add NSObject static selector safe, add hookDictionaryWithObjects args…

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 xcuserdata
 xcshareddata
+DerivedData/

NSObjectSafe/NSObjectSafe.m

@@ -139,6 +139,8 @@ + (void)load
         swizzleInstanceMethod([NSObject class], @selector(removeObserver:forKeyPath:), @selector(hookRemoveObserver:forKeyPath:));
         swizzleInstanceMethod([NSObject class], @selector(methodSignatureForSelector:), @selector(hookMethodSignatureForSelector:));
         swizzleInstanceMethod([NSObject class], @selector(forwardInvocation:), @selector(hookForwardInvocation:));
+        [NSObject swizzleClassMethod:@selector(methodSignatureForSelector:) withMethod:@selector(hookMethodSignatureForSelector:)];
+        [NSObject swizzleClassMethod:@selector(forwardInvocation:) withMethod:@selector(hookForwardInvocation:)];
     });
 }
 - (void) hookAddObserver:(NSObject *)observer forKeyPath:(NSString *)keyPath options:(NSKeyValueObservingOptions)options context:(void *)context
@@ -168,6 +170,22 @@ - (void) hookRemoveObserver:(NSObject *)observer forKeyPath:(NSString *)keyPath
     }
 }
 
++ (NSMethodSignature*)hookMethodSignatureForSelector:(SEL)aSelector {
+    NSMethodSignature* sig = [self hookMethodSignatureForSelector:aSelector];
+    if (sig) {
+        return sig;
+    }
+
+    return [self.class checkObjectSignatureAndCurrentClass:self.class];
+}
+
++ (void)hookForwardInvocation:(NSInvocation*)invocation
+{
+    NSString* info = [NSString stringWithFormat:@"unrecognized static selector [%@] sent to %@", NSStringFromSelector(invocation.selector), NSStringFromClass(self.class)];
+    [[NSNotificationCenter defaultCenter] postNotificationName:NSSafeNotification object:self userInfo:@{@"invocation":invocation}];
+    [[[NSSafeProxy new] autorelease] dealException:info];
+}
+
 - (NSMethodSignature*)hookMethodSignatureForSelector:(SEL)aSelector {
     /* 如果 当前类有methodSignatureForSelector实现，NSObject的实现直接返回nil
      * 子类实现如下：
@@ -179,14 +197,10 @@ - (NSMethodSignature*)hookMethodSignatureForSelector:(SEL)aSelector {
      *          return sig;
      */
     NSMethodSignature* sig = [self hookMethodSignatureForSelector:aSelector];
-    if (!sig){
-        if (class_getMethodImplementation([NSObject class], @selector(methodSignatureForSelector:))
-            != class_getMethodImplementation(self.class, @selector(methodSignatureForSelector:)) ){
-            return nil;
-        }
-        return [NSMethodSignature signatureWithObjCTypes:"v@:@"];
+    if (sig) {
+        return sig;
     }
-    return sig;
+    return [self.class checkObjectSignatureAndCurrentClass:self.class];
 }
 
 - (void)hookForwardInvocation:(NSInvocation*)invocation
@@ -196,6 +210,28 @@ - (void)hookForwardInvocation:(NSInvocation*)invocation
     [[[NSSafeProxy new] autorelease] dealException:info];
 }
 
+/**
+ * Check the class method signature to the [NSObject class]
+ * If not equals,return nil
+ * If equals,return the v@:@ method
+
+ @param currentClass Class
+ @return NSMethodSignature
+ */
++ (NSMethodSignature *)checkObjectSignatureAndCurrentClass:(Class)currentClass {
+    IMP originIMP = class_getMethodImplementation([NSObject class], @selector(methodSignatureForSelector:));
+    IMP currentClassIMP = class_getMethodImplementation(currentClass, @selector(methodSignatureForSelector:));
+
+    // If current class override methodSignatureForSelector return nil
+    if (originIMP != currentClassIMP){
+        return nil;
+    }
+
+    // Customer method signature
+    // void xxx(id,sel,id)
+    return [NSMethodSignature signatureWithObjCTypes:"v@:@"];
+}
+
 @end
 
 #pragma mark - NSString
@@ -1066,6 +1102,8 @@ + (instancetype) hookDictionaryWithObjects:(const id [])objects forKeys:(const i
             ks[index] = keys[i];
             objs[index] = objects[i];
             ++index;
+        } else {
+            SFAssert(NO, @"NSDictionary invalid args hookDictionaryWithObject:[%@] forKey:[%@]", objects, keys);
         }
     }
     return [self hookDictionaryWithObjects:objs forKeys:ks count:index];

NSObjectSafeTests/NSObjectSafeTests.m

@@ -138,6 +138,8 @@ - (void)testExample {
 
     NSArray* array = @"hello";
     NSLog(@"%@", [array objectAtIndex:1]);
+
+    NSLog(@"%@", [NSArray performSelector:NSSelectorFromString(@"hello")]);
 
     array = [NSArray arrayWithObjects:@1, @2, nil];//__NSArrayI
     [array subarrayWithRange:NSMakeRange(0, 1)];