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

[gnunet]

Author: grothoff
Date: 2010-06-12 23:04:54 +0200 (Sat, 12 Jun 2010)
New Revision: 11698

Modified:
   Extractor/src/main/extract.c
   Extractor/src/main/extractor.c
   Extractor/src/plugins/it_extractor.c
Log:
cleanup

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2010-06-12 20:46:13 UTC (rev 11697)
+++ Extractor/src/main/extract.c        2010-06-12 21:04:54 UTC (rev 11698)
@@ -553,6 +553,13 @@
   ignore_sigpipe ();
 #endif
   print = malloc (sizeof (int) * EXTRACTOR_metatype_get_max ());
+  if (print == NULL)
+    {
+      fprintf (stderr, 
+              "malloc failed: %s\n",
+              strerror (errno));
+      return 1;
+    }
   for (i = 0; i < EXTRACTOR_metatype_get_max (); i++)
     print[i] = YES;            /* default: print everything */
 

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2010-06-12 20:46:13 UTC (rev 11697)
+++ Extractor/src/main/extractor.c      2010-06-12 21:04:54 UTC (rev 11698)
@@ -177,11 +177,11 @@
   char * lnk;
   char * ret;
   char * lestr;
-  size_t size;
+  ssize_t size;
   FILE * f;
 
   snprintf(fn,
-          64,
+          sizeof (fn),
           "/proc/%u/maps",
           getpid());
   f = fopen(fn, "r");
@@ -200,14 +200,14 @@
     fclose(f);
   }
   snprintf(fn,
-          64,
+          sizeof (fn),
           "/proc/%u/exe",
           getpid());
   lnk = malloc(1029); /* 1024 + 5 for "lib/" catenation */
   if (lnk == NULL)         
     return NULL;
   size = readlink(fn, lnk, 1023);
-  if ( (size == 0) || (size >= 1024) ) {
+  if ( (size <= 0) || (size >= 1024) ) {
     free(lnk);
     return NULL;
   }
@@ -391,14 +391,18 @@
               const char *fname)
 {
   char *ret;
+  size_t slen;
 
+  slen = strlen (path);
+  if (slen == 0)
+    return NULL;
   if (fname[0] == DIR_SEPARATOR)
     fname++;
-  ret = malloc (strlen (path) + strlen(fname) + 2);
+  ret = malloc (slen + strlen(fname) + 2);
   if (ret == NULL)
     return NULL;
 #ifdef MINGW
-  if (path[strlen(path)-1] == '\\')
+  if (path[slen-1] == '\\')
     sprintf (ret,
             "%s%s",
             path, 
@@ -409,7 +413,7 @@
             path, 
             fname);
 #else
-  if (path[strlen(path)-1] == '/')
+  if (path[slen-1] == '/')
     sprintf (ret,
           "%s%s",
           path, 

Modified: Extractor/src/plugins/it_extractor.c
===================================================================
--- Extractor/src/plugins/it_extractor.c        2010-06-12 20:46:13 UTC (rev 
11697)
+++ Extractor/src/plugins/it_extractor.c        2010-06-12 21:04:54 UTC (rev 
11698)
@@ -75,9 +75,10 @@
     return 1;
 
   /* Version of Tracker */
-  sprintf (itversion, 
-          "%d.%d", 
-          (head->version[0]& 0x01),head->version[1]);
+  snprintf (itversion, 
+           sizeof (itversion),
+           "%d.%d", 
+           (head->version[0]& 0x01),head->version[1]);
   if (0 != proc (proc_cls,
                 "it",
                 EXTRACTOR_METATYPE_FORMAT_VERSION,