diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-09-24 17:24:23 +0800 |
| commit | e8c200515a8014a24c98a92c7de7c33463114863 (patch) | |
| tree | 43c6884e80c80ccd897600bd31e4decda5a9ec55 /ext/spl | |
| parent | 628c257f713224663567a35b3da781153829a413 (diff) | |
| parent | b05ff14a9aa8fd98eea9cbeb090f9d64bf302561 (diff) | |
| download | php-git-e8c200515a8014a24c98a92c7de7c33463114863.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Compiler warning
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/spl_dllist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 52138561bc..c7ac6cecd0 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -733,7 +733,7 @@ SPL_METHOD(SplDoublyLinkedList, setIteratorMode) return; } - intern->flags = value & SPL_DLLIST_IT_MASK | intern->flags & SPL_DLLIST_IT_FIX; + intern->flags = (value & SPL_DLLIST_IT_MASK) | (intern->flags & SPL_DLLIST_IT_FIX); RETURN_LONG(intern->flags); } |