osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Do not initialize ett_tree and msg_fcn_p when match_strval_idx_ext does not find a match 

svn path=/trunk/; revision=48538
This commit is contained in:
Pascal Quantin 2013-03-24 21:52:19 +00:00
parent f3e5fa224c
commit bda771b86b
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-bssgp.c
View File

@ -6348,9 +6348,11 @@ static void get_bssgp_msg_params(guint8 oct, const gchar **msg_str, int *ett_tre
gint idx;
*msg_str = match_strval_idx_ext((guint32) (oct & 0xff), &bssgp_msg_strings_ext, &idx);
*ett_tree = ett_bssgp_msg[idx];
*hf_idx = hf_bssgp_msg_type;
*msg_fcn_p = bssgp_msg_fcn[idx];
if (*msg_str != NULL) {
*ett_tree = ett_bssgp_msg[idx];
*msg_fcn_p = bssgp_msg_fcn[idx];
}
return;
}

12
epan/dissectors/packet-nas_eps.c
View File

@ -4578,9 +4578,11 @@ get_nas_esm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf
gint idx;
*msg_str = match_strval_idx_ext((guint32) (oct & 0xff), &nas_msg_esm_strings_ext, &idx);
*ett_tree = ett_nas_msg_esm[idx];
*hf_idx = hf_nas_eps_msg_esm_type;
*msg_fcn_p = nas_msg_esm_fcn[idx];
if (*msg_str != NULL) {
*ett_tree = ett_nas_msg_esm[idx];
*msg_fcn_p = nas_msg_esm_fcn[idx];
}
return;
}
@ -4634,9 +4636,11 @@ get_nas_emm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf
gint idx;
*msg_str = match_strval_idx_ext((guint32) (oct & 0xff), &nas_msg_emm_strings_ext, &idx);
*ett_tree = ett_nas_msg_emm[idx];
*hf_idx = hf_nas_eps_msg_emm_type;
*msg_fcn_p = nas_msg_emm_fcn[idx];
if (*msg_str != NULL) {
*ett_tree = ett_nas_msg_emm[idx];
*msg_fcn_p = nas_msg_emm_fcn[idx];
}
return;
}

6
epan/dissectors/packet-sgsap.c
View File

@ -1370,9 +1370,11 @@ static void get_sgsap_msg_params(guint8 oct, const gchar **msg_str, int *ett_tre
gint idx;
*msg_str = match_strval_idx_ext((guint32) (oct & 0xff), &sgsap_msg_strings_ext, &idx);
*ett_tree = ett_sgsap_msg[idx];
*hf_idx = hf_sgsap_msg_type;
*msg_fcn_p = sgsap_msg_fcn[idx];
if (*msg_str != NULL) {
*ett_tree = ett_sgsap_msg[idx];
*msg_fcn_p = sgsap_msg_fcn[idx];
}
return;
}