Title: [148937] trunk/Source/WebKit2
Revision
148937
Author
[email protected]
Date
2013-04-22 17:43:25 -0700 (Mon, 22 Apr 2013)

Log Message

        [Mac] REGRESSION (r142806): "Just Leaking" Console errors on launch
        https://bugs.webkit.org/show_bug.cgi?id=115002
        <rdar://problem/13254212>

        Reviewed by Sam Weinig.

        * Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.mm:
        (WebKit::BootstrapMain): Added an autorelease pool for code that uses Objective-C.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (148936 => 148937)


--- trunk/Source/WebKit2/ChangeLog	2013-04-23 00:16:27 UTC (rev 148936)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-23 00:43:25 UTC (rev 148937)
@@ -1,3 +1,14 @@
+2013-04-22  Alexey Proskuryakov  <[email protected]>
+
+        [Mac] REGRESSION (r142806): "Just Leaking" Console errors on launch
+        https://bugs.webkit.org/show_bug.cgi?id=115002
+        <rdar://problem/13254212>
+
+        Reviewed by Sam Weinig.
+
+        * Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.mm:
+        (WebKit::BootstrapMain): Added an autorelease pool for code that uses Objective-C.
+
 2013-04-22  Anders Carlsson  <[email protected]>
 
         Web process should decide when to continue main resource loads

Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.mm (148936 => 148937)


--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.mm	2013-04-23 00:16:27 UTC (rev 148936)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.mm	2013-04-23 00:43:25 UTC (rev 148937)
@@ -63,11 +63,14 @@
         return EXIT_FAILURE;
     }
 
-    NSString *entryPointFunctionName = (NSString *)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
-    BootstrapMainFunction bootstrapMainFunction = reinterpret_cast<BootstrapMainFunction>(dlsym(frameworkLibrary, [entryPointFunctionName UTF8String]));
-    if (!bootstrapMainFunction) {
-        NSLog(@"Unable to find entry point '%s' in WebKit2.framework: %s\n", [entryPointFunctionName UTF8String], dlerror());
-        return EXIT_FAILURE;
+    BootstrapMainFunction bootstrapMainFunction;
+    @autoreleasepool {
+        NSString *entryPointFunctionName = (NSString *)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
+        bootstrapMainFunction = reinterpret_cast<BootstrapMainFunction>(dlsym(frameworkLibrary, [entryPointFunctionName UTF8String]));
+        if (!bootstrapMainFunction) {
+            NSLog(@"Unable to find entry point '%s' in WebKit2.framework: %s\n", [entryPointFunctionName UTF8String], dlerror());
+            return EXIT_FAILURE;
+        }
     }
 
     return bootstrapMainFunction(argc, argv);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to