Changeset 85d7b85 for protocols/yahoo/yahoo_util.c

Timestamp:

2008-04-02T14:22:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk.

File:

• protocols/yahoo/yahoo_util.c (modified) (2 diffs)

protocols/yahoo/yahoo_util.c

@@ -69 +69 @@
         int i=0;
         int l = strlen(sep);
-        if(nelem < 0) {
+        if(nelem <= 0) {
                 char * s;
                 nelem=0;
-                for(s=strstr(str, sep); s; s=strstr(s+l, sep),nelem++)
-                        ;
-                if(strcmp(str+strlen(str)-l, sep))
-                        nelem++;
+                if (*str) {
+                        for(s=strstr(str, sep); s; s=strstr(s+l, sep),nelem++)
+                                ;
+                        if(strcmp(str+strlen(str)-l, sep))
+                                nelem++;
+                }
         }
 
@@ -87 +89 @@
         }
 
-        if(i<nelem) /* str didn't end with sep */
+        if(i<nelem && *str) /* str didn't end with sep, and str isn't empty */
                 vector[i++] = strdup(p);