aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-10-29 16:19:14 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-29 20:33:44 +0100
commitef2386b80abfb22ccb697ddbdd4047aacc395c50 (patch)
tree29cdff7d9d254f06913e499b4b25879b1811ab90 /shell
parent3f221113a50196e536bfb059712915bd8bde10d1 (diff)
downloadbusybox-ef2386b80abfb22ccb697ddbdd4047aacc395c50.tar.gz
ash: only allow local variables in functions
Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c3
-rw-r--r--shell/ash_test/ash-misc/local2.right1
-rwxr-xr-xshell/ash_test/ash-misc/local2.tests1
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)
{
char *name;
+ if (!funcnest)
+ ash_msg_and_raise_error("not in a function");
+
argv = argptr;
while ((name = *argv++) != NULL) {
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