projects
/
freeradius.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7127581
)
check for request->packet. Closes #1935
author
Alan T. DeKok
<aland@freeradius.org>
Fri, 31 Mar 2017 13:56:35 +0000
(09:56 -0400)
committer
Alan T. DeKok
<aland@freeradius.org>
Fri, 31 Mar 2017 13:56:35 +0000
(09:56 -0400)
src/modules/rlm_cache/rlm_cache.c
patch
|
blob
|
history
diff --git
a/src/modules/rlm_cache/rlm_cache.c
b/src/modules/rlm_cache/rlm_cache.c
index
5444974
..
248de8b
100644
(file)
--- a/
src/modules/rlm_cache/rlm_cache.c
+++ b/
src/modules/rlm_cache/rlm_cache.c
@@
-126,8
+126,7
@@
static void CC_HINT(nonnull) cache_merge(rlm_cache_t *inst, REQUEST *request, rl
RDEBUG2("Merging cache entry into request");
- if (c->packet) {
- rad_assert(request->packet != NULL);
+ if (c->packet && request->packet) {
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);
}