From dafc32d8e21b3febc7fa228dd85abb7ed2e588a7 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 14 Oct 2021 09:02:26 +0300 Subject: [PATCH] GDB: Do not pass regular expressions to set substitute-path Change-Id: If647e2d12b261ba2137c952640dfdb3a984fcfbf Reviewed-by: hjk --- src/plugins/debugger/gdb/gdbengine.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index c87ec179116..6b1a53ab96d 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3796,8 +3796,11 @@ static SourcePathMap mergeStartParametersSourcePathMap(const DebuggerRunParamete { // Do not overwrite user settings. SourcePathMap rc = sp.sourcePathMap; - for (auto it = in.constBegin(), end = in.constEnd(); it != end; ++it) - rc.insert(it.key(), it.value()); + for (auto it = in.constBegin(), end = in.constEnd(); it != end; ++it) { + // Entries that start with parenthesis are handled in CppDebuggerEngine::validateRunParameters + if (!it.key().startsWith('(')) + rc.insert(it.key(), it.value()); + } return rc; }