Mercurial > pidgin.yaz

changeset 28477:67e93a042bf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '38ebec4433858a0ad3e429387c23ab0f1d8c0f12' and 'c0a4c2650c0117a4b956199f56d5b990e0c3fb0d'
author maiku@pidgin.im
date Fri, 28 Aug 2009 23:27:08 +0000
parents 3a35ff11d51b (current diff) 5901b1dd8d07 (diff)
children e47d4bddf974
files
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/util.c	Fri Aug 28 23:14:30 2009 +0000
+++ b/libpurple/util.c	Fri Aug 28 23:27:08 2009 +0000
@@ -3129,11 +3129,8 @@
 	const char *ret = NULL;
 	static char buf[BUF_LEN];
 
-	/* g_utf8_normalize() for glib ver < 2.15.0 causes a crash when an invalid utf8 string is passed to it
-	   (http://bugzilla.gnome.org/show_bug.cgi?id=501997).
-	   Returning NULL when str is NULL, should prevent a few crashes, see #10115 */
-	if(!str)
-		return NULL;
+	/* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
+	g_return_val_if_fail(str != NULL, "");
 
 	if (account != NULL)
 	{