osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

DICOM: Revert 3752a643ac5c85622822c88c69d83ce23828acb8 

Revert commit 3752a643ac5c85622822c88c69d83ce23828acb8
to fix bug 13164 and bug 13570 introduced with this commit.

This reopens bug 13110.

Bug: 13164
Bug: 13570
Change-Id: Id237f08258ca100f675614a9cb36a32340944b3e
Reviewed-on: https://code.wireshark.org/review/21089
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Uli Heilmeier 2017-04-14 14:46:11 +02:00 committed by Michael Mann
parent cbc2c84a27
commit ce50000f14
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-dcm.c
View File

@ -6570,7 +6570,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
pdv_body_len,
!(pdv->is_last_fragment));
if ((head && (head->next == NULL)) || pdv->is_last_fragment) {
if (head && (head->next == NULL)) {
/* Was not really fragmented, therefore use 'conventional' decoding
fragment_add_seq_next() won't add any items to the list, when last fragment only
*/