packages/rpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!278 Fix potential segmentation fault

Browse Source 
From: @renxichen 
Reviewed-by: @ZhouShuiQing, @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2023-09-26 03:24:41 +00:00 committed by Gitee
commit e6bd442b19
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Add-IMA-digest-list-support.patch
View File

@ -4,14 +4,14 @@ Date: Fri, 16 Jun 2023 11:35:21 +0800
Subject: [PATCH] Add IMA digest list support Subject: [PATCH] Add IMA digest list support
--- ---
build/files.c | 302 ++++++++++++++++++++++++++++++++++++++-- build/files.c | 305 ++++++++++++++++++++++++++++++++++++++--
build/parsePreamble.c | 3 +- build/parsePreamble.c | 3 +-
macros.in | 1 + macros.in | 1 +
plugins/Makefile.am | 4 + plugins/Makefile.am | 4 +
plugins/selinux.c | 3 +- plugins/selinux.c | 3 +-
rpmio/rpmpgp_internal.c | 32 +---- rpmio/rpmpgp_internal.c | 32 +----
rpmio/rpmpgp_internal.h | 29 ++++ rpmio/rpmpgp_internal.h | 29 ++++
7 files changed, 333 insertions(+), 41 deletions(-) 7 files changed, 336 insertions(+), 41 deletions(-)
diff --git a/build/files.c b/build/files.c diff --git a/build/files.c b/build/files.c
index eb008ab..3fc3551 100644 index eb008ab..3fc3551 100644
@ -337,7 +337,7 @@ index eb008ab..3fc3551 100644
/** /**
* Add directory (and all of its files) to the package manifest. * Add directory (and all of its files) to the package manifest.
* @param fl package file tree walk data * @param fl package file tree walk data
@@ -2584,6 +2796,58 @@ static void addPackageFileList (struct FileList_s *fl, Package pkg, @@ -2584,6 +2796,61 @@ static void addPackageFileList (struct FileList_s *fl, Package pkg,
argvFree(fileNames); argvFree(fileNames);
} }
@ -361,6 +361,9 @@ index eb008ab..3fc3551 100644
+ if (!(s && *s)) + if (!(s && *s))
+ goto exit; + goto exit;
+ +
+ if (!strchr(binRpm, '/'))
+ goto exit;
+
+ av_brp[2] = strchr(binRpm, '/') + 1; + av_brp[2] = strchr(binRpm, '/') + 1;
+ rpmlog(RPMLOG_NOTICE, _("Generating digest list: %s\n"), s); + rpmlog(RPMLOG_NOTICE, _("Generating digest list: %s\n"), s);
+ +

5
rpm.spec
View File

@ -1,6 +1,6 @@
Name: rpm Name: rpm
Version: 4.18.1 Version: 4.18.1
Release: 8 Release: 9
Summary: RPM Package Manager Summary: RPM Package Manager
License: GPLv2+ License: GPLv2+
URL: http://www.rpm.org/ URL: http://www.rpm.org/
@ -327,6 +327,9 @@ make clean
%exclude %{_mandir}/man8/rpmspec.8.gz %exclude %{_mandir}/man8/rpmspec.8.gz
%changelog %changelog
* Tue Sep 26 2023 renhongxun<renhongxun@h-partners.com> - 4.18.1-9
- Fix potential segmentation fault
* Fri Sep 08 2023 renhongxun<renhongxun@h-partners.com> - 4.18.1-8 * Fri Sep 08 2023 renhongxun<renhongxun@h-partners.com> - 4.18.1-8
- support _disable_auto_rebuilddb macro in posttrans - support _disable_auto_rebuilddb macro in posttrans