diff libpurple/protocols/irc/parse.c @ 28592:493f48f8d17f 2.6.2_jp

merged with im.pidgin.pidgin

--- a/libpurple/protocols/irc/parse.c	Thu Sep 03 16:58:48 2009 +0900
+++ b/libpurple/protocols/irc/parse.c	Mon Sep 07 20:39:36 2009 +0900
@@ -562,7 +562,12 @@
 	char fg[3] = "\0\0", bg[3] = "\0\0";
 	int fgnum, bgnum;
 	int font = 0, bold = 0, underline = 0, italic = 0;
-	GString *decoded = g_string_sized_new(strlen(string));
+	GString *decoded;
+
+	if (string == NULL)
+		return NULL;
+
+	decoded = g_string_sized_new(strlen(string));
 
 	cur = string;
 	do {
@@ -662,9 +667,14 @@
 
 char *irc_mirc2txt (const char *string)
 {
-	char *result = g_strdup (string);
+	char *result;
 	int i, j;
 
+	if (string == NULL)
+		return NULL;
+
+	result = g_strdup (string);
+
 	for (i = 0, j = 0; result[i]; i++) {
 		switch (result[i]) {
 		case '\002':