[open-ils-commits] r8713 - trunk/Open-ILS/src/c-apps

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-11 13:47:54 -0500 (Mon, 11 Feb 2008)
New Revision: 8713

Modified:
   trunk/Open-ILS/src/c-apps/oils_event.c
Log:
rolling back one change to oilsEventFree, which was causing a double-free.  as noted in a new comment, if event->json is generated, it will contain a pointer to event->payload, which will cause event->payload to be automatically freed at ->payload free time

Modified: trunk/Open-ILS/src/c-apps/oils_event.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_event.c	2008-02-11 17:53:10 UTC (rev 8712)
+++ trunk/Open-ILS/src/c-apps/oils_event.c	2008-02-11 18:47:54 UTC (rev 8713)
@@ -71,7 +71,8 @@
 	free(event->perm);
 	free(event->file);
 	if(event->json) jsonObjectFree(event->json);
-	if(event->payload) jsonObjectFree(event->payload);
+    /* event->json will contain a pointer to event->payload */
+    else jsonObjectFree(event->payload); 
 	free(event);
 }