Răsfoiți Sursa

Merge pull request #343 from doublec/janssonrpc_double_free

janssonrpc-c: Fix double free if retry timer add fails
Daniel-Constantin Mierla 10 ani în urmă
părinte
comite
8cac414881
1 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 2 2
      modules/janssonrpc-c/janssonrpc_request.c

+ 2 - 2
modules/janssonrpc-c/janssonrpc_request.c

@@ -253,8 +253,6 @@ int schedule_retry(jsonrpc_request_t* req)
 
 
 	new_req->ntries = req->ntries;
 	new_req->ntries = req->ntries;
 
 
-	free_request(req);
-
 	const struct timeval tv = ms_to_tv(time);
 	const struct timeval tv = ms_to_tv(time);
 
 
 	new_req->retry_ev = evtimer_new(global_ev_base, retry_cb, (void*)new_req);
 	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;
 		goto error;
 	}
 	}
 
 
+	free_request(req);
+
 	return 0;
 	return 0;
 error:
 error:
 	ERR("schedule_retry failed.\n");
 	ERR("schedule_retry failed.\n");