archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-04-05 18:33:12 +01:00
commit ac9392b855
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ext/dba/dba.c
View file

@ -857,9 +857,7 @@ restart:
} }
if (!connection->info->lock.fp) { if (!connection->info->lock.fp) {
/* stream operation already wrote an error message */ /* stream operation already wrote an error message */
zend_string_release_ex(resource_key, /* persistent */ false); goto fail;
zval_ptr_dtor(return_value);
RETURN_FALSE;
} }
if (!error && !php_stream_supports_lock(connection->info->lock.fp)) { if (!error && !php_stream_supports_lock(connection->info->lock.fp)) {
error = "Stream does not support locking"; error = "Stream does not support locking";
@ -878,9 +876,7 @@ restart:
} }
if (!connection->info->fp) { if (!connection->info->fp) {
/* stream operation already wrote an error message */ /* stream operation already wrote an error message */
zend_string_release_ex(resource_key, /* persistent */ false); goto fail;
zval_ptr_dtor(return_value);
RETURN_FALSE;
} }
if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) { if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
/* Needed because some systems do not allow to write to the original /* Needed because some systems do not allow to write to the original
@ -888,9 +884,7 @@ restart:
*/ */
if (SUCCESS != php_stream_cast(connection->info->fp, PHP_STREAM_AS_FD, (void*)&connection->info->fd, 1)) { if (SUCCESS != php_stream_cast(connection->info->fp, PHP_STREAM_AS_FD, (void*)&connection->info->fd, 1)) {
php_error_docref(NULL, E_WARNING, "Could not cast stream"); php_error_docref(NULL, E_WARNING, "Could not cast stream");
zend_string_release_ex(resource_key, /* persistent */ false); goto fail;
zval_ptr_dtor(return_value);
RETURN_FALSE;
#ifdef F_SETFL #ifdef F_SETFL
} else if (modenr == DBA_CREAT) { } else if (modenr == DBA_CREAT) {
int flags = fcntl(connection->info->fd, F_GETFL); int flags = fcntl(connection->info->fd, F_GETFL);
@ -924,9 +918,7 @@ restart:
php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s", hptr->name); php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s", hptr->name);
} }
} }
zend_string_release_ex(resource_key, /* persistent */ false); goto fail;
zval_ptr_dtor(return_value);
RETURN_FALSE;
} }
connection->info->hnd = hptr; connection->info->hnd = hptr;
@ -935,6 +927,7 @@ restart:
if (zend_register_persistent_resource_ex(connection->hash, connection->info, le_pdb) == NULL) { if (zend_register_persistent_resource_ex(connection->hash, connection->info, le_pdb) == NULL) {
php_error_docref(NULL, E_WARNING, "Could not register persistent resource"); php_error_docref(NULL, E_WARNING, "Could not register persistent resource");
zend_string_release_ex(resource_key, /* persistent */ false); zend_string_release_ex(resource_key, /* persistent */ false);
dba_close_connection(connection);
zval_ptr_dtor(return_value); zval_ptr_dtor(return_value);
RETURN_FALSE; RETURN_FALSE;
} }
@ -942,6 +935,14 @@ restart:
zend_hash_add_new(&DBA_G(connections), connection->hash, return_value); zend_hash_add_new(&DBA_G(connections), connection->hash, return_value);
zend_string_release_ex(resource_key, /* persistent */ false); zend_string_release_ex(resource_key, /* persistent */ false);
return;
fail:
zend_string_release_ex(resource_key, /* persistent */ false);
zend_string_release_ex(connection->hash, persistent);
dba_close_info(connection->info);
connection->info = NULL;
zval_ptr_dtor(return_value);
RETURN_FALSE;
} }
/* }}} */ /* }}} */

12
ext/dba/tests/gh18247.phpt Normal file
View file

@ -0,0 +1,12 @@
--TEST--
GH-18247: dba_open() memory leak on invalid path
--EXTENSIONS--
dba
--FILE--
<?php
var_dump(dba_popen('/inexistent', 'r'));
?>
--EXPECTF--
Warning: dba_popen(/inexistent): Failed to open stream: No such file or directory in %s on line %d
bool(false)