wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 670553. Don't try to read more than aCount bytes in nsUnicharStreamLoader::OnDataAvailable. r=zwol

Browse Source
This commit is contained in:
Boris Zbarsky 2011-07-21 17:31:36 -04:00
parent 433ceb027e
commit 1c71a78f9f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netwerk/base/src/nsUnicharStreamLoader.cpp
View File

@ -41,6 +41,7 @@
#include "nsICharsetConverterManager.h"
#include "nsIServiceManager.h"
#define SNIFFING_BUFFER_SIZE 512 // specified in draft-abarth-mime-sniff-06
NS_IMETHODIMP
nsUnicharStreamLoader::Init(nsIUnicharStreamLoaderObserver *aObserver)
@ -49,7 +50,7 @@ nsUnicharStreamLoader::Init(nsIUnicharStreamLoaderObserver *aObserver)
mObserver = aObserver;
if (!mRawData.SetCapacity(512))
if (!mRawData.SetCapacity(SNIFFING_BUFFER_SIZE))
return NS_ERROR_OUT_OF_MEMORY;
return NS_OK;
@ -153,20 +154,21 @@ nsUnicharStreamLoader::OnDataAvailable(nsIRequest *aRequest,
PRUint32 dummy;
aInputStream->ReadSegments(WriteSegmentFun, this, aCount, &dummy);
} else {
// no decoder yet. Read up to 512 octets into mRawData (this is
// the cutoff specified in draft-abarth-mime-sniff-06). If we can
// get that much, then go ahead and fire charset detection and
// read the rest. Otherwise wait for more data.
// no decoder yet. Read up to SNIFFING_BUFFER_SIZE octets into
// mRawData (this is the cutoff specified in
// draft-abarth-mime-sniff-06). If we can get that much, then go
// ahead and fire charset detection and read the rest. Otherwise
// wait for more data.
PRUint32 haveRead = mRawData.Length();
PRUint32 toRead = 512 - haveRead;
PRUint32 toRead = NS_MIN(SNIFFING_BUFFER_SIZE - haveRead, aCount);
PRUint32 n;
char *here = mRawData.BeginWriting() + haveRead;
rv = aInputStream->Read(here, toRead, &n);
if (NS_SUCCEEDED(rv)) {
mRawData.SetLength(haveRead + n);
if (mRawData.Length() == 512) {
if (mRawData.Length() == SNIFFING_BUFFER_SIZE) {
rv = DetermineCharset();
if (NS_SUCCEEDED(rv)) {
// process what's left