summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-25 18:45:41 -0500
committerDave Parks <davep@lindenlab.com>2011-05-25 18:45:41 -0500
commit9b3a9beb40885aca65abb6363a8d7897fae4269c (patch)
treed9b9b35d07b601840e8b99bce25a5a0a9d0fa6da /indra/llcommon/llsdserialize.cpp
parent7cf1d0714bbdce1e7e7f88e12607e28a2f441e91 (diff)
parent3a409e6edc95ddee8ea0ff88f8388a8aa840d871 (diff)
merge
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r--indra/llcommon/llsdserialize.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 5be5ecc492..bf62600514 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2036,7 +2036,9 @@ std::string zip_llsd(LLSD& data)
{ //copy result into output
if (strm.avail_out >= CHUNK)
{
- llerrs << "WTF?" << llendl;
+ free(output);
+ llwarns << "Failed to compress LLSD block." << llendl;
+ return std::string();
}
have = CHUNK-strm.avail_out;