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

* when reading omf records (and subrecords), range check against

Browse Source 
RawRecord.RecordLength instead of High(RawRecord.RawData)

git-svn-id: trunk@30591 -
This commit is contained in:
nickysn 2015-04-14 17:55:13 +00:00
parent f31f87e8c7
commit e0be3e49ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/omfbase.pas
View File

@ -933,7 +933,7 @@ implementation
NextOfs:=RawRecord.ReadIndexedRef(NextOfs,FBaseSegmentIndex);
if BaseSegmentIndex=0 then
begin
if (NextOfs+1)>High(RawRecord.RawData) then
if (NextOfs+1)>=RawRecord.RecordLength then
internalerror(2015041401);
BaseFrame:=RawRecord.RawData[NextOfs]+(RawRecord.RawData[NextOfs+1] shl 8);
Inc(NextOfs,2);
@ -946,7 +946,7 @@ implementation
NextOfs:=RawRecord.ReadStringAt(NextOfs,Name);
if Is32Bit then
begin
if (NextOfs+3)>High(RawRecord.RawData) then
if (NextOfs+3)>=RawRecord.RecordLength then
internalerror(2015041401);
PublicOffset:=RawRecord.RawData[NextOfs]+(RawRecord.RawData[NextOfs+1] shl 8)+
(RawRecord.RawData[NextOfs+2] shl 16)+(RawRecord.RawData[NextOfs+3] shl 24);
@ -954,7 +954,7 @@ implementation
end
else
begin
if (NextOfs+1)>High(RawRecord.RawData) then
if (NextOfs+1)>=RawRecord.RecordLength then
internalerror(2015041401);
PublicOffset:=RawRecord.RawData[NextOfs]+(RawRecord.RawData[NextOfs+1] shl 8);
Inc(NextOfs,2);
@ -1283,7 +1283,7 @@ implementation
Locat: Word;
FixData: Byte;
begin
if (Offset+2)>High(RawRecord.RawData) then
if (Offset+2)>=RawRecord.RecordLength then
internalerror(2015040504);
{ unlike other fields in the OMF format, this one is big endian }
Locat:=(RawRecord.RawData[Offset] shl 8) or RawRecord.RawData[Offset+1];
@ -1323,7 +1323,7 @@ implementation
begin
if Is32Bit then
begin
if (Offset+3)>High(RawRecord.RawData) then
if (Offset+3)>=RawRecord.RecordLength then
internalerror(2015040504);
TargetDisplacement := RawRecord.RawData[Offset]+
(RawRecord.RawData[Offset+1] shl 8)+
@ -1333,7 +1333,7 @@ implementation
end
else
begin
if (Offset+1)>High(RawRecord.RawData) then
if (Offset+1)>=RawRecord.RecordLength then
internalerror(2015040504);
TargetDisplacement := RawRecord.RawData[Offset]+
(RawRecord.RawData[Offset+1] shl 8);