Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-21 14:31:40 +08:00
Code Issues Actions 3 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
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Native_File_Chooser_WIN32.cxx
+8 -4
View File
@@ -524,10 +524,14 @@ int Fl_WinAPI_Native_File_Chooser_Driver::showfile() {
char pathname[FNFC_MAX_PATH]; char pathname[FNFC_MAX_PATH];
for ( const WCHAR *s = dirname + dirlen + 1; for ( const WCHAR *s = dirname + dirlen + 1;
*s; s += (wcslen(s)+1)) { *s; s += (wcslen(s)+1)) {
strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH); // ISSUE #206 -- beware strncpy() vs. strncat():
strncat(pathname, "\\", FNFC_MAX_PATH); // > strncpy() doesn't guarantee null termination but strncat() does.
strncat(pathname, wchartoutf8(s), FNFC_MAX_PATH); // > strncat() can write to n+1, whereas strncpy() only writes to n.
pathname[FNFC_MAX_PATH-1] = 0; // 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); add_pathname(pathname);
} }
} }