Fix format-truncation warning, missing string.h inclusion and strnlen warning (#723)

* Fix format-truncation warning, missing string.h inclusion and strnlen warning

* Dynamic string width field

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 60799fc8c10dfa14bd4b7fbbed324c2546561008..9570be203b7a59aeee15fbc8242c72cccec44dbe 100644 (file)
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -8,11 +8,14 @@
 // asn.1 dumping
 //-----------------------------------------------------------------------------
 
 // asn.1 dumping
 //-----------------------------------------------------------------------------
 

+#define _POSIX_C_SOURCE 200809L                 // need for strnlen()
+

 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h> 
 #include <stdio.h>
 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h> 
 #include <stdio.h>

+#include <string.h>

 #include <jansson.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 #include <jansson.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>

diff --git a/client/ui.c b/client/ui.c
index 3a1e42c523786b2771f74eb94d08731e4d474dcc..5c9d7424a614189ef5347b2acc8db6600bb4732e 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -99,7 +99,7 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
                }
                PrintAndLog(buffer2);
        } else {
                }
                PrintAndLog(buffer2);
        } else {

-               snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
+               snprintf(buffer2, sizeof(buffer2), "%s%.*s", prefix, MAX_PRINT_BUFFER - 20, buffer);

                PrintAndLog(buffer2);
        }
 }
                PrintAndLog(buffer2);
        }
 }