Don't free thing until we're done

FreeRADIUS · Dec 6, 2014 · 71b1957 · 71b1957
1 parent b031495
commit 71b1957
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/modcall.c b/src/main/modcall.c
@@ -802,6 +802,7 @@ static bool modcall_recurse(REQUEST *request, rlm_components_t component, int de
 		modcallable *this, *found, *null_case;
 		modgroup *g, *h;
 		fr_cond_t cond;
+		value_data_t data;
 		value_pair_map_t map;
 		value_pair_tmpl_t vpt;
 
@@ -849,11 +850,10 @@ static bool modcall_recurse(REQUEST *request, rlm_components_t component, int de
 		if ((g->vpt->type == TMPL_TYPE_XLAT_STRUCT) ||
 		    (g->vpt->type == TMPL_TYPE_XLAT) ||
 		    (g->vpt->type == TMPL_TYPE_EXEC)) {
-			value_data_t data;
-
 			if (radius_expand_tmpl(&data, request, g->vpt) < 0) goto find_null_case;
 			tmpl_init(&vpt, TMPL_TYPE_LITERAL, data.strvalue, talloc_array_length(data.strvalue) - 1);
-			talloc_free(data.ptr);
+		} else {
+			data.ptr = NULL;
 		}
 
 		/*
@@ -922,6 +922,7 @@ static bool modcall_recurse(REQUEST *request, rlm_components_t component, int de
 		if (!found) found = null_case;
 
 	do_null_case:
+		talloc_free(data.ptr);
 		modcall_child(request, component, depth + 1, entry, found, &result);
 		MOD_LOG_CLOSE_BRACE;
 		goto calculate_result;