diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-09-28 21:20:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-09-28 21:20:50 (GMT) |
| commit | 28523989f9ad311e862b34539a2aefd708fcbb5a (patch) | |
| tree | 4bbcc35d2c98ef432ee08599ec2bd541b906a6ba /generic/tclAlloc.c | |
| parent | 2aa45635bb65ab27ecc692076b072560a603d4d3 (diff) | |
| download | tcl-28523989f9ad311e862b34539a2aefd708fcbb5a.zip tcl-28523989f9ad311e862b34539a2aefd708fcbb5a.tar.gz tcl-28523989f9ad311e862b34539a2aefd708fcbb5a.tar.bz2 | |
* generic/tclAlloc.c: Cleaned up various routines in the
* generic/tclCkalloc.c: call stacks for memory allocation to
* generic/tclParse.c: guarantee that any size values computed
* generic/tclThreadAlloc.c: are within the domains of the routines
they get passed to. [Bugs 2557696 and 2557796].
Diffstat (limited to 'generic/tclAlloc.c')
| -rw-r--r-- | generic/tclAlloc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index 12c0201..7decf22 100644 --- a/generic/tclAlloc.c +++ b/generic/tclAlloc.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclAlloc.c,v 1.16.2.3 2007/09/22 15:46:45 das Exp $ + * RCS: @(#) $Id: tclAlloc.c,v 1.16.2.4 2009/09/28 21:20:50 dgp Exp $ */ /* @@ -272,7 +272,7 @@ TclpAlloc(nbytes) register union overhead *op; register long bucket; register unsigned amt; - struct block *bigBlockPtr; + struct block *bigBlockPtr = NULL; if (!allocInit) { /* @@ -286,9 +286,11 @@ TclpAlloc(nbytes) /* * First the simple case: we simple allocate big blocks directly */ - if (nbytes + OVERHEAD >= MAXMALLOC) { - bigBlockPtr = (struct block *) TclpSysAlloc((unsigned) - (sizeof(struct block) + OVERHEAD + nbytes), 0); + if (nbytes >= MAXMALLOC - OVERHEAD) { + if (nbytes <= UINT_MAX - OVERHEAD - sizeof(struct block)) { + bigBlockPtr = (struct block *) TclpSysAlloc((unsigned) + (sizeof(struct block) + OVERHEAD + nbytes), 0); + } if (bigBlockPtr == NULL) { Tcl_MutexUnlock(allocMutexPtr); return NULL; |