fixup! Determine ALIGNMENT more cleverly and move it to util.h

bitcoin-core · Oct 25, 2018 · 13fff2c · 13fff2c
1 parent 1572a22
commit 13fff2c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/util.h b/src/util.h
@@ -98,10 +98,10 @@ static SECP256K1_INLINE void *checked_realloc(const secp256k1_callback* cb, void
 static SECP256K1_INLINE void *manual_alloc(void** prealloc_ptr, size_t alloc_size, void* base, size_t max_size) {
     size_t aligned_alloc_size = ROUND_TO_ALIGN(alloc_size);
     void* ret = *prealloc_ptr;
-    CHECK((char*)*prealloc_ptr != NULL);
-    CHECK((char*)*prealloc_ptr >= (char*)base);
-    CHECK(((char*)*prealloc_ptr - (char*)base) + aligned_alloc_size <= max_size);
-    *((char**)prealloc_ptr) += aligned_alloc_size;
+    CHECK((unsigned char*)*prealloc_ptr != NULL);
+    CHECK((unsigned char*)*prealloc_ptr >= (unsigned char*)base);
+    CHECK(((unsigned char*)*prealloc_ptr - (unsigned char*)base) + aligned_alloc_size <= max_size);
+    *((unsigned char**)prealloc_ptr) += aligned_alloc_size;
     return ret;
 }