194092 2019-01-31 08:52:12 -0800 [SOUP] Improve use of PAL::SessionID in WebKitCookieManager 2019-02-05 08:03:15 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro berto bugs-noreply cgarcia commit-queue ews-watchlist gustavo mcatanzaro webkit-bug-importer oldest_to_newest 1500592 0 mcatanzaro 2019-01-31 08:52:12 -0800 Improve use of PAL::SessionID in WebKitCookieManager. Always get it from the data store instead of assuming the default session ID, and add a helper function for this. We could cache it there too, just not sure it's worth it. 1500597 1 360731 mcatanzaro 2019-01-31 08:54:19 -0800 Created attachment 360731 Patch 1500600 2 ews-watchlist 2019-01-31 08:57:13 -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 1501119 3 360731 commit-queue 2019-02-01 08:51:19 -0800 Comment on attachment 360731 Patch Clearing flags on attachment: 360731 Committed r240850: <https://trac.webkit.org/changeset/240850> 1501120 4 commit-queue 2019-02-01 08:51:21 -0800 All reviewed patches have been landed. Closing bug. 360731 2019-01-31 08:54:19 -0800 2019-02-01 08:51:19 -0800 Patch bug-194092-20190131105418.patch text/plain 8696 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkMDllMWJjZDc3YzEzOTA0 ZjBlZGVmNjUyNTNmMTE5Mzk1ZTBhMDUuLjdhMzJmNmFhNDViZWZkZGQ4MTI4NDJmZTFhOTYyYTll NzA5YzA2OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDEtMzEgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtTT1VQXSBJbXBy b3ZlIHVzZSBvZiBQQUw6OlNlc3Npb25JRCBpbiBXZWJLaXRDb29raWVNYW5hZ2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQwOTIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHdheXMgZ2V0IGl0IGZy b20gdGhlIGRhdGEgc3RvcmUgaW5zdGVhZCBvZiBhc3N1bWluZyB0aGUgZGVmYXVsdCBzZXNzaW9u IElELCBhbmQgYWRkIGEKKyAgICAgICAgaGVscGVyIGZ1bmN0aW9uIGZvciB0aGlzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvb2tpZU1hbmFnZXIuY3BwOgorICAgICAg ICAoX1dlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlOjpzZXNzaW9uSUQgY29uc3QpOgorICAgICAg ICAoX1dlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlOjp+X1dlYktpdENvb2tpZU1hbmFnZXJQcml2 YXRlKToKKyAgICAgICAgKHdlYmtpdENvb2tpZU1hbmFnZXJDcmVhdGUpOgorICAgICAgICAod2Vi a2l0X2Nvb2tpZV9tYW5hZ2VyX3NldF9wZXJzaXN0ZW50X3N0b3JhZ2UpOgorICAgICAgICAod2Vi a2l0X2Nvb2tpZV9tYW5hZ2VyX3NldF9hY2NlcHRfcG9saWN5KToKKyAgICAgICAgKHdlYmtpdF9j b29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeSk6CisgICAgICAgICh3ZWJraXRfY29va2ll X21hbmFnZXJfYWRkX2Nvb2tpZSk6CisgICAgICAgICh3ZWJraXRfY29va2llX21hbmFnZXJfZ2V0 X2Nvb2tpZXMpOgorICAgICAgICAod2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2RlbGV0ZV9jb29raWUp OgorCiAyMDE5LTAxLTMwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFtNYWNdIEltcGxlbWVudCBiYXNpYyBoaXQgdGVzdGluZyBpbiB0aGUgc2Nyb2xs aW5nIHRyZWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dl YktpdENvb2tpZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIv V2ViS2l0Q29va2llTWFuYWdlci5jcHAKaW5kZXggMDFlMWEzZWRhODNkZjBiZDhiYmRiZGY3ZjZh NjRlMDI2NjMyOWNkNy4uZjUwZmVlYTllNTZhZjJhNmMxMTY0ZGZkNGU3OThlOTcxNDVhNjdmMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2ll TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0 Q29va2llTWFuYWdlci5jcHAKQEAgLTU1LDExICs1NSwxNiBAQCBlbnVtIHsKIH07CiAKIHN0cnVj dCBfV2ViS2l0Q29va2llTWFuYWdlclByaXZhdGUgeworICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Np b25JRCgpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQoZGF0YU1hbmFnZXIpOworICAgICAg ICByZXR1cm4gd2Via2l0V2Vic2l0ZURhdGFNYW5hZ2VyR2V0RGF0YVN0b3JlKGRhdGFNYW5hZ2Vy KS53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklEKCk7CisgICAgfQorCiAgICAgfl9XZWJLaXRD b29raWVNYW5hZ2VyUHJpdmF0ZSgpCiAgICAgewotICAgICAgICBhdXRvIHNlc3Npb25JRCA9IHdl YmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShkYXRhTWFuYWdlcikud2Vic2l0ZURh dGFTdG9yZSgpLnNlc3Npb25JRCgpOwogICAgICAgICBmb3IgKGF1dG8qIHByb2Nlc3NQb29sIDog d2Via2l0V2Vic2l0ZURhdGFNYW5hZ2VyR2V0UHJvY2Vzc1Bvb2xzKGRhdGFNYW5hZ2VyKSkKLSAg ICAgICAgICAgIHByb2Nlc3NQb29sLT5zdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4o KS0+c2V0Q29va2llT2JzZXJ2ZXJDYWxsYmFjayhzZXNzaW9uSUQsIG51bGxwdHIpOworICAgICAg ICAgICAgcHJvY2Vzc1Bvb2wtPnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlclByb3h5PigpLT5z ZXRDb29raWVPYnNlcnZlckNhbGxiYWNrKHNlc3Npb25JRCgpLCBudWxscHRyKTsKICAgICB9CiAK ICAgICBXZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIqIGRhdGFNYW5hZ2VyOwpAQCAtMTM1LDkgKzE0 MCw4IEBAIFdlYktpdENvb2tpZU1hbmFnZXIqIHdlYmtpdENvb2tpZU1hbmFnZXJDcmVhdGUoV2Vi S2l0V2Vic2l0ZURhdGFNYW5hZ2VyKiBkYXRhTWFuCiB7CiAgICAgV2ViS2l0Q29va2llTWFuYWdl ciogbWFuYWdlciA9IFdFQktJVF9DT09LSUVfTUFOQUdFUihnX29iamVjdF9uZXcoV0VCS0lUX1RZ UEVfQ09PS0lFX01BTkFHRVIsIG51bGxwdHIpKTsKICAgICBtYW5hZ2VyLT5wcml2LT5kYXRhTWFu YWdlciA9IGRhdGFNYW5hZ2VyOwotICAgIGF1dG8gc2Vzc2lvbklEID0gd2Via2l0V2Vic2l0ZURh dGFNYW5hZ2VyR2V0RGF0YVN0b3JlKG1hbmFnZXItPnByaXYtPmRhdGFNYW5hZ2VyKS53ZWJzaXRl RGF0YVN0b3JlKCkuc2Vzc2lvbklEKCk7CiAgICAgZm9yIChhdXRvKiBwcm9jZXNzUG9vbCA6IHdl YmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldFByb2Nlc3NQb29scyhtYW5hZ2VyLT5wcml2LT5kYXRh TWFuYWdlcikpIHsKLSAgICAgICAgcHJvY2Vzc1Bvb2wtPnN1cHBsZW1lbnQ8V2ViQ29va2llTWFu YWdlclByb3h5PigpLT5zZXRDb29raWVPYnNlcnZlckNhbGxiYWNrKHNlc3Npb25JRCwgW21hbmFn ZXJdIHsKKyAgICAgICAgcHJvY2Vzc1Bvb2wtPnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlclBy b3h5PigpLT5zZXRDb29raWVPYnNlcnZlckNhbGxiYWNrKG1hbmFnZXItPnByaXYtPnNlc3Npb25J RCgpLCBbbWFuYWdlcl0gewogICAgICAgICAgICAgZ19zaWduYWxfZW1pdChtYW5hZ2VyLCBzaWdu YWxzW0NIQU5HRURdLCAwKTsKICAgICAgICAgfSk7CiAgICAgfQpAQCAtMTY2LDcgKzE3MCw3IEBA IHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX3NldF9wZXJzaXN0ZW50X3N0b3JhZ2UoV2ViS2l0 Q29va2llTWFuYWdlciogbWFuYWdlciwKICAgICBnX3JldHVybl9pZl9mYWlsKGZpbGVuYW1lKTsK ICAgICBnX3JldHVybl9pZl9mYWlsKCF3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfaXNfZXBo ZW1lcmFsKG1hbmFnZXItPnByaXYtPmRhdGFNYW5hZ2VyKSk7CiAKLSAgICBhdXRvIHNlc3Npb25J RCA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShtYW5hZ2VyLT5wcml2LT5k YXRhTWFuYWdlcikud2Vic2l0ZURhdGFTdG9yZSgpLnNlc3Npb25JRCgpOworICAgIGF1dG8gc2Vz c2lvbklEID0gbWFuYWdlci0+cHJpdi0+c2Vzc2lvbklEKCk7CiAgICAgaWYgKHNlc3Npb25JRC5p c0VwaGVtZXJhbCgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE4Niw3ICsxOTAsNyBAQCB2b2lk IHdlYmtpdF9jb29raWVfbWFuYWdlcl9zZXRfYWNjZXB0X3BvbGljeShXZWJLaXRDb29raWVNYW5h Z2VyKiBtYW5hZ2VyLCBXZWJLaQogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX0NPT0tJ RV9NQU5BR0VSKG1hbmFnZXIpKTsKIAogICAgIGZvciAoYXV0byogcHJvY2Vzc1Bvb2wgOiB3ZWJr aXRXZWJzaXRlRGF0YU1hbmFnZXJHZXRQcm9jZXNzUG9vbHMobWFuYWdlci0+cHJpdi0+ZGF0YU1h bmFnZXIpKQotICAgICAgICBwcm9jZXNzUG9vbC0+c3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2Vy UHJveHk+KCktPnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koUEFMOjpTZXNzaW9uSUQ6OmRlZmF1 bHRTZXNzaW9uSUQoKSwgdG9IVFRQQ29va2llQWNjZXB0UG9saWN5KHBvbGljeSksIFtdKENhbGxi YWNrQmFzZTo6RXJyb3Ipe30pOworICAgICAgICBwcm9jZXNzUG9vbC0+c3VwcGxlbWVudDxXZWJD b29raWVNYW5hZ2VyUHJveHk+KCktPnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kobWFuYWdlci0+ cHJpdi0+c2Vzc2lvbklEKCksIHRvSFRUUENvb2tpZUFjY2VwdFBvbGljeShwb2xpY3kpLCBbXShD YWxsYmFja0Jhc2U6OkVycm9yKSB7IH0pOwogfQogCiAvKioKQEAgLTIxNCw3ICsyMTgsNyBAQCB2 b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeShXZWJLaXRDb29raWVN YW5hZ2VyKiBtYW5hZ2VyLCBHQ2FuYwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcHJv Y2Vzc1Bvb2xzWzBdLT5zdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKS0+Z2V0SFRU UENvb2tpZUFjY2VwdFBvbGljeShQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLCBb dGFzayA9IFdURk1vdmUodGFzayldKEhUVFBDb29raWVBY2NlcHRQb2xpY3kgcG9saWN5LCBDYWxs YmFja0Jhc2U6OkVycm9yKSB7CisgICAgcHJvY2Vzc1Bvb2xzWzBdLT5zdXBwbGVtZW50PFdlYkNv b2tpZU1hbmFnZXJQcm94eT4oKS0+Z2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShtYW5hZ2VyLT5w cml2LT5zZXNzaW9uSUQoKSwgW3Rhc2sgPSBXVEZNb3ZlKHRhc2spXShIVFRQQ29va2llQWNjZXB0 UG9saWN5IHBvbGljeSwgQ2FsbGJhY2tCYXNlOjpFcnJvcikgewogICAgICAgICBnX3Rhc2tfcmV0 dXJuX2ludCh0YXNrLmdldCgpLCB0b1dlYktpdENvb2tpZUFjY2VwdFBvbGljeShwb2xpY3kpKTsK ICAgICB9KTsKIH0KQEAgLTI2MCwxMiArMjY0LDEwIEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5h Z2VyX2FkZF9jb29raWUoV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlciwgU291cENvb2tpZSoK IAogICAgIEdSZWZQdHI8R1Rhc2s+IHRhc2sgPSBhZG9wdEdSZWYoZ190YXNrX25ldyhtYW5hZ2Vy LCBjYW5jZWxsYWJsZSwgY2FsbGJhY2ssIHVzZXJEYXRhKSk7CiAKLSAgICBhdXRvIHNlc3Npb25J RCA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShtYW5hZ2VyLT5wcml2LT5k YXRhTWFuYWdlcikud2Vic2l0ZURhdGFTdG9yZSgpLnNlc3Npb25JRCgpOwotICAgIGNvbnN0IGF1 dG8mIHByb2Nlc3NQb29scyA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldFByb2Nlc3NQb29s cyhtYW5hZ2VyLT5wcml2LT5kYXRhTWFuYWdlcik7Ci0KICAgICAvLyBDb29raWVzIGFyZSByZWFk L3dyaXR0ZW4gZnJvbS90byB0aGUgc2FtZSBTUUxpdGUgZGF0YWJhc2Ugb24gZGlzayByZWdhcmRs ZXNzCiAgICAgLy8gb2YgdGhlIHByb2Nlc3Mgd2UgYWNjZXNzIHRoZW0gZnJvbSwgc28ganVzdCB1 c2UgdGhlIGZpcnN0IHByb2Nlc3MgcG9vbC4KLSAgICBwcm9jZXNzUG9vbHNbMF0tPnN1cHBsZW1l bnQ8V2ViQ29va2llTWFuYWdlclByb3h5PigpLT5zZXRDb29raWUoc2Vzc2lvbklELCBXZWJDb3Jl OjpDb29raWUoY29va2llKSwgW3Rhc2sgPSBXVEZNb3ZlKHRhc2spXShDYWxsYmFja0Jhc2U6OkVy cm9yIGVycm9yKSB7CisgICAgY29uc3QgYXV0byYgcHJvY2Vzc1Bvb2xzID0gd2Via2l0V2Vic2l0 ZURhdGFNYW5hZ2VyR2V0UHJvY2Vzc1Bvb2xzKG1hbmFnZXItPnByaXYtPmRhdGFNYW5hZ2VyKTsK KyAgICBwcm9jZXNzUG9vbHNbMF0tPnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlclByb3h5Pigp LT5zZXRDb29raWUobWFuYWdlci0+cHJpdi0+c2Vzc2lvbklEKCksIFdlYkNvcmU6OkNvb2tpZShj b29raWUpLCBbdGFzayA9IFdURk1vdmUodGFzayldKENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3Ip IHsKICAgICAgICAgaWYgKGVycm9yICE9IENhbGxiYWNrQmFzZTo6RXJyb3I6Ok5vbmUpIHsKICAg ICAgICAgICAgIC8vIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGluIGNhc2VzIHdoZXJlIHRoZSB3ZWIg cHJvY2VzcyBpcyBub3QgYXZhaWxhYmxlLAogICAgICAgICAgICAgLy8gY29uc2lkZXIgdGhlIG9w ZXJhdGlvbiAiY2FuY2VsbGVkIiBmcm9tIHRoZSBwb2ludCBvZiB2aWV3IG9mIHRoZSBjbGllbnQu CkBAIC0zMjAsMTIgKzMyMiwxMCBAQCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfY29v a2llcyhXZWJLaXRDb29raWVNYW5hZ2VyKiBtYW5hZ2VyLCBjb25zdCBnY2hhcgogCiAgICAgR1Jl ZlB0cjxHVGFzaz4gdGFzayA9IGFkb3B0R1JlZihnX3Rhc2tfbmV3KG1hbmFnZXIsIGNhbmNlbGxh YmxlLCBjYWxsYmFjaywgdXNlckRhdGEpKTsKIAotICAgIGF1dG8gc2Vzc2lvbklEID0gd2Via2l0 V2Vic2l0ZURhdGFNYW5hZ2VyR2V0RGF0YVN0b3JlKG1hbmFnZXItPnByaXYtPmRhdGFNYW5hZ2Vy KS53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklEKCk7Ci0gICAgY29uc3QgYXV0byYgcHJvY2Vz c1Bvb2xzID0gd2Via2l0V2Vic2l0ZURhdGFNYW5hZ2VyR2V0UHJvY2Vzc1Bvb2xzKG1hbmFnZXIt PnByaXYtPmRhdGFNYW5hZ2VyKTsKLQogICAgIC8vIENvb2tpZXMgYXJlIHJlYWQvd3JpdHRlbiBm cm9tL3RvIHRoZSBzYW1lIFNRTGl0ZSBkYXRhYmFzZSBvbiBkaXNrIHJlZ2FyZGxlc3MKICAgICAv LyBvZiB0aGUgcHJvY2VzcyB3ZSBhY2Nlc3MgdGhlbSBmcm9tLCBzbyBqdXN0IHVzZSB0aGUgZmly c3QgcHJvY2VzcyBwb29sLgotICAgIHByb2Nlc3NQb29sc1swXS0+c3VwcGxlbWVudDxXZWJDb29r aWVNYW5hZ2VyUHJveHk+KCktPmdldENvb2tpZXMoc2Vzc2lvbklELCBVUkwoVVJMKCksIFN0cmlu Zzo6ZnJvbVVURjgodXJpKSksIFt0YXNrID0gV1RGTW92ZSh0YXNrKV0oY29uc3QgVmVjdG9yPFdl YkNvcmU6OkNvb2tpZT4mIGNvb2tpZXMsIENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKKyAg ICBjb25zdCBhdXRvJiBwcm9jZXNzUG9vbHMgPSB3ZWJraXRXZWJzaXRlRGF0YU1hbmFnZXJHZXRQ cm9jZXNzUG9vbHMobWFuYWdlci0+cHJpdi0+ZGF0YU1hbmFnZXIpOworICAgIHByb2Nlc3NQb29s c1swXS0+c3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyUHJveHk+KCktPmdldENvb2tpZXMobWFu YWdlci0+cHJpdi0+c2Vzc2lvbklEKCksIFVSTChVUkwoKSwgU3RyaW5nOjpmcm9tVVRGOCh1cmkp KSwgW3Rhc2sgPSBXVEZNb3ZlKHRhc2spXShjb25zdCBWZWN0b3I8V2ViQ29yZTo6Q29va2llPiYg Y29va2llcywgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgewogICAgICAgICBpZiAoZXJyb3Ig IT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgewogICAgICAgICAgICAgLy8gVGhpcyBjYW4g b25seSBoYXBwZW4gaW4gY2FzZXMgd2hlcmUgdGhlIHdlYiBwcm9jZXNzIGlzIG5vdCBhdmFpbGFi bGUsCiAgICAgICAgICAgICAvLyBjb25zaWRlciB0aGUgb3BlcmF0aW9uICJjYW5jZWxsZWQiIGZy b20gdGhlIHBvaW50IG9mIHZpZXcgb2YgdGhlIGNsaWVudC4KQEAgLTM4NywxMiArMzg3LDEwIEBA IHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2RlbGV0ZV9jb29raWUoV2ViS2l0Q29va2llTWFu YWdlciogbWFuYWdlciwgU291cENvb2tpCiAKICAgICBHUmVmUHRyPEdUYXNrPiB0YXNrID0gYWRv cHRHUmVmKGdfdGFza19uZXcobWFuYWdlciwgY2FuY2VsbGFibGUsIGNhbGxiYWNrLCB1c2VyRGF0 YSkpOwogCi0gICAgYXV0byBzZXNzaW9uSUQgPSB3ZWJraXRXZWJzaXRlRGF0YU1hbmFnZXJHZXRE YXRhU3RvcmUobWFuYWdlci0+cHJpdi0+ZGF0YU1hbmFnZXIpLndlYnNpdGVEYXRhU3RvcmUoKS5z ZXNzaW9uSUQoKTsKLSAgICBjb25zdCBhdXRvJiBwcm9jZXNzUG9vbHMgPSB3ZWJraXRXZWJzaXRl RGF0YU1hbmFnZXJHZXRQcm9jZXNzUG9vbHMobWFuYWdlci0+cHJpdi0+ZGF0YU1hbmFnZXIpOwot CiAgICAgLy8gQ29va2llcyBhcmUgcmVhZC93cml0dGVuIGZyb20vdG8gdGhlIHNhbWUgU1FMaXRl IGRhdGFiYXNlIG9uIGRpc2sgcmVnYXJkbGVzcwogICAgIC8vIG9mIHRoZSBwcm9jZXNzIHdlIGFj Y2VzcyB0aGVtIGZyb20sIHNvIGp1c3QgdXNlIHRoZSBmaXJzdCBwcm9jZXNzIHBvb2wuCi0gICAg cHJvY2Vzc1Bvb2xzWzBdLT5zdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKS0+ZGVs ZXRlQ29va2llKHNlc3Npb25JRCwgV2ViQ29yZTo6Q29va2llKGNvb2tpZSksIFt0YXNrID0gV1RG TW92ZSh0YXNrKV0oQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgeworICAgIGNvbnN0IGF1dG8m IHByb2Nlc3NQb29scyA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldFByb2Nlc3NQb29scyht YW5hZ2VyLT5wcml2LT5kYXRhTWFuYWdlcik7CisgICAgcHJvY2Vzc1Bvb2xzWzBdLT5zdXBwbGVt ZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKS0+ZGVsZXRlQ29va2llKG1hbmFnZXItPnByaXYt PnNlc3Npb25JRCgpLCBXZWJDb3JlOjpDb29raWUoY29va2llKSwgW3Rhc2sgPSBXVEZNb3ZlKHRh c2spXShDYWxsYmFja0Jhc2U6OkVycm9yIGVycm9yKSB7CiAgICAgICAgIGlmIChlcnJvciAhPSBD YWxsYmFja0Jhc2U6OkVycm9yOjpOb25lKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGNhbiBvbmx5 IGhhcHBlbiBpbiBjYXNlcyB3aGVyZSB0aGUgd2ViIHByb2Nlc3MgaXMgbm90IGF2YWlsYWJsZSwK ICAgICAgICAgICAgIC8vIGNvbnNpZGVyIHRoZSBvcGVyYXRpb24gImNhbmNlbGxlZCIgZnJvbSB0 aGUgcG9pbnQgb2YgdmlldyBvZiB0aGUgY2xpZW50Lgo=