diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-02-02 04:32:02 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-02-02 04:32:02 +0000 |
| commit | 47f810920afff067666bd6496a3c92e92e2d65a8 (patch) | |
| tree | 98328ee09b593859c980d4d394ab5fa61b240a6f | |
| parent | b5139f598bf64bdb3212375a6ee6907dfbeacea0 (diff) | |
| download | cygnal-47f810920afff067666bd6496a3c92e92e2d65a8.tar.gz cygnal-47f810920afff067666bd6496a3c92e92e2d65a8.tar.bz2 cygnal-47f810920afff067666bd6496a3c92e92e2d65a8.zip | |
* cygheap.cc (creturn): Correctly calculate cygheap_max.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/cygheap.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6708d7e44..98bfb224d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 1 23:08:29 2001 Christopher Faylor <cgf@cygnus.com> + + * cygheap.cc (creturn): Correctly calculate cygheap_max. + Wed Jan 31 10:04:58 2001 Christopher Faylor <cgf@cygnus.com> * shared.cc (shared_info::initialize): Reduce size of heap. diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index 49a819a65..585ca8aa8 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -202,8 +202,9 @@ creturn (cygheap_types x, cygheap_entry * c, int len) return NULL; } c->type = x; - if (cygheap_max < ((char *) c + len)) - cygheap_max = (char *) c + len; + char *cend = ((char *) c + sizeof (*c) + len); + if (cygheap_max < cend) + cygheap_max = cend; MALLOC_CHECK; return (void *) c->data; } |