libxml2 thread safety for pkg/xar and dmg.

12 years ago · 5a43ac17f1
parent 5938dfd881
commit 5a43ac17f1
3 changed files with 3 additions and 2 deletions
--- a/libclamav/dmg.c
+++ b/libclamav/dmg.c
@ -456,7 +456,6 @@ int cli_scandmg(cli_ctx *ctx)
    }

    xmlFreeTextReader(reader);
-    xmlCleanupParser();

 #else

--- a/libclamav/others.c
+++ b/libclamav/others.c
@ -297,6 +297,9 @@ int cl_init(unsigned int initoptions)
    rc = bytecode_init();
    if (rc)
 	return rc;
+#ifdef HAVE_LIBXML2
+    xmlInitParser();
+#endif
    return CL_SUCCESS;
 }

--- a/libclamav/xar.c
+++ b/libclamav/xar.c
@ -823,7 +823,6 @@ int cli_scanxar(cli_ctx *ctx)
 exit_reader:
    xmlTextReaderClose(reader);
    xmlFreeTextReader(reader);
-    xmlCleanupParser();

 exit_toc:
    free(toc);