# HG changeset patch # User Sadrul Habib Chowdhury # Date 1265061080 0 # Node ID 362d787f0b87ea8da14ac45fdf9bcbd7c8200aa5 # Parent 61e2537722e0e21d3c912169ba358df5536d8ee1# Parent ed93baed53c2390631870ba9ab585b9fca8fdc27 merge of '4a72c5feaab572105b4902609836cd509328aa6d' and '89ddd80c4cd11b79fbcb649bba819ecce526312c' diff -r 61e2537722e0 -r 362d787f0b87 pidgin/gtkthemes.c --- a/pidgin/gtkthemes.c Mon Feb 01 21:28:33 2010 +0000 +++ b/pidgin/gtkthemes.c Mon Feb 01 21:51:20 2010 +0000 @@ -310,7 +310,7 @@ while (*i) { char l[64]; int li = 0; - while (!isspace(*i) && li < sizeof(l) - 1) { + while (*i && !isspace(*i) && li < sizeof(l) - 1) { if (*i == '\\' && *(i+1) != '\0' && *(i+1) != '\n' && *(i+1) != '\r') i++; l[li++] = *(i++);