From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 May 2026 01:30:56 +0000 (+0900)
Subject: Merge branch 'en/diffstat-utf8-truncation-fix'
X-Git-Tag: v2.55.0-rc0~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b3a3ef06624db3937a1e38d5d1f365cfdef1b69;p=thirdparty%2Fgit.git

Merge branch 'en/diffstat-utf8-truncation-fix'

The computation to shorten the filenames shown in diffstat measured
width of individual UTF-8 characters to add up, but forgot to take
into account error cases (e.g., an invalid UTF-8 sequence, or a
control character).

* en/diffstat-utf8-truncation-fix:
  diff: fix out-of-bounds reads and NULL deref in diffstat UTF-8 truncation
---

3b3a3ef06624db3937a1e38d5d1f365cfdef1b69