Merge pull request #249 from pcc/xgetinputfocus

[mono.git] / mono / metadata / sgen-pinning.c

diff --git a/mono/metadata/sgen-pinning.c b/mono/metadata/sgen-pinning.c
index ee5c5ec55159a3e970590bbd74db2d8e1b4642a5..10f7d2a336116bc1aba5f8b294ae3a47e5d36404 100644 (file)
--- a/mono/metadata/sgen-pinning.c
+++ b/mono/metadata/sgen-pinning.c
@@ -120,6 +120,11 @@ mono_sgen_pinning_setup_section (GCMemSection *section)
        section->pin_queue_num_entries = next_pin_slot;
 }
 
+void
+mono_sgen_pinning_trim_queue_to_section (GCMemSection *section)
+{
+       next_pin_slot = section->pin_queue_num_entries;
+}
 
 void
 mono_sgen_pin_queue_clear_discarded_entries (GCMemSection *section, int max_pin_slot)
@@ -128,6 +133,9 @@ mono_sgen_pin_queue_clear_discarded_entries (GCMemSection *section, int max_pin_
        void **end = pin_queue + max_pin_slot;
        void *addr;
 
+       if (!start)
+               return;
+
        for (; start < end; ++start) {
                addr = *start;
                if ((char*)addr < section->data || (char*)addr > section->end_data)