From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Sat, 29 May 2021 01:16:00 +0000 (+0100)
Subject: Don't assert state quite so soon
X-Git-Tag: release_3_0_23~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66ee0e95ab4724b35b2003e420c1c4da58c89a69;p=thirdparty%2Ffreeradius-server.git

Don't assert state quite so soon

If we're injecting a fake cleanup packet then state will already
be set. However there will be no State attribute, which will let
this quit early.
---

diff --git a/src/main/state.c b/src/main/state.c
index 15a19458e48..c04db0bc025 100644
--- a/src/main/state.c
+++ b/src/main/state.c
@@ -438,8 +438,6 @@ void fr_state_get_vps(REQUEST *request, RADIUS_PACKET *packet)
 	fr_state_t *state = &global_state;
 	TALLOC_CTX *old_ctx = NULL;
 
-	rad_assert(request->state == NULL);
-
 	/*
 	 *	No State, don't do anything.
 	 */
@@ -448,6 +446,8 @@ void fr_state_get_vps(REQUEST *request, RADIUS_PACKET *packet)
 		return;
 	}
 
+	rad_assert(request->state == NULL);
+
 	PTHREAD_MUTEX_LOCK(&state->mutex);
 	entry = fr_state_find(state, request->server, packet);