diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-14 22:34:58 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-14 22:34:58 +0200 |
| commit | 15236fb83eda8d741bf0d5df8b25ab8d0c4e9083 (patch) | |
| tree | 5f75b8359c599bd70367aa3d3760319ebc56c0c8 | |
| parent | e41867888a76da3c270afe8dc86352e41d1f8c39 (diff) | |
| parent | 4e198c00646604b5fe6726cdc9eba4c2b7861ce2 (diff) | |
| download | php-git-15236fb83eda8d741bf0d5df8b25ab8d0c4e9083.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Avoid segfault if module/extension version is not defined
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 25148b0d4a..b9a0946a56 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2673,12 +2673,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); |