181564 2018-01-11 16:13:23 -0800 REGRESSION(r226789): broke API tests (Requested by alexchristensen on #webkit). 2018-01-11 16:16:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181423 1 commit-queue commit-queue achristensen joepeck webkit-bug-importer oldest_to_newest 1388532 0 commit-queue 2018-01-11 16:13:23 -0800 https://trac.webkit.org/changeset/226789 broke the build: broke API tests (Requested by alexchristensen on #webkit). 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. 1388535 1 331136 commit-queue 2018-01-11 16:13:32 -0800 Created attachment 331136 ROLLOUT of r226789 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 rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1388539 2 331136 commit-queue 2018-01-11 16:15:59 -0800 Comment on attachment 331136 ROLLOUT of r226789 Clearing flags on attachment: 331136 Committed r226817: <https://trac.webkit.org/changeset/226817> 1388540 3 commit-queue 2018-01-11 16:16:01 -0800 All reviewed patches have been landed. Closing bug. 1388541 4 webkit-bug-importer 2018-01-11 16:16:15 -0800 <rdar://problem/36453265> 331136 2018-01-11 16:13:32 -0800 2018-01-11 16:15:59 -0800 ROLLOUT of r226789 bug-181564-20180111191331.patch text/plain 17971 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0MTVjNGJkOTIzM2E3MGEy YjcxMDBkMTRhMDhiMWVmOTNmZWFjMWUuLjVhZTMzOWYwZWI5ODkxZTEyMTEwNzIxNTQxYzk2ZDFi YTEzZjY2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMDEtMTEgIENvbW1pdCBR dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIyMjY3ODkgYW5kIHIyMjY3OTQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE1NjQKKworICAgICAgICBicm9rZSBBUEkgdGVzdHMg KFJlcXVlc3RlZCBieSBhbGV4Y2hyaXN0ZW5zZW4gb24gI3dlYmtpdCkuCisKKyAgICAgICAgUmV2 ZXJ0ZWQgY2hhbmdlc2V0czoKKworICAgICAgICAiTWVyZ2Ugc3luYyBhbmQgYXN5bmMgY29kZSBw YXRocyBmb3IgZ2V0dGluZyBjb250ZXh0IG1lbnVzIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNDIzCisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8yMjY3ODkKKworICAgICAgICAiUmV2ZXJ0IGNoYW5nZXMgYWNjaWRl bnRhbGx5IGNvbW1pdHRlZCB3aXRoIHIyMjY3ODkuIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNDIzCisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8yMjY3OTQKKwogMjAxOC0wMS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBTZW5kIFByb21pc2VkQmxvYkluZm8gdG8g dGhlIGNsaWVudCB0aHJvdWdoIERyYWdJdGVtIGluc3RlYWQgb2YgRHJhZ0NsaWVudDo6cHJlcGFy ZVRvRHJhZ1Byb21pc2VkQmxvYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DTWFrZUxpc3Rz LnR4dCBiL1NvdXJjZS9XZWJLaXQvQ01ha2VMaXN0cy50eHQKaW5kZXggNzdmYTZiY2EzNTgxN2I3 MjE1OGEzOTYyYjNiZWMyOWRkYzZlY2M3OC4uZTlmYzI1NjVlMTg2YTQ2ZWU0NjFlNzk2ZmE2NGNm ZWI2NGQxZTFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DTWFrZUxpc3RzLnR4dAorKysg Yi9Tb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMudHh0CkBAIC0zMTAsNyArMzEwLDYgQEAgc2V0KFdl YktpdF9TT1VSQ0VTCiAgICAgVUlQcm9jZXNzL1dlYkNvbnRleHRDbGllbnQuY3BwCiAgICAgVUlQ cm9jZXNzL1dlYkNvbnRleHRDb25uZWN0aW9uQ2xpZW50LmNwcAogICAgIFVJUHJvY2Vzcy9XZWJD b250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCi0gICAgVUlQcm9jZXNzL1dlYkNvbnRleHRN ZW51TGlzdGVuZXJQcm94eS5jcHAKICAgICBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94eS5j cHAKICAgICBVSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmNwcAogICAgIFVJUHJvY2Vz cy9XZWJDb29raWVNYW5hZ2VyUHJveHlDbGllbnQuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtTWFjLmNtYWtlIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybU1hYy5jbWFrZQpp bmRleCAzMTg4OTZiZmQ0MTBmNDE4YWVmNTQxODhlMWI0ODc5MjVmNWZkYWQzLi5jZmJlN2YyZTlj MjUwZjAyNDk0ZThkNmVkNWI0NzY2ZjUzYzk4YmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1BsYXRmb3JtTWFjLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1NYWMuY21ha2UK QEAgLTE2OCw2ICsxNjgsNyBAQCBsaXN0KEFQUEVORCBXZWJLaXRfU09VUkNFUwogCiAgICAgVUlQ cm9jZXNzL0hpZ2hQZXJmb3JtYW5jZUdyYXBoaWNzVXNhZ2VTYW1wbGVyLmNwcAogICAgIFVJUHJv Y2Vzcy9QZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VTYW1wbGVyLmNwcAorICAgIFVJUHJvY2Vzcy9X ZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkuY3BwCiAgICAgVUlQcm9jZXNzL1dlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKICAgICBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1RlbGVtZXRyeS5jcHAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSUNvbnRleHRNZW51Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJQ29udGV4dE1lbnVDbGllbnQuaAppbmRleCAwNWRmMGE4YTMxN2I4Y2Q1NzE4YzU2NmVh MDE3NGYwNjMzNmI5NmVhLi5iYTFlMzZiMWY4ODM0ZDhjODc0ZTU4OTliOTcwZTczZWFmYzgzZTRj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGV4dE1lbnVD bGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGV4dE1lbnVD bGllbnQuaApAQCAtMjcsNyArMjcsNiBAQAogCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAK LSNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVu dUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJIaXRUZXN0UmVzdWx0RGF0YS5oIgogI2lu Y2x1ZGUgPFdlYktpdC9XS0Jhc2UuaD4KQEAgLTQxLDYgKzQwLDcgQEAgY2xhc3MgSW50UG9pbnQ7 CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgeworY2xhc3MgV2ViQ29udGV4dE1lbnVJdGVtOwogY2xh c3MgV2ViQ29udGV4dE1lbnVJdGVtRGF0YTsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIH0KQEAgLTUx LDcgKzUxLDggQEAgY2xhc3MgQ29udGV4dE1lbnVDbGllbnQgewogcHVibGljOgogICAgIHZpcnR1 YWwgfkNvbnRleHRNZW51Q2xpZW50KCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZ2V0Q29udGV4 dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgVmVjdG9yPFJlZjxX ZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbT4+JiYgLyogcHJvcG9zZWRNZW51ICovLCBXZWJLaXQ6 OldlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eSYgbGlzdGVuZXIsIGNvbnN0IFdlYktpdDo6V2Vi SGl0VGVzdFJlc3VsdERhdGEmLCBBUEk6Ok9iamVjdCogLyogdXNlckRhdGEgKi8pIHsgbGlzdGVu ZXIudXNlQ29udGV4dE1lbnVJdGVtcyh7IH0pOyB9CisgICAgdmlydHVhbCBib29sIGdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGNvbnN0IFZlY3Rv cjxSZWY8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW0+PiYgLyogcHJvcG9zZWRNZW51ICovLCBW ZWN0b3I8UmVmPFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtPj4mIC8qIGN1c3RvbU1lbnUgKi8s IGNvbnN0IFdlYktpdDo6V2ViSGl0VGVzdFJlc3VsdERhdGEmLCBBUEk6Ok9iamVjdCogLyogdXNl ckRhdGEgKi8pIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGdldENvbnRleHRN ZW51RnJvbVByb3Bvc2VkTWVudUFzeW5jKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgY29uc3QgVmVj dG9yPFJlZjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbT4+JiAvKiBwcm9wb3NlZE1lbnUgKi8s IFdlYktpdDo6V2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5KiwgY29uc3QgV2ViS2l0OjpXZWJI aXRUZXN0UmVzdWx0RGF0YSYsIEFQSTo6T2JqZWN0KiAvKiB1c2VyRGF0YSAqLykgeyByZXR1cm4g ZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQo V2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURh dGEmKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgc2hvd0NvbnRleHRNZW51KFdlYktpdDo6V2ViUGFn ZVByb3h5JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBjb25zdCBWZWN0b3I8UmVmPFdlYktp dDo6V2ViQ29udGV4dE1lbnVJdGVtPj4mKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwg Ym9vbCBoaWRlQ29udGV4dE1lbnUoV2ViS2l0OjpXZWJQYWdlUHJveHkmKSB7IHJldHVybiBmYWxz ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggYWYyYmRl ZDczOThlMzVmMWFmOWU4MmUwN2I4NjhkODQyYzU3NDY3YS4uNzY2OWQ3YmNhYzllMGRlY2FmZjAx NTA2YTc4YTg5N2EwYWRkMmI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1Bh Z2UuY3BwCkBAIC04MTgsMjkgKzgxOCwxMyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VDb250ZXh0TWVu dUNsaWVudChXS1BhZ2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQYWdlQ29udGV4dE1lbnVDbAogICAg ICAgICB9CiAKICAgICBwcml2YXRlOgotICAgICAgICB2b2lkIGdldENvbnRleHRNZW51RnJvbVBy b3Bvc2VkTWVudShXZWJQYWdlUHJveHkmIHBhZ2UsIFZlY3RvcjxSZWY8V2ViS2l0OjpXZWJDb250 ZXh0TWVudUl0ZW0+PiYmIHByb3Bvc2VkTWVudVZlY3RvciwgV2ViS2l0OjpXZWJDb250ZXh0TWVu dUxpc3RlbmVyUHJveHkmIGNvbnRleHRNZW51TGlzdGVuZXIsIGNvbnN0IFdlYkhpdFRlc3RSZXN1 bHREYXRhJiBoaXRUZXN0UmVzdWx0RGF0YSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlk ZQorICAgICAgICBib29sIGdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudShXZWJQYWdlUHJv eHkmIHBhZ2UsIGNvbnN0IFZlY3RvcjxSZWY8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW0+PiYg cHJvcG9zZWRNZW51VmVjdG9yLCBWZWN0b3I8UmVmPFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVt Pj4mIGN1c3RvbU1lbnUsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHREYXRhJiBoaXRUZXN0UmVzdWx0 RGF0YSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQogICAgICAgICB7Ci0gICAgICAg ICAgICBpZiAobV9jbGllbnQuYmFzZS52ZXJzaW9uID49IDQgJiYgbV9jbGllbnQuZ2V0Q29udGV4 dE1lbnVGcm9tUHJvcG9zZWRNZW51QXN5bmMpIHsKLSAgICAgICAgICAgICAgICBWZWN0b3I8UmVm UHRyPEFQSTo6T2JqZWN0Pj4gcHJvcG9zZWRNZW51SXRlbXM7Ci0gICAgICAgICAgICAgICAgcHJv cG9zZWRNZW51SXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShwcm9wb3NlZE1lbnVWZWN0b3Iu c2l6ZSgpKTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBmb3IgKGNvbnN0IGF1 dG8mIG1lbnVJdGVtIDogcHJvcG9zZWRNZW51VmVjdG9yKQotICAgICAgICAgICAgICAgICAgICBw cm9wb3NlZE1lbnVJdGVtcy51bmNoZWNrZWRBcHBlbmQobWVudUl0ZW0ucHRyKCkpOwotICAgICAg ICAgICAgICAgIAotICAgICAgICAgICAgICAgIGF1dG8gd2ViSGl0VGVzdFJlc3VsdCA9IEFQSTo6 SGl0VGVzdFJlc3VsdDo6Y3JlYXRlKGhpdFRlc3RSZXN1bHREYXRhKTsKLSAgICAgICAgICAgICAg ICBtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnVBc3luYyh0b0FQSSgmcGFn ZSksIHRvQVBJKEFQSTo6QXJyYXk6OmNyZWF0ZShXVEZNb3ZlKHByb3Bvc2VkTWVudUl0ZW1zKSku cHRyKCkpLCB0b0FQSSgmY29udGV4dE1lbnVMaXN0ZW5lciksIHRvQVBJKHdlYkhpdFRlc3RSZXN1 bHQucHRyKCkpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAg ICAgICAgICBpZiAoIW1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSAmJiAh bV9jbGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51X2RlcHJlY2F0ZWRGb3JVc2VX aXRoVjApIHsKLSAgICAgICAgICAgICAgICBjb250ZXh0TWVudUxpc3RlbmVyLnVzZUNvbnRleHRN ZW51SXRlbXMoV1RGTW92ZShwcm9wb3NlZE1lbnVWZWN0b3IpKTsKLSAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIW1fY2xpZW50LmdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudSAmJiAhbV9jbGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJv cG9zZWRNZW51X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApCisgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgICAgICAgICBpZiAobV9jbGllbnQuYmFzZS52ZXJzaW9uID49IDIgJiYg IW1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSkgewotICAgICAgICAgICAg ICAgIGNvbnRleHRNZW51TGlzdGVuZXIudXNlQ29udGV4dE1lbnVJdGVtcyhXVEZNb3ZlKHByb3Bv c2VkTWVudVZlY3RvcikpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGlmIChtX2NsaWVudC5iYXNlLnZlcnNpb24gPj0gMiAmJiAhbV9jbGllbnQu Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KQorICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgICAgICAgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IHByb3Bvc2Vk TWVudUl0ZW1zOwogICAgICAgICAgICAgcHJvcG9zZWRNZW51SXRlbXMucmVzZXJ2ZUluaXRpYWxD YXBhY2l0eShwcm9wb3NlZE1lbnVWZWN0b3Iuc2l6ZSgpKTsKQEAgLTg1Nyw5ICs4NDEsOSBAQCB2 b2lkIFdLUGFnZVNldFBhZ2VDb250ZXh0TWVudUNsaWVudChXS1BhZ2VSZWYgcGFnZVJlZiwgY29u c3QgV0tQYWdlQ29udGV4dE1lbnVDbAogCiAgICAgICAgICAgICBSZWZQdHI8QVBJOjpBcnJheT4g YXJyYXkgPSBhZG9wdFJlZih0b0ltcGwobmV3TWVudSkpOwogCi0gICAgICAgICAgICBWZWN0b3I8 UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+IGN1c3RvbU1lbnU7CisgICAgICAgICAgICBjdXN0b21N ZW51LmNsZWFyKCk7CisKICAgICAgICAgICAgIHNpemVfdCBuZXdTaXplID0gYXJyYXkgPyBhcnJh eS0+c2l6ZSgpIDogMDsKLSAgICAgICAgICAgIGN1c3RvbU1lbnUucmVzZXJ2ZUluaXRpYWxDYXBh Y2l0eShuZXdTaXplKTsKICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbmV3U2l6 ZTsgKytpKSB7CiAgICAgICAgICAgICAgICAgV2ViQ29udGV4dE1lbnVJdGVtKiBpdGVtID0gYXJy YXktPmF0PFdlYkNvbnRleHRNZW51SXRlbT4oaSk7CiAgICAgICAgICAgICAgICAgaWYgKCFpdGVt KSB7CkBAIC04NjcsMTAgKzg1MSwyNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VDb250ZXh0TWVudUNs aWVudChXS1BhZ2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQYWdlQ29udGV4dE1lbnVDbAogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg ICAgICBjdXN0b21NZW51LnVuY2hlY2tlZEFwcGVuZCgqaXRlbSk7CisgICAgICAgICAgICAgICAg Y3VzdG9tTWVudS5hcHBlbmQoKml0ZW0pOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBj b250ZXh0TWVudUxpc3RlbmVyLnVzZUNvbnRleHRNZW51SXRlbXMoV1RGTW92ZShjdXN0b21NZW51 KSk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIGJvb2wg Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51QXN5bmMoV2ViUGFnZVByb3h5JiBwYWdlLCBj b25zdCBWZWN0b3I8UmVmPFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtPj4mIHByb3Bvc2VkTWVu dVZlY3RvciwgV2ViS2l0OjpXZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkqIGNvbnRleHRNZW51 TGlzdGVuZXIsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHREYXRhJiBoaXRUZXN0UmVzdWx0RGF0YSwg QVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQorICAgICAgICB7CisgICAgICAgICAgICBp ZiAobV9jbGllbnQuYmFzZS52ZXJzaW9uIDwgNCB8fCAhbV9jbGllbnQuZ2V0Q29udGV4dE1lbnVG cm9tUHJvcG9zZWRNZW51QXN5bmMpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgICAgICAgICBWZWN0b3I8UmVmUHRyPEFQSTo6T2JqZWN0Pj4gcHJvcG9zZWRNZW51SXRlbXM7 CisgICAgICAgICAgICBwcm9wb3NlZE1lbnVJdGVtcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHBy b3Bvc2VkTWVudVZlY3Rvci5zaXplKCkpOworCisgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8m IG1lbnVJdGVtIDogcHJvcG9zZWRNZW51VmVjdG9yKQorICAgICAgICAgICAgICAgIHByb3Bvc2Vk TWVudUl0ZW1zLnVuY2hlY2tlZEFwcGVuZChtZW51SXRlbS5wdHIoKSk7CisKKyAgICAgICAgICAg IFJlZlB0cjxBUEk6OkhpdFRlc3RSZXN1bHQ+IHdlYkhpdFRlc3RSZXN1bHQgPSBBUEk6OkhpdFRl c3RSZXN1bHQ6OmNyZWF0ZShoaXRUZXN0UmVzdWx0RGF0YSk7CisgICAgICAgICAgICBtX2NsaWVu dC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnVBc3luYyh0b0FQSSgmcGFnZSksIHRvQVBJ KEFQSTo6QXJyYXk6OmNyZWF0ZShXVEZNb3ZlKHByb3Bvc2VkTWVudUl0ZW1zKSkucHRyKCkpLCB0 b0FQSShjb250ZXh0TWVudUxpc3RlbmVyKSwgdG9BUEkod2ViSGl0VGVzdFJlc3VsdC5nZXQoKSks IHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKworICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KIAogICAgICAgICB2b2lkIGN1c3RvbUNvbnRleHRN ZW51SXRlbVNlbGVjdGVkKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgV2ViQ29udGV4dE1lbnVJ dGVtRGF0YSYgaXRlbURhdGEpIG92ZXJyaWRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXgg OTdlOTI1NjAxNzczN2I3NjY1YWNjOGViMmYzNThlYjJlYzU5MDBiOS4uYmZlYTVmOTZhZDg3MTYw ZmY4ZjI4YjQ0ZjZhNjIyNjU2MzQ4MDliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcApAQCAt MzQsNyArMzQsNyBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIHZvaWQgZ2V0Q29u dGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94eSYsIFZlY3RvcjxSZWY8V2ViS2l0 OjpXZWJDb250ZXh0TWVudUl0ZW0+PiYmIHByb3Bvc2VkTWVudSwgV2ViS2l0OjpXZWJDb250ZXh0 TWVudUxpc3RlbmVyUHJveHkmIGNvbnRleHRNZW51TGlzdGVuZXIsIGNvbnN0IFdlYkhpdFRlc3RS ZXN1bHREYXRhJiBoaXRUZXN0UmVzdWx0RGF0YSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVy cmlkZQorICAgIGJvb2wgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94 eSYsIGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mIHByb3Bvc2VkTWVudSwg VmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHRE YXRhJiBoaXRUZXN0UmVzdWx0RGF0YSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQog ICAgIHsKICAgICAgICAgR1JlZlB0cjxHVmFyaWFudD4gdmFyaWFudDsKICAgICAgICAgaWYgKHVz ZXJEYXRhKSB7CkBAIC00OCw3ICs0OCw3IEBAIHByaXZhdGU6CiAgICAgICAgIGZvciAoYXV0byYg aXRlbSA6IHByb3Bvc2VkTWVudSkKICAgICAgICAgICAgIG1lbnVJdGVtcy51bmNoZWNrZWRBcHBl bmQoaXRlbS0+ZGF0YSgpKTsKICAgICAgICAgd2Via2l0V2ViVmlld1BvcHVsYXRlQ29udGV4dE1l bnUobV93ZWJWaWV3LCBtZW51SXRlbXMsIGhpdFRlc3RSZXN1bHREYXRhLCB2YXJpYW50LmdldCgp KTsKLSAgICAgICAgY29udGV4dE1lbnVMaXN0ZW5lci51c2VDb250ZXh0TWVudUl0ZW1zKHsgfSk7 CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAogICAgIFdlYktpdFdlYlZpZXcqIG1fd2Vi VmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51 UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaApp bmRleCAzZjA1ZjQzOTVjMDg2NTZlZTYwYzFhNDY3YzZmZTgwOTExNWEwMjEwLi5lNjg5MTJjYjg5 NDhjYTExYzA1ODhkOWI0Y2YzODg5NTBkMjI5ODMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94eS5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKIAog ICAgIHZpcnR1YWwgdm9pZCBzaG93KCkgPSAwOwogCi0gICAgdmlydHVhbCB2b2lkIHNob3dDb250 ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+JiYpID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxS ZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mKSA9IDA7CiAKIHByb3RlY3RlZDoKICAgICBXZWJDb250 ZXh0TWVudVByb3h5KENvbnRleHRNZW51Q29udGV4dERhdGEmJiwgY29uc3QgVXNlckRhdGEmKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVBy b3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVBy b3h5R3RrLmNwcAppbmRleCAzYmIzYmM5OTMxMzg5ZTAzYTZiYmM1ZWFiMDViZTYzNTI5MmU4ODlm Li4zOTczOGZiOGE3OTQwODExM2ViMGExMDA0NDg4MjBiOGE0OGJhNDIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuY3Bw CkBAIC0xNDksMTEgKzE0OSwxNCBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlHdGs6OnNob3co KQogICAgICAgICAgICAgcHJvcG9zZWRBUElJdGVtcy5hcHBlbmQoV2ViQ29udGV4dE1lbnVJdGVt OjpjcmVhdGUoaXRlbSkpOwogICAgIH0KIAotICAgIG1fcGFnZS0+Y29udGV4dE1lbnVDbGllbnQo KS5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUoKm1fcGFnZSwgV1RGTW92ZShwcm9wb3Nl ZEFQSUl0ZW1zKSwgV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5OjpjcmVhdGUodGhpcykuZ2V0 KCksIG1fY29udGV4dC53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLCBtX3BhZ2UtPnByb2Nlc3MoKS50 cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKG1fdXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKLX0K KyAgICBWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+IGNsaWVudEl0ZW1zOworICAgIGJv b2wgdXNlUHJvcG9zZWRJdGVtcyA9IHRydWU7CisKKyAgICBpZiAobV9wYWdlLT5jb250ZXh0TWVu dUNsaWVudCgpLmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSgqbV9wYWdlLCBwcm9wb3Nl ZEFQSUl0ZW1zLCBjbGllbnRJdGVtcywgbV9jb250ZXh0LndlYkhpdFRlc3RSZXN1bHREYXRhKCks IG1fcGFnZS0+cHJvY2VzcygpLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobV91c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpKQorICAgICAgICB1c2VQcm9wb3NlZEl0ZW1zID0gZmFsc2U7CisKKyAg ICBjb25zdCBWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+JiBpdGVtcyA9IHVzZVByb3Bv c2VkSXRlbXMgPyBwcm9wb3NlZEFQSUl0ZW1zIDogY2xpZW50SXRlbXM7CiAKLXZvaWQgV2ViQ29u dGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxSZWY8V2Vi Q29udGV4dE1lbnVJdGVtPj4mJiBpdGVtcykKLXsKICAgICBpZiAoIWl0ZW1zLmlzRW1wdHkoKSkK ICAgICAgICAgcG9wdWxhdGUoaXRlbXMpOwogCkBAIC0xNjgsNyArMTcxLDEyIEBAIHZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxSZWY8 V2ViQ29udGV4dE1lbnVJCiAgICAgTmF0aXZlV2ViTW91c2VFdmVudCogbW91c2VFdmVudCA9IG1f cGFnZS0+Y3VycmVudGx5UHJvY2Vzc2VkTW91c2VEb3duRXZlbnQoKTsKICAgICBjb25zdCBHZGtF dmVudCogZXZlbnQgPSBtb3VzZUV2ZW50ID8gbW91c2VFdmVudC0+bmF0aXZlRXZlbnQoKSA6IDA7 CiAgICAgZ3RrX21lbnVfYXR0YWNoX3RvX3dpZGdldChtX21lbnUsIEdUS19XSURHRVQobV93ZWJW aWV3KSwgbnVsbHB0cik7Ci0gICAgZ3RrX21lbnVfcG9wdXAobV9tZW51LCBudWxscHRyLCBudWxs cHRyLCByZWludGVycHJldF9jYXN0PEd0a01lbnVQb3NpdGlvbkZ1bmM+KG1lbnVQb3NpdGlvbkZ1 bmN0aW9uKSwgdGhpcywgZXZlbnQgPyBldmVudC0+YnV0dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8g ZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RLX0NVUlJFTlRfVElNRSk7CisgICAgZ3RrX21lbnVfcG9w dXAobV9tZW51LCBudWxscHRyLCBudWxscHRyLCByZWludGVycHJldF9jYXN0PEd0a01lbnVQb3Np dGlvbkZ1bmM+KG1lbnVQb3NpdGlvbkZ1bmN0aW9uKSwgdGhpcywKKyAgICAgICAgICAgICAgICAg ICBldmVudCA/IGV2ZW50LT5idXR0b24uYnV0dG9uIDogMywgZXZlbnQgPyBldmVudC0+YnV0dG9u LnRpbWUgOiBHREtfQ1VSUkVOVF9USU1FKTsKK30KKwordm9pZCBXZWJDb250ZXh0TWVudVByb3h5 R3RrOjpzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoY29uc3QgVmVjdG9yPFJlZjxXZWJDb250ZXh0 TWVudUl0ZW0+PiYpCit7CiB9CiAKIFdlYkNvbnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRN ZW51UHJveHlHdGsoR3RrV2lkZ2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkmIHBhZ2UsIENvbnRl eHRNZW51Q29udGV4dERhdGEmJiBjb250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94 eUd0ay5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlH dGsuaAppbmRleCAzY2I0MTM1MmVhNmZjZWI0NDY4MDM0ZTM2YzY2YTQ1ZGFhN2I0YzIyLi44NGI5 ODhjYjc5YzhkNDBmZDJmODYxYTc5NDM5NmZkOTljOWJmOGQwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgKQEAgLTU1LDcg KzU1LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBXZWJDb250ZXh0TWVudVByb3h5R3RrKEd0 a1dpZGdldCosIFdlYlBhZ2VQcm94eSYsIENvbnRleHRNZW51Q29udGV4dERhdGEmJiwgY29uc3Qg VXNlckRhdGEmKTsKICAgICB2b2lkIHNob3coKSBvdmVycmlkZTsKLSAgICB2b2lkIHNob3dDb250 ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+JiYpIG92ZXJy aWRlOworICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8 V2ViQ29udGV4dE1lbnVJdGVtPj4mKSBvdmVycmlkZTsKICAgICB2b2lkIGFwcGVuZChHTWVudSos IGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbUdsaWImKTsKICAgICBHUmVmUHRyPEdNZW51PiBidWls ZE1lbnUoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+Jik7CiAgICAgdm9pZCBw b3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+Jik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaApp bmRleCAzZmE2MDZiMjA5NjUxNmNkMzE1NTVlZDVhZWYzOGVmNjNiMzJmNDU3Li5kN2RlYjZlNjM0 MWU1MTM1YjhhOTczZjllZWIyMzQ0ZWEwZmZhNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgKQEAgLTU0LDcgKzU0LDcg QEAgcHVibGljOgogICAgIH5XZWJDb250ZXh0TWVudVByb3h5TWFjKCk7CiAKICAgICB2b2lkIGNv bnRleHRNZW51SXRlbVNlbGVjdGVkKGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsKLSAg ICB2b2lkIHNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51 SXRlbT4+JiYpIG92ZXJyaWRlOworICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNv bnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mKSBvdmVycmlkZTsKIAogI2lmIEVO QUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIHZvaWQgY2xlYXJTZXJ2aWNlc01lbnUoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5 TWFjLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlN YWMubW0KaW5kZXggOTc4MTU3NDliZGRjYjA5Mzg4MWU4OGJlNzE3NjcwNzRhZTZmOGM3My4uNzky MjU4Yzc3ODE4MTc2NDQ3NmY3YzY4YTg3ODQyMmQ3NjY5YzkzMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTQ1 MSwxNCArNDUxLDggQEAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IFdlYkNvbnRleHRNZW51UHJveHlN YWM6OmNyZWF0ZUNvbnRleHRNZW51SXRlbShjb25zdCBXZWJDb24KICAgICB9CiB9CiAKLXZvaWQg V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxS ZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mJiBpdGVtcykKK3ZvaWQgV2ViQ29udGV4dE1lbnVQcm94 eU1hYzo6c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4 dE1lbnVJdGVtPj4mIGl0ZW1zKQogewotICAgIGlmIChtX3BhZ2UuY29udGV4dE1lbnVDbGllbnQo KS5zaG93Q29udGV4dE1lbnUobV9wYWdlLCBtX2NvbnRleHQubWVudUxvY2F0aW9uKCksIGl0ZW1z KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKGl0ZW1zLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuOwotCiAgICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGRhdGE7CiAgICAg ZGF0YS5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGl0ZW1zLnNpemUoKSk7CiAgICAgZm9yIChhdXRv JiBpdGVtIDogaXRlbXMpCkBAIC00ODQsNiArNDc4LDkgQEAgdm9pZCBXZWJDb250ZXh0TWVudVBy b3h5TWFjOjpzaG93Q29udGV4dE1lbnUoKQogICAgIGZvciAoYXV0byYgaXRlbSA6IG1fY29udGV4 dC5tZW51SXRlbXMoKSkKICAgICAgICAgcHJvcG9zZWRBUElJdGVtcy5hcHBlbmQoV2ViQ29udGV4 dE1lbnVJdGVtOjpjcmVhdGUoaXRlbSkpOwogCisgICAgVmVjdG9yPFJlZjxXZWJDb250ZXh0TWVu dUl0ZW0+PiBjbGllbnRJdGVtczsKKyAgICBib29sIHVzZVByb3Bvc2VkSXRlbXMgPSB0cnVlOwor CiAgICAgaWYgKG1fY29udGV4dE1lbnVMaXN0ZW5lcikgewogICAgICAgICBtX2NvbnRleHRNZW51 TGlzdGVuZXItPmludmFsaWRhdGUoKTsKICAgICAgICAgbV9jb250ZXh0TWVudUxpc3RlbmVyID0g bnVsbHB0cjsKQEAgLTQ5MSw3ICs0ODgsMjIgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFj OjpzaG93Q29udGV4dE1lbnUoKQogCiAgICAgbV9jb250ZXh0TWVudUxpc3RlbmVyID0gV2ViQ29u dGV4dE1lbnVMaXN0ZW5lclByb3h5OjpjcmVhdGUodGhpcyk7CiAKLSAgICBtX3BhZ2UuY29udGV4 dE1lbnVDbGllbnQoKS5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUobV9wYWdlLCBXVEZN b3ZlKHByb3Bvc2VkQVBJSXRlbXMpLCAqbV9jb250ZXh0TWVudUxpc3RlbmVyLCBtX2NvbnRleHQu d2ViSGl0VGVzdFJlc3VsdERhdGEoKSwgbV9wYWdlLnByb2Nlc3MoKS50cmFuc2Zvcm1IYW5kbGVz VG9PYmplY3RzKG1fdXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICBpZiAobV9wYWdlLmNv bnRleHRNZW51Q2xpZW50KCkuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51QXN5bmMobV9w YWdlLCBwcm9wb3NlZEFQSUl0ZW1zLCBtX2NvbnRleHRNZW51TGlzdGVuZXIuZ2V0KCksIG1fY29u dGV4dC53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLCBtX3BhZ2UucHJvY2VzcygpLnRyYW5zZm9ybUhh bmRsZXNUb09iamVjdHMobV91c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpKQorICAgICAgICByZXR1 cm47CisKKyAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGVzZSB0d28gY2xpZW50IGNhbGxzIG9u Y2Ugd2UgZG9uJ3QgbmVlZCB0byBzdXBwb3J0IHRoZSBDIFNQSS4KKyAgICBpZiAobV9wYWdlLmNv bnRleHRNZW51Q2xpZW50KCkuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KG1fcGFnZSwg cHJvcG9zZWRBUElJdGVtcywgY2xpZW50SXRlbXMsIG1fY29udGV4dC53ZWJIaXRUZXN0UmVzdWx0 RGF0YSgpLCBtX3BhZ2UucHJvY2VzcygpLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobV91c2Vy RGF0YS5vYmplY3QoKSkuZ2V0KCkpKQorICAgICAgICB1c2VQcm9wb3NlZEl0ZW1zID0gZmFsc2U7 CisKKyAgICBpZiAobV9wYWdlLmNvbnRleHRNZW51Q2xpZW50KCkuc2hvd0NvbnRleHRNZW51KG1f cGFnZSwgbV9jb250ZXh0Lm1lbnVMb2NhdGlvbigpLCB1c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9z ZWRBUElJdGVtcyA6IGNsaWVudEl0ZW1zKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYXV0byYm IGl0ZW1zID0gV1RGTW92ZSh1c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9zZWRBUElJdGVtcyA6IGNs aWVudEl0ZW1zKTsKKyAgICAKKyAgICBpZiAoaXRlbXMuaXNFbXB0eSgpKQorICAgICAgICByZXR1 cm47CisKKyAgICBzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoaXRlbXMpOwogfQogCiBOU1dpbmRv dyAqV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6d2luZG93KCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJDb250ZXh0TWVudVByb3h5V1BFLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViQ29udGV4dE1lbnVQcm94eVdQRS5oCmluZGV4IDhi MmQzYTM2Y2U0ZWMxNGI2MzhhNzc4OTkzOGVmMGIxNGEzNmVhYjEuLjQ5ODZiNjZkMzAxMTgwY2Mz ZmU4MmM2YWM5MzVhMjM0ZmJkMWIzMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL3dwZS9XZWJDb250ZXh0TWVudVByb3h5V1BFLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3Mvd3BlL1dlYkNvbnRleHRNZW51UHJveHlXUEUuaApAQCAtMzYsNyArMzYsNyBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkNvbnRleHRNZW51UHJveHlXUEUo V1RGTW92ZShjb250ZXh0KSwgdXNlckRhdGEpKTsKICAgICB9CiAKLSAgICB2b2lkIHNob3dDb250 ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+JiYpIGZpbmFs IHsgfQorICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8 V2ViQ29udGV4dE1lbnVJdGVtPj4mKSBmaW5hbCB7IH0KICAgICB2b2lkIHNob3coKSBmaW5hbCB7 IH07CiAKIHByaXZhdGU6Cg==