Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

prevent warning C4319: '~': zero extending 'const unsigned int' to 'upx_uint64_t' of greater size

Browse Source 
modified:   linker.cpp
	modified:   p_lx_elf.cpp
	modified:   pefile.cpp
This commit is contained in:
John Reiser
2016-11-19 16:46:01 -08:00
parent 3df7d26101
commit 134b829d59
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pefile.cpp
+2 -2
View File
@@ -2414,7 +2414,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
osection[1].vsize = (osection[1].size + oam1) &~ oam1;
osection[2].vsize = (osection[2].size + ncsize_virt_increase + oam1) &~ oam1;
oh.imagesize = osection[2].vaddr + osection[2].vsize;
osection[0].rawdataptr = (pe_offset + sizeof(ht) + sizeof_osection + fam1) &~ fam1;
osection[0].rawdataptr = (pe_offset + sizeof(ht) + sizeof_osection + fam1) &~ (size_t)fam1;
osection[1].rawdataptr = osection[0].rawdataptr;
}
else
@@ -2422,7 +2422,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
osection[1].vsize = osection[1].size;
osection[2].vsize = osection[2].size;
osection[0].rawdataptr = 0;
osection[1].rawdataptr = (pe_offset + sizeof(ht) + sizeof_osection + fam1) &~ fam1;
osection[1].rawdataptr = (pe_offset + sizeof(ht) + sizeof_osection + fam1) &~ (size_t)fam1;
}
osection[2].rawdataptr = osection[1].rawdataptr + osection[1].size;