sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libcli: nbt: cleanup resolve_lmhosts_file_as_sockaddr() - don't change return values on fail.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Jeremy Allison 2020-09-08 13:54:55 -07:00 committed by Noel Power
parent af6aaf6243
commit da9c7b1938
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libcli/nbt/lmhosts.c
View File

@ -176,9 +176,8 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx,
struct sockaddr_storage return_ss;
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
TALLOC_CTX *ctx = NULL;
*return_iplist = NULL;
*return_count = 0;
size_t ret_count = 0;
struct sockaddr_storage *iplist = NULL;
DEBUG(3,("resolve_lmhosts: "
"Attempting lmhosts lookup for name %s<0x%x>\n",
@ -207,19 +206,25 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx,
continue;
}
*return_iplist = talloc_realloc(ctx, (*return_iplist),
struct sockaddr_storage,
(*return_count)+1);
/* wrap check. */
if (ret_count + 1 < ret_count) {
TALLOC_FREE(ctx);
endlmhosts(fp);
return NT_STATUS_INVALID_PARAMETER;
}
iplist = talloc_realloc(ctx, iplist,
struct sockaddr_storage,
ret_count+1);
if ((*return_iplist) == NULL) {
if (iplist == NULL) {
TALLOC_FREE(ctx);
endlmhosts(fp);
DEBUG(3,("resolve_lmhosts: talloc_realloc fail !\n"));
return NT_STATUS_NO_MEMORY;
}
(*return_iplist)[*return_count] = return_ss;
*return_count += 1;
iplist[ret_count] = return_ss;
ret_count += 1;
/* we found something */
status = NT_STATUS_OK;
@ -229,7 +234,13 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx,
break;
}
talloc_steal(mem_ctx, *return_iplist);
if ((int)ret_count < 0) {
TALLOC_FREE(ctx);
endlmhosts(fp);
return NT_STATUS_INVALID_PARAMETER;
}
*return_count = ret_count;
*return_iplist = talloc_move(mem_ctx, &iplist);
TALLOC_FREE(ctx);
endlmhosts(fp);
return status;