From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Mar 2013 03:38:03 +0000 (-0500)
Subject: Fix potential memory leak
X-Git-Tag: release_3_0_0_beta1~835
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=365cd1ee3c84cc17df08b69d11f91b7f3bbe1db2;p=thirdparty%2Ffreeradius-server.git

Fix potential memory leak
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 429d4ed9a57..eb89dd35c2c 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -284,8 +284,12 @@ static int sql_fetch_row(rlm_sql_handle_t *handle, rlm_sql_config_t *config)
 	}
 
 	/*
-	 *	Results should probably
+	 *	Free the previous result (also gets called on finish_query)
 	 */
+	if (handle->row) {
+		talloc_free(handle->row);	
+	}
+	
 	MEM(row = handle->row = talloc_zero_array(handle->conn, char *,
 					    	  conn->col_count + 1));
 	
@@ -431,9 +435,10 @@ static int sql_finish_query(rlm_sql_handle_t *handle,
  *	Purpose: End the select query, such as freeing memory or result
  *
  *************************************************************************/
-static int sql_finish_select_query(rlm_sql_handle_t * handle, rlm_sql_config_t *config)
+static int sql_finish_select_query(rlm_sql_handle_t *handle,
+				   rlm_sql_config_t *config)
 {
-	return sql_finish_query(handle, config);
+	return sql_free_result(handle, config);
 }
 
 
@@ -445,7 +450,8 @@ static int sql_finish_select_query(rlm_sql_handle_t * handle, rlm_sql_config_t *
  *		 statement 
  *
  *************************************************************************/
-static int sql_affected_rows(rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t *config)
+static int sql_affected_rows(rlm_sql_handle_t *handle,
+			     UNUSED rlm_sql_config_t *config)
 {
 	rlm_sql_conn *conn = handle->conn;