From: Scott MacVicar <scottmac@php.net>
Date: Wed, 9 Feb 2011 08:05:00 +0000 (+0000)
Subject: Fix Bug #53963, error code isn't always set in certain error cases.
X-Git-Tag: php-5.4.0alpha1~191^2~251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18b7f018e369977069a3cf27ee483a709a9ecb4e;p=php

Fix Bug #53963, error code isn't always set in certain error cases.
---

diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
index ef05f3b43c..dd832a7cbd 100644
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@@ -673,6 +673,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
 					/* fall through if not IS_STRING */
                 default:
                     FREE_BUFFERS();
+                    jp->error_code = PHP_JSON_ERROR_SYNTAX;
                     return false;
                 }
                 break;
@@ -712,6 +713,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
                         break;
                     default:
                         FREE_BUFFERS();
+                        jp->error_code = PHP_JSON_ERROR_SYNTAX;
                         return false;
                 }
                 buf.len = 0;