From 5a39c948a4da1aa2515e15dfdda5486f9a5c9e35 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@redhat.com>
Date: Wed, 25 Feb 2009 17:43:39 +0100
Subject: test

---
 lib/Plugins/CCpp.cpp | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'lib/Plugins/CCpp.cpp')

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 2845688..de83231 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -118,26 +118,24 @@ void CLanguageCCpp::GetIndependentBacktrace(const std::string& pBacktrace, std::
         }
         if (line[jj] == '#')
         {
-            // "#0  0x080483a8 in main () at sigsegv.c:6
-            while(!isspace(line[jj]))
+            while(jj < line.length())
             {
-                jj++;
-            }
-            // "  0x080483a8 in main () at sigsegv.c:6
-            while (isspace(line[jj]))
-            {
-                jj++;
-            }
-            // "0x080483a8 in main () at sigsegv.c:6
-            while (isalnum(line[jj]))
-            {
-                jj++;
-            }
-            // " in main () at sigsegv.c:6
-            while (jj < line.length())
-            {
-                pIndependentBacktrace += line[jj];
-                jj++;
+                if (isspace(line[jj]))
+                {
+                    jj++;
+                }
+                else if (line[jj] == '0' && line[jj+1] == 'x')
+                {
+                    while (isalnum(line[jj]))
+                    {
+                        jj++;
+                    }
+                }
+                else
+                {
+                    pIndependentBacktrace += line[jj];
+                    jj++;
+                }
             }
         }
         ii++;
-- 
cgit