diff --git a/fix-heap-buffer-overflow-in-redisvFormatCommand.patch b/fix-heap-buffer-overflow-in-redisvFormatCommand.patch deleted file mode 100644 index 4bc175ac32355b6497e95be238c651d4acdd9a41..0000000000000000000000000000000000000000 --- a/fix-heap-buffer-overflow-in-redisvFormatCommand.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 78a8af37c6fc43e5fe4487a7a0762c9473444e37 Mon Sep 17 00:00:00 2001 -From: lingsheng -Date: Fri, 4 Jun 2021 11:05:20 +0800 -Subject: [PATCH] fix heap buffer overflow in redisvFormatCommand - ---- - hiredis.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/hiredis.c b/hiredis.c -index 73d0251..af3a079 100644 ---- a/hiredis.c -+++ b/hiredis.c -@@ -375,6 +375,9 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { - - touched = 1; - c++; -+ if (*c == '\0') { -+ goto format_err; -+ } - } - c++; - } --- -2.23.0 - diff --git a/hiredis-1.1.0.tar.gz b/hiredis-1.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..edafe2c39413329826203d640a2fd71f0a13dc0b Binary files /dev/null and b/hiredis-1.1.0.tar.gz differ diff --git a/hiredis.spec b/hiredis.spec index 944d63bb73e196eb5cbe59ac84bd946aa53a878e..ee58092ba7396a8e14cb431e31862872986d79ae 100644 --- a/hiredis.spec +++ b/hiredis.spec @@ -1,13 +1,13 @@ Name: hiredis -Version: 1.0.2 -Release: 3 +Version: 1.1.0 +Release: 1 Summary: A minimalistic C client library for the Redis database License: BSD URL: https://github.com/redis/hiredis -Source0: https://github.com/redis/hiredis/archive/refs/tags/v%{version}.tar.gz +Source0: https://github.com/redis/hiredis/archive/refs/tags/v%{version}.tar.gz#/hiredis-1.1.0.tar.gz BuildRequires: gcc redis -Patch0001: fix-heap-buffer-overflow-in-redisvFormatCommand.patch + Patch0002: fix-memory-uninitialized-in-fuzz-testcase.patch %description @@ -28,7 +28,7 @@ Requires: hiredis = %{version}-%{release} The hiredis-devel package contains development files to build applications for hiredis. %prep -%autosetup -p1 +%autosetup -p1 %build %make_build PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" DEBUG="%{optflags}" LDFLAGS="%{?__global_ldflags}" @@ -61,6 +61,8 @@ make check || true %{_libdir}/pkgconfig/hiredis.pc %changelog +* Thu Jul 20 2023 zhangchenglin - 1.1.0-1 +- Update to version 1.1.0 * Fri Dec 16 2022 xu_ping - 1.0.2-3 - fix memory uninitialized in fuzz testcase diff --git a/v1.0.2.tar.gz b/v1.0.2.tar.gz deleted file mode 100644 index 35c86e26f5f7c2ff96a76ea96e670e1eaaf193f6..0000000000000000000000000000000000000000 Binary files a/v1.0.2.tar.gz and /dev/null differ