From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 30 Dec 2015 06:24:42 +0000 (-0500)
Subject: Fix potential SEGV in SQL simultaneous use check
X-Git-Tag: release_3_0_11~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9312cc84b7da001545fb678ec01427cfc581f8c9;p=thirdparty%2Ffreeradius-server.git

Fix potential SEGV in SQL simultaneous use check
---

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 5b539532b19..23bd8fb7508 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -225,10 +225,7 @@ static ssize_t sql_xlat(void *instance, REQUEST *request, char const *query, cha
 	if (rcode != RLM_SQL_OK) goto query_error;
 
 	rcode = rlm_sql_fetch_row(inst, request, &handle);
-	if (rcode) {
-		(inst->module->sql_finish_select_query)(handle, inst->config);
-		goto query_error;
-	}
+	if (rcode) goto query_error;
 
 	row = handle->row;
 	if (!row) {
@@ -1531,7 +1528,7 @@ static rlm_rcode_t mod_checksimul(void *instance, REQUEST * request)
 
 	if (rlm_sql_select_query(inst, request, &handle, expanded) != RLM_SQL_OK) {
 		rcode = RLM_MODULE_FAIL;
-		goto finish;
+		goto release;	/* handle may no longer be valid */
 	}
 
 	ret = rlm_sql_fetch_row(inst, request, &handle);