Merge branch 'rs/plug-strbuf-leak-in-lock-ref'

gitster · gitster · commit 97488abc9121 · 2015-01-12T11:38:31.000-08:00
* rs/plug-strbuf-leak-in-lock-ref:
  refs: plug strbuf leak in lock_ref_sha1_basic()
diff --git a/refs.c b/refs.c
@@ -2334,7 +2334,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 			struct strbuf err = STRBUF_INIT;
 			unable_to_lock_message(ref_file, errno, &err);
 			error("%s", err.buf);
-			strbuf_reset(&err);
+			strbuf_release(&err);
 			goto error_return;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2334,7 +2334,7 @@ static struct ref_lock lock_ref_sha1_basic(const char refname,`
`2334`	`2334`	`struct strbuf err = STRBUF_INIT;`
`2335`	`2335`	`unable_to_lock_message(ref_file, errno, &err);`
`2336`	`2336`	`error("%s", err.buf);`
`2337`		`- strbuf_reset(&err);`
	`2337`	`+ strbuf_release(&err);`
`2338`	`2338`	`goto error_return;`
`2339`	`2339`	`}`
`2340`	`2340`	`}`