<!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>[193509] trunk/Tools</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/193509">193509</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 20:31:49 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>TestNetscapePlugIn: Fix remaining static analyzer warnings
<http://webkit.org/b/151888>
Reviewed by Alexey Proskuryakov.
Fixes the following static analyzer warnings:
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:101:9: warning: Called function pointer is null (null dereference)
CRASH();
^~~~~~~
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:46:5: note: expanded from macro 'CRASH'
((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
^~~~~~~~~~~~~~~~
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:375:12: warning: Access to field 'pluginTest' results in a dereference of a null pointer (loaded from variable 'obj')
return obj->pluginTest->NPP_SetWindow(window);
^~~~~~~~~~~~~~~
2 warnings generated.
* DumpRenderTree/TestNetscapePlugIn/main.cpp:
(CRASH): Use __builtin_trap() for gcc/clang.
(NPP_SetWindow): Add early return if obj is nullptr.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInmaincpp">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (193508 => 193509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-05 03:29:36 UTC (rev 193508)
+++ trunk/Tools/ChangeLog 2015-12-05 04:31:49 UTC (rev 193509)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-04 David Kilzer <ddkilzer@apple.com>
+
+ TestNetscapePlugIn: Fix remaining static analyzer warnings
+ <http://webkit.org/b/151888>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fixes the following static analyzer warnings:
+ Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:101:9: warning: Called function pointer is null (null dereference)
+ CRASH();
+ ^~~~~~~
+ Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:46:5: note: expanded from macro 'CRASH'
+ ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
+ ^~~~~~~~~~~~~~~~
+ Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:375:12: warning: Access to field 'pluginTest' results in a dereference of a null pointer (loaded from variable 'obj')
+ return obj->pluginTest->NPP_SetWindow(window);
+ ^~~~~~~~~~~~~~~
+ 2 warnings generated.
+
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (CRASH): Use __builtin_trap() for gcc/clang.
+ (NPP_SetWindow): Add early return if obj is nullptr.
+
</ins><span class="cx"> 2015-12-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test /webkit2/WebKitWebResource/get-data is flaky
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (193508 => 193509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2015-12-05 03:29:36 UTC (rev 193508)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2015-12-05 04:31:49 UTC (rev 193509)
</span><span class="lines">@@ -41,10 +41,17 @@
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="cx">
</span><ins>+#if defined(__GNUC__)
</ins><span class="cx"> #define CRASH() do { \
</span><span class="cx"> *(int *)(uintptr_t)0xbbadbeef = 0; \
</span><ins>+ __builtin_trap(); /* More reliable, but doesn't say BBADBEEF. */ \
+} while (false)
+#else
+#define CRASH() do { \
+ *(int *)(uintptr_t)0xbbadbeef = 0; \
</ins><span class="cx"> ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
</span><del>-} while(false)
</del><ins>+} while (false)
+#endif
</ins><span class="cx">
</span><span class="cx"> static bool getEntryPointsWasCalled;
</span><span class="cx"> static bool initializeWasCalled;
</span><span class="lines">@@ -349,29 +356,30 @@
</span><span class="cx"> {
</span><span class="cx"> PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
</span><span class="cx">
</span><del>- if (obj) {
- obj->lastWindow = *window;
</del><ins>+ if (!obj)
+ return NPERR_GENERIC_ERROR;
</ins><span class="cx">
</span><del>- if (obj->logSetWindow) {
- pluginLog(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
- obj->logSetWindow = FALSE;
- executeScript(obj, "testRunner.notifyDone();");
- }
</del><ins>+ obj->lastWindow = *window;
</ins><span class="cx">
</span><del>- if (obj->onSetWindow)
- executeScript(obj, obj->onSetWindow);
</del><ins>+ if (obj->logSetWindow) {
+ pluginLog(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
+ obj->logSetWindow = FALSE;
+ executeScript(obj, "testRunner.notifyDone();");
+ }
</ins><span class="cx">
</span><del>- if (obj->testWindowOpen) {
- testWindowOpen(instance);
- obj->testWindowOpen = FALSE;
- }
</del><ins>+ if (obj->onSetWindow)
+ executeScript(obj, obj->onSetWindow);
</ins><span class="cx">
</span><del>- if (obj->testKeyboardFocusForPlugins) {
- obj->eventLogging = true;
- executeScript(obj, "eventSender.keyDown('A');");
- }
</del><ins>+ if (obj->testWindowOpen) {
+ testWindowOpen(instance);
+ obj->testWindowOpen = FALSE;
</ins><span class="cx"> }
</span><del>-
</del><ins>+
+ if (obj->testKeyboardFocusForPlugins) {
+ obj->eventLogging = true;
+ executeScript(obj, "eventSender.keyDown('A');");
+ }
+
</ins><span class="cx"> return obj->pluginTest->NPP_SetWindow(window);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>