chore: apply suggested fixes

Author: mstdokumaci

src/msgpack.zig

@@ -868,10 +868,8 @@ fn clonePayload(payload: Payload, allocator: Allocator) !Payload {
             var cloned_count: usize = 0;
             errdefer {
                 // cleanup partial clones on error
-                var j: usize = cloned_count;
-                while (j > 0) {
-                    j -= 1;
-                    new_arr[j].free(allocator);
+                for (new_arr[0..cloned_count]) |item| {
+                    item.free(allocator);
                 }
                 allocator.free(new_arr);
             }
@@ -889,13 +887,18 @@ fn clonePayload(payload: Payload, allocator: Allocator) !Payload {
             // Clone all entries
             var it = m.map.iterator();
             while (it.next()) |entry| {
-                const cloned_key = try clonePayload(entry.key_ptr.*, allocator);
-                errdefer cloned_key.free(allocator);
-                const cloned_value = try clonePayload(entry.value_ptr.*, allocator);
-                errdefer cloned_value.free(allocator);
+                var cloned_key: ?Payload = null;
+                var cloned_value: ?Payload = null;
+                errdefer {
+                    if (cloned_value) |v| v.free(allocator);
+                    if (cloned_key) |k| k.free(allocator);
+                }
+
+                cloned_key = try clonePayload(entry.key_ptr.*, allocator);
+                cloned_value = try clonePayload(entry.value_ptr.*, allocator);
 
                 // Use putInternal to insert without additional cloning
-                try new_map.putInternal(cloned_key, cloned_value);
+                try new_map.putInternal(cloned_key.?, cloned_value.?);
             }
             return Payload{ .map = new_map };
         },

src/test.zig

@@ -3618,7 +3618,7 @@ test "clonePayload arr partial fail path frees partially cloned elements" {
     defer src.free(std.heap.page_allocator);
 
     try src.setArrElement(0, try Payload.strToPayload("a", std.heap.page_allocator));
-    try src.setArrElement(1, try Payload.strToPayload("this-is-a-large-string-that-will-always-fail", std.heap.page_allocator));
+    try src.setArrElement(1, try Payload.strToPayload("this-is-a-very-large-string-that-will-always-fail-because-it-is-much-longer-than-the-fixed-buffer-can-handle-and-should-cause-out-of-memory-error-during-cloning-process", std.heap.page_allocator));
 
     var buffer: [@sizeOf(Payload) * 2 + 8]u8 = undefined;
     var pool = std.heap.FixedBufferAllocator.init(&buffer);
@@ -3641,7 +3641,7 @@ test "clonePayload map partial fail path frees partially cloned entries" {
     defer src.free(std.heap.page_allocator);
 
     try src.mapPut("k1", try Payload.strToPayload("v1", std.heap.page_allocator));
-    try src.mapPut("k2", try Payload.strToPayload("very-long-string-to-force-out-of-memory-on-clone", std.heap.page_allocator));
+    try src.mapPut("k2", try Payload.strToPayload("very-long-string-to-force-out-of-memory-on-clone-because-the-fixed-buffer-is-too-small-to-allocate-this-large-string-during-the-cloning-operation", std.heap.page_allocator));
 
     var buffer: [@sizeOf(Payload) * 2 + 16]u8 = undefined;
     var pool = std.heap.FixedBufferAllocator.init(&buffer);