]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
PSKDemod Bug Fix
authormarshmellow42 <marshmellowrf@gmail.com>
Mon, 23 Feb 2015 02:11:25 +0000 (21:11 -0500)
committermarshmellow42 <marshmellowrf@gmail.com>
Mon, 23 Feb 2015 02:11:25 +0000 (21:11 -0500)
client/cmddata.c

index 2ed5166f9df2903a9737947307fa18b8db0ee2f3..15f4d3eb442640097fb6d6f9afd8945ffa7afd76 100644 (file)
@@ -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);
   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
     //invalid carrier
-    return -1
+    return -1;
   }
   int errCnt=0;
   errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
   }
   int errCnt=0;
   errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
Impressum, Datenschutz