https://salsa.debian.org/debian/screen/-/raw/debian/4.8.0-5/debian/patches/99_CVE-2021-26937.patch Description: [CVE-2021-26937] Fix out of bounds array access Author: Michael Schröder Bug-Debian: https://bugs.debian.org/982435 Bug: https://savannah.gnu.org/bugs/?60030 Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html --- a/encoding.c +++ b/encoding.c @@ -43,7 +43,7 @@ # ifdef UTF8 static int recode_char __P((int, int, int)); static int recode_char_to_encoding __P((int, int)); -static void comb_tofront __P((int, int)); +static void comb_tofront __P((int)); # ifdef DW_CHARS static int recode_char_dw __P((int, int *, int, int)); static int recode_char_dw_to_encoding __P((int, int *, int)); @@ -1263,6 +1263,8 @@ {0x30000, 0x3FFFD}, }; + if (c >= 0xdf00 && c <= 0xdfff) + return 1; /* dw combining sequence */ return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || (cjkwidth && bisearch(c, ambiguous, @@ -1330,11 +1332,12 @@ } static void -comb_tofront(root, i) -int root, i; +comb_tofront(i) +int i; { for (;;) { + int root = i >= 0x700 ? 0x801 : 0x800; debug1("bring to front: %x\n", i); combchars[combchars[i]->prev]->next = combchars[i]->next; combchars[combchars[i]->next]->prev = combchars[i]->prev; @@ -1396,9 +1399,9 @@ { /* full, recycle old entry */ if (c1 >= 0xd800 && c1 < 0xe000) - comb_tofront(root, c1 - 0xd800); + comb_tofront(c1 - 0xd800); i = combchars[root]->prev; - if (c1 == i + 0xd800) + if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) { /* completely full, can't recycle */ debug("utf8_handle_comp: completely full!\n"); @@ -1422,7 +1425,7 @@ mc->font = (i >> 8) + 0xd8; mc->fontx = 0; debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); - comb_tofront(root, i); + comb_tofront(i); } #else /* !UTF8 */ 88251df'>gnu/installer.scm
AgeCommit message (Expand)Author
2022-12-05installer: Log provenance data....* gnu/installer.scm (provenance-sexp): New procedure. (installer-program)[installer-builder]: Add 'installer-log-line' call. Ludovic Courtès
2022-11-15installer: Migrate to 'guile-gnutls'....* gnu/installer.scm (installer-program): Replace GNUTLS with GUILE-GNUTLS. Ludovic Courtès
2022-11-15installer: Report known-unsupported PCI devices....* gnu/installer/hardware.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add it. * po/guix/POTFILES.in: Add it. * gnu/installer.scm (installer-steps): Pass #:pci-database to the 'welcome' step procedure. * gnu/installer/newt.scm (welcome-page): Add #:pci-database and pass it to 'run-welcome-page'. * gnu/installer/newt/welcome.scm (check-hardware-support): Add #:pci-database. Enumerate unsupported PCI devices and run an error page when unsupported devices are found. (run-welcome-page): Add #:pci-database and pass it to 'check-hardware-support' and to the recursive call. * gnu/installer/record.scm (<installer>)[welcome-page]: Adjust comment. * doc/guix.texi (Hardware Considerations): Mention it. Ludovic Courtès
2022-11-15installer: Use 'current-guix' for extensions....This lets us use the latest (gnu build linux-modules) for instance. Note that items listed in 'with-extensions' come first in the load path, before the directory containing the modules in 'with-imported-modules'. * gnu/installer.scm (installer-program): Use (current-guix) instead of 'guix' in 'with-extensions'. Ludovic Courtès
2022-11-02installer: Skip the backtrace page on user abort....When the user aborts the installation because a core dump is discovered or the installation command failed, displaying the abort backtrace doesn't make much sense. Hide it when the abort condition is &user-abort-error and skip directly to the dump page. * gnu/installer/steps.scm (&user-abort-error): New variable. (user-abort-error?): New procedure. * gnu/installer/newt/final.scm (run-install-failed-page): Raise a user-abort-error. * gnu/installer/newt/welcome.scm (run-welcome-page): Ditto. * gnu/installer.scm (installer-program): Hide the backtrace page and directly propose to dump the report when the a &user-abort-error is raised. Mathieu Othacehe
2022-11-02installer: Add core dump support....Fixes: <https://issues.guix.gnu.org/58733> * gnu/installer.scm (installer-program): Enable core dump generation. * gnu/installer/dump.scm (%core-dump): New variable. (prepare-dump): Copy the core dump file. * gnu/installer/newt/welcome.scm (run-welcome-page): Propose to report an installation that previously generated a core dump. Mathieu Othacehe
2022-08-08installer: Render the final configuration with (guix read-print)....* gnu/installer.scm (module-to-import?): Return #t for (guix read-print). * gnu/installer/steps.scm (configuration->file): Use 'pretty-print-with-comments/splice' instead of 'for-each' and 'pretty-print'. Ludovic Courtès