153130 2016-01-15 08:24:32 -0800 [GTK] GVariant runtime critical errors when encoding session data 2016-01-16 01:37:05 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1155771 0 cgarcia 2016-01-15 08:24:32 -0800 It happens when the FrameState has children, because the recursive serialization is wrong. (epiphany:19881): GLib-CRITICAL **: g_variant_builder_open: assertion '!GVSB(builder)->expected_type || g_variant_type_is_subtype_of (type, GVSB(builder)->expected_type)' failed (epiphany:19881): GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed (epiphany:19881): GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed (epiphany:19881): GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed (epiphany:19881): GLib-CRITICAL **: g_variant_builder_add_value: assertion '!GVSB(builder)->expected_type || g_variant_is_of_type (value, GVSB(builder)->expected_type)' failed (epiphany:19881): GLib-CRITICAL **: g_variant_builder_open: assertion '!GVSB(builder)->expected_type || g_variant_type_is_subtype_of (type, GVSB(builder)->expected_type)' failed 1155772 1 269055 cgarcia 2016-01-15 08:30:57 -0800 Created attachment 269055 Patch 1155773 2 commit-queue 2016-01-15 08:32:07 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1155780 3 269060 cgarcia 2016-01-15 08:44:03 -0800 Created attachment 269060 Updated patch The decode part also needed to be fixed. 1156148 4 cgarcia 2016-01-16 01:37:05 -0800 Committed r195166: <http://trac.webkit.org/changeset/195166> 269055 2016-01-15 08:30:57 -0800 2016-01-15 08:44:03 -0800 Patch wk2-session-state-encoding-issues.diff text/plain 5357 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MzY5ZTYyLi4zYmFmN2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTYtMDEtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEdWYXJpYW50IHJ1bnRpbWUgY3JpdGljYWwgZXJyb3JzIHdoZW4g ZW5jb2Rpbmcgc2Vzc2lvbiBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTMxMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJdCBoYXBwZW5zIHdoZW4gdGhlIEZyYW1lU3RhdGUgaGFzIGNoaWxkcmVu LCBiZWNhdXNlIHRoZSByZWN1cnNpdmUKKyAgICAgICAgc2VyaWFsaXphdGlvbiBpcyB3cm9uZy4g QWxzbyBmaXggc2VyaWFsaXphdGlvbiBvZgorICAgICAgICBkb2N1bWVudFNlcXVlbmNlTnVtYmVy IGFuZCBpdGVtU2VxdWVuY2VOdW1iZXIgdGhhdCBhcmUgZ2ludDY0LCBub3QKKyAgICAgICAgZ3Vp bnQ2NC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdTZXNzaW9u U3RhdGUuY3BwOgorICAgICAgICAoZW5jb2RlRnJhbWVTdGF0ZSk6IExldCB0aGUgY2FsbGVyIG9w ZW4vaW5pdCB0aGUgZ2l2ZW4KKyAgICAgICAgYnVpbGRlci4gVXNlIGEgbmV3IGJ1aWxkZXIgdG8g ZW5jb2RlIGNoaWxkIHN0YXRlcyByZWN1cnNpdmVseS4KKyAgICAgICAgKGVuY29kZVBhZ2VTdGF0 ZSk6IERvIHRoZSBidWlsZGVyIG9wZW4vY2xvc2UgZm9yIHRoZSBGcmFtZVN0YXRlIGVuY29kaW5n LgorICAgICAgICAoZGVjb2RlRnJhbWVTdGF0ZSk6CisKIDIwMTYtMDEtMTMgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBJbXBsZW1lbnQgY3Vz dG9tIHByb3RvY29scyB3aGVuIHVzaW5nIE5ldHdvcmtTZXNzaW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3U2Vzc2lvblN0YXRlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdTZXNzaW9u U3RhdGUuY3BwCmluZGV4IGJmZDY5MTguLmIwMGFhNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdTZXNzaW9uU3RhdGUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdTZXNzaW9uU3Rh dGUuY3BwCkBAIC00NCw4ICs0NCw4IEBAIHN0YXRpYyBjb25zdCBndWludDE2IGdfc2Vzc2lvblN0 YXRlVmVyc2lvbiA9IDE7CiAjZGVmaW5lIEhUVFBfQk9EWV9FTEVNRU5UX0ZPUk1BVF9TVFJJTkdf VjEgIih1YXkmc3hteG1kJnMpIgogI2RlZmluZSBIVFRQX0JPRFlfVFlQRV9TVFJJTkdfVjEgIm0o c2EiIEhUVFBfQk9EWV9FTEVNRU5UX1RZUEVfU1RSSU5HX1YxICIpIgogI2RlZmluZSBIVFRQX0JP RFlfRk9STUFUX1NUUklOR19WMSAibSgmc2EiIEhUVFBfQk9EWV9FTEVNRU5UX1RZUEVfU1RSSU5H X1YxICIpIgotI2RlZmluZSBGUkFNRV9TVEFURV9UWVBFX1NUUklOR19WMSAgIihzc3NzYXNtYXl0 dChpaSlkIiBIVFRQX0JPRFlfVFlQRV9TVFJJTkdfVjEgImF2KSIKLSNkZWZpbmUgRlJBTUVfU1RB VEVfRk9STUFUX1NUUklOR19WMSAgIigmcyZzJnMmc2FzbWF5dHQoaWkpZEAiIEhUVFBfQk9EWV9U WVBFX1NUUklOR19WMSAiYXYpIgorI2RlZmluZSBGUkFNRV9TVEFURV9UWVBFX1NUUklOR19WMSAg Iihzc3NzYXNtYXl4eChpaSlkIiBIVFRQX0JPRFlfVFlQRV9TVFJJTkdfVjEgImF2KSIKKyNkZWZp bmUgRlJBTUVfU1RBVEVfRk9STUFUX1NUUklOR19WMSAgIigmcyZzJnMmc2FzbWF5eHgoaWkpZEAi IEhUVFBfQk9EWV9UWVBFX1NUUklOR19WMSAiYXYpIgogI2RlZmluZSBCQUNLX0ZPUldBUkRfTElT VF9JVEVNX1RZUEVfU1RSSU5HX1YxICAiKHRzIiBGUkFNRV9TVEFURV9UWVBFX1NUUklOR19WMSAi dSkiCiAjZGVmaW5lIEJBQ0tfRk9SV0FSRF9MSVNUX0lURU1fRk9STUFUX1NUUklOR19WMSAgIih0 JnNAIiBGUkFNRV9TVEFURV9UWVBFX1NUUklOR19WMSAidSkiCiAjZGVmaW5lIFNFU1NJT05fU1RB VEVfVFlQRV9TVFJJTkdfVjEgICIocWEiIEJBQ0tfRk9SV0FSRF9MSVNUX0lURU1fVFlQRV9TVFJJ TkdfVjEgIm11KSIKQEAgLTE1MCw3ICsxNTAsNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZW5jb2Rl SFRUUEJvZHkoR1ZhcmlhbnRCdWlsZGVyKiBzZXNzaW9uQnVpbGRlciwgY29uc3QgSFRUUEJvZAog CiBzdGF0aWMgaW5saW5lIHZvaWQgZW5jb2RlRnJhbWVTdGF0ZShHVmFyaWFudEJ1aWxkZXIqIHNl c3Npb25CdWlsZGVyLCBjb25zdCBGcmFtZVN0YXRlJiBmcmFtZVN0YXRlKQogewotICAgIGdfdmFy aWFudF9idWlsZGVyX29wZW4oc2Vzc2lvbkJ1aWxkZXIsIEdfVkFSSUFOVF9UWVBFKEZSQU1FX1NU QVRFX1RZUEVfU1RSSU5HX1YxKSk7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25C dWlsZGVyLCAicyIsIGZyYW1lU3RhdGUudXJsU3RyaW5nLnV0ZjgoKS5kYXRhKCkpOwogICAgIGdf dmFyaWFudF9idWlsZGVyX2FkZChzZXNzaW9uQnVpbGRlciwgInMiLCBmcmFtZVN0YXRlLm9yaWdp bmFsVVJMU3RyaW5nLnV0ZjgoKS5kYXRhKCkpOwogICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChz ZXNzaW9uQnVpbGRlciwgInMiLCBmcmFtZVN0YXRlLnJlZmVycmVyLnV0ZjgoKS5kYXRhKCkpOwpA QCAtMTY5LDggKzE2OCw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBlbmNvZGVGcmFtZVN0YXRlKEdW YXJpYW50QnVpbGRlciogc2Vzc2lvbkJ1aWxkZXIsIGNvbnN0IEZyYW1lCiAgICAgICAgIGdfdmFy aWFudF9idWlsZGVyX2Nsb3NlKHNlc3Npb25CdWlsZGVyKTsKICAgICAgICAgZ192YXJpYW50X2J1 aWxkZXJfY2xvc2Uoc2Vzc2lvbkJ1aWxkZXIpOwogICAgIH0KLSAgICBnX3ZhcmlhbnRfYnVpbGRl cl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICJ0IiwgZnJhbWVTdGF0ZS5kb2N1bWVudFNlcXVlbmNlTnVt YmVyKTsKLSAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICJ0IiwgZnJh bWVTdGF0ZS5pdGVtU2VxdWVuY2VOdW1iZXIpOworICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChz ZXNzaW9uQnVpbGRlciwgIngiLCBmcmFtZVN0YXRlLmRvY3VtZW50U2VxdWVuY2VOdW1iZXIpOwor ICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChzZXNzaW9uQnVpbGRlciwgIngiLCBmcmFtZVN0YXRl Lml0ZW1TZXF1ZW5jZU51bWJlcik7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25C dWlsZGVyLCAiKGlpKSIsIGZyYW1lU3RhdGUuc2Nyb2xsUG9zaXRpb24ueCgpLCBmcmFtZVN0YXRl LnNjcm9sbFBvc2l0aW9uLnkoKSk7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25C dWlsZGVyLCAiZCIsIGZyYW1lU3RhdGUucGFnZVNjYWxlRmFjdG9yKTsKICAgICBpZiAoIWZyYW1l U3RhdGUuaHR0cEJvZHkpCkBAIC0xODEsMTYgKzE4MCwyMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQg ZW5jb2RlRnJhbWVTdGF0ZShHVmFyaWFudEJ1aWxkZXIqIHNlc3Npb25CdWlsZGVyLCBjb25zdCBG cmFtZQogICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9jbG9zZShzZXNzaW9uQnVpbGRlcik7CiAg ICAgfQogICAgIGdfdmFyaWFudF9idWlsZGVyX29wZW4oc2Vzc2lvbkJ1aWxkZXIsIEdfVkFSSUFO VF9UWVBFKCJhdiIpKTsKLSAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkIDogZnJhbWVTdGF0ZS5j aGlsZHJlbikKLSAgICAgICAgZW5jb2RlRnJhbWVTdGF0ZShzZXNzaW9uQnVpbGRlciwgY2hpbGQp OwotICAgIGdfdmFyaWFudF9idWlsZGVyX2Nsb3NlKHNlc3Npb25CdWlsZGVyKTsKKyAgICBmb3Ig KGNvbnN0IGF1dG8mIGNoaWxkIDogZnJhbWVTdGF0ZS5jaGlsZHJlbikgeworICAgICAgICBHVmFy aWFudEJ1aWxkZXIgZnJhbWVTdGF0ZUJ1aWxkZXI7CisgICAgICAgIGdfdmFyaWFudF9idWlsZGVy X2luaXQoJmZyYW1lU3RhdGVCdWlsZGVyLCBHX1ZBUklBTlRfVFlQRShGUkFNRV9TVEFURV9UWVBF X1NUUklOR19WMSkpOworICAgICAgICBlbmNvZGVGcmFtZVN0YXRlKCZmcmFtZVN0YXRlQnVpbGRl ciwgY2hpbGQpOworICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIs ICJ2IiwgZ192YXJpYW50X2J1aWxkZXJfZW5kKCZmcmFtZVN0YXRlQnVpbGRlcikpOworICAgIH0K ICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9jbG9zZShzZXNzaW9uQnVpbGRlcik7CiB9CiAKIHN0YXRp YyBpbmxpbmUgdm9pZCBlbmNvZGVQYWdlU3RhdGUoR1ZhcmlhbnRCdWlsZGVyKiBzZXNzaW9uQnVp bGRlciwgY29uc3QgUGFnZVN0YXRlJiBwYWdlU3RhdGUpCiB7CiAgICAgZ192YXJpYW50X2J1aWxk ZXJfYWRkKHNlc3Npb25CdWlsZGVyLCAicyIsIHBhZ2VTdGF0ZS50aXRsZS51dGY4KCkuZGF0YSgp KTsKKyAgICBnX3ZhcmlhbnRfYnVpbGRlcl9vcGVuKHNlc3Npb25CdWlsZGVyLCBHX1ZBUklBTlRf VFlQRShGUkFNRV9TVEFURV9UWVBFX1NUUklOR19WMSkpOwogICAgIGVuY29kZUZyYW1lU3RhdGUo c2Vzc2lvbkJ1aWxkZXIsIHBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSk7CisgICAgZ192YXJpYW50 X2J1aWxkZXJfY2xvc2Uoc2Vzc2lvbkJ1aWxkZXIpOwogICAgIGdfdmFyaWFudF9idWlsZGVyX2Fk ZChzZXNzaW9uQnVpbGRlciwgInUiLCB0b0V4dGVybmFsVVJMc1BvbGljeShwYWdlU3RhdGUuc2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSkpOwogfQogCkBAIC0yNzgsOCArMjgyLDggQEAgc3Rh dGljIGlubGluZSB2b2lkIGRlY29kZUZyYW1lU3RhdGUoR1ZhcmlhbnQqIGZyYW1lU3RhdGVWYXJp YW50LCBGcmFtZVN0YXRlJiBmcmEKICAgICBjb25zdCBjaGFyKiB0YXJnZXQ7CiAgICAgR1VuaXF1 ZU91dFB0cjxHVmFyaWFudEl0ZXI+IGRvY3VtZW50U3RhdGVJdGVyOwogICAgIEdVbmlxdWVPdXRQ dHI8R1ZhcmlhbnRJdGVyPiBzdGF0ZU9iamVjdERhdGFJdGVyOwotICAgIGd1aW50NjQgZG9jdW1l bnRTZXF1ZW5jZU51bWJlcjsKLSAgICBndWludDY0IGl0ZW1TZXF1ZW5jZU51bWJlcjsKKyAgICBn aW50NjQgZG9jdW1lbnRTZXF1ZW5jZU51bWJlcjsKKyAgICBnaW50NjQgaXRlbVNlcXVlbmNlTnVt YmVyOwogICAgIGdpbnQzMiBzY3JvbGxQb3NpdGlvblgsIHNjcm9sbFBvc2l0aW9uWTsKICAgICBn ZG91YmxlIHBhZ2VTY2FsZUZhY3RvcjsKICAgICBHVmFyaWFudCogaHR0cEJvZHlWYXJpYW50Owo= 269060 2016-01-15 08:44:03 -0800 2016-01-15 11:55:22 -0800 Updated patch wk2-session-state-encoding-issues.diff text/plain 5947 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MzY5ZTYyLi4wOGU3MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTYtMDEtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEdWYXJpYW50IHJ1bnRpbWUgY3JpdGljYWwgZXJyb3JzIHdoZW4g ZW5jb2Rpbmcgc2Vzc2lvbiBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTMxMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJdCBoYXBwZW5zIHdoZW4gdGhlIEZyYW1lU3RhdGUgaGFzIGNoaWxkcmVu LCBiZWNhdXNlIHRoZSByZWN1cnNpdmUKKyAgICAgICAgc2VyaWFsaXphdGlvbiBpcyB3cm9uZy4g QWxzbyBmaXggc2VyaWFsaXphdGlvbiBvZgorICAgICAgICBkb2N1bWVudFNlcXVlbmNlTnVtYmVy IGFuZCBpdGVtU2VxdWVuY2VOdW1iZXIgdGhhdCBhcmUgZ2ludDY0LCBub3QKKyAgICAgICAgZ3Vp bnQ2NC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdTZXNzaW9u U3RhdGUuY3BwOgorICAgICAgICAoZW5jb2RlRnJhbWVTdGF0ZSk6IExldCB0aGUgY2FsbGVyIG9w ZW4vaW5pdCB0aGUgZ2l2ZW4KKyAgICAgICAgYnVpbGRlci4gVXNlIGEgbmV3IGJ1aWxkZXIgdG8g ZW5jb2RlIGNoaWxkIHN0YXRlcyByZWN1cnNpdmVseS4KKyAgICAgICAgKGVuY29kZVBhZ2VTdGF0 ZSk6IERvIHRoZSBidWlsZGVyIG9wZW4vY2xvc2UgZm9yIHRoZSBGcmFtZVN0YXRlIGVuY29kaW5n LgorICAgICAgICAoZGVjb2RlRnJhbWVTdGF0ZSk6IEdldCB0aGUgdmFyaWFudCBvZiBldmVyeSBj aGlsZC4KKwogMjAxNi0wMS0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIEltcGxlbWVudCBjdXN0b20gcHJvdG9jb2xzIHdoZW4gdXNpbmcg TmV0d29ya1Nlc3Npb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdTZXNzaW9uU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld1Nlc3Npb25TdGF0ZS5jcHAKaW5kZXggYmZkNjkxOC4u YTRiYjc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld1Nlc3Npb25TdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld1Nlc3Npb25TdGF0ZS5jcHAKQEAgLTQ0LDggKzQ0LDggQEAg c3RhdGljIGNvbnN0IGd1aW50MTYgZ19zZXNzaW9uU3RhdGVWZXJzaW9uID0gMTsKICNkZWZpbmUg SFRUUF9CT0RZX0VMRU1FTlRfRk9STUFUX1NUUklOR19WMSAiKHVheSZzeG14bWQmcykiCiAjZGVm aW5lIEhUVFBfQk9EWV9UWVBFX1NUUklOR19WMSAibShzYSIgSFRUUF9CT0RZX0VMRU1FTlRfVFlQ RV9TVFJJTkdfVjEgIikiCiAjZGVmaW5lIEhUVFBfQk9EWV9GT1JNQVRfU1RSSU5HX1YxICJtKCZz YSIgSFRUUF9CT0RZX0VMRU1FTlRfVFlQRV9TVFJJTkdfVjEgIikiCi0jZGVmaW5lIEZSQU1FX1NU QVRFX1RZUEVfU1RSSU5HX1YxICAiKHNzc3Nhc21heXR0KGlpKWQiIEhUVFBfQk9EWV9UWVBFX1NU UklOR19WMSAiYXYpIgotI2RlZmluZSBGUkFNRV9TVEFURV9GT1JNQVRfU1RSSU5HX1YxICAiKCZz JnMmcyZzYXNtYXl0dChpaSlkQCIgSFRUUF9CT0RZX1RZUEVfU1RSSU5HX1YxICJhdikiCisjZGVm aW5lIEZSQU1FX1NUQVRFX1RZUEVfU1RSSU5HX1YxICAiKHNzc3Nhc21heXh4KGlpKWQiIEhUVFBf Qk9EWV9UWVBFX1NUUklOR19WMSAiYXYpIgorI2RlZmluZSBGUkFNRV9TVEFURV9GT1JNQVRfU1RS SU5HX1YxICAiKCZzJnMmcyZzYXNtYXl4eChpaSlkQCIgSFRUUF9CT0RZX1RZUEVfU1RSSU5HX1Yx ICJhdikiCiAjZGVmaW5lIEJBQ0tfRk9SV0FSRF9MSVNUX0lURU1fVFlQRV9TVFJJTkdfVjEgICIo dHMiIEZSQU1FX1NUQVRFX1RZUEVfU1RSSU5HX1YxICJ1KSIKICNkZWZpbmUgQkFDS19GT1JXQVJE X0xJU1RfSVRFTV9GT1JNQVRfU1RSSU5HX1YxICAiKHQmc0AiIEZSQU1FX1NUQVRFX1RZUEVfU1RS SU5HX1YxICJ1KSIKICNkZWZpbmUgU0VTU0lPTl9TVEFURV9UWVBFX1NUUklOR19WMSAgIihxYSIg QkFDS19GT1JXQVJEX0xJU1RfSVRFTV9UWVBFX1NUUklOR19WMSAibXUpIgpAQCAtMTUwLDcgKzE1 MCw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBlbmNvZGVIVFRQQm9keShHVmFyaWFudEJ1aWxkZXIq IHNlc3Npb25CdWlsZGVyLCBjb25zdCBIVFRQQm9kCiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBlbmNv ZGVGcmFtZVN0YXRlKEdWYXJpYW50QnVpbGRlciogc2Vzc2lvbkJ1aWxkZXIsIGNvbnN0IEZyYW1l U3RhdGUmIGZyYW1lU3RhdGUpCiB7Ci0gICAgZ192YXJpYW50X2J1aWxkZXJfb3BlbihzZXNzaW9u QnVpbGRlciwgR19WQVJJQU5UX1RZUEUoRlJBTUVfU1RBVEVfVFlQRV9TVFJJTkdfVjEpKTsKICAg ICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICJzIiwgZnJhbWVTdGF0ZS51 cmxTdHJpbmcudXRmOCgpLmRhdGEoKSk7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Np b25CdWlsZGVyLCAicyIsIGZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmcudXRmOCgpLmRhdGEo KSk7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25CdWlsZGVyLCAicyIsIGZyYW1l U3RhdGUucmVmZXJyZXIudXRmOCgpLmRhdGEoKSk7CkBAIC0xNjksOCArMTY4LDggQEAgc3RhdGlj IGlubGluZSB2b2lkIGVuY29kZUZyYW1lU3RhdGUoR1ZhcmlhbnRCdWlsZGVyKiBzZXNzaW9uQnVp bGRlciwgY29uc3QgRnJhbWUKICAgICAgICAgZ192YXJpYW50X2J1aWxkZXJfY2xvc2Uoc2Vzc2lv bkJ1aWxkZXIpOwogICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9jbG9zZShzZXNzaW9uQnVpbGRl cik7CiAgICAgfQotICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChzZXNzaW9uQnVpbGRlciwgInQi LCBmcmFtZVN0YXRlLmRvY3VtZW50U2VxdWVuY2VOdW1iZXIpOwotICAgIGdfdmFyaWFudF9idWls ZGVyX2FkZChzZXNzaW9uQnVpbGRlciwgInQiLCBmcmFtZVN0YXRlLml0ZW1TZXF1ZW5jZU51bWJl cik7CisgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25CdWlsZGVyLCAieCIsIGZyYW1l U3RhdGUuZG9jdW1lbnRTZXF1ZW5jZU51bWJlcik7CisgICAgZ192YXJpYW50X2J1aWxkZXJfYWRk KHNlc3Npb25CdWlsZGVyLCAieCIsIGZyYW1lU3RhdGUuaXRlbVNlcXVlbmNlTnVtYmVyKTsKICAg ICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICIoaWkpIiwgZnJhbWVTdGF0 ZS5zY3JvbGxQb3NpdGlvbi54KCksIGZyYW1lU3RhdGUuc2Nyb2xsUG9zaXRpb24ueSgpKTsKICAg ICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICJkIiwgZnJhbWVTdGF0ZS5w YWdlU2NhbGVGYWN0b3IpOwogICAgIGlmICghZnJhbWVTdGF0ZS5odHRwQm9keSkKQEAgLTE4MSwx NiArMTgwLDIxIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBlbmNvZGVGcmFtZVN0YXRlKEdWYXJpYW50 QnVpbGRlciogc2Vzc2lvbkJ1aWxkZXIsIGNvbnN0IEZyYW1lCiAgICAgICAgIGdfdmFyaWFudF9i dWlsZGVyX2Nsb3NlKHNlc3Npb25CdWlsZGVyKTsKICAgICB9CiAgICAgZ192YXJpYW50X2J1aWxk ZXJfb3BlbihzZXNzaW9uQnVpbGRlciwgR19WQVJJQU5UX1RZUEUoImF2IikpOwotICAgIGZvciAo Y29uc3QgYXV0byYgY2hpbGQgOiBmcmFtZVN0YXRlLmNoaWxkcmVuKQotICAgICAgICBlbmNvZGVG cmFtZVN0YXRlKHNlc3Npb25CdWlsZGVyLCBjaGlsZCk7Ci0gICAgZ192YXJpYW50X2J1aWxkZXJf Y2xvc2Uoc2Vzc2lvbkJ1aWxkZXIpOworICAgIGZvciAoY29uc3QgYXV0byYgY2hpbGQgOiBmcmFt ZVN0YXRlLmNoaWxkcmVuKSB7CisgICAgICAgIEdWYXJpYW50QnVpbGRlciBmcmFtZVN0YXRlQnVp bGRlcjsKKyAgICAgICAgZ192YXJpYW50X2J1aWxkZXJfaW5pdCgmZnJhbWVTdGF0ZUJ1aWxkZXIs IEdfVkFSSUFOVF9UWVBFKEZSQU1FX1NUQVRFX1RZUEVfU1RSSU5HX1YxKSk7CisgICAgICAgIGVu Y29kZUZyYW1lU3RhdGUoJmZyYW1lU3RhdGVCdWlsZGVyLCBjaGlsZCk7CisgICAgICAgIGdfdmFy aWFudF9idWlsZGVyX2FkZChzZXNzaW9uQnVpbGRlciwgInYiLCBnX3ZhcmlhbnRfYnVpbGRlcl9l bmQoJmZyYW1lU3RhdGVCdWlsZGVyKSk7CisgICAgfQogICAgIGdfdmFyaWFudF9idWlsZGVyX2Ns b3NlKHNlc3Npb25CdWlsZGVyKTsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkIGVuY29kZVBhZ2VT dGF0ZShHVmFyaWFudEJ1aWxkZXIqIHNlc3Npb25CdWlsZGVyLCBjb25zdCBQYWdlU3RhdGUmIHBh Z2VTdGF0ZSkKIHsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoc2Vzc2lvbkJ1aWxkZXIsICJz IiwgcGFnZVN0YXRlLnRpdGxlLnV0ZjgoKS5kYXRhKCkpOworICAgIGdfdmFyaWFudF9idWlsZGVy X29wZW4oc2Vzc2lvbkJ1aWxkZXIsIEdfVkFSSUFOVF9UWVBFKEZSQU1FX1NUQVRFX1RZUEVfU1RS SU5HX1YxKSk7CiAgICAgZW5jb2RlRnJhbWVTdGF0ZShzZXNzaW9uQnVpbGRlciwgcGFnZVN0YXRl Lm1haW5GcmFtZVN0YXRlKTsKKyAgICBnX3ZhcmlhbnRfYnVpbGRlcl9jbG9zZShzZXNzaW9uQnVp bGRlcik7CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKHNlc3Npb25CdWlsZGVyLCAidSIsIHRv RXh0ZXJuYWxVUkxzUG9saWN5KHBhZ2VTdGF0ZS5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 KSk7CiB9CiAKQEAgLTI3OCw4ICsyODIsOCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZGVjb2RlRnJh bWVTdGF0ZShHVmFyaWFudCogZnJhbWVTdGF0ZVZhcmlhbnQsIEZyYW1lU3RhdGUmIGZyYQogICAg IGNvbnN0IGNoYXIqIHRhcmdldDsKICAgICBHVW5pcXVlT3V0UHRyPEdWYXJpYW50SXRlcj4gZG9j dW1lbnRTdGF0ZUl0ZXI7CiAgICAgR1VuaXF1ZU91dFB0cjxHVmFyaWFudEl0ZXI+IHN0YXRlT2Jq ZWN0RGF0YUl0ZXI7Ci0gICAgZ3VpbnQ2NCBkb2N1bWVudFNlcXVlbmNlTnVtYmVyOwotICAgIGd1 aW50NjQgaXRlbVNlcXVlbmNlTnVtYmVyOworICAgIGdpbnQ2NCBkb2N1bWVudFNlcXVlbmNlTnVt YmVyOworICAgIGdpbnQ2NCBpdGVtU2VxdWVuY2VOdW1iZXI7CiAgICAgZ2ludDMyIHNjcm9sbFBv c2l0aW9uWCwgc2Nyb2xsUG9zaXRpb25ZOwogICAgIGdkb3VibGUgcGFnZVNjYWxlRmFjdG9yOwog ICAgIEdWYXJpYW50KiBodHRwQm9keVZhcmlhbnQ7CkBAIC0zMTgsNyArMzIyLDggQEAgc3RhdGlj IGlubGluZSB2b2lkIGRlY29kZUZyYW1lU3RhdGUoR1ZhcmlhbnQqIGZyYW1lU3RhdGVWYXJpYW50 LCBGcmFtZVN0YXRlJiBmcmEKICAgICBnX3ZhcmlhbnRfdW5yZWYoaHR0cEJvZHlWYXJpYW50KTsK ICAgICB3aGlsZSAoR1JlZlB0cjxHVmFyaWFudD4gY2hpbGQgPSBhZG9wdEdSZWYoZ192YXJpYW50 X2l0ZXJfbmV4dF92YWx1ZShjaGlsZHJlbkl0ZXIuZ2V0KCkpKSkgewogICAgICAgICBGcmFtZVN0 YXRlIGNoaWxkRnJhbWVTdGF0ZTsKLSAgICAgICAgZGVjb2RlRnJhbWVTdGF0ZShjaGlsZC5nZXQo KSwgY2hpbGRGcmFtZVN0YXRlKTsKKyAgICAgICAgR1JlZlB0cjxHVmFyaWFudD4gY2hpbGRWYXJp YW50ID0gYWRvcHRHUmVmKGdfdmFyaWFudF9nZXRfdmFyaWFudChjaGlsZC5nZXQoKSkpOworICAg ICAgICBkZWNvZGVGcmFtZVN0YXRlKGNoaWxkVmFyaWFudC5nZXQoKSwgY2hpbGRGcmFtZVN0YXRl KTsKICAgICAgICAgZnJhbWVTdGF0ZS5jaGlsZHJlbi5hcHBlbmQoV1RGTW92ZShjaGlsZEZyYW1l U3RhdGUpKTsKICAgICB9CiB9Cg==