summaryrefslogtreecommitdiff
path: root/epan/wmem
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-08-11 21:52:32 +0200
committerStig Bjørlykke <stig@bjorlykke.org>2015-08-11 19:55:01 +0000
commit58ec64c36ebc56be145193c3a15f60ef50baa691 (patch)
tree4e2f778e3bffc332d3b3c6fac6f0b5959b677556 /epan/wmem
parent4309b964f548d0eb15c9ffbd78c8650fbb06a325 (diff)
downloadwireshark-58ec64c36ebc56be145193c3a15f60ef50baa691.tar.gz
wmem: Fix wmem_tree_remove_string
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 <stig@bjorlykke.org>
Diffstat (limited to 'epan/wmem')
-rw-r--r--epan/wmem/wmem_tree.c4
1 files changed, 1 insertions, 3 deletions
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) {