From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 3 Jul 2011 23:08:30 +0000 (+0000)
Subject: fix crash with wrong pointer indirection in setup.c
X-Git-Tag: v8.11~625
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1f6877630b975698550c84e1f7f47a761316097b

fix crash with wrong pointer indirection in setup.c
---

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index ae7b28ecd..8f9cd5867 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1278,17 +1278,17 @@ void GetDefaultValChar(char *WhereTo, const char *VarName, char DefVal)
 		*WhereTo = atoi(ch);
 	}
 }
-#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr((char**)&config.CFGNAME, sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
-void GetDefaultValStr(char **WhereTo, size_t nMax, const char *VarName, const char *DefVal)
+#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr(&config.CFGNAME[0], sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
+void GetDefaultValStr(char *WhereTo, size_t nMax, const char *VarName, const char *DefVal)
 {
 	const char *ch;
-	if (**WhereTo == '\0') 
-		safestrncpy(*WhereTo, DefVal, nMax);
+	if (*WhereTo == '\0') 
+		safestrncpy(WhereTo, DefVal, nMax);
 
 	if ((setup_type == UI_SILENT) &&
 	    (ch = getenv(VarName), ch != NULL))
 	{
-		safestrncpy(*WhereTo, ch, nMax);
+		safestrncpy(WhereTo, ch, nMax);
 	}
 }