Minor bug fixes with help from Holiman.

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 1ebfebea2ce452870ebccfaecaf95faeb6bc31ad..903791a09d03d832565e027e140aa4c926e9cb9f 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -103,22 +103,26 @@ void print_hex(const uint8_t * data, const size_t len)
 }
 
 char * sprint_hex(const uint8_t * data, const size_t len) {
 }
 
 char * sprint_hex(const uint8_t * data, const size_t len) {

+       
+       int maxLen = ( len > 1024/3) ? 1024/3 : len;

        static char buf[1024];
        char * tmp = buf;
        size_t i;
 
        static char buf[1024];
        char * tmp = buf;
        size_t i;
 

-       for (i=0; i < len && i < 1024/3; i++, tmp += 3)
+       for (i=0; i < maxLen; ++i, tmp += 3)

                sprintf(tmp, "%02x ", data[i]);
 
        return buf;
 }
 
 char * sprint_bin(const uint8_t * data, const size_t len) {
                sprintf(tmp, "%02x ", data[i]);
 
        return buf;
 }
 
 char * sprint_bin(const uint8_t * data, const size_t len) {

+       
+       int maxLen = ( len > 1024) ? 1024 : len;

        static char buf[1024];
        char * tmp = buf;
        size_t i;
 
        static char buf[1024];
        char * tmp = buf;
        size_t i;
 

-       for (i=0; i < len && i < 1024; i++, tmp++)
+       for (i=0; i < maxLen; ++i, ++tmp)

                sprintf(tmp, "%u", data[i]);
 
        return buf;
                sprintf(tmp, "%u", data[i]);
 
        return buf;