summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-27 08:10:29 -0400
committerOz Linden <oz@lindenlab.com>2012-06-27 08:10:29 -0400
commit5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (patch)
tree433af79631cf0f386c6cf991cb01e119d5187009 /indra/llvfs
parenta4913246770b58ed569021c484c213231aaae549 (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
merge up to 3.3.3-release
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir.cpp7
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))
{