Skip to content

Commit d9602e4

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: NEWS for GH-19162 ext/socket: Remove incorrect zval_ptr_dtor ext/hash: Remove incorrect zval_ptr_dtor
2 parents 554ae51 + 86aaded commit d9602e4

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

NEWS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.4.12
44

5+
- Hash:
6+
. Fix crash on clone failure. (nielsdos)
7+
58
- Intl:
69
. Fix memleak on failure in collator_get_sort_key(). (nielsdos)
710

@@ -14,6 +17,9 @@ PHP NEWS
1417
return value check). (nielsdos, botovq)
1518
. Fix error return check of EVP_CIPHER_CTX_ctrl(). (nielsdos)
1619

20+
- Sockets:
21+
. Fix some potential crashes on incorrect argument value. (nielsdos)
22+
1723
31 Jul 2025, PHP 8.4.11
1824

1925
- Calendar:

ext/hash/hash.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,6 @@ PHP_FUNCTION(hash_copy)
849849
RETVAL_OBJ(Z_OBJ_HANDLER_P(zhash, clone_obj)(Z_OBJ_P(zhash)));
850850

851851
if (php_hashcontext_from_object(Z_OBJ_P(return_value))->context == NULL) {
852-
zval_ptr_dtor(return_value);
853-
854852
zend_throw_error(NULL, "Cannot copy hash");
855853
RETURN_THROWS();
856854
}

ext/sockets/sockets.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2589,7 +2589,6 @@ PHP_FUNCTION(socket_addrinfo_bind)
25892589
}
25902590
default:
25912591
close(php_sock->bsd_socket);
2592-
zval_ptr_dtor(return_value);
25932592
zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
25942593
RETURN_THROWS();
25952594
}
@@ -2653,7 +2652,6 @@ PHP_FUNCTION(socket_addrinfo_connect)
26532652
default:
26542653
zend_argument_value_error(1, "socket type must be one of AF_UNIX, AF_INET, or AF_INET6");
26552654
close(php_sock->bsd_socket);
2656-
zval_ptr_dtor(return_value);
26572655
RETURN_THROWS();
26582656
}
26592657

0 commit comments

Comments
 (0)