summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan Hing Wah <devnull@localhost>2006-04-24 19:57:23 +0000
committerWan Hing Wah <devnull@localhost>2006-04-24 19:57:23 +0000
commit55648d923b0e8b05ae2cfd064c85b6ff5d0483e4 (patch)
tree6ef1b9af624c5db840ab2f0b915a9d8f028f4403
parentb46c6a00e016cb201566115c1a164f570425d65a (diff)
downloadpidgin-55648d923b0e8b05ae2cfd064c85b6ff5d0483e4.tar.gz
[gaim-migrate @ 16087]
SF Patch #1475008 from Wan Hing Wah "fix crash when search in buddylist containing non-ascii text" "the len parameter of pango_get_log_attrs should be in length of bytes instead of length of utf8 characters. This cause crash when the buddly list name contain international character where strlen(normalized) != g_utf8_strlen(normalized). reproducable on gaim svn trunk" committer: Richard Laager <rlaager@pidgin.im>
-rw-r--r--COPYRIGHT1
-rw-r--r--src/gtkblist.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 045ff326bf..35e8c261c9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -294,6 +294,7 @@ James Vega
David Vermeille
Sid Vicious
Bjoern Voigt
+Wan Hing Wah
Philip Walford
Nathan Walp
Eric Warmenhoven
diff --git a/src/gtkblist.c b/src/gtkblist.c
index 652297b059..48ade15415 100644
--- a/src/gtkblist.c
+++ b/src/gtkblist.c
@@ -3428,7 +3428,7 @@ _search_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *it
len = g_utf8_strlen(normalized, -1);
log_attrs = g_new(PangoLogAttr, len + 1);
- pango_get_log_attrs(normalized, len, -1, NULL, log_attrs, len + 1);
+ pango_get_log_attrs(normalized, strlen(normalized), -1, NULL, log_attrs, len + 1);
word = normalized;
result = TRUE;