sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli/security:sddl_decode_err_msg(): don't pretend msg is optional (CID1548624)

Browse Source 
Having it optionally NULL just complicates the code, and Coverity
rightly complained.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-11-09 17:56:48 +13:00 committed by Andrew Bartlett
parent 12e5c15a97
commit b18fe675c0
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libcli/security/sddl.c
View File

@ -842,23 +842,23 @@ struct security_descriptor *sddl_decode_err_msg(TALLOC_CTX *mem_ctx, const char
.forest_sid = domain_sid,
};
const char *start = sddl;
struct security_descriptor *sd;
struct security_descriptor *sd = NULL;
if (msg == NULL || msg_offset == NULL) {
DBG_ERR("Programmer misbehaviour: use sddl_decode() "
"or provide msg pointers.\n");
return NULL;
}
*msg = NULL;
*msg_offset = 0;
sd = talloc_zero(mem_ctx, struct security_descriptor);
if (sd == NULL) {
goto failed;
return NULL;
}
sd->revision = SECURITY_DESCRIPTOR_REVISION_1;
sd->type = SEC_DESC_SELF_RELATIVE;
if (msg != NULL) {
if (msg_offset == NULL) {
DBG_ERR("Programmer misbehaviour\n");
goto failed;
}
*msg = NULL;
*msg_offset = 0;
}
while (*sddl) {
uint32_t flags;
char c = sddl[0];
@ -896,16 +896,14 @@ struct security_descriptor *sddl_decode_err_msg(TALLOC_CTX *mem_ctx, const char
}
return sd;
failed:
if (msg != NULL) {
if (*msg != NULL) {
*msg = talloc_steal(mem_ctx, *msg);
}
/*
* The actual message (*msg) might still be NULL, but the
* offset at least provides a clue.
*/
*msg_offset += sddl - start;
if (*msg != NULL) {
*msg = talloc_steal(mem_ctx, *msg);
}
/*
* The actual message (*msg) might still be NULL, but the
* offset at least provides a clue.
*/
*msg_offset += sddl - start;
DEBUG(2,("Badly formatted SDDL '%s'\n", sddl));
talloc_free(sd);
return NULL;