Sync with 2.34.7
* maint-2.34: Git 2.34.7 http: support CURLOPT_PROTOCOLS_STR http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT Git 2.33.7 Git 2.32.6 Git 2.31.7 Git 2.30.8 apply: fix writing behind newly created symbolic links dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS clone: delay picking a transport until after get_repo_path() t5619: demonstrate clone_local() with ambiguous transport
This commit is contained in:
27
apply.c
27
apply.c
@ -4426,6 +4426,33 @@ static int create_one_file(struct apply_state *state,
|
||||
if (state->cached)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* We already try to detect whether files are beyond a symlink in our
|
||||
* up-front checks. But in the case where symlinks are created by any
|
||||
* of the intermediate hunks it can happen that our up-front checks
|
||||
* didn't yet see the symlink, but at the point of arriving here there
|
||||
* in fact is one. We thus repeat the check for symlinks here.
|
||||
*
|
||||
* Note that this does not make the up-front check obsolete as the
|
||||
* failure mode is different:
|
||||
*
|
||||
* - The up-front checks cause us to abort before we have written
|
||||
* anything into the working directory. So when we exit this way the
|
||||
* working directory remains clean.
|
||||
*
|
||||
* - The checks here happen in the middle of the action where we have
|
||||
* already started to apply the patch. The end result will be a dirty
|
||||
* working directory.
|
||||
*
|
||||
* Ideally, we should update the up-front checks to catch what would
|
||||
* happen when we apply the patch before we damage the working tree.
|
||||
* We have all the information necessary to do so. But for now, as a
|
||||
* part of embargoed security work, having this check would serve as a
|
||||
* reasonable first step.
|
||||
*/
|
||||
if (path_is_beyond_symlink(state, path))
|
||||
return error(_("affected file '%s' is beyond a symbolic link"), path);
|
||||
|
||||
res = try_create_file(state, path, mode, buf, size);
|
||||
if (res < 0)
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user