JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

_sbrk(): Return -1 rather than aborting if too much memory is requested.

Browse Source
This commit is contained in:
Nick Clifton 2002-01-17 16:39:53 +00:00
parent 104c3be681
commit b2db0ebcfe
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2002-01-17 Nick Clifton <nickc@cambridge.redhat.com>
* libc/sys/arm/syscalls.c (_sbrk): Return -1 rather than aborting
if too much memory is requested.
2002-01-11 Jeff Johnston <jjohnstn@redhat.com> 2002-01-11 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdio/vfscanf.c (__svfscanf_r): Change loop that * libc/stdio/vfscanf.c (__svfscanf_r): Change loop that

12
newlib/libc/sys/arm/syscalls.c
View File

@ -470,8 +470,6 @@ _getpid (int n)
n = n; n = n;
} }
extern void abort (void);
caddr_t caddr_t
_sbrk (int incr) _sbrk (int incr)
{ {
@ -486,8 +484,18 @@ _sbrk (int incr)
if (heap_end + incr > stack_ptr) if (heap_end + incr > stack_ptr)
{ {
/* Some of the libstdc++-v3 tests rely upon detecting
out of memory errors, so do not abort here. */
#if 0
extern void abort (void);
_write (1, "_sbrk: Heap and stack collision\n", 32); _write (1, "_sbrk: Heap and stack collision\n", 32);
abort (); abort ();
#else
errno = ENOMEM;
return -1;
#endif
} }
heap_end += incr; heap_end += incr;