diff --git a/backport-Fix-potential-Null-pointer-dereference-in-regress_buffer.c.patch b/backport-Fix-potential-Null-pointer-dereference-in-regress_buffer.c.patch new file mode 100644 index 0000000000000000000000000000000000000000..894b3714013510376262e6b8e785efa9b58534f4 --- /dev/null +++ b/backport-Fix-potential-Null-pointer-dereference-in-regress_buffer.c.patch @@ -0,0 +1,24 @@ +From 2466dea1dff1ed8d51eb057854a22d5440aae147 Mon Sep 17 00:00:00 2001 +From: icy17 <1061499390@qq.com> +Date: Wed, 10 Apr 2024 17:42:01 +0800 +Subject: [PATCH] Fix potential Null pointer dereference in regress_buffer.c + +--- + test/regress_buffer.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/regress_buffer.c b/test/regress_buffer.c +index 2685055f03..32e35af8b7 100644 +--- a/test/regress_buffer.c ++++ b/test/regress_buffer.c +@@ -1308,7 +1308,9 @@ test_evbuffer_add_file(void *ptr) + addfile_test_writecb, src); + rev = event_new(base, pair[1], EV_READ|EV_PERSIST, + addfile_test_readcb, dest); +- ++ tt_assert(wev); ++ tt_assert(rev); ++ + event_add(wev, NULL); + event_add(rev, NULL); + event_base_dispatch(base); diff --git a/backport-Fix-potential-Null-pointer-dereference-in-regress_et.c.patch b/backport-Fix-potential-Null-pointer-dereference-in-regress_et.c.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f4e764af929c128fc8fe9f27e40fa19c3fe6dde --- /dev/null +++ b/backport-Fix-potential-Null-pointer-dereference-in-regress_et.c.patch @@ -0,0 +1,22 @@ +From 6765bd2909e60cd41a2949607556b2b64fbf5b89 Mon Sep 17 00:00:00 2001 +From: icy17 <1061499390@qq.com> +Date: Wed, 10 Apr 2024 17:45:03 +0800 +Subject: [PATCH] Fix potential Null pointer dereference in regress_et.c + +--- + test/regress_et.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/regress_et.c b/test/regress_et.c +index 1b1f819eda..185a32476f 100644 +--- a/test/regress_et.c ++++ b/test/regress_et.c +@@ -228,6 +228,8 @@ test_edge_triggered_multiple_events(void *data_) + read_notification_cb, NULL); + write_ev = event_new(base, pair[1], EV_WRITE|EV_ET|EV_PERSIST, + write_notification_cb, NULL); ++ tt_assert(read_ev); ++ tt_assert(write_ev); + + event_add(read_ev, NULL); + event_add(write_ev, NULL); diff --git a/backport-Fix-potential-Null-pointer-dereference-in-regress_thread.c.patch b/backport-Fix-potential-Null-pointer-dereference-in-regress_thread.c.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ca2256fa3e16628b6169057ef9baa9e2b44d66b --- /dev/null +++ b/backport-Fix-potential-Null-pointer-dereference-in-regress_thread.c.patch @@ -0,0 +1,25 @@ +From 319cae4af2d48058488bfc717ec8673fc57dd42d Mon Sep 17 00:00:00 2001 +From: icy17 <1061499390@qq.com> +Date: Wed, 10 Apr 2024 17:39:36 +0800 +Subject: [PATCH] Fix potential Null pointer dereference in regress_thread.c + +--- + test/regress_thread.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/regress_thread.c b/test/regress_thread.c +index 3f46764d56..8dbbda52eb 100644 +--- a/test/regress_thread.c ++++ b/test/regress_thread.c +@@ -192,9 +192,11 @@ thread_basic(void *arg) + /* This piggybacks on the th_notify_fd weirdly, and looks + * inside libevent internals. Not a good idea in non-testing + * code! */ ++ tt_assert(sigchld_event); + notification_event = event_new(base, + base->th_notify_fd[0], EV_READ|EV_PERSIST, notify_fd_cb, + NULL); ++ tt_assert(notification_event); + event_add(sigchld_event, NULL); + event_add(notification_event, NULL); + diff --git a/libevent.spec b/libevent.spec index b12522bfa4dcb801b40f7e7636a5cfaedecc0ec8..9e02547861818a3dbdf967ef33b92ba0beb54556 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,6 +1,6 @@ Name: libevent Version: 2.1.12 -Release: 12 +Release: 13 Summary: An event notification library License: BSD @@ -26,6 +26,10 @@ Patch6004: backport-evutil-don-t-call-memset-before-memcpy.patch Patch6005: 0002-Avoid-calling-read-2-on-eventfd-on-each-event-loop-w.patch Patch6006: backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch +Patch6007: backport-Fix-potential-Null-pointer-dereference-in-regress_thread.c.patch +Patch6008: backport-Fix-potential-Null-pointer-dereference-in-regress_buffer.c.patch +Patch6009: backport-Fix-potential-Null-pointer-dereference-in-regress_et.c.patch + %description Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets, filters, rate-limiting, SSL, zero-copy file transmission, and IOCP. @@ -85,6 +89,11 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Thu Aug 15 2024 zhangxingrong - 2.1.12-13 +- Fix potential Null pointer dereference in regress_thread.c +- Fix potential Null pointer dereference in regress_buffer.c +- Fix potential Null pointer dereference in regress_et.c + * Thu May 30 2024 baiguo - 2.1.12-12 - Fix potential Null pointer dereference in regress_finalize.c