Apple-2gs-SW
/
ORCA-C
mirror of https://github.com/byteworksinc/ORCA-C.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set expressionType to a default value when an expression parsing error is encountered. 

This ensures consistent handling of errors and prevents possible null pointer dereferences.
This commit is contained in:
Stephen Heumann 2019-12-22 23:49:14 -06:00
parent a4f7284a8a
commit 7f79b49c3a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Expression.pas
View File

@ -3874,7 +3874,7 @@ procedure Expression {kind: expressionKind; stopSym: tokenSet};
{ realExpressionValue - value of a real constant }
{ expression }
{ expressionValue - value of a constant expression }
{ expressionType - type of the constant expression }
{ expressionType - type of the expression }
label 1;
@ -3891,7 +3891,9 @@ if kind = normalExpression then begin {generate code from the expression tree}
if not errorFound then begin
doDispose := true;
GenerateCode(tree);
end; {if}
end {if}
else
expressionType := wordPtr; {set default type in case of error}
end {if}
else begin {record the expression for an initializer}
initializerTree := tree;
@ -3899,6 +3901,7 @@ else begin {record the expression for an initialize
if errorFound then begin
DisposeTree(initializerTree);
initializerTree := nil;
expressionType := wordPtr; {set default type in case of error}
end {if}
else begin
ldoDispose := doDispose; {find the expression type}