aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bssgp.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-03-24 21:52:19 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-03-24 21:52:19 +0000
commitbda771b86bd18f8f5cc5ad9c22df427c17898e7c (patch)
tree2de4b54d67889b4a4c7295693ab9fb13e1372d0c /epan/dissectors/packet-bssgp.c
parentf3e5fa224c396d5408fba06f6824fd22ea6ce670 (diff)
Do not initialize ett_tree and msg_fcn_p when match_strval_idx_ext does not find a match
svn path=/trunk/; revision=48538
Diffstat (limited to 'epan/dissectors/packet-bssgp.c')
-rw-r--r--epan/dissectors/packet-bssgp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 8ba5461622..d420fd4a21 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -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;
}