diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-08-22 22:30:34 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2018-10-22 23:23:06 +0200 |
| commit | e1938c189223164f3a75cf848e90ecc1d2e55d15 (patch) | |
| tree | 01098708cb7f48349664b1d712c6a77af6bd008c /nx-X11/lib/src/FontNames.c | |
| parent | 3dc4595560b34242fe4705af8c93d0024eeb2c56 (diff) | |
| download | nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.tar.gz nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.tar.bz2 nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.zip | |
libNX_X11: upgrade to X.org upstream version 1.6.6
We are at X.Org libX11 upstream commit 733f64b
Fixes: ArcticaProject/nx-libs #716, #719 and #720
Diffstat (limited to 'nx-X11/lib/src/FontNames.c')
| -rw-r--r-- | nx-X11/lib/src/FontNames.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nx-X11/lib/src/FontNames.c b/nx-X11/lib/src/FontNames.c index 9ffdfd299..ec7d90fa2 100644 --- a/nx-X11/lib/src/FontNames.c +++ b/nx-X11/lib/src/FontNames.c @@ -88,24 +88,16 @@ int *actualCount) /* RETURN */ * unpack into null terminated strings. */ chstart = ch; - chend = ch + (rlen + 1); + chend = ch + rlen; length = *(unsigned char *)ch; *ch = 1; /* make sure it is non-zero for XFreeFontNames */ for (i = 0; i < rep.nFonts; i++) { if (ch + length < chend) { flist[i] = ch + 1; /* skip over length */ ch += length + 1; /* find next length ... */ - if (ch <= chend) { - length = *(unsigned char *)ch; - *ch = '\0'; /* and replace with null-termination */ - count++; - } else { - Xfree(chstart); - Xfree(flist); - flist = NULL; - count = 0; - break; - } + length = *(unsigned char *)ch; + *ch = '\0'; /* and replace with null-termination */ + count++; } else { Xfree(chstart); Xfree(flist); |