im.pidgin.pidgin: 9d35dde0c779cca73548172223ba557f27d61882

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 9d35dde0c779cca73548172223ba557f27d61882
Ancestor: c848ad4c20988b5dac9ac164455d3ba2d7307230
Author: datallah at pidgin.im
Date: 2007-10-10T00:00:21
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/myspace/markup.c

ChangeLog: 

Move NULL check earlier to prevent confusion when it is checked after being derefed. Fixes CID 350

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/markup.c	d89e9798f538d17fdb33c61be404948092164b2e
+++ libpurple/protocols/myspace/markup.c	b6d22f58e04d3c88f1f4edd024c042193dd9c717
@@ -400,6 +400,8 @@ msim_markup_tag_to_html(MsimSession *ses
 msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin, 
 		gchar **end)
 {
+	g_return_if_fail(root != NULL);
+
 	if (g_str_equal(root->name, "f")) {
 		msim_markup_f_to_html(session, root, begin, end);
 	} else if (g_str_equal(root->name, "a")) {
@@ -415,7 +417,7 @@ msim_markup_tag_to_html(MsimSession *ses
 	} else {
 		purple_debug_info("msim", "msim_markup_tag_to_html: "
 				"unknown tag name=%s, ignoring", 
-				(root && root->name) ? root->name : "(NULL)");
+				root->name ? root->name : "(NULL)");
 		*begin = g_strdup("");
 		*end = g_strdup("");
 	}