From: Markus Fischer <mfischer@php.net>
Date: Mon, 12 Nov 2001 00:58:16 +0000 (+0000)
Subject: Fix #14020 and some minor leaks.
X-Git-Tag: ChangeLog~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cc12e14504916d095db962d0d42bd3ae8227dec;p=php

Fix #14020 and some minor leaks.
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 5e685aa6f4..c28afe9d73 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -899,8 +899,10 @@ PHP_FUNCTION(socket_create)
 	int			arg1, arg2, arg3;
 	php_socket	*php_sock = (php_socket*)emalloc(sizeof(php_socket));
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &arg1, &arg2, &arg3) == FAILURE)
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &arg1, &arg2, &arg3) == FAILURE) {
+        efree(php_sock);
 		return;
+    }
 
 	if (arg1 != AF_UNIX && arg1 != AF_INET) {
 		php_error(E_WARNING, "Invalid socket domain [%d] specified, assuming AF_INET", arg1);
@@ -1026,6 +1028,7 @@ PHP_FUNCTION(socket_bind)
 				sa->sun_family = AF_UNIX;
 				snprintf(sa->sun_path, 108, "%s", addr);
 				retval = bind(php_sock->bsd_socket, (struct sockaddr *) sa, SUN_LEN(sa));
+				break;
 			}
 		
 		case AF_INET:
@@ -1044,6 +1047,7 @@ PHP_FUNCTION(socket_bind)
 				sa.sin_family	= hp->h_addrtype;
 				sa.sin_port		= htons((unsigned short)port);
 				retval = bind(php_sock->bsd_socket, (struct sockaddr *)&sa, sizeof(sa));
+				break;
 			}
 		
 		default:
@@ -1818,6 +1822,8 @@ PHP_FUNCTION(socket_create_pair)
 	zval_dtor(fds_array_zval);
 	if (array_init(fds_array_zval) == FAILURE) {
 		php_error(E_WARNING, "Can't initialize fds array");
+		efree(php_sock[0]);
+		efree(php_sock[1]);
 		RETURN_FALSE;
 	}