diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 21:43:27 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 21:59:05 +0100 |
| commit | e8611966de4dfc9c28a7a4de1798f3f10ff87f80 (patch) | |
| tree | 2331b225ac8f61b6a16edf08227cc89cd7e0a3a1 | |
| parent | ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378 (diff) | |
Remove bounds check when resuming from yield.
The code would get a pointer to the beginning of the call_args by using
operator[] at the stack Vector. This does bound checking. When there are
no call_args this bound check fails and the error mentioned in #7796
gets triggered.
This bound check is actually not necessary as call_args just gets set to
NULL and never dereferenced. This new code will just unconditionally set
the pointer to the place where the call_args are if there are any. There
is no NULL check for call_args anywhere so this is safe.
Fixes #7796
| -rw-r--r-- | modules/gdscript/gd_function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index d7274b5b8e..31bac2748a 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -171,7 +171,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a if (p_state) { //use existing (supplied) state (yielded) stack=(Variant*)p_state->stack.ptr(); - call_args=(Variant**)&p_state->stack[sizeof(Variant)*p_state->stack_size]; + call_args=(Variant**)stack + sizeof(Variant)*p_state->stack_size; line=p_state->line; ip=p_state->ip; alloca_size=p_state->stack.size(); |