Fix index out of bounds

qkjs · Aug 2, 2015 · 18ba7f6 · 18ba7f6
1 parent 1390ea7
commit 18ba7f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/MJExtension.podspec b/MJExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MJExtension"
-  s.version      = "2.5.4"
+  s.version      = "2.5.5"
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'
   s.summary      = "The fastest and most convenient conversion between JSON and model"

diff --git a/MJExtension/MJProperty.m b/MJExtension/MJProperty.m
@@ -17,7 +17,7 @@ - (id)valueInObject:(id)object
     if ([object isKindOfClass:[NSDictionary class]] && self.type == MJPropertyKeyTypeDictionary) {
         return object[self.name];
     } else if ([object isKindOfClass:[NSArray class]] && self.type == MJPropertyKeyTypeArray) {
-        return object[self.name.intValue];
+        return [object count] ? object[self.name.intValue] : nil;
     }
     return nil;
 }

diff --git a/MJExtension/NSObject+MJKeyValue.m b/MJExtension/NSObject+MJKeyValue.m
@@ -8,6 +8,7 @@
 
 #import "NSObject+MJKeyValue.h"
 #import "NSObject+MJProperty.h"
+#import "NSString+MJExtension.h"
 #import "MJProperty.h"
 #import "MJType.h"
 #import "MJExtensionConst.h"
@@ -207,6 +208,7 @@ - (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)con
         }
     } @catch (NSException *exception) {
         MJExtensionBuildError(error, exception.reason);
+        NSLog(@"%@", exception);
     }
     return self;
 }
@@ -405,6 +407,7 @@ - (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys ignoredKeys:(NSArray
         }
     } @catch (NSException *exception) {
         MJExtensionBuildError(error, exception.reason);
+        NSLog(@"%@", exception);
     }
 
     return keyValues;

diff --git a/...le.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate b/...le.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate