From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 19 Jul 2021 21:56:07 +0000 (-0500)
Subject: Populate randle request pointer
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6898db660a47bd355596f16b9f26c79dc8402a75;p=thirdparty%2Ffreeradius-server.git

Populate randle request pointer
---

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 2785bd77159..ecafb30415e 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -2136,6 +2136,8 @@ void rest_request_cleanup(UNUSED rlm_rest_t const *instance, fr_curl_io_request_
 	TALLOC_FREE(ctx->response.buffer);
 	TALLOC_FREE(ctx->request.encoder);
 	TALLOC_FREE(ctx->response.decoder);
+
+	randle->request = NULL;
 }
 
 /** URL encodes a string.
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 487f43b244a..a3a7574e2f7 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -436,6 +436,8 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 
 	fr_assert(in_vb->type == FR_TYPE_GROUP);
 
+	randle->request = request;	/* Populate the request pointer for escape callbacks */
+
 	if (fr_uri_escape(&in_vb->vb_group, rest_uri_parts, randle) < 0) {
 		RPEDEBUG("Failed escaping URI");