From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 22 Oct 2020 10:41:52 +0000 (+0200)
Subject: Don't leak json error_code across requests
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa0d886cbc8ab4a227568c2bc5f2f00b7e378cfc;p=php

Don't leak json error_code across requests
---

diff --git a/ext/json/json.c b/ext/json/json.c
index cbf4f84014..df46294cd6 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -104,6 +104,11 @@ static PHP_GINIT_FUNCTION(json)
 }
 /* }}} */
 
+static PHP_RINIT_FUNCTION(json)
+{
+	JSON_G(error_code) = 0;
+	return SUCCESS;
+}
 
 /* {{{ json_module_entry */
 zend_module_entry json_module_entry = {
@@ -112,7 +117,7 @@ zend_module_entry json_module_entry = {
 	ext_functions,
 	PHP_MINIT(json),
 	NULL,
-	NULL,
+	PHP_RINIT(json),
 	NULL,
 	PHP_MINFO(json),
 	PHP_JSON_VERSION,