diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-11 20:02:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-11 20:02:40 (GMT) |
| commit | f8c365412ab16261db162c4018b225b1dd096aa8 (patch) | |
| tree | 02e91e1577770fb368b1db809c5f12096e38d614 /generic/tclCkalloc.c | |
| parent | 9d94ed0d5461f1677bc5483a618768872457b7dc (diff) | |
| parent | 00268d4ae68741fdbf73a54412cd38648f9d7302 (diff) | |
| download | tcl-f8c365412ab16261db162c4018b225b1dd096aa8.zip tcl-f8c365412ab16261db162c4018b225b1dd096aa8.tar.gz tcl-f8c365412ab16261db162c4018b225b1dd096aa8.tar.bz2 | |
Merge 8.7
In test-cases, don't load Tcltest package if it isn't actually used.
Another round of size_t related improvements. Nothing functional. Also improve some comments.
Diffstat (limited to 'generic/tclCkalloc.c')
| -rw-r--r-- | generic/tclCkalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c index 6b122cb..32d4158 100644 --- a/generic/tclCkalloc.c +++ b/generic/tclCkalloc.c @@ -403,7 +403,7 @@ Tcl_DbCkalloc( /* Don't let size argument to TclpAlloc overflow */ if (size <= UINT_MAX - HIGH_GUARD_SIZE -sizeof(struct mem_header)) { - result = (struct mem_header *) TclpAlloc((unsigned)size + + result = (struct mem_header *) TclpAlloc(size + sizeof(struct mem_header) + HIGH_GUARD_SIZE); } if (result == NULL) { @@ -493,7 +493,7 @@ Tcl_AttemptDbCkalloc( /* Don't let size argument to TclpAlloc overflow */ if (size <= UINT_MAX - HIGH_GUARD_SIZE - sizeof(struct mem_header)) { - result = (struct mem_header *) TclpAlloc((unsigned)size + + result = (struct mem_header *) TclpAlloc(size + sizeof(struct mem_header) + HIGH_GUARD_SIZE); } if (result == NULL) { |