Merge branch 'dev' into modify-pr-command

rizinorg · Nov 23, 2023 · 5e4ee76 · 5e4ee76
2 parents 77a1901 + 78461f4
commit 5e4ee76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/librz/core/cbin.c b/librz/core/cbin.c
@@ -4534,7 +4534,7 @@ RZ_API bool rz_core_bin_raise(RzCore *core, ut32 bfid) {
 	if (bf) {
 		rz_io_use_fd(core->io, bf->fd);
 	}
-	return bf && rz_core_bin_apply_all_info(core, bf) && rz_core_block_read(core);
+	return bf && rz_core_bin_apply_all_info(core, bf) && rz_core_block_read(core) > 0;
 }
 
 /**
@@ -4550,7 +4550,7 @@ RZ_API bool rz_core_binfiles_delete(RzCore *core, RzBinFile *bf) {
 	if (bf) {
 		rz_io_use_fd(core->io, bf->fd);
 	}
-	return bf && rz_core_bin_apply_all_info(core, bf) && rz_core_block_read(core);
+	return bf && rz_core_bin_apply_all_info(core, bf) && rz_core_block_read(core) > 0;
 }
 
 static void core_bin_file_print(RzCore *core, RzBinFile *bf, RzCmdStateOutput *state) {

diff --git a/librz/core/core.c b/librz/core/core.c
@@ -2782,16 +2782,11 @@ RZ_API bool rz_core_block_size(RzCore *core, ut32 bsize) {
 	ut8 *bump;
 	if (bsize == core->blocksize) {
 		return true;
-	}
-	if (bsize > core->blocksize_max) {
-		RZ_LOG_ERROR("Block size %d is too big\n", bsize);
-		return false;
-	}
-	if (bsize < 1) {
+	} else if (bsize < 1) {
 		bsize = 1;
 	} else if (core->blocksize_max && bsize > core->blocksize_max) {
-		RZ_LOG_ERROR("block size is bigger than its max (check `bm` command). set to 0x%x\n", core->blocksize_max);
-		bsize = core->blocksize_max;
+		RZ_LOG_ERROR("block size is bigger than its max 0x%x (check `bm` command)\n", core->blocksize_max);
+		return false;
 	}
 	bump = realloc(core->block, bsize + 1);
 	if (!bump) {