lz4: 1.9.3 -> 1.9.4

This commit is contained in:
Tim Biermann 2022-08-20 12:01:03 +02:00
parent 7f69aa472a
commit f9b0be39e8
4 changed files with 10 additions and 37 deletions

View File

@ -11,9 +11,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/lz4hc.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/liblz4.a
lrwxrwxrwx root/root usr/lib/liblz4.so -> liblz4.so.1.9.3
lrwxrwxrwx root/root usr/lib/liblz4.so.1 -> liblz4.so.1.9.3
-rwxr-xr-x root/root usr/lib/liblz4.so.1.9.3
lrwxrwxrwx root/root usr/lib/liblz4.so -> liblz4.so.1.9.4
lrwxrwxrwx root/root usr/lib/liblz4.so.1 -> liblz4.so.1.9.4
-rwxr-xr-x root/root usr/lib/liblz4.so.1.9.4
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/liblz4.pc
drwxr-xr-x root/root usr/share/

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF33M9dX5wPDqPSLsPxegfmqjgj/2+95yILfZt79v17p/MPUSUEs32pmrkpuz6t2JgcprItK9mo+U5kyEL4yqCJg0=
SHA256 (Pkgfile) = 8de158f16af5ff4d1c739237bff3a2fe862727cc80d2626099f4508434246269
SHA256 (.footprint) = b54711d20c7de6fc0ffa92a1f97ecbcfe55fe0ad50c2cf2aee77a330a6610aa3
SHA256 (lz4-1.9.3.tar.gz) = 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
SHA256 (lz4-1.9.3-negative-memmove.patch) = c99da650a79a42db4db23e72146701cce9106383ba45709c5ac89022e36dcfb2
RWSagIOpLGJF37iXwKTvaUkkCRXgtAX2azIZdHrl88/OdThxHAJSrO4PdHUO8JmdsYLiKLkFNCA4h1eU4KZt+UX6tsKs42x0jQI=
SHA256 (Pkgfile) = e1caa1eb17ed77739098a5da32f7efb1fc9bd41b1ce539529fdae05447d11267
SHA256 (.footprint) = d2972b8b8cc766d09f93e7b8b8b2db80eb831aba0a1643279db490068d4eab74
SHA256 (lz4-1.9.4.tar.gz) = 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b

View File

@ -3,17 +3,13 @@
# Maintainer: Tim Biermann, tbier at posteo dot de
name=lz4
version=1.9.3
release=2
source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz
lz4-1.9.3-negative-memmove.patch)
version=1.9.4
release=1
source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
build() {
cd $name-$version
# https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7
# Fix potential memory corruption with negative memmove() size
patch -p1 -i $SRC/lz4-1.9.3-negative-memmove.patch
make -C lib PREFIX=/usr
make -C programs PREFIX=/usr lz4 lz4c
make install PREFIX=/usr DESTDIR=$PKG

View File

@ -1,22 +0,0 @@
From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <j@jasper.la>
Date: Fri, 26 Feb 2021 15:21:20 +0100
Subject: [PATCH] Fix potential memory corruption with negative memmove() size
---
lib/lz4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/lz4.c b/lib/lz4.c
index 5f524d01d..c2f504ef3 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -1749,7 +1749,7 @@ LZ4_decompress_generic(
const size_t dictSize /* note : = 0 if noDict */
)
{
- if (src == NULL) { return -1; }
+ if ((src == NULL) || (outputSize < 0)) { return -1; }
{ const BYTE* ip = (const BYTE*) src;
const BYTE* const iend = ip + srcSize;