diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-19 18:28:13 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-19 18:28:13 +0000 |
| commit | e13d73e038b89cf1ab1b53764214fda825a0b83f (patch) | |
| tree | 384d3d6d777a2118365ce9ed321b0f623461bd7f /epan/emem.c | |
| parent | 7670683e3be189c570213dba3e7e8697db1e5053 (diff) | |
| download | wireshark-e13d73e038b89cf1ab1b53764214fda825a0b83f.tar.gz | |
Rework wmem scoping limits so that users can still get a handle to a pool when
it is out of scope, they just can't *allocate* in the pool. This is necessary
because file-scope trees (migrating from emem) are set up on program
initialization when there is no file in scope - they need to initialize with the
handle, they just won't use it until a file is actually in scope.
svn path=/trunk/; revision=50046
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/emem.c b/epan/emem.c index 1882b26a76..e188372964 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -846,9 +846,9 @@ emem_alloc(size_t size, emem_pool_t *mem) #if 0 /* For testing wmem, effectively redirects most emem memory to wmem. - * You will also have to comment out several assertions in - * wmem_packet_scope() and wmem_file_scope() since they are much - * stricter about when they are permitted to be called. */ + * You will also have to comment out several assertions in wmem_core.c, + * specifically anything g_assert(allocator->in_scope), since it is much + * stricter about when it is permitted to be called. */ if (mem == &ep_packet_mem) { return wmem_alloc(wmem_packet_scope(), size); } |