Fix iOS build, crashes in reflines, analysis issues on OSX debugger and more!

Author: radare

libr/anal/reflines.c

@@ -72,7 +72,7 @@ R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal,
 					goto __next;
 				list2 = R_NEW (RAnalRefline);
 				if (!list2) {
-					eprintf ("not enough memory in %s - %s", __FILE__, __LINE__); 
+					eprintf ("not enough memory in %s - %d", __FILE__, __LINE__);
 					free_refline_list (&(list->list));
 					return NULL;
 				}
@@ -97,7 +97,7 @@ R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal,
 								continue;
 							list2 = R_NEW (RAnalRefline);
 							if (!list2) {
-								eprintf ("not enough memory in %s - %s", __FILE__, __LINE__); 
+								eprintf ("not enough memory in %s - %d", __FILE__, __LINE__);
 								free_refline_list (&(list->list));
 								return NULL;
 							}
@@ -170,7 +170,7 @@ R_API struct r_anal_refline_t *r_anal_reflines_fcn_get( struct r_anal_t *anal, R
 
 			list2 = R_NEW0 (RAnalRefline);
 			if (!list2) {
-				eprintf ("not enough memory in %s - %s", __FILE__, __LINE__); 
+				eprintf ("not enough memory in %s - %d", __FILE__, __LINE__);
 				free_refline_list (&(list->list));
 				return NULL;
 			}
@@ -192,7 +192,7 @@ R_API struct r_anal_refline_t *r_anal_reflines_fcn_get( struct r_anal_t *anal, R
 							continue;
 						list2 = R_NEW (RAnalRefline);
 						if (!list2){
-							eprintf ("not enough memory in %s - %s", __FILE__, __LINE__); 
+							eprintf ("not enough memory in %s - %d", __FILE__, __LINE__);
 							free_refline_list (&(list->list));
 							return NULL;
 						}

libr/bin/mangling/microsoft_demangle.c

@@ -410,7 +410,7 @@ int get_namespace_and_name(	char *buf, STypeCodeStr *type_code_str,
 		r_list_append(names_l, str_info);
 
 		read_len += len;
-		if ((len == 1)) {
+		if (len == 1) {
 			if (*(prev_pos + 1) == '@') {
 				prev_pos = curr_pos;
 			} else {

libr/cons/utf8.c

@@ -17,6 +17,7 @@
 #define UTF8_DETECT_LOCALE 0
 #define UTF8_DETECT_CURSOR 0
 
+#if UTF8_DETECT_CURSOR
 static inline int rd(const int fd) {
 	unsigned char   buffer[4];
 	ssize_t         n;
@@ -61,6 +62,7 @@ static inline int wr(const int fd, const char *const data, const size_t bytes) {
 
 	return 0;
 }
+#endif
 
 /* Return a new file descriptor to the current TTY.
  */

libr/core/core.c

@@ -1443,7 +1443,7 @@ R_API int r_core_serve(RCore *core, RIODesc *file) {
 					strcpy ((char*)buf, "/tmp/.out");
 					pipefd = r_cons_pipe_open ((const char *)buf, 1, 0);
 					//eprintf("SYSTEM(%s)\n", ptr+6);
-					system ((const char*)ptr+6);
+					r_sandbox_system ((const char*)ptr+6, 1);
 					r_cons_pipe_close (pipefd);
 					{
 						FILE *fd = r_sandbox_fopen((char*)buf, "r");

libr/debug/p/debug_native.c

@@ -489,9 +489,11 @@ static int r_debug_native_continue(RDebug *dbg, int pid, int tid, int sig) {
 	return tid;
 #elif __APPLE__
 #if __arm__
-	int i, ret, status;
-	thread_array_t inferior_threads = NULL;
-	unsigned int inferior_thread_count = 0;
+	return 1;
+#if 0
+	//int i, ret, status;
+	//thread_array_t inferior_threads = NULL;
+	//unsigned int inferior_thread_count = 0;
 
 // XXX: detach is noncontrollable continue
         ptrace (PT_DETACH, pid, 0, 0);
@@ -513,7 +515,7 @@ static int r_debug_native_continue(RDebug *dbg, int pid, int tid, int sig) {
         for (i = 0; i < inferior_thread_count; i++)
 		thread_resume (inferior_threads[i]);
 */
-	return 1;
+#endif
 #else
 	//ut64 rip = r_debug_reg_get (dbg, "pc");
 	void *data = (void*)(size_t)((sig != -1)?sig: dbg->signum);
@@ -1472,7 +1474,7 @@ static int r_debug_native_reg_write(RDebug *dbg, int type, const ut8* buf, int s
 		thread_array_t inferior_threads = NULL;
 		unsigned int inferior_thread_count = 0;
 		R_DEBUG_REG_T *regs = (R_DEBUG_REG_T*)buf;
-		unsigned int gp_count = R_DEBUG_STATE_SZ;
+		mach_msg_type_number_t gp_count = R_DEBUG_STATE_SZ;
 
 		ret = task_threads (pid_to_task (pid),
 			&inferior_threads, &inferior_thread_count);
@@ -1510,7 +1512,8 @@ static int r_debug_native_reg_write(RDebug *dbg, int type, const ut8* buf, int s
 			}
 #else
 			ret = thread_set_state (inferior_threads[tid],
-					R_DEBUG_STATE_T, (thread_state_t) regs, &gp_count);
+				R_DEBUG_STATE_T, (thread_state_t) regs,
+				gp_count);
 #endif
 //if (thread_set_state (inferior_threads[0], R_DEBUG_STATE_T, (thread_state_t) regs, gp_count) != KERN_SUCCESS)
 			if (ret != KERN_SUCCESS) {

libr/io/p/io_debug.c

@@ -34,7 +34,6 @@ static void my_io_redirect (RIO *io, const char *ref, const char *file) {
 
 #if __APPLE__
 #include <spawn.h>
-#include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <mach/exception_types.h>

libr/io/p/io_mach.c

@@ -10,9 +10,6 @@
 
 #define EXCEPTION_PORT 0
 
-#include <sys/ptrace.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <mach/exception_types.h>
 #include <mach/mach_vm.h>
 #include <mach/mach_init.h>
@@ -28,6 +25,8 @@
 #include <mach-o/nlist.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/wait.h>
 #include <errno.h>
 

libr/util/sandbox.c

@@ -68,7 +68,29 @@ R_API int r_sandbox_enable (int e) {
 
 R_API int r_sandbox_system (const char *x, int n) {
 	if (!enabled) {
+#if __IPHONE_8_0
+		#include <spawn.h>
+		if (n) {
+			int pid, argc;
+			char **argv = r_str_argv (x, &argc);
+			if (argv) {
+				char *argv0 = r_file_path (argv[0]);
+				if (!argv0) {
+					eprintf ("Cannot find '%s'\n", argv[0]);
+					return -1;
+				}
+				posix_spawn(&pid, argv0, NULL, NULL, argv, NULL);
+				waitpid(pid, NULL, 0);
+				r_str_argv_free (argv);
+				free (argv0);
+			} else {
+				eprintf ("Error parsing command arguments\n");
+				return -1;
+			}
+		}
+#else
 		if (n) return system (x);
+#endif
 		return execl ("/bin/sh", "sh", "-c", x, (const char*)NULL);
 	}
 	eprintf ("sandbox: system call disabled\n");

shlr/Makefile

@@ -187,6 +187,5 @@ CAPSTONE_CFLAGS=-g
 capstone-build: capstone
 	cd capstone && CFLAGS="-Dmips=mips ${CAPSTONE_CFLAGS} $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		$(MAKE) CC="$(CC)" AR_EXT=a IS_CYGWIN=0 CAPSTONE_STATIC=yes CAPSTONE_SHARED=no \
-		RANLIB="$(RANLIB)" AR="$(AR)" IS_MINGW=0 \
-		./libcapstone.a
+		RANLIB="$(RANLIB)" AR="$(AR)" IS_MINGW=0 ./libcapstone.a
 endif

shlr/gdb/Makefile

@@ -14,6 +14,7 @@ MINOR=1
 LD=$(CC)
 LDFLAGS+=-L${LIBR}/socket -lr_socket
 LDFLAGS+=-L${LIBR}/util -lr_util
+LDFLAGS+=../zip/librz.a
 #OSTYPE=windows
 include ../../libr/socket/deps.mk
 

sys/ios-sdk-gcc

@@ -1,7 +1,14 @@
 #!/bin/sh
-export PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH
 
 CWD="$(dirname "$0")"
+CC="xcrun --sdk iphoneos gcc -arch armv7 -I${CWD}/ios-include"
+#echo ${CC} "${CFLAGS}" "${LDFLAGS}" $*
+#exec ${CC} ${CFLAGS} ${LDFLAGS} $*
+exec ${CC} $*
+exit 1
+
+export PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH
+
 #CPU="armv7 arm64"
 if [ -z "${CPU}" ]; then
 	CPU=armv7