Merge pull request #176 from fhilgers/master

Fix #146

src/cc_array.c

@@ -853,7 +853,7 @@ static enum cc_stat expand_capacity(CC_Array *ar)
     else
         ar->capacity = new_capacity;
 
-    void **new_buff = ar->mem_alloc(new_capacity * sizeof(void*));
+    void **new_buff = ar->mem_alloc(ar->capacity * sizeof(void*));
 
     if (!new_buff)
         return CC_ERR_ALLOC;

src/cc_deque.c

@@ -980,19 +980,22 @@ static INLINE size_t upper_pow_two(size_t n)
         return MAX_POW_TWO;
 
     if (n == 0)
-        return 2;
+        return 1;
 
     /**
      * taken from:
      * http://graphics.stanford.edu/~seander/
-     * bithacks.html#RoundUpPowerOf2Float
+     * bithacks.html#RoundUpPowerOf2
      */
     n--;
     n |= n >> 1;
     n |= n >> 2;
     n |= n >> 4;
     n |= n >> 8;
     n |= n >> 16;
+#ifdef ARCH_64
+    n |= n >> 32;
+#endif /* ARCH_64 */
     n++;
 
     return n;

src/cc_hashtable.c

@@ -448,18 +448,21 @@ static INLINE size_t round_pow_two(size_t n)
         return MAX_POW_TWO;
 
     if (n == 0)
-        return 2;
+        return 1;
     /**
      * taken from:
      * http://graphics.stanford.edu/~seander/
-     * bithacks.html#RoundUpPowerOf2Float
+     * bithacks.html#RoundUpPowerOf2
      */
     n--;
     n |= n >> 1;
     n |= n >> 2;
     n |= n >> 4;
     n |= n >> 8;
     n |= n >> 16;
+#ifdef ARCH_64
+    n |= n >> 32;
+#endif /* ARCH_64 */
     n++;
 
     return n;

src/cc_pqueue.c

@@ -193,7 +193,7 @@ static enum cc_stat expand_capacity(CC_PQueue *pq)
     else
         pq->capacity = new_capacity;
 
-    void **new_buff = pq->mem_alloc(new_capacity * sizeof(void*));
+    void **new_buff = pq->mem_alloc(pq->capacity * sizeof(void*));
 
     if (!new_buff)
         return CC_ERR_ALLOC;

src/sized/cc_array_sized.c

@@ -809,7 +809,7 @@ static enum cc_stat expand_capacity(CC_ArraySized *ar)
     } else {
         ar->capacity = new_capacity;
     }
-    uint8_t *new_buff = ar->mem_alloc(new_capacity * ar->data_length);
+    uint8_t *new_buff = ar->mem_alloc(ar->capacity * ar->data_length);
 
     if (!new_buff) {
         return CC_ERR_ALLOC;