<!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>[168259] releases/WebKitGTK/webkit-2.4/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/168259">168259</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-05 00:08:42 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167885">r167885</a> - [WK2][X11] NetscapePluginModule::scanPlugin() should write UTF-8 strings to stdout
https://bugs.webkit.org/show_bug.cgi?id=132245
Reviewed by Carlos Garcia Campos.
NetscapePluginModule::scanPlugin(), in the helper writeLine function, takes each character
of the given string and writes it out as a UChar, doing two fputc calls for each byte of the
16-bit type.
This fails badly with characters with integer value less than 256 as the most significant byte
of the UChar is written out as a null character. This effectively chops the output that's gathered
in the UIProcess and is parsed in PluginProcessProxy::scanPlugin().
To avoid all this, the UTF-8 encoding of the string is written out in the PluginProcess, and
String::fromUTF8() is called in the UIProcess to properly decode the received string.
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::writeCharacter):
(WebKit::writeLine):
(WebKit::writeByte): Deleted.
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::scanPlugin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (168258 => 168259)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-05 06:45:53 UTC (rev 168258)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-05 07:08:42 UTC (rev 168259)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-04-28 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [WK2][X11] NetscapePluginModule::scanPlugin() should write UTF-8 strings to stdout
+ https://bugs.webkit.org/show_bug.cgi?id=132245
+
+ Reviewed by Carlos Garcia Campos.
+
+ NetscapePluginModule::scanPlugin(), in the helper writeLine function, takes each character
+ of the given string and writes it out as a UChar, doing two fputc calls for each byte of the
+ 16-bit type.
+
+ This fails badly with characters with integer value less than 256 as the most significant byte
+ of the UChar is written out as a null character. This effectively chops the output that's gathered
+ in the UIProcess and is parsed in PluginProcessProxy::scanPlugin().
+
+ To avoid all this, the UTF-8 encoding of the string is written out in the PluginProcess, and
+ String::fromUTF8() is called in the UIProcess to properly decode the received string.
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ (WebKit::writeCharacter):
+ (WebKit::writeLine):
+ (WebKit::writeByte): Deleted.
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+
+2014-04-28 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [GTK][WK2] Missing return statement in webkit_plugin_get_description()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132263
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (168258 => 168259)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-05-05 06:45:53 UTC (rev 168258)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-05-05 07:08:42 UTC (rev 168259)
</span><span class="lines">@@ -185,23 +185,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String truncateToSingleLine(const String& string)
</del><ins>+static void writeCharacter(char byte)
</ins><span class="cx"> {
</span><del>- unsigned oldLength = string.length();
- UChar* buffer;
- String stringBuffer(StringImpl::createUninitialized(oldLength + 1, buffer));
</del><ins>+ int result;
+ while ((result = fputc(byte, stdout)) == EOF && errno == EINTR) { }
+ ASSERT(result != EOF);
+}
</ins><span class="cx">
</span><del>- unsigned newLength = 0;
- const UChar* start = string.characters();
- for (const UChar* c = start; c < start + oldLength; ++c) {
- if (*c != UChar('\n'))
- buffer[newLength++] = *c;
- }
- buffer[newLength++] = UChar('\n');
</del><ins>+static void writeLine(const String& line)
+{
+ CString utf8String = line.utf8();
+ const char* utf8Data = utf8String.data();
</ins><span class="cx">
</span><del>- String result = (newLength == oldLength + 1) ? stringBuffer : String(stringBuffer.characters16(), newLength);
- ASSERT(result.endsWith(UChar('\n')));
- return result;
</del><ins>+ for (unsigned i = 0; i < utf8String.length(); i++) {
+ char character = utf8Data[i];
+ if (character != '\n')
+ writeCharacter(character);
+ }
+ writeCharacter('\n');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetscapePluginModule::scanPlugin(const String& pluginPath)
</span><span class="lines">@@ -227,22 +228,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Write data to standard output for the UI process.
</span><del>- String output[3] = {
- truncateToSingleLine(metaData.name),
- truncateToSingleLine(metaData.description),
- truncateToSingleLine(metaData.mimeDescription)
- };
- for (unsigned i = 0; i < 3; ++i) {
- const String& line = output[i];
- const char* current = reinterpret_cast<const char*>(line.characters16());
- const char* end = reinterpret_cast<const char*>(line.characters16()) + (line.length() * sizeof(UChar));
- while (current < end) {
- int result;
- while ((result = fputc(*current, stdout)) == EOF && errno == EINTR) { }
- ASSERT(result != EOF);
- ++current;
- }
- }
</del><ins>+ writeLine(metaData.name);
+ writeLine(metaData.description);
+ writeLine(metaData.mimeDescription);
</ins><span class="cx">
</span><span class="cx"> fflush(stdout);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (168258 => 168259)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2014-05-05 06:45:53 UTC (rev 168258)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2014-05-05 07:08:42 UTC (rev 168259)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS || !stdOut)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- String stdOutString(reinterpret_cast<const UChar*>(stdOut.get()));
</del><ins>+ String stdOutString = String::fromUTF8(stdOut.get());
</ins><span class="cx">
</span><span class="cx"> Vector<String> lines;
</span><span class="cx"> stdOutString.split(UChar('\n'), true, lines);
</span></span></pre>
</div>
</div>
</body>
</html>