diff options
| -rw-r--r-- | mono/metadata/ChangeLog | 7 | ||||
| -rw-r--r-- | mono/metadata/locales.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index bbb461c39ef..54f3c036db1 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,10 @@ +2004-09-16 Lluis Sanchez Gual <lluis@novell.com> + + * locales.c: nullify the ICU_collator member of CompareInfo when it is + finalized. There where random SIGSEVs at program termination, when + an object being finalized was trying to do a string comparison and + the current culture was already finalized. + 2004-09-16 Zoltan Varga <vargaz@freemail.hu> * appdomain.c (ves_icall_System_AppDomain_createDomain): Load all diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c index 1210965a70a..256598e14c0 100644 --- a/mono/metadata/locales.c +++ b/mono/metadata/locales.c @@ -1041,6 +1041,7 @@ void ves_icall_System_Globalization_CompareInfo_free_internal_collator (MonoComp coll=this->ICU_collator; if(coll!=NULL) { + this->ICU_collator = NULL; ucol_close (coll); } } |