Skip to content

Fix conditional breakpoint evaluation when stepping onto breakpoint #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3rdit wants to merge 2 commits into
base: test_conditional_breakpoint
Choose a base branch
from
+14 −1
Open

Fix conditional breakpoint evaluation when stepping onto breakpoint #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb0fff
Fix conditional breakpoint evaluation when stepping onto a breakpoint…
3rdit Dec 27, 2025
b666f2e
explanatory comment for rationale for other developers
3rdit Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion core/debuggercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2014,7 +2014,17 @@ void DebuggerController::DebuggerMainThread()
AddRegisterValuesToExpressionParser();
AddModuleValuesToExpressionParser();

if (uint64_t ip = m_state->IP(); m_state->GetBreakpoints()->ContainsAbsolute(ip))
// skip conditional breakpoint evaluation for step operations - when the user explicitly
// steps onto a breakpoint, they expect to stop there regardless of the condition.
bool isStepOperation = (m_lastOperation == DebugAdapterStepInto)
|| (m_lastOperation == DebugAdapterStepOver)
|| (m_lastOperation == DebugAdapterStepReturn)
|| (m_lastOperation == DebugAdapterStepIntoReverse)
|| (m_lastOperation == DebugAdapterStepOverReverse)
|| (m_lastOperation == DebugAdapterStepReturnReverse);

if (uint64_t ip = m_state->IP();
!isStepOperation && m_state->GetBreakpoints()->ContainsAbsolute(ip))
{
if (!EvaluateBreakpointCondition(ip))
{
Expand Down Expand Up @@ -2654,6 +2664,8 @@ DebugStopReason DebuggerController::ExecuteAdapterAndWait(const DebugAdapterOper
},
"WaitForAdapterStop");

m_lastOperation = operation;

bool resumeOK = false;
bool operationRequested = false;
switch (operation)
Expand Down
1 change: 1 addition & 0 deletions core/debuggercontroller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ namespace BinaryNinjaDebugger {
uint32_t m_exitCode = 0;

bool m_userRequestedBreak = false;
DebugAdapterOperation m_lastOperation = DebugAdapterGo;

bool m_lastAdapterStopEventConsumed = true;

Expand Down