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

notes: make get_note return pointer to struct object_id 

Make get_note return a pointer to a const struct object_id.  Add a
defensive check to ensure we don't accidentally dereference a NULL
pointer.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2017-05-30 10:30:40 -07:00 committed by Junio C Hamano
parent 490bc83a01
commit 9ef7223058
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/notes.c
View File

@ -351,7 +351,7 @@ static int list(int argc, const char **argv, const char *prefix)
{ {
struct notes_tree *t; struct notes_tree *t;
unsigned char object[20]; unsigned char object[20];
const unsigned char *note; const struct object_id *note;
int retval = -1; int retval = -1;
struct option options[] = { struct option options[] = {
OPT_END() OPT_END()
@ -372,7 +372,7 @@ static int list(int argc, const char **argv, const char *prefix)
die(_("failed to resolve '%s' as a valid ref."), argv[0]); die(_("failed to resolve '%s' as a valid ref."), argv[0]);
note = get_note(t, object); note = get_note(t, object);
if (note) { if (note) {
puts(sha1_to_hex(note)); puts(oid_to_hex(note));
retval = 0; retval = 0;
} else } else
retval = error(_("no note found for object %s."), retval = error(_("no note found for object %s."),
@ -392,7 +392,7 @@ static int add(int argc, const char **argv, const char *prefix)
const char *object_ref; const char *object_ref;
struct notes_tree *t; struct notes_tree *t;
unsigned char object[20], new_note[20]; unsigned char object[20], new_note[20];
const unsigned char *note; const struct object_id *note;
struct note_data d = { 0, 0, NULL, STRBUF_INIT }; struct note_data d = { 0, 0, NULL, STRBUF_INIT };
struct option options[] = { struct option options[] = {
{ OPTION_CALLBACK, 'm', "message", &d, N_("message"), { OPTION_CALLBACK, 'm', "message", &d, N_("message"),
@ -453,7 +453,7 @@ static int add(int argc, const char **argv, const char *prefix)
sha1_to_hex(object)); sha1_to_hex(object));
} }


prepare_note_data(object, &d, note); prepare_note_data(object, &d, note->hash);
if (d.buf.len || allow_empty) { if (d.buf.len || allow_empty) {
write_note_data(&d, new_note); write_note_data(&d, new_note);
if (add_note(t, object, new_note, combine_notes_overwrite)) if (add_note(t, object, new_note, combine_notes_overwrite))
@ -474,7 +474,7 @@ static int add(int argc, const char **argv, const char *prefix)
static int copy(int argc, const char **argv, const char *prefix) static int copy(int argc, const char **argv, const char *prefix)
{ {
int retval = 0, force = 0, from_stdin = 0; int retval = 0, force = 0, from_stdin = 0;
const unsigned char *from_note, *note; const struct object_id *from_note, *note;
const char *object_ref; const char *object_ref;
unsigned char object[20], from_obj[20]; unsigned char object[20], from_obj[20];
struct notes_tree *t; struct notes_tree *t;
@ -539,7 +539,7 @@ static int copy(int argc, const char **argv, const char *prefix)
goto out; goto out;
} }


if (add_note(t, object, from_note, combine_notes_overwrite)) if (add_note(t, object, from_note->hash, combine_notes_overwrite))
die("BUG: combine_notes_overwrite failed"); die("BUG: combine_notes_overwrite failed");
commit_notes(t, "Notes added by 'git notes copy'"); commit_notes(t, "Notes added by 'git notes copy'");
out: out:
@ -553,7 +553,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
const char *object_ref; const char *object_ref;
struct notes_tree *t; struct notes_tree *t;
unsigned char object[20], new_note[20]; unsigned char object[20], new_note[20];
const unsigned char *note; const struct object_id *note;
char *logmsg; char *logmsg;
const char * const *usage; const char * const *usage;
struct note_data d = { 0, 0, NULL, STRBUF_INIT }; struct note_data d = { 0, 0, NULL, STRBUF_INIT };
@ -598,13 +598,13 @@ static int append_edit(int argc, const char **argv, const char *prefix)
t = init_notes_check(argv[0], NOTES_INIT_WRITABLE); t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
note = get_note(t, object); note = get_note(t, object);


prepare_note_data(object, &d, edit ? note : NULL); prepare_note_data(object, &d, edit && note ? note->hash : NULL);


if (note && !edit) { if (note && !edit) {
/* Append buf to previous note contents */ /* Append buf to previous note contents */
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
char *prev_buf = read_sha1_file(note, &type, &size); char *prev_buf = read_sha1_file(note->hash, &type, &size);


strbuf_grow(&d.buf, size + 1); strbuf_grow(&d.buf, size + 1);
if (d.buf.len && prev_buf && size) if (d.buf.len && prev_buf && size)
@ -638,7 +638,7 @@ static int show(int argc, const char **argv, const char *prefix)
const char *object_ref; const char *object_ref;
struct notes_tree *t; struct notes_tree *t;
unsigned char object[20]; unsigned char object[20];
const unsigned char *note; const struct object_id *note;
int retval; int retval;
struct option options[] = { struct option options[] = {
OPT_END() OPT_END()
@ -664,7 +664,7 @@ static int show(int argc, const char **argv, const char *prefix)
retval = error(_("no note found for object %s."), retval = error(_("no note found for object %s."),
sha1_to_hex(object)); sha1_to_hex(object));
else { else {
const char *show_args[3] = {"show", sha1_to_hex(note), NULL}; const char *show_args[3] = {"show", oid_to_hex(note), NULL};
retval = execv_git_cmd(show_args); retval = execv_git_cmd(show_args);
} }
free_notes(t); free_notes(t);

8
notes-cache.c
View File

@ -69,15 +69,15 @@ int notes_cache_write(struct notes_cache *c)
char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid, char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
size_t *outsize) size_t *outsize)
{ {
const unsigned char *value_sha1; const struct object_id *value_oid;
enum object_type type; enum object_type type;
char *value; char *value;
unsigned long size; unsigned long size;


value_sha1 = get_note(&c->tree, key_oid->hash); value_oid = get_note(&c->tree, key_oid->hash);
if (!value_sha1) if (!value_oid)
return NULL; return NULL;
value = read_sha1_file(value_sha1, &type, &size); value = read_sha1_file(value_oid->hash, &type, &size);


*outsize = size; *outsize = size;
return value; return value;

18
notes.c
View File

@ -1119,7 +1119,7 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1)
return 0; return 0;
} }


const unsigned char *get_note(struct notes_tree *t, const struct object_id *get_note(struct notes_tree *t,
const unsigned char *object_sha1) const unsigned char *object_sha1)
{ {
struct leaf_node *found; struct leaf_node *found;
@ -1128,7 +1128,7 @@ const unsigned char *get_note(struct notes_tree *t,
t = &default_notes_tree; t = &default_notes_tree;
assert(t->initialized); assert(t->initialized);
found = note_tree_find(t, t->root, 0, object_sha1); found = note_tree_find(t, t->root, 0, object_sha1);
return found ? found->val_oid.hash : NULL; return found ? &found->val_oid : NULL;
} }


int for_each_note(struct notes_tree *t, int flags, each_note_fn fn, int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
@ -1219,7 +1219,7 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
struct strbuf *sb, const char *output_encoding, int raw) struct strbuf *sb, const char *output_encoding, int raw)
{ {
static const char utf8[] = "utf-8"; static const char utf8[] = "utf-8";
const unsigned char *sha1; const struct object_id *oid;
char *msg, *msg_p; char *msg, *msg_p;
unsigned long linelen, msglen; unsigned long linelen, msglen;
enum object_type type; enum object_type type;
@ -1229,11 +1229,11 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
if (!t->initialized) if (!t->initialized)
init_notes(t, NULL, NULL, 0); init_notes(t, NULL, NULL, 0);


sha1 = get_note(t, object_sha1); oid = get_note(t, object_sha1);
if (!sha1) if (!oid)
return; return;


if (!(msg = read_sha1_file(sha1, &type, &msglen)) || type != OBJ_BLOB) { if (!(msg = read_sha1_file(oid->hash, &type, &msglen)) || type != OBJ_BLOB) {
free(msg); free(msg);
return; return;
} }
@ -1291,14 +1291,14 @@ int copy_note(struct notes_tree *t,
const unsigned char *from_obj, const unsigned char *to_obj, const unsigned char *from_obj, const unsigned char *to_obj,
int force, combine_notes_fn combine_notes) int force, combine_notes_fn combine_notes)
{ {
const unsigned char *note = get_note(t, from_obj); const struct object_id *note = get_note(t, from_obj);
const unsigned char *existing_note = get_note(t, to_obj); const struct object_id *existing_note = get_note(t, to_obj);


if (!force && existing_note) if (!force && existing_note)
return 1; return 1;


if (note) if (note)
return add_note(t, to_obj, note, combine_notes); return add_note(t, to_obj, note->hash, combine_notes);
else if (existing_note) else if (existing_note)
return add_note(t, to_obj, null_sha1, combine_notes); return add_note(t, to_obj, null_sha1, combine_notes);



2
notes.h
View File

@ -140,7 +140,7 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1);
* *
* Return NULL if the given object has no notes. * Return NULL if the given object has no notes.
*/ */
const unsigned char *get_note(struct notes_tree *t, const struct object_id *get_note(struct notes_tree *t,
const unsigned char *object_sha1); const unsigned char *object_sha1);


/* /*

6
remote-testsvn.c
View File

@ -53,15 +53,15 @@ static void terminate_batch(void)
/* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */ /* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */
static char *read_ref_note(const unsigned char sha1[20]) static char *read_ref_note(const unsigned char sha1[20])
{ {
const unsigned char *note_sha1; const struct object_id *note_oid;
char *msg = NULL; char *msg = NULL;
unsigned long msglen; unsigned long msglen;
enum object_type type; enum object_type type;


init_notes(NULL, notes_ref, NULL, 0); init_notes(NULL, notes_ref, NULL, 0);
if (!(note_sha1 = get_note(NULL, sha1))) if (!(note_oid = get_note(NULL, sha1)))
return NULL; /* note tree not found */ return NULL; /* note tree not found */
if (!(msg = read_sha1_file(note_sha1, &type, &msglen))) if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)))
error("Empty notes tree. %s", notes_ref); error("Empty notes tree. %s", notes_ref);
else if (!msglen || type != OBJ_BLOB) { else if (!msglen || type != OBJ_BLOB) {
error("Note contains unusable content. " error("Note contains unusable content. "