!37 [sync] PR-35: 【openEuler-22.03-LTS-SP1】Free constraint in error branch

From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
This commit is contained in:
openeuler-ci-bot 2024-11-05 02:51:42 +00:00 committed by Gitee
commit 816eda2778
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 55b474ee41034e7cec38cf7b739c2a5c5a7886c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Mon, 29 Apr 2024 18:39:01 +0200
Subject: [PATCH] mcstrans: free constraint in error branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Free constraint, like in all other error branches.
Reported-by: Cppcheck
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
---
mcstrans/src/mcstrans.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/mcstrans/src/mcstrans.c b/mcstrans/src/mcstrans.c
index fded3235..7667e131 100644
--- a/mcstrans/src/mcstrans.c
+++ b/mcstrans/src/mcstrans.c
@@ -477,6 +477,7 @@ add_constraint(char op, char *raw, char *tok) {
}
if (asprintf(&constraint->text, "%s%c%s", raw, op, tok) < 0) {
log_error("asprintf failed %s", strerror(errno));
+ free(constraint);
return -1;
}
constraint->op = op;
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: mcstrans
Version: 3.3
Release: 3
Release: 4
Summary: SELinux Translation Daemon
License: GPL2
URL: https://github.com/SELinuxProject/selinux/wiki
@ -8,6 +8,7 @@ Source: https://github.com/SELinuxProject/selinux/releases/download/3.3/
Patch0: backport-mcstrans-port-to-new-PCRE2-from-end-of-life-PCRE.patch
Patch1: backport-mcstrans-check-memory-allocations.patch
Patch2: backport-mcstrans-free-constraint-in-error-branch.patch
BuildRequires: gcc systemd-units make
BuildRequires: libselinux-devel >= %{version}
@ -43,6 +44,7 @@ mcstrans-help include help files for man page
%setup -q
%patch0 -p2
%patch1 -p2
%patch2 -p2
%build
%set_build_flags
@ -92,6 +94,9 @@ rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/mcstrans
%{_mandir}/ru/man8/*.8.gz
%changelog
* Wed Oct 23 2024 yixiangzhike <yixiangzhike007@163.com> - 3.3-4
- backport upstream patch to free constraint in error branch
* Mon Jul 8 2024 yixiangzhike <yixiangzhike007@163.com> - 3.3-3
- backport upstream patch to avoid NULL dereferences