undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs.c: avoid git_path assignment in lock_ref_sha1_basic

Browse Source 
Assigning the result of git_path is a bad pattern, because
it's not immediately obvious how long you expect the content
to stay valid (and it may be overwritten by subsequent
calls). Let's use a function-local strbuf here instead,
which we know is safe (we just have to remember to free it
in all code paths).

As a bonus, we get rid of a confusing variable-reuse
("ref_file" is used for two distinct purposes).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-08-10 05:37:12 -04:00 committed by Junio C Hamano
parent d6549f3655
commit 5f8ef5b848
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
refs.c
View File

@ -2408,7 +2408,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
unsigned int flags, int *type_p, unsigned int flags, int *type_p,
struct strbuf *err) struct strbuf *err)
{ {
const char *ref_file; struct strbuf ref_file = STRBUF_INIT;
struct strbuf orig_ref_file = STRBUF_INIT;
const char *orig_refname = refname; const char *orig_refname = refname;
struct ref_lock *lock; struct ref_lock *lock;
int last_errno = 0; int last_errno = 0;
@ -2432,20 +2433,19 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
refname = resolve_ref_unsafe(refname, resolve_flags, refname = resolve_ref_unsafe(refname, resolve_flags,
lock->old_oid.hash, &type); lock->old_oid.hash, &type);
if (!refname && errno == EISDIR) { if (!refname && errno == EISDIR) {
/* we are trying to lock foo but we used to /*
* we are trying to lock foo but we used to
* have foo/bar which now does not exist; * have foo/bar which now does not exist;
* it is normal for the empty directory 'foo' * it is normal for the empty directory 'foo'
* to remain. * to remain.
*/ */
ref_file = git_path("%s", orig_refname); strbuf_git_path(&orig_ref_file, "%s", orig_refname);
if (remove_empty_directories(ref_file)) { if (remove_empty_directories(orig_ref_file.buf)) {
last_errno = errno; last_errno = errno;
if (!verify_refname_available(orig_refname, extras, skip, if (!verify_refname_available(orig_refname, extras, skip,
get_loose_refs(&ref_cache), err)) get_loose_refs(&ref_cache), err))
strbuf_addf(err, "there are still refs under '%s'", strbuf_addf(err, "there are still refs under '%s'",
orig_refname); orig_refname);
goto error_return; goto error_return;
} }
refname = resolve_ref_unsafe(orig_refname, resolve_flags, refname = resolve_ref_unsafe(orig_refname, resolve_flags,
@ -2485,10 +2485,10 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
} }
lock->ref_name = xstrdup(refname); lock->ref_name = xstrdup(refname);
lock->orig_ref_name = xstrdup(orig_refname); lock->orig_ref_name = xstrdup(orig_refname);
ref_file = git_path("%s", refname); strbuf_git_path(&ref_file, "%s", refname);
retry: retry:
switch (safe_create_leading_directories_const(ref_file)) { switch (safe_create_leading_directories_const(ref_file.buf)) {
case SCLD_OK: case SCLD_OK:
break; /* success */ break; /* success */
case SCLD_VANISHED: case SCLD_VANISHED:
@ -2497,11 +2497,12 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
/* fall through */ /* fall through */
default: default:
last_errno = errno; last_errno = errno;
strbuf_addf(err, "unable to create directory for %s", ref_file); strbuf_addf(err, "unable to create directory for %s",
ref_file.buf);
goto error_return; goto error_return;
} }
if (hold_lock_file_for_update(lock->lk, ref_file, lflags) < 0) { if (hold_lock_file_for_update(lock->lk, ref_file.buf, lflags) < 0) {
last_errno = errno; last_errno = errno;
if (errno == ENOENT && --attempts_remaining > 0) if (errno == ENOENT && --attempts_remaining > 0)
/* /*
@ -2511,7 +2512,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
*/ */
goto retry; goto retry;
else { else {
unable_to_lock_message(ref_file, errno, err); unable_to_lock_message(ref_file.buf, errno, err);
goto error_return; goto error_return;
} }
} }
@ -2519,12 +2520,17 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
last_errno = errno; last_errno = errno;
goto error_return; goto error_return;
} }
return lock; goto out;
error_return: error_return:
unlock_ref(lock); unlock_ref(lock);
lock = NULL;
out:
strbuf_release(&ref_file);
strbuf_release(&orig_ref_file);
errno = last_errno; errno = last_errno;
return NULL; return lock;
} }
/* /*