asfj

Author: radare

libr/core/canal.c

@@ -35,17 +35,6 @@ static int cmp_sec_range(const RCoreSecRange *a, const RCoreSecRange *b) {
 	return (fa > fb)? 1: (fa < fb)? -1: 0;
 }
 
-static const char *data_types[] = { "CSTRINGS", "CONST", "cfstring", "4BYTE", "8BYTE", "16BYTE", NULL };
-static bool is_data_section_type(const char *type) {
-	const char **dt = data_types;
-	for (; *dt; dt++) {
-		if (r_str_startswith (type, *dt)) {
-			return true;
-		}
-	}
-	return false;
-}
-
 static RVecRCoreSecRange *r_core_get_sec_ranges(RCore *core) {
 	RCorePriv *priv = core->priv;
 	// Check if we have a cached result
@@ -76,12 +65,12 @@ static RVecRCoreSecRange *r_core_get_sec_ranges(RCore *core) {
 			if (to <= from) {
 				continue;
 			}
+			if (section->perm & R_PERM_W) {
+				continue;
+			}
 			RCoreSecRange r = {
 				.from = from,
 				.to = to,
-				.executable = (section->perm & R_PERM_X) != 0,
-				.has_strings = section->has_strings,
-				.is_data_type = is_data_section_type (section->type)
 			};
 			RVecRCoreSecRange_push_back (sr, &r);
 		}
@@ -160,6 +149,11 @@ static int cmpaddr(const void *_a, const void *_b) {
 	return (a->addr > b->addr)? 1: (a->addr < b->addr)? -1: 0;
 }
 
+static int cmp_ut64(const ut64 *a, const void *_b) {
+	const ut64 *b = (const ut64 *)_b;
+	return (*a > *b)? 1: (*a < *b)? -1: 0;
+}
+
 static void init_addr2klass(RCore *core, RBinObject *bo) {
 	if (bo->addr2klassmethod) {
 		return;
@@ -287,13 +281,6 @@ static bool is_string_at(RCore *core, ut64 addr, char *str, int *olen, const RVe
 		return false;
 	}
 	const RCoreSecRange *r = RVecRCoreSecRange_at (sr, idx);
-#if 0
-	// Skip strings in executable sections unless they contain actual string data
-	// (e.g., Mach-O __cstring which is executable but contains string data)
-	if (r->executable && !r->has_strings && !r->is_data_type) {
-		return false;
-	}
-#endif
 	if (addr + 4 > r->to) {
 		return false;
 	}
@@ -1179,15 +1166,7 @@ static bool __core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int de
 				RIOMap *map = r_io_map_get_at (core->io, addr);
 				// only get next if found on an executable section
 				if (!map || (map && map->perm & R_PERM_X)) {
-					ut64 *iter;
-					bool found = false;
-					R_VEC_FOREACH (&next, iter) {
-						if (*iter == addr) {
-							found = true;
-							break;
-						}
-					}
-					if (!found) {
+					if (!RVecUT64_find (&next, &addr, cmp_ut64)) {
 						ut64 at = r_anal_function_max_addr (fcn);
 						while (true) {
 							ut64 size;
@@ -1198,7 +1177,6 @@ static bool __core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int de
 							at += size;
 						}
 						// TODO: ensure next address is function after padding (nop or trap or wat)
-						// XXX noisy for test cases because we want to clear the stderr
 						r_cons_clear_line (core->cons, true, true);
 						if (verbose) {
 							loganal (fcn->addr, at, 10000 - depth);
@@ -5357,7 +5335,6 @@ bool fcn_merge_touch_cb(ut64 addr, struct r_merge_ctx_t *ctx) {
 		if (ctx->cur == fcn) {
 			return true;
 		}
-
 		// Function we're trying to merge into
 		if (ctx->merge == fcn) {
 			found = true;

libr/include/r_core.h

@@ -66,12 +66,12 @@ R_LIB_VERSION_HEADER(r_core);
 #define R_FLAGS_FS_SYMBOLS_SECTIONS "symbols.sections"
 #define R_FLAGS_FS_SYSCALLS "syscalls"
 
-#define R_GRAPH_FORMAT_NO           0
-#define R_GRAPH_FORMAT_GMLFCN       1
-#define R_GRAPH_FORMAT_JSON         2
-#define R_GRAPH_FORMAT_GML          3
-#define R_GRAPH_FORMAT_DOT          4
-#define R_GRAPH_FORMAT_CMD          5
+#define R_GRAPH_FORMAT_NO 0
+#define R_GRAPH_FORMAT_GMLFCN 1
+#define R_GRAPH_FORMAT_JSON 2
+#define R_GRAPH_FORMAT_GML 3
+#define R_GRAPH_FORMAT_DOT 4
+#define R_GRAPH_FORMAT_CMD 5
 
 ///
 #define R_CONS_COLOR_DEF(x, def) ((core->cons && core->cons->context->pal.x)? core->cons->context->pal.x: def)
@@ -318,14 +318,14 @@ typedef struct r_core_esil_t {
 	ut32 tr_reg;
 	ut32 tr_mem;
 	RReg *reg;
-	char *cmd_step;		// command to run before a step is performed
-	char *cmd_step_out;	// command to run after a step is performed
-	char *cmd_intr;		// command to run when an interrupt occurs
-	char *cmd_trap;		// command to run when a trap occurs
-	char *cmd_mdev;		// command to run when an memory mapped device address is used
-	char *cmd_todo;		// command to run when esil expr contains TODO
-	char *cmd_ioer;		// command to run when esil fails to IO
-	char *mdev_range;	// string containing the r_str_range to match for read/write accesses
+	char *cmd_step;	// command to run before a step is performed
+	char *cmd_step_out; // command to run after a step is performed
+	char *cmd_intr; // command to run when an interrupt occurs
+	char *cmd_trap; // command to run when a trap occurs
+	char *cmd_mdev; // command to run when an memory mapped device address is used
+	char *cmd_todo; // command to run when esil expr contains TODO
+	char *cmd_ioer; // command to run when esil fails to IO
+	char *mdev_range; // string containing the r_str_range to match for read/write accesses
 	ut8 cfg;
 } RCoreEsil;
 

libr/include/r_core_priv.h

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2024-2025 - pancake */
+/* radare - LGPL - Copyright 2024-2026 - pancake */
 
 #include "r_core.h"
 
@@ -12,9 +12,6 @@ extern "C" {
 typedef struct r_core_sec_range_t {
 	ut64 from;
 	ut64 to;
-	bool executable;
-	bool has_strings;
-	bool is_data_type; // precomputed from section type (CSTRINGS, CONST, etc.)
 } RCoreSecRange;
 
 R_VEC_TYPE (RVecRCoreSecRange, RCoreSecRange);