Applied Holiman's fixes for iclass.c and CSNs

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index b35ba63c8cf0a7c0ed1aad2a27ed3dff8936d878..0641f9c87d7fbdc7fe786f0d47a6d89a8850d130 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -137,9 +137,11 @@ int getCommand(UsbCommand* response)
  * @return true if command was returned, otherwise false
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
-  
+
+  UsbCommand resp;
+       
   if (response == NULL) {
-    UsbCommand resp;
+
     response = &resp;
   }
 
@@ -196,10 +198,9 @@ void UsbCommandReceived(UsbCommand *UC)
   switch(UC->cmd) {
       // First check if we are handling a debug message
     case CMD_DEBUG_PRINT_STRING: {
-      char s[USB_CMD_DATA_SIZE+1];
+      char s[USB_CMD_DATA_SIZE+1] = {0x00};
       size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
       memcpy(s,UC->d.asBytes,len);
-      s[len] = 0x00;
       PrintAndLog("#db# %s       ", s);
       return;
     } break;