Imported Upstream version 5.3.0~RC4upstream/5.3.0_RC4upstream/5.3.0.RC4

1 files changed, 9 insertions, 1 deletions

diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
index 6aae849f1..259b77b08 100644
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@@ -247,6 +247,11 @@ new_JSON_parser(int depth)
     jp->top = -1;
 	jp->error_code = PHP_JSON_ERROR_NONE;
     jp->stack = (int*)ecalloc(depth, sizeof(int));
+    if (depth > JSON_PARSER_DEFAULT_DEPTH) {
+        jp->the_zstack = (zval **)safe_emalloc(depth, sizeof(zval), 0);
+    } else {
+        jp->the_zstack = &jp->the_static_zstack[0];
+    }
     push(jp, MODE_DONE);
     return jp;
 }
@@ -258,6 +263,9 @@ int
 free_JSON_parser(JSON_parser jp)
 {
     efree((void*)jp->stack);
+    if (jp->the_zstack != &jp->the_static_zstack[0]) {
+        efree(jp->the_zstack);
+    }
     efree((void*)jp);
     return false;
 }
@@ -352,7 +360,7 @@ static void utf16_to_utf8(smart_str *buf, unsigned short utf16)
                     | (utf16 & 0x3ff)) + 0x10000;
         buf->len -= 3;
 
-        smart_str_appendc(buf, 0xf0 | (utf32 >> 18));
+        smart_str_appendc(buf, (unsigned char) (0xf0 | (utf32 >> 18)));
         smart_str_appendc(buf, 0x80 | ((utf32 >> 12) & 0x3f));
         smart_str_appendc(buf, 0x80 | ((utf32 >> 6) & 0x3f));
         smart_str_appendc(buf, 0x80 | (utf32 & 0x3f));