summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-06 17:37:31 -0500
committerDave Parks <davep@lindenlab.com>2010-04-06 17:37:31 -0500
commitde663d15df69aa6961f984f9f1c440f1fe2b3efb (patch)
tree7b97fa0332faa186029217b9ad5b354f8d735cfb /indra
parent47ffcdb93d6e2ac1f9d497e43e0213c98d129254 (diff)
Cleanup from review.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llsdserialize.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index c341b15539..fdeb93e27f 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2025,6 +2025,7 @@ std::string zip_llsd(LLSD& data)
{
delete [] output;
llwarns << "Failed to compress LLSD block." << llendl;
+ return std::string();
}
std::string::size_type size = source.size()-strm.avail_out;
@@ -2116,6 +2117,7 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size)
if (!LLSDSerialize::deserialize(data, istr, cur_size))
{
llwarns << "Failed to unzip LLSD block" << llendl;
+ free(result);
return false;
}
}