gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lazy initialisation of nonBase charset info to avoid recursion during startup

Browse source
This commit is contained in:
rfm 2024-11-15 18:47:45 +00:00
parent d7c9bdbce7
commit 8209fa428f
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Source/NSString.m
View file

@ -169,6 +169,7 @@ static gs_mutex_t placeholderLock = GS_MUTEX_INIT_STATIC;
static SEL cMemberSel = 0;
static NSCharacterSet *nonBase = nil;
static BOOL (*nonBaseImp)(id, SEL, unichar) = 0;
static gs_mutex_t nonBaseLock = GS_MUTEX_INIT_STATIC;
static NSCharacterSet *wPathSeps = nil;
static NSCharacterSet *uPathSeps = nil;
@ -231,8 +232,24 @@ uni_isnonsp(unichar u)
* to a number of issues with UTF-16
*/
if ((u >= 0xdc00) && (u <= 0xdfff))
return YES;
{
return YES;
}
if (0 == nonBaseImp)
{
GS_MUTEX_LOCK(nonBaseLock);
if (nil == nonBase)
{
nonBase = RETAIN([NSCharacterSet nonBaseCharacterSet]);
nonBaseImp
= (BOOL(*)(id,SEL,unichar))[nonBase methodForSelector: cMemberSel];
}
GS_MUTEX_UNLOCK(nonBaseLock);
if (0 == nonBaseImp)
{
return NO; // if charset is missing (prerhaps during process exit)
}
}
return (*nonBaseImp)(nonBase, cMemberSel, u);
}
@ -917,10 +934,6 @@ register_printf_atsign ()
gcrSel = @selector(getCharacters:range:);
ranSel = @selector(rangeOfComposedCharacterSequenceAtIndex:);
nonBase = [NSCharacterSet nonBaseCharacterSet];
nonBaseImp
= (BOOL(*)(id,SEL,unichar))[nonBase methodForSelector: cMemberSel];
_DefaultStringEncoding = GSPrivateDefaultCStringEncoding();
_ByteEncodingOk = GSPrivateIsByteEncoding(_DefaultStringEncoding);