From d72f28015aab8ff3d9233b60a123030ce995fc76 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Tue, 7 May 2024 21:01:01 +0300 Subject: updater/mask: don't panic upon malformed files Signed-off-by: Arthur Zamarin --- pkg/portage/repository/deprecated.go | 3 +++ pkg/portage/repository/mask.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/portage/repository/deprecated.go b/pkg/portage/repository/deprecated.go index 594c553..ddc80a1 100644 --- a/pkg/portage/repository/deprecated.go +++ b/pkg/portage/repository/deprecated.go @@ -76,6 +76,9 @@ func parsePackagesDeprecated(entry string) { } else { reason = reason + " " + templ.EscapeString(strings.TrimPrefix(packageLine, "# ")) } + if len(packageLines) == 0 { + break + } packageLine, packageLines = packageLines[0], packageLines[1:] } diff --git a/pkg/portage/repository/mask.go b/pkg/portage/repository/mask.go index c6b500c..eddf8ec 100644 --- a/pkg/portage/repository/mask.go +++ b/pkg/portage/repository/mask.go @@ -120,6 +120,9 @@ func parsePackageMask(packageMask string) { } else { reason = reason + " " + templ.EscapeString(strings.TrimPrefix(packageMaskLine, "# ")) } + if len(packageMaskLines) == 0 { + break + } packageMaskLine, packageMaskLines = packageMaskLines[0], packageMaskLines[1:] } -- cgit v1.2.3-65-gdbad