diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:41:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:41:27 -0500 |
| commit | 654dd60ca7310db940e09065a3f6e7fec377c956 (patch) | |
| tree | d401b682f18da1c5dfbea261ed5da05665d5ab81 /indra/llvfs | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | ce0f455b7cb5a5d45e7682e4a4180b577eda3c5a (diff) | |
merge
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)) { |