mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/packed-refs-do-one-ref-recursion'

Browse Source 
Fix a NULL-pointer dereference during nested iterations over
references (for example, when replace references are being used).

* mh/packed-refs-do-one-ref-recursion:
  do_one_ref(): save and restore value of current_ref
This commit is contained in:
Junio C Hamano 2013-07-31 12:38:11 -07:00
commit f1093b0f60
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
refs.c
View File

@ -634,7 +634,9 @@ struct ref_entry_cb {
static int do_one_ref(struct ref_entry *entry, void *cb_data) static int do_one_ref(struct ref_entry *entry, void *cb_data)
{ {
struct ref_entry_cb *data = cb_data; struct ref_entry_cb *data = cb_data;
struct ref_entry *old_current_ref;
int retval; int retval;
if (prefixcmp(entry->name, data->base)) if (prefixcmp(entry->name, data->base))
return 0; return 0;
@ -642,10 +644,12 @@ static int do_one_ref(struct ref_entry *entry, void *cb_data)
!ref_resolves_to_object(entry)) !ref_resolves_to_object(entry))
return 0; return 0;
/* Store the old value, in case this is a recursive call: */
old_current_ref = current_ref;
current_ref = entry; current_ref = entry;
retval = data->fn(entry->name + data->trim, entry->u.value.sha1, retval = data->fn(entry->name + data->trim, entry->u.value.sha1,
entry->flag, data->cb_data); entry->flag, data->cb_data);
current_ref = NULL; current_ref = old_current_ref;
return retval; return retval;
} }