Removed super selector leak when calling a swizzled method

parmanoir · Aug 3, 2011 · 2541dfa · 2541dfa
1 parent 0c45a77
commit 2541dfa
Show file tree

Hide file tree

Showing 60 changed files with 10,611 additions and 6,641 deletions.
diff --git a/JSCocoa/JSCocoaController.m b/JSCocoa/JSCocoaController.m
@@ -4769,7 +4769,11 @@ static JSValueRef jsCocoaObject_callAsFunction(JSContextRef ctx, JSObjectRef fun
 				JSStringRef resultStringJS = JSValueToStringCopy(ctx, arguments[1], NULL);
 				superSelector = (NSString*)JSStringCopyCFString(kCFAllocatorDefault, resultStringJS);
 				JSStringRelease(resultStringJS);
-				if (callingSwizzled)	superSelector = [NSString stringWithFormat:@"%@%@", OriginalMethodPrefix, superSelector];
+				if (callingSwizzled)	{
+					NSString* previousSelector = superSelector;
+					superSelector = [NSString stringWithFormat:@"%@%@", OriginalMethodPrefix, superSelector];
+					[previousSelector release];
+				}
 			}			
 
 			// Swizzled handling : we're just changing the selector

diff --git a/Tests/1 C and ObjC calls.js → Tests/! stock/1 C and ObjC calls.js b/Tests/1 C and ObjC calls.js → Tests/! stock/1 C and ObjC calls.js
diff --git a/Tests/10 shorthand overload.js → Tests/! stock/10 shorthand overload.js b/Tests/10 shorthand overload.js → Tests/! stock/10 shorthand overload.js
diff --git a/Tests/11 retain test 2.js → Tests/! stock/11 retain test 2.js b/Tests/11 retain test 2.js → Tests/! stock/11 retain test 2.js
diff --git a/Tests/12 instance variables.js → Tests/! stock/12 instance variables.js b/Tests/12 instance variables.js → Tests/! stock/12 instance variables.js
diff --git a/Tests/13 instance.js → Tests/! stock/13 instance.js b/Tests/13 instance.js → Tests/! stock/13 instance.js
diff --git a/Tests/14 class.js → Tests/! stock/14 class.js b/Tests/14 class.js → Tests/! stock/14 class.js
diff --git a/Tests/15 IBOutlet IBAction.js → Tests/! stock/15 IBOutlet IBAction.js b/Tests/15 IBOutlet IBAction.js → Tests/! stock/15 IBOutlet IBAction.js
diff --git a/Tests/16 NSArray NSDictionary easy access.js → ...ck/16 NSArray NSDictionary easy access.js b/Tests/16 NSArray NSDictionary easy access.js → ...ck/16 NSArray NSDictionary easy access.js
diff --git a/Tests/17 struct instance.js → Tests/! stock/17 struct instance.js b/Tests/17 struct instance.js → Tests/! stock/17 struct instance.js
diff --git a/Tests/18 structure args.js → Tests/! stock/18 structure args.js b/Tests/18 structure args.js → Tests/! stock/18 structure args.js
diff --git a/Tests/19 pure js methods.js → Tests/! stock/19 pure js methods.js b/Tests/19 pure js methods.js → Tests/! stock/19 pure js methods.js
diff --git a/Tests/2 structure arguments.js → Tests/! stock/2 structure arguments.js b/Tests/2 structure arguments.js → Tests/! stock/2 structure arguments.js
diff --git a/Tests/20 pointer to function.js → Tests/! stock/20 pointer to function.js b/Tests/20 pointer to function.js → Tests/! stock/20 pointer to function.js
diff --git a/Tests/21 new class definition.js → Tests/! stock/21 new class definition.js b/Tests/21 new class definition.js → Tests/! stock/21 new class definition.js
diff --git a/Tests/22 instance valueOf.js → Tests/! stock/22 instance valueOf.js b/Tests/22 instance valueOf.js → Tests/! stock/22 instance valueOf.js
diff --git a/Tests/23 NSString bridging.js → Tests/! stock/23 NSString bridging.js b/Tests/23 NSString bridging.js → Tests/! stock/23 NSString bridging.js
diff --git a/Tests/24 structure set.js → Tests/! stock/24 structure set.js b/Tests/24 structure set.js → Tests/! stock/24 structure set.js
diff --git a/Tests/25 variadic.js → Tests/! stock/25 variadic.js b/Tests/25 variadic.js → Tests/! stock/25 variadic.js
diff --git a/Tests/26 full NSArray bridge.js → Tests/! stock/26 full NSArray bridge.js b/Tests/26 full NSArray bridge.js → Tests/! stock/26 full NSArray bridge.js
diff --git a/Tests/27 type modifier o.js → Tests/! stock/27 type modifier o.js b/Tests/27 type modifier o.js → Tests/! stock/27 type modifier o.js
diff --git a/Tests/28 struct description.js → Tests/! stock/28 struct description.js b/Tests/28 struct description.js → Tests/! stock/28 struct description.js
diff --git a/Tests/29 pointer handling.js → Tests/! stock/29 pointer handling.js b/Tests/29 pointer handling.js → Tests/! stock/29 pointer handling.js
diff --git a/Tests/3 derivation.js → Tests/! stock/3 derivation.js b/Tests/3 derivation.js → Tests/! stock/3 derivation.js
diff --git a/Tests/30 obj1 == obj2.js → Tests/! stock/30 obj1 == obj2.js b/Tests/30 obj1 == obj2.js → Tests/! stock/30 obj1 == obj2.js
diff --git a/Tests/31 bridgeSupport bench.js → Tests/! stock/31 bridgeSupport bench.js b/Tests/31 bridgeSupport bench.js → Tests/! stock/31 bridgeSupport bench.js
diff --git a/Tests/32 new class syntax.js → Tests/! stock/32 new class syntax.js b/Tests/32 new class syntax.js → Tests/! stock/32 new class syntax.js
diff --git a/Tests/33 class syntax swizzle.js → Tests/! stock/33 class syntax swizzle.js b/Tests/33 class syntax swizzle.js → Tests/! stock/33 class syntax swizzle.js
diff --git a/Tests/34 object keys.js → Tests/! stock/34 object keys.js b/Tests/34 object keys.js → Tests/! stock/34 object keys.js
diff --git a/Tests/35 webview.js → Tests/! stock/35 webview.js b/Tests/35 webview.js → Tests/! stock/35 webview.js
diff --git a/Tests/36 safe dealloc.js → Tests/! stock/36 safe dealloc.js b/Tests/36 safe dealloc.js → Tests/! stock/36 safe dealloc.js
diff --git a/Tests/37 init from webview.js → Tests/! stock/37 init from webview.js b/Tests/37 init from webview.js → Tests/! stock/37 init from webview.js
diff --git a/Tests/38 class walker.js → Tests/! stock/38 class walker.js b/Tests/38 class walker.js → Tests/! stock/38 class walker.js
diff --git a/Tests/39 NSArray js functions.js → Tests/! stock/39 NSArray js functions.js b/Tests/39 NSArray js functions.js → Tests/! stock/39 NSArray js functions.js
diff --git a/Tests/4 js load.js → Tests/! stock/4 js load.js b/Tests/4 js load.js → Tests/! stock/4 js load.js
diff --git a/Tests/40 ObjJ syntax.js → Tests/! stock/40 ObjJ syntax.js b/Tests/40 ObjJ syntax.js → Tests/! stock/40 ObjJ syntax.js
diff --git a/Tests/41 class inner js functions.js → Tests/! stock/41 class inner js functions.js b/Tests/41 class inner js functions.js → Tests/! stock/41 class inner js functions.js
diff --git a/Tests/42 return if.js → Tests/! stock/42 return if.js b/Tests/42 return if.js → Tests/! stock/42 return if.js
diff --git a/Tests/43 @ string and selector.js → Tests/! stock/43 @ string and selector.js b/Tests/43 @ string and selector.js → Tests/! stock/43 @ string and selector.js
diff --git a/Tests/44 instanceWith.js → Tests/! stock/44 instanceWith.js b/Tests/44 instanceWith.js → Tests/! stock/44 instanceWith.js
diff --git a/Tests/45 ƒ function shortcut.js → Tests/! stock/45 ƒ function shortcut.js b/Tests/45 ƒ function shortcut.js → Tests/! stock/45 ƒ function shortcut.js
diff --git a/Tests/46 exceptions.js → Tests/! stock/46 exceptions.js b/Tests/46 exceptions.js → Tests/! stock/46 exceptions.js
diff --git a/Tests/48 ObjJ syntax compatibility.js → ...s/! stock/48 ObjJ syntax compatibility.js b/Tests/48 ObjJ syntax compatibility.js → ...s/! stock/48 ObjJ syntax compatibility.js
diff --git a/Tests/49 out pointer.js → Tests/! stock/49 out pointer.js b/Tests/49 out pointer.js → Tests/! stock/49 out pointer.js
diff --git a/Tests/50 setValueForKey op.js → Tests/! stock/50 setValueForKey op.js b/Tests/50 setValueForKey op.js → Tests/! stock/50 setValueForKey op.js
diff --git a/Tests/51 ObjC blocks.js → Tests/! stock/51 ObjC blocks.js b/Tests/51 ObjC blocks.js → Tests/! stock/51 ObjC blocks.js
diff --git a/Tests/52 line and sourceURL.js → Tests/! stock/52 line and sourceURL.js b/Tests/52 line and sourceURL.js → Tests/! stock/52 line and sourceURL.js
diff --git a/Tests/53 Unicode ObjC classes.js → Tests/! stock/53 Unicode ObjC classes.js b/Tests/53 Unicode ObjC classes.js → Tests/! stock/53 Unicode ObjC classes.js
diff --git a/Tests/54 custom indexed access.js → Tests/! stock/54 custom indexed access.js b/Tests/54 custom indexed access.js → Tests/! stock/54 custom indexed access.js
diff --git a/Tests/55 javascript method override.js → .../! stock/55 javascript method override.js b/Tests/55 javascript method override.js → .../! stock/55 javascript method override.js
diff --git a/Tests/56 whitespace.js → Tests/! stock/56 whitespace.js b/Tests/56 whitespace.js → Tests/! stock/56 whitespace.js
diff --git a/Tests/6 basic arguments.js → Tests/! stock/6 basic arguments.js b/Tests/6 basic arguments.js → Tests/! stock/6 basic arguments.js
diff --git a/Tests/7 split call.js → Tests/! stock/7 split call.js b/Tests/7 split call.js → Tests/! stock/7 split call.js
diff --git a/Tests/8 zero arg autocall.js → Tests/! stock/8 zero arg autocall.js b/Tests/8 zero arg autocall.js → Tests/! stock/8 zero arg autocall.js
diff --git a/Tests/9 auto setter.js → Tests/! stock/9 auto setter.js b/Tests/9 auto setter.js → Tests/! stock/9 auto setter.js
diff --git a/TestsRunner/ApplicationController.h b/TestsRunner/ApplicationController.h
@@ -29,6 +29,7 @@
 
 	NSError*	testNSError;
 
+	BOOL		areTestsRunning;
 	BOOL		runningContinuously;
 	// If we cycle context each time, we can test bindings each time.
 	BOOL		cyclingContext;

diff --git a/TestsRunner/ApplicationController.m b/TestsRunner/ApplicationController.m
@@ -22,7 +22,7 @@ - (id)init {
 		return nil;
 
 	test_unit = test_delegate = test_webview = test_autocall = YES;
-
+	areTestsRunning	= NO;
 	return self;
 }
 
@@ -98,8 +98,7 @@ - (void)cycleContext
 //
 int runCount = 0;
 
-- (IBAction)runJSTests:(id)sender
+- (IBAction)_runJSTests:(id)sender {
-{
 	[self cycleContext];
 
 	[textField setStringValue:@"Running Tests ..."];
@@ -241,7 +240,14 @@ - (IBAction)runJSTests:(id)sender
 	NSLog(@"r=%@", r);
 */
 }
-
+- (IBAction)runJSTests:(id)sender
+{
+	if (areTestsRunning)
+		return;
+	areTestsRunning = YES;
+	[self _runJSTests:sender];
+	areTestsRunning = NO;
+}
 
 - (IBAction)_runJSTestsContinuously:(id)sender
 {
@@ -267,6 +273,15 @@ - (BOOL)validateMenuItem:(NSMenuItem *) menuItem {
 	return NO;
 }
 
+- (void)dumpObjectAtAddress:(NSUInteger)address {
+	void* p = (void*)address;
+	NSLog(@"object at %p=", p);
+	@try {
+		NSLog(@"%@", *(id*)p);
+	} @catch (NSException* e) {
+		NSLog(@"Bad address");
+	}
+}
 
 //
 //
@@ -1165,4 +1180,3 @@ + (void)testFunction:(void (^)(NSError *))theBlock {
 
 
 
-
diff --git a/TestsRunner/English.lproj/MainMenu.xib b/TestsRunner/English.lproj/MainMenu.xib
@@ -1360,20 +1360,21 @@
 						<object class="NSTextField" id="835093140">
 							<reference key="NSNextResponder" ref="439893737"/>
 							<int key="NSvFlags">290</int>
-							<string key="NSFrame">{{17, 20}, {386, 11}}</string>
+							<string key="NSFrame">{{17, 19}, {386, 12}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="291550997">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272892928</int>
-								<string key="NSContents">Text field</string>
+								<string key="NSContents"/>
 								<object class="NSFont" key="NSSupport">
 									<string key="NSName">LucidaGrande</string>
 									<double key="NSSize">9</double>
 									<int key="NSfFlags">3614</int>
 								</object>
+								<string key="NSPlaceholderString">…</string>
 								<reference key="NSControlView" ref="835093140"/>
 								<object class="NSColor" key="NSBackgroundColor" id="895343154">
 									<int key="NSColorSpace">6</int>