Skip to content

Commit 6c096bf

Browse files
devnexendevnexen
authored
ext/sockets: php_set_inet*_addr using zend_string instead. (php#17845)
1 parent 378e1b0 commit 6c096bf

File tree

5 files changed

+30
-31
lines changed

5 files changed

+30
-31
lines changed

‎ext/sockets/conversions.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ static void from_zval_write_sin_addr(const zval *zaddr_str, char *inaddr, ser_co
555555
zend_string *addr_str, *tmp_addr_str;
556556

557557
addr_str = zval_get_tmp_string((zval *) zaddr_str, &tmp_addr_str);
558-
res = php_set_inet_addr(&saddr, ZSTR_VAL(addr_str), ctx->sock);
558+
res = php_set_inet_addr(&saddr, addr_str, ctx->sock);
559559
if (res) {
560560
memcpy(inaddr, &saddr.sin_addr, sizeof saddr.sin_addr);
561561
} else {
@@ -605,7 +605,7 @@ static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6, ser_co
605605
zend_string *addr_str, *tmp_addr_str;
606606

607607
addr_str = zval_get_tmp_string((zval *) zaddr_str, &tmp_addr_str);
608-
res = php_set_inet6_addr(&saddr6, ZSTR_VAL(addr_str), ctx->sock);
608+
res = php_set_inet6_addr(&saddr6, addr_str, ctx->sock);
609609
if (res) {
610610
memcpy(addr6, &saddr6.sin6_addr, sizeof saddr6.sin6_addr);
611611
} else {

‎ext/sockets/multicast.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static zend_result php_get_address_from_array(const HashTable *ht, const char *k
128128
return FAILURE;
129129
}
130130
str = zval_get_tmp_string(val, &tmp_str);
131-
if (!php_set_inet46_addr(ss, ss_len, ZSTR_VAL(str), sock)) {
131+
if (!php_set_inet46_addr(ss, ss_len, str, sock)) {
132132
zend_tmp_string_release(tmp_str);
133133
return FAILURE;
134134
}

‎ext/sockets/sockaddr_conv.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ extern zend_result php_string_to_if_index(const char *val, unsigned *out);
1313

1414
#ifdef HAVE_IPV6
1515
/* Sets addr by hostname, or by ip in string form (AF_INET6) */
16-
int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
16+
int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socket *php_sock) /* {{{ */
1717
{
1818
struct in6_addr tmp;
1919
#ifdef HAVE_GETADDRINFO
2020
struct addrinfo hints;
2121
struct addrinfo *addrinfo = NULL;
2222
#endif
23-
char *scope = strchr(string, '%');
23+
char *scope = strchr(ZSTR_VAL(string), '%');
2424

25-
if (inet_pton(AF_INET6, string, &tmp)) {
25+
if (inet_pton(AF_INET6, ZSTR_VAL(string), &tmp)) {
2626
memcpy(&(sin6->sin6_addr.s6_addr), &(tmp.s6_addr), sizeof(struct in6_addr));
2727
} else {
2828
#ifdef HAVE_GETADDRINFO
@@ -34,7 +34,7 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_
3434
#else
3535
hints.ai_flags = AI_ADDRCONFIG;
3636
#endif
37-
getaddrinfo(string, NULL, &hints, &addrinfo);
37+
getaddrinfo(ZSTR_VAL(string), NULL, &hints, &addrinfo);
3838
if (!addrinfo) {
3939
#ifdef PHP_WIN32
4040
PHP_SOCKET_ERROR(php_sock, "Host lookup failed", WSAGetLastError());
@@ -84,15 +84,15 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_
8484
#endif
8585

8686
/* Sets addr by hostname, or by ip in string form (AF_INET) */
87-
int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_sock) /* {{{ */
87+
int php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock) /* {{{ */
8888
{
8989
struct in_addr tmp;
9090
struct hostent *host_entry;
9191

92-
if (inet_pton(AF_INET, string, &tmp)) {
92+
if (inet_pton(AF_INET, ZSTR_VAL(string), &tmp)) {
9393
sin->sin_addr.s_addr = tmp.s_addr;
9494
} else {
95-
if (strlen(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(string))) {
95+
if (ZSTR_LEN(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(ZSTR_VAL(string)))) {
9696
/* Note: < -10000 indicates a host lookup error */
9797
#ifdef PHP_WIN32
9898
PHP_SOCKET_ERROR(php_sock, "Host lookup failed", WSAGetLastError());
@@ -114,7 +114,7 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc
114114

115115
/* Sets addr by hostname or by ip in string form (AF_INET or AF_INET6,
116116
* depending on the socket) */
117-
int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, char *string, php_socket *php_sock) /* {{{ */
117+
int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock) /* {{{ */
118118
{
119119
if (php_sock->type == AF_INET) {
120120
struct sockaddr_in t = {0};

‎ext/sockets/sockaddr_conv.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
* The IPv6 literal can be a IPv4 mapped address (like ::ffff:127.0.0.1).
1717
* If the hostname yields no IPv6 addresses, a mapped IPv4 address may be returned (AI_V4MAPPED)
1818
*/
19-
int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock);
19+
int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socket *php_sock);
2020

2121
/*
2222
* Convert an IPv4 literal or a hostname into a sockaddr_in.
2323
*/
24-
int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_sock);
24+
int php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock);
2525

2626
/*
2727
* Calls either php_set_inet6_addr() or php_set_inet_addr(), depending on the type of the socket.
2828
*/
29-
int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, char *string, php_socket *php_sock);
29+
int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock);
3030

3131
#endif

‎ext/sockets/sockets.c‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,15 +1204,14 @@ PHP_FUNCTION(socket_connect)
12041204
{
12051205
zval *resource_socket;
12061206
php_socket *php_sock;
1207-
char *addr;
1207+
zend_string *addr;
12081208
int retval;
1209-
size_t addr_len;
12101209
zend_long port;
12111210
bool port_is_null = 1;
12121211

12131212
ZEND_PARSE_PARAMETERS_START(2, 3)
12141213
Z_PARAM_OBJECT_OF_CLASS(resource_socket, socket_ce)
1215-
Z_PARAM_STRING(addr, addr_len)
1214+
Z_PARAM_STR(addr)
12161215
Z_PARAM_OPTIONAL
12171216
Z_PARAM_LONG_OR_NULL(port, port_is_null)
12181217
ZEND_PARSE_PARAMETERS_END();
@@ -1265,15 +1264,15 @@ PHP_FUNCTION(socket_connect)
12651264
case AF_UNIX: {
12661265
struct sockaddr_un s_un = {0};
12671266

1268-
if (addr_len >= sizeof(s_un.sun_path)) {
1267+
if (ZSTR_LEN(addr) >= sizeof(s_un.sun_path)) {
12691268
zend_argument_value_error(2, "must be less than %d", sizeof(s_un.sun_path));
12701269
RETURN_THROWS();
12711270
}
12721271

12731272
s_un.sun_family = AF_UNIX;
1274-
memcpy(&s_un.sun_path, addr, addr_len);
1273+
memcpy(&s_un.sun_path, ZSTR_VAL(addr), ZSTR_LEN(addr));
12751274
retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un,
1276-
(socklen_t)(XtOffsetOf(struct sockaddr_un, sun_path) + addr_len));
1275+
(socklen_t)(XtOffsetOf(struct sockaddr_un, sun_path) + ZSTR_LEN(addr)));
12771276
break;
12781277
}
12791278

@@ -1316,14 +1315,13 @@ PHP_FUNCTION(socket_bind)
13161315
php_sockaddr_storage sa_storage = {0};
13171316
struct sockaddr *sock_type = (struct sockaddr*) &sa_storage;
13181317
php_socket *php_sock;
1319-
char *addr;
1320-
size_t addr_len;
1318+
zend_string *addr;
13211319
zend_long objint = 0;
13221320
zend_long retval = 0;
13231321

13241322
ZEND_PARSE_PARAMETERS_START(2, 3)
13251323
Z_PARAM_OBJECT_OF_CLASS(arg1, socket_ce)
1326-
Z_PARAM_STRING(addr, addr_len)
1324+
Z_PARAM_STR(addr)
13271325
Z_PARAM_OPTIONAL
13281326
Z_PARAM_LONG(objint)
13291327
ZEND_PARSE_PARAMETERS_END();
@@ -1343,14 +1341,14 @@ PHP_FUNCTION(socket_bind)
13431341

13441342
sa->sun_family = AF_UNIX;
13451343

1346-
if (addr_len >= sizeof(sa->sun_path)) {
1344+
if (ZSTR_LEN(addr) >= sizeof(sa->sun_path)) {
13471345
zend_argument_value_error(2, "must be less than %d", sizeof(sa->sun_path));
13481346
RETURN_THROWS();
13491347
}
1350-
memcpy(&sa->sun_path, addr, addr_len);
1348+
memcpy(&sa->sun_path, ZSTR_VAL(addr), ZSTR_LEN(addr));
13511349

13521350
retval = bind(php_sock->bsd_socket, (struct sockaddr *) sa,
1353-
offsetof(struct sockaddr_un, sun_path) + addr_len);
1351+
offsetof(struct sockaddr_un, sun_path) + ZSTR_LEN(addr));
13541352
break;
13551353
}
13561354

@@ -1395,7 +1393,7 @@ PHP_FUNCTION(socket_bind)
13951393
RETURN_THROWS();
13961394
}
13971395

1398-
sa->sll_ifindex = if_nametoindex(addr);
1396+
sa->sll_ifindex = if_nametoindex(ZSTR_VAL(addr));
13991397

14001398
retval = bind(php_sock->bsd_socket, sock_type, sizeof(struct sockaddr_ll));
14011399
break;
@@ -1666,17 +1664,18 @@ PHP_FUNCTION(socket_sendto)
16661664
//struct sockaddr_ll sll;
16671665
#endif
16681666
int retval;
1669-
size_t buf_len, addr_len;
1667+
size_t buf_len;
16701668
zend_long len, flags, port = 0;
16711669
bool port_is_null = 1;
1672-
char *buf, *addr;
1670+
char *buf;
1671+
zend_string *addr;
16731672

16741673
ZEND_PARSE_PARAMETERS_START(5, 6)
16751674
Z_PARAM_OBJECT_OF_CLASS(arg1, socket_ce)
16761675
Z_PARAM_STRING(buf, buf_len)
16771676
Z_PARAM_LONG(len)
16781677
Z_PARAM_LONG(flags)
1679-
Z_PARAM_STRING(addr, addr_len)
1678+
Z_PARAM_STR(addr)
16801679
Z_PARAM_OPTIONAL
16811680
Z_PARAM_LONG_OR_NULL(port, port_is_null)
16821681
ZEND_PARSE_PARAMETERS_END();
@@ -1699,7 +1698,7 @@ PHP_FUNCTION(socket_sendto)
16991698
case AF_UNIX:
17001699
memset(&s_un, 0, sizeof(s_un));
17011700
s_un.sun_family = AF_UNIX;
1702-
snprintf(s_un.sun_path, sizeof(s_un.sun_path), "%s", addr);
1701+
snprintf(s_un.sun_path, sizeof(s_un.sun_path), "%s", ZSTR_VAL(addr));
17031702

17041703
retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &s_un, SUN_LEN(&s_un));
17051704
break;

0 commit comments

Comments
 (0)