Browse Source

Minor fix to `heap_allocator_proc` in common_memory.cpp

gingerBill 4 years ago
parent
commit
f5615b204c
1 changed files with 14 additions and 4 deletions
  1. 14 4
      src/common_memory.cpp

+ 14 - 4
src/common_memory.cpp

@@ -350,11 +350,16 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
 		gb_zero_size(ptr, size);
 		gb_zero_size(ptr, size);
 	} break;
 	} break;
 
 
-	case gbAllocation_Free: {
-		free(old_memory);
-	} break;
+	case gbAllocation_Free:
+		if (!old_memory) {
+			free(old_memory);
+		}
+		break;
 
 
 	case gbAllocation_Resize:
 	case gbAllocation_Resize:
+		if (!old_memory) {
+			break;
+		}
 		if (size == 0) {
 		if (size == 0) {
 			free(old_memory);
 			free(old_memory);
 			break;
 			break;
@@ -381,10 +386,15 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
 		break;
 		break;
 
 
 	case gbAllocation_Free:
 	case gbAllocation_Free:
-		free(old_memory);
+		if (!old_memory) {
+			free(old_memory);
+		}
 		break;
 		break;
 
 
 	case gbAllocation_Resize:
 	case gbAllocation_Resize:
+		if (!old_memory) {
+			break;
+		}
 		if (size == 0) {
 		if (size == 0) {
 			free(old_memory);
 			free(old_memory);
 			break;
 			break;