From 2f12f76ec9561a6c1d522e3e6d81723ed9a07356 Mon Sep 17 00:00:00 2001 From: InspIRCd Robot Date: Thu, 30 Jul 2020 14:31:12 +0100 Subject: Update copyright headers. --- src/modules/m_bcrypt.cpp | 2 +- src/modules/m_pbkdf2.cpp | 2 +- src/modules/m_setname.cpp | 1 - src/modules/m_spanningtree/override_map.cpp | 2 +- src/modules/m_svshold.cpp | 2 +- src/modules/m_timedbans.cpp | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp index a9a1ef2ae..9f02dd74c 100644 --- a/src/modules/m_bcrypt.cpp +++ b/src/modules/m_bcrypt.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017-2018, 2020 Sadie Powell * Copyright (C) 2014 Daniel Vassdal * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp index 8a57936fd..90fa54a77 100644 --- a/src/modules/m_pbkdf2.cpp +++ b/src/modules/m_pbkdf2.cpp @@ -1,8 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018, 2020 Sadie Powell * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2018 Sadie Powell * Copyright (C) 2014, 2016 Attila Molnar * Copyright (C) 2014 Daniel Vassdal * diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index 3e2ca0eaf..46a83d803 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2013, 2018-2020 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Attila Molnar - * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2007 John Brooks * Copyright (C) 2007 Dennis Friis diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp index bb6c66be7..26bbcc279 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2017 B00mX0r - * Copyright (C) 2016, 2018-2019 Sadie Powell + * Copyright (C) 2016, 2018-2020 Sadie Powell * Copyright (C) 2014 Adam * Copyright (C) 2013-2016 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index e25f239a9..cbacfdabb 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2019-2020 Matt Schatz * Copyright (C) 2018 linuxdaemon * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell * Copyright (C) 2012, 2018-2019 Robby diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 8dd334230..061a25166 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2020 iwalkalone * Copyright (C) 2018 linuxdaemon * Copyright (C) 2017 B00mX0r * Copyright (C) 2016, 2019 Matt Schatz -- cgit v1.3.1-10-gc9f91 From eb11cc14db861ac8bfe6b93515272a8ab11fb714 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 1 Aug 2020 08:28:10 +0100 Subject: Fix null-checking the wrong variable in the disable module. Closes #1792. --- src/modules/m_disable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp index 9f08cc6b3..95fcd8b4c 100644 --- a/src/modules/m_disable.cpp +++ b/src/modules/m_disable.cpp @@ -55,7 +55,7 @@ class ModuleDisable : public Module // Check that the mode actually exists. ModeHandler* mh = ServerInstance->Modes->FindMode(chr, type); - if (!chr) + if (!mh) throw ModuleException(InspIRCd::Format("Nonexistent mode '%c' was specified in at %s", chr, field.c_str(), tag->getTagLocation().c_str())); -- cgit v1.3.1-10-gc9f91