summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
commite2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch)
treec405316265ca4248802817b8a99697063c58469d /indra/llinventory
parent2d9c970babf6bab8d402482315af6be0ffb198dd (diff)
parent78895f9e0c628dc33268578faf135e967cf30142 (diff)
merge changes for storm-398
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;