summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 07:46:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-28 07:46:25 (GMT)
commit2254da06a5473ffde973337bad2c6a96eea61e20 (patch)
treec7b1bf0ba4094dbc3e6f209e379a15b66d6864aa /grep.c
parentf06b9f1dffa67c1d28793bdaf7b2165d3d392d35 (diff)
parent3e73cb2f48cc4044905455a9936692f967a0f9b3 (diff)
downloadgit-2254da06a5473ffde973337bad2c6a96eea61e20.zip
git-2254da06a5473ffde973337bad2c6a96eea61e20.tar.gz
git-2254da06a5473ffde973337bad2c6a96eea61e20.tar.bz2
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index 062b2b6..b0d992a 100644
--- a/grep.c
+++ b/grep.c
@@ -70,6 +70,8 @@ static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
struct grep_expr *x;
p = *list;
+ if (!p)
+ return NULL;
switch (p->token) {
case GREP_PATTERN: /* atom */
case GREP_PATTERN_HEAD:
@@ -82,8 +84,6 @@ static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
case GREP_OPEN_PAREN:
*list = p->next;
x = compile_pattern_or(list);
- if (!x)
- return NULL;
if (!*list || (*list)->token != GREP_CLOSE_PAREN)
die("unmatched parenthesis");
*list = (*list)->next;
@@ -99,6 +99,8 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
struct grep_expr *x;
p = *list;
+ if (!p)
+ return NULL;
switch (p->token) {
case GREP_NOT:
if (!p->next)
@@ -386,6 +388,8 @@ static int match_expr_eval(struct grep_opt *o,
{
int h = 0;
+ if (!x)
+ die("Not a valid grep expression");
switch (x->node) {
case GREP_NODE_ATOM:
h = match_one_pattern(o, x->u.atom, bol, eol, ctx);