mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Call xmlCleanupParser only once - when we are done with libxml

Browse source 
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>
This commit is contained in:
Lubomir I. Ivanov 2012-09-18 18:33:55 +03:00 • committed by Dirk Hohndel
parent 0cf3a11645
commit 7226a48a8c
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -385,6 +385,7 @@ static inline struct dive *get_dive(unsigned int nr)
extern void parse_xml_init(void); 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_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 set_filename(const char *filename, gboolean force);
extern void parse_file(const char *filename, GError **error); extern void parse_file(const char *filename, GError **error);

3
main.c
View file

@ -253,5 +253,8 @@ int main(int argc, char **argv)
show_dive_info(NULL); show_dive_info(NULL);
run_ui(); run_ui();
exit_ui(); exit_ui();
parse_xml_exit();
return 0; return 0;
} }

6
parse-xml.c
View file

@ -1497,7 +1497,6 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er
traverse(xmlDocGetRootElement(doc)); traverse(xmlDocGetRootElement(doc));
dive_end(); dive_end();
xmlFreeDoc(doc); xmlFreeDoc(doc);
xmlCleanupParser();
} }
void parse_xml_init(void) void parse_xml_init(void)
@ -1505,6 +1504,11 @@ void parse_xml_init(void)
LIBXML_TEST_VERSION LIBXML_TEST_VERSION
} }
void parse_xml_exit(void)
{
xmlCleanupParser();
}
#ifdef XSLT #ifdef XSLT
/* Maybe we'll want a environment variable that can override this.. */ /* Maybe we'll want a environment variable that can override this.. */