mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes brought in at r. 10046 make fluid crash when open or saving files with Fl_Native_File_Chooser 

on the WIN32 platform.
The filter used by fluid "FLUID files \t*.f[ld]/n" makes Fl_Native_File_Chooser::parse_filter() crash.
The present changes TEMPORARILY avoid this crash, but r. 10046 changes should be closely reviewed.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-06-30 13:39:09 +00:00
parent e64a8e90e3
commit 0f4fa1633d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Fl_Native_File_Chooser_WIN32.cxx
View File

@ -718,11 +718,12 @@ void Fl_Native_File_Chooser::parse_filter(const char *in) {
// Init // Init
int nwildcards = 0; int nwildcards = 0;
char **wildcards; // parsed wildcards (can be several) //char **wildcards; // parsed wildcards (can be several)
char *wildcards[80]; // TMP
int maxfilters = (strcnt(in, ",|") + 1); // count wildcard seps int maxfilters = (strcnt(in, ",|") + 1); // count wildcard seps
int t; int t;
wildcards = new char*[maxfilters]; //wildcards = new char*[maxfilters];
for ( t=0; t<maxfilters; t++ ) { for ( t=0; t<80/*maxfilters*/; t++ ) {
wildcards[t] = new char[slen]; wildcards[t] = new char[slen];
wildcards[t][0] = '\0'; wildcards[t][0] = '\0';
} }
@ -791,8 +792,8 @@ void Fl_Native_File_Chooser::parse_filter(const char *in) {
delete[] wildprefix; delete[] wildprefix;
delete[] comp; delete[] comp;
delete[] name; delete[] name;
for ( t=0; t<maxfilters; t++ ) delete[] wildcards[t]; for ( t=0; t<80/*maxfilters*/; t++ ) delete[] wildcards[t];
delete[] wildcards; //delete[] wildcards;
return; return;
} }
continue; // not done yet, more filters continue; // not done yet, more filters