From a2501dc6d4433c0b4718c5e1a4f3f2434c650172 Mon Sep 17 00:00:00 2001 From: s00se <95649696+s00se@users.noreply.github.com> Date: Sun, 11 Oct 2026 21:03:41 +0000 Subject: [PATCH] Fixed ndef vcard by replacing deprecated strtok with strtok_r Use 200112L instead of 200809L --- client/src/cmddata.c | 13 +++++++++---- client/src/cmdhf14a.c | 8 ++++++-- client/src/cmdhf14b.c | 8 ++++++-- client/src/emv/cmdemv.c | 9 ++++++--- client/src/nfc/ndef.c | 13 +++++++++---- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/client/src/cmddata.c b/client/src/cmddata.c index 612acd152..0ee7e33d5 100644 --- a/client/src/cmddata.c +++ b/client/src/cmddata.c @@ -15,6 +15,9 @@ //----------------------------------------------------------------------------- // Data and Graph commands //----------------------------------------------------------------------------- +#ifndef _WIN32 +#define _POSIX_C_SOURCE 200112L +#endif #include "cmddata.h" #include #include @@ -3511,10 +3514,11 @@ static int CmdAtrLookup(const char *Cmd) { char *copy = str_dup(getAtrInfo((char *)data)); - char *token = strtok(copy, "\n"); + char *saveptr = NULL; + char *token = strtok_r(copy, "\n", &saveptr); while (token != NULL) { PrintAndLogEx(INFO, " %s", token); - token = strtok(NULL, "\n"); + token = strtok_r(NULL, "\n", &saveptr); } free(copy); return PM3_SUCCESS; @@ -3728,7 +3732,8 @@ static int CmdBinaryMap(const char *Cmd) { template[1] = 0; } - char *token = strtok((char *)template, ","); + char *saveptr = NULL; + char *token = strtok_r((char *)template, ",", &saveptr); // header PrintAndLogEx(INFO, "---+-------------------------"); @@ -3751,7 +3756,7 @@ static int CmdBinaryMap(const char *Cmd) { } PrintAndLogEx(NORMAL, ""); - token = strtok(NULL, ","); + token = strtok_r(NULL, ",", &saveptr); cnt++; } diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 124420f29..67ba85d71 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -15,6 +15,9 @@ //----------------------------------------------------------------------------- // High frequency ISO14443A commands //----------------------------------------------------------------------------- +#ifndef _WIN32 +#define _POSIX_C_SOURCE 200112L +#endif #include "cmdhf14a.h" #include #include @@ -3399,10 +3402,11 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) { int atrLen = 0; atsToEmulatedAtr(card.ats, atr, &atrLen); char *copy = str_dup(getAtrInfo(sprint_hex_inrow(atr, atrLen))); - char *token = strtok(copy, "\n"); + char *saveptr = NULL; + char *token = strtok_r(copy, "\n", &saveptr); while (token != NULL) { PrintAndLogEx(SUCCESS, " %s", token); - token = strtok(NULL, "\n"); + token = strtok_r(NULL, "\n", &saveptr); } free(copy); } diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c index 01adb3097..12de62cdd 100644 --- a/client/src/cmdhf14b.c +++ b/client/src/cmdhf14b.c @@ -16,6 +16,9 @@ // High frequency ISO14443B commands //----------------------------------------------------------------------------- +#ifndef _WIN32 +#define _POSIX_C_SOURCE 200112L +#endif #include "cmdhf14b.h" #include #include "iso14b.h" @@ -494,10 +497,11 @@ static int print_atqb_resp(uint8_t *data, uint8_t cid) { int atrLen = 0; atqbToEmulatedAtr(data, cid, atr, &atrLen); char *copy = str_dup(getAtrInfo(sprint_hex_inrow(atr, atrLen))); - char *token = strtok(copy, "\n"); + char *saveptr = NULL; + char *token = strtok_r(copy, "\n", &saveptr); while (token != NULL) { PrintAndLogEx(SUCCESS, " %s", token); - token = strtok(NULL, "\n"); + token = strtok_r(NULL, "\n", &saveptr); } free(copy); } diff --git a/client/src/emv/cmdemv.c b/client/src/emv/cmdemv.c index 36a7eec74..c82fa3644 100644 --- a/client/src/emv/cmdemv.c +++ b/client/src/emv/cmdemv.c @@ -16,6 +16,9 @@ // EMV commands //----------------------------------------------------------------------------- +#ifndef _WIN32 +#define _POSIX_C_SOURCE 200112L +#endif #include "cmdemv.h" #include #include "comms.h" // DropField @@ -292,7 +295,8 @@ static int emv_parse_track1(const uint8_t *d, size_t n, bool verbose) { char *tmp = str_ndup((const char *)d, n); uint8_t i = 0; const char delim[2] = "^"; - char *token = strtok(tmp, delim); + char *saveptr = NULL; + char *token = strtok_r(tmp, delim, &saveptr); while (token != NULL) { switch (i) { @@ -340,7 +344,7 @@ static int emv_parse_track1(const uint8_t *d, size_t n, bool verbose) { default: break; } - token = strtok(0, delim); + token = strtok_r(NULL, delim, &saveptr); i++; } free(tmp); @@ -3171,4 +3175,3 @@ int CmdEMV(const char *Cmd) { clearCommandBuffer(); return CmdsParse(CommandTable, Cmd); } - diff --git a/client/src/nfc/ndef.c b/client/src/nfc/ndef.c index 5655cfea0..1713bd199 100644 --- a/client/src/nfc/ndef.c +++ b/client/src/nfc/ndef.c @@ -16,6 +16,9 @@ // NFC Data Exchange Format (NDEF) functions //----------------------------------------------------------------------------- +#ifndef _WIN32 +#define _POSIX_C_SOURCE 200112L +#endif #include "ndef.h" #include @@ -1009,13 +1012,15 @@ static int ndefDecodeMime_vcard(NDEFHeader_t *ndef) { char *s = strstr((char *)ndef->Payload, "PHOTO"); if (s) { - s = strtok(s, ";"); + char *saveptr = NULL; + s = strtok_r(s, ";", &saveptr); while (s) { char *tmp = s; if (strncmp(tmp, "ENCODING", 8) == 0) { } else if (strncmp(tmp, "TYPE", 4) == 0) { - char *part = strtok(tmp + 4, ":"); + char *part_saveptr = NULL; + char *part = strtok_r(tmp + 4, ":", &part_saveptr); while (part) { if (strncmp(part, "=image/", 7) == 0) { @@ -1024,10 +1029,10 @@ static int ndefDecodeMime_vcard(NDEFHeader_t *ndef) { // should be in the BASE64 data part now. ShowBase64PictureWindow("VCARD photo", part); } - part = strtok(NULL, ":"); + part = strtok_r(NULL, ":", &part_saveptr); } } - s = strtok(NULL, ";"); + s = strtok_r(NULL, ";", &saveptr); } } return PM3_SUCCESS;