fix: remove bugs, appearing with protection off

MeerkatBoss · Oct 21, 2022 · e111e29 · e111e29
1 parent 5b567e3
commit e111e29
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/int_stack.cpp b/int_stack.cpp
@@ -1,2 +1,4 @@
+#define NSTACK_CHECK
+#define STK_PROT_LEVEL 0
 #include "int_stack.h"
 #include "stack.h"
diff --git a/stack.h b/stack.h
@@ -331,7 +331,10 @@ unsigned int StackAssert_(const Stack* stack,
                             size_t       line,
                             int force = 0)
 {
-    unsigned int errs = StackCheck_(stack);
+    unsigned int errs = 0;
+    _ON_STACK_CHECK(
+        errs = StackCheck_(stack);
+    )
 
     if (!errs && !force)
         return STK_NO_ERROR;
@@ -460,14 +463,18 @@ element_t* ReallocWithCanary_(element_t* old_array,
         return result;
     )
     _NO_CANARY(
-        return realloc(old_array, new_size);
+        return (element_t*)realloc(old_array, new_size * sizeof(element_t));
     )
 
 }
 
 void FreeWithCanary_(element_t* ptr)
 {
-    free((canary_t*)ptr - 1);
+    _ON_CANARY(
+        free((canary_t*)ptr - 1);
+        return;
+    )
+    free(ptr);
 }
 
 inline size_t GetNewCapacity_(size_t size)