Skip to content

Commit f51bbcc

Browse files
committed
Merge branch 'PHP-7.4' into master
* PHP-7.4: Avoid segfault if module/extension version is not defined
2 parents a4c3aee + 15236fb commit f51bbcc

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2734,12 +2734,16 @@ static void accel_gen_system_id(void)
27342734
*/
27352735
ZEND_HASH_FOREACH_PTR(&module_registry, module) {
27362736
PHP_MD5Update(&context, module->name, strlen(module->name));
2737-
PHP_MD5Update(&context, module->version, strlen(module->version));
2737+
if (module->version != NULL) {
2738+
PHP_MD5Update(&context, module->version, strlen(module->version));
2739+
}
27382740
} ZEND_HASH_FOREACH_END();
27392741
extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
27402742
while (extension) {
27412743
PHP_MD5Update(&context, extension->name, strlen(extension->name));
2742-
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2744+
if (extension->version != NULL) {
2745+
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2746+
}
27432747
extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
27442748
}
27452749
PHP_MD5Final(digest, &context);

0 commit comments

Comments
 (0)