summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
committerOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
commitef1c3aac889d118530994e878d83426d4fc2ca7c (patch)
treedd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /indra/llinventory
parentf421e8701b3ef5b0230b06602fc5e937382ccc68 (diff)
parent14d830ca43a7114140ebeb16a76829db4d21a95b (diff)
merge fix for storm-784
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;