Merge pull request #331 from Ricowere/master

Inifinite loop in some while-loops
appsquickly · Mar 24, 2015 · c3bbbbc · c3bbbbc
2 parents 1c98abd + c881308
commit c3bbbbc
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 10 deletions.
diff --git a/Source/Definition/AutoInjection/TyphoonFactoryAutoInjectionPostProcessor.m b/Source/Definition/AutoInjection/TyphoonFactoryAutoInjectionPostProcessor.m
@@ -53,7 +53,8 @@ - (NSArray *)autoInjectedPropertiesForClass:(Class)clazz
     NSMutableArray *injections = nil;
     NSSet *allProperties = [TyphoonIntrospectionUtils injectedPropertiesForClass:clazz upToParentClass:[NSObject class]];
     for (NSString *propertyName in allProperties) {
-        TyphoonTypeDescriptor *type = [clazz typhoon_typeForPropertyWithName:propertyName];
+		TyphoonTypeDescriptor *type = [TyphoonIntrospectionUtils typeForPropertyWithName:propertyName inClass:clazz];
+
         id explicitType = TypeForInjectionFromType(type);
         if (!explicitType) {
             [NSException raise:NSInternalInconsistencyException format:@"Can't resolve '%@' property in %@ class. Make sure that specified protocol/class exist and linked.", propertyName, clazz];

diff --git a/Source/Utils/TyphoonIntrospectionUtils.m b/Source/Utils/TyphoonIntrospectionUtils.m
@@ -137,7 +137,7 @@ + (NSSet *)injectedPropertiesForClass:(Class)clazz upToParentClass:(Class)parent
     NSString *injectedObjectClassName = NSStringFromClass([TyphoonInjectedObject class]);
     NSString *injectedProtolName = NSStringFromProtocol(@protocol(TyphoonInjectedProtocol));
 
-    while (clazz != parent) {
+    while (clazz && clazz != parent) {
         unsigned int count = 0;
         objc_property_t *properties = class_copyPropertyList(clazz, &count);
 
@@ -177,7 +177,7 @@ + (NSSet *)propertiesForClass:(Class)clazz upToParentClass:(Class)parent
 
     NSMutableSet *propertyNames = [[NSMutableSet alloc] init];
 
-    while (clazz != parent) {
+    while (clazz && clazz != parent) {
         unsigned int count = 0;
         objc_property_t *properties = class_copyPropertyList(clazz, &count);
 
@@ -202,7 +202,7 @@ + (NSSet *)methodsForClass:(Class)clazz upToParentClass:(Class)parent
 {
     NSMutableSet *methodSelectors = [[NSMutableSet alloc] init];
 
-    while (clazz != parent) {
+    while (clazz && clazz != parent) {
         unsigned int methodCount;
         Method *methodList = class_copyMethodList(clazz, &methodCount);
         for (unsigned int i = 0; i < methodCount; i++) {

diff --git a/Typhoon.xcodeproj/xcshareddata/xcschemes/TyphoonFrameworkSwiftExample.xcscheme b/Typhoon.xcodeproj/xcshareddata/xcschemes/TyphoonFrameworkSwiftExample.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Typhoon.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "90ABC4CE1A36BA53008D8162"
+               BuildableName = "TyphoonFrameworkSwiftExampleTests.xctest"
+               BlueprintName = "TyphoonFrameworkSwiftExampleTests"
+               ReferencedContainer = "container:Typhoon.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -28,6 +42,16 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Debug">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "90ABC4CE1A36BA53008D8162"
+               BuildableName = "TyphoonFrameworkSwiftExampleTests.xctest"
+               BlueprintName = "TyphoonFrameworkSwiftExampleTests"
+               ReferencedContainer = "container:Typhoon.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -48,7 +72,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"
@@ -66,7 +91,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"

diff --git a/Typhoon.xcodeproj/xcshareddata/xcschemes/TyphoonSwift.xcscheme b/Typhoon.xcodeproj/xcshareddata/xcschemes/TyphoonSwift.xcscheme
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    version = "1.3">
-   <BuildAction>
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForRunning = "YES">
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"
@@ -13,12 +19,60 @@
                ReferencedContainer = "container:Typhoon.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "90ABC4CE1A36BA53008D8162"
+               BuildableName = "TyphoonFrameworkSwiftExampleTests.xctest"
+               BlueprintName = "TyphoonFrameworkSwiftExampleTests"
+               ReferencedContainer = "container:Typhoon.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "90ABC4CE1A36BA53008D8162"
+               BuildableName = "TyphoonFrameworkSwiftExampleTests.xctest"
+               BlueprintName = "TyphoonFrameworkSwiftExampleTests"
+               ReferencedContainer = "container:Typhoon.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"
+            BuildableName = "TyphoonFrameworkSwiftExample.app"
+            BlueprintName = "TyphoonFrameworkSwiftExample"
+            ReferencedContainer = "container:Typhoon.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
    <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug">
-      <BuildableProductRunnable>
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"
@@ -27,5 +81,30 @@
             ReferencedContainer = "container:Typhoon.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "90ABC4BA1A36BA53008D8162"
+            BuildableName = "TyphoonFrameworkSwiftExample.app"
+            BlueprintName = "TyphoonFrameworkSwiftExample"
+            ReferencedContainer = "container:Typhoon.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>