Changeset 289 for trunk

Timestamp:

Jun 16, 2010, 10:28:44 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #212 (warning on NULL argv in execve)

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_extern.c (modified) (2 diffs)

trunk/docs/Changelog

@@ +1 @@
+2.7.2:
+        * sh_extern.c: As reported by T. Luettgert, gcc 4.4.4 on Fedora 13 
+          will throw a warning if execve is called with a NULL argv pointer. 
+          Need to provide a dummy argp[].
+
 2.7.1:
         * samhain_kmem.c: fix compile problems

trunk/src/sh_extern.c

@@ -132 +132 @@
 
   /* Linux, HP-UX and FreeBSD will happily accept envp = argp = NULL
+   * (newer Linuxes (gcc 4.4.4) warn on argp == NULL, but accept it,
+   * as reported by T. Luettgert)
    * Solaris (and probably some other Unices) 
    *         needs a valid *envp[] with envp[0] = NULL;
@@ -420 +422 @@
                   do {
                     val_return = execve (pname, 
-                                         (task->argc == 0) ? NULL : task->argv, 
+                                         (task->argc == 0) ? argp : task->argv, 
                                          (task->envc == 0) ? NULL : task->envv
                                          );