hush: plug a memory leak

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/hush.c b/shell/hush.c
index 25094654dab21800f51ed87d0acefb87b483e750..d02e68d496a5ef08b64d215b10feaea3b8703335 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -4136,6 +4136,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
 
                /* if someone gives us an empty string: `cmd with empty output` */
                if (!argv_expanded[0]) {
+                       free(argv_expanded);
                        debug_leave();
                        return G.last_exitcode;
                }

diff --git a/shell/hush_test/hush-z_slow/leak_empty_tick.right b/shell/hush_test/hush-z_slow/leak_empty_tick.right
new file mode 100644 (file)
index 0000000..c6f0334
--- /dev/null
+++ b/shell/hush_test/hush-z_slow/leak_empty_tick.right
@@ -0,0 +1,3 @@
+Warm up
+Measuring memory leak...
+Ok

diff --git a/shell/hush_test/hush-z_slow/leak_empty_tick.tests b/shell/hush_test/hush-z_slow/leak_empty_tick.tests
new file mode 100755 (executable)
index 0000000..ae37579
--- /dev/null
+++ b/shell/hush_test/hush-z_slow/leak_empty_tick.tests
@@ -0,0 +1,28 @@
+echo "Warm up"
+i=1
+while test $i != 9; do
+    `true`
+    : $((i++))
+done
+
+memleak
+
+echo "Measuring memory leak..."
+i=1
+while test $i != 199; do
+    `true`
+    : $((i++))
+done
+i=1
+while test $i != 199; do
+    `true`
+    : $((i++))
+done
+
+memleak
+kb=$?
+if test $kb -le 4; then
+    echo Ok #$kb
+else
+    echo "Bad: $kb kb (or more) leaked"
+fi