Changeset 6168

Timestamp:

05/16/10 13:23:55 (3 years ago)

Author:

Cyrus

Message:

ustream: Fix possible fd leaking

Files:

• luci2/libustream/protocol/http.c (modified) (3 diffs)

luci2/libustream/protocol/http.c

@@ -152 +152 @@
         if (!http->ssl) {
             if (!(http->ssl = ustream_tls_new(http->socket))) {
+                close(http->socket);
                 goto error;
             }
@@ -166 +167 @@
         }
     } else {
-        int s = dup(http->socket);
-        if (!(http->transport = fdopen(s, "r+"))) {
-            close(s);
+        if (!(http->transport = fdopen(http->socket, "r+"))) {
+            close(http->socket);
             goto error;
         }
@@ -578 +578 @@
     }
     if (http->ssl) {
+        close(http->socket);
         SSL_shutdown(http->ssl);
         SSL_free(http->ssl);
-    }
-    if (http->socket) {
-        close(http->socket);
     }
     free(http);