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

Fix crash bug from bad static_cast.

This commit is contained in:
Jeff Young 2020-08-12 16:26:10 +01:00
parent 17d3e36bd6
commit 84425f5a40
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libeval_compiler/libeval_compiler.h
View File

@ -241,7 +241,7 @@ public:
class CONTEXT
{
public:
~CONTEXT()
virtual ~CONTEXT()
{
for( VALUE* value : m_ownedValues )
delete value;

6
pcbnew/pcb_expr_evaluator.cpp
View File

@ -215,6 +215,8 @@ PCB_EXPR_BUILTIN_FUNCTIONS::PCB_EXPR_BUILTIN_FUNCTIONS()
BOARD_ITEM* PCB_EXPR_VAR_REF::GetObject( LIBEVAL::CONTEXT* aCtx ) const
{
wxASSERT( dynamic_cast<PCB_EXPR_CONTEXT*>( aCtx ) );
const PCB_EXPR_CONTEXT* ctx = static_cast<const PCB_EXPR_CONTEXT*>( aCtx );
BOARD_ITEM* item = ctx->GetItem( m_itemIndex );
return item;
@ -381,11 +383,11 @@ PCB_EXPR_EVALUATOR::~PCB_EXPR_EVALUATOR()
bool PCB_EXPR_EVALUATOR::Evaluate( const wxString& aExpr )
{
PCB_EXPR_UCODE ucode;
LIBEVAL::CONTEXT preflightContext;
PCB_EXPR_CONTEXT preflightContext( F_Cu );
m_compiler.Compile( aExpr.ToUTF8().data(), &ucode, &preflightContext );
LIBEVAL::CONTEXT evaluationContext;
PCB_EXPR_CONTEXT evaluationContext( F_Cu );
LIBEVAL::VALUE* result = ucode.Run( &evaluationContext );
if( result->GetType() == LIBEVAL::VT_NUMERIC )