mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from gmbr3/RuntimeError

Browse Source 
Align RTLIB CopyMem/SetMem with normal versions
This commit is contained in:
Nigel Croxon 2024-04-30 07:15:32 -04:00 committed by GitHub
commit bfaaec428b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/efirtlib.h
View File

@ -45,6 +45,7 @@ RtZeroMem (
);
VOID
EFIAPI
RUNTIMEFUNCTION
RtSetMem (
IN VOID *Buffer,
@ -53,10 +54,11 @@ RtSetMem (
);
VOID
EFIAPI
RUNTIMEFUNCTION
RtCopyMem (
IN VOID *Dest,
IN CONST VOID *Src,
IN VOID *Src,
IN UINTN len
);

4
lib/runtime/efirtlib.c
View File

@ -42,6 +42,7 @@ RtZeroMem (
#pragma RUNTIME_CODE(RtSetMem)
#endif
VOID
EFIAPI
RUNTIMEFUNCTION
RtSetMem (
IN VOID *Buffer,
@ -61,10 +62,11 @@ RtSetMem (
#pragma RUNTIME_CODE(RtCopyMem)
#endif
VOID
EFIAPI
RUNTIMEFUNCTION
RtCopyMem (
IN VOID *Dest,
IN CONST VOID *Src,
IN VOID *Src,
IN UINTN len
)
{

14
lib/runtime/rtstr.c
View File

@ -69,10 +69,13 @@ RtStrnCpy (
)
// copy strings
{
CHAR16 CopySrc = *Src;
CHAR16 *PCopySrc = &CopySrc;
UINTN Size = RtStrnLen(Src, Len);
if (Size != Len)
RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0');
RtCopyMem(Dest, Src, Size * sizeof(CHAR16));
RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16));
}
#ifndef __GNUC__
@ -105,10 +108,13 @@ RtStpnCpy (
)
// copy strings
{
CHAR16 CopySrc = *Src;
CHAR16 *PCopySrc = &CopySrc;
UINTN Size = RtStrnLen(Src, Len);
if (Size != Len)
RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0');
RtCopyMem(Dest, Src, Size * sizeof(CHAR16));
RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16));
return Dest + Size;
}
@ -137,10 +143,12 @@ RtStrnCat (
)
{
UINTN DestSize, Size;
CHAR16 CopySrc = *Src;
CHAR16 *PCopySrc = &CopySrc;
DestSize = RtStrLen(Dest);
Size = RtStrnLen(Src, Len);
RtCopyMem(Dest + DestSize, Src, Size * sizeof(CHAR16));
RtCopyMem(Dest + DestSize, PCopySrc, Size * sizeof(CHAR16));
Dest[DestSize + Size] = '\0';
}

4
lib/str.c
View File

@ -201,11 +201,13 @@ StrDuplicate (
{
CHAR16 *Dest;
UINTN Size;
CHAR16 CopySrc = *Src;
CHAR16 *PCopySrc = &CopySrc;
Size = StrSize(Src);
Dest = AllocatePool (Size);
if (Dest) {
CopyMem (Dest, (void *)Src, Size);
CopyMem (Dest, PCopySrc, Size);
}
return Dest;
}