diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-16 17:35:52 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-16 17:36:03 +0100 |
| commit | 9ca43b873a6ad8426794262de261a1764a933cfa (patch) | |
| tree | e26b97ffa8f22b1117302070c887690d04a12e1e | |
| parent | 976225ef23c88e519f840e714d30308c6eff463c (diff) | |
| parent | 61e59db99d29cd028336b66884b3a8e69b46cf71 (diff) | |
| download | php-git-9ca43b873a6ad8426794262de261a1764a933cfa.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend_portability.h | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -13,6 +13,8 @@ PHP NEWS . Fixed bug #73998 (array_key_exists fails on arrays created by get_object_vars). (mhagstrand) . Fixed bug #73954 (NAN check fails on Alpine Linux with musl). (Andrea) + . Fixed bug #73677 (Generating phar.phar core dump with gcc ASAN enabled + build). (ondrej) - Apache: . Fixed bug #61471 (Incomplete POST does not timeout but is passed to PHP). diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 8efa651c22..6c09560b37 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -131,6 +131,12 @@ #if defined(HAVE_LIBDL) && !defined(ZEND_WIN32) +# if defined(__has_feature) +# if __has_feature(address_sanitizer) +# define __SANITIZE_ADDRESS__ +# endif +# endif + # ifndef RTLD_LAZY # define RTLD_LAZY 1 /* Solaris 1, FreeBSD's (2.1.7.1 and older) */ # endif @@ -141,7 +147,7 @@ # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT) # define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) -# elif defined(RTLD_DEEPBIND) +# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) # define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND) # else # define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) |