diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-26 13:43:57 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-26 13:43:57 +0200 |
commit | a50cead71293721a3db0373f6b335be0f747db9b (patch) | |
tree | 963140be4ed0e1e30ddab16e6a13d1c1eabd20e8 | |
parent | 7805220fef2276e8f0b25888e9305e8d42154477 (diff) | |
parent | 38fad353568d4c986c82eaf26f371f6dff7d9c62 (diff) | |
download | redot-engine-a50cead71293721a3db0373f6b335be0f747db9b.tar.gz |
Merge pull request #90792 from jsjtxietian/shader-crash
Fix editor crash when shader has incorrect global array declaration
-rw-r--r-- | servers/rendering/shader_language.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 745dcf5392..568aec2ff6 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -7411,6 +7411,9 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun return ERR_PARSE_ERROR; } tk = _get_token(); + } else { + _set_expected_error("("); + return ERR_PARSE_ERROR; } } } else { @@ -9520,6 +9523,9 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f _set_error(RTR("Array size mismatch.")); return ERR_PARSE_ERROR; } + } else { + _set_expected_error("("); + return ERR_PARSE_ERROR; } array_size = constant.array_size; |