180897 2017-12-15 17:52:19 -0800 Use new WebsiteDataStore passed in through decidePolicyForNavigation SPI 2018-02-02 11:32:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=182443 InRadar P2 Normal --- 1 achristensen achristensen bfulgham webkit-bug-importer youennf oldest_to_newest 1382403 0 achristensen 2017-12-15 17:52:19 -0800 Use new WebsiteDataStore passed in through decidePolicyForNavigation SPI 1382406 1 329549 achristensen 2017-12-15 17:54:35 -0800 Created attachment 329549 Patch 1384308 2 330077 achristensen 2017-12-21 16:35:18 -0800 Created attachment 330077 Patch 1384890 3 330077 bfulgham 2017-12-28 13:54:26 -0800 Comment on attachment 330077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=330077&action=review r=me > Source/WebKit/ChangeLog:20 > + (WebKit::WebProcessPool::pageRemovedFromProcess): Deleted. These were just renamed to match their purpose, right? > Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm:885 > + */ Did you mean to leave this commented-out code? 1385149 4 achristensen 2018-01-02 09:22:04 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 330077 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=330077&action=review > > r=me > > > Source/WebKit/ChangeLog:20 > > + (WebKit::WebProcessPool::pageRemovedFromProcess): Deleted. > > These were just renamed to match their purpose, right? Right. > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm:885 > > + */ > > Did you mean to leave this commented-out code? I removed it for now. http://trac.webkit.org/r226325 1385205 5 webkit-bug-importer 2018-01-02 12:56:53 -0800 <rdar://problem/36260832> 1395922 6 youennf 2018-02-02 11:31:47 -0800 When changing the website data store, there is the possibility that a page will now need to check service worker registration while it was not needed previously. We should add some logic to fix that. 1395924 7 youennf 2018-02-02 11:32:44 -0800 Filed bug 182443 to follow on service worker aspects 329549 2017-12-15 17:54:35 -0800 2017-12-21 16:35:17 -0800 Patch bug-180897-20171215175434.patch text/plain 6219 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNTk5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTEyLTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgVXNlIG5ldyBXZWJzaXRlRGF0YVN0b3JlIHBhc3NlZCBpbiB0 aHJvdWdoIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb24gU1BJCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA4OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM1NTM1MzI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3QgdHdvIGZvcm1zIG9mIHN0b3JhZ2UgdG8gYmUgc3VyZSB3ZSBhcmUgdXNpbmcg YSBkaWZmZXJlbnQgV2Vic2l0ZURhdGFTdG9yZTogY29va2llcyBhbmQgc2Vzc2lvblN0b3JhZ2Uu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xp Y2llcy5tbToKKyAgICAgICAgKC1bV2Vic2l0ZVBvbGljaWVzV2Vic2l0ZURhdGFTdG9yZURlbGVn YXRlIF93ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtXZWJzaXRlUG9saWNpZXNXZWJzaXRlRGF0YVN0b3JlRGVsZWdh dGUgd2ViVmlldzpzdGFydFVSTFNjaGVtZVRhc2s6XSk6CisgICAgICAgICgtW1dlYnNpdGVQb2xp Y2llc1dlYnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZSB3ZWJWaWV3OnJ1bkphdmFTY3JpcHRBbGVydFBh bmVsV2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAg ICAgICAgKHdlYnNpdGVEYXRhU3RvcmVUZXN0V2ViVmlldyk6CisgICAgICAgIChURVNUKToKKwog MjAxNy0xMi0xNSAgRGF2aWQgUXVlc2FkYSAgPGRhdmlkX3F1ZXNhZGFAYXBwbGUuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIGFkZGluZyBteXNlbGYgdG8gY29udHJpYnV0b3JzLmpzb24KSW5k ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVz Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZVBvbGljaWVzLm1tCShyZXZpc2lvbiAyMjU5ODkpCisrKyBUb29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2llcy5tbQkod29ya2luZyBjb3B5KQpA QCAtNzg5LDE0ICs3ODksMTUgQEAgVEVTVChXZWJLaXQsIEN1c3RvbUhlYWRlckZpZWxkcykKIAog c3RhdGljIGJvb2wgZG9uZTsKIAotQGludGVyZmFjZSBXZWJzaXRlUG9saWNpZXNXZWJzaXRlRGF0 YVN0b3JlRGVsZWdhdGUgOiBOU09iamVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLCBX S1VSTFNjaGVtZUhhbmRsZXI+CitAaW50ZXJmYWNlIFdlYnNpdGVQb2xpY2llc1dlYnNpdGVEYXRh U3RvcmVEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUsIFdL VVJMU2NoZW1lSGFuZGxlciwgV0tVSURlbGVnYXRlPgogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g V2Vic2l0ZVBvbGljaWVzV2Vic2l0ZURhdGFTdG9yZURlbGVnYXRlCiAKIC0gKHZvaWQpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjoo V0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiBkZWNpc2lvbkhhbmRsZXI6KHZv aWQgKF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopKWRl Y2lzaW9uSGFuZGxlcgogewotICAgIGlmIChbbmF2aWdhdGlvbkFjdGlvbi5yZXF1ZXN0LlVSTC5w YXRoIGlzRXF1YWxUb1N0cmluZzpAIi9pbnZhbGlkIl0pIHsKKyAgICBOU1VSTCAqdXJsID0gbmF2 aWdhdGlvbkFjdGlvbi5yZXF1ZXN0LlVSTDsKKyAgICBpZiAoW3VybC5wYXRoIGlzRXF1YWxUb1N0 cmluZzpAIi9pbnZhbGlkIl0pIHsKICAgICAgICAgX1dLV2Vic2l0ZVBvbGljaWVzICp3ZWJzaXRl UG9saWNpZXMgPSBbW1tfV0tXZWJzaXRlUG9saWNpZXMgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNl XTsKICAgICAgICAgd2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmUgPSBbW1tXS1dlYnNp dGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246W1tbX1dLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXV0gYXV0b3JlbGVh c2VdOwogCkBAIC04MTAsMjYgKzgxMSw1MiBAQCAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcg Kil3ZWJWaWV3IGRlCiAKICAgICAgICAgZG9uZSA9IHRydWU7CiAgICAgfQorICAgIGlmIChbdXJs LnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2NoZWNrU3RvcmFnZSJdIHx8IFt1cmwucGF0aCBpc0Vx dWFsVG9TdHJpbmc6QCIvY2hlY2tDb29raWVzIl0pIHsKKyAgICAgICAgX1dLV2Vic2l0ZVBvbGlj aWVzICp3ZWJzaXRlUG9saWNpZXMgPSBbW1tfV0tXZWJzaXRlUG9saWNpZXMgYWxsb2NdIGluaXRd IGF1dG9yZWxlYXNlXTsKKyAgICAgICAgd2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmUg PSBbV0tXZWJzaXRlRGF0YVN0b3JlIG5vblBlcnNpc3RlbnREYXRhU3RvcmVdOworICAgICAgICBk ZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3csIHdlYnNpdGVQb2xp Y2llcyk7CisgICAgfQogfQogCi0tICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcg c3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tVUkxTY2hlbWVUYXNrPil1cmxTY2hlbWVUYXNrCist ICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihp ZCA8V0tVUkxTY2hlbWVUYXNrPil0YXNrCiB7CisgICAgTlNVUkwgKnVybCA9IHRhc2sucmVxdWVz dC5VUkw7CisgICAgaWYgKFt1cmwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvY2hlY2tTdG9yYWdl Il0pIHsKKyAgICAgICAgTlNTdHJpbmcgKmh0bWwgPSBAIjxzY3JpcHQ+dmFyIG9sZFZhbHVlID0g d2luZG93LnNlc3Npb25TdG9yYWdlWydzdG9yYWdlS2V5J107IHdpbmRvdy5zZXNzaW9uU3RvcmFn ZVsnc3RvcmFnZUtleSddID0gJ3ZhbHVlJzsgYWxlcnQoJ29sZCB2YWx1ZTogPCcgKyAob2xkVmFs dWUgPyAnZmFpbCcgOiAnJykgKyAnPicpOzwvc2NyaXB0PiI7CisgICAgICAgIFt0YXNrIGRpZFJl Y2VpdmVSZXNwb25zZTpbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnVybCBNSU1F VHlwZTpAInRleHQvaHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmh0bWwubGVuZ3RoIHRleHRF bmNvZGluZ05hbWU6bmlsXV07CisgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRhOltodG1sIGRh dGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXV07CisgICAgICAgIFt0YXNrIGRp ZEZpbmlzaF07CisgICAgfQogfQogCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZp ZXcgc3RvcFVSTFNjaGVtZVRhc2s6KGlkIDxXS1VSTFNjaGVtZVRhc2s+KXVybFNjaGVtZVRhc2sK IHsKIH0KIAorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHJ1bkphdmFTY3Jp cHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyaW5nICopbWVzc2FnZSBpbml0aWF0ZWRCeUZy YW1lOihXS0ZyYW1lSW5mbyAqKWZyYW1lIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSh2b2lk KSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIEVYUEVDVF9TVFJFUShtZXNzYWdlLlVURjhTdHJp bmcsICJvbGQgdmFsdWU6IDw+Iik7CisgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKKyAgICBkb25l ID0gdHJ1ZTsKK30KKwogQGVuZAogCi1URVNUKFdlYktpdCwgVXBkYXRlV2Vic2l0ZVBvbGljaWVz SW52YWxpZCkKK1JldGFpblB0cjxXS1dlYlZpZXc+IHdlYnNpdGVEYXRhU3RvcmVUZXN0V2ViVmll dygpCiB7CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXZWJzaXRlUG9saWNpZXNXZWJz aXRlRGF0YVN0b3JlRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKICAgICBhdXRvIGNvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwogICAg IFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6ZGVsZWdhdGUuZ2V0KCkgZm9yVVJM U2NoZW1lOkAidGVzdCJdOworICAgIFtjb25maWd1cmF0aW9uIHNldFdlYnNpdGVEYXRhU3RvcmU6 W1dLV2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXV07CiAgICAgYXV0byB3 ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsK ICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAg IFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIHJldHVybiB3ZWJW aWV3OworfQogCitURVNUKFdlYktpdCwgVXBkYXRlV2Vic2l0ZVBvbGljaWVzSW52YWxpZCkKK3sK KyAgICBhdXRvIHdlYlZpZXcgPSB3ZWJzaXRlRGF0YVN0b3JlVGVzdFdlYlZpZXcoKTsKICAgICBh dXRvIHBvbGljaWVzID0gYWRvcHROUyhbW19XS1dlYnNpdGVQb2xpY2llcyBhbGxvY10gaW5pdF0p OwogICAgIFtwb2xpY2llcyBzZXRXZWJzaXRlRGF0YVN0b3JlOltXS1dlYnNpdGVEYXRhU3RvcmUg bm9uUGVyc2lzdGVudERhdGFTdG9yZV1dOwogICAgIGJvb2wgc2F3RXhjZXB0aW9uID0gZmFsc2U7 CkBAIC04NDQsNiArODcxLDI0IEBAIFRFU1QoV2ViS2l0LCBVcGRhdGVXZWJzaXRlUG9saWNpZXNJ bnZhbGkKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwogfQogCi0vLyBGSVhN RTogVXNlIF9XS1dlYnNpdGVQb2xpY2llcy53ZWJzaXRlRGF0YVN0b3JlIGFuZCB0ZXN0IHRoYXQg aXQgaXMgdXNlZC4KK1RFU1QoV2ViS2l0LCBXZWJzaXRlUG9saWNpZXNEYXRhU3RvcmUpCit7Cisg ICAgYXV0byBzdG9yYWdlV2ViVmlldyA9IHdlYnNpdGVEYXRhU3RvcmVUZXN0V2ViVmlldygpOwor CisgICAgW3N0b3JhZ2VXZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdp dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2NoZWNrU3RvcmFnZSJdXV07Cisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cisg ICAgW3N0b3JhZ2VXZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhV Ukw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2NoZWNrU3RvcmFnZSJdXV07CisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAg CisgICAgYXV0byBjb29raWVXZWJWaWV3ID0gd2Vic2l0ZURhdGFTdG9yZVRlc3RXZWJWaWV3KCk7 CisgICAgTlNTdHJpbmcgKmFsZXJ0T2xkQ29va2llID0gQCI8c2NyaXB0PnZhciBvbGRDb29raWUg PSBkb2N1bWVudC5jb29raWU7IGRvY3VtZW50LmNvb2tpZSA9ICdrZXk9dmFsdWUnOyBhbGVydCgn b2xkIHZhbHVlOiA8JyArIG9sZENvb2tpZSArICc+Jyk7PC9zY3JpcHQ+IjsKKyAgICBbY29va2ll V2ViVmlldyBsb2FkSFRNTFN0cmluZzphbGVydE9sZENvb2tpZSBiYXNlVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tL2NoZWNrQ29va2llcyJdXTsKKyAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBbY29v a2llV2ViVmlldyBsb2FkSFRNTFN0cmluZzphbGVydE9sZENvb2tpZSBiYXNlVVJMOltOU1VSTCBV UkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tL2NoZWNrQ29va2llcyJdXTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworfQogCiAjZW5kaWYgLy8gV0tfQVBJX0VO QUJMRUQK 330077 2017-12-21 16:35:18 -0800 2017-12-28 13:54:26 -0800 Patch bug-180897-20171221163517.patch text/plain 15965 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjYyNDgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE3LTEyLTIxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIG5ldyBXZWJz aXRlRGF0YVN0b3JlIHBhc3NlZCBpbiB0aHJvdWdoIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb24g U1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA4 OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1NTM1MzI4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYnNpdGVQb2xpY2llc0Rh dGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlUG9saWNpZXNEYXRhOjphcHBseVRvRG9j dW1lbnRMb2FkZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUu bW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2hhbmdlV2Vi c2l0ZURhdGFTdG9yZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjpwYWdlQmVnaW5Vc2luZ1dlYnNpdGVEYXRhU3RvcmUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGFnZUVuZFVzaW5nV2Vic2l0ZURhdGFTdG9yZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwYWdlQWRkZWRUb1Byb2Nlc3MpOiBEZWxl dGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGFnZVJlbW92ZWRGcm9tUHJv Y2Vzcyk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NQcm94eTo6YWRkRXhpc3RpbmdXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0OjplbnN1cmVXZWJzaXRlRGF0YVN0b3Jl U2Vzc2lvbik6CisKIDIwMTctMTItMjEgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZHJlc3MgYWRkaXRpb25hbCByZXZpZXcgZmVlZGJhY2sgYWZ0ZXIgcjIyNjE4 Mi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3Bw CShyZXZpc2lvbiAyMjYxOTUpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNp ZXNEYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsMTAgQEAKICNpbmNsdWRlICJX ZWJzaXRlUG9saWNpZXNEYXRhLmgiCiAKICNpbmNsdWRlICJBcmd1bWVudENvZGVycy5oIgorI2lu Y2x1ZGUgIldlYlByb2Nlc3MuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0RvY3VtZW50TG9hZGVyLmg+ CisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMTEyLDYgKzExNSwxNiBAQCB2b2lkIFdlYnNpdGVQ b2xpY2llc0RhdGE6OmFwcGx5VG9Eb2N1bWVuCiAgICAgICAgIGRvY3VtZW50TG9hZGVyLnNldEF1 dG9wbGF5UG9saWN5KFdlYkNvcmU6OkF1dG9wbGF5UG9saWN5OjpEZW55KTsKICAgICAgICAgYnJl YWs7CiAgICAgfQorICAgIAorICAgIGlmICh3ZWJzaXRlUG9saWNpZXMud2Vic2l0ZURhdGFTdG9y ZVBhcmFtZXRlcnMpIHsKKyAgICAgICAgaWYgKGF1dG8qIGZyYW1lID0gZG9jdW1lbnRMb2FkZXIu ZnJhbWUoKSkgeworICAgICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBmcmFtZS0+cGFnZSgpKSB7 CisgICAgICAgICAgICAgICAgYXV0byBzZXNzaW9uSUQgPSB3ZWJzaXRlUG9saWNpZXMud2Vic2l0 ZURhdGFTdG9yZVBhcmFtZXRlcnMtPm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zZXNzaW9uSUQ7 CisgICAgICAgICAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuYWRkV2Vic2l0ZURhdGFT dG9yZShXVEZNb3ZlKCp3ZWJzaXRlUG9saWNpZXMud2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMp KTsKKyAgICAgICAgICAgICAgICBwYWdlLT5zZXRTZXNzaW9uSUQoc2Vzc2lvbklEKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KIH0KIAogfQpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMjYxOTUpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NDQsNiAr NDQ0LDEzIEBAIFBBTDo6U2Vzc2lvbklEIFdlYlBhZ2VQcm94eTo6c2Vzc2lvbklEKCkKICAgICBy ZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlLT5zZXNzaW9uSUQoKTsKIH0KIAordm9pZCBXZWJQYWdl UHJveHk6OmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURh dGFTdG9yZSkKK3sKKyAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGFnZUVuZFVzaW5nV2Vi c2l0ZURhdGFTdG9yZSgqdGhpcyk7CisgICAgbV93ZWJzaXRlRGF0YVN0b3JlID0gd2Vic2l0ZURh dGFTdG9yZTsKKyAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGFnZUJlZ2luVXNpbmdXZWJz aXRlRGF0YVN0b3JlKCp0aGlzKTsKK30KKwogY29uc3QgQVBJOjpQYWdlQ29uZmlndXJhdGlvbiYg V2ViUGFnZVByb3h5Ojpjb25maWd1cmF0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9jb25m aWd1cmF0aW9uLmdldCgpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgJKHJldmlzaW9uIDIyNjE5NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMjQsNiArMzI0LDcgQEAgcHVibGljOgogICAgIFdl Yk5hdmlnYXRpb25TdGF0ZSYgbmF2aWdhdGlvblN0YXRlKCkgeyByZXR1cm4gKm1fbmF2aWdhdGlv blN0YXRlLmdldCgpOyB9CiAKICAgICBXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3Jl KCkgeyByZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlOyB9CisgICAgdm9pZCBjaGFuZ2VXZWJzaXRl RGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmUmKTsKIAogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElP TikKICAgICBOU0FycmF5ICpkYXRhRGV0ZWN0aW9uUmVzdWx0cygpIHsgcmV0dXJuIG1fZGF0YURl dGVjdGlvblJlc3VsdHMuZ2V0KCk7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDIyNjE5NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0NSw3ICsxMDQ1 LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6dXBkYXRlU2VydmljZVdvcmtlcgogfQogI2VuZGlm CiAKLXZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBhZ2VBZGRlZFRvUHJvY2VzcyhXZWJQYWdlUHJveHkm IHBhZ2UpCit2b2lkIFdlYlByb2Nlc3NQb29sOjpwYWdlQmVnaW5Vc2luZ1dlYnNpdGVEYXRhU3Rv cmUoV2ViUGFnZVByb3h5JiBwYWdlKQogewogICAgIGF1dG8gcmVzdWx0ID0gbV9zZXNzaW9uVG9Q YWdlc01hcC5hZGQocGFnZS5zZXNzaW9uSUQoKSwgSGFzaFNldDxXZWJQYWdlUHJveHkqPigpKS5p dGVyYXRvci0+dmFsdWUuYWRkKCZwYWdlKTsKICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVz dWx0LmlzTmV3RW50cnkpOwpAQCAtMTA2Niw3ICsxMDY2LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9v bDo6cGFnZUFkZGVkVG9Qcm9jZXNzKAogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzUG9vbDo6 cGFnZVJlbW92ZWRGcm9tUHJvY2VzcyhXZWJQYWdlUHJveHkmIHBhZ2UpCit2b2lkIFdlYlByb2Nl c3NQb29sOjpwYWdlRW5kVXNpbmdXZWJzaXRlRGF0YVN0b3JlKFdlYlBhZ2VQcm94eSYgcGFnZSkK IHsKICAgICBhdXRvIHNlc3Npb25JRCA9IHBhZ2Uuc2Vzc2lvbklEKCk7CiAgICAgYXV0byBpdGVy YXRvciA9IG1fc2Vzc2lvblRvUGFnZXNNYXAuZmluZChzZXNzaW9uSUQpOwpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCShyZXZpc2lvbiAyMjYxOTUpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNzYsOCArMTc2LDggQEAgcHVibGljOgogCiAgICAgUmVmPFdlYlBhZ2VQcm94eT4gY3JlYXRl V2ViUGFnZShQYWdlQ2xpZW50JiwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogCi0g ICAgdm9pZCBwYWdlQWRkZWRUb1Byb2Nlc3MoV2ViUGFnZVByb3h5Jik7Ci0gICAgdm9pZCBwYWdl UmVtb3ZlZEZyb21Qcm9jZXNzKFdlYlBhZ2VQcm94eSYpOworICAgIHZvaWQgcGFnZUJlZ2luVXNp bmdXZWJzaXRlRGF0YVN0b3JlKFdlYlBhZ2VQcm94eSYpOworICAgIHZvaWQgcGFnZUVuZFVzaW5n V2Vic2l0ZURhdGFTdG9yZShXZWJQYWdlUHJveHkmKTsKIAogICAgIGNvbnN0IFN0cmluZyYgaW5q ZWN0ZWRCdW5kbGVQYXRoKCkgY29uc3QgeyByZXR1cm4gbV9jb25maWd1cmF0aW9uLT5pbmplY3Rl ZEJ1bmRsZVBhdGgoKTsgfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDIyNjE5NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2MCw3ICszNjAsNyBA QCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6YWRkRXhpc3RpbmdXZWJQYWdlCiAgICAgQVNTRVJUKCFt X3BhZ2VNYXAuY29udGFpbnMocGFnZUlEKSk7CiAgICAgQVNTRVJUKCFnbG9iYWxQYWdlTWFwKCku Y29udGFpbnMocGFnZUlEKSk7CiAKLSAgICBtX3Byb2Nlc3NQb29sLT5wYWdlQWRkZWRUb1Byb2Nl c3Mod2ViUGFnZSk7CisgICAgbV9wcm9jZXNzUG9vbC0+cGFnZUJlZ2luVXNpbmdXZWJzaXRlRGF0 YVN0b3JlKHdlYlBhZ2UpOwogCiAgICAgbV9wYWdlTWFwLnNldChwYWdlSUQsICZ3ZWJQYWdlKTsK ICAgICBnbG9iYWxQYWdlTWFwKCkuc2V0KHBhZ2VJRCwgJndlYlBhZ2UpOwpAQCAtMzc1LDcgKzM3 NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKFdlYlAKICAgICByZW1v dmVkUGFnZSA9IGdsb2JhbFBhZ2VNYXAoKS50YWtlKHBhZ2VJRCk7CiAgICAgQVNTRVJUX1VOVVNF RChyZW1vdmVkUGFnZSwgcmVtb3ZlZFBhZ2UgPT0gJndlYlBhZ2UpOwogCi0gICAgbV9wcm9jZXNz UG9vbC0+cGFnZVJlbW92ZWRGcm9tUHJvY2Vzcyh3ZWJQYWdlKTsKKyAgICBtX3Byb2Nlc3NQb29s LT5wYWdlRW5kVXNpbmdXZWJzaXRlRGF0YVN0b3JlKHdlYlBhZ2UpOwogCiAgICAgdXBkYXRlQmFj a2dyb3VuZFJlc3BvbnNpdmVuZXNzVGltZXIoKTsKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHJldmlzaW9uIDIyNjE5 NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQko d29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogI2ltcG9ydCAiQVBJTmF2aWdhdGlvblJl c3BvbnNlLmgiCiAjaW1wb3J0ICJBUElTdHJpbmcuaCIKICNpbXBvcnQgIkFQSVVSTC5oIgorI2lt cG9ydCAiQVBJV2Vic2l0ZURhdGFTdG9yZS5oIgogI2ltcG9ydCAiQXV0aGVudGljYXRpb25EZWNp c2lvbkxpc3RlbmVyLmgiCiAjaW1wb3J0ICJDb21wbGV0aW9uSGFuZGxlckNhbGxDaGVja2VyLmgi CiAjaW1wb3J0ICJMb2dnaW5nLmgiCkBAIC00NjAsNyArNDYxLDcgQEAgdm9pZCBOYXZpZ2F0aW9u U3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAgIAogICAgIGF1dG8gY2hlY2tlciA9IENvbXBs ZXRpb25IYW5kbGVyQ2FsbENoZWNrZXI6OmNyZWF0ZShuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCks IGRlbGVnYXRlSGFzV2Vic2l0ZVBvbGljaWVzID8gQHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOikgOiBAc2VsZWN0b3Iod2Vi VmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopKTsK ICAgICAKLSAgICBhdXRvIGRlY2lzaW9uSGFuZGxlcldpdGhQb2xpY2llcyA9IFtsb2NhbExpc3Rl bmVyID0gV1RGTW92ZShsaXN0ZW5lciksIG5hdmlnYXRpb25BY3Rpb24gPSBuYXZpZ2F0aW9uQWN0 aW9uLmNvcHlSZWYoKSwgY2hlY2tlciA9IFdURk1vdmUoY2hlY2tlciksIG1haW5GcmFtZVVSTFN0 cmluZ10oV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5IGFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBv bGljaWVzICp3ZWJzaXRlUG9saWNpZXMpIG11dGFibGUgeworICAgIGF1dG8gZGVjaXNpb25IYW5k bGVyV2l0aFBvbGljaWVzID0gW2xvY2FsTGlzdGVuZXIgPSBXVEZNb3ZlKGxpc3RlbmVyKSwgbmF2 aWdhdGlvbkFjdGlvbiA9IG5hdmlnYXRpb25BY3Rpb24uY29weVJlZigpLCBjaGVja2VyID0gV1RG TW92ZShjaGVja2VyKSwgbWFpbkZyYW1lVVJMU3RyaW5nLCB3ZWJQYWdlUHJveHkgPSBtYWtlUmVm KHdlYlBhZ2VQcm94eSldKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSBhY3Rpb25Qb2xpY3ksIF9X S1dlYnNpdGVQb2xpY2llcyAqd2Vic2l0ZVBvbGljaWVzKSBtdXRhYmxlIHsKICAgICAgICAgaWYg KGNoZWNrZXItPmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNhbGxlZCgpKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBjaGVja2VyLT5kaWRDYWxsQ29tcGxldGlvbkhhbmRsZXIoKTsKQEAg LTQ3Miw2ICs0NzMsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 CiAgICAgICAgICAgICAgICAgYXV0byYgc2Vzc2lvbklEID0gZGF0YS0+d2Vic2l0ZURhdGFTdG9y ZVBhcmFtZXRlcnMtPm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zZXNzaW9uSUQ7CiAgICAgICAg ICAgICAgICAgaWYgKCFzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSAmJiBzZXNzaW9uSUQgIT0gUEFM OjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSkKICAgICAgICAgICAgICAgICAgICAgW05T RXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIl9XS1dl YnNpdGVQb2xpY2llcy53ZWJzaXRlRGF0YVN0b3JlIG11c3QgYmUgbmlsLCBkZWZhdWx0LCBvciBu b24tcGVyc2lzdGVudC4iXTsKKyAgICAgICAgICAgICAgICB3ZWJQYWdlUHJveHktPmNoYW5nZVdl YnNpdGVEYXRhU3RvcmUod2Vic2l0ZVBvbGljaWVzLT5fd2Vic2l0ZVBvbGljaWVzLT53ZWJzaXRl RGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9X ZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5t bQkocmV2aXNpb24gMjI2MTk1KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC02MiwxMCArNjIsOCBAQCB2b2lkIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmVuc3VyZVdl CiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJz LmNvb2tpZVN0b3JhZ2VQYXRoRXh0ZW5zaW9uSGFuZGxlKTsKIAogICAgIFJldGFpblB0cjxDRkhU VFBDb29raWVTdG9yYWdlUmVmPiB1aVByb2Nlc3NDb29raWVTdG9yYWdlOwotICAgIGlmICghc2Vz c2lvbklELmlzRXBoZW1lcmFsKCkpCisgICAgaWYgKCFzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSAm JiAhcGFyYW1ldGVycy51aVByb2Nlc3NDb29raWVTdG9yYWdlSWRlbnRpZmllci5pc0VtcHR5KCkp CiAgICAgICAgIHVpUHJvY2Vzc0Nvb2tpZVN0b3JhZ2UgPSBjb29raWVTdG9yYWdlRnJvbUlkZW50 aWZ5aW5nRGF0YShwYXJhbWV0ZXJzLnVpUHJvY2Vzc0Nvb2tpZVN0b3JhZ2VJZGVudGlmaWVyKTsK LSAgICBlbHNlCi0gICAgICAgIEFTU0VSVChwYXJhbWV0ZXJzLnVpUHJvY2Vzc0Nvb2tpZVN0b3Jh Z2VJZGVudGlmaWVyLmlzRW1wdHkoKSk7CiAKICAgICBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmVu c3VyZVNlc3Npb24oc2Vzc2lvbklELCBiYXNlICsgJy4nICsgU3RyaW5nOjpudW1iZXIoc2Vzc2lv bklELnNlc3Npb25JRCgpKSwgV1RGTW92ZSh1aVByb2Nlc3NDb29raWVTdG9yYWdlKSk7CiAKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDIyNjE5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIwIEBACisyMDE3LTEyLTIxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVXNlIG5ldyBXZWJzaXRlRGF0YVN0b3JlIHBhc3NlZCBpbiB0aHJv dWdoIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb24gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA4OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzM1NTM1MzI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3QgdHdvIGZvcm1zIG9mIHN0b3JhZ2UgdG8gYmUgc3VyZSB3ZSBhcmUgdXNpbmcgYSBk aWZmZXJlbnQgV2Vic2l0ZURhdGFTdG9yZTogY29va2llcyBhbmQgc2Vzc2lvblN0b3JhZ2UuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2ll cy5tbToKKyAgICAgICAgKC1bV2Vic2l0ZVBvbGljaWVzV2Vic2l0ZURhdGFTdG9yZURlbGVnYXRl IF93ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVy Ol0pOgorICAgICAgICAoLVtXZWJzaXRlUG9saWNpZXNXZWJzaXRlRGF0YVN0b3JlRGVsZWdhdGUg d2ViVmlldzpzdGFydFVSTFNjaGVtZVRhc2s6XSk6CisgICAgICAgICgtW1dlYnNpdGVQb2xpY2ll c1dlYnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZSB3ZWJWaWV3OnJ1bkphdmFTY3JpcHRBbGVydFBhbmVs V2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAg ICAgKHdlYnNpdGVEYXRhU3RvcmVUZXN0V2ViVmlldyk6CisgICAgICAgIChURVNUKToKKwogMjAx Ny0xMi0yMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgTWFy a2VyU3VicmFuZ2UuU3ViZGl2aWRlR3JhbW1hckFuZFNlbGVjdGlvbk92ZXJsYXB7RnJvbnRtb3N0 LCBGcm9udG1vc3RXaXRoTG9uZ2VzdEVmZmVjdGl2ZVJhbmdlfSBhcmUgZmFpbGluZwpJbmRleDog VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlUG9saWNpZXMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJz aXRlUG9saWNpZXMubW0JKHJldmlzaW9uIDIyNjE5NSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03 ODksMTQgKzc4OSwxNSBAQCBURVNUKFdlYktpdCwgQ3VzdG9tSGVhZGVyRmllbGRzKQogCiBzdGF0 aWMgYm9vbCBkb25lOwogCi1AaW50ZXJmYWNlIFdlYnNpdGVQb2xpY2llc1dlYnNpdGVEYXRhU3Rv cmVEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUsIFdLVVJM U2NoZW1lSGFuZGxlcj4KK0BpbnRlcmZhY2UgV2Vic2l0ZVBvbGljaWVzV2Vic2l0ZURhdGFTdG9y ZURlbGVnYXRlIDogTlNPYmplY3QgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZSwgV0tVUkxT Y2hlbWVIYW5kbGVyLCBXS1VJRGVsZWdhdGU+CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJz aXRlUG9saWNpZXNXZWJzaXRlRGF0YVN0b3JlRGVsZWdhdGUKIAogLSAodm9pZClfd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05h dmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAo XikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBfV0tXZWJzaXRlUG9saWNpZXMgKikpZGVjaXNp b25IYW5kbGVyCiB7Ci0gICAgaWYgKFtuYXZpZ2F0aW9uQWN0aW9uLnJlcXVlc3QuVVJMLnBhdGgg aXNFcXVhbFRvU3RyaW5nOkAiL2ludmFsaWQiXSkgeworICAgIE5TVVJMICp1cmwgPSBuYXZpZ2F0 aW9uQWN0aW9uLnJlcXVlc3QuVVJMOworICAgIGlmIChbdXJsLnBhdGggaXNFcXVhbFRvU3RyaW5n OkAiL2ludmFsaWQiXSkgewogICAgICAgICBfV0tXZWJzaXRlUG9saWNpZXMgKndlYnNpdGVQb2xp Y2llcyA9IFtbW19XS1dlYnNpdGVQb2xpY2llcyBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwog ICAgICAgICB3ZWJzaXRlUG9saWNpZXMud2Vic2l0ZURhdGFTdG9yZSA9IFtbW1dLV2Vic2l0ZURh dGFTdG9yZSBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpbW1tfV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdXSBhdXRvcmVsZWFzZV07 CiAKQEAgLTgxMCwyNiArODExLDUyIEBAIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgZGUKIAogICAgICAgICBkb25lID0gdHJ1ZTsKICAgICB9CisgICAgaWYgKFt1cmwucGF0 aCBpc0VxdWFsVG9TdHJpbmc6QCIvY2hlY2tTdG9yYWdlIl0gfHwgW3VybC5wYXRoIGlzRXF1YWxU b1N0cmluZzpAIi9jaGVja0Nvb2tpZXMiXSkgeworICAgICAgICBfV0tXZWJzaXRlUG9saWNpZXMg KndlYnNpdGVQb2xpY2llcyA9IFtbW19XS1dlYnNpdGVQb2xpY2llcyBhbGxvY10gaW5pdF0gYXV0 b3JlbGVhc2VdOworICAgICAgICB3ZWJzaXRlUG9saWNpZXMud2Vic2l0ZURhdGFTdG9yZSA9IFtX S1dlYnNpdGVEYXRhU3RvcmUgbm9uUGVyc2lzdGVudERhdGFTdG9yZV07CisgICAgICAgIGRlY2lz aW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdywgd2Vic2l0ZVBvbGljaWVz KTsKKyAgICB9CiB9CiAKLS0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdGFy dFVSTFNjaGVtZVRhc2s6KGlkIDxXS1VSTFNjaGVtZVRhc2s+KXVybFNjaGVtZVRhc2sKKy0gKHZv aWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdGFydFVSTFNjaGVtZVRhc2s6KGlkIDxX S1VSTFNjaGVtZVRhc2s+KXRhc2sKIHsKKyAgICBOU1VSTCAqdXJsID0gdGFzay5yZXF1ZXN0LlVS TDsKKyAgICBpZiAoW3VybC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9jaGVja1N0b3JhZ2UiXSkg eworICAgICAgICBOU1N0cmluZyAqaHRtbCA9IEAiPHNjcmlwdD52YXIgb2xkVmFsdWUgPSB3aW5k b3cuc2Vzc2lvblN0b3JhZ2VbJ3N0b3JhZ2VLZXknXTsgd2luZG93LnNlc3Npb25TdG9yYWdlWydz dG9yYWdlS2V5J10gPSAndmFsdWUnOyBhbGVydCgnb2xkIHZhbHVlOiA8JyArIChvbGRWYWx1ZSA/ ICdmYWlsJyA6ICcnKSArICc+Jyk7PC9zY3JpcHQ+IjsKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2 ZVJlc3BvbnNlOltbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dXJsIE1JTUVUeXBl OkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6aHRtbC5sZW5ndGggdGV4dEVuY29k aW5nTmFtZTpuaWxdXTsKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6W2h0bWwgZGF0YVVz aW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddXTsKKyAgICAgICAgW3Rhc2sgZGlkRmlu aXNoXTsKKyAgICB9CiB9CiAKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBz dG9wVVJMU2NoZW1lVGFzazooaWQgPFdLVVJMU2NoZW1lVGFzaz4pdXJsU2NoZW1lVGFzawogewog fQogCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcnVuSmF2YVNjcmlwdEFs ZXJ0UGFuZWxXaXRoTWVzc2FnZTooTlNTdHJpbmcgKiltZXNzYWdlIGluaXRpYXRlZEJ5RnJhbWU6 KFdLRnJhbWVJbmZvICopZnJhbWUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNv bXBsZXRpb25IYW5kbGVyCit7CisgICAgRVhQRUNUX1NUUkVRKG1lc3NhZ2UuVVRGOFN0cmluZywg Im9sZCB2YWx1ZTogPD4iKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgIGRvbmUgPSB0 cnVlOworfQorCiBAZW5kCiAKLVRFU1QoV2ViS2l0LCBVcGRhdGVXZWJzaXRlUG9saWNpZXNJbnZh bGlkKQorUmV0YWluUHRyPFdLV2ViVmlldz4gd2Vic2l0ZURhdGFTdG9yZVRlc3RXZWJWaWV3KCkK IHsKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1dlYnNpdGVQb2xpY2llc1dlYnNpdGVE YXRhU3RvcmVEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIGF1dG8gY29uZmlndXJhdGlvbiA9 IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgW2Nv bmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpkZWxlZ2F0ZS5nZXQoKSBmb3JVUkxTY2hl bWU6QCJ0ZXN0Il07CisgICAgW2NvbmZpZ3VyYXRpb24gc2V0V2Vic2l0ZURhdGFTdG9yZTpbV0tX ZWJzaXRlRGF0YVN0b3JlIG5vblBlcnNpc3RlbnREYXRhU3RvcmVdXTsKICAgICBhdXRvIHdlYlZp ZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3Qo MCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAg IFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisgICAgW3dl YlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisgICAgcmV0dXJuIHdlYlZpZXc7 Cit9CiAKK1RFU1QoV2ViS2l0LCBVcGRhdGVXZWJzaXRlUG9saWNpZXNJbnZhbGlkKQoreworICAg IGF1dG8gd2ViVmlldyA9IHdlYnNpdGVEYXRhU3RvcmVUZXN0V2ViVmlldygpOwogICAgIGF1dG8g cG9saWNpZXMgPSBhZG9wdE5TKFtbX1dLV2Vic2l0ZVBvbGljaWVzIGFsbG9jXSBpbml0XSk7CiAg ICAgW3BvbGljaWVzIHNldFdlYnNpdGVEYXRhU3RvcmU6W1dLV2Vic2l0ZURhdGFTdG9yZSBub25Q ZXJzaXN0ZW50RGF0YVN0b3JlXV07CiAgICAgYm9vbCBzYXdFeGNlcHRpb24gPSBmYWxzZTsKQEAg LTg0NCw2ICs4NzEsMjYgQEAgVEVTVChXZWJLaXQsIFVwZGF0ZVdlYnNpdGVQb2xpY2llc0ludmFs aQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiB9CiAKLS8vIEZJWE1FOiBV c2UgX1dLV2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmUgYW5kIHRlc3QgdGhhdCBpdCBp cyB1c2VkLgorVEVTVChXZWJLaXQsIFdlYnNpdGVQb2xpY2llc0RhdGFTdG9yZSkKK3sKKyAgICAv LyBGSVhNRTogTWFrZSBzZXNzaW9uIHN0b3JhZ2Ugc2VwYXJhdGUuCisgICAgLyoKKyAgICBhdXRv IHN0b3JhZ2VXZWJWaWV3ID0gd2Vic2l0ZURhdGFTdG9yZVRlc3RXZWJWaWV3KCk7CisgICAgW3N0 b3JhZ2VXZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2NoZWNrU3RvcmFnZSJdXV07CisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3N0b3Jh Z2VXZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJM IFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2NoZWNrU3RvcmFnZSJdXV07CisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgKi8KKyAgICAK KyAgICBhdXRvIGNvb2tpZVdlYlZpZXcgPSB3ZWJzaXRlRGF0YVN0b3JlVGVzdFdlYlZpZXcoKTsK KyAgICBOU1N0cmluZyAqYWxlcnRPbGRDb29raWUgPSBAIjxzY3JpcHQ+dmFyIG9sZENvb2tpZSA9 IGRvY3VtZW50LmNvb2tpZTsgZG9jdW1lbnQuY29va2llID0gJ2tleT12YWx1ZSc7IGFsZXJ0KCdv bGQgdmFsdWU6IDwnICsgb2xkQ29va2llICsgJz4nKTs8L3NjcmlwdD4iOworICAgIFtjb29raWVX ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOmFsZXJ0T2xkQ29va2llIGJhc2VVUkw6W05TVVJMIFVSTFdp dGhTdHJpbmc6QCJodHRwOi8vZXhhbXBsZS5jb20vY2hlY2tDb29raWVzIl1dOworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIFtjb29r aWVXZWJWaWV3IGxvYWRIVE1MU3RyaW5nOmFsZXJ0T2xkQ29va2llIGJhc2VVUkw6W05TVVJMIFVS TFdpdGhTdHJpbmc6QCJodHRwOi8vZXhhbXBsZS5jb20vY2hlY2tDb29raWVzIl1dOworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Cit9CiAKICNlbmRpZiAvLyBXS19BUElfRU5B QkxFRAo=