From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 30 Nov 2022 08:15:51 +0000 (+0000)
Subject: Handle failure to copy args (CIS #1517104)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4289ffbba8597f1f27625066fdd6d1d0ad2cd64c;p=thirdparty%2Ffreeradius-server.git

Handle failure to copy args (CIS #1517104)
---

diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c
index 3d35f44d89c..b5cbdbbcc43 100644
--- a/src/lib/server/trigger.c
+++ b/src/lib/server/trigger.c
@@ -401,13 +401,15 @@ int trigger_exec(unlang_interpret_t *intp,
 
 		MEM(local_args = talloc_zero(request, fr_pair_list_t));
 		fr_pair_list_init(local_args);
-		fr_pair_list_copy(local_args, local_args, args);
-
-		if (request_data_add(request, &trigger_exec_main, REQUEST_INDEX_TRIGGER_ARGS, local_args,
-				      false, false, false) < 0) {
+		if (fr_pair_list_copy(local_args, local_args, args) < 0) {
+			PERROR("Failed copying trigger arguments");
+		args_error:
 			talloc_free(request);
 			return -1;
-		}
+		};
+
+		if (request_data_add(request, &trigger_exec_main, REQUEST_INDEX_TRIGGER_ARGS, local_args,
+				      false, false, false) < 0) goto args_error;
 	}
 
 	{