Mercurial > pidgin
changeset 30206:545ce15b619f
merge of '18ddd668ba1cc77ed0a0595a053f8a2879dddfd0'
and '63b644ac7791059c9fad6128d17bccebca8ad71a'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 17 Jun 2010 21:23:01 +0000 |
| parents | 33989e3a449b (current diff) 738741a7a692 (diff) |
| children | 62f7ea77feb3 509c63006b1f c4cbe5f992ce |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jutil.c Thu Jun 17 21:06:00 2010 +0000 +++ b/libpurple/protocols/jabber/jutil.c Thu Jun 17 21:23:01 2010 +0000 @@ -303,8 +303,10 @@ c = (const guchar *)in; for ( ; *c; ++c) { - if (*c > 0x7f || + if (*c > 0x7f || /* Non-ASCII characters */ + *c == 0x7f || /* ASCII Delete character */ (*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r')) + /* ASCII control characters */ return NULL; }
--- a/libpurple/tests/test_jabber_scram.c Thu Jun 17 21:06:00 2010 +0000 +++ b/libpurple/tests/test_jabber_scram.c Thu Jun 17 21:23:01 2010 +0000 @@ -89,11 +89,13 @@ "c=biws,r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,p=pXkak78EuwwOEwk2/h/OzD7NkEI=", "v=ldX4EBNnOgDnNTOCmbSfBHAUCOs="); +#ifdef USE_IDN assert_successful_exchange("pass½word", "GNb2HsNI7VnTv8ABsE5AnY8W", "n=paul,r=GNb2HsNI7VnTv8ABsE5AnY8W", "r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,s=ysAriUjPzFqOXnMQ,i=4096", "c=biws,r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,p=n/CtgdWjOYnLQ4m9Na+wPn9D2uY=", "v=4TkZwKWy6JHNmrUbU2+IdAaXtos="); +#endif } END_TEST