Changeset 459 for trunk

Timestamp:

Aug 7, 2014, 9:15:02 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #360 (free on null pointer).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• include/samhain.h (modified) (1 diff)
• src/sh_err_log.c (modified) (1 diff)
• src/sh_mem.c (modified) (2 diffs)

trunk/configure.ac

@@ -1646 +1646 @@
                 mydebugit="yes"
         elif test "x${enable_debug}" = "xgdb"; then
+                AC_DEFINE(SH_ABORT_ON_ERROR, 1, [Use abort])
                 if test "x${myneedg3}" = "xyes"; then
                         mydebugdef="-g3"

trunk/docs/Changelog

@@ -12 +12 @@
         * Fixed incorrect logic in setting the ALLIGNORE flag (more specific
           directory / file directives were ignored)
-        * Fix for tickets #358 (repetitive lstat warning about deleted 
+        * Fix for tickets #358 (repetitive lstat warning about deleted
           directory) and #359 (reporting of deleted/added top level directory)
+        * Fix a free() on NULL (harmless but avoids spurious warning)
 
 3.1.1 (01-0-2014):

trunk/include/samhain.h

@@ -414 +414 @@
  **************************************************/
 
+#if defined(SH_ABORT_ON_ERROR)
+#define SH_ABORT abort()
+#else
+#define SH_ABORT 
+#endif
+
 #if defined(__GNUC__) && (__GNUC__ >= 4)
 #define SH_GNUC_SENTINEL __attribute__((__sentinel__))

trunk/src/sh_err_log.c

@@ -598 +598 @@
         (*service_failure) = 1;
       }
-      SH_FREE(tmp);
+      if (tmp)
+        SH_FREE(tmp);
       SL_RETURN(-1, _("sh_log_open"));
     }

trunk/src/sh_mem.c

@@ -444 +444 @@
     {
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_MNULL);
+      SH_ABORT;
     }
   SL_RET0(_("sh_mem_free"));
@@ -466 +467 @@
       /* use _exit() rather than exit() - we malloc() in atexit()  
        */
+      SH_ABORT;
       _exit (EXIT_FAILURE);
     }