Changeset 2238:6390b65b36b6 for browser.c

Timestamp:

2001-01-08 08:57:20 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Fix and/or check more fishy code.

Files:

• browser.c (modified) (6 diffs)

browser.c

@@ -177 +177 @@
       if (folder->ff->st != NULL)
       {
-        strcat (fn, S_ISLNK (folder->ff->st->st_mode) ? "@" : 
+        strcat (fn, S_ISLNK (folder->ff->st->st_mode) ? "@" :           /* __STRCAT_CHECKED__ */
                 (S_ISDIR (folder->ff->st->st_mode) ? "/" : 
                  ((folder->ff->st->st_mode & S_IXUSR) != 0 ? "*" : "")));
@@ -567 +567 @@
       {
         getcwd (LastDir, sizeof (LastDir));
-        strcat (LastDir, "/");
+        strcat (LastDir, "/");  /* __STRCAT_CHECKED__ */
         strncat (LastDir, f, i);
       }
@@ -683 +683 @@
             {
               if (mutt_strcmp ("..", LastDir + mutt_strlen (LastDir) - 2) == 0)
-                strcat (LastDir, "/..");
+                strcat (LastDir, "/..");        /* __STRCAT_CHECKED__ */
               else
               {
@@ -695 +695 @@
                     LastDir[1] = 0;
                   else
-                    strcat (LastDir, "/..");
+                    strcat (LastDir, "/..");    /* __STRCAT_CHECKED__ */
                 }
               }
@@ -701 +701 @@
             else if (buffy)
             {
-              sprintf (LastDir, "%s", state.entry[menu->current].name);
+              strfcpy (LastDir, state.entry[menu->current].name, sizeof (LastDir));
               mutt_expand_path (LastDir, sizeof (LastDir));
             }
@@ -727 +727 @@
 #endif
             else
-              sprintf (LastDir + mutt_strlen (LastDir), "/%s",
-                       state.entry[menu->current].name);
+            {
+              char tmp[_POSIX_PATH_MAX];
+              snprintf (tmp, sizeof (tmp), "%s/%s", LastDir, state.entry[menu->current].name);
+              strfcpy (LastDir, tmp, sizeof (LastDir));
+            }
 
             destroy_state (&state);