Skip to content

Commit ca661f2

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix replaced error handling in SQLite3Stmt::__construct
2 parents 6e0f486 + 824d1f9 commit ca661f2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ PHP NEWS
4444
- Standard:
4545
. Fix serialization of RC1 objects appearing in object graph twice. (ilutov)
4646

47+
- SQLite3:
48+
. Fix replaced error handling in SQLite3Stmt::__construct. (nielsdos)
49+
4750
- XMLReader:
4851
. Fix GH-11548 (Argument corruption when calling XMLReader::open or
4952
XMLReader::XML non-statically with observer active). (Bob)

ext/sqlite3/sqlite3.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,6 @@ PHP_METHOD(SQLite3Stmt, __construct)
18241824
zval *db_zval;
18251825
zend_string *sql;
18261826
int errcode;
1827-
zend_error_handling error_handling;
18281827
php_sqlite3_free_list *free_item;
18291828

18301829
stmt_obj = Z_SQLITE3_STMT_P(object);
@@ -1835,9 +1834,7 @@ PHP_METHOD(SQLite3Stmt, __construct)
18351834

18361835
db_obj = Z_SQLITE3_DB_P(db_zval);
18371836

1838-
zend_replace_error_handling(EH_THROW, NULL, &error_handling);
18391837
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1840-
zend_restore_error_handling(&error_handling);
18411838

18421839
if (!ZSTR_LEN(sql)) {
18431840
RETURN_FALSE;

0 commit comments

Comments
 (0)