From 30a49462fe9e53629b9fc7b43cb776aa2ba2cd94 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 19 Feb 2023 08:06:35 -0500 Subject: [PATCH] Fix crash parsing cadstar Fixes sentry KICAD-B2 --- common/plugins/cadstar/cadstar_archive_parser.cpp | 2 +- pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/plugins/cadstar/cadstar_archive_parser.cpp b/common/plugins/cadstar/cadstar_archive_parser.cpp index b4b56005b5..957c35dce5 100644 --- a/common/plugins/cadstar/cadstar_archive_parser.cpp +++ b/common/plugins/cadstar/cadstar_archive_parser.cpp @@ -193,7 +193,7 @@ void CADSTAR_ARCHIVE_PARSER::LINECODE::Parse( XNODE* aNode, PARSER_CONTEXT* aCon XNODE* cNode = aNode->GetChildren(); - if( cNode->GetName() != wxT( "STYLE" ) ) + if( !cNode || cNode->GetName() != wxT( "STYLE" ) ) THROW_UNKNOWN_NODE_IO_ERROR( cNode->GetName(), wxString::Format( "LINECODE -> %s", Name ) ); wxString styleStr = GetXmlAttributeIDString( cNode, 0 ); diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp index c48aede3df..91a397f28f 100644 --- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp +++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp @@ -1266,7 +1266,7 @@ void CADSTAR_PCB_ARCHIVE_PARSER::DIMENSION::TEXTFORMAT::Parse( XNODE* aNode, XNODE* cNode = aNode->GetChildren(); - if( cNode->GetName() != wxT( "TXTSTYLE" ) ) + if( !cNode || cNode->GetName() != wxT( "TXTSTYLE" ) ) THROW_UNKNOWN_NODE_IO_ERROR( cNode->GetName(), wxT( "DIMTEXT" ) ); wxString styleStr = GetXmlAttributeIDString( cNode, 0 );