From c84baf515261a12ded15a5aaf8bde2a88f42a69f Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Sun, 27 Aug 2023 10:53:51 -0700
Subject: [PATCH] address test leaks

---
 src/aws.zig      | 1 +
 src/aws_http.zig | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/aws.zig b/src/aws.zig
index 18ad54a..97b67c3 100644
--- a/src/aws.zig
+++ b/src/aws.zig
@@ -1383,6 +1383,7 @@ fn processRequest(options: *TestOptions, server: *std.http.Server) !void {
     var res = try server.accept(.{ .allocator = options.allocator });
     options.server_ready = false;
     defer res.deinit();
+    defer if (res.headers.owned and res.headers.list.items.len > 0) res.headers.deinit();
     defer _ = res.reset();
     try res.wait(); // wait for client to send a complete request head
 
diff --git a/src/aws_http.zig b/src/aws_http.zig
index 37bedb0..f7f69c1 100644
--- a/src/aws_http.zig
+++ b/src/aws_http.zig
@@ -163,7 +163,7 @@ pub const AwsHttp = struct {
         defer headers.deinit();
         for (request_cp.headers) |header|
             try headers.append(header.name, header.value);
-        log.debug("All Request Headers (zfetch):", .{});
+        log.debug("All Request Headers:", .{});
         for (headers.list.items) |h| {
             log.debug("\t{s}: {s}", .{ h.name, h.value });
         }
@@ -179,6 +179,7 @@ pub const AwsHttp = struct {
 
         const method = std.meta.stringToEnum(std.http.Method, request_cp.method).?;
         var req = try cl.request(method, try std.Uri.parse(url), headers, .{});
+        defer req.deinit();
         if (request_cp.body.len > 0)
             req.transfer_encoding = .{ .content_length = request_cp.body.len };
         try req.start();
@@ -210,11 +211,7 @@ pub const AwsHttp = struct {
                 content_length = std.fmt.parseInt(usize, h.value, 10) catch 0;
         }
 
-        // TODO: This is still stupid. Allocate a freaking array
-        var resp_payload = try std.ArrayList(u8).initCapacity(self.allocator, content_length);
-        defer resp_payload.deinit();
-        try resp_payload.resize(content_length);
-        var response_data = try resp_payload.toOwnedSlice();
+        var response_data = try self.allocator.alloc(u8, content_length);
         errdefer self.allocator.free(response_data);
         _ = try req.readAll(response_data);
         log.debug("raw response body:\n{s}", .{response_data});