X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=d64d83983193f275dd64dbb4f67335349ec92a11;hb=228054a071ef16a6450f9a4a39f67852267265fe;hp=1513bccb1d71e39f36fe00da54a2793616621e03;hpb=7ed57c6537c5bf8714f779b1c1a153eab4aa4da4;p=citadel.git

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 1513bccb1..d64d83983 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -534,41 +534,65 @@ void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_nodename, 0);
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
+	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0);
 }
 
 void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_humannode, 0);
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
+	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0);
 }
 
 void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_fqdn, 0);
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
+	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0);
 }
 
 void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_software, 0);
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
+	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_software, 0);
 }
 
 void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP)
 {
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
 	StrBufAppendPrintf(Target, "%d.%02d",
-			    WC->serv_info->serv_rev_level / 100,
-			    WC->serv_info->serv_rev_level % 100);
+			    WCC->serv_info->serv_rev_level / 100,
+			    WCC->serv_info->serv_rev_level % 100);
 }
 int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP)
 {
-	return WC->serv_info->serv_newuser_disabled != 0;
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return 0;
+	return WCC->serv_info->serv_newuser_disabled != 0;
 }
 int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
 {
-	return WC->serv_info->serv_supports_openid != 0;
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return 0;
+	return WCC->serv_info->serv_supports_openid != 0;
 }
 
 void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
 {
+	wcsession *WCC = WC;
+	if (WCC->serv_info == NULL)
+		return;
 	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0);
 }