diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 10:46:35 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 10:47:10 +0200 |
| commit | 461135009c9c5e5a5839f22aff23ee7c896fb730 (patch) | |
| tree | faf3f0d33f942eee252d88f14fe3cdf10074de3d /ext/pdo_sqlite/sqlite_statement.c | |
| parent | b26ad33001cf9612fde9c7506bf6856f63b8845c (diff) | |
| parent | 63bd8f38f4b7e8ffbcbd0ea607e21041ebba2455 (diff) | |
| download | php-git-461135009c9c5e5a5839f22aff23ee7c896fb730.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 80bdcafd10..63f2d5d80c 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; |