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/io/marshalls.h | |
| parent | e91844e8dca5d03eabd33e867fdbceb18db60cff (diff) | |
| parent | 393e62b98a5a37ccdd7d860571e2f8cc7b970fe4 (diff) | |
Merge pull request #27485 from Faless/io/encode_decode_safety_pr
Safer encode/decode variant.
Diffstat (limited to 'core/io/marshalls.h')
| -rw-r--r-- | core/io/marshalls.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/marshalls.h b/core/io/marshalls.h index 11c4b2c98e..f361c29754 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -199,7 +199,7 @@ public: EncodedObjectAsID(); }; -Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len = NULL, bool p_allow_objects = true); -Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_object_as_id = false); +Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len = NULL, bool p_allow_objects = false); +Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects = false); #endif |