Changeset 4231

Timestamp:

07/30/08 01:36:58 (5 years ago)

Author:

douglask

Message:

32bit Debian Etch's glibc has an issue with malloc being inside a fork/exec.

As some glibc version had issues if malloc/free was outside a fork/exec,
now avoid using malloc altogther by using a char *args[64] local variable.

Files:

• rat/trunk/process.c (modified) (3 diffs)

rat/trunk/process.c

@@ -94 +94 @@
                 debug_msg("Running as root? PATH unmodified\n");
         }
+        /* some glibc versions have issues with malloc/free when used inside or
+           in some cases outside a fork/exec, so we now use a args[64] array instead of
+           xmalloc'ing it. In the unlikely event the array needs to hold more
+           command-line arguments, print a error message */
+        if ((2 * num_tokens) + argc + 4 >= 64) {
+                fprintf(stderr, "Exceeded max of %i command-line arguments\n",
+                        64 - (2 * num_tokens) + 4);
+                exit(1);
+        }
         /* Fork off the sub-process... */
         *pid = fork();
@@ -100 +109 @@
                 abort();
         } else if (*pid == 0) {
-                char **args = xmalloc((2 * num_tokens) + argc + 4);
+                char *args[64];
                 int numargs=0;
 
@@ -115 +124 @@
                 args[numargs++] = NULL;
                 execvp( proc_name, args );
-        
+
                 perror("Cannot execute subprocess");
-                xfree(args);
-                /* Note: this MUST NOT be exit() or abort(), since they affect the standard */
-                /* IO channels in the parent process (fork duplicates file descriptors, but */
+                /* Note: this MUST NOT be exit() or abort(), since they affect the standard */
+                /* IO channels in the parent process (fork duplicates file descriptors, but */
                 /* they still point to the same underlying file).                           */
                 _exit(1);