From: miker Date: Mon, 10 Mar 2008 04:34:46 +0000 (+0000) Subject: Patch from Scott McKellar: X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=70537f37ab5b92c53bb33d5681a65ef9ea727c3d;p=Evergreen.git Patch from Scott McKellar: In oilsAuthGetTimeout() we make three calls to osrf_settings_host_value_object(), which allocates a jsonObject. However we were passing the return values directly to another function, without capturing the pointers for freeing. As a result we were leaking the jsonObjects thus allocated. git-svn-id: svn://svn.open-ils.org/ILS/trunk@8954 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c index 1373659e02..59ff65d06f 100644 --- a/Open-ILS/src/c-apps/oils_auth.c +++ b/Open-ILS/src/c-apps/oils_auth.c @@ -210,20 +210,22 @@ static double oilsAuthGetTimeout( const jsonObject* userObj, const char* type, d if(!_oilsAuthOPACTimeout) { /* Load the default timeouts */ - _oilsAuthOPACTimeout = - jsonObjectGetNumber( - osrf_settings_host_value_object( - "/apps/open-ils.auth/app_settings/default_timeout/opac")); - - _oilsAuthStaffTimeout = - jsonObjectGetNumber( - osrf_settings_host_value_object( - "/apps/open-ils.auth/app_settings/default_timeout/staff" )); - - _oilsAuthOverrideTimeout = - jsonObjectGetNumber( - osrf_settings_host_value_object( - "/apps/open-ils.auth/app_settings/default_timeout/temp" )); + jsonObject* value_obj; + + value_obj = osrf_settings_host_value_object( + "/apps/open-ils.auth/app_settings/default_timeout/opac" ); + _oilsAuthOPACTimeout = jsonObjectGetNumber(value_obj); + jsonObjectFree(value_obj); + + value_obj = osrf_settings_host_value_object( + "/apps/open-ils.auth/app_settings/default_timeout/staff" ); + _oilsAuthStaffTimeout = jsonObjectGetNumber(value_obj); + jsonObjectFree(value_obj); + + value_obj = osrf_settings_host_value_object( + "/apps/open-ils.auth/app_settings/default_timeout/temp" ); + _oilsAuthOverrideTimeout = jsonObjectGetNumber(value_obj); + jsonObjectFree(value_obj); osrfLogInfo(OSRF_LOG_MARK, "Set default auth timetouts: opac => %d : staff => %d : temp => %d",