diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-08-28 16:52:05 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-08-28 16:52:05 +0000 |
| commit | 56eec34f806d6811f1f2fefd987b95e859d3ae7c (patch) | |
| tree | d494468fc9ea33b407826ae915340855579d2b4e /epan/dissectors/packet-dcm.c | |
| parent | c680dc89a3301f8d43c0ce5f359dd388f836e7ed (diff) | |
Fix possible memmove with a NULL poiunter.
svn path=/trunk/; revision=29599
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 0572b97b60..6ca3d0eff7 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4478,8 +4478,10 @@ dcm_export_create_object(packet_info *pinfo, dcm_state_assoc_t *assoc, dcm_state pdv_combined_curr = pdv_combined; - memmove(pdv_combined, dcm_header, dcm_header_len); - pdv_combined_curr += dcm_header_len; + if (dcm_header_len != 0) { /* XXX: Can be 0 if global_dcm_export_header is FALSE ? */ + memmove(pdv_combined, dcm_header, dcm_header_len); + pdv_combined_curr += dcm_header_len; + } /* Copy PDV per PDV to target buffer */ while (!pdv_curr->is_last_fragment) { |