merge from upstream

1 files changed, 4 insertions, 3 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 43befd722bb..44f935c243d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1258,7 +1258,7 @@ emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2)
    calls malloc because it is the first call, and we have an endless loop.  */
 
 void
-reset_malloc_hooks ()
+reset_malloc_hooks (void)
 {
   __free_hook = old_free_hook;
   __malloc_hook = old_malloc_hook;
@@ -5619,7 +5619,8 @@ mark_buffer (Lisp_Object buf)
   /* buffer-local Lisp variables start at `undo_list',
      tho only the ones from `name' on are GC'd normally.  */
   for (ptr = &buffer->BUFFER_INTERNAL_FIELD (name);
-       (char *)ptr < (char *)buffer + sizeof (struct buffer);
+       ptr <= &PER_BUFFER_VALUE (buffer,
+                                 PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER));
        ptr++)
     mark_object (*ptr);
 
@@ -5732,7 +5733,7 @@ gc_sweep (void)
         int ilim = (lim + BITS_PER_INT - 1) / BITS_PER_INT;
 
         /* Scan the mark bits an int at a time.  */
-        for (i = 0; i <= ilim; i++)
+        for (i = 0; i < ilim; i++)
           {
             if (cblk->gcmarkbits[i] == -1)
               {