diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-03-22 19:27:48 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-03-22 19:27:48 +0000 |
commit | 1f5bfa75b168e7b9e7178bf910d2835e848461bc (patch) | |
tree | e423fc005129b0ded53e282dafce4ebc49085e11 /epan | |
parent | ed3d478fb9df0bf832113f7827c4baa5335b1d7f (diff) |
Remove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL"
svn path=/trunk/; revision=36267
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-dcm.c | 12 |
1 files changed, 4 insertions, 8 deletions
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 */ |