diff options
| author | George Peter Banyard <girgias@php.net> | 2020-09-25 16:32:41 +0100 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-09-25 16:32:41 +0100 |
| commit | ef385e806f8bf7977cf7f8c61d6915553c02c385 (patch) | |
| tree | c3b192a22045a1a6ac5c84baeaf8be89ec45587d | |
| parent | 1086e4ec886c86653e0f5bb161d067982efbf1ed (diff) | |
| parent | 4dfbf07644ba68486b66662d7c74b660a5b80572 (diff) | |
| download | php-git-ef385e806f8bf7977cf7f8c61d6915553c02c385.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix logic error in PDO
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 38ce69e288..adc921bbd7 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -1866,7 +1866,8 @@ int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, in mode = Z_LVAL(args[skip]); flags = mode & PDO_FETCH_FLAGS; - retval = pdo_stmt_verify_mode(stmt, mode, 0); + /* pdo_stmt_verify_mode() returns a boolean value */ + retval = pdo_stmt_verify_mode(stmt, mode, 0) ? SUCCESS : FAILURE; } } |