clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
	NEWS
This commit is contained in:
Dmitry Stogov 2013-09-25 11:04:03 +04:00
commit 4e249c8a93
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/opcache/ZendAccelerator.c
View File

@ -2411,14 +2411,14 @@ static inline int accel_find_sapi(TSRMLS_D)
return FAILURE;
}
static void zend_accel_init_shm(TSRMLS_D)
static int zend_accel_init_shm(TSRMLS_D)
{
zend_shared_alloc_lock(TSRMLS_C);
accel_shared_globals = zend_shared_alloc(sizeof(zend_accel_shared_globals));
if (!accel_shared_globals) {
zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!");
return;
return FAILURE;
}
ZSMMG(app_shared_globals) = accel_shared_globals;
@ -2433,7 +2433,8 @@ static void zend_accel_init_shm(TSRMLS_D)
ZCSG(interned_strings).arBuckets = zend_shared_alloc(ZCSG(interned_strings).nTableSize * sizeof(Bucket *));
ZCSG(interned_strings_start) = zend_shared_alloc((ZCG(accel_directives).interned_strings_buffer * 1024 * 1024));
if (!ZCSG(interned_strings).arBuckets || !ZCSG(interned_strings_start)) {
zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " cannot allocate buffer for interned strings");
zend_accel_error(ACCEL_LOG_FATAL, ACCELERATOR_PRODUCT_NAME " cannot allocate buffer for interned strings");
return FAILURE;
}
ZCSG(interned_strings_end) = ZCSG(interned_strings_start) + (ZCG(accel_directives).interned_strings_buffer * 1024 * 1024);
ZCSG(interned_strings_top) = ZCSG(interned_strings_start);
@ -2472,6 +2473,8 @@ static void zend_accel_init_shm(TSRMLS_D)
ZCSG(restart_in_progress) = 0;
zend_shared_alloc_unlock(TSRMLS_C);
return SUCCESS;
}
static void accel_globals_ctor(zend_accel_globals *accel_globals TSRMLS_DC)
@ -2529,7 +2532,10 @@ static int accel_startup(zend_extension *extension)
/********************************************/
switch (zend_shared_alloc_startup(ZCG(accel_directives).memory_consumption)) {
case ALLOC_SUCCESS:
zend_accel_init_shm(TSRMLS_C);
if (zend_accel_init_shm(TSRMLS_C) == FAILURE) {
accel_startup_ok = 0;
return FAILURE;
}
break;
case ALLOC_FAILURE:
accel_startup_ok = 0;