From 6e45d683991a3269c3cfe63d981bddcd92da0406 Mon Sep 17 00:00:00 2001
From: David Hill <dhill@conformal.com>
Date: Sat, 12 Jul 2014 16:35:42 -0400
Subject: [PATCH] Avoid using uninitalized values.

---
 src/core/modules-load.c          | 2 +-
 src/core/settings.c              | 4 ++--
 src/fe-common/core/fe-messages.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 8e65ecd4..49f811de 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -163,7 +163,7 @@ static int module_load_name(const char *path, const char *rootmodule,
 	GModule *gmodule;
         MODULE_REC *module;
 	MODULE_FILE_REC *rec;
-	gpointer value1, value2;
+	gpointer value1, value2 = NULL;
 	char *initfunc, *deinitfunc;
         int found;
 
diff --git a/src/core/settings.c b/src/core/settings.c
index 9f527ebe..2296909e 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -121,7 +121,7 @@ int settings_get_bool(const char *key)
 int settings_get_time(const char *key)
 {
 	const char *str;
-	int msecs;
+	int msecs = 0;
 
 	str = settings_get_str_type(key, SETTING_TYPE_TIME);
 	if (str != NULL && !parse_time_interval(str, &msecs))
@@ -140,7 +140,7 @@ int settings_get_level(const char *key)
 int settings_get_size(const char *key)
 {
 	const char *str;
-	int bytes;
+	int bytes = 0;
 
 	str = settings_get_str_type(key, SETTING_TYPE_SIZE);
 	if (str != NULL && !parse_size(str, &bytes))
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index fcc55a67..56fe89f8 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -82,7 +82,7 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text)
 			continue;
 		if (!ishighalnum(end[-1]) || ishighalnum(end[1]) ||
 		    end[1] == type || end[1] == '*' || end[1] == '_' ||
-		    (type == 29 && end[1] != NULL && ishighalnum(end[2])))
+		    (type == 29 && end[1] != '\0' && ishighalnum(end[2])))
 			continue;
 
 		if (IS_CHANNEL(item)) {