diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-16 21:05:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 21:05:24 +0900 |
| commit | 94294e92e107009f96c7496387717e618dc249c4 (patch) | |
| tree | 65543aab88525a6f598781d4c5e944a5c9532a3e /builtin | |
| parent | Merge branch 'ma/typofixes' (diff) | |
| parent | maintenance: fix two memory leaks (diff) | |
| download | tgif-94294e92e107009f96c7496387717e618dc249c4.tar.xz | |
Merge branch 'lh/maintenance-leakfix'
* lh/maintenance-leakfix:
maintenance: fix two memory leaks
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/gc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 98a803196b..f05d2f0a1a 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1909,6 +1909,7 @@ static int crontab_update_schedule(int run_maintenance, int fd, const char *cmd) else if (!in_old_region) fprintf(cron_in, "%s\n", line.buf); } + strbuf_release(&line); if (run_maintenance) { struct strbuf line_format = STRBUF_INIT; @@ -1971,8 +1972,10 @@ static int update_background_schedule(int enable) cmd = sep + 1; } - if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) - return error(_("another process is scheduling background maintenance")); + if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) { + result = error(_("another process is scheduling background maintenance")); + goto cleanup; + } if (!strcmp(scheduler, "launchctl")) result = launchctl_update_schedule(enable, get_lock_file_fd(&lk), cmd); @@ -1984,6 +1987,9 @@ static int update_background_schedule(int enable) die("unknown background scheduler: %s", scheduler); rollback_lock_file(&lk); + +cleanup: + free(lock_path); free(testing); return result; } |