From 995ff214a9b6224aae6ebdb812862bd9ea345d24 Mon Sep 17 00:00:00 2001 From: hevake_lcj Date: Thu, 28 Jul 2022 10:14:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86terminal/termina?= =?UTF-8?q?l=5Fnodes.h=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9session?= =?UTF-8?q?.h=E7=9A=84=E5=8C=85=E5=90=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- terminal/terminal_nodes.h | 1 + 1 file changed, 1 insertion(+) diff --git a/terminal/terminal_nodes.h b/terminal/terminal_nodes.h index ad9ae0e..b09b052 100644 --- a/terminal/terminal_nodes.h +++ b/terminal/terminal_nodes.h @@ -2,6 +2,7 @@ #define TBOX_TERMINAL_NODES_H_20220214 #include "types.h" +#include "session.h" namespace tbox { namespace terminal { -- Gitee From 2bd4ec58559e6f6054519dace0dfaa3db43a6491 Mon Sep 17 00:00:00 2001 From: hevake_lcj Date: Thu, 28 Jul 2022 12:01:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3event=E4=B8=ADEpollFdEven?= =?UTF-8?q?t=E5=9C=A8=E6=9E=90=E6=9E=84=E6=97=B6=E5=87=BA=E7=8E=B0d=5F?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E6=AE=B5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- event/engins/epoll/fd_event.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/event/engins/epoll/fd_event.cpp b/event/engins/epoll/fd_event.cpp index f341b40..58ff0ed 100644 --- a/event/engins/epoll/fd_event.cpp +++ b/event/engins/epoll/fd_event.cpp @@ -28,10 +28,12 @@ EpollFdEvent::~EpollFdEvent() disable(); - --d_->ref; - if (d_->ref == 0) { - wp_loop_->removeFdSharedData(fd_); - delete d_; + if (d_ != nullptr) { + --d_->ref; + if (d_->ref == 0) { + wp_loop_->removeFdSharedData(fd_); + delete d_; + } } } -- Gitee