From 14175912b9a31dd4dc19402743f6ca74e3d3b4e0 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 18 Jan 2012 08:51:16 +0400
Subject: [PATCH] Fix GC_finalized_malloc for out-of-memory case (and for
 missing 'const' qualifier)

* fnlz_mlc.c (GC_finalized_disclaim): Add 'const' qualifier for "fc"
pointer.
* fnlz_mlc.c (GC_core_finalized_malloc, GC_finalized_malloc): Cast
"op" to 'const' pointer on "fclos" storing.
* fnlz_mlc.c (GC_finalized_malloc): Use GC_get_oom_fn() instead of
locked read of GC_oom_fn.
* fnlz_mlc.c (GC_core_finalized_malloc): Test GC_generic_malloc result
for NULL (return NULL in this case).
* fnlz_mlc.c (GC_core_finalized_malloc): Add assertion on GC_size
returned value (at least just to outline that it might be bigger than
"lb" value).
---
 fnlz_mlc.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/fnlz_mlc.c b/fnlz_mlc.c
index e79605d..8626b0f 100644
--- a/fnlz_mlc.c
+++ b/fnlz_mlc.c
@@ -30,7 +30,8 @@ STATIC int GC_CALLBACK GC_finalized_disclaim(void *obj,
                                              void *cd GC_ATTR_UNUSED)
 {
     void **fc_addr;
-    struct GC_finalizer_closure *fc;
+    const struct GC_finalizer_closure *fc;
+
     fc_addr = &((void **)obj)[GC_size(obj) / sizeof(void *) - 1];
     fc = *fc_addr;
     if (fc != NULL) {
@@ -89,19 +90,28 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
         lg = GC_size_map[lb];
         opp = &GC_finalized_objfreelist[lg];
         LOCK();
-        if (EXPECT((op = *opp) == 0, FALSE)) {
+        op = *opp;
+        if (EXPECT(0 == op, FALSE)) {
             UNLOCK();
             op = GC_generic_malloc((word)lb, GC_finalized_kind);
+            if (NULL == op)
+                return NULL;
         } else {
             *opp = obj_link(op);
             obj_link(op) = 0;
             GC_bytes_allocd += GRANULES_TO_BYTES(lg);
             UNLOCK();
         }
-        ((void **)op)[GRANULES_TO_WORDS(lg) - 1] = fclos;
+        ((const void **)op)[GRANULES_TO_WORDS(lg) - 1] = fclos;
     } else {
+        size_t op_sz;
+
         op = GC_generic_malloc((word)lb, GC_finalized_kind);
-        ((void **)op)[GC_size(op) / sizeof(void *) - 1] = fclos;
+        if (NULL == op)
+            return NULL;
+        op_sz = GC_size(op);
+        GC_ASSERT(op_sz >= lb);
+        ((const void **)op)[op_sz / sizeof(void *) - 1] = fclos;
     }
     return GC_clear_stack(op);
 }
@@ -134,12 +144,7 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
                                    GC_finalized_kind, my_fl);
             my_entry = *my_fl;
             if (my_entry == 0) {
-                GC_oom_func oom_fn;
-
-                LOCK();
-                oom_fn = GC_oom_fn;
-                UNLOCK();
-                return((*oom_fn)(lb));
+                return (*GC_get_oom_fn())(lb);
             }
         }
     }
@@ -148,7 +153,7 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
     result = (void *)my_entry;
     *my_fl = next;
     obj_link(result) = 0;
-    ((void **)result)[GRANULES_TO_WORDS(lg) - 1] = fclos;
+    ((const void **)result)[GRANULES_TO_WORDS(lg) - 1] = fclos;
     PREFETCH_FOR_WRITE(next);
     return result;
   }
-- 
2.7.4