Mercurial > octave-nkf
changeset 13999:1221086f1ba5
avoid segfault related to fontconfig memory management
* txt-eng-ft.cc (ft_manager::instance_ok): Comment out code to add
cleanup_instance to singleton_cleanup_list.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Dec 2011 16:08:13 -0500 |
| parents | 6e9bf84dec3c |
| children | 15400d5deb1c |
| files | src/txt-eng-ft.cc |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/txt-eng-ft.cc Mon Dec 05 02:03:35 2011 -0500 +++ b/src/txt-eng-ft.cc Mon Dec 05 16:08:13 2011 -0500 @@ -77,8 +77,14 @@ { instance = new ft_manager (); + // FIXME -- there seem to be some memory management errors + // related to fontconfig that cause segfaults when Octave + // exits if ft_manager::instance is explicitly deleted. So + // skip doing that for now. +#if 0 if (instance) singleton_cleanup_list::add (cleanup_instance); +#endif } if (! instance)