diff options
| author | Carlos Martín Nieto <carlosmn@github.com> | 2016-04-01 04:09:50 -0700 |
|---|---|---|
| committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-04-01 04:09:50 -0700 |
| commit | 36fc25572ca042372b1a58f07bc721b2b827e8be (patch) | |
| tree | ee839a5b82e762c8c1b2c89c9430fedbc73b3cd4 | |
| parent | 1cac688d3f064f1b193c078e40b1b5eeca99dc16 (diff) | |
| parent | 83c93a7cc215956083e0c81155128adf4a5ca2f3 (diff) | |
| download | libgit2-36fc25572ca042372b1a58f07bc721b2b827e8be.tar.gz | |
Merge pull request #3720 from pks-t/pks/merge-driver-memleaks
merge_driver: fix missing `goto done;`
| -rw-r--r-- | src/merge_driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c index cc039dbb5..88a53ecdb 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -178,6 +178,7 @@ int git_merge_driver_global_init(void) merge_driver_name__union, &git_merge_driver__union.base)) < 0 || (error = merge_driver_registry_insert( merge_driver_name__binary, &git_merge_driver__binary)) < 0) + goto done; git__on_shutdown(git_merge_driver_global_shutdown); |