echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libarchive: Fix WideCharToMultiByte output buffer size

Browse Source 
Fix `archive_string_append_from_wcs_in_codepage` to account for the
already-used portion of the buffer when computing the size of the
remaining buffer for ``WideCharToMultiByte` output.
This commit is contained in:
Brad King 2020-02-06 14:28:02 -05:00
parent 44b8937b76
commit f7c54d2049
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,7 +735,8 @@ archive_string_append_from_wcs_in_codepage(struct archive_string *as,
else else
dp = &defchar_used; dp = &defchar_used;
count = WideCharToMultiByte(to_cp, 0, ws, wslen, count = WideCharToMultiByte(to_cp, 0, ws, wslen,
as->s + as->length, (int)as->buffer_length-1, NULL, dp); as->s + as->length,
(int)as->buffer_length - as->length - 1, NULL, dp);
if (count == 0 && if (count == 0 &&
GetLastError() == ERROR_INSUFFICIENT_BUFFER) { GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
/* Expand the MBS buffer and retry. */ /* Expand the MBS buffer and retry. */