[lxc-devel] [PATCH] fortify: use reentrant safe strtok_r
Dwight Engen
dwight.engen at oracle.com
Mon Apr 15 19:28:07 UTC 2013
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
---
src/lxc/conf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index c416da5..917c052 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -750,7 +750,7 @@ static int setup_tty(const struct lxc_rootfs *rootfs,
static int setup_rootfs_pivot_root_cb(char *buffer, void *data)
{
struct lxc_list *mountlist, *listentry, *iterator;
- char *pivotdir, *mountpoint, *mountentry;
+ char *pivotdir, *mountpoint, *mountentry, *saveptr;
int found;
void **cbparm;
@@ -761,12 +761,12 @@ static int setup_rootfs_pivot_root_cb(char *buffer, void *data)
pivotdir = cbparm[1];
/* parse entry, first field is mountname, ignore */
- mountpoint = strtok(mountentry, " ");
+ mountpoint = strtok_r(mountentry, " ", &saveptr);
if (!mountpoint)
return -1;
/* second field is mountpoint */
- mountpoint = strtok(NULL, " ");
+ mountpoint = strtok_r(NULL, " ", &saveptr);
if (!mountpoint)
return -1;
--
1.7.12.3
More information about the lxc-devel
mailing list