1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dcerpc-netlogon: Guard debug statements against private_data being null

Browse Source 
Avoid calling strlen or printf on a NULL pointer. (Do it this way
so that it is optimized out on non-debug builds.)

Fix #20364.
This commit is contained in:
John Thacker 2025-05-15 09:53:01 -04:00
parent 5eac2708f6
commit f15b9e9a80
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-dcerpc-netlogon.c
View File

@ -3905,9 +3905,12 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
cb_wstr_postprocess,
GINT_TO_POINTER(CB_STR_COL_INFO |CB_STR_SAVE | 1));
ws_debug("1)Len %d offset %d txt %s",(int) strlen((char *)dcv->private_data),offset,(char*)dcv->private_data);
ws_debug("1)Len %zu offset %d txt %s",
dcv->private_data ? strlen((char *)dcv->private_data) : 0,
offset,
dcv->private_data ? (char*)dcv->private_data : "(null)");
vars = create_global_netlogon_auth_vars(pinfo, (char*)dcv->private_data, 0);
ws_debug("2)Len %d offset %d txt %s",(int) strlen((char *)dcv->private_data),offset,vars->client_name);
ws_debug("2)Txt %s", vars->client_name);
offset = dissect_dcerpc_8bytes(tvb, offset, pinfo, tree, drep,
hf_client_challenge,&vars->client_challenge);
@ -8170,9 +8173,12 @@ netlogon_dissect_netrserverauthenticatekerberos_rqst(tvbuff_t *tvb, int offset,
cb_wstr_postprocess,
GINT_TO_POINTER(CB_STR_COL_INFO |CB_STR_SAVE | 1));
ws_debug("1)Len %d offset %d txt %s",(int) strlen((char *)dcv->private_data),offset,(char*)dcv->private_data);
ws_debug("1)Len %zu offset %d txt %s",
dcv->private_data ? strlen((char *)dcv->private_data) : 0,
offset,
dcv->private_data ? (char*)dcv->private_data : "(null)");
vars = create_global_netlogon_auth_vars(pinfo, (char*)dcv->private_data, 0);
ws_debug("2)Len %d offset %d txt %s",(int) strlen((char *)dcv->private_data),offset,vars->client_name);
ws_debug("2)Txt %s", vars->client_name);
ALIGN_TO_4_BYTES;