- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.

This commit is contained in:
Adam Jackson 2008-09-17 16:58:55 +00:00
parent 76dfd6e153
commit 60b601e52a
2 changed files with 12 additions and 6 deletions

View File

@ -1,6 +1,7 @@
--- libX11-1.1.4/src/xcb_io.c 2008-03-06 15:45:06.000000000 -0500 diff -up libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak libX11-1.1.4/src/xcb_io.c
+++ hacked/src/xcb_io.c 2008-09-17 00:40:57.000000000 -0400 --- libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak 2008-03-06 15:45:06.000000000 -0500
@@ -396,15 +396,18 @@ +++ 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_LookupColor:
case X_AllocNamedColor: case X_AllocNamedColor:
@ -9,9 +10,11 @@
} }
break; break;
case BadFont: case BadFont:
if(err->majorCode == X_QueryFont) - if(err->majorCode == X_QueryFont)
+ if(err->majorCode == X_QueryFont) {
+ free(error); + free(error);
return 0; return 0;
+ }
break; break;
case BadAlloc: case BadAlloc:
case BadAccess: case BadAccess:
@ -19,7 +22,7 @@
return 0; return 0;
} }
@@ -413,10 +416,13 @@ @@ -413,10 +417,13 @@ Status _XReply(Display *dpy, xReply *rep
* want to suppress the error. * want to suppress the error.
*/ */
for(ext = dpy->ext_procs; ext; ext = ext->next) for(ext = dpy->ext_procs; ext; ext = ext->next)

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libX11 runtime library Summary: X.Org X11 libX11 runtime library
Name: libX11 Name: libX11
Version: 1.1.4 Version: 1.1.4
Release: 3%{?dist} Release: 4%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Wed Sep 17 2008 Adam Jackson <ajax@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@redhat.com> 1.1.4-3 * Wed Sep 17 2008 Adam Jackson <ajax@redhat.com> 1.1.4-3
- libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a - libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
non-fatal error handler. (mclasen, fdo #17616) non-fatal error handler. (mclasen, fdo #17616)