diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
| commit | 6e710333e7ea08a79c401ae54d063d8ef608f99a (patch) | |
| tree | ff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/llvfs | |
| parent | 7cc44fb7fe40706e2017343d76ed226f477dad8d (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index f3ac17d612..32d081d552 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -86,6 +86,13 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) std::string fullpath; S32 result; + // File masks starting with "/" will match nothing, so we consider them invalid. + if (LLStringUtil::startsWith(mask, getDirDelimiter())) + { + llwarns << "Invalid file mask: " << mask << llendl; + llassert(!"Invalid file mask"); + } + LLDirIterator iter(dirname, mask); while (iter.next(filename)) { |