small fix util.c

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index b7f07bde056ec5b79834088a77de8d466b08a358..5dc9a4556b1668708f9323138191401593c95e1c 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -116,6 +116,7 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
                
        char *tmp = (char *)buf;
        size_t i;
+       memset(tmp, 0x00, hex_max_len);
 
        int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
 
@@ -356,6 +357,23 @@ char * printBits(size_t const size, void const * const ptr)
        return buf;
 }
 
+char * printBitsPar(const uint8_t *b, size_t len) {
+       static char buf1[512] = {0};
+       static char buf2[512] = {0};
+       static char *buf;
+       if (buf != buf1)
+               buf = buf1;
+       else
+               buf = buf2;
+       memset(buf, 0x00, 512);
+
+       for (int i = 0; i < len; i++) {
+               buf[i] = ((b[i / 8] << (i % 8)) & 0x80) ? '1':'0';
+       }
+       return buf;
+}
+
+
 //  -------------------------------------------------------------------------
 //  string parameters lib
 //  -------------------------------------------------------------------------
@@ -496,7 +514,7 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
                return 1;
 
        for(i = 0; i < hexcnt; i += 2) {
-               if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) )   return 1;
+               if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) )     return 1;
                
                sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
                data[i / 2] = temp & 0xff;
@@ -518,7 +536,7 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
                return 1;
 
        for(i = 0; i < *hexcnt; i += 2) {
-               if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) )   return 1;
+               if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) )     return 1;
                
                sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
                data[i / 2] = temp & 0xff;
@@ -543,7 +561,7 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
                        continue;
                }
                
-               if (isxdigit(line[indx])) {
+               if (isxdigit((unsigned char)line[indx])) {
                        buf[strlen(buf) + 1] = 0x00;
                        buf[strlen(buf)] = line[indx];
                } else {
@@ -620,7 +638,7 @@ int hextobinarray(char *target, char *source)
         else if (x >= 'A' && x <= 'F')
             x -= 'A' - 10;
         else {
-               printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, source - start, start);
+               printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);
             return 0;
         }
         // output