From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 16 Apr 2006 21:41:00 +0000 (-0000)
Subject: just use the stack to kill memleak and return if user didnt give us anything to match
X-Git-Tag: 1_2_0~513
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=20c22e0883a34c4ac1a8cc399134de96bbfa80ba;p=oweals%2Fbusybox.git

just use the stack to kill memleak and return if user didnt give us anything to match
---

diff --git a/miscutils/less.c b/miscutils/less.c
index eba916a80..9d42748dc 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -659,7 +659,7 @@ static void regex_process(void)
 	char current_line[256];
 	int i;
 	int j = 0;
-	regex_t *pattern;
+	regex_t pattern;
 
 	/* Reset variables */
 	match_lines[0] = -1;
@@ -667,9 +667,6 @@ static void regex_process(void)
 	num_matches = 0;
 	match_found = 0;
 
-	pattern = (regex_t *) malloc(sizeof(regex_t));
-	memset(pattern, 0, sizeof(regex_t));
-
 	/* Get the uncompiled regular expression from the user */
 	clear_line();
 	putchar((match_backwards) ? '?' : '/');
@@ -681,14 +678,15 @@ static void regex_process(void)
 			uncomp_regex[i-1] = '\0';
 		else
 			while((i = getchar()) != '\n' && i != EOF);
-	}
+	} else
+		return;
 
 	/* Compile the regex and check for errors */
-	xregcomp(pattern, uncomp_regex, 0);
+	xregcomp(&pattern, uncomp_regex, 0);
 
 	/* Run the regex on each line of the current file here */
 	for (i = 0; i <= num_flines; i++) {
-		strcpy(current_line, process_regex_on_line(flines[i], pattern));
+		strcpy(current_line, process_regex_on_line(flines[i], &pattern));
 		flines[i] = bb_xstrdup(current_line);
 		if (match_found) {
 			match_lines[j] = i;