Reduce core->block use, add more precondition guards, and help for aoc

Author: trufae

libr/arch/arch_op.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2024 - pancake, nibble, condret */
+/* radare - LGPL - Copyright 2010-2026 - pancake, nibble, condret */
 
 #include <r_arch.h>
 
@@ -16,6 +16,7 @@ R_API bool r_anal_op_set_mnemonic(RAnalOp *op, ut64 addr, const char *s) {
 }
 
 R_API bool r_anal_op_set_bytes(RAnalOp *op, ut64 addr, const ut8* data, int size) {
+	R_RETURN_VAL_IF_FAIL (op && data && size > 0, false);
 	if (op) {
 		// TODO: use maxopsz from archbits
 		op->addr = addr;

libr/arch/arch_session.c

@@ -16,6 +16,7 @@ static void _arch_session_free(RArchSession *s) {
 }
 
 R_API RArchSession *r_arch_session(RArch *arch, RArchConfig *cfg, RArchPlugin *ap) {
+	R_RETURN_VAL_IF_FAIL (arch && cfg && ap, false);
 	RArchSession *ai = R_NEW0 (RArchSession);
 	r_ref_init (ai, _arch_session_free);
 	ai->arch = arch;
@@ -35,6 +36,7 @@ R_API RArchSession *r_arch_session(RArch *arch, RArchConfig *cfg, RArchPlugin *a
 }
 
 R_API bool r_arch_session_decode(RArchSession *ai, RAnalOp *op, RArchDecodeMask mask) {
+	R_RETURN_VAL_IF_FAIL (ai && op, false);
 	RArchPluginDecodeCallback decode = R_UNWRAP3 (ai, plugin, decode);
 	if (decode != NULL) {
 		return decode (ai, op, mask);
@@ -43,6 +45,7 @@ R_API bool r_arch_session_decode(RArchSession *ai, RAnalOp *op, RArchDecodeMask
 }
 
 R_API bool r_arch_session_patch(RArchSession *ai, RAnalOp *op, RArchEncodeMask mask) {
+	R_RETURN_VAL_IF_FAIL (ai && op, false);
 	RArchPluginEncodeCallback encode = R_UNWRAP3 (ai, plugin, encode);
 	if (encode != NULL) {
 		return encode (ai, op, mask);
@@ -51,6 +54,7 @@ R_API bool r_arch_session_patch(RArchSession *ai, RAnalOp *op, RArchEncodeMask m
 }
 
 R_API bool r_arch_session_encode(RArchSession *ai, RAnalOp *op, RArchEncodeMask mask) {
+	R_RETURN_VAL_IF_FAIL (ai && op, false);
 	// TODO R2_590 use the encoder if found in the current session ai->encoder->..
 	RArchPluginEncodeCallback encode = R_UNWRAP3 (ai, plugin, encode);
 	if (encode != NULL) {
@@ -60,23 +64,19 @@ R_API bool r_arch_session_encode(RArchSession *ai, RAnalOp *op, RArchEncodeMask
 }
 
 R_API RList *r_arch_session_preludes(RArchSession *s) {
-	if (s) {
-		RArchPluginPreludesCallback preludes = R_UNWRAP3 (s, plugin, preludes);
-		if (preludes != NULL) {
-			return preludes (s);
-		}
+	R_RETURN_VAL_IF_FAIL (s, false);
+	RArchPluginPreludesCallback preludes = R_UNWRAP3 (s, plugin, preludes);
+	if (preludes != NULL) {
+		return preludes (s);
 	}
 	return NULL;
 }
 
 R_API int r_arch_session_info(RArchSession *s, int query) {
-	if (!s) {
-		return -1;
-	}
+	R_RETURN_VAL_IF_FAIL (s, -1);
 	RArchPluginInfoCallback info = R_UNWRAP3 (s, plugin, info);
 	if (info != NULL) {
 		return info (s, query);
 	}
 	return -1;
 }
-

libr/core/canal.c

@@ -973,13 +973,6 @@ static bool set_fcn_name_from_flag(RCore *core, RAnalFunction *fcn, RFlagItem *f
 			nameChanged = true;
 		}
 	}
-#if 0
-	if (!nameChanged) {
-		char *nn = r_str_newf ("%s.%08" PFMT64x, fcnpfx, fcn->addr);
-		r_anal_function_rename (fcn, nn);
-		free (nn);
-	}
-#endif
 	return nameChanged;
 }
 
@@ -1225,49 +1218,22 @@ static char *get_title(ut64 addr) {
 	return r_str_newf ("0x%"PFMT64x, addr);
 }
 
-/* decode and return the RAnalOp at the address addr */
 R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr, int mask) {
-	int len;
-	ut8 buf[32];
-	ut8 *ptr;
-
 	R_RETURN_VAL_IF_FAIL (core, NULL);
 	if (addr == UT64_MAX) {
 		return NULL;
 	}
+	ut8 buf[32];
 	RAnalOp *op = R_NEW0 (RAnalOp);
 	int maxopsz = r_anal_archinfo (core->anal, R_ARCH_INFO_MAXOP_SIZE);
-	if (sizeof (buf) < maxopsz) {
+	if (maxopsz > sizeof (buf)) {
 		maxopsz = sizeof (buf);
 	}
-	int delta = (addr - core->addr);
-	int minopsz = 8;
-	if (delta > 0 && delta + minopsz < core->blocksize && addr >= core->addr && addr + 16 < core->addr + core->blocksize) {
-		ptr = core->block + delta;
-		len = core->blocksize - delta;
-		if (len < 1) {
-			goto err_op;
-		}
-	} else {
-		if (!r_io_read_at (core->io, addr, buf, maxopsz)) {
-			goto err_op;
+	if (r_io_read_at (core->io, addr, buf, maxopsz)) {
+		if (r_anal_op (core->anal, op, addr, buf, maxopsz, mask) > 0) {
+			return op;
 		}
-		ptr = buf;
-		len = maxopsz;
 	}
-	if (r_anal_op (core->anal, op, addr, ptr, len, mask) < 1) {
-		goto err_op;
-	}
-	// TODO This code block must be deleted when all the anal plugs support disasm
-	if (!op->mnemonic && mask & R_ARCH_OP_MASK_DISASM) {
-		r_asm_set_pc (core->rasm, addr);
-		if (r_asm_disassemble (core->rasm, op, ptr, len) < 1) {
-			free (op->mnemonic);
-			op->mnemonic = strdup ("invalid");
-		}
-	}
-	return op;
-err_op:
 	r_anal_op_free (op);
 	return NULL;
 }
@@ -5088,23 +5054,21 @@ R_API RCoreAnalStats* r_core_anal_get_stats(RCore *core, ut64 from, ut64 to, ut6
 R_API void r_core_anal_stats_free(RCoreAnalStats *s) {
 	if (s) {
 		free (s->block);
+		free (s);
 	}
-	free (s);
 }
 
 R_API RList* r_core_anal_cycles(RCore *core, int ccl) {
+	R_RETURN_VAL_IF_FAIL (core, NULL);
 	RCons *cons = core->cons;
 	const bool verbose = r_config_get_b (core->config, "scr.interactive") && r_config_get_b (core->config, "scr.prompt");
 	ut64 addr = core->addr;
 	int depth = 0;
 	RAnalOp *op = NULL;
-	RAnalCycleFrame *prev = NULL, *cf = NULL;
+	RAnalCycleFrame *prev = NULL;
 	RAnalCycleHook *ch;
 	RList *hooks = r_list_new ();
-	if (!hooks) {
-		return NULL;
-	}
-	cf = r_anal_cycle_frame_new ();
+	RAnalCycleFrame *cf = r_anal_cycle_frame_new ();
 	r_cons_break_push (core->cons, NULL, NULL);
 	while (cf && !r_cons_is_breaked (cons)) {
 		if ((op = r_core_anal_op (core, addr, R_ARCH_OP_MASK_BASIC)) && (op->cycles) && (ccl > 0)) {
@@ -5305,9 +5269,9 @@ struct r_merge_ctx_t {
 /* Tests if functions are touching */
 bool fcn_merge_touch_cb(ut64 addr, struct r_merge_ctx_t *ctx) {
 	RAnalBlock *bb = r_anal_get_block_at(ctx->anal, addr);
-
-	if (!bb)
+	if (!bb) {
 		return true;
+	}
 
 	RListIter *iter;
 	RAnalFunction *fcn;
@@ -5326,9 +5290,8 @@ bool fcn_merge_touch_cb(ut64 addr, struct r_merge_ctx_t *ctx) {
 
 	// Add it to the touch list
 	if (found) {
-		r_list_append(&ctx->touch, bb);
+		r_list_append (&ctx->touch, bb);
 	}
-
 	return true;
 }
 

libr/core/cio.c

@@ -67,7 +67,6 @@ R_API int r_core_seek_base(RCore *core, const char *hex) {
 
 R_API bool r_core_dump(RCore *core, const char *file, ut64 addr, ut64 size, int append) {
 	ut64 i;
-	ut8 *buf;
 	int bs = core->blocksize;
 	FILE *fd;
 	if (append) {
@@ -84,7 +83,7 @@ R_API bool r_core_dump(RCore *core, const char *file, ut64 addr, ut64 size, int
 	if (bs > 4096) {
 		bs = 4096;
 	}
-	buf = malloc (bs);
+	ut8 *buf = malloc (bs);
 	if (!buf) {
 		R_LOG_ERROR ("Cannot alloc %d byte(s)", bs);
 		fclose (fd);

libr/core/cmd_anal.inc.c

@@ -9739,9 +9739,48 @@ static void cmd_anal_opcode_bits(RCore *core, const char *arg, int mode) {
 	}
 }
 
+static void cmd_aoc(RCore *core, const char *input) {
+	RListIter *iter;
+	RAnalCycleHook *hook;
+	char ch = input[1];
+	if (ch== '?') {
+		r_core_cmd_help_contains (core, help_msg_ao, "aoc");
+		return;
+	}
+	if (ch && ch != ' ') {
+		r_core_return_invalid_command (core, "aoc", ch);
+		return;
+	}
+	const int ccl = input[1]? r_num_math (core->num, input + 2): 0;
+	if (ccl < 0) {
+		R_LOG_ERROR ("aoc expects a positive number");
+		return;
+	}
+	RConfigHold *hc = r_config_hold_new (core->config);
+	r_config_hold (hc, "asm.cmt.right", "asm.functions", "asm.lines", "asm.xrefs", NULL);
+	r_config_set_b (core->config, "asm.cmt.right", true);
+	r_config_set_b (core->config, "asm.functions", false);
+	r_config_set_b (core->config, "asm.lines", false);
+	r_config_set_b (core->config, "asm.xrefs", false);
+
+	RList *hooks = r_core_anal_cycles (core, ccl);
+	r_list_foreach (hooks, iter, hook) {
+		char *ins = r_core_disassemble_instr (core, hook->addr, 1);
+		if (ins) {
+			size_t count = ccl - hook->cycles;
+			r_cons_printf (core->cons, "after %i cycles: %s\n", count, ins);
+			free (ins);
+		}
+	}
+	r_list_free (hooks);
+
+	r_config_hold_restore (hc);
+	r_config_hold_free (hc);
+}
+
 static void cmd_anal_opcode(RCore *core, const char *input) {
-	int l, len = core->blocksize;
 	ut32 tbs = core->blocksize;
+	int l, len = tbs;
 	r_core_block_read (core);
 	switch (input[0]) {
 	case 's': // "aos"
@@ -9857,39 +9896,8 @@ static void cmd_anal_opcode(RCore *core, const char *input) {
 		}
 		break;
 	case 'c': // "aoc"
-	{
-		RList *hooks;
-		RListIter *iter;
-		RAnalCycleHook *hook;
-		char *instr_tmp = NULL;
-		int ccl = input[1]? r_num_math (core->num, &input[2]): 0; //get cycles to look for
-		bool cr = r_config_get_b (core->config, "asm.cmt.right");
-		bool fu = r_config_get_b (core->config, "asm.functions");
-		bool li = r_config_get_b (core->config, "asm.lines");
-		bool xr = r_config_get_b (core->config, "asm.xrefs");
-
-		r_config_set_b (core->config, "asm.cmt.right", true);
-		r_config_set_b (core->config, "asm.functions", false);
-		r_config_set_b (core->config, "asm.lines", false);
-		r_config_set_b (core->config, "asm.xrefs", false);
-
-		hooks = r_core_anal_cycles (core, ccl); // analyse
-		r_list_foreach (hooks, iter, hook) {
-			instr_tmp = r_core_disassemble_instr (core, hook->addr, 1);
-			if (instr_tmp) {
-				r_cons_printf (core->cons, "After %4i cycles:\t%s", (ccl - hook->cycles), instr_tmp);
-				r_cons_flush (core->cons);
-				free (instr_tmp);
-			}
-		}
-		r_list_free (hooks);
-
-		r_config_set_b (core->config, "asm.cmt.right", cr); //reset settings
-		r_config_set_b (core->config, "asm.functions", fu);
-		r_config_set_b (core->config, "asm.lines", li);
-		r_config_set_b (core->config, "asm.xrefs", xr);
-	}
-	break;
+		cmd_aoc (core, input);
+		break;
 	case 'd': // "aod"
 		if (input[1] == 'a') { // "aoda"
 			// list sdb database

libr/core/cmd_print.inc.c

@@ -1176,7 +1176,6 @@ static void cmd_prc_zoom(RCore *core, const char *input) {
 	RVecRIORegion *regions = NULL;
 	RIORegion *region = NULL;
 	size_t region_idx = 0;
-	ut8 *block = core->block;
 	int len = core->blocksize;
 	if (show_unalloc && core->io->va) {
 		RInterval itv = { core->addr, (ut64)len };
@@ -1200,7 +1199,7 @@ static void cmd_prc_zoom(RCore *core, const char *input) {
 		}
 	} else {
 		from = core->addr;
-		to = from + core->blocksize;
+		to = from + len;
 	}
 	if (list) {
 		r_list_free (list);
@@ -1209,7 +1208,7 @@ static void cmd_prc_zoom(RCore *core, const char *input) {
 
 	core->print->zoom->mode = (input && *input)? input[1]: 'e';
 	r_print_zoom_buf (core->print, printzoomcallback, core, from, to, len, len);
-	block = core->print->zoom->buf;
+	ut8 *block = core->print->zoom->buf;
 
 	for (i = 0; i < len; i += cols) {
 		ut64 ea = core->addr + i;