From: Anatol Belski Date: Mon, 26 Mar 2018 13:08:22 +0000 (+0200) Subject: Fix datatypes X-Git-Tag: php-7.3.0alpha1~129 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cce3548f1abee6813809331c7028310ece75b89;p=php Fix datatypes --- diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index 4d84f35fed..a1aabf7d86 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -1,4 +1,4 @@ -/* Generated by re2c 1.0.2 */ +/* Generated by re2c 1.0.3 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -399,7 +399,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, size_t inquery_len { Scanner s; char *ptr, *newbuffer; - int t; + ptrdiff_t t; uint32_t bindno = 0; int ret = 0; size_t newbuffer_len; @@ -416,7 +416,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, size_t inquery_len while((t = scan(&s)) != PDO_PARSER_EOI) { if (t == PDO_PARSER_BIND || t == PDO_PARSER_BIND_POS) { if (t == PDO_PARSER_BIND) { - int len = s.cur - s.tok; + ptrdiff_t len = s.cur - s.tok; if ((inquery < (s.cur - len)) && isalnum(*(s.cur - len - 1))) { continue; } diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index 60f0519065..76e4190ac4 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -85,7 +85,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, size_t inquery_len { Scanner s; char *ptr, *newbuffer; - int t; + ptrdiff_t t; uint32_t bindno = 0; int ret = 0; size_t newbuffer_len; @@ -102,7 +102,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, size_t inquery_len while((t = scan(&s)) != PDO_PARSER_EOI) { if (t == PDO_PARSER_BIND || t == PDO_PARSER_BIND_POS) { if (t == PDO_PARSER_BIND) { - int len = s.cur - s.tok; + ptrdiff_t len = s.cur - s.tok; if ((inquery < (s.cur - len)) && isalnum(*(s.cur - len - 1))) { continue; }