225260 2021-04-30 16:59:52 -0700 App highlight UI should be disabled when selecting text in image overlays 2021-04-30 20:27:02 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1755873 0 wenson_hsieh 2021-04-30 16:59:52 -0700 rdar://77359313 1755876 1 427471 wenson_hsieh 2021-04-30 17:35:47 -0700 Created attachment 427471 Patch 1755900 2 427471 thorton 2021-04-30 18:43:19 -0700 Comment on attachment 427471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427471&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3571 > + // FIXME: It doesn't seem like this codepath is exercised, since UIKit only asks for the action target for custom actions > + // added via -[UIMenuController setMenuItems:]. Can we remove this check? Yikes, good catch. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3769 > + return state.selectionIsRange && !state.isContentEditable && !state.selectionIsRangeInsideImageOverlay ? self : nil; Please factor this out as discussed. > Tools/ChangeLog:21 > + Add support for a new `TestOption` that enables app higlights. See the new layout test for more information. sp. "highlights" 1755902 3 427471 wenson_hsieh 2021-04-30 18:46:31 -0700 Comment on attachment 427471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427471&action=review Thanks for the review! >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3769 >> + return state.selectionIsRange && !state.isContentEditable && !state.selectionIsRangeInsideImageOverlay ? self : nil; > > Please factor this out as discussed. 👍🏻 >> Tools/ChangeLog:21 >> + Add support for a new `TestOption` that enables app higlights. See the new layout test for more information. > > sp. "highlights" Whoops, fixed! 1755905 4 427482 wenson_hsieh 2021-04-30 18:52:12 -0700 Created attachment 427482 For EWS 1755914 5 ews-feeder 2021-04-30 20:27:02 -0700 Committed r276871 (237217@main): <https://commits.webkit.org/237217@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427482. 427471 2021-04-30 17:35:47 -0700 2021-04-30 18:43:19 -0700 Patch bug-225260-20210430173546.patch text/plain 23190 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uNWFiMzQyNzVlMjU0MDMxNmZmNzRiOTM1NWY0ZDFk ODExNWMyOThkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA0LTMwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFwcCBoaWdobGln aHQgVUkgc2hvdWxkIGJlIGRpc2FibGVkIHdoZW4gc2VsZWN0aW5nIHRleHQgaW4gaW1hZ2Ugb3Zl cmxheXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NTI2MAorICAgICAgICByZGFyOi8vNzczNTkzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGJvdGggYXBwIGhpZ2hsaWdodHMgYW5kIGltYWdl IGV4dHJhY3Rpb24gYXJlIGVuYWJsZWQsIHBhcnRzIG9mIHRoZSBhcHAgaGlnaGxpZ2h0cyBmZWF0 dXJlIGRvbid0IHBsYXkgd2VsbAorICAgICAgICB3aXRoIGhpZ2hsaWdodHMgY3JlYXRlZCBmb3Ig dGV4dCBzZWxlY3Rpb25zIGluc2lkZSBhbiBpbWFnZSBvdmVybGF5LiBGb3IgdGhlIHRpbWUgYmVp bmcsIGFkZHJlc3MgdGhpcyBieQorICAgICAgICBkaXNhYmxpbmcgYXBwIGhpZ2hsaWdodHMgaW4g aW1hZ2Ugb3ZlcmxheXMuCisKKyAgICAgICAgVGhlc2UgY2hhbmdlcyBhcmUgZXhlcmNpc2VkIGJ5 IGEgbmV3IEFQSSB0ZXN0IG9uIGlPUywgYW5kIGEgbmV3IGxheW91dCB0ZXN0IGZvciBtYWNPUy4K KworICAgICAgICBUZXN0czogIFdlYktpdC5BcHBIaWdobGlnaHRzSW5JbWFnZU92ZXJsYXlzCisg ICAgICAgICAgICAgICAgZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvaW1hZ2Utb3Zl cmxheS10ZXh0LWRpc2FibGVzLWFwcC1oaWdobGlnaHQtbWVudS1pdGVtcy5odG1sCisKKyAgICAg ICAgKiBwYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD b250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKToKKworICAgICAgICBEb24ndCBhZGQgYXBw IGhpZ2hsaWdodCBtZW51IGl0ZW1zIGluIHRoZSBjYXNlIHdoZXJlIHdlJ3ZlIHNlbGVjdGVkIHRl eHQgaW4gYW4gaW1hZ2Ugb3ZlcmxheS4KKworICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6YXBwSGlnaGxpZ2h0Q29udGV4dE1lbnVJ dGVtVGl0bGVzIGNvbnN0KToKKworICAgICAgICBBZGQgYW4gaW50ZXJuYWwgdGVzdGluZyBob29r IHRvIGV4cG9zZSB0aGUgbG9jYWxpemVkIG5hbWVzIG9mIHRoZSBhcHAgaGlnaGxpZ2h0IG1lbnUg aXRlbXMgdG8gbGF5b3V0IHRlc3RzLgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaDoK KyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5pZGw6CisKIDIwMjEtMDQtMzAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKGlPUyAxNC41 KTogUFdBJ3MgLyBIb21lIFNjcmVlbiBBcHBzIHdpdGggU2VydmljZSBXb3JrZXJzIGludGVybWl0 dGVubHkgZmFpbCB0byBvcGVuIG9mZmxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMmQ2ZTMwMDdmODJkM2U5MGFk MTJlYjQ0YmQzYWFlOTE2Yjg3ZmQ2NC4uNmNiZDA2NDlkZTJmM2M1MmZhZGZkMWMyMGZkZjhkYWIz Yjk4OTEyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAyMS0wNC0zMCAgV2Vuc29uIEhz aWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBBcHAgaGlnaGxpZ2h0IFVJ IHNob3VsZCBiZSBkaXNhYmxlZCB3aGVuIHNlbGVjdGluZyB0ZXh0IGluIGltYWdlIG92ZXJsYXlz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUyNjAK KyAgICAgICAgcmRhcjovLzc3MzU5MzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGEgYml0IHRvIGBFZGl0b3JTdGF0ZWAgdG8gaW5kaWNhdGUg d2hlbiBhIHJhbmdlZCBzZWxlY3Rpb24gaXMgaW5zaWRlIGFuIGltYWdlIG92ZXJsYXkuCisKKyAg ICAgICAgKiBTaGFyZWQvRWRpdG9yU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JT dGF0ZTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OmRlY29k ZSk6CisgICAgICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgY2FuUGVyZm9ybUFjdGlvbjp3aXRoU2VuZGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHRhcmdldEZvckFjdGlvbjp3aXRoU2VuZGVyOl0pOgorCisgICAgICAgIE1ha2UgYC10YXJn ZXRGb3JBY3Rpb246d2l0aFNlbmRlcjpgIHJldHVybiBgc2VsZmAgb25seSBpZiB3ZSBoYXZlIGEg cmFuZ2VkIHNlbGVjdGlvbiB0aGF0IGlzIG5vdCBpbnNpZGUgYW4gaW1hZ2UKKyAgICAgICAgb3Zl cmxheS4gSW50ZXJlc3RpbmdseSwgVUlLaXQgZG9lc24ndCBzZWVtIHRvIGNvbnN1bHQgYC1jYW5Q ZXJmb3JtQWN0aW9uOndpdGhTZW5kZXI6YCBmb3IgYWN0aW9ucyB0aGF0IGFyZSBhZGRlZAorICAg ICAgICB0aHJvdWdoIGAtW1VJTWVudUNvbnRyb2xsZXIgc2V0TWVudUl0ZW1zOl1gLCBzbyB3ZSBh ZGQgdGhlIGNoZWNrIGhlcmUgaW5zdGVhZCBvZiBpbnNpZGUgYC1jYW5QZXJmb3JtQWN0aW9uOmAK KyAgICAgICAgYWJvdmUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVkaXRvclN0YXRlIGNvbnN0KToKKworICAg ICAgICBTZXQgdGhlIG5ldyBiaXQgaGVyZS4gTm90ZSB0aGF0IHRoaXMgKGltcG9ydGFudGx5KSBk b2Vzbid0IHRyaWdnZXIgbGF5b3V0LCBiZWNhdXNlIGBWaXNpYmxlU2VsZWN0aW9uOjpyYW5nZWAK KyAgICAgICAganVzdCByZXR1cm5zIGEgKHBvdGVudGlhbGx5IHVuY2Fub25pY2FsaXplZCkgYFNp bXBsZVJhbmdlYC4gRm9yIHRoZSBwdXJwb3NlcyBvZiBjaGVja2luZyB3aGV0aGVyIHRoZSBzZWxl Y3Rpb24KKyAgICAgICAgaXMgaW5zaWRlIGFuIGltYWdlIG92ZXJsYXksIHRoaXMgaXMgc3VmZmlj aWVudC4KKwogMjAyMS0wNC0zMCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NjgzOC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcAppbmRleCAwNmRiNTAxNzRkZmI1MThm MDJmM2E4YTBjN2NlNDAxNjNmOGNjNDNhLi45MmU2ZjRjM2JkNGY1ODA1ZDE4NTBjMWNkYzdmMzY5 NzNlOGIzZDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xs ZXIuY3BwCkBAIC05MzUsNiArOTM1LDggQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBv cHVsYXRlKCkKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAgIGF1dG8gc2VsZWN0 ZWRSYW5nZSA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5yYW5nZSgpOworICAgICAg ICBib29sIHNlbGVjdGlvbklzSW5zaWRlSW1hZ2VPdmVybGF5ID0gc2VsZWN0ZWRSYW5nZSAmJiBI VE1MRWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJsYXkoKnNlbGVjdGVkUmFuZ2UpOwogICAgICAg ICBib29sIHNob3VsZFNob3dJdGVtc0Zvck5vbkVkaXRhYmxlVGV4dCA9IChbJl0gewogICAgICAg ICAgICAgaWYgKCFsaW5rVVJMLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CkBAIC05NDIsMTAgKzk0NCw4IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpwb3B1 bGF0ZSgpCiAgICAgICAgICAgICBpZiAoIW1lZGlhVVJMLmlzRW1wdHkoKSkKICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgICAgIGlmICghaW1hZ2VVUkwuaXNFbXB0eSgp KSB7Ci0gICAgICAgICAgICAgICAgYXV0byBzZWxlY3RlZFJhbmdlID0gZnJhbWUtPnNlbGVjdGlv bigpLnNlbGVjdGlvbigpLnJhbmdlKCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHNlbGVjdGVk UmFuZ2UgJiYgSFRNTEVsZW1lbnQ6OmlzSW5zaWRlSW1hZ2VPdmVybGF5KCpzZWxlY3RlZFJhbmdl KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICghaW1hZ2VVUkwuaXNFbXB0eSgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBzZWxlY3Rpb25Jc0luc2lkZUltYWdlT3ZlcmxheTsKIAog ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0pKCk7CkBAIC05NjMsNyArOTYzLDcg QEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKCkKIAogI2lmIEVOQUJMRShB UFBfSElHSExJR0hUUykKICAgICAgICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGZyYW1lLT5w YWdlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHBhZ2UtPnNldHRpbmdzKCkuYXBwSGln aGxpZ2h0c0VuYWJsZWQoKSkgeworICAgICAgICAgICAgICAgICAgICBpZiAocGFnZS0+c2V0dGlu Z3MoKS5hcHBIaWdobGlnaHRzRW5hYmxlZCgpICYmICFzZWxlY3Rpb25Jc0luc2lkZUltYWdlT3Zl cmxheSkgewogICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShBZGRIaWdobGlnaHRU b05ld0dyb3VwSXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBhcHBlbmRJdGVtKEFkZEhpZ2hsaWdodEl0ZW0sIG1fY29udGV4dE1lbnUuZ2V0KCkpOwog ICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbSgqc2VwYXJhdG9ySXRlbSgpLCBtX2Nv bnRleHRNZW51LmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCBj YmQzNGYyNTFlNmJjZGI1MWQ5NzRkNTNlM2VjMjRiZDUwMmRkNjE1Li40MzBjMzliZGZjZjMwNDhi MGE1NDQwYzg4N2E3NTVmMGRiNWUxZjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu Y3BwCkBAIC0xMjQsNiArMTI0LDcgQEAKICNpbmNsdWRlICJMZWdhY3lTY2hlbWVSZWdpc3RyeS5o IgogI2luY2x1ZGUgIkxpYldlYlJUQ1Byb3ZpZGVyLmgiCiAjaW5jbHVkZSAiTG9hZGVyU3RyYXRl Z3kuaCIKKyNpbmNsdWRlICJMb2NhbGl6ZWRTdHJpbmdzLmgiCiAjaW5jbHVkZSAiTG9jYXRpb24u aCIKICNpbmNsdWRlICJNYWxsb2NTdGF0aXN0aWNzLmgiCiAjaW5jbHVkZSAiTWVkaWFEZXZpY2Vz LmgiCkBAIC02MDUzLDYgKzYwNTQsMTQgQEAgYm9vbCBJbnRlcm5hbHM6Omhhc1NhbmRib3hJT0tp dE9wZW5BY2Nlc3NUb0NsYXNzKGNvbnN0IFN0cmluZyYgcHJvY2VzcywgY29uc3QgU3QKICNlbmRp ZgogCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorVmVjdG9yPFN0cmluZz4gSW50ZXJuYWxz OjphcHBIaWdobGlnaHRDb250ZXh0TWVudUl0ZW1UaXRsZXMoKSBjb25zdAoreworICAgIHJldHVy biB7eworICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdBZGRIaWdobGlnaHRUb0N1cnJlbnRHcm91 cCgpLAorICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdBZGRIaWdobGlnaHRUb05ld0dyb3VwKCks CisgICAgfX07Cit9CisKIHVuc2lnbmVkIEludGVybmFsczo6bnVtYmVyT2ZBcHBIaWdobGlnaHRz KCkKIHsKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBjb250ZXh0RG9jdW1lbnQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IGM5NmQ2NTY1YzkyNGM1MzkyN2M2MTdlZDgxMTUy NTRjNjVlYjVlYzIuLmUyMDIzNGI3YmE0ZjU3ZTNlNDk0MjlmZjBkMjU4NjEzMGJmZDMyNGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtMTEwMCw2ICsxMTAwLDcgQEAgcHVibGlj OgogICAgIGJvb2wgZGVzdHJveVNsZWVwRGlzYWJsZXIodW5zaWduZWQgaWRlbnRpZmllcik7CiAg ICAgICAgIAogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKyAgICBWZWN0b3I8U3RyaW5nPiBh cHBIaWdobGlnaHRDb250ZXh0TWVudUl0ZW1UaXRsZXMoKSBjb25zdDsKICAgICB1bnNpZ25lZCBu dW1iZXJPZkFwcEhpZ2hsaWdodHMoKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVy bmFscy5pZGwKaW5kZXggYTcwY2Q3ODY3ZDBlNjNhODkzYmY1ZDAxYTY4NmRmNTEzNDBiNWEyNS4u MDM1YTI2OGQzMmY3ZmZiNGI0ZmYwZmU0OTBiOWVjZDNkNTczZGUxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtMTAwMiw2ICsxMDAyLDcgQEAgZW51bSBUcmVlVHlwZSB7 CiAgICAgdW5zaWduZWQgbG9uZyBjcmVhdGVTbGVlcERpc2FibGVyKERPTVN0cmluZyByZWFzb24s IGJvb2xlYW4gZGlzcGxheSk7CiAgICAgYm9vbGVhbiBkZXN0cm95U2xlZXBEaXNhYmxlcih1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIpOwogICAgIAorICAgIFtDb25kaXRpb25hbD1BUFBfSElHSExJ R0hUU10gcmVhZG9ubHkgYXR0cmlidXRlIHNlcXVlbmNlPERPTVN0cmluZz4gYXBwSGlnaGxpZ2h0 Q29udGV4dE1lbnVJdGVtVGl0bGVzOwogICAgIFtDb25kaXRpb25hbD1BUFBfSElHSExJR0hUU10g dW5zaWduZWQgbG9uZyBudW1iZXJPZkFwcEhpZ2hsaWdodHMoKTsKIAogICAgIFtDb25kaXRpb25h bD1XRUJYUl0gcmVhZG9ubHkgYXR0cmlidXRlIFdlYlhSVGVzdCB4clRlc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9FZGl0b3JTdGF0ZS5jcHAKaW5kZXggYzhkY2ZhNTJiYjA1NjVjMjM4YTY0NTNmZjlhMWU2 MDg0NjdhNmFiOS4uODlmZWRlOTdiODA2ZjIzNzMxMWJkY2Y2NDQ5YjkzNjNhNDIwMTVhNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNwcApAQCAtMzksNiArMzksNyBAQCB2b2lkIEVk aXRvclN0YXRlOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29k ZXIgPDwgc2hvdWxkSWdub3JlU2VsZWN0aW9uQ2hhbmdlczsKICAgICBlbmNvZGVyIDw8IHNlbGVj dGlvbklzTm9uZTsKICAgICBlbmNvZGVyIDw8IHNlbGVjdGlvbklzUmFuZ2U7CisgICAgZW5jb2Rl ciA8PCBzZWxlY3Rpb25Jc1JhbmdlSW5zaWRlSW1hZ2VPdmVybGF5OwogICAgIGVuY29kZXIgPDwg aXNDb250ZW50RWRpdGFibGU7CiAgICAgZW5jb2RlciA8PCBpc0NvbnRlbnRSaWNobHlFZGl0YWJs ZTsKICAgICBlbmNvZGVyIDw8IGlzSW5QYXNzd29yZEZpZWxkOwpAQCAtNjYsNiArNjcsOSBAQCBi b29sIEVkaXRvclN0YXRlOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBFZGl0b3JTdGF0 ZSYgcmVzdWx0KQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNlbGVjdGlvbklzUmFu Z2UpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5zZWxlY3Rpb25Jc1JhbmdlSW5zaWRlSW1hZ2VPdmVybGF5KSkKKyAgICAgICAgcmV0dXJu IGZhbHNlOworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaXNDb250ZW50RWRpdGFi bGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL0VkaXRvclN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5o CmluZGV4IGQ5NTY4YWNmMTA0OGM3YTBlNWZjMjEzNTUyZWY5MDkyNTk3NTZmZjIuLmUxOGZkMDdj ZmU2M2ZhNGVmMjlmYTUzZTVmOTAwYWU1YjRkN2JiMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0VkaXRvclN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9y U3RhdGUuaApAQCAtNzUsNiArNzUsNyBAQCBzdHJ1Y3QgRWRpdG9yU3RhdGUgewogICAgIGJvb2wg c2hvdWxkSWdub3JlU2VsZWN0aW9uQ2hhbmdlcyB7IGZhbHNlIH07CiAgICAgYm9vbCBzZWxlY3Rp b25Jc05vbmUgeyB0cnVlIH07IC8vIFRoaXMgd2lsbCBiZSBmYWxzZSB3aGVuIHRoZXJlIGlzIGEg Y2FyZXQgc2VsZWN0aW9uLgogICAgIGJvb2wgc2VsZWN0aW9uSXNSYW5nZSB7IGZhbHNlIH07Cisg ICAgYm9vbCBzZWxlY3Rpb25Jc1JhbmdlSW5zaWRlSW1hZ2VPdmVybGF5IHsgZmFsc2UgfTsKICAg ICBib29sIGlzQ29udGVudEVkaXRhYmxlIHsgZmFsc2UgfTsKICAgICBib29sIGlzQ29udGVudFJp Y2hseUVkaXRhYmxlIHsgZmFsc2UgfTsKICAgICBib29sIGlzSW5QYXNzd29yZEZpZWxkIHsgZmFs c2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDNiZDU0NzRhYTA3ZDViM2U1MzAyMWFiNjYxODYwOTVm M2YwMDRmZDcuLjQwODk0NGRjNTkwZmFiN2Y0NTRkOTgxMzA2YjRmZmI5MzlmMmRmOWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtMzU2Niw4ICszNTY2LDExIEBAIC0gKEJPT0wpY2FuUGVyZm9ybUFjdGlv bjooU0VMKWFjdGlvbiB3aXRoU2VuZGVyOihpZClzZW5kZXIKICAgICAgICAgcmV0dXJuIGVkaXRv clN0YXRlLmlzQ29udGVudEVkaXRhYmxlOwogCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQot ICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdyb3Vw V2l0aFJhbmdlOikgfHwgYWN0aW9uID09IEBzZWxlY3RvcihjcmVhdGVIaWdobGlnaHRJbk5ld0dy b3VwV2l0aFJhbmdlOikpCi0gICAgICAgIHJldHVybiBlZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc1Jh bmdlICYmICFlZGl0b3JTdGF0ZS5pc0NvbnRlbnRFZGl0YWJsZTsKKyAgICBpZiAoYWN0aW9uID09 IEBzZWxlY3RvcihjcmVhdGVIaWdobGlnaHRJbkN1cnJlbnRHcm91cFdpdGhSYW5nZTopIHx8IGFj dGlvbiA9PSBAc2VsZWN0b3IoY3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZTopKSB7 CisgICAgICAgIC8vIEZJWE1FOiBJdCBkb2Vzbid0IHNlZW0gbGlrZSB0aGlzIGNvZGVwYXRoIGlz IGV4ZXJjaXNlZCwgc2luY2UgVUlLaXQgb25seSBhc2tzIGZvciB0aGUgYWN0aW9uIHRhcmdldCBm b3IgY3VzdG9tIGFjdGlvbnMKKyAgICAgICAgLy8gYWRkZWQgdmlhIC1bVUlNZW51Q29udHJvbGxl ciBzZXRNZW51SXRlbXM6XS4gQ2FuIHdlIHJlbW92ZSB0aGlzIGNoZWNrPworICAgICAgICByZXR1 cm4gZWRpdG9yU3RhdGUuc2VsZWN0aW9uSXNSYW5nZSAmJiAhZWRpdG9yU3RhdGUuaXNDb250ZW50 RWRpdGFibGUgJiYgIWVkaXRvclN0YXRlLnNlbGVjdGlvbklzUmFuZ2VJbnNpZGVJbWFnZU92ZXJs YXk7CisgICAgfQogI2VuZGlmCiAKICAgICByZXR1cm4gW193ZWJWaWV3IGNhblBlcmZvcm1BY3Rp b246YWN0aW9uIHdpdGhTZW5kZXI6c2VuZGVyXTsKQEAgLTM3NjEsOCArMzc2NCwxMCBAQCAtIChC T09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJWaWV3OihTRUwpYWN0aW9uIHdpdGhTZW5kZXI6KGlk KXNlbmRlcgogLSAoaWQpdGFyZ2V0Rm9yQWN0aW9uOihTRUwpYWN0aW9uIHdpdGhTZW5kZXI6KGlk KXNlbmRlcgogewogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKLSAgICBpZiAoYWN0aW9uID09 IEBzZWxlY3RvcihjcmVhdGVIaWdobGlnaHRJbkN1cnJlbnRHcm91cFdpdGhSYW5nZTopIHx8IGFj dGlvbiA9PSBAc2VsZWN0b3IoY3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZTopKQot ICAgICAgICByZXR1cm4gc2VsZjsKKyAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihjcmVhdGVI aWdobGlnaHRJbkN1cnJlbnRHcm91cFdpdGhSYW5nZTopIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3Io Y3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZTopKSB7CisgICAgICAgIGF1dG8gc3Rh dGUgPSBfcGFnZS0+ZWRpdG9yU3RhdGUoKTsKKyAgICAgICAgcmV0dXJuIHN0YXRlLnNlbGVjdGlv bklzUmFuZ2UgJiYgIXN0YXRlLmlzQ29udGVudEVkaXRhYmxlICYmICFzdGF0ZS5zZWxlY3Rpb25J c1JhbmdlSW5zaWRlSW1hZ2VPdmVybGF5ID8gc2VsZiA6IG5pbDsKKyAgICB9CiAjZW5kaWYKICAg ICByZXR1cm4gW193ZWJWaWV3IHRhcmdldEZvckFjdGlvbjphY3Rpb24gd2l0aFNlbmRlcjpzZW5k ZXJdOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApp bmRleCAzYjYzYjFiNjg1ODBjMDQ1MGQ4N2IwNDc1ZjA5ZDVlNTdlMWQyNmY0Li5mNDU3Yzg2NGIz ZDIzYTBiMGI1NTljNmU4NmU2ZWQ5NzIyYTJmODlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTIwOCw2ICsxMjA4LDExIEBAIEVkaXRvclN0 YXRlIFdlYlBhZ2U6OmVkaXRvclN0YXRlKFNob3VsZFBlcmZvcm1MYXlvdXQgc2hvdWxkUGVyZm9y bUxheW91dCkgY29uc3QKICAgICBSZWY8RG9jdW1lbnQ+IGRvY3VtZW50ID0gKmZyYW1lLT5kb2N1 bWVudCgpOwogICAgIHJlc3VsdC5vcmlnaW5JZGVudGlmaWVyRm9yUGFzdGVib2FyZCA9IGRvY3Vt ZW50LT5vcmlnaW5JZGVudGlmaWVyRm9yUGFzdGVib2FyZCgpOwogCisgICAgaWYgKHJlc3VsdC5z ZWxlY3Rpb25Jc1JhbmdlKSB7CisgICAgICAgIGF1dG8gc2VsZWN0aW9uUmFuZ2UgPSBzZWxlY3Rp b24ucmFuZ2UoKTsKKyAgICAgICAgcmVzdWx0LnNlbGVjdGlvbklzUmFuZ2VJbnNpZGVJbWFnZU92 ZXJsYXkgPSBzZWxlY3Rpb25SYW5nZSAmJiBIVE1MRWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJs YXkoKnNlbGVjdGlvblJhbmdlKTsKKyAgICB9CisKICAgICBpZiAoc2hvdWxkUGVyZm9ybUxheW91 dCA9PSBTaG91bGRQZXJmb3JtTGF5b3V0OjpZZXMgfHwgcGxhdGZvcm1OZWVkc0xheW91dEZvckVk aXRvclN0YXRlKGZyYW1lKSkKICAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dCgpOyAvLyBN YXkgY2F1c2UgZG9jdW1lbnQgZGVzdHJ1Y3Rpb24KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDU1Njk4ODU4OTdlNmI0ZTEwNjExODA4NWY1NjRj Njc3NTU4NGUwYTcuLmE1MmJjZjA4NWY2NTAzYTZmYTc3NDVkOWY0NGUwNjIwOTAxM2RjZDAgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyNSBAQAorMjAyMS0wNC0zMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KKworICAgICAgICBBcHAgaGlnaGxpZ2h0IFVJIHNob3VsZCBiZSBkaXNhYmxlZCB3aGVuIHNl bGVjdGluZyB0ZXh0IGluIGltYWdlIG92ZXJsYXlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUyNjAKKyAgICAgICAgcmRhcjovLzc3MzU5MzEzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudFZpZXdFZGl0aW5nQWN0aW9ucy5tbToK KworICAgICAgICBBZGQgYSBuZXcgQVBJIHRlc3QgdG8gdmVyaWZ5IHRoZSBiZWhhdmlvciBvZiBg LXRhcmdldEZvckFjdGlvbjp3aXRoU2VuZGVyOmAgaW4gYFdLQ29udGVudFZpZXdgLgorCisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHA6CisgICAgICAgIChXVFI6OlRl c3RPcHRpb25zOjpkZWZhdWx0cyk6CisgICAgICAgIChXVFI6OlRlc3RPcHRpb25zOjprZXlUeXBl TWFwcGluZyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oOgorICAg ICAgICAoV1RSOjpUZXN0T3B0aW9uczo6YXBwSGlnaGxpZ2h0c0VuYWJsZWQgY29uc3QpOgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbToKKyAg ICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ3JlYXRlV2ViVmlldyk6CisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIGEgbmV3IGBUZXN0T3B0aW9uYCB0aGF0IGVuYWJsZXMgYXBw IGhpZ2xpZ2h0cy4gU2VlIHRoZSBuZXcgbGF5b3V0IHRlc3QgZm9yIG1vcmUgaW5mb3JtYXRpb24u CisKIDIwMjEtMDQtMzAgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc2ODQ2LgpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3RWRpdGluZ0Fj dGlvbnMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVu dFZpZXdFZGl0aW5nQWN0aW9ucy5tbQppbmRleCBhYjZmNjI5ODkwMTE0NGE4NDY1OTU4MTQ5NTA3 Y2M3OTc3YzkyOTNiLi5iYjU3M2UzOWRlY2Q0MjM3OTFkYTRiN2M1NjMyYmM2MDlhZjNjNTRiIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVu dFZpZXdFZGl0aW5nQWN0aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLQ29udGVudFZpZXdFZGl0aW5nQWN0aW9ucy5tbQpAQCAtMzIsNiArMzIsOCBA QAogI2ltcG9ydCAiVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5oIgogI2ltcG9ydCAiVGVzdFdLV2Vi Vmlldy5oIgogI2ltcG9ydCAiVUlLaXRTUEkuaCIKKyNpbXBvcnQgIldLV2ViVmlld0NvbmZpZ3Vy YXRpb25FeHRyYXMuaCIKKyNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYktpdC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0 ci5oPgogCkBAIC03MSw0ICs3MywzMiBAQCBURVNUKFdlYktpdCwgSW52b2tlU2hhcmVXaXRob3V0 U2VsZWN0aW9uKQogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsK IH0KIAotI2VuZGlmCisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pICYmIEVOQUJMRShBUFBf SElHSExJR0hUUykKKworVEVTVChXZWJLaXQsIEFwcEhpZ2hsaWdodHNJbkltYWdlT3ZlcmxheXMp Cit7CisgICAgYXV0byBjb25maWd1cmF0aW9uID0gcmV0YWluUHRyKFtXS1dlYlZpZXdDb25maWd1 cmF0aW9uIF90ZXN0X2NvbmZpZ3VyYXRpb25XaXRoVGVzdFBsdWdJbkNsYXNzTmFtZTpAIldlYlBy b2Nlc3NQbHVnSW5XaXRoSW50ZXJuYWxzIiBjb25maWd1cmVKU0NGb3JUZXN0aW5nOllFU10pOwor ICAgIFtjb25maWd1cmF0aW9uIF9zZXRBcHBIaWdobGlnaHRzRW5hYmxlZDpZRVNdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9u LmdldCgpXSk7CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRUZXN0UGFnZU5hbWVkOkAi c2ltcGxlLWltYWdlLW92ZXJsYXkiXTsKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK YXZhU2NyaXB0OkAic2VsZWN0SW1hZ2VPdmVybGF5KCkiXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9y TmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisKKyAgICBhdXRvIGNyZWF0ZUhpZ2hsaWdodEluQ3Vy cmVudEdyb3VwV2l0aFJhbmdlU2VsZWN0b3IgPSBOU1NlbGVjdG9yRnJvbVN0cmluZyhAImNyZWF0 ZUhpZ2hsaWdodEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOiIpOworICAgIGF1dG8gY3JlYXRlSGln aGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZVNlbGVjdG9yID0gTlNTZWxlY3RvckZyb21TdHJpbmco QCJjcmVhdGVIaWdobGlnaHRJbk5ld0dyb3VwV2l0aFJhbmdlOiIpOworCisgICAgYXV0byBjb250 ZW50VmlldyA9IFt3ZWJWaWV3IHRleHRJbnB1dENvbnRlbnRWaWV3XTsKKyAgICBFWFBFQ1RfTlVM TChbY29udGVudFZpZXcgdGFyZ2V0Rm9yQWN0aW9uOmNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdy b3VwV2l0aFJhbmdlU2VsZWN0b3Igd2l0aFNlbmRlcjpuaWxdKTsKKyAgICBFWFBFQ1RfTlVMTChb Y29udGVudFZpZXcgdGFyZ2V0Rm9yQWN0aW9uOmNyZWF0ZUhpZ2hsaWdodEluTmV3R3JvdXBXaXRo UmFuZ2VTZWxlY3RvciB3aXRoU2VuZGVyOm5pbF0pOworCisgICAgW3dlYlZpZXcgc3luY2hyb25v dXNseUxvYWRUZXN0UGFnZU5hbWVkOkAic2ltcGxlIl07CisgICAgW3dlYlZpZXcgc2VsZWN0QWxs Om5pbF07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworICAg IEVYUEVDVF9FUShbY29udGVudFZpZXcgdGFyZ2V0Rm9yQWN0aW9uOmNyZWF0ZUhpZ2hsaWdodElu Q3VycmVudEdyb3VwV2l0aFJhbmdlU2VsZWN0b3Igd2l0aFNlbmRlcjpuaWxdLCBjb250ZW50Vmll dyk7CisgICAgRVhQRUNUX0VRKFtjb250ZW50VmlldyB0YXJnZXRGb3JBY3Rpb246Y3JlYXRlSGln aGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZVNlbGVjdG9yIHdpdGhTZW5kZXI6bmlsXSwgY29udGVu dFZpZXcpOworfQorCisjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pICYmIEVOQUJM RShBUFBfSElHSExJR0hUUykKKworI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYg LS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRpb25zLmNwcCBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwCmluZGV4IDRjZjExNzk2ZGNkOTEzYTUzMDYx Nzg4MTZmMWYzNTQ1YmE5MTExZjQuLjk0YjBjY2FkODRmZTkwZjkxNGNkMWRjZTkzOTZmZDEzOGZj NTg4MjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3Bw CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwCkBAIC0xMzUsNiAr MTM1LDcgQEAgY29uc3QgVGVzdEZlYXR1cmVzJiBUZXN0T3B0aW9uczo6ZGVmYXVsdHMoKQogICAg ICAgICAgICAgeyAiZW5hYmxlSW5BcHBCcm93c2VyUHJpdmFjeSIsIGZhbHNlIH0sCiAgICAgICAg ICAgICB7ICJlbmFibGVQcm9jZXNzU3dhcE9uTmF2aWdhdGlvbiIsIHRydWUgfSwKICAgICAgICAg ICAgIHsgImVuYWJsZVByb2Nlc3NTd2FwT25XaW5kb3dPcGVuIiwgZmFsc2UgfSwKKyAgICAgICAg ICAgIHsgImFwcEhpZ2hsaWdodHNFbmFibGVkIiwgZmFsc2UgfSwKICAgICAgICAgICAgIHsgImln bm9yZVN5bmNocm9ub3VzTWVzc2FnaW5nVGltZW91dHMiLCBmYWxzZSB9LAogICAgICAgICAgICAg eyAiaWdub3Jlc1ZpZXdwb3J0U2NhbGVMaW1pdHMiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAi aXNBcHBCb3VuZFdlYlZpZXciLCBmYWxzZSB9LApAQCAtMTg2LDYgKzE4Nyw3IEBAIGNvbnN0IHN0 ZDo6dW5vcmRlcmVkX21hcDxzdGQ6OnN0cmluZywgVGVzdEhlYWRlcktleVR5cGU+JiBUZXN0T3B0 aW9uczo6a2V5VHlwZU1hCiAgICAgICAgIHsgImVuYWJsZUluQXBwQnJvd3NlclByaXZhY3kiLCBU ZXN0SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKICAgICAgICAgeyAiZW5hYmxlUHJv Y2Vzc1N3YXBPbk5hdmlnYXRpb24iLCBUZXN0SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIg fSwKICAgICAgICAgeyAiZW5hYmxlUHJvY2Vzc1N3YXBPbldpbmRvd09wZW4iLCBUZXN0SGVhZGVy S2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKKyAgICAgICAgeyAiYXBwSGlnaGxpZ2h0c0VuYWJs ZWQiLCBUZXN0SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKICAgICAgICAgeyAiaWdu b3JlU3luY2hyb25vdXNNZXNzYWdpbmdUaW1lb3V0cyIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29s VGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJpZ25vcmVzVmlld3BvcnRTY2FsZUxpbWl0cyIsIFRl c3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJpc0FwcEJvdW5k V2ViVmlldyIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LApkaWZmIC0tZ2l0 IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9UZXN0T3B0aW9ucy5oCmluZGV4IGRjOTlhMDI1Yzc5ZmE1NGRhYmZlMDg1MGU2MDIy MjRiMDdkNjIxMWUuLjkzNjAzODc0NmNhYjdlOWU5ZDc5MmE1ZTk5Y2I4NWZjYTcxMmYyZTkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaAorKysgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRpb25zLmgKQEAgLTU1LDYgKzU1LDcgQEAgcHVibGlj OgogICAgIGJvb2wgZW5hYmxlSW5BcHBCcm93c2VyUHJpdmFjeSgpIGNvbnN0IHsgcmV0dXJuIGJv b2xUZXN0UnVubmVyRmVhdHVyZVZhbHVlKCJlbmFibGVJbkFwcEJyb3dzZXJQcml2YWN5Iik7IH0K ICAgICBib29sIGVuYWJsZVByb2Nlc3NTd2FwT25OYXZpZ2F0aW9uKCkgY29uc3QgeyByZXR1cm4g Ym9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoImVuYWJsZVByb2Nlc3NTd2FwT25OYXZpZ2F0aW9u Iik7IH0KICAgICBib29sIGVuYWJsZVByb2Nlc3NTd2FwT25XaW5kb3dPcGVuKCkgY29uc3QgeyBy ZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoImVuYWJsZVByb2Nlc3NTd2FwT25XaW5k b3dPcGVuIik7IH0KKyAgICBib29sIGFwcEhpZ2hsaWdodHNFbmFibGVkKCkgY29uc3QgeyByZXR1 cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoImFwcEhpZ2hsaWdodHNFbmFibGVkIik7IH0K ICAgICBib29sIGlnbm9yZVN5bmNocm9ub3VzTWVzc2FnaW5nVGltZW91dHMoKSBjb25zdCB7IHJl dHVybiBib29sVGVzdFJ1bm5lckZlYXR1cmVWYWx1ZSgiaWdub3JlU3luY2hyb25vdXNNZXNzYWdp bmdUaW1lb3V0cyIpOyB9CiAgICAgYm9vbCBpZ25vcmVzVmlld3BvcnRTY2FsZUxpbWl0cygpIGNv bnN0IHsgcmV0dXJuIGJvb2xUZXN0UnVubmVyRmVhdHVyZVZhbHVlKCJpZ25vcmVzVmlld3BvcnRT Y2FsZUxpbWl0cyIpOyB9CiAgICAgYm9vbCBpc0FwcEJvdW5kV2ViVmlldygpIGNvbnN0IHsgcmV0 dXJuIGJvb2xUZXN0UnVubmVyRmVhdHVyZVZhbHVlKCJpc0FwcEJvdW5kV2ViVmlldyIpOyB9CmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29j b2EubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2Eu bW0KaW5kZXggMzYxMzMyZTU2YzBmNDczMTAzYjc1NTEyYjBlNTNjMDNmOTI4MzkzZC4uOWI3Y2Ew NzRlMzYxODYxOGQ2MzM2MjE1NTliZDRkMjZkYjc0ZDUzMiAxMDA2NDQKLS0tIGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQpAQCAtMTc2LDYgKzE3 Niw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ3JlYXRlV2ViVmlldyhXS1BhZ2VD b25maWd1cmF0aW9uUmVmLCBjb25zdCBUZXN0T3B0CiAKICAgICBbY29waWVkQ29uZmlndXJhdGlv biBzZXRXZWJzaXRlRGF0YVN0b3JlOihXS1dlYnNpdGVEYXRhU3RvcmUgKil3ZWJzaXRlRGF0YVN0 b3JlKCldOwogICAgIFtjb3BpZWRDb25maWd1cmF0aW9uIF9zZXRBbGxvd1RvcE5hdmlnYXRpb25U b0RhdGFVUkxzOm9wdGlvbnMuYWxsb3dUb3BOYXZpZ2F0aW9uVG9EYXRhVVJMcygpXTsKKyAgICBb Y29waWVkQ29uZmlndXJhdGlvbiBfc2V0QXBwSGlnaGxpZ2h0c0VuYWJsZWQ6b3B0aW9ucy5hcHBI aWdobGlnaHRzRW5hYmxlZCgpXTsKIAogICAgIGNvbmZpZ3VyZUNvbnRlbnRNb2RlKGNvcGllZENv bmZpZ3VyYXRpb24uZ2V0KCksIG9wdGlvbnMpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2U1MmQxOTBmMjBkY2QyOWUx NmVjNmY4ZjBhZDZkZmI2ZjMyYWUwNi4uMzc5MzRiYTUwMzQxMzExMDE4YzE4NGZkMmUzODgwYTIx MjllYTNhMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTMwICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFwcCBoaWdobGlnaHQgVUkgc2hv dWxkIGJlIGRpc2FibGVkIHdoZW4gc2VsZWN0aW5nIHRleHQgaW4gaW1hZ2Ugb3ZlcmxheXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTI2MAorICAg ICAgICByZGFyOi8vNzczNTkzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYSBuZXcgbGF5b3V0IHRlc3QgdG8gdmVyaWZ5IHRoYXQgdGhlIGFw cCBoaWdsaWdodCBjb250ZXh0IG1lbnUgaXRlbXMgZG9uJ3Qgc2hvdyB1cCBvbiBtYWNPUyB3aGVu IHJpZ2h0CisgICAgICAgIGNsaWNraW5nLgorCisgICAgICAgICogZmFzdC9pbWFnZXMvaW1hZ2Ut ZXh0cmFjdGlvbi9tYWMvaW1hZ2Utb3ZlcmxheS10ZXh0LWRpc2FibGVzLWFwcC1oaWdobGlnaHQt bWVudS1pdGVtcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaW1hZ2VzL2lt YWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJsYXktdGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxp Z2h0LW1lbnUtaXRlbXMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDQtMzAgIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJlc29sdmVycyBiZXR3 ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJs YXktdGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxpZ2h0LW1lbnUtaXRlbXMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvaW1hZ2Utb3Zlcmxh eS10ZXh0LWRpc2FibGVzLWFwcC1oaWdobGlnaHQtbWVudS1pdGVtcy1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMzhjMGU3YjM3MWRiYzFhZWY4Mjc4NTM2ZTZkMjBlZWUzZWU3YjI1OQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFj L2ltYWdlLW92ZXJsYXktdGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxpZ2h0LW1lbnUtaXRlbXMtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsOSBAQAorUEFTUyBmb3VuZFRpdGxlMSBpcyB0cnVlCitQQVNT IGZvdW5kVGl0bGUyIGlzIHRydWUKK1BBU1MgU2VsZWN0ZWQgaW1hZ2Ugb3ZlcmxheQorUEFTUyBm b3VuZFRpdGxlMSBpcyBmYWxzZQorUEFTUyBmb3VuZFRpdGxlMiBpcyBmYWxzZQorUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJsYXkt dGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxpZ2h0LW1lbnUtaXRlbXMuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJsYXktdGV4dC1kaXNh Ymxlcy1hcHAtaGlnaGxpZ2h0LW1lbnUtaXRlbXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMmJhYjU5ODRm Mzg4MjQ1Mjc5MWQwOGI5MmJkN2E5NjViOTQ0NDcxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9pbWFnZXMvaW1hZ2UtZXh0cmFjdGlvbi9tYWMvaW1hZ2Utb3ZlcmxheS10ZXh0 LWRpc2FibGVzLWFwcC1oaWdobGlnaHQtbWVudS1pdGVtcy5odG1sCkBAIC0wLDAgKzEsNzcgQEAK KzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGFwcEhpZ2hsaWdodHNF bmFibGVkPXRydWUgXSAtLT4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4v Li4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorPHN0eWxlPgorYm9keSwgaHRtbCB7 CisgICAgbWFyZ2luOiAwOworfQorCitwIHsKKyAgICBmb250LXNpemU6IDMycHg7CisgICAgZGlz cGxheTogaW5saW5lLWJsb2NrOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBz cmM9Ii4uLy4uL3Jlc291cmNlcy9ncmVlbi00MDB4NDAwLnBuZyI+PC9pbWc+Cis8cD5IZWxsbyB3 b3JsZCB0aGlzIGlzIGEgdGVzdC48L3A+Cis8L2JvZHk+Cis8c2NyaXB0PgordmFyIGZvdW5kVGl0 bGUxOwordmFyIGZvdW5kVGl0bGUyOworCitmdW5jdGlvbiBjaGVja0ZvckFwcEhpZ2hsaWdodENv bnRleHRNZW51SXRlbXMoKSB7CisgICAgZm91bmRUaXRsZTEgPSBmYWxzZTsKKyAgICBmb3VuZFRp dGxlMiA9IGZhbHNlOworCisgICAgbGV0IFt0aXRsZTEsIHRpdGxlMl0gPSBpbnRlcm5hbHMuYXBw SGlnaGxpZ2h0Q29udGV4dE1lbnVJdGVtVGl0bGVzOworICAgIGZvciAobGV0IGl0ZW0gb2YgZXZl bnRTZW5kZXIuY29udGV4dENsaWNrKCkpIHsKKyAgICAgICAgaWYgKGl0ZW0udGl0bGUgPT09IHRp dGxlMSkKKyAgICAgICAgICAgIGZvdW5kVGl0bGUxID0gdHJ1ZTsKKworICAgICAgICBpZiAoaXRl bS50aXRsZSA9PT0gdGl0bGUyKQorICAgICAgICAgICAgZm91bmRUaXRsZTIgPSB0cnVlOworICAg IH0KK30KKworYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsICgpID0+IHsKKyAgICBsZXQgdGV4dCA9 IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoInAiKTsKKyAgICBsZXQgdGV4dFJlY3QgPSB0ZXh0Lmdl dEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgIGxldCBpbWFnZSA9IGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoImltZyIpOworCisgICAgaW50ZXJuYWxzLmluc3RhbGxJbWFnZU92ZXJsYXkoaW1hZ2Us IFsKKyAgICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5 KDAsIDApLAorICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAw KSwKKyAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMSks CisgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMSksCisg ICAgICAgICAgICBjaGlsZHJlbjogWworICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgdGV4dCA6ICJmb29iYXIiLAorICAgICAgICAgICAgICAgICAgICB0b3BMZWZ0IDogbmV3 IERPTVBvaW50UmVhZE9ubHkoMCwgMCksCisgICAgICAgICAgICAgICAgICAgIHRvcFJpZ2h0IDog bmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMCksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbVJp Z2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMSksCisgICAgICAgICAgICAgICAgICAgIGJv dHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAxKSwKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICBdCisgICAgICAgIH0KKyAgICBdKTsKKworICAgIGdldFNlbGVjdGlvbigp LnNlbGVjdEFsbENoaWxkcmVuKHRleHQpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHRl eHRSZWN0LmxlZnQgKyB0ZXh0UmVjdC53aWR0aCAvIDIsIHRleHRSZWN0LnRvcCArIHRleHRSZWN0 LmhlaWdodCAvIDIpOworICAgIGNoZWNrRm9yQXBwSGlnaGxpZ2h0Q29udGV4dE1lbnVJdGVtcygp OworICAgIHNob3VsZEJlVHJ1ZSgiZm91bmRUaXRsZTEiKTsKKyAgICBzaG91bGRCZVRydWUoImZv dW5kVGl0bGUyIik7CisKKyAgICBnZXRTZWxlY3Rpb24oKS5zZWxlY3RBbGxDaGlsZHJlbihpbnRl cm5hbHMuc2hhZG93Um9vdChpbWFnZSkucXVlcnlTZWxlY3RvcigiZGl2I2ltYWdlLW92ZXJsYXki KSk7CisgICAgdGVzdFBhc3NlZCgiU2VsZWN0ZWQgaW1hZ2Ugb3ZlcmxheSIpCisgICAgZXZlbnRT ZW5kZXIubW91c2VNb3ZlVG8oMjAwLCAyMDApOworICAgIGNoZWNrRm9yQXBwSGlnaGxpZ2h0Q29u dGV4dE1lbnVJdGVtcygpOworICAgIHNob3VsZEJlRmFsc2UoImZvdW5kVGl0bGUxIik7CisgICAg c2hvdWxkQmVGYWxzZSgiZm91bmRUaXRsZTIiKTsKKworICAgIHRleHQucmVtb3ZlKCk7Cit9KTsK Kzwvc2NyaXB0PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 427482 2021-04-30 18:52:12 -0700 2021-04-30 20:27:02 -0700 For EWS bug-225260-20210430185211.patch text/plain 23341 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uMWE1MTQzMzkxYTQxYjE0ZTZlNzdiMzBmNzI0MTBi YTBlMmEzNTM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA0LTMwICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFwcCBoaWdobGln aHQgVUkgc2hvdWxkIGJlIGRpc2FibGVkIHdoZW4gc2VsZWN0aW5nIHRleHQgaW4gaW1hZ2Ugb3Zl cmxheXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NTI2MAorICAgICAgICByZGFyOi8vNzczNTkzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIFdoZW4gYm90aCBhcHAgaGlnaGxpZ2h0cyBhbmQgaW1hZ2UgZXh0 cmFjdGlvbiBhcmUgZW5hYmxlZCwgcGFydHMgb2YgdGhlIGFwcCBoaWdobGlnaHRzIGZlYXR1cmUg ZG9uJ3QgcGxheSB3ZWxsCisgICAgICAgIHdpdGggaGlnaGxpZ2h0cyBjcmVhdGVkIGZvciB0ZXh0 IHNlbGVjdGlvbnMgaW5zaWRlIGFuIGltYWdlIG92ZXJsYXkuIEZvciB0aGUgdGltZSBiZWluZywg YWRkcmVzcyB0aGlzIGJ5CisgICAgICAgIGRpc2FibGluZyBhcHAgaGlnaGxpZ2h0cyBpbiBpbWFn ZSBvdmVybGF5cy4KKworICAgICAgICBUaGVzZSBjaGFuZ2VzIGFyZSBleGVyY2lzZWQgYnkgYSBu ZXcgQVBJIHRlc3Qgb24gaU9TLCBhbmQgYSBuZXcgbGF5b3V0IHRlc3QgZm9yIG1hY09TLgorCisg ICAgICAgIFRlc3RzOiAgV2ViS2l0LkFwcEhpZ2hsaWdodHNJbkltYWdlT3ZlcmxheXMKKyAgICAg ICAgICAgICAgICBmYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9pbWFnZS1vdmVybGF5 LXRleHQtZGlzYWJsZXMtYXBwLWhpZ2hsaWdodC1tZW51LWl0ZW1zLmh0bWwKKworICAgICAgICAq IHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl eHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUpOgorCisgICAgICAgIERvbid0IGFkZCBhcHAgaGln aGxpZ2h0IG1lbnUgaXRlbXMgaW4gdGhlIGNhc2Ugd2hlcmUgd2UndmUgc2VsZWN0ZWQgdGV4dCBp biBhbiBpbWFnZSBvdmVybGF5LgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjphcHBIaWdobGlnaHRDb250ZXh0TWVudUl0ZW1U aXRsZXMgY29uc3QpOgorCisgICAgICAgIEFkZCBhbiBpbnRlcm5hbCB0ZXN0aW5nIGhvb2sgdG8g ZXhwb3NlIHRoZSBsb2NhbGl6ZWQgbmFtZXMgb2YgdGhlIGFwcCBoaWdobGlnaHQgbWVudSBpdGVt cyB0byBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAg ICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQ V0EncyAvIEhvbWUgU2NyZWVuIEFwcHMgd2l0aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5s eSBmYWlsIHRvIG9wZW4gb2ZmbGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAyZDZlMzAwN2Y4MmQzZTkwYWQxMmVi NDRiZDNhYWU5MTZiODdmZDY0Li40ZTY4NzMxZTY2NGVkOWRhMDgwMmU1MTI1NzZlMDkxZTZhNzZi YzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTMwICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFwcCBoaWdobGlnaHQgVUkgc2hv dWxkIGJlIGRpc2FibGVkIHdoZW4gc2VsZWN0aW5nIHRleHQgaW4gaW1hZ2Ugb3ZlcmxheXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTI2MAorICAg ICAgICByZGFyOi8vNzczNTkzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgor CisgICAgICAgIEFkZCBhIGJpdCB0byBgRWRpdG9yU3RhdGVgIHRvIGluZGljYXRlIHdoZW4gYSBy YW5nZWQgc2VsZWN0aW9uIGlzIGluc2lkZSBhbiBpbWFnZSBvdmVybGF5LgorCisgICAgICAgICog U2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OmVu Y29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpkZWNvZGUpOgorICAg ICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHNob3Vs ZEFsbG93QXBwSGlnaGxpZ2h0Q3JlYXRpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBj YW5QZXJmb3JtQWN0aW9uOndpdGhTZW5kZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg dGFyZ2V0Rm9yQWN0aW9uOndpdGhTZW5kZXI6XSk6CisKKyAgICAgICAgTWFrZSBgLXRhcmdldEZv ckFjdGlvbjp3aXRoU2VuZGVyOmAgcmV0dXJuIGBzZWxmYCBvbmx5IGlmIHdlIGhhdmUgYSByYW5n ZWQgc2VsZWN0aW9uIHRoYXQgaXMgbm90IGluc2lkZSBhbiBpbWFnZQorICAgICAgICBvdmVybGF5 LiBJbnRlcmVzdGluZ2x5LCBVSUtpdCBkb2Vzbid0IHNlZW0gdG8gY29uc3VsdCBgLWNhblBlcmZv cm1BY3Rpb246d2l0aFNlbmRlcjpgIGZvciBhY3Rpb25zIHRoYXQgYXJlIGFkZGVkCisgICAgICAg IHRocm91Z2ggYC1bVUlNZW51Q29udHJvbGxlciBzZXRNZW51SXRlbXM6XWAsIHNvIHdlIGFkZCB0 aGUgY2hlY2sgaGVyZSBpbnN0ZWFkIG9mIGluc2lkZSBgLWNhblBlcmZvcm1BY3Rpb246YAorICAg ICAgICBhYm92ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZWRpdG9yU3RhdGUgY29uc3QpOgorCisgICAgICAg IFNldCB0aGUgbmV3IGJpdCBoZXJlLiBOb3RlIHRoYXQgdGhpcyAoaW1wb3J0YW50bHkpIGRvZXNu J3QgdHJpZ2dlciBsYXlvdXQsIGJlY2F1c2UgYFZpc2libGVTZWxlY3Rpb246OnJhbmdlYAorICAg ICAgICBqdXN0IHJldHVybnMgYSAocG90ZW50aWFsbHkgdW5jYW5vbmljYWxpemVkKSBgU2ltcGxl UmFuZ2VgLiBGb3IgdGhlIHB1cnBvc2VzIG9mIGNoZWNraW5nIHdoZXRoZXIgdGhlIHNlbGVjdGlv bgorICAgICAgICBpcyBpbnNpZGUgYW4gaW1hZ2Ugb3ZlcmxheSwgdGhpcyBpcyBzdWZmaWNpZW50 LgorCiAyMDIxLTA0LTMwICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc2ODM4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IDA2ZGI1MDE3NGRmYjUxOGYwMmYz YThhMGM3Y2U0MDE2M2Y4Y2M0M2EuLjkyZTZmNGMzYmQ0ZjU4MDVkMTg1MGMxY2RjN2YzNjk3M2U4 YjNkOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5j cHAKQEAgLTkzNSw2ICs5MzUsOCBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxh dGUoKQogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAgICAgICAgYXV0byBzZWxlY3RlZFJh bmdlID0gZnJhbWUtPnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLnJhbmdlKCk7CisgICAgICAgIGJv b2wgc2VsZWN0aW9uSXNJbnNpZGVJbWFnZU92ZXJsYXkgPSBzZWxlY3RlZFJhbmdlICYmIEhUTUxF bGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheSgqc2VsZWN0ZWRSYW5nZSk7CiAgICAgICAgIGJv b2wgc2hvdWxkU2hvd0l0ZW1zRm9yTm9uRWRpdGFibGVUZXh0ID0gKFsmXSB7CiAgICAgICAgICAg ICBpZiAoIWxpbmtVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK QEAgLTk0MiwxMCArOTQ0LDggQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRl KCkKICAgICAgICAgICAgIGlmICghbWVkaWFVUkwuaXNFbXB0eSgpKQogICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgICAgICAgICAgaWYgKCFpbWFnZVVSTC5pc0VtcHR5KCkpIHsK LSAgICAgICAgICAgICAgICBhdXRvIHNlbGVjdGVkUmFuZ2UgPSBmcmFtZS0+c2VsZWN0aW9uKCku c2VsZWN0aW9uKCkucmFuZ2UoKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gc2VsZWN0ZWRSYW5n ZSAmJiBIVE1MRWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJsYXkoKnNlbGVjdGVkUmFuZ2UpOwot ICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFpbWFnZVVSTC5pc0VtcHR5KCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIHNlbGVjdGlvbklzSW5zaWRlSW1hZ2VPdmVybGF5OwogCiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfSkoKTsKQEAgLTk2Myw3ICs5NjMsNyBAQCB2 b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQogCiAjaWYgRU5BQkxFKEFQUF9I SUdITElHSFRTKQogICAgICAgICAgICAgICAgIGlmIChhdXRvKiBwYWdlID0gZnJhbWUtPnBhZ2Uo KSkgewotICAgICAgICAgICAgICAgICAgICBpZiAocGFnZS0+c2V0dGluZ3MoKS5hcHBIaWdobGln aHRzRW5hYmxlZCgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChwYWdlLT5zZXR0aW5ncygp LmFwcEhpZ2hsaWdodHNFbmFibGVkKCkgJiYgIXNlbGVjdGlvbklzSW5zaWRlSW1hZ2VPdmVybGF5 KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKEFkZEhpZ2hsaWdodFRvTmV3 R3JvdXBJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAg IGFwcGVuZEl0ZW0oQWRkSGlnaGxpZ2h0SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAg ICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKCpzZXBhcmF0b3JJdGVtKCksIG1fY29udGV4 dE1lbnUuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IGNiZDM0 ZjI1MWU2YmNkYjUxZDk3NGQ1M2UzZWMyNGJkNTAyZGQ2MTUuLjQzMGMzOWJkZmNmMzA0OGIwYTU0 NDBjODg3YTc1NWYwZGI1ZTFmNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAK QEAgLTEyNCw2ICsxMjQsNyBAQAogI2luY2x1ZGUgIkxlZ2FjeVNjaGVtZVJlZ2lzdHJ5LmgiCiAj aW5jbHVkZSAiTGliV2ViUlRDUHJvdmlkZXIuaCIKICNpbmNsdWRlICJMb2FkZXJTdHJhdGVneS5o IgorI2luY2x1ZGUgIkxvY2FsaXplZFN0cmluZ3MuaCIKICNpbmNsdWRlICJMb2NhdGlvbi5oIgog I2luY2x1ZGUgIk1hbGxvY1N0YXRpc3RpY3MuaCIKICNpbmNsdWRlICJNZWRpYURldmljZXMuaCIK QEAgLTYwNTMsNiArNjA1NCwxNCBAQCBib29sIEludGVybmFsczo6aGFzU2FuZGJveElPS2l0T3Bl bkFjY2Vzc1RvQ2xhc3MoY29uc3QgU3RyaW5nJiBwcm9jZXNzLCBjb25zdCBTdAogI2VuZGlmCiAK ICNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCitWZWN0b3I8U3RyaW5nPiBJbnRlcm5hbHM6OmFw cEhpZ2hsaWdodENvbnRleHRNZW51SXRlbVRpdGxlcygpIGNvbnN0Cit7CisgICAgcmV0dXJuIHt7 CisgICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ0FkZEhpZ2hsaWdodFRvQ3VycmVudEdyb3VwKCks CisgICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ0FkZEhpZ2hsaWdodFRvTmV3R3JvdXAoKSwKKyAg ICB9fTsKK30KKwogdW5zaWduZWQgSW50ZXJuYWxzOjpudW1iZXJPZkFwcEhpZ2hsaWdodHMoKQog ewogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGNvbnRleHREb2N1bWVudCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggYzk2ZDY1NjVjOTI0YzUzOTI3YzYxN2VkODExNTI1NGM2 NWViNWVjMi4uZTIwMjM0YjdiYTRmNTdlM2U0OTQyOWZmMGQyNTg2MTMwYmZkMzI0ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC0xMTAwLDYgKzExMDAsNyBAQCBwdWJsaWM6CiAg ICAgYm9vbCBkZXN0cm95U2xlZXBEaXNhYmxlcih1bnNpZ25lZCBpZGVudGlmaWVyKTsKICAgICAg ICAgCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIFZlY3RvcjxTdHJpbmc+IGFwcEhp Z2hsaWdodENvbnRleHRNZW51SXRlbVRpdGxlcygpIGNvbnN0OwogICAgIHVuc2lnbmVkIG51bWJl ck9mQXBwSGlnaGxpZ2h0cygpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3Rlc3RpbmcvSW50ZXJuYWxzLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmlkbAppbmRleCBhNzBjZDc4NjdkMGU2M2E4OTNiZjVkMDFhNjg2ZGY1MTM0MGI1YTI1Li4wMzVh MjY4ZDMyZjdmZmI0YjRmZjBmZTQ5MGI5ZWNkM2Q1NzNkZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuaWRsCkBAIC0xMDAyLDYgKzEwMDIsNyBAQCBlbnVtIFRyZWVUeXBlIHsKICAg ICB1bnNpZ25lZCBsb25nIGNyZWF0ZVNsZWVwRGlzYWJsZXIoRE9NU3RyaW5nIHJlYXNvbiwgYm9v bGVhbiBkaXNwbGF5KTsKICAgICBib29sZWFuIGRlc3Ryb3lTbGVlcERpc2FibGVyKHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllcik7CiAgICAgCisgICAgW0NvbmRpdGlvbmFsPUFQUF9ISUdITElHSFRT XSByZWFkb25seSBhdHRyaWJ1dGUgc2VxdWVuY2U8RE9NU3RyaW5nPiBhcHBIaWdobGlnaHRDb250 ZXh0TWVudUl0ZW1UaXRsZXM7CiAgICAgW0NvbmRpdGlvbmFsPUFQUF9ISUdITElHSFRTXSB1bnNp Z25lZCBsb25nIG51bWJlck9mQXBwSGlnaGxpZ2h0cygpOwogCiAgICAgW0NvbmRpdGlvbmFsPVdF QlhSXSByZWFkb25seSBhdHRyaWJ1dGUgV2ViWFJUZXN0IHhyVGVzdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0VkaXRvclN0YXRlLmNwcAppbmRleCBjOGRjZmE1MmJiMDU2NWMyMzhhNjQ1M2ZmOWExZTYwODQ2 N2E2YWI5Li44OWZlZGU5N2I4MDZmMjM3MzExYmRjZjY0NDliOTM2M2E0MjAxNWE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC0zOSw2ICszOSw3IEBAIHZvaWQgRWRpdG9y U3RhdGU6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8 PCBzaG91bGRJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzOwogICAgIGVuY29kZXIgPDwgc2VsZWN0aW9u SXNOb25lOwogICAgIGVuY29kZXIgPDwgc2VsZWN0aW9uSXNSYW5nZTsKKyAgICBlbmNvZGVyIDw8 IHNlbGVjdGlvbklzUmFuZ2VJbnNpZGVJbWFnZU92ZXJsYXk7CiAgICAgZW5jb2RlciA8PCBpc0Nv bnRlbnRFZGl0YWJsZTsKICAgICBlbmNvZGVyIDw8IGlzQ29udGVudFJpY2hseUVkaXRhYmxlOwog ICAgIGVuY29kZXIgPDwgaXNJblBhc3N3b3JkRmllbGQ7CkBAIC02Niw2ICs2Nyw5IEBAIGJvb2wg RWRpdG9yU3RhdGU6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEVkaXRvclN0YXRlJiBy ZXN1bHQpCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuc2VsZWN0aW9uSXNSYW5nZSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0 LnNlbGVjdGlvbklzUmFuZ2VJbnNpZGVJbWFnZU92ZXJsYXkpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5pc0NvbnRlbnRFZGl0YWJsZSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFy ZWQvRWRpdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmgKaW5k ZXggZDk1NjhhY2YxMDQ4YzdhMGU1ZmMyMTM1NTJlZjkwOTI1OTc1NmZmMi4uZTE4ZmQwN2NmZTYz ZmE0ZWYyOWZhNTNlNWY5MDBhZTViNGQ3YmIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvRWRpdG9yU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0 ZS5oCkBAIC03NSw2ICs3NSw3IEBAIHN0cnVjdCBFZGl0b3JTdGF0ZSB7CiAgICAgYm9vbCBzaG91 bGRJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzIHsgZmFsc2UgfTsKICAgICBib29sIHNlbGVjdGlvbklz Tm9uZSB7IHRydWUgfTsgLy8gVGhpcyB3aWxsIGJlIGZhbHNlIHdoZW4gdGhlcmUgaXMgYSBjYXJl dCBzZWxlY3Rpb24uCiAgICAgYm9vbCBzZWxlY3Rpb25Jc1JhbmdlIHsgZmFsc2UgfTsKKyAgICBi b29sIHNlbGVjdGlvbklzUmFuZ2VJbnNpZGVJbWFnZU92ZXJsYXkgeyBmYWxzZSB9OwogICAgIGJv b2wgaXNDb250ZW50RWRpdGFibGUgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNDb250ZW50UmljaGx5 RWRpdGFibGUgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNJblBhc3N3b3JkRmllbGQgeyBmYWxzZSB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KaW5kZXggM2JkNTQ3NGFhMDdkNWIzZTUzMDIxYWI2NjE4NjA5NWYzZjAw NGZkNy4uYmU3ZTc0MTYwYzJjYWQwOWQyN2RhOTFhMmQ2YmJmNjhhOTg2NjIwZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC0zNTQ4LDYgKzM1NDgsMTYgQEAgLSAodm9pZCl0aW50Q29sb3JEaWRDaGFuZ2UK ICAgICAgICAgW190ZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQgYWN0aXZhdGVTZWxlY3Rpb25dOwog fQogCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorCistIChCT09MKXNob3VsZEFsbG93QXBw SGlnaGxpZ2h0Q3JlYXRpb24KK3sKKyAgICBhdXRvIGVkaXRvclN0YXRlID0gX3BhZ2UtPmVkaXRv clN0YXRlKCk7CisgICAgcmV0dXJuIGVkaXRvclN0YXRlLnNlbGVjdGlvbklzUmFuZ2UgJiYgIWVk aXRvclN0YXRlLmlzQ29udGVudEVkaXRhYmxlICYmICFlZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc1Jh bmdlSW5zaWRlSW1hZ2VPdmVybGF5OworfQorCisjZW5kaWYgLy8gRU5BQkxFKEFQUF9ISUdITElH SFRTKQorCiAtIChCT09MKWNhblBlcmZvcm1BY3Rpb246KFNFTClhY3Rpb24gd2l0aFNlbmRlcjoo aWQpc2VuZGVyCiB7CiAgICAgaWYgKF9kb21QYXN0ZVJlcXVlc3RIYW5kbGVyKQpAQCAtMzU2Niw4 ICszNTc2LDExIEBAIC0gKEJPT0wpY2FuUGVyZm9ybUFjdGlvbjooU0VMKWFjdGlvbiB3aXRoU2Vu ZGVyOihpZClzZW5kZXIKICAgICAgICAgcmV0dXJuIGVkaXRvclN0YXRlLmlzQ29udGVudEVkaXRh YmxlOwogCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQotICAgIGlmIChhY3Rpb24gPT0gQHNl bGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOikgfHwgYWN0aW9u ID09IEBzZWxlY3RvcihjcmVhdGVIaWdobGlnaHRJbk5ld0dyb3VwV2l0aFJhbmdlOikpCi0gICAg ICAgIHJldHVybiBlZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc1JhbmdlICYmICFlZGl0b3JTdGF0ZS5p c0NvbnRlbnRFZGl0YWJsZTsKKyAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihjcmVhdGVIaWdo bGlnaHRJbkN1cnJlbnRHcm91cFdpdGhSYW5nZTopIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3IoY3Jl YXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZTopKSB7CisgICAgICAgIC8vIEZJWE1FOiBJ dCBkb2Vzbid0IHNlZW0gbGlrZSB0aGlzIGNvZGVwYXRoIGlzIGV4ZXJjaXNlZCwgc2luY2UgVUlL aXQgb25seSBhc2tzIGZvciB0aGUgYWN0aW9uIHRhcmdldCBmb3IgY3VzdG9tIGFjdGlvbnMKKyAg ICAgICAgLy8gYWRkZWQgdmlhIC1bVUlNZW51Q29udHJvbGxlciBzZXRNZW51SXRlbXM6XS4gQ2Fu IHdlIHJlbW92ZSB0aGlzIGNoZWNrPworICAgICAgICByZXR1cm4gc2VsZi5zaG91bGRBbGxvd0Fw cEhpZ2hsaWdodENyZWF0aW9uOworICAgIH0KICNlbmRpZgogCiAgICAgcmV0dXJuIFtfd2ViVmll dyBjYW5QZXJmb3JtQWN0aW9uOmFjdGlvbiB3aXRoU2VuZGVyOnNlbmRlcl07CkBAIC0zNzYyLDcg KzM3NzUsNyBAQCAtIChpZCl0YXJnZXRGb3JBY3Rpb246KFNFTClhY3Rpb24gd2l0aFNlbmRlcjoo aWQpc2VuZGVyCiB7CiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQogICAgIGlmIChhY3Rpb24g PT0gQHNlbGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOikgfHwg YWN0aW9uID09IEBzZWxlY3RvcihjcmVhdGVIaWdobGlnaHRJbk5ld0dyb3VwV2l0aFJhbmdlOikp Ci0gICAgICAgIHJldHVybiBzZWxmOworICAgICAgICByZXR1cm4gc2VsZi5zaG91bGRBbGxvd0Fw cEhpZ2hsaWdodENyZWF0aW9uID8gc2VsZiA6IG5pbDsKICNlbmRpZgogICAgIHJldHVybiBbX3dl YlZpZXcgdGFyZ2V0Rm9yQWN0aW9uOmFjdGlvbiB3aXRoU2VuZGVyOnNlbmRlcl07CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDNiNjNiMWI2 ODU4MGMwNDUwZDg3YjA0NzVmMDlkNWU1N2UxZDI2ZjQuLmY0NTdjODY0YjNkMjNhMGIwYjU1OWM2 ZTg2ZTZlZDk3MjJhMmY4OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCkBAIC0xMjA4LDYgKzEyMDgsMTEgQEAgRWRpdG9yU3RhdGUgV2ViUGFnZTo6 ZWRpdG9yU3RhdGUoU2hvdWxkUGVyZm9ybUxheW91dCBzaG91bGRQZXJmb3JtTGF5b3V0KSBjb25z dAogICAgIFJlZjxEb2N1bWVudD4gZG9jdW1lbnQgPSAqZnJhbWUtPmRvY3VtZW50KCk7CiAgICAg cmVzdWx0Lm9yaWdpbklkZW50aWZpZXJGb3JQYXN0ZWJvYXJkID0gZG9jdW1lbnQtPm9yaWdpbklk ZW50aWZpZXJGb3JQYXN0ZWJvYXJkKCk7CiAKKyAgICBpZiAocmVzdWx0LnNlbGVjdGlvbklzUmFu Z2UpIHsKKyAgICAgICAgYXV0byBzZWxlY3Rpb25SYW5nZSA9IHNlbGVjdGlvbi5yYW5nZSgpOwor ICAgICAgICByZXN1bHQuc2VsZWN0aW9uSXNSYW5nZUluc2lkZUltYWdlT3ZlcmxheSA9IHNlbGVj dGlvblJhbmdlICYmIEhUTUxFbGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheSgqc2VsZWN0aW9u UmFuZ2UpOworICAgIH0KKwogICAgIGlmIChzaG91bGRQZXJmb3JtTGF5b3V0ID09IFNob3VsZFBl cmZvcm1MYXlvdXQ6OlllcyB8fCBwbGF0Zm9ybU5lZWRzTGF5b3V0Rm9yRWRpdG9yU3RhdGUoZnJh bWUpKQogICAgICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0KCk7IC8vIE1heSBjYXVzZSBkb2N1 bWVudCBkZXN0cnVjdGlvbgogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggNTU2OTg4NTg5N2U2YjRlMTA2MTE4MDg1ZjU2NGM2Nzc1NTg0ZTBhNy4u NjI2MmJmZTUyZjAxYWM1ZmZjZjU1MDgxOWYwMjI4ZjVmOWY1NWYwMSAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIx LTA0LTMwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAg IEFwcCBoaWdobGlnaHQgVUkgc2hvdWxkIGJlIGRpc2FibGVkIHdoZW4gc2VsZWN0aW5nIHRleHQg aW4gaW1hZ2Ugb3ZlcmxheXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNTI2MAorICAgICAgICByZGFyOi8vNzczNTkzMTMKKworICAgICAgICBSZXZp ZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XS0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlvbnMubW06CisKKyAgICAgICAgQWRkIGEg bmV3IEFQSSB0ZXN0IHRvIHZlcmlmeSB0aGUgYmVoYXZpb3Igb2YgYC10YXJnZXRGb3JBY3Rpb246 d2l0aFNlbmRlcjpgIGluIGBXS0NvbnRlbnRWaWV3YC4KKworICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvVGVzdE9wdGlvbnMuY3BwOgorICAgICAgICAoV1RSOjpUZXN0T3B0aW9uczo6ZGVmYXVs dHMpOgorICAgICAgICAoV1RSOjpUZXN0T3B0aW9uczo6a2V5VHlwZU1hcHBpbmcpOgorICAgICAg ICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaDoKKyAgICAgICAgKFdUUjo6VGVzdE9w dGlvbnM6OmFwcEhpZ2hsaWdodHNFbmFibGVkIGNvbnN0KToKKyAgICAgICAgKiBXZWJLaXRUZXN0 UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW06CisgICAgICAgIChXVFI6OlRlc3RD b250cm9sbGVyOjpwbGF0Zm9ybUNyZWF0ZVdlYlZpZXcpOgorCisgICAgICAgIEFkZCBzdXBwb3J0 IGZvciBhIG5ldyBgVGVzdE9wdGlvbmAgdGhhdCBlbmFibGVzIGFwcCBoaWdobGlnaHRzLiBTZWUg dGhlIG5ldyBsYXlvdXQgdGVzdCBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KKwogMjAyMS0wNC0zMCAg Q29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcmV2ZXJ0aW5nIHIyNzY4NDYuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudFZpZXdFZGl0aW5nQWN0aW9ucy5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rp b25zLm1tCmluZGV4IGFiNmY2Mjk4OTAxMTQ0YTg0NjU5NTgxNDk1MDdjYzc5NzdjOTI5M2IuLmJi NTczZTM5ZGVjZDQyMzc5MWRhNGI3YzU2MzJiYzYwOWFmM2M1NGIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rp b25zLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250 ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1tCkBAIC0zMiw2ICszMiw4IEBACiAjaW1wb3J0ICJUZXN0 TmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0 ICJVSUtpdFNQSS5oIgorI2ltcG9ydCAiV0tXZWJWaWV3Q29uZmlndXJhdGlvbkV4dHJhcy5oIgor I2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmg+CiAjaW1wb3J0 IDxXZWJLaXQvV2ViS2l0Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKQEAgLTcxLDQg KzczLDMyIEBAIFRFU1QoV2ViS2l0LCBJbnZva2VTaGFyZVdpdGhvdXRTZWxlY3Rpb24pCiAgICAg W3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwogfQogCi0jZW5kaWYKKyNp ZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikgJiYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorCitU RVNUKFdlYktpdCwgQXBwSGlnaGxpZ2h0c0luSW1hZ2VPdmVybGF5cykKK3sKKyAgICBhdXRvIGNv bmZpZ3VyYXRpb24gPSByZXRhaW5QdHIoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Rlc3RfY29u ZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1BsdWdJbldpdGhJ bnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXSk7CisgICAgW2NvbmZpZ3VyYXRp b24gX3NldEFwcEhpZ2hsaWdodHNFbmFibGVkOllFU107CisKKyAgICBhdXRvIHdlYlZpZXcgPSBh ZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAs IDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBb d2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJzaW1wbGUtaW1hZ2Utb3Zl cmxheSJdOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzZWxl Y3RJbWFnZU92ZXJsYXkoKSJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9u VXBkYXRlXTsKKworICAgIGF1dG8gY3JlYXRlSGlnaGxpZ2h0SW5DdXJyZW50R3JvdXBXaXRoUmFu Z2VTZWxlY3RvciA9IE5TU2VsZWN0b3JGcm9tU3RyaW5nKEAiY3JlYXRlSGlnaGxpZ2h0SW5DdXJy ZW50R3JvdXBXaXRoUmFuZ2U6Iik7CisgICAgYXV0byBjcmVhdGVIaWdobGlnaHRJbk5ld0dyb3Vw V2l0aFJhbmdlU2VsZWN0b3IgPSBOU1NlbGVjdG9yRnJvbVN0cmluZyhAImNyZWF0ZUhpZ2hsaWdo dEluTmV3R3JvdXBXaXRoUmFuZ2U6Iik7CisKKyAgICBhdXRvIGNvbnRlbnRWaWV3ID0gW3dlYlZp ZXcgdGV4dElucHV0Q29udGVudFZpZXddOworICAgIEVYUEVDVF9OVUxMKFtjb250ZW50VmlldyB0 YXJnZXRGb3JBY3Rpb246Y3JlYXRlSGlnaGxpZ2h0SW5DdXJyZW50R3JvdXBXaXRoUmFuZ2VTZWxl Y3RvciB3aXRoU2VuZGVyOm5pbF0pOworICAgIEVYUEVDVF9OVUxMKFtjb250ZW50VmlldyB0YXJn ZXRGb3JBY3Rpb246Y3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdpdGhSYW5nZVNlbGVjdG9yIHdp dGhTZW5kZXI6bmlsXSk7CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdl TmFtZWQ6QCJzaW1wbGUiXTsKKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAgICBbd2Vi VmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisgICAgRVhQRUNUX0VRKFtjb250 ZW50VmlldyB0YXJnZXRGb3JBY3Rpb246Y3JlYXRlSGlnaGxpZ2h0SW5DdXJyZW50R3JvdXBXaXRo UmFuZ2VTZWxlY3RvciB3aXRoU2VuZGVyOm5pbF0sIGNvbnRlbnRWaWV3KTsKKyAgICBFWFBFQ1Rf RVEoW2NvbnRlbnRWaWV3IHRhcmdldEZvckFjdGlvbjpjcmVhdGVIaWdobGlnaHRJbk5ld0dyb3Vw V2l0aFJhbmdlU2VsZWN0b3Igd2l0aFNlbmRlcjpuaWxdLCBjb250ZW50Vmlldyk7Cit9CisKKyNl bmRpZiAvLyBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikgJiYgRU5BQkxFKEFQUF9ISUdITElHSFRT KQorCisjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0T3B0aW9ucy5jcHAKaW5kZXggNGNmMTE3OTZkY2Q5MTNhNTMwNjE3ODgxNmYxZjM1NDViYTkx MTFmNC4uOTRiMGNjYWQ4NGZlOTBmOTE0Y2QxZGNlOTM5NmZkMTM4ZmM1ODgyNyAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHAKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHAKQEAgLTEzNSw2ICsxMzUsNyBAQCBjb25zdCBU ZXN0RmVhdHVyZXMmIFRlc3RPcHRpb25zOjpkZWZhdWx0cygpCiAgICAgICAgICAgICB7ICJlbmFi bGVJbkFwcEJyb3dzZXJQcml2YWN5IiwgZmFsc2UgfSwKICAgICAgICAgICAgIHsgImVuYWJsZVBy b2Nlc3NTd2FwT25OYXZpZ2F0aW9uIiwgdHJ1ZSB9LAogICAgICAgICAgICAgeyAiZW5hYmxlUHJv Y2Vzc1N3YXBPbldpbmRvd09wZW4iLCBmYWxzZSB9LAorICAgICAgICAgICAgeyAiYXBwSGlnaGxp Z2h0c0VuYWJsZWQiLCBmYWxzZSB9LAogICAgICAgICAgICAgeyAiaWdub3JlU3luY2hyb25vdXNN ZXNzYWdpbmdUaW1lb3V0cyIsIGZhbHNlIH0sCiAgICAgICAgICAgICB7ICJpZ25vcmVzVmlld3Bv cnRTY2FsZUxpbWl0cyIsIGZhbHNlIH0sCiAgICAgICAgICAgICB7ICJpc0FwcEJvdW5kV2ViVmll dyIsIGZhbHNlIH0sCkBAIC0xODYsNiArMTg3LDcgQEAgY29uc3Qgc3RkOjp1bm9yZGVyZWRfbWFw PHN0ZDo6c3RyaW5nLCBUZXN0SGVhZGVyS2V5VHlwZT4mIFRlc3RPcHRpb25zOjprZXlUeXBlTWEK ICAgICAgICAgeyAiZW5hYmxlSW5BcHBCcm93c2VyUHJpdmFjeSIsIFRlc3RIZWFkZXJLZXlUeXBl OjpCb29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJlbmFibGVQcm9jZXNzU3dhcE9uTmF2aWdh dGlvbiIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJl bmFibGVQcm9jZXNzU3dhcE9uV2luZG93T3BlbiIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVz dFJ1bm5lciB9LAorICAgICAgICB7ICJhcHBIaWdobGlnaHRzRW5hYmxlZCIsIFRlc3RIZWFkZXJL ZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJpZ25vcmVTeW5jaHJvbm91c01l c3NhZ2luZ1RpbWVvdXRzIiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0UnVubmVyIH0sCiAg ICAgICAgIHsgImlnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRzIiwgVGVzdEhlYWRlcktleVR5cGU6 OkJvb2xUZXN0UnVubmVyIH0sCiAgICAgICAgIHsgImlzQXBwQm91bmRXZWJWaWV3IiwgVGVzdEhl YWRlcktleVR5cGU6OkJvb2xUZXN0UnVubmVyIH0sCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RPcHRpb25zLmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRp b25zLmgKaW5kZXggZGM5OWEwMjVjNzlmYTU0ZGFiZmUwODUwZTYwMjIyNGIwN2Q2MjExZS4uOTM2 MDM4NzQ2Y2FiN2U5ZTlkNzkyYTVlOTljYjg1ZmNhNzEyZjJlOSAxMDA2NDQKLS0tIGEvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdE9wdGlvbnMuaApAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbmFi bGVJbkFwcEJyb3dzZXJQcml2YWN5KCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0 dXJlVmFsdWUoImVuYWJsZUluQXBwQnJvd3NlclByaXZhY3kiKTsgfQogICAgIGJvb2wgZW5hYmxl UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24oKSBjb25zdCB7IHJldHVybiBib29sVGVzdFJ1bm5lckZl YXR1cmVWYWx1ZSgiZW5hYmxlUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24iKTsgfQogICAgIGJvb2wg ZW5hYmxlUHJvY2Vzc1N3YXBPbldpbmRvd09wZW4oKSBjb25zdCB7IHJldHVybiBib29sVGVzdFJ1 bm5lckZlYXR1cmVWYWx1ZSgiZW5hYmxlUHJvY2Vzc1N3YXBPbldpbmRvd09wZW4iKTsgfQorICAg IGJvb2wgYXBwSGlnaGxpZ2h0c0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBib29sVGVzdFJ1bm5l ckZlYXR1cmVWYWx1ZSgiYXBwSGlnaGxpZ2h0c0VuYWJsZWQiKTsgfQogICAgIGJvb2wgaWdub3Jl U3luY2hyb25vdXNNZXNzYWdpbmdUaW1lb3V0cygpIGNvbnN0IHsgcmV0dXJuIGJvb2xUZXN0UnVu bmVyRmVhdHVyZVZhbHVlKCJpZ25vcmVTeW5jaHJvbm91c01lc3NhZ2luZ1RpbWVvdXRzIik7IH0K ICAgICBib29sIGlnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRzKCkgY29uc3QgeyByZXR1cm4gYm9v bFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoImlnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRzIik7IH0K ICAgICBib29sIGlzQXBwQm91bmRXZWJWaWV3KCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5u ZXJGZWF0dXJlVmFsdWUoImlzQXBwQm91bmRXZWJWaWV3Iik7IH0KZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbSBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQppbmRleCAzNjEzMzJl NTZjMGY0NzMxMDNiNzU1MTJiMGU1M2MwM2Y5MjgzOTNkLi45YjdjYTA3NGUzNjE4NjE4ZDYzMzYy MTU1OWJkNGQyNmRiNzRkNTMyIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2Nv Y29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9j b2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCkBAIC0xNzYsNiArMTc2LDcgQEAgdm9pZCBUZXN0 Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVXZWJWaWV3KFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYs IGNvbnN0IFRlc3RPcHQKIAogICAgIFtjb3BpZWRDb25maWd1cmF0aW9uIHNldFdlYnNpdGVEYXRh U3RvcmU6KFdLV2Vic2l0ZURhdGFTdG9yZSAqKXdlYnNpdGVEYXRhU3RvcmUoKV07CiAgICAgW2Nv cGllZENvbmZpZ3VyYXRpb24gX3NldEFsbG93VG9wTmF2aWdhdGlvblRvRGF0YVVSTHM6b3B0aW9u cy5hbGxvd1RvcE5hdmlnYXRpb25Ub0RhdGFVUkxzKCldOworICAgIFtjb3BpZWRDb25maWd1cmF0 aW9uIF9zZXRBcHBIaWdobGlnaHRzRW5hYmxlZDpvcHRpb25zLmFwcEhpZ2hsaWdodHNFbmFibGVk KCldOwogCiAgICAgY29uZmlndXJlQ29udGVudE1vZGUoY29waWVkQ29uZmlndXJhdGlvbi5nZXQo KSwgb3B0aW9ucyk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3ZTUyZDE5MGYyMGRjZDI5ZTE2ZWM2ZjhmMGFkNmRmYjZm MzJhZTA2Li5lN2RjZDA2MzFjYmIzMzMwOWY0MzcyYjg5Yzk2OTA4ODE5NjE1ZDk2IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMzAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBh cHBsZS5jb20+CisKKyAgICAgICAgQXBwIGhpZ2hsaWdodCBVSSBzaG91bGQgYmUgZGlzYWJsZWQg d2hlbiBzZWxlY3RpbmcgdGV4dCBpbiBpbWFnZSBvdmVybGF5cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MjYwCisgICAgICAgIHJkYXI6Ly83NzM1 OTMxMworCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgQWRkIGEg bmV3IGxheW91dCB0ZXN0IHRvIHZlcmlmeSB0aGF0IHRoZSBhcHAgaGlnbGlnaHQgY29udGV4dCBt ZW51IGl0ZW1zIGRvbid0IHNob3cgdXAgb24gbWFjT1Mgd2hlbiByaWdodAorICAgICAgICBjbGlj a2luZy4KKworICAgICAgICAqIGZhc3QvaW1hZ2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdl LW92ZXJsYXktdGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxpZ2h0LW1lbnUtaXRlbXMtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9p bWFnZS1vdmVybGF5LXRleHQtZGlzYWJsZXMtYXBwLWhpZ2hsaWdodC1tZW51LWl0ZW1zLmh0bWw6 IEFkZGVkLgorCiAyMDIxLTA0LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBTaGFyZSBzdHlsZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRy ZWVzIHdpdGhvdXQgc3R5bGUgc2hlZXRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lt YWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9pbWFnZS1vdmVybGF5LXRleHQtZGlzYWJsZXMtYXBw LWhpZ2hsaWdodC1tZW51LWl0ZW1zLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaW1h Z2VzL2ltYWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJsYXktdGV4dC1kaXNhYmxlcy1hcHAt aGlnaGxpZ2h0LW1lbnUtaXRlbXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM4YzBlN2IzNzFk YmMxYWVmODI3ODUzNmU2ZDIwZWVlM2VlN2IyNTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L2ltYWdlcy9pbWFnZS1leHRyYWN0aW9uL21hYy9pbWFnZS1vdmVybGF5LXRleHQt ZGlzYWJsZXMtYXBwLWhpZ2hsaWdodC1tZW51LWl0ZW1zLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDkgQEAKK1BBU1MgZm91bmRUaXRsZTEgaXMgdHJ1ZQorUEFTUyBmb3VuZFRpdGxlMiBpcyB0cnVl CitQQVNTIFNlbGVjdGVkIGltYWdlIG92ZXJsYXkKK1BBU1MgZm91bmRUaXRsZTEgaXMgZmFsc2UK K1BBU1MgZm91bmRUaXRsZTIgaXMgZmFsc2UKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdl cy9pbWFnZS1leHRyYWN0aW9uL21hYy9pbWFnZS1vdmVybGF5LXRleHQtZGlzYWJsZXMtYXBwLWhp Z2hsaWdodC1tZW51LWl0ZW1zLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9pbWFnZS1l eHRyYWN0aW9uL21hYy9pbWFnZS1vdmVybGF5LXRleHQtZGlzYWJsZXMtYXBwLWhpZ2hsaWdodC1t ZW51LWl0ZW1zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzJiYWI1OTg0ZjM4ODI0NTI3OTFkMDhiOTJiZDdh OTY1Yjk0NDQ3MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2lt YWdlLWV4dHJhY3Rpb24vbWFjL2ltYWdlLW92ZXJsYXktdGV4dC1kaXNhYmxlcy1hcHAtaGlnaGxp Z2h0LW1lbnUtaXRlbXMuaHRtbApAQCAtMCwwICsxLDc3IEBACis8IURPQ1RZUEUgaHRtbD4gPCEt LSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBhcHBIaWdobGlnaHRzRW5hYmxlZD10cnVlIF0gLS0+Cis8 aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0 LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2JvZHksIGh0bWwgeworICAgIG1hcmdpbjogMDsKK30K KworcCB7CisgICAgZm9udC1zaXplOiAzMnB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsK K30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxpbWcgc3JjPSIuLi8uLi9yZXNvdXJjZXMv Z3JlZW4tNDAweDQwMC5wbmciPjwvaW1nPgorPHA+SGVsbG8gd29ybGQgdGhpcyBpcyBhIHRlc3Qu PC9wPgorPC9ib2R5PgorPHNjcmlwdD4KK3ZhciBmb3VuZFRpdGxlMTsKK3ZhciBmb3VuZFRpdGxl MjsKKworZnVuY3Rpb24gY2hlY2tGb3JBcHBIaWdobGlnaHRDb250ZXh0TWVudUl0ZW1zKCkgewor ICAgIGZvdW5kVGl0bGUxID0gZmFsc2U7CisgICAgZm91bmRUaXRsZTIgPSBmYWxzZTsKKworICAg IGxldCBbdGl0bGUxLCB0aXRsZTJdID0gaW50ZXJuYWxzLmFwcEhpZ2hsaWdodENvbnRleHRNZW51 SXRlbVRpdGxlczsKKyAgICBmb3IgKGxldCBpdGVtIG9mIGV2ZW50U2VuZGVyLmNvbnRleHRDbGlj aygpKSB7CisgICAgICAgIGlmIChpdGVtLnRpdGxlID09PSB0aXRsZTEpCisgICAgICAgICAgICBm b3VuZFRpdGxlMSA9IHRydWU7CisKKyAgICAgICAgaWYgKGl0ZW0udGl0bGUgPT09IHRpdGxlMikK KyAgICAgICAgICAgIGZvdW5kVGl0bGUyID0gdHJ1ZTsKKyAgICB9Cit9CisKK2FkZEV2ZW50TGlz dGVuZXIoImxvYWQiLCAoKSA9PiB7CisgICAgbGV0IHRleHQgPSBkb2N1bWVudC5xdWVyeVNlbGVj dG9yKCJwIik7CisgICAgbGV0IHRleHRSZWN0ID0gdGV4dC5nZXRCb3VuZGluZ0NsaWVudFJlY3Qo KTsKKyAgICBsZXQgaW1hZ2UgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJpbWciKTsKKworICAg IGludGVybmFscy5pbnN0YWxsSW1hZ2VPdmVybGF5KGltYWdlLCBbCisgICAgICAgIHsKKyAgICAg ICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwKSwKKyAgICAgICAgICAg IHRvcFJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMCksCisgICAgICAgICAgICBib3R0 b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDEpLAorICAgICAgICAgICAgYm90dG9t TGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDEpLAorICAgICAgICAgICAgY2hpbGRyZW46 IFsKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHRleHQgOiAiZm9vYmFy IiwKKyAgICAgICAgICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAs IDApLAorICAgICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5 KDEsIDApLAorICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDEsIDEpLAorICAgICAgICAgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBv aW50UmVhZE9ubHkoMCwgMSksCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgXQorICAg ICAgICB9CisgICAgXSk7CisKKyAgICBnZXRTZWxlY3Rpb24oKS5zZWxlY3RBbGxDaGlsZHJlbih0 ZXh0KTsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh0ZXh0UmVjdC5sZWZ0ICsgdGV4dFJl Y3Qud2lkdGggLyAyLCB0ZXh0UmVjdC50b3AgKyB0ZXh0UmVjdC5oZWlnaHQgLyAyKTsKKyAgICBj aGVja0ZvckFwcEhpZ2hsaWdodENvbnRleHRNZW51SXRlbXMoKTsKKyAgICBzaG91bGRCZVRydWUo ImZvdW5kVGl0bGUxIik7CisgICAgc2hvdWxkQmVUcnVlKCJmb3VuZFRpdGxlMiIpOworCisgICAg Z2V0U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hpbGRyZW4oaW50ZXJuYWxzLnNoYWRvd1Jvb3QoaW1h Z2UpLnF1ZXJ5U2VsZWN0b3IoImRpdiNpbWFnZS1vdmVybGF5IikpOworICAgIHRlc3RQYXNzZWQo IlNlbGVjdGVkIGltYWdlIG92ZXJsYXkiKQorICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDIw MCwgMjAwKTsKKyAgICBjaGVja0ZvckFwcEhpZ2hsaWdodENvbnRleHRNZW51SXRlbXMoKTsKKyAg ICBzaG91bGRCZUZhbHNlKCJmb3VuZFRpdGxlMSIpOworICAgIHNob3VsZEJlRmFsc2UoImZvdW5k VGl0bGUyIik7CisKKyAgICB0ZXh0LnJlbW92ZSgpOworfSk7Cis8L3NjcmlwdD4KKzwvaHRtbD4K XCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==