]> granicus.if.org Git - php/commitdiff
Correction
authorDmitry Stogov <dmitry@zend.com>
Wed, 27 Feb 2013 17:35:24 +0000 (21:35 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 27 Feb 2013 17:35:24 +0000 (21:35 +0400)
shared_alloc_shm.c
zend_accelerator_blacklist.c

index 21a4005571d27afd6065bf5f4deb95b22fa29edb..a8b244aac15196dd575988590d456fa6d796c2c0 100644 (file)
@@ -89,6 +89,7 @@ static int create_segments(size_t requested_size, zend_shared_segment_shm ***sha
        *shared_segments_count = ((requested_size - 1) / seg_allocate_size) + 1;
        *shared_segments_p = (zend_shared_segment_shm **) calloc(1, (*shared_segments_count) * sizeof(zend_shared_segment_shm) + sizeof(void *) * (*shared_segments_count));
        if (!*shared_segments_p) {
+               *error_in = "calloc";
                return ALLOC_FAILURE;
        }
        shared_segments = (zend_shared_segment_shm *)((char *)(*shared_segments_p) + sizeof(void *) * (*shared_segments_count));
index 48fe958432a59a8ded7ad0e4e54f61e098bf633d..87dc4744574f11e8a7ac41f906f4d3f4c3c101a9 100644 (file)
@@ -56,7 +56,7 @@ void zend_accel_blacklist_init(zend_blacklist *blacklist)
 
        blacklist->entries = (zend_blacklist_entry *) calloc(sizeof(zend_blacklist_entry), blacklist->size);
        if (!blacklist->entries) {
-               zend_accel_error(ACCEL_LOG_ERROR, "Blacklist initialization: no memory\n");
+               zend_accel_error(ACCEL_LOG_FATAL, "Blacklist initialization: no memory\n");
                return;
        }
        blacklist->regexp_list = NULL;