Catch Z-BUS errors in templates.

[citadel.git] / webcit / subst.c

diff --git a/webcit/subst.c b/webcit/subst.c
index 167a94d35999544270c0f0e84fb66931995c9331..83540918a1e7c45f9dfadfeb06933561804d3cc8 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -679,6 +679,7 @@ void StrBufAppendTemplate(StrBuf *Target,
        char EscapeAs = ' ';
 
        if ((FormatTypeIndex < TP->Tokens->nParameters) &&
+           (TP->Tokens->Params[FormatTypeIndex] != NULL) &&
            (TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
            (TP->Tokens->Params[FormatTypeIndex]->len >= 1)) {
                pFmt = TP->Tokens->Params[FormatTypeIndex]->Start;
@@ -695,10 +696,10 @@ void StrBufAppendTemplate(StrBuf *Target,
                break;
        case 'J':
                StrECMAEscAppend(Target, Source, NULL);
-         break;
+               break;
        case 'K':
                StrHtmlEcmaEscAppend(Target, Source, NULL, 0, 0);
-         break;
+               break;
        case 'U':
                StrBufUrlescAppend(Target, Source, NULL);
                break;
@@ -1526,8 +1527,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
                char *MinorPtr;
 
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
-
+               d_namelen = filedir_entry->d_namlen;
 #else
                d_namelen = strlen(filedir_entry->d_name);
 #endif