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

backport framework loading bugfix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/base-1_13_0@24312 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-01-04 08:38:20 +00:00
parent 5c4a470260
commit e54589d3a2
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-01-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: backport fix for crash when initialising with
lots of frameworks.
2007-01-02 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m: backport check for scheme in URL.

32
Source/NSBundle.m
View file

@ -714,8 +714,6 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (self == [NSBundle class])
{
NSDictionary *env;
void *state = NULL;
Class class;
_emptyTable = RETAIN([NSDictionary dictionary]);
@ -772,39 +770,19 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
}
#else
{
int i, numBufClasses = 10, numClasses = 0;
Class *classes;
classes = objc_malloc(sizeof(Class) * numBufClasses);
void *state = NULL;
Class class;
while ((class = objc_next_class(&state)))
{
unsigned int len = strlen (class->name);
if (len > 12 * sizeof(char)
&& !strncmp("NSFramework_", class->name, 12))
if (len > sizeof("NSFramework_")
&& !strncmp("NSFramework_", class->name, 12))
{
classes[numClasses++] = class;
[self _addFrameworkFromClass: class];
}
if (numClasses == numBufClasses)
{
Class *ptr;
numClasses += 10;
ptr = objc_realloc(classes, sizeof(Class) * numClasses);
if (!ptr)
break;
classes = ptr;
}
}
for (i = 0; i < numClasses; i++)
{
[self _addFrameworkFromClass: classes[i]];
}
objc_free(classes);
}
#endif
#if 0