Merge branch '53' into 54

* 53: Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
tstarling · Mar 19, 2012 · 5709f7d · 5709f7d
2 parents 867d980 + edb5781
commit 5709f7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -38,6 +38,10 @@ PHP                                                                        NEWS
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
     function is by reference). (Nikita Popov)
 
+- 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
@@ -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;
 }