A heap buffer overflow vulnerability exists in Git's three-way merge code (xdiff) due to improper handling of the conflict-marker-size attribute, allowing an attacker controlling a repository to cause an integer overflow and write beyond allocated buffer boundaries. This can lead to crashes or heap corruption. The flaw affects Git versions prior to 2.33.0-23.oe2203sp4 and is triggered by commands performing textual three-way merges, including git-merge, git-rebase, git-cherry-pick, and git-merge-tree. The issue has been patched by changing the size calculation to use size_t and adding overflow checks. Workarounds for servers unable to upgrade immediately include setting conflict-marker-size=7 in repository info/attributes or disabling server-side mergeability checks for untrusted repositories.