diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-10-02 17:43:47 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-08 04:08:55 +0000 |
| commit | 291bca0056f0f3c6d3bcd232991cec66d79b17f2 (patch) | |
| tree | 085813c543d84c400262d56a5ea5da8e2f88a705 /epan/dissectors/packet-epl.c | |
| parent | 546fe80b7abf6ce0a1f19d0a02f438a7367747a9 (diff) | |
| download | wireshark-291bca0056f0f3c6d3bcd232991cec66d79b17f2.tar.gz | |
epl: fix bug in g_hash_table_lookup_extended() call (CID 1254382)
Change-Id: Iebf0fc5d3e86fba9a2ea4da5784256d820598e39
Reviewed-on: https://code.wireshark.org/review/10744
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-epl.c')
| -rw-r--r-- | epan/dissectors/packet-epl.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 26a46b0e31..af3fcb53f5 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1579,20 +1579,15 @@ epl_duplication_insert(GHashTable* table, gpointer ptr, guint32 frame) { duplication_data *data = NULL; duplication_key *key = NULL; - gpointer *pkey = NULL; + gpointer pkey = NULL; gpointer pdata; /* check if the values are stored */ - if(g_hash_table_lookup_extended(table,ptr,pkey,&pdata)) + if(g_hash_table_lookup_extended(table,ptr,&pkey,&pdata)) { - /* it happened that pkey was NULL - to prevent a crash this if was created */ - if(pkey != NULL) - { - data = (duplication_data *)pdata; - data->frame = frame; - g_hash_table_insert(table, pkey, data); - } + data = (duplication_data *)pdata; + data->frame = frame; + g_hash_table_insert(table, pkey, data); } /* insert the data struct into the table */ else |