diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-08 11:21:50 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-08 11:21:50 +0200 |
| commit | 9738cc7ef26c15523e9bcacb21b1920693ec85c3 (patch) | |
| tree | dc3bade178ade1f1f49705d56fa39f82d1adbd9e | |
| parent | bca2c30b7d38f3cad2b06ae30ee7d73e15677373 (diff) | |
| parent | 8addab785d01a0a7860267c06b785b7bfde88e19 (diff) | |
| download | redot-engine-9738cc7ef26c15523e9bcacb21b1920693ec85c3.tar.gz | |
Merge pull request #90335 from Faless/io/marshall_nil_script
[IO] Fix marshall decoding when script is NIL
| -rw-r--r-- | core/io/marshalls.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index b25fcccd7f..f0bbf00a1d 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -687,7 +687,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int (*r_len) += used; } - if (str == "script") { + if (str == "script" && value.get_type() != Variant::NIL) { ERR_FAIL_COND_V_MSG(value.get_type() != Variant::STRING, ERR_INVALID_DATA, "Invalid value for \"script\" property, expected script path as String."); String path = value; ERR_FAIL_COND_V_MSG(path.is_empty() || !path.begins_with("res://") || !ResourceLoader::exists(path, "Script"), ERR_INVALID_DATA, "Invalid script path: '" + path + "'."); |