From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 1 Sep 2020 12:16:14 +0000 (+0200)
Subject: Avoid null pointer UB in accel blacklist
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ff5b3df1cf95257752c00ffef752831c5abf193;p=php

Avoid null pointer UB in accel blacklist

Pretty annoying...
---

diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
index 889fcabd79..9ae897b521 100644
--- a/ext/opcache/zend_accelerator_blacklist.c
+++ b/ext/opcache/zend_accelerator_blacklist.c
@@ -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++;