diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 10:48:15 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 10:48:15 +0200 |
commit | 97b7dbb8f4871bdf7385ad05258360ac16299539 (patch) | |
tree | 15625e2958ee52f1701820acc1525d425ffc1e92 /ext/pdo_sqlite/sqlite_statement.c | |
parent | 6b45039fb768a038783dff496ce14780c478482a (diff) | |
parent | 461135009c9c5e5a5839f22aff23ee7c896fb730 (diff) | |
download | php-git-97b7dbb8f4871bdf7385ad05258360ac16299539.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79664: PDOStatement::getColumnMeta fails on empty result set
Diffstat (limited to 'ext/pdo_sqlite/sqlite_statement.c')
-rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index db1bbf9b14..3d71acca88 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -339,7 +339,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; |