corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 536911: fix null dereference topcash r=alfredkayser

Browse Source
This commit is contained in:
Taras Glek
2009-12-31 10:10:20 -08:00
parent 9bab6f1849
commit c7a2bc8794
3 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libjar/nsJARInputStream.cpp
View File

@@ -89,6 +89,8 @@ nsJARInputStream::InitFile(nsJAR *aJar, nsZipItem *item)
// Must keep handle to filepointer and mmap structure as long as we need access to the mmapped data // Must keep handle to filepointer and mmap structure as long as we need access to the mmapped data
mFd = aJar->mZip.GetFD(); mFd = aJar->mZip.GetFD();
mZs.next_in = aJar->mZip.GetData(item); mZs.next_in = aJar->mZip.GetData(item);
if (!mZs.next_in)
return NS_ERROR_FILE_CORRUPTED;
mZs.avail_in = item->Size(); mZs.avail_in = item->Size();
mOutSize = item->RealSize(); mOutSize = item->RealSize();
mZs.total_out = 0; mZs.total_out = 0;

BIN
modules/libjar/test/unit/data/test_corrupt.zip Normal file
View File

Binary file not shown.

69
modules/libjar/test/unit/test_corrupt_536911.js Normal file
View File

@@ -0,0 +1,69 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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.org code.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation
* Portions created by the Initial Developer are Copyright (C) 2009
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Taras Glek <tglek@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function wrapInputStream(input)
{
var nsIScriptableInputStream = Components.interfaces.nsIScriptableInputStream;
var factory = Components.classes["@mozilla.org/scriptableinputstream;1"];
var wrapper = factory.createInstance(nsIScriptableInputStream);
wrapper.init(input);
return wrapper;
}
// Check that files can be read from after closing zipreader
function run_test() {
const Cc = Components.classes;
const Ci = Components.interfaces;
// the build script have created the zip we can test on in the current dir.
var file = do_get_file("data/test_corrupt.zip");
var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
createInstance(Ci.nsIZipReader);
zipreader.open(file);
// var entries = zipreader.findEntries(null);
// the signature for file is corrupt, should not segfault
var failed = false;
try {
var stream = wrapInputStream(zipreader.getInputStream("file"));
stream.read(1024);
} catch (ex) {
failed = true;
}
do_check_true(failed);
}