Merge pull request #971 from jphickey/fix-970-strncpy-warning

astrogeco · web-flow · commit 180559b6ebf3 · 2020-11-02T13:26:24.000-05:00
Fix #970, strncpy warning
diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -256,7 +256,9 @@ int32 CFE_ES_ReloadApp(CFE_ES_ResourceID_t AppID, const char *AppFileName)
        {
            CFE_ES_SysLogWrite_Unsync("CFE_ES_ReloadApp: Reload Application %s Initiated. New filename = %s\n",
                    CFE_ES_AppRecordGetName(AppRecPtr), AppFileName);
-           strncpy(AppRecPtr->StartParams.BasicInfo.FileName, AppFileName, OS_MAX_PATH_LEN);
+           strncpy(AppRecPtr->StartParams.BasicInfo.FileName, AppFileName,
+                       sizeof(AppRecPtr->StartParams.BasicInfo.FileName)-1);
+           AppRecPtr->StartParams.BasicInfo.FileName[sizeof(AppRecPtr->StartParams.BasicInfo.FileName)-1] = 0;
            AppRecPtr->ControlReq.AppControlRequest = CFE_ES_RunStatus_SYS_RELOAD;
        }
        else

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,9 @@ int32 CFE_ES_ReloadApp(CFE_ES_ResourceID_t AppID, const char *AppFileName)`
`256`	`256`	`{`
`257`	`257`	`CFE_ES_SysLogWrite_Unsync("CFE_ES_ReloadApp: Reload Application %s Initiated. New filename = %s\n",`
`258`	`258`	`CFE_ES_AppRecordGetName(AppRecPtr), AppFileName);`
`259`		`- strncpy(AppRecPtr->StartParams.BasicInfo.FileName, AppFileName, OS_MAX_PATH_LEN);`
	`259`	`+ strncpy(AppRecPtr->StartParams.BasicInfo.FileName, AppFileName,`
	`260`	`+ sizeof(AppRecPtr->StartParams.BasicInfo.FileName)-1);`
	`261`	`+ AppRecPtr->StartParams.BasicInfo.FileName[sizeof(AppRecPtr->StartParams.BasicInfo.FileName)-1] = 0;`
`260`	`262`	`AppRecPtr->ControlReq.AppControlRequest = CFE_ES_RunStatus_SYS_RELOAD;`
`261`	`263`	`}`
`262`	`264`	`else`