Skip to content

Commit 85d41da

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: [skip ci] Add NEWS entry Fix undefined behavior in php_set_inet6_addr Reduce the scope of XFAIL (#8592)
2 parents 14da1cb + c71e75b commit 85d41da

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

ext/opcache/tests/bug78175_2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ opcache
1010
--SKIPIF--
1111
<?php
1212
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
13+
if (PHP_ZTS) die('xfail GH-8588');
1314
?>
1415
--FILE--
1516
<?php

ext/opcache/tests/bug78376.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ opcache
1010
--SKIPIF--
1111
<?php
1212
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
13+
if (PHP_ZTS) die('xfail GH-8588');
1314
?>
1415
--FILE--
1516
<?php

ext/opcache/tests/preload_method_static_vars.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ opcache
1010
--SKIPIF--
1111
<?php
1212
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
13+
if (PHP_ZTS) die('xfail GH-8588');
1314
?>
1415
--FILE--
1516
<?php

ext/opcache/tests/preload_trait_static.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ opcache
1010
--SKIPIF--
1111
<?php
1212
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
13+
if (PHP_ZTS) die('xfail GH-8588');
1314
?>
1415
--FILE--
1516
<?php

ext/sockets/sockaddr_conv.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_
6060

6161
}
6262

63-
if (scope++) {
63+
if (scope) {
6464
zend_long lval = 0;
6565
double dval = 0;
6666
unsigned scope_id = 0;
6767

68+
scope++;
69+
6870
if (IS_LONG == is_numeric_string(scope, strlen(scope), &lval, &dval, 0)) {
6971
if (lval > 0 && (zend_ulong)lval <= UINT_MAX) {
7072
scope_id = lval;

0 commit comments

Comments
 (0)