components/wireshark/patches/bug8717.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Mon, 08 Jul 2013 15:13:23 -0700
branchs11-update
changeset 2670 eaef8ade1d5d
permissions -rw-r--r--
16963021 problem in UTILITY/WIRESHARK
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2670
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
See:
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8717
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
http://anonsvn.wireshark.org/viewvc?view=revision&revision=49802
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
--- epan/dissectors/packet-dcp-etsi.c	2013/06/06 02:10:22	49801
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
+++ epan/dissectors/packet-dcp-etsi.c	2013/06/06 02:53:36	49802
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
@@ -518,9 +518,10 @@
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
       if(li)
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
         proto_item_append_text(li, " (length error (%d))", real_len);
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
     }
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
-    if (real_len)
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
+    else {
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
       next_tvb = dissect_pft_fragmented(tvb, pinfo, pft_tree, findex, fcount,
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
                                         seq, offset, real_len, fec, rsk, rsz);
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
+    }
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
     pinfo->fragmented = save_fragmented;
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
   } else {
eaef8ade1d5d 16963021 problem in UTILITY/WIRESHARK
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
     next_tvb = tvb_new_subset_remaining (tvb, offset);