Skip to content

Commit 4e198c0

Browse files
committed
Avoid segfault if module/extension version is not defined
1 parent dfb3a79 commit 4e198c0

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
@@ -2710,12 +2710,16 @@ static void accel_gen_system_id(void)
27102710
*/
27112711
ZEND_HASH_FOREACH_PTR(&module_registry, module) {
27122712
PHP_MD5Update(&context, module->name, strlen(module->name));
2713-
PHP_MD5Update(&context, module->version, strlen(module->version));
2713+
if (module->version != NULL) {
2714+
PHP_MD5Update(&context, module->version, strlen(module->version));
2715+
}
27142716
} ZEND_HASH_FOREACH_END();
27152717
extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
27162718
while (extension) {
27172719
PHP_MD5Update(&context, extension->name, strlen(extension->name));
2718-
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2720+
if (extension->version != NULL) {
2721+
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2722+
}
27192723
extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
27202724
}
27212725
PHP_MD5Final(digest, &context);

0 commit comments

Comments
 (0)