Improve error messages to be more json-friendly

nowsecure · Sep 18, 2023 · a58f388 · a58f388
1 parent 2775949
commit a58f388
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/agent/index.ts b/src/agent/index.ts
@@ -36,7 +36,7 @@ global.r2pipe = {
     }
 };
 
-const commandHandlers = {
+onst commandHandlers = {
     '?': [expr.evalNum, 'evaluate number'],
     '?e': [echo, 'print message'],
     '?E': [uiAlert, 'popup alert dialog on target app'],

diff --git a/src/io_frida.c b/src/io_frida.c
@@ -385,7 +385,10 @@ static bool __eternalizeScript(RIOFrida *rf, const char *fileName) {
 
 static int on_compiler_diagnostics (void *user, GVariant *diagnostics) {
 	gchar *str = g_variant_print (diagnostics, TRUE);
-	str = r_str_replace (str, "int64", "int64:", true);
+	str = r_str_replace (str, "int64", "", true);
+	str = r_str_replace (str, "<", "", true);
+	str = r_str_replace (str, ">", "", true);
+	str = r_str_replace (str, "'", "\"", true);
 	char *json = r_print_json_indent (str, true, "  ", NULL);
 	eprintf ("%s\n", json);
 	free (json);

diff --git a/src/r2frida-compile.c b/src/r2frida-compile.c
@@ -13,7 +13,10 @@
 
 static int on_compiler_diagnostics(void *user, GVariant *diagnostics) {
 	gchar *str = g_variant_print (diagnostics, TRUE);
-	str = r_str_replace (str, "int64", "int64:", true);
+	str = r_str_replace (str, "int64", "", true);
+	str = r_str_replace (str, "<", "", true);
+	str = r_str_replace (str, ">", "", true);
+	str = r_str_replace (str, "'", "\"", true);
 	char *json = r_print_json_indent (str, true, "  ", NULL);
 	eprintf ("%s\n", json);
 	free (json);