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 /modules/gdscript/gdscript_tokenizer.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 'modules/gdscript/gdscript_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 8b22d6f085..8962e3bb34 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -1199,7 +1199,8 @@ Error GDScriptTokenizerBuffer::set_code_buffer(const Vector<uint8_t> &p_buffer) Variant v; int len; - Error err = decode_variant(v, b, total_len, &len); + // An object cannot be constant, never decode objects + Error err = decode_variant(v, b, total_len, &len, false); if (err) return err; b += len; @@ -1367,11 +1368,12 @@ Vector<uint8_t> GDScriptTokenizerBuffer::parse_code_string(const String &p_code) for (Map<int, Variant>::Element *E = rev_constant_map.front(); E; E = E->next()) { int len; - Error err = encode_variant(E->get(), NULL, len); + // Objects cannot be constant, never encode objects + Error err = encode_variant(E->get(), NULL, len, false); ERR_FAIL_COND_V(err != OK, Vector<uint8_t>()); int pos = buf.size(); buf.resize(pos + len); - encode_variant(E->get(), &buf.write[pos], len); + encode_variant(E->get(), &buf.write[pos], len, false); } for (Map<int, uint32_t>::Element *E = rev_line_map.front(); E; E = E->next()) { |