Merge pull request #343 from doublec/janssonrpc_double_free

janssonrpc-c: Fix double free if retry timer add fails
kamailio · Sep 24, 2015 · 8cac414 · 8cac414
2 parents b2ef89b + bce9cf9
commit 8cac414
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/janssonrpc-c/janssonrpc_request.c b/modules/janssonrpc-c/janssonrpc_request.c
@@ -253,8 +253,6 @@ int schedule_retry(jsonrpc_request_t* req)
 
 	new_req->ntries = req->ntries;
 
-	free_request(req);
-
 	const struct timeval tv = ms_to_tv(time);
 
 	new_req->retry_ev = evtimer_new(global_ev_base, retry_cb, (void*)new_req);
@@ -264,6 +262,8 @@ int schedule_retry(jsonrpc_request_t* req)
 		goto error;
 	}
 
+	free_request(req);
+
 	return 0;
 error:
 	ERR("schedule_retry failed.\n");