Module Name: src
Committed By: riz
Date: Thu Sep 26 14:20:03 UTC 2013
Modified Files:
src/lib/libcurses [netbsd-6]: setterm.c
Log Message:
Pull up following revision(s) (requested by dsainty in ticket #960):
lib/libcurses/setterm.c: revision 1.51
Fix a NULL dereference if the exit_alt_charset_mode capability is not
defined.
The previous version of this file changed a terminal initialisation test on
the exit_attribute_mode capability, checking for the exit_alt_charset_mode
capability as a substring, rather than performing a search for the
hard-coded
^O character.
That works better on terminals where ^O is not the correct value for
exit_alt_charset_mode. But it works worse on terminals that don't have a
definition specified for exit_alt_charset_mode.
For example:
% TERMCAP='xterm:me=\E[m:' TERM=xterm vi
segmentation fault (core dumped) TERMCAP='xterm:me=\E[m:' TERM=xterm vi
The crash can be avoided (without fixing the bug) by defining
exit_alt_charset_mode:
% TERMCAP='xterm|:me=\E[m:ae=:' TERM=xterm vi
ex/vi: Error: xterm: No such process
We now test exit_alt_charset_mode for NULL before continuing with the fatal
test, restoring the original no-crash behaviour.
XXX does_ctrl_o() is now just a naive reimplementation of strstr(), so
should
probably just use strstr() instead.
To generate a diff of this commit:
cvs rdiff -u -r1.48.4.1 -r1.48.4.2 src/lib/libcurses/setterm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/setterm.c
diff -u src/lib/libcurses/setterm.c:1.48.4.1 src/lib/libcurses/setterm.c:1.48.4.2
--- src/lib/libcurses/setterm.c:1.48.4.1 Sat May 11 21:48:23 2013
+++ src/lib/libcurses/setterm.c Thu Sep 26 14:20:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $ */
+/* $NetBSD: setterm.c,v 1.48.4.2 2013/09/26 14:20:03 riz Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setterm.c 8.8 (Berkeley) 10/25/94";
#else
-__RCSID("$NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.48.4.2 2013/09/26 14:20:03 riz Exp $");
#endif
#endif /* not lint */
@@ -172,6 +172,7 @@ _cursesi_setterm(char *type, SCREEN *scr
* It might turn off ACS, so check for that.
*/
if (t_exit_attribute_mode(screen->term) != NULL &&
+ t_exit_alt_charset_mode(screen->term) != NULL &&
does_ctrl_o(t_exit_attribute_mode(screen->term),
t_exit_alt_charset_mode(screen->term)))
screen->mask_me = 0;
