* Support recoverable failure from erealloc()

* Fix the shutdown code on an unrecoverable erealloc() failure

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 576356420c8d25182362c3b34c5c984f63aca45d..740b424f9565c156c4898e36291cb81faa89a766 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -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);

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 2b847be488d17190bbcdb80281ec1b11ba016b00..c47687df50d473d2181b767947382e1d313cf09d 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -55,41 +55,44 @@ ZEND_API char *zend_strndup(const char *s, unsigned int length);
 BEGIN_EXTERN_C()
 
 #if ZEND_DEBUG
-ZEND_API void *_emalloc(size_t size,char *filename,uint lineno);
-ZEND_API void _efree(void *ptr,char *filename,uint lineno);
-ZEND_API void *_ecalloc(size_t nmemb, size_t size,char *filename,uint lineno);
-ZEND_API void *_erealloc(void *ptr, size_t size,char *filename,uint lineno);
-ZEND_API char *_estrdup(const char *s,char *filename,uint lineno);
-ZEND_API char *_estrndup(const char *s, unsigned int length,char *filename,uint lineno);
+ZEND_API void *_emalloc(size_t size, char *filename, uint lineno);
+ZEND_API void _efree(void *ptr, char *filename, uint lineno);
+ZEND_API void *_ecalloc(size_t nmemb, size_t size, char *filename, uint lineno);
+ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure, char *filename, uint lineno);
+ZEND_API char *_estrdup(const char *s, char *filename, uint lineno);
+ZEND_API char *_estrndup(const char *s, unsigned int length, char *filename, uint lineno);
 ZEND_API void _persist_alloc(void *ptr, char *filename, uint lineno);
-#define emalloc(size)                  _emalloc((size),__FILE__,__LINE__)
-#define efree(ptr)                             _efree((ptr),__FILE__,__LINE__)
-#define ecalloc(nmemb,size)            _ecalloc((nmemb),(size),__FILE__,__LINE__)
-#define erealloc(ptr,size)             _erealloc((ptr),(size),__FILE__,__LINE__)
-#define estrdup(s)                             _estrdup((s),__FILE__,__LINE__)
-#define estrndup(s,length)             _estrndup((s),(length),__FILE__,__LINE__)
-#define persist_alloc(p)               _persist_alloc((p),__FILE__,__LINE__)
+#define emalloc(size)                                  _emalloc((size),__FILE__,__LINE__)
+#define efree(ptr)                                             _efree((ptr),__FILE__,__LINE__)
+#define ecalloc(nmemb,size)                            _ecalloc((nmemb),(size),__FILE__,__LINE__)
+#define erealloc(ptr,size)                             _erealloc((ptr),(size),0,__FILE__,__LINE__)
+#define erealloc_recoverable(ptr,size) _erealloc((ptr),(size),1,__FILE__,__LINE__)
+#define estrdup(s)                                             _estrdup((s),__FILE__,__LINE__)
+#define estrndup(s,length)                             _estrndup((s),(length),__FILE__,__LINE__)
+#define persist_alloc(p)                               _persist_alloc((p),__FILE__,__LINE__)
 #else
 ZEND_API void *_emalloc(size_t size);
 ZEND_API void _efree(void *ptr);
 ZEND_API void *_ecalloc(size_t nmemb, size_t size);
-ZEND_API void *_erealloc(void *ptr, size_t size);
+ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure);
 ZEND_API char *_estrdup(const char *s);
 ZEND_API char *_estrndup(const char *s, unsigned int length);
 ZEND_API void _persist_alloc(void *ptr);
-#define emalloc(size)                  _emalloc((size))
-#define efree(ptr)                             _efree((ptr))
-#define ecalloc(nmemb,size)            _ecalloc((nmemb),(size))
-#define erealloc(ptr,size)             _erealloc((ptr),(size))
-#define estrdup(s)                             _estrdup((s))
-#define estrndup(s,length)             _estrndup((s),(length))
-#define persist_alloc(p)               _persist_alloc((p))
+#define emalloc(size)                                          _emalloc((size))
+#define efree(ptr)                                                     _efree((ptr))
+#define ecalloc(nmemb,size)                                    _ecalloc((nmemb),(size))
+#define erealloc(ptr,size)                                     _erealloc((ptr),(size),0)
+#define erealloc_recoverable(ptr,size)         _erealloc((ptr),(size),1)
+#define estrdup(s)                                                     _estrdup((s))
+#define estrndup(s,length)                                     _estrndup((s),(length))
+#define persist_alloc(p)                                       _persist_alloc((p))
 #endif
 
 #define pemalloc(size,persistent) ((persistent)?malloc(size):emalloc(size))
 #define pefree(ptr,persistent)  ((persistent)?free(ptr):efree(ptr))
 #define pecalloc(nmemb,size,persistent) ((persistent)?calloc((nmemb),(size)):ecalloc((nmemb),(size)))
 #define perealloc(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc((ptr),(size)))
+#define perealloc_recoverable(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc_recoverable((ptr),(size)))
 #define pestrdup(s,persistent) ((persistent)?strdup(s):estrdup(s))
 
 #define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):(empty_string))

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 2fb21f00c10eae8ee4c930567a6dd7fc1611206f..285cc840f8d8ee31ac6ca4071b1de18bbe6bc89b 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -631,7 +631,7 @@ static int if_full_do_resize(HashTable *ht)
 
        if ((ht->nNumOfElements > ht->nTableSize) && (ht->nHashSizeIndex < nNumPrimeNumbers - 1)) {             /* Let's double the table
                                                                                                                                                                                                           size */
-               t = (Bucket **) perealloc(ht->arBuckets, PrimeNumbers[ht->nHashSizeIndex + 1] * sizeof(Bucket *),ht->persistent);
+               t = (Bucket **) perealloc_recoverable(ht->arBuckets, PrimeNumbers[ht->nHashSizeIndex + 1] * sizeof(Bucket *),ht->persistent);
                if (t) {
                        HANDLE_BLOCK_INTERRUPTIONS();
                        ht->arBuckets = t;