summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2001-10-20 17:48:23 +0000
committerBart Schaefer <barts@users.sourceforge.net>2001-10-20 17:48:23 +0000
commita6981898435ad1ea9bcbb4540c7966048b755470 (patch)
tree2cb6edf89e4fe9ac9c6eae299d25811f8dedfeaa
parent2a0862bc40493312db83b368b8ba927e9183b5b9 (diff)
downloadzsh-a6981898435ad1ea9bcbb4540c7966048b755470.tar.gz
zsh-a6981898435ad1ea9bcbb4540c7966048b755470.zip
Fix segfault in checkrmall().
-rw-r--r--ChangeLog5
-rw-r--r--Src/utils.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 95919c14c..a75e006e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-20 Bart Schaefer <schaefer@zsh.org>
+
+ * Adapted from Stefan Dalibor, 16043: Src/utils.c: checkrmall()
+ must not print to shout when shout's not valid.
+
2001-10-19 Sven Wischnowsky <wischnow@zsh.org>
* 16085: Completion/Base/Utility/_describe,
diff --git a/Src/utils.c b/Src/utils.c
index 539b383ee..d7d277b55 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -1406,6 +1406,8 @@ read_poll(int fd, int *readchar, int polltty)
int
checkrmall(char *s)
{
+ if (!shout)
+ return 1;
fprintf(shout, "zsh: sure you want to delete all the files in ");
if (*s != '/') {
nicezputs(pwd[1] ? unmeta(pwd) : "", shout);