Skip to content

Commit ec33712

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
2 parents ae59c69 + 0ef52c3 commit ec33712

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

ext/sqlite3/sqlite3.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,6 +2043,7 @@ PHP_METHOD(SQLite3Result, fetchArray)
20432043

20442044
default:
20452045
php_sqlite3_error(result_obj->db_obj, sqlite3_errcode(sqlite3_db_handle(result_obj->stmt_obj->stmt)), "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(result_obj->stmt_obj->stmt)));
2046+
RETURN_FALSE;
20462047
}
20472048
}
20482049
/* }}} */

ext/sqlite3/tests/gh20699.phpt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--TEST--
2+
GH-20699 (SQLite3Result fetchArray return array|false, null returned)
3+
--EXTENSIONS--
4+
sqlite3
5+
--CREDITS--
6+
plusminmax
7+
--FILE--
8+
<?php
9+
$db = new SQLite3(':memory:');
10+
var_dump($db->prepare('BEGIN;')->execute()->fetchArray());
11+
?>
12+
--EXPECTF--
13+
Warning: SQLite3Result::fetchArray(): Unable to execute statement: cannot start a transaction within a transaction in %s on line %d
14+
bool(false)

0 commit comments

Comments
 (0)