gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initialise XMLParser in main thread

Browse source
This commit is contained in:
Richard Frith-Macdonald 2021-02-18 21:18:41 +00:00
parent e6c387f8fd
commit 958449e90f
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Source/Additions/GSXML.m
View file

@ -67,6 +67,7 @@
#import "Foundation/NSFileManager.h"
#import "Foundation/NSRunLoop.h"
#import "Foundation/NSString.h"
#import "Foundation/NSThread.h"
#import "Foundation/NSTimer.h"
#import "Foundation/NSTimeZone.h"
#import "Foundation/NSURL.h"
@ -156,20 +157,32 @@ static char * xml_strdup(const char *from)
return to;
}
@implementation NSObject (SetupForGSXML)
+ (void) _setupForGSXML
{
xmlInitParser();
xmlMemSetup(free, malloc, realloc, xml_strdup);
xmlInitializeCatalog();
xmlDefaultSAXHandlerInit();
NSString_class = [NSString class];
usSel = @selector(stringWithUTF8String:);
usImp = (id (*)(id, SEL, const unsigned char*))
[NSString_class methodForSelector: usSel];
treeClass = [GSTreeSAXHandler class];
cacheDone = YES;
}
@end
static void
setupCache()
{
if (cacheDone == NO)
{
cacheDone = YES;
xmlMemSetup(free, malloc, realloc, xml_strdup);
xmlInitializeCatalog();
xmlDefaultSAXHandlerInit();
NSString_class = [NSString class];
usSel = @selector(stringWithUTF8String:);
usImp = (id (*)(id, SEL, const unsigned char*))
[NSString_class methodForSelector: usSel];
treeClass = [GSTreeSAXHandler class];
/* Setup of libxml2 must be done on main thread.
*/
[NSObject performSelectorOnMainThread: @selector(_setupForGSXML)
withObject: nil
waitUntilDone: YES];
}
}
@ -3660,7 +3673,7 @@ fatalErrorFunction(void *ctx, const unsigned char *msg, ...)
}
else
{
memcpy(lib, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler));
xmlSAX2InitDefaultSAXHandler(lib, 0);
#define LIB ((xmlSAXHandlerPtr)lib)
/*
@ -3779,7 +3792,7 @@ fatalErrorFunction(void *ctx, const unsigned char *msg, ...)
}
else
{
memcpy(lib, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler));
xmlSAX2InitDefaultSAXHandler(lib, 0);
#define LIB ((xmlSAXHandlerPtr)lib)
#define SETCB(NAME,SEL) if ([self methodForSelector: @selector(SEL)] != [treeClass instanceMethodForSelector: @selector(SEL)]) LIB->NAME = (void*)NAME ## Function