Skip to content

Commit

Permalink
Merge r235982 - [GLib] Fix format string in KeyedEncoderGlib::beginOb…
Browse files Browse the repository at this point in the history
…ject().

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):
  • Loading branch information
Ms2ger authored and carlosgcampos committed Sep 19, 2018
1 parent e9689cb commit 8e44a25
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
2018-09-13 Ms2ger <Ms2ger@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 <psaavedra@igalia.com>

Linking against libWPEWebKit-0.1.so is not posible when WPE is build with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/glib/KeyedEncoderGlib.cpp
Expand Up @@ -93,7 +93,7 @@ void KeyedEncoderGlib::encodeString(const String& key, const String& value)

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());
}
Expand Down

0 comments on commit 8e44a25

Please sign in to comment.