Add safety check for nonexistent server in receiving server origin privmsg (shouldnt...

[user/henk/code/inspircd.git] / src / modules / m_delayjoin.cpp

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 126221dd22f1f84d020b23a1f0e7ee917895eee9..bb96b461745f32e37368caba054096802cdd7523 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -160,6 +160,10 @@ class ModuleDelayJoin : public Module
 
        void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
        {
+               /* Server origin */
+               if (!user)
+                       return;
+
                if (target_type != TYPE_CHANNEL)
                        return;
 
@@ -188,7 +192,7 @@ class ModuleDelayJoin : public Module
                user->Shrink("delayjoin");
        }
 
-       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5)
        {
                va_list argsPtr;
                char textbuffer[MAXBUF];