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

Testcase for bug 413512 - Crash loading www.pricerunner.de.

Browse Source
This commit is contained in:
dolske@mozilla.com 2008-01-22 22:09:21 -08:00
parent 47f938e2b9
commit 03b8bceab4
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/libpr0n/src/imgTools.cpp
View File

@ -233,7 +233,8 @@ NS_IMETHODIMP imgTools::DecodeImageData(nsIInputStream* aInStr,
NS_ENSURE_SUCCESS(rv, rv);
rv = decoder->WriteFrom(aInStr, length, &written);
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(written == length, "decoder didn't eat all of its vegetables");
if (written != length)
NS_WARNING("decoder didn't eat all of its vegetables");
rv = decoder->Flush();
NS_ENSURE_SUCCESS(rv, rv);
rv = decoder->Close();

BIN
modules/libpr0n/test/unit/bug413512.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

52
modules/libpr0n/test/unit/test_imgtools.js
View File

@ -92,6 +92,28 @@ function compareArrays(aArray1, aArray2) {
}
/*
* checkExpectedError
*
* Checks to see if a thrown error was expected or not, and if it
* matches the expected value.
*/
function checkExpectedError (aExpectedError, aActualError) {
if (aExpectedError) {
if (!aActualError)
throw "Didn't throw as expected (" + aExpectedError + ")";
if (!aExpectedError.test(aActualError))
throw "Threw (" + aActualError + "), not (" + aExpectedError;
// We got the expected error, so make a note in the test log.
dump("...that error was expected.\n\n");
} else if (aActualError) {
throw "Threw unexpected error: " + aActualError;
}
}
function run_test() {
try {
@ -100,6 +122,7 @@ try {
/* ========== 0 ========== */
var testnum = 0;
var testdesc = "imgITools setup";
var err = null;
var imgTools = Cc["@mozilla.org/image/tools;1"].
getService(Ci.imgITools);
@ -298,6 +321,35 @@ referenceBytes = streamToArray(istream);
// compare the encoder's output to the reference file.
compareArrays(encodedBytes, referenceBytes);
/* ========== bug 413512 ========== */
testnum = 413512;
testdesc = "test decoding bad favicon (bug 413512)";
imgName = "bug413512.ico";
inMimeType = "image/x-icon";
imgFile = do_get_file(TESTDIR + imgName);
istream = getFileInputStream(imgFile);
do_check_eq(istream.available(), 17759);
// You'd think the decoder would fail, but it doesn't. The decoders use
// stream->ReadSegments with a callback, and buffered streams ignore errors
// from the callback. :-( See bug 413595.
outParam = { value: null };
imgTools.decodeImageData(istream, inMimeType, outParam);
container = outParam.value;
try {
istream = imgTools.encodeImage(container, "image/png");
} catch (e) {
err = e;
}
checkExpectedError(/NS_ERROR_NOT_AVAILABLE/, err);
/* ========== end ========== */
} catch (e) {