godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Marshalls `raw/utf8_to_base64` from erroring on empty input. 

As per RFC  4648 (https://www.rfc-editor.org/rfc/rfc4648#section-10),
the base64 encoding for an empty ("") input is also empty. The
functionality in the Marshalls package coincedentially returns the
correct result, but produces an error as well.

The `variant_to_base64` function remains unchanged since an encoded
variant cannot be empty.
This commit is contained in:
Hamza Ali 2024-08-17 22:54:20 +05:00
parent 1bd740d18d
commit 48035be648
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core_bind.cpp
View File

@ -1142,6 +1142,9 @@ Variant Marshalls::base64_to_variant(const String &p_str, bool p_allow_objects)
}
String Marshalls::raw_to_base64(const Vector<uint8_t> &p_arr) {
if (p_arr.is_empty()) {
return "";
}
String ret = CryptoCore::b64_encode_str(p_arr.ptr(), p_arr.size());
ERR_FAIL_COND_V(ret.is_empty(), ret);
return ret;
@ -1165,6 +1168,9 @@ Vector<uint8_t> Marshalls::base64_to_raw(const String &p_str) {
}
String Marshalls::utf8_to_base64(const String &p_str) {
if (p_str.is_empty()) {
return "";
}
CharString cstr = p_str.utf8();
String ret = CryptoCore::b64_encode_str((unsigned char *)cstr.get_data(), cstr.length());
ERR_FAIL_COND_V(ret.is_empty(), ret);