<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179473] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179473">179473</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 00:27:03 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some leaks found by the leak bot
https://bugs.webkit.org/show_bug.cgi?id=141149
Reviewed by Alexey Proskuryakov.
* bindings/js/JSSubtleCryptoCustom.cpp:
(WebCore::importKey): Changed argument types to std::unique_ptr for better code clarity.
(WebCore::JSSubtleCrypto::importKey): Use WTF::move instead of release.
(WebCore::JSSubtleCrypto::wrapKey): Fixed leaks by adding missing delete calls to the
case where we get a DOM exception.
(WebCore::JSSubtleCrypto::unwrapKey): Ditto.
* dom/SelectorQuery.cpp:
(WebCore::SelectorQuery::SelectorQuery): Use WTF::move here. Not clear how this could
have caused the storage leak, but it does seem obviously missing. The leak is pretty big,
implying that we leak almost all CSSSelectorList objects we parse; not sure this fixes it.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse): Added code to
deleted the unguarded pointer if postTaskForModeToWorkerGlobalScope fails.
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveData): Ditto.
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFail): Ditto.
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck): Ditto.
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
(WebCore::MediaSelectionGroupAVFObjC::updateOptions): Added missing adoptNS.
* platform/graphics/mac/GraphicsContextMac.mm:
(WebCore::GraphicsContext::updateDocumentMarkerResources): Added missing release.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQuerycpp">trunk/Source/WebCore/dom/SelectorQuery.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/ChangeLog 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-02-02 Darin Adler <darin@apple.com>
+
+ Fix some leaks found by the leak bot
+ https://bugs.webkit.org/show_bug.cgi?id=141149
+
+ Reviewed by Alexey Proskuryakov.
+
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ (WebCore::importKey): Changed argument types to std::unique_ptr for better code clarity.
+ (WebCore::JSSubtleCrypto::importKey): Use WTF::move instead of release.
+ (WebCore::JSSubtleCrypto::wrapKey): Fixed leaks by adding missing delete calls to the
+ case where we get a DOM exception.
+ (WebCore::JSSubtleCrypto::unwrapKey): Ditto.
+
+ * dom/SelectorQuery.cpp:
+ (WebCore::SelectorQuery::SelectorQuery): Use WTF::move here. Not clear how this could
+ have caused the storage leak, but it does seem obviously missing. The leak is pretty big,
+ implying that we leak almost all CSSSelectorList objects we parse; not sure this fixes it.
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse): Added code to
+ deleted the unguarded pointer if postTaskForModeToWorkerGlobalScope fails.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveData): Ditto.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didFail): Ditto.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck): Ditto.
+
+ * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
+ (WebCore::MediaSelectionGroupAVFObjC::updateOptions): Added missing adoptNS.
+
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::GraphicsContext::updateDocumentMarkerResources): Added missing release.
+
</ins><span class="cx"> 2015-02-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use more references in HistoryItem
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -435,11 +435,8 @@
</span><span class="cx"> return wrapper.promise();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void importKey(ExecState* exec, CryptoKeyFormat keyFormat, CryptoOperationData data, CryptoAlgorithm* algorithmPtr, CryptoAlgorithmParameters* parametersPtr, bool extractable, CryptoKeyUsage keyUsages, CryptoAlgorithm::KeyCallback callback, CryptoAlgorithm::VoidCallback failureCallback)
</del><ins>+static void importKey(ExecState* exec, CryptoKeyFormat keyFormat, CryptoOperationData data, std::unique_ptr<CryptoAlgorithm> algorithm, std::unique_ptr<CryptoAlgorithmParameters> parameters, bool extractable, CryptoKeyUsage keyUsages, CryptoAlgorithm::KeyCallback callback, CryptoAlgorithm::VoidCallback failureCallback)
</ins><span class="cx"> {
</span><del>- std::unique_ptr<CryptoAlgorithm> algorithm(algorithmPtr);
- std::unique_ptr<CryptoAlgorithmParameters> parameters(parametersPtr);
-
</del><span class="cx"> std::unique_ptr<CryptoKeySerialization> keySerialization;
</span><span class="cx"> switch (keyFormat) {
</span><span class="cx"> case CryptoKeyFormat::Raw:
</span><span class="lines">@@ -550,7 +547,7 @@
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WebCore::importKey(exec, keyFormat, data, algorithm.release(), parameters.release(), extractable, keyUsages, WTF::move(successCallback), WTF::move(failureCallback));
</del><ins>+ WebCore::importKey(exec, keyFormat, data, WTF::move(algorithm), WTF::move(parameters), extractable, keyUsages, WTF::move(successCallback), WTF::move(failureCallback));
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="lines">@@ -689,6 +686,8 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> WebCore::exportKey(exec, keyFormat, *key, WTF::move(exportSuccessCallback), WTF::move(exportFailureCallback));
</span><span class="cx"> if (ec) {
</span><ins>+ delete algorithmPtr;
+ delete parametersPtr;
</ins><span class="cx"> setDOMException(exec, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -780,7 +779,7 @@
</span><span class="cx"> wrapper.reject(nullptr);
</span><span class="cx"> };
</span><span class="cx"> ExecState* exec = domGlobalObject->globalExec();
</span><del>- WebCore::importKey(exec, keyFormat, std::make_pair(result.data(), result.size()), unwrappedKeyAlgorithmPtr, unwrappedKeyAlgorithmParametersPtr, extractable, keyUsages, WTF::move(importSuccessCallback), WTF::move(importFailureCallback));
</del><ins>+ WebCore::importKey(exec, keyFormat, std::make_pair(result.data(), result.size()), std::unique_ptr<CryptoAlgorithm>(unwrappedKeyAlgorithmPtr), std::unique_ptr<CryptoAlgorithmParameters>(unwrappedKeyAlgorithmParametersPtr), extractable, keyUsages, WTF::move(importSuccessCallback), WTF::move(importFailureCallback));
</ins><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> // FIXME: Report exception details to console, and possibly to calling script once there is a standardized way to pass errors to WebCrypto promise reject functions.
</span><span class="cx"> exec->clearException();
</span><span class="lines">@@ -797,6 +796,8 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> unwrapAlgorithm->decryptForUnwrapKey(*unwrapAlgorithmParameters, *unwrappingKey, wrappedKeyData, WTF::move(decryptSuccessCallback), WTF::move(decryptFailureCallback), ec);
</span><span class="cx"> if (ec) {
</span><ins>+ delete unwrappedKeyAlgorithmPtr;
+ delete unwrappedKeyAlgorithmParametersPtr;
</ins><span class="cx"> setDOMException(exec, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SelectorQuery::SelectorQuery(CSSSelectorList&& selectorList)
</span><del>- : m_selectorList(selectorList)
</del><ins>+ : m_selectorList(WTF::move(selectorList))
</ins><span class="cx"> , m_selectors(m_selectorList)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -162,11 +162,12 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><span class="cx"> CrossThreadResourceResponseData* responseData = response.copyData().leakPtr();
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, identifier, responseData] (ScriptExecutionContext& context) {
</del><ins>+ if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, identifier, responseData] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> OwnPtr<ResourceResponse> response(ResourceResponse::adopt(adoptPtr(responseData)));
</span><span class="cx"> workerClientWrapper->didReceiveResponse(identifier, *response);
</span><del>- }, m_taskMode);
</del><ins>+ }, m_taskMode))
+ delete responseData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didReceiveData(const char* data, int dataLength)
</span><span class="lines">@@ -174,11 +175,12 @@
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><span class="cx"> Vector<char>* vectorPtr = new Vector<char>(dataLength);
</span><span class="cx"> memcpy(vectorPtr->data(), data, dataLength);
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, vectorPtr] (ScriptExecutionContext& context) {
</del><ins>+ if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, vectorPtr] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> OwnPtr<Vector<char>> vector = adoptPtr(vectorPtr);
</span><span class="cx"> workerClientWrapper->didReceiveData(vector->data(), vector->size());
</span><del>- }, m_taskMode);
</del><ins>+ }, m_taskMode))
+ delete vectorPtr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didFinishLoading(unsigned long identifier, double finishTime)
</span><span class="lines">@@ -194,22 +196,24 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><span class="cx"> ResourceError* capturedError = new ResourceError(error.copy());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</del><ins>+ if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->didFail(*capturedError);
</span><span class="cx"> delete capturedError;
</span><del>- }, m_taskMode);
</del><ins>+ }, m_taskMode))
+ delete capturedError;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><span class="cx"> ResourceError* capturedError = new ResourceError(error.copy());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</del><ins>+ if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->didFailAccessControlCheck(*capturedError);
</span><span class="cx"> delete capturedError;
</span><del>- }, m_taskMode);
</del><ins>+ }, m_taskMode))
+ delete capturedError;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx"> for (auto& avOption : m_options.keys())
</span><span class="cx"> [oldAVOptions addObject:avOption];
</span><span class="cx">
</span><del>- RetainPtr<NSMutableSet> addedAVOptions = [newAVOptions mutableCopy];
</del><ins>+ RetainPtr<NSMutableSet> addedAVOptions = adoptNS([newAVOptions mutableCopy]);
</ins><span class="cx"> [addedAVOptions minusSet:oldAVOptions.get()];
</span><span class="cx">
</span><del>- RetainPtr<NSMutableSet> removedAVOptions = [oldAVOptions mutableCopy];
</del><ins>+ RetainPtr<NSMutableSet> removedAVOptions = adoptNS([oldAVOptions mutableCopy]);
</ins><span class="cx"> [removedAVOptions minusSet:newAVOptions.get()];
</span><span class="cx">
</span><span class="cx"> for (AVMediaSelectionOption* removedAVOption in removedAVOptions.get()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (179472 => 179473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-02-02 00:49:36 UTC (rev 179472)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-02-02 08:27:03 UTC (rev 179473)
</span><span class="lines">@@ -152,8 +152,11 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::updateDocumentMarkerResources()
</span><span class="cx"> {
</span><ins>+ [spellingPatternColor release];
</ins><span class="cx"> spellingPatternColor = nullptr;
</span><ins>+ [grammarPatternColor release];
</ins><span class="cx"> grammarPatternColor = nullptr;
</span><ins>+ [correctionPatternColor release];
</ins><span class="cx"> correctionPatternColor = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>