[26683] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25692 - in trunk/athena/etc/athinfod: . debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Aug 2 18:58:37 2012

Date: Thu, 2 Aug 2012 18:58:34 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208022258.q72MwYFf002372@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-08-02 18:58:33 -0400 (Thu, 02 Aug 2012)
New Revision: 25692

Modified:
   trunk/athena/etc/athinfod/athinfod.c
   trunk/athena/etc/athinfod/debian/changelog
Log:
In athinfod:
  * Free memory correctly


Modified: trunk/athena/etc/athinfod/athinfod.c
===================================================================
--- trunk/athena/etc/athinfod/athinfod.c	2012-08-02 21:28:05 UTC (rev 25691)
+++ trunk/athena/etc/athinfod/athinfod.c	2012-08-02 22:58:33 UTC (rev 25692)
@@ -170,12 +170,15 @@
 	/* Should we print an error here?  I don't think so. */
 	continue;
       definition = get_definition_from_file(query, path);
-      free(namelist[i]);
       if (definition != NULL)
 	break;
     }
   }
+
+  for (i = 0; i < numfiles; i++)
+    free(namelist[i]);
   free(namelist);
+
   if (definition != NULL)
     return definition;
   fprintf(stderr, "athinfod: unrecognized query.\n");

Modified: trunk/athena/etc/athinfod/debian/changelog
===================================================================
--- trunk/athena/etc/athinfod/debian/changelog	2012-08-02 21:28:05 UTC (rev 25691)
+++ trunk/athena/etc/athinfod/debian/changelog	2012-08-02 22:58:33 UTC (rev 25692)
@@ -1,3 +1,9 @@
+debathena-athinfod (10.1-0debathena2) unstable; urgency=low
+
+  * Free memory correctly
+
+ -- Jonathan Reed <jdreed@mit.edu>  Thu, 02 Aug 2012 18:55:11 -0400
+
 debathena-athinfod (10.1-0debathena1) unstable; urgency=low
 
   * Bump debian/compat to 6


home help back first fref pref prev next nref lref last post