rpms/gaim/devel gaim-2.0.0-beta3-utf8-name-crash.patch, NONE, 1.1 gaim.spec, 1.131, 1.132

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2919

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-utf8-name-crash.patch 
Log Message:
fix crash with certain UTF-8 names in buddy list (#199590)


gaim-2.0.0-beta3-utf8-name-crash.patch:
 gtkblist.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-2.0.0-beta3-utf8-name-crash.patch ---
Index: src/gtkblist.c
===================================================================
--- src/gtkblist.c	(revision 16086)
+++ src/gtkblist.c	(revision 16087)
@@ -3428,7 +3428,7 @@
 	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;


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gaim.spec	22 Jul 2006 04:10:18 -0000	1.131
+++ gaim.spec	25 Jul 2006 16:57:43 -0000	1.132
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.8.%{betaver}%{?dist}
+Release:	0.9.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -56,6 +56,7 @@
 
 ## Patches 100+: To be Included in Future Upstream
 Patch181: gaim-2.0.0-beta3-silc-realname.patch
+Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -158,6 +159,7 @@
 %patch5 -p1
 ## Patches 100+: To be Included in Future Upstream
 %patch181 -p2
+%patch182 -p0
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -295,6 +297,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Tue Jul 25 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.9.beta3
+- fix crash with certain UTF-8 names in buddy list (#199590)
+
 * Sat Jul 22 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.8.beta3
 - move gaim.pc to -devel (#199761)