rpms/tk/devel tk-8.5.7-nofont-sigsegv.patch, NONE, 1.1 tk.spec, 1.65, 1.66

[Jaroslav Škarvada]

Author: jskarvad

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

Modified Files:
	tk.spec 
Added Files:
	tk-8.5.7-nofont-sigsegv.patch 
Log Message:
* Fri Jun 25 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.8-2
- Fixed sigsegv if there is no font seen by fontconfig (#606671),
  fixed by nofont-sigsegv patch


tk-8.5.7-nofont-sigsegv.patch:
 tkFont.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE tk-8.5.7-nofont-sigsegv.patch ---
--- tk8.5.7/generic/tkFont.c.old	2009-03-04 00:54:11.000000000 +0100
+++ tk8.5.7/generic/tkFont.c	2010-06-24 17:49:20.191702270 +0200
@@ -1194,6 +1194,13 @@ Tk_AllocFontFromObj(
 	}
     }
 
+	if (fontPtr == NULL) {
+		if (isNew) {
+			Tcl_DeleteHashEntry(cacheHashPtr);
+		}
+		return NULL;
+	}
+
     fontPtr->resourceRefCount = 1;
     fontPtr->objRefCount = 1;
     fontPtr->cacheHashPtr = cacheHashPtr;


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- tk.spec	18 Mar 2010 17:22:41 -0000	1.65
+++ tk.spec	25 Jun 2010 08:22:06 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -27,6 +27,8 @@ Patch2: tk8.5-conf.patch
 Patch3: tk-seg_input.patch
 # RHBZ#545807, this patch is tracked in tk tracker
 Patch4: tk-8.5.7-color.patch
+# fixes sigsegv if there is no font seen by fontconfig (#606671)
+Patch5: tk-8.5.7-nofont-sigsegv.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -52,6 +54,7 @@ The package contains the development fil
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .seg
 %patch4 -p1 -b .color
+%patch5 -p1 -b .nofont-sigsegv
 
 %build
 cd unix
@@ -119,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jun 25 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.8-2
+- Fixed sigsegv if there is no font seen by fontconfig (#606671),
+  fixed by nofont-sigsegv patch
+
 * Thu Mar 18 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.8-1
 - Update to 8.5.8