Commit: edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:23 -0400 Committer: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:23 -0400 Parents: bcd19cf6491030f3bfd14d769011ba8f20d99333
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Log: Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). Bugs: https://bugs.php.net/61430 Changed paths: M NEWS M sapi/fpm/fpm/fpm_shm.c Diff: edb57810a707e92b3fdb03fcf36fee53e1f69fd3 diff --git a/NEWS b/NEWS index 7563155..a2d7c05 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,10 @@ PHP NEWS function is by reference). (Nikita Popov) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) +- FPM + . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). + (michaelhood at gmail dot com, Ilia) + - Ibase . Fixed bug #60947 (Segmentation fault while executing ibase_db_info). (Ilia) diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c index 6acbddf..9226adf 100644 --- a/sapi/fpm/fpm/fpm_shm.c +++ b/sapi/fpm/fpm/fpm_shm.c @@ -35,7 +35,7 @@ void *fpm_shm_alloc(size_t size) /* {{{ */ return NULL; } - memset(mem, size, 0); + memset(mem, 0, size); fpm_shm_size += size; return mem; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
