Fix various Visual C++ analysis warnings.
[metze/wireshark/wip.git] / epan / dissectors / packet-amr.c
index 99fa779dc68b0b464a7643c238b5b2a1144b1074..974c9b33fdaf5292140311422783718c2ad4e0bb 100644 (file)
@@ -601,8 +601,8 @@ dissect_amr_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree)
        amr_capability_t *ftr = NULL; 
 
        actx = get_asn1_ctx(pinfo->private_data);
-       DISSECTOR_ASSERT(actx);
-       if (tree) {
+       DISSECTOR_ASSERT(actx != NULL);
+       if (tree && actx != NULL) {
                ftr = find_cap(pinfo->match_string);
                if (ftr) {
                        proto_item_append_text(actx->created_item, " - %s", ftr->name);