[GNUnet-SVN] r9351 - in Extractor/src/plugins: ffmpeg/libavutil ffmpeg/libswscale ffmpeg/tools hash pdf

[gnunet]

Author: grothoff
Date: 2009-10-30 13:12:07 -0600 (Fri, 30 Oct 2009)
New Revision: 9351

Modified:
   Extractor/src/plugins/ffmpeg/libavutil/lzo.c
   Extractor/src/plugins/ffmpeg/libswscale/swscale-example.c
   Extractor/src/plugins/ffmpeg/tools/qt-faststart.c
   Extractor/src/plugins/ffmpeg/tools/trasher.c
   Extractor/src/plugins/hash/rmd160extractor.c
   Extractor/src/plugins/pdf/XRef.cc
Log:
fixing leaks, improving style


Modified: Extractor/src/plugins/ffmpeg/libavutil/lzo.c
===================================================================
--- Extractor/src/plugins/ffmpeg/libavutil/lzo.c        2009-10-30 18:58:25 UTC 
(rev 9350)
+++ Extractor/src/plugins/ffmpeg/libavutil/lzo.c        2009-10-30 19:12:07 UTC 
(rev 9351)
@@ -268,6 +268,7 @@
         av_log(NULL, AV_LOG_ERROR, "decompression incorrect\n");
     else
         av_log(NULL, AV_LOG_ERROR, "decompression ok\n");
+    fclose (in);
     return 0;
 }
 #endif

Modified: Extractor/src/plugins/ffmpeg/libswscale/swscale-example.c
===================================================================
--- Extractor/src/plugins/ffmpeg/libswscale/swscale-example.c   2009-10-30 
18:58:25 UTC (rev 9350)
+++ Extractor/src/plugins/ffmpeg/libswscale/swscale-example.c   2009-10-30 
19:12:07 UTC (rev 9351)
@@ -224,6 +224,7 @@
 #endif
 
     selfTest(src, stride, W, H);
-
+    free (rgb_data);
+    free (data);
     return 123;
 }

Modified: Extractor/src/plugins/ffmpeg/tools/qt-faststart.c
===================================================================
--- Extractor/src/plugins/ffmpeg/tools/qt-faststart.c   2009-10-30 18:58:25 UTC 
(rev 9350)
+++ Extractor/src/plugins/ffmpeg/tools/qt-faststart.c   2009-10-30 19:12:07 UTC 
(rev 9351)
@@ -257,6 +257,7 @@
     if (!outfile) {
         perror(argv[2]);
         fclose(outfile);
+       fclose(infile);
         free(moov_atom);
         return 1;
     }

Modified: Extractor/src/plugins/ffmpeg/tools/trasher.c
===================================================================
--- Extractor/src/plugins/ffmpeg/tools/trasher.c        2009-10-30 18:58:25 UTC 
(rev 9350)
+++ Extractor/src/plugins/ffmpeg/tools/trasher.c        2009-10-30 19:12:07 UTC 
(rev 9351)
@@ -65,6 +65,6 @@
             fwrite(&val, 1, 1, f);
         }
     }
-
+    fclose (f);
     return 0;
 }

Modified: Extractor/src/plugins/hash/rmd160extractor.c
===================================================================
--- Extractor/src/plugins/hash/rmd160extractor.c        2009-10-30 18:58:25 UTC 
(rev 9350)
+++ Extractor/src/plugins/hash/rmd160extractor.c        2009-10-30 19:12:07 UTC 
(rev 9351)
@@ -74,8 +74,6 @@
 #define RMD160_INIT3           0x10325476UL
 #define RMD160_INIT4           0xc3d2e1f0UL
 
-#define FUNCTION_NAME "rmd160_calc"
-
 static int
 _rmd160_calc (rmd160uint32 * state, rmd160uint32 * data)
 {
@@ -319,10 +317,7 @@
   return RMD160_OK;
 }
 
-#undef FUNCTION_NAME
 
-#define FUNCTION_NAME "rmd160_append"
-
 static int
 rmd160_append (RMD160 arg_obj, size_t arg_len, const unsigned char *arg_data)
 {
@@ -435,10 +430,7 @@
 
 }
 
-#undef FUNCTION_NAME
 
-#define FUNCTION_NAME "rmd160_destroy"
-
 static int
 rmd160_destroy (RMD160 ptr)
 {
@@ -450,9 +442,7 @@
   return RMD160_OK;
 }
 
-#undef FUNCTION_NAME
 
-#define FUNCTION_NAME "rmd160_copy"
 
 static RMD160
 rmd160_copy (RMD160 target_p, RMD160 source_p)
@@ -511,12 +501,8 @@
   return target_p;
 }
 
-#undef FUNCTION_NAME
 
 
-
-#define FUNCTION_NAME "rmd160_sum_words"
-
 static rmd160uint32 *
 rmd160_sum_words (RMD160 arg_handle, rmd160uint32 * arg_result_p)
 {
@@ -563,54 +549,33 @@
 
 }
 
-#undef FUNCTION_NAME
 
 
-
-#define FUNCTION_NAME "rmd160_sum_bytes"
-
-static unsigned char *
-rmd160_sum_bytes (RMD160 arg_handle, unsigned char *arg_result_p)
+static void
+rmd160_sum_bytes (RMD160 arg_handle, unsigned char *result_p)
 {
   rmd160uint32 temp[5];
-
   rmd160uint32 *ptemp;
-
   unsigned char *result_p;
 
-
-  if (!(result_p = arg_result_p))
-    {
-      if (!(result_p = (unsigned char *) malloc (20)))
-        return NULL;
-    }
-
   if (!rmd160_sum_words (arg_handle, temp))
-    {
-      if (!arg_result_p)
-        free (result_p);
-      return NULL;
-    }
+    return;    
 
   ptemp = temp;
   {
     int i;
     for (i = 0; i < 5; ++i)
       {
-        register rmd160uint32 w;
-        *(arg_result_p++) = 0xff & (w = *ptemp);
-        *(arg_result_p++) = 0xff & (w >> 8);
-        *(arg_result_p++) = 0xff & (w >> 16);
-        *(arg_result_p++) = 0xff & (w >> 24);
+       rmd160uint32 w;
+        *(result_p++) = 0xff & (w = *ptemp);
+        *(result_p++) = 0xff & (w >> 8);
+        *(result_p++) = 0xff & (w >> 16);
+        *(result_p++) = 0xff & (w >> 24);
         ++ptemp;
       }
   }
-
-  return arg_result_p;
-
 }
 
-#undef FUNCTION_NAME
 
 
 static struct EXTRACTOR_Keywords *
@@ -619,7 +584,7 @@
 {
 
   EXTRACTOR_KeywordList *keyword;
-  keyword = (EXTRACTOR_KeywordList *) malloc (sizeof (EXTRACTOR_KeywordList));
+  keyword = malloc (sizeof (EXTRACTOR_KeywordList));
   keyword->next = oldhead;
   keyword->keyword = strdup (phrase);
   keyword->keywordType = type;

Modified: Extractor/src/plugins/pdf/XRef.cc
===================================================================
--- Extractor/src/plugins/pdf/XRef.cc   2009-10-30 18:58:25 UTC (rev 9350)
+++ Extractor/src/plugins/pdf/XRef.cc   2009-10-30 19:12:07 UTC (rev 9351)
@@ -882,6 +882,7 @@
     if (!obj1.isInt() || obj1.getInt() != num ||
        !obj2.isInt() || obj2.getInt() != gen ||
        !obj3.isCmd("obj")) {
+      delete parser;
       goto err;
     }
 #ifndef NO_DECRYPTION