Fix #16455 - iij asserts for ld-uclibc with a null import ##bin (#1…

…6509) * Fix asserts in `iij` for ld-uclibc with a null import ##bin * Add test for `iij` on ld-uclibc
radareorg · Apr 10, 2020 · af51074 · af51074
1 parent 388df51
commit af51074
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/libr/core/cbin.c b/libr/core/cbin.c
@@ -1849,13 +1849,16 @@ static int bin_imports(RCore *r, int mode, int va, const char *name) {
 			str = r_str_replace (str, "\"", "\\\"", 1);
 
 			pj_ki (pj, "ordinal", import->ordinal);
-			pj_ks (pj, "bind", import->bind);
-			pj_ks (pj, "type", import->type);
+			if (import->bind) {
+				pj_ks (pj, "bind", import->bind);
+			}
+			if (import->type) {
+				pj_ks (pj, "type", import->type);
+			}
 			if (import->classname && import->classname[0]) {
 				pj_ks (pj, "classname", import->classname);
 				pj_ks (pj, "descriptor", import->descriptor);
 			}
-
 			pj_ks (pj, "name", str);
 			if (libname) {
 				pj_ks (pj, "libname", libname);

diff --git a/test/new/db/formats/elf/crash b/test/new/db/formats/elf/crash
@@ -13,3 +13,19 @@ EXPECT=<<EOF
 
 EOF
 RUN
+
+NAME=ELF: ld-uclibc
+FILE=../bins/elf/ld-uClibc-0.9.33.2.so
+CMDS=<<EOF
+ii
+iij
+EOF
+EXPECT=<<EOF
+[Imports]
+nth vaddr      bind type lib name
+---------------------------------
+0   0x00000000 NONE NONE     
+
+[{"ordinal":0,"name":"","plt":0}]
+EOF
+RUN