Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

2020-05-11 01:14:04 +02:00
parent 280b7d9c46 8a9c7d2efc
commit 4d34c8d4d5
1 changed files with 2 additions and 1 deletions
--- a/client/deps/cliparser/argtable3.c
+++ b/client/deps/cliparser/argtable3.c
@@ -4135,7 +4135,8 @@ int arg_parse(int argc, char * *argv, void * *argtable) {
 */
 static void arg_cat(char **pdest, const char *src, size_t *pndest) {
    char *dest = *pdest;
-    char *end  = dest + *pndest;
+    // PM3 fix: leave room for null terminate char
+    char *end  = dest + *pndest - 1;

    /*locate null terminator of dest string */
    while (dest < end && *dest != 0)