diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:37 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:37 +0300 |
| commit | 1c82a80b2e48167ba718b6b79d51135cc7e7b371 (patch) | |
| tree | cc8a5b339116a317d8329d34ee162d6a80ab013b /indra/llcommon/llsdserialize.cpp | |
| parent | f4c7c8aff55d0cd8f044d5b7c8cddb2be750dde5 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index c3fb4ebc2c..79934642ae 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2251,7 +2251,7 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, return ZR_SIZE_ERROR; } #endif - catch (std::bad_alloc) + catch (std::bad_alloc&) { free(result); return ZR_MEM_ERROR; |