Changeset 1528 for zzuf/trunk/src/zzuf.cTweet

Timestamp:

Dec 29, 2006, 7:13:42 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Check regex syntax in zzuf.
• Fix minor, harmful memory leaks.

File:

• zzuf/trunk/src/zzuf.c (modified) (7 diffs)

zzuf/trunk/src/zzuf.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <regex.h>
 #include <string.h>
 #include <signal.h>
@@ -46 +47 @@
 #endif
 
-enum status
-{
-    STATUS_FREE,
-    STATUS_RUNNING,
-    STATUS_SIGTERM,
-    STATUS_SIGKILL,
-    STATUS_EOF,
-};
-
 struct child_list
 {
-    enum status status;
+    enum status
+    {
+        STATUS_FREE,
+        STATUS_RUNNING,
+        STATUS_SIGTERM,
+        STATUS_SIGKILL,
+        STATUS_EOF,
+    } status;
+
     pid_t pid;
     int outfd, errfd;
     int bytes, seed;
     time_t date;
-}
-*child_list;
+} *child_list;
 int parallel = 1, child_count = 0;
 
@@ -82 +81 @@
 int main(int argc, char *argv[])
 {
+    regex_t optre;
     char **newargv;
     char *parser;
@@ -121 +121 @@
         {
         case 'I': /* --include */
+            if(regcomp(&optre, optarg, 0) != 0)
+            {
+                printf("%s: invalid regex -- `%s'\n", argv[0], optarg);
+                return EXIT_FAILURE;
+            }
+            regfree(&optre);
             setenv("ZZUF_INCLUDE", optarg, 1);
             break;
         case 'E': /* --exclude */
+            if(regcomp(&optre, optarg, 0) != 0)
+            {
+                printf("%s: invalid regex -- `%s'\n", argv[0], optarg);
+                return EXIT_FAILURE;
+            }
+            regfree(&optre);
             setenv("ZZUF_EXCLUDE", optarg, 1);
             break;
@@ -161 +173 @@
             printf("%s: invalid option -- %c\n", argv[0], c);
             printf(MOREINFO, argv[0]);
-            return 1;
+            return EXIT_FAILURE;
         }
     }
@@ -329 +341 @@
         }
     }
+
+    /* Clean up */
+    free(newargv);
+    free(child_list);
 
     return EXIT_SUCCESS;    
@@ -406 +422 @@
     strcpy(tmp ? tmp + 1 : libpath, ".libs/libzzuf.so");
     if(access(libpath, R_OK) == 0)
-    {
         setenv("LD_PRELOAD", libpath, 1);
-        return;
-    }
+    else
+        setenv("LD_PRELOAD", LIBDIR "/libzzuf.so", 1);
     free(libpath);
-
-    setenv("LD_PRELOAD", LIBDIR "/libzzuf.so", 1);
 }