From 07e675cc52955329a24b38b51ec841675c0eb16d Mon Sep 17 00:00:00 2001 From: Scott MacVicar Date: Tue, 17 Mar 2009 02:00:13 +0000 Subject: MFH Fix bug #47644 - Valid integers are truncated with json_decode() --- ext/json/JSON_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/json/JSON_parser.c') diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c index edb1adf005..8eaf65e85c 100644 --- a/ext/json/JSON_parser.c +++ b/ext/json/JSON_parser.c @@ -289,11 +289,11 @@ static void json_create_zval(zval **z, smart_str *buf, int type) if (type == IS_LONG) { - double d = zend_strtod(buf->c, NULL); - if (d > LONG_MAX || d < LONG_MIN) { - ZVAL_DOUBLE(*z, d); + long l = strtol(buf->c, NULL, 10); + if (l > LONG_MAX || l < LONG_MIN) { + ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL)); } else { - ZVAL_LONG(*z, (long)d); + ZVAL_LONG(*z, l); } } else if (type == IS_DOUBLE) -- cgit v1.2.1