Fixes #15480 (#15611)

oven-sh · Dec 6, 2024 · b453360 · b453360
1 parent 1476e4c
commit b453360
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/packages/bun-usockets/src/bsd.c b/packages/bun-usockets/src/bsd.c
@@ -965,8 +965,10 @@ int bsd_connect_udp_socket(LIBUS_SOCKET_DESCRIPTOR fd, const char *host, int por
     char port_string[16];
     snprintf(port_string, 16, "%d", port);
 
-    if (getaddrinfo(host, port_string, &hints, &result)) {
-        return -1;
+    int gai_error = getaddrinfo(host, port_string, &hints, &result);
+
+    if (gai_error != 0) {
+        return gai_error;
     }
 
     if (result == NULL) {

diff --git a/src/bun.js/api/bun/udp_socket.zig b/src/bun.js/api/bun/udp_socket.zig
@@ -290,14 +290,6 @@ pub const UDPSocket = struct {
             .vm = vm,
         });
 
-        // also cleans up config
-        defer {
-            if (globalThis.hasException()) {
-                this.closed = true;
-                this.deinit();
-            }
-        }
-
         if (uws.udp.Socket.create(
             this.loop,
             onData,
@@ -309,15 +301,26 @@ pub const UDPSocket = struct {
         )) |socket| {
             this.socket = socket;
         } else {
+            this.closed = true;
+            this.deinit();
             return globalThis.throw("Failed to bind socket", .{});
         }
 
+        errdefer {
+            this.socket.close();
+            this.deinit();
+        }
+
         if (config.connect) |connect| {
             const ret = this.socket.connect(connect.address, connect.port);
             if (ret != 0) {
                 if (JSC.Maybe(void).errnoSys(ret, .connect)) |err| {
                     return globalThis.throwValue(err.toJS(globalThis));
                 }
+
+                if (bun.c_ares.Error.initEAI(ret)) |err| {
+                    return globalThis.throwValue(err.toJS(globalThis));
+                }
             }
             this.connect_info = .{ .port = connect.port };
         }
@@ -645,7 +648,7 @@ pub const UDPSocket = struct {
         // finalize is only called when js_refcount reaches 0
         // js_refcount can only reach 0 when the socket is closed
         bun.assert(this.closed);
-
+        this.poll_ref.disable();
         this.config.deinit();
         this.destroy();
     }

diff --git a/test/js/bun/udp/udp_socket.test.ts b/test/js/bun/udp/udp_socket.test.ts
@@ -2,8 +2,16 @@ import { udpSocket } from "bun";
 import { describe, expect, test } from "bun:test";
 import { disableAggressiveGCScope, randomPort } from "harness";
 import { dataCases, dataTypes } from "./testdata";
+import { heapStats } from "bun:jsc";
 
 describe("udpSocket()", () => {
+  test("connect with invalid hostname rejects", async () => {
+    expect(async () =>
+      udpSocket({
+        connect: { hostname: "example!!!!!.com", port: 443 },
+      }),
+    ).toThrow();
+  });
   test("can create a socket", async () => {
     const socket = await udpSocket({});
     expect(socket).toBeInstanceOf(Object);