summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-09-05 09:57:41 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-09-05 09:57:41 +0000
commitbfe61f036afb18941c2c3caf0b6f870c9bc62647 (patch)
treeebf168f228b20dcd4c24704be273678a02b6f9fc /src
parentcdc165bd6809473bb2068c8902d034de3fb5bed6 (diff)
STR #1410: fl_file_chooser could crash after a previously canceled dialog
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5417 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/fl_file_dir.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fl_file_dir.cxx b/src/fl_file_dir.cxx
index 830df39bf..a39b9fd30 100644
--- a/src/fl_file_dir.cxx
+++ b/src/fl_file_dir.cxx
@@ -106,7 +106,11 @@ fl_file_chooser(const char *message, // I - Message in titlebar
// re-use the previously selected name
}
} else if (!*fname) { // empty filename reuses directory with empty name
- strlcpy(retname, fc->value(), sizeof(retname));
+ const char *fcv = fc->value();
+ if (fcv)
+ strlcpy(retname, fc->value(), sizeof(retname));
+ else
+ *retname = 0;
const char *n = fl_filename_name(retname);
if (n) *((char*)n) = 0;
fc->value("");