Changeset 562 for trunk/src/yulectl.c

Timestamp:

Jun 29, 2021, 10:23:44 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #450 (compiler warnings) and fixes for tests.

File:

• trunk/src/yulectl.c (modified) (6 diffs)

trunk/src/yulectl.c

@@ -48 +48 @@
 #endif
 
+#define SH_PW_SIZE 15
+
 static int    sock     = -1;
-static char   password[15] = "";
+static char   password[SH_PW_SIZE] = "";
 static int    verbose = 0;
 
@@ -123 +125 @@
 static char * safe_copy(char * to, const char * from, size_t size)
 {
-  if (to && from)
-    {
-      strncpy (to, from, size);
-      if (size > 0)
-        to[size-1] = '\0';
-      else 
-        *to = '\0';
+  if (to && from && (size > 0))
+    {
+      strncpy (to, from, size-1);
+      to[size-1] = '\0';
     }
   return to;
@@ -144 +143 @@
    */
   name.sun_family = AF_UNIX;
-  strncpy (name.sun_path, serversock, sizeof(name.sun_path) - 1);
+  memcpy(name.sun_path, serversock, sizeof(name.sun_path));
+  name.sun_path[sizeof(name.sun_path)-1] = '\0';
+  if (strlen(serversock) > strlen(name.sun_path))
+    {
+      perror (_("ERROR: socket path too long"));
+      return -1;
+    }
   size = (offsetof (struct sockaddr_un, sun_path)
           + strlen (name.sun_path) + 1);
@@ -401 +406 @@
    */
   pw = getenv(_("YULECTL_PASSWORD"));
-  if (pw && strlen(pw) < 15)
+  if (pw && strlen(pw) < SH_PW_SIZE)
     {
       strcpy(password, pw);
@@ -413 +418 @@
     return -1;
 
-  if ( (strlen(home) + strlen(_("/.yulectl_cred")) + 1) > 4096)
+  if ( (strlen(home) + strlen(_("/.yulectl_cred")) + 1) > sizeof(home))
     {
       fprintf (stderr, "%s", _("ERROR: path for $HOME is too long.\n"));
@@ -451 +456 @@
   (void) rtrim(message2);
 
-  if (strlen(message2) > 14)
+  if (strlen(message2) > (SH_PW_SIZE -1))
     {
       fprintf (stderr, "%s",