From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 10 Mar 2017 14:14:45 +0000 (-0500)
Subject: request->packet cannot be NULL. Helps with #1935
X-Git-Tag: release_3_0_14~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f22c30476be495438d5bc4dbec2f618f09c0b15;p=thirdparty%2Ffreeradius-server.git

request->packet cannot be NULL. Helps with #1935
---

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 248de8bf9b7..54449747f48 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -126,7 +126,8 @@ static void CC_HINT(nonnull) cache_merge(rlm_cache_t *inst, REQUEST *request, rl
 
 	RDEBUG2("Merging cache entry into request");
 
-	if (c->packet && request->packet) {
+	if (c->packet) {
+		rad_assert(request->packet != NULL);
 		rdebug_pair_list(L_DBG_LVL_2, request, c->packet, "&request:");
 		radius_pairmove(request, &request->packet->vps, fr_pair_list_copy(request->packet, c->packet), false);
 	}