Commit: d39a49a5340643483f6a94f391328b2d46a24d3b Author: Dmitry Stogov <dmi...@zend.com> Wed, 27 Feb 2013 21:35:24 +0400 Parents: e1fb6ce3657f0397261e95e8dc910a305e50ae1a Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d39a49a5340643483f6a94f391328b2d46a24d3b Log: Correction Changed paths: M shared_alloc_shm.c M zend_accelerator_blacklist.c Diff: diff --git a/shared_alloc_shm.c b/shared_alloc_shm.c index 21a4005..a8b244a 100644 --- a/shared_alloc_shm.c +++ b/shared_alloc_shm.c @@ -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)); diff --git a/zend_accelerator_blacklist.c b/zend_accelerator_blacklist.c index 48fe958..87dc474 100644 --- a/zend_accelerator_blacklist.c +++ b/zend_accelerator_blacklist.c @@ -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; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
