rpms/libX11/devel libX11-1.1.4-xcb-xreply-leak.patch, 1.1, 1.2 libX11.spec, 1.47, 1.48

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19952

Modified Files:
	libX11-1.1.4-xcb-xreply-leak.patch libX11.spec 
Log Message:
* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-4
- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.


libX11-1.1.4-xcb-xreply-leak.patch:

Index: libX11-1.1.4-xcb-xreply-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11-1.1.4-xcb-xreply-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libX11-1.1.4-xcb-xreply-leak.patch	17 Sep 2008 14:57:27 -0000	1.1
+++ libX11-1.1.4-xcb-xreply-leak.patch	17 Sep 2008 16:58:55 -0000	1.2
@@ -1,6 +1,7 @@
---- libX11-1.1.4/src/xcb_io.c	2008-03-06 15:45:06.000000000 -0500
-+++ hacked/src/xcb_io.c	2008-09-17 00:40:57.000000000 -0400
-@@ -396,15 +396,18 @@
+diff -up libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak libX11-1.1.4/src/xcb_io.c
+--- libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak	2008-03-06 15:45:06.000000000 -0500
++++ libX11-1.1.4/src/xcb_io.c	2008-09-17 12:58:05.000000000 -0400
+@@ -396,15 +396,19 @@ Status _XReply(Display *dpy, xReply *rep
  				{
  					case X_LookupColor:
  					case X_AllocNamedColor:
@@ -9,9 +10,11 @@
  				}
  				break;
  			case BadFont:
- 				if(err->majorCode == X_QueryFont)
+-				if(err->majorCode == X_QueryFont)
++				if(err->majorCode == X_QueryFont) {
 +					free(error);
  					return 0;
++				}
  				break;
  			case BadAlloc:
  			case BadAccess:
@@ -19,7 +22,7 @@
  				return 0;
  		}
  
-@@ -413,10 +416,13 @@
+@@ -413,10 +417,13 @@ Status _XReply(Display *dpy, xReply *rep
  		 * want to suppress the error.
  		 */
  		for(ext = dpy->ext_procs; ext; ext = ext->next)


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libX11.spec	17 Sep 2008 14:57:27 -0000	1.47
+++ libX11.spec	17 Sep 2008 16:58:55 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -117,6 +117,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-4
+- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.
+
 * Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-3
 - libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
   non-fatal error handler. (mclasen, fdo #17616)