Prevent the existance of dangling pointers upon failure of FindDataStart.
parent
f86309421d
commit
9bcdb8f762
|
@ -217,16 +217,17 @@ nsresult nsZipHandle::Init(nsIFile *file, nsZipHandle **ret,
|
||||||
#else
|
#else
|
||||||
handle->mNSPRFileDesc = fd.forget();
|
handle->mNSPRFileDesc = fd.forget();
|
||||||
#endif
|
#endif
|
||||||
handle->mMap = map;
|
|
||||||
handle->mFile.Init(file);
|
handle->mFile.Init(file);
|
||||||
handle->mTotalLen = (uint32_t) size;
|
handle->mTotalLen = (uint32_t) size;
|
||||||
handle->mFileStart = buf;
|
handle->mFileStart = buf;
|
||||||
rv = handle->findDataStart();
|
rv = handle->findDataStart();
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
PR_MemUnmap(buf, (uint32_t) size);
|
PR_MemUnmap(buf, (uint32_t) size);
|
||||||
|
handle->mFileStart = nullptr;
|
||||||
PR_CloseFileMap(map);
|
PR_CloseFileMap(map);
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
handle->mMap = map;
|
||||||
handle.forget(ret);
|
handle.forget(ret);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue