mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-11 17:49:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'libarchive-windows-encoding' into release-4.0

Browse Source 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11622
This commit is contained in:
Brad King
2026-01-24 08:03:24 -05:00
parent acefe25af1 f590010167
commit 8b19487cbb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Utilities/cmlibarchive/libarchive/archive_string.c
View File

@@ -552,7 +552,12 @@ archive_wstring_append_from_mbs_in_codepage(struct archive_wstring *dest,
} else
mbflag = MB_PRECOMPOSED;
/* FIXME(CMake#26903): Offer control over encoding conversion.
For now, we instead tolerate invalid characters as
libarchive 3.7.2 / CMake 3.30 and below did. */
#if 0
mbflag |= MB_ERR_INVALID_CHARS;
#endif
buffsize = dest->length + length + 1;
do {