From fa0f5fe284268a9fd9566ef03681a9dceed864f0 Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Wed, 26 Jun 2024 21:50:13 +0800 Subject: [PATCH] fix potential Null pointer dereference in regress_finalize.c (cherry picked from commit b73d09a380508313f0232edcd1687aa9a93b9769) --- ...ll-pointer-dereference-in-regress_fi.patch | 33 +++++++++++++++++++ libevent.spec | 9 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch 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 0000000..1c5e991 --- /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.43.0 + diff --git a/libevent.spec b/libevent.spec index 42aba2c..80596f1 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,6 +1,6 @@ Name: libevent Version: 2.1.12 -Release: 8 +Release: 9 Summary: An event notification library License: BSD @@ -16,6 +16,7 @@ Patch6001: backport-http-eliminate-redundant-bev-fd-manipulating-and-cac.patch Patch6002: backport-http-fix-fd-leak-on-fd-reset-by-using-bufferevent_re.patch Patch6003: backport-bufferevent-introduce-bufferevent_replacefd-like-set.patch Patch6004: backport-evutil-don-t-call-memset-before-memcpy.patch +Patch6005: 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, @@ -88,6 +89,12 @@ EOF %changelog +* Wed Jul 03 2024 zhangxianting - 2.1.12-9 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix potential Null pointer dereference in regress_finalize.c + * Mon Apr 01 2024 shixuantong - 2.1.12-8 - Type:bugfix - CVE:NA -- Gitee