diff options
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 4 | ||||
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 12 | ||||
| -rw-r--r-- | ext/standard/random.c | 8 |
4 files changed, 25 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4ca947374e..a055fcfdfa 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -425,6 +425,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_chr, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +#if HAVE_MBREGEX ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_encoding, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() @@ -508,6 +509,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_set_options, 0, 0, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +#endif /* HAVE_MBREGEX */ /* }}} */ /* {{{ zend_function_entry mbstring_functions[] */ diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 9692b4023c..be927f6447 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -572,7 +572,9 @@ static void zend_accel_class_hash_copy_from_shm(HashTable *target, HashTable *so return; } -#if defined(__AVX__) +#if __has_feature(memory_sanitizer) +# define fast_memcpy memcpy +#elif defined(__AVX__) # include <nmmintrin.h> # if defined(__GNUC__) && defined(__i386__) static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size) diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 4079c8bf1c..caff6ec1ce 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -49,6 +49,10 @@ # include <sys/file.h> #endif +#if __has_feature(memory_sanitizer) +# include <sanitizer/msan_interface.h> +#endif + #ifndef ZEND_WIN32 #define zend_file_cache_unlink unlink #define zend_file_cache_open open @@ -954,6 +958,14 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm) info.checksum = zend_adler32(ADLER32_INIT, buf, script->size); info.checksum = zend_adler32(info.checksum, (signed char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_size); +#if __has_feature(memory_sanitizer) + /* The buffer may contain uninitialized regions. However, the uninitialized parts will not be + * used when reading the cache. We should probably still try to get things fully initialized + * for reproducibility, but for now ignore this issue. */ + __msan_unpoison(&info, sizeof(info)); + __msan_unpoison(buf, script->size); +#endif + #ifdef HAVE_SYS_UIO_H vec[0].iov_base = &info; vec[0].iov_len = sizeof(info); diff --git a/ext/standard/random.c b/ext/standard/random.c index 01d99a5eef..9fe2ac2133 100644 --- a/ext/standard/random.c +++ b/ext/standard/random.c @@ -38,6 +38,10 @@ # endif #endif +#if __has_feature(memory_sanitizer) +# include <sanitizer/msan_interface.h> +#endif + #ifdef ZTS int random_globals_id; #else @@ -133,6 +137,10 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, zend_bool should_throw) } } +#if __has_feature(memory_sanitizer) + /* MSan does not instrument manual syscall invocations. */ + __msan_unpoison(bytes + read_bytes, n); +#endif read_bytes += (size_t) n; } #endif |