diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-21 13:37:14 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-21 13:37:31 +0100 |
| commit | 2a76e3a4571a7e31905a569580682e68cc003abb (patch) | |
| tree | 2ed139553087ca9aa14737855ea3fe83b3cac83e /ext/sqlite3/sqlite3.c | |
| parent | 5a5680c25b3e6d758cc25268c89e0ceb04147ad7 (diff) | |
| parent | f133f0024ec801dc9636ee5bf84a93de1300d4b2 (diff) | |
| download | php-git-2a76e3a4571a7e31905a569580682e68cc003abb.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79294: ::columnType() may fail after SQLite3Stmt::reset()
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 910181a3b7..3a3ade7bc3 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1983,7 +1983,7 @@ PHP_METHOD(sqlite3result, columnType) return; } - if (result_obj->complete) { + if (!sqlite3_data_count(result_obj->stmt_obj->stmt)) { RETURN_FALSE; } @@ -2038,7 +2038,6 @@ PHP_METHOD(sqlite3result, fetchArray) break; case SQLITE_DONE: - result_obj->complete = 1; RETURN_FALSE; break; @@ -2066,8 +2065,6 @@ PHP_METHOD(sqlite3result, reset) RETURN_FALSE; } - result_obj->complete = 0; - RETURN_TRUE; } /* }}} */ |