228128 2021-07-20 14:59:09 -0700 REGRESSION(r267763): [SOUP] After network process crash, all cookies are lost until browser is restarted 2021-07-21 05:27:25 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=216041 P2 Normal --- 1 mcatanzaro webkit-unassigned aperez berto bugs-noreply cgarcia ews-watchlist gustavo mcatanzaro oldest_to_newest 1778288 0 mcatanzaro 2021-07-20 14:59:09 -0700 After a network process crash, all cookies are lost until the browser is restarted. At least, I think that's what's happening. I'm logged out of all websites. Everything's fine again after restarting Epiphany. This is weird. 1778385 1 433924 cgarcia 2021-07-21 03:52:42 -0700 Created attachment 433924 Patch 1778386 2 ews-watchlist 2021-07-21 03:53:28 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1778393 3 cgarcia 2021-07-21 04:51:29 -0700 Committed r280128 (239838@main): <https://commits.webkit.org/239838@main> 1778397 4 433924 mcatanzaro 2021-07-21 05:27:25 -0700 Comment on attachment 433924 Patch Wow! 433924 2021-07-21 03:52:42 -0700 2021-07-21 03:57:19 -0700 Patch wk2-cookie-settings.diff text/plain 11982 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMjgzOTRmNTY4NjQ2Li43MWFiNWM0ZjQwNGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzAgQEAKKzIwMjEtMDctMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI2Nzc2Myk6IFtTT1VQXSBBZnRlciBuZXR3 b3JrIHByb2Nlc3MgY3Jhc2gsIGFsbCBjb29raWVzIGFyZSBsb3N0IHVudGlsIGJyb3dzZXIgaXMg cmVzdGFydGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjgxMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb29raWVzIGNvbmZpZ3VyYXRpb24gaXMgbm8gbG9uZ2VyIHN0b3JlZCB0byBiZSBzZW50IGFn YWluIHRvIHRoZSBuZXcgbmV0d29yayBwcm9jZXNzIGFmdGVyIGEgY3Jhc2guCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUg Y29uc3QpOiBFbmNvZGUgY29va2llQWNjZXB0UG9saWN5LgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKTogRGVjb2RlIGNvb2tpZUFjY2Vw dFBvbGljeS4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9u UGFyYW1ldGVycy5oOiBBZGQgY29va2llQWNjZXB0UG9saWN5LgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Nlc3Npb25Tb3VwOjpOZXR3b3JrU2Vzc2lvblNvdXApOiBTZXQgY29va2llIGFjY2VwdCBw b2xpY3kgb24gTmV0d29ya1N0b3JhZ2VTZXNzaW9uLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKHdlYmtpdF9jb29raWVfbWFu YWdlcl9zZXRfcGVyc2lzdGVudF9zdG9yYWdlKTogVXNlIFdlYnNpdGVEYXRhU3RvcmUgQVBJIHRv IGNhY2hlIHRoZSBnaXZlbiB2YWx1ZXMuCisgICAgICAgICh3ZWJraXRfY29va2llX21hbmFnZXJf c2V0X2FjY2VwdF9wb2xpY3kpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29va2ll TWFuYWdlclByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvc291cC9XZWJzaXRl RGF0YVN0b3JlU291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnBs YXRmb3JtU2V0TmV0d29ya1BhcmFtZXRlcnMpOiBTZXQgY2FjaGVkIGNvb2tpZSBzZXR0aW5ncyB0 byBuZXR3b3JrIHNlc3Npb24gcGFyYW1ldGVycy4KKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURh dGFTdG9yZTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UpOiBDYWNoZSB0aGUgZ2l2ZW4gdmFs dWUgYW5kIG5vdGlmeSB0aGUgY29va2llIG1hbmFnZXIuCisgICAgICAgIChXZWJLaXQ6OldlYnNp dGVEYXRhU3RvcmU6OnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kpOiBEaXR0by4KKyAgICAgICAg KiBVSVByb2Nlc3Mvc291cC9XZWJDb29raWVNYW5hZ2VyUHJveHlTb3VwLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRDb29raWVQZXJzaXN0ZW50U3RvcmFn ZSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjEtMDctMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gUFNPTjogYWNjZXNzaWJp bGl0eSBkb2Vzbid0IHdvcmsgYWZ0ZXIgYSBjcm9zcyBzaXRlIG5hdmlnYXRpb24KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBh cmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv bkNyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggY2Y3ZmU5N2YyMjQ5Li5jODM0OGUzMDJjYmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25D cmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC02NCw2ICs2NCw3IEBAIHZv aWQgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXIm IGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBwZXJzaXN0ZW50Q3JlZGVudGlhbFN0b3Jh Z2VFbmFibGVkOwogICAgIGVuY29kZXIgPDwgaWdub3JlVExTRXJyb3JzOwogICAgIGVuY29kZXIg PDwgcHJveHlTZXR0aW5nczsKKyAgICBlbmNvZGVyIDw8IGNvb2tpZUFjY2VwdFBvbGljeTsKICNl bmRpZgogI2lmIFVTRShDVVJMKQogICAgIGVuY29kZXIgPDwgY29va2llUGVyc2lzdGVudFN0b3Jh Z2VGaWxlOwpAQCAtMTg4LDYgKzE4OSwxMSBAQCBzdGQ6Om9wdGlvbmFsPE5ldHdvcmtTZXNzaW9u Q3JlYXRpb25QYXJhbWV0ZXJzPiBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycwogICAg IGRlY29kZXIgPj4gcHJveHlTZXR0aW5nczsKICAgICBpZiAoIXByb3h5U2V0dGluZ3MpCiAgICAg ICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkhU VFBDb29raWVBY2NlcHRQb2xpY3k+IGNvb2tpZUFjY2VwdFBvbGljeTsKKyAgICBkZWNvZGVyID4+ IGNvb2tpZUFjY2VwdFBvbGljeTsKKyAgICBpZiAoIWNvb2tpZUFjY2VwdFBvbGljeSkKKyAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICNlbmRpZgogCiAjaWYgVVNFKENVUkwpCkBAIC0zMTIs NiArMzE4LDcgQEAgc3RkOjpvcHRpb25hbDxOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVy cz4gTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMKICAgICAgICAgLCBXVEZNb3ZlKCpw ZXJzaXN0ZW50Q3JlZGVudGlhbFN0b3JhZ2VFbmFibGVkKQogICAgICAgICAsIFdURk1vdmUoKmln bm9yZVRMU0Vycm9ycykKICAgICAgICAgLCBXVEZNb3ZlKCpwcm94eVNldHRpbmdzKQorICAgICAg ICAsIFdURk1vdmUoKmNvb2tpZUFjY2VwdFBvbGljeSkKICNlbmRpZgogI2lmIFVTRShDVVJMKQog ICAgICAgICAsIFdURk1vdmUoKmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBh cmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25D cmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCA5MDNiYjBjYTRjMTMuLjIyMTBhZjg2MDY1MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0 aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMzMsNiArMzMsNyBAQAogCiAjaWYgVVNF KFNPVVApCiAjaW5jbHVkZSAiU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZS5oIgorI2lu Y2x1ZGUgPFdlYkNvcmUvSFRUUENvb2tpZUFjY2VwdFBvbGljeS5oPgogI2luY2x1ZGUgPFdlYkNv cmUvU291cE5ldHdvcmtQcm94eVNldHRpbmdzLmg+CiAjZW5kaWYKIApAQCAtNzcsNiArNzgsNyBA QCBzdHJ1Y3QgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgcGVy c2lzdGVudENyZWRlbnRpYWxTdG9yYWdlRW5hYmxlZCB7IHRydWUgfTsKICAgICBib29sIGlnbm9y ZVRMU0Vycm9ycyB7IGZhbHNlIH07CiAgICAgV2ViQ29yZTo6U291cE5ldHdvcmtQcm94eVNldHRp bmdzIHByb3h5U2V0dGluZ3M7CisgICAgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGljeSBj b29raWVBY2NlcHRQb2xpY3kgeyBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNs dXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW4gfTsKICNlbmRpZgogI2lmIFVTRShDVVJMKQog ICAgIFN0cmluZyBjb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCmlu ZGV4IDA2Y2EyNTJiMDQzOS4uM2E4ZTViZDZiYTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcApAQCAtNDcs NiArNDcsOCBAQCBOZXR3b3JrU2Vzc2lvblNvdXA6Ok5ldHdvcmtTZXNzaW9uU291cChOZXR3b3Jr UHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIE5ldHdvcmtTZQogICAgIGF1dG8qIHN0b3JhZ2VTZXNz aW9uID0gbmV0d29ya1N0b3JhZ2VTZXNzaW9uKCk7CiAgICAgQVNTRVJUKHN0b3JhZ2VTZXNzaW9u KTsKIAorICAgIHN0b3JhZ2VTZXNzaW9uLT5zZXRDb29raWVBY2NlcHRQb2xpY3kocGFyYW1ldGVy cy5jb29raWVBY2NlcHRQb2xpY3kpOworCiAgICAgc2V0SWdub3JlVExTRXJyb3JzKHBhcmFtZXRl cnMuaWdub3JlVExTRXJyb3JzKTsKIAogICAgIGlmIChwYXJhbWV0ZXJzLnByb3h5U2V0dGluZ3Mu bW9kZSAhPSBTb3VwTmV0d29ya1Byb3h5U2V0dGluZ3M6Ok1vZGU6OkRlZmF1bHQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2Vy LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvb2tpZU1hbmFn ZXIuY3BwCmluZGV4IDhkYzc2NzQ3NjMzZS4uZmZmMzhjNGQ2ZDQ4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNw cApAQCAtMTk0LDcgKzE5NCw4IEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX3NldF9wZXJz aXN0ZW50X3N0b3JhZ2UoV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlciwKICAgICBpZiAoc2Vz c2lvbklELmlzRXBoZW1lcmFsKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1hbmFnZXItPnBy aXYtPmNvb2tpZU1hbmFnZXIoKS5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShzZXNzaW9uSUQs IFN0cmluZzo6ZnJvbVVURjgoZmlsZW5hbWUpLCB0b1NvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFn ZVR5cGUoc3RvcmFnZSkpOworICAgIGF1dG8mIHdlYnNpdGVEYXRhU3RvcmUgPSB3ZWJraXRXZWJz aXRlRGF0YU1hbmFnZXJHZXREYXRhU3RvcmUobWFuYWdlci0+cHJpdi0+ZGF0YU1hbmFnZXIpOwor ICAgIHdlYnNpdGVEYXRhU3RvcmUuc2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoU3RyaW5nOjpm cm9tVVRGOChmaWxlbmFtZSksIHRvU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZShzdG9y YWdlKSk7CiB9CiAKIC8qKgpAQCAtMjEyLDcgKzIxMyw4IEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9t YW5hZ2VyX3NldF9hY2NlcHRfcG9saWN5KFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZXIsIFdl YktpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfQ09PS0lFX01BTkFHRVIobWFu YWdlcikpOwogCi0gICAgbWFuYWdlci0+cHJpdi0+Y29va2llTWFuYWdlcigpLnNldEhUVFBDb29r aWVBY2NlcHRQb2xpY3kobWFuYWdlci0+cHJpdi0+c2Vzc2lvbklEKCksIHRvSFRUUENvb2tpZUFj Y2VwdFBvbGljeShwb2xpY3kpLCBbXSgpIHsgfSk7CisgICAgYXV0byYgd2Vic2l0ZURhdGFTdG9y ZSA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShtYW5hZ2VyLT5wcml2LT5k YXRhTWFuYWdlcik7CisgICAgd2Vic2l0ZURhdGFTdG9yZS5zZXRIVFRQQ29va2llQWNjZXB0UG9s aWN5KHRvSFRUUENvb2tpZUFjY2VwdFBvbGljeShwb2xpY3kpKTsKIH0KIAogLyoqCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvb2tpZU1hbmFnZXJQcm94eS5oCmluZGV4IGFhYTY2 YjRmZDc1OS4uM2RjZjU0YWQ3YzhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJDb29raWVNYW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJDb29raWVNYW5hZ2VyUHJveHkuaApAQCAtODcsNyArODcsNiBAQCBwdWJsaWM6CiAKICNpZiBV U0UoU09VUCkKICAgICB2b2lkIHNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lv bklELCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3Jh Z2VUeXBlKTsKLSAgICB2b2lkIGdldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lv bklELCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBl JikgY29uc3Q7CiAjZW5kaWYKIAogcHJpdmF0ZToKQEAgLTk5LDExICs5OCw2IEBAIHByaXZhdGU6 CiAgICAgSGFzaE1hcDxQQUw6OlNlc3Npb25JRCwgV2Vha0hhc2hTZXQ8T2JzZXJ2ZXI+PiBtX2Nv b2tpZU9ic2VydmVyczsKIAogICAgIFdlYWtQdHI8TmV0d29ya1Byb2Nlc3NQcm94eT4gbV9uZXR3 b3JrUHJvY2VzczsKLQotI2lmIFVTRShTT1VQKQotICAgIHVzaW5nIENvb2tpZVBlcnNpc3RlbnRT dG9yYWdlTWFwID0gSGFzaE1hcDxQQUw6OlNlc3Npb25JRCwgc3RkOjpwYWlyPFN0cmluZywgU291 cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZT4+OwotICAgIENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlTWFwIG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VNYXA7Ci0jZW5kaWYKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IDMwYjIxN2EyN2ViMi4uYzkyMWE4Njk4 ODM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5oCkBAIC02Miw2ICs2Miw4IEBACiAjZW5kaWYKIAogI2lmIFVTRShT T1VQKQorI2luY2x1ZGUgIlNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUuaCIKKyNpbmNs dWRlIDxXZWJDb3JlL0hUVFBDb29raWVBY2NlcHRQb2xpY3kuaD4KICNpbmNsdWRlIDxXZWJDb3Jl L1NvdXBOZXR3b3JrUHJveHlTZXR0aW5ncy5oPgogI2VuZGlmCiAKQEAgLTI5MCw2ICsyOTIsOCBA QCBwdWJsaWM6CiAgICAgYm9vbCBpZ25vcmVUTFNFcnJvcnMoKSBjb25zdCB7IHJldHVybiBtX2ln bm9yZVRMU0Vycm9yczsgfQogICAgIHZvaWQgc2V0TmV0d29ya1Byb3h5U2V0dGluZ3MoV2ViQ29y ZTo6U291cE5ldHdvcmtQcm94eVNldHRpbmdzJiYpOwogICAgIGNvbnN0IFdlYkNvcmU6OlNvdXBO ZXR3b3JrUHJveHlTZXR0aW5ncyYgbmV0d29ya1Byb3h5U2V0dGluZ3MoKSBjb25zdCB7IHJldHVy biBtX25ldHdvcmtQcm94eVNldHRpbmdzOyB9CisgICAgdm9pZCBzZXRDb29raWVQZXJzaXN0ZW50 U3RvcmFnZShjb25zdCBTdHJpbmcmLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsK KyAgICB2b2lkIHNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koV2ViQ29yZTo6SFRUUENvb2tpZUFj Y2VwdFBvbGljeSk7CiAjZW5kaWYKIAogICAgIHN0YXRpYyB2b2lkIGFsbG93V2Vic2l0ZURhdGFS ZWNvcmRzRm9yQWxsT3JpZ2lucygpOwpAQCAtNDMzLDYgKzQzNyw5IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX3BlcnNpc3RlbnRDcmVkZW50aWFsU3RvcmFnZUVuYWJsZWQgeyB0cnVlIH07CiAgICAg Ym9vbCBtX2lnbm9yZVRMU0Vycm9ycyB7IHRydWUgfTsKICAgICBXZWJDb3JlOjpTb3VwTmV0d29y a1Byb3h5U2V0dGluZ3MgbV9uZXR3b3JrUHJveHlTZXR0aW5nczsKKyAgICBTdHJpbmcgbV9jb29r aWVQZXJzaXN0ZW50U3RvcmFnZVBhdGg7CisgICAgU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdl VHlwZSBtX2Nvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSB7IFNvdXBDb29raWVQZXJzaXN0ZW50 U3RvcmFnZVR5cGU6OlNRTGl0ZSB9OworICAgIFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQb2xp Y3kgbV9jb29raWVBY2NlcHRQb2xpY3kgeyBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5 OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW4gfTsKICNlbmRpZgogCiAgICAgV2Vh a0hhc2hTZXQ8V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3NlczsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL3NvdXAvV2Vic2l0ZURhdGFTdG9yZVNvdXAu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvc291cC9XZWJzaXRlRGF0 YVN0b3JlU291cC5jcHAKaW5kZXggNzA0YTliNjgzNjk1Li5iY2FlYjEyZDk0ZmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL3NvdXAvV2Vic2l0ZURhdGFT dG9yZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL3Nv dXAvV2Vic2l0ZURhdGFTdG9yZVNvdXAuY3BwCkBAIC00MSw4ICs0MSw5IEBAIHZvaWQgV2Vic2l0 ZURhdGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3JrUGFyYW1ldGVycyhXZWJzaXRlRGF0YVN0b3Jl UGFyYW1ldGVycyYKICAgICBuZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMucGVyc2lzdGVudENyZWRl bnRpYWxTdG9yYWdlRW5hYmxlZCA9IG1fcGVyc2lzdGVudENyZWRlbnRpYWxTdG9yYWdlRW5hYmxl ZDsKICAgICBuZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuaWdub3JlVExTRXJyb3JzID0gbV9pZ25v cmVUTFNFcnJvcnM7CiAgICAgbmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnByb3h5U2V0dGluZ3Mg PSBtX25ldHdvcmtQcm94eVNldHRpbmdzOwotCi0gICAgbmV0d29ya1Byb2Nlc3MoKS5jb29raWVN YW5hZ2VyKCkuZ2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UobV9zZXNzaW9uSUQsIG5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGgsIG5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUpOworICAgIG5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGggPSBtX2Nvb2tpZVBl cnNpc3RlbnRTdG9yYWdlUGF0aDsKKyAgICBuZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuY29va2ll UGVyc2lzdGVudFN0b3JhZ2VUeXBlID0gbV9jb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGU7Cisg ICAgbmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmNvb2tpZUFjY2VwdFBvbGljeSA9IG1fY29va2ll QWNjZXB0UG9saWN5OwogfQogCiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnNldFBlcnNpc3RlbnRD cmVkZW50aWFsU3RvcmFnZUVuYWJsZWQoYm9vbCBlbmFibGVkKQpAQCAtNzIsNCArNzMsMjMgQEAg dm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXROZXR3b3JrUHJveHlTZXR0aW5ncyhXZWJDb3JlOjpT b3VwTmV0d29ya1Byb3h5U2V0dGluZ3MKICAgICBuZXR3b3JrUHJvY2VzcygpLnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtQcm9jZXNzOjpTZXROZXR3b3JrUHJveHlTZXR0aW5ncyhtX3Nlc3Npb25JRCwg bV9uZXR3b3JrUHJveHlTZXR0aW5ncyksIDApOwogfQogCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6 OnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3RvcmFnZVBhdGgsIFNv dXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUpCit7CisgICAgaWYgKG1f Y29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRoID09IHN0b3JhZ2VQYXRoICYmIG1fY29va2llUGVy c2lzdGVudFN0b3JhZ2VUeXBlID09IHN0b3JhZ2VUeXBlKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX2Nvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCA9IHN0b3JhZ2VQYXRoOworICAgIG1fY29v a2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlID0gc3RvcmFnZVR5cGU7CisgICAgbmV0d29ya1Byb2Nl c3MoKS5jb29raWVNYW5hZ2VyKCkuc2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UobV9zZXNzaW9u SUQsIG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRoLCBtX2Nvb2tpZVBlcnNpc3RlbnRTdG9y YWdlVHlwZSk7Cit9CisKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeShXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkKK3sKKyAgICBp ZiAobV9jb29raWVBY2NlcHRQb2xpY3kgPT0gcG9saWN5KQorICAgICAgICByZXR1cm47CisKKyAg ICBtX2Nvb2tpZUFjY2VwdFBvbGljeSA9IHBvbGljeTsKKyAgICBuZXR3b3JrUHJvY2VzcygpLmNv b2tpZU1hbmFnZXIoKS5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KG1fc2Vzc2lvbklELCBwb2xp Y3ksIFtdIHsgfSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3Mvc291cC9XZWJDb29raWVNYW5hZ2VyUHJveHlTb3VwLmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5j cHAKaW5kZXggYWMwNGUzOGE1N2IyLi5kMDdiYzQxYTMyNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3Mvc291cC9XZWJDb29raWVNYW5hZ2VyUHJveHlTb3VwLmNw cApAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NQcm94eS5oIgog I2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXJNZXNzYWdlcy5oIgotI2luY2x1ZGUgIldlYlByb2Nl c3NQb29sLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC0zOCwxMSArMzcsNCBAQCB2b2lk IFdlYkNvb2tpZU1hbmFnZXJQcm94eTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklELAogICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJDb29raWVNYW5hZ2VyOjpTZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShzZXNzaW9u SUQsIHN0b3JhZ2VQYXRoLCBzdG9yYWdlVHlwZSksIDApOwogfQogCi12b2lkIFdlYkNvb2tpZU1h bmFnZXJQcm94eTo6Z2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFMOjpTZXNzaW9uSUQgc2Vz c2lvbklELCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VU eXBlJiBzdG9yYWdlVHlwZSkgY29uc3QKLXsKLSAgICBhdXRvIHBhaXIgPSBtX2Nvb2tpZVBlcnNp c3RlbnRTdG9yYWdlTWFwLmdldChzZXNzaW9uSUQpOwotICAgIHN0b3JhZ2VQYXRoID0gcGFpci5m aXJzdDsKLSAgICBzdG9yYWdlVHlwZSA9IHBhaXIuc2Vjb25kOwotfQotCi19Cit9IC8vIG5hbWVz cGFjZSBXZWJLaXQK