From: Michael Haggerty Date: Mon, 14 Apr 2014 13:54:40 GMT Subject: [PATCH v3 10/25] delete_ref_loose(): don't muck around in the lock_file's filename Message-ID: <1397483695-10888-11-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1397483695-10888-1-git-send-email-mhagger@alum.mit.edu> It's bad manners. Especially since, if unlink_or_warn() failed, the memory wasn't restored to its original contents. So make our own copy to work with. Signed-off-by: Michael Haggerty --- refs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/refs.c b/refs.c index 2805b31..20c483b 100644 --- a/refs.c +++ b/refs.c @@ -2486,12 +2486,15 @@ static int repack_without_ref(const char *refname) static int delete_ref_loose(struct ref_lock *lock, int flag) { if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { - /* loose */ - int err, i = strlen(lock->lk->filename) - LOCK_SUFFIX_LEN; - - lock->lk->filename[i] = 0; - err = unlink_or_warn(lock->lk->filename); - lock->lk->filename[i] = LOCK_SUFFIX[0]; + /* + * loose. The loose file name is the same as the + * lockfile name, minus ".lock": + */ + char *loose_filename = xmemdupz( + lock->lk->filename, + strlen(lock->lk->filename) - LOCK_SUFFIX_LEN); + int err = unlink_or_warn(loose_filename); + free(loose_filename); if (err && errno != ENOENT) return 1; } -- 1.9.1