From 3e4c34234e32324de533a1134e2d5fdd83795ce4 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 23 Sep 2018 14:47:26 -0400 Subject: [PATCH] demangle/gcc2: Skip count > length should skip to the end. This is the behavior the code expects. --- src/add-ons/kernel/debugger/demangle/gcc2.cpp | 2 ++ src/tests/add-ons/kernel/debugger/DemangleTest.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/debugger/demangle/gcc2.cpp b/src/add-ons/kernel/debugger/demangle/gcc2.cpp index 1c1f24252e..9c09456ea5 100644 --- a/src/add-ons/kernel/debugger/demangle/gcc2.cpp +++ b/src/add-ons/kernel/debugger/demangle/gcc2.cpp @@ -49,6 +49,8 @@ public: { if (count > fLength) { TRACE("Input::Skip(): fOffset > fLength\n"); + fString += fLength; + fLength = 0; return; } diff --git a/src/tests/add-ons/kernel/debugger/DemangleTest.cpp b/src/tests/add-ons/kernel/debugger/DemangleTest.cpp index 7d82f65fc3..c485490ca9 100644 --- a/src/tests/add-ons/kernel/debugger/DemangleTest.cpp +++ b/src/tests/add-ons/kernel/debugger/DemangleTest.cpp @@ -37,7 +37,7 @@ DemangleTest::RunGCC2Tests() "registerInstance__Q26icu_5713BreakIteratorPQ26icu_5713BreakIteratorRCQ26icu_576Locale18UBreakIteratorTypeR10UErrorCode"); // Previously caused crashes - TEST("SetTo__Q282_GLOBAL_", "SetTo__Q282_GLOBAL_"); + TEST("SetTo__Q282_GLOBAL_", "_GLOBAL_::SetTo()"); }