Skip to content

Commit 15236fb

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

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
@@ -2673,12 +2673,16 @@ static void accel_gen_system_id(void)
26732673
*/
26742674
ZEND_HASH_FOREACH_PTR(&module_registry, module) {
26752675
PHP_MD5Update(&context, module->name, strlen(module->name));
2676-
PHP_MD5Update(&context, module->version, strlen(module->version));
2676+
if (module->version != NULL) {
2677+
PHP_MD5Update(&context, module->version, strlen(module->version));
2678+
}
26772679
} ZEND_HASH_FOREACH_END();
26782680
extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
26792681
while (extension) {
26802682
PHP_MD5Update(&context, extension->name, strlen(extension->name));
2681-
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2683+
if (extension->version != NULL) {
2684+
PHP_MD5Update(&context, extension->version, strlen(extension->version));
2685+
}
26822686
extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
26832687
}
26842688
PHP_MD5Final(digest, &context);

0 commit comments

Comments
 (0)