Author: branden
Date: 2004-07-29 15:30:13 -0500 (Thu, 29 Jul 2004)
New Revision: 1707
Removed:
trunk/debian/patches/051_fix_lcPtrTxt.c_memleak.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab from XFree86 CVS (2003-05-29) a fix for a SEGV in libX11's lcPrTxt()
function, which caused application crashes when, e.g., pasting text into
XTerm. Also remove patch #051 in favor of identical fix committed to
XFree86 CVS on 2003-04-03). Thanks to Thomas Dickey for tracking this
bug, and fix, down. (Closes: #250655)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-29 19:16:40 UTC (rev 1706)
+++ trunk/debian/CHANGESETS 2004-07-29 20:30:13 UTC (rev 1707)
@@ -221,4 +221,11 @@
(Thanks, Michael Banck!)
1706
+Grab from XFree86 CVS (2003-05-29) a fix for a SEGV in libX11's lcPrTxt()
+function, which caused application crashes when, e.g., pasting text into
+XTerm. Also remove patch #051 in favor of identical fix committed to
+XFree86 CVS on 2003-04-03). Thanks to Thomas Dickey for tracking this
+bug, and fix, down. (Closes: #250655)
+ 1707
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-29 19:16:40 UTC (rev 1706)
+++ trunk/debian/changelog 2004-07-29 20:30:13 UTC (rev 1707)
@@ -160,6 +160,12 @@
MANIFEST files.
(Thanks, Michael Banck!)
+ * Grab from XFree86 CVS (2003-05-29) a fix for a SEGV in libX11's lcPrTxt()
+ function, which caused application crashes when, e.g., pasting text into
+ XTerm. Also remove patch #051 in favor of identical fix committed to
+ XFree86 CVS on 2003-04-03). Thanks to Thomas Dickey for tracking this
+ bug, and fix, down. (Closes: #250655)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -192,7 +198,7 @@
* Get glxinfo to link properly with g++ (instead of adding -lstdc++).
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 29 Jul 2004 14:09:27 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 29 Jul 2004 15:20:43 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-07-29 19:16:40 UTC
(rev 1706)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-07-29 20:30:13 UTC
(rev 1707)
@@ -258,6 +258,14 @@
James Su).
[David Dawes]
+xc/lib/X11/lcPrTxt.c @ 1.9
+ 54. Fix a double allocation in _XTextPropertyToTextList() (#A.1681,
+ Lubos Lunak).
+
+xc/lib/X11/lcPrTxt.c @ 1.10
+ 198. Fix bug (Bugzilla #315) in _XTextPropertyToTextList() that causes
+ an application crash in some circumstances (Ivan Pascal).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -6123,3 +6131,38 @@
END XLC_FONTSET
XCOMM
+Index: xc/lib/X11/lcPrTxt.c
+===================================================================
+RCS file: /cvs/xc/lib/X11/lcPrTxt.c,v
+retrieving revision 1.8
+retrieving revision 1.10
+diff -u -r1.8 -r1.10
+--- xc/lib/X11/lcPrTxt.c 3 Jun 2002 22:36:00 -0000 1.8
++++ xc/lib/X11/lcPrTxt.c 29 May 2003 13:22:51 -0000 1.10
+@@ -23,7 +23,7 @@
+ * Author: Katsuhisa Yano TOSHIBA Corp.
+ * [EMAIL PROTECTED]
+ */
+-/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.8 2002/06/03 22:36:00 dawes Exp $ */
++/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.10 2003/05/29 13:22:51 pascal Exp $ */
+
+ #include "Xlibint.h"
+ #include "XlcPubI.h"
+@@ -154,7 +154,6 @@
+ buf_len = text_prop->nitems * 6 + 1;
+ else
+ buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
+- buf = (XPointer) Xmalloc(buf_len);
+ }
+ buf = (XPointer) Xmalloc(buf_len);
+ if (buf == NULL)
+@@ -213,7 +212,8 @@
+ to++;
+ to_left--;
+ }
+- _XlcResetConverter(conv);
++ if (! do_strcpy)
++ _XlcResetConverter(conv);
+ } else
+ str_ptr++;
+
Deleted: trunk/debian/patches/051_fix_lcPtrTxt.c_memleak.diff
===================================================================
--- trunk/debian/patches/051_fix_lcPtrTxt.c_memleak.diff 2004-07-29
19:16:40 UTC (rev 1706)
+++ trunk/debian/patches/051_fix_lcPtrTxt.c_memleak.diff 2004-07-29
20:30:13 UTC (rev 1707)
@@ -1,14 +0,0 @@
-$Id$
-
-This patch from Mike A. Harris - prevents a memleak from a double malloc().
-
---- xc/lib/X11/lcPrTxt.c.sav 2002-06-04 00:36:00.000000000 +0200
-+++ xc/lib/X11/lcPrTxt.c 2003-03-13 12:59:07.000000000 +0100
-@@ -154,7 +154,6 @@ _XTextPropertyToTextList(
- buf_len = text_prop->nitems * 6 + 1;
- else
- buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
-- buf = (XPointer) Xmalloc(buf_len);
- }
- buf = (XPointer) Xmalloc(buf_len);
- if (buf == NULL)
