开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

_service:extract_file:zstd.spec Deleted

@@ -1,158 +0,0 @@
-%bcond_without pzstd
-
-Name:            zstd
-Version:         1.5.2
-Release:	 1
-Summary:         A fast lossless compression algorithm
-License:         BSD and GPLv2
-URL:             https://github.com/facebook/zstd
-Source0:         https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-BuildRequires:   gtest-devel gcc-c++ pkg-config
-
-Provides:        libzstd
-Obsoletes:       libzstd
-
-%description
-Zstd is a fast lossless compression algorithm. It's backed by a very fast entropy stage,
-provided by Huff0 and FSE library. It's a real-time compression scenario for zlib levels
-and has a better compression ratio.
-
-%package         devel
-Summary:         Header files for zstd library
-Requires:        %{name} = %{version}-%{release}
-Provides:        libzstd-devel
-Obsoletes:       libzstd-devel
-
-%description     devel
-This package contains the header files for zstd library.
-
-%package         help
-Summary:         Help documentation related to zstd
-BuildArch:       noarch
-
-%description     help
-This package includes help documentation and manuals related to zstd.
-
-%prep
-%autosetup -p1
-
-%build
-export CFLAGS="$RPM_OPT_FLAGS"
-export LDFLAGS="$RPM_LD_FLAGS"
-for dir in lib programs; do
-  %make_build -C "$dir"
-done
-%if %{with pzstd}
-%make_build -C contrib/pzstd CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
-%endif
-
-%check
-make -C tests test
-%if %{with pzstd}
-make -C contrib/pzstd test CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
-%endif
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%install
-%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
-%if %{with pzstd}
-install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
-install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1
-%endif
-
-%files
-%doc CHANGELOG README.md
-%license LICENSE COPYING
-%{_bindir}/*
-
-%{_libdir}/libzstd.so.*
-
-%exclude %{_bindir}/%{name}less
-%exclude %{_bindir}/%{name}grep
-%exclude %{_libdir}/libzstd.a
-
-%files devel
-%{_includedir}/*.h
-
-%{_libdir}/pkgconfig/libzstd.pc
-%{_libdir}/libzstd.so
-
-%files help
-%{_mandir}/man1/*.1*
-
-%changelog
-* Thu Apr 14 2022 YukariChiba <i@0x7f.cc> - 1.5.2-1
-- Upgrade version to 1.5.2
-
-* Wed Dec 15 2021 liushiyuan <liushiyuan2@huawei.com> - 1.5.0.17
-* fix test-pool result print
-
-* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.16
-* fix Add missing bounds checks during compression
-
-* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.15
-* Z_PREFIX zError function
-
-* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.14
-* Fix progress flag to properly control progress display and default
-
-* Mon Dec 13 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.13
-* fix entropy repeat mode bug
-
-* Mon Dec 13 2021 liushiyuan <liushiyuan2@huawei.com> - 1.5.0.12
-* add test c result print
-
-* Mon Dec 06 2021 helei <helei28@huawei.com> - 1.5.0.11
-* fix extra newline gets printes out when compressing multiple files
-
-* Fri Dec 03 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.10
-* add test case
-
-* Mon Nov 22 2021 wangshenglong <wangshenglong7@hauwei.com> - 1.5.0.9
-* fix a determinism bug with the DUBT
-
-* Thu Nov 18 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.8
-* add test case survive a list of files which long file name length
-
-* Tue Nov 16 2021 zhangying <zhangying103@huawei.com> - 1.5.0.7
-* run the complete test case on ci
-
-* Tue Nov 16 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.6
-* Limit train smaples
-
-* Mon Nov 15 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.5
-* make the test in all archtectures
-
-* Mon Nov 08 2021 zhangying <zhangying103@huawei.com> - 1.5.0-4
-* remove invalid test
-
-* Wed Nov 03 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0-3
-* add tests - solve the  modification time is set to the compression time
-
-* Mon Oct 25 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0-2
-* solve the  modification time is set to the compression time
-
-* Wed Aug 04 2021 shixuantong <shixuantong@huawei.com> - 1.5.0-1
-- upgrade version to 1.5.0
-
-* Tue Mar 16 2021 shixuantong <shixuantong@huawei.com> - 1.4.8-2
-- fix CVE-2021-24032
-
-* Thu Jan 28 2021 liudabo <liudabo1@huawei.com> - 1.4.8-1
-- upgrade version to 1.4.8 
-
-* Sat Jun 20 2020 maqiang<maqiang42@huawei.com> -1.4.5
-- Type:Update 
-- ID:
-- SUG:NA
-- DESC:Update to version 1.4.5
-
-* Mon Jan 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.6-3
-- Delete useless files.
-
-* Sun Sep 15 2019 dongjian <dongjian13@huawei.com> - 1.3.6-2
-- Modification summary

_service:tar_scm:zstd.spec Added

@@ -0,0 +1,169 @@
+%bcond_without pzstd
+
+Name:            zstd
+Version:         1.5.2
+Release:         2
+Summary:         A fast lossless compression algorithm
+License:         BSD and GPLv2
+URL:             https://github.com/facebook/zstd
+Source0:         https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+Patch6000:       backport-0001-CVE-2022-4899.patch
+Patch6001:       backport-0002-CVE-2022-4899.patch
+
+Patch9000:       add-test-c-result-print.patch
+
+BuildRequires:   gtest-devel gcc-c++ pkg-config
+
+Provides:        libzstd
+Obsoletes:       libzstd
+
+%description
+Zstd is a fast lossless compression algorithm. It's backed by a very fast entropy stage,
+provided by Huff0 and FSE library. It's a real-time compression scenario for zlib levels
+and has a better compression ratio.
+
+%package         devel
+Summary:         Header files for zstd library
+Requires:        %{name} = %{version}-%{release}
+Provides:        libzstd-devel
+Obsoletes:       libzstd-devel
+
+%description     devel
+This package contains the header files for zstd library.
+
+%package         help
+Summary:         Help documentation related to zstd
+BuildArch:       noarch
+
+%description     help
+This package includes help documentation and manuals related to zstd.
+
+%prep
+%autosetup -p1
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
+for dir in lib programs; do
+  %make_build -C "$dir"
+done
+%if %{with pzstd}
+%make_build -C contrib/pzstd CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
+%endif
+
+%check
+make -C tests test
+%if %{with pzstd}
+make -C contrib/pzstd test CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
+%endif
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%install
+%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
+%if %{with pzstd}
+install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
+install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1
+%endif
+
+%files
+%doc CHANGELOG README.md
+%license LICENSE COPYING
+%{_bindir}/*
+
+%{_libdir}/libzstd.so.*
+
+%exclude %{_bindir}/%{name}less
+%exclude %{_bindir}/%{name}grep
+%exclude %{_libdir}/libzstd.a
+
+%files devel
+%{_includedir}/*.h
+
+%{_libdir}/pkgconfig/libzstd.pc
+%{_libdir}/libzstd.so
+
+%files help
+%{_mandir}/man1/*.1*
+
+%changelog
+* Mon Apr 3 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.5.2.2
+* fix CVE-2022-4899
+
+* Tue Jan 31 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.5.2.1
+* zstd update to 1.5.2
+
+* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.5.0.18
+* rebuild for next release
+
+* Wed Dec 15 2021 liushiyuan <liushiyuan2@huawei.com> - 1.5.0.17
+* fix test-pool result print
+
+* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.16
+* fix Add missing bounds checks during compression
+
+* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.15
+* Z_PREFIX zError function
+
+* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.14
+* Fix progress flag to properly control progress display and default
+
+* Mon Dec 13 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.13
+* fix entropy repeat mode bug
+
+* Mon Dec 13 2021 liushiyuan <liushiyuan2@huawei.com> - 1.5.0.12
+* add test c result print
+
+* Mon Dec 06 2021 helei <helei28@huawei.com> - 1.5.0.11
+* fix extra newline gets printes out when compressing multiple files
+
+* Fri Dec 03 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.10
+* add test case
+
+* Mon Nov 22 2021 wangshenglong <wangshenglong7@hauwei.com> - 1.5.0.9
+* fix a determinism bug with the DUBT
+
+* Thu Nov 18 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.8
+* add test case survive a list of files which long file name length
+
+* Tue Nov 16 2021 zhangying <zhangying103@huawei.com> - 1.5.0.7
+* run the complete test case on ci
+
+* Tue Nov 16 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.6
+* Limit train smaples
+
+* Mon Nov 15 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.5
+* make the test in all archtectures
+
+* Mon Nov 08 2021 zhangying <zhangying103@huawei.com> - 1.5.0-4
+* remove invalid test
+
+* Wed Nov 03 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0-3
+* add tests - solve the  modification time is set to the compression time
+
+* Mon Oct 25 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0-2
+* solve the  modification time is set to the compression time
+
+* Wed Aug 04 2021 shixuantong <shixuantong@huawei.com> - 1.5.0-1
+- upgrade version to 1.5.0
+
+* Tue Mar 16 2021 shixuantong <shixuantong@huawei.com> - 1.4.8-2
+- fix CVE-2021-24032
+
+* Thu Jan 28 2021 liudabo <liudabo1@huawei.com> - 1.4.8-1
+- upgrade version to 1.4.8 
+
+* Sat Jun 20 2020 maqiang<maqiang42@huawei.com> -1.4.5
+- Type:Update 
+- ID:
+- SUG:NA
+- DESC:Update to version 1.4.5
+
+* Mon Jan 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.6-3
+- Delete useless files.
+
+* Sun Sep 15 2019 dongjian <dongjian13@huawei.com> - 1.3.6-2
+- Modification summary

_service:tar_scm:add-test-c-result-print.patch Added

@@ -0,0 +1,521 @@
+From 7409f10fed50978ad5dff36540dc0a7aae688688 Mon Sep 17 00:00:00 2001
+From: zhangying <zhangying103@huawei.com>
+Date: Thu, 2 Feb 2023 14:59:55 +0800
+Subject: PATCH zstd-add-test-c-result-print.patch
+
+Displays statistics about the execution of all zstd test cases.
+---
+ tests/decodecorpus.c        | 17 +++++++++--
+ tests/fullbench.c           | 61 ++++++++++++++++++++++++++++++++++---
+ tests/fuzzer.c              | 16 ++++++++++
+ tests/invalidDictionaries.c | 10 ++++++
+ tests/legacy.c              | 10 ++++--
+ tests/playTests.sh          |  2 ++
+ tests/poolTests.c           | 24 ++++++++++++---
+ tests/zstreamtest.c         | 18 +++++++++++
+ 8 files changed, 144 insertions(+), 14 deletions(-)
+
+diff --git a/tests/decodecorpus.c b/tests/decodecorpus.c
+index 1037a36..5d053aa 100644
+--- a/tests/decodecorpus.c
++++ b/tests/decodecorpus.c
+@@ -1538,6 +1538,7 @@ static int runTestMode(U32 seed, unsigned numFiles, unsigned const testDurationS
+ 
+     if (numFiles == 0 && !testDurationS) numFiles = 1;
+ 
++    DISPLAY("==== test/decodecorpus/runTestMode ====\n");
+     DISPLAY("seed: %u\n", (unsigned)seed);
+ 
+     for (fnum = 0; fnum < numFiles || UTIL_clockSpanMicro(startClock) < maxClockSpan; fnum++) {
+@@ -1549,12 +1550,13 @@ static int runTestMode(U32 seed, unsigned numFiles, unsigned const testDurationS
+         {   int const ret = (genType == gt_frame) ?
+                             runFrameTest(&seed) :
+                             runBlockTest(&seed);
+-            if (ret) return ret;
++            if (ret) {DISPLAY("==== results: passed: 0/1, failed: 1/1, skipped: 0/1 ====\n");return ret;}
+         }
+     }
+ 
+     DISPLAY("\r%u tests completed: ", fnum);
+     DISPLAY("OK\n");
++    DISPLAY("==== results: passed: 1/1, failed: 0/1, skipped: 0/1 ====\n");
+ 
+     return 0;
+ }
+@@ -1568,6 +1570,7 @@ static int generateFile(U32 seed, const char* const path,
+ {
+     frame_t fr;
+ 
++    DISPLAY("==== test/decodecorpus/gerenateFile ====\n");
+     DISPLAY("seed: %u\n", (unsigned)seed);
+ 
+     {   dictInfo const info = initDictInfo(0, 0, NULL, 0);
+@@ -1581,6 +1584,7 @@ static int generateFile(U32 seed, const char* const path,
+     if (origPath) {
+         outputBuffer(fr.srcStart, (BYTE*)fr.src - (BYTE*)fr.srcStart, origPath);
+     }
++    DISPLAY("==== results: passed: 1/1, failed: 0/1, skipped: 0/1 ====\n");
+     return 0;
+ }
+ 
+@@ -1590,6 +1594,7 @@ static int generateCorpus(U32 seed, unsigned numFiles, const char* const path,
+     char outPathMAX_PATH;
+     unsigned fnum;
+ 
++    DISPLAY("==== test/decodecorpus/generateCorpus ====\n");
+     DISPLAY("seed: %u\n", (unsigned)seed);
+ 
+     for (fnum = 0; fnum < numFiles; fnum++) {
+@@ -1607,6 +1612,7 @@ static int generateCorpus(U32 seed, unsigned numFiles, const char* const path,
+ 
+         if (snprintf(outPath, MAX_PATH, "%s/z%06u.zst", path, fnum) + 1 > MAX_PATH) {
+             DISPLAY("Error: path too long\n");
++	    DISPLAY("==== results: passed: 0/1, failed: 1/1, skipped: 0/1 ====\n");
+             return 1;
+         }
+         outputBuffer(fr.dataStart, (BYTE*)fr.data - (BYTE*)fr.dataStart, outPath);
+@@ -1614,6 +1620,7 @@ static int generateCorpus(U32 seed, unsigned numFiles, const char* const path,
+         if (origPath) {
+             if (snprintf(outPath, MAX_PATH, "%s/z%06u", origPath, fnum) + 1 > MAX_PATH) {
+                 DISPLAY("Error: path too long\n");
++		DISPLAY("==== results: passed: 0/1, failed: 1/1, skipped: 0/1 ====\n");
+                 return 1;
+             }
+             outputBuffer(fr.srcStart, (BYTE*)fr.src - (BYTE*)fr.srcStart, outPath);
+@@ -1621,7 +1628,7 @@ static int generateCorpus(U32 seed, unsigned numFiles, const char* const path,
+     }
+ 
+     DISPLAY("\r%u/%u      \n", fnum, numFiles);
+-
++    DISPLAY("==== results: passed: 1/1, failed: 0/1, skipped: 0/1 ====\n");
+     return 0;
+ }
+ 
+@@ -1634,8 +1641,11 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const
+     U32 const dictID = RAND(&seed);
+     int errorDetected = 0;
+ 
++    DISPLAY("==== test/decodecorpus/generateCorpusWithDict ====\n");
++
+     if (snprintf(outPath, MAX_PATH, "%s/dictionary", path) + 1 > MAX_PATH) {
+         DISPLAY("Error: path too long\n");
++	DISPLAY("==== results: passed: 0/1, failed: 1/1, skipped: 0/1 ====\n");
+         return 1;
+     }
+ 
+@@ -1643,6 +1653,7 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const
+     fullDict = malloc(dictSize);
+     if (fullDict == NULL) {
+         DISPLAY("Error: could not allocate space for full dictionary.\n");
++	DISPLAY("==== results: passed: 0/1, failed: 1/1, skipped: 0/1 ====\n");
+         return 1;
+     }
+ 
+@@ -1711,6 +1722,8 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const
+     }
+ 
+ dictCleanup:
++    DISPLAY("==== results: passed: %d/1, failed: %d/1, skipped: 0/1 ====\n",
++           (1-errorDetected), errorDetected);
+     free(fullDict);
+     return errorDetected;
+ }
+diff --git a/tests/fullbench.c b/tests/fullbench.c
+index b55ff76..3a6ce2b 100644
+--- a/tests/fullbench.c
++++ b/tests/fullbench.c
+@@ -500,7 +500,7 @@ static int benchMem(unsigned benchNb,
+         benchFunction = local_ZSTD_compress_generic_T2_end; benchName = "compress_generic, -T2, end";
+         break;
+     default :
+-        return 0;
++        return -1;
+     }
+ 
+     /* Allocation */
+@@ -700,8 +700,15 @@ static int benchSample(U32 benchNb,
+                        size_t benchedSize, double compressibility,
+                        int cLevel, ZSTD_compressionParameters cparams)
+ {
++    int ret = 0;
++    int testOk = 0;
++    int testEr = 0;
++
+     /* Allocation */
+     void* const origBuff = malloc(benchedSize);
++
++    DISPLAY("==== test/fullbench/benchSamplecompressibility:%f ====\n", compressibility);   
++
+     if (!origBuff) { DISPLAY("\nError: not enough memory!\n"); return 12; }
+ 
+     /* Fill buffer */
+@@ -711,12 +718,31 @@ static int benchSample(U32 benchNb,
+     DISPLAY("\r%70s\r", "");
+     DISPLAY(" Sample %u bytes : \n", (unsigned)benchedSize);
+     if (benchNb) {
+-        benchMem(benchNb, origBuff, benchedSize, cLevel, cparams);
++        ret = benchMem(benchNb, origBuff, benchedSize, cLevel, cparams);
++	if ( 0 == ret )
++	{
++	    testOk++;
++	}
++	else if ( 1 == ret )
++	{
++	    testEr++;
++	}
+     } else {  /* 0 == run all tests */
+         for (benchNb=0; benchNb<100; benchNb++) {
+-            benchMem(benchNb, origBuff, benchedSize, cLevel, cparams);
++            ret = benchMem(benchNb, origBuff, benchedSize, cLevel, cparams);
++	    if ( 0 == ret )
++	    {
++	        testOk++;
++	    }
++	    else if ( 1 == ret )
++	    {
++	        testEr++;
++	    }
+     }   }
+ 
++    DISPLAY("==== results: passed: %d/%d, failed: %d/%d, skipped: 0/%d ====\n",
++	    testOk, (testOk+testEr), testEr, (testOk+testEr), (testOk+testEr));
++
+     free(origBuff);
+     return 0;
+ }
+@@ -728,6 +754,12 @@ static int benchFiles(U32 benchNb,
+ {
+     /* Loop for each file */
+     int fileIdx;
++    int ret = 0;
++    int testOk = 0;
++    int testEr = 0;
++
++    DISPLAY("==== test/fullbench/benchFiles ====\n");
++
+     for (fileIdx=0; fileIdx<nbFiles; fileIdx++) {
+         const char* const inFileName = fileNamesTablefileIdx;
+         FILE* const inFile = fopen( inFileName, "rb" );
+@@ -769,15 +801,34 @@ static int benchFiles(U32 benchNb,

_service:tar_scm:backport-0001-CVE-2022-4899.patch Added

@@ -0,0 +1,85 @@
+From f9f27de91c89d826c6a39c3ef44fb1b02f9a43aa Mon Sep 17 00:00:00 2001
+From: Elliot Gorokhovsky <embg@fb.com>
+Date: Fri, 29 Jul 2022 14:44:22 -0700
+Subject: PATCH Disallow empty output directory
+
+Reference:https://github.com/facebook/zstd/commit/f9f27de91c89d826c6a39c3ef44fb1b02f9a43aa
+Conflict:NA
+---
+ programs/zstdcli.c                             | 18 ++++++++++++++++--
+ tests/cli-tests/basic/output_dir.sh            |  7 +++++++
+ .../cli-tests/basic/output_dir.sh.stderr.exact |  2 ++
+ .../cli-tests/basic/output_dir.sh.stdout.exact |  2 ++
+ 4 files changed, 27 insertions(+), 2 deletions(-)
+ create mode 100755 tests/cli-tests/basic/output_dir.sh
+ create mode 100644 tests/cli-tests/basic/output_dir.sh.stderr.exact
+ create mode 100644 tests/cli-tests/basic/output_dir.sh.stdout.exact
+
+diff --git a/programs/zstdcli.c b/programs/zstdcli.c
+index bfe18c0..50ef3ba 100644
+--- a/programs/zstdcli.c
++++ b/programs/zstdcli.c
+@@ -990,7 +990,14 @@ int main(int argCount, const char* argv)
+                 if (longCommandWArg(&argument, "--stream-size=")) { streamSrcSize = readSizeTFromChar(&argument); continue; }
+                 if (longCommandWArg(&argument, "--target-compressed-block-size=")) { targetCBlockSize = readSizeTFromChar(&argument); continue; }
+                 if (longCommandWArg(&argument, "--size-hint=")) { srcSizeHint = readSizeTFromChar(&argument); continue; }
+-                if (longCommandWArg(&argument, "--output-dir-flat")) { NEXT_FIELD(outDirName); continue; }
++                if (longCommandWArg(&argument, "--output-dir-flat")) {
++                    NEXT_FIELD(outDirName);
++                    if (strlen(outDirName) == 0) {
++                        DISPLAY("error: output dir cannot be empty string (did you mean to pass '.' instead?)\n");
++                        CLEAN_RETURN(1);
++                    }
++                    continue;
++                }
+ #ifdef ZSTD_MULTITHREAD
+                 if (longCommandWArg(&argument, "--auto-threads")) {
+                     const char* threadDefault = NULL;
+@@ -1001,7 +1008,14 @@ int main(int argCount, const char* argv)
+                 }
+ #endif
+ #ifdef UTIL_HAS_MIRRORFILELIST
+-                if (longCommandWArg(&argument, "--output-dir-mirror")) { NEXT_FIELD(outMirroredDirName); continue; }
++                if (longCommandWArg(&argument, "--output-dir-mirror")) {
++                    NEXT_FIELD(outMirroredDirName);
++                    if (strlen(outMirroredDirName) == 0) {
++                        DISPLAY("error: output dir cannot be empty string (did you mean to pass '.' instead?)\n");
++                        CLEAN_RETURN(1);
++                    }
++                    continue;
++                }
+ #endif
+ #ifndef ZSTD_NOTRACE
+                 if (longCommandWArg(&argument, "--trace")) { char const* traceFile; NEXT_FIELD(traceFile); TRACE_enable(traceFile); continue; }
+diff --git a/tests/cli-tests/basic/output_dir.sh b/tests/cli-tests/basic/output_dir.sh
+new file mode 100755
+index 0000000..a8819d2
+--- /dev/null
++++ b/tests/cli-tests/basic/output_dir.sh
+@@ -0,0 +1,7 @@
++#!/bin/sh
++
++println "+ zstd -r * --output-dir-mirror=\"\""
++zstd -r * --output-dir-mirror="" && die "Should not allow empty output dir!"
++println "+ zstd -r * --output-dir-flat=\"\""
++zstd -r * --output-dir-flat="" && die "Should not allow empty output dir!"
++exit 0
+diff --git a/tests/cli-tests/basic/output_dir.sh.stderr.exact b/tests/cli-tests/basic/output_dir.sh.stderr.exact
+new file mode 100644
+index 0000000..e12b504
+--- /dev/null
++++ b/tests/cli-tests/basic/output_dir.sh.stderr.exact
+@@ -0,0 +1,2 @@
++error: output dir cannot be empty string (did you mean to pass '.' instead?)
++error: output dir cannot be empty string (did you mean to pass '.' instead?)
+diff --git a/tests/cli-tests/basic/output_dir.sh.stdout.exact b/tests/cli-tests/basic/output_dir.sh.stdout.exact
+new file mode 100644
+index 0000000..1e478cd
+--- /dev/null
++++ b/tests/cli-tests/basic/output_dir.sh.stdout.exact
+@@ -0,0 +1,2 @@
+++ zstd -r * --output-dir-mirror=""
+++ zstd -r * --output-dir-flat=""
+-- 
+2.27.0
+

_service:tar_scm:backport-0002-CVE-2022-4899.patch Added

@@ -0,0 +1,63 @@
+From e1873ad576cb478fff0e6e44ad99599cd5fd2846 Mon Sep 17 00:00:00 2001
+From: Elliot Gorokhovsky <embg@fb.com>
+Date: Fri, 29 Jul 2022 11:10:47 -0700
+Subject: PATCH Fix buffer underflow for null dir1
+
+---
+ programs/util.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/programs/util.c b/programs/util.c
+index f53eb03fbe..b874344c4d 100644
+--- a/programs/util.c
++++ b/programs/util.c
+@@ -870,30 +870,30 @@ static const char * trimPath(const char *pathname)
+ 
+ static char* mallocAndJoin2Dir(const char *dir1, const char *dir2)
+ {
+-    const size_t dir1Size = strlen(dir1);
+-    const size_t dir2Size = strlen(dir2);
+-    char *outDirBuffer, *buffer, trailingChar;
+-
+     assert(dir1 != NULL && dir2 != NULL);
+-    outDirBuffer = (char *) malloc(dir1Size + dir2Size + 2);
+-    CONTROL(outDirBuffer != NULL);
++    {   const size_t dir1Size = strlen(dir1);
++        const size_t dir2Size = strlen(dir2);
++        char *outDirBuffer, *buffer;
+ 
+-    memcpy(outDirBuffer, dir1, dir1Size);
+-    outDirBufferdir1Size = '\0';
++        outDirBuffer = (char *) malloc(dir1Size + dir2Size + 2);
++        CONTROL(outDirBuffer != NULL);
+ 
+-    if (dir20 == '.')
+-        return outDirBuffer;
++        memcpy(outDirBuffer, dir1, dir1Size);
++        outDirBufferdir1Size = '\0';
+ 
+-    buffer = outDirBuffer + dir1Size;
+-    trailingChar = *(buffer - 1);
+-    if (trailingChar != PATH_SEP) {
+-        *buffer = PATH_SEP;
+-        buffer++;
+-    }
+-    memcpy(buffer, dir2, dir2Size);
+-    bufferdir2Size = '\0';
++        if (dir20 == '.')
++            return outDirBuffer;
+ 
+-    return outDirBuffer;
++        buffer = outDirBuffer + dir1Size;
++        if (dir1Size > 0 && *(buffer - 1) != PATH_SEP) {
++            *buffer = PATH_SEP;
++            buffer++;
++        }
++        memcpy(buffer, dir2, dir2Size);
++        bufferdir2Size = '\0';
++
++        return outDirBuffer;
++    }
+ }
+ 
+ /* this function will return NULL if input srcFileName is not valid name for mirrored output path */

_service Changed

_service:extract_file:zstd-1.5.2.tar.gz Deleted

_service:extract_file:zstd.yaml Deleted

_service:tar_scm:zstd-1656685220.b55bd2a.tar -> _service:tar_scm:zstd-1.5.2.tar.gz Changed

_service:tar_scm:zstd.yaml Added