From dbcbe07a1b284a945c66dae6808966c28f1a1e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 5 Apr 2022 18:41:36 +0200 Subject: [PATCH] runtime_loader: review after ebeab0cf7032dd3f09d4588aa05e0618482999b8 * memset should happen after the NULL check * useless casts Change-Id: Id96e7861154b554dd927bf5dde2329c8acd2fdca Reviewed-on: https://review.haiku-os.org/c/haiku/+/5181 Tested-by: Commit checker robot Reviewed-by: X512 Reviewed-by: waddlesplash --- src/system/runtime_loader/elf_tls.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/runtime_loader/elf_tls.cpp b/src/system/runtime_loader/elf_tls.cpp index 117b39907e..fbef3f6e36 100644 --- a/src/system/runtime_loader/elf_tls.cpp +++ b/src/system/runtime_loader/elf_tls.cpp @@ -85,10 +85,10 @@ TLSBlockTemplate::SetBaseAddress(addr_t baseAddress) TLSBlock TLSBlockTemplate::CreateBlock() { - void* pointer = (uint8*)malloc(fMemorySize + TLS_DTV_OFFSET); - memset((uint8*)pointer, 0, TLS_DTV_OFFSET); + void* pointer = malloc(fMemorySize + TLS_DTV_OFFSET); if (pointer == NULL) return TLSBlock(); + memset(pointer, 0, TLS_DTV_OFFSET); memcpy((char*)pointer + TLS_DTV_OFFSET, fAddress, fFileSize); if (fMemorySize > fFileSize) memset((char*)pointer + TLS_DTV_OFFSET + fFileSize, 0, fMemorySize - fFileSize);