make sure rq->to is set to NULL when cleaning up server output queue

mariux64 · Mar 10, 2017 · 3d9be84 · 3d9be84
1 parent f3619bf
commit 3d9be84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,7 @@ Changes between 1.6.8 and the master branch
 	- Make clang less unhappy.
 	- Don't use a smaller pthread stack size than what's allowed.
 	- Don't follow NULL the pointer at debug level 5 (RADSECPROXY-68).
+	- Avoid a deadlock situation with dynamic servers (RADSECPROXY-73).
 
 2016-09-21 1.6.8
 	Bug fixes:

diff --git a/radsecproxy.c b/radsecproxy.c
@@ -289,8 +289,6 @@ void freeserver(struct server *server, uint8_t destroymutex) {
     if (server->requests) {
 	rqout = server->requests;
 	for (end = rqout + MAX_REQUESTS; rqout < end; rqout++) {
-	    if (rqout->rq)
-		rqout->rq->to = NULL;
 	    freerqoutdata(rqout);
 	    pthread_mutex_destroy(rqout->lock);
 	    free(rqout->lock);
@@ -421,6 +419,7 @@ void freerqoutdata(struct rqout *rqout) {
 	    free(rqout->rq->buf);
 	    rqout->rq->buf = NULL;
 	}
+	rqout->rq->to = NULL;
 	freerq(rqout->rq);
 	rqout->rq = NULL;
     }