diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
| commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
| tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/llcommon/llsdserialize.cpp | |
| parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
| parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) | |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index b7e316da10..9181600f23 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2193,9 +2193,9 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32 size) { U8* result = NULL; - U32 cur_size = 0; + llssize cur_size = 0; z_stream strm; - + constexpr U32 CHUNK = 1024 * 512; static thread_local std::unique_ptr<U8[]> out; @@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size return result; } -char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size) +char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size) { const char* deprecated_header = "<? LLSD/Binary ?>"; constexpr size_t deprecated_header_size = 17; |