X Strike Force X.Org X11 SVN commit: r4133 - in trunk/lib/libx11/debian: . patches
Author: julien
Date: 2006-12-07 20:22:56 -0500 (Thu, 07 Dec 2006)
New Revision: 4133
Added:
trunk/lib/libx11/debian/patches/021_compose_fclose.diff
Modified:
trunk/lib/libx11/debian/changelog
trunk/lib/libx11/debian/patches/series
Log:
* Add patch 021_compose_fclose.diff to fix file descriptor leak when a
Compose file uses the "include" directive.
Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog 2006-12-07 16:40:05 UTC (rev 4132)
+++ trunk/lib/libx11/debian/changelog 2006-12-08 01:22:56 UTC (rev 4133)
@@ -2,8 +2,10 @@
* Remove /usr/X11R6/lib from /etc/ld.so.conf in postinst if it's no longer
needed, instead of adding it there.
+ * Add patch 021_compose_fclose.diff to fix file descriptor leak when a
+ Compose file uses the "include" directive.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 25 Nov 2006 06:01:37 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Fri, 8 Dec 2006 02:07:33 +0100
libx11 (2:1.0.3-4) unstable; urgency=low
Added: trunk/lib/libx11/debian/patches/021_compose_fclose.diff
===================================================================
--- trunk/lib/libx11/debian/patches/021_compose_fclose.diff (rev 0)
+++ trunk/lib/libx11/debian/patches/021_compose_fclose.diff 2006-12-08 01:22:56 UTC (rev 4133)
@@ -0,0 +1,15 @@
+Fix file descriptor leak.
+Submitted upstream: see https://bugs.freedesktop.org/show_bug.cgi?id=9279
+
+diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
+index 18147e9..8eb5fa7 100644
+--- a/modules/im/ximcp/imLcPrs.c
++++ b/modules/im/ximcp/imLcPrs.c
+@@ -471,6 +471,7 @@ parseline(
+ if (infp == NULL)
+ goto error;
+ _XimParseStringFile(infp, im);
++ fclose(infp);
+ return (0);
+ } else if ((token == KEY) && (strcmp("None", tokenbuf) == 0)) {
+ modifier = 0;
Modified: trunk/lib/libx11/debian/patches/series
===================================================================
--- trunk/lib/libx11/debian/patches/series 2006-12-07 16:40:05 UTC (rev 4132)
+++ trunk/lib/libx11/debian/patches/series 2006-12-08 01:22:56 UTC (rev 4133)
@@ -14,3 +14,4 @@
016_greek_polytonic_Compose.diff
019_new_autoconf.diff
020_CVE-2006-5397.diff
+021_compose_fclose.diff
Reply to: