clean: release strbuf after use in remove_dirs()

rscharfe · gitster · commit 25a8f80a8482 · 2017-09-07T08:49:27.000+09:00
Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/clean.c b/builtin/clean.c
@@ -167,7 +167,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		}
 
 		*dir_gone = 0;
-		return 0;
+		goto out;
 	}
 
 	dir = opendir(path->buf);
@@ -181,7 +181,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			warning_errno(_(msg_warn_remove_failed), quoted.buf);
 			*dir_gone = 0;
 		}
-		return res;
+		ret = res;
+		goto out;
 	}
 
 	strbuf_complete(path, '/');
@@ -249,6 +250,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		for (i = 0; i < dels.nr; i++)
 			printf(dry_run ?  _(msg_would_remove) : _(msg_remove), dels.items[i].string);
 	}
+out:
+	strbuf_release(&quoted);
 	string_list_clear(&dels, 0);
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ static int remove_dirs(struct strbuf path, const char prefix, int force_flag,`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`*dir_gone = 0;`
`170`		`- return 0;`
	`170`	`+ goto out;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`dir = opendir(path->buf);`
`@@ -181,7 +181,8 @@ static int remove_dirs(struct strbuf path, const char prefix, int force_flag,`
`181`	`181`	`warning_errno(_(msg_warn_remove_failed), quoted.buf);`
`182`	`182`	`*dir_gone = 0;`
`183`	`183`	`}`
`184`		`- return res;`
	`184`	`+ ret = res;`
	`185`	`+ goto out;`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`strbuf_complete(path, '/');`
`@@ -249,6 +250,8 @@ static int remove_dirs(struct strbuf path, const char prefix, int force_flag,`
`249`	`250`	`for (i = 0; i < dels.nr; i++)`
`250`	`251`	`printf(dry_run ? _(msg_would_remove) : _(msg_remove), dels.items[i].string);`
`251`	`252`	`}`
	`253`	`+out:`
	`254`	`+ strbuf_release(&quoted);`
`252`	`255`	`string_list_clear(&dels, 0);`
`253`	`256`	`return ret;`
`254`	`257`	`}`