godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Make sure we don't leak when an opcode is followed by itself

Browse Source 
When compiling with GCC it is now possible for an opcode followed by
itself to never leave the scope it is currently in. This leads to a
situation where the dtor of a scope local variable isn't called which in
turn can lead to a memory leak.

By moving the goto outside of the scope of each opcode we guarantee that
all dtors have been called before the next opcode gets dispatched.

this fixes #12401
This commit is contained in:
Hein-Pieter van Braam
2017-11-09 17:13:04 +01:00
parent 05fc741bdb
commit 38ae49e574
1 changed files with 80 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
modules/gdscript/gd_function.cpp
View File

@@ -170,7 +170,7 @@ static String _get_var_type(const Variant *p_type) {
return basestr; return basestr;
} }
#if defined(__GNUC__) && !defined(__clang__) #if defined(__GNUC__)
#define OPCODES_TABLE \ #define OPCODES_TABLE \
static const void *switch_table_ops[] = { \ static const void *switch_table_ops[] = { \
&&OPCODE_OPERATOR, \ &&OPCODE_OPERATOR, \
@@ -427,8 +427,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = ret; *dst = ret;
#endif #endif
ip += 5; ip += 5;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_EXTENDS_TEST) { OPCODE(OPCODE_EXTENDS_TEST) {
CHECK_SPACE(4); CHECK_SPACE(4);
@@ -492,8 +493,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = extends_ok; *dst = extends_ok;
ip += 4; ip += 4;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_SET) { OPCODE(OPCODE_SET) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -518,8 +520,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += 4; ip += 4;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_GET) { OPCODE(OPCODE_GET) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -550,8 +553,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = ret; *dst = ret;
#endif #endif
ip += 4; ip += 4;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_SET_NAMED) { OPCODE(OPCODE_SET_NAMED) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -575,8 +579,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += 4; ip += 4;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_GET_NAMED) { OPCODE(OPCODE_GET_NAMED) {
CHECK_SPACE(4); CHECK_SPACE(4);
@@ -609,8 +614,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = ret; *dst = ret;
#endif #endif
ip += 4; ip += 4;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_SET_MEMBER) { OPCODE(OPCODE_SET_MEMBER) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -631,8 +637,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += 3; ip += 3;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_GET_MEMBER) { OPCODE(OPCODE_GET_MEMBER) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -649,8 +656,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += 3; ip += 3;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_ASSIGN) { OPCODE(OPCODE_ASSIGN) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -660,8 +668,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = *src; *dst = *src;
ip += 3; ip += 3;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_ASSIGN_TRUE) { OPCODE(OPCODE_ASSIGN_TRUE) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -670,8 +679,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = true; *dst = true;
ip += 2; ip += 2;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_ASSIGN_FALSE) { OPCODE(OPCODE_ASSIGN_FALSE) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -680,8 +690,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = false; *dst = false;
ip += 2; ip += 2;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CONSTRUCT) { OPCODE(OPCODE_CONSTRUCT) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -708,8 +719,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ip += 4 + argc; ip += 4 + argc;
//construct a basic type //construct a basic type
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CONSTRUCT_ARRAY) { OPCODE(OPCODE_CONSTRUCT_ARRAY) {
CHECK_SPACE(1); CHECK_SPACE(1);
@@ -728,8 +740,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = array; *dst = array;
ip += 3 + argc; ip += 3 + argc;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CONSTRUCT_DICTIONARY) { OPCODE(OPCODE_CONSTRUCT_DICTIONARY) {
CHECK_SPACE(1); CHECK_SPACE(1);
@@ -750,8 +763,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = dict; *dst = dict;
ip += 3 + argc * 2; ip += 3 + argc * 2;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CALL_RETURN) OPCODE(OPCODE_CALL_RETURN)
OPCODE(OPCODE_CALL) { OPCODE(OPCODE_CALL) {
@@ -830,8 +844,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
//_call_func(NULL,base,*methodname,ip,argc,p_instance,stack); //_call_func(NULL,base,*methodname,ip,argc,p_instance,stack);
ip += argc + 1; ip += argc + 1;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CALL_BUILT_IN) { OPCODE(OPCODE_CALL_BUILT_IN) {
CHECK_SPACE(4); CHECK_SPACE(4);
@@ -869,12 +884,14 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += argc + 1; ip += argc + 1;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_CALL_SELF) { OPCODE(OPCODE_CALL_SELF) {
OPCODE_BREAK; OPCODE_BREAK;
} }
OPCODE(OPCODE_CALL_SELF_BASE) { OPCODE(OPCODE_CALL_SELF_BASE) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -948,8 +965,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
ip += 4 + argc; ip += 4 + argc;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_YIELD) OPCODE(OPCODE_YIELD)
OPCODE(OPCODE_YIELD_SIGNAL) { OPCODE(OPCODE_YIELD_SIGNAL) {
@@ -1032,6 +1050,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
exit_ok = true; exit_ok = true;
OPCODE_BREAK; OPCODE_BREAK;
} }
OPCODE(OPCODE_YIELD_RESUME) { OPCODE(OPCODE_YIELD_RESUME) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -1044,8 +1063,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
GET_VARIANT_PTR(result, 1); GET_VARIANT_PTR(result, 1);
*result = p_state->result; *result = p_state->result;
ip += 2; ip += 2;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_JUMP) { OPCODE(OPCODE_JUMP) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -1053,8 +1073,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
GD_ERR_BREAK(to < 0 || to > _code_size); GD_ERR_BREAK(to < 0 || to > _code_size);
ip = to; ip = to;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_JUMP_IF) { OPCODE(OPCODE_JUMP_IF) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -1067,11 +1088,12 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
int to = _code_ptr[ip + 2]; int to = _code_ptr[ip + 2];
GD_ERR_BREAK(to < 0 || to > _code_size); GD_ERR_BREAK(to < 0 || to > _code_size);
ip = to; ip = to;
DISPATCH_OPCODE; } else {
ip += 3;
} }
ip += 3;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_JUMP_IF_NOT) { OPCODE(OPCODE_JUMP_IF_NOT) {
CHECK_SPACE(3); CHECK_SPACE(3);
@@ -1084,17 +1106,19 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
int to = _code_ptr[ip + 2]; int to = _code_ptr[ip + 2];
GD_ERR_BREAK(to < 0 || to > _code_size); GD_ERR_BREAK(to < 0 || to > _code_size);
ip = to; ip = to;
DISPATCH_OPCODE; } else {
ip += 3;
} }
ip += 3;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_JUMP_TO_DEF_ARGUMENT) { OPCODE(OPCODE_JUMP_TO_DEF_ARGUMENT) {
CHECK_SPACE(2); CHECK_SPACE(2);
ip = _default_arg_ptr[defarg]; ip = _default_arg_ptr[defarg];
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_RETURN) { OPCODE(OPCODE_RETURN) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -1103,6 +1127,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
exit_ok = true; exit_ok = true;
OPCODE_BREAK; OPCODE_BREAK;
} }
OPCODE(OPCODE_ITERATE_BEGIN) { OPCODE(OPCODE_ITERATE_BEGIN) {
CHECK_SPACE(8); //space for this a regular iterate CHECK_SPACE(8); //space for this a regular iterate
@@ -1121,20 +1146,21 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
int jumpto = _code_ptr[ip + 3]; int jumpto = _code_ptr[ip + 3];
GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size); GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);
ip = jumpto; ip = jumpto;
DISPATCH_OPCODE; } else {
} GET_VARIANT_PTR(iterator, 4);
GET_VARIANT_PTR(iterator, 4);
*iterator = container->iter_get(*counter, valid); *iterator = container->iter_get(*counter, valid);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (!valid) { if (!valid) {
err_text = "Unable to obtain iterator object of type " + Variant::get_type_name(container->get_type()) + "'."; err_text = "Unable to obtain iterator object of type " + Variant::get_type_name(container->get_type()) + "'.";
OPCODE_BREAK; OPCODE_BREAK;
} }
#endif #endif
ip += 5; //skip regular iterate which is always next ip += 5; //skip regular iterate which is always next
DISPATCH_OPCODE; }
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_ITERATE) { OPCODE(OPCODE_ITERATE) {
CHECK_SPACE(4); CHECK_SPACE(4);
@@ -1153,20 +1179,21 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
int jumpto = _code_ptr[ip + 3]; int jumpto = _code_ptr[ip + 3];
GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size); GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);
ip = jumpto; ip = jumpto;
DISPATCH_OPCODE; } else {
} GET_VARIANT_PTR(iterator, 4);
GET_VARIANT_PTR(iterator, 4);
*iterator = container->iter_get(*counter, valid); *iterator = container->iter_get(*counter, valid);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (!valid) { if (!valid) {
err_text = "Unable to obtain iterator object of type " + Variant::get_type_name(container->get_type()) + "' (but was obtained on first iteration?)."; err_text = "Unable to obtain iterator object of type " + Variant::get_type_name(container->get_type()) + "' (but was obtained on first iteration?).";
OPCODE_BREAK; OPCODE_BREAK;
} }
#endif #endif
ip += 5; //loop again ip += 5; //loop again
DISPATCH_OPCODE; }
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_ASSERT) { OPCODE(OPCODE_ASSERT) {
CHECK_SPACE(2); CHECK_SPACE(2);
GET_VARIANT_PTR(test, 1); GET_VARIANT_PTR(test, 1);
@@ -1182,8 +1209,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
#endif #endif
ip += 2; ip += 2;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_BREAKPOINT) { OPCODE(OPCODE_BREAKPOINT) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (ScriptDebugger::get_singleton()) { if (ScriptDebugger::get_singleton()) {
@@ -1191,8 +1219,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip += 1; ip += 1;
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_LINE) { OPCODE(OPCODE_LINE) {
CHECK_SPACE(2); CHECK_SPACE(2);
@@ -1220,8 +1249,9 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ScriptDebugger::get_singleton()->line_poll(); ScriptDebugger::get_singleton()->line_poll();
} }
DISPATCH_OPCODE;
} }
DISPATCH_OPCODE;
OPCODE(OPCODE_END) { OPCODE(OPCODE_END) {
exit_ok = true; exit_ok = true;