[GNUnet-SVN] r6261 - in Extractor: . src/main src/plugins

[gnunet]

Author: grothoff
Date: 2008-02-11 22:59:12 -0700 (Mon, 11 Feb 2008)
New Revision: 6261

Modified:
   Extractor/AUTHORS
   Extractor/ChangeLog
   Extractor/src/main/extractor.c
   Extractor/src/plugins/flacextractor.c
   Extractor/src/plugins/pack.c
   Extractor/src/plugins/pdfextractor.c
Log:
cleanup

Modified: Extractor/AUTHORS
===================================================================
--- Extractor/AUTHORS   2008-02-12 04:52:41 UTC (rev 6260)
+++ Extractor/AUTHORS   2008-02-12 05:59:12 UTC (rev 6261)
@@ -50,6 +50,7 @@
 Heiko Wundram <address@hidden>
 Ronan MELENNEC <address@hidden>
 Vasil Dimov <address@hidden>
+Pavol Rusnak <address@hidden>
 
 Translations:
 German - Karl Eichwalder <address@hidden>
@@ -77,3 +78,4 @@
 glib        -
 libltdl     -
 gtk (pixbuf)-
+libflac     -

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2008-02-12 04:52:41 UTC (rev 6260)
+++ Extractor/ChangeLog 2008-02-12 05:59:12 UTC (rev 6261)
@@ -1,3 +1,10 @@
+Mon Feb 11 22:58:48 MST 2008
+       Various minor code cleanups.
+
+Sat Jan 12 14:14:32 MST 2008
+       Fixed security issues in XPDF-based PDF extractor.
+       Releasing libextractor 0.5.19a.
+
 Mon Jan  7 08:46:40 MST 2008
        Releasing libextractor 0.5.19.
 

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2008-02-12 04:52:41 UTC (rev 6260)
+++ Extractor/src/main/extractor.c      2008-02-12 05:59:12 UTC (rev 6261)
@@ -339,8 +339,8 @@
        return cut_lib(strdup(dir));
       }
     }
+    fclose(f);
   }
-  fclose(f);
   snprintf(fn,
           64,
           "/proc/%u/exe",

Modified: Extractor/src/plugins/flacextractor.c
===================================================================
--- Extractor/src/plugins/flacextractor.c       2008-02-12 04:52:41 UTC (rev 
6260)
+++ Extractor/src/plugins/flacextractor.c       2008-02-12 05:59:12 UTC (rev 
6261)
@@ -276,7 +276,7 @@
   if (false == FLAC__stream_decoder_set_metadata_respond_all(decoder))
     {
       FLAC__stream_decoder_delete(decoder);     
-      return le_cls.prev;
+      return prev;
     }
   le_cls.prev = prev;
   le_cls.prev = prev;

Modified: Extractor/src/plugins/pack.c
===================================================================
--- Extractor/src/plugins/pack.c        2008-02-12 04:52:41 UTC (rev 6260)
+++ Extractor/src/plugins/pack.c        2008-02-12 05:59:12 UTC (rev 6261)
@@ -357,7 +357,10 @@
               len |= *bp++;
 
               if (len > maxlen)
-                return -1;
+               {
+                 va_end (ap);
+                 return -1;
+               }
 
               memmove (arr, bp, len);
               bp += len;
@@ -487,6 +490,7 @@
                   int j;
                   for (j = 0; j < i; j++)
                     free (cbvp[i].data);
+                 va_end (ap);
                   return -1;
                 }
 

Modified: Extractor/src/plugins/pdfextractor.c
===================================================================
--- Extractor/src/plugins/pdfextractor.c        2008-02-12 04:52:41 UTC (rev 
6260)
+++ Extractor/src/plugins/pdfextractor.c        2008-02-12 05:59:12 UTC (rev 
6261)
@@ -410,7 +410,8 @@
           pos += 20 * xinfo - xstart;
           memcpy (buf, &data[pos], 20);
           buf[20] = '\0';
-          sscanf (buf, "%10llu %*5u %*c", &info_offset);
+          if (1 != sscanf (buf, "%10llu %*5u %*c", &info_offset))
+           return prev;
           break;
         }
       xrefpos = 20 * xcount + pos;