Typo

FreeRADIUS · Jan 13, 2017 · 37e9e40 · 37e9e40
1 parent dcf6779
commit 37e9e40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
@@ -429,7 +429,7 @@ static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, REQUEST
 	 *	Note: Not all SQL client libraries provide a row count,
 	 *	so we have to do the count here.
 	 */
-	while (((ret == rlm_sql_fetch_row(&row, inst, request, &handle)) == RLM_SQL_OK)) {
+	while (((ret = rlm_sql_fetch_row(&row, inst, request, &handle)) == RLM_SQL_OK)) {
 		rows++;
 		for (map = maps, j = 0;
 		     map && (j < MAX_SQL_FIELD_INDEX);

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
@@ -243,7 +243,11 @@ sql_rcode_t rlm_sql_fetch_row(rlm_sql_row_t *out, rlm_sql_t const *inst, REQUEST
 	ret = (inst->driver->sql_fetch_row)(out, *handle, inst->config);
 	switch (ret) {
 	case RLM_SQL_OK:
+		rad_assert(*out != NULL);
+		return ret;
+
 	case RLM_SQL_NO_MORE_ROWS:
+		rad_assert(*out == NULL);
 		return ret;
 
 	default: