263773 2023-10-27 05:15:42 -0700 REGRESSION(269827@main): May have caused PLT (iPad only) regression 2023-10-27 05:23:33 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 263698 1 commit-queue commit-queue webkit-bug-importer zalan oldest_to_newest 1987964 0 commit-queue 2023-10-27 05:15:42 -0700 https://commits.webkit.org/269827@main introduced a regression: May have caused PLT (iPad only) regression This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1987966 1 468365 commit-queue 2023-10-27 05:15:51 -0700 Created attachment 468365 [fast-cq]REVERT of 269827@main Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1987967 2 ews-feeder 2023-10-27 05:22:08 -0700 Committed 269847@main (81c420fb7189): <https://commits.webkit.org/269847@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468365. 1987968 3 webkit-bug-importer 2023-10-27 05:23:33 -0700 <rdar://problem/117583061> 468365 2023-10-27 05:15:51 -0700 2023-10-27 05:22:09 -0700 [fast-cq]REVERT of 269827@main bug-263773-20231027121550.patch text/plain 29176 commit-queue RnJvbSAwNjk5NTc2ODJmYzlkMDFiMjIzMzkyNTdmYWVlMzViZWQ2YTFkMGIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDb21taXQgUXVldWUgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3Jn PgpEYXRlOiBGcmksIDI3IE9jdCAyMDIzIDEyOjE1OjQ4ICswMDAwClN1YmplY3Q6IFtQQVRDSF0g VW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIDI2OTgyN0BtYWluLgogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI2Mzc3MwpNSU1FLVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6 IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJp dAoKTWF5IGhhdmUgY2F1c2VkIFBMVCAoaVBhZCBvbmx5KSByZWdyZXNzaW9uCgpSZXZlcnRlZCBj aGFuZ2VzZXQ6CgoiQSBmbG9hdGluZyBlbGVtZW50IGNhbiBjYXVzZSB0aGUgZm9sbG93aW5nIGVs ZW1lbnTigJlzIHRleHQtaW5kZW50IHRvIGZhaWwiCmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNjM2OTgKaHR0cHM6Ly9jb21taXRzLndlYmtpdC5vcmcvMjY5ODI3QG1h aW4KLS0tCiAuLi4vaW5saW5lL0Fic3RyYWN0TGluZUJ1aWxkZXIuaCAgICAgICAgICAgICAgfCAg MiArLQogLi4uL2lubGluZS9JbmxpbmVDb250ZW50QmFsYW5jZXIuY3BwICAgICAgICAgIHwgIDcg KystLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwICAgICAgICB8IDIz ICsrKysrKystLS0tLS0tLQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oICAg ICAgICAgIHwgIDIgKy0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcCAgICAg ICAgICB8ICA2ICsrLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmggICAgICAg ICAgICB8ICAyICstCiAuLi4vaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCAgICAgICAgICAg ICAgfCAxMSArKysrLS0tCiAuLi4vaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmggICAgICAgICAg ICAgICAgfCAgNCArLS0KIC4uLi9pbmxpbmUvSW5saW5lTGluZVR5cGVzLmggICAgICAgICAgICAg ICAgICB8ICA1IC0tLS0KIC4uLi9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmNwcCAgICAg ICAgICB8ICA2ICsrLS0KIC4uLi9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAg ICAgICB8IDE0ICsrKystLS0tLQogLi4uL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVy LmggICAgICAgIHwgIDggKystLS0KIC4uLm5kZW50LXdpdGgtd2lkZS1mbG9hdC1iZWZvcmUtZXhw ZWN0ZWQuaHRtbCB8IDE3IC0tLS0tLS0tLS0tCiAuLi4vdGV4dC1pbmRlbnQtd2l0aC13aWRlLWZs b2F0LWJlZm9yZS5odG1sICAgfCAyOSAtLS0tLS0tLS0tLS0tLS0tLS0tCiAxNCBmaWxlcyBjaGFu Z2VkLCA0MSBpbnNlcnRpb25zKCspLCA5NSBkZWxldGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0 NCBMYXlvdXRUZXN0cy9mYXN0L3RleHQvdGV4dC1pbmRlbnQtd2l0aC13aWRlLWZsb2F0LWJlZm9y ZS1leHBlY3RlZC5odG1sCiBkZWxldGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L3RleHQtaW5kZW50LXdpdGgtd2lkZS1mbG9hdC1iZWZvcmUuaHRtbAoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0Fic3RyYWN0TGlu ZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0Fic3RyYWN0TGluZUJ1aWxkZXIuaAppbmRleCA5OTYyOWI0MmI1YmMuLjIyOTliZmMxNjQ4 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvQWJzdHJhY3RMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0Fic3RyYWN0TGluZUJ1aWxkZXIuaApAQCAtMzgsNyAr MzgsNyBAQCBzdHJ1Y3QgTGluZUlucHV0IHsKIAogY2xhc3MgQWJzdHJhY3RMaW5lQnVpbGRlciB7 CiBwdWJsaWM6Ci0gICAgdmlydHVhbCBMaW5lTGF5b3V0UmVzdWx0IGxheW91dElubGluZUNvbnRl bnQoY29uc3QgTGluZUlucHV0JiwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91c0NvbnRlbnQ+ JikgPSAwOworICAgIHZpcnR1YWwgTGluZUxheW91dFJlc3VsdCBsYXlvdXRJbmxpbmVDb250ZW50 KGNvbnN0IExpbmVJbnB1dCYsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5lPiYpID0g MDsKICAgICB2aXJ0dWFsIH5BYnN0cmFjdExpbmVCdWlsZGVyKCkgeyB9OwogCiAgICAgdm9pZCBz ZXRJbnRyaW5zaWNXaWR0aE1vZGUoSW50cmluc2ljV2lkdGhNb2RlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRCYWxhbmNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVDb250ZW50QmFsYW5jZXIuY3BwCmluZGV4IGYzYTIzNTc3NmQzNS4uYzZm YjVhNTM1NzliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QmFsYW5jZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCYWxhbmNl ci5jcHAKQEAgLTEzOSwxMSArMTM5LDExIEBAIHZvaWQgSW5saW5lQ29udGVudEJhbGFuY2VyOjpp bml0aWFsaXplKCkKICAgICBhdXRvIGxheW91dFJhbmdlID0gSW5saW5lSXRlbVJhbmdlIHsgMCwg bV9pbmxpbmVJdGVtTGlzdC5zaXplKCkgfTsKICAgICBhdXRvIGxpbmVCdWlsZGVyID0gTGluZUJ1 aWxkZXIgeyBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0LCBtX2hvcml6b250YWxDb25zdHJhaW50 cywgbV9pbmxpbmVJdGVtTGlzdCB9OwogICAgIGF1dG8gcHJldmlvdXNMaW5lRW5kID0gc3RkOjpv cHRpb25hbDxJbmxpbmVJdGVtUG9zaXRpb24+IHsgfTsKLSAgICBhdXRvIHByZXZpb3VzQ29udGVu dCA9IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNDb250ZW50PiB7IH07CisgICAgYXV0byBwcmV2aW91 c0xpbmUgPSBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzTGluZT4geyB9OwogICAgIGF1dG8gbGluZUlu ZGV4ID0gMGx1OwogICAgIHdoaWxlICghbGF5b3V0UmFuZ2UuaXNFbXB0eSgpKSB7CiAgICAgICAg IGF1dG8gbGluZUluaXRpYWxSZWN0ID0gSW5saW5lUmVjdCB7IDAuZiwgbV9ob3Jpem9udGFsQ29u c3RyYWludHMubG9naWNhbExlZnQsIG1faG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0 aCwgMC5mIH07Ci0gICAgICAgIGF1dG8gbGluZUxheW91dFJlc3VsdCA9IGxpbmVCdWlsZGVyLmxh eW91dElubGluZUNvbnRlbnQoeyBsYXlvdXRSYW5nZSwgbGluZUluaXRpYWxSZWN0IH0sIHByZXZp b3VzQ29udGVudCk7CisgICAgICAgIGF1dG8gbGluZUxheW91dFJlc3VsdCA9IGxpbmVCdWlsZGVy LmxheW91dElubGluZUNvbnRlbnQoeyBsYXlvdXRSYW5nZSwgbGluZUluaXRpYWxSZWN0IH0sIHBy ZXZpb3VzTGluZSk7CiAKICAgICAgICAgLy8gUmVjb3JkIHJlbGV2YW50IGdlb21ldHJ5IG1lYXN1 cmVtZW50cyBmcm9tIG9uZSBsaW5lIGxheW91dAogICAgICAgICBtX29yaWdpbmFsTGluZUlubGlu ZUl0ZW1SYW5nZXMuYXBwZW5kKGxpbmVMYXlvdXRSZXN1bHQuaW5saW5lSXRlbVJhbmdlKTsKQEAg LTE1Nyw4ICsxNTcsNyBAQCB2b2lkIElubGluZUNvbnRlbnRCYWxhbmNlcjo6aW5pdGlhbGl6ZSgp CiAKICAgICAgICAgbGF5b3V0UmFuZ2Uuc3RhcnQgPSBJbmxpbmVGb3JtYXR0aW5nVXRpbHM6Omxl YWRpbmdJbmxpbmVJdGVtUG9zaXRpb25Gb3JOZXh0TGluZShsaW5lTGF5b3V0UmVzdWx0LmlubGlu ZUl0ZW1SYW5nZS5lbmQsIHByZXZpb3VzTGluZUVuZCwgbGF5b3V0UmFuZ2UuZW5kKTsKICAgICAg ICAgcHJldmlvdXNMaW5lRW5kID0gbGF5b3V0UmFuZ2Uuc3RhcnQ7Ci0gICAgICAgIC8vIEZJWE1F OiBCYWxhbmNlciBtYXkgY2FyZSBhYm91dCB0ZXh0IGluZGVudCB3aXRoIHByZWNlZGluZyBmbG9h dHMgKGN1cnJlbnRseSBub3Qgc3VwcG9ydGVkIGNvbWJpbmF0aW9uKS4KLSAgICAgICAgcHJldmlv dXNDb250ZW50ID0geyB0cnVlLCBQcmV2aW91c0xpbmUgeyBsaW5lSW5kZXgsIGxpbmVMYXlvdXRS ZXN1bHQuY29udGVudEdlb21ldHJ5LnRyYWlsaW5nT3ZlcmZsb3dpbmdDb250ZW50V2lkdGgsICFs aW5lTGF5b3V0UmVzdWx0LmlubGluZUNvbnRlbnQuaXNFbXB0eSgpICYmIGxpbmVMYXlvdXRSZXN1 bHQuaW5saW5lQ29udGVudC5sYXN0KCkuaXNMaW5lQnJlYWsoKSwgbGluZUxheW91dFJlc3VsdC5k aXJlY3Rpb25hbGl0eS5pbmxpbmVCYXNlRGlyZWN0aW9uLCBXVEZNb3ZlKGxpbmVMYXlvdXRSZXN1 bHQuZmxvYXRDb250ZW50LnN1c3BlbmRlZEZsb2F0cykgfSB9OworICAgICAgICBwcmV2aW91c0xp bmUgPSBQcmV2aW91c0xpbmUgeyBsaW5lSW5kZXgsIGxpbmVMYXlvdXRSZXN1bHQuY29udGVudEdl b21ldHJ5LnRyYWlsaW5nT3ZlcmZsb3dpbmdDb250ZW50V2lkdGgsICFsaW5lTGF5b3V0UmVzdWx0 LmlubGluZUNvbnRlbnQuaXNFbXB0eSgpICYmIGxpbmVMYXlvdXRSZXN1bHQuaW5saW5lQ29udGVu dC5sYXN0KCkuaXNMaW5lQnJlYWsoKSwgbGluZUxheW91dFJlc3VsdC5kaXJlY3Rpb25hbGl0eS5p bmxpbmVCYXNlRGlyZWN0aW9uLCBXVEZNb3ZlKGxpbmVMYXlvdXRSZXN1bHQuZmxvYXRDb250ZW50 LnN1c3BlbmRlZEZsb2F0cykgfTsKICAgICAgICAgbGluZUluZGV4Kys7CiAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZjJm OTRmMzBmNTRhLi4xZjA5MTU4MGNjMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEyMSw3ICsxMjEsNyBAQCBJbmxpbmVMYXlvdXRS ZXN1bHQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dChjb25zdCBDb25zdHJhaW50c0Zv cklubGluZUNvbgogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGF1dG8gcHJldmlv dXNDb250ZW50ID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxQcmV2aW91c0NvbnRlbnQ+IHsKKyAg ICBhdXRvIHByZXZpb3VzTGluZSA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5l PiB7CiAgICAgICAgIGlmICghbmVlZHNMYXlvdXRSYW5nZS5zdGFydCkKICAgICAgICAgICAgIHJl dHVybiB7IH07CiAgICAgICAgIGlmICghbGluZURhbWFnZSB8fCAhbGluZURhbWFnZS0+c3RhcnQo KSkgewpAQCAtMTI5LDggKzEyOSw4IEBAIElubGluZUxheW91dFJlc3VsdCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0KGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29uCiAgICAgICAg ICAgICByZXR1cm4geyB9OwogICAgICAgICB9CiAgICAgICAgIGF1dG8gbGFzdExpbmVJbmRleCA9 IGxpbmVEYW1hZ2UtPnN0YXJ0KCktPmxpbmVJbmRleCAtIDE7Ci0gICAgICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYmUgYWJsZSB0byBleHRyYWN0IHRoZSBsYXN0IGxpbmUgaW5mb3JtYXRpb24gYW5k IHByb3ZpZGUgaXQgdG8gbGF5b3V0IGFzICJwcmV2aW91cyBsaW5lIiAoZW5kcyBpbiBsaW5lIGJy ZWFrIGFuZCBpbmxpbmUgZGlyZWN0aW9uKSBpbmNsdWRpbmcgImhhcyBzZWVuIGlubGluZSBjb250 ZW50Ii4KLSAgICAgICAgcmV0dXJuIFByZXZpb3VzQ29udGVudCB7IHRydWUsIHsgbGFzdExpbmVJ bmRleCwgeyB9LCB7IH0sIHsgfSwgeyB9IH0gfTsKKyAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZCBiZSBhYmxlIHRvIGV4dHJhY3QgdGhlIGxhc3QgbGluZSBpbmZvcm1hdGlvbiBhbmQgcHJvdmlk ZSBpdCB0byBsYXlvdXQgYXMgInByZXZpb3VzIGxpbmUiIChlbmRzIGluIGxpbmUgYnJlYWsgYW5k IGlubGluZSBkaXJlY3Rpb24pLgorICAgICAgICByZXR1cm4gUHJldmlvdXNMaW5lIHsgbGFzdExp bmVJbmRleCwgeyB9LCB7IH0sIHsgfSwgeyB9IH07CiAgICAgfTsKIAogICAgIGlmIChyb290KCku c3R5bGUoKS50ZXh0V3JhcE1vZGUoKSA9PSBUZXh0V3JhcE1vZGU6OldyYXAgJiYgcm9vdCgpLnN0 eWxlKCkudGV4dFdyYXBTdHlsZSgpID09IFRleHRXcmFwU3R5bGU6OkJhbGFuY2UpIHsKQEAgLTE0 MiwxMCArMTQyLDEwIEBAIElubGluZUxheW91dFJlc3VsdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0KGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29uCiAKICAgICBpZiAoVGV4dE9u bHlTaW1wbGVMaW5lQnVpbGRlcjo6aXNFbGlnaWJsZUZvclNpbXBsaWZpZWRUZXh0T25seUlubGlu ZUxheW91dChyb290KCksIHRoaXMtPmlubGluZUNvbnRlbnRDYWNoZSgpLCAmcGxhY2VkRmxvYXRz KSkgewogICAgICAgICBhdXRvIHNpbXBsaWZpZWRMaW5lQnVpbGRlciA9IFRleHRPbmx5U2ltcGxl TGluZUJ1aWxkZXIgeyAqdGhpcywgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLCBpbmxpbmVJdGVt TGlzdCB9OwotICAgICAgICByZXR1cm4gbGluZUxheW91dChzaW1wbGlmaWVkTGluZUJ1aWxkZXIs IGlubGluZUl0ZW1MaXN0LCBuZWVkc0xheW91dFJhbmdlLCBwcmV2aW91c0NvbnRlbnQoKSwgY29u c3RyYWludHMsIGxpbmVEYW1hZ2UpOworICAgICAgICByZXR1cm4gbGluZUxheW91dChzaW1wbGlm aWVkTGluZUJ1aWxkZXIsIGlubGluZUl0ZW1MaXN0LCBuZWVkc0xheW91dFJhbmdlLCBwcmV2aW91 c0xpbmUoKSwgY29uc3RyYWludHMsIGxpbmVEYW1hZ2UpOwogICAgIH0KICAgICBhdXRvIGxpbmVC dWlsZGVyID0gTGluZUJ1aWxkZXIgeyAqdGhpcywgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLCBp bmxpbmVJdGVtTGlzdCB9OwotICAgIHJldHVybiBsaW5lTGF5b3V0KGxpbmVCdWlsZGVyLCBpbmxp bmVJdGVtTGlzdCwgbmVlZHNMYXlvdXRSYW5nZSwgcHJldmlvdXNDb250ZW50KCksIGNvbnN0cmFp bnRzLCBsaW5lRGFtYWdlKTsKKyAgICByZXR1cm4gbGluZUxheW91dChsaW5lQnVpbGRlciwgaW5s aW5lSXRlbUxpc3QsIG5lZWRzTGF5b3V0UmFuZ2UsIHByZXZpb3VzTGluZSgpLCBjb25zdHJhaW50 cywgbGluZURhbWFnZSk7CiB9CiAKIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljU2l6ZXMoY29uc3QgSW5saW5lRGFtYWdl KiBsaW5lRGFtYWdlKQpAQCAtMTkyLDcgKzE5Miw3IEBAIHN0YXRpYyBib29sIG1heUV4aXRGcm9t UGFydGlhbExheW91dChjb25zdCBJbmxpbmVEYW1hZ2UmIGxpbmVEYW1hZ2UsIHNpemVfdCBsaW5l CiAgICAgcmV0dXJuIHRyYWlsaW5nQ29udGVudEZyb21QcmV2aW91c0xheW91dCA/ICghbmV3Q29u dGVudC5pc0VtcHR5KCkgJiYgKnRyYWlsaW5nQ29udGVudEZyb21QcmV2aW91c0xheW91dCA9PSBu ZXdDb250ZW50Lmxhc3QoKSkgOiBmYWxzZTsKIH0KIAotSW5saW5lTGF5b3V0UmVzdWx0IElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KEFic3RyYWN0TGluZUJ1aWxkZXImIGxpbmVC dWlsZGVyLCBjb25zdCBJbmxpbmVJdGVtTGlzdCYgaW5saW5lSXRlbUxpc3QsIElubGluZUl0ZW1S YW5nZSBuZWVkc0xheW91dFJhbmdlLCBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzQ29udGVudD4gcHJl dmlvdXNDb250ZW50LCBjb25zdCBDb25zdHJhaW50c0ZvcklubGluZUNvbnRlbnQmIGNvbnN0cmFp bnRzLCBjb25zdCBJbmxpbmVEYW1hZ2UqIGxpbmVEYW1hZ2UpCitJbmxpbmVMYXlvdXRSZXN1bHQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoQWJzdHJhY3RMaW5lQnVpbGRlciYg bGluZUJ1aWxkZXIsIGNvbnN0IElubGluZUl0ZW1MaXN0JiBpbmxpbmVJdGVtTGlzdCwgSW5saW5l SXRlbVJhbmdlIG5lZWRzTGF5b3V0UmFuZ2UsIHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5lPiBw cmV2aW91c0xpbmUsIGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCYgY29uc3RyYWlu dHMsIGNvbnN0IElubGluZURhbWFnZSogbGluZURhbWFnZSkKIHsKICAgICBBU1NFUlQoIW5lZWRz TGF5b3V0UmFuZ2UuaXNFbXB0eSgpKTsKIApAQCAtMjAyLDcgKzIwMiw3IEBAIElubGluZUxheW91 dFJlc3VsdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxheW91dChBYnN0cmFjdExpbmVC dWlsZGVyJiBsaW5lCiAKICAgICBhdXRvIGlzUGFydGlhbExheW91dCA9IGxpbmVEYW1hZ2UgJiYg bGluZURhbWFnZS0+c3RhcnQoKTsKICAgICBpZiAoIWlzUGFydGlhbExheW91dCAmJiBjcmVhdGVE aXNwbGF5Q29udGVudEZvckxpbmVGcm9tQ2FjaGVkQ29udGVudChjb25zdHJhaW50cywgbGF5b3V0 UmVzdWx0KSkgewotICAgICAgICBBU1NFUlQoIXByZXZpb3VzQ29udGVudCk7CisgICAgICAgIEFT U0VSVCghcHJldmlvdXNMaW5lKTsKICAgICAgICAgbGF5b3V0UmVzdWx0LnJhbmdlID0gSW5saW5l TGF5b3V0UmVzdWx0OjpSYW5nZTo6RnVsbDsKICAgICAgICAgcmV0dXJuIGxheW91dFJlc3VsdDsK ICAgICB9CkBAIC0yMTMsMTEgKzIxMywxMSBAQCBJbmxpbmVMYXlvdXRSZXN1bHQgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoQWJzdHJhY3RMaW5lQnVpbGRlciYgbGluZQogICAg IGF1dG8gbGVhZGluZ0lubGluZUl0ZW1Qb3NpdGlvbiA9IG5lZWRzTGF5b3V0UmFuZ2Uuc3RhcnQ7 CiAgICAgd2hpbGUgKHRydWUpIHsKIAotICAgICAgICBhdXRvIGxpbmVJbml0aWFsUmVjdCA9IElu bGluZVJlY3QgeyBsaW5lTG9naWNhbFRvcCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2lj YWxMZWZ0LCBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoLCBmb3JtYXR0aW5n VXRpbHMoKS5pbml0aWFsTGluZUhlaWdodCghcHJldmlvdXNDb250ZW50Lmhhc192YWx1ZSgpKSB9 OworICAgICAgICBhdXRvIGxpbmVJbml0aWFsUmVjdCA9IElubGluZVJlY3QgeyBsaW5lTG9naWNh bFRvcCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0LCBjb25zdHJhaW50cy5o b3Jpem9udGFsKCkubG9naWNhbFdpZHRoLCBmb3JtYXR0aW5nVXRpbHMoKS5pbml0aWFsTGluZUhl aWdodCghcHJldmlvdXNMaW5lLmhhc192YWx1ZSgpKSB9OwogICAgICAgICBhdXRvIGxpbmVJbnB1 dCA9IExpbmVJbnB1dCB7IHsgbGVhZGluZ0lubGluZUl0ZW1Qb3NpdGlvbiwgbmVlZHNMYXlvdXRS YW5nZS5lbmQgfSwgbGluZUluaXRpYWxSZWN0IH07Ci0gICAgICAgIGF1dG8gbGluZUluZGV4ID0g cHJldmlvdXNDb250ZW50ID8gKHByZXZpb3VzQ29udGVudC0+cHJldmlvdXNMaW5lLmxpbmVJbmRl eCArIDEpIDogMGx1OworICAgICAgICBhdXRvIGxpbmVJbmRleCA9IHByZXZpb3VzTGluZSA/IChw cmV2aW91c0xpbmUtPmxpbmVJbmRleCArIDEpIDogMGx1OwogCi0gICAgICAgIGF1dG8gbGluZUxh eW91dFJlc3VsdCA9IGxpbmVCdWlsZGVyLmxheW91dElubGluZUNvbnRlbnQobGluZUlucHV0LCBw cmV2aW91c0NvbnRlbnQpOworICAgICAgICBhdXRvIGxpbmVMYXlvdXRSZXN1bHQgPSBsaW5lQnVp bGRlci5sYXlvdXRJbmxpbmVDb250ZW50KGxpbmVJbnB1dCwgcHJldmlvdXNMaW5lKTsKICAgICAg ICAgYXV0byBsaW5lQm94ID0gTGluZUJveEJ1aWxkZXIgeyAqdGhpcywgbGluZUxheW91dFJlc3Vs dCB9LmJ1aWxkKGxpbmVJbmRleCk7CiAgICAgICAgIGF1dG8gbGluZUxvZ2ljYWxSZWN0ID0gY3Jl YXRlRGlzcGxheUNvbnRlbnRGb3JJbmxpbmVDb250ZW50KGxpbmVCb3gsIGxpbmVMYXlvdXRSZXN1 bHQsIGNvbnN0cmFpbnRzLCBsYXlvdXRSZXN1bHQuZGlzcGxheUNvbnRlbnQpOwogICAgICAgICB1 cGRhdGVCb3hHZW9tZXRyeUZvclBsYWNlZEZsb2F0cyhsaW5lTGF5b3V0UmVzdWx0LmZsb2F0Q29u dGVudC5wbGFjZWRGbG9hdHMpOwpAQCAtMjM1LDggKzIzNSw3IEBAIElubGluZUxheW91dFJlc3Vs dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxheW91dChBYnN0cmFjdExpbmVCdWlsZGVy JiBsaW5lCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGF1dG8gaGFz U2VlbklubGluZUNvbnRlbnQgPSBwcmV2aW91c0NvbnRlbnQgPyBwcmV2aW91c0NvbnRlbnQtPmhh c0lubGluZUNvbnRlbnQgfHwgIWxpbmVMYXlvdXRSZXN1bHQuaW5saW5lQ29udGVudC5pc0VtcHR5 KCkgOiAhbGluZUxheW91dFJlc3VsdC5pbmxpbmVDb250ZW50LmlzRW1wdHkoKTsKLSAgICAgICAg cHJldmlvdXNDb250ZW50ID0geyBoYXNTZWVuSW5saW5lQ29udGVudCwgUHJldmlvdXNMaW5lIHsg bGluZUluZGV4LCBsaW5lTGF5b3V0UmVzdWx0LmNvbnRlbnRHZW9tZXRyeS50cmFpbGluZ092ZXJm bG93aW5nQ29udGVudFdpZHRoLCAhbGluZUxheW91dFJlc3VsdC5pbmxpbmVDb250ZW50LmlzRW1w dHkoKSAmJiBsaW5lTGF5b3V0UmVzdWx0LmlubGluZUNvbnRlbnQubGFzdCgpLmlzTGluZUJyZWFr KCksIGxpbmVMYXlvdXRSZXN1bHQuZGlyZWN0aW9uYWxpdHkuaW5saW5lQmFzZURpcmVjdGlvbiwg V1RGTW92ZShsaW5lTGF5b3V0UmVzdWx0LmZsb2F0Q29udGVudC5zdXNwZW5kZWRGbG9hdHMpIH0g fTsKKyAgICAgICAgcHJldmlvdXNMaW5lID0gUHJldmlvdXNMaW5lIHsgbGluZUluZGV4LCBsaW5l TGF5b3V0UmVzdWx0LmNvbnRlbnRHZW9tZXRyeS50cmFpbGluZ092ZXJmbG93aW5nQ29udGVudFdp ZHRoLCAhbGluZUxheW91dFJlc3VsdC5pbmxpbmVDb250ZW50LmlzRW1wdHkoKSAmJiBsaW5lTGF5 b3V0UmVzdWx0LmlubGluZUNvbnRlbnQubGFzdCgpLmlzTGluZUJyZWFrKCksIGxpbmVMYXlvdXRS ZXN1bHQuZGlyZWN0aW9uYWxpdHkuaW5saW5lQmFzZURpcmVjdGlvbiwgV1RGTW92ZShsaW5lTGF5 b3V0UmVzdWx0LmZsb2F0Q29udGVudC5zdXNwZW5kZWRGbG9hdHMpIH07CiAgICAgICAgIHByZXZp b3VzTGluZUVuZCA9IGxpbmVDb250ZW50RW5kOwogICAgICAgICBsaW5lTG9naWNhbFRvcCA9IGZv cm1hdHRpbmdVdGlscygpLmxvZ2ljYWxUb3BGb3JOZXh0TGluZShsaW5lTGF5b3V0UmVzdWx0LCBs aW5lTG9naWNhbFJlY3QsIGZsb2F0aW5nQ29udGV4dCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggOWZhNjIyZDVmMzIzLi5hY2Y4 NzAzYTdiMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaApAQCAtNzYsNyArNzYsNyBAQCBwdWJsaWM6CiAgICAgQm94R2VvbWV0cnkmIGdlb21ldHJ5 Rm9yQm94KGNvbnN0IEJveCYsIHN0ZDo6b3B0aW9uYWw8RXNjYXBlUmVhc29uPiA9IHN0ZDo6bnVs bG9wdCk7CiAKIHByaXZhdGU6Ci0gICAgSW5saW5lTGF5b3V0UmVzdWx0IGxpbmVMYXlvdXQoQWJz dHJhY3RMaW5lQnVpbGRlciYsIGNvbnN0IElubGluZUl0ZW1MaXN0JiwgSW5saW5lSXRlbVJhbmdl LCBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzQ29udGVudD4sIGNvbnN0IENvbnN0cmFpbnRzRm9ySW5s aW5lQ29udGVudCYsIGNvbnN0IElubGluZURhbWFnZSogPSBudWxscHRyKTsKKyAgICBJbmxpbmVM YXlvdXRSZXN1bHQgbGluZUxheW91dChBYnN0cmFjdExpbmVCdWlsZGVyJiwgY29uc3QgSW5saW5l SXRlbUxpc3QmLCBJbmxpbmVJdGVtUmFuZ2UsIHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5lPiwg Y29uc3QgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50JiwgY29uc3QgSW5saW5lRGFtYWdlKiA9 IG51bGxwdHIpOwogICAgIHZvaWQgbGF5b3V0RmxvYXRDb250ZW50T25seShjb25zdCBDb25zdHJh aW50c0ZvcklubGluZUNvbnRlbnQmKTsKIAogICAgIHZvaWQgY29sbGVjdENvbnRlbnRJZk5lZWRl ZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5jcHAKaW5k ZXggNTcwMDZhZDIyYTA3Li5mODNlZjRiZGU3MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcApAQCAtMTQ2LDcgKzE0Niw3IEBAIElubGluZVJlY3Qg SW5saW5lRm9ybWF0dGluZ1V0aWxzOjpmbGlwVmlzdWFsUmVjdFRvTG9naWNhbEZvcldyaXRpbmdN b2RlKGNvbnN0IEluCiAgICAgcmV0dXJuIHZpc3VhbFJlY3Q7CiB9CiAKLUlubGluZUxheW91dFVu aXQgSW5saW5lRm9ybWF0dGluZ1V0aWxzOjpjb21wdXRlZFRleHRJbmRlbnQoSXNJbnRyaW5zaWNX aWR0aE1vZGUgaXNJbnRyaW5zaWNXaWR0aE1vZGUsIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gcHJldmlv dXNDb250ZW50RW5kc1dpdGhMaW5lQnJlYWssIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lk dGgpIGNvbnN0CitJbmxpbmVMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdVdGlsczo6Y29tcHV0 ZWRUZXh0SW5kZW50KElzSW50cmluc2ljV2lkdGhNb2RlIGlzSW50cmluc2ljV2lkdGhNb2RlLCBz dGQ6Om9wdGlvbmFsPGJvb2w+IHByZXZpb3VzTGluZUVuZHNXaXRoTGluZUJyZWFrLCBJbmxpbmVM YXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKSBjb25zdAogewogICAgIGF1dG8mIHJvb3QgPSBmb3Jt YXR0aW5nQ29udGV4dCgpLnJvb3QoKTsKIApAQCAtMTU3LDcgKzE1Nyw3IEBAIElubGluZUxheW91 dFVuaXQgSW5saW5lRm9ybWF0dGluZ1V0aWxzOjpjb21wdXRlZFRleHRJbmRlbnQoSXNJbnRyaW5z aWNXaWR0aE1vZGUKICAgICAvLyBJZiAnZWFjaC1saW5lJyBpcyBzcGVjaWZpZWQsIGluZGVudGF0 aW9uIGFsc28gYXBwbGllcyB0byBhbGwgbGluZXMgd2hlcmUgdGhlIHByZXZpb3VzIGxpbmUgZW5k cyB3aXRoIGEgaGFyZCBicmVhay4KICAgICAvLyBbSW50ZWdyYXRpb25dIHJvb3QoKS0+cGFyZW50 KCkgd291bGQgbm9ybWFsbHkgcHJvZHVjZSBhIHZhbGlkIGxheW91dCBib3guCiAgICAgYm9vbCBz aG91bGRJbmRlbnQgPSBmYWxzZTsKLSAgICBpZiAoIXByZXZpb3VzQ29udGVudEVuZHNXaXRoTGlu ZUJyZWFrKSB7CisgICAgaWYgKCFwcmV2aW91c0xpbmVFbmRzV2l0aExpbmVCcmVhaykgewogICAg ICAgICBzaG91bGRJbmRlbnQgPSAhcm9vdC5pc0Fub255bW91cygpOwogICAgICAgICBpZiAocm9v dC5pc0Fub255bW91cygpKSB7CiAgICAgICAgICAgICBpZiAoIXJvb3QuaXNJbmxpbmVJbnRlZ3Jh dGlvblJvb3QoKSkKQEAgLTE2Niw3ICsxNjYsNyBAQCBJbmxpbmVMYXlvdXRVbml0IElubGluZUZv cm1hdHRpbmdVdGlsczo6Y29tcHV0ZWRUZXh0SW5kZW50KElzSW50cmluc2ljV2lkdGhNb2RlCiAg ICAgICAgICAgICAgICAgc2hvdWxkSW5kZW50ID0gcm9vdC5pc0ZpcnN0Q2hpbGRGb3JJbnRlZ3Jh dGlvbigpOwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIHNob3VsZEluZGVudCA9IHJv b3Quc3R5bGUoKS50ZXh0SW5kZW50TGluZSgpID09IFRleHRJbmRlbnRMaW5lOjpFYWNoTGluZSAm JiAqcHJldmlvdXNDb250ZW50RW5kc1dpdGhMaW5lQnJlYWs7CisgICAgICAgIHNob3VsZEluZGVu dCA9IHJvb3Quc3R5bGUoKS50ZXh0SW5kZW50TGluZSgpID09IFRleHRJbmRlbnRMaW5lOjpFYWNo TGluZSAmJiAqcHJldmlvdXNMaW5lRW5kc1dpdGhMaW5lQnJlYWs7CiAKICAgICAvLyBTcGVjaWZ5 aW5nICdoYW5naW5nJyBpbnZlcnRzIHdoZXRoZXIgdGhlIGxpbmUgc2hvdWxkIGJlIGluZGVudGVk IG9yIG5vdC4KICAgICBpZiAocm9vdC5zdHlsZSgpLnRleHRJbmRlbnRUeXBlKCkgPT0gVGV4dElu ZGVudFR5cGU6OkhhbmdpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdV dGlscy5oCmluZGV4IDM3NGFhYmI0YjIwMy4uZjkyZDRkMjA2OTVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nVXRpbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuaApAQCAtNDQsNyArNDQsNyBAQCBwdWJsaWM6 CiAgICAgQ29udGVudFdpZHRoQW5kTWFyZ2luIGlubGluZUJsb2NrQ29udGVudFdpZHRoQW5kTWFy Z2luKGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJy aWRkZW5Ib3Jpem9udGFsVmFsdWVzJikgY29uc3Q7CiAKICAgICBlbnVtIGNsYXNzIElzSW50cmlu c2ljV2lkdGhNb2RlIDogYm9vbCB7IE5vLCBZZXMgfTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGNv bXB1dGVkVGV4dEluZGVudChJc0ludHJpbnNpY1dpZHRoTW9kZSwgc3RkOjpvcHRpb25hbDxib29s PiBwcmV2aW91c0NvbnRlbnRFbmRzV2l0aExpbmVCcmVhaywgSW5saW5lTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCkgY29uc3Q7CisgICAgSW5saW5lTGF5b3V0VW5pdCBjb21wdXRlZFRleHRJbmRl bnQoSXNJbnRyaW5zaWNXaWR0aE1vZGUsIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gcHJldmlvdXNMaW5l RW5kc1dpdGhMaW5lQnJlYWssIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0 OwogCiAgICAgYm9vbCBpbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IElubGluZUxl dmVsQm94JikgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNw cAppbmRleCAwMGI5NjZkMTliN2MuLjdlOTI1Y2QxYmI0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjM0LDExICsyMzQsMTAgQEAgTGluZUJ1aWxkZXI6 OkxpbmVCdWlsZGVyKElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29u dGV4dCwgSG9yaXoKIHsKIH0KIAotTGluZUxheW91dFJlc3VsdCBMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmIGxpbmVJbnB1dCwgY29uc3Qgc3RkOjpvcHRp b25hbDxQcmV2aW91c0NvbnRlbnQ+JiBwcmV2aW91c0NvbnRlbnQpCitMaW5lTGF5b3V0UmVzdWx0 IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IExpbmVJbnB1dCYgbGluZUlu cHV0LCBjb25zdCBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzTGluZT4mIHByZXZpb3VzTGluZSkKIHsK LSAgICBhdXRvIHByZXZpb3VzTGluZSA9ICFwcmV2aW91c0NvbnRlbnQgPyBzdGQ6Om51bGxvcHQg OiBzdGQ6Om1ha2Vfb3B0aW9uYWwocHJldmlvdXNDb250ZW50LT5wcmV2aW91c0xpbmUpOwotICAg IGF1dG8gcHJldmlvdXNDb250ZW50RW5kc1dpdGhMaW5lQnJlYWsgPSAhcHJldmlvdXNMaW5lIHx8 ICFwcmV2aW91c0NvbnRlbnQtPmhhc0lubGluZUNvbnRlbnQgPyBzdGQ6Om51bGxvcHQgOiBzdGQ6 Om1ha2Vfb3B0aW9uYWwocHJldmlvdXNMaW5lLT5lbmRzV2l0aExpbmVCcmVhayk7Ci0gICAgaW5p dGlhbGl6ZShsaW5lSW5wdXQuaW5pdGlhbExvZ2ljYWxSZWN0LCBpbml0aWFsQ29uc3RyYWludHNG b3JMaW5lKGxpbmVJbnB1dC5pbml0aWFsTG9naWNhbFJlY3QsIHByZXZpb3VzQ29udGVudEVuZHNX aXRoTGluZUJyZWFrKSwgbGluZUlucHV0Lm5lZWRzTGF5b3V0UmFuZ2UsIHByZXZpb3VzTGluZSk7 CisgICAgYXV0byBwcmV2aW91c0xpbmVFbmRzV2l0aExpbmVCcmVhayA9ICFwcmV2aW91c0xpbmUg PyBzdGQ6Om51bGxvcHQgOiBzdGQ6Om1ha2Vfb3B0aW9uYWwocHJldmlvdXNMaW5lLT5lbmRzV2l0 aExpbmVCcmVhayk7CisgICAgaW5pdGlhbGl6ZShsaW5lSW5wdXQuaW5pdGlhbExvZ2ljYWxSZWN0 LCBpbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGxpbmVJbnB1dC5pbml0aWFsTG9naWNhbFJlY3Qs IHByZXZpb3VzTGluZUVuZHNXaXRoTGluZUJyZWFrKSwgbGluZUlucHV0Lm5lZWRzTGF5b3V0UmFu Z2UsIHByZXZpb3VzTGluZSk7CiAgICAgYXV0byBsaW5lQ29udGVudCA9IHBsYWNlSW5saW5lQW5k RmxvYXRDb250ZW50KGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKTsKICAgICBhdXRvIHJlc3Vs dCA9IG1fbGluZS5jbG9zZSgpOwogCkBAIC01MjUsMTAgKzUyNCwxMCBAQCBMaW5lQ29udGVudCBM aW5lQnVpbGRlcjo6cGxhY2VJbmxpbmVBbmRGbG9hdENvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJh bmdlJiBuZWVkcwogICAgIHJldHVybiBsaW5lQ29udGVudDsKIH0KIAotTGluZUJ1aWxkZXI6OlVz ZWRDb25zdHJhaW50cyBMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25z dCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBzdGQ6Om9wdGlvbmFsPGJvb2w+ IHByZXZpb3VzQ29udGVudEVuZHNXaXRoTGluZUJyZWFrKSBjb25zdAorTGluZUJ1aWxkZXI6OlVz ZWRDb25zdHJhaW50cyBMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25z dCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBzdGQ6Om9wdGlvbmFsPGJvb2w+ IHByZXZpb3VzTGluZUVuZHNXaXRoTGluZUJyZWFrKSBjb25zdAogewogICAgIGF1dG8gaXNJbnRy aW5zaWNXaWR0aE1vZGUgPSBpc0luSW50cmluc2ljV2lkdGhNb2RlKCkgPyBJbmxpbmVGb3JtYXR0 aW5nVXRpbHM6OklzSW50cmluc2ljV2lkdGhNb2RlOjpZZXMgOiBJbmxpbmVGb3JtYXR0aW5nVXRp bHM6OklzSW50cmluc2ljV2lkdGhNb2RlOjpObzsKLSAgICBhdXRvIHRleHRJbmRlbnQgPSBmb3Jt YXR0aW5nQ29udGV4dCgpLmZvcm1hdHRpbmdVdGlscygpLmNvbXB1dGVkVGV4dEluZGVudChpc0lu dHJpbnNpY1dpZHRoTW9kZSwgcHJldmlvdXNDb250ZW50RW5kc1dpdGhMaW5lQnJlYWssIGluaXRp YWxMaW5lTG9naWNhbFJlY3Qud2lkdGgoKSk7CisgICAgYXV0byB0ZXh0SW5kZW50ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5mb3JtYXR0aW5nVXRpbHMoKS5jb21wdXRlZFRleHRJbmRlbnQoaXNJbnRy aW5zaWNXaWR0aE1vZGUsIHByZXZpb3VzTGluZUVuZHNXaXRoTGluZUJyZWFrLCBpbml0aWFsTGlu ZUxvZ2ljYWxSZWN0LndpZHRoKCkpOwogCiAgICAgcmV0dXJuIGZsb2F0Q29uc3RyYWluZWRSZWN0 KGluaXRpYWxMaW5lTG9naWNhbFJlY3QsIHRleHRJbmRlbnQpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1 aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggZTQ5ZGJlMDY3ODA0Li4xNDZiZGYyMjAzNTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtNDIsNyArNDIsNyBAQCBj bGFzcyBMaW5lQnVpbGRlciA6IHB1YmxpYyBBYnN0cmFjdExpbmVCdWlsZGVyIHsKIHB1YmxpYzoK ICAgICBMaW5lQnVpbGRlcihJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIEhvcml6b250YWxDb25z dHJhaW50cyByb290SG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBJbmxpbmVJdGVtTGlzdCYp OwogICAgIHZpcnR1YWwgfkxpbmVCdWlsZGVyKCkgeyB9OwotICAgIExpbmVMYXlvdXRSZXN1bHQg bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmLCBjb25zdCBzdGQ6Om9wdGlvbmFs PFByZXZpb3VzQ29udGVudD4mKSBmaW5hbDsKKyAgICBMaW5lTGF5b3V0UmVzdWx0IGxheW91dElu bGluZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JiwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91 c0xpbmU+JikgZmluYWw7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBjYW5kaWRhdGVDb250ZW50Rm9y TGluZShMaW5lQ2FuZGlkYXRlJiwgc2l6ZV90IGlubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5l SXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGN1cnJlbnRMb2dp Y2FsUmlnaHQpOwpAQCAtNTQsNyArNTQsNyBAQCBwcml2YXRlOgogICAgICAgICBJbmxpbmVMYXlv dXRVbml0IG1hcmdpblN0YXJ0IHsgMCB9OwogICAgICAgICBPcHRpb25TZXQ8VXNlZEZsb2F0PiBp c0NvbnN0cmFpbmVkQnlGbG9hdCB7IH07CiAgICAgfTsKLSAgICBVc2VkQ29uc3RyYWludHMgaW5p dGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2lj YWxSZWN0LCBzdGQ6Om9wdGlvbmFsPGJvb2w+IHByZXZpb3VzQ29udGVudEVuZHNXaXRoTGluZUJy ZWFrKSBjb25zdDsKKyAgICBVc2VkQ29uc3RyYWludHMgaW5pdGlhbENvbnN0cmFpbnRzRm9yTGlu ZShjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBzdGQ6Om9wdGlvbmFs PGJvb2w+IHByZXZpb3VzTGluZUVuZHNXaXRoTGluZUJyZWFrKSBjb25zdDsKICAgICBVc2VkQ29u c3RyYWludHMgZmxvYXRDb25zdHJhaW5lZFJlY3QoY29uc3QgSW5saW5lUmVjdCYgbGluZUxvZ2lj YWxSZWN0LCBJbmxpbmVMYXlvdXRVbml0IG1hcmdpblN0YXJ0KSBjb25zdDsKIAogICAgIHN0cnVj dCBSZXN1bHQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lVHlwZXMuaAppbmRleCBhY2U2YWNj NjM4Y2MuLmMzYzNjM2E4NjZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVR5cGVzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVR5cGVzLmgK QEAgLTc2LDExICs3Niw2IEBAIHN0cnVjdCBQcmV2aW91c0xpbmUgewogICAgIFZlY3Rvcjxjb25z dCBCb3gqPiBzdXNwZW5kZWRGbG9hdHM7CiB9OwogCi1zdHJ1Y3QgUHJldmlvdXNDb250ZW50IHsK LSAgICBib29sIGhhc0lubGluZUNvbnRlbnQgeyBmYWxzZSB9OwotICAgIFByZXZpb3VzTGluZSBw cmV2aW91c0xpbmUgeyB9OwotfTsKLQogaW5saW5lIElubGluZUl0ZW1SYW5nZTo6SW5saW5lSXRl bVJhbmdlKElubGluZUl0ZW1Qb3NpdGlvbiBzdGFydCwgSW5saW5lSXRlbVBvc2l0aW9uIGVuZCkK ICAgICA6IHN0YXJ0KHN0YXJ0KQogICAgICwgZW5kKGVuZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFu ZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwCmluZGV4IDVhYzBjNjY0OTdmMy4uYzI0YzM4MmY1 ZmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAK QEAgLTgwLDExICs4MCwxMSBAQCBJbmxpbmVMYXlvdXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxl cjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFpbnQoSW50cgogICAgIGF1dG8gbGF5 b3V0UmFuZ2UgPSBJbmxpbmVJdGVtUmFuZ2UgeyAwICwgbV9pbmxpbmVJdGVtTGlzdC5zaXplKCkg fTsKICAgICBhdXRvIG1heGltdW1Db250ZW50V2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsK ICAgICBhdXRvIHByZXZpb3VzTGluZUVuZCA9IHN0ZDo6b3B0aW9uYWw8SW5saW5lSXRlbVBvc2l0 aW9uPiB7IH07Ci0gICAgYXV0byBwcmV2aW91c0NvbnRlbnQgPSBzdGQ6Om9wdGlvbmFsPFByZXZp b3VzQ29udGVudD4geyB9OworICAgIGF1dG8gcHJldmlvdXNMaW5lID0gc3RkOjpvcHRpb25hbDxQ cmV2aW91c0xpbmU+IHsgfTsKICAgICBhdXRvIGxpbmVJbmRleCA9IDBsdTsKIAogICAgIHdoaWxl ICh0cnVlKSB7Ci0gICAgICAgIGF1dG8gbGluZUxheW91dFJlc3VsdCA9IGxpbmVCdWlsZGVyLmxh eW91dElubGluZUNvbnRlbnQoeyBsYXlvdXRSYW5nZSwgeyAwLmYsIDAuZiwgaG9yaXpvbnRhbENv bnN0cmFpbnRzLmxvZ2ljYWxXaWR0aCwgMC5mIH0gfSwgcHJldmlvdXNDb250ZW50KTsKKyAgICAg ICAgYXV0byBsaW5lTGF5b3V0UmVzdWx0ID0gbGluZUJ1aWxkZXIubGF5b3V0SW5saW5lQ29udGVu dCh7IGxheW91dFJhbmdlLCB7IDAuZiwgMC5mLCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNh bFdpZHRoLCAwLmYgfSB9LCBwcmV2aW91c0xpbmUpOwogICAgICAgICBhdXRvIGZsb2F0Q29udGVu dFdpZHRoID0gWyZdIHsKICAgICAgICAgICAgIGF1dG8gbGVmdFdpZHRoID0gTGF5b3V0VW5pdCB7 IH07CiAgICAgICAgICAgICBhdXRvIHJpZ2h0V2lkdGggPSBMYXlvdXRVbml0IHsgfTsKQEAgLTEx NSw3ICsxMTUsNyBAQCBJbmxpbmVMYXlvdXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6Y29t cHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFpbnQoSW50cgogICAgICAgICAvLyBTdXBwb3J0 IHNpbmdsZSBsaW5lIG9ubHkuCiAgICAgICAgIG1heUNhY2hlTGF5b3V0UmVzdWx0ID0gTWF5Q2Fj aGVMYXlvdXRSZXN1bHQ6Ok5vOwogICAgICAgICBwcmV2aW91c0xpbmVFbmQgPSBsYXlvdXRSYW5n ZS5zdGFydDsKLSAgICAgICAgcHJldmlvdXNDb250ZW50ID0geyB0cnVlLCBQcmV2aW91c0xpbmUg eyBsaW5lSW5kZXgrKywgbGluZUxheW91dFJlc3VsdC5jb250ZW50R2VvbWV0cnkudHJhaWxpbmdP dmVyZmxvd2luZ0NvbnRlbnRXaWR0aCwgeyB9LCB7IH0sIFdURk1vdmUobGluZUxheW91dFJlc3Vs dC5mbG9hdENvbnRlbnQuc3VzcGVuZGVkRmxvYXRzKSB9IH07CisgICAgICAgIHByZXZpb3VzTGlu ZSA9IFByZXZpb3VzTGluZSB7IGxpbmVJbmRleCsrLCBsaW5lTGF5b3V0UmVzdWx0LmNvbnRlbnRH ZW9tZXRyeS50cmFpbGluZ092ZXJmbG93aW5nQ29udGVudFdpZHRoLCB7IH0sIHsgfSwgV1RGTW92 ZShsaW5lTGF5b3V0UmVzdWx0LmZsb2F0Q29udGVudC5zdXNwZW5kZWRGbG9hdHMpIH07CiAgICAg fQogICAgIHJldHVybiBtYXhpbXVtQ29udGVudFdpZHRoOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVM aW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcAppbmRleCBlM2YxNzJlNDViYzgu Ljk3MmU0ZjE4NzE1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1w bGVMaW5lQnVpbGRlci5jcHAKQEAgLTEwMSw5ICsxMDEsOSBAQCBUZXh0T25seVNpbXBsZUxpbmVC dWlsZGVyOjpUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyKGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZQogewogfQogCi1MaW5lTGF5b3V0UmVzdWx0IFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6 OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JiBsaW5lSW5wdXQsIGNvbnN0IHN0 ZDo6b3B0aW9uYWw8UHJldmlvdXNDb250ZW50PiYgcHJldmlvdXNDb250ZW50KQorTGluZUxheW91 dFJlc3VsdCBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNv bnN0IExpbmVJbnB1dCYgbGluZUlucHV0LCBjb25zdCBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzTGlu ZT4mIHByZXZpb3VzTGluZSkKIHsKLSAgICBpbml0aWFsaXplKGxpbmVJbnB1dC5uZWVkc0xheW91 dFJhbmdlLCBsaW5lSW5wdXQuaW5pdGlhbExvZ2ljYWxSZWN0LCBwcmV2aW91c0NvbnRlbnQpOwor ICAgIGluaXRpYWxpemUobGluZUlucHV0Lm5lZWRzTGF5b3V0UmFuZ2UsIGxpbmVJbnB1dC5pbml0 aWFsTG9naWNhbFJlY3QsIHByZXZpb3VzTGluZSk7CiAgICAgYXV0byBwbGFjZWRDb250ZW50RW5k ID0gaXNXcmFwcGluZ0FsbG93ZWQoKSA/IHBsYWNlSW5saW5lVGV4dENvbnRlbnQobGluZUlucHV0 Lm5lZWRzTGF5b3V0UmFuZ2UpIDogcGxhY2VOb25XcmFwcGluZ0lubGluZVRleHRDb250ZW50KGxp bmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKTsKICAgICBhdXRvIHJlc3VsdCA9IG1fbGluZS5jbG9z ZSgpOwogCkBAIC0xMjUsMTEgKzEyNSwxMSBAQCBMaW5lTGF5b3V0UmVzdWx0IFRleHRPbmx5U2lt cGxlTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JgogICAg IH07CiB9CiAKLXZvaWQgVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZShjb25z dCBJbmxpbmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlLCBjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFs TG9naWNhbFJlY3QsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNDb250ZW50PiYgcHJldmlv dXNDb250ZW50KQordm9pZCBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjppbml0aWFsaXplKGNv bnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UsIGNvbnN0IElubGluZVJlY3QmIGluaXRp YWxMb2dpY2FsUmVjdCwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91c0xpbmU+JiBwcmV2aW91 c0xpbmUpCiB7Ci0gICAgQVNTRVJUKCFsYXlvdXRSYW5nZS5pc0VtcHR5KCkgfHwgKHByZXZpb3Vz Q29udGVudCAmJiAhcHJldmlvdXNDb250ZW50LT5wcmV2aW91c0xpbmUuc3VzcGVuZGVkRmxvYXRz LmlzRW1wdHkoKSkpOworICAgIEFTU0VSVCghbGF5b3V0UmFuZ2UuaXNFbXB0eSgpIHx8IChwcmV2 aW91c0xpbmUgJiYgIXByZXZpb3VzTGluZS0+c3VzcGVuZGVkRmxvYXRzLmlzRW1wdHkoKSkpOwog ICAgIGF1dG8gcGFydGlhbExlYWRpbmdUZXh0SXRlbSA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8 SW5saW5lVGV4dEl0ZW0+IHsKLSAgICAgICAgaWYgKCFwcmV2aW91c0NvbnRlbnQgfHwgIWxheW91 dFJhbmdlLnN0YXJ0Lm9mZnNldCkKKyAgICAgICAgaWYgKCFwcmV2aW91c0xpbmUgfHwgIWxheW91 dFJhbmdlLnN0YXJ0Lm9mZnNldCkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAKICAgICAgICAg YXV0byYgb3ZlcmZsb3dpbmdJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVt PihtX2lubGluZUl0ZW1MaXN0W2xheW91dFJhbmdlLnN0YXJ0LmluZGV4XSk7CkBAIC0xMzgsMTMg KzEzOCwxMyBAQCB2b2lkIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6OmluaXRpYWxpemUoY29u c3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgYwogICAgICAgICBpZiAob3ZlcmZsb3dp bmdMZW5ndGgpIHsKICAgICAgICAgICAgIC8vIFR1cm4gcHJldmlvdXMgbGluZSdzIG92ZXJmbG93 IGNvbnRlbnQgaW50byB0aGUgbmV4dCBsaW5lJ3MgbGVhZGluZyBjb250ZW50LgogICAgICAgICAg ICAgLy8gInNwWzwtbGluZSBicmVhay0+XWxpdF9jb250ZW50IiAtPiBicmVhayBwb3NpdGlvbjog MiAtPiBsZWFkaW5nIHBhcnRpYWwgY29udGVudCBsZW5ndGg6IDExLgotICAgICAgICAgICAgcmV0 dXJuIG92ZXJmbG93aW5nSW5saW5lVGV4dEl0ZW0ucmlnaHQob3ZlcmZsb3dpbmdMZW5ndGgsIHBy ZXZpb3VzQ29udGVudC0+cHJldmlvdXNMaW5lLnRyYWlsaW5nT3ZlcmZsb3dpbmdDb250ZW50V2lk dGgpOworICAgICAgICAgICAgcmV0dXJuIG92ZXJmbG93aW5nSW5saW5lVGV4dEl0ZW0ucmlnaHQo b3ZlcmZsb3dpbmdMZW5ndGgsIHByZXZpb3VzTGluZS0+dHJhaWxpbmdPdmVyZmxvd2luZ0NvbnRl bnRXaWR0aCk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9OwogICAgIG1f cGFydGlhbExlYWRpbmdUZXh0SXRlbSA9IHBhcnRpYWxMZWFkaW5nVGV4dEl0ZW0oKTsKICAgICBt X2xpbmUuaW5pdGlhbGl6ZSh7IH0sIGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkpOwotICAgIG1fcHJl dmlvdXNDb250ZW50ID0gcHJldmlvdXNDb250ZW50OworICAgIG1fcHJldmlvdXNMaW5lID0gcHJl dmlvdXNMaW5lOwogICAgIG1fbGluZUxvZ2ljYWxSZWN0ID0gaW5pdGlhbExvZ2ljYWxSZWN0Owog ICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdCA9IHsgfTsKICAgICBtX3RyaW1tZWRUcmFpbGluZ1do aXRlc3BhY2VXaWR0aCA9IHsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2lt cGxlTGluZUJ1aWxkZXIuaAppbmRleCBkNmM0MDYxNzcxMmUuLjBkOWViMTU3MWJlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4 dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaApAQCAtNDIs NyArNDIsNyBAQCBzdHJ1Y3QgVGV4dE9ubHlMaW5lQnJlYWtSZXN1bHQ7CiBjbGFzcyBUZXh0T25s eVNpbXBsZUxpbmVCdWlsZGVyIDogcHVibGljIEFic3RyYWN0TGluZUJ1aWxkZXIgewogcHVibGlj OgogICAgIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQmLCBIb3Jpem9udGFsQ29uc3RyYWludHMgcm9vdEhvcml6b250YWxDb25zdHJhaW50cywg Y29uc3QgSW5saW5lSXRlbUxpc3QmKTsKLSAgICBMaW5lTGF5b3V0UmVzdWx0IGxheW91dElubGlu ZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JiwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91c0Nv bnRlbnQ+JikgZmluYWw7CisgICAgTGluZUxheW91dFJlc3VsdCBsYXlvdXRJbmxpbmVDb250ZW50 KGNvbnN0IExpbmVJbnB1dCYsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5lPiYpIGZp bmFsOwogCiAgICAgc3RhdGljIGJvb2wgaXNFbGlnaWJsZUZvclNpbXBsaWZpZWRUZXh0T25seUlu bGluZUxheW91dChjb25zdCBFbGVtZW50Qm94JiByb290LCBjb25zdCBJbmxpbmVDb250ZW50Q2Fj aGUmLCBjb25zdCBQbGFjZWRGbG9hdHMqID0gbnVsbHB0cik7CiAKQEAgLTUxLDIwICs1MSwyMCBA QCBwcml2YXRlOgogICAgIElubGluZUl0ZW1Qb3NpdGlvbiBwbGFjZU5vbldyYXBwaW5nSW5saW5l VGV4dENvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJik7CiAgICAgVGV4dE9ubHlMaW5lQnJl YWtSZXN1bHQgaGFuZGxlT3ZlcmZsb3dpbmdUZXh0Q29udGVudChjb25zdCBJbmxpbmVDb250ZW50 QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQmLCBjb25zdCBJbmxpbmVJdGVtUmFuZ2UmKTsKICAg ICBUZXh0T25seUxpbmVCcmVha1Jlc3VsdCBjb21taXRDYW5kaWRhdGVDb250ZW50KGNvbnN0IENh bmRpZGF0ZVRleHRDb250ZW50JiwgY29uc3QgSW5saW5lSXRlbVJhbmdlJik7Ci0gICAgdm9pZCBp bml0aWFsaXplKGNvbnN0IElubGluZUl0ZW1SYW5nZSYsIGNvbnN0IElubGluZVJlY3QmIGluaXRp YWxMb2dpY2FsUmVjdCwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91c0NvbnRlbnQ+Jik7Cisg ICAgdm9pZCBpbml0aWFsaXplKGNvbnN0IElubGluZUl0ZW1SYW5nZSYsIGNvbnN0IElubGluZVJl Y3QmIGluaXRpYWxMb2dpY2FsUmVjdCwgY29uc3Qgc3RkOjpvcHRpb25hbDxQcmV2aW91c0xpbmU+ Jik7CiAgICAgdm9pZCBoYW5kbGVMaW5lRW5kaW5nKElubGluZUl0ZW1Qb3NpdGlvbiwgc2l6ZV90 IGxheW91dFJhbmdlRW5kSW5kZXgpOwogICAgIHNpemVfdCByZXZlcnRUb1RyYWlsaW5nSXRlbShj b25zdCBJbmxpbmVJdGVtUmFuZ2UmLCBjb25zdCBJbmxpbmVUZXh0SXRlbSYpOwogICAgIHNpemVf dCByZXZlcnRUb0xhc3ROb25PdmVyZmxvd2luZ0l0ZW0oY29uc3QgSW5saW5lSXRlbVJhbmdlJik7 CiAgICAgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNvbnN0OwogICAgIGJvb2wg aXNXcmFwcGluZ0FsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzV3JhcHBpbmdBbGxvd2VkOyB9 CiAKLSAgICBib29sIGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkgY29uc3QgeyByZXR1cm4gIW1fcHJl dmlvdXNDb250ZW50Lmhhc192YWx1ZSgpOyB9CisgICAgYm9vbCBpc0ZpcnN0Rm9ybWF0dGVkTGlu ZSgpIGNvbnN0IHsgcmV0dXJuICFtX3ByZXZpb3VzTGluZS5oYXNfdmFsdWUoKTsgfQogCiAgICAg Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3Qg eyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsgfQogICAgIGNvbnN0IEVsZW1lbnRC b3gmIHJvb3QoKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBzdGQ6Om9wdGlvbmFsPFByZXZpb3Vz Q29udGVudD4gbV9wcmV2aW91c0NvbnRlbnQgeyB9OworICAgIHN0ZDo6b3B0aW9uYWw8UHJldmlv dXNMaW5lPiBtX3ByZXZpb3VzTGluZSB7IH07CiAgICAgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNX aWR0aE1vZGU+IG1faW50cmluc2ljV2lkdGhNb2RlOwogICAgIGNvbnN0IElubGluZUZvcm1hdHRp bmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwogICAgIHN0ZDo6b3B0aW9uYWw8 SG9yaXpvbnRhbENvbnN0cmFpbnRzPiBtX3Jvb3RIb3Jpem9udGFsQ29uc3RyYWludHM7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdGV4dC1pbmRlbnQtd2l0aC13aWRlLWZsb2F0 LWJlZm9yZS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3RleHQtaW5kZW50 LXdpdGgtd2lkZS1mbG9hdC1iZWZvcmUtZXhwZWN0ZWQuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggODVhNjI5ZWNhYjYwLi4wMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L3RleHQtaW5kZW50LXdpdGgtd2lkZS1mbG9hdC1iZWZvcmUtZXhwZWN0ZWQuaHRt bAorKysgL2Rldi9udWxsCkBAIC0xLDE3ICswLDAgQEAKLTxzdHlsZT4KLS5pbmRlbnQgewotICB0 ZXh0LWluZGVudDogNDBweDsKLSAgd2lkdGg6IDQwMHB4OwotICBmb250LWZhbWlseTogTW9ub3Nw YWNlOwotICBtYXJnaW4tYm90dG9tOiAxcHg7Ci19Ci08L3N0eWxlPgotPGRpdiBjbGFzcz0iaW5k ZW50Ij4KLSAgUGFzcyBpZiB0aGlzIHRleHQgaXMgaW5kZW50ZWQKLTwvZGl2PgotPGRpdiBjbGFz cz0iaW5kZW50Ij4KLSAgUGFzcyBpZiB0aGlzIHRleHQgaXMgaW5kZW50ZWQKLTwvZGl2PgotPGRp diBjbGFzcz0iaW5kZW50Ij4KLSAgUGFzcyBpZiB0aGlzIHRleHQgaXMgaW5kZW50ZWQKLTwvZGl2 PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3RleHQtaW5kZW50LXdpdGgtd2lk ZS1mbG9hdC1iZWZvcmUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC90ZXh0LWluZGVudC13 aXRoLXdpZGUtZmxvYXQtYmVmb3JlLmh0bWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IGE2MGQzOTI3NTA2Ni4uMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC90 ZXh0LWluZGVudC13aXRoLXdpZGUtZmxvYXQtYmVmb3JlLmh0bWwKKysrIC9kZXYvbnVsbApAQCAt MSwyOSArMCwwIEBACi08c3R5bGU+Ci0uY29udGFpbmVyIHsKLSAgd2lkdGg6IDQwMHB4OwotICBm b250LWZhbWlseTogTW9ub3NwYWNlOwotfQotCi0uaW5kZW50IHsKLSAgdGV4dC1pbmRlbnQ6IDQw cHg7Ci19Ci0KLS5mbG9hdF9ib3ggewotICBmbG9hdDogbGVmdDsKLSAgd2lkdGg6IDQwMHB4Owot ICBoZWlnaHQ6IDFweDsKLX0KLTwvc3R5bGU+Ci08ZGl2IGNsYXNzPSJjb250YWluZXIgaW5kZW50 Ij4KLSAgUGFzcyBpZiB0aGlzIHRleHQgaXMgaW5kZW50ZWQKLTwvZGl2PgotPGRpdiBjbGFzcz0i Y29udGFpbmVyIGluZGVudCI+Ci0gIDxkaXYgY2xhc3M9ZmxvYXRfYm94PjwvZGl2PgotICBQYXNz IGlmIHRoaXMgdGV4dCBpcyBpbmRlbnRlZAotPC9kaXY+Ci08ZGl2IGNsYXNzPWNvbnRhaW5lcj4K LSAgPGRpdiBjbGFzcz1mbG9hdF9ib3g+PC9kaXY+Ci0gIDxkaXYgY2xhc3M9aW5kZW50PgotICAg IFBhc3MgaWYgdGhpcyB0ZXh0IGlzIGluZGVudGVkCi0gIDwvZGl2PgotPC9kaXY+Cg==