From f5569153b7df6d141164c27040ef0076732f2da7 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Thu, 20 May 2021 16:22:02 -0400
Subject: file_cmds: 321.100.10.0.1

---
 file_cmds/mtree/spec.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'file_cmds/mtree/spec.c')

diff --git a/file_cmds/mtree/spec.c b/file_cmds/mtree/spec.c
index f15d857..4119124 100644
--- a/file_cmds/mtree/spec.c
+++ b/file_cmds/mtree/spec.c
@@ -186,6 +186,7 @@ set(char *t, NODE *ip)
 	mode_t *m;
 	int value;
 	char *ep;
+	char *l;
 
 	for (; (kw = strtok(t, "= \t\n")); t = NULL) {
 		ip->flags |= type = parsekey(kw, &value);
@@ -415,14 +416,19 @@ set(char *t, NODE *ip)
 				}
 				break;
 			case F_XATTRS:
-				ep = strtok(val,".");
+				/*
+				 * Note this is nested inside an strtok loop,
+				 * strtok_r must be used to preserve the strtok context
+				 * of the loop.
+				 */
+				ep = strtok_r(val,".", &l);
 				ip->xattrsdigest = strdup(ep);
 				if (!ip->xattrsdigest) {
 					error = errno;
 					RECORD_FAILURE(54, error);
 					errc(1, error, "strdup");
 				}
-				val = strtok(NULL,".");
+				val = strtok_r(NULL,".", &l);
 				if (val) {
 					ip->xdstream_priv_id = strtoull(val, &ep, 10);
 					if (*ep) {
-- 
cgit v1.2.3-56-ge451