Skip to content

Commit 3f6a212

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Report len as -1 instead of INT_MAX
2 parents 180b9af + 3911158 commit 3f6a212

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/pdo_sqlite/sqlite_statement.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno)
284284

285285
str = sqlite3_column_name(S->stmt, colno);
286286
stmt->columns[colno].name = zend_string_init(str, strlen(str), 0);
287-
stmt->columns[colno].maxlen = 0xffffffff;
287+
stmt->columns[colno].maxlen = SIZE_MAX;
288288
stmt->columns[colno].precision = 0;
289289

290290
switch (sqlite3_column_type(S->stmt, colno)) {

ext/pdo_sqlite/tests/bug79664.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ array(6) {
2424
["name"]=>
2525
string(1) "1"
2626
["len"]=>
27-
int(4294967295)
27+
int(-1)
2828
["precision"]=>
2929
int(0)
3030
["pdo_type"]=>

0 commit comments

Comments
 (0)