Ticket #19498: optipng-0.6.2.1.diff

lib/pngxtern/gif/gifread.c

@@ -219 +219 @@
  **/
 static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream)
 {
-    unsigned char *ptr;
-    unsigned int len;
+    unsigned int offset, len;
     int count, label;
 
     GIF_FGETC(label, stream);
@@ -233 +232 @@
         return;
     }
 
-    ptr = ext->Buffer;
+    offset = 0;
     len = ext->BufferSize;
     for ( ;; )
     {
@@ -243 +242 @@
             ext->BufferSize += 1024;
             ext->Buffer = realloc(ext->Buffer, ext->BufferSize);
         }
-        count = ReadDataBlock(ptr, stream);
+        count = ReadDataBlock(ext->Buffer + offset, stream);
         if (count == 0)
             break;
-        ptr += count;
+        offset += count;
         len -= count;
     }
 }

src/optipng.c

@@ -542 +542 @@
 static void
 app_init(void)
 {
+    setvbuf(stdout, NULL, _IONBF, 0);
     if (options.log_name != NULL)
     {
         /* Open the log file, line-buffered. */

src/proginfo.h

@@ -1 +1 @@
 #define PROGRAM_NAME        "OptiPNG"
 #define PROGRAM_DESCRIPTION "Advanced PNG optimizer"
-#define PROGRAM_VERSION     "0.6.2"
-#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2008 Cosmin Truta"
+#define PROGRAM_VERSION     "0.6.2.1"
+#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2009 Cosmin Truta"
 #define PROGRAM_URI         "http://optipng.sourceforge.net/"