From adf70fd8f20f8aa0cbda39a8660acd08f9f51731 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 3 Aug 2021 08:40:56 +0200 Subject: [PATCH] Debugger: Don't add empty path components to solib-search-path Change-Id: I417e5193749dae44d189fc0189a92899d738976b Reviewed-by: Christian Stenger --- share/qtcreator/debugger/gdbbridge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index af9f56bbe13..cb3210a8840 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -1165,7 +1165,8 @@ class Dumper(DumperBase): def appendSolibSearchPath(self, args): new = list(map(self.hexdecode, args['path'])) old = [gdb.parameter('solib-search-path')] - gdb.execute('set solib-search-path %s' % args['separator'].join(old + new)) + joined = os.pathsep.join([item for item in old + new if item != '']) + gdb.execute('set solib-search-path %s' % joined) def watchPoint(self, args): self.reportToken(args)