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

Merge branch 'bw/object-id' 

Conversion from uchar[20] to struct object_id continues.

* bw/object-id:
  receive-pack: don't access hash of NULL object_id pointer
  notes: don't access hash of NULL object_id pointer
  tree-diff: don't access hash of NULL object_id pointer
maint
Junio C Hamano 2017-08-11 13:26:56 -07:00
parent df422678a8 f730944a49
commit c7528f4d8a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/notes.c
View File

@ -456,7 +456,7 @@ static int add(int argc, const char **argv, const char *prefix)
oid_to_hex(&object)); oid_to_hex(&object));
} }


prepare_note_data(&object, &d, note->hash); prepare_note_data(&object, &d, note ? note->hash : NULL);
if (d.buf.len || allow_empty) { if (d.buf.len || allow_empty) {
write_note_data(&d, new_note.hash); write_note_data(&d, new_note.hash);
if (add_note(t, &object, &new_note, combine_notes_overwrite)) if (add_note(t, &object, &new_note, combine_notes_overwrite))

2
builtin/receive-pack.c
View File

@ -1138,7 +1138,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
} }
if (ref_transaction_delete(transaction, if (ref_transaction_delete(transaction,
namespaced_name, namespaced_name,
old_oid->hash, old_oid ? old_oid->hash : NULL,
0, "push", &err)) { 0, "push", &err)) {
rp_error("%s", err.buf); rp_error("%s", err.buf);
strbuf_release(&err); strbuf_release(&err);

5
tree-diff.c
View File

@ -421,8 +421,9 @@ static struct combine_diff_path *ll_diff_tree_paths(
* diff_tree_oid(parent, commit) ) * diff_tree_oid(parent, commit) )
*/ */
for (i = 0; i < nparent; ++i) for (i = 0; i < nparent; ++i)
tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]->hash); tptree[i] = fill_tree_descriptor(&tp[i],
ttree = fill_tree_descriptor(&t, oid->hash); parents_oid[i] ? parents_oid[i]->hash : NULL);
ttree = fill_tree_descriptor(&t, oid ? oid->hash : NULL);


/* Enable recursion indefinitely */ /* Enable recursion indefinitely */
opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE); opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);