]> granicus.if.org Git - php/commitdiff
Avoid null pointer UB in accel blacklist
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 12:16:14 +0000 (14:16 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 12:43:06 +0000 (14:43 +0200)
Pretty annoying...

ext/opcache/zend_accelerator_blacklist.c

index 889fcabd798875f40181c3c780f61719b4726805..9ae897b521146e5d828bf7e061203373e4fea52b 100644 (file)
@@ -205,8 +205,11 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist)
 
 void zend_accel_blacklist_shutdown(zend_blacklist *blacklist)
 {
-       zend_blacklist_entry *p = blacklist->entries, *end = blacklist->entries + blacklist->pos;
+       if (!blacklist->entries) {
+               return;
+       }
 
+       zend_blacklist_entry *p = blacklist->entries, *end = blacklist->entries + blacklist->pos;
        while (p<end) {
                free(p->path);
                p++;