From 42ffe0b5367e4245532f5e9af6e3aa02d94b8af6 Mon Sep 17 00:00:00 2001 From: Mirko Viviani Date: Fri, 10 Nov 2000 10:57:36 +0000 Subject: [PATCH] * Source/NSBundle.m ([NSBundle +_addFrameworkFromClass:]): avoid crash when called with Nil class. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8074 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSBundle.m | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3c379f88..da94763c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-11-10 Mirko Viviani + + * Source/NSBundle.m ([NSBundle +_addFrameworkFromClass:]): avoid crash + when called with Nil class. + 2000-11-10 Richard Frith-Macdonald * Source/GSTcpPort.m: Added some locking tweaks for writing data. diff --git a/Source/NSBundle.m b/Source/NSBundle.m index a73cb7abf..636966485 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -222,10 +222,15 @@ _bundle_name_first_match(NSString* directory, NSString* name) + (BOOL) _addFrameworkFromClass:(Class)frameworkClass { - NSBundle *bundle; + NSBundle *bundle; NSString **fmClasses; - NSString *bundlePath = nil; - int len = strlen(frameworkClass->name); + NSString *bundlePath = nil; + int len; + + if (frameworkClass == Nil) + return NO; + + len = strlen(frameworkClass->name); if (len > 12*sizeof(char) && !strncmp("NSFramework_", frameworkClass->name, sizeof(char)*12))