External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: fix off-by-one when expanding a bitmap

Browse Source 
To make sure bit 'b' fits into the bitmap, we need to allocate b+1
bits, since we number from 0.

Adjust the bitmap test to set a bit at a multiple of 16.
That way the test fails without this fix, because the VIR_REALLOC
call clears the newly added memory even if the original pointer
has not changed.
This commit is contained in:
Ján Tomko 2017-01-30 13:52:02 +01:00
parent 5d82a2085f
commit 4a41cf18b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/virbitmap.c
View File

@ -187,7 +187,7 @@ int virBitmapSetBit(virBitmapPtr bitmap, size_t b)
*/ */
static int virBitmapExpand(virBitmapPtr map, size_t b) static int virBitmapExpand(virBitmapPtr map, size_t b)
{ {
size_t new_len = VIR_DIV_UP(b, VIR_BITMAP_BITS_PER_UNIT); size_t new_len = VIR_DIV_UP(b + 1, VIR_BITMAP_BITS_PER_UNIT);
/* resize the memory if necessary */ /* resize the memory if necessary */
if (map->map_len < new_len) { if (map->map_len < new_len) {

6
tests/virbitmaptest.c
View File

@ -639,15 +639,15 @@ test12(const void *opaque ATTRIBUTE_UNUSED)
TEST_MAP(0, ""); TEST_MAP(0, "");
if (virBitmapSetBitExpand(map, 100) < 0) if (virBitmapSetBitExpand(map, 128) < 0)
goto cleanup; goto cleanup;
TEST_MAP(101, "100"); TEST_MAP(129, "128");
if (virBitmapClearBitExpand(map, 150) < 0) if (virBitmapClearBitExpand(map, 150) < 0)
goto cleanup; goto cleanup;
TEST_MAP(151, "100"); TEST_MAP(151, "128");
virBitmapFree(map); virBitmapFree(map);
if (virBitmapParseUnlimited("34,1023", &map) < 0) if (virBitmapParseUnlimited("34,1023", &map) < 0)