From aabdfa67919ccca9238463bc7785dce4c1a99894 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 4 Jan 2017 12:05:49 +0100 Subject: ipcpd: Fix uninitialized variables in ribmgr --- src/ipcpd/normal/ribmgr.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c index ab492e7f..d0bd3ec7 100644 --- a/src/ipcpd/normal/ribmgr.c +++ b/src/ipcpd/normal/ribmgr.c @@ -312,13 +312,13 @@ static struct rnode * ribmgr_ro_create(const char * name, { char * str; char * str1; - char * saveptr; - char * token; + char * saveptr = NULL; + char * token = NULL; char * token2; struct rnode * node; struct rnode * new; struct rnode * prev; - bool sibling; + bool sibling = false; int timeout; str = strdup(name); @@ -327,6 +327,8 @@ static struct rnode * ribmgr_ro_create(const char * name, node = rib.root; + assert(node); + for (str1 = str; node != NULL; str1 = NULL) { token = strtok_r(str1, PATH_DELIMITER, &saveptr); if (token == NULL) { @@ -351,6 +353,8 @@ static struct rnode * ribmgr_ro_create(const char * name, } } + assert(token); + token2 = strtok_r(NULL, PATH_DELIMITER, &saveptr); if (token2 != NULL) { LOG_ERR("Part of the pathname does not exist."); -- cgit v1.2.3