diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-08-19 18:23:56 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-08-19 18:43:06 +0200 |
commit | 215b0ca6e4fe466c6942d21a1bba62d97f2d5e5d (patch) | |
tree | 4fbb9563d870ce8a5f8f08015424e358a1462677 /shell/hush_test/run-all | |
parent | aedc3fe19fac368dc363050e0387d263b7e01cc6 (diff) | |
download | busybox-w32-215b0ca6e4fe466c6942d21a1bba62d97f2d5e5d.tar.gz busybox-w32-215b0ca6e4fe466c6942d21a1bba62d97f2d5e5d.tar.bz2 busybox-w32-215b0ca6e4fe466c6942d21a1bba62d97f2d5e5d.zip |
hush: fix a bug in FEATURE_SH_STANDALONE=y config. Closes 9186
Run this in a "sh SCRIPT":
sha256sum /dev/null
echo END
sha256sum is a NOEXEC applet. It runs in a forked child. Then child exit()s.
By this time, entire script is read, and buffered in a FILE object
from fopen("SCRIPT"). But fgetc() did not consume entire input.
exit() lseeks back by -9 bytes, from <eof> to 'e' in 'echo'.
(this may be libc-specific).
This change of fd position *is shared with the parent*!
Now parent can read more, and it thinks there is another "echo END".
End result: two "echo END"s are run.
Fix this by _exit()ing instead.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test/run-all')
-rwxr-xr-x | shell/hush_test/run-all | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/hush_test/run-all b/shell/hush_test/run-all index 64a7abc47..837b3f7da 100755 --- a/shell/hush_test/run-all +++ b/shell/hush_test/run-all | |||
@@ -64,11 +64,12 @@ do_test() | |||
64 | echo -n "$1/$x:" | 64 | echo -n "$1/$x:" |
65 | ( | 65 | ( |
66 | "$THIS_SH" "./$x" >"$name.xx" 2>&1 | 66 | "$THIS_SH" "./$x" >"$name.xx" 2>&1 |
67 | r=$? | ||
67 | # filter C library differences | 68 | # filter C library differences |
68 | sed -i \ | 69 | sed -i \ |
69 | -e "/: invalid option /s:'::g" \ | 70 | -e "/: invalid option /s:'::g" \ |
70 | "$name.xx" | 71 | "$name.xx" |
71 | test $? -eq 77 && rm -f "../$1-$x.fail" && exit 77 | 72 | test $r -eq 77 && rm -f "../$1-$x.fail" && exit 77 |
72 | diff -u "$name.xx" "$name.right" >"../$1-$x.fail" && rm -f "$name.xx" "../$1-$x.fail" | 73 | diff -u "$name.xx" "$name.right" >"../$1-$x.fail" && rm -f "$name.xx" "../$1-$x.fail" |
73 | ) | 74 | ) |
74 | case $? in | 75 | case $? in |