WebSVN – freemyipod – Diff – /libs/png/tinflate.c

  * 3. This notice may not be removed or altered from
  *    any source distribution.
  */
 //#define DEBUG_CONSOLES 2
 //#define DEBUG_PRINT_SOURCE_LINE
 #include "emcorelib.h"
 #include "tinf.h"
 /* ------------------------------ *
    unsigned int bit;
 //   DEBUGF("tinf_getbit: bytecount=%d, bitcount=%d, source=0x%08X",
 //          d->bytecount, d->bitcount, d->source);
    /* check if tag is empty */
-   if (!--d->bitcount)
+   if (!d->bitcount)
+   {
-       while (!--d->bytecount)
+       while (!d->bytecount)
+       {
            DEBUGF("tinf_getbit: refilling bytes");
-   DEBUGF("tinf_getbit: bytecount=%d, bitcount=%d, source=0x%08X",
+           DEBUGF("tinf_getbit: bytecount=%d, bitcount=%d, source=0x%08X",
-          d->bytecount, d->bitcount, d->source);
+                  d->bytecount, d->bitcount, d->source);
            d->bytecount = (d->source[4] << 24) | (d->source[5] << 16)
                         | (d->source[6] << 8) | d->source[7];
            d->source += 12;
-   DEBUGF("tinf_getbit: bytecount=%d, bitcount=%d, source=0x%08X",
+           DEBUGF("tinf_getbit: bytecount=%d, bitcount=%d, source=0x%08X",
-          d->bytecount, d->bitcount, d->source);
+                  d->bytecount, d->bitcount, d->source);
+       }
       /* load next tag */
       d->tag = *d->source++;
       d->bitcount = 8;
+      d->bytecount--;
+   }
    /* shift bit out of tag */
    bit = d->tag & 1;
    d->tag >>= 1;
+   d->bitcount--;
 //   DEBUGF("tinf_getbit: returning bit %d", bit);
    return bit;
+}
+{
     TINF_DATA d;
     int bfinal;
     d.source = (const unsigned char *)(source + 10);
-    d.bitcount = 1;
+    d.bitcount = 0;
     d.bytecount = ((d.source[-10] << 24) | (d.source[-9] << 16)
-                 | (d.source[-8] << 8) | d.source[-7]) + 1;
+                 | (d.source[-8] << 8) | d.source[-7]) - 2;
     d.dest = (unsigned char *)dest;
     d.destLen = destLen;
     *destLen = 0;
+       }
        if (res) return res;
        if (d.source > (unsigned char *)source + sourceLen)
+       {
+           DEBUGF("tinf_uncompress: Hit end of buffer! (source=0x%08X, len=%d, current=0x%08X)",
+                  source, sourceLen, d.source);
            return -7;
+       }
     } while (!bfinal);
+    d.bytecount -= 4;
+    if (d.bytecount)
+    {
+        DEBUGF("tinf_uncompress: %d leftover bytes, %d bits!", d.bytecount, d.bitcount);
+        return -8;
+    }
     return 0;
+}

Subversion Repositories freemyipod

(root)/libs/png/tinflate.c – Rev 494 → 649