diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2014-04-22 15:53:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-22 16:21:16 -0700 |
| commit | 68f4e1fc6abd332726dd281c76dd63ce7d13d7a1 (patch) | |
| tree | 6d5edea3b7ed54e0301a588a654bdb18828fceb0 /ewah | |
| parent | 69e4b3426a608b4965c1cb0c6eab5252d880178b (diff) | |
| download | git-68f4e1fc6abd332726dd281c76dd63ce7d13d7a1.tar.gz | |
ewah_bitmap.c: do not assume size_t and eword_t are the same size
When buffer_grow changes the size of the buffer using realloc,
it first computes and saves the rlw pointer's offset into the
buffer using (uint8_t *) math before the realloc but then
restores it using (eword_t *) math.
In order to do this it's necessary to convert the (uint8_t *)
offset into an (eword_t *) offset. It was doing this by
dividing by the sizeof(size_t). Unfortunately sizeof(size_t)
is not same as sizeof(eword_t) on all platforms.
This causes illegal memory accesses and other bad things to
happen when attempting to use bitmaps on those platforms.
Fix this by dividing by the sizeof(eword_t) instead which
will always be correct for all platforms.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ewah')
| -rw-r--r-- | ewah/ewah_bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 9ced2dadfe..fccb42b52c 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -41,7 +41,7 @@ static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size) self->alloc_size = new_size; self->buffer = ewah_realloc(self->buffer, self->alloc_size * sizeof(eword_t)); - self->rlw = self->buffer + (rlw_offset / sizeof(size_t)); + self->rlw = self->buffer + (rlw_offset / sizeof(eword_t)); } static inline void buffer_push(struct ewah_bitmap *self, eword_t value) |