com php-src: Merge branch 'PHP-7.3' into PHP-7.4: NEWS ext/opcache/zend_accelerator_util_funcs.c ext/opcache /zend_accelerator_util_funcs.h
ext/opcache/zend_fil e_cache.c
| From: | Joe Watkins | Date: | Mon, 14 Oct 2019 14:50:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: NEWS ext/opcache/zend_accelerator_util_funcs.c ext/opcache /zend_accelerator_util_funcs.h ext/opcache/zend_fil e_cache.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-108914@lists.php.net to get a copy of this message | ||
Commit: 042e3b227e61742e01aa80a160a68972fd5abfaf
Author: Joe Watkins <krakjoe@php.net> Mon, 14 Oct 2019 16:50:06 +0200
Parents: 641f9615cc81f2393504f569db51c02a19d26061 22ac57b064b6295d27d60dc416efe1f5ce1c6590
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=042e3b227e61742e01aa80a160a68972fd5abfaf
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix checksum calculation for opcache
Changed paths:
MM NEWS
MM ext/opcache/zend_accelerator_util_funcs.c
MM ext/opcache/zend_accelerator_util_funcs.h
MM ext/opcache/zend_file_cache.c
Diff:
diff --cc NEWS
index fd6ca50730e,1cc48b34e8d..9f0ee37bbbb
--- a/NEWS
+++ b/NEWS
@@@ -22,22 -11,10 +22,26 @@@ PH
. Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
cmb).
+- Pcntl:
+ . Fixed bug #77335 (PHP is preventing SIGALRM from specifying SA_RESTART).
+ (Nikita)
+
+- MySQLi:
+ . Fixed bug #76809 (SSL settings aren't respected when persistent connections
+ are used). (fabiomsouto)
+
+ - OpCache:
+ . Fixed bug #78654 (Incorrectly computed opcache checksum on files with
+ non-ascii characters). (mhagstrand)
+
+- PDO_MySQL:
+ . Fixed bug #78623 (Regression caused by "SP call yields additional empty
+ result set"). (cmb)
+
+- SimpleXML:
+ . Fixed bug #75245 (Don't set content of elements with only whitespaces).
+ (eriklundin)
+
- Sockets:
. Fixed bug #78665 (Multicasting may leak memory). (cmb)
diff --cc ext/opcache/zend_file_cache.c
index 83e8a9d5753,ac6f84b7d1d..6d49b8b9508
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@@ -929,16 -867,8 +929,16 @@@ int zend_file_cache_script_store(zend_p
zend_shared_alloc_destroy_xlat_table();
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);
+ info.checksum = zend_adler32(info.checksum, (unsigned 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);