luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly clear observer reference on the observed object when it is freed.

Browse source 
[INTERPRETER]
* BUG: Correctly clear observer reference on the observed object when it is freed.
* BUG: Clear environment variables set by the interpreter, as they can be read by the shared libraries exit routines after main() has been terminated.
This commit is contained in:
gambas 2018-12-24 17:57:36 +01:00
parent 76a15e14ff
commit bfc88545c8
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/gbx/gbx_c_observer.c
View file

@ -47,7 +47,7 @@ void COBSERVER_attach(COBSERVER *this, void *parent, const char *name)
#if DEBUG_ME #if DEBUG_ME
fprintf(stderr, "COBSERVER_attach: %p: %s %p\n", this, parent ? OBJECT_class(parent)->name : "", parent); fprintf(stderr, "COBSERVER_attach: %p: %s %p\n", this, parent ? OBJECT_class(parent)->name : "", parent);
#endif #endif
if (this->event) if (this->object && this->event)
EVENT_search(OBJECT_class(this->object), this->event, name, parent); EVENT_search(OBJECT_class(this->object), this->event, name, parent);
} }

20
main/gbx/gbx_local.c
View file

@ -602,11 +602,25 @@ void LOCAL_init(void)
void LOCAL_exit(void) void LOCAL_exit(void)
{ {
STRING_free(&env_LANG); if (env_LANG)
STRING_free(&env_LC_ALL); {
STRING_free(&env_LANGUAGE); unsetenv("LANG");
STRING_free(&env_LANG);
}
if (env_LC_ALL)
{
unsetenv("LC_ALL");
STRING_free(&env_LC_ALL);
}
if (env_LANGUAGE)
{
unsetenv("LANGUAGE");
STRING_free(&env_LANGUAGE);
}
if (!LOCAL_is_UTF8) if (!LOCAL_is_UTF8)
STRING_free(&LOCAL_encoding); STRING_free(&LOCAL_encoding);
STRING_free(&_lang); STRING_free(&_lang);
free_local_info(); free_local_info();
} }

1
main/gbx/gbx_object.c
View file

@ -196,6 +196,7 @@ static void remove_observers(OBJECT *ob)
#if DEBUG_EVENT #if DEBUG_EVENT
fprintf(stderr, "Remove observer %p %d: %p: %p\n", obs, (int)obs->ob.ref, ob, obs->object); fprintf(stderr, "Remove observer %p %d: %p: %p\n", obs, (int)obs->ob.ref, ob, obs->object);
#endif #endif
obs->object = NULL;
OBJECT_UNREF(obs); OBJECT_UNREF(obs);
obs = next; obs = next;
} }