File PK-zypp-return-error-invalid-package-ids.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PK-zypp-return-error-invalid-package-ids.patch of Package PackageKit (Revision daaf8c7338a74f7802fca3ec3a4dcfd0)

Currently displaying revision daaf8c7338a74f7802fca3ec3a4dcfd0 , Show latest

From 6c97a7f05953e91b156fdb783e24357ed03b20c7 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathan121537@gmail.com>
Date: Mon, 7 Aug 2017 14:48:37 +0800
Subject: [PATCH] zypp: Return error if invalid package IDs are detected

---
 backends/zypp/pk-backend-zypp.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

Index: PackageKit-1.1.7/backends/zypp/pk-backend-zypp.cpp
===================================================================
--- PackageKit-1.1.7.orig/backends/zypp/pk-backend-zypp.cpp
+++ PackageKit-1.1.7/backends/zypp/pk-backend-zypp.cpp
@@ -1805,7 +1805,7 @@ pk_backend_destroy (PkBackend *backend)
 static bool
 zypp_is_no_solvable (const sat::Solvable &solv)
 {
-	return solv.id() == sat::detail::noSolvableId;
+	return solv == sat::Solvable::noSolvable;
 }
 
 /**
@@ -2111,6 +2111,13 @@ backend_get_details_thread (PkBackendJob
 
 		sat::Solvable solv = zypp_get_package_by_id( package_ids[i] );
 
+		if (zypp_is_no_solvable(solv)) {
+			// Previously stored package_id no longer matches any solvable.
+			zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
+						     "couldn't find package");
+			return;
+		}
+
 		ResObject::constPtr obj = make<ResObject>( solv );
 		if (obj == NULL) {
 			zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, 
@@ -2584,6 +2591,13 @@ backend_install_packages_thread (PkBacke
 		for (guint i = 0; package_ids[i]; i++) {
 			MIL << package_ids[i] << endl;
 			sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
+
+			if (zypp_is_no_solvable(solvable)) {
+				// Previously stored package_id no longer matches any solvable.
+				zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
+							     "couldn't find package");
+				return;
+			}
 			
 			to_install++;
 			PoolItem item(solvable);
@@ -3222,6 +3236,14 @@ backend_update_packages_thread (PkBacken
 
 	for (guint i = 0; package_ids[i]; i++) {
 		sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
+
+		if (zypp_is_no_solvable(solvable)) {
+			// Previously stored package_id no longer matches any solvable.
+			zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
+						     "couldn't find package");
+			return;
+		}
+
 		ui::Selectable::Ptr sel( ui::Selectable::get( solvable ));
 		
 		PoolItem item(solvable);

Places

File PK-zypp-return-error-invalid-package-ids.patch of Package PackageKit (Revision daaf8c7338a74f7802fca3ec3a4dcfd0)

Places