More small error fixes.

diff --git a/chanserv/authcmds.c b/chanserv/authcmds.c
index 0d3d5fc9f5f8ff8655293858aaa515c7f2163f4e..e85a1818f99ea55846db12ab54fd65f0a20ae8f9 100644 (file)
--- a/chanserv/authcmds.c
+++ b/chanserv/authcmds.c
@@ -141,7 +141,7 @@ int csa_doauth(void *source, int cargc, char **cargv) {
   reguser *rup;
   activeuser* aup;
   nick *sender=source;
-  nicklist *nl;
+  nicklist *nl = NULL;
   char userhost[USERLEN+HOSTLEN+2];
   int ucount=0;
 

diff --git a/lib/base64.c b/lib/base64.c
index cac65cf19cf1ca1015d8fe0fef2c7fd2ccb657b3..8e4a370d380de25aa007f1256de1f703a72d5cb9 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -23,8 +23,7 @@ int numerictab[] = {
 
 char tokens[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789[]";
 
-/* Moved into include file
-long numerictolong(const char *numeric, int numericlen)
+INLINE long numerictolong(const char *numeric, int numericlen)
 {
   long mynumeric=0; 
   int i;
@@ -35,7 +34,6 @@ long numerictolong(const char *numeric, int numericlen)
 
   return mynumeric;
 }
-*/
 
 char *longtonumeric(long param, int len)
 {

diff --git a/lua/luacommands.c b/lua/luacommands.c
index 1c604a9ab4147815c904ec3842178beb72e89800..f23fd7ee60faf330cdc5827616b94875acdfca82 100644 (file)
--- a/lua/luacommands.c
+++ b/lua/luacommands.c
@@ -349,6 +349,8 @@ static int lua_getuserbyauth(lua_State *l) {
   if(!lua_isstring(l, 1))
     return 0;
 
+  acc = lua_tostring(l, 1);
+
   for(i=0;i<NICKHASHSIZE;i++) {
     for(np=nicktable[i];np;np=np->next) {
       if(np && np->authname && !ircd_strcmp(np->authname, acc)) {

diff --git a/noperserv/noperserv.c b/noperserv/noperserv.c
index f54a903574e4da652a891da2d972575a069dc426..dc1162af1a4afabcf2c0a5969b829e59fd71259b 100644 (file)
--- a/noperserv/noperserv.c
+++ b/noperserv/noperserv.c
@@ -147,7 +147,7 @@ void _fini() {
 
 /* @test */
 int noperserv_hello(void *sender, int cargc, char **cargv) {
-  char *newaccount;
+  char *newaccount = NULL;
   no_autheduser *au;
   int i;
   nick *np = (nick *)sender, *np2, *target = NULL;

diff --git a/nterface/nterfacer.c b/nterface/nterfacer.c
index 491b8c74d68c79f1ab3eef318f640b646fc37e38..1d9c90e89fb16be74577a72be196dee3951ae47e 100644 (file)
--- a/nterface/nterfacer.c
+++ b/nterface/nterfacer.c
@@ -498,7 +498,7 @@ int nterfacer_line_event(struct esocket *sock, char *newline) {
 }
 
 int nterfacer_new_rline(char *line, struct esocket *socket, int *number) {
-  char *sp, *p, *parsebuf, *pp, commandbuf[MAX_BUFSIZE], *args[MAX_ARGS], *newp;
+  char *sp, *p, *parsebuf = NULL, *pp, commandbuf[MAX_BUFSIZE], *args[MAX_ARGS], *newp;
   int argcount;
   struct service_node *service;
   struct rline *prequest;
@@ -598,7 +598,7 @@ int nterfacer_new_rline(char *line, struct esocket *socket, int *number) {
     *newp = '\0';
   }
   if(argcount < hl->args) {
-    if(argcount)
+    if(argcount && parsebuf)
       free(parsebuf);
     return RE_WRONG_ARG_COUNT;
   }
@@ -606,7 +606,7 @@ int nterfacer_new_rline(char *line, struct esocket *socket, int *number) {
   prequest = (struct rline *)malloc(sizeof(struct rline));
   if(!prequest) {
     MemError();
-    if(argcount)
+    if(argcount && parsebuf)
       free(parsebuf);
     return RE_MEM_ERROR;
   }
@@ -623,7 +623,7 @@ int nterfacer_new_rline(char *line, struct esocket *socket, int *number) {
   rlines = prequest;
   re = (hl->function)(prequest, argcount, args);
   
-  if(argcount)
+  if(argcount && parsebuf)
     free(parsebuf);
 
   return re;

diff --git a/regexgline/regexgline.c b/regexgline/regexgline.c
index 6652db873bedae423f145d03edbfe0242e941c05..697da05f2e8464d32fad2ace62b3a5e6d1ef89ff 100644 (file)
--- a/regexgline/regexgline.c
+++ b/regexgline/regexgline.c
@@ -658,10 +658,12 @@ struct rg_struct *rg_newstruct(time_t expires) {
 struct rg_struct *rg_newsstruct(char *id, char *mask, char *setby, char *reason, char *expires, char *type, time_t iexpires, int iid) {
   struct rg_struct *newrow, *lp, *cp;
   time_t rexpires;
+  int stupidwarning;
   char glineiddata[1024];
   if (iexpires == 0) {
-    if(!protectedatoi(expires, (int *)&rexpires))
+    if(!protectedatoi(expires, &stupidwarning))
       return NULL;
+    rexpires = (time_t)stupidwarning;
   } else {
     rexpires = iexpires;
   }
@@ -746,14 +748,14 @@ struct rg_struct *rg_newsstruct(char *id, char *mask, char *setby, char *reason,
 
 void rg_dogline(struct rg_glinelist *gll, nick *np, struct rg_struct *rp, char *matched) { /* PPA: if multiple users match the same user@host or *@host it'll send multiple glines?! */
   char hostname[RG_MASKLEN];
-  int usercount;
+  int usercount = 0;
 
   rg_loggline(rp, np);
 
   if (rp->type == 1) {
     nick *tnp;
 
-    for(usercount=0,tnp=np->host->nicks;tnp;tnp=tnp->nextbyhost)
+    for(tnp=np->host->nicks;tnp;tnp=tnp->nextbyhost)
       if(!ircd_strcmp(np->ident, tnp->ident))
         usercount++;
 

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index add7940710b5868f94ddd2537a821d14a88b33d3..403a544d24a36e361ef2b694bfa5999701138d05 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -1315,7 +1315,7 @@ int trojanscan_add_ll(struct trojanscan_prechannels **head, struct trojanscan_pr
 void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count) {
   int i, j, marked;
   struct trojanscan_prechannels *lp;
-  struct trojanscan_templist *markedlist;
+  struct trojanscan_templist *markedlist = NULL;
 
   if(count > 0) {
     markedlist = (struct trojanscan_templist *)calloc(count, sizeof(struct trojanscan_templist));
@@ -1325,15 +1325,17 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
   
   for(i=0;i<trojanscan_activechans;i++) {
     marked = 0;    
-    for(lp=hp,j=0;j<count&&lp;j++,lp=lp->next) {
-      if(!markedlist[j].active && !lp->exempt && !ircd_strcmp(lp->name->content, trojanscan_chans[i].channel->content)) { /* we're already on the channel */
-        if(trojanscan_chans[i].watch_clone) {
-          markedlist[j].active = 1;
-          markedlist[j].watch_clone = trojanscan_chans[i].watch_clone;
-          lp->watch_clone = trojanscan_chans[i].watch_clone;
+    if(markedlist) {
+      for(lp=hp,j=0;j<count&&lp;j++,lp=lp->next) {
+        if(!markedlist[j].active && !lp->exempt && !ircd_strcmp(lp->name->content, trojanscan_chans[i].channel->content)) { /* we're already on the channel */
+          if(trojanscan_chans[i].watch_clone) {
+            markedlist[j].active = 1;
+            markedlist[j].watch_clone = trojanscan_chans[i].watch_clone;
+            lp->watch_clone = trojanscan_chans[i].watch_clone;
+          }
+          marked = 1;
+          break;
         }
-        marked = 1;
-        break;
       }
     }
     if(!marked && trojanscan_chans[i].watch_clone) {
@@ -1343,6 +1345,9 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
     }
   }
   
+  if(!markedlist)
+    return;
+
   for(j=0,lp=hp;j<count&&lp;j++,lp=lp->next) {
     if((!markedlist[j].active || !markedlist[j].watch_clone) && !lp->exempt) {
       channel *cp = findchannel(lp->name->content);