More rb_socketpair() return value checks.

from ircd-ratbox (r26507) (androsyn)

diff --git a/src/s_serv.c b/src/s_serv.c
index 5aeee209abe642992bfeaf0f8eb38347da5d1ad9..0e3bd29564e300ca09e26bd4b080aa0a701cf8e6 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1161,7 +1161,13 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
                serv_connect_callback(F, status, data);
                return;
        }
-       rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection");
+       if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection") == -1)
+       {
+                ilog_error("rb_socketpair failed for server");
+               serv_connect_callback(F, RB_ERROR, data);
+               return;
+               
+       }
        del_from_cli_fd_hash(client_p);
        client_p->localClient->F = xF[0];
        add_to_cli_fd_hash(client_p);

diff --git a/src/sslproc.c b/src/sslproc.c
index 4789e86f197e26ef70709688c54368f0b72d147d..35b221e8a0384eccad4e27e9e94bfc9be2c80881 100644 (file)
--- a/src/sslproc.c
+++ b/src/sslproc.c
@@ -284,7 +284,12 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
        for(i = 0; i < count; i++)
        {
                ssl_ctl_t *ctl;
-               rb_socketpair(AF_UNIX, SOCK_DGRAM, 0, &F1, &F2, "SSL/TLS handle passing socket");
+               if(rb_socketpair(AF_UNIX, SOCK_DGRAM, 0, &F1, &F2, "SSL/TLS handle passing socket") == -1)
+               {
+                       ilog(L_MAIN, "Unable to create ssld - rb_socketpair failed: %s", strerror(errno));
+                       return started;
+               }
+               
                rb_set_buffers(F1, READBUF_SIZE);
                rb_set_buffers(F2, READBUF_SIZE);
                rb_snprintf(fdarg, sizeof(fdarg), "%d", rb_get_fd(F2));
@@ -740,8 +745,14 @@ start_zlib_session(void *data)
 
        /* Pass the socket to ssld. */
        *buf = 'Z';
-       rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF1, &xF2, "Initial zlib socketpairs");
-
+       if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF1, &xF2, "Initial zlib socketpairs") == -1)
+       {
+               sendto_realops_snomask(SNO_GENERAL, L_ALL, "Error creating zlib socketpair - %s", strerror(errno));
+               ilog(L_MAIN, "Error creating zlib socketpairs - %s", strerror(errno));
+               exit_client(server, server, server, "Error creating zlib socketpair");
+               return;
+       }
+       
        if(IsSSL(server))
        {
                /* tell ssld the new connid for the ssl part*/