Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mitigate crash that can occur when installed version is null #2278

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Mitigate crash that can occur when installed version is null #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/AppInstallerRepositoryCore/CompositeSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,11 @@ namespace AppInstaller::Repository
{
if (m_installedPackage)
{
return std::make_shared<CompositeInstalledVersion>(m_installedPackage->GetInstalledVersion(), m_trackingSource, m_overrideInstalledVersion);
auto installedVersion = m_installedPackage->GetInstalledVersion();
if (installedVersion)
{
return std::make_shared<CompositeInstalledVersion>(std::move(installedVersion), m_trackingSource, m_overrideInstalledVersion);
}
}

return {};
Expand Down Expand Up @@ -444,10 +448,14 @@ namespace AppInstaller::Repository
{
if (m_installedPackage && m_availablePackage)
{
auto installedType = Manifest::ConvertToInstallerTypeEnum(m_installedPackage->GetInstalledVersion()->GetMetadata()[PackageVersionMetadata::InstalledType]);
if (Manifest::DoesInstallerTypeSupportArpVersionRange(installedType))
auto installedVersion = m_installedPackage->GetInstalledVersion();
if (installedVersion)
{
m_overrideInstalledVersion = GetMappedInstalledVersion(m_installedPackage->GetInstalledVersion()->GetProperty(PackageVersionProperty::Version), m_availablePackage);
auto installedType = Manifest::ConvertToInstallerTypeEnum(installedVersion->GetMetadata()[PackageVersionMetadata::InstalledType]);
if (Manifest::DoesInstallerTypeSupportArpVersionRange(installedType))
{
m_overrideInstalledVersion = GetMappedInstalledVersion(installedVersion->GetProperty(PackageVersionProperty::Version), m_availablePackage);
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion src/AppInstallerRepositoryCore/Microsoft/Schema/1_0/Interface_1_0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ namespace AppInstaller::Repository::Microsoft::Schema::V1_0
// Get the last version in the list (the highest version) and its rowid
const std::string& latestVersion = versions.back().ToString();
versionIdOpt = VersionTable::SelectIdByValue(connection, latestVersion);

if (!versionIdOpt)
{
AICLI_LOG(Repo, Warning, << "Did not find a Version row for the latest version { " << latestVersion << " }");
}
}
else
{
Expand All @@ -109,7 +114,7 @@ namespace AppInstaller::Repository::Microsoft::Schema::V1_0

if (!versionIdOpt)
{
AICLI_LOG(Repo, Info, << "Did not find a Version { " << version << " }");
AICLI_LOG(Repo, Info, << "Did not find a Version for { " << version << " }");
return {};
}

Expand Down