summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2011-04-21 05:31:11 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2011-04-21 05:31:11 +0000
commit27f92a4c11bee42d5429a666ec4a2a94ac150f8a (patch)
treeed93dba90473458c0582d3b1b2d4fd6da9c451f2 /epan
parentff783ad1d560ce9793041d74b1245e663444b906 (diff)
downloadwireshark-27f92a4c11bee42d5429a666ec4a2a94ac150f8a.tar.gz
Fix ep_check_canary_integrity to use proper variable.
Previously it would sigsegv (accessing (void *) -1), instead of displaying error. svn path=/trunk/; revision=36745
Diffstat (limited to 'epan')
-rw-r--r--epan/emem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/emem.c b/epan/emem.c
index 27e11c78b3..1f710ac9a6 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -266,9 +266,9 @@ ep_check_canary_integrity(const char* fmt, ...)
while (canary_next != NULL) {
canary_next = emem_canary_next(ep_packet_mem.canary, canary_next, NULL);
- /* XXX, check if canary_last is inside allocated memory? */
+ /* XXX, check if canary_next is inside allocated memory? */
- if (npc->canary_last == (void *) -1)
+ if (canary_next == (void *) -1)
g_error("Per-packet memory corrupted\nbetween: %s\nand: %s", there, here);
}
}