Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 28648:1a4b6f47258c
merge of '5e1784d5a975dc0726e72521fbf6024dfa281d84'
and 'e28bbfa3c8184843c6f30c7fe26da08ade3873c2'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 27 Nov 2009 07:13:38 +0000 |
| parents | 9feec7d1d95c 7622d3f86752 |
| children | 9ae3e70a327b |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Nov 27 07:12:35 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 27 07:13:38 2009 +0000 @@ -476,7 +476,14 @@ if (NULL == packet) return; + if (!PURPLE_CONNECTION_IS_VALID(pc)) + return; + js = purple_connection_get_protocol_data(pc); + + if (NULL == js) + return; + if (js->bosh) if (g_str_equal((*packet)->name, "message") || g_str_equal((*packet)->name, "iq") ||