paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-14 10:20:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* prevent crash of h2pas if an unknown specifier is encountered, resolves #18664

Browse Source 
git-svn-id: trunk@20136 -
This commit is contained in:
florian 2012-01-21 15:17:11 +00:00
parent a0b200db76
commit d01824ab22
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/h2pas/h2pas.pas
View File

@ -1076,8 +1076,9 @@ program h2pas;
hp3:=hp2^.p2;
while assigned(hp3) do
begin
if not assigned(hp3^.p1^.p3) or
(hp3^.p1^.p3^.typ <> t_size_specifier) then
if assigned(hp3^.p1) and
(not assigned(hp3^.p1^.p3) or
(hp3^.p1^.p3^.typ <> t_size_specifier)) then
begin
if is_sized then
begin
@ -1097,7 +1098,8 @@ program h2pas;
popshift;
end;
{ size specifier or default value ? }
if assigned(hp3^.p1^.p3) then
if assigned(hp3^.p1) and
assigned(hp3^.p1^.p3) then
begin
{ we could use mask to implement this }
{ because we need to respect the positions }

8
utils/h2pas/h2pas.y
View File

@ -1072,8 +1072,9 @@ program h2pas;
hp3:=hp2^.p2;
while assigned(hp3) do
begin
if not assigned(hp3^.p1^.p3) or
(hp3^.p1^.p3^.typ <> t_size_specifier) then
if assigned(hp3^.p1) and
(not assigned(hp3^.p1^.p3) or
(hp3^.p1^.p3^.typ <> t_size_specifier)) then
begin
if is_sized then
begin
@ -1093,7 +1094,8 @@ program h2pas;
popshift;
end;
{ size specifier or default value ? }
if assigned(hp3^.p1^.p3) then
if assigned(hp3^.p1) and
assigned(hp3^.p1^.p3) then
begin
{ we could use mask to implement this }
{ because we need to respect the positions }