WIP : Static analysis fixes.

viveris · Nov 13, 2023 · 8703b5c · 8703b5c
1 parent 98ce44b
commit 8703b5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib_jtag_core/src/bsdl_parser/bsdl_loader.c b/lib_jtag_core/src/bsdl_parser/bsdl_loader.c
@@ -1315,7 +1315,7 @@ jtag_bsdl * load_bsdlfile(jtag_core * jc,char *filename)
 	if(filename[i] == '\\')
 		i++;
 
-	strncpy(bsdl->src_filename,&filename[i],sizeof(bsdl->src_filename));
+	strncpy(bsdl->src_filename,&filename[i],sizeof(bsdl->src_filename) - 1);
 	bsdl->src_filename[ sizeof(bsdl->src_filename) - 1 ] = '0';
 
 	///////////////////////

diff --git a/lib_jtag_core/src/jtag_core.c b/lib_jtag_core/src/jtag_core.c
@@ -398,12 +398,12 @@ int jtagcore_get_dev_name(jtag_core * jc, int device, char * devname, char * bsd
 
 		if(devname)
 		{
-			devname[0] = 0;
+			devname[0] = '\0';
 		}
 
 		if(bsdlpath)
 		{
-			bsdlpath[0] = 0;
+			bsdlpath[0] = '\0';
 		}
 
 		return JTAG_CORE_NO_ERROR;

diff --git a/lib_jtag_core/src/script/script.c b/lib_jtag_core/src/script/script.c
@@ -1353,8 +1353,9 @@ static int cmd_autoinit( script_ctx * ctx, char * line)
 
 	genos_getcurrentdirectory(szExecPath,MAX_PATH);
 
-	strcpy(scanfolder,szExecPath);
-	strcat(scanfolder,DIR_SEPARATOR"bsdl_files"DIR_SEPARATOR);
+	strncpy(scanfolder, szExecPath, sizeof(scanfolder) );
+	genos_strndstcat(scanfolder, DIR_SEPARATOR"bsdl_files"DIR_SEPARATOR,  sizeof(scanfolder) - 1 );
+	scanfolder[sizeof(scanfolder) - 1] = '\0';
 
 	h_file_find = genos_find_first_file( scanfolder, "*.*", &fileinfo );