diff mbox series

[v8,6/6] branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks

Message ID 20220129000446.99261-7-chooglen@google.com (mailing list archive)
State Accepted
Commit 679e3693aba0c17af60c031f7eef68f2296b8dad
Headers show
Series implement branch --recurse-submodules | expand

Commit Message

Glen Choo Jan. 29, 2022, 12:04 a.m. UTC 
Signed-off-by: Glen Choo <chooglen@google.com>
---
 branch.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/branch.c b/branch.c
index 70026b3c79..47251669e1 100644
--- a/branch.c
+++ b/branch.c
@@ -239,7 +239,7 @@  static void setup_tracking(const char *new_ref, const char *orig_ref,
 	if (track != BRANCH_TRACK_INHERIT)
 		for_each_remote(find_tracked_branch, &tracking);
 	else if (inherit_tracking(&tracking, orig_ref))
-		return;
+		goto cleanup;
 
 	if (!tracking.matches)
 		switch (track) {
@@ -249,7 +249,7 @@  static void setup_tracking(const char *new_ref, const char *orig_ref,
 		case BRANCH_TRACK_INHERIT:
 			break;
 		default:
-			return;
+			goto cleanup;
 		}
 
 	if (tracking.matches > 1)
@@ -262,7 +262,8 @@  static void setup_tracking(const char *new_ref, const char *orig_ref,
 				tracking.remote, tracking.srcs) < 0)
 		exit(-1);
 
-	string_list_clear(tracking.srcs, 0);
+cleanup:
+	string_list_clear(&tracking_srcs, 0);
 }
 
 int read_branch_desc(struct strbuf *buf, const char *branch_name)