diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2007-10-10 00:00:21 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2007-10-10 00:00:21 +0000 |
| commit | 220f7086b2c3cbddaf7278d597e312d1a9751c9f (patch) | |
| tree | 2d80ebbe6ebded5edc2a7fbc9711bb89a872bc28 | |
| parent | dcaa9b65f40347d498d078d23b35fd9a85a5b1d0 (diff) | |
| download | pidgin-220f7086b2c3cbddaf7278d597e312d1a9751c9f.tar.gz | |
Move NULL check earlier to prevent confusion when it is checked after being derefed. Fixes CID 350
| -rw-r--r-- | libpurple/protocols/myspace/markup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpurple/protocols/myspace/markup.c b/libpurple/protocols/myspace/markup.c index 6a08253505..24aa8c4a94 100644 --- a/libpurple/protocols/myspace/markup.c +++ b/libpurple/protocols/myspace/markup.c @@ -400,6 +400,8 @@ static void 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 *session, xmlnode *root, gchar **begin, } 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(""); } |