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

svn path=/trunk/; revision=48538

1 files changed, 8 insertions, 4 deletions

diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index 5c4ea6db32..3602ffd55c 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -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;
 }