From c9ee462652b9904c30eab23bbd0e5a3a90d5cefb Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 14 Jun 2025 19:39:30 +0100
Subject: [PATCH] Nullptr safety.

---
 pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp | 4 +++-
 pcbnew/tools/pcb_control.cpp                            | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
index 61231e0440..e02b5eddb4 100644
--- a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
+++ b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
@@ -4792,7 +4792,9 @@ FOOTPRINT* PCB_IO_KICAD_SEXPR_PARSER::parseFOOTPRINT_unchecked( wxArrayString* a
                     break;
 
                 case DSN_STRING:
-                    currentGroup->insert( FromUTF8() );
+                    if( currentGroup )
+                        currentGroup->insert( FromUTF8() );
+
                     break;
 
                 case T_RIGHT:
diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp
index 6ba86c78a9..178b4e3c6d 100644
--- a/pcbnew/tools/pcb_control.cpp
+++ b/pcbnew/tools/pcb_control.cpp
@@ -1962,8 +1962,11 @@ int PCB_CONTROL::UpdateMessagePanel( const TOOL_EVENT& aEvent )
         BOARD_ITEM* a = dynamic_cast<BOARD_ITEM*>( selection[0] );
         BOARD_ITEM* b = dynamic_cast<BOARD_ITEM*>( selection[1] );
 
-        msgItems.emplace_back( MSG_PANEL_ITEM( a->GetItemDescription( m_frame, false ),
-                                               b->GetItemDescription( m_frame, false ) ) );
+        if( a && b )
+        {
+            msgItems.emplace_back( MSG_PANEL_ITEM( a->GetItemDescription( m_frame, false ),
+                                                   b->GetItemDescription( m_frame, false ) ) );
+        }
 
         BOARD_CONNECTED_ITEM* a_conn = dynamic_cast<BOARD_CONNECTED_ITEM*>( a );
         BOARD_CONNECTED_ITEM* b_conn = dynamic_cast<BOARD_CONNECTED_ITEM*>( b );