cvs: php-src(PHP_5_3) /ext/sysvshm sysvshm.c
| From: | Ilia Alshanetsky | Date: | Thu, 19 Mar 2009 23:11:32 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/sysvshm sysvshm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56647@lists.php.net to get a copy of this message | ||
iliaa Thu Mar 19 23:11:32 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sysvshm sysvshm.c
Log:
MFB: Fixed bug #47721 (Aligment issues in mbstring and sysvshm extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.5.2.11&r2=1.70.2.2.2.5.2.12&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.11
php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.12
--- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.11 Tue Mar 17 23:21:37 2009
+++ php-src/ext/sysvshm/sysvshm.c Thu Mar 19 23:11:32 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.11 2009/03/17 23:21:37 iliaa Exp $ */
+/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.12 2009/03/19 23:11:32 iliaa Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -357,7 +357,7 @@
long total_size;
long shm_varpos;
- total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / 4) * 4 + 4; /* 4-byte alligment */
+ total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / sizeof(long)) * sizeof(long) +
sizeof(long); /* long alligment */
if ((shm_varpos = php_check_shm_data(ptr, key)) > 0) {
php_remove_shm_data(ptr, shm_varpos);