diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-28 12:31:29 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2017-01-28 18:48:33 +0000 |
| commit | 120a1ebb2264c7b13cf20a9c8e9db37e9a125743 (patch) | |
| tree | cf7b7e120de3c0a35062d91a6e34864184f611de /epan | |
| parent | 8f81dd4f8274c2bd9b8438a59cbe232c09f5e573 (diff) | |
| download | wireshark-120a1ebb2264c7b13cf20a9c8e9db37e9a125743.tar.gz | |
wmem: Delay creation of map table until its needed
wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), ...)
doesn't have "file" scope ready at startup to create hash table
and will assert.
Change-Id: I3437f45ef42bf8635e4d504cf073fc3fb0c9a8cd
Reviewed-on: https://code.wireshark.org/review/19825
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/wmem/wmem_map.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/wmem/wmem_map.c b/epan/wmem/wmem_map.c index c91d062ba9..5d1a781809 100644 --- a/epan/wmem/wmem_map.c +++ b/epan/wmem/wmem_map.c @@ -107,7 +107,8 @@ wmem_map_new(wmem_allocator_t *allocator, map->eql_func = eql_func; map->master = allocator; map->allocator = allocator; - wmem_map_init_table(map); + map->count = 0; + map->table = NULL; return map; } @@ -152,7 +153,8 @@ wmem_map_new_autoreset(wmem_allocator_t *master, wmem_allocator_t *slave, map->eql_func = eql_func; map->master = master; map->allocator = slave; - wmem_map_init_table(map); + map->count = 0; + map->table = NULL; map->master_cb_id = wmem_register_callback(master, wmem_map_destroy_cb, map); map->slave_cb_id = wmem_register_callback(slave, wmem_map_reset_cb, map); |