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

[svn at svn.open-ils.org]

Author: miker
Date: 2008-03-16 13:58:53 -0400 (Sun, 16 Mar 2008)
New Revision: 9056

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
Memory leak plugging from Scott McKellar

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-03-16 09:30:57 UTC (rev 9055)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-03-16 17:58:53 UTC (rev 9056)
@@ -1461,6 +1461,7 @@
 				);
 				buffer_free(join_buf);
 				free(field);
+				jsonObjectIteratorFree(search_itr);
 				return NULL;
 			}
 			fkey = strdup( fkey );
@@ -1478,6 +1479,7 @@
 				);
 				buffer_free(join_buf);
 				free(fkey);
+				jsonObjectIteratorFree(search_itr);
 				return NULL;
 			}
 			field = strdup( field );
@@ -1524,6 +1526,7 @@
 					class
 				);
 				buffer_free(join_buf);
+				jsonObjectIteratorFree(search_itr);
 				return NULL;
 			}
 
@@ -1664,7 +1667,8 @@
                     );
                     buffer_free(sql_buf);
                     free(table);
-                    return NULL;
+					jsonObjectIteratorFree(search_itr);
+					return NULL;
                 }
 
                 char* subpred = searchPredicate( class, field, node->item );
@@ -2131,6 +2135,7 @@
 			buffer_free(order_buf);
 			buffer_free(sql_buf);
 			if (defaultselhash) jsonObjectFree(defaultselhash);
+			jsonObjectIteratorFree(class_itr);
 			return NULL;
 		}
 
@@ -2796,6 +2801,7 @@
 									)
 								);
 							}
+							jsonObjectIteratorFree(_k);
 						}
 
 						if (!(strcmp( osrfHashGet(kid_link, "reltype"), "has_a" )) || !(strcmp( osrfHashGet(kid_link, "reltype"), "might_have" ))) {