Fix json error in version output (#1223)

arras-energy · Nov 14, 2022 · 558fa7c · 558fa7c
1 parent 3cdedd1
commit 558fa7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/source/cmdarg.cpp b/source/cmdarg.cpp
@@ -707,10 +707,10 @@ int GldCmdarg::version(int argc, const char *argv[])
 		global_suppress_repeat_messages = false;
 		output_message("{");
 #define OUTPUT(TAG,FORMAT,VALUE) output_message("\t\"%s\" : \"" FORMAT "\",",TAG,VALUE)
-#define OUTPUT_LAST(TAG,FORMAT,VALUE) output_message("\t\"%s\" : \"" FORMAT "\"\n}",TAG,VALUE)
+#define OUTPUT_LAST(TAG,FORMAT,VALUE) output_message("\t\"%s\" : \"%s\"\n}",TAG,escape(VALUE))
 #define OUTPUT_LIST_START(TAG) output_message("\t\"%s\" : [",TAG)
-#define OUTPUT_LIST_ITEM(VALUE) output_message("\t\t\"%s\",",VALUE)
-#define OUTPUT_LIST_END(VALUE) output_message("\t\t\"%s\"],",VALUE)
+#define OUTPUT_LIST_ITEM(VALUE) output_message("\t\t\"%s\",",escape(VALUE))
+#define OUTPUT_LIST_END(VALUE) output_message("\t\t\"%s\"],",escape(VALUE))
 #define OUTPUT_MULTILINE(TAG,VALUE) {\
 		const char *value = VALUE;\
 		char *token=NULL, *last=NULL;\

diff --git a/source/json.cpp b/source/json.cpp
@@ -35,7 +35,7 @@ GldJsonWriter::~GldJsonWriter(void)
 	free((void*)filename);
 }
 
-const char * escape(const char *buffer, size_t len = 1024)
+const char * escape(const char *buffer, size_t len)
 {
 	static char *result = NULL;
 	static size_t result_len = 0;

diff --git a/source/json.h b/source/json.h
@@ -18,6 +18,7 @@
 DEPRECATED CDECL int json_dump(const char *filename);
 DEPRECATED CDECL int json_output(FILE *fp);
 DEPRECATED CDECL int json_to_glm(const char *jsonfile, char *glmfile);
+DEPRECATED CDECL const char * escape(const char *buffer, size_t len = 1024);
 
 class GldJsonWriter
 {