From ed44f70d9001957f71f6d23eafbc72a0acbec15c Mon Sep 17 00:00:00 2001 From: liweiganga Date: Mon, 12 Dec 2022 11:18:38 +0800 Subject: [PATCH] sync upstream patch (cherry picked from commit 8c4c5b75932415f46caa13262506a81732c7bbfc) --- ...uickly-second-segmentation-violation.patch | 27 +++++++++++++++++++ lftp.spec | 11 ++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch diff --git a/backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch b/backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch new file mode 100644 index 0000000..5ae2f8e --- /dev/null +++ b/backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch @@ -0,0 +1,27 @@ +From cb80e261acad0c17acaf4b4f51b7a66e4d038bda Mon Sep 17 00:00:00 2001 +From: Rimsky <349157738@qq.com> +Date: Tue, 9 Aug 2022 13:15:45 +0800 +Subject: [PATCH] fill verify_fn for quickly second segmentation violation + +--- + src/GetFileInfo.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/GetFileInfo.cc b/src/GetFileInfo.cc +index b553544c..bbcf51c0 100644 +--- a/src/GetFileInfo.cc ++++ b/src/GetFileInfo.cc +@@ -398,6 +398,10 @@ int GetFileInfo::Do() + * also serves as a last attempt to see if the file exists--we + * only get here if everything else thinks the path doesn't exist. + */ ++ ++ if(!verify_fn) ++ MakeVerifyFileName(); ++ + FileInfo *fi=new FileInfo(verify_fn); + fi->need=need; + /* We need to do at least one. */ +-- +2.20.1 + diff --git a/lftp.spec b/lftp.spec index fdb285d..231f6b2 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp Version: 4.9.2 -Release: 3 +Release: 4 License: GPLv3+ URL: http://lftp.yar.ru/ Source0: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz @@ -11,7 +11,8 @@ BuildRequires: chrpath Patch0: lftp-4.0.9-date_fmt.patch Patch1: Quit-while-source-file-increased.patch -Patch2: backport-fill-verify_fn-in-case-of-cd-error-fix-650.patch +Patch2: backport-fill-verify_fn-in-case-of-cd-error-fix-650.patch +Patch3: backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch %description LFTP is a sophisticated file transfer program supporting a number of @@ -85,6 +86,12 @@ echo "%{_libdir}/lftp/%{version}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arc %changelog +* Mon Dec 12 2022 liweiganga - 4.9.2-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fill verify_fn for quickly second segmentation violation + * Thu Jul 14 2022 rimsky <349157738@qq.com> - 4.9.2-3 - Type:bugfix - ID:NA