INN commit: trunk (expire/makehistory.c innd/art.c storage/expire.c)

INN Commit rra at isc.org
Sun Jun 14 10:09:47 UTC 2015


    Date: Sunday, June 14, 2015 @ 03:09:47
  Author: iulius
Revision: 9896

innd, expire, makehistory: fix memory leak for extraoverview

Thanks to Richard Kettlewell for the bug report and the patch.

Modified:
  trunk/expire/makehistory.c
  trunk/innd/art.c
  trunk/storage/expire.c

----------------------+
 expire/makehistory.c |    4 +++-
 innd/art.c           |    3 ++-
 storage/expire.c     |    3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

Modified: expire/makehistory.c
===================================================================
--- expire/makehistory.c	2015-06-14 10:08:21 UTC (rev 9895)
+++ expire/makehistory.c	2015-06-14 10:09:47 UTC (rev 9896)
@@ -417,7 +417,7 @@
 ARTreadschema(bool Overview)
 {
     const struct cvector        *standardoverview;
-    const struct vector         *extraoverview;
+    struct vector               *extraoverview;
     ARTOVERFIELD                *fp;
     unsigned int                i;
 
@@ -474,6 +474,8 @@
         }
 
 	ARTfieldsize = fp - ARTfields;
+        vector_free(extraoverview);
+
     }
     if (Bytesp == (ARTOVERFIELD *)NULL)
         Missfieldsize++;

Modified: innd/art.c
===================================================================
--- innd/art.c	2015-06-14 10:08:21 UTC (rev 9895)
+++ innd/art.c	2015-06-14 10:09:47 UTC (rev 9896)
@@ -131,7 +131,7 @@
 ARTreadschema(void)
 {
   const struct cvector *standardoverview;
-  const struct vector  *extraoverview;
+  struct vector        *extraoverview;
   unsigned int         i;
   ARTOVERFIELD         *fp;
   const ARTHEADER      *hp;
@@ -183,6 +183,7 @@
   }
 
   fp->Header = NULL;
+  vector_free(extraoverview);
 
   return ok;
 }

Modified: storage/expire.c
===================================================================
--- storage/expire.c	2015-06-14 10:08:21 UTC (rev 9895)
+++ storage/expire.c	2015-06-14 10:09:47 UTC (rev 9896)
@@ -539,7 +539,7 @@
 ARTreadschema(void)
 {
     const struct cvector        *standardoverview;
-    const struct vector         *extraoverview;
+    struct vector               *extraoverview;
     ARTOVERFIELD                *fp;
     unsigned int                i;
 
@@ -566,6 +566,7 @@
     }
 
     ARTfieldsize = fp - ARTfields;
+    vector_free(extraoverview);
 }
 
 /*



More information about the inn-committers mailing list