From 2659b13ed346c8a20798a0dc64390bbde81bb73a Mon Sep 17 00:00:00 2001 From: "brade%netscape.com" Date: Tue, 19 Mar 2002 14:11:06 +0000 Subject: [PATCH] always seek so variables are initialized properly, increment mSegmentNum before getting next block; bug 129760, r=dougt, sr=darin, a=Asa git-svn-id: svn://10.0.0.236/trunk@116856 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsStorageStream.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mozilla/xpcom/io/nsStorageStream.cpp b/mozilla/xpcom/io/nsStorageStream.cpp index 2513cd9dcfc..02bc783a10a 100644 --- a/mozilla/xpcom/io/nsStorageStream.cpp +++ b/mozilla/xpcom/io/nsStorageStream.cpp @@ -364,12 +364,10 @@ nsStorageStream::NewInputStream(PRInt32 aStartingOffset, nsIInputStream* *aInput NS_ADDREF(inputStream); - if (aStartingOffset) { - nsresult rv = inputStream->Seek(aStartingOffset); - if (NS_FAILED(rv)) { - NS_RELEASE(inputStream); - return rv; - } + nsresult rv = inputStream->Seek(aStartingOffset); + if (NS_FAILED(rv)) { + NS_RELEASE(inputStream); + return rv; } *aInputStream = inputStream; @@ -404,7 +402,7 @@ nsStorageInputStream::Read(char* aBuffer, PRUint32 aCount, PRUint32 *aNumRead) if (!available) goto out; - mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(mSegmentNum++); + mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(++mSegmentNum); mSegmentEnd = mReadCursor + PR_MIN(mSegmentSize, available); } @@ -442,7 +440,7 @@ nsStorageInputStream::ReadSegments(nsWriteSegmentFun writer, void * closure, PRU if (!available) goto out; - mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(mSegmentNum++); + mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(++mSegmentNum); mSegmentEnd = mReadCursor + PR_MIN(mSegmentSize, available); availableInSegment = mSegmentEnd - mReadCursor; }