BUILD : 1.7.5 (364) NOTES : Added nullfix patch from Trystan.

git-svn-id: svn://svn.anope.org/anope/trunk@364 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@235 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 16 insertions, 2 deletions

diff --git a/src/chanserv.c b/src/chanserv.c
index 712c22560..0be9cb809 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1945,6 +1945,13 @@ ChannelInfo *cs_findchan(const char *chan)
 {
     ChannelInfo *ci;
 
+    if (!chan || !*chan) {
+        if (debug) {
+            alog("Error: finduser() called with NULL values");
+        }
+        return NULL;
+    }
+
     for (ci = chanlists[tolower(chan[1])]; ci; ci = ci->next) {
         if (stricmp(ci->name, chan) == 0)
             return ci;
@@ -1962,8 +1969,15 @@ ChannelInfo *cs_findchan(const char *chan)
 
 int check_access(User * user, ChannelInfo * ci, int what)
 {
-    int level = get_access(user, ci);
-    int limit = ci->levels[what];
+    int level;
+    int limit;
+
+    if (!user || !ci) {
+        return 0;
+    }
+
+    level = get_access(user, ci);
+    limit = ci->levels[what];
 
     /* Resetting the last used time */
     if (level > 0)