RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 01:55:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: sprint_bin_break didn't print the last digit in array.

Browse source
This commit is contained in:
iceman1001 2017-01-17 22:58:16 +01:00
parent 3e5b5bb2da
commit f56b1fae2d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/cmdlft55xx.c
View file

@ -195,8 +195,8 @@ static int CmdHelp(const char *Cmd);
void printT5xxHeader(uint8_t page){ void printT5xxHeader(uint8_t page){
PrintAndLog("Reading Page %d:", page); PrintAndLog("Reading Page %d:", page);
PrintAndLog("blk | hex data | binary | ascii"); PrintAndLog("blk | hex data | binary | ascii");
PrintAndLog("----+----------+---------------------------------+-------"); PrintAndLog("----+----------+----------------------------------+-------");
} }
int CmdT55xxSetConfig(const char *Cmd) { int CmdT55xxSetConfig(const char *Cmd) {
@ -907,8 +907,8 @@ int special(const char *Cmd) {
uint32_t blockData = 0; uint32_t blockData = 0;
uint8_t bits[32] = {0x00}; uint8_t bits[32] = {0x00};
PrintAndLog("OFFSET | DATA | BINARY | ASCII"); PrintAndLog("OFFSET | DATA | BINARY | ASCII");
PrintAndLog("-------+-------+------------------------------------+------"); PrintAndLog("-------+-------+-------------------------------------+------");
int i,j = 0; int i,j = 0;
for (; j < 64; ++j){ for (; j < 64; ++j){

14
client/util.c
View file

@ -144,11 +144,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
// make sure we don't go beyond our char array memory // make sure we don't go beyond our char array memory
size_t in_index = 0, out_index = 0; size_t in_index = 0, out_index = 0;
int max_len; int rowlen;
if (breaks==0) if (breaks==0)
max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len; rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
else else
max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks); rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
//clear memory //clear memory
@ -156,11 +156,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
char *tmp = buf; char *tmp = buf;
// loop through the out_index to make sure we don't go too far // loop through the out_index to make sure we don't go too far
for (out_index=0; out_index < max_len-2; out_index++) { for (out_index=0; out_index < rowlen-1; out_index++) {
// set character // set character
sprintf(tmp++, "%u", (unsigned int) data[in_index]); sprintf(tmp++, "%u", data[in_index]);
// check if a line break is needed and we have room to print it in our array // check if a line break is needed and we have room to print it in our array
if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) { if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
// increment and print line break // increment and print line break
out_index++; out_index++;
sprintf(tmp++, "%s","\n"); sprintf(tmp++, "%s","\n");
@ -168,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
in_index++; in_index++;
} }
// last char. // last char.
sprintf(tmp++, "%u", (unsigned int) data[in_index]); sprintf(tmp++, "%u", data[in_index]);
return buf; return buf;
} }