rename: ul_switch_off_field -> DropField (inside cmdhf14a.c)

chg:  Fix memory bounds error (@wsmoses)
 https://github.com/Proxmark/proxmark3/commit/c3511781a16c6f3f24abe2ad9a08c0737b1dc3b0
This commit is contained in:
iceman1001 committed 2017-11-11 23:23:01 +01:00
1 parent f906cb7f89
commit 2f3dbbcaa3
15 files changed
+132 -99

No files matched your search

+15 -3
View File
@@ -540,10 +540,19 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
return 0;
}
int param_getstr(const char *line, int paramnum, char * str)
int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
{
int bg, en;
if (param_getptr(line, &bg, &en, paramnum)) return 0;
if (param_getptr(line, &bg, &en, paramnum)) {
return 0;
}
// Prevent out of bounds errors
if (en - bg + 1 >= buffersize) {
printf("out of bounds error: want %d bytes have %u bytes\n", en - bg + 1 + 1, buffersize);
return 0;
}
memcpy(str, line + bg, en - bg + 1);
str[en - bg + 1] = 0;
@@ -560,6 +569,7 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/
int hextobinarray(char *target, char *source)
{
int length, i, count= 0;
char* start = source;
char x;
length = strlen(source);
@@ -575,8 +585,10 @@ int hextobinarray(char *target, char *source)
x -= '0';
else if (x >= 'A' && x <= 'F')
x -= 'A' - 10;
else
else {
printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, source - start, start);
return 0;
}
// output
for(i= 0 ; i < 4 ; ++i, ++count)
*(target++)= (x >> (3 - i)) & 1;