From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 29 Mar 2021 14:38:32 +0000 (+0100)
Subject: Fix issue in request.c with -M flag
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ee4dcd202c5ec13fb078d2413ef1f88448efc28;p=thirdparty%2Ffreeradius-server.git

Fix issue in request.c with -M flag
---

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 5ca7bc47525..7a5073fb15a 100644
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -299,6 +299,8 @@ static int _request_free(request_t *request)
 		      request->alloc_line,
 		      request->name ? request->name : "(null)", request->runnable_id);
 
+	RDEBUG3("Request freed (%p)", request);
+
 	/*
 	 *	Reinsert into the free list if it's not already
 	 *	in the free list.
@@ -319,7 +321,7 @@ static int _request_free(request_t *request)
 
 		if (request->session_state_ctx) {
 			fr_assert(talloc_parent(request->session_state_ctx) != request);	/* Should never be directly parented */
-			talloc_free(request->session_state_ctx);	/* Not parented from the request */
+			TALLOC_FREE(request->session_state_ctx);				/* Not parented from the request */
 		}
 		free_list = request_free_list;
 
@@ -349,6 +351,7 @@ static int _request_free(request_t *request)
 		return -1;	/* Prevent free */
  	}
 
+
 	/*
 	 *	Ensure anything that might reference the request is
 	 *	freed before it is.
@@ -639,24 +642,19 @@ void request_verify(char const *file, int line, request_t const *request)
 	(void)talloc_get_type_abort(request->control_ctx, fr_pair_t);
 	fr_pair_list_verify(file, line, request->control_ctx, &request->control_pairs);
 	(void)talloc_get_type_abort(request->session_state_ctx, fr_pair_t);
-	fr_assert_msg(talloc_parent(request->session_state_ctx) == NULL,
-		      "session_state_ctx must not be parented by another chunk, but is parented by %s",
-		      talloc_get_name(talloc_parent(request->session_state_ctx)));
+
+	{
+		TALLOC_CTX *parent = talloc_parent(request->session_state_ctx);
+
+		fr_assert_msg((parent == NULL) || (parent == talloc_null_ctx()),
+			      "session_state_ctx must not be parented by another chunk, but is parented by %s",
+			      talloc_get_name(talloc_parent(request->session_state_ctx)));
+	}
 
 	fr_pair_list_verify(file, line, request->session_state_ctx, &request->session_state_pairs);
 
 	if (request->packet) {
 		packet_verify(file, line, request, request->packet, "request");
-#if 0
-		/*
-		 *	@todo - a multi-protocol server shouldn't have
-		 *	hard-coded RADIUS.
-		 */
-		if ((request->packet->code == FR_RADIUS_CODE_ACCESS_REQUEST) &&
-		    (request->reply && !request->reply->code)) {
-			fr_assert(request->session_state_ctx != NULL);
-		}
-#endif
 	}
 	if (request->reply) packet_verify(file, line, request, request->reply, "reply");