Merge.

diff --git a/nick/nickhandlers.c b/nick/nickhandlers.c
index 6ca637c9a26ce2eefb81a4eed142ca8aa6d0065d..56529726b460e2bb0c5e34731d52621ea8a7776f 100644 (file)
--- a/nick/nickhandlers.c
+++ b/nick/nickhandlers.c
@@ -302,6 +302,7 @@ int handleusermodemsg(void *source, int cargc, char **cargv) {
           np->opername = getsstring(cargv[2], ACCOUNTLEN);
         } else {
           freesstring(np->opername);
+          np->opername = NULL;
         }
       }
       if((np->umodes ^ oldflags) & UMODE_OPER)