X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=grep.c;h=c411ddd4d52e2aa68edd979733dd0b15f51d5f32;hb=4b4a5dbb17e1136275665024689625ed5cc5a03d;hp=cc8d6846a59563b6b902f576262ec97b73f01562;hpb=d1cb7ac49b7ab9195383bca50f6aec8b6de2c0d7;p=git.git

diff --git a/grep.c b/grep.c
index cc8d6846a..c411ddd4d 100644
--- a/grep.c
+++ b/grep.c
@@ -138,16 +138,13 @@ void compile_grep_patterns(struct grep_opt *opt)
 {
 	struct grep_pat *p;
 
-	if (opt->fixed)
-		return;
-
-	/* First compile regexps */
 	for (p = opt->pattern_list; p; p = p->next) {
 		switch (p->token) {
 		case GREP_PATTERN: /* atom */
 		case GREP_PATTERN_HEAD:
 		case GREP_PATTERN_BODY:
-			compile_regexp(p, opt);
+			if (!opt->fixed)
+				compile_regexp(p, opt);
 			break;
 		default:
 			opt->extended = 1;
@@ -167,6 +164,46 @@ void compile_grep_patterns(struct grep_opt *opt)
 		die("incomplete pattern expression: %s", p->pattern);
 }
 
+static void free_pattern_expr(struct grep_expr *x)
+{
+	switch (x->node) {
+	case GREP_NODE_ATOM:
+		break;
+	case GREP_NODE_NOT:
+		free_pattern_expr(x->u.unary);
+		break;
+	case GREP_NODE_AND:
+	case GREP_NODE_OR:
+		free_pattern_expr(x->u.binary.left);
+		free_pattern_expr(x->u.binary.right);
+		break;
+	}
+	free(x);
+}
+
+void free_grep_patterns(struct grep_opt *opt)
+{
+	struct grep_pat *p, *n;
+
+	for (p = opt->pattern_list; p; p = n) {
+		n = p->next;
+		switch (p->token) {
+		case GREP_PATTERN: /* atom */
+		case GREP_PATTERN_HEAD:
+		case GREP_PATTERN_BODY:
+			regfree(&p->regexp);
+			break;
+		default:
+			break;
+		}
+		free(p);
+	}
+
+	if (!opt->extended)
+		return;
+	free_pattern_expr(opt->pattern_expression);
+}
+
 static char *end_of_line(char *cp, unsigned long *left)
 {
 	unsigned long l = *left;
@@ -439,6 +476,8 @@ int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long
 		lno++;
 	}
 
+	free(prev);
+
 	if (opt->status_only)
 		return 0;
 	if (opt->unmatch_name_only) {