202222 2019-09-25 12:35:25 -0700 Don't fall back to default session if session can't be found for cookie operations 2019-09-25 12:44:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren webkit-bug-importer oldest_to_newest 1574167 0 achristensen 2019-09-25 12:35:25 -0700 Don't fall back to default session if session can't be found for cookie operations 1574168 1 379573 achristensen 2019-09-25 12:37:31 -0700 Created attachment 379573 Patch 1574169 2 379573 ggaren 2019-09-25 12:40:43 -0700 Comment on attachment 379573 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379573&action=review r=me > Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:-505 > - LOG_ERROR("Non-default storage session was requested, but there was no session for it. Please file a bug unless you just disabled private browsing, in which case it's an expected race."); Should we leave behind this LOG_ERROR? Seems like a real error. 1574170 3 achristensen 2019-09-25 12:43:19 -0700 I left it. http://trac.webkit.org/r250354 1574171 4 webkit-bug-importer 2019-09-25 12:44:18 -0700 <rdar://problem/55714819> 379573 2019-09-25 12:37:31 -0700 2019-09-25 12:40:43 -0700 Patch bug-202222-20190925123730.patch text/plain 8968 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAzNTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTI1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgZmFsbCBi YWNrIHRvIGRlZmF1bHQgc2Vzc2lvbiBpZiBzZXNzaW9uIGNhbid0IGJlIGZvdW5kIGZvciBjb29r aWUgb3BlcmF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAyMjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQXBwYXJlbnRseSwgZHVyaW5nIHRlYXJkb3duIG9mIHByaXZhdGUgYnJvd3Npbmcgc2Vz c2lvbnMsIHRoZXJlIGlzIHNvbWV0aW1lcyBhIHJhY2UgY29uZGl0aW9uIGFuZCBjb29raWVzIGZy b20gYSB0b3JuLWRvd24gc2Vzc2lvbiBhcmUgcmVxdWVzdGVkLgorICAgICAgICBJbiB0aGlzIGNh c2UsIGp1c3QgZmFpbCBsaWtlIHdlIGRvIGFsbCBvdGhlciBvcGVyYXRpb25zIGluIHRoaXMgZmls ZS4gIE90aGVyd2lzZSwgaXQncyBhIGJyZWFjaCBvZiBwcml2YWN5LgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c3RvcmFnZVNlc3Npb24pOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29va2llc0Zv ckRPTSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpz ZXRDb29raWVzRnJvbURPTSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzOjpjb29raWVzRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZSk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpnZXRSYXdDb29raWVz KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRlbGV0 ZUNvb2tpZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3MuaDoKKwogMjAxOS0wOS0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBkdXBsaWNhdGUgV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24gY29weWluZyBjb2RlCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmNwcAkocmV2aXNpb24gMjUwMzUwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5NCwx NyArNDk0LDkgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6ZGlkRgogICAg IG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpE aWRGaW5pc2hQcmVjb25uZWN0aW9uKHByZWNvbm5lY3Rpb25JZGVudGlmaWVyLCBlcnJvciksIDAp OwogfQogCi1OZXR3b3JrU3RvcmFnZVNlc3Npb24mIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpzdG9yYWdlU2Vzc2lvbigpCitOZXR3b3JrU3RvcmFnZVNlc3Npb24qIE5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpzdG9yYWdlU2Vzc2lvbigpCiB7Ci0gICAgaWYgKG1fc2Vzc2lv bklEICE9IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpIHsKLSAgICAgICAgaWYg KGF1dG8qIHN0b3JhZ2VTZXNzaW9uID0gbmV0d29ya1Byb2Nlc3MoKS5zdG9yYWdlU2Vzc2lvbiht X3Nlc3Npb25JRCkpCi0gICAgICAgICAgICByZXR1cm4gKnN0b3JhZ2VTZXNzaW9uOwotCi0gICAg ICAgIC8vIFNvbWUgcmVxdWVzdHMgd2l0aCBwcml2YXRlIGJyb3dzaW5nIG1vZGUgcmVxdWVzdGVk IG1heSBzdGlsbCBiZSBjb21pbmcgc2hvcnRseSBhZnRlciBOZXR3b3JrUHJvY2VzcyB3YXMgdG9s ZCB0byBkZXN0cm95IGl0cyBzZXNzaW9uLgotICAgICAgICAvLyBGSVhNRTogRmluZCBhIHdheSB0 byB0cmFjayBwcml2YXRlIGJyb3dzaW5nIHNlc3Npb25zIG1vcmUgcmlnb3JvdXNseS4KLSAgICAg ICAgTE9HX0VSUk9SKCJOb24tZGVmYXVsdCBzdG9yYWdlIHNlc3Npb24gd2FzIHJlcXVlc3RlZCwg YnV0IHRoZXJlIHdhcyBubyBzZXNzaW9uIGZvciBpdC4gUGxlYXNlIGZpbGUgYSBidWcgdW5sZXNz IHlvdSBqdXN0IGRpc2FibGVkIHByaXZhdGUgYnJvd3NpbmcsIGluIHdoaWNoIGNhc2UgaXQncyBh biBleHBlY3RlZCByYWNlLiIpOwotICAgIH0KLSAgICByZXR1cm4gbmV0d29ya1Byb2Nlc3MoKS5k ZWZhdWx0U3RvcmFnZVNlc3Npb24oKTsKKyAgICByZXR1cm4gbmV0d29ya1Byb2Nlc3MoKS5zdG9y YWdlU2Vzc2lvbihtX3Nlc3Npb25JRCk7CiB9CiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OnN0YXJ0RG93bmxvYWQoRG93bmxvYWRJRCBkb3dubG9hZElELCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkTmFtZSkKQEAgLTUz MywxMiArNTI1LDE0IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNvbnYK IAogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29va2llc0ZvckRPTShjb25z dCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYgc2FtZVNpdGVJbmZvLCBjb25z dCBVUkwmIHVybCwgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQ YWdlSWRlbnRpZmllcj4gcGFnZUlELCBJbmNsdWRlU2VjdXJlQ29va2llcyBpbmNsdWRlU2VjdXJl Q29va2llcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcgY29va2llU3RyaW5nLCBib29s IHNlY3VyZUNvb2tpZXNBY2Nlc3NlZCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgYXV0 byYgbmV0d29ya1N0b3JhZ2VTZXNzaW9uID0gc3RvcmFnZVNlc3Npb24oKTsKLSAgICBhdXRvIHJl c3VsdCA9IG5ldHdvcmtTdG9yYWdlU2Vzc2lvbi5jb29raWVzRm9yRE9NKGZpcnN0UGFydHksIHNh bWVTaXRlSW5mbywgdXJsLCBmcmFtZUlELCBwYWdlSUQsIGluY2x1ZGVTZWN1cmVDb29raWVzKTsK KyAgICBhdXRvKiBuZXR3b3JrU3RvcmFnZVNlc3Npb24gPSBzdG9yYWdlU2Vzc2lvbigpOworICAg IGlmICghbmV0d29ya1N0b3JhZ2VTZXNzaW9uKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhh bmRsZXIoeyB9LCBmYWxzZSk7CisgICAgYXV0byByZXN1bHQgPSBuZXR3b3JrU3RvcmFnZVNlc3Np b24tPmNvb2tpZXNGb3JET00oZmlyc3RQYXJ0eSwgc2FtZVNpdGVJbmZvLCB1cmwsIGZyYW1lSUQs IHBhZ2VJRCwgaW5jbHVkZVNlY3VyZUNvb2tpZXMpOwogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FE X1NUQVRJU1RJQ1MpICYmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIGlmIChhdXRvKiBzZXNz aW9uID0gbmV0d29ya1Nlc3Npb24oKSkgewogICAgICAgICBpZiAoc2Vzc2lvbi0+c2hvdWxkTG9n Q29va2llSW5mb3JtYXRpb24oKSkKLSAgICAgICAgICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6 bG9nQ29va2llSW5mb3JtYXRpb24oKnRoaXMsICJOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vz czo6Y29va2llc0ZvckRPTSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCo+KHRoaXMpLCBu ZXR3b3JrU3RvcmFnZVNlc3Npb24sIGZpcnN0UGFydHksIHNhbWVTaXRlSW5mbywgdXJsLCBlbXB0 eVN0cmluZygpLCBmcmFtZUlELCBwYWdlSUQsIFdURjo6bnVsbG9wdCk7CisgICAgICAgICAgICBO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZm9ybWF0aW9uKCp0aGlzLCAiTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNvb2tpZXNGb3JET00iLCByZWludGVycHJldF9jYXN0 PGNvbnN0IHZvaWQqPih0aGlzKSwgKm5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgZmlyc3RQYXJ0eSwg c2FtZVNpdGVJbmZvLCB1cmwsIGVtcHR5U3RyaW5nKCksIGZyYW1lSUQsIHBhZ2VJRCwgV1RGOjpu dWxsb3B0KTsKICAgICB9CiAjZW5kaWYKICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHJl c3VsdC5maXJzdCksIHJlc3VsdC5zZWNvbmQpOwpAQCAtNTQ2LDM3ICs1NDAsNTEgQEAgdm9pZCBO ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29vawogCiB2b2lkIE5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzOjpzZXRDb29raWVzRnJvbURPTShjb25zdCBVUkwmIGZpcnN0UGFydHks IGNvbnN0IFNhbWVTaXRlSW5mbyYgc2FtZVNpdGVJbmZvLCBjb25zdCBVUkwmIHVybCwgT3B0aW9u YWw8V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRp Zmllcj4gcGFnZUlELCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cmluZykKIHsKLSAgICBhdXRvJiBu ZXR3b3JrU3RvcmFnZVNlc3Npb24gPSBzdG9yYWdlU2Vzc2lvbigpOwotICAgIG5ldHdvcmtTdG9y YWdlU2Vzc2lvbi5zZXRDb29raWVzRnJvbURPTShmaXJzdFBhcnR5LCBzYW1lU2l0ZUluZm8sIHVy bCwgZnJhbWVJRCwgcGFnZUlELCBjb29raWVTdHJpbmcpOworICAgIGF1dG8qIG5ldHdvcmtTdG9y YWdlU2Vzc2lvbiA9IHN0b3JhZ2VTZXNzaW9uKCk7CisgICAgaWYgKCFuZXR3b3JrU3RvcmFnZVNl c3Npb24pCisgICAgICAgIHJldHVybjsKKyAgICBuZXR3b3JrU3RvcmFnZVNlc3Npb24tPnNldENv b2tpZXNGcm9tRE9NKGZpcnN0UGFydHksIHNhbWVTaXRlSW5mbywgdXJsLCBmcmFtZUlELCBwYWdl SUQsIGNvb2tpZVN0cmluZyk7CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykg JiYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgaWYgKGF1dG8qIHNlc3Npb24gPSBuZXR3b3Jr U2Vzc2lvbigpKSB7CiAgICAgICAgIGlmIChzZXNzaW9uLT5zaG91bGRMb2dDb29raWVJbmZvcm1h dGlvbigpKQotICAgICAgICAgICAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZv cm1hdGlvbigqdGhpcywgIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXRDb29raWVz RnJvbURPTSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCo+KHRoaXMpLCBuZXR3b3JrU3Rv cmFnZVNlc3Npb24sIGZpcnN0UGFydHksIHNhbWVTaXRlSW5mbywgdXJsLCBlbXB0eVN0cmluZygp LCBmcmFtZUlELCBwYWdlSUQsIFdURjo6bnVsbG9wdCk7CisgICAgICAgICAgICBOZXR3b3JrUmVz b3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZm9ybWF0aW9uKCp0aGlzLCAiTmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3M6OnNldENvb2tpZXNGcm9tRE9NIiwgcmVpbnRlcnByZXRfY2FzdDxjb25z dCB2b2lkKj4odGhpcyksICpuZXR3b3JrU3RvcmFnZVNlc3Npb24sIGZpcnN0UGFydHksIHNhbWVT aXRlSW5mbywgdXJsLCBlbXB0eVN0cmluZygpLCBmcmFtZUlELCBwYWdlSUQsIFdURjo6bnVsbG9w dCk7CiAgICAgfQogI2VuZGlmCiB9CiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OmNvb2tpZXNFbmFibGVkKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7Ci0gICAgY29tcGxldGlvbkhhbmRsZXIoc3RvcmFnZVNlc3Npb24oKS5j b29raWVzRW5hYmxlZCgpKTsKKyAgICBhdXRvKiBuZXR3b3JrU3RvcmFnZVNlc3Npb24gPSBzdG9y YWdlU2Vzc2lvbigpOworICAgIGlmICghbmV0d29ya1N0b3JhZ2VTZXNzaW9uKQorICAgICAgICBy ZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoZmFsc2UpOworICAgIGNvbXBsZXRpb25IYW5kbGVyKG5l dHdvcmtTdG9yYWdlU2Vzc2lvbi0+Y29va2llc0VuYWJsZWQoKSk7CiB9CiAKIHZvaWQgTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKGNv bnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiBzYW1lU2l0ZUluZm8sIGNv bnN0IFVSTCYgdXJsLCBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFs PFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQsIEluY2x1ZGVTZWN1cmVDb29raWVzIGluY2x1ZGVTZWN1 cmVDb29raWVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZywgYm9vbCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBzdG9yYWdlU2Vzc2lvbigpLmNvb2tp ZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKGZpcnN0UGFydHksIHNhbWVTaXRlSW5mbywgdXJsLCBm cmFtZUlELCBwYWdlSUQsIGluY2x1ZGVTZWN1cmVDb29raWVzKTsKKyAgICBhdXRvKiBuZXR3b3Jr U3RvcmFnZVNlc3Npb24gPSBzdG9yYWdlU2Vzc2lvbigpOworICAgIGlmICghbmV0d29ya1N0b3Jh Z2VTZXNzaW9uKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoeyB9LCBmYWxzZSk7 CisgICAgYXV0byByZXN1bHQgPSBuZXR3b3JrU3RvcmFnZVNlc3Npb24tPmNvb2tpZVJlcXVlc3RI ZWFkZXJGaWVsZFZhbHVlKGZpcnN0UGFydHksIHNhbWVTaXRlSW5mbywgdXJsLCBmcmFtZUlELCBw YWdlSUQsIGluY2x1ZGVTZWN1cmVDb29raWVzKTsKICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZN b3ZlKHJlc3VsdC5maXJzdCksIHJlc3VsdC5zZWNvbmQpOwogfQogCiB2b2lkIE5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpnZXRSYXdDb29raWVzKGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwg Y29uc3QgU2FtZVNpdGVJbmZvJiBzYW1lU2l0ZUluZm8sIGNvbnN0IFVSTCYgdXJsLCBPcHRpb25h bDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiBwYWdl SUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFdlYkNvcmU6OkNvb2tpZT4mJik+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgYXV0byogbmV0d29ya1N0b3JhZ2VTZXNzaW9uID0g c3RvcmFnZVNlc3Npb24oKTsKKyAgICBpZiAoIW5ldHdvcmtTdG9yYWdlU2Vzc2lvbikKKyAgICAg ICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CiAgICAgVmVjdG9yPFdlYkNvcmU6OkNv b2tpZT4gcmVzdWx0OwotICAgIHN0b3JhZ2VTZXNzaW9uKCkuZ2V0UmF3Q29va2llcyhmaXJzdFBh cnR5LCBzYW1lU2l0ZUluZm8sIHVybCwgZnJhbWVJRCwgcGFnZUlELCByZXN1bHQpOworICAgIG5l dHdvcmtTdG9yYWdlU2Vzc2lvbi0+Z2V0UmF3Q29va2llcyhmaXJzdFBhcnR5LCBzYW1lU2l0ZUlu Zm8sIHVybCwgZnJhbWVJRCwgcGFnZUlELCByZXN1bHQpOwogICAgIGNvbXBsZXRpb25IYW5kbGVy KFdURk1vdmUocmVzdWx0KSk7CiB9CiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OmRlbGV0ZUNvb2tpZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjb29raWVOYW1l KQogewotICAgIHN0b3JhZ2VTZXNzaW9uKCkuZGVsZXRlQ29va2llKHVybCwgY29va2llTmFtZSk7 CisgICAgYXV0byogbmV0d29ya1N0b3JhZ2VTZXNzaW9uID0gc3RvcmFnZVNlc3Npb24oKTsKKyAg ICBpZiAoIW5ldHdvcmtTdG9yYWdlU2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOworICAgIG5ldHdv cmtTdG9yYWdlU2Vzc2lvbi0+ZGVsZXRlQ29va2llKHVybCwgY29va2llTmFtZSk7CiB9CiAKIHZv aWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlZ2lzdGVyRmlsZUJsb2JVUkwoY29u c3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcGF0aCwgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl JiYgZXh0ZW5zaW9uSGFuZGxlLCBjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlKQpJbmRleDogU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjUwMzUwKQorKysgU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNTksNyArMTU5LDcgQEAgcHJpdmF0ZToKICAgICBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2VzcyhOZXR3b3JrUHJvY2VzcyYsIFdlYkNvcmU6OlByb2Nlc3NJZGVudGlmaWVyLCBQ QUw6OlNlc3Npb25JRCwgSVBDOjpDb25uZWN0aW9uOjpJZGVudGlmaWVyKTsKIAogICAgIHZvaWQg ZGlkRmluaXNoUHJlY29ubmVjdGlvbih1aW50NjRfdCBwcmVjb25uZWN0aW9uSWRlbnRpZmllciwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwotICAgIFdlYkNvcmU6Ok5ldHdvcmtTdG9y YWdlU2Vzc2lvbiYgc3RvcmFnZVNlc3Npb24oKTsKKyAgICBXZWJDb3JlOjpOZXR3b3JrU3RvcmFn ZVNlc3Npb24qIHN0b3JhZ2VTZXNzaW9uKCk7CiAKICAgICAvLyBJUEM6OkNvbm5lY3Rpb246OkNs aWVudAogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpE ZWNvZGVyJikgb3ZlcnJpZGU7Cg==