diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-11-30 17:31:13 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-11-30 17:31:13 +0000 |
| commit | 9417a7c86f9bd43d078721f0512cc01b27f2b835 (patch) | |
| tree | 114835444c9b14ae64aa66eedb42f028528d1fc7 /epan/emem.c | |
| parent | 874657592c2e69dd20cd67015c19139144734789 (diff) | |
From Jakub Zawadzki via bug 4274:
Switch back to checking size instead of asize in emem_alloc_chunk. Make
sure we don't try to cross the streams by allocating a negative amount
of memory in the LTP dissector.
svn path=/trunk/; revision=31132
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/emem.c b/epan/emem.c index 1364610c87..85a94adf1d 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -723,7 +723,7 @@ emem_alloc_chunk(size_t size, emem_header_t *mem) #endif /* make sure we dont try to allocate too much (arbitrary limit) */ - DISSECTOR_ASSERT(asize<(EMEM_PACKET_CHUNK_SIZE>>2)); + DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2)); if (!mem->free_list) emem_create_chunk(&mem->free_list, use_canary); |