<!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>[193607] 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/193607">193607</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-12-06 19:27:30 -0800 (Sun, 06 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>TestNetscapePlugIn: Fix leaks found by static analyzer
<http://webkit.org/b/151881>
Reviewed by Darin Adler.
Fixes the following leaks found by the static analyzer:
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'path'
return false;
^~~~~
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'target'
return false;
^~~~~
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'url'
return false;
^~~~~
* DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
(toCString): Switch to returning std::unique_ptr<char[]>. Add
early return if allocation fails.
(testPostURLFile): Switch to using std::unique_ptr<char[]>.
Make sure to call fclose() on filehandle, even for an early
return.
(testSetStatus): Switch to using std::unique_ptr<char[]>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjectcpp">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (193606 => 193607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-07 01:54:43 UTC (rev 193606)
+++ trunk/Tools/ChangeLog 2015-12-07 03:27:30 UTC (rev 193607)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-12-06 David Kilzer <ddkilzer@apple.com>
+
+ TestNetscapePlugIn: Fix leaks found by static analyzer
+ <http://webkit.org/b/151881>
+
+ Reviewed by Darin Adler.
+
+ Fixes the following leaks found by the static analyzer:
+ DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'path'
+ return false;
+ ^~~~~
+ DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'target'
+ return false;
+ ^~~~~
+ DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'url'
+ return false;
+ ^~~~~
+
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
+ (toCString): Switch to returning std::unique_ptr<char[]>. Add
+ early return if allocation fails.
+ (testPostURLFile): Switch to using std::unique_ptr<char[]>.
+ Make sure to call fclose() on filehandle, even for an early
+ return.
+ (testSetStatus): Switch to using std::unique_ptr<char[]>.
+
</ins><span class="cx"> 2015-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> prepare-ChangeLog: Fix some warning messages when using svn
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp (193606 => 193607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2015-12-07 01:54:43 UTC (rev 193606)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2015-12-07 03:27:30 UTC (rev 193607)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "PluginTest.h"
</span><span class="cx"> #include "TestObject.h"
</span><span class="cx"> #include <assert.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <stdarg.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="lines">@@ -775,12 +776,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char* toCString(const NPString& string)
</del><ins>+static std::unique_ptr<char[]> toCString(const NPString& string)
</ins><span class="cx"> {
</span><del>- char* result = static_cast<char*>(malloc(string.UTF8Length + 1));
- memcpy(result, string.UTF8Characters, string.UTF8Length);
- result[string.UTF8Length] = '\0';
</del><ins>+ size_t length = string.UTF8Length;
+ std::unique_ptr<char[]> result(new char[length + 1]);
+ if (!result)
+ return result;
</ins><span class="cx">
</span><ins>+ memcpy(result.get(), string.UTF8Characters, length);
+ result[length] = '\0';
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -790,30 +795,27 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> NPString urlString = NPVARIANT_TO_STRING(args[0]);
</span><del>- char* url = toCString(urlString);
</del><ins>+ auto url = toCString(urlString);
</ins><span class="cx">
</span><span class="cx"> NPString targetString = NPVARIANT_TO_STRING(args[1]);
</span><del>- char* target = toCString(targetString);
</del><ins>+ auto target = toCString(targetString);
</ins><span class="cx">
</span><span class="cx"> NPString pathString = NPVARIANT_TO_STRING(args[2]);
</span><del>- char* path = toCString(pathString);
</del><ins>+ auto path = toCString(pathString);
</ins><span class="cx">
</span><span class="cx"> NPString contentsString = NPVARIANT_TO_STRING(args[3]);
</span><span class="cx">
</span><del>- FILE* tempFile = fopen(path, "w");
</del><ins>+ FILE* tempFile = fopen(path.get(), "w");
</ins><span class="cx"> if (!tempFile)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile))
- return false;
-
</del><ins>+ size_t count = fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile);
</ins><span class="cx"> fclose(tempFile);
</span><span class="cx">
</span><del>- NPError error = browser->posturl(obj->npp, url, target, pathString.UTF8Length, path, TRUE);
</del><ins>+ if (!count)
+ return false;
</ins><span class="cx">
</span><del>- free(path);
- free(target);
- free(url);
</del><ins>+ NPError error = browser->posturl(obj->npp, url.get(), target.get(), pathString.UTF8Length, path.get(), TRUE);
</ins><span class="cx">
</span><span class="cx"> BOOLEAN_TO_NPVARIANT(error == NPERR_NO_ERROR, *result);
</span><span class="cx"> return true;
</span><span class="lines">@@ -972,15 +974,14 @@
</span><span class="cx">
</span><span class="cx"> static bool testSetStatus(PluginObject* obj, const NPVariant* args, uint32_t argCount, NPVariant* result)
</span><span class="cx"> {
</span><del>- char* message = 0;
</del><ins>+ std::unique_ptr<char[]> message(nullptr);
</ins><span class="cx"> if (argCount && NPVARIANT_IS_STRING(args[0])) {
</span><span class="cx"> NPString statusString = NPVARIANT_TO_STRING(args[0]);
</span><span class="cx"> message = toCString(statusString);
</span><span class="cx"> }
</span><del>-
- browser->status(obj->npp, message);
</del><span class="cx">
</span><del>- free(message);
</del><ins>+ browser->status(obj->npp, message.get());
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>