mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
reading from corrupt zip archives leaks memory (bug 190996) r=ssu, sr=heikki,a=asa
This commit is contained in:
parent
0426251963
commit
fb101585e7
@ -1,53 +0,0 @@
|
|||||||
/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Netscape Public
|
|
||||||
* License Version 1.1 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.mozilla.org/NPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS
|
|
||||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
||||||
* implied. See the License for the specific language governing
|
|
||||||
* rights and limitations under the License.
|
|
||||||
*
|
|
||||||
* The Original Code is Mozilla Communicator client code,
|
|
||||||
* released March 31, 1998.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is Netscape Communications
|
|
||||||
* Corporation. Portions created by Netscape are
|
|
||||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
|
||||||
* Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Daniel Veditz <dveditz@netscape.com>
|
|
||||||
* Don Bragg <dbragg@netscape.com>
|
|
||||||
* Samir Gehani <sgehani@netscape.com>
|
|
||||||
* Mitch Stoltz <mstoltz@netscape.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "nsISupports.idl"
|
|
||||||
#include "nsISimpleEnumerator.idl"
|
|
||||||
#include "nsIInputStream.idl"
|
|
||||||
|
|
||||||
%{C++
|
|
||||||
#include "nsIFactory.h"
|
|
||||||
|
|
||||||
#define NS_ZIP_CID \
|
|
||||||
{ /* CEB5BDB2-121D-11d3-BCFB-00805F0E1353*/ \
|
|
||||||
0xCEB5BDB2, \
|
|
||||||
0x121D, \
|
|
||||||
0x11d3, \
|
|
||||||
{0xBC, 0xFB, 0x00, 0x80, 0x5F, 0x0E, 0x13, 0x53} \
|
|
||||||
}
|
|
||||||
%}
|
|
||||||
|
|
||||||
[uuid(CEB5BDB1-121D-11d3-BCFB-00805F0E1353)]
|
|
||||||
interface nsIZip : nsISupports
|
|
||||||
{
|
|
||||||
PRInt32 open(in string aZipFileName);
|
|
||||||
PRInt32 extract(in string aFilename, in string aOutname);
|
|
||||||
nsISimpleEnumerator find(in string aPattern);
|
|
||||||
nsIInputStream getInputStream(in string aFilename);
|
|
||||||
PRUint32 itemSize(in string aFilename);
|
|
||||||
};
|
|
||||||
|
|
@ -578,8 +578,9 @@ PRInt32 nsZipArchive::ReadInit(const char* zipEntry, nsZipRead* aRead)
|
|||||||
if (!item)
|
if (!item)
|
||||||
return ZIP_ERR_FNF;
|
return ZIP_ERR_FNF;
|
||||||
|
|
||||||
//-- Initialize nsZipRead object
|
//-- verify we can handle the compression type
|
||||||
aRead->Init(this, item);
|
if (item->compression != DEFLATED && item->compression != STORED)
|
||||||
|
return ZIP_ERR_UNSUPPORTED;
|
||||||
|
|
||||||
//-- Read the item into memory
|
//-- Read the item into memory
|
||||||
// Inflate if necessary and save in mInflatedFileBuffer
|
// Inflate if necessary and save in mInflatedFileBuffer
|
||||||
@ -587,20 +588,20 @@ PRInt32 nsZipArchive::ReadInit(const char* zipEntry, nsZipRead* aRead)
|
|||||||
// (nsJAR needs the whole file in memory before passing it on)
|
// (nsJAR needs the whole file in memory before passing it on)
|
||||||
char* buf = (char*)PR_Malloc(item->realsize);
|
char* buf = (char*)PR_Malloc(item->realsize);
|
||||||
if (!buf) return ZIP_ERR_MEMORY;
|
if (!buf) return ZIP_ERR_MEMORY;
|
||||||
switch(item->compression)
|
|
||||||
{
|
if (item->compression == DEFLATED)
|
||||||
case DEFLATED:
|
|
||||||
result = InflateItem(item, 0, buf);
|
result = InflateItem(item, 0, buf);
|
||||||
break;
|
else
|
||||||
case STORED:
|
|
||||||
result = CopyItemToBuffer(item, buf);
|
result = CopyItemToBuffer(item, buf);
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return ZIP_ERR_UNSUPPORTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result == ZIP_OK)
|
if (result == ZIP_OK)
|
||||||
|
{
|
||||||
|
aRead->Init(this, item);
|
||||||
aRead->mFileBuffer = buf;
|
aRead->mFileBuffer = buf;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
PR_Free(buf);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1281,7 +1282,7 @@ PRInt32 nsZipArchive::InflateItem( const nsZipItem* aItem, PRFileDesc* fOut,
|
|||||||
{
|
{
|
||||||
PRInt32 status = ZIP_OK;
|
PRInt32 status = ZIP_OK;
|
||||||
PRUint32 chunk, inpos, outpos, size, crc;
|
PRUint32 chunk, inpos, outpos, size, crc;
|
||||||
PRUint32 bigBufSize;
|
PRUint32 bigBufSize=0;
|
||||||
z_stream zs;
|
z_stream zs;
|
||||||
int zerr;
|
int zerr;
|
||||||
PRBool bInflating = PR_FALSE;
|
PRBool bInflating = PR_FALSE;
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
#define PR_ASSERT assert
|
#define PR_ASSERT assert
|
||||||
#define PR_Malloc malloc
|
#define PR_Malloc malloc
|
||||||
|
#define PR_Free free
|
||||||
#define PR_FREEIF(x) do { if (x) free(x); } while(0)
|
#define PR_FREEIF(x) do { if (x) free(x); } while(0)
|
||||||
#define PL_strfree free
|
#define PL_strfree free
|
||||||
#define PL_strcmp strcmp
|
#define PL_strcmp strcmp
|
||||||
|
Loading…
Reference in New Issue
Block a user