Merge branch 'PHP-7.3' into PHP-7.4

Girgias · Girgias · commit ef385e806f8b · 2020-09-25T16:32:41.000+01:00
* PHP-7.3:
  Fix logic error in PDO
diff --git 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;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1866,7 +1866,8 @@ int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, in`
`1866`	`1866`	`mode = Z_LVAL(args[skip]);`
`1867`	`1867`	`flags = mode & PDO_FETCH_FLAGS;`
`1868`	`1868`
`1869`		`- retval = pdo_stmt_verify_mode(stmt, mode, 0);`
	`1869`	`+ /* pdo_stmt_verify_mode() returns a boolean value */`
	`1870`	`+ retval = pdo_stmt_verify_mode(stmt, mode, 0) ? SUCCESS : FAILURE;`
`1870`	`1871`	`}`
`1871`	`1872`	`}`
`1872`	`1873`