osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Signal-PDU: Adding Check to Remove Compiler Warning 

There was a warning that dynamic_hf[i].p_id is not checked for NULL and
that could mean a NULL Pointer dereference.

To make the code more robust and the compiler happy, this patch adds the
check for NULL.
This commit is contained in:
Dr. Lars Völker 2022-01-03 19:30:17 +01:00 committed by A Wireshark GitLab Utility
parent 196e8e74f3
commit f02d2a4793
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-signal-pdu.c
View File

@ -673,15 +673,17 @@ free_spdu_signal_list_cb(void*r) {
static void
deregister_user_data(void)
{
if (dynamic_hf) {
if (dynamic_hf != NULL) {
/* Unregister all fields */
for (guint i = 0; i < dynamic_hf_size; i++) {
proto_deregister_field(proto_signal_pdu, *(dynamic_hf[i].p_id));
g_free(dynamic_hf[i].p_id);
dynamic_hf[i].p_id = NULL;
if (dynamic_hf[i].p_id != NULL) {
proto_deregister_field(proto_signal_pdu, *(dynamic_hf[i].p_id));
g_free(dynamic_hf[i].p_id);
dynamic_hf[i].p_id = NULL;
/* workaround since the proto.c proto_free_field_strings seems to crash us... */
dynamic_hf[i].hfinfo.strings = NULL;
/* workaround since the proto.c proto_free_field_strings seems to crash us... */
dynamic_hf[i].hfinfo.strings = NULL;
}
}
proto_add_deregistered_data(dynamic_hf);