summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 07:46:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-28 07:46:20 (GMT)
commit3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch)
tree9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44
parentcc137194519a8ddbc0514da088fb012bea40df51 (diff)
parentc922b01f54c4bebe84daeacf014cfbc8dc68479b (diff)
downloadgit-3e73cb2f48cc4044905455a9936692f967a0f9b3.zip
git-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.gz
git-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: 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
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--builtin-merge.c2
-rw-r--r--grep.c8
-rwxr-xr-xt/t7002-grep.sh4
4 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
index 7ede1e6..5cb2b05 100644
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -37,7 +37,7 @@ where options is the bitwise-or of:
Make sure there is a work tree, i.e. the command cannot act
on bare repositories.
- This makes only sense when `RUN_SETUP` is also set.
+ This only makes sense when `RUN_SETUP` is also set.
. Add `builtin-foo.o` to `BUILTIN_OBJS` in `Makefile`.
diff --git a/builtin-merge.c b/builtin-merge.c
index cf86975..2179e06 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -785,7 +785,7 @@ static int suggest_conflicts(void)
fp = fopen(git_path("MERGE_MSG"), "a");
if (!fp)
- die("Could open %s for writing", git_path("MERGE_MSG"));
+ die("Could not open %s for writing", git_path("MERGE_MSG"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
diff --git a/grep.c b/grep.c
index 600f69f..704facf 100644
--- a/grep.c
+++ b/grep.c
@@ -54,6 +54,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:
@@ -66,8 +68,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;
@@ -83,6 +83,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)
@@ -368,6 +370,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);
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index c493854..b815937 100755
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -26,6 +26,10 @@ test_expect_success setup '
git commit -m initial
'
+test_expect_success 'grep should not segfault with a bad input' '
+ test_must_fail git grep "("
+'
+
for H in HEAD ''
do
case "$H" in