From 12650bcda4584828799d837388a7b728f7f650ec Mon Sep 17 00:00:00 2001
From: lithdew <kenta@lithdew.net>
Date: Fri, 14 May 2021 15:42:22 +0900
Subject: [PATCH] x/os, x/tcp: fix Socket.Message init values and tcp test buf
 len

---
 lib/std/x/net/tcp.zig   | 4 ++--
 lib/std/x/os/socket.zig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/std/x/net/tcp.zig b/lib/std/x/net/tcp.zig
index abf1191dfd..05b0f50c10 100644
--- a/lib/std/x/net/tcp.zig
+++ b/lib/std/x/net/tcp.zig
@@ -405,14 +405,14 @@ test "tcp/client: read and write multiple vectors" {
         Buffer.from(message[message.len / 2 ..]),
     }), 0);
 
-    var buf: [message.len]u8 = undefined;
+    var buf: [message.len + 1]u8 = undefined;
     var msg = Socket.Message.fromBuffers(&[_]Buffer{
         Buffer.from(buf[0 .. message.len / 2]),
         Buffer.from(buf[message.len / 2 ..]),
     });
     _ = try client.readVectorized(&msg, 0);
 
-    try testing.expectEqualStrings(message, &buf);
+    try testing.expectEqualStrings(message, buf[0..message.len]);
 }
 
 test "tcp/listener: bind to unspecified ipv4 address" {
diff --git a/lib/std/x/os/socket.zig b/lib/std/x/os/socket.zig
index 05bd0499d1..1825d9f00c 100644
--- a/lib/std/x/os/socket.zig
+++ b/lib/std/x/os/socket.zig
@@ -212,9 +212,9 @@ pub const Socket = struct {
             name_len: c_uint = 0,
 
             buffers: usize = undefined,
-            buffers_len: c_int,
+            buffers_len: c_int = undefined,
 
-            control: usize = null,
+            control: usize = @ptrToInt(@as(?[*]u8, null)),
             control_len: c_uint = 0,
 
             flags: c_int = 0,