Fix last covs in rbin

radareorg · Nov 1, 2017 · 7040985 · 7040985
1 parent 93e4092
commit 7040985
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
@@ -705,7 +705,7 @@ static Sdb *store_versioninfo_gnu_verdef(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
 		return false;
 	}
 	link_shdr = &bin->shdr[shdr->sh_link];
-	if (shdr->sh_size < 1 || shdr->sh_size > SIZE_MAX) {
+	if ((int)shdr->sh_size < 1) {
 		return false;
 	}
 	Elf_(Verdef) *defs = calloc (shdr->sh_size, sizeof (char));
@@ -837,7 +837,7 @@ static Sdb *store_versioninfo_gnu_verneed(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
 	if (shdr->sh_link > bin->ehdr.e_shnum) {
 		return NULL;
 	}
-	if (shdr->sh_size < 1 || shdr->sh_size > SIZE_MAX) {
+	if ((int)shdr->sh_size < 1) {
 		return NULL;
 	}
 	sdb = sdb_new0 ();

diff --git a/libr/bin/p/bin_nro.c b/libr/bin/p/bin_nro.c
@@ -152,7 +152,7 @@ static bool load(RBinFile *bf) {
 	const ut64 sz = r_buf_size (bf->buf);
 	const ut64 la = bf->o->loadaddr;
 	const ut8 *bytes = r_buf_buffer (bf->buf);
-	bf->o->bin_obj = load_bytes (bf, bytes, sz, la, bf? bf->sdb: NULL);
+	bf->o->bin_obj = load_bytes (bf, bytes, sz, la, bf->sdb);
 	return bf->o->bin_obj != NULL;
 }
 

diff --git a/libr/bin/p/bin_sfc.c b/libr/bin/p/bin_sfc.c
@@ -39,11 +39,11 @@ static RBinInfo* info(RBinFile *bf) {
 	sfc_int_hdr sfchdr = {{0}};
 	RBinInfo *ret = NULL;
 	int hdroffset = 0;
-
+#if THIS_IS_ALWAYS_FALSE_WTF
 	if ((bf->size & 0x8000) == 0x200) {
 		hdroffset = 0x200;
 	}
-
+#endif
 	int reat = r_buf_read_at (bf->buf, 0x7FC0 + hdroffset,
 		(ut8*)&sfchdr, SFC_HDR_SIZE);
 	if (reat != SFC_HDR_SIZE) {
@@ -119,12 +119,12 @@ static RList* sections(RBinFile *bf) {
 	int hdroffset = 0;
 	bool is_hirom = false;
 	int i = 0; //0x8000-long bank number for loops
-
+#if THIS_IS_ALWAYS_FALSE_WTF
 	if ((bf->size & 0x8000) == 0x200) {
 		hdroffset = 0x200;
 	}
-	sfc_int_hdr sfchdr;
-	memset (&sfchdr, 0, SFC_HDR_SIZE);
+#endif
+	sfc_int_hdr sfchdr = {0};
 
 	int reat = r_buf_read_at (bf->buf, 0x7FC0 + hdroffset, (ut8*)&sfchdr, SFC_HDR_SIZE);
 	if (reat != SFC_HDR_SIZE) {