summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2024-02-17Use autoconf to check for float.h instead of platform-specific ifdefsHEADmasterAlan Coopersmith2-9/+4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-17unifdef NCDAlan Coopersmith2-51/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-17unifdef LynxAlan Coopersmith1-4/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-17unifdef ISCAlan Coopersmith1-4/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-17unifdef __OSF1__Alan Coopersmith1-7/+3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-17unifdef sonyAlan Coopersmith1-11/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-03bitscale.c: remove unused MAX() macroAlan Coopersmith1-4/+0
Code that used it was removed in commit 632a2e90a4b209facc Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-03bitscale.c: ensure SCORE macro expands properlyAlan Coopersmith1-7/+7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-03bitscale.c: ensure SCORE2 macro expands properlyAlan Coopersmith1-3/+3
Handles warning from Oracle Parfait 11.2 static analyzer: Error: Misleading macro Misleading macro [misleading-macro]: misleading evaluation of '/' operator in expansion of macro SCORE2 due to missing parentheses at line 299 of src/bitmap/bitscale.c. '/' operator has lower precedence than '/' operator inside macro body at line 438 low precedence '/' operator is hidden by expansion of macro argument m at line 299 Misleading macro [misleading-macro]: misleading evaluation of '/' operator in expansion of macro SCORE2 due to missing parentheses at line 299 of src/bitmap/bitscale.c. binary '*' operator has lower precedence than '/' operator inside macro body at line 440 low precedence binary '*' operator is hidden by expansion of macro argument m at line 299 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-24configure: Use AC_SYS_LARGEFILE to enable large file supportAlan Coopersmith1-0/+3
While font files should never be more than 2gb in size, they may be stored on filesystems with large inodes or timestamps outside of the 32-bit range. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-24Modernize lseek() callsAlan Coopersmith1-4/+4
Position should be stored in an off_t, not an int, and the "whence" arg should use symbolic constants instead of raw numbers. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-03-25Set close-on-exec when opening fonts.dir & fonts.alias filesAlan Coopersmith1-2/+6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-03-04configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOLAlan Coopersmith1-2/+3
AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, so it's time to rely on it. Clears autoconf warnings: configure.ac:38: warning: The macro `AC_PROG_LIBTOOL' is obsolete. configure.ac:38: You should run autoupdate. aclocal.m4:3640: AC_PROG_LIBTOOL is expanded from... configure.ac:38: the top level libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-02-25Remove "All rights reserved" from Oracle copyright noticesAlan Coopersmith6-6/+6
Oracle no longer includes this term in our copyright & license notices. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-02-16configure: raise minimum autoconf requirement to 2.70Alan Coopersmith2-5/+6
Needed for builds on NetBSD to work correctly, since it depends on AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the prototype for reallocarray() in the system headers. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-26atom: Update Hash() to be unsignedJeremy Huddleston Sequoia1-18/+16
This avoids undefined behavior (left shift overflow in signed integer type) Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-11-10Fix font server reconnection timeoutPeter Harris1-0/+2
The great libxfont2 rewrite 135fb032e940ce226c9feb13e6e903f3ecbc5eb0 split fs_wakeup into fs_wakeup and fs_fd_handler. The fs_fd_handler side is called when there is new data on the socket. The fs_wakeup side is called on a timeout. If there's a connection timeout, the block handler will set the timeout to zero, expecting fs_wakeup to handle the timeout. Therefore, we need to call _fs_check_reconnect in fs_wakeup to handle the connection timeout. If we don't, the X server will go to 100% CPU (and the font server connection will not be retried). Signed-off-by: Peter Harris <pharris@opentext.com>
2022-11-05Only link with libbsd if needed for reallocarray() or strlcat()Alan Coopersmith1-3/+9
Avoid unnecessary library dependency when using a libc with these functions included Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-06Switch from libbsd to libbsd-overlayGuillem Jover2-15/+6
This is the preferred usage form for libbsd, as it makes the code more portable and requires no special includes for libbsd, by transparently injects the needed standard headers that would be used on a BSD. Signed-off-by: Guillem Jover <guillem@hadrons.org>
2022-08-26libXfont2 2.0.6libXfont2-2.0.6Alan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-08-11Fix buffer overrun in FontFileMakeDir on WIN32Peter Harris1-4/+5
When dirName is "" (eg. when called by BuiltinReadDirectory), FontFileMakeDir would read after the string when WIN32 is defined. Fix the overrun issue by checking the location of the found : before adding two. Signed-off-by: Peter Harris <pharris@opentext.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-06-21Fix comments to reflect removal of OS/2 supportAlan Coopersmith3-4/+4
Commit 6c29007756301 removed OS/2 support from the code, but missed updating the comments to match. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-06-21Correct fsCreateACReq lengthJeremy Huddleston Sequoia1-1/+1
Regressed-in: 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561 Fixes: https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues/13 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-06-20configure: Use pkg-config to handle zlib dependency if possibleAlan Coopersmith3-3/+8
Preserves fallback for systems like darwin without zlib.pc Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-04-06Fix spelling/wording issuesAlan Coopersmith11-16/+16
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-04-06Build xz tarballs instead of bzip2Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-04-06gitlab CI: add a basic build testAlan Coopersmith1-0/+99
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-08-01libXfont2 2.0.5libXfont2-2.0.5Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-07-14Fix out-of-bounds read in FontFileMakeDir()Alex Richardson1-4/+1
BuiltinReadDirectory() calls FontFileMakeDir ("", builtin_dir_count); and this causes the `dirName[dirlen - 1]` access to read before the start of the string. I found this while porting Xvnc to CHERI-RISC-V (which has bounds and permissions on all pointers).
2021-06-12configure: define HAVE_LIBBSD when libbsd was foundBernd Kuhls1-0/+3
2021-03-02Fix use after free when font server connection lostPeter Harris1-21/+19
If there are multiple blocks waiting for the same font, only one of them will have ->freeFont set. The rest will be in a state of FS_DEPENDING. If the font server dies before the font finishes opening, the block with ->freeFont set will call ->unload_font, invalidating the pfont pointers in the remaining FS_DEPENDING blocks. Avoid a use after free (and potential crash) by passing conn to fs_cleanup_font instead of dereferencing pfont to find the conn. Signed-off-by: Peter Harris <pharris@opentext.com>
2020-03-06Fix crash when font server connection lostPeter Harris1-10/+10
Always initialize the return value of fs_new_block_rec. Even if the conn->blockState is FS_BROKEN_CONNECTION | FS_RECONNECTING, we must not return with an uninitialized blockrec on the block list. When the blockrec times out, _fs_clean_aborted_blockrec calls fs_cleanup_bfont, which will try to follow pointers in the blockrec (which has not been initialized). Signed-off-by: Peter Harris <pharris@opentext.com>
2019-10-25Fix Win32 build since c4ed2e06 "Add some unit testing utilities"Jon Turney5-1/+55
Provide Win32 replacements for realpath() and err.h
2019-09-16README: Remove mention of libXfont 1.5Adam Jackson1-9/+4
xfs was ported to libXfont2 in release 1.2, and bdftopcf 1.1 includes a copy of enough of the old libXfont1 code to not need an external libXfont at all.
2019-09-14libXfont2 2.0.4libXfont2-2.0.4Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-09-14Add src/util/replace.h to noinst_HEADERS so it gets included in tarballsAlan Coopersmith1-1/+2
Found when "make distcheck" failed. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-17fs_read_glyphs: check if rep is null before dereferencingAlan Coopersmith1-1/+2
Resolves coverity warning def16 from the list in https://gitlab.freedesktop.org/xorg/lib/libxfont/issues/6 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-17CatalogueRescan: if opendir() fails, unref fpes, but don't free the catAlan Coopersmith1-4/+2
None of the callers of CatalogueRescan check for failure before accessing the cat pointer so don't free it (especially without clearing the pointer to it in fpe->private), just unref the contents. Can only be triggered if somehow stat() succeeds on the directory, but opendir fails anyway (removed between the calls? permission problem?). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-17ComputeScaledProperties: check for valid pointers before making atomsAlan Coopersmith1-2/+4
Resolves coverity warning def23 from the list in https://gitlab.freedesktop.org/xorg/lib/libxfont/issues/6 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-17stubs/atom.c: check for ResizeHashTable failureAlan Coopersmith1-1/+3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-17Fix whitespaceMaya Rashish1-1/+1
2019-08-04fontxlfd.c: tell gcc that switch fallthrough is intentionalAlan Coopersmith1-0/+1
Quiets: src/util/fontxlfd.c: In function ‘FontParseXLFDName’: src/util/fontxlfd.c:450:14: warning: this statement may fall through [-Wimplicit-fallthrough=] replaceChar = '*'; ~~~~~~~~~~~~^~~~~ src/util/fontxlfd.c:451:5: note: here case FONT_XLFD_REPLACE_ZERO: ^~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-04Convert multiplying malloc calls to use mallocarray insteadAlan Coopersmith14-28/+39
Introduces mallocarray as a macro calling reallocarray with a NULL pointer for the old allocation. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-03Convert multiplying realloc calls to use reallocarray insteadAlan Coopersmith12-14/+25
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-03Add reallocarray fallback if not provided by libc nor libbsdAlan Coopersmith3-1/+54
Implementation copied from the Xserver Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-03Use bounds checking string functions everywhereAlan Coopersmith8-102/+131
Replace strcpy, strcat, sprintf with strlcpy, strlcat, snprintf everywhere, even where there were already bounds checks in place, to reduce time spent checking static analysis results. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-03Add strlcat & strlcpy fallbacks if not provided by libc nor libbsdAlan Coopersmith5-1/+162
Implementations copied from the Xserver Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-08-03Add some unit testing utilitiesAlan Coopersmith5-0/+487
The test/utils directory contains some standalone test programs for testing libXfont funtionality without needing a full X server session. They could be used to generate automated unit testing in the future, but that work has not yet been done. [v2: updated original work from libXfont 1.5 to 2.0 API & makefiles] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-05-14fontfile: Remove unused 'bc' slot from _FontEntryAdam Jackson2-9/+0
Whatever this is, we're not using it. On my machine we allocate about 1100 of these structs, and this change reduces the struct from 152 to 48 bytes, so this saves about 100k of memory. Signed-off-by: Adam Jackson <ajax@redhat.com>
2019-03-16Update configure.ac bug URL for gitlab migrationAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 09:05:54 +0000