Title: [275135] trunk/Source/WebKit
- Revision
- 275135
- Author
- [email protected]
- Date
- 2021-03-27 10:15:19 -0700 (Sat, 27 Mar 2021)
Log Message
Fix leaks in WKInspectorResourceURLSchemeHandler
<https://webkit.org/b/223824>
Reviewed by Joseph Pecoraro.
* UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:
(-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
- Make use of adoptNS() when assigning a newly allocated, +1
retained Objective-C object to a RetainPtr<>.
- Also fix leak of local NSHTTPURLResponse object by using a
RetainPtr<>.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (275134 => 275135)
--- trunk/Source/WebKit/ChangeLog 2021-03-27 16:01:48 UTC (rev 275134)
+++ trunk/Source/WebKit/ChangeLog 2021-03-27 17:15:19 UTC (rev 275135)
@@ -1,3 +1,17 @@
+2021-03-27 David Kilzer <[email protected]>
+
+ Fix leaks in WKInspectorResourceURLSchemeHandler
+ <https://webkit.org/b/223824>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:
+ (-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
+ - Make use of adoptNS() when assigning a newly allocated, +1
+ retained Objective-C object to a RetainPtr<>.
+ - Also fix leak of local NSHTTPURLResponse object by using a
+ RetainPtr<>.
+
2021-03-27 Simon Fraser <[email protected]>
Remove DisplayRefreshMonitor::handleDisplayRefreshedNotificationOnMainThread()
Modified: trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm (275134 => 275135)
--- trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm 2021-03-27 16:01:48 UTC (rev 275134)
+++ trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm 2021-03-27 17:15:19 UTC (rev 275135)
@@ -52,10 +52,10 @@
}
if (!_fileLoadOperations)
- _fileLoadOperations = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory valueOptions:NSPointerFunctionsStrongMemory capacity:5];
+ _fileLoadOperations = adoptNS([[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory valueOptions:NSPointerFunctionsStrongMemory capacity:5]);
if (!_operationQueue) {
- _operationQueue = [[NSOperationQueue alloc] init];
+ _operationQueue = adoptNS([[NSOperationQueue alloc] init]);
_operationQueue.get().underlyingQueue = dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0);
_operationQueue.get().qualityOfService = NSOperationQualityOfServiceUserInteractive;
}
@@ -85,13 +85,13 @@
if (!mimeType)
mimeType = @"application/octet-stream";
- NSHTTPURLResponse *urlResponse = [[NSHTTPURLResponse alloc] initWithURL:urlSchemeTask.request.URL statusCode:200 HTTPVersion:nil headerFields:@{
+ RetainPtr<NSHTTPURLResponse> urlResponse = adoptNS([[NSHTTPURLResponse alloc] initWithURL:urlSchemeTask.request.URL statusCode:200 HTTPVersion:nil headerFields:@{
@"Access-Control-Allow-Origin": @"*",
@"Content-Length": [NSString stringWithFormat:@"%zu", (size_t)fileData.length],
@"Content-Type": mimeType,
- }];
+ }]);
- [urlSchemeTask didReceiveResponse:urlResponse];
+ [urlSchemeTask didReceiveResponse:urlResponse.get()];
[urlSchemeTask didReceiveData:fileData];
[urlSchemeTask didFinish];
}];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
