From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Jan 2016 19:23:44 +0000 (+0100)
Subject: FIX: earlier NULL check.
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/05e07571a43131cb8f6685a2638fa0e36f557c84?ds=inline

FIX: earlier NULL check.
---

diff --git a/client/nonce2key/crypto1.c b/client/nonce2key/crypto1.c
index e5a3fe73..ba297b8d 100644
--- a/client/nonce2key/crypto1.c
+++ b/client/nonce2key/crypto1.c
@@ -23,10 +23,11 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
 	struct Crypto1State *s = malloc(sizeof(*s));
-	s->odd = s->even = 0;	
+	if ( !s ) return NULL;
+		
 	int i;
-
-	for(i = 47;s && i > 0; i -= 2) {
+	//for(i = 47;s && i > 0; i -= 2) {
+	for(i = 47; i > 0; i -= 2) {
 		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
 		s->even = s->even << 1 | BIT(key, i ^ 7);
 	}