mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve issue #206 warning.

Browse Source
This commit is contained in:
Greg Ercolano 2021-03-23 12:24:04 -07:00
parent 8a9e25cdac
commit 12d8da9cb6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Fl_Native_File_Chooser_WIN32.cxx
View File

@ -524,10 +524,14 @@ int Fl_WinAPI_Native_File_Chooser_Driver::showfile() {
char pathname[FNFC_MAX_PATH];
for ( const WCHAR *s = dirname + dirlen + 1;
*s; s += (wcslen(s)+1)) {
strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH);
strncat(pathname, "\\", FNFC_MAX_PATH);
strncat(pathname, wchartoutf8(s), FNFC_MAX_PATH);
pathname[FNFC_MAX_PATH-1] = 0;
// ISSUE #206 -- beware strncpy() vs. strncat():
// > strncpy() doesn't guarantee null termination but strncat() does.
// > strncat() can write to n+1, whereas strncpy() only writes to n.
// fl_snprintf() can't be used here b/c wchartoutf8() returns a static str.
//
strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH); pathname[FNFC_MAX_PATH-1] = 0;
strncat(pathname, "\\", FNFC_MAX_PATH-1);
strncat(pathname, wchartoutf8(s), FNFC_MAX_PATH-1);
add_pathname(pathname);
}
}