diff --git a/debian/changelog b/debian/changelog index 37b9015..53d3192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ golang-github-ulikunitz-xz (0.5.10-1) UNRELEASED; urgency=low * New upstream release. + * Drop patch 0001-CVE-2021-29482.patch, present upstream. -- Debian Janitor Sat, 21 Aug 2021 10:27:24 -0000 diff --git a/debian/patches/0001-CVE-2021-29482.patch b/debian/patches/0001-CVE-2021-29482.patch deleted file mode 100644 index 50d5cca..0000000 --- a/debian/patches/0001-CVE-2021-29482.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Ulrich Kunitz -Date: Wed, 19 Aug 2020 18:04:10 +0200 -Subject: CVE-2021-29482 - -Origin: backport, https://github.com/ulikunitz/xz/commit/69c6093c7b2397b923acf82cb378f55ab2652b9b ---- - bits.go | 7 ++++++- - bits_test.go | 11 +++++++++++ - 2 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/bits.go b/bits.go -index fadc1a5..87d4623 100644 ---- a/bits.go -+++ b/bits.go -@@ -54,6 +54,8 @@ var errOverflowU64 = errors.New("xz: uvarint overflows 64-bit unsigned integer") - - // readUvarint reads a uvarint from the given byte reader. - func readUvarint(r io.ByteReader) (x uint64, n int, err error) { -+ const maxUvarintLen = 10 -+ - var s uint - i := 0 - for { -@@ -62,8 +64,11 @@ func readUvarint(r io.ByteReader) (x uint64, n int, err error) { - return x, i, err - } - i++ -+ if i > maxUvarintLen { -+ return x, i, errOverflowU64 -+ } - if b < 0x80 { -- if i > 10 || i == 10 && b > 1 { -+ if i == maxUvarintLen && b > 1 { - return x, i, errOverflowU64 - } - return x | uint64(b)<