From: Nikita Popov <nikic@php.net>
Date: Thu, 29 May 2014 10:53:32 +0000 (+0200)
Subject: Fix length reset in JSON parser
X-Git-Tag: POST_PHPNG_MERGE~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfff679d903c7ef1648d3d009f42566baa7d6232;p=php

Fix length reset in JSON parser
---

diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
index c7fc6b4f2f..116fc0c9b6 100644
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@@ -712,7 +712,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
                         jp->error_code = PHP_JSON_ERROR_SYNTAX;
                         return false;
                 }
-                buf.s->len = 0;
+                if (buf.s) { buf.s->len = 0; }
                 JSON_RESET_TYPE();
             }
             break;