← Commit list

1943aec2e

Denis Vlasenko

2009-04-09

FAILED Duration: 32s

Subject

hush: plug the leak of expanded heredoc

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/hush.c +10 -5 shell/hush_test/hush-z_slow/leak_heredoc1.right +3 -0 shell/hush_test/hush-z_slow/leak_heredoc1.tests +34 -0 shell/match.c +1 -2 shell/math.c +1 -2 shell/msh.c +0 -1

shell/hush.c+10 -5

@@ -64,7 +64,6 @@
	*
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/
-
	#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
	//TODO: pull in some .h and find out whether we have SINGLE_APPLET_MAIN?
	//#include "applet_tables.h" doesn't work
@@ -79,6 +78,12 @@
	# define PIPE_BUF 4096 /* amount of buffering in a pipe */
	#endif

+
+	/* Debug build knobs */
+	//#define LEAK_HUNTING 1
+	//#define WANT_TO_TEST_NOMMU 1
+
+
	#ifdef WANT_TO_TEST_NOMMU
	# undef BB_MMU
	# undef USE_FOR_NOMMU
@@ -214,8 +219,7 @@ static void debug_print_strings(const char prefix, char *vv)
	/*
	* Leak hunting. Use hush_leaktool.sh for post-processing.
	*/
-	//#define FOR_HUSH_LEAKTOOL
-	#ifdef FOR_HUSH_LEAKTOOL
+	#ifdef LEAK_HUNTING
	static void *xxmalloc(int lineno, size_t size)
	{
	void *ptr = xmalloc((size + 0xff) & ~0xff);
@@ -743,7 +747,7 @@ static char add_strings_to_strings(char strings, char **add, int need_to_dup
	v[count1 + i] = (need_to_dup ? xstrdup(add[i]) : add[i]);
	return v;
	}
-	#ifdef FOR_HUSH_LEAKTOOL
+	#ifdef LEAK_HUNTING
	static char xx_add_strings_to_strings(int lineno, char strings, char **add, int need_to_dup)
	{
	char **ptr = add_strings_to_strings(strings, add, need_to_dup);
@@ -761,7 +765,7 @@ static char add_string_to_strings(char strings, char *add)
	v[1] = NULL;
	return add_strings_to_strings(strings, v, /dup:/ 0);
	}
-	#ifdef FOR_HUSH_LEAKTOOL
+	#ifdef LEAK_HUNTING
	static char xx_add_string_to_strings(int lineno, char strings, char *add)
	{
	char **ptr = add_string_to_strings(strings, add);
@@ -2310,6 +2314,7 @@ static void setup_heredoc(struct redir_struct *redir)
	len -= written;
	if (len == 0) {
	close(pair.wr);
+	free(expanded);
	return;
	}
	heredoc += written;

shell/hush_test/hush-z_slow/leak_heredoc1.right+3 -0

@@ -0,0 +1,3 @@
+	Warm up
+	Measuring memory leak...
+	Ok

shell/hush_test/hush-z_slow/leak_heredoc1.tests+34 -0

@@ -0,0 +1,34 @@
+	echo "Warm up"
+	i=1
+	while test $i != 99; do
+	: <<HERE
+	Hello $i `echo builtin_$i`
+	HERE
+	: $((i++))
+	done
+
+	memleak
+
+	echo "Measuring memory leak..."
+	i=1
+	while test $i != 99; do
+	: <<HERE
+	Hello $i `echo builtin_$i`
+	HERE
+	: $((i++))
+	done
+	i=1
+	while test $i != 99; do
+	: <<HERE
+	Hello $i `echo builtin_$i`
+	HERE
+	: $((i++))
+	done
+
+	memleak
+	kb=$?
+	if test $kb -le 4; then
+	echo Ok #$kb
+	else
+	echo "Bad: $kb kb (or more) leaked"
+	fi

shell/match.c+1 -2

@@ -14,7 +14,6 @@
	*
	* Original BSD copyright notice is retained at the end of this file.
	*/
-
	#ifdef STANDALONE
	# include <stdbool.h>
	# include <stdio.h>
@@ -22,7 +21,7 @@
	# include <string.h>
	# include <unistd.h>
	#else
-	# include "busybox.h"
+	# include "libbb.h"
	#endif
	#include <fnmatch.h>
	#include "match.h"

shell/math.c+1 -2

@@ -26,8 +26,7 @@
	* rewrote arith (see notes to this), added locale support,
	* rewrote dynamic variables.
	*/
-
-	#include "busybox.h"
+	#include "libbb.h"
	#include "math.h"

	#define a_e_h_t arith_eval_hooks_t

shell/msh.c+0 -1

@@ -12,7 +12,6 @@
	*
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/
-
	#include <sys/times.h>
	#include <setjmp.h>