Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard against empty name field in inotify_event, see #14466

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-06 16:39:08 +00:00
parent 0f79c83f89
commit 41e027551c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/unix/fswatcher_inotify.cpp
View File

@@ -344,9 +344,12 @@ protected:
wxString mask = (inevt.mask & IN_ISDIR) ? wxString mask = (inevt.mask & IN_ISDIR) ?
wxString::Format("IS_DIR | %u", inevt.mask & ~IN_ISDIR) : wxString::Format("IS_DIR | %u", inevt.mask & ~IN_ISDIR) :
wxString::Format("%u", inevt.mask); wxString::Format("%u", inevt.mask);
const char* name = "";
if (inevt.len)
name = inevt.name;
return wxString::Format("Event: wd=%d, mask=%s, cookie=%u, len=%u, " return wxString::Format("Event: wd=%d, mask=%s, cookie=%u, len=%u, "
"name=%s", inevt.wd, mask, inevt.cookie, "name=%s", inevt.wd, mask, inevt.cookie,
inevt.len, inevt.name); inevt.len, name);
} }
static wxFileName GetEventPath(const wxFSWatchEntry& watch, static wxFileName GetEventPath(const wxFSWatchEntry& watch,
@@ -354,7 +357,7 @@ protected:
{ {
// only when dir is watched, we have non-empty e.name // only when dir is watched, we have non-empty e.name
wxFileName path = watch.GetPath(); wxFileName path = watch.GetPath();
if (path.IsDir()) if (path.IsDir() && inevt.len)
{ {
path = wxFileName(path.GetPath(), inevt.name); path = wxFileName(path.GetPath(), inevt.name);
} }