From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0694D3FD4 for ; Tue, 26 Mar 2024 21:41:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.108.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711489309; cv=none; b=eddan4cCCu1bps3lUzkzfQG6zx+rKXDUgj+XqHpMrnv5sWQiDLbYaq7xkNNQ6aijczGsvjNDOIxQV7TNLzYQYLuxVMDOokD7+333c5GQMvxLDu0gaPcdzyOtRXiQ+9xGUPdjiOPt4SAPl379lPv/Np18zp9rymUqJgEwKSN2wac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711489309; c=relaxed/simple; bh=3Vpfjopd0IIESYZrlCrvzu8O8SoVUTAVD0IZ/IhBP3Q=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=RUrgYZVR1HluScFnCxcJxI/EzPn8RcSs7DpkXHAVXtlgg4sIfIYHGhRWqsKug1H0jU4+9uJvsD9KjrR1QD3oTbAmLR5TO5mzCpnILq3RNBHpwTL4DeN6qipfgEnP0+z3RgP626CbZFWxwOVUykKwx+K1L4qrWHSl5EMGdPvN8hE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=rLAHNstG; arc=none smtp.client-ip=64.147.108.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="rLAHNstG" Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id C82311F2E06; Tue, 26 Mar 2024 17:41:46 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=3Vpfjopd0IIESYZrlCrvzu8O8SoVUTAVD0IZ/I hBP3Q=; b=rLAHNstG//XAUudQrYblMfc7NMSbB/aSTZdW2ZDbaXNZzQ+iVYBRFa pN+T7wQ9Z4ntH24iYg8B2qOvMlvV2sfScDFHrSNbv1ottGumxVQ0gpjmpEmKD6gz JgniAvgduWE8JmnO7R6wz3a1ofuC4FiUIQpWr/zB86H5N1lf0S9pE= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id BFB631F2E05; Tue, 26 Mar 2024 17:41:46 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.139.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 2B1201F2E04; Tue, 26 Mar 2024 17:41:46 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Cc: Han Young Subject: Re: [PATCH 0/1] quote: quote space In-Reply-To: (Junio C. Hamano's message of "Tue, 19 Mar 2024 15:56:44 -0700") References: <20240319095212.42332-1-hanyang.tony@bytedance.com> Date: Tue, 26 Mar 2024 14:41:45 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: A4D46112-EBB9-11EE-8C18-25B3960A682E-77302942!pb-smtp2.pobox.com This patch hasn't seen any review, which is understandable because it was buried in another patch'es discussion thread. I'll give it a read-over once again, as self-reviews are better than no reviews at all ;-) and then would mark it for 'next' if I didn't find anything. > ----- >8 --------- >8 --------- >8 --------- >8 ----- > Subject: [PATCH] apply: parse names out of "diff --git" more carefully > > "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 > --- > apply.c | 9 ++++++++- > t/t4126-apply-empty.sh | 22 ++++++++++++++++++++++ > 2 files changed, 30 insertions(+), 1 deletion(-) > > diff --git c/apply.c w/apply.c > index 432837a674..e311013bc4 100644 > --- c/apply.c > +++ w/apply.c > @@ -1292,8 +1292,15 @@ static char *git_header_name(int p_value, > return NULL; /* no postimage name */ > second = skip_tree_prefix(p_value, name + len + 1, > line_len - (len + 1)); > + /* > + * If we are at the SP at the end of a directory, > + * skip_tree_prefix() may return NULL as that makes > + * it appears as if we have an absolute path. > + * Keep going to find another SP. > + */ > if (!second) > - return NULL; > + continue; > + > /* > * Does len bytes starting at "name" and "second" > * (that are separated by one HT or SP we just > diff --git c/t/t4126-apply-empty.sh w/t/t4126-apply-empty.sh > index ece9fae207..eaf0c5304a 100755 > --- c/t/t4126-apply-empty.sh > +++ w/t/t4126-apply-empty.sh > @@ -66,4 +66,26 @@ test_expect_success 'apply --index create' ' > git diff --exit-code > ' > > +test_expect_success 'apply with no-contents and a funny pathname' ' > + mkdir "funny " && > + >"funny /empty" && > + git add "funny /empty" && > + git diff HEAD "funny /" >sample.patch && > + git diff -R HEAD "funny /" >elpmas.patch && > + git reset --hard && > + rm -fr "funny " && > + > + git apply --stat --check --apply sample.patch && > + test_must_be_empty "funny /empty" && > + > + git apply --stat --check --apply elpmas.patch && > + test_path_is_missing "funny /empty" && > + > + git apply -R --stat --check --apply elpmas.patch && > + test_must_be_empty "funny /empty" && > + > + git apply -R --stat --check --apply sample.patch && > + test_path_is_missing "funny /empty" > +' > + > test_done