kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

do not segfault if make_cache_entry failed 

Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Dmitry Potapov 2008-10-05 06:14:40 +04:00 committed by Shawn O. Pearce
parent 52e8370bc7
commit 048f276200
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-apply.c
View File

@ -2586,6 +2586,8 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
sha1_ptr = sha1; sha1_ptr = sha1;


ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0); ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
if (!ce)
die("make_cache_entry failed for path '%s'", name);
if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
die ("Could not add %s to temporary index", name); die ("Could not add %s to temporary index", name);
} }

2
builtin-checkout.c
View File

@ -206,6 +206,8 @@ static int checkout_merged(int pos, struct checkout *state)
ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode), ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode),
sha1, sha1,
path, 2, 0); path, 2, 0);
if (!ce)
die("make_cache_entry failed for path '%s'", path);
status = checkout_entry(ce, state, NULL); status = checkout_entry(ce, state, NULL);
return status; return status;
} }

3
builtin-reset.c
View File

@ -121,6 +121,9 @@ static void update_index_from_diff(struct diff_queue_struct *q,
struct cache_entry *ce; struct cache_entry *ce;
ce = make_cache_entry(one->mode, one->sha1, one->path, ce = make_cache_entry(one->mode, one->sha1, one->path,
0, 0); 0, 0);
if (!ce)
die("make_cache_entry failed for path '%s'",
one->path);
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
ADD_CACHE_OK_TO_REPLACE); ADD_CACHE_OK_TO_REPLACE);
} else } else