FIX: Coverity, Dereference null return, CID #212329, filehandle could be NULL

[proxmark3-svn] / client / cmdcrc.c

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 82b1f8b8e5d456683693726d9699f5177323d325..666b4a8e67d42c2de61377ea978be72b4d8076b3 100644 (file)
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -271,7 +271,6 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
        int ibperhx = 8, obperhx = 8;
        int rflags = 0; // search flags 
        int c;
        int ibperhx = 8, obperhx = 8;
        int rflags = 0; // search flags 
        int c;

-       unsigned long width = 0UL;

        poly_t apoly, crc;
 
        char *string;
        poly_t apoly, crc;
 
        char *string;


@@ -290,8 +289,6 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
        if(c < 0)
                return uerr("no preset models available");
 
        if(c < 0)
                return uerr("no preset models available");
 

-       // must set width so that parameter to -ipx is not zeroed 
-       width = plen(model.spoly);

        rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
        
        //set flags
        rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
        
        //set flags


@@ -430,14 +427,14 @@ int CmdrevengSearch(const char *Cmd){
                if (ans) {
                        //test for match
                        if (memcmp(result, inCRC, crcChars)==0){
                if (ans) {
                        //test for match
                        if (memcmp(result, inCRC, crcChars)==0){

-                               PrintAndLog("\nFound a match!\nModel: %s\nValue: %s\n",Models[i], result);
+                               PrintAndLog("\nFound a possible match!\nModel: %s\nValue: %s\n",Models[i], result);

                                //optional - stop searching if found...
                                found = true;
                        } else {
                                if (crcChars > 2){
                                        char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
                                        if (memcmp(swapEndian, inCRC, crcChars)==0){
                                //optional - stop searching if found...
                                found = true;
                        } else {
                                if (crcChars > 2){
                                        char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
                                        if (memcmp(swapEndian, inCRC, crcChars)==0){

-                                               PrintAndLog("\nFound a match!\nModel: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);
+                                               PrintAndLog("\nFound a possible match!\nModel: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);

                                                //optional - stop searching if found...
                                                found = true;
                                        }
                                                //optional - stop searching if found...
                                                found = true;
                                        }


@@ -451,14 +448,14 @@ int CmdrevengSearch(const char *Cmd){
                        if (ans) {
                                //test for match
                                if (memcmp(revResult, inCRC, crcChars)==0){
                        if (ans) {
                                //test for match
                                if (memcmp(revResult, inCRC, crcChars)==0){

-                                       PrintAndLog("\nFound a match!\nModel Reversed: %s\nValue: %s\n",Models[i], revResult);
+                                       PrintAndLog("\nFound a possible match!\nModel Reversed: %s\nValue: %s\n",Models[i], revResult);

                                        //optional - stop searching if found...
                                        found = true;
                                } else {
                                        if (crcChars > 2){
                                                char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
                                                if (memcmp(swapEndian, inCRC, crcChars)==0){
                                        //optional - stop searching if found...
                                        found = true;
                                } else {
                                        if (crcChars > 2){
                                                char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
                                                if (memcmp(swapEndian, inCRC, crcChars)==0){

-                                                       PrintAndLog("\nFound a match!\nModel Reversed: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);
+                                                       PrintAndLog("\nFound a possible match!\nModel Reversed: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);

                                                        //optional - stop searching if found...
                                                        found = true;
                                                }
                                                        //optional - stop searching if found...
                                                        found = true;
                                                }


@@ -473,4 +470,4 @@ int CmdrevengSearch(const char *Cmd){
        }
        if (!found) PrintAndLog("\nNo matches found\n");
        return 1;
        }
        if (!found) PrintAndLog("\nNo matches found\n");
        return 1;

-}
\ No newline at end of file
+}