summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:37:59 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:37:59 -0500
commit69b6aa5db2034e8e34bd234a4ebf04763419933a (patch)
tree5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/llinventory
parent1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff)
parent12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff)
merge changes for storm-669
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;