From 6f3cf8aaa60bc4ab9e48520db26cd8e46360f6bf Mon Sep 17 00:00:00 2001
From: B00mX0r
Date: Sun, 3 Dec 2017 14:36:57 -0800
Subject: Ensure that ModeParser doesn't try to process a non-existent mode.

This fixes #1431 and closes #1432.
---
 src/mode.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/mode.cpp')

diff --git a/src/mode.cpp b/src/mode.cpp
index e2129b55a..c07c342a3 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -449,6 +449,12 @@ unsigned int ModeParser::ProcessSingle(User* user, Channel* targetchannel, User*
 		Modes::Change& item = *i;
 		ModeHandler* mh = item.mh;
 
+		// If a mode change has been given for a mode that does not exist then reject
+		// it. This can happen when core_reloadmodule attempts to restore a mode that
+		// no longer exists.
+		if (!mh)
+			continue;
+
 		// If the mode is supposed to have a parameter then we first take a look at item.param
 		// and, if we were asked to, also handle mode merges now
 		if (mh->NeedsParam(item.adding))
-- 
cgit v1.3.1-10-gc9f91