com web/php: Guard against security eol date not found: distributions include/branches.inc

Commit: 527e1f4a06f95251e3264d696145f11f70c25843 Author: Sara Golemon <pollita@php.net> Thu, 7 Jan 2021 18:15:50 +0000 Parents: 496b7de5af4110a48a680d26d916708e7e66b821 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=527e1f4a06f95251e3264d696145f11f70c25843 Log: Guard against security eol date not found Changed paths: M distributions M include/branches.inc Diff: diff --git a/distributions b/distributions index 7e88f1d56..0bda8fb4c 160000 --- a/distributions +++ b/distributions @@ -1 +1 @@ -Subproject commit 7e88f1d561e8f56a1501d71b630e849022502ef1 +Subproject commit 0bda8fb4cb43cb37e68b05d87378b5d8c3a361b6 diff --git a/include/branches.inc b/include/branches.inc index 589404f75..cca5b8575 100644 --- a/include/branches.inc +++ b/include/branches.inc @@ -133,10 +133,14 @@ function get_active_branches($include_recent_eols = true) { foreach ($GLOBALS['RELEASES'] as $major => $releases) { foreach ($releases as $version => $release) { if ($branch = version_number_to_branch($version)) { - $threshold = get_branch_security_eol_date($branch); - if ($include_recent_eols) { - $threshold->add($GLOBALS['KEEP_EOL']); - } + $threshold = get_branch_security_eol_date($branch); + if ($threshold === null) { + // No EOL date available, assume it is ancient. + continue; + } + if ($include_recent_eols) { + $threshold->add($GLOBALS['KEEP_EOL']); + } if ($now < $threshold) { $branches[$major][$branch] = $release; $branches[$major][$branch]['version'] = $version;