From a31be40707765bfa38f84bc8a6e63cf770b16ae8 Mon Sep 17 00:00:00 2001 From: nate Date: Thu, 4 May 2017 11:20:50 -0700 Subject: [PATCH 1/2] Fix crash when lldb of v4.0.0.1 calls entry.py. @snare is the one who gave the code to resolve the issue. --- voltron/plugins/debugger/dbg_lldb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/voltron/plugins/debugger/dbg_lldb.py b/voltron/plugins/debugger/dbg_lldb.py index 144316c..316fc3f 100644 --- a/voltron/plugins/debugger/dbg_lldb.py +++ b/voltron/plugins/debugger/dbg_lldb.py @@ -395,7 +395,8 @@ if HAVE_LLDB: ci = self.host.GetCommandInterpreter() ci.HandleCommand(str(command), res, False) if res.Succeeded(): - return res.GetOutput().strip() + output = res.GetOutput() + return output.strip() if output else None else: raise Exception(res.GetError().strip()) else: From dddfddbc2ec1e87869f191659b72405d1e8d0746 Mon Sep 17 00:00:00 2001 From: nate Date: Thu, 4 May 2017 11:49:58 -0700 Subject: [PATCH 2/2] change 'None' to "" --- voltron/plugins/debugger/dbg_lldb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voltron/plugins/debugger/dbg_lldb.py b/voltron/plugins/debugger/dbg_lldb.py index 316fc3f..4dd8ec8 100644 --- a/voltron/plugins/debugger/dbg_lldb.py +++ b/voltron/plugins/debugger/dbg_lldb.py @@ -396,7 +396,7 @@ if HAVE_LLDB: ci.HandleCommand(str(command), res, False) if res.Succeeded(): output = res.GetOutput() - return output.strip() if output else None + return output.strip() if output else "" else: raise Exception(res.GetError().strip()) else: