From 07e675cc52955329a24b38b51ec841675c0eb16d Mon Sep 17 00:00:00 2001
From: Scott MacVicar <scottmac@php.net>
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 ++++----
 ext/json/tests/bug47644.phpt | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 ext/json/tests/bug47644.phpt

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)
diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt
new file mode 100644
index 0000000000..5e996b6973
--- /dev/null
+++ b/ext/json/tests/bug47644.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Bug #47644 (valid large integers are truncated)
+--SKIPIF--
+<?php
+  if (!extension_loaded('json')) die('skip: json extension not available');
+  if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
+--FILE--
+<?php
+
+for ($i = 10000000000000000; $i < 10000000000000006; $i++) {
+	var_dump(json_decode("[$i]"));
+}
+
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(1) {
+  [0]=>
+  int(10000000000000000)
+}
+array(1) {
+  [0]=>
+  int(10000000000000001)
+}
+array(1) {
+  [0]=>
+  int(10000000000000002)
+}
+array(1) {
+  [0]=>
+  int(10000000000000003)
+}
+array(1) {
+  [0]=>
+  int(10000000000000004)
+}
+array(1) {
+  [0]=>
+  int(10000000000000005)
+}
+Done
-- 
cgit v1.2.1