aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-24 12:31:50 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-24 12:31:51 -0700
commit1697bf30df3ec6c28b180bc290d7d11d2fe97562 (patch)
treecf881eb498bc11f9f593323d57b7c43e91bb474b
parentd508e4a8e2391ae2596403b6478d01cf3d5f928f (diff)
parent68f4e1fc6abd332726dd281c76dd63ce7d13d7a1 (diff)
downloadgit-1697bf30df3ec6c28b180bc290d7d11d2fe97562.tar.gz
Merge branch 'jk/pack-bitmap'
A last minute (and hopefully the last) fix to avoid coredumps due to an incorrect pointer arithmetic. * jk/pack-bitmap: ewah_bitmap.c: do not assume size_t and eword_t are the same size
-rw-r--r--ewah/ewah_bitmap.c2
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)