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

[BUG] git stash show --src-prefix prints freed memory since 2.52.0

From
NCNicolas Le Cam <niko.lecam@gmail.com>
Date
Aug 30, 2026, 21:55 UTC
Message-ID
<20260830215555.2660035-1-niko.lecam@gmail.com>
What did you do before the bug happened? (Steps to reproduce your issue)
    git init repo && cd repo
    printf 'one\ntwo\nthree\n' >f.txt
    git add f.txt && git commit -m init
    printf 'one\nTWO\nthree\n' >f.txt
    git stash
    git stash show --src-prefix=a/ --dst-prefix=b/
What did you expect to happen? (Expected behavior)
The first line of the patch should use the prefixes I asked for:
    diff --git a/f.txt b/f.txt
What happened instead? (Actual behavior)

The prefixes are replaced by fragments of unrelated heap data, and the value changes between runs of the same command:

    $ git stash show --src-prefix=a/ --dst-prefix=b/ | head -1
    diff --git Uf.txt Uf.txt
    $ git stash show --src-prefix=a/ --dst-prefix=b/ | head -1
    diff --git Vf.txt Vf.txt

On other versions the garbage is recognisable as pieces of other strings live in the process -- "ributes" (from "attributes"), "bjectmode" (from "objectmode"), "4c/" -- which is what suggests a use-after-free rather than an off-by-one.

What's different between what you expected and what actually happened?
Scope, from testing across released versions.

"git diff --src-prefix=a/ --dst-prefix=b/" is correct on every version I tried. Only "stash show" is affected. First line of the patch from "git stash show --src-prefix=a/ --dst-prefix=b/":

    2.49.1   diff --git a/f.txt b/f.txt          (correct)
    2.52.0   diff --git ributesf.txt 4c/f.txt
    2.53.0   diff --git Uf.txt Uf.txt
    2.54.0   diff --git 4c/f.txt bjectmodef.txt

The 2.53.0 output varies between invocations; the others were stable within a single container but differ from each other.

Also unaffected: "git stash show -p" with no prefix flags, and "git stash show -p --no-ext-diff --no-textconv".

Anything else you want to add:

Suspected cause. 3ea35c64b ("stash: tell setup_revisions() to free our allocated strings", merged in jk/setup-revisions-freefix) added

    struct setup_revision_opt opt = { .free_removed_argv_elements = 1 };

to show_stash(). v2.51.0 does not contain that commit; v2.52.0 does, which matches the bisect above.

--src-prefix and --dst-prefix are parsed by OPT_STRING_F in diff.c:
    OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
                 N_("show the given source prefix instead of \"a/\""),
                 PARSE_OPT_NONEG),

parse-options stores the pointer into the argv element rather than copying it, so options->a_prefix points into the "--src-prefix=a/" string itself. Once setup_revisions() is told it may free the argv elements it consumes, that string is freed while a_prefix still references it, and the dangling pointer is read later when the diff header is emitted.

If that reading is right, the same hazard would apply to any diff option parsed with OPT_STRING* into a struct diff_options field, not only these two -- "stash show" is simply the caller that now opts in to the freeing.

How I ran into it: a tool that passes --src-prefix=a/ --dst-prefix=b/ explicitly so it can parse the resulting patch without being affected by a user's diff.noprefix or diff.mnemonicPrefix configuration. That is a fairly common pattern for programs consuming git's diff output (lint-staged does the same), so the corrupted paths surface as unparseable filenames rather than as an obvious crash.

I could not find an existing report for this.

[System Info] git version 2.53.0 (Debian). Reproduced identically on the alpine/git 2.52.0 and 2.54.0 images; not reproducible on 2.49.1.

Thanks, Nicolas Le Cam

Next: Jeff King
Message 1 of 7 in “[BUG] git stash show --src-prefix prints freed memory since 2.52.0”
  1. Nicolas Le CamAug 30, 2026
  2. revision: hang on to "freed" argv elementsJeff King, Sep 1, 2026
  3. 2/1 revision: simplify mark_argv_for_free() callersJeff King, Sep 1, 2026
  4. Junio C HamanoSep 1, 2026
  5. Patrick SteinhardtSep 1, 2026
  6. Jeff KingSep 1, 2026
  7. Patrick SteinhardtSep 1, 2026

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.