From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 11 Jul 2009 22:22:47 +0000 (+0000)
Subject: Plug a couple of memory leaks.
X-Git-Tag: sprint4-merge-nov22~9700
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=977583fd298a28743efc80c674abd359b8bd3bc0;p=working%2FEvergreen.git

Plug a couple of memory leaks.


git-svn-id: svn://svn.open-ils.org/ILS/trunk@13566 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/c-apps/oils_utils.c b/Open-ILS/src/c-apps/oils_utils.c
index 337ab653bd..4519b2a387 100644
--- a/Open-ILS/src/c-apps/oils_utils.c
+++ b/Open-ILS/src/c-apps/oils_utils.c
@@ -79,11 +79,13 @@ oilsEvent* oilsUtilsCheckPerms( int userid, int orgid, char* permissions[], int
 	oilsEvent* evt = NULL;
 
 	if (orgid == -1) {
+		jsonObject* where_clause = jsonParseString( "{\"parent_ou\":null}" );
 		jsonObject* org = oilsUtilsQuickReq(
-            "open-ils.cstore", 
-            "open-ils.cstore.direct.actor.org_unit.search",
-            jsonParseString("{\"parent_ou\":null}")
-        );
+			"open-ils.cstore",
+			"open-ils.cstore.direct.actor.org_unit.search",
+			where_clause
+		);
+		jsonObjectFree( where_clause );
 
         orgid = (int)jsonObjectGetNumber( oilsFMGetObject( org, "id" ) );
 
@@ -155,8 +157,9 @@ jsonObject* oilsUtilsFetchUserByBarcode(const char* barcode) {
 	jsonObject* params = jsonParseStringFmt("{\"barcode\":\"%s\"}", barcode);
 	jsonObject* card = oilsUtilsQuickReq(
 		"open-ils.cstore", "open-ils.cstore.direct.actor.card.search", params );
+	jsonObjectFree(params);
 
-	if(!card) { jsonObjectFree(params); return NULL; }
+	if(!card) return NULL;
 
 	char* usr = oilsFMGetString(card, "usr");
 	jsonObjectFree(card);
@@ -164,7 +167,6 @@ jsonObject* oilsUtilsFetchUserByBarcode(const char* barcode) {
 	double iusr = strtod(usr, NULL);
 	free(usr);
 
-	jsonObjectFree(params);
 	params = jsonParseStringFmt("[%f]", iusr);
 	jsonObject* user = oilsUtilsQuickReq(
 		"open-ils.cstore", "open-ils.cstore.direct.actor.user.retrieve", params);