From 58ec64c36ebc56be145193c3a15f60ef50baa691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Tue, 11 Aug 2015 21:52:32 +0200 Subject: wmem: Fix wmem_tree_remove_string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always set is_removed when insert data in a node. Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2 Reviewed-on: https://code.wireshark.org/review/9978 Reviewed-by: Stig Bjørlykke --- epan/wmem/wmem_tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'epan/wmem') diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c index 7013ab5dae..aeb6b1b86f 100644 --- a/epan/wmem/wmem_tree.c +++ b/epan/wmem/wmem_tree.c @@ -415,9 +415,7 @@ wmem_tree_insert(wmem_tree_t *tree, const void *key, void *data, compare_func cm int result = cmp(key, node->key); if (result == 0) { node->data = data; - if (!data) { - node->is_removed = TRUE; - } + node->is_removed = data ? FALSE : TRUE; return; } else if (result < 0) { -- cgit v1.2.1