c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

__xmlGlobalInitMutexDestroy() will free global_init_lock on Win32. Patch

Browse Source 
* globals.c threads.c include/libxml/threads.h: 
  __xmlGlobalInitMutexDestroy() will free global_init_lock on Win32.
  Patch from Marc-Antoine Ruel.

svn path=/trunk/; revision=3664
This commit is contained in:
Rob Richards 2007-11-16 10:54:59 +00:00
parent b9ba0facb5
commit 91eb560c7c
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Nov 16 11:55:36 CET 2007 Rob Richards <rrichards@ctindustries.net>
* globals.c threads.c include/libxml/threads.h:
__xmlGlobalInitMutexDestroy() will free global_init_lock on Win32.
Patch from Marc-Antoine Ruel.
Tue Nov 13 21:26:27 CET 2007 Rob Richards <rrichards@ctindustries.net> Tue Nov 13 21:26:27 CET 2007 Rob Richards <rrichards@ctindustries.net>
* schematron.c: fix crash/leaks from xmlSchematronParse due to improper * schematron.c: fix crash/leaks from xmlSchematronParse due to improper

1
globals.c
View File

@ -60,6 +60,7 @@ void xmlCleanupGlobals(void)
xmlFreeMutex(xmlThrDefMutex); xmlFreeMutex(xmlThrDefMutex);
xmlThrDefMutex = NULL; xmlThrDefMutex = NULL;
} }
__xmlGlobalInitMutexDestroy();
} }
/************************************************************************ /************************************************************************

1
libxml.h
View File

@ -77,6 +77,7 @@ void __htmlParseContent(void *ctx);
*/ */
void __xmlGlobalInitMutexLock(void); void __xmlGlobalInitMutexLock(void);
void __xmlGlobalInitMutexUnlock(void); void __xmlGlobalInitMutexUnlock(void);
void __xmlGlobalInitMutexDestroy(void);
#ifdef IN_LIBXML #ifdef IN_LIBXML
#ifdef __GNUC__ #ifdef __GNUC__

19
threads.c
View File

@ -451,6 +451,7 @@ __xmlGlobalInitMutexLock(void)
* section in the global_init_lock then discard the one * section in the global_init_lock then discard the one
* allocated by this thread. */ * allocated by this thread. */
if (global_init_lock != cs) { if (global_init_lock != cs) {
DeleteCriticalSection(cs);
free(cs); free(cs);
} }
} }
@ -500,6 +501,24 @@ __xmlGlobalInitMutexUnlock(void)
#endif #endif
} }
/**
* xmlGlobalInitMutexDestroy
*
* Makes sure that the global initialization mutex is destroyed before
* application termination.
*/
void __xmlGlobalInitMutexDestroy(void)
{
#if defined HAVE_WIN32_THREADS
if (global_init_lock != NULL)
{
DeleteCriticalSection(global_init_lock);
free(global_init_lock);
global_init_lock = NULL;
}
#endif
}
/************************************************************************ /************************************************************************
* * * *
* Per thread global state handling * * Per thread global state handling *