diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-11-30 19:14:21 +0100 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-12-07 18:51:21 +0100 |
commit | 7525cfa63719a65d5c5f924219b13a0111f1343f (patch) | |
tree | 459dbac35248cc6b5b0c93e8764d42b5a5d541b6 /testing/nvi/10no_one_line_visual.patch | |
parent | 4b763f9b85d0696d458ffbd14d99544cdd7550cf (diff) | |
download | aports-7525cfa63719a65d5c5f924219b13a0111f1343f.tar.bz2 aports-7525cfa63719a65d5c5f924219b13a0111f1343f.tar.xz |
testing/nvi: new aport
Including a subset of the debian patchset.
Diffstat (limited to 'testing/nvi/10no_one_line_visual.patch')
-rw-r--r-- | testing/nvi/10no_one_line_visual.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/testing/nvi/10no_one_line_visual.patch b/testing/nvi/10no_one_line_visual.patch new file mode 100644 index 0000000000..41a638d844 --- /dev/null +++ b/testing/nvi/10no_one_line_visual.patch @@ -0,0 +1,21 @@ +From: <hesso@pool.math.tu-berlin.de> +Subject: Catch segfaults when the screen is only one line high. + +diff -Naur nvi-1.81.6.orig/vi/vi.c nvi-1.81.6/vi/vi.c +--- nvi-1.81.6.orig/vi/vi.c 2007-11-18 17:41:42.000000000 +0100 ++++ nvi-1.81.6/vi/vi.c 2008-05-01 18:15:14.000000000 +0200 +@@ -974,6 +974,14 @@ + sp->rows = vip->srows = O_VAL(sp, O_LINES); + sp->cols = O_VAL(sp, O_COLUMNS); + sp->t_rows = sp->t_minrows = O_VAL(sp, O_WINDOW); ++ /* ++ * To avoid segfaults on terminals with only one line, ++ * catch this corner case now and die explicitly. ++ */ ++ if (sp->t_rows == 0) { ++ (void)fprintf(stderr, "Error: Screen too small for visual mode.\n"); ++ return 1; ++ } + if (sp->rows != 1) { + if (sp->t_rows > sp->rows - 1) { + sp->t_minrows = sp->t_rows = sp->rows - 1; |