Merge branch 'jk/pack-bitmap'

gitster · gitster · commit 1697bf30df3e · 2014-04-24T12:31:51.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size)`
`41`	`41`	`self->alloc_size = new_size;`
`42`	`42`	`self->buffer = ewah_realloc(self->buffer,`
`43`	`43`	`self->alloc_size * sizeof(eword_t));`
`44`		`- self->rlw = self->buffer + (rlw_offset / sizeof(size_t));`
	`44`	`+ self->rlw = self->buffer + (rlw_offset / sizeof(eword_t));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`static inline void buffer_push(struct ewah_bitmap *self, eword_t value)`