fix jezzmemo#63

Author: Jezz

.gitignore

@@ -21,6 +21,7 @@ xcuserdata/
 *.moved-aside
 *.xccheckout
 *.xcscmblueprint
+.DS_Store
 
 ## Obj-C/Swift specific
 *.hmap

JJException.xcodeproj/project.xcworkspace/xcuserdata/jezz.xcuserdatad/UserInterfaceState.xcuserstate

@@ -27,13 +27,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "JJException/Source/MRC/NSObject+ZombieHook.m"
-            timestampString = "572505624.197015"
+            filePath = "JJException/ViewController.m"
+            timestampString = "577100550.896796"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "57"
-            endingLineNumber = "57"
-            landmarkName = "-hookDealloc"
+            startingLineNumber = "73"
+            endingLineNumber = "73"
+            landmarkName = "-testArrayDictionaryUnrecognizedSelector"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

JJException.xcodeproj/xcuserdata/jezz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -24,6 +24,7 @@ + (void)jj_swizzleNSMutableArray{
     swizzleInstanceMethod(NSClassFromString(@"__NSArrayM"), @selector(insertObject:atIndex:), @selector(hookInsertObject:atIndex:));
     swizzleInstanceMethod(NSClassFromString(@"__NSArrayM"), @selector(removeObjectAtIndex:), @selector(hookRemoveObjectAtIndex:));
     swizzleInstanceMethod(NSClassFromString(@"__NSArrayM"), @selector(replaceObjectAtIndex:withObject:), @selector(hookReplaceObjectAtIndex:withObject:));
+    swizzleInstanceMethod(NSClassFromString(@"__NSArrayM"), @selector(setObject:atIndexedSubscript:), @selector(hookSetObject:atIndexedSubscript:));
     swizzleInstanceMethod(NSClassFromString(@"__NSArrayM"), @selector(removeObjectsInRange:), @selector(hookRemoveObjectsInRange:));
 
     swizzleInstanceMethod(NSClassFromString(@"__NSCFArray"), @selector(objectAtIndex:), @selector(hookObjectAtIndex:));
@@ -83,6 +84,14 @@ - (void) hookReplaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject {
     }
 }
 
+- (void) hookSetObject:(id)object atIndexedSubscript:(NSUInteger)index {
+    if (index < self.count && object) {
+        [self hookSetObject:object atIndexedSubscript:index];
+    }else{
+        handleCrashException(JJExceptionGuardArrayContainer,[NSString stringWithFormat:@"NSMutableArray setObject invalid object:%@ atIndexedSubscript:%tu total:%tu",object,index,self.count]);
+    }
+}
+
 - (void) hookRemoveObjectsInRange:(NSRange)range {
     if (range.location + range.length <= self.count) {
         [self hookRemoveObjectsInRange:range];

JJException/Source/MRC/NSMutableArray+MutableArrayHook.m

@@ -18,22 +18,31 @@ @implementation NSMutableDictionary (MutableDictionaryHook)
 + (void)jj_swizzleNSMutableDictionary{
     swizzleInstanceMethod(NSClassFromString(@"__NSDictionaryM"), @selector(setObject:forKey:), @selector(hookSetObject:forKey:));
     swizzleInstanceMethod(NSClassFromString(@"__NSDictionaryM"), @selector(removeObjectForKey:), @selector(hookRemoveObjectForKey:));
+    swizzleInstanceMethod(NSClassFromString(@"__NSDictionaryM"), @selector(setObject:forKeyedSubscript:), @selector(hookSetObject:forKeyedSubscript:));
 }
 
 - (void) hookSetObject:(id)object forKey:(id)key {
     if (object && key) {
         [self hookSetObject:object forKey:key];
-    }else{
+    } else {
         handleCrashException(JJExceptionGuardDictionaryContainer,[NSString stringWithFormat:@"NSMutableDictionary setObject invalid object:%@ and key:%@",object,key],self);
     }
 }
 
 - (void) hookRemoveObjectForKey:(id)key {
     if (key) {
         [self hookRemoveObjectForKey:key];
-    }else{
+    } else {
         handleCrashException(JJExceptionGuardDictionaryContainer,@"NSMutableDictionary removeObjectForKey nil key",self);
     }
 }
 
+- (void)hookSetObject:(id)object forKeyedSubscript:(id<NSCopying>)key {
+    if (object && key ) {
+        [self hookSetObject:object forKeyedSubscript:key];
+    } else {
+        handleCrashException(JJExceptionGuardDictionaryContainer,[NSString stringWithFormat:@"NSMutableDictionary setObject object:%@ and forKeyedSubscript:%@",object,key],self);
+    }
+}
+
 @end

JJException/Source/MRC/NSMutableDictionary+MutableDictionaryHook.m

@@ -68,6 +68,9 @@ - (void)testMutableArrayException{
 
     NSAssert([mutableArray objectAtIndex:2] == nil, @"Check invalid index crash");
     NSAssert(mutableArray[2] == nil, @"Check invalid index crash");
+    
+    NSMutableArray* atIndexedSubscriptArray = @[@"text"].mutableCopy;
+    atIndexedSubscriptArray[3] = @"iOS";
 }
 
 - (void)testDictionaryException{
@@ -88,6 +91,10 @@ - (void)testMutableDictionaryException{
 
     NSString* key = nil;
     [testDic removeObjectForKey:key];
+    
+    NSMutableDictionary *forKeyedSubscript = @{@"name" : @"text"}.mutableCopy;
+    NSString *subscript = nil;
+    forKeyedSubscript[subscript] = @(25);
 }
 
 - (void)testZombieException{