From: Ilia Alshanetsky <iliaal@php.net>
Date: Mon, 19 Mar 2012 17:10:23 +0000 (-0400)
Subject: Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
X-Git-Tag: PHP-5.4.1-RC1~20^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edb57810a707e92b3fdb03fcf36fee53e1f69fd3;p=php

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

diff --git a/NEWS b/NEWS
index 7563155c76..a2d7c051e6 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 6acbddf9a6..9226adf3d3 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;
 }