shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-27 03:21:26 +03:00
Code

globals: Abort if lazy allocation of global state failed

Browse Source 
There's really nothing we can do in this situation, so it's better to
abort with an error message.
This commit is contained in:
Nick Wellnhofer 2023-09-20 13:30:01 +02:00
parent 868b94b80e
commit ea29b95144
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
globals.c
View File

@ -11,6 +11,7 @@
#define IN_LIBXML
#include "libxml.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -792,13 +793,24 @@ xmlInitGlobalState(xmlGlobalStatePtr gs) {
* Returns the newly allocated xmlGlobalStatePtr or NULL in case of error
*/
static xmlGlobalStatePtr
xmlNewGlobalState(void)
xmlNewGlobalState(int allowFailure)
{
xmlGlobalState *gs;
gs = malloc(sizeof(xmlGlobalState));
if (gs == NULL)
return (NULL);
if (gs == NULL) {
if (allowFailure)
return(NULL);
/*
* If an application didn't call xmlCheckThreadLocalStorage to make
* sure that global state could be allocated, it's too late to
* handle the error.
*/
fprintf(stderr, "libxml2: Failed to allocate globals for thread\n"
"libxml2: See xmlCheckThreadLocalStorage\n");
abort();
}
memset(gs, 0, sizeof(xmlGlobalState));
xmlInitGlobalState(gs);
@ -807,9 +819,11 @@ xmlNewGlobalState(void)
#endif
static xmlGlobalStatePtr
xmlGetThreadLocalStorage(void) {
xmlGetThreadLocalStorage(int allowFailure) {
xmlGlobalState *gs;
(void) allowFailure;
#ifdef XML_THREAD_LOCAL
gs = &globalState;
if (gs->initialized == 0)
@ -817,11 +831,11 @@ xmlGetThreadLocalStorage(void) {
#elif defined(HAVE_POSIX_THREADS)
gs = (xmlGlobalState *) pthread_getspecific(globalkey);
if (gs == NULL)
gs = xmlNewGlobalState();
gs = xmlNewGlobalState(allowFailure);
#elif defined(HAVE_WIN32_THREADS)
gs = (xmlGlobalState *) TlsGetValue(globalkey);
if (gs == NULL)
gs = xmlNewGlobalState();
gs = xmlNewGlobalState(allowFailure);
#else
gs = NULL;
#endif
@ -855,7 +869,7 @@ xmlGetThreadLocalStorage(void) {
int
xmlCheckThreadLocalStorage(void) {
#if defined(LIBXML_THREAD_ENABLED) && !defined(XML_THREAD_LOCAL_STORAGE)
if ((!xmlIsMainThreadInternal()) && (xmlGetThreadLocalStorage() == NULL))
if ((!xmlIsMainThreadInternal()) && (xmlGetThreadLocalStorage(1) == NULL))
return(-1);
#endif
return(0);
@ -1124,7 +1138,7 @@ xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc fun
if (IS_MAIN_THREAD) \
return (&name); \
else \
return (&xmlGetThreadLocalStorage()->gs_##name); \
return (&xmlGetThreadLocalStorage(0)->gs_##name); \
}
#define XML_OP XML_DEFINE_GLOBAL_WRAPPER