From c93cb673b7bf4a0bc92764b75748af0c850529c2 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Wed, 23 Jul 2025 16:48:32 +0200 Subject: [PATCH] fixes for variable initialization --- src/modules/rlm_dpsk/rlm_dpsk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/rlm_dpsk/rlm_dpsk.c b/src/modules/rlm_dpsk/rlm_dpsk.c index 4c6eee4540..96a005953a 100644 --- a/src/modules/rlm_dpsk/rlm_dpsk.c +++ b/src/modules/rlm_dpsk/rlm_dpsk.c @@ -487,10 +487,11 @@ stage1: vp_id = fr_pair_find_by_num(request->config, PW_PSK_IDENTITY, 0, TAG_ANY); if (vp_id) { - psk_identity = vp->vp_strvalue; + psk_identity = vp_id->vp_strvalue; } else { vp = fr_pair_find_by_num(request->packet->vps, PW_USER_NAME, 0, TAG_ANY); - fr_assert(vp != NULL); + if (!vp) return RLM_MODULE_REJECT; + psk_identity = vp->vp_strvalue; } @@ -769,7 +770,7 @@ make_digest: entry->ssid_len = vp_ssid->vp_length; MEM(entry->psk = talloc_memdup(entry, psk, psk_len)); - entry->psk_len = vp->vp_length; + entry->psk_len = psk_len; MEM(entry->identity = talloc_memdup(entry, psk_identity, strlen(psk_identity))); entry->identity_len = strlen(psk_identity); -- 2.47.3