From: Douglas Bagnall Date: Fri, 20 Oct 2023 23:56:24 +0000 (+1300) Subject: libcli/security: sddl_conditional_ace: ensure message is talloced X-Git-Tag: talloc-2.4.2~906 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b57d5cd5c880e1cd2ea43b586686481cb347aa6;p=thirdparty%2Fsamba.git libcli/security: sddl_conditional_ace: ensure message is talloced It is simpler for the message to have consistent parentage; it is easier to drop one message we'll never see than to talloc it. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/libcli/security/sddl_conditional_ace.c b/libcli/security/sddl_conditional_ace.c index 2f243bca6a6..82fa266e8b8 100644 --- a/libcli/security/sddl_conditional_ace.c +++ b/libcli/security/sddl_conditional_ace.c @@ -1299,7 +1299,8 @@ static void comp_error(struct ace_condition_sddl_compiler_context *comp, } return; fail: - comp->message = "failed to set error message"; + comp->message = talloc_strdup(comp->mem_ctx, + "failed to set error message"); } @@ -2736,8 +2737,7 @@ struct ace_condition_script * ace_conditions_compile_sddl( bool ok; struct ace_condition_sddl_compiler_context comp = {}; - /* just in case, a message for the next few tallocs */ - *message = "allocation error"; + *message = NULL; *message_offset = 0; ok = init_compiler_context(mem_ctx,