debian/changelog | 11 +++++++++-- debian/control | 2 +- nls/locale.dir.pre | 3 +-- src/FontNames.c | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-)
New commits: commit 078c259914f451392471038e9ec471abd8f258ae Author: Julien Cristau <[email protected]> Date: Sat Jan 28 00:09:06 2017 +0100 Build-depend on dpkg-dev 1.18.0 for arch-bits support in dpkg-gensymbols. diff --git a/debian/changelog b/debian/changelog index 2e0b277..f8a2f87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libx11 (2:1.6.4-3) unstable; urgency=high * Fix two regressions introduced in 2:1.6.4-1: + Fix wrong Xfree in XListFonts failure path + Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 (closes: #847345) + * Build-depend on dpkg-dev 1.18.0 for arch-bits support in dpkg-gensymbols. -- Julien Cristau <[email protected]> Sat, 28 Jan 2017 00:06:50 +0100 diff --git a/debian/control b/debian/control index c77280f..9d05e43 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Build-Depends: debhelper (>= 10), - dpkg-dev (>= 1.16.0), + dpkg-dev (>= 1.18.0), pkg-config, xtrans-dev, x11proto-core-dev (>= 7.0.21), commit 29fc1840288617c479ddebcd0bcf64d23caf78e9 Author: Julien Cristau <[email protected]> Date: Sat Jan 28 00:06:57 2017 +0100 Update changelog, upload to unstable diff --git a/debian/changelog b/debian/changelog index 16881bf..2e0b277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -libx11 (2:1.6.4-3) UNRELEASED; urgency=medium +libx11 (2:1.6.4-3) unstable; urgency=high + [ Emilio Pozuelo Monfort ] * debian/libx11-6.symbols: use arch-bits=64 rather than listing all 64-bits architectures, which is not future-proof. - -- Emilio Pozuelo Monfort <[email protected]> Wed, 07 Dec 2016 17:23:04 +0100 + [ Julien Cristau ] + * Fix two regressions introduced in 2:1.6.4-1: + + Fix wrong Xfree in XListFonts failure path + + Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 (closes: #847345) + + -- Julien Cristau <[email protected]> Sat, 28 Jan 2017 00:06:50 +0100 libx11 (2:1.6.4-2) unstable; urgency=medium commit 10e7570f675f30adcd7a6b8b91fe840ec5e5fb89 Author: Petr Písař <[email protected]> Date: Sun Oct 30 12:49:11 2016 +0100 Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 The cs_CZ.UTF-8/XLC_LOCALE is an empty file leading to unsupported cs_CZ.UTF-8 locale and reporting this error: Warning: locale not supported by Xlib, locale set to C Therefore this patch reverts to the en_US.UTF-8 definition file that was used before. This patch also deduplicates the cs_CZ.UTF-8 entry. <https://bugs.freedesktop.org/show_bug.cgi?id=98219> This reverts commit 33840a5465a2e5fecab520bfbdd2d1bd0a456f51 Signed-off-by: Julien Cristau <[email protected]> (cherry picked from commit 23d9623c661694aba8cf1e8f277dffa7a86cf065) diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index c4740a7..92da876 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -302,9 +302,8 @@ en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8 -cs_CZ.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 -en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 +en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8 en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8 en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8 commit 146a2a4ae59dbcffa069f53f916583073cdcc7e0 Author: Julien Cristau <[email protected]> Date: Sat Jan 7 16:20:31 2017 +0100 Fix wrong Xfree in XListFonts failure path 'ch' gets moved inside the allocated buffer as we're looping through fonts, so keep a reference to the start of the buffer so we can pass that to Xfree in the failure case. Fixes: commit 20a3f99eba5001925b8b313da3accb7900eb1927 "Plug a memory leak" Signed-off-by: Julien Cristau <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit c74b070f2712c95f0db7c320a10232b0e5c83049) diff --git a/src/FontNames.c b/src/FontNames.c index 3e23b5f..9ffdfd2 100644 --- a/src/FontNames.c +++ b/src/FontNames.c @@ -43,6 +43,7 @@ int *actualCount) /* RETURN */ register int length; char **flist = NULL; char *ch = NULL; + char *chstart; char *chend; int count = 0; xListFontsReply rep; @@ -86,6 +87,7 @@ int *actualCount) /* RETURN */ /* * unpack into null terminated strings. */ + chstart = ch; chend = ch + (rlen + 1); length = *(unsigned char *)ch; *ch = 1; /* make sure it is non-zero for XFreeFontNames */ @@ -98,14 +100,14 @@ int *actualCount) /* RETURN */ *ch = '\0'; /* and replace with null-termination */ count++; } else { - Xfree(ch); + Xfree(chstart); Xfree(flist); flist = NULL; count = 0; break; } } else { - Xfree(ch); + Xfree(chstart); Xfree(flist); flist = NULL; count = 0;
