Title: [236192] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236192
- Author
- carlo...@webkit.org
- Date
- 2018-09-19 06:19:46 -0700 (Wed, 19 Sep 2018)
Log Message
Merge r235982 - [GLib] Fix format string in KeyedEncoderGlib::beginObject().
https://bugs.webkit.org/show_bug.cgi?id=189585
Reviewed by Michael Catanzaro.
This appears to fix the following assertion locally:
GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed
Covered by existing tests.
* platform/glib/KeyedEncoderGlib.cpp:
(WebCore::KeyedEncoderGlib::beginObject):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236191 => 236192)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:19:42 UTC (rev 236191)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:19:46 UTC (rev 236192)
@@ -1,3 +1,19 @@
+2018-09-13 Ms2ger <ms2...@igalia.com>
+
+ [GLib] Fix format string in KeyedEncoderGlib::beginObject().
+ https://bugs.webkit.org/show_bug.cgi?id=189585
+
+ Reviewed by Michael Catanzaro.
+
+ This appears to fix the following assertion locally:
+
+ GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed
+
+ Covered by existing tests.
+
+ * platform/glib/KeyedEncoderGlib.cpp:
+ (WebCore::KeyedEncoderGlib::beginObject):
+
2018-09-12 Pablo Saavedra <psaave...@igalia.com>
Linking against libWPEWebKit-0.1.so is not posible when WPE is build with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/glib/KeyedEncoderGlib.cpp (236191 => 236192)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/glib/KeyedEncoderGlib.cpp 2018-09-19 13:19:42 UTC (rev 236191)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/glib/KeyedEncoderGlib.cpp 2018-09-19 13:19:46 UTC (rev 236192)
@@ -93,7 +93,7 @@
void KeyedEncoderGlib::beginObject(const String& key)
{
- GRefPtr<GVariantBuilder> builder = adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("aa{sv}")));
+ GRefPtr<GVariantBuilder> builder = adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("a{sv}")));
m_objectStack.append(std::make_pair(key, builder));
m_variantBuilderStack.append(builder.get());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
