# HG changeset patch # User Paul Aurich # Date 1295303823 0 # Node ID 84e9eb0ae4d5726e61cc425a715fc8ef1784a298 # Parent 2c29fe4757a2af0e39489723341a9b120d42fbe1 jabber: Un-assert-ify one failure case in the Cyrus code. Seen in a user's debug log, where the server sent back (slightly redacted): [B@10stuff diff -r 2c29fe4757a2 -r 84e9eb0ae4d5 libpurple/protocols/jabber/auth_cyrus.c --- a/libpurple/protocols/jabber/auth_cyrus.c Thu Jan 13 08:24:28 2011 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Jan 17 22:37:03 2011 +0000 @@ -520,9 +520,12 @@ g_free(dec_in); if (js->sasl_state != SASL_OK) { - /* This should never happen! */ + /* This happens when the server sends back jibberish + * in the "additional data with success" case. + * Seen with Wildfire 3.0.1. + */ *error = g_strdup(_("Invalid response from server")); - g_return_val_if_reached(JABBER_SASL_STATE_FAIL); + return JABBER_SASL_STATE_FAIL; } }