diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2012-09-18 18:33:55 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-18 18:57:52 -0400 |
| commit | 7226a48a8cff5637b865b64e39a6a937c20e7677 (patch) | |
| tree | b02d05fd8044293be5881d0300203cc4ef5e711d | |
| parent | 0cf3a11645c8884d4e7b3b917ce5f983fbd7ff8c (diff) | |
| download | subsurface-7226a48a8cff5637b865b64e39a6a937c20e7677.tar.gz | |
Call xmlCleanupParser only once - when we are done with libxml
Calling xmlCleanupParser in parse-xml.c:parse_xml_buffer()
caused massive memory corruption mostly affecting gtk's FileChooser
dialogs and the application menu.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dive.h | 1 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | parse-xml.c | 6 |
3 files changed, 9 insertions, 1 deletions
@@ -385,6 +385,7 @@ static inline struct dive *get_dive(unsigned int nr) extern void parse_xml_init(void); extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error); +extern void parse_xml_exit(void); extern void set_filename(const char *filename, gboolean force); extern void parse_file(const char *filename, GError **error); @@ -253,5 +253,8 @@ int main(int argc, char **argv) show_dive_info(NULL); run_ui(); exit_ui(); + + parse_xml_exit(); + return 0; } diff --git a/parse-xml.c b/parse-xml.c index f47ac5a26..2a10792f8 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1497,7 +1497,6 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er traverse(xmlDocGetRootElement(doc)); dive_end(); xmlFreeDoc(doc); - xmlCleanupParser(); } void parse_xml_init(void) @@ -1505,6 +1504,11 @@ void parse_xml_init(void) LIBXML_TEST_VERSION } +void parse_xml_exit(void) +{ + xmlCleanupParser(); +} + #ifdef XSLT /* Maybe we'll want a environment variable that can override this.. */ |