Mercurial > pidgin.yaz

changeset 30825:a4f579485ce6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
encoding can be NULL in encoding_extract(); this is not an error and shouldn't be written to the log.
author ivan.komarov@soc.pidgin.im
date Wed, 28 Jul 2010 23:13:25 +0000
parents 5661f30d1b8e
children bbb27d65681f
files libpurple/protocols/oscar/encoding.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/encoding.c	Wed Jul 28 23:11:14 2010 +0000
+++ b/libpurple/protocols/oscar/encoding.c	Wed Jul 28 23:13:25 2010 +0000
@@ -38,7 +38,9 @@
 {
 	char *begin, *end;
 
-	g_return_val_if_fail(encoding != NULL, NULL);
+	if (encoding == NULL) {
+		return NULL;
+	}
 
 	if (!g_str_has_prefix(encoding, "text/aolrtf; charset=") &&
 		!g_str_has_prefix(encoding, "text/x-aolrtf; charset=") &&