diff options
| author | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
| commit | fb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch) | |
| tree | a157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/llbase64.cpp | |
| parent | 66f59478d09122ddf43c4ba3445754d1698bf016 (diff) | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
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; } |