summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
committerOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
commit5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch)
tree9a22b0583bb290a242df3c619665fdb692e1ecef /indra/llinventory
parent86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff)
parent49de8add8355455da4b6ec5aaa55427fafa94322 (diff)
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llnotecard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp
index 62829c284f..69152cefe0 100644
--- a/indra/llinventory/llnotecard.cpp
+++ b/indra/llinventory/llnotecard.cpp
@@ -199,7 +199,7 @@ bool LLNotecard::importStream(std::istream& str)
return FALSE;
}
- if(text_len > mMaxText)
+ if(text_len > mMaxText || text_len < 0)
{
llwarns << "Invalid Linden text length: " << text_len << llendl;
return FALSE;