shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

radix-tree: fix bug when erasing elts in remove_prefix

Browse Source 
_erase_elt() now zeroes the last element of the array (ie. sets to
UNSET).  Previously remove() was doing this, but not remove_prefix().
This commit is contained in:
Joe Thornber 2018-06-21 17:10:05 +01:00
parent 40c1f7889f
commit 72e2e92f4c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/data-struct/radix-tree.c
View File

@ -626,6 +626,9 @@ static void _erase_elt(void *array, unsigned obj_size, unsigned count, unsigned
memmove(((uint8_t *) array) + (obj_size * index), memmove(((uint8_t *) array) + (obj_size * index),
((uint8_t *) array) + (obj_size * (index + 1)), ((uint8_t *) array) + (obj_size * (index + 1)),
obj_size * (count - index - 1)); obj_size * (count - index - 1));
// Zero the now unused last elt (set's v.type to UNSET)
memset(array + (count - 1) * obj_size, 0, obj_size);
} }
static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke) static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint8_t *ke)
@ -700,7 +703,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint
} }
n4->nr_entries--; n4->nr_entries--;
n4->values[n4->nr_entries].type = UNSET;
if (!n4->nr_entries) { if (!n4->nr_entries) {
free(n4); free(n4);
root->type = UNSET; root->type = UNSET;
@ -723,7 +725,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint
} }
n16->nr_entries--; n16->nr_entries--;
n16->values[n16->nr_entries].type = UNSET;
if (n16->nr_entries <= 4) { if (n16->nr_entries <= 4) {
_degrade_to_n4(n16, root); _degrade_to_n4(n16, root);
} }
@ -745,7 +746,6 @@ static bool _remove(struct radix_tree *rt, struct value *root, uint8_t *kb, uint
n48->keys[j]--; n48->keys[j]--;
_erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i); _erase_elt(n48->values, sizeof(*n48->values), n48->nr_entries, i);
n48->nr_entries--; n48->nr_entries--;
n48->values[n48->nr_entries].type = UNSET;
if (n48->nr_entries <= 16) if (n48->nr_entries <= 16)
_degrade_to_n16(n48, root); _degrade_to_n16(n48, root);
} }
@ -1066,7 +1066,7 @@ static bool _check_nodes(struct value *v, unsigned *count)
for (i = n4->nr_entries; i < 4; i++) for (i = n4->nr_entries; i < 4; i++)
if (n4->values[i].type != UNSET) { if (n4->values[i].type != UNSET) {
fprintf(stderr, "unused value is not UNSET\n"); fprintf(stderr, "unused value is not UNSET (n4)\n");
return false; return false;
} }
@ -1080,7 +1080,7 @@ static bool _check_nodes(struct value *v, unsigned *count)
for (i = n16->nr_entries; i < 16; i++) for (i = n16->nr_entries; i < 16; i++)
if (n16->values[i].type != UNSET) { if (n16->values[i].type != UNSET) {
fprintf(stderr, "unused value is not UNSET\n"); fprintf(stderr, "unused value is not UNSET (n16)\n");
return false; return false;
} }
@ -1105,7 +1105,7 @@ static bool _check_nodes(struct value *v, unsigned *count)
for (i = n48->nr_entries; i < 48; i++) for (i = n48->nr_entries; i < 48; i++)
if (n48->values[i].type != UNSET) { if (n48->values[i].type != UNSET) {
fprintf(stderr, "unused value is not UNSET\n"); fprintf(stderr, "unused value is not UNSET (n48)\n");
return false; return false;
} }