From 381d86de2a368d31fea7176c08e18b40b297c854 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Thu, 17 Jul 2014 05:49:20 +0200
Subject: [PATCH] Fix null deref and bad indent

---
 binr/rabin2/rabin2.c | 3 +--
 libr/bin/p/bin_elf.c | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/binr/rabin2/rabin2.c b/binr/rabin2/rabin2.c
index b6c19de885..39411e1378 100644
--- a/binr/rabin2/rabin2.c
+++ b/binr/rabin2/rabin2.c
@@ -491,9 +491,8 @@ int main(int argc, char **argv) {
 			datalen = 0;
 		}
 		code = malloc (strlen (p)+1);
-		if (!code) {
+		if (!code)
 		    return 1;
-	    }
 		codelen = r_hex_str2bin (p, code);
 		if (!arch) arch = "x86";
 		if (!bits) bits = 32;
diff --git a/libr/bin/p/bin_elf.c b/libr/bin/p/bin_elf.c
index 26a5158f9d..2477300224 100644
--- a/libr/bin/p/bin_elf.c
+++ b/libr/bin/p/bin_elf.c
@@ -591,8 +591,10 @@ static RBuffer* create(RBin* bin, const ut8 *code, int codelen, const ut8 *data,
 	ut16 ehdrsz, phdrsz;
 	ut32 p_vaddr, p_paddr, p_fs, p_fs2;
 	ut32 baddr;
-	int is_arm = !strcmp (bin->cur->o->info->arch, "arm");
+	int is_arm = 0;
 	RBuffer *buf = r_buf_new ();
+	if (bin && bin->cur && bin->cur->o && bin->cur->o->info)
+		is_arm = !strcmp (bin->cur->o->info->arch, "arm");
 	// XXX: hardcoded
 	if (is_arm) {
 		baddr = 0x40000;