# HG changeset patch # User Evan Schoenberg # Date 1213034653 0 # Node ID dca10ce7b09cc4210c0dea265bc576a06c5dac79 # Parent 101573414138ad87ed861794886e71ea8c564996 Avoid calling purple_str_sub_away_formatters() and g_markup_escape_text() with NULL strings. diff -r 101573414138 -r dca10ce7b09c libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Mon Jun 09 17:28:08 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Jun 09 18:04:13 2008 +0000 @@ -844,7 +844,7 @@ /* Away messges are HTML, but available messages were originally plain text. * We therefore need to strip away messages but not available messages if we're asked to remove HTML tags. */ - if (is_away) { + if (is_away && message) { gchar *tmp2; tmp = purple_markup_strip_html(message); g_free(message); @@ -854,16 +854,16 @@ } } else { - if (itmsurl) { - tmp = g_strdup_printf("%s", - itmsurl, message); - g_free(itmsurl); - g_free(message); - message = tmp; - } - } - - if (is_away) { + if (itmsurl) { + tmp = g_strdup_printf("%s", + itmsurl, message); + g_free(itmsurl); + g_free(message); + message = tmp; + } + } + + if (is_away && message) { tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account)); g_free(message); message = tmp;