ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/malloc.c
(Generate patch)

Comparing ray/src/common/malloc.c (file contents):
Revision 1.5 by greg, Wed Sep 26 13:46:52 1990 UTC vs.
Revision 1.6 by greg, Wed Sep 26 19:35:46 1990 UTC

# Line 19 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19   *      Greg Ward       Lawrence Berkeley Laboratory
20   */
21  
22 + #include  <errno.h>
23 +
24   #define  NULL           0
25  
26   #ifndef ALIGN
# Line 123 | Line 125 | register unsigned  n;
125          register int    bucket;
126          register unsigned       bsiz;
127                                          /* align pointer */
128 <        bsiz = BYTES_WORD - ((unsigned)p&~(BYTES_WORD-1));
128 >        bsiz = BYTES_WORD - ((unsigned)p&(BYTES_WORD-1));
129          if (bsiz < BYTES_WORD) {
130                  p += bsiz;
131                  n -= bsiz;
# Line 144 | Line 146 | char *
146   malloc(n)                       /* allocate n bytes of memory */
147   unsigned        n;
148   {
149 +        extern int  errno;
150          register M_HEAD *mp;
151          register int    bucket;
152          register unsigned       bsiz;
# Line 151 | Line 154 | unsigned       n;
154          if (n == 0)
155                  return(NULL);
156                                          /* find first bucket that fits */
157 <        bucket = FIRSTBUCKET;
158 <        for (bsiz = 1<<FIRSTBUCKET; bsiz < n; bsiz <<= 1)
159 <                bucket++;
157 >        for (bucket = FIRSTBUCKET, bsiz = 1<<FIRSTBUCKET;
158 >                        bucket < NBUCKETS; bucket++, bsiz <<= 1)
159 >                if (bsiz >= n)
160 >                        break;
161 >        if (bucket >= NBUCKETS) {
162 >                errno = EINVAL;
163 >                return(NULL);
164 >        }
165          if (free_list[bucket] == NULL) {        /* need more core */
166                  mp = (M_HEAD *)bmalloc(bsiz+sizeof(M_HEAD));
167                  if (mp == NULL)
# Line 169 | Line 177 | unsigned       n;
177  
178   char *
179   realloc(op, n)                  /* reallocate memory using malloc() */
180 < char    *op;
180 > register char   *op;
181   unsigned        n;
182   {
183 <        register char   *p;
183 >        char    *p;
184          register unsigned       on;
185 <
185 >                                        /* get old size */
186          if (op != NULL)
187                  on = 1 << ((M_HEAD *)op-1)->bucket;
188          else
189                  on = 0;
190 <        if (n <= on && n > on>>1)
190 >        if (n <= on && (n > on>>1 || on == 1<<FIRSTBUCKET))
191                  return(op);             /* same bucket */
192          p = malloc(n);
193          if (p != NULL)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines