Changeset 40 for trunk/src/sh_socket.c

Timestamp:

May 31, 2006, 9:38:30 PM (18 years ago)

Author:

rainer

Message:

Fix for tickets #13, #14, #15, #16, #17

File:

• trunk/src/sh_socket.c (modified) (10 diffs)

trunk/src/sh_socket.c

@@ -111 +111 @@
 int    pf_unix_fd  = -1;
 static char * sh_sockname = NULL;
-/* static char   sh_sockpass[29]; */
-static char   sh_sockpass_real[15];
+static char   sh_sockpass_real[SOCKPASS_MAX+1];
 
 struct socket_cmd {
@@ -226 +225 @@
 {
   int j = 0;
-  while (skey->sh_sockpass[2*j] != '\0')
+  while (skey->sh_sockpass[2*j] != '\0' && j < sizeof(sh_sockpass_real))
     {
       sh_sockpass_real[j] = skey->sh_sockpass[2*j];
@@ -309 +308 @@
 
   i = sl_strlen(c);
-  if (i > 14) {
+  if (i > SOCKPASS_MAX) {
     return -1;
   }
-  for (j = 0; j < 29; ++j)
+  for (j = 0; j < (2*SOCKPASS_MAX+1); ++j)
     {
       skey->sh_sockpass[j] = '\0';
@@ -556 +555 @@
 
   iov.iov_base = (char *) &message;
-  iov.iov_len  = SH_MAXMSG;
+  iov.iov_len  = sizeof(message);
 
   memset (&msg, 0, sizeof (msg));
@@ -626 +625 @@
 #endif
 
-  /* nbytes = recv (talkfd, message, SH_MAXMSG, 0); */
-
-  message[SH_MAXMSG-1] = '\0';
+  /* msg.msg_iov.iov_base, filled by recvmsg
+   */
+  message[sizeof(message)-1] = '\0';
 
   if (nbytes < 0)
@@ -684 +683 @@
   if (eopw) 
     *eopw = '\0';
-  if (0 == strcmp(goodpassword, message))
+  /*
+   * message is null-terminated and >> goodpassword
+   */
+  if (0 == strcmp(goodpassword, message) &&
+      strlen(goodpassword) < (sizeof(message)/2))
     {
       client_uid = sh_socket_flaguid;
@@ -808 +811 @@
       while (list_cmd)
         {
-          sl_snprintf(message, SH_MAXMSG, _("SENT  %8s  %32s  %s"),
+          sl_snprintf(message, sizeof(message), _("SENT  %8s  %32s  %s"),
                       list_cmd->cmd, list_cmd->clt, list_cmd->cti);
           /*
@@ -835 +838 @@
   while (list_cmd)
     {
-      sl_snprintf(message, SH_MAXMSG, _(">>>>  %8s  %32s  %s"),
+      sl_snprintf(message, sizeof(message), _(">>>>  %8s  %32s  %s"),
                   list_cmd->cmd, list_cmd->clt, list_cmd->cti);
       /*
@@ -964 +967 @@
     }
 
-  sl_strlcpy(cancel_cmd, _("CANCEL"), SH_MAXMSGLEN); 
+  sl_strlcpy(cancel_cmd, _("CANCEL"), sizeof(cancel_cmd)); 
 
   while (sh_socket_read (&cmd) > 0)
@@ -994 +997 @@
       if (0 == sl_strcmp(new->clt, client_name))
         {
-          sl_strlcpy(out, new->cmd, SH_MAXMSGLEN);
+          sl_strlcpy(out, new->cmd, sizeof(out));
           sh_socket_add2run (new);
           sh_socket_rm2list  (client_name);