Skip to content

Commit 15f2f4b

Browse files
committed
Revert more
1 parent 00f450a commit 15f2f4b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

ext/mysqli/mysqli_api.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,13 +2255,14 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
22552255
}
22562256
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
22572257

2258+
if (mode_in < 0) {
2259+
zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than or equal to 0");
2260+
RETURN_THROWS();
2261+
}
2262+
22582263
switch (attr) {
22592264
#if MYSQL_VERSION_ID >= 50107
22602265
case STMT_ATTR_UPDATE_MAX_LENGTH:
2261-
if (mode_in < 0) {
2262-
zend_argument_value_error(ERROR_ARG_POS(3), "must be 0 or 1 for attribute MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH");
2263-
RETURN_THROWS();
2264-
}
22652266
mode_b = (my_bool) mode_in;
22662267
mode_p = &mode_b;
22672268
break;

ext/mysqli/tests/mysqli_stmt_attr_set.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ require_once("connect.inc");
257257
--EXPECT--
258258
Error: mysqli_stmt object is not fully initialized
259259
mysqli_stmt_attr_set(): Argument #2 ($attr) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE
260-
mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be 0 or 1 for attribute MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH
260+
mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be greater than or equal to 0
261261
bool(true)
262262
mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be one of MYSQLI_CURSOR_TYPE_NO_CURSOR, MYSQLI_CURSOR_TYPE_READ_ONLY, MYSQLI_CURSOR_TYPE_FOR_UPDATE, or MYSQLI_CURSOR_TYPE_SCROLLABLE for attribute MYSQLI_STMT_ATTR_CURSOR_TYPE
263263
mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be greater than 0 for attribute MYSQLI_STMT_ATTR_PREFETCH_ROWS

0 commit comments

Comments
 (0)