* Fixed a longstanding valgrind error in 'chanprog'

* Fixed up some initialization of some strings to be NULL


svn: 659

src/chanprog.c

@@ -415,16 +415,15 @@ void load_internal_users()
    *port,
    *pass,
    *hosts,
-    host[250],
-    buf[2048];
+    host[UHOSTMAX] = "",
+    buf[2048] = "";
   char *attr;
   int i, hublevel = 0;
   struct bot_addr *bi;
   struct userrec *u;
-  //struct flag_record fr = {FR_BOT, 0, 0, 0, 0, 0};
 
   /* hubs */
-  sprintf(buf, "%s", hubs);
+  snprintf(buf, sizeof buf, "%s", hubs);
   p = buf;
   while (p) {
     ln = p;
@@ -465,13 +464,13 @@ void load_internal_users()
 	  /* set_user(&USERENTRY_PASS, get_user_by_handle(userlist, hand), SALT2); */
 	}
       default:
-//	ln = userids for hostlist, add them all 
+	/* ln = userids for hostlist, add them all */
 	hosts = ln;
 	ln = strchr(ln, ' ');
 	if (ln)
 	  *ln++ = 0;
 	while (hosts) {
-	  sprintf(host, "*!%s@%s", hosts, ip);
+	  snprintf(host, sizeof host, "*!%s@%s", hosts, ip);
 	  set_user(&USERENTRY_HOSTS, get_user_by_handle(userlist, hand), host);
 	  hosts = ln;
 	  if (ln)
@@ -492,7 +491,7 @@ void load_internal_users()
   /* perm owners */
   owner[0] = 0;
 
-  sprintf(buf, "%s", owners);
+  snprintf(buf, sizeof buf, "%s", owners);
   p = buf;
   while (p) {
     ln = p;
@@ -541,13 +540,13 @@ void load_internal_users()
 
 void chanprog()
 {
-  char buf[2048];
+  /* char buf[2048] = ""; */
   struct bot_addr *bi;
   struct userrec *u;
 
 
   admin[0] = 0;
-  /* cache our ip on load instead of every 30 seconds -zip */
+  /* cache our ip on load instead of every 30 seconds */
   cache_my_ip();
   sdprintf("ip4: %s", myipstr(4));
   sdprintf("ip6: %s", myipstr(6));
@@ -576,13 +575,13 @@ void chanprog()
 
   if (!(u = get_user_by_handle(userlist, botnetnick))) {
     /* I need to be on the userlist... doh. */
-    userlist = adduser(userlist, botnetnick, STR("none"), "-", USER_BOT | USER_OP );
+    userlist = adduser(userlist, botnetnick, "none", "-", USER_BOT | USER_OP );
     u = get_user_by_handle(userlist, botnetnick);
     bi = malloc(sizeof(struct bot_addr));
 
     bi->address = strdup(myip);
-    bi->telnet_port = atoi(buf) ? atoi(buf) : 3333;
-    bi->relay_port = bi->telnet_port;
+    /* bi->telnet_port = atoi(buf) ? atoi(buf) : 3333; */
+    bi->telnet_port = bi->relay_port = 3333;
 #ifdef HUB
     bi->hublevel = 99;
 #else
@@ -612,10 +611,10 @@ void chanprog()
   /* test tempdir: it's vital */
   {
     FILE *f = NULL;
-    char s[161];
+    char s[DIRMAX] = "";
     int fd;
 
-    sprintf(s, STR("%s.test-XXXXXX"), tempdir);
+    snprintf(s, sizeof s, STR("%s.test-XXXXXX"), tempdir);
     if ((fd = mkstemp(s)) == -1 || (f = fdopen(fd, "w")) == NULL) {
       if (fd != -1) {
         unlink(s);

src/main.c

@@ -652,8 +652,8 @@ int init_dcc_max(), init_userent(), init_auth(), init_config(), init_bots(),
 void binds_init();
 
 int crontab_exists() {
-  char buf[2048], *out=NULL;
-  sprintf(buf, STR("crontab -l | grep \"%s\" | grep -v \"^#\""), binname);
+  char buf[2048] = "", *out = NULL;
+  egg_snprintf(buf, sizeof buf, STR("crontab -l | grep \"%s\" | grep -v \"^#\""), binname);
   if (shell_exec(buf, NULL, &out, NULL)) {
 
     if (out && strstr(out, binname)) {
@@ -669,19 +669,18 @@ int crontab_exists() {
 }
 
 void crontab_create(int interval) {
-  char tmpfile[161],
-    buf[256];
+  char tmpfile[161] = "", buf[256] = "";
   FILE *f;
   int fd;
 
   /* always use mkstemp() when handling temp files! -dizz */
-  sprintf(tmpfile, "%s.crontab-XXXXXX", tempdir);
+  egg_snprintf(tmpfile, sizeof tmpfile, "%s.crontab-XXXXXX", tempdir);
   if ((fd = mkstemp(tmpfile)) == -1) {
     unlink(tmpfile);
     return;
   } 
 
-  sprintf(buf, STR("crontab -l | grep -v \"%s\" | grep -v \"^#\" | grep -v \"^\\$\"> %s"), binname, tmpfile);
+  egg_snprintf(buf, sizeof buf, STR("crontab -l | grep -v \"%s\" | grep -v \"^#\" | grep -v \"^\\$\"> %s"), binname, tmpfile);
   if (shell_exec(buf, NULL, NULL, NULL) && (f = fdopen(fd, "a")) != NULL) {
     buf[0] = 0;
     if (interval == 1)
@@ -698,7 +697,7 @@ void crontab_create(int interval) {
         i += interval;
       }
     }
-    sprintf(buf + strlen(buf), STR(" * * * * %s > /dev/null 2>&1"), binname);
+    egg_snprintf(buf + strlen(buf), sizeof buf, STR(" * * * * %s > /dev/null 2>&1"), binname);
     fseek(f, 0, SEEK_END);
     fprintf(f, STR("\n%s\n"), buf);
     fclose(f);
@@ -786,13 +785,13 @@ static void gotspawn(char *filename)
 
 static int spawnbot(char *bin, char *nick, char *ip, char *host, char *ipsix, int cloak)
 {
-  char buf[DIRMAX], bindir[DIRMAX], bufrun[DIRMAX];
+  char buf[DIRMAX] = "", bindir[DIRMAX] = "", bufrun[DIRMAX] = "";
   FILE *fp;
 
-  sprintf(buf, "%s", bin);
-  sprintf(bindir, "%s", dirname(buf));
+  egg_snprintf(buf, sizeof buf, "%s", bin);
+  egg_snprintf(bindir, sizeof bindir, "%s", dirname(buf));
 
-  sprintf(buf, "%s/.wraith-%s", bindir, nick);
+  egg_snprintf(buf, sizeof buf, "%s/.wraith-%s", bindir, nick);
 
 
   if (!(fp = fopen(buf, "w")))
@@ -803,7 +802,7 @@ static int spawnbot(char *bin, char *nick, char *ip, char *host, char *ipsix, in
   fflush(fp);
   fclose(fp);
 
-  sprintf(bufrun, "%s -c %s", bin, buf);
+  egg_snprintf(bufrun, sizeof bufrun, "%s -c %s", bin, buf);
   return system(bufrun);
 }
 #endif /* LEAF */
@@ -920,7 +919,7 @@ int main(int argc, char **argv)
 #ifdef LEAF
   int x = 1;
 #endif
-  char buf[SGRAB + 9], s[25];
+  char buf[SGRAB + 9] = "", s[25] = "";
   FILE *f;
 #ifdef LEAF
   int skip = 0;
@@ -1063,7 +1062,7 @@ int main(int argc, char **argv)
 
   //The config dir is accessable with correct permissions, lets read/write/create config file now..
   {		/* config shit */
-    char cfile[DIRMAX], templine[8192];
+    char cfile[DIRMAX] = "", templine[8192] = "";
 #ifdef LEAF
     egg_snprintf(cfile, sizeof cfile, STR("%s/.known_hosts"), confdir());
 #else /* HUB */
@@ -1161,7 +1160,7 @@ int main(int argc, char **argv)
           } //First bot in conf
 #ifdef LEAF
           else { //these are the rest of the bots..
-            char buf2[DIRMAX];
+            char buf2[DIRMAX] = "";
             FILE *fp;
 
             xx = 0, x = 0, errno = 0;
@@ -1212,7 +1211,9 @@ int main(int argc, char **argv)
   console_init();
   ctcp_init();
   module_load("compress");
+
   chanprog();
+
   clear_tmp();
 #ifdef LEAF
   if (localhub) {
@@ -1370,6 +1371,7 @@ int main(int argc, char **argv)
 
     buf[0] = 0;
     xx = sockgets(buf, &i); 
+    /* "chanprog()" bug is down here somewhere.... */
     if (xx >= 0) {		/* Non-error */
       int idx;