mirror of
https://github.com/python/cpython.git
synced 2025-07-22 10:45:22 +00:00
* renamed malloc.h mymalloc.h, and added MALLARG as the type of the
argument to malloc() (size_t or unsigned int) * listobject.c: check for overflow of the size of the object, so things like range(0x7fffffff) will raise MemoryError instead of calling malloc() with -4 (and then crashing -- malloc's fault)
This commit is contained in:
parent
b001f7adb1
commit
1e28e5e596
4 changed files with 83 additions and 3 deletions
74
Include/mymalloc.h
Normal file
74
Include/mymalloc.h
Normal file
|
@ -0,0 +1,74 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted,
|
||||
provided that the above copyright notice appear in all copies and that
|
||||
both that copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the names of Stichting Mathematisch
|
||||
Centrum or CWI not be used in advertising or publicity pertaining to
|
||||
distribution of the software without specific, written prior permission.
|
||||
|
||||
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
||||
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
|
||||
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
|
||||
/* Lowest-level memory allocation interface */
|
||||
|
||||
#ifdef macintosh
|
||||
#define ANY void
|
||||
#ifndef THINK_C_3_0
|
||||
#define HAVE_STDLIB
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef sun
|
||||
/* Maybe not for very old versions of SunOS ? */
|
||||
#define HAVE_STDLIB
|
||||
#endif
|
||||
|
||||
#ifdef sgi
|
||||
#define HAVE_STDLIB
|
||||
#endif
|
||||
|
||||
#ifdef __STDC__
|
||||
#define ANY void
|
||||
#define HAVE_STDLIB
|
||||
#endif
|
||||
|
||||
#ifndef ANY
|
||||
#define ANY char
|
||||
#endif
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
#endif
|
||||
|
||||
#define NEW(type, n) ( (type *) malloc((n) * sizeof(type)) )
|
||||
#define RESIZE(p, type, n) \
|
||||
if ((p) == NULL) \
|
||||
(p) = (type *) malloc((n) * sizeof(type)); \
|
||||
else \
|
||||
(p) = (type *) realloc((ANY *)(p), (n) * sizeof(type))
|
||||
#define DEL(p) free((ANY *)p)
|
||||
#define XDEL(p) if ((p) == NULL) ; else DEL(p)
|
||||
|
||||
#ifdef HAVE_STDLIB
|
||||
#include <stdlib.h>
|
||||
#define MALLARG size_t
|
||||
#else
|
||||
#define MALLARG size_t
|
||||
extern ANY *malloc PROTO((MALLARG));
|
||||
extern ANY *calloc PROTO((MALLARG, MALLARG));
|
||||
extern ANY *realloc PROTO((ANY *, MALLARG));
|
||||
extern void free PROTO((ANY *)); /* XXX sometimes int on Unix old systems */
|
||||
#endif
|
Loading…
Add table
Add a link
Reference in a new issue