use portable strtol

weltling · weltling · commit 4a875e18fdeb · 2015-02-10T13:06:57.000+01:00
diff --git a/ext/json/json_scanner.c b/ext/json/json_scanner.c
@@ -267,7 +267,7 @@ int php_json_scan(php_json_scanner *s)
 			}
 		}
 		if (!bigint) {
-			ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));
+			ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));
 			return PHP_JSON_T_INT;
 		} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {
 			ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);
diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re
@@ -171,7 +171,7 @@ std:
 			}
 		}
 		if (!bigint) {
-			ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));
+			ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));
 			return PHP_JSON_T_INT;
 		} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {
 			ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ int php_json_scan(php_json_scanner *s)`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`	`if (!bigint) {`
`270`		`- ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));`
	`270`	`+ ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));`
`271`	`271`	`return PHP_JSON_T_INT;`
`272`	`272`	`} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {`
`273`	`273`	`ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ std:`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`if (!bigint) {`
`174`		`- ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));`
	`174`	`+ ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));`
`175`	`175`	`return PHP_JSON_T_INT;`
`176`	`176`	`} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {`
`177`	`177`	`ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);`