Merge branch 'PHP-7.4'

Girgias · Girgias · commit 3c10d4d9a9aa · 2020-09-25T16:35:50.000+01:00
* PHP-7.4:
  Fix logic error in PDO
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -1738,9 +1738,8 @@ int pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, zval *args, uint
 	stmt->default_fetch_type = PDO_FETCH_BOTH;
 
 	flags = mode & PDO_FETCH_FLAGS;
-	retval = pdo_stmt_verify_mode(stmt, mode, 0);
 
-	if (FAILURE == retval) {
+	if (!pdo_stmt_verify_mode(stmt, mode, 0)) {
 		PDO_STMT_CLEAR_ERR();
 		return FAILURE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1738,9 +1738,8 @@ int pdo_stmt_setup_fetch_mode(pdo_stmt_t stmt, zend_long mode, zval args, uint`
`1738`	`1738`	`stmt->default_fetch_type = PDO_FETCH_BOTH;`
`1739`	`1739`
`1740`	`1740`	`flags = mode & PDO_FETCH_FLAGS;`
`1741`		`- retval = pdo_stmt_verify_mode(stmt, mode, 0);`
`1742`	`1741`
`1743`		`- if (FAILURE == retval) {`
	`1742`	`+ if (!pdo_stmt_verify_mode(stmt, mode, 0)) {`
`1744`	`1743`	`PDO_STMT_CLEAR_ERR();`
`1745`	`1744`	`return FAILURE;`
`1746`	`1745`	`}`