diff --git a/NEWS b/NEWS index 045e191b3e9..fc9f8459cfd 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ PHP NEWS . Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita) . Fixed bug #79650 (php-win.exe 100% cpu lockup). (cmb) +- PDO SQLite: + . Fixed bug #79664 (PDOStatement::getColumnMeta fails on empty result set). + (cmb) + - phpdbg: . Fixed bug #73926 (phpdbg will not accept input on restart execution). (cmb) . Fixed several mostly Windows related phpdbg bugs. (cmb) diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 80bdcafd100..63f2d5d80cc 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -341,7 +341,7 @@ static int pdo_sqlite_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *ret if (!S->stmt) { return FAILURE; } - if(colno >= sqlite3_data_count(S->stmt)) { + if(colno >= sqlite3_column_count(S->stmt)) { /* error invalid column */ pdo_sqlite_error_stmt(stmt); return FAILURE; diff --git a/ext/pdo_sqlite/tests/bug79664.phpt b/ext/pdo_sqlite/tests/bug79664.phpt new file mode 100644 index 00000000000..072d107ba6a --- /dev/null +++ b/ext/pdo_sqlite/tests/bug79664.phpt @@ -0,0 +1,32 @@ +--TEST-- +Bug #79664 (PDOStatement::getColumnMeta fails on empty result set) +--SKIPIF-- + +--FILE-- + PDO::ERRMODE_EXCEPTION, +]); +$stmt = $pdo->query('select 1 where 0'); +if ($stmt->columnCount()) { + var_dump($stmt->getColumnMeta(0)); +} +?> +--EXPECT-- +array(6) { + ["native_type"]=> + string(4) "null" + ["flags"]=> + array(0) { + } + ["name"]=> + string(1) "1" + ["len"]=> + int(4294967295) + ["precision"]=> + int(0) + ["pdo_type"]=> + int(2) +}