clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix replaced error handling in SQLite3Stmt::__construct

Browse Source 
The error handling is replaced using zend_replace_error_handling(), but
when SQLITE3_CHECK_INITIALIZED() returns early, the old error handling
isn't restored.

In the past, SQLITE3_CHECK_INITIALIZED() threw a warning when the check
failed. This was replaced a few years ago with an error exception. So we
can fix the bug by just removing the replacing error handling as it
accomplishes nothing anymore.

Closes GH-11607.
This commit is contained in:
Niels Dossche 2023-07-06 22:02:56 +02:00
parent 0aaad46c15
commit 824d1f95ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -46,6 +46,9 @@ PHP NEWS
- Standard:
. Fix serialization of RC1 objects appearing in object graph twice. (ilutov)
- SQLite3:
. Fix replaced error handling in SQLite3Stmt::__construct. (nielsdos)
06 Jul 2023, PHP 8.1.21
- CLI:

3
ext/sqlite3/sqlite3.c
View File

@ -1820,7 +1820,6 @@ PHP_METHOD(SQLite3Stmt, __construct)
zval *db_zval;
zend_string *sql;
int errcode;
zend_error_handling error_handling;
php_sqlite3_free_list *free_item;
stmt_obj = Z_SQLITE3_STMT_P(object);
@ -1831,9 +1830,7 @@ PHP_METHOD(SQLite3Stmt, __construct)
db_obj = Z_SQLITE3_DB_P(db_zval);
zend_replace_error_handling(EH_THROW, NULL, &error_handling);
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
zend_restore_error_handling(&error_handling);
if (!ZSTR_LEN(sql)) {
RETURN_FALSE;