Fixed buffer overflow and bytes leaked not working correctly

Author: dev

src/CMakeLists.txt

@@ -48,8 +48,8 @@ else()
 endif()
 
 add_library(swiftnet STATIC ${SOURCE_FILES})
-target_compile_options(swiftnet PRIVATE -O3)
-target_link_options(swiftnet PRIVATE -O3)
+target_compile_options(swiftnet PRIVATE -O0)
+target_link_options(swiftnet PRIVATE -O0)
 
 if(DEFINED ENV{VCPKG_ROOT} AND DEFINED CMAKE_VCPKG_TARGET_TRIPLET)
     set(VCPKG_INCLUDE_DIR "$ENV{VCPKG_ROOT}/installed/${CMAKE_VCPKG_TARGET_TRIPLET}/include")

src/internal/datatype_allocator.c

@@ -286,18 +286,24 @@ void allocator_destroy(struct SwiftNetMemoryAllocator* const memory_allocator) {
             break;
         }
 
-        free(current_stack);
-
         #ifdef SWIFT_NET_DEBUG
             lock_ptr_status(current_stack);
 
-            for (uint32_t i = 0; i < sizeof(uint8_t) * (memory_allocator->chunk_item_amount / 8) + 1; i++) {
-                if (current_stack->ptr_status + i != 0x00) {
-                    for(uint8_t bit = 0; bit < 8; bit++) {
-                        if((*(current_stack->ptr_status + i) & (1 << bit)) == 0x00) {
-                            bytes_leaked += memory_allocator->item_size;
-                            items_leaked++;
-                        }
+            const uint32_t total_items = memory_allocator->chunk_item_amount;
+            const uint32_t bytes = (total_items / 8) + 1;
+
+            for (uint32_t byte = 0; byte < bytes; byte++) {
+                uint8_t mask = current_stack->ptr_status[byte];
+
+                for (uint8_t bit = 0; bit < 8; bit++) {
+                    uint32_t idx = byte * 8 + bit;
+                    if (idx >= total_items) break;
+
+                    bool allocated = (mask & (1u << bit)) != 0;
+
+                    if (allocated) {
+                        items_leaked++;
+                        bytes_leaked += memory_allocator->item_size;
                     }
                 }
             }
@@ -307,6 +313,8 @@ void allocator_destroy(struct SwiftNetMemoryAllocator* const memory_allocator) {
             free(current_stack->ptr_status);
         #endif
 
+        free(current_stack);
+
         current_stack = next_stack;
     }
 }

tests/CMakeLists.txt

@@ -21,13 +21,13 @@ endif()
 
 link_directories(${CMAKE_SOURCE_DIR}/../build/output)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
 
 file(GLOB SRC_FILES "${CMAKE_SOURCE_DIR}/src/*.c")
 
 add_executable(run_tests ${SRC_FILES})
 
 target_link_libraries(run_tests PRIVATE swiftnet -lpcap)
-target_link_options(run_tests PRIVATE -g -O3)
+target_link_options(run_tests PRIVATE -g -O0)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})