pidgin: 3ce9883e: Woah, this was wrong. MY BAD! We shoul...

markdoliner at pidgin.im markdoliner at pidgin.im
Sat Aug 22 14:26:13 EDT 2009


-----------------------------------------------------------------
Revision: 3ce9883eaf090e4ec49d632e99ae336882b209cd
Ancestor: a57cdafda796d92b975e1a6bbd807c0a78d5c0e4
Author: markdoliner at pidgin.im
Date: 2009-08-22T18:24:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3ce9883eaf090e4ec49d632e99ae336882b209cd

Modified files:
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c

ChangeLog: 

Woah, this was wrong.  MY BAD!  We should not be setting this to true
just because we get an unknown html tag (or in this case an unescaped
'<').  This fixes bug #10021 and I think probably another duplicate bug

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/util.c	b61962f831b0bc0ef57b498dd95648597bcb6357
+++ libpurple/protocols/yahoo/util.c	7996c11dc9a1e9bbbb55c890471cef616237f4a0
@@ -611,7 +611,6 @@ char *yahoo_codes_to_html(const char *x)
 				if (match == NULL) {
 					/* Unknown tag.  The user probably typed a less-than sign */
 					g_string_append_c(cdata, x[i]);
-					no_more_gt_brackets = TRUE;
 					g_free(tag);
 					g_free(tag_name);
 					break;
============================================================
--- libpurple/tests/test_yahoo_util.c	8d074dda2cba35ff2985e665670422de13b7551f
+++ libpurple/tests/test_yahoo_util.c	264fbddc917581fac21b93597df09ad34cd94059
@@ -100,6 +100,8 @@ START_TEST(test_codes_to_html)
 			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
 	assert_string_equal_free("<font color='#FF0080'><font size='4' absz='15'>test</font></font>",
 			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
+	assert_string_equal_free(":&lt;",
+			yahoo_codes_to_html("<FADE #ff0000,#00ff00,#0000ff>:<</FADE>"));
 #endif /* !USE_CSS_FORMATTING */
 }
 END_TEST


More information about the Commits mailing list