RzShell: refactor string, regex and byte search

binrz/rz-test/run.c

@@ -119,6 +119,7 @@ static RzSubprocessOutput *run_rz_test(RzTestRunConfig *config, ut64 timeout_ms,
 	rz_pvector_push(&args, "-escr.color=0");
 	rz_pvector_push(&args, "-escr.interactive=0");
 	rz_pvector_push(&args, "-eflirt.sigdb.load.system=false");
+	rz_pvector_push(&args, "-esearch.show_progress=false");
 	rz_pvector_push(&args, "-eflirt.sigdb.load.home=false");
 	rz_pvector_push(&args, "-N");
 	RzListIter *it;

librz/arch/asm.c

@@ -655,6 +655,7 @@ static Ase findAssembler(RzAsm *a, const char *kw) {
 		if (assemblerMatches(a, h)) {
 			if (kw) {
 				if (strstr(h->name, kw)) {
+					rz_iterator_free(iter);
 					return h->assemble;
 				}
 			} else {

librz/arch/data.c

@@ -10,8 +10,7 @@ static bool get_string(const ut8 *buf, int size, RzDetectedString **dstr, RzStrE
 	}
 
 	RzUtilStrScanOptions opt = {
-		.buf_size = size,
-		.max_uni_blocks = 4,
+		.max_str_length = size,
 		.min_str_length = 4,
 		.prefer_big_endian = big_endian,
 		.check_ascii_freq = false,

librz/arch/p/analysis/analysis_arm_cs.c

@@ -1671,7 +1671,7 @@ jmp $$ + 4 + ( [delta] * 2 )
 #endif
 		// 0x000082a8    28301be5     ldr r3, [fp, -0x28]
 		if (INSOP(1).mem.scale != -1) {
-			op->scale = INSOP(1).mem.scale << LSHIFT(1);
+			op->scale = (ut64)INSOP(1).mem.scale << LSHIFT(1);
 		}
 		op->ireg = cs_reg_name(handle, REGBASE(1));
 		op->disp = MEMDISP(1);

librz/bin/bfile_string.c

@@ -83,8 +83,7 @@ static RzList /*<RzDetectedString *>*/ *string_scan_range(SharedData *shared, co
 	size_t buffer_size = RZ_MIN(shared->buffer_size, interval_size);
 
 	RzUtilStrScanOptions scan_opt = {
-		.buf_size = buffer_size,
-		.max_uni_blocks = shared->max_uni_blocks,
+		.max_str_length = buffer_size,
 		.min_str_length = shared->min_str_length,
 		.prefer_big_endian = shared->prefer_big_endian,
 		.check_ascii_freq = shared->check_ascii_freq,
@@ -312,8 +311,7 @@ RZ_API void rz_bin_string_search_opt_init(RZ_NONNULL RzBinStringSearchOpt *opt)
 	rz_return_if_fail(opt);
 	opt->max_threads = RZ_THREAD_N_CORES_ALL_AVAILABLE;
 	opt->min_length = RZ_BIN_STRING_SEARCH_MIN_STRING;
-	opt->buffer_size = RZ_BIN_STRING_SEARCH_BUFFER_SIZE;
-	opt->max_uni_blocks = RZ_BIN_STRING_SEARCH_MAX_UNI_BLOCKS;
+	opt->max_length = RZ_BIN_STRING_SEARCH_BUFFER_SIZE;
 	opt->max_region_size = RZ_BIN_STRING_SEARCH_MAX_REGION_SIZE;
 	opt->raw_alignment = RZ_BIN_STRING_SEARCH_RAW_FILE_ALIGNMENT;
 	opt->string_encoding = RZ_STRING_ENC_GUESS;
@@ -464,9 +462,8 @@ RZ_API RZ_OWN RzPVector /*<RzBinString *>*/ *rz_bin_file_strings(RZ_NONNULL RzBi
 		.lock = lock,
 		.bf = bf,
 		.strings_db = strings_db,
-		.buffer_size = opt->buffer_size,
+		.buffer_size = opt->max_length,
 		.string_encoding = opt->string_encoding,
-		.max_uni_blocks = opt->max_uni_blocks,
 		.min_str_length = opt->min_length,
 		.check_ascii_freq = opt->check_ascii_freq,
 		.prefer_big_endian = prefer_big_endian,

librz/core/canalysis.c

@@ -75,8 +75,7 @@ static bool find_string_at(RzCore *core, RzBinObject *bobj, ut64 pointer, char *
 
 	RzStrEnc strenc = bin->str_search_cfg.string_encoding;
 	RzUtilStrScanOptions scan_opt = {
-		.buf_size = sizeof(buffer),
-		.max_uni_blocks = bin->str_search_cfg.max_uni_blocks,
+		.max_str_length = sizeof(buffer),
 		.min_str_length = bin->str_search_cfg.min_length,
 		.prefer_big_endian = core->analysis->big_endian,
 		.check_ascii_freq = bin->str_search_cfg.check_ascii_freq,

librz/core/casm.c

@@ -279,23 +279,28 @@ RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_strsearch(RzCore *core, const ch
 	ut64 usrimm2 = inp_arg ? rz_num_math(core->num, inp_arg) : usrimm;
 	if (usrimm > usrimm2) {
 		RZ_LOG_ERROR("core: Invalid range [0x%08" PFMT64x ":0x%08" PFMT64x "]\n", usrimm, usrimm2);
+		free(inp);
 		return NULL;
 	}
 
 	if (core->blocksize < 8) {
 		RZ_LOG_ERROR("core: block size is too small\n");
+		free(inp);
 		return NULL;
 	}
 	if (!(buf = (ut8 *)calloc(core->blocksize, 1))) {
+		free(inp);
 		return NULL;
 	}
 	if (!(ptr = rz_str_dup(input))) {
 		free(buf);
+		free(inp);
 		return NULL;
 	}
 	if (!(hits = rz_core_asm_hit_list_new())) {
 		free(buf);
 		free(ptr);
+		free(inp);
 		return NULL;
 	}
 	tokens[0] = NULL;
@@ -481,6 +486,7 @@ RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_strsearch(RzCore *core, const ch
 	rz_cons_break_pop();
 	rz_asm_set_pc(core->rasm, toff);
 beach:
+	free(inp);
 	free(buf);
 	free(ptr);
 	free(code);