<!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>[195166] 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/195166">195166</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-16 01:36:44 -0800 (Sat, 16 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] GVariant runtime critical errors when encoding session data
https://bugs.webkit.org/show_bug.cgi?id=153130
Reviewed by Michael Catanzaro.
It happens when the FrameState has children, because the recursive
serialization is wrong. Also fix serialization of
documentSequenceNumber and itemSequenceNumber that are gint64, not
guint64.
* UIProcess/API/gtk/WebKitWebViewSessionState.cpp:
(encodeFrameState): Let the caller open/init the given
builder. Use a new builder to encode child states recursively.
(encodePageState): Do the builder open/close for the FrameState encoding.
(decodeFrameState): Get the variant of every child.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewSessionStatecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewSessionState.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195165 => 195166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-16 08:49:18 UTC (rev 195165)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-16 09:36:44 UTC (rev 195166)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] GVariant runtime critical errors when encoding session data
+ https://bugs.webkit.org/show_bug.cgi?id=153130
+
+ Reviewed by Michael Catanzaro.
+
+ It happens when the FrameState has children, because the recursive
+ serialization is wrong. Also fix serialization of
+ documentSequenceNumber and itemSequenceNumber that are gint64, not
+ guint64.
+
+ * UIProcess/API/gtk/WebKitWebViewSessionState.cpp:
+ (encodeFrameState): Let the caller open/init the given
+ builder. Use a new builder to encode child states recursively.
+ (encodePageState): Do the builder open/close for the FrameState encoding.
+ (decodeFrameState): Get the variant of every child.
+
</ins><span class="cx"> 2016-01-15 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewSessionStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewSessionState.cpp (195165 => 195166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewSessionState.cpp 2016-01-16 08:49:18 UTC (rev 195165)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewSessionState.cpp 2016-01-16 09:36:44 UTC (rev 195166)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> #define HTTP_BODY_ELEMENT_FORMAT_STRING_V1 "(uay&sxmxmd&s)"
</span><span class="cx"> #define HTTP_BODY_TYPE_STRING_V1 "m(sa" HTTP_BODY_ELEMENT_TYPE_STRING_V1 ")"
</span><span class="cx"> #define HTTP_BODY_FORMAT_STRING_V1 "m(&sa" HTTP_BODY_ELEMENT_TYPE_STRING_V1 ")"
</span><del>-#define FRAME_STATE_TYPE_STRING_V1 "(ssssasmaytt(ii)d" HTTP_BODY_TYPE_STRING_V1 "av)"
-#define FRAME_STATE_FORMAT_STRING_V1 "(&s&s&s&sasmaytt(ii)d@" HTTP_BODY_TYPE_STRING_V1 "av)"
</del><ins>+#define FRAME_STATE_TYPE_STRING_V1 "(ssssasmayxx(ii)d" HTTP_BODY_TYPE_STRING_V1 "av)"
+#define FRAME_STATE_FORMAT_STRING_V1 "(&s&s&s&sasmayxx(ii)d@" HTTP_BODY_TYPE_STRING_V1 "av)"
</ins><span class="cx"> #define BACK_FORWARD_LIST_ITEM_TYPE_STRING_V1 "(ts" FRAME_STATE_TYPE_STRING_V1 "u)"
</span><span class="cx"> #define BACK_FORWARD_LIST_ITEM_FORMAT_STRING_V1 "(t&s@" FRAME_STATE_TYPE_STRING_V1 "u)"
</span><span class="cx"> #define SESSION_STATE_TYPE_STRING_V1 "(qa" BACK_FORWARD_LIST_ITEM_TYPE_STRING_V1 "mu)"
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx">
</span><span class="cx"> static inline void encodeFrameState(GVariantBuilder* sessionBuilder, const FrameState& frameState)
</span><span class="cx"> {
</span><del>- g_variant_builder_open(sessionBuilder, G_VARIANT_TYPE(FRAME_STATE_TYPE_STRING_V1));
</del><span class="cx"> g_variant_builder_add(sessionBuilder, "s", frameState.urlString.utf8().data());
</span><span class="cx"> g_variant_builder_add(sessionBuilder, "s", frameState.originalURLString.utf8().data());
</span><span class="cx"> g_variant_builder_add(sessionBuilder, "s", frameState.referrer.utf8().data());
</span><span class="lines">@@ -169,8 +168,8 @@
</span><span class="cx"> g_variant_builder_close(sessionBuilder);
</span><span class="cx"> g_variant_builder_close(sessionBuilder);
</span><span class="cx"> }
</span><del>- g_variant_builder_add(sessionBuilder, "t", frameState.documentSequenceNumber);
- g_variant_builder_add(sessionBuilder, "t", frameState.itemSequenceNumber);
</del><ins>+ g_variant_builder_add(sessionBuilder, "x", frameState.documentSequenceNumber);
+ g_variant_builder_add(sessionBuilder, "x", frameState.itemSequenceNumber);
</ins><span class="cx"> g_variant_builder_add(sessionBuilder, "(ii)", frameState.scrollPosition.x(), frameState.scrollPosition.y());
</span><span class="cx"> g_variant_builder_add(sessionBuilder, "d", frameState.pageScaleFactor);
</span><span class="cx"> if (!frameState.httpBody)
</span><span class="lines">@@ -181,16 +180,21 @@
</span><span class="cx"> g_variant_builder_close(sessionBuilder);
</span><span class="cx"> }
</span><span class="cx"> g_variant_builder_open(sessionBuilder, G_VARIANT_TYPE("av"));
</span><del>- for (const auto& child : frameState.children)
- encodeFrameState(sessionBuilder, child);
</del><ins>+ for (const auto& child : frameState.children) {
+ GVariantBuilder frameStateBuilder;
+ g_variant_builder_init(&frameStateBuilder, G_VARIANT_TYPE(FRAME_STATE_TYPE_STRING_V1));
+ encodeFrameState(&frameStateBuilder, child);
+ g_variant_builder_add(sessionBuilder, "v", g_variant_builder_end(&frameStateBuilder));
+ }
</ins><span class="cx"> g_variant_builder_close(sessionBuilder);
</span><del>- g_variant_builder_close(sessionBuilder);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void encodePageState(GVariantBuilder* sessionBuilder, const PageState& pageState)
</span><span class="cx"> {
</span><span class="cx"> g_variant_builder_add(sessionBuilder, "s", pageState.title.utf8().data());
</span><ins>+ g_variant_builder_open(sessionBuilder, G_VARIANT_TYPE(FRAME_STATE_TYPE_STRING_V1));
</ins><span class="cx"> encodeFrameState(sessionBuilder, pageState.mainFrameState);
</span><ins>+ g_variant_builder_close(sessionBuilder);
</ins><span class="cx"> g_variant_builder_add(sessionBuilder, "u", toExternalURLsPolicy(pageState.shouldOpenExternalURLsPolicy));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -278,8 +282,8 @@
</span><span class="cx"> const char* target;
</span><span class="cx"> GUniqueOutPtr<GVariantIter> documentStateIter;
</span><span class="cx"> GUniqueOutPtr<GVariantIter> stateObjectDataIter;
</span><del>- guint64 documentSequenceNumber;
- guint64 itemSequenceNumber;
</del><ins>+ gint64 documentSequenceNumber;
+ gint64 itemSequenceNumber;
</ins><span class="cx"> gint32 scrollPositionX, scrollPositionY;
</span><span class="cx"> gdouble pageScaleFactor;
</span><span class="cx"> GVariant* httpBodyVariant;
</span><span class="lines">@@ -318,7 +322,8 @@
</span><span class="cx"> g_variant_unref(httpBodyVariant);
</span><span class="cx"> while (GRefPtr<GVariant> child = adoptGRef(g_variant_iter_next_value(childrenIter.get()))) {
</span><span class="cx"> FrameState childFrameState;
</span><del>- decodeFrameState(child.get(), childFrameState);
</del><ins>+ GRefPtr<GVariant> childVariant = adoptGRef(g_variant_get_variant(child.get()));
+ decodeFrameState(childVariant.get(), childFrameState);
</ins><span class="cx"> frameState.children.append(WTFMove(childFrameState));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>