From 8a030bbaff670aee308be8abaafbf0dc0e8d321a Mon Sep 17 00:00:00 2001 From: "Emilio A. Escobar" Date: Wed, 9 Feb 2022 19:06:37 -0800 Subject: [PATCH 1/2] Fix crashes happening on 2.2.1 during rwho --- src/m_rwho.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m_rwho.c b/src/m_rwho.c index ff2df0bb..3f465b47 100644 --- a/src/m_rwho.c +++ b/src/m_rwho.c @@ -991,11 +991,11 @@ static int rwho_match(aClient *cptr, int *failcode, aClient **failclient) #ifdef USER_HOSTMASKING if ((rwho_opts.check[0] & RWM_HOST) && - rwho_opts.host_func[0](rwho_opts.host_pat[0], cptr->user->host) && rwho_opts.host_func[0](rwho_opts.host_pat[0], cptr->user->mhost)) + (rwho_opts.host_func[0](rwho_opts.host_pat[0], cptr->user->host) && rwho_opts.host_func[0](rwho_opts.host_pat[0], cptr->user->mhost))) return 0; if ((rwho_opts.check[1] & RWM_HOST) && - !rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->host) || !rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->mhost)) + !(rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->host) || !rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->mhost))) return 0; #else if ((rwho_opts.check[0] & RWM_HOST) && From ac39cff8f3e202ebf6b1ea6ce25c95bc29b36ae1 Mon Sep 17 00:00:00 2001 From: "Emilio A. Escobar" Date: Wed, 9 Feb 2022 19:11:20 -0800 Subject: [PATCH 2/2] Moving ! inside parenthesis --- src/m_rwho.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_rwho.c b/src/m_rwho.c index 3f465b47..0c695ef6 100644 --- a/src/m_rwho.c +++ b/src/m_rwho.c @@ -995,7 +995,7 @@ static int rwho_match(aClient *cptr, int *failcode, aClient **failclient) return 0; if ((rwho_opts.check[1] & RWM_HOST) && - !(rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->host) || !rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->mhost))) + (!rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->host) || !rwho_opts.host_func[1](rwho_opts.host_pat[1], cptr->user->mhost))) return 0; #else if ((rwho_opts.check[0] & RWM_HOST) &&