Mercurial > pidgin
changeset 28930:362d787f0b87
merge of '4a72c5feaab572105b4902609836cd509328aa6d'
and '89ddd80c4cd11b79fbcb649bba819ecce526312c'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 01 Feb 2010 21:51:20 +0000 |
| parents | 61e2537722e0 (current diff) ed93baed53c2 (diff) |
| children | 508b73ce9b14 |
| files | pidgin/gtkthemes.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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++);