Applied Holiman's fixes for iclass.c and CSNs

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 1ebfebea2ce452870ebccfaecaf95faeb6bc31ad..56c4998d8368c69103b5716d09eb5a62cee90fe8 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -46,12 +46,18 @@ int ukbhit(void) {
 #endif
 
 // log files functions
-void AddLogLine(char *fileName, char *extData, char *c) {
+void AddLogLine(char *file, char *extData, char *c) {
        FILE *fLog = NULL;
-
-       fLog = fopen(fileName, "a");
+    char filename[FILE_PATH_SIZE] = {0x00};
+    int len = 0;
+
+    len = strlen(file);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, file, len);
+   
+       fLog = fopen(filename, "a");
        if (!fLog) {
-               printf("Could not append log file %s", fileName);
+               printf("Could not append log file %s", filename);
                return;
        }
 
@@ -103,22 +109,26 @@ void print_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;
 
-       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) {
+       
+       int maxLen = ( len > 1024) ? 1024 : len;
        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;