From ad60a5727c8894951d3a90e5124dc7922b728afc Mon Sep 17 00:00:00 2001 From: wmeier Date: Tue, 22 Mar 2011 19:27:48 +0000 Subject: Remove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL" git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36267 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-dcm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'epan/dissectors/packet-dcm.c') diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index a31d6b0c7f..0c7f258bb1 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6297,10 +6297,8 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Copy pure DICOM data to buffer, no PDV flags */ pdv->data = g_malloc(next_tvb->length); /* will be freed in dcm_export_create_object() */ - if (pdv->data) { - tvb_memcpy(next_tvb, pdv->data, 0, next_tvb->length); - pdv->data_len = next_tvb->length; - } + tvb_memcpy(next_tvb, pdv->data, 0, next_tvb->length); + pdv->data_len = next_tvb->length; /* Copy to export buffer */ dcm_export_create_object(pinfo, assoc, pdv); @@ -6317,10 +6315,8 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Copy pure DICOM data to buffer, no PDV flags */ pdv->data = g_malloc(pdv_body_len); /* will be freed in dcm_export_create_object() */ - if (pdv->data) { - tvb_memcpy(tvb, pdv->data, startpos, pdv_body_len); - pdv->data_len = pdv_body_len; - } + tvb_memcpy(tvb, pdv->data, startpos, pdv_body_len); + pdv->data_len = pdv_body_len; if ((pdv_body_len > 0) && (pdv->is_last_fragment)) { /* At the last segment, merge all related previous PDVs and copy to export buffer */ -- cgit v1.2.3