From d29a341e73dd575892c04c3033ec4e51670345f5 Mon Sep 17 00:00:00 2001 From: Alexis Christoforides Date: Sun, 5 Oct 2014 23:08:48 -0700 Subject: [PATCH] [runtime] Fix canary oops --- mono/metadata/sgen-gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c index f24fabeac0a..d29c6c5b1f3 100644 --- a/mono/metadata/sgen-gc.c +++ b/mono/metadata/sgen-gc.c @@ -1024,7 +1024,7 @@ pin_objects_from_nursery_pin_queue (ScanCopyContext ctx) */ if (((MonoObject*)obj_to_pin)->synchronisation == GINT_TO_POINTER (-1)) goto next_pin_queue_entry; - else + else if (nursery_canaries_enabled ()) pinning_front = (char*)pinning_front + CANARY_SIZE; /* -- 2.25.1