From 7816a28c53d1ba559851ae41c4c467dcd14fd2e9 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Sat, 23 Dec 2023 16:19:11 +0800 Subject: [PATCH] use strtok_r instead of strtok for thread safety --- HISTORY | 2 +- src/shared_func.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 3c3b57f..110f966 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,5 @@ -Version 1.71 2023-12-01 +Version 1.71 2023-12-23 * full support IPv6 by pull request #47 * replace inet_ntop to getnameinfo for IPv6 diff --git a/src/shared_func.c b/src/shared_func.c index dcddfd3..14c75ac 100644 --- a/src/shared_func.c +++ b/src/shared_func.c @@ -2833,15 +2833,16 @@ int parseAddress(char *src, char *parts[2]) { char *ip; char *port; + char *saveptr = NULL; if (src[0] == '[') { - ip = strtok(src, "[]"); + ip = strtok_r(src, "[]", &saveptr); } else { - ip = strtok(src, ":"); + ip = strtok_r(src, ":", &saveptr); } parts[0] = ip; - port = strtok(NULL, ":"); + port = strtok_r(NULL, ":", &saveptr); if (port == NULL) { return 1; } else {