Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP] Fix invalid use of character count instead of byte count

Browse source
This commit is contained in:
Timo Kreuzer 2021-07-21 10:26:42 +02:00
parent a3763c61dc
commit b1c6c91d1f
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
base/setup/usetup/spapisup/cabinet.c
View file

@ -628,6 +628,7 @@ CabinetOpen(
OBJECT_ATTRIBUTES ObjectAttributes;
IO_STATUS_BLOCK IoStatusBlock;
UNICODE_STRING FileName;
USHORT StringLength;
NTSTATUS NtStatus;
if (CabinetContext->FileOpen)
@ -732,11 +733,14 @@ CabinetOpen(
the same directory as the current */
wcscpy(CabinetContext->CabinetPrev, CabinetContext->CabinetName);
RemoveFileName(CabinetContext->CabinetPrev);
CabinetNormalizePath(CabinetContext->CabinetPrev, 256);
CabinetNormalizePath(CabinetContext->CabinetPrev, sizeof(CabinetContext->CabinetPrev));
RtlInitAnsiString(&astring, (LPSTR)Buffer);
ustring.Length = wcslen(CabinetContext->CabinetPrev);
ustring.Buffer = CabinetContext->CabinetPrev + ustring.Length;
ustring.MaximumLength = sizeof(CabinetContext->CabinetPrev) - ustring.Length;
/* Initialize ustring with the remaining buffer */
StringLength = (USHORT)wcslen(CabinetContext->CabinetPrev) * sizeof(WCHAR);
ustring.Buffer = CabinetContext->CabinetPrev + StringLength;
ustring.MaximumLength = sizeof(CabinetContext->CabinetPrev) - StringLength;
ustring.Length = 0;
RtlAnsiStringToUnicodeString(&ustring, &astring, FALSE);
Buffer += astring.Length + 1;
@ -762,9 +766,12 @@ CabinetOpen(
RemoveFileName(CabinetContext->CabinetNext);
CabinetNormalizePath(CabinetContext->CabinetNext, 256);
RtlInitAnsiString(&astring, (LPSTR)Buffer);
ustring.Length = wcslen(CabinetContext->CabinetNext);
ustring.Buffer = CabinetContext->CabinetNext + ustring.Length;
ustring.MaximumLength = sizeof(CabinetContext->CabinetNext) - ustring.Length;
/* Initialize ustring with the remaining buffer */
StringLength = (USHORT)wcslen(CabinetContext->CabinetNext) * sizeof(WCHAR);
ustring.Buffer = CabinetContext->CabinetNext + StringLength;
ustring.MaximumLength = sizeof(CabinetContext->CabinetNext) - StringLength;
ustring.Length = 0;
RtlAnsiStringToUnicodeString(&ustring, &astring, FALSE);
Buffer += astring.Length + 1;