lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Code Activity

parser: Fix reinitialization

Browse Source
This commit is contained in:
Nick Wellnhofer
2023-09-27 17:22:17 +02:00
parent c7ff438b83
commit b8961a75e9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
globals.c
View File

@@ -615,6 +615,8 @@ void xmlCleanupGlobalsInternal(void) {
} }
#endif #endif
#endif #endif
parserInitialized = 0;
} }
/** /**

9
threads.c
View File

@@ -445,6 +445,8 @@ xmlCleanupThreads(void)
************************************************************************/ ************************************************************************/
static int xmlParserInitialized = 0; static int xmlParserInitialized = 0;
static int xmlParserInnerInitialized = 0;
#ifdef HAVE_POSIX_THREADS #ifdef HAVE_POSIX_THREADS
static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -567,8 +569,6 @@ xmlGlobalInitMutexDestroy(void) {
*/ */
void void
xmlInitParser(void) { xmlInitParser(void) {
static int innerInitialized = 0;
/* /*
* Note that the initialization code must not make memory allocations. * Note that the initialization code must not make memory allocations.
*/ */
@@ -577,7 +577,7 @@ xmlInitParser(void) {
xmlGlobalInitMutexLock(); xmlGlobalInitMutexLock();
if (innerInitialized == 0) { if (xmlParserInnerInitialized == 0) {
#if defined(_WIN32) && \ #if defined(_WIN32) && \
(!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
if (xmlFree == free) if (xmlFree == free)
@@ -597,7 +597,7 @@ xmlInitParser(void) {
xmlRegisterDefaultOutputCallbacks(); xmlRegisterDefaultOutputCallbacks();
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
innerInitialized = 1; xmlParserInnerInitialized = 1;
} }
xmlGlobalInitMutexUnlock(); xmlGlobalInitMutexUnlock();
@@ -660,6 +660,7 @@ xmlCleanupParser(void) {
xmlGlobalInitMutexDestroy(); xmlGlobalInitMutexDestroy();
xmlParserInitialized = 0; xmlParserInitialized = 0;
xmlParserInnerInitialized = 0;
} }
#if defined(HAVE_ATTRIBUTE_DESTRUCTOR) && !defined(LIBXML_STATIC) && \ #if defined(HAVE_ATTRIBUTE_DESTRUCTOR) && !defined(LIBXML_STATIC) && \