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

struct ref_update: store refname as a FLEX_ARRAY 

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-04-07 15:48:14 +02:00 committed by Junio C Hamano
parent 5524e2416e
commit 88615910db
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
refs.c
View File

@ -3274,11 +3274,11 @@ static int update_ref_write(const char *action, const char *refname,
* value or to zero to ensure the ref does not exist before update. * value or to zero to ensure the ref does not exist before update.
*/ */
struct ref_update { struct ref_update {
const char *refname;
unsigned char new_sha1[20]; unsigned char new_sha1[20];
unsigned char old_sha1[20]; unsigned char old_sha1[20];
int flags; /* REF_NODEREF? */ int flags; /* REF_NODEREF? */
int have_old; /* 1 if old_sha1 is valid, 0 otherwise */ int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
const char refname[FLEX_ARRAY];
}; };


/* /*
@ -3301,12 +3301,8 @@ static void ref_transaction_free(struct ref_transaction *transaction)
{ {
int i; int i;


for (i = 0; i < transaction->nr; i++) { for (i = 0; i < transaction->nr; i++)
struct ref_update *update = transaction->updates[i]; free(transaction->updates[i]);

free((char *)update->refname);
free(update);
}


free(transaction->updates); free(transaction->updates);
free(transaction); free(transaction);
@ -3320,9 +3316,10 @@ void ref_transaction_rollback(struct ref_transaction *transaction)
static struct ref_update *add_update(struct ref_transaction *transaction, static struct ref_update *add_update(struct ref_transaction *transaction,
const char *refname) const char *refname)
{ {
struct ref_update *update = xcalloc(1, sizeof(*update)); size_t len = strlen(refname);
struct ref_update *update = xcalloc(1, sizeof(*update) + len + 1);


update->refname = xstrdup(refname); strcpy((char *)update->refname, refname);
ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc); ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
transaction->updates[transaction->nr++] = update; transaction->updates[transaction->nr++] = update;
return update; return update;