From: Ivan Poddubny <ivan.poddubny@gmail.com>
Date: Sat, 3 Oct 2015 11:27:27 +0000 (+0300)
Subject: manager: Fix GetConfigJSON returning invalid JSON
X-Git-Tag: 11.20.0-rc2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F1372%2F1;p=thirdparty%2Fasterisk.git

manager: Fix GetConfigJSON returning invalid JSON

When GetConfigJSON was introduced back in 1.6, it returned each
section as an array of strings: ["key=value", "key2=value2"].
Afterwards, it was changed a few times and became
["key": "value", "key2": "value2"], which is not a correct JSON.
This patch fixes that by constructing a JSON object {} instead of
an array [].

ASTERISK-25391 #close
Reported by: Bojan Nemčić

Change-Id: Ibbe93c6a227dff14d4a54b0d152341857bcf6ad8
---

diff --git a/main/manager.c b/main/manager.c
index d5e3273f5e..19c00b35bd 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2871,7 +2871,7 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
 
 		astman_append(s, "%s\"", comma1 ? "," : "");
 		astman_append_json(s, category);
-		astman_append(s, "\":[");
+		astman_append(s, "\":{");
 		comma1 = 1;
 		for (v = ast_variable_browse(cfg, category); v; v = v->next) {
 			astman_append(s, "%s\"", comma2 ? "," : "");
@@ -2881,7 +2881,7 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
 			astman_append(s, "\"");
 			comma2 = 1;
 		}
-		astman_append(s, "]");
+		astman_append(s, "}");
 	}
 	astman_append(s, "}\r\n\r\n");