mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
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>
This commit is contained in:
parent
0cf3a11645
commit
7226a48a8c
3 changed files with 9 additions and 1 deletions
1
dive.h
1
dive.h
|
@ -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);
|
||||
|
|
3
main.c
3
main.c
|
@ -253,5 +253,8 @@ int main(int argc, char **argv)
|
|||
show_dive_info(NULL);
|
||||
run_ui();
|
||||
exit_ui();
|
||||
|
||||
parse_xml_exit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -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.. */
|
||||
|
|
Loading…
Reference in a new issue