Merge branch 'feature/classic-cv-with-excludes-4390' into next

fixes: #4390
Icinga · Sep 21, 2013 · aa77900 · aa77900
2 parents 62703fa + 7a4ad61
commit aa77900
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cgi/extinfo.c b/cgi/extinfo.c
@@ -1485,7 +1485,7 @@ void show_host_info(void) {
 				for (temp_customvar = temp_host->custom_variables; temp_customvar != NULL; temp_customvar = temp_customvar->next) {
 					if (check_exclude_customvar(temp_customvar) == FALSE) {
 						if (json_start == FALSE) printf(",");
-						printf(" { \"%s\": \"%s\" }\n", temp_customvar->variable_name, temp_customvar->variable_value);
+						printf(" { \"%s\": \"%s\" }\n", json_encode(temp_customvar->variable_name), json_encode(temp_customvar->variable_value));
 						json_start = FALSE;
 					}
 				}
@@ -1945,7 +1945,7 @@ void show_service_info(void) {
 				for (temp_customvar = temp_service->custom_variables; temp_customvar != NULL; temp_customvar = temp_customvar->next) {
 					if (check_exclude_customvar(temp_customvar) == FALSE) {
 						if (json_start == FALSE) printf(",");
-						printf(" { \"%s\": \"%s\" }\n", temp_customvar->variable_name, temp_customvar->variable_value);
+						printf(" { \"%s\": \"%s\" }\n", json_encode(temp_customvar->variable_name), json_encode(temp_customvar->variable_value));
 						json_start = FALSE;
 					}
 				}