SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Also NUL-terminate for CHAR16 in file_reaad

Browse Source
This commit is contained in:
Jan Janssen
2022-01-26 18:07:00 +01:00
parent 20a734726e
commit c323c2f63c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/efi/util.c
+7 -3
View File
@@ -455,7 +455,7 @@ EFI_STATUS file_read(EFI_FILE *dir, const CHAR16 *name, UINTN off, UINTN size, C
if (EFI_ERROR(err))
return err;
size = info->FileSize+1;
size = info->FileSize;
}
if (off > 0) {
@@ -464,12 +464,16 @@ EFI_STATUS file_read(EFI_FILE *dir, const CHAR16 *name, UINTN off, UINTN size, C
return err;
}
buf = xallocate_pool(size + 1);
/* Allocate some extra bytes to guarantee the result is NUL-terminated for CHAR8 and CHAR16 strings. */
UINTN extra = size % sizeof(CHAR16) + sizeof(CHAR16);
buf = xallocate_pool(size + extra);
err = handle->Read(handle, &size, buf);
if (EFI_ERROR(err))
return err;
buf[size] = '\0';
/* Note that handle->Read() changes size to reflect the actualy bytes read. */
ZeroMem(buf + size, extra);
*ret = TAKE_PTR(buf);
if (ret_size)