Fix radareorg#266 - [ragg2] exit on invalid input (again)

ReverseLab · Oct 28, 2013 · d900345 · d900345
1 parent d9724df
commit d900345
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/binr/ragg2/ragg2.c b/binr/ragg2/ragg2.c
@@ -221,6 +221,8 @@ int main(int argc, char **argv) {
 		case 'v':
 			printf ("ragg2 "R2_VERSION" "R2_INCDIR"/sflib\n");
 			return 0;
+		default:
+			return 1;
 		}
 	}
 

diff --git a/libr/util/hex.c b/libr/util/hex.c
@@ -61,6 +61,8 @@ R_API int r_hex_str2bin(const char *in, ut8 *out) {
 	const char *ptr;
 	ut8 c = 0, d = 0;
 
+	if (!in || !*in)
+		return 0;
 	if (!memcmp (in, "0x", 2))
 		in += 2;
 	for (ptr = in; ; ptr++) {