paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 08:09:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Another attempt to align section raw data size in COFF headers. Without this, image modification WinAPIs like BeginUpdateResource/EndUpdateResource typically corrupt the image. Resolves #16852 (at least partially).

Browse Source 
git-svn-id: trunk@18172 -
This commit is contained in:
sergei 2011-08-11 16:42:24 +00:00
parent 48695a7705
commit 392dafd175
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/ogcoff.pas
View File

@ -2111,12 +2111,14 @@ const pemagic : array[0..3] of byte = (
sechdr.vsize:=mempos;
{ sechdr.dataSize is size of initilized data. Must be zero for sections that
do not contain one.
TODO: In Windows it must be rounded up to FileAlignment
do not contain one. In Windows it must be rounded up to FileAlignment
(so it can be greater than VirtualSize) }
if (oso_data in SecOptions) then
begin
sechdr.dataSize:=Size;
if win32 then
sechdr.dataSize:=Align(Size,SectionDataAlign)
else
sechdr.dataSize:=Size;
if (Size>0) then
sechdr.datapos:=datapos;
end;
@ -2229,7 +2231,7 @@ const pemagic : array[0..3] of byte = (
inherited DataPos_Symbols;
{ Calculating symbols position and size }
nsyms:=ExeSymbolList.Count;
sympos:=CurrDataPos;
sympos:=Align(CurrDataPos,SectionDataAlign);
inc(CurrDataPos,sizeof(coffsymbol)*nsyms);
end;
@ -2495,6 +2497,9 @@ const pemagic : array[0..3] of byte = (
ExeSectionList.ForEachCall(@ExeSectionList_write_header,nil);
{ Section data }
ExeSectionList.ForEachCall(@ExeSectionList_write_data,nil);
{ Align after the last section }
FWriter.Writezeros(Align(FWriter.Size,SectionDataAlign)-FWriter.Size);
{ Optional Symbols }
if SymPos<>FWriter.Size then
internalerror(200602252);