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

Fix potential segmentation fault

Browse Source 
(cherry picked from commit f88101bb97acde5d300a3827adfa56e601fd827b)
This commit is contained in:
renxichen 2023-09-26 02:22:40 +00:00 committed by openeuler-sync-bot
parent a12d66f74d
commit dcdcb2a278
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Generate-digest-lists.patch
View File

@ -4,8 +4,8 @@ Date: Thu, 12 Mar 2020 17:29:55 +0100
Subject: [PATCH 1/3] Generate digest lists Subject: [PATCH 1/3] Generate digest lists
--- ---
build/files.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++-- build/files.c | 179 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 169 insertions(+), 7 deletions(-) 1 file changed, 171 insertions(+), 7 deletions(-)
diff --git a/build/files.c b/build/files.c diff --git a/build/files.c b/build/files.c
index 6dfd801c8..ab6938d8c 100644 index 6dfd801c8..ab6938d8c 100644
@ -207,7 +207,7 @@ index 6dfd801c8..ab6938d8c 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
@@ -2556,6 +2652,58 @@ static void addPackageFileList (struct FileList_s *fl, Package pkg, @@ -2556,6 +2652,61 @@ static void addPackageFileList (struct FileList_s *fl, Package pkg,
argvFree(fileNames); argvFree(fileNames);
} }
@ -231,6 +231,9 @@ index 6dfd801c8..ab6938d8c 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.17.0 Version: 4.17.0
Release: 30 Release: 31
Summary: RPM Package Manager Summary: RPM Package Manager
License: GPLv2+ License: GPLv2+
URL: http://www.rpm.org/ URL: http://www.rpm.org/
@ -403,6 +403,9 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_mandir}/man1/gendiff.1* %{_mandir}/man1/gendiff.1*
%changelog %changelog
* Tue Sep 26 2023 renhongxun<renhongxun@h-partners.com> - 4.17.0-31
- Fix potential segmentation fault
* Fri Sep 08 2023 renhongxun<renhongxun@h-partners.com> - 4.17.0-30 * Fri Sep 08 2023 renhongxun<renhongxun@h-partners.com> - 4.17.0-30
- support _disable_auto_rebuilddb macro in posttrans - support _disable_auto_rebuilddb macro in posttrans