Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Avoid segfault if module/extension version is not defined

1 files changed, 6 insertions, 2 deletions

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 72dc299219..46363acb7b 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2734,12 +2734,16 @@ static void accel_gen_system_id(void)
      */
 	ZEND_HASH_FOREACH_PTR(&module_registry, module) {
 		PHP_MD5Update(&context, module->name, strlen(module->name));
-		PHP_MD5Update(&context, module->version, strlen(module->version));
+		if (module->version != NULL) {
+			PHP_MD5Update(&context, module->version, strlen(module->version));
+		}
 	} ZEND_HASH_FOREACH_END();
 	extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
 	while (extension) {
 		PHP_MD5Update(&context, extension->name, strlen(extension->name));
-		PHP_MD5Update(&context, extension->version, strlen(extension->version));
+		if (extension->version != NULL) {
+			PHP_MD5Update(&context, extension->version, strlen(extension->version));
+		}
 		extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
 	}
 	PHP_MD5Final(digest, &context);