Skip to content

Commit 5dcb36e

Browse files
committed
Fix snapshot crashes
We did not handle multiple components properly, add a contrib component to the test case.
1 parent f26a15a commit 5dcb36e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

apt-pkg/deb/debmetaindex.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,8 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type /*{{{*/
11581158
std::transform(Options.begin(), Options.end(), std::back_inserter(ret),
11591159
[](auto &&O) { return O.first; });
11601160
std::sort(ret.begin(), ret.end());
1161+
auto r = std::remove(ret.begin(), ret.end(), "SHADOWED");
1162+
ret.erase(r, ret.end());
11611163
return ret;
11621164
}
11631165

@@ -1315,7 +1317,7 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type /*{{{*/
13151317
std::string filename;
13161318

13171319
// The Release file and config based on that should be the ultimate source of truth.
1318-
if (ReleaseFileName(Deb, filename))
1320+
if (Deb && ReleaseFileName(Deb, filename))
13191321
{
13201322
auto OldDeb = dynamic_cast<debReleaseIndex *>(Deb->UnloadedClone());
13211323
if (not OldDeb->Load(filename, nullptr))

0 commit comments

Comments
 (0)