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

[citadel.git] / webcit / vcard.c

diff --git a/webcit/vcard.c b/webcit/vcard.c
index d5ff0b64902eda260857d8c10ae227601004e244..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"))
@@ -128,25 +128,32 @@ struct vCard *vcard_load(char *vtext) {
 
 
 /*
- * Fetch the value of a particular key
+ * Fetch the value of a particular key.
  * If is_partial is set to 1, a partial match is ok (for example,
- * a key of "tel;home" will satisfy a search for "tel")
+ * a key of "tel;home" will satisfy a search for "tel").
  * Set "instance" to a value higher than 0 to return subsequent instances
- * of the same key
+ * of the same key.
+ * Set "get_propname" to nonzero to fetch the property name instead of value.
  */
 char *vcard_get_prop(struct vCard *v, char *propname,
-                       int is_partial, int instance) {
+                       int is_partial, int instance, int get_propname) {
        int i;
        int found_instance = 0;
 
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
                if ( (!strcasecmp(v->prop[i].name, propname))
+                  || (propname[0] == 0)
                   || (  (!strncasecmp(v->prop[i].name,
                                        propname, strlen(propname)))
                         && (v->prop[i].name[strlen(propname)] == ';')
                         && (is_partial) ) ) {
                        if (instance == found_instance++) {
-                               return(v->prop[i].value);
+                               if (get_propname) {
+                                       return(v->prop[i].name);
+                               }
+                               else {
+                                       return(v->prop[i].value);
+                               }
                        }
                }
        }