Ticket #3547: mc-3547-robust-sizeof-usage-at-function-parameter-and-use-me.patch

lib/tty/key.c

@@ -923 +923 @@
     {
         int shift_ext_status;
 
-        if (devctl (fileno (stdin), DCMD_CHR_LINESTATUS, &mod_status, sizeof (int), NULL) == -1)
+        if (devctl (fileno (stdin), DCMD_CHR_LINESTATUS, &mod_status, sizeof (mod_status), NULL) == -1)
             return 0;
         shift_ext_status = mod_status & 0xffffff00UL;
         mod_status &= 0x7f;

lib/utilunix.c

@@ -798 +798 @@
             return 1;
         }
         close (old_error);
-        len = read (error_pipe[0], msg, MAX_PIPE_SIZE - 1);
+        len = read (error_pipe[0], msg, sizeof (msg));
 
         if (len >= 0)
             msg[len] = 0;
@@ -1132 +1132 @@
         }
         else
         {
-            g_snprintf (got_path, PATH_MAX, "%s", new_path);
+            g_snprintf (got_path, sizeof (got_path), "%s", new_path);
             g_free (new_path);
             new_path = got_path;
         }

lib/widget/input_complete.c

@@ -399 +399 @@
     if (!file)
         return;
 
-    while (fgets (buffer, 255, file) != NULL)
+    while (fgets (buffer, sizeof (buffer) - 1, file) != NULL)
     {
         /* Skip to first character. */
         for (bi = buffer; bi[0] != '\0' && str_isspace (bi); str_next_char (&bi));
@@ -1284 +1284 @@
     try_complete_automation_state_t state;
     char **matches = NULL;
 
-    memset (&state, 0, sizeof (try_complete_automation_state_t));
+    memset (&state, 0, sizeof (state));
     state.flags = flags;
 
     SHOW_C_CTX ("try_complete");

src/background.c

@@ -256 +256 @@
 
     if (have_ctx)
     {
-        if (read (fd, ctx, sizeof (file_op_context_t)) != sizeof (file_op_context_t))
+        if (read (fd, ctx, sizeof (*ctx)) != sizeof (*ctx))
         {
             return reading_failed (-1, data);
         }
@@ -342 +342 @@
             }
 
         /* Send the result code and the value for shared variables */
-        ret = write (to_child_fd, &result, sizeof (int));
+        ret = write (to_child_fd, &result, sizeof (result));
         if (have_ctx && to_child_fd != -1)
-            ret = write (to_child_fd, ctx, sizeof (file_op_context_t));
+            ret = write (to_child_fd, ctx, sizeof (*ctx));
     }
     else if (type == Return_String)
     {
@@ -416 +416 @@
     have_ctx = (ctx != NULL);
 
     ret = write (parent_fd, &routine, sizeof (routine));
-    ret = write (parent_fd, &argc, sizeof (int));
+    ret = write (parent_fd, &argc, sizeof (argc));
     ret = write (parent_fd, &type, sizeof (type));
     ret = write (parent_fd, &have_ctx, sizeof (have_ctx));
 
     if (have_ctx)
-        ret = write (parent_fd, ctx, sizeof (file_op_context_t));
+        ret = write (parent_fd, ctx, sizeof (*ctx));
     (void) ret;
 }
 
@@ -442 +442 @@
 
         len = va_arg (ap, int);
         value = va_arg (ap, void *);
-        ret = write (parent_fd, &len, sizeof (int));
+        ret = write (parent_fd, &len, sizeof (len));
         ret = write (parent_fd, value, len);
     }
 
-    ret = read (from_parent_fd, &i, sizeof (int));
+    ret = read (from_parent_fd, &i, sizeof (i));
     if (ctx)
-        ret = read (from_parent_fd, ctx, sizeof (file_op_context_t));
+        ret = read (from_parent_fd, ctx, sizeof (*ctx));
 
     (void) ret;
     return i;
@@ -470 +470 @@
 
         len = va_arg (ap, int);
         value = va_arg (ap, void *);
-        if ((write (parent_fd, &len, sizeof (int)) != sizeof (int)) ||
+        if ((write (parent_fd, &len, sizeof (len)) != sizeof (len)) ||
             (write (parent_fd, value, len) != len))
         {
             return NULL;
         }
     }
 
-    if (read (from_parent_fd, &i, sizeof (int)) != sizeof (int))
+    if (read (from_parent_fd, &i, sizeof (i)) != sizeof (i))
         return NULL;
     if (!i)
         return NULL;

src/diffviewer/ydiff.c

@@ -1065 +1065 @@
         Lprev = Lcurr;
         Lcurr = L;
 #ifdef USE_MEMSET_IN_LCS
-        memset (Lcurr, 0, (n + 1) * sizeof (int));
+        memset (Lcurr, 0, (n + 1) * sizeof (*Lcurr));
 #endif
         for (j = 0; j < n; j++)
         {

src/editor/edit.c

@@ -2238 +2238 @@
     }
 
     edit_clean (edit);
-    memcpy (edit, e, sizeof (WEdit));
+    memcpy (edit, e, sizeof (*edit));
     g_free (e);
 
     return TRUE;

src/editor/editdraw.c

@@ -554 +554 @@
         cur_line = edit->start_line + row;
         if (cur_line <= (unsigned int) edit->buffer.lines)
         {
-            g_snprintf (line_stat, LINE_STATE_WIDTH + 1, "%7i ", cur_line + 1);
+            g_snprintf (line_stat, sizeof (line_stat), "%7i ", cur_line + 1);
         }
         else
         {

src/filemanager/cmd.c

@@ -247 +247 @@
             rotate_dash (TRUE);
             do
             {
-                while ((n1 = read (file1, buf1, BUFSIZ)) == -1 && errno == EINTR);
-                while ((n2 = read (file2, buf2, BUFSIZ)) == -1 && errno == EINTR);
+                while ((n1 = read (file1, buf1, sizeof (buf1))) == -1 && errno == EINTR);
+                while ((n2 = read (file2, buf2, sizeof (buf2))) == -1 && errno == EINTR);
             }
             while (n1 == n2 && n1 == BUFSIZ && !memcmp (buf1, buf2, BUFSIZ));
             result = (n1 != n2) || memcmp (buf1, buf2, n1);

src/filemanager/dir.c

@@ -561 +561 @@
     }
 
     fentry = &list->list[0];
-    memset (fentry, 0, sizeof (file_entry_t));
+    memset (fentry, 0, sizeof (*fentry));
     fentry->fnamelen = 2;
     fentry->fname = g_strndup ("..", fentry->fnamelen);
     fentry->f.link_to_dir = 0;

src/filemanager/filegui.c

@@ -909 +909 @@
 
         file_eta_prepare_for_show (buffer2, ctx->eta_secs, FALSE);
         if (ctx->bps == 0)
-            g_snprintf (buffer, BUF_TINY, "%s %s", buffer2, stalled_msg);
+            g_snprintf (buffer, sizeof (buffer), "%s %s", buffer2, stalled_msg);
         else
         {
             char buffer3[BUF_TINY];
 
             file_bps_prepare_for_show (buffer3, ctx->bps);
-            g_snprintf (buffer, BUF_TINY, "%s (%s) %s", buffer2, buffer3, stalled_msg);
+            g_snprintf (buffer, sizeof (buffer), "%s (%s) %s", buffer2, buffer3, stalled_msg);
         }
     }
     else
     {
-        g_snprintf (buffer, BUF_TINY, "%s", stalled_msg);
+        g_snprintf (buffer, sizeof (buffer), "%s", stalled_msg);
     }
 
     label_set_text (ui->progress_file_label, buffer);
@@ -942 +942 @@
         return;
 
     if (ctx->progress_totals_computed)
-        g_snprintf (buffer, BUF_TINY, _("Files processed: %zu/%zu"), done, total);
+        g_snprintf (buffer, sizeof (buffer), _("Files processed: %zu/%zu"), done, total);
     else
-        g_snprintf (buffer, BUF_TINY, _("Files processed: %zu"), done);
+        g_snprintf (buffer, sizeof (buffer), _("Files processed: %zu"), done);
     label_set_text (ui->total_files_processed_label, buffer);
 }
 
@@ -991 +991 @@
         {
             file_eta_prepare_for_show (buffer3, tctx->eta_secs, TRUE);
             if (tctx->bps == 0)
-                g_snprintf (buffer, BUF_TINY, _("Time: %s %s"), buffer2, buffer3);
+                g_snprintf (buffer, sizeof (buffer), _("Time: %s %s"), buffer2, buffer3);
             else
             {
 
                 file_bps_prepare_for_show (buffer4, (long) tctx->bps);
-                g_snprintf (buffer, BUF_TINY, _("Time: %s %s (%s)"), buffer2, buffer3, buffer4);
+                g_snprintf (buffer, sizeof (buffer), _("Time: %s %s (%s)"), buffer2, buffer3, buffer4);
             }
         }
         else
         {
             if (tctx->bps == 0)
-                g_snprintf (buffer, BUF_TINY, _("Time: %s"), buffer2);
+                g_snprintf (buffer, sizeof (buffer), _("Time: %s"), buffer2);
             else
             {
                 file_bps_prepare_for_show (buffer4, (long) tctx->bps);
-                g_snprintf (buffer, BUF_TINY, _("Time: %s (%s)"), buffer2, buffer4);
+                g_snprintf (buffer, sizeof (buffer), _("Time: %s (%s)"), buffer2, buffer4);
             }
         }
 
@@ -1017 +1017 @@
     {
         size_trunc_len (buffer2, 5, tctx->copied_bytes, 0, panels_options.kilobyte_si);
         if (!ctx->progress_totals_computed)
-            g_snprintf (buffer, BUF_TINY, _(" Total: %s "), buffer2);
+            g_snprintf (buffer, sizeof (buffer), _(" Total: %s "), buffer2);
         else
         {
             size_trunc_len (buffer3, 5, ctx->progress_bytes, 0, panels_options.kilobyte_si);
-            g_snprintf (buffer, BUF_TINY, _(" Total: %s/%s "), buffer2, buffer3);
+            g_snprintf (buffer, sizeof (buffer), _(" Total: %s/%s "), buffer2, buffer3);
         }
 
         hline_set_text (ui->total_bytes_label, buffer);

src/filemanager/mountlist.c

@@ -1726 +1726 @@
 
     if (entry != NULL)
     {
-        memset (&fs_use, 0, sizeof (struct fs_usage));
+        memset (&fs_use, 0, sizeof (fs_use));
         get_fs_usage (entry->me_mountdir, NULL, &fs_use);
 
         myfs_stats->type = entry->me_dev;

src/filemanager/panelize.c

@@ -329 +329 @@
     while (TRUE)
     {
         clearerr (external);
-        if (fgets (line, MC_MAXPATHLEN, external) == NULL)
+        if (fgets (line, sizeof (line), external) == NULL)
         {
             if (ferror (external) && errno == EINTR)
                 continue;

src/setup.c

@@ -1388 +1388 @@
     for (i = 0; i < LIST_TYPES; i++)
     {
         g_free (panel->user_status_format[i]);
-        g_snprintf (buffer2, BUF_TINY, "user_status%lld", (long long) i);
+        g_snprintf (buffer2, sizeof (buffer2), "user_status%lld", (long long) i);
         panel->user_status_format[i] =
             mc_config_get_string (mc_panels_config, section, buffer2, DEFAULT_USER_FORMAT);
     }
@@ -1424 +1424 @@
 
     for (i = 0; i < LIST_TYPES; i++)
     {
-        g_snprintf (buffer, BUF_TINY, "user_status%lld", (long long) i);
+        g_snprintf (buffer, sizeof (buffer), "user_status%lld", (long long) i);
         mc_config_set_string (mc_panels_config, section, buffer, panel->user_status_format[i]);
     }
 

src/subshell/common.c

@@ -570 +570 @@
         else if (FD_ISSET (subshell_pipe[READ], &read_set))
             /* Read the subshell's CWD and capture its prompt */
         {
-            bytes = read (subshell_pipe[READ], subshell_cwd, MC_MAXPATHLEN + 1);
+            bytes = read (subshell_pipe[READ], subshell_cwd, sizeof (subshell_cwd));
             if (bytes <= 0)
             {
                 tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);

src/vfs/ftpfs/ftpfs.c

@@ -832 +832 @@
 
     tty_enable_interrupt_key ();        /* clear the interrupt flag */
 
-    memset (&hints, 0, sizeof (struct addrinfo));
+    memset (&hints, 0, sizeof (hints));
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 
@@ -1258 +1258 @@
 {
     int result;
 
-    memset (data_addr, 0, sizeof (struct sockaddr_storage));
+    memset (data_addr, 0, sizeof (*data_addr));
     *data_addrlen = sizeof (struct sockaddr_storage);
 
     if (SUP->use_passive_connection)

src/vfs/sftpfs/config_parser.c

@@ -220 +220 @@
     while (!feof (ssh_config_handler))
     {
         char *cr;
-        if (fgets (buffer, BUF_MEDIUM, ssh_config_handler) == NULL)
+        if (fgets (buffer, sizeof (buffer), ssh_config_handler) == NULL)
         {
             if (errno != 0)
             {

src/vfs/sftpfs/connection.c

@@ -83 +83 @@
 
     tty_enable_interrupt_key ();        /* clear the interrupt flag */
 
-    memset (&hints, 0, sizeof (struct addrinfo));
+    memset (&hints, 0, sizeof (hints));
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 

src/vfs/sftpfs/vfs_class.c

@@ -675 +675 @@
 void
 sftpfs_init_class (void)
 {
-    memset (&sftpfs_class, 0, sizeof (struct vfs_class));
+    memset (&sftpfs_class, 0, sizeof (sftpfs_class));
     sftpfs_class.name = "sftpfs";
     sftpfs_class.prefix = "sftp";
     sftpfs_class.flags = VFSF_NOLINKS;

src/vfs/sftpfs/vfs_subclass.c

@@ -176 +176 @@
 void
 sftpfs_init_subclass (void)
 {
-    memset (&sftpfs_subclass, 0, sizeof (struct vfs_s_subclass));
+    memset (&sftpfs_subclass, 0, sizeof (sftpfs_subclass));
     sftpfs_subclass.flags = VFS_S_REMOTE;
 }
 

src/vfs/smbfs/helpers/lib/system.c

@@ -89 +89 @@
 
         if (found)
         {
-            memcpy ((void *) fds, (void *) &fds2, sizeof (fds2));
+            memcpy ((void *) fds, (void *) &fds2, sizeof (*fds));
             return (found);
         }
 

src/vfs/smbfs/helpers/lib/util.c

@@ -1304 +1304 @@
     BOOL matched;
 
     /* Make local copies of str and regexp */
-    StrnCpy (p1, regexp, sizeof (pstring) - 1);
-    StrnCpy (p2, str, sizeof (pstring) - 1);
+    StrnCpy (p1, regexp, sizeof (p1) - 1);
+    StrnCpy (p2, str, sizeof (p2) - 1);
 
     if (!strchr (p2, '.'))
     {

src/vfs/smbfs/helpers/lib/util_sock.c

@@ -60 +60 @@
 {
     int v;
     unsigned int l;
-    l = sizeof (int);
+    l = sizeof (l);
     return (getsockopt (fd, SOL_SOCKET, SO_TYPE, (char *) &v, &l) == 0);
 }
 
@@ -161 +161 @@
         case OPT_BOOL:
         case OPT_INT:
             ret = setsockopt (fd, socket_options[i].level,
-                              socket_options[i].option, (char *) &value, sizeof (int));
+                              socket_options[i].option, (char *) &value, sizeof (value));
             break;
 
         case OPT_ON:
@@ -171 +171 @@
             {
                 int on = socket_options[i].value;
                 ret = setsockopt (fd, socket_options[i].level,
-                                  socket_options[i].option, (char *) &on, sizeof (int));
+                                  socket_options[i].option, (char *) &on, sizeof (on));
             }
             break;
         }

src/vfs/smbfs/helpers/libsmb/clientgen.c

@@ -158 +158 @@
 
         if (nt_msg == NULL)
         {
-            slprintf (error_message, sizeof (fstring) - 1, "NT code %d", nt_rpc_error);
+            slprintf (error_message, sizeof (error_message) - 1, "NT code %d", nt_rpc_error);
         }
         else
         {
@@ -2430 +2430 @@
     int len = 4;
     /* send a session request (RFC 1002) */
 
-    memcpy (&(cli->calling), calling, sizeof (*calling));
-    memcpy (&(cli->called), called, sizeof (*called));
+    memcpy (&(cli->calling), calling, sizeof (cli->calling));
+    memcpy (&(cli->called), called, sizeof (cli->called));
 
     /* put in the destination name */
     p = cli->outbuf + len;
@@ -2932 +2932 @@
     pstring path2;
     char *p;
 
-    safe_strcpy (path2, path, sizeof (pstring) - 1);
+    safe_strcpy (path2, path, sizeof (path2) - 1);
     trim_string (path2, NULL, "\\");
     if (!*path2)
         *path2 = '\\';

src/vfs/smbfs/helpers/libsmb/namequery.c

@@ -270 +270 @@
 
         *name_type = -1;
 
-        if (!fgets_slash (line, sizeof (pstring), fp))
+        if (!fgets_slash (line, sizeof (line), fp))
             continue;
 
         if (*line == '#')

src/vfs/smbfs/helpers/libsmb/nmblib.c

@@ -830 +830 @@
 make_nmb_name (struct nmb_name *n, const char *name, int type)
 {
     extern pstring global_scope;
-    memset ((char *) n, '\0', sizeof (struct nmb_name));
+    memset ((char *) n, '\0', sizeof (*n));
     StrnCpy (n->name, name, 15);
     strupper (n->name);
     n->name_type = (unsigned int) type & 0xFF;

src/vfs/smbfs/helpers/param/loadparm.c

@@ -1398 +1398 @@
 ***************************************************************************/
      static void init_service (service * pservice)
 {
-    memset ((char *) pservice, '\0', sizeof (service));
+    memset ((char *) pservice, '\0', sizeof (*pservice));
     copy_service (pservice, &sDefault, NULL);
 }
 

src/vfs/smbfs/smbfs.c

@@ -1179 +1179 @@
     g_free (bucket->user);
     wipe_password (bucket->password);
     g_free (bucket->home);
-    memset (bucket, 0, sizeof (smbfs_connection));
+    memset (bucket, 0, sizeof (*bucket));
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -1451 +1451 @@
             {
                 DEBUG (4, ("smbfs_fake_server_stat: %s:%4o\n",
                            dentry->text, (int) dentry->my_stat.st_mode));
-                memcpy (buf, &dentry->my_stat, sizeof (struct stat));
+                memcpy (buf, &dentry->my_stat, sizeof (*buf));
                 return 0;
             }
             dentry = dentry->next;
@@ -1513 +1513 @@
         {
             DEBUG (6, ("smbfs_fake_share_stat: %s:%4o\n",
                        dentry->text, (int) dentry->my_stat.st_mode));
-            memcpy (buf, &dentry->my_stat, sizeof (struct stat));
+            memcpy (buf, &dentry->my_stat, sizeof (*buf));
             return 0;
         }
         dentry = dentry->next;
@@ -1552 +1552 @@
         return -1;              /* cli_list returns number of files */
     }
 
-    memcpy (buf, &single_entry->my_stat, sizeof (struct stat));
+    memcpy (buf, &single_entry->my_stat, sizeof (*buf));
 
     /* don't free here, use for smbfs_fstat() */
     /*      g_free(single_entry->text);
@@ -1570 +1570 @@
     {
         if (strcmp (text, dentry->text) == 0)
         {
-            memcpy (buf, &dentry->my_stat, sizeof (struct stat));
-            memcpy (&single_entry->my_stat, &dentry->my_stat, sizeof (struct stat));
+            memcpy (buf, &dentry->my_stat, sizeof (*buf));
+            memcpy (&single_entry->my_stat, &dentry->my_stat, sizeof (single_entry->my_stat));
             return 0;
         }
         dentry = dentry->next;
@@ -1620 +1620 @@
             mydir = p + 1;      /* advance util last '/' */
         if (strcmp (mydir, mypath) == 0)
         {                       /* fake a stat for ".." */
-            memset (buf, 0, sizeof (struct stat));
+            memset (buf, 0, sizeof (*buf));
             buf->st_mode = (S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH) & myumask;
-            memcpy (&single_entry->my_stat, buf, sizeof (struct stat));
+            memcpy (&single_entry->my_stat, buf, sizeof (single_entry->my_stat));
             g_free (mdp);
             DEBUG (1, ("        PARENT:found in %s\n", current_info->dirname));
             return 0;
@@ -1642 +1642 @@
         }
         if (strcmp (mypath, dnp) == 0)
         {
-            memset (buf, 0, sizeof (struct stat));
+            memset (buf, 0, sizeof (*buf));
             buf->st_mode = (S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH) & myumask;
-            memcpy (&single_entry->my_stat, buf, sizeof (struct stat));
+            memcpy (&single_entry->my_stat, buf, sizeof (single_entry->my_stat));
             DEBUG (1, ("        CURRENT:found in %s\n", current_info->dirname));
             return 0;
         }
@@ -1793 +1793 @@
         {
             /* make server name appear as directory */
             DEBUG (1, ("smbfs_stat: showing server as directory\n"));
-            memset (buf, 0, sizeof (struct stat));
+            memset (buf, 0, sizeof (*buf));
             buf->st_mode = (S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH) & myumask;
             g_free (service);
             return 0;
@@ -2195 +2195 @@
 
     /* use left over from previous smbfs_get_remote_stat, if available */
     if (single_entry)
-        memcpy (buf, &single_entry->my_stat, sizeof (struct stat));
+        memcpy (buf, &single_entry->my_stat, sizeof (*buf));
     else
     {                           /* single_entry not set up: bug */
         my_errno = EFAULT;

src/vfs/tar/tar.c

@@ -354 +354 @@
 
     (void) archive;
 
-    n = mc_read (tard, rec_buf.charptr, RECORDSIZE);
+    n = mc_read (tard, rec_buf.charptr, sizeof (rec_buf.charptr));
     if (n != RECORDSIZE)
         return NULL;            /* An error has occurred */
     current_tar_position += RECORDSIZE;

src/viewer/coord_cache.c

@@ -94 +94 @@
     if (pos != cache->size)
         memmove (cache->cache[pos + 1], cache->cache[pos],
                  (cache->size - pos) * sizeof (coord_cache_entry_t *));
-    cache->cache[pos] = g_memdup (entry, sizeof (coord_cache_entry_t));
+    cache->cache[pos] = g_memdup (entry, sizeof (*entry));
     cache->size++;
 }
 

tests/lib/utilunix__my_system-common.c

@@ -63 +63 @@
 
     /* store signum */
     tmp_signum = g_new (int, 1);
-    memcpy (tmp_signum, &signum, sizeof (int));
+    memcpy (tmp_signum, &signum, sizeof (*tmp_signum));
     if (sigaction_signum__captured != NULL)
         g_ptr_array_add (sigaction_signum__captured, tmp_signum);
 
@@ -71 +71 @@
     if (act != NULL)
     {
         tmp_act = g_new (struct sigaction, 1);
-        memcpy (tmp_act, act, sizeof (struct sigaction));
+        memcpy (tmp_act, act, sizeof (*tmp_act));
     }
     else
         tmp_act = NULL;
@@ -82 +82 @@
     if (oldact != NULL)
     {
         tmp_act = g_new (struct sigaction, 1);
-        memcpy (tmp_act, oldact, sizeof (struct sigaction));
+        memcpy (tmp_act, oldact, sizeof (*tmp_act));
     }
     else
         tmp_act = NULL;
@@ -131 +131 @@
 
     /* store signum */
     tmp_signum = g_new (int, 1);
-    memcpy (tmp_signum, &signum, sizeof (int));
+    memcpy (tmp_signum, &signum, sizeof (*tmp_signum));
     g_ptr_array_add (signal_signum__captured, tmp_signum);
 
     /* store handler */
     if (handler != SIG_DFL)
     {
         tmp_handler = g_new (sighandler_t, 1);
-        memcpy (tmp_handler, handler, sizeof (sighandler_t));
+        memcpy (tmp_handler, handler, sizeof (*tmp_handler));
     }
     else
         tmp_handler = (void *) SIG_DFL;