Enlarge symbol name limits aligned to flag sizes ##bin

Author: trufae

libr/anal/fcn.c

@@ -19,9 +19,6 @@
 /* speedup analysis by removing some function overlapping checks */
 #define JAYRO_04 1
 
-// 16 KB is the maximum size for a basic block
-#define MAX_FLG_NAME_SIZE 64
-
 #define FIX_JMP_FWD 0
 #define D if (a->verbose)
 

libr/bin/format/elf/elf_specs.h

@@ -58,7 +58,7 @@
 #ifndef _INCLUDE_ELF_SPECS_H
 #define _INCLUDE_ELF_SPECS_H
 
-#define ELF_STRING_LENGTH 256
+#define ELF_STRING_LENGTH 512
 
 // not strictly ELF, but close enough:
 #define        CGCMAG          "\177CGC"

libr/bin/format/objc/mach0_classes.c

@@ -6,7 +6,8 @@
 #include "mach0_classes.h"
 
 #define RO_META (1 << 0)
-#define MAX_CLASS_NAME_LEN 256
+// should be aligned to R_FLAG_NAME_SIZE i guess
+#define MAX_CLASS_NAME_LEN 512
 #define MAX_SWIFT_MEMBERS 256
 
 #ifdef R_BIN_MACH064

libr/core/cbin.c

@@ -2347,8 +2347,6 @@ static const char *symbol_flag_prefix(RBinSymbol *sym) {
 	return "sym";
 }
 
-#define MAXFLAG_LEN_DEFAULT 128
-
 static char *construct_symbol_flagname(const char *pfx, const char *libname, const char *symname, int len) {
 	char *s = r_str_newf ("%s.%s%s%s", pfx, r_str_get (libname), libname ? "_" : "", symname);
 	if (s) {
@@ -2390,12 +2388,12 @@ static void snInit(RCore *core, SymName *sn, RBinSymbol *sym, const char *lang,
 		resymname = r_str_newf ("%s_%d", sym_name, sym->dup_count);
 		symname = resymname;
 	}
-	sn->nameflag = construct_symbol_flagname (pfx, sym->libname, symname, MAXFLAG_LEN_DEFAULT);
+	sn->nameflag = construct_symbol_flagname (pfx, sym->libname, symname, R_FLAG_NAME_SIZE);
 	free (resymname);
 	if (R_STR_ISNOTEMPTY (sym->classname)) {
 		sn->classname = strdup (sym->classname);
 		sn->classflag = r_str_newf ("sym.%s.%s", sn->classname, sn->name);
-		r_name_filter (sn->classflag, MAXFLAG_LEN_DEFAULT);
+		r_name_filter (sn->classflag, R_FLAG_NAME_SIZE);
 		sn->methname = r_str_newf ("%s::%s", sn->classname, sym_name);
 		sn->methflag = r_str_newf ("sym.%s.%s", sn->classname, sym_name);
 		r_name_filter (sn->methflag, strlen (sn->methflag));
@@ -2715,7 +2713,7 @@ static bool bin_symbols(RCore *core, PJ *pj, int mode, ut64 laddr, int va, ut64
 				lastfs = 's';
 			}
 			if (core->bin->prefix || *n) { // we don't want unnamed symbol flags
-				char *flagname = construct_symbol_flagname ("sym", sn.libname, n, MAXFLAG_LEN_DEFAULT);
+				char *flagname = construct_symbol_flagname ("sym", sn.libname, n, R_FLAG_NAME_SIZE);
 				if (!flagname) {
 					goto next;
 				}

test/db/formats/dwarf

@@ -733,28 +733,28 @@ colu: 1
 addr: 0x00001176
 EOF
 EXPECT_ERR=<<EOF
-DEBUG: [cbin.c:3404] (section .dynsym) Cd 8[21] @ 0x3d8
-DEBUG: [cbin.c:3404] (section .dynstr) Css 141 @ 0x480
-DEBUG: [cbin.c:3404] (section .rela.dyn) Cd 8[24] @ 0x550
-DEBUG: [cbin.c:3404] (section .rela.plt) Cd 8[3] @ 0x610
-DEBUG: [cbin.c:3404] (section .init_array) Cd 8[1] @ 0x3db8
-DEBUG: [cbin.c:3404] (section .fini_array) Cd 8[1] @ 0x3dc0
-DEBUG: [cbin.c:3404] (section .dynamic) Cd 8[62] @ 0x3dc8
-DEBUG: [cbin.c:3404] (section .got) Cd 8[9] @ 0x3fb8
-DEBUG: [cbin.c:3404] (section .dynsym) Cd 8[21] @ 0x3d8
-DEBUG: [cbin.c:3404] (section .dynstr) Css 141 @ 0x480
-DEBUG: [cbin.c:3404] (section .rela.dyn) Cd 8[24] @ 0x550
-DEBUG: [cbin.c:3404] (section .rela.plt) Cd 8[3] @ 0x610
-DEBUG: [cbin.c:3404] (section .init_array) Cd 8[1] @ 0x3db8
-DEBUG: [cbin.c:3404] (section .fini_array) Cd 8[1] @ 0x3dc0
-DEBUG: [cbin.c:3404] (section .dynamic) Cd 8[62] @ 0x3dc8
-DEBUG: [cbin.c:3404] (section .got) Cd 8[9] @ 0x3fb8
+DEBUG: [cbin.c:3402] (section .dynsym) Cd 8[21] @ 0x3d8
+DEBUG: [cbin.c:3402] (section .dynstr) Css 141 @ 0x480
+DEBUG: [cbin.c:3402] (section .rela.dyn) Cd 8[24] @ 0x550
+DEBUG: [cbin.c:3402] (section .rela.plt) Cd 8[3] @ 0x610
+DEBUG: [cbin.c:3402] (section .init_array) Cd 8[1] @ 0x3db8
+DEBUG: [cbin.c:3402] (section .fini_array) Cd 8[1] @ 0x3dc0
+DEBUG: [cbin.c:3402] (section .dynamic) Cd 8[62] @ 0x3dc8
+DEBUG: [cbin.c:3402] (section .got) Cd 8[9] @ 0x3fb8
+DEBUG: [cbin.c:3402] (section .dynsym) Cd 8[21] @ 0x3d8
+DEBUG: [cbin.c:3402] (section .dynstr) Css 141 @ 0x480
+DEBUG: [cbin.c:3402] (section .rela.dyn) Cd 8[24] @ 0x550
+DEBUG: [cbin.c:3402] (section .rela.plt) Cd 8[3] @ 0x610
+DEBUG: [cbin.c:3402] (section .init_array) Cd 8[1] @ 0x3db8
+DEBUG: [cbin.c:3402] (section .fini_array) Cd 8[1] @ 0x3dc0
+DEBUG: [cbin.c:3402] (section .dynamic) Cd 8[62] @ 0x3dc8
+DEBUG: [cbin.c:3402] (section .got) Cd 8[9] @ 0x3fb8
 WARN: [cbin.c:1943] Relocs has not been applied. Please use `-e bin.relocs.apply=true` or `-e bin.cache=true` next time
-DEBUG: [cbin.c:2632] Cannot resolve symbol address __libc_start_main
-DEBUG: [cbin.c:2632] Cannot resolve symbol address _ITM_deregisterTMCloneTable
-DEBUG: [cbin.c:2632] Cannot resolve symbol address __gmon_start__
-DEBUG: [cbin.c:2632] Cannot resolve symbol address _ITM_registerTMCloneTable
-DEBUG: [cbin.c:2632] Cannot resolve symbol address __cxa_finalize
+DEBUG: [cbin.c:2630] Cannot resolve symbol address __libc_start_main
+DEBUG: [cbin.c:2630] Cannot resolve symbol address _ITM_deregisterTMCloneTable
+DEBUG: [cbin.c:2630] Cannot resolve symbol address __gmon_start__
+DEBUG: [cbin.c:2630] Cannot resolve symbol address _ITM_registerTMCloneTable
+DEBUG: [cbin.c:2630] Cannot resolve symbol address __cxa_finalize
 EOF
 RUN