git/apply.c, branch v2.45.2

Merge branch 'rj/add-i-leak-fix'

2024-04-25T17:34:24Z

Leakfix. * rj/add-i-leak-fix: add: plug a leak on interactive_add add-patch: plug a leak handling the '/' command add-interactive: plug a leak in get_untracked_files apply: plug a leak in apply_data

apply: plug a leak in apply_data

2024-04-22T23:27:42Z

We have an execution path in apply_data that leaks the local struct image. Plug it. This leak can be triggered with: $ echo foo >file $ git add file && git commit -m file $ echo bar >file $ git diff file >diff $ sed s/foo/frotz/ baddiff $ git apply --cached Signed-off-by: Junio C Hamano

apply: avoid using fixed-size buffer in write_out_one_reject()

2024-04-16T20:38:35Z

On some systems PATH_MAX is not a hard limit. Support longer paths by building them on the heap instead of using static buffers. Take care to work around (arguably buggy) implementations of free(3) that change errno by calling it only after using the errno value. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/apply-reject-fd-leakfix'

2024-04-15T21:11:43Z

A file descriptor leak in an error codepath, used when "git apply --reject" fails to create the *.rej file, has been corrected. * rs/apply-reject-fd-leakfix: apply: don't leak fd on fdopen() error

Merge branch 'rs/apply-lift-path-length-limit'

2024-04-15T21:11:42Z

"git apply" has been updated to lift the hardcoded pathname length limit, which in turn allowed a mksnpath() function that is no longer used. * rs/apply-lift-path-length-limit: path: remove mksnpath() apply: avoid fixed-size buffer in create_one_file()

Merge branch 'jc/apply-parse-diff-git-header-names-fix'

2024-04-09T21:31:43Z

"git apply" failed to extract the filename the patch applied to, when the change was about an empty file created in or deleted from a directory whose name ends with a SP, which has been corrected. * jc/apply-parse-diff-git-header-names-fix: t4126: fix "funny directory name" test on Windows (again) t4126: make sure a directory with SP at the end is usable apply: parse names out of "diff --git" more carefully

apply: don't leak fd on fdopen() error

2024-04-05T17:09:26Z

Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

apply: avoid fixed-size buffer in create_one_file()

2024-04-05T16:49:36Z

PATH_MAX is not always a hard limit and 'path' in create_one_file() could be longer -- it's taken from the patch file and allocated dynamically. Allocate the name of the temporary file on the heap as well instead of using a fixed-size buffer to avoid that arbitrary limit. Resist the temptation of using the more convenient mkpath() to avoid introducing a dependency on a static variable deep inside the apply machinery. Take care to work around (arguably buggy) implementations of free(3) that modify errno, by calling it only after using the errno value. Suggested-by: Jeff King Helped-by: Jeff King Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

apply: parse names out of "diff --git" more carefully

2024-03-19T22:58:15Z

"git apply" uses the pathname parsed out of the "diff --git" header to decide which path is being patched, but this is used only when there is no other names available in the patch. When there is any content change (like we can see in this patch, that modifies the contents of "apply.c") or rename (which comes with "rename from" and "rename to" extended diff headers), the names are available without having to parse this header. When we do need to parse this header, a special care needs to be taken, as the name of a directory or a file can have a SP in it so it is not like "find a space, and take everything before the space and that is the preimage filename, everything after the space is the postimage filename". We have a loop that stops at every SP on the "diff --git a/dir/file b/dir/foo" line and see if that SP is the right place that separates such a pair of names. Unfortunately, this loop can terminate prematurely when a crafted directory name ended with a SP. The next pathname component after that SP (i.e. the beginning of the possible postimage filename) will be a slash, and instead of rejecting that position as the valid separation point between pre- and post-image filenames and keep looping, we stopped processing right there. The fix is simple. Instead of stopping and giving up, keep going on when we see such a condition. Reported-by: Han Young Signed-off-by: Junio C Hamano

Merge branch 'jc/am-whitespace-doc'

2024-02-28T00:04:31Z

"git am --help" now tells readers what actions are available in "git am --whitespace=", in addition to saying that the option is passed through to the underlying "git apply". * jc/am-whitespace-doc: doc: add shortcut to "am --whitespace="