svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_worker_pool.c

tony2001 Wed, 27 Jan 2010 13:04:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294090 Log: fix invalid read and possible crash Changed paths: U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c 2010-01-27 12:55:01 UTC (rev 294089) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c 2010-01-27 13:04:10 UTC (rev 294090) @@ -29,13 +29,13 @@ fpm_array_free(&wp->slots_used); fpm_array_free(&wp->slots_free); fpm_shm_free_list(wp->shm_list, which == FPM_CLEANUP_CHILD ? fpm_shm_slots_mem() : 0); + if (wp->shm_status && which != FPM_CLEANUP_CHILD) { + fpm_shm_free(wp->shm_status, !fpm_globals.is_child); + } free(wp->config); free(wp->user); free(wp->home); free(wp); - if (wp->shm_status && which != FPM_CLEANUP_CHILD) { - fpm_shm_free(wp->shm_status, !fpm_globals.is_child); - } } fpm_worker_all_pools = 0; }