Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes STR#3200 issue with filter() on Win32.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11920 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano
2016-09-05 16:46:59 +00:00
parent 86d8af009a
commit 1dc11af70f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Native_File_Chooser_WIN32.cxx
+5 -5
View File
@@ -778,7 +778,7 @@ static int count_filters(const char *filter) {
// //
void Fl_Native_File_Chooser::parse_filter(const char *in) { void Fl_Native_File_Chooser::parse_filter(const char *in) {
clear_filters(); clear_filters();
if ( ! in ) return; if ( ! in || in[0] == '\0' ) return;
int has_name = strchr(in, '\t') ? 1 : 0; int has_name = strchr(in, '\t') ? 1 : 0;
char mode = has_name ? 'n' : 'w'; // parse mode: n=name, w=wildcard char mode = has_name ? 'n' : 'w'; // parse mode: n=name, w=wildcard
@@ -786,9 +786,9 @@ void Fl_Native_File_Chooser::parse_filter(const char *in) {
// whatever input string is, our output won't be much longer in length.. // whatever input string is, our output won't be much longer in length..
// use double length just for safety. // use double length just for safety.
size_t slen = strlen(in); size_t slen = strlen(in);
char *wildprefix = new char[slen*2]; wildprefix[0] = 0; char *wildprefix = new char[(slen+1)*2]; wildprefix[0] = 0;
char *comp = new char[slen*2]; comp[0] = 0; char *comp = new char[(slen+1)*2]; comp[0] = 0;
char *name = new char[slen*2]; name[0] = 0; char *name = new char[(slen+1)*2]; name[0] = 0;
// Init // Init
int nwildcards = 0; int nwildcards = 0;
@@ -796,7 +796,7 @@ void Fl_Native_File_Chooser::parse_filter(const char *in) {
char **wildcards = new char*[maxfilters]; // parsed wildcards (can be several) char **wildcards = new char*[maxfilters]; // parsed wildcards (can be several)
int t; int t;
for ( t=0; t<maxfilters; t++ ) { for ( t=0; t<maxfilters; t++ ) {
wildcards[t] = new char[slen]; wildcards[t] = new char[slen+1];
wildcards[t][0] = '\0'; wildcards[t][0] = '\0';
} }