!29 Upgrade to 1.4.6

From: @li-long315 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-04-28 01:53:15 +00:00 committed by Gitee
commit fd93b8bb13
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 7 additions and 59 deletions

View File

@ -1,27 +0,0 @@
From adf41f36cf7214d7d6fa8d528b74eba47c377405 Mon Sep 17 00:00:00 2001
From: Zero0one1 <arya_lee@qq.com>
Date: Fri, 2 Apr 2021 16:45:56 +0800
Subject: [PATCH] Fix a small memory leak in sqlite3_exec()
Fixes https://github.com/hughsie/colord/issues/110
Conflict:NA
Reference:https://github.com/hughsie/colord/commit/adf41f36cf7214d7d6fa8d528b74eba47c377405
---
src/cd-device-db.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cd-device-db.c b/src/cd-device-db.c
index a212c83d..3ae44ef2 100644
--- a/src/cd-device-db.c
+++ b/src/cd-device-db.c
@@ -91,7 +91,7 @@ cd_device_db_load (CdDeviceDb *ddb,
/* check properties version 2 */
rc = sqlite3_exec (priv->db, "SELECT * FROM properties_v2 LIMIT 1",
- NULL, NULL, &error_msg);
+ NULL, NULL, NULL);
if (rc != SQLITE_OK) {
statement = "CREATE TABLE properties_v2 ("
"device_id TEXT,"

View File

@ -1,25 +0,0 @@
From 1452a975ecae14299fb27d41522dfd32305481ce Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 13 Apr 2022 14:21:32 +0100
Subject: [PATCH] trivial: Fix a small memory leak on db open failure
Conflict:Using g_autofree will make the testcase fail, so here we use sqlite3_free to free the memory
Reference:https://github.com/hughsie/colord/commit/1452a975ecae14299fb27d41522dfd32305481ce
---
src/cd-profile-db.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/cd-profile-db.c b/src/cd-profile-db.c
index 5661d09..d6361ac 100644
--- a/src/cd-profile-db.c
+++ b/src/cd-profile-db.c
@@ -87,6 +87,7 @@ cd_profile_db_load (CdProfileDb *pdb,
"uid INTEGER,"
"value TEXT,"
"PRIMARY KEY (profile_id, property, uid));";
+ sqlite3_free (error_msg);
sqlite3_exec (priv->db, statement, NULL, NULL, NULL);
}
return TRUE;
--
2.33.0

Binary file not shown.

BIN
colord-1.4.6.tar.xz Normal file

Binary file not shown.

View File

@ -1,17 +1,14 @@
Name: colord
Version: 1.4.5
Release: 4
Version: 1.4.6
Release: 1
Summary: A system activated daemon
License: GPLv2+ and LGPLv2+
URL: https://www.freedesktop.org/software/colord/
Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
Patch6000: backport-0001-CVE-2021-42523.patch
Patch6001: backport-0002-CVE-2021-42523.patch
BuildRequires: color-filesystem dbus-devel docbook5-style-xsl gettext glib2-devel
BuildRequires: gobject-introspection-devel gtk-doc libgudev1-devel
BuildRequires: libxslt meson sqlite-devel systemd systemd-devel vala-tools
BuildRequires: gobject-introspection-devel gtk-doc libgudev1-devel sane-backends-devel
BuildRequires: libxslt meson sqlite-devel systemd systemd-devel vala bash-completion
BuildRequires: lcms2-devel >= 2.6 libgusb-devel >= 0.2.2 polkit-devel >= 0.103
Requires: color-filesystem %{name}-libs = %{version}-%{release}
@ -171,6 +168,9 @@ exit 0
%{_datadir}/man/man1/*.1.gz
%changelog
* Thu Feb 16 2023 lilong <lilong@kylinos.cn> - 1.4.6-1
- Upgrade to 1.4.6
* Wed Aug 31 2022 wangkerong <wangkerong@h-partners.com> - 1.4.5-4
- fix CVE-2021-42523