com php-src: Ensure pointer alignment.: ext/opcache/Optimizer/z end_worklist.h
| From: | Dmitry Stogov | Date: | Mon, 06 Mar 2017 14:09:05 +0000 |
| Subject: | com php-src: Ensure pointer alignment.: ext/opcache/Optimizer/z end_worklist.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97244@lists.php.net to get a copy of this message | ||
Commit: e113b6784aa92c74ec3f4d821ccc6492d4b1a52d
Author: Dmitry Stogov <dmitry@zend.com> Mon, 6 Mar 2017 17:09:05 +0300
Parents: c6982995504b6e21e8a5ade29cfb16a55196dc43
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e113b6784aa92c74ec3f4d821ccc6492d4b1a52d
Log:
Ensure pointer alignment.
Changed paths:
M ext/opcache/Optimizer/zend_worklist.h
Diff:
diff --git a/ext/opcache/Optimizer/zend_worklist.h b/ext/opcache/Optimizer/zend_worklist.h
index 332dbde..73c0bca 100644
--- a/ext/opcache/Optimizer/zend_worklist.h
+++ b/ext/opcache/Optimizer/zend_worklist.h
@@ -77,10 +77,10 @@ typedef struct _zend_worklist {
} zend_worklist;
#define ZEND_WORKLIST_ALLOCA(w, _len, use_heap) do { \
- (w)->stack.buf = (int*)do_alloca(sizeof(int) * _len + sizeof(zend_ulong) *
zend_bitset_len(_len), use_heap); \
+ (w)->stack.buf = (int*)do_alloca(ZEND_MM_ALIGNED_SIZE(sizeof(int) * _len) + sizeof(zend_ulong)
* zend_bitset_len(_len), use_heap); \
(w)->stack.len = 0; \
(w)->stack.capacity = _len; \
- (w)->visited = (zend_bitset)((w)->stack.buf + _len); \
+ (w)->visited = (zend_bitset)((char*)(w)->stack.buf + ZEND_MM_ALIGNED_SIZE(sizeof(int) *
_len)); \
memset((w)->visited, 0, sizeof(zend_ulong) * zend_bitset_len(_len)); \
} while (0)