From 2d526352ee551d8f5e90643e097ee554df5aae4e Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Mon, 28 Mar 2022 14:02:20 -0400
Subject: [PATCH] Improved improper error reporting by DemangledAddressTable
 with external symbols

---
 .../ghidra/app/util/demangler/DemangledAddressTable.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledAddressTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledAddressTable.java
index bb7c80efd3..4a3d53e31b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledAddressTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledAddressTable.java
@@ -88,8 +88,17 @@ public class DemangledAddressTable extends DemangledObject {
 			return false;
 		}
 
+		if (address.isExternalAddress()) {
+			Msg.warn(this,
+				"Unable to fully apply external demangled Address Table: " + s.getName(true));
+			return true;
+		}
+
 		Listing listing = program.getListing();
 		if (MemoryBlock.isExternalBlockAddress(address, program)) {
+			Msg.warn(this,
+				"Unable to fully apply external demangled Address Table at " + address + ": " +
+					s.getName(true));
 			listing.setComment(address, CodeUnit.EOL_COMMENT,
 				"WARNING: Unable to apply demangled Address Table");
 			return true; // don't complain