dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	client/cmdhfmf.c
	client/cmdmain.c
This commit is contained in:
iceman
2016-02-10 13:29:23 +01:00
parent 719b2377be a9e4e78f83
commit 480e2f2394
12 changed files with 249 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/cmdmain.c
View File

@@ -182,10 +182,11 @@ void UsbCommandReceived(UsbCommand *UC)
// First check if we are handling a debug message
case CMD_DEBUG_PRINT_STRING: {
char s[USB_CMD_DATA_SIZE+1];
memset(s, 0x00, sizeof(s));
size_t len = MIN(UC->arg[0], USB_CMD_DATA_SIZE);
memset(s, 0x00, sizeof(s));
size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
memcpy(s, UC->d.asBytes, len);
PrintAndLog("#db# %s", s);
return;
} break;
case CMD_DEBUG_PRINT_INTEGERS:
@@ -201,5 +202,6 @@ void UsbCommandReceived(UsbCommand *UC)
break;
}
}
}