fix

Author: radare

libr/core/cbin.c

@@ -154,6 +154,7 @@ R_API bool r_core_bin_set_by_fd(RCore *core, ut64 bin_fd) {
 }
 
 #define RUNSCRIPT 1
+
 R_API void r_core_bin_export_info(RCore *core, int mode) {
 	char *flagname = NULL, *offset = NULL;
 	RBinFile *bf = r_bin_cur (core->bin);
@@ -171,38 +172,40 @@ R_API void r_core_bin_export_info(RCore *core, int mode) {
 
 	SdbListIter *iter;
 	SdbKv *kv;
+#if RUNSCRIPT
+	r_cons_push ();
+	r_strbuf_append (s0, "fs format\n");
+#else
 	if (IS_MODE_RAD (mode)) {
 		r_strbuf_append (s0, "fs format\n");
 	} else if (IS_MODE_SET (mode)) {
 		// just run the script, not the api
 		r_flag_space_push (core->flags, "format");
 	}
+#endif
 
 	// iterate over all keys
 	SdbList *ls = sdb_foreach_list (db, false);
 	ls_foreach (ls, iter, kv) {
 		char *k = sdbkv_key (kv);
 		char *v = sdbkv_value (kv);
-		char *dup = strdup (k);
 		//printf ("?e (%s) (%s)\n", k, v);
 		// 1
-		if ((flagname = strstr (dup, ".offset"))) {
-			*flagname = 0;
-			flagname = dup;
+		if ((flagname = strstr (k, ".offset"))) {
 #if RUNSCRIPT
-			r_strbuf_appendf (s0, "f %s @ %s\n", flagname, v);
+			r_strbuf_appendf (s0, "f %s @ %s\n", k, v);
 #else
 			if (IS_MODE_RAD (mode)) {
-				r_strbuf_appendf (s0, "f %s @ %s\n", flagname, v);
+				r_strbuf_appendf (s0, "f %s @ %s\n", k, v);
 			} else if (IS_MODE_SET (mode)) {
 				ut64 nv = r_num_math (core->num, v);
-				r_flag_set (core->flags, flagname, nv, 0);
+				r_flag_set (core->flags, k, nv, 0);
 			}
 #endif
 			free (offset);
 			offset = strdup (v);
-		}
-		if (strstr (dup, ".cparse")) {
+		} else
+		if (strstr (k, ".cparse")) {
 #if RUNSCRIPT
 			r_strbuf_appendf (s1, "\"td %s\"\n", v);
 #else
@@ -223,33 +226,31 @@ R_API void r_core_bin_export_info(RCore *core, int mode) {
 				}
 			}
 #endif
-		}
+		} else
 		// 2
-		if ((flagname = strstr (dup, ".format"))) {
+		if ((flagname = strstr (k, ".format"))) {
 			*flagname = 0;
 			if (!offset) {
 				offset = strdup ("0");
 			}
-			flagname = dup;
 #if RUNSCRIPT
-			r_strbuf_appendf (s1, "pf.%s %s\n", flagname, v);
+			r_strbuf_appendf (s1, "pf.%s %s\n", k, v);
 #else
 			if (IS_MODE_RAD (mode)) {
-				r_strbuf_appendf (s1, "pf.%s %s\n", flagname, v);
+				r_strbuf_appendf (s1, "pf.%s %s\n", k, v);
 			} else if (IS_MODE_SET (mode)) {
-				sdb_set (core->print->formats, flagname, v, 0);
+				sdb_set (core->print->formats, k, v, 0);
 			}
 #endif
-		}
+		} else
 		// 3
-		if ((flagname = strstr (dup, ".format"))) {
+		if ((flagname = strstr (k, ".format"))) {
 			*flagname = 0;
 			if (!offset) {
 				offset = strdup ("0");
 			}
-			flagname = dup;
 			int fmtsize = r_print_format_struct_size (core->print, v, 0, 0);
-			char *offset_key = r_str_newf ("%s.offset", flagname);
+			char *offset_key = r_str_newf ("%s.offset", k);
 			const char *off = sdb_const_get (db, offset_key, 0);
 			if (fmtsize < 1) {
 				continue;
@@ -277,12 +278,9 @@ R_API void r_core_bin_export_info(RCore *core, int mode) {
 				}
 #endif
 			}
-		}
-		if ((flagname = strstr (dup, ".size"))) {
-			*flagname = 0;
-			flagname = dup;
+		} else if ((flagname = strstr (k, ".size"))) {
 #if RUNSCRIPT
-			r_strbuf_appendf (s2, "fl %s %s\n", flagname, v);
+			r_strbuf_appendf (s2, "fl %s %s\n", k, v);
 #else
 			if (IS_MODE_RAD (mode)) {
 				r_strbuf_appendf (s2, "fl %s %s\n", flagname, v);
@@ -296,13 +294,13 @@ R_API void r_core_bin_export_info(RCore *core, int mode) {
 			}
 #endif
 		}
-		free (dup);
 	}
 	R_FREE (offset);
 	ls_free (ls);
 	r_strbuf_append_strbuf (s0, s1);
 	r_strbuf_append_strbuf (s0, s2);
 	char *s = r_strbuf_drain (s0);
+	r_cons_pop ();
 	if (IS_MODE_RAD (mode)) {
 		r_cons_print (s);
 	} else if (IS_MODE_SET (mode)) {