commit da4246c98bc51297daeec47c15181e179df94013 Author: Alan Coopersmith Date: Tue Mar 17 08:12:19 2015 -0700 libXfont 1.5.1 Signed-off-by: Alan Coopersmith commit 2351c83a77a478b49cba6beb2ad386835e264744 Author: Alan Coopersmith Date: Fri Mar 6 22:54:58 2015 -0800 bdfReadCharacters: ensure metrics fit into xCharInfo struct [CVE-2015-1804] We use 32-bit ints to read from the bdf file, but then try to stick into a 16-bit int in the xCharInfo struct, so make sure they won't overflow that range. Found by afl-1.24b. v2: Verify that additions won't overflow 32-bit int range either. v3: As Julien correctly observes, the previous check for bh & bw not being < 0 reduces the number of cases we need to check for overflow. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau commit 78c2e3d70d29698244f70164428bd2868c0ab34c Author: Alan Coopersmith Date: Fri Feb 6 15:54:00 2015 -0800 bdfReadCharacters: bailout if a char's bitmap cannot be read [CVE-2015-1803] Previously would charge on ahead with a NULL pointer in ci->bits, and then crash later in FontCharInkMetrics() trying to access the bits. Found with afl-1.23b. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau commit 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e Author: Alan Coopersmith Date: Fri Feb 6 15:50:45 2015 -0800 bdfReadProperties: property count needs range check [CVE-2015-1802] Avoid integer overflow or underflow when allocating memory arrays by multiplying the number of properties reported for a BDF font. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau commit d9fda3d247942292a5f24694c22337c547006e11 Author: Christos Zoulas Date: Wed Feb 25 21:39:30 2015 +0100 Set close-on-exec for font file I/O. Reviewed-by: Alan Coopersmith Signed-off-by: Thomas Klausner commit 3b33588117c2ca3099b999939985ffe098d479b3 Author: Alan Coopersmith Date: Wed Nov 5 17:41:24 2014 -0800 Use 'imdent' to realign cpp indentation levels in fslibos.h Parts were indented, others weren't, now is more consistent. 'git diff -w' shows no non-whitespace changes in this commit Signed-off-by: Alan Coopersmith commit 03c035b061a0582159467dcadfc8e95074e2a84f Author: Alan Coopersmith Date: Wed Nov 5 17:39:05 2014 -0800 Remove unneeded checks for #ifndef X_NOT_POSIX Signed-off-by: Alan Coopersmith commit ad4f4d8a2d0730c0ea3c09210bf921638b4682bc Author: Alan Coopersmith Date: Sat Jul 19 09:49:23 2014 -0700 libXfont 1.5.0 Signed-off-by: Alan Coopersmith commit b19cf2a78f7f721c43d0d9e2f32b71fc746142a3 Author: Alan Coopersmith Date: Mon Jul 7 13:18:18 2014 -0700 libXfont 1.4.99.901 Signed-off-by: Alan Coopersmith commit 0dcdd82059c69ec417bb094f4da2afef7cc1426a Author: Yaakov Selkowitz Date: Sun Apr 6 14:18:32 2014 -0500 Make shared library work on Cygwin/MinGW Weak symbols on PE platforms do not work the same way as on ELF platforms, hence we have been unable to have a fully functional shared libXfont until now. This patch works around these issues so that we can fix that. In summary, only when compiling shared libraries on NO_WEAK_SYMBOLS platforms, when the first stub is called, the invoking program is first checked to determine if it exports the stubbed functions. Then, for every stub call, if the function is exported by the loader, it is called instead of the stub code. serverClient and serverGeneration are data pointers, and therefore are replaced by getter functions. ErrorF is variadic, so the override is routed through VErrorF instead. FatalError has no va_list equivalent, but it is not actually used in libXfont and therefore should be safe to remove. This requires all X servers to export their symbols, which requires forthcoming patches for hw/xwin and xfs; the other xservers (including tigervnc) already do this via LD_EXPORT_SYMBOLS_FLAG. Signed-off-by: Yaakov Selkowitz Reviewed-by: Colin Harrison Acked-by: Alan Coopersmith Tested-by: Jeremy Huddleston Sequoia commit 783a406d6258509abfbdc54c0b32366dcaf13044 Author: Keith Packard Date: Mon Apr 21 13:37:00 2014 -0700 Use default glyphs when getting 16-bit font with 8-bit text When accessing a 16-bit font with firstRow > 0 with 8-bit text, check to see if the font has a default character and return that for every incoming character. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt Signed-off-by: Alan Coopersmith commit e8d20171fe04dbdc5f97739d5a59e02f0b091ba0 Author: Alan Coopersmith Date: Thu May 15 23:04:23 2014 -0700 Don't build unused code in bitmapfunc.c if all bitmap formats are disabled If the only bitmaps we support are builtins, don't need the code to register all the bitmap font file handlers. Fixes gcc warnings: bitmapfunc.c:110:1: warning: 'BitmapOpenBitmap' defined but not used [-Wunused-function] BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, ^ bitmapfunc.c:155:1: warning: 'BitmapGetInfoBitmap' defined but not used [-Wunused-function] BitmapGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo, ^ Signed-off-by: Alan Coopersmith Reviewed-by: Rémi Cardona commit c2b7758d268fd98e09c3e66a0e7717b47ff12a47 Author: Alan Coopersmith Date: Thu May 15 22:44:38 2014 -0700 Don't compile bitmap source files for disabled formats pcfread.c is a special case - it's needed for either reading pcf files from disk (--enable-pcfformat) or from the builtin fonts in memory (--enable-builtins), so needed a new AM_CONDITIONAL case. Signed-off-by: Alan Coopersmith Reviewed-by: Rémi Cardona commit a81f1a9bd3cd0a9d45d93d5b9e392b4e08ac60f7 Author: Alan Coopersmith Date: Thu May 15 20:43:34 2014 -0700 Drop imake/monolithic compatibility #define mapping Require the #defines from configure.ac now that we're not sharing source with the imake builds any longer. Signed-off-by: Alan Coopersmith Reviewed-by: Rémi Cardona commit 37595cfd4feaf031552d66f96dc6d58686f9c851 Author: Alan Coopersmith Date: Thu May 15 20:26:41 2014 -0700 Change default to disabling SNF support Signed-off-by: Alan Coopersmith Reviewed-by: Rémi Cardona commit 9f677e55c7bf07df280427f127af21e5b70f1e03 Author: Alan Coopersmith Date: Thu May 15 20:21:29 2014 -0700 Use AS_HELP_STRING to provide help for AC_ARG_ENABLE & AC_ARG_WITH options Signed-off-by: Alan Coopersmith Reviewed-by: Rémi Cardona commit d338f81df1e188eb16e1d6aeea7f4800f89c1218 Author: Alan Coopersmith Date: Fri May 2 19:24:17 2014 -0700 CVE-2014-0210: unvalidated length fields in fs_read_list_info() fs_read_list_info() parses a reply from the font server. The reply contains a number of additional data items with embedded length or count fields, none of which are validated. This can cause out of bound reads when looping over these items in the reply. Signed-off-by: Alan Coopersmith commit 5fa73ac18474be3032ee7af9c6e29deab163ea39 Author: Alan Coopersmith Date: Fri May 2 19:24:17 2014 -0700 CVE-2014-0210: unvalidated length fields in fs_read_list() fs_read_list() parses a reply from the font server. The reply contains a list of strings with embedded length fields, none of which are validated. This can cause out of bound reads when looping over the strings in the reply. Signed-off-by: Alan Coopersmith commit 520683652564c2a4e42328ae23eef9bb63271565 Author: Alan Coopersmith Date: Fri Apr 25 23:03:24 2014 -0700 CVE-2014-0210: unvalidated length fields in fs_read_glyphs() fs_read_glyphs() parses a reply from the font server. The reply contains embedded length fields, none of which are validated. This can cause out of bound reads when looping over the glyph bitmaps in the reply. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit a3f21421537620fc4e1f844a594a4bcd9f7e2bd8 Author: Alan Coopersmith Date: Fri Apr 25 23:03:05 2014 -0700 CVE-2014-0210: unvalidated length fields in fs_read_extent_info() Looping over the extents in the reply could go past the end of the reply buffer if the reply indicated more extents than could fit in the specified reply length. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit a42f707f8a62973f5e8bbcd08afb10a79e9cee33 Author: Alan Coopersmith Date: Fri Apr 25 23:02:54 2014 -0700 CVE-2014-0211: integer overflow in fs_alloc_glyphs() fs_alloc_glyphs() is a malloc wrapper used by the font code. It contains a classic integer overflow in the malloc() call, which can cause memory corruption. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit c578408c1fd4db09e4e3173f8a9e65c81cc187c1 Author: Alan Coopersmith Date: Fri Apr 25 23:02:42 2014 -0700 CVE-2014-0211: integer overflow in fs_read_extent_info() fs_read_extent_info() parses a reply from the font server. The reply contains a 32bit number of elements field which is used to calculate a buffer length. There is an integer overflow in this calculation which can lead to memory corruption. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 491291cabf78efdeec8f18b09e14726a9030cc8f Author: Alan Coopersmith Date: Fri Apr 25 23:02:34 2014 -0700 CVE-2014-0210: unvalidated length fields in fs_read_query_info() fs_read_query_info() parses a reply from the font server. The reply contains embedded length fields, none of which are validated. This can cause out of bound reads in either fs_read_query_info() or in _fs_convert_props() which it calls to parse the fsPropInfo in the reply. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 0f1a5d372c143f91a602bdf10c917d7eabaee09b Author: Alan Coopersmith Date: Fri Apr 25 23:02:25 2014 -0700 CVE-2014-0211: Integer overflow in fs_get_reply/_fs_start_read fs_get_reply() would take any reply size, multiply it by 4 and pass to _fs_start_read. If that size was bigger than the current reply buffer size, _fs_start_read would add it to the existing buffer size plus the buffer size increment constant and realloc the buffer to that result. This math could overflow, causing the code to allocate a smaller buffer than the amount it was about to read into that buffer from the network. It could also succeed, allowing the remote font server to cause massive allocations in the X server, possibly using up all the address space in a 32-bit X server, allowing the triggering of other bugs in code that fails to handle malloc failure properly. This patch protects against both problems, by disconnecting any font server trying to feed us more than (the somewhat arbitrary) 64 mb in a single reply. Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit cbb64aef35960b2882be721f4b8fbaa0fb649d12 Author: Alan Coopersmith Date: Fri Apr 25 23:02:12 2014 -0700 CVE-2014-0210: unvalidated lengths when reading replies from font server Functions to handle replies to font server requests were casting replies from the generic form to reply specific structs without first checking that the reply was at least as long as the struct being cast to. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 891e084b26837162b12f841060086a105edde86d Author: Alan Coopersmith Date: Fri Apr 25 23:02:00 2014 -0700 CVE-2014-0210: unvalidated length in _fs_recv_conn_setup() The connection setup reply from the font server can include a list of alternate servers to contact if this font server stops working. The reply specifies a total size of all the font server names, and then provides a list of names. _fs_recv_conn_setup() allocated the specified total size for copying the names to, but didn't check to make sure it wasn't copying more data to that buffer than the size it had allocated. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 05c8020a49416dd8b7510cbba45ce4f3fc81a7dc Author: Alan Coopersmith Date: Fri Apr 25 23:01:48 2014 -0700 CVE-2014-0209: integer overflow of realloc() size in lexAlias() lexAlias() reads from a file in a loop. It does this by starting with a 64 byte buffer. If that size limit is hit, it does a realloc of the buffer size << 1, basically doubling the needed length every time the length limit is hit. Eventually, this will shift out to 0 (for a length of ~4gig), and that length will be passed on to realloc(). A length of 0 (with a valid pointer) causes realloc to free the buffer on most POSIX platforms, but the caller will still have a pointer to it, leading to use after free issues. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 2f5e57317339c526e6eaee1010b0e2ab8089c42e Author: Alan Coopersmith Date: Fri Apr 25 23:01:11 2014 -0700 CVE-2014-0209: integer overflow of realloc() size in FontFileAddEntry() FontFileReadDirectory() opens a fonts.dir file, and reads over every line in an fscanf loop. For each successful entry read (font name, file name) a call is made to FontFileAddFontFile(). FontFileAddFontFile() will add a font file entry (for the font name and file) each time it’s called, by calling FontFileAddEntry(). FontFileAddEntry() will do the actual adding. If the table it has to add to is full, it will do a realloc, adding 100 more entries to the table size without checking to see if that will overflow the int used to store the size. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson Reviewed-by: Matthieu Herrb commit 2a5111af9e03a55bd099c6c3a5b9a7fd3dfce76f Author: Alan Coopersmith Date: Thu Apr 24 22:11:08 2014 -0700 fs_send_open_font needs to allow namelen of 0 when FontReopen is set When _fs_load_glyphs calls fs_send_open_font with FontReopen set, it passes a NULL name and namelen of 0, since fs_send_open_font is going to reuse the previous name. This overly restrictive check was added in XFree86 4.3.99.12: http://cvsweb.xfree86.org/cvsweb/xc/lib/font/fc/fserve.c.diff?r1=3.23&r2=3.24 http://cvsweb.xfree86.org/cvsweb/xc/lib/font/fc/fserve.c?rev=3.24&content-type=text/vnd.viewcvs-markup Signed-off-by: Alan Coopersmith commit 77902e1422315963364fcba3736ff9b5b0f32d47 Author: Alan Coopersmith Date: Tue Apr 22 23:49:29 2014 -0700 Clean up warnings when src/fc is built with -DDEBUG Signed-off-by: Alan Coopersmith commit f75f7bde4cedc36d5ca1289988b3daebb80528d2 Author: Alan Coopersmith Date: Tue Apr 22 23:45:41 2014 -0700 Allow enabling src/fc DEBUG helpers via CPPFLAGS Instead of editing fsio.h to turn on debugging logs, just add -DDEBUG to CPPFLAGS when building. Signed-off-by: Alan Coopersmith commit 21f5d3ec9d833b8bce08d0749b8001e1e88544ac Author: Alan Coopersmith Date: Mon Apr 21 22:05:20 2014 -0700 Bump version to 1.4.99.0 for master branch (to become 1.5) libXfont 1.5.0 will be synchronized with the fontsproto 2.1.3 API changes needed for xorg-server 1.16 branch. libXfont 1.4.x will be left for stable release branch for older Xserver releases. Signed-off-by: Alan Coopersmith commit 5a398a55ccdd92d0ff05793692ef8e57f3a50198 Author: Alan Coopersmith Date: Sun Apr 20 18:10:07 2014 -0700 Require fontsproto 2.1.3 for matching function prototypes Building current libXfont git against fontsproto 2.1.2 causes clang complaints of: patcache.c:130:1: error: conflicting types for 'CacheFontPattern' CacheFontPattern (FontPatternCachePtr cache, ^ patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern' FindCachedFontPattern (FontPatternCachePtr cache, ^ due to the constification of arguments not matching. Signed-off-by: Alan Coopersmith Reviewed-by: Thomas Klausner commit c77a0784bdfc8c178f0742689cf6ae02a2fce37f Author: Alan Coopersmith Date: Sun Apr 20 17:59:14 2014 -0700 Check if pointer returned by BufFileCreate is NULL before writing to it Fixes clang analyzer warning: bufio.c:165:13: warning: Access to field 'bufp' results in a dereference of a null pointer (loaded from variable 'f') f->bufp = f->buffer; ~ ^ Signed-off-by: Alan Coopersmith Reviewed-by: Thomas Klausner commit c8855746aec2a9b732502da0ca3258b4e701c61a Author: Peter Harris Date: Mon Apr 7 14:25:02 2014 -0400 Fix buffer read overrun "FreeType" is only eight bytes long. The atom "FreeType\x00\x??" is probably not what the author intended. Signed-off-by: Peter Harris Reviewed-by: Alan Coopersmith commit a96cc1f032a059da89319ceccb6659c8edd446fb Author: Keith Packard Date: Fri Nov 15 21:46:15 2013 +0900 Warning fixes. Many const char issues. One extra 'i' declared in ScaleFont; we can just use the same 'i' as exists at the top level scope. Also ignore bad-function-cast in ftfuncs.c and bitscale.c because we're casting the return value from floor or ceil from double to int. As floor and ceil are kinda designed to generate integer results, it's pretty clear that we're doing what we want and that the compiler is generating noise. I'm not sure why bad-function-cast is ever a good warning to turn on, but I'll leave that for another day. Signed-off-by: Keith Packard Reviewed-by: Gaetan Nadon commit 2a3429413df27224ceeddd22500ce43b5431d698 Author: Alan Coopersmith Date: Fri Jan 17 22:25:56 2014 -0800 Add note to README declaring snf fonts to be deprecated pcf was introduced to replace snf in X11R5 in 1991: http://www.x.org/wiki/X11R5/#index56h3 22 years is long enough to move off a font format that was alive for less than a decade before that, and widely considered a bad idea even then: http://www.faqs.org/faqs/fonts-faq/part15/ Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Eric Anholt Reviewed-by: Julien Cristau commit efcb136a03f642fba7e289e25d5dcf609bd13f07 Author: Alan Coopersmith Date: Fri Jan 17 22:25:01 2014 -0800 Add notes to README about various font formats & configure options Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Eric Anholt Reviewed-by: Julien Cristau commit 5d696738c2ab901bdef004169799bb63939fa7b5 Author: Alan Coopersmith Date: Fri Jan 17 22:00:25 2014 -0800 Correct comment in configure.ac about scalable font support Bitstream Speedo support was removed in commit d50de26430c1a114a. All scalable font support now goes through FreeType, which can also handle some bitmap font formats as well. Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Eric Anholt Reviewed-by: Julien Cristau commit 6371fcf2b60e48605ed59f098d1e642e35b1d142 Author: Alan Coopersmith Date: Tue Jan 7 23:09:08 2014 -0800 Remove redundant setting of 'len' in SPropRecValList_add_by_font_cap Found by cppcheck 1.63: [FreeType/xttcap.c:621] -> [FreeType/xttcap.c:624]: (performance) Variable 'len' is reassigned a value before the old one has been used. Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre commit 63c7ac4dbb739e51d55249e71282699e5e0d7e1d Author: Alan Coopersmith Date: Tue Jan 7 22:58:22 2014 -0800 Initialize (unused) data field in fsListCataloguesReq before sending it. Quiets cppcheck 1.63 warning: [fc/fserve.c:2972]: (error) Uninitialized variable: lcreq Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre commit d279ffa49284b5e5f787f76edbe8c52226534a64 Author: Alan Coopersmith Date: Tue Jan 7 22:29:04 2014 -0800 Remove redundant declaration of FontFileStartListFonts() Fixes gcc warning: catalogue.c:336:1: warning: redundant redeclaration of 'FontFileStartListFonts' [-Wredundant-decls] In file included from ../../include/X11/fonts/fntfilst.h:40:0, from catalogue.c:32: ../../include/X11/fonts/fntfil.h:92:12: note: previous declaration of 'FontFileStartListFonts' was here Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre commit 2fb6295ace36394732815aca5aef1a85e63de56c Author: Alan Coopersmith Date: Tue Jan 7 22:15:50 2014 -0800 Fix unused variable 'dir' warnings catalogue.c: In function 'CatalogueOpenFont': catalogue.c:290:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] catalogue.c: In function 'CatalogueListFonts': catalogue.c:324:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] fpe.c: In function 'BuiltinResetFPE': fpe.c:57:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre commit 30110063857ff9a5f93f6d8d13f535c9b6e59e2a Author: Alan Coopersmith Date: Tue Jan 7 08:22:31 2014 -0800 libXfont 1.4.7 Signed-off-by: Alan Coopersmith commit 2a84680376bafd74609c6ef3e38befcb8467d814 Author: Alan Coopersmith Date: Mon Dec 23 19:01:11 2013 -0800 Limit additional sscanf strings to fit buffer sizes None of these could currently result in buffer overflow, as the input and output buffers were the same size, but adding limits helps ensure we keep it that way, if we ever resize any of these in the future. Fixes cppcheck warnings: [lib/libXfont/src/bitmap/bdfread.c:547]: (warning) scanf without field width limits can crash with huge input data. [lib/libXfont/src/bitmap/bdfread.c:553]: (warning) scanf without field width limits can crash with huge input data. [lib/libXfont/src/bitmap/bdfread.c:636]: (warning) scanf without field width limits can crash with huge input data. Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Jeremy Huddleston Sequoia commit 4d024ac10f964f6bd372ae0dd14f02772a6e5f63 Author: Alan Coopersmith Date: Mon Dec 23 18:34:02 2013 -0800 CVE-2013-6462: unlimited sscanf overflows stack buffer in bdfReadCharacters() Fixes cppcheck warning: [lib/libXfont/src/bitmap/bdfread.c:341]: (warning) scanf without field width limits can crash with huge input data. Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Jeremy Huddleston Sequoia commit fdcf9a9be6a5d453659beadec5d1a1fdbab9afaf Author: Alan Coopersmith Date: Fri Dec 27 11:01:35 2013 -0800 Add AC_USE_SYSTEM_EXTENSIONS to expose non-standard extensions Required on Solaris to expose definitions in system headers that are not defined in the XPG standards now that xtrans 1.3 defines _XOPEN_SOURCE to 600 on Solaris. Fixes build failures: fserve.c: In function 'fs_block_handler': fserve.c:1210:5: error: 'fd_mask' undeclared (first use in this function) fserve.c:1210:5: note: each undeclared identifier is reported only once for each function it appears in In file included from transport.c:67:0, from fstrans.c:28: Xtranssock.c: In function '_FontTransSocketINETConnect': Xtranssock.c:1421:19: error: 'INET6_ADDRSTRLEN' undeclared (first use in this function) Xtranssock.c:1421:19: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Alan Coopersmith Reviewed-by: Daniel Stone commit 0d24378a6f08f5ab594ff552d60cf5f8f74bcb33 Author: Alan Coopersmith Date: Sat Dec 7 20:11:29 2013 -0800 Don't leak old allocation if realloc fails to enlarge it In ftfuncs.c, since the buffer being reallocated is a function local buffer, used to accumulate data for a single run of the function and then freed at the end of the function, we just free the old buffer if realloc fails. In atom.c however, the ReverseMap is a static buffer, so we operate in temporary variables until we know we're successful, then update the static variables. If we fail, we leave the old static variables in place, since they contain data about previous atoms we should maintain, not lose. Reported by cppcheck: [lib/libXfont/src/FreeType/ftfuncs.c:2122]: (error) Common realloc mistake: 'ranges' nulled but not freed upon failure [lib/libXfont/src/util/atom.c:126]: (error) Common realloc mistake: 'reverseMap' nulled but not freed upon failure Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer commit 5e27c364b174497d427dcecd122d711ef6b9f630 Author: Julien Cristau Date: Mon Aug 12 18:40:27 2013 +0200 Make serverGeneration unsigned Makes the definition match other declarations, and xserver's definition. Debian bug#689439 Reported-by: Michael Tautschnig Signed-off-by: Julien Cristau Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith commit 7d34534c050cb4366c7b14bff585c17d6d578f89 Author: Alan Coopersmith Date: Sat Oct 26 00:06:22 2013 -0700 Replace malloc(strlen)+strcpy/strcat calls with strdup Signed-off-by: Alan Coopersmith commit 8a9fc31628a98e3cdaae6078bb5d92bce06c37ac Author: Alan Coopersmith Date: Fri Oct 25 23:56:55 2013 -0700 xstrdup -> strdup Missed in xalloc -> malloc etal conversion in 0cdc9b8f850342 Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre commit 8b289e10c5013cdcbf817c06bd929e3ea8339987 Author: Alan Coopersmith Date: Sun Jul 21 16:53:47 2013 -0700 libXfont 1.4.6 Signed-off-by: Alan Coopersmith commit 7447029974415641a7a8a85918edcc20cfd9d461 Author: Alan Coopersmith Date: Mon Jun 24 22:40:39 2013 -0700 Require ANSI C89 pre-processor, drop pre-C89 token pasting support Signed-off-by: Alan Coopersmith commit c21d25de05d82a761a3225b685e9adcb7bb374bd Author: Thomas Klausner Date: Sun Jun 2 21:03:27 2013 +0200 Protect config.h inclusion with ifdef HAVE_CONFIG_H, like usual. Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith commit b8dd42dce868f9c16a59790ce51f0542b59cb79d Author: Alan Coopersmith Date: Tue Jan 15 18:30:32 2013 -0800 Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html - Support for the long-deprecated INCLUDES variable will be removed altogether in Automake 1.14. The AM_CPPFLAGS variable should be used instead. This variable was deprecated in Automake releases prior to 1.10, which is the current minimum level required to build X. Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer commit 8d946d2606b3a349b2a54d602e027a09ae330e88 Author: Colin Walters Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson commit 9d8936879b2fe1ca6460354ef68cd5e824d6748c Author: Adam Jackson Date: Tue Jan 15 14:28:48 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson commit a756da1844f63a2f2162eb8e53a883f496e4faad Author: Adam Jackson Date: Fri Dec 7 10:30:38 2012 -0500 catalogue: Fix obvious thinko Signed-off-by: Adam Jackson commit 5680e4c3d76cd5c64175d88d0685ee6962aa1e46 Author: Yaakov Selkowitz Date: Mon Oct 29 09:59:30 2012 -0500 Omit catalogue support on systems without symlinks Signed-off-by: Yaakov Selkowitz Reviewed-by: Colin Harrison Reviewed-by: Jon TURNEY commit 3c534f72d6d4327926474a5f8fa53cbcf19de3cf Author: Arvind Umrao Date: Thu Aug 23 16:15:04 2012 +0530 If socket is interrupted with signal EINTR, re-attempt read. If socket is getting interrupted with signal EINTR, we should keep socket in progress state. I have borrowed following code from socket write _fs_flush():line274 . I have done exactly same at _fs_fill(). Socket write will not close the connection and re attempt to read buffer. Signed-off-by: Arvind Umrao Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith commit 4b67ad5486c322c01a2ca86b0b4af0a74228f813 Author: Alan Coopersmith Date: Fri Mar 2 10:05:21 2012 -0800 libXfont 1.4.5 Signed-off-by: Alan Coopersmith commit 3f87a8b0b86de83ea8944a53de82caf254a9988a Author: Alan Coopersmith Date: Fri Oct 21 20:49:50 2011 -0700 Use * precision notation instead of computing sprintf format strings Allows gcc to check format strings instead of just warning about them Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 613faa245437bb948b4c86ea6c7fbb716e38f0bf Author: Alan Coopersmith Date: Sun Oct 2 09:30:09 2011 -0700 Fix printf warnings about incorrect argument types Mostly due to difference between sizeof & int on 64-bit platforms Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit f24c559bcb42e3ea9321c3e6a9ecf0720a581e33 Author: Alan Coopersmith Date: Sun Oct 2 09:19:47 2011 -0700 Add _X_ATTRIBUTE_PRINTF to *Error/*Warning functions taking printf formats Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 3715cd752bac912a56aa1cbb9dd874624a709aab Author: Alan Coopersmith Date: Sun Oct 2 09:16:05 2011 -0700 Add const attributes to fix gcc -Wwrite-strings warnings Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 8d130ac0fcf19e0e0dd0a404d9317fd8860baad4 Author: Tomas Hoger Date: Mon Oct 10 14:38:06 2011 -0700 Support compress files with maxbits < 12 The compress decompression code used by libXfont rejects valid archives with maxbits less than 12 (compress allows values 9 - 16, 16 is the default). This is because maxbits-12 is used as index to hsize_table[]. That looks like an incorrect port of the original compress code, where: - hsize depended on BITS, the maximum maxbits value supported by particular build, rather than on maxbits value from the particular input file - the same hsize was used for all BITS <= 12 The quick way to verify the problem is: compress -b 11 fontfile.bdf bdftopcf -o /dev/null fontfile.bdf.Z which fails, while 12-16 works correctly. This fix removes hsize_table and uses 1 << maxbits (aka maxmaxcode) as tab_prefix size. As decompression code does not use hashing as compression code, there does not seem to be a reason to allocate any extra space. Note: In this fix, maxbits == 9 is still rejected early. AFAICS compress is able to generate such files (unknown how correct such output is), but is unable to uncompress them correctly. Reviewed-by: Jeremy Huddleston commit bb97dbf56dff50bef936c0631587ed08dd6c8fa9 Author: Matt Dew Date: Mon Oct 3 20:23:47 2011 -0600 1 - fix the capitalization of the ID attriutes to match either the