picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #614 from teg/bitmap-overflow

Browse source 
basic: bitmap - complete fix for bitshift overflow
This commit is contained in:
Daniel Mack 2015-07-19 02:53:23 -04:00
parent 511ed79917 cdf6f5ae04
commit afd56ac532
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/basic/bitmap.c
View file

@ -69,7 +69,7 @@ int bitmap_ensure_allocated(Bitmap **b) {
}
int bitmap_set(Bitmap *b, unsigned n) {
long long bitmask;
long long unsigned bitmask;
unsigned offset;
assert(b);
@ -87,7 +87,7 @@ int bitmap_set(Bitmap *b, unsigned n) {
b->n_bitmaps = offset + 1;
}
bitmask = 1 << BITMAP_NUM_TO_REM(n);
bitmask = 1ULL << BITMAP_NUM_TO_REM(n);
b->bitmaps[offset] |= bitmask;
@ -95,7 +95,7 @@ int bitmap_set(Bitmap *b, unsigned n) {
}
void bitmap_unset(Bitmap *b, unsigned n) {
long long bitmask;
long long unsigned bitmask;
unsigned offset;
assert(b);
@ -105,13 +105,13 @@ void bitmap_unset(Bitmap *b, unsigned n) {
if (offset >= b->n_bitmaps)
return;
bitmask = 1 << BITMAP_NUM_TO_REM(n);
bitmask = 1ULL << BITMAP_NUM_TO_REM(n);
b->bitmaps[offset] &= ~bitmask;
}
bool bitmap_isset(Bitmap *b, unsigned n) {
long long bitmask;
long long unsigned bitmask;
unsigned offset;
if (!b || !b->bitmaps)
@ -122,7 +122,7 @@ bool bitmap_isset(Bitmap *b, unsigned n) {
if (offset >= b->n_bitmaps)
return false;
bitmask = 1 << BITMAP_NUM_TO_REM(n);
bitmask = 1ULL << BITMAP_NUM_TO_REM(n);
return !!(b->bitmaps[offset] & bitmask);
}
@ -149,7 +149,7 @@ void bitmap_clear(Bitmap *b) {
}
bool bitmap_iterate(Bitmap *b, Iterator *i, unsigned *n) {
long long bitmask;
long long unsigned bitmask;
unsigned offset, rem;
if (!b || i->idx == BITMAP_END)

8
src/test/test-bitmap.c
View file

@ -58,6 +58,14 @@ int main(int argc, const char *argv[]) {
assert_se(bitmap_isset(b, 256) == false);
assert_se(bitmap_isclear(b) == true);
assert_se(bitmap_set(b, 32) == 0);
bitmap_unset(b, 0);
assert_se(bitmap_isset(b, 32) == true);
bitmap_unset(b, 32);
BITMAP_FOREACH(n, NULL, it)
assert_not_reached("NULL bitmap");
assert_se(bitmap_set(b, 0) == 0);
assert_se(bitmap_set(b, 1) == 0);
assert_se(bitmap_set(b, 256) == 0);