diff --git a/backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch b/backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c20acf0fa3036ab460110637fd5ed43d2aada99 --- /dev/null +++ b/backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch @@ -0,0 +1,33 @@ +From 5c6eaadd24ed432347e55f6827e8d8ac670cd534 Mon Sep 17 00:00:00 2001 +From: icy17 <1061499390@qq.com> +Date: Wed, 10 Apr 2024 16:18:27 +0800 +Subject: [PATCH] Fix potential Null pointer dereference in regress_finalize.c +Referenxe:https://github.com/libevent/libevent/pull/1598/ + +--- + test/regress_finalize.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/regress_finalize.c b/test/regress_finalize.c +index 9e57188..543cd94 100644 +--- a/test/regress_finalize.c ++++ b/test/regress_finalize.c +@@ -130,6 +130,7 @@ test_fin_cb_invoked(void *arg) + /* Okay, now add but don't have it become active, and make sure *that* + * works. */ + ev = evtimer_new(base, timer_callback, &ev_called); ++ tt_assert(ev); + event_add(ev, &ten_sec); + event_free_finalize(0, ev, event_finalize_callback_1); + +@@ -141,6 +142,7 @@ test_fin_cb_invoked(void *arg) + + /* Now try adding and deleting after finalizing. */ + ev = evtimer_new(base, timer_callback, &ev_called); ++ tt_assert(ev); + evtimer_assign(&ev2, base, timer_callback, &ev_called); + event_add(ev, &ten_sec); + event_free_finalize(0, ev, event_finalize_callback_1); +-- +2.27.0 + diff --git a/libevent.spec b/libevent.spec index 6e948b845d1327a1f66ce68664e7eb286cda31fb..385acb03870e366f59dcc419a6122874b3bf1d91 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,6 +1,6 @@ Name: libevent Version: 2.1.12 -Release: 4 +Release: 5 Summary: An event notification library License: BSD @@ -12,6 +12,7 @@ BuildRequires: gcc doxygen openssl-devel Patch0: libevent-nonettests.patch Patch1: http-add-callback-to-allow-server-to-decline-and-the.patch Patch6000: backport-evutil-don-t-call-memset-before-memcpy.patch +Patch6001: backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch %description Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets, @@ -69,6 +70,12 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Wed Jul 03 2024 zhangxianting - 2.1.12-5 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix potential Null pointer dereference in regress_finalize.c + * Mon Apr 01 2024 shixuantong - 2.1.12-4 - Type:bugfix - ID:NA