diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
| commit | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch) | |
| tree | 4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/llcommon/llsdserialize.cpp | |
| parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
| parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 4 |
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; |