* Use safestrncpy() instead of strncpy() where appropriate

[citadel.git] / webcit / vcard.c

diff --git a/webcit/vcard.c b/webcit/vcard.c
index 362dbe6b660133a49c888cb79f130dbc1c9e5f5f..6b04215951ad358568839b0cf78bb5d6b935905f 100644 (file)
--- a/webcit/vcard.c
+++ b/webcit/vcard.c
@@ -89,12 +89,12 @@ struct vCard *vcard_load(char *vtext) {
                colonpos = pattern2(ptr, ":");
                nlpos = pattern2(ptr, "\n");
 
-               if (nlpos > colonpos > 0) {
+               if ((nlpos > colonpos) && (colonpos > 0)) {
                        namebuf = malloc(colonpos + 1);
                        valuebuf = malloc(nlpos - colonpos + 1);
-                       strncpy(namebuf, ptr, colonpos);
+                       safestrncpy(namebuf, ptr, colonpos);
                        namebuf[colonpos] = 0;
-                       strncpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
+                       safestrncpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
                        valuebuf[nlpos-colonpos-1] = 0;
 
                        if ( (!strcasecmp(namebuf, "end"))