diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-29 16:19:14 +0000 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-29 20:33:44 +0100 |
commit | ef2386b80abfb22ccb697ddbdd4047aacc395c50 (patch) | |
tree | 29cdff7d9d254f06913e499b4b25879b1811ab90 | |
parent | 3f221113a50196e536bfb059712915bd8bde10d1 (diff) | |
download | busybox-w32-ef2386b80abfb22ccb697ddbdd4047aacc395c50.tar.gz busybox-w32-ef2386b80abfb22ccb697ddbdd4047aacc395c50.tar.bz2 busybox-w32-ef2386b80abfb22ccb697ddbdd4047aacc395c50.zip |
ash: only allow local variables in functions
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | shell/ash.c | 3 | ||||
-rw-r--r-- | shell/ash_test/ash-misc/local2.right | 1 | ||||
-rwxr-xr-x | shell/ash_test/ash-misc/local2.tests | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index a2e06184b..0d7cac0b5 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -8987,6 +8987,9 @@ localcmd(int argc UNUSED_PARAM, char **argv) | |||
8987 | { | 8987 | { |
8988 | char *name; | 8988 | char *name; |
8989 | 8989 | ||
8990 | if (!funcnest) | ||
8991 | ash_msg_and_raise_error("not in a function"); | ||
8992 | |||
8990 | argv = argptr; | 8993 | argv = argptr; |
8991 | while ((name = *argv++) != NULL) { | 8994 | while ((name = *argv++) != NULL) { |
8992 | mklocal(name); | 8995 | mklocal(name); |
diff --git a/shell/ash_test/ash-misc/local2.right b/shell/ash_test/ash-misc/local2.right new file mode 100644 index 000000000..630ef7979 --- /dev/null +++ b/shell/ash_test/ash-misc/local2.right | |||
@@ -0,0 +1 @@ | |||
./local2.tests: local: line 1: not in a function | |||
diff --git a/shell/ash_test/ash-misc/local2.tests b/shell/ash_test/ash-misc/local2.tests new file mode 100755 index 000000000..8e14037c5 --- /dev/null +++ b/shell/ash_test/ash-misc/local2.tests | |||
@@ -0,0 +1 @@ | |||
local x=1 | |||