git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 5/7] ls-files: fix a trivial dir_clear() leak

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 14, 2021, 17:38 UTC
Message-ID
<xmqq1r4ncxrr.fsf@gitster.g>
In-Reply-To
<87lf2wh2fu.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 15 quoted lines
> On Wed, Oct 13 2021, Junio C Hamano wrote:
>
>> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>>
>>> -       if (ps_matched) {
>>> -               int bad;
>>> -               bad = report_path_error(ps_matched, &pathspec);
>>> -               if (bad)
>>> -                       fprintf(stderr, "Did you forget to 'git add'?\n");
>>> -
>>> -               return bad ? 1 : 0;
>>> +       if (ps_matched && report_path_error(ps_matched, &pathspec)) {
>>> +               fprintf(stderr, "Did you forget to 'git add'?\n");
>>> +               ret = 1;
>>>         }
 ...
Show 19 quoted lines
> I mean that we generally don't write code like:
>
> 	if (x) {
> 		if (y) {
> 			fprintf(...);
> 			ret = 1;
> 		}
> 	}
>
> And instead write:
>
> 	if (x && y) {
> 		fprintf(...);
> 		ret = 1;
> 	}
>
> So aside from the specific change here I thought your objection would
> also apply to e.g. removing braces from a standalone "if" as it's
> reduced to a one statement body, which we we generally do.
Yes, but in a "plug-leak-only" fix, I would have expected
	if (ps_matched) {
		int bad;
		bad = report_path_error(ps_matched, &pathspec);
		if (bad)
			fprintf(stderr, "Did you forget to 'git add'?\n");

- return bad ? 1 : 0; + ret = bad ? 1 : 0;

	}
Doing anything more than that is "while at it clean-up".
Previous: Ævar Arnfjörð Bjarmason
Message 23 of 23 in “leak tests: fix "test-tool" & other small leaks”
  1. 0/7 leak tests: fix "test-tool" & other small leaksÆvar Arnfjörð Bjarmason, Oct 6, 2021
  2. 1/7 tests: fix a memory leak in test-prio-queue.cÆvar Arnfjörð Bjarmason, Oct 6, 2021
  3. 2/7 tests: fix a memory leak in test-parse-options.cÆvar Arnfjörð Bjarmason, Oct 6, 2021
  4. Elijah NewrenOct 6, 2021
  5. 3/7 tests: fix a memory leak in test-oidtree.cÆvar Arnfjörð Bjarmason, Oct 6, 2021
  6. 5/7 ls-files: fix a trivial dir_clear() leakÆvar Arnfjörð Bjarmason, Oct 6, 2021
  7. 4/7 tests: fix test-oid-array leak, test in SANITIZE=leakÆvar Arnfjörð Bjarmason, Oct 6, 2021
  8. 6/7 ls-files: add missing string_list_clear()Ævar Arnfjörð Bjarmason, Oct 6, 2021
  9. 7/7 merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason, Oct 6, 2021
  10. Elijah NewrenOct 6, 2021
  11. 0/7 leak tests: fix "test-tool" & other small leaksÆvar Arnfjörð Bjarmason, Oct 7, 2021
  12. 1/7 tests: fix a memory leak in test-prio-queue.cÆvar Arnfjörð Bjarmason, Oct 7, 2021
  13. 2/7 tests: fix a memory leak in test-parse-options.cÆvar Arnfjörð Bjarmason, Oct 7, 2021
  14. 3/7 tests: fix a memory leak in test-oidtree.cÆvar Arnfjörð Bjarmason, Oct 7, 2021
  15. 4/7 tests: fix test-oid-array leak, test in SANITIZE=leakÆvar Arnfjörð Bjarmason, Oct 7, 2021
  16. 7/7 merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason, Oct 7, 2021
  17. 6/7 ls-files: add missing string_list_clear()Ævar Arnfjörð Bjarmason, Oct 7, 2021
  18. 5/7 ls-files: fix a trivial dir_clear() leakÆvar Arnfjörð Bjarmason, Oct 7, 2021
  19. Junio C HamanoOct 7, 2021
  20. Ævar Arnfjörð BjarmasonOct 13, 2021
  21. Junio C HamanoOct 13, 2021
  22. Ævar Arnfjörð BjarmasonOct 14, 2021
  23. Junio C HamanoOct 14, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.