[PATCH 2/2] [WineDbg]: don't access inside a bp structure if it's not initialized

Eric Pouech eric.pouech at orange.fr
Wed Aug 25 14:43:52 CDT 2010


(Spotted by Peter Urbanec)

A+
---

 programs/winedbg/break.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c
index b1cef6a..2f502ce 100644
--- a/programs/winedbg/break.c
+++ b/programs/winedbg/break.c
@@ -510,11 +510,13 @@ void break_delete_xpoints_from_module(DWORD64 base)
 
     for (i = 0; i < dbg_curr_process->next_bp; i++)
     {
-        linear = (DWORD_PTR)memory_to_linear_addr(&bp[i].addr);
-        if (bp[i].refcount && bp[i].enabled &&
-            im.BaseOfImage <= linear && linear < im.BaseOfImage + im.ImageSize)
+        if (bp[i].refcount && bp[i].enabled)
         {
-            break_delete_xpoint(i);
+            linear = (DWORD_PTR)memory_to_linear_addr(&bp[i].addr);
+            if (im.BaseOfImage <= linear && linear < im.BaseOfImage + im.ImageSize)
+            {
+                break_delete_xpoint(i);
+            }
         }
     }
 }






More information about the wine-patches mailing list