Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent crash in package search when index is broken

This commit is contained in:
Martchus 2022-04-19 00:24:31 +02:00
parent 1f3f0b0df1
commit 2ca6ce1eec
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
librepomgr/webapi/routes.cpp
View File

@ -268,6 +268,11 @@ void getPackages(const Params &params, ResponseHandler &&handler)
visitDb, [&](LibPkg::Database &db, std::string_view packageName, const std::function<PackageSpec(void)> &getPackage) {
if (packageName.find(name) != std::string_view::npos) {
const auto [packageID, package] = getPackage();
if (!package) {
cerr << Phrases::ErrorMessage << "Broken index in db \"" << db.name << "\": package \"" << packageName
<< "\" does not exist" << std::endl;
return false;
}
return pushPackage(db, packageID, package);
}
return false;
@ -283,6 +288,11 @@ void getPackages(const Params &params, ResponseHandler &&handler)
visitDb, [&](LibPkg::Database &db, std::string_view packageName, const std::function<PackageSpec(void)> &getPackage) {
if (std::regex_match(packageName.begin(), packageName.end(), regex)) {
const auto [packageID, package] = getPackage();
if (!package) {
cerr << Phrases::ErrorMessage << "Broken index in db \"" << db.name << "\": package \"" << packageName
<< "\" does not exist" << std::endl;
return false;
}
return pushPackage(db, packageID, package);
}
return false;