Fix a bug intrduced in http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revisi...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54831 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 1f9f9348af47be9957867ebe4d9f9c9e4cb6f2ae..9a23ab39588832420dd0c42a5d47062e41f829d7 100644 (file)
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -485,7 +485,7 @@ dissect_diameter_avp(diam_ctx_t *c, tvbuff_t *tvb, int offset, diam_sub_dis_t *d
        guint32 flags_bits     = (len & 0xFF000000) >> 24;
        guint32 vendorid       = vendor_flag ? tvb_get_ntohl(tvb,offset+8) : 0 ;
        wmem_tree_key_t k[3];
-       diam_avp_t *a          = (diam_avp_t *)wmem_tree_lookup32_array(dictionary.avps,k);
+       diam_avp_t *a;
        proto_item *pi, *avp_item;
        proto_tree *avp_tree, *save_tree;
        tvbuff_t *subtvb;
@@ -503,6 +503,8 @@ dissect_diameter_avp(diam_ctx_t *c, tvbuff_t *tvb, int offset, diam_sub_dis_t *d
        k[2].length = 0;
        k[2].key = NULL;
 
+       a = (diam_avp_t *)wmem_tree_lookup32_array(dictionary.avps,k);
+
        len &= 0x00ffffff;
        pad_len =  (len % 4) ? 4 - (len % 4) : 0 ;