com php-src: Fix bug #61430 for trunk: sapi/fpm/fpm/fpm_shm .c
| From: | Xinchen Hui | Date: | Tue, 17 Apr 2012 03:23:28 +0000 |
| Subject: | com php-src: Fix bug #61430 for trunk: sapi/fpm/fpm/fpm_shm .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68797@lists.php.net to get a copy of this message | ||
Commit: 65062b47f35b858d6e6d0f91bacc929b470aa3a3
Author: Xinchen Hui <laruence@php.net> Tue, 17 Apr 2012 11:23:28 +0800
Parents: 565892d4c09ff39e96d1de16a22be21242bb83e9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65062b47f35b858d6e6d0f91bacc929b470aa3a3
Log:
Fix bug #61430 for trunk
Bugs:
https://bugs.php.net/61430
Changed paths:
M sapi/fpm/fpm/fpm_shm.c
Diff:
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;
}