|
|
|
|
@ -439,3 +439,42 @@ diff -ru libpng-1.2.5/pngrutil.c libpng-1.2.5.fix/pngrutil.c
|
|
|
|
|
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
|
|
|
|
|
if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
|
|
|
|
|
|
|
|
|
|
Index: qtools/qxml.cpp
|
|
|
|
|
--- qtools/qxml.cpp.orig 2003-12-14 23:00:57.000000000 +0100
|
|
|
|
|
+++ qtools/qxml.cpp 2005-02-18 12:31:22.005743375 +0100
|
|
|
|
|
@@ -4772,7 +4772,7 @@
|
|
|
|
|
{
|
|
|
|
|
const signed char Init = 0;
|
|
|
|
|
const signed char Ws1 = 1; // eat whitespace
|
|
|
|
|
- const signed char CS = 2; // choice or set
|
|
|
|
|
+ const signed char xCS = 2; // choice or set
|
|
|
|
|
const signed char Ws2 = 3; // eat whitespace
|
|
|
|
|
const signed char More = 4; // more cp to read
|
|
|
|
|
const signed char Name = 5; // read name
|
|
|
|
|
@@ -4792,7 +4792,7 @@
|
|
|
|
|
static signed char table[6][9] = {
|
|
|
|
|
/* InpWs InpOp InpCp InpQm InpAst InpPlus InpPipe InpComm InpUnknown */
|
|
|
|
|
{ -1, Ws1, -1, -1, -1, -1, -1, -1, Name }, // Init
|
|
|
|
|
- { -1, CS, -1, -1, -1, -1, -1, -1, CS }, // Ws1
|
|
|
|
|
+ { -1, xCS, -1, -1, -1, -1, -1, -1, xCS }, // Ws1
|
|
|
|
|
{ Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1 }, // CS
|
|
|
|
|
{ -1, -1, Done, -1, -1, -1, More, More, -1 }, // Ws2
|
|
|
|
|
{ -1, Ws1, -1, -1, -1, -1, -1, -1, Name }, // More (same as Init)
|
|
|
|
|
@@ -4837,7 +4837,7 @@
|
|
|
|
|
case Ws1:
|
|
|
|
|
next_eat_ws();
|
|
|
|
|
break;
|
|
|
|
|
- case CS:
|
|
|
|
|
+ case xCS:
|
|
|
|
|
parseOk = parseChoiceSeq();
|
|
|
|
|
break;
|
|
|
|
|
case Ws2:
|
|
|
|
|
@@ -4855,7 +4855,7 @@
|
|
|
|
|
}
|
|
|
|
|
// no input is read after this
|
|
|
|
|
switch ( state ) {
|
|
|
|
|
- case CS:
|
|
|
|
|
+ case xCS:
|
|
|
|
|
if ( !parseOk ) {
|
|
|
|
|
d->error = XMLERR_ERRORPARSINGCHOICE;
|
|
|
|
|
goto parseError;
|
|
|
|
|
|
