haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Libeval: don't try to dereference invalid STRUCT_REF parent 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/7764
This commit is contained in:
Jon Evans 2021-02-28 14:46:13 -05:00
parent 63b5d8db43
commit 5c17ff0595
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/libeval_compiler/libeval_compiler.cpp
View File

@ -841,8 +841,19 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
if( node->leaf[0]->op != TR_IDENTIFIER ) if( node->leaf[0]->op != TR_IDENTIFIER )
{ {
reportError( CST_CODEGEN, _( "Unknown parent of property" ), int pos = node->leaf[0]->srcPos;
node->leaf[0]->srcPos - (int) node->leaf[0]->value.str->length() );
if( node->leaf[0]->value.str )
pos -= static_cast<int>( node->leaf[0]->value.str->length() );
reportError( CST_CODEGEN, _( "Unknown parent of property" ), pos );
node->leaf[0]->isVisited = true;
node->leaf[1]->isVisited = true;
node->SetUop( TR_UOP_PUSH_VALUE, 0.0 );
node->isTerminal = true;
break;
} }
switch( node->leaf[1]->op ) switch( node->leaf[1]->op )