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 777292 - netwerk/: Don't treat number of bytes as an nsresult; r=bz

Browse Source
This commit is contained in:
Aryeh Gregor 2012-07-27 17:03:25 +03:00
parent 9ee902c3ed
commit 4213d86624
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
netwerk/streamconv/converters/nsHTTPCompressConv.cpp
View File

@ -154,10 +154,8 @@ nsHTTPCompressConv::OnDataAvailable(nsIRequest* request,
if (mInpBuffer == NULL || mOutBuffer == NULL)
return NS_ERROR_OUT_OF_MEMORY;
iStr->Read((char *)mInpBuffer, streamLen, &rv);
if (NS_FAILED(rv))
return rv;
PRUint32 unused;
iStr->Read((char *)mInpBuffer, streamLen, &unused);
if (mMode == HTTP_COMPRESS_DEFLATE)
{
@ -363,7 +361,6 @@ static unsigned gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
PRUint32
nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsresult *rs)
{
nsresult rv;
enum { GZIP_INIT = 0, GZIP_OS, GZIP_EXTRA0, GZIP_EXTRA1, GZIP_EXTRA2, GZIP_ORIG, GZIP_COMMENT, GZIP_CRC };
char c;
@ -377,7 +374,8 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
switch (hMode)
{
case GZIP_INIT:
iStr->Read (&c, 1, &rv);
PRUint32 unused;
iStr->Read(&c, 1, &unused);
streamLen--;
if (mSkipCount == 0 && ((unsigned)c & 0377) != gz_magic[0])
@ -413,7 +411,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
break;
case GZIP_OS:
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
mSkipCount++;
@ -424,7 +422,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
case GZIP_EXTRA0:
if (mFlags & EXTRA_FIELD)
{
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
mLen = (uInt) c & 0377;
hMode = GZIP_EXTRA1;
@ -434,7 +432,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
break;
case GZIP_EXTRA1:
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
mLen = ((uInt) c & 0377) << 8;
mSkipCount = 0;
@ -446,7 +444,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
hMode = GZIP_ORIG;
else
{
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
mSkipCount++;
}
@ -455,7 +453,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
case GZIP_ORIG:
if (mFlags & ORIG_NAME)
{
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
if (c == 0)
hMode = GZIP_COMMENT;
@ -467,7 +465,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
case GZIP_COMMENT:
if (mFlags & COMMENT)
{
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
if (c == 0)
{
@ -485,7 +483,7 @@ nsHTTPCompressConv::check_header(nsIInputStream *iStr, PRUint32 streamLen, nsres
case GZIP_CRC:
if (mFlags & HEAD_CRC)
{
iStr->Read(&c, 1, &rv);
iStr->Read(&c, 1, &unused);
streamLen--;
mSkipCount++;
if (mSkipCount == 2)