svn commit: r1720862 - in /openoffice/trunk/main: rsc/source/rscpp/cpp1.c sal/osl/unx/profile.c

[pfg]

Author: pfg
Date: Sat Dec 19 00:00:28 2015
New Revision: 1720862

URL: http://svn.apache.org/viewvc?rev=1720862&view=rev
Log:
Remember to NULL terminate when using strncpy.

All systems should have strlcpy.

Modified:
    openoffice/trunk/main/rsc/source/rscpp/cpp1.c
    openoffice/trunk/main/sal/osl/unx/profile.c

Modified: openoffice/trunk/main/rsc/source/rscpp/cpp1.c
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/rsc/source/rscpp/cpp1.c?rev=1720862&r1=1720861&r2=1720862&view=diff
==============================================================================
--- openoffice/trunk/main/rsc/source/rscpp/cpp1.c (original)
+++ openoffice/trunk/main/rsc/source/rscpp/cpp1.c Sat Dec 19 00:00:28 2015
@@ -329,7 +329,8 @@ nRunde++;
                     cerror("Can't open input file \"%s\"", useargv[1]);
                     exit(IO_ERROR);
                 }
-                strncpy(work, useargv[1], sizeof(work));  /* Remember input 
filename      */
+                strncpy(work, useargv[1], NWORK+1);  /* Remember input 
filename      */
+                work[NWORK] = '\0';
                 break;
             }                           /* Else, just get stdin         */
         case 0:                         /* No args?                     */

Modified: openoffice/trunk/main/sal/osl/unx/profile.c
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/unx/profile.c?rev=1720862&r1=1720861&r2=1720862&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/unx/profile.c (original)
+++ openoffice/trunk/main/sal/osl/unx/profile.c Sat Dec 19 00:00:28 2015
@@ -2065,6 +2065,7 @@ static sal_Bool osl_ProfileSwapProfileNa
        osl_ProfileGenerateExtension(pProfile->m_FileName,"bak",pszBakFile);
 
     strncpy(pszIniFile,pProfile->m_FileName,PATH_MAX);
+    pszIniFile[PATH_MAX-1] = '\0';
 
     osl_ProfileGenerateExtension(pProfile->m_FileName,"tmp",pszTmpFile);