i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runtime_loader: review after ebeab0cf70

Browse Source 
* 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 <[email protected]>
Reviewed-by: X512 <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2022-04-06 13:10:52 +00:00
committed by waddlesplash
parent f0a1b22183
commit dbcbe07a1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/runtime_loader/elf_tls.cpp
+2 -2
View File
@@ -85,10 +85,10 @@ TLSBlockTemplate::SetBaseAddress(addr_t baseAddress)
TLSBlock TLSBlock
TLSBlockTemplate::CreateBlock() TLSBlockTemplate::CreateBlock()
{ {
void* pointer = (uint8*)malloc(fMemorySize + TLS_DTV_OFFSET); void* pointer = malloc(fMemorySize + TLS_DTV_OFFSET);
memset((uint8*)pointer, 0, TLS_DTV_OFFSET);
if (pointer == NULL) if (pointer == NULL)
return TLSBlock(); return TLSBlock();
memset(pointer, 0, TLS_DTV_OFFSET);
memcpy((char*)pointer + TLS_DTV_OFFSET, fAddress, fFileSize); memcpy((char*)pointer + TLS_DTV_OFFSET, fAddress, fFileSize);
if (fMemorySize > fFileSize) if (fMemorySize > fFileSize)
memset((char*)pointer + TLS_DTV_OFFSET + fFileSize, 0, fMemorySize - fFileSize); memset((char*)pointer + TLS_DTV_OFFSET + fFileSize, 0, fMemorySize - fFileSize);