diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
| commit | 2b7ba3f90455d675770e68f7e338d39053a343b9 (patch) | |
| tree | 652c664acf1d848e894637c47c93f9aa17289954 /indra/llcommon/llbase64.cpp | |
| parent | 80e39507810ea0d5e9931bea79e0bfda3e77ab9e (diff) | |
| parent | 7d9249d180f7bc228cad3d6f5ed4d5fb13296451 (diff) | |
Merge branch 'xcode-14.1' into contribute
Diffstat (limited to 'indra/llcommon/llbase64.cpp')
| -rw-r--r-- | indra/llcommon/llbase64.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp index 4e82cf7f20..bb85fe32a3 100644 --- a/indra/llcommon/llbase64.cpp +++ b/indra/llcommon/llbase64.cpp @@ -42,7 +42,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size) && input_size > 0) { // Yes, it returns int. - int b64_buffer_length = apr_base64_encode_len(input_size); + int b64_buffer_length = apr_base64_encode_len(narrow(input_size)); char* b64_buffer = new char[b64_buffer_length]; // This is faster than apr_base64_encode() if you know @@ -52,7 +52,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size) b64_buffer_length = apr_base64_encode_binary( b64_buffer, input, - input_size); + narrow(input_size)); output.assign(b64_buffer); delete[] b64_buffer; } |