Changeset 2159 for trunk

Timestamp:

Jul 3, 2005, 12:56:38 AM (20 years ago)

Author:

bird

Message:

Fixed assertion during realloc(p, -256) to return failure instead. Added a few more overflow checks.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/lib/malloc/irealloc.c (modified) (3 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -5 +5 @@
         o Added obstack.h and it's implementation from GLIBC.
         o malloc and realloc must set errno to ENOMEM on failure.
+        o Fixed assertion during realloc(p, -256) to return failure
+          instead. Added a few more overflow checks.
 
 2005-07-01: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/src/lib/malloc/irealloc.c

@@ -77 +77 @@
   rsize = _UM_ROUND_LUMP (new_size);
   nsize = (char *)_UM_ADD (lump, rsize) - (char *)seg->mem;
-  assert (nsize > seg->size);
+  if (nsize <= seg->size)
+    return 0;
 
   /* Attempt to expand the segment by calling EXPAND_FUN. */
@@ -254 +255 @@
   struct _um_lump *slack;
 
+  /* round the new size and make sure it doesn't accidentially wrap. */
+  rsize = _UM_ROUND_LUMP (new_size);
+  if (rsize < new_size)
+    return NULL;
+
   h = seg->parent_heap;
   _um_heap_lock (h);
@@ -259 +265 @@
     flags |= _UMFI_TILED;
   osize = _UM_ROUND_LUMP (lump->size);
-  rsize = _UM_ROUND_LUMP (new_size);
   r = _UM_BLOCK_FROM_LUMP (lump);
   if (rsize < osize)