Make all bucket and overflow addresses unsigned

[unix-history] / usr / src / lib / libc / stdlib / malloc.c

diff --git a/usr/src/lib/libc/stdlib/malloc.c b/usr/src/lib/libc/stdlib/malloc.c
index a078712..6464ad0 100644 (file)
--- a/usr/src/lib/libc/stdlib/malloc.c
+++ b/usr/src/lib/libc/stdlib/malloc.c
@@ -1,12 +1,13 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)malloc.c   5.4 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)malloc.c   5.11 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * malloc.c (Caltech) 2/21/82
 
 /*
  * malloc.c (Caltech) 2/21/82


@@ -15,35 +16,38 @@ static char sccsid[] = "@(#)malloc.c        5.4 (Berkeley) %G%";
  * This is a very fast storage allocator.  It allocates blocks of a small 
  * number of different sizes, and keeps free lists of each size.  Blocks that
  * don't exactly fit are passed up to the next larger size.  In this 
  * This is a very fast storage allocator.  It allocates blocks of a small 
  * number of different sizes, and keeps free lists of each size.  Blocks that
  * don't exactly fit are passed up to the next larger size.  In this 

- * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long.
- * This is designed for use in a program that uses vast quantities of memory,
- * but bombs when it runs out. 
+ * implementation, the available sizes are 2^n-4 (or 2^n-10) bytes long.
+ * This is designed for use in a virtual memory environment.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

 
 #define        NULL 0
 
 
 #define        NULL 0
 

+static void morecore();
+static int findbucket();
+

 /*
  * The overhead on a block is at least 4 bytes.  When free, this space
  * contains a pointer to the next free block, and the bottom two bits must
  * be zero.  When in use, the first byte is set to MAGIC, and the second
  * byte is the size index.  The remaining bytes are for alignment.
 /*
  * The overhead on a block is at least 4 bytes.  When free, this space
  * contains a pointer to the next free block, and the bottom two bits must
  * be zero.  When in use, the first byte is set to MAGIC, and the second
  * byte is the size index.  The remaining bytes are for alignment.

- * If range checking is enabled and the size of the block fits
- * in two bytes, then the top two bytes hold the size of the requested block
- * plus the range checking words, and the header word MINUS ONE.
+ * If range checking is enabled then a second word holds the size of the
+ * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC).
+ * The order of elements is critical: ov_magic must overlay the low order
+ * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern.

  */
 union  overhead {
        union   overhead *ov_next;      /* when free */
        struct {
  */
 union  overhead {
        union   overhead *ov_next;      /* when free */
        struct {

-#ifndef RCHECK
-               u_char  ovu_magic;      /* magic number */
-               u_char  ovu_index;      /* bucket # */
-#else
-               u_int   ovu_size;       /* actual block size */

                u_char  ovu_magic;      /* magic number */
                u_char  ovu_index;      /* bucket # */
                u_char  ovu_magic;      /* magic number */
                u_char  ovu_index;      /* bucket # */

+#ifdef RCHECK

                u_short ovu_rmagic;     /* range magic number */
                u_short ovu_rmagic;     /* range magic number */

+               u_int   ovu_size;       /* actual block size */

 #endif
        } ovu;
 #define        ov_magic        ovu.ovu_magic
 #endif
        } ovu;
 #define        ov_magic        ovu.ovu_magic


@@ -97,13 +101,13 @@ botch(s)
 #define        ASSERT(p)
 #endif
 
 #define        ASSERT(p)
 #endif
 

-char *
+void *

 malloc(nbytes)
 malloc(nbytes)

-       unsigned nbytes;
+       size_t nbytes;

 {
        register union overhead *op;
 {
        register union overhead *op;

-       register int bucket;
-       register unsigned amt, n;
+       register int bucket, n;
+       register unsigned amt;

 
        /*
         * First time malloc is called, setup page size and
 
        /*
         * First time malloc is called, setup page size and


@@ -182,6 +186,7 @@ malloc(nbytes)
 /*
  * Allocate more memory to the indicated bucket.
  */
 /*
  * Allocate more memory to the indicated bucket.
  */

+static void

 morecore(bucket)
        int bucket;
 {
 morecore(bucket)
        int bucket;
 {


@@ -195,8 +200,12 @@ morecore(bucket)
         * 2^30 bytes on a VAX, I think) or for a negative arg.
         */
        sz = 1 << (bucket + 3);
         * 2^30 bytes on a VAX, I think) or for a negative arg.
         */
        sz = 1 << (bucket + 3);

+#ifdef DEBUG
+       ASSERT(sz > 0);
+#else

        if (sz <= 0)
                return;
        if (sz <= 0)
                return;

+#endif

        if (sz < pagesz) {
                amt = pagesz;
                nblks = amt / sz;
        if (sz < pagesz) {
                amt = pagesz;
                nblks = amt / sz;


@@ -219,8 +228,9 @@ morecore(bucket)
        }
 }
 
        }
 }
 

+void

 free(cp)
 free(cp)

-       char *cp;
+       void *cp;

 {   
        register int size;
        register union overhead *op;
 {   
        register int size;
        register union overhead *op;


@@ -240,7 +250,7 @@ free(cp)
 #endif
        size = op->ov_index;
        ASSERT(size < NBUCKETS);
 #endif
        size = op->ov_index;
        ASSERT(size < NBUCKETS);

-       op->ov_next = nextf[size];
+       op->ov_next = nextf[size];      /* also clobbers ov_magic */

        nextf[size] = op;
 #ifdef MSTATS
        nmalloc[size]--;
        nextf[size] = op;
 #ifdef MSTATS
        nmalloc[size]--;


@@ -260,12 +270,13 @@ free(cp)
  */
 int realloc_srchlen = 4;       /* 4 should be plenty, -1 =>'s whole list */
 
  */
 int realloc_srchlen = 4;       /* 4 should be plenty, -1 =>'s whole list */
 

-char *
+void *

 realloc(cp, nbytes)
 realloc(cp, nbytes)

-       char *cp; 
-       unsigned nbytes;
+       void *cp; 
+       size_t nbytes;

 {   
 {   

-       register u_int onb, i;
+       register u_int onb;
+       register int i;

        union overhead *op;
        char *res;
        int was_alloced = 0;
        union overhead *op;
        char *res;
        int was_alloced = 0;