Fix short jmp assemble in x86.nz, add rasm2 -O <outputfile>

Author: radare

TODO.md

@@ -6,13 +6,12 @@
 
 0.9.8
 =====
-* Rename anal.plugin into anal.arch ??? to keep in sync with asm.arch
-* use __unused if available
+--> add test * pdr doesnt works well with antidisasm tricks
+* option to disable aslr in rarun2?
 * rafind2 : add support for unicode/widestring search
 * .dr- # documented... but not working
 * libr/debug/p/drx.c <- not used .. debug must have a hw reg api for drx and gpio
 * ah -> add hint to define calls that do not return
-* pdr doesnt works well with antidisasm tricks, wtf
 * continue execution until condition happen (reg, mem, ..)
 * rabin2 -x should not work on non-fatmach0 files
 * foldable stuff .. was in r1..redo?
@@ -30,10 +29,6 @@
 * refactor vmenus.c -> refresh function must be redefined for each menu
 // show hints for
     0x100005eca     ff2540130000     jmp qword [rip+0x1340] [1]             
-* bar for cursor?
-* p= show entropy of current block
-  - show number of occurrences for each byte
-  - maybe in 'ad' command, analyze data
 * highlight search hits in hexdump
 * Implement debugger backtrace properly
 * p7 : 7bit encoding (sms)

binr/rasm2/rasm2.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2013 - pancake, nibble */
+/* radare - LGPL - Copyright 2009-2014 - pancake, nibble */
 
 #include <stdio.h>
 #include <string.h>
@@ -44,6 +44,7 @@ static int rasm_show_help(int v) {
 		" -l [len]     Input/Output length\n"
 		" -L           List supported asm plugins\n"
 		" -o [offset]  Set start address for code (default 0)\n"
+		" -O [file]    Output file name (rasm2 -Bf a.asm -O a)\n"
 		" -s [syntax]  Select syntax (intel, att)\n"
 		" -B           Binary input/output (-l is mandatory for binary input)\n"
 		" -v           Show version information\n"
@@ -165,7 +166,7 @@ int main(int argc, char *argv[]) {
 	char buf[R_ASM_BUFSIZE];
 	char *arch = NULL, *file = NULL, *filters = NULL, *kernel = NULL, *cpu = NULL;
 	ut64 offset = 0;
-	int dis = 0, ascii = 0, bin = 0, ret = 0, bits = 32, c, whatsop = 0;
+	int fd =-1, dis = 0, ascii = 0, bin = 0, ret = 0, bits = 32, c, whatsop = 0;
 	ut64 len = 0, idx = 0, skip = 0;
 
 	a = r_asm_new ();
@@ -182,7 +183,7 @@ int main(int argc, char *argv[]) {
 
 	r_asm_use (a, R_SYS_ARCH);
 	r_asm_set_big_endian (a, R_FALSE);
-	while ((c = getopt (argc, argv, "i:k:DCc:eva:b:s:do:Bl:hLf:F:w")) != -1) {
+	while ((c = getopt (argc, argv, "i:k:DCc:eva:b:s:do:Bl:hLf:F:wO:")) != -1) {
 		switch (c) {
 		case 'k':
 			kernel = optarg;
@@ -219,6 +220,11 @@ int main(int argc, char *argv[]) {
 		case 'o':
 			offset = r_num_math (NULL, optarg);
 			break;
+		case 'O':
+			fd = open (optarg, O_TRUNC|O_RDWR|O_CREAT, 0644);
+			if (fd != -1)
+				dup2 (fd, 1);
+			break;
 		case 'B':
 			bin = 1;
 			break;
@@ -345,7 +351,7 @@ int main(int argc, char *argv[]) {
 				else ret = rasm_asm (buf, offset, length, a->bits, bin);
 				idx += ret;
 				offset += ret;
-				if (!ret) return 0;
+				if (!ret) goto beach;
 			} while (!len || idx<length);
 			return idx;
 		}
@@ -365,7 +371,10 @@ int main(int argc, char *argv[]) {
 				a->bits, ascii, bin, dis-1);
 		} else ret = rasm_asm (argv[optind], offset, len, a->bits, bin);
 		if (!ret) eprintf ("invalid\n");
-		return !ret;
+		ret = !!!ret;
 	}
-	return 0;
+beach:
+	if (fd != -1)
+		close (fd);
+	return ret;
 }

libr/asm/p/asm_x86_nz.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2013 - pancake */
+/* Copyright (C) 2008-2014 - pancake */
 
 #include <stdio.h>
 #include <string.h>
@@ -920,11 +920,11 @@ static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
 					return -1;
 				}
 			} else {
-				st64 dst = getnum (a, arg) - offset;
+				st64 dst = getnum (a, arg); // - offset;
 				ut32 addr = dst;
 				ut8 *ptr = (ut8 *)&addr;
 
-				if (dst+offset == 0 && *arg != '0') {
+				if (dst == 0 && *arg != '0') {
 					data[l++] = '\xff';
 					data[l] = getreg (arg) | 0xe0;
 					if (data[l] != 0xff)
@@ -942,7 +942,7 @@ static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
 				if (dst>-0x80 && dst<0x7f) {
 					/* relative byte address */
 					data[l++] = 0xeb;
-					data[l++] = (char)(addr-offset-2);
+					data[l++] = (char)(dst-2);
 					return l;
 				} else {
 					/* absolute address */

libr/socket/socket.c

@@ -299,12 +299,12 @@ R_API int r_socket_listen (RSocket *s, const char *port, const char *certfile) {
 		return R_FALSE;
 	linger.l_onoff = 1;
 	linger.l_linger = 1;
-	setsockopt (s->fd, SOL_SOCKET, SO_LINGER, (const char *)&linger, sizeof (linger));
+	setsockopt (s->fd, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof (linger));
 	{ // fix close after write bug //
 	int x = 1500;
-	setsockopt (s->fd, SOL_SOCKET, SO_SNDBUF, (const char *)&x, sizeof (int));
+	setsockopt (s->fd, SOL_SOCKET, SO_SNDBUF, (void*)&x, sizeof (int));
 	}
-	setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval);
+	setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof optval);
 	memset (&s->sa, 0, sizeof (s->sa));
 	s->sa.sin_family = AF_INET;
 	s->sa.sin_addr.s_addr = htonl (s->local? INADDR_LOOPBACK: INADDR_ANY);

libr/util/sys.c

@@ -366,14 +366,11 @@ R_API int r_sys_cmd_str_full(const char *cmd, const char *input, char **output,
 			return R_FALSE;
 		}
 
-		if (output) {
-			*output = outputptr;
-		} else if (outputptr) {
-			free(outputptr);
-		}
+		if (output) *output = outputptr;
+		else free (outputptr);
 		return R_TRUE;
 	}
-	free(outputptr);
+	free (outputptr);
 	return R_FALSE;
 }
 #elif __WINDOWS__