Changeset 509

Timestamp:

Aug 9, 2016, 8:06:45 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #402 (memory leak in server).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_calls.c (modified) (1 diff)
• src/sh_ipvx.c (modified) (3 diffs)
• test/testcompile.sh (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.1.4)
+AM_INIT_AUTOMAKE(samhain, 4.1.5)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 @@
-4.1.4:
+4.1.5:
+        * fix memory leak in server (reported by C. Doerr).
+
+4.1.4 (02-06-2016):
         * fix problems with wildcard pattern re-evaluation (reported by
         A. Ansari):

trunk/src/sh_calls.c

@@ -737 +737 @@
   if ((val_return < 0) && (*o_noatime != 0))
     {
+      /* cppcheck-suppress resourceLeak */
       val_return = open (pathname, flags, mode);
       if (val_return >= 0)

trunk/src/sh_ipvx.c

@@ -302 +302 @@
       break;
     }
+  freeaddrinfo(res);
   return 1;
 #else
@@ -382 +383 @@
   if (err == 0)
     {
+      struct addrinfo * res_orig = res;
+
 #if defined(AI_CANONNAME)
       if (res->ai_canonname && strlen(res->ai_canonname) > 0)
@@ -413 +416 @@
           res = res->ai_next;
         }
+      
+      freeaddrinfo(res_orig);
     }
 #else

trunk/test/testcompile.sh

@@ -94 +94 @@
     #
     cd src/
-    stat=`cppcheck --quiet --inline-suppr --force -j 4 --template="{file},{line},{severity},{id},{message}" -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c 2>&1 | wc -l`
+    stat=`cppcheck --quiet --library=posix.cfg --inline-suppr --force -j 4 --template="{file},{line},{severity},{id},{message}" -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c 2>&1 | wc -l`
     if [ $stat -ne 0 ]; then
-        cppcheck --quiet --inline-suppr --force -j 4 --template="{file},{line},{severity},{id},{message}" -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c >>../test_log 2>&1
+        cppcheck --quiet --library=posix.cfg --inline-suppr --force -j 4 --template="{file},{line},{severity},{id},{message}" -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c >>../test_log 2>&1
         retval=1
         [ -z "$quiet" ] && log_fail $2 ${MAXTEST} "check w/cppcheck";