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

Tweak to avoid possible re-entrancy errors

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35256 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-07-05 10:46:39 +00:00
parent bb5d10108f
commit 445b29faa4
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,8 +1,14 @@
2012-07-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Don't assume that code loading won't be called
re-entrantly.
2012-07-05 Quentin Mathe <quentin.mathe@gmail.com>
* Source/NSPathUtilities.m: Fixed constant string comparison error
reported by Clang SVN trunk r158230 or more recent.
See http://llvm.org/viewvc/llvm-project?view=rev&revision=158230
This is a workaround for a Clang compiler bug ...
2012-07-02 Richard Frith-Macdonald <rfm@gnu.org>

36
Source/NSBundle.m
View file

@ -634,7 +634,7 @@ _find_main_bundle_for_tool(NSString *toolName)
if ([bundlePath isEqualToString: GSPrivateExecutablePath()])
{
/* Ops ... the NSFramework_xxx class is linked in the main
/* Oops ... the NSFramework_xxx class is linked in the main
* executable. Maybe the framework was statically linked
* into the application ... resort to searching the
* framework bundle on the filesystem manually.
@ -924,8 +924,8 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
/* Don't store the internal NSFramework_xxx class into the list of
bundle classes, but store the linked frameworks in _loadingFrameworks */
if (strlen (className) > 12 && !strncmp ("NSFramework_",
className, 12))
if (strlen (className) > 12
&& !strncmp ("NSFramework_", className, 12))
{
if (_currentFrameworkName)
{
@ -1792,18 +1792,26 @@ IF_NO_GC(
NSEnumerator *classEnumerator;
NSMutableArray *classNames;
NSValue *class;
NSBundle *savedLoadingBundle;
/* Get the binary and set up fraework name if it is a framework.
*/
object = [self executablePath];
if (object == nil || [object length] == 0)
{
[load_lock unlock];
return NO;
}
savedLoadingBundle = _loadingBundle;
_loadingBundle = self;
_bundleClasses = [[NSMutableArray alloc] initWithCapacity: 2];
_loadingFrameworks = RETAIN([NSMutableArray arrayWithCapacity: 2]);
/* This code is executed twice if a class linked in the bundle call a
if (nil == savedLoadingBundle)
{
_loadingFrameworks = [[NSMutableArray alloc] initWithCapacity: 2];
}
/* This code is executed twice if a class linked in the bundle calls a
NSBundle method inside +load (-principalClass). To avoid this we set
_codeLoaded before loading the bundle. */
_codeLoaded = YES;
@ -1811,8 +1819,12 @@ IF_NO_GC(
if (GSPrivateLoadModule(object, stderr, _bundle_load_callback, 0, 0))
{
_codeLoaded = NO;
DESTROY(_loadingFrameworks);
DESTROY(_currentFrameworkName);
_loadingBundle = savedLoadingBundle;
if (nil == _loadingBundle)
{
DESTROY(_loadingFrameworks);
DESTROY(_currentFrameworkName);
}
[load_lock unlock];
return NO;
}
@ -1832,10 +1844,6 @@ IF_NO_GC(
normally want all loaded bundles to appear when they call
+allBundles. */
IF_NO_GC([self retain];)
_loadingBundle = nil;
DESTROY(_loadingFrameworks);
DESTROY(_currentFrameworkName);
classNames = [NSMutableArray arrayWithCapacity: [_bundleClasses count]];
classEnumerator = [_bundleClasses objectEnumerator];
@ -1846,6 +1854,12 @@ IF_NO_GC(
NSStringFromClass((Class)[class pointerValue])];
}
_loadingBundle = savedLoadingBundle;
if (nil == _loadingBundle)
{
DESTROY(_loadingFrameworks);
DESTROY(_currentFrameworkName);
}
[load_lock unlock];
[[NSNotificationCenter defaultCenter]