Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).

diff --git a/NEWS b/NEWS
index 7563155c76d562fba85c459c1df9859683a81dc8..a2d7c051e653aa1505e96909138b5c68a5864e05 100644 (file)
--- 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 6acbddf9a6c5ba4866011d938718357aa797e72c..9226adf3d3f37d33853c316231f44a9029a65f3e 100644 (file)
--- 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;
 }