A couple fixes for the SOS support for regions (#2200)

diff --git a/src/SOS/Strike/gcroot.cpp b/src/SOS/Strike/gcroot.cpp
index f654d642e07ca2e3f0d078ca45cd97ee23215dfd..38c64ce4a1e85daaa58efe50a75894c56d81df76 100644 (file)
--- a/src/SOS/Strike/gcroot.cpp
+++ b/src/SOS/Strike/gcroot.cpp
@@ -1530,7 +1530,7 @@ void should_check_bgc_mark(const GCHeapDetails &heap,
         {
             *consider_bgc_mark_p = TRUE;
 
-            if (seg.segmentAddr == heap.saved_sweep_ephemeral_seg)
+            if ((heap.saved_sweep_ephemeral_seg != -1) && (seg.segmentAddr == heap.saved_sweep_ephemeral_seg))
             {
                 *check_saved_sweep_p = TRUE;
             }
@@ -1659,19 +1659,18 @@ BOOL FindSegment(const GCHeapDetails &heap, DacpHeapSegmentData &seg, CLRDATA_AD
                 if (addr >= TO_TADDR(seg.mem) &&
                     addr < (dwAddrSeg == heap.ephemeral_heap_segment ? heap.alloc_allocated : TO_TADDR(seg.allocated)))
                 {
-                    break;
+                    return TRUE;
                 }
                 dwAddrSeg = (DWORD_PTR)seg.next;
             }
-            if (dwAddrSeg != 0)
-                break;
         }
+        return FALSE;
     }
     else
     {
         CLRDATA_ADDRESS dwAddrSeg = heap.generation_table[GetMaxGeneration()].start_segment;
 
-        // Request the inital segment.
+        // Request the initial segment.
         if (seg.Request(g_sos, dwAddrSeg, heap.original_heap_details) != S_OK)
         {
             ExtOut("Error requesting heap segment %p.\n", SOS_PTR(dwAddrSeg));