<!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>[164179] trunk/Source/WebKit2</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/164179">164179</a></dd>
<dt>Author</dt> <dd>rakuco@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 13:15:49 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Stop calling mktemp(3).
https://bugs.webkit.org/show_bug.cgi?id=128826
Reviewed by Gyuyoung Kim.
mktemp(3) is an insecure function and should be avoided at all costs.
Replace its usage with mkdtemp(3): instead of just getting a file name
that is supposed to be random and unused, we now create a directory
with a random name and then put whatever files we need there with fixed
names.
* UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp:
(TEST_F):
* UIProcess/API/efl/tests/test_ewk2_download_job.cpp:
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_cookie_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_download_jobcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164178 => 164179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-15 19:45:54 UTC (rev 164178)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-15 21:15:49 UTC (rev 164179)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-15 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+
+ [EFL][WK2] Stop calling mktemp(3).
+ https://bugs.webkit.org/show_bug.cgi?id=128826
+
+ Reviewed by Gyuyoung Kim.
+
+ mktemp(3) is an insecure function and should be avoided at all costs.
+ Replace its usage with mkdtemp(3): instead of just getting a file name
+ that is supposed to be random and unused, we now create a directory
+ with a random name and then put whatever files we need there with fixed
+ names.
+
+ * UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp:
+ (TEST_F):
+ * UIProcess/API/efl/tests/test_ewk2_download_job.cpp:
+ (TEST_F):
+
</ins><span class="cx"> 2014-02-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) in WebKit2/UIProcess except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_cookie_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp (164178 => 164179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp 2014-02-15 19:45:54 UTC (rev 164178)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp 2014-02-15 21:15:49 UTC (rev 164179)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "UnitTestUtils/EWK2UnitTestBase.h"
</span><span class="cx"> #include "UnitTestUtils/EWK2UnitTestServer.h"
</span><ins>+#include <stdio.h>
</ins><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><span class="lines">@@ -199,10 +200,12 @@
</span><span class="cx"> ewk_cookie_manager_changes_watch(cookieManager, onCookiesChanged, &cookiesChanged);
</span><span class="cx">
</span><span class="cx"> // Make sure we don't get notifications when loading setting an existing persistent storage
</span><del>- char textStorage1[] = "/tmp/txt-cookie.XXXXXX";
- ASSERT_TRUE(mktemp(textStorage1));
- char textStorage2[] = "/tmp/txt-cookie.XXXXXX";
- ASSERT_TRUE(mktemp(textStorage2));
</del><ins>+ char storageDirectory[] = "/tmp/ewk2_cookie_manager-XXXXXX";
+ ASSERT_TRUE(mkdtemp(storageDirectory));
+ char textStorage1[64];
+ snprintf(textStorage1, sizeof(textStorage1), "%s/txt-cookie1", storageDirectory);
+ char textStorage2[64];
+ snprintf(textStorage2, sizeof(textStorage2), "%s/txt-cookie2", storageDirectory);
</ins><span class="cx">
</span><span class="cx"> ewk_cookie_manager_persistent_storage_set(cookieManager, textStorage1, EWK_COOKIE_PERSISTENT_STORAGE_TEXT);
</span><span class="cx"> ASSERT_TRUE(loadUrlSync(httpServer->getURLForPath("/index.html").data()));
</span><span class="lines">@@ -221,6 +224,7 @@
</span><span class="cx"> ewk_cookie_manager_changes_watch(cookieManager, 0, 0);
</span><span class="cx"> unlink(textStorage1);
</span><span class="cx"> unlink(textStorage2);
</span><ins>+ rmdir(storageDirectory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2CookieManagerTest, ewk_cookie_manager_cookies_delete)
</span><span class="lines">@@ -265,10 +269,12 @@
</span><span class="cx"> httpServer->run(serverCallback);
</span><span class="cx">
</span><span class="cx"> // Generate unique names for cookie storages.
</span><del>- char textStorage[] = "/tmp/txt-cookie.XXXXXX";
- ASSERT_TRUE(mktemp(textStorage));
- char sqliteStorage[] = "/tmp/sqlite-cookie.XXXXXX";
- ASSERT_TRUE(mktemp(sqliteStorage));
</del><ins>+ char storageDirectory[] = "/tmp/ewk2_cookie_manager-XXXXXX";
+ ASSERT_TRUE(mkdtemp(storageDirectory));
+ char textStorage[64];
+ snprintf(textStorage, sizeof(textStorage), "%s/txt-cookie", storageDirectory);
+ char sqliteStorage[64];
+ snprintf(sqliteStorage, sizeof(sqliteStorage), "%s/sqlite-cookie", storageDirectory);
</ins><span class="cx">
</span><span class="cx"> Ewk_Cookie_Manager* cookieManager = ewk_context_cookie_manager_get(ewk_view_context_get(webView()));
</span><span class="cx"> ASSERT_TRUE(cookieManager);
</span><span class="lines">@@ -305,4 +311,5 @@
</span><span class="cx"> // Final clean up.
</span><span class="cx"> unlink(textStorage);
</span><span class="cx"> unlink(sqliteStorage);
</span><ins>+ rmdir(storageDirectory);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_download_jobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp (164178 => 164179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp 2014-02-15 19:45:54 UTC (rev 164178)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_download_job.cpp 2014-02-15 21:15:49 UTC (rev 164179)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #include "UnitTestUtils/EWK2UnitTestServer.h"
</span><span class="cx"> #include <sys/stat.h>
</span><span class="cx"> #include <sys/types.h>
</span><ins>+#include <stdio.h>
+#include <stdlib.h>
</ins><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><span class="cx"> using namespace EWK2UnitTest;
</span><span class="lines">@@ -152,12 +154,13 @@
</span><span class="cx"> std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
</span><span class="cx"> httpServer->run(serverCallback);
</span><span class="cx">
</span><del>- // Generate unique name for destination file.
- char destinationPath[] = "/tmp/pdf-file.XXXXXX";
- ASSERT_TRUE(mktemp(destinationPath));
-
</del><span class="cx"> CString fileUrl = httpServer->getURLForPath(testFilePath);
</span><span class="cx">
</span><ins>+ char destinationDirectory[] = "/tmp/ewk2_download_job-XXXXXX";
+ ASSERT_TRUE(mkdtemp(destinationDirectory));
+ char destinationPath[64];
+ snprintf(destinationPath, sizeof(destinationPath), "%s/pdf-file", destinationDirectory);
+
</ins><span class="cx"> DownloadTestData userData = { fileUrl.data(), destinationPath };
</span><span class="cx"> ASSERT_FALSE(fileExists(destinationPath));
</span><span class="cx">
</span><span class="lines">@@ -172,4 +175,5 @@
</span><span class="cx">
</span><span class="cx"> // Clean up
</span><span class="cx"> unlink(destinationPath);
</span><ins>+ rmdir(destinationDirectory);
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>