Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix from alfred.peng@sun.com for old seek-on-selected-stream-without-mBytesLeft-update bug, plus assertions and a null store for stronger consistency (341595, r=me for Alfred's parts, and vice versa).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@206317 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2006-08-01 20:14:33 +00:00
parent 199719e59a
commit e5fa056073
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/xpcom/io/nsFastLoadFile.cpp
View File

@ -1123,6 +1123,24 @@ nsFastLoadFileReader::ReadObject(PRBool aIsStrongRef, nsISupports* *aObject)
// We must skip over the object definition.
if (oid & MFL_OBJECT_DEF_TAG) {
NS_ASSERTION(entry->mSkipOffset != 0, "impossible! see above");
// Since we are seeking within a muxed segment, we must adjust
// mBytesLeft, so that Seek called from Read will be triggered
// when mBytesLeft goes to zero.
PRInt64 currentOffset;
rv = mSeekableInput->Tell(&currentOffset);
if (NS_FAILED(rv))
return rv;
NS_ASSERTION(entry->mSkipOffset > (PRUint32)currentOffset,
"skipping backwards from object?!");
NS_ASSERTION(mCurrentDocumentMapEntry->mBytesLeft >=
entry->mSkipOffset - (PRUint32)currentOffset,
"skipped object buffer underflow!");
mCurrentDocumentMapEntry->mBytesLeft -=
entry->mSkipOffset - (PRUint32)currentOffset;
rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET,
entry->mSkipOffset);
if (NS_FAILED(rv))
@ -1464,7 +1482,6 @@ nsFastLoadFileWriter::SelectMuxedDocument(nsISupports* aURI,
uriMapEntry->mDocMapEntry = docMapEntry;
uriMapEntry->mGeneration = mDocumentMap.generation;
}
docMapEntry = uriMapEntry->mDocMapEntry;
// If there is a muxed document segment open, close it now by setting its
// length, stored in the second PRUint32 of the segment.
@ -1564,9 +1581,13 @@ nsFastLoadFileWriter::EndMuxedDocument(nsISupports* aURI)
}
// Drop our ref to the URI object that was passed to StartMuxedDocument,
// we no longer need it, and we do not want to extend its lifetime.
if (uriMapEntry->mDocMapEntry)
// we no longer need it, and we do not want to extend its lifetime. Also
// null mCurrentDocumentMapEntry if aURI is currently selected.
if (uriMapEntry->mDocMapEntry) {
NS_RELEASE(uriMapEntry->mDocMapEntry->mURI);
if (uriMapEntry->mDocMapEntry == mCurrentDocumentMapEntry)
mCurrentDocumentMapEntry = nsnull;
}
// Shrink the table if half the entries are removed sentinels.
PRUint32 size = PL_DHASH_TABLE_SIZE(&mURIMap);