rpms/imsettings/devel imsettings-fix-race-on-popen.patch, NONE, 1.1 imsettings.spec, 1.52, 1.53

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11933

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-race-on-popen.patch 
Log Message:
* Thu Jun 24 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-4
- Fix a segfault. (#599924)

imsettings-fix-race-on-popen.patch:
 imsettings-info.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE imsettings-fix-race-on-popen.patch ---
2010-06-04  Akira TAGOH  <tagoh at redhat.com>

	* imsettings/imsettings-info.c (imsettings_info_notify_properties): 
	Fix the race condition issue during popen. (rhbz#599924)

Index: imsettings/imsettings-info.c
===================================================================
--- imsettings/imsettings-info.c	(リビジョン 396)
+++ imsettings/imsettings-info.c	(作業コピー)
@@ -107,6 +107,7 @@
 
 
 G_DEFINE_TYPE (IMSettingsInfo, imsettings_info, IMSETTINGS_TYPE_OBJECT);
+G_LOCK_DEFINE_STATIC (info);
 
 /*
  * Private functions
@@ -228,6 +229,8 @@
 	g_free(xinputinfo);
 	g_free(lang);
 
+	G_LOCK (info);
+
 	if (lstat(filename, &st) == -1 ||
 	    (fp = popen(cmd->str, "r")) == NULL) {
 		/* error happens. don't list. */
@@ -304,6 +307,8 @@
 		}
 		pclose(fp);
 	}
+
+	G_UNLOCK (info);
 	g_string_free(cmd, TRUE);
 	g_string_free(str, TRUE);
 


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- imsettings.spec	19 May 2010 08:52:06 -0000	1.52
+++ imsettings.spec	24 Jun 2010 09:26:11 -0000	1.53
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.108.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,6 +22,7 @@ Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-none.conf-gtk-xim-default.patch
 Patch3:		imsettings-fix-lxde-fail.patch
 Patch4:		imsettings-no-restart-with-exit0.patch
+Patch5:		imsettings-fix-race-on-popen.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -107,6 +108,7 @@ This package contains a helper program t
 %patch2 -p1 -b .2-xim
 %patch3 -p0 -b .3-lxde
 %patch4 -p0 -b .4-no-restart
+%patch5 -p0 -b .5-popen
 autoreconf -Im4macros -f
 
 %build
@@ -244,6 +246,9 @@ fi
 
 
 %changelog
+* Thu Jun 24 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-4
+- Fix a segfault. (#599924)
+
 * Tue May 18 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-3
 - Don't restart the IM process when the exit status is 0.