GVEA: StrLength is NULL-Safe and truly tells us whether the string is actually there.

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 1155a182da6b846d68fccacde2646ec0207835f5..242dbbddbbe22e2c9cb1d16797f597b60f89d447 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -1055,9 +1055,9 @@ HashList *GetGVEAHash(StrBuf *Target, WCTemplputParams *TP)
                                i = snprintf(N, sizeof(N), "%d", n);
                                StrBufTrim(Rcp);
                                VEA->Address = Rcp;
-                               if (EnvelopeTo != NULL)
+                               if (StrLength(EnvelopeTo) > 0)
                                        VEA->IsDefault = strstr(ChrPtr(EnvelopeTo), ChrPtr(Rcp)) != NULL;
-                               else if (DefaultFrom != NULL)
+                               else if (StrLength(DefaultFrom) > 0)
                                        VEA->IsDefault = !strcmp(ChrPtr(Rcp), ChrPtr(DefaultFrom));
                                else
                                        VEA->IsDefault = 0;