aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-babel.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-04-27 23:20:15 +0000
committerGerald Combs <gerald@wireshark.org>2011-04-27 23:20:15 +0000
commit3af2a4c81f842c5b8d92c4ba1abe8da643d9cc08 (patch)
tree027e2b36137c31db37cbce690dd94b2f10a262e7 /epan/dissectors/packet-babel.c
parentd7b8350c7c5dc19e736f53cc20f9fc44480f6058 (diff)
From Juliusz Chroboczek via bug 5812:
This should not trigger with any Babel packets generated by the current version of babeld, but could potentially do so with a future version that performs more aggressive compression for IPv4 addresses. svn path=/trunk/; revision=36920
Diffstat (limited to 'epan/dissectors/packet-babel.c')
-rw-r--r--epan/dissectors/packet-babel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c
index 37adb6e912..918a956b64 100644
--- a/epan/dissectors/packet-babel.c
+++ b/epan/dissectors/packet-babel.c
@@ -151,7 +151,7 @@ network_prefix(int ae, int plen, unsigned int omitted,
if (dp == NULL) return -1;
memcpy(prefix, dp, 12 + omitted);
}
- if(pb > omitted) memcpy(prefix + 12 + omitted, p, pb);
+ if(pb > omitted) memcpy(prefix + 12 + omitted, p, pb - omitted);
break;
case 2:
if(omitted > 16 || (pb > omitted && len < pb - omitted))