diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-21 15:48:56 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-21 15:48:56 +0000 |
| commit | 3a4743112285f095a13b44eb1d57364e28d47f66 (patch) | |
| tree | e5ac7deec75f45caf18ee4af4d84fc7347cd5971 /Zend/zend_alloc.c | |
| parent | 5ae205fb4181183f67b0f162f94051d47060a8c0 (diff) | |
| download | php-git-3a4743112285f095a13b44eb1d57364e28d47f66.tar.gz | |
No need to block for interruptions so early
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index ed1a7b9f48..8e253bc601 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -105,7 +105,6 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) mem_header *p; ALS_FETCH(); - HANDLE_BLOCK_INTERRUPTIONS(); if (!ZEND_DISABLE_MEMORY_CACHE && (size < MAX_CACHED_MEMORY) && (AG(cache_count)[size] > 0)) { p = AG(cache)[size][--AG(cache_count)[size]]; @@ -117,7 +116,6 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) p->magic = MEM_BLOCK_START_MAGIC; p->reported = 0; #endif - HANDLE_UNBLOCK_INTERRUPTIONS(); p->persistent = 0; p->cached = 0; return (void *)((char *)p + sizeof(mem_header) + PLATFORM_PADDING); @@ -125,6 +123,8 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) p = (mem_header *) malloc(sizeof(mem_header) + size + PLATFORM_PADDING + END_ALIGNMENT(size) + END_MAGIC_SIZE); } + HANDLE_BLOCK_INTERRUPTIONS(); + if (!p) { fprintf(stderr,"FATAL: emalloc(): Unable to allocate %ld bytes\n", (long) size); #if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID) |