Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL] Properly truncate 8dot3 names when using a MultiByte OEM code page

Browse source 
CORE-17571
This commit is contained in:
Jérôme Gardou 2021-05-17 17:40:26 +02:00 • committed by Jérôme Gardou
parent 49fcbe7cd8
commit 30f2ad7949
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sdk/lib/rtl/dos8dot3.c
View file

@ -102,8 +102,9 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
DotPos = Index; DotPos = Index;
} }
/* Copy name (6 valid characters max) */ /* Copy name. OEM string length can't exceed 6. */
for (Index = 0; Index < DotPos && Context->NameLength < 6; Index++) UCHAR OemSizeLeft = 6;
for (Index = 0; (Index < DotPos) && OemSizeLeft; Index++)
{ {
Char = Name->Buffer[Index]; Char = Name->Buffer[Index];
@ -115,8 +116,17 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
else if (Char >= L'a' && Char <= L'z') else if (Char >= L'a' && Char <= L'z')
Char = RtlpUpcaseUnicodeChar(Char); Char = RtlpUpcaseUnicodeChar(Char);
/* Beware of MB OEM codepage */
if (NlsMbOemCodePageTag && HIBYTE(NlsUnicodeToMbOemTable[Char]))
{
if (OemSizeLeft < 2)
break;
OemSizeLeft--;
}
Context->NameBuffer[Context->NameLength] = Char; Context->NameBuffer[Context->NameLength] = Char;
++Context->NameLength; Context->NameLength++;
OemSizeLeft--;
} }
} }