From 9c9b5fa4a07f2b3ee7af5a42e5c69f5a3198196d Mon Sep 17 00:00:00 2001
From: Harbour <Harbour@Sfinx.Od.UA>
Date: Sat, 1 Dec 2007 17:53:05 +0200
Subject: [PATCH] Fix failed demangle case output

---
 src/F_App.C | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/F_App.C b/src/F_App.C
index 6e687c5..2ae5fab 100644
--- a/src/F_App.C
+++ b/src/F_App.C
@@ -33,6 +33,7 @@ extern "C" int init_demangler(const char *style, const char *options,
 extern "C" char *cplus_demangle(const char *mangled, int options);
 
 #define DMGL_AUTO        (1 << 8)
+
 const char *F::demangled_(const char *mngl)
 {
 #ifdef OLD_BINUTILS
@@ -42,7 +43,8 @@ const char *F::demangled_(const char *mngl)
    init_ = true;
  }
 #endif
- return cplus_demangle(mngl, DMGL_AUTO);
+ const char *dm = cplus_demangle(mngl, DMGL_AUTO);
+ return dm ? dm : mngl;
 }
 
 #else
-- 
2.11.4.GIT