From cd5827a69400b9536307cb2e5276a2fec584978c Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 28 Feb 2024 16:12:07 +0000
Subject: [PATCH] Check env vars when testing for unresolved variables.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17174

(cherry picked from commit 27031dd2c55ff4ea0ad3359374f5c00392c130b7)
---
 pcbnew/drc/drc_test_provider_misc.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pcbnew/drc/drc_test_provider_misc.cpp b/pcbnew/drc/drc_test_provider_misc.cpp
index 4b64b894f2..42f56838e4 100644
--- a/pcbnew/drc/drc_test_provider_misc.cpp
+++ b/pcbnew/drc/drc_test_provider_misc.cpp
@@ -285,11 +285,15 @@ void DRC_TEST_PROVIDER_MISC::testTextVars()
                     return false;
 
                 BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( item );
-                EDA_TEXT*   text = dynamic_cast<EDA_TEXT*>( boardItem );
+                EDA_TEXT*   textItem = dynamic_cast<EDA_TEXT*>( boardItem );
 
-                wxCHECK( boardItem, false );
+                if( !textItem )
+                    return true;
 
-                if( text && text->GetShownText( true ).Matches( wxT( "*${*}*" ) ) )
+                wxString resolved = ExpandEnvVarSubstitutions( textItem->GetShownText( true ),
+                                                               nullptr /*project already done*/ );
+
+                if( resolved.Matches( wxT( "*${*}*" ) ) )
                 {
                     std::shared_ptr<DRC_ITEM>drcItem = DRC_ITEM::Create( DRCE_UNRESOLVED_VARIABLE );
                     drcItem->SetItems( item );