summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-21 17:26:13 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-21 17:26:13 -0500
commitaba13fb96c048fedf62b492b0db5ca0b185ce0a8 (patch)
tree821c671ebe44d1aeacde2648468d93cf4a5b4109 /indra/llinventory
parent8bca21e23b1ad857cb707af986c33523c6ea7724 (diff)
parent91021bf905286bcb5ce0f14e19a55b4800a9ce99 (diff)
Automated merge up from viewer-development
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;