Merge branch 'master' of https://github.com/iceman1001/proxmark3

diff --combined client/cmdhflegic.c
index da1b20b1cd422b46f7a8a3c3a7910c5d1d3a9ffd,0adf3c596b8cf1334cbf278c3b9d4c9bed5a0cdb..731cead1097a5f80b0c56c104bfe81346b75b702
--- 1/client/cmdhflegic.c
--- 2/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@@ -527,8 -527,7 +527,7 @@@ int CmdLegicRfRawWrite(const char *Cmd
                PrintAndLog("# changing the DCF is irreversible  #");
                PrintAndLog("#####################################");
                PrintAndLog("do youe really want to continue? y(es) n(o)");             
-               scanf(" %c", &answer);
-               if (answer == 'y' || answer == 'Y') {
+               if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
                        SendCommand(&c);
                        return 0;
                }
@@@ -612,7 -611,7 +611,7 @@@ int CmdLegicCalcCrc8(const char *Cmd)
        }
        //Validations
        if (errors){
 -              if (data != NULL) free(data);
 +              if (data) free(data);
                return usage_legic_calccrc8();
        }
        
@@@ -625,7 -624,7 +624,7 @@@
                        break;
        }
        
 -      if (data != NULL) free(data);
 +      if (data) free(data);
        return 0;
  }