From 84ebeefa515da2368b2c68414c6dbdc6c928697c Mon Sep 17 00:00:00 2001 From: JeanLeo Date: Sat, 18 Jan 2020 18:03:30 +0800 Subject: [PATCH] remove useless file or patch --- ...mcpy-NULL-foo-0-because-it-is-undefi.patch | 101 ------------------ colorxzgrep.csh | 5 - colorxzgrep.sh | 4 - xz.spec | 21 ++-- 4 files changed, 7 insertions(+), 124 deletions(-) delete mode 100644 0014-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch delete mode 100644 colorxzgrep.csh delete mode 100644 colorxzgrep.sh diff --git a/0014-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch b/0014-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch deleted file mode 100644 index cd3aaf6..0000000 --- a/0014-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2a22de439ec63da1927b640eda309296a1e8dce5 Mon Sep 17 00:00:00 2001 -From: Lasse Collin -Date: Mon, 13 May 2019 20:05:17 +0300 -Subject: [PATCH 14/14] liblzma: Avoid memcpy(NULL, foo, 0) because it is - undefined behavior. - -I should have always known this but I didn't. Here is an example -as a reminder to myself: - - int mycopy(void *dest, void *src, size_t n) - { - memcpy(dest, src, n); - return dest == NULL; - } - -In the example, a compiler may assume that dest != NULL because -passing NULL to memcpy() would be undefined behavior. Testing -with GCC 8.2.1, mycopy(NULL, NULL, 0) returns 1 with -O0 and -O1. -With -O2 the return value is 0 because the compiler infers that -dest cannot be NULL because it was already used with memcpy() -and thus the test for NULL gets optimized out. - -In liblzma, if a null-pointer was passed to memcpy(), there were -no checks for NULL *after* the memcpy() call, so I cautiously -suspect that it shouldn't have caused bad behavior in practice, -but it's hard to be sure, and the problematic cases had to be -fixed anyway. - -Thanks to Jeffrey Walton. ---- - src/liblzma/common/common.c | 6 +++++- - src/liblzma/lz/lz_decoder.c | 12 +++++++++--- - src/liblzma/simple/simple_coder.c | 10 +++++++++- - 3 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/src/liblzma/common/common.c b/src/liblzma/common/common.c -index 1399b92..18453ae 100644 ---- a/src/liblzma/common/common.c -+++ b/src/liblzma/common/common.c -@@ -99,7 +99,11 @@ lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos, - const size_t out_avail = out_size - *out_pos; - const size_t copy_size = my_min(in_avail, out_avail); - -- memcpy(out + *out_pos, in + *in_pos, copy_size); -+ // Call memcpy() only if there is something to copy. If there is -+ // nothing to copy, in or out might be NULL and then the memcpy() -+ // call would trigger undefined behavior. -+ if (copy_size > 0) -+ memcpy(out + *out_pos, in + *in_pos, copy_size); - - *in_pos += copy_size; - *out_pos += copy_size; -diff --git a/src/liblzma/lz/lz_decoder.c b/src/liblzma/lz/lz_decoder.c -index bb21d0d..6c9024e 100644 ---- a/src/liblzma/lz/lz_decoder.c -+++ b/src/liblzma/lz/lz_decoder.c -@@ -91,11 +91,17 @@ decode_buffer(lzma_coder *coder, - in, in_pos, in_size); - - // Copy the decoded data from the dictionary to the out[] -- // buffer. -+ // buffer. Do it conditionally because out can be NULL -+ // (in which case copy_size is always 0). Calling memcpy() -+ // with a null-pointer is undefined even if the third -+ // argument is 0. - const size_t copy_size = coder->dict.pos - dict_start; - assert(copy_size <= out_size - *out_pos); -- memcpy(out + *out_pos, coder->dict.buf + dict_start, -- copy_size); -+ -+ if (copy_size > 0) -+ memcpy(out + *out_pos, coder->dict.buf + dict_start, -+ copy_size); -+ - *out_pos += copy_size; - - // Reset the dictionary if so requested by coder->lz.code(). -diff --git a/src/liblzma/simple/simple_coder.c b/src/liblzma/simple/simple_coder.c -index 13ebabc..4f499be 100644 ---- a/src/liblzma/simple/simple_coder.c -+++ b/src/liblzma/simple/simple_coder.c -@@ -118,7 +118,15 @@ simple_code(void *coder_ptr, const lzma_allocator *allocator, - // coder->pos and coder->size yet. This way the coder can be - // restarted if the next filter in the chain returns e.g. - // LZMA_MEM_ERROR. -- memcpy(out + *out_pos, coder->buffer + coder->pos, buf_avail); -+ // -+ // Do the memcpy() conditionally because out can be NULL -+ // (in which case buf_avail is always 0). Calling memcpy() -+ // with a null-pointer is undefined even if the third -+ // argument is 0. -+ if (buf_avail > 0) -+ memcpy(out + *out_pos, coder->buffer + coder->pos, -+ buf_avail); -+ - *out_pos += buf_avail; - - // Copy/Encode/Decode more data to out[]. --- -1.8.3.1 - diff --git a/colorxzgrep.csh b/colorxzgrep.csh deleted file mode 100644 index a3964dc..0000000 --- a/colorxzgrep.csh +++ /dev/null @@ -1,5 +0,0 @@ -/usr/libexec/grepconf.sh -c -if ( $status == 1 ) exit -alias xzgrep 'xzgrep --color=auto' -alias xzfgrep 'xzfgrep --color=auto' -alias xzegrep 'xzegrep --color=auto' diff --git a/colorxzgrep.sh b/colorxzgrep.sh deleted file mode 100644 index 4a91d70..0000000 --- a/colorxzgrep.sh +++ /dev/null @@ -1,4 +0,0 @@ -/usr/libexec/grepconf.sh -c || return -alias xzgrep='xzgrep --color=auto' 2>/dev/null -alias xzegrep='xzegrep --color=auto' 2>/dev/null -alias xzfgrep='xzfgrep --color=auto' 2>/dev/null diff --git a/xz.spec b/xz.spec index 6c9285b..d431ba0 100644 --- a/xz.spec +++ b/xz.spec @@ -1,19 +1,11 @@ -%global profiledir %{_sysconfdir}/profile.d - Name: xz Version: 5.2.4 -Release: 4 +Release: 5 Summary: A free general-purpose data compreession software with LZMA2 algorithm License: Public Domain, LGPLv2.1 and GPLv2+ URL: http://tukaani.org/xz Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz -#Source1 and Source2 get from fedora -Source1: colorxzgrep.sh -Source2: colorxzgrep.csh - -Patch6000: 0014-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch - BuildRequires: perl-interpreter Requires: %{name} = %{version}-%{release} @@ -60,10 +52,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %install %make_install -mkdir -p %{buildroot}%{profiledir} -install -p -m 644 %{SOURCE1} %{buildroot}%{profiledir} -install -p -m 644 %{SOURCE2} %{buildroot}%{profiledir} - %find_lang %name %check @@ -77,7 +65,6 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_bindir}/*lz* %{_libdir}/lib*.so.5* -%{profiledir}/* %exclude %_pkgdocdir/examples* %exclude %{_libdir}/*.la @@ -96,5 +83,11 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*xz* %changelog +* Sat Jan 18 2020 JeanLeo - 5.2.4-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove useless file or patch + * Mon Sep 2 2019 dongjian - 5.2.4-4 - Rebuild the xz and fix description -- Gitee