More strcpy() strcat() sprintf() squashing

[fw/sdcc] / src / SDCCmain.c

diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index e6f0f3ba9b94a58e8b5c51371fc7c175921cbf55..8b41cce77ba3cd4279f6950910878a654f610540 100644 (file)
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -54,6 +54,7 @@ char *fullSrcFileName;                /* full name for the source file; */
                                /* can be NULL while c1mode or linking without compiling */
 char *fullDstFileName;         /* full name for the output file; */
                                /* only given by -o, otherwise NULL */
+size_t fullDstFileNameLen;     /* size of previous string. */
 char *dstFileName;             /* destination file name without extension */
 char *dstPath = "";            /* path for the output files; */
                                /* "" is equivalent with cwd */
@@ -559,7 +560,7 @@ processFile (char *s)
        }
 
       /* copy the file name into the buffer */
-      strcpy (buffer, s);
+      strncpyz (buffer, s, PATH_MAX);
 
       /* get rid of the "."-extension */
 
@@ -694,7 +695,10 @@ tryHandleUnsupportedOpt(char **argv, int *pi)
                         (longOpt && unsupportedOptTable[i].longOpt && !strcmp(unsupportedOptTable[i].longOpt, longOpt))) {
                         // Found an unsupported opt.
                         char buffer[100];
-                        sprintf(buffer, "%s%c%c", longOpt ? longOpt : "", shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' ');
+                        SNPRINTF(buffer, sizeof(buffer), 
+                                "%s%c%c", 
+                                longOpt ? longOpt : "", 
+                                shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' ');
                         werror (W_UNSUPP_OPTION, buffer, unsupportedOptTable[i].message);
                         return 1;
                     }
@@ -1028,7 +1032,7 @@ parseCmdLine (int argc, char **argv)
                 char *p;
 
                 /* copy the file name into the buffer */
-                strcpy (buffer, getStringArg("-o", argv, &i, argc));
+                strncpyz(buffer, getStringArg("-o", argv, &i, argc), PATH_MAX);
                 /* point to last character */
                 p = buffer + strlen (buffer) - 1;
                 if (*p == DIR_SEPARATOR_CHAR)
@@ -1040,6 +1044,7 @@ parseCmdLine (int argc, char **argv)
                 else
                   {
                     fullDstFileName = Safe_strdup (buffer);
+                   fullDstFileNameLen = strlen(fullDstFileName) + 1;
 
                     /* get rid of the "."-extension */
 
@@ -1133,7 +1138,7 @@ parseCmdLine (int argc, char **argv)
                if (sOpt == 'Y')
                  sOpt = 'I';
 
-               sprintf (buffer, "-%c%s", sOpt, rest);
+               SNPRINTF (buffer, sizeof(buffer), "-%c%s", sOpt, rest);
                addToList (preArgv, buffer);
              }
              break;
@@ -1196,16 +1201,19 @@ parseCmdLine (int argc, char **argv)
       /* use the modulename from the C-source */
       if (fullSrcFileName)
         {
-          dstFileName = Safe_alloc (strlen (dstPath) + strlen (moduleName) + 1);
-          strcpy (dstFileName, dstPath);
-          strcat (dstFileName, moduleName);
+         size_t bufSize = strlen (dstPath) + strlen (moduleName) + 1;
+
+         dstFileName = Safe_alloc (bufSize);
+          strncpyz (dstFileName, dstPath, bufSize);
+          strncatz (dstFileName, moduleName, bufSize);
         }
       /* use the modulename from the first object file */
       else if (nrelFiles >= 1)
         {
           char *objectName;
+         size_t bufSize;
 
-          strcpy (buffer, relFiles[0]);
+          strncpyz (buffer, relFiles[0], PATH_MAX);
           /* remove extension (it must be .rel) */
           *strrchr (buffer, '.') = '\0';
           /* remove path */
@@ -1218,9 +1226,10 @@ parseCmdLine (int argc, char **argv)
             {
               objectName = buffer;
             }
-          dstFileName = Safe_alloc (strlen (dstPath) + strlen (objectName) + 1);
-          strcpy (dstFileName, dstPath);
-          strcat (dstFileName, objectName);
+         bufSize = strlen (dstPath) + strlen (objectName) + 1;  
+          dstFileName = Safe_alloc (bufSize);
+          strncpyz (dstFileName, dstPath, bufSize);
+          strncatz (dstFileName, objectName, bufSize);
         }
       /* else no module given: help text is displayed */
     }
@@ -1232,7 +1241,8 @@ parseCmdLine (int argc, char **argv)
   /* if debug option is set the open the cdbFile */
   if (options.debug && fullSrcFileName)
     {
-      sprintf (scratchFileName, "%s.adb", dstFileName); //JCF: Nov 30, 2002
+      SNPRINTF (scratchFileName, sizeof(scratchFileName), 
+               "%s.adb", dstFileName); //JCF: Nov 30, 2002
       if ((cdbFile = fopen (scratchFileName, "w")) == NULL)
        werror (E_FILE_OPEN_ERR, scratchFileName);
       else
@@ -1255,7 +1265,8 @@ linkEdit (char **envp)
   int i, system_ret;
 
   /* first we need to create the <filename>.lnk file */
-  sprintf (scratchFileName, "%s.lnk", dstFileName);
+  SNPRINTF (scratchFileName, sizeof(scratchFileName), 
+           "%s.lnk", dstFileName);
   if (!(lnkfile = fopen (scratchFileName, "w")))
     {
       werror (E_FILE_OPEN_ERR, scratchFileName);
@@ -1387,33 +1398,35 @@ linkEdit (char **envp)
   /* -o option overrides default name? */
   if (fullDstFileName)
     {
-      strcpy (scratchFileName, fullDstFileName);
+      strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName));
     }
   else
     {
       /* the linked file gets the name of the first modul */
       if (fullSrcFileName)
         {
-          strcpy (scratchFileName, dstFileName);
+          strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
         }
       else
         {
-          strcpy (scratchFileName, relFiles[0]);
+          strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
           /* strip ".rel" extension */
           *strrchr (scratchFileName, '.') = '\0';
         }
-      strcat (scratchFileName, options.out_fmt ? ".S19" : ".ihx");
+      strncatz (scratchFileName, 
+               options.out_fmt ? ".S19" : ".ihx",
+               sizeof(scratchFileName));
     }
 
   if (port->linker.cmd)
     {
       char buffer2[PATH_MAX];
       buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, NULL);
-      buildCmdLine2 (buffer, buffer2);
+      buildCmdLine2 (buffer, buffer2, PATH_MAX);
     }
   else
     {
-      buildCmdLine2 (buffer, port->linker.mcmd);
+      buildCmdLine2 (buffer, port->linker.mcmd, PATH_MAX);
     }
 
   system_ret = my_system (buffer);
@@ -1425,16 +1438,24 @@ linkEdit (char **envp)
       /* the linked file gets the name of the first modul */
       if (fullSrcFileName)
         {
-          strcpy (scratchFileName, dstFileName);
+          strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
           p = strlen (scratchFileName) + scratchFileName;
         }
       else
         {
-          strcpy (scratchFileName, relFiles[0]);
+          strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
           /* strip "rel" extension */
-          p = strrchr (scratchFileName, '.') + 1;
+          p = strrchr (scratchFileName, '.');
+         if (p)
+           {
+               p++;
+               *p = 0;
+           }
+           
         }
-      strcpy (p, options.out_fmt ? "S19" : "ihx");
+      strncatz (scratchFileName,
+               options.out_fmt ? "S19" : "ihx",
+               sizeof(scratchFileName));
       rename (scratchFileName, fullDstFileName);
 
       q = strrchr (fullDstFileName, '.');
@@ -1446,13 +1467,19 @@ linkEdit (char **envp)
       else
         {
           /* no extension: append new extensions */
+         /* Don't we want to append a period here ? */
           q = strlen (fullDstFileName) + fullDstFileName;
         }
-      strcpy (p, "map");
-      strcpy (q, "map");
+               
+      *p = 0;  
+      strncatz (scratchFileName, "map", sizeof(scratchFileName));
+      *q = 0;
+      strncatz(fullDstFileName, "map", fullDstFileNameLen);
       rename (scratchFileName, fullDstFileName);
-      strcpy (p, "mem");
-      strcpy (q, "mem");
+      *p = 0;  
+      strncatz (scratchFileName, "mem", sizeof(scratchFileName));
+      *q = 0;
+      strncatz(fullDstFileName, "mem", fullDstFileNameLen);    
       rename (scratchFileName, fullDstFileName);
     }
   if (system_ret)
@@ -1471,11 +1498,11 @@ assemble (char **envp)
 
     /* -o option overrides default name? */
     if (options.cc_only && fullDstFileName) {
-        strcpy (scratchFileName, fullDstFileName);
+        strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName));
     } else {
         /* the assembled file gets the name of the first modul */
-        strcpy (scratchFileName, dstFileName);
-        strcat (scratchFileName, port->linker.rel_ext);
+        strncpyz (scratchFileName, dstFileName, PATH_MAX);
+        strncatz (scratchFileName, port->linker.rel_ext, PATH_MAX);
     }
 
     if (port->assembler.do_assemble) {
@@ -1486,7 +1513,7 @@ assemble (char **envp)
                      options.debug ? port->assembler.debug_opts : port->assembler.plain_opts,
                      asmOptions);
     } else {
-       buildCmdLine2 (buffer, port->assembler.mcmd);
+       buildCmdLine2 (buffer, port->assembler.mcmd, sizeof(buffer));
     }
 
     if (my_system (buffer)) {
@@ -1498,8 +1525,10 @@ assemble (char **envp)
     /* TODO: most assembler don't have a -o parameter */
     /* -o option overrides default name? */
     if (options.cc_only && fullDstFileName) {
-        strcpy (scratchFileName, dstFileName);
-        strcat (scratchFileName, port->linker.rel_ext);
+        strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
+        strncatz (scratchFileName, 
+                 port->linker.rel_ext,
+                 sizeof(scratchFileName));
         rename (scratchFileName, fullDstFileName);
     }
 }
@@ -1586,7 +1615,7 @@ preProcess (char **envp)
       if (options.verbose)
        printf ("sdcc: Calling preprocessor...\n");
 
-      buildCmdLine2 (buffer, _preCmd);
+      buildCmdLine2 (buffer, _preCmd, PATH_MAX);
 
       if (my_system (buffer))
        {
@@ -1617,8 +1646,8 @@ _setPaths (const char *pprefix)
       where expected.  If so, set.
   */
   getPathDifference (buffer, PREFIX, SDCC_INCLUDE_DIR);
-  strcpy (scratchFileName, pprefix);
-  strcat (scratchFileName, buffer);
+  strncpyz (scratchFileName, pprefix, sizeof(scratchFileName));
+  strncatz (scratchFileName, buffer, sizeof(scratchFileName));
 
   if (pathExists (scratchFileName))
     {
@@ -1630,8 +1659,8 @@ _setPaths (const char *pprefix)
     }
 
   getPathDifference (buffer, PREFIX, SDCC_LIB_DIR);
-  strcpy (scratchFileName, pprefix);
-  strcat (scratchFileName, buffer);
+  strncpyz (scratchFileName, pprefix, sizeof(scratchFileName));
+  strncatz (scratchFileName, buffer, sizeof(scratchFileName));
 
   if (pathExists (scratchFileName))
     {
@@ -1675,7 +1704,7 @@ _discoverPaths (const char *argv0)
    */
   if (strchr (argv0, DIR_SEPARATOR_CHAR))
     {
-      strcpy (scratchFileName, argv0);
+      strncpyz (scratchFileName, argv0, sizeof(scratchFileName));
       *strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0';
       setMainValue ("bindir", scratchFileName);
       ExePathList[0] = Safe_strdup (scratchFileName);
@@ -1683,8 +1712,8 @@ _discoverPaths (const char *argv0)
   else if (getenv (SDCCDIR_NAME) != NULL)
     {
       getPathDifference (buffer, PREFIX, BINDIR);
-      strcpy (scratchFileName, getenv (SDCCDIR_NAME));
-      strcat (scratchFileName, buffer);
+      strncpyz (scratchFileName, getenv (SDCCDIR_NAME), sizeof(scratchFileName));
+      strncatz (scratchFileName, buffer, PATH_MAX);
       setMainValue ("bindir", scratchFileName);
       ExePathList[0] = Safe_strdup (scratchFileName);
     }