https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2779
--- Comment #3 from Darryl Champagne <dgc@xxxxxxx> 2008-08-07 14:29:40 PDT ---
The only way I can recreate those errors is if I apply the same patch to an
already patched copy of the file.
Could you please retest?
Also, I am attached a test file, for the ActiveSync portion (it is hard to get
traces without a lot of personal information - this one has been cleaned).
dgc
E.g. if I apply my patch to my already patched copy, I get:
Darryl@DGC-SonyFS /cygdrive/C/wireshark/epan/dissectors
$ patch packet-wbxml.c packet-wbxml-SyncML12-ActiveSync.patch
patching file packet-wbxml.c
Hunk #1 succeeded at 3350 (offset 570 lines).
Hunk #2 succeeded at 7071 with fuzz 2 (offset 572 lines).
Hunk #3 succeeded at 7095 with fuzz 2 (offset 576 lines).
Hunk #4 FAILED at 8952.
1 out of 4 hunks FAILED -- saving rejects to file packet-wbxml.c.rej
Darryl@DGC-SonyFS /cygdrive/C/wireshark/epan/dissectors
This can be shown by performing a grep - the patch and the original copy of the
file only have 1 copy of things (2 lines), while the doubly patched version has
two (4 lines). It was very suspicious that the offset was approximately the
size of the patch itself, when I was at the HEAD, but it took a while to track
down what was happening.
It builds correctly with just a single copy of the changes.
dgc
$ grep wbxml_syncmlc12_tags_cp0 packet-wbx*
packet-wbxml-SyncML12-ActiveSync.patch:+static const value_string
wbxml_syncmlc1
2_tags_cp0[] = { /* SyncML 1.2 */
packet-wbxml-SyncML12-ActiveSync.patch:+ { 0, wbxml_syncmlc12_tags_cp0
},
/* -//SYNCML//DTD SyncML 1.2//EN */
packet-wbxml.c:static const value_string wbxml_syncmlc12_tags_cp0[] = { /*
SyncM
L 1.2 */
packet-wbxml.c: { 0, wbxml_syncmlc12_tags_cp0 }, /* -//SYNCML//DTD SyncML
1.2//E
N */
packet-wbxml.c:static const value_string wbxml_syncmlc12_tags_cp0[] = { /*
SyncM
L 1.2 */
packet-wbxml.c: { 0, wbxml_syncmlc12_tags_cp0 }, /* -//SYNCML//DTD SyncML
1.2//E
N */
packet-wbxml.c.orig:static const value_string wbxml_syncmlc12_tags_cp0[] = { /*
SyncML 1.2 */
packet-wbxml.c.orig: { 0, wbxml_syncmlc12_tags_cp0 }, /* -//SYNCML//DTD
SyncM
L 1.2//EN */
packet-wbxml.c.save:static const value_string wbxml_syncmlc12_tags_cp0[] = { /*
SyncML 1.2 */
packet-wbxml.c.save: { 0, wbxml_syncmlc12_tags_cp0 }, /* -//SYNCML//DTD
SyncM
L 1.2//EN */
Binary file packet-wbxml.obj matches
--
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
