<!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>[174470] trunk/Source/WebKit/win</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/174470">174470</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-10-08 12:34:03 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Resolve various static analyzer warnings in WebKit.
https://bugs.webkit.org/show_bug.cgi?id=137531
Reviewed by Dean Jackson.
* MarshallingHelpers.cpp:
(MarshallingHelpers::safeArrayToIntArray): Handle possible failure of
SafeArrayGetElement call.
(MarshallingHelpers::safeArrayToIUnknownArray): Ditto.
* MemoryStream.cpp:
(MemoryStream::CopyTo): Zero-initialize 'written' to silence warning.
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::exceededDatabaseQuota): Handle possible failure of
GetModuleFileName.
* WebHistory.cpp:
(getDayBoundaries): Handle possible failure of TzSpecificLocalTimeToSystemTime
* WebView.cpp:
(WebView::shouldInitializeTrackPointHack): Zero initialize return value.
(WebView::dispatchDidReceiveIconFromWebFrame): Avoid possible DeleteObject
call on a null bitmap handle.
(WebView::standardUserAgentWithApplicationName): Get rid of spurious
pointer dereference.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinMarshallingHelperscpp">trunk/Source/WebKit/win/MarshallingHelpers.cpp</a></li>
<li><a href="#trunkSourceWebKitwinMemoryStreamcpp">trunk/Source/WebKit/win/MemoryStream.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistorycpp">trunk/Source/WebKit/win/WebHistory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/ChangeLog 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Resolve various static analyzer warnings in WebKit.
+ https://bugs.webkit.org/show_bug.cgi?id=137531
+
+ Reviewed by Dean Jackson.
+
+ * MarshallingHelpers.cpp:
+ (MarshallingHelpers::safeArrayToIntArray): Handle possible failure of
+ SafeArrayGetElement call.
+ (MarshallingHelpers::safeArrayToIUnknownArray): Ditto.
+ * MemoryStream.cpp:
+ (MemoryStream::CopyTo): Zero-initialize 'written' to silence warning.
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::exceededDatabaseQuota): Handle possible failure of
+ GetModuleFileName.
+ * WebHistory.cpp:
+ (getDayBoundaries): Handle possible failure of TzSpecificLocalTimeToSystemTime
+ * WebView.cpp:
+ (WebView::shouldInitializeTrackPointHack): Zero initialize return value.
+ (WebView::dispatchDidReceiveIconFromWebFrame): Avoid possible DeleteObject
+ call on a null bitmap handle.
+ (WebView::standardUserAgentWithApplicationName): Get rid of spurious
+ pointer dereference.
+
</ins><span class="cx"> 2014-10-02 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Move PageOverlay[Controller] to WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitwinMarshallingHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/MarshallingHelpers.cpp (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -237,9 +237,9 @@
</span><span class="cx"> if (len > 0) {
</span><span class="cx"> items = new CFNumberRef[len];
</span><span class="cx"> for (; lBound <= uBound; lBound++) {
</span><del>- int num;
</del><ins>+ int num = 0;
</ins><span class="cx"> hr = ::SafeArrayGetElement(inArray, &lBound, &num);
</span><del>- items[lBound] = intToCFNumberRef(num);
</del><ins>+ items[lBound] = SUCCEEDED(hr) ? intToCFNumberRef(num) : kCFNumberNaN;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> CFArrayRef result = CFArrayCreate(0, (const void**) items, len, &kCFTypeArrayCallBacks);
</span><span class="lines">@@ -255,9 +255,9 @@
</span><span class="cx"> if (SUCCEEDED(hr))
</span><span class="cx"> hr = ::SafeArrayGetUBound(inArray, 1, &uBound);
</span><span class="cx"> long len = (SUCCEEDED(hr)) ? (uBound-lBound+1) : 0;
</span><del>- void* items;
</del><ins>+ void* items = nullptr;
</ins><span class="cx"> hr = ::SafeArrayAccessData(inArray, &items);
</span><del>- CFArrayRef result = CFArrayCreate(0, (const void**) items, len, &kIUnknownArrayCallBacks);
</del><ins>+ CFArrayRef result = SUCCEEDED(hr) ? CFArrayCreate(0, (const void**) items, len, &kIUnknownArrayCallBacks) : nullptr;
</ins><span class="cx"> hr = ::SafeArrayUnaccessData(inArray);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinMemoryStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/MemoryStream.cpp (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/MemoryStream.cpp 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/MemoryStream.cpp 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> cb.LowPart = (DWORD)-1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ULONG written;
</del><ins>+ ULONG written = 0;
</ins><span class="cx"> ULONG read = min(cb.LowPart, (ULONG)(m_buffer->size()-m_pos));
</span><span class="cx"> HRESULT hr = pstm->Write(m_buffer->data()+m_pos, read, &written);
</span><span class="cx"> if (pcbWritten) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -598,8 +598,9 @@
</span><span class="cx"> HMODULE safariHandle = GetModuleHandleW(L"Safari.exe");
</span><span class="cx"> if (!safariHandle)
</span><span class="cx"> return;
</span><del>- GetModuleFileName(safariHandle, path, WTF_ARRAY_LENGTH(path));
- DWORD handle;
</del><ins>+ if (!::GetModuleFileName(safariHandle, path, WTF_ARRAY_LENGTH(path)))
+ return;
+ DWORD handle = 0;
</ins><span class="cx"> DWORD versionSize = GetFileVersionInfoSize(path, &handle);
</span><span class="cx"> if (!versionSize)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistory.cpp (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -126,12 +126,12 @@
</span><span class="cx"> addDayToSystemTime(beginningOfNextDayLocalTime);
</span><span class="cx">
</span><span class="cx"> SYSTEMTIME beginningSystemTime;
</span><del>- ::TzSpecificLocalTimeToSystemTime(0, &beginningLocalTime, &beginningSystemTime);
- ::SystemTimeToVariantTime(&beginningSystemTime, &beginningOfDay);
</del><ins>+ if (::TzSpecificLocalTimeToSystemTime(0, &beginningLocalTime, &beginningSystemTime))
+ ::SystemTimeToVariantTime(&beginningSystemTime, &beginningOfDay);
</ins><span class="cx">
</span><span class="cx"> SYSTEMTIME beginningOfNextDaySystemTime;
</span><del>- ::TzSpecificLocalTimeToSystemTime(0, &beginningOfNextDayLocalTime, &beginningOfNextDaySystemTime);
- ::SystemTimeToVariantTime(&beginningOfNextDaySystemTime, &beginningOfNextDay);
</del><ins>+ if (::TzSpecificLocalTimeToSystemTime(0, &beginningOfNextDayLocalTime, &beginningOfNextDaySystemTime))
+ ::SystemTimeToVariantTime(&beginningOfNextDaySystemTime, &beginningOfNextDay);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline DATE beginningOfDay(DATE date)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (174469 => 174470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-10-08 19:24:43 UTC (rev 174469)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-10-08 19:34:03 UTC (rev 174470)
</span><span class="lines">@@ -2692,8 +2692,8 @@
</span><span class="cx"> L"Software\\Synaptics\\SynTPEnh\\UltraNavPS2" };
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < 5; ++i) {
</span><del>- HKEY trackPointKey;
- int readKeyResult = ::RegOpenKeyExW(HKEY_CURRENT_USER, trackPointKeys[i], 0, KEY_READ, &trackPointKey);
</del><ins>+ HKEY trackPointKey = nullptr;
+ LSTATUS readKeyResult = ::RegOpenKeyExW(HKEY_CURRENT_USER, trackPointKeys[i], 0, KEY_READ, &trackPointKey);
</ins><span class="cx"> ::RegCloseKey(trackPointKey);
</span><span class="cx"> if (readKeyResult == ERROR_SUCCESS) {
</span><span class="cx"> shouldCreateScrollbars = true;
</span><span class="lines">@@ -2928,7 +2928,7 @@
</span><span class="cx">
</span><span class="cx"> BitmapInfo bmInfo = BitmapInfo::create(sz);
</span><span class="cx">
</span><del>- HBITMAP hBitmap = 0;
</del><ins>+ HBITMAP hBitmap = nullptr;
</ins><span class="cx">
</span><span class="cx"> Image* icon = iconDatabase().synchronousIconForPageURL(str, sz);
</span><span class="cx">
</span><span class="lines">@@ -2939,7 +2939,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT hr = m_frameLoadDelegate->didReceiveIcon(this, hBitmap, frame);
</span><del>- if (hr == E_NOTIMPL)
</del><ins>+ if ((hr == E_NOTIMPL) && hBitmap)
</ins><span class="cx"> DeleteObject(hBitmap);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5330,17 +5330,13 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::standardUserAgentWithApplicationName(
- BSTR applicationName,
- BSTR* groupName)
</del><ins>+HRESULT WebView::standardUserAgentWithApplicationName(BSTR applicationName, BSTR* groupName)
</ins><span class="cx"> {
</span><span class="cx"> if (!groupName) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_POINTER;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *groupName;
-
</del><span class="cx"> if (!applicationName) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_POINTER;
</span></span></pre>
</div>
</div>
</body>
</html>