231827 2021-10-15 12:35:35 -0700 Use attributedBundleIdentifier instead of applicationBundleIdentifier when present for handling PCM attribution 2021-10-15 19:59:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson webkit-bug-importer wilander oldest_to_newest 1804963 0 achristensen 2021-10-15 12:35:35 -0700 Use attributedBundleIdentifier instead of applicationBundleIdentifier when present for handling PCM attribution 1804965 1 441415 achristensen 2021-10-15 12:38:11 -0700 Created attachment 441415 Patch 1804968 2 webkit-bug-importer 2021-10-15 12:51:18 -0700 <rdar://problem/84313358> 1804980 3 441415 wilander 2021-10-15 13:28:36 -0700 Comment on attachment 441415 Patch Does this change what's considered ephemeral? Please add some explanation of the changes to ephemeral. Thanks. 1804983 4 441415 achristensen 2021-10-15 13:30:59 -0700 Comment on attachment 441415 Patch It doesn't, but to test what SafariViewController does I added test SPI to set an ephemeral PCM. All the other API tests are testing non-ephemeral PCMs. 1805185 5 achristensen 2021-10-15 19:59:23 -0700 http://trac.webkit.org/r284301 441415 2021-10-15 12:38:11 -0700 2021-10-15 19:59:16 -0700 Patch bug-231827-20211015123810.patch text/plain 19647 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIwNWQ5MGU3YWNkNmE3YTFm ZDM4ZDY3ZjRkZTYwMmY3MGZjM2NiZmMuLjVhMDA3ODkyYWIwMWEyZjZhOGJlMDAxNzdlMDRhOGZm YThmOTQ5MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMTAtMTUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgYXR0cmli dXRlZEJ1bmRsZUlkZW50aWZpZXIgaW5zdGVhZCBvZiBhcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZp ZXIgd2hlbiBwcmVzZW50IGZvciBoYW5kbGluZyBQQ00gYXR0cmlidXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTgyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgdGhlIHNhbWUgaWRl bnRpZmllciB0aGF0IFNhZmFyaVZpZXdDb250cm9sbGVyIHVzZXMgaW4gX3NldEVwaGVtZXJhbFVJ RXZlbnRBdHRyaWJ1dGlvbjpmb3JBcHBsaWNhdGlvbldpdGhCdW5kbGVJRDoKKyAgICAgICAgSWYg d2UgZG9uJ3QgZG8gdGhpcywgdGhlbiBTYWZhcmlWaWV3Q29udHJvbGxlciBsb29rcyBpbiB0aGUg ZGF0YWJhc2UgZm9yIFBDTXMgZnJvbSBjb20uYXBwbGUuU2FmYXJpVmlld1NlcnZpY2UgYW5kIGRv ZXNuJ3QgZmluZCBhbnkgYW5kIGRvZXNuJ3Qgc2VuZCBhbnkgcmVwb3J0cy4KKworICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtEYXRhVGFzazo6YXR0cmlidXRlZEJ1bmRsZUlkZW50aWZpZXIpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtMb2FkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmF0dHJpYnV0 ZWRCdW5kbGVJZGVudGlmaWVyKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9h ZC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVXaWxsU2Vu ZFJlZGlyZWN0ZWRSZXF1ZXN0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpoYW5kbGVQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudENvbnZlcnNpb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtT ZXNzaW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRl Rm9yVGVzdGluZy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3VGVz dGluZy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9hZGRFdmVudEF0dHJpYnV0aW9uV2l0aFNv dXJjZUlEOmRlc3RpbmF0aW9uVVJMOnNvdXJjZURlc2NyaXB0aW9uOnB1cmNoYXNlcjpyZXBvcnRF bmRwb2ludDpvcHRpb25hbE5vbmNlOmFwcGxpY2F0aW9uQnVuZGxlSUQ6ZXBoZW1lcmFsOl0pOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRoU291cmNlSUQ6ZGVz dGluYXRpb25VUkw6c291cmNlRGVzY3JpcHRpb246cHVyY2hhc2VyOnJlcG9ydEVuZHBvaW50Om9w dGlvbmFsTm9uY2U6YXBwbGljYXRpb25CdW5kbGVJRDpdKTogRGVsZXRlZC4KKwogMjAyMS0xMC0x NSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkIG1hY2NhdGFseXN0IGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmNwcAppbmRleCBkNTE3ODU3M2RjY2ExOWQ1ZTY2 NmQ0YTRjNzE4ODU4M2JiMTE3YTI3Li5lODEyZTIxNjEzMGZhODRlNTQyMDhmMTVhZTYxMjYxMDZh YWUyMDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtE YXRhVGFzay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0 YVRhc2suY3BwCkBAIC0xNzUsNCArMTc1LDExIEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrOjpyZXN0 cmljdFJlcXVlc3RSZWZlcnJlclRvT3JpZ2luSWZOZWVkZWQoV2ViQ29yZTo6UmVzb3VyY2VSCiAj ZW5kaWYKIH0KIAorU3RyaW5nIE5ldHdvcmtEYXRhVGFzazo6YXR0cmlidXRlZEJ1bmRsZUlkZW50 aWZpZXIoV2ViUGFnZVByb3h5SWRlbnRpZmllciBwYWdlSUQpCit7CisgICAgaWYgKGF1dG8qIHNl c3Npb24gPSBuZXR3b3JrU2Vzc2lvbigpKQorICAgICAgICByZXR1cm4gc2Vzc2lvbi0+YXR0cmli dXRlZEJ1bmRsZUlkZW50aWZpZXJGcm9tUGFnZUlkZW50aWZpZXIocGFnZUlEKTsKKyAgICByZXR1 cm4geyB9OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5oCmluZGV4IGZlNjIwNTVjMzFlNmY2YmE2YzQ4 YzNlMzY4Mzc5NzM4N2I2NDIzOWEuLmQ2MDE4ZjYxMzgzYWUzYTUxZTlkNDcyMmNmNmE2MGUyZDhi ODdhN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Rh dGFUYXNrLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRh c2suaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiRG93bmxvYWRJRC5oIgogI2luY2x1 ZGUgIlNhbmRib3hFeHRlbnNpb24uaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHlJZGVudGlmaWVy LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9DcmVkZW50aWFsLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9G cmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrTG9hZE1ldHJpY3Mu aD4KQEAgLTEzNSw2ICsxMzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEgyUGlu Z0NhbGxiYWNrKGNvbnN0IFVSTCYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8V1RG OjpTZWNvbmRzLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yPiYmKT4mJik7CiAKICAgICB2aXJ0dWFs IHZvaWQgc2V0UHJpb3JpdHkoV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHkpIHsgfQorICAg IFN0cmluZyBhdHRyaWJ1dGVkQnVuZGxlSWRlbnRpZmllcihXZWJQYWdlUHJveHlJZGVudGlmaWVy KTsKIAogICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCmluZGV4IGExODViYTU2YmI3MjY0 MzcyOTJjMmIxZTBkNjI0OWQzZmFjYWVjZTguLmJhYzAyMmFiNDU0MzBmNjUxYjE4OWFjMDEyMDdh MDYwNjA4YzE2NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya0xvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xv YWQuY3BwCkBAIC0zMTcsNCArMzE3LDExIEBAIHZvaWQgTmV0d29ya0xvYWQ6OnNldEgyUGluZ0Nh bGxiYWNrKGNvbnN0IFVSTCYgdXJsLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVjCiAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VVbmV4cGVjdGVkKGludGVybmFsRXJyb3IodXJsKSkp OwogfQogCitTdHJpbmcgTmV0d29ya0xvYWQ6OmF0dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyKFdl YlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlEKQoreworICAgIGlmIChtX3Rhc2spCisgICAgICAg IHJldHVybiBtX3Rhc2stPmF0dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyKHBhZ2VJRCk7CisgICAg cmV0dXJuIHsgfTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgKaW5kZXggZjU0NTFjZjYwZTdmOWI4NjY0ODU4ZTJk MmI4Zjc1MDI2YmE0OWMwOS4uYzM3NzNjOTg3ODU1M2NlNTM0ZDA1NGFiZmZkZGViYjI5ZWUwODRk MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuaApAQCAtNjAs NiArNjAsNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmIHBh cmFtZXRlcnMoKSBjb25zdCB7IHJldHVybiBtX3BhcmFtZXRlcnM7IH0KICAgICBjb25zdCBVUkwm IHVybCgpIGNvbnN0IHsgcmV0dXJuIHBhcmFtZXRlcnMoKS5yZXF1ZXN0LnVybCgpOyB9CisgICAg U3RyaW5nIGF0dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIp OwogCiAgICAgdm9pZCBjb250aW51ZVdpbGxTZW5kUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAwZWY4MWNlZGI2N2MxOTcyMDBkMjcwY2E2OTVk M2RhOGRmYWM2YjBhLi5iZjhmMzU3ZDdhODNlZTUwMjg5MWRiMWU1YWJkODQxODRjNjMzNmM4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC0xMDgwLDggKzEwODAsMTAgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OmNvbnRpbnVlV2lsbFNlbmRSZWRpcmVjdGVkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3Qm JgogICAgIEFTU0VSVCghaXNTeW5jaHJvbm91cygpKTsKIAogICAgIE5ldHdvcmtTZXNzaW9uKiBu ZXR3b3JrU2Vzc2lvbiA9IG51bGxwdHI7Ci0gICAgaWYgKHByaXZhdGVDbGlja01lYXN1cmVtZW50 QXR0cmlidXRpb25UcmlnZ2VyRGF0YSAmJiAobmV0d29ya1Nlc3Npb24gPSBtX2Nvbm5lY3Rpb24t Pm5ldHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKCkpKSkKLSAgICAgICAg bmV0d29ya1Nlc3Npb24tPmhhbmRsZVByaXZhdGVDbGlja01lYXN1cmVtZW50Q29udmVyc2lvbihX VEZNb3ZlKCpwcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEpLCBy ZXF1ZXN0LnVybCgpLCByZWRpcmVjdFJlcXVlc3QpOworICAgIGlmIChwcml2YXRlQ2xpY2tNZWFz dXJlbWVudEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEgJiYgKG5ldHdvcmtTZXNzaW9uID0gbV9jb25u ZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLm5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCgpKSkpIHsK KyAgICAgICAgYXV0byBhdHRyaWJ1dGVkQnVuZGxlSWRlbnRpZmllciA9IG1fbmV0d29ya0xvYWQg PyBtX25ldHdvcmtMb2FkLT5hdHRyaWJ1dGVkQnVuZGxlSWRlbnRpZmllcihtX3BhcmFtZXRlcnMu d2ViUGFnZVByb3h5SUQpIDogU3RyaW5nKCk7CisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5oYW5k bGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudENvbnZlcnNpb24oV1RGTW92ZSgqcHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRBdHRyaWJ1dGlvblRyaWdnZXJEYXRhKSwgcmVxdWVzdC51cmwoKSwgcmVkaXJl Y3RSZXF1ZXN0LCBXVEZNb3ZlKGF0dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyKSk7CisgICAgfQog CiAgICAgaWYgKG1faXNLZXB0QWxpdmUpIHsKICAgICAgICAgY29udGludWVXaWxsU2VuZFJlcXVl c3QoV1RGTW92ZShyZWRpcmVjdFJlcXVlc3QpLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCBkMTc3NmU4 MWY5Yzc2ZjgyNGQ5ZjRhMzI2NDIzZTE5MGRmODk1YTUyLi5kMjM0ZGFiNWJlZWE1YjY0NzMwNTUw Yzc3MzcwYTlmMTU5NTk3Zjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgKQEAgLTIxMiw4ICsyMTIsNiBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBsb2dTbG93Q2FjaGVSZXRyaWV2ZUlmTmVlZGVkKGNvbnN0IE5ldHdvcmtD YWNoZTo6Q2FjaGU6OlJldHJpZXZlSW5mbyYpOwogCi0gICAgdm9pZCBoYW5kbGVQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudENvbnZlcnNpb24oV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6 OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGEmJiwgY29uc3QgVVJMJiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0Jik7Ci0KICAgICBzdGQ6Om9wdGlvbmFsPFNlY29uZHM+IHZhbGlkYXRlQ2Fj aGVFbnRyeUZvck1heEFnZUNhcFZhbGlkYXRpb24oY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsKIAogICAgIFJlc291cmNlTG9hZEluZm8g cmVzb3VyY2VMb2FkSW5mbygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmNwcAppbmRleCBiYTJkNGNlMzVmZTgzNWRkMzJmZmEyMmM0N2U0MmVlY2Q1 MDdjYWZhLi5jMjU0ZjEwODg1MjJkNTNhNjU0MDRiMmY1M2M0YTBhOTY5YzA5YWY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcApAQCAtMzMx LDEyICszMzEsMTIgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbjo6c3RvcmVQcml2YXRlQ2xpY2tNZWFz dXJlbWVudChXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWUKICAgICBwcml2YXRlQ2xpY2tN ZWFzdXJlbWVudCgpLnN0b3JlVW5hdHRyaWJ1dGVkKFdURk1vdmUodW5hdHRyaWJ1dGVkUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQpLCBbXSB7IH0pOwogfQogCi12b2lkIE5ldHdvcmtTZXNzaW9uOjpo YW5kbGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudENvbnZlcnNpb24oUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQ6OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGEmJiBhdHRyaWJ1dGlvblRyaWdnZXJEYXRhLCBj b25zdCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVk aXJlY3RSZXF1ZXN0KQordm9pZCBOZXR3b3JrU2Vzc2lvbjo6aGFuZGxlUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRDb252ZXJzaW9uKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvblRy aWdnZXJEYXRhJiYgYXR0cmlidXRpb25UcmlnZ2VyRGF0YSwgY29uc3QgVVJMJiByZXF1ZXN0VVJM LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlZGlyZWN0UmVxdWVzdCwgU3RyaW5n JiYgYXR0cmlidXRlZEJ1bmRsZUlkZW50aWZpZXIpCiB7CisgICAgU3RyaW5nIGFwcEJ1bmRsZUlE ID0gV1RGTW92ZShhdHRyaWJ1dGVkQnVuZGxlSWRlbnRpZmllcik7CiAjaWYgUExBVEZPUk0oQ09D T0EpCi0gICAgYXV0byBhcHBCdW5kbGVJRCA9IFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRl bnRpZmllcigpOwotI2Vsc2UKLSAgICBhdXRvIGFwcEJ1bmRsZUlEID0gU3RyaW5nKCk7CisgICAg aWYgKGFwcEJ1bmRsZUlELmlzRW1wdHkoKSkKKyAgICAgICAgYXBwQnVuZGxlSUQgPSBXZWJDb3Jl OjphcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKTsKICNlbmRpZgogCiAgICAgaWYgKG1fZXBo ZW1lcmFsTWVhc3VyZW1lbnQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Nlc3Npb24uaAppbmRleCA0N2QxZGQ3YzE3ZjA3NTE2OWJhY2ZkZjUyZjYxNzQzNjQxYTc3 ZDQyLi5lNzVmNWU5ZGJjZWJlNzM1OTA0YTYwMWIzNDIzOWY5YjA1NDc5MzE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCkBAIC0xMjcsNyArMTI3 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckFwcEJvdW5kU2Vzc2lvbigpIHsg fQogI2VuZGlmCiAgICAgdm9pZCBzdG9yZVByaXZhdGVDbGlja01lYXN1cmVtZW50KFdlYkNvcmU6 OlByaXZhdGVDbGlja01lYXN1cmVtZW50JiYpOwotICAgIHZvaWQgaGFuZGxlUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRDb252ZXJzaW9uKFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpB dHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYsIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QpOworICAgIHZvaWQgaGFuZGxl UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRDb252ZXJzaW9uKFdlYkNvcmU6OlByaXZhdGVDbGlja01l YXN1cmVtZW50OjpBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYsIGNvbnN0IFVSTCYgcmVxdWVzdFVS TCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QsIFN0cmlu ZyYmIGF0dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyKTsKICAgICB2b2lkIGR1bXBQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyk+JiYpOwogICAgIHZv aWQgY2xlYXJQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYpOwogICAgIHZvaWQgY2xlYXJQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEZvclJlZ2lzdHJhYmxl RG9tYWluKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiYsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5oCmluZGV4IGUzZWQyYTRlYzU0Yzhh YjJkN2MwMmI4NjE2OGM3YmUyNzFiMmRkOTEuLmUxNjkyNzEzYjhmNWNjOTUyMGZmNTc5OGJhMGQ5 MTU1ODI1ZDU3YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5oCkBAIC00NCw3ICs0NCw3 IEBAIHN0cnVjdCBXS0FwcFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSB7CiAKIEBpbnRlcmZhY2Ug V0tXZWJWaWV3IChXS1Rlc3RpbmcpCiAKLS0gKHZvaWQpX2FkZEV2ZW50QXR0cmlidXRpb25XaXRo U291cmNlSUQ6KHVpbnQ4X3Qpc291cmNlSUQgZGVzdGluYXRpb25VUkw6KE5TVVJMICopZGVzdGlu YXRpb24gc291cmNlRGVzY3JpcHRpb246KE5TU3RyaW5nICopc291cmNlRGVzY3JpcHRpb24gcHVy Y2hhc2VyOihOU1N0cmluZyAqKXB1cmNoYXNlciByZXBvcnRFbmRwb2ludDooTlNVUkwgKilyZXBv cnRFbmRwb2ludCBvcHRpb25hbE5vbmNlOihudWxsYWJsZSBOU1N0cmluZyAqKW5vbmNlIGFwcGxp Y2F0aW9uQnVuZGxlSUQ6KE5TU3RyaW5nICopYnVuZGxlSUQgV0tfQVBJX0FWQUlMQUJMRShtYWNv cyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpX2FkZEV2ZW50QXR0cmli dXRpb25XaXRoU291cmNlSUQ6KHVpbnQ4X3Qpc291cmNlSUQgZGVzdGluYXRpb25VUkw6KE5TVVJM ICopZGVzdGluYXRpb24gc291cmNlRGVzY3JpcHRpb246KE5TU3RyaW5nICopc291cmNlRGVzY3Jp cHRpb24gcHVyY2hhc2VyOihOU1N0cmluZyAqKXB1cmNoYXNlciByZXBvcnRFbmRwb2ludDooTlNV UkwgKilyZXBvcnRFbmRwb2ludCBvcHRpb25hbE5vbmNlOihudWxsYWJsZSBOU1N0cmluZyAqKW5v bmNlIGFwcGxpY2F0aW9uQnVuZGxlSUQ6KE5TU3RyaW5nICopYnVuZGxlSUQgZXBoZW1lcmFsOihC T09MKWVwaGVtZXJhbCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tf SU9TX1RCQSkpOwogCiAtICh2b2lkKV9zZXRQYWdlU2NhbGU6KENHRmxvYXQpc2NhbGUgd2l0aE9y aWdpbjooQ0dQb2ludClvcmlnaW47CiAtIChDR0Zsb2F0KV9wYWdlU2NhbGU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3VGVzdGluZy5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCmlu ZGV4IDQ4NTQwNDgzYzMxYWRlOGYyNTE4NDdjZmJkOGM2Mzk1OTdjNjI4ZWUuLmI3NjNkMTkxZTUw MDcyOTMzMmE2ZTgyNjI4MTAzNWQyYWI3MDEwMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCkBAIC01NSw3ICs1NSw3 IEBACiAKIEBpbXBsZW1lbnRhdGlvbiBXS1dlYlZpZXcgKFdLVGVzdGluZykKIAotLSAodm9pZClf YWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDoodWludDhfdClzb3VyY2VJRCBkZXN0aW5h dGlvblVSTDooTlNVUkwgKilkZXN0aW5hdGlvbiBzb3VyY2VEZXNjcmlwdGlvbjooTlNTdHJpbmcg Kilzb3VyY2VEZXNjcmlwdGlvbiBwdXJjaGFzZXI6KE5TU3RyaW5nICopcHVyY2hhc2VyIHJlcG9y dEVuZHBvaW50OihOU1VSTCAqKXJlcG9ydEVuZHBvaW50IG9wdGlvbmFsTm9uY2U6KE5TU3RyaW5n ICopbm9uY2UgYXBwbGljYXRpb25CdW5kbGVJRDooTlNTdHJpbmcgKilidW5kbGVJRAorLSAodm9p ZClfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDoodWludDhfdClzb3VyY2VJRCBkZXN0 aW5hdGlvblVSTDooTlNVUkwgKilkZXN0aW5hdGlvbiBzb3VyY2VEZXNjcmlwdGlvbjooTlNTdHJp bmcgKilzb3VyY2VEZXNjcmlwdGlvbiBwdXJjaGFzZXI6KE5TU3RyaW5nICopcHVyY2hhc2VyIHJl cG9ydEVuZHBvaW50OihOU1VSTCAqKXJlcG9ydEVuZHBvaW50IG9wdGlvbmFsTm9uY2U6KE5TU3Ry aW5nICopbm9uY2UgYXBwbGljYXRpb25CdW5kbGVJRDooTlNTdHJpbmcgKilidW5kbGVJRCBlcGhl bWVyYWw6KEJPT0wpZXBoZW1lcmFsCiB7CiAgICAgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQgbWVhc3VyZW1lbnQoCiAgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVt ZW50OjpTb3VyY2VJRChzb3VyY2VJRCksCkBAIC02Myw3ICs2Myw3IEBACiAgICAgICAgIFdlYkNv cmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvbkRlc3RpbmF0aW9uU2l0ZShk ZXN0aW5hdGlvbiksCiAgICAgICAgIGJ1bmRsZUlELAogICAgICAgICBXYWxsVGltZTo6bm93KCks Ci0gICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvbkVw aGVtZXJhbDo6Tm8KKyAgICAgICAgZXBoZW1lcmFsID8gV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQ6OkF0dHJpYnV0aW9uRXBoZW1lcmFsOjpZZXMgOiBXZWJDb3JlOjpQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25FcGhlbWVyYWw6Ok5vCiAgICAgKTsKICAgICBpZiAo bm9uY2UpCiAgICAgICAgIG1lYXN1cmVtZW50LnNldEVwaGVtZXJhbFNvdXJjZU5vbmNlKHsgbm9u Y2UgfSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggODFmYTIzMTVjMjc5NjBlZmJiYWUyYWFkYTQ1MWZhNDNmNzBhYWE4OS4uOWRmMjYyNjc2OWEw MjczZDk2OTg0NGFkODBhMGRkMGE1MjU1MTY3YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEwLTE1ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIGF0 dHJpYnV0ZWRCdW5kbGVJZGVudGlmaWVyIGluc3RlYWQgb2YgYXBwbGljYXRpb25CdW5kbGVJZGVu dGlmaWVyIHdoZW4gcHJlc2VudCBmb3IgaGFuZGxpbmcgUENNIGF0dHJpYnV0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4MjcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbToKKyAgICAgICAgKFRlc3RXZWJL aXRBUEk6OnJ1bkJhc2ljUENNVGVzdCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToK KwogMjAyMS0xMC0xNCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBUZXN0V2ViS2l0QVBJLlByaXZhdGVDbGlja01lYXN1cmVtZW50LkZyYXVkUHJldmVudGlv biBpcyBhIGNvbnN0YW50IHRpbWVvdXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbQppbmRleCA0NGFiNWY4OTI3 ODA2YTY2MmExMzgwZTZmMjVkZmJlNjhhZGExMjViLi4yMmUwMjYzYzI3ZWExZjU2YzY2YmYwM2Fj NWNhNWRkYTBkY2ZhYjYzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tCkBAIC0xMjAsNyArMTIwLDcgQEAg c3RhdGljIHZvaWQgY2xlYXJTdGF0ZSgpCiAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5h Z2VyXSByZW1vdmVJdGVtQXRVUkw6YWRvcHROUyhbW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSkuZ2V0KCkuX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rv cnkgZXJyb3I6bmlsXTsKIH0KIAotdm9pZCBydW5CYXNpY1BDTVRlc3QoV0tXZWJWaWV3Q29uZmln dXJhdGlvbiAqY29uZmlndXJhdGlvbiwgRnVuY3Rpb248dm9pZChXS1dlYlZpZXcgKiwgY29uc3Qg SFRUUFNlcnZlciYpPiYmIGFkZEF0dHJpYnV0aW9uVG9XZWJWaWV3KQordm9pZCBydW5CYXNpY1BD TVRlc3QoV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiwgRnVuY3Rpb248dm9p ZChXS1dlYlZpZXcgKiwgY29uc3QgSFRUUFNlcnZlciYpPiYmIGFkZEF0dHJpYnV0aW9uVG9XZWJW aWV3LCBib29sIHNldFRlc3RBcHBCdW5kbGVJRCA9IHRydWUpCiB7CiAgICAgY2xlYXJTdGF0ZSgp OwogICAgIFtXS1dlYnNpdGVEYXRhU3RvcmUgX3NldE5ldHdvcmtQcm9jZXNzU3VzcGVuc2lvbkFs bG93ZWRGb3JUZXN0aW5nOk5PXTsKQEAgLTE2MywxMCArMTYzLDEzIEBAIHZvaWQgcnVuQmFzaWNQ Q01UZXN0KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24sIEZ1bmN0aW9uPHZv aWQoV0tXZWJWCiAgICAgW1t3ZWJWaWV3IGNvbmZpZ3VyYXRpb25dLndlYnNpdGVEYXRhU3RvcmUg X3RydXN0U2VydmVyRm9yTG9jYWxQQ01UZXN0aW5nOnNlY1RydXN0RnJvbUNlcnRpZmljYXRlQ2hh aW4oQFsoaWQpdGVzdENlcnRpZmljYXRlKCkuZ2V0KCldKS5nZXQoKV07CiAgICAgW3dlYlZpZXcg X3NldFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0cmlidXRpb25SZXBvcnRVUkxzRm9yVGVzdGlu ZzpzZXJ2ZXJVUkwgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIGNvbXBsZXRpb25IYW5kbGVy Ol57CiAgICAgICAgIFt3ZWJWaWV3IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE92ZXJyaWRl VGltZXJGb3JUZXN0aW5nOllFUyBjb21wbGV0aW9uSGFuZGxlcjpeewotICAgICAgICAgICAgW3dl YlZpZXcgX3NldFByaXZhdGVDbGlja01lYXN1cmVtZW50QXBwQnVuZGxlSURGb3JUZXN0aW5nOkAi dGVzdC5idW5kbGUuaWQiIGNvbXBsZXRpb25IYW5kbGVyOl57Ci0gICAgICAgICAgICAgICAgTlNT dHJpbmcgKmh0bWwgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIjxzY3JpcHQ+ZmV0Y2go JyVAY29udmVyc2lvblJlcXVlc3RCZWZvcmVSZWRpcmVjdCcse21vZGU6J25vLWNvcnMnfSk8L3Nj cmlwdD4iLCBzZXJ2ZXJVUkxdOworICAgICAgICAgICAgTlNTdHJpbmcgKmh0bWwgPSBbTlNTdHJp bmcgc3RyaW5nV2l0aEZvcm1hdDpAIjxzY3JpcHQ+ZmV0Y2goJyVAY29udmVyc2lvblJlcXVlc3RC ZWZvcmVSZWRpcmVjdCcse21vZGU6J25vLWNvcnMnfSk8L3NjcmlwdD4iLCBzZXJ2ZXJVUkxdOwor ICAgICAgICAgICAgaWYgKHNldFRlc3RBcHBCdW5kbGVJRCkgeworICAgICAgICAgICAgICAgIFt3 ZWJWaWV3IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEFwcEJ1bmRsZUlERm9yVGVzdGluZzpA InRlc3QuYnVuZGxlLmlkIiBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgICAgICAgICAgICAgICAg ICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6ZXhhbXBsZVVSTCgpXTsKKyAg ICAgICAgICAgICAgICB9XTsKKyAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIFt3 ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOmh0bWwgYmFzZVVSTDpleGFtcGxlVVJMKCldOwotICAgICAg ICAgICAgfV07CiAgICAgICAgIH1dOwogICAgIH1dOwogICAgIFV0aWw6OnJ1bigmZG9uZSk7CkBA IC0zMDksNyArMzEyLDcgQEAgVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgRnJhdWRQcmV2 ZW50aW9uKQogCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwog ICAgIHdlYlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gZGVsZWdhdGVBbGxvd2luZ0Fs bFRMUygpOwotICAgIFt3ZWJWaWV3IF9hZGRFdmVudEF0dHJpYnV0aW9uV2l0aFNvdXJjZUlEOjQy IGRlc3RpbmF0aW9uVVJMOmV4YW1wbGVVUkwoKSBzb3VyY2VEZXNjcmlwdGlvbjpAInRlc3Qgc291 cmNlIGRlc2NyaXB0aW9uIiBwdXJjaGFzZXI6QCJ0ZXN0IHB1cmNoYXNlciIgcmVwb3J0RW5kcG9p bnQ6c2VydmVyVVJMIG9wdGlvbmFsTm9uY2U6QCJBQkNERUZhYmNkZWYwMTIzNDU2Nzg5IiBhcHBs aWNhdGlvbkJ1bmRsZUlEOkAidGVzdC5idW5kbGUuaWQiXTsKKyAgICBbd2ViVmlldyBfYWRkRXZl bnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMKCkg c291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNjcmlwdGlvbiIgcHVyY2hhc2VyOkAi dGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZlclVSTCBvcHRpb25hbE5vbmNlOkAi QUJDREVGYWJjZGVmMDEyMzQ1Njc4OSIgYXBwbGljYXRpb25CdW5kbGVJRDpAInRlc3QuYnVuZGxl LmlkIiBlcGhlbWVyYWw6Tk9dOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRl RGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNdOwogICAgIFtb d2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF90cnVzdFNlcnZlckZvckxv Y2FsUENNVGVzdGluZzpzZWNUcnVzdEZyb21DZXJ0aWZpY2F0ZUNoYWluKEBbKGlkKXRlc3RDZXJ0 aWZpY2F0ZSgpLmdldCgpXSkuZ2V0KCldOwogCkBAIC0zMzIsMTAgKzMzNSwxOSBAQCBURVNUKFBy aXZhdGVDbGlja01lYXN1cmVtZW50LCBGcmF1ZFByZXZlbnRpb24pCiBURVNUKFByaXZhdGVDbGlj a01lYXN1cmVtZW50LCBCYXNpYykKIHsKICAgICBydW5CYXNpY1BDTVRlc3QobmlsLCBbXShXS1dl YlZpZXcgKndlYlZpZXcsIGNvbnN0IEhUVFBTZXJ2ZXImIHNlcnZlcikgewotICAgICAgICBbd2Vi VmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5hdGlvblVSTDpl eGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNjcmlwdGlvbiIg cHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZlci5yZXF1ZXN0 KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9uQnVuZGxlSUQ6QCJ0ZXN0LmJ1bmRs ZS5pZCJdOworICAgICAgICBbd2ViVmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJ RDo0MiBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0 IHNvdXJjZSBkZXNjcmlwdGlvbiIgcHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVu ZHBvaW50OnNlcnZlci5yZXF1ZXN0KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9u QnVuZGxlSUQ6QCJ0ZXN0LmJ1bmRsZS5pZCIgZXBoZW1lcmFsOk5PXTsKICAgICB9KTsKIH0KIAor VEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgRXBoZW1lcmFsV2l0aEF0dHJpYnV0ZWRCdW5k bGVJZGVudGlmaWVyKQoreworICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2Vi Vmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5fYXR0cmli dXRlZEJ1bmRsZUlkZW50aWZpZXIgPSBAIm90aGVyLnRlc3QuYnVuZGxlLmlkIjsKKyAgICBydW5C YXNpY1BDTVRlc3QoY29uZmlndXJhdGlvbi5nZXQoKSwgW10oV0tXZWJWaWV3ICp3ZWJWaWV3LCBj b25zdCBIVFRQU2VydmVyJiBzZXJ2ZXIpIHsKKyAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0 cmlidXRpb25XaXRoU291cmNlSUQ6NDIgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJj ZURlc2NyaXB0aW9uOkAidGVzdCBzb3VyY2UgZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3Qg cHVyY2hhc2VyIiByZXBvcnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBvcHRpb25hbE5v bmNlOm5pbCBhcHBsaWNhdGlvbkJ1bmRsZUlEOkAib3RoZXIudGVzdC5idW5kbGUuaWQiIGVwaGVt ZXJhbDpZRVNdOworICAgIH0sIGZhbHNlKTsKK30KKwogVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJl bWVudCwgRGF0YWJhc2VMb2NhdGlvbikKIHsKICAgICBOU0ZpbGVNYW5hZ2VyICpmaWxlTWFuYWdl ciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKQEAgLTM1NCw3ICszNjYsNyBAQCBU RVNUKFByaXZhdGVDbGlja01lYXN1cmVtZW50LCBEYXRhYmFzZUxvY2F0aW9uKQogICAgICAgICBh dXRvIGRhdGFTdG9yZSA9IGFkb3B0TlMoW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0 V2l0aENvbmZpZ3VyYXRpb246ZGF0YVN0b3JlQ29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgICAg ICB2aWV3Q29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gZGF0YVN0b3JlLmdl dCgpOwogICAgICAgICBydW5CYXNpY1BDTVRlc3Qodmlld0NvbmZpZ3VyYXRpb24uZ2V0KCksIFtd KFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgSFRUUFNlcnZlciYgc2VydmVyKSB7Ci0gICAgICAg ICAgICBbd2ViVmlldyBfYWRkRXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5h dGlvblVSTDpleGFtcGxlVVJMKCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNj cmlwdGlvbiIgcHVyY2hhc2VyOkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZl ci5yZXF1ZXN0KCkuVVJMIG9wdGlvbmFsTm9uY2U6bmlsIGFwcGxpY2F0aW9uQnVuZGxlSUQ6QCJ0 ZXN0LmJ1bmRsZS5pZCJdOworICAgICAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRp b25XaXRoU291cmNlSUQ6NDIgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2Ny aXB0aW9uOkAidGVzdCBzb3VyY2UgZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hh c2VyIiByZXBvcnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBvcHRpb25hbE5vbmNlOm5p bCBhcHBsaWNhdGlvbkJ1bmRsZUlEOkAidGVzdC5idW5kbGUuaWQiIGVwaGVtZXJhbDpOT107CiAg ICAgICAgIH0pOwogICAgICAgICBvcmlnaW5hbE5ldHdvcmtQcm9jZXNzUGlkID0gW2RhdGFTdG9y ZSBfbmV0d29ya1Byb2Nlc3NJZGVudGlmaWVyXTsKICAgICAgICAgRVhQRUNUX0dUKG9yaWdpbmFs TmV0d29ya1Byb2Nlc3NQaWQsIDApOwpAQCAtNDk3LDcgKzUwOSw3IEBAIFRFU1QoUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQsIERhZW1vbkJhc2ljRnVuY3Rpb25hbGl0eSkKICAgICBhdXRvIFt0ZW1w RGlyLCBjb25maWd1cmF0aW9uXSA9IHNldFVwRGFlbW9uKGFkb3B0TlMoW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gbmV3XSkuYXV0b3JlbGVhc2UoKSk7CiAgICAgYXR0ZW1wdENvbm5lY3Rpb25JblBy b2Nlc3NXaXRob3V0RW50aXRsZW1lbnQoKTsKICAgICBydW5CYXNpY1BDTVRlc3QoY29uZmlndXJh dGlvbiwgW10oV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBIVFRQU2VydmVyJiBzZXJ2ZXIpIHsK LSAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRoU291cmNlSUQ6NDIgZGVz dGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2NyaXB0aW9uOkAidGVzdCBzb3VyY2Ug ZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hhc2VyIiByZXBvcnRFbmRwb2ludDpz ZXJ2ZXIucmVxdWVzdCgpLlVSTCBvcHRpb25hbE5vbmNlOm5pbCBhcHBsaWNhdGlvbkJ1bmRsZUlE OkAidGVzdC5idW5kbGUuaWQiXTsKKyAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRp b25XaXRoU291cmNlSUQ6NDIgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2Ny aXB0aW9uOkAidGVzdCBzb3VyY2UgZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hh c2VyIiByZXBvcnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBvcHRpb25hbE5vbmNlOm5p bCBhcHBsaWNhdGlvbkJ1bmRsZUlEOkAidGVzdC5idW5kbGUuaWQiIGVwaGVtZXJhbDpOT107CiAg ICAgfSk7CiAgICAgY2xlYW5VcERhZW1vbih0ZW1wRGlyKTsKIH0K