Fix server name/pass len handling on jump

Found by: michaelortmann
Patch by: michaelortmann

Due to eggdrops mod API, we cannot use sizeof in irc.mod for strings defined in server.mod.

Author: michaelortmann

src/mod/irc.mod/msgcmds.c

@@ -1095,9 +1095,9 @@ static int msg_jump(char *nick, char *host, struct userrec *u, char *par)
       putlog(LOG_CMDS, "*", "(%s!%s) !%s! JUMP %s %d %s", nick, host,
              u->handle, s, port, par);
 #endif
-      strcpy(newserver, s);
+      strlcpy(newserver, s, NEWSERVERMAX);
       newserverport = port;
-      strcpy(newserverpass, par);
+      strlcpy(newserverpass, par, NEWSERVERPASSMAX);
     } else
       putlog(LOG_CMDS, "*", "(%s!%s) !%s! JUMP", nick, host, u->handle);
     dprintf(-serv, "NOTICE %s :%s\n", nick, IRC_JUMP);

src/mod/server.mod/server.c

@@ -31,9 +31,9 @@ static Function *global = NULL;
 
 static int ctcp_mode;
 static int serv;                /* sock # of server currently */
-static char newserver[121];     /* new server? */
+static char newserver[NEWSERVERMAX]; /* new server? */
 static int newserverport;       /* new server port? */
-static char newserverpass[121]; /* new server password? */
+static char newserverpass[NEWSERVERPASSMAX]; /* new server password? */
 static time_t trying_server;    /* trying to connect to a server right now? */
 static int server_lag;          /* how lagged (in seconds) is the server? */
 static char altnick[NICKLEN];   /* possible alternate nickname to use */

src/mod/server.mod/server.h

@@ -23,12 +23,14 @@
 #ifndef _EGG_MOD_SERVER_SERVER_H
 #define _EGG_MOD_SERVER_SERVER_H
 
-#define CAPMAX       499    /*  (512 - "CAP REQ :XXX\r\n")     */
-#define CLITAGMAX    4096   /* Max size for IRCv3 message-tags sent by client*/
-#define TOTALTAGMAX  8191   /* @ + Server tag len + ; + Client tag len + ' ' */
-#define MSGMAX       511    /* Max size of IRC message line    */
-#define SENDLINEMAX  CLITAGMAX + MSGMAX
-#define RECVLINEMAX  TOTALTAGMAX + MSGMAX
+#define CAPMAX           499    /*  (512 - "CAP REQ :XXX\r\n")     */
+#define CLITAGMAX        4096   /* Max size for IRCv3 message-tags sent by client*/
+#define TOTALTAGMAX      8191   /* @ + Server tag len + ; + Client tag len + ' ' */
+#define MSGMAX           511    /* Max size of IRC message line    */
+#define SENDLINEMAX      CLITAGMAX + MSGMAX
+#define RECVLINEMAX      TOTALTAGMAX + MSGMAX
+#define NEWSERVERMAX     256
+#define NEWSERVERPASSMAX 128
 
 #define check_tcl_ctcp(a,b,c,d,e,f) check_tcl_ctcpr(a,b,c,d,e,f,H_ctcp)
 #define check_tcl_ctcr(a,b,c,d,e,f) check_tcl_ctcpr(a,b,c,d,e,f,H_ctcr)

src/mod/server.mod/servmsg.c

@@ -1918,7 +1918,7 @@ static void server_resolve_failure(int);
  */
 static void connect_server(void)
 {
-  char pass[121], botserver[UHOSTLEN], s[1024];
+  char pass[NEWSERVERPASSMAX], botserver[NEWSERVERMAX], s[1024];
 #ifdef IPV6
   char buf[sizeof(struct in6_addr)];
 #endif
@@ -1930,9 +1930,9 @@ static void connect_server(void)
   empty_msgq();
   if (newserverport) {          /* Jump to specified server */
     curserv = -1;             /* Reset server list */
-    strcpy(botserver, newserver);
+    strlcpy(botserver, newserver, sizeof botserver);
     botserverport = newserverport;
-    strcpy(pass, newserverpass);
+    strlcpy(pass, newserverpass, sizeof pass);
     newserver[0] = 0;
     newserverport = 0;
     newserverpass[0] = 0;