Merge pull request nygard#47 from OleksiyA/seg-fault-fix

Corrected set-fault when self.name is nil and componentsJoinedByString failing to join such nil components.
xcltyt · Oct 18, 2014 · cce181f · cce181f
2 parents 71b7518 + 1dc1220
commit cce181f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Source/CDTypeName.m b/Source/CDTypeName.m
@@ -53,8 +53,9 @@ - (BOOL)isEqual:(id)otherObject;
 
 - (NSString *)description;
 {
-    if ([self.templateTypes count] == 0)
-        return self.name;
+    if ([self.templateTypes count] == 0) {
+        return self.name ? self.name : @"";
+    }
 
     if (self.suffix != nil)
         return [NSString stringWithFormat:@"%@<%@>%@", self.name, [self.templateTypes componentsJoinedByString:@", "], self.suffix];