archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* Support recoverable failure from erealloc()

Browse source 
* Fix the shutdown code on an unrecoverable erealloc() failure
This commit is contained in:
Zeev Suraski 1999-07-09 11:03:56 +00:00
parent 81f5522210
commit 6abe9c34d9
3 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Zend/zend_alloc.c
View file

@ -200,9 +200,9 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size)
#if ZEND_DEBUG
ZEND_API void *_erealloc(void *ptr, size_t size, char *filename, uint lineno)
ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure, char *filename, uint lineno)
#else
ZEND_API void *_erealloc(void *ptr, size_t size)
ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure)
#endif
{
mem_header *p = (mem_header *) ((char *)ptr-sizeof(mem_header)-PLATFORM_PADDING);
@ -220,10 +220,12 @@ ZEND_API void *_erealloc(void *ptr, size_t size)
REMOVE_POINTER_FROM_LIST(p);
p = (mem_header *) realloc(p,sizeof(mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size)+END_MAGIC_SIZE);
if (!p) {
fprintf(stderr,"FATAL: erealloc(): Unable to allocate %ld bytes\n", (long) size);
HANDLE_UNBLOCK_INTERRUPTIONS();
zend_bailout();
if (!allow_failure) {
fprintf(stderr,"FATAL: erealloc(): Unable to allocate %ld bytes\n", (long) size);
exit(1);
}
ADD_POINTER_TO_LIST(orig);
HANDLE_UNBLOCK_INTERRUPTIONS();
return (void *)NULL;
}
ADD_POINTER_TO_LIST(p);