From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 23 Feb 2015 02:11:25 +0000 (-0500)
Subject: PSKDemod Bug Fix
X-Git-Tag: show~6^2~14
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/ec9882b18c9e12a60bb0face34ea4bcc072c2dfb

PSKDemod Bug Fix
---

diff --git a/client/cmddata.c b/client/cmddata.c
index 2ed5166f..15f4d3eb 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1492,9 +1492,9 @@ int PSKDemod(const char *Cmd, bool verbose)
   size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return -1;
   uint8_t carrier=countPSK_FC(BitStream, BitLen);
-  if (carrier!=2 && carrier!=4 || carrier!=8){
+  if (carrier!=2 && carrier!=4 && carrier!=8){
     //invalid carrier
-    return -1
+    return -1;
   }
   int errCnt=0;
   errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);