From 805ef9efdded3507ff4e68b47d2857466729e686 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 17 Sep 2016 12:41:31 -0700
Subject: [PATCH] ARM Debugger: Fix clearing software breakpoints

---
 src/arm/debugger/debugger.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/arm/debugger/debugger.c b/src/arm/debugger/debugger.c
index 454f3c418..ba9204726 100644
--- a/src/arm/debugger/debugger.c
+++ b/src/arm/debugger/debugger.c
@@ -152,7 +152,9 @@ void ARMDebuggerClearSoftwareBreakpoint(struct mDebuggerPlatform* d, uint32_t ad
 		breakpoint = NULL;
 	}
 
-	debugger->clearSoftwareBreakpoint(debugger, address, breakpoint->sw.mode, breakpoint->sw.opcode);
+	if (breakpoint) {
+		debugger->clearSoftwareBreakpoint(debugger, address, breakpoint->sw.mode, breakpoint->sw.opcode);
+	}
 }
 
 static void ARMDebuggerSetBreakpoint(struct mDebuggerPlatform* d, uint32_t address) {