diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-01 17:00:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 17:00:40 +0200 |
| commit | e3bd84fa571661d76fc8458d65bb053988e934a6 (patch) | |
| tree | cbf6ead84d9e62d331f5399e6407f9e6777425a3 /core/packed_data_container.cpp | |
| parent | e91844e8dca5d03eabd33e867fdbceb18db60cff (diff) | |
| parent | 393e62b98a5a37ccdd7d860571e2f8cc7b970fe4 (diff) | |
| download | redot-engine-e3bd84fa571661d76fc8458d65bb053988e934a6.tar.gz | |
Merge pull request #27485 from Faless/io/encode_decode_safety_pr
Safer encode/decode variant.
Diffstat (limited to 'core/packed_data_container.cpp')
| -rw-r--r-- | core/packed_data_container.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 6c17f42b13..99bed829c1 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -114,7 +114,7 @@ Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs, const uint8_t *p_buf, b } else { Variant v; - Error rerr = decode_variant(v, p_buf + p_ofs, datalen - p_ofs, NULL); + Error rerr = decode_variant(v, p_buf + p_ofs, datalen - p_ofs, NULL, false); if (rerr != OK) { @@ -249,9 +249,9 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd uint32_t pos = tmpdata.size(); int len; - encode_variant(p_data, NULL, len); + encode_variant(p_data, NULL, len, false); tmpdata.resize(tmpdata.size() + len); - encode_variant(p_data, &tmpdata.write[pos], len); + encode_variant(p_data, &tmpdata.write[pos], len, false); return pos; } break; |