From db72eb4e3b98e5533030d2b146c7bd8077a5e65a Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Mon, 22 Jun 2015 17:48:54 -0700 Subject: wmem_tree_new_autoreset() never returns NULL Change-Id: I497b77dec1eb4617179d492838ecd7d267539ba4 Reviewed-on: https://code.wireshark.org/review/9043 Reviewed-by: Martin Kaiser --- epan/dissectors/packet-zvt.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'epan/dissectors/packet-zvt.c') diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 34e9866476..74ca54f01a 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -504,22 +504,18 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre proto_tree_add_item(apdu_tree, hf_zvt_aprc, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* XXX - can this ever be NULL? */ - if (transactions) { - zvt_trans = (zvt_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); - if (zvt_trans && zvt_trans->resp_frame==0) { - /* there's a pending request, this packet is the response */ - zvt_trans->resp_frame = PINFO_FD_NUM(pinfo); - } - - if (zvt_trans && zvt_trans->resp_frame == PINFO_FD_NUM(pinfo)) { - it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_to, - NULL, 0, 0, zvt_trans->rqst_frame); - PROTO_ITEM_SET_GENERATED(it); - } + zvt_trans = (zvt_transaction_t *)wmem_tree_lookup32_le( + transactions, PINFO_FD_NUM(pinfo)); + if (zvt_trans && zvt_trans->resp_frame==0) { + /* there's a pending request, this packet is the response */ + zvt_trans->resp_frame = PINFO_FD_NUM(pinfo); } + if (zvt_trans && zvt_trans->resp_frame == PINFO_FD_NUM(pinfo)) { + it = proto_tree_add_uint(apdu_tree, hf_zvt_resp_to, + NULL, 0, 0, zvt_trans->rqst_frame); + PROTO_ITEM_SET_GENERATED(it); + } } else { ctrl = tvb_get_ntohs(tvb, offset); @@ -539,15 +535,12 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre } } else { - /* XXX - can this ever be NULL? */ - if (transactions) { - zvt_trans = wmem_new(wmem_file_scope(), zvt_transaction_t); - zvt_trans->rqst_frame = PINFO_FD_NUM(pinfo); - zvt_trans->resp_frame = 0; - zvt_trans->ctrl = ctrl; - wmem_tree_insert32(transactions, - zvt_trans->rqst_frame, (void *)zvt_trans); - } + zvt_trans = wmem_new(wmem_file_scope(), zvt_transaction_t); + zvt_trans->rqst_frame = PINFO_FD_NUM(pinfo); + zvt_trans->resp_frame = 0; + zvt_trans->ctrl = ctrl; + wmem_tree_insert32(transactions, + zvt_trans->rqst_frame, (void *)zvt_trans); } } -- cgit v1.2.3