summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-06-02 17:51:39 +0000
committerEric Andersen2000-06-02 17:51:39 +0000
commit9c8ffa02f4ecd6029233de9d5cdc695fc82fc6df (patch)
treeefb6f856f25a646c4fef50123de1deb559d83a9a
parent3199bda52e85225c22c617617f43591d6fd23eea (diff)
downloadbusybox-9c8ffa02f4ecd6029233de9d5cdc695fc82fc6df.zip
busybox-9c8ffa02f4ecd6029233de9d5cdc695fc82fc6df.tar.gz
Pavel fixed a segfault in yes.
-Erik
-rw-r--r--Changelog1
-rw-r--r--coreutils/yes.c2
-rw-r--r--yes.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 3083ae9..8292329 100644
--- a/Changelog
+++ b/Changelog
@@ -48,6 +48,7 @@
* Fixed more and ps to have sensible terminal width defaults, thanks
to Pavel Roskin.
* Fixed all fatalError() calls lacking a "\n", thanks to Pavel Roskin.
+ * Fixed a segfault in yes when no args were given -- Pavel Roskin.
* More doc updates
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 97b6f65..1718af4 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -27,7 +27,7 @@ extern int yes_main(int argc, char **argv)
{
int i;
- if (argc >=1 && *argv[1]=='-') {
+ if (argc >= 2 && *argv[1] == '-') {
usage("yes [OPTION]... [STRING]...\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nRepeatedly outputs a line with all specified STRING(s), or `y'.\n"
diff --git a/yes.c b/yes.c
index 97b6f65..1718af4 100644
--- a/yes.c
+++ b/yes.c
@@ -27,7 +27,7 @@ extern int yes_main(int argc, char **argv)
{
int i;
- if (argc >=1 && *argv[1]=='-') {
+ if (argc >= 2 && *argv[1] == '-') {
usage("yes [OPTION]... [STRING]...\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nRepeatedly outputs a line with all specified STRING(s), or `y'.\n"