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

libcli:auth: Remove unreachable code (CID 1272968)

Browse Source 
For us to reach the statement ‘if (0 < len1)’, ‘len1’ must be equal to
‘len2’, and they must not both be equal to zero. That cannot be the case
if ‘len1’ is equal to zero, and therefore the ‘else’ branch cannot be
reached.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Joseph Sutton 2023-10-06 12:36:13 +13:00 committed by Douglas Bagnall
parent 228dd73cae
commit 0425b0fcbe
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libcli/auth/msrpc_parse.c
View File

@ -262,6 +262,8 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
} else {
size_t pull_len;
/* make sure its in the right format - be strict */
if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) {
ret = false;
@ -278,20 +280,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
if (0 < len1) {
size_t pull_len;
if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX,
blob->data + ptr, len1,
ps, &pull_len)) {
ret = false;
goto cleanup;
}
} else {
*ps = talloc_strdup(mem_ctx, "");
if (*ps == NULL) {
ret = false;
goto cleanup;
}
if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX,
blob->data + ptr, len1,
ps, &pull_len)) {
ret = false;
goto cleanup;
}
}
break;