Move fpinf dereference after NULL check.
authordarkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 6 May 2011 20:45:34 +0000 (20:45 +0000)
committerdarkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 6 May 2011 20:45:34 +0000 (20:45 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37012 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-umts_mac.c

index ed2c347096a007fdc8568b9a4c9aa71ab4df50e5..28b56e44979f843caa67fadb584a482086ed2e5e 100644 (file)
@@ -420,12 +420,12 @@ static void dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
        macinf = p_get_proto_data(pinfo->fd, proto_umts_mac);
        fpinf = p_get_proto_data(pinfo->fd, proto_fp);
-       pos = fpinf->cur_tb;
        if (!macinf || !fpinf) {
                proto_tree_add_text(dch_tree, tvb, 0, -1,
                        "Cannot dissect MAC frame because per-frame info is missing");
                return;
        }
+       pos = fpinf->cur_tb;
        if (macinf->ctmux[pos]) {
                proto_tree_add_bits_item(dch_tree, hf_mac_ct, tvb, 0, 4, FALSE);
                bitoffs = 4;