240362 2022-05-12 16:12:52 -0700 Use _adoptEffectiveConfiguration instead of a separate NSURLSession without credentials 2022-05-26 20:51:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo ews-watchlist webkit-bug-importer oldest_to_newest 1868573 0 achristensen 2022-05-12 16:12:52 -0700 Use _adoptEffectiveConfiguration instead of a separate NSURLSession without credentials 1868574 1 459256 achristensen 2022-05-12 16:14:34 -0700 Created attachment 459256 Patch 1868794 2 459309 achristensen 2022-05-13 10:13:37 -0700 Created attachment 459309 Patch 1869270 3 achristensen 2022-05-16 09:30:48 -0700 Perf testers say this is a 0.57% performance improvement. 1869272 4 459309 cdumez 2022-05-16 09:32:10 -0700 Comment on attachment 459309 Patch r=me 1869284 5 ews-feeder 2022-05-16 09:50:36 -0700 Committed r294238 (250596@main): <https://commits.webkit.org/250596@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459309. 1869285 6 webkit-bug-importer 2022-05-16 09:51:13 -0700 <rdar://problem/93352198> 1869419 7 ryanhaddad 2022-05-16 14:37:09 -0700 Reverted r294238 for reason: Breaks internal builds Committed r294261 (250609@trunk): <https://commits.webkit.org/250609@trunk> 1869793 8 459513 achristensen 2022-05-17 13:55:09 -0700 Created attachment 459513 Patch 1869812 9 459516 achristensen 2022-05-17 14:47:20 -0700 Created attachment 459516 Patch 1872228 10 459800 achristensen 2022-05-26 17:41:05 -0700 Created attachment 459800 Patch 1872259 11 ews-feeder 2022-05-26 20:51:12 -0700 Committed r294927 (251038@main): <https://commits.webkit.org/251038@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459800. 459256 2022-05-12 16:14:34 -0700 2022-05-13 10:13:36 -0700 Patch bug-240362-20220512161433.patch text/plain 12163 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCA5M2VkNzVi NjdiYTM3ODZhMjRkZDIxZjYwMzRiYTJjMGUyMGNmYmFlLi5mNzg3YzlkMWE4MDQwZDhkYmY3NTM5 MTY1MDY5NDRmYzkxMDM2MDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMi0wNS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgor CisgICAgICAgIFVzZSBfYWRvcHRFZmZlY3RpdmVDb25maWd1cmF0aW9uIGluc3RlYWQgb2YgYSBz ZXBhcmF0ZSBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVkZW50aWFscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMzYyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQ SS5oOgorCiAyMDIyLTA1LTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFtDb2NvYV0gU2Vla2luZyBpbnRvIGEgeEhFLUFBQyB0cmFjayBiYWNrZWQgYnkgYSBT b3VyY2VCdWZmZXIgY2FuIHN0YWxsIHBsYXliYWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxMzFjNmMyYjZiMWZk YWY4NDdjZjRiYTgzZDk1ZGQyNDU2ZTAyOTguLjA0NWM1Nzk0NjkzZTM2ODJmMDI4M2U2OWVmMTA3 MjgzZjk5ZmViYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDUtMTIgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgX2Fk b3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbiBpbnN0ZWFkIG9mIGEgc2VwYXJhdGUgTlNVUkxTZXNz aW9uIHdpdGhvdXQgY3JlZGVudGlhbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI0MDM2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0 YVRhc2tDb2NvYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np b25Db2NvYS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9u Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OmluaXRpYWxp emVOU1VSTFNlc3Npb25zSW5TZXQpOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9uU2V0Ojppbml0 aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6c2Vzc2lvbldyYXBwZXJGb3JUYXNrKToKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6YXBwQm91bmRTZXNzaW9uKToKKyAgICAgICAg KFdlYktpdDo6U2Vzc2lvblNldDo6aXNvbGF0ZWRTZXNzaW9uKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Nlc3Npb25Db2NvYTo6aW52YWxpZGF0ZUFuZENhbmNlbFNlc3Npb25TZXQpOgorCiAy MDIyLTA1LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBhYmFuZG9uZWQgQ1NTRGVmZXJyZWRQYXJzZXIgaW1wbGVtZW50YXRpb24gYW5kIGZl YXR1cmUgZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZO ZXR3b3JrU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEku aAppbmRleCA4OTg0NjBjZWExZDk4MzBhZTc1NzAzNTY2MWU1ZGRhOTc3MTE3MGZlLi4wMTFiMWVl MThhYjM1NWJiNWVlOGRiNTY1M2EyNTMxMjU4OWU4NGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaApAQCAtMjgwLDYgKzI4MCw3IEBAIHR5cGVkZWYg TlNfRU5VTShOU0ludGVnZXIsIE5TVVJMU2Vzc2lvbkNvbXBhbmlvblByb3h5UHJlZmVyZW5jZSkg ewogQGVuZAogCiBAaW50ZXJmYWNlIE5TVVJMU2Vzc2lvblRhc2sgKCkKKy0gKHZvaWQpIF9hZG9w dEVmZmVjdGl2ZUNvbmZpZ3VyYXRpb246KE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24qKSBuZXdD b25maWd1cmF0aW9uOwogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0RhdGE7CiBAcHJvcGVydHkg KHJlYWR3cml0ZSwgY29weSkgTlNTdHJpbmcgKl9wYXRoVG9Eb3dubG9hZFRhc2tGaWxlOwogQHBy b3BlcnR5IChjb3B5KSBOU1N0cmluZyAqX3N0b3JhZ2VQYXJ0aXRpb25JZGVudGlmaWVyOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRh c2tDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW0KaW5kZXggNjljNTkwMDUzMjE3MTViMzE4MDk0ODI4MGM3ZWU3NGI1ZmE3 NDdmNy4uYjY4OTk5NjZiZWQyY2RiN2M1ZWFkYmVhOGZjZTViZDEyM2I3ZDQzZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2Nv YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRh VGFza0NvY29hLm1tCkBAIC0zNjQsNiArMzY0LDIwIEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpO ZXR3b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFU CiAKICAgICBtX3Rhc2sgPSBbbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbiBkYXRhVGFza1dpdGhS ZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAKKyAgICBzd2l0Y2ggKHBhcmFtZXRlcnMuc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kpIHsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxz UG9saWN5OjpVc2U6CisgICAgICAgIEFTU0VSVChtX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uLmdl dCgpLmNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UpOworICAgICAgICBicmVhazsK KyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0 ZWxlc3M6CisgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbi5nZXQoKS5j b25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlKTsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2U6CisgICAgICAg IE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gPSBtX3Nl c3Npb25XcmFwcGVyLT5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247CisgICAgICAgIGVmZmVj dGl2ZUNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CisgICAgICAgIFtt X3Rhc2sgX2Fkb3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbjplZmZlY3RpdmVDb25maWd1cmF0aW9u XTsKKyAgICAgICAgYnJlYWs7CisgICAgfTsKKwogICAgIFdURkJlZ2luU2lnbnBvc3QobV90YXNr LmdldCgpLCAiRGF0YVRhc2siLCAiJXtwdWJsaWN9cyBwcmk6ICUuMmYgcHJlY29ubmVjdDogJWQi LCB1cmwuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCksIHRvTlNVUkxTZXNzaW9uVGFza1ByaW9yaXR5 KHJlcXVlc3QucHJpb3JpdHkoKSksIHBhcmFtZXRlcnMuc2hvdWxkUHJlY29ubmVjdE9ubHkgPT0g UHJlY29ubmVjdE9ubHk6Olllcyk7CiAKICAgICBSRUxFQVNFX0FTU0VSVCghbV9zZXNzaW9uV3Jh cHBlci0+ZGF0YVRhc2tNYXAuY29udGFpbnMoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np b25Db2NvYS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLmgKaW5kZXggNGZkYzkxZjMzNGM5ZGYyMjg1NDQ2NmVmMWRmMDE4ODA2MWJhZDdj Yy4uOTM0NzQxMjcyZjM4YWE2MDIzYjUwYjJkODY1NzQwMmFiYTA5MGU5NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNv Y29hLmgKQEAgLTY4LDcgKzY4LDYgQEAgc3RydWN0IElzb2xhdGVkU2Vzc2lvbiB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lv bldpdGhDcmVkZW50aWFsU3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91 dENyZWRlbnRpYWxTdG9yYWdlOwogICAgIFdhbGxUaW1lIGxhc3RVc2VkOwogfTsKIApAQCAtODcs NyArODYsNiBAQCBwdWJsaWM6CiAgICAgc3RkOjp1bmlxdWVfcHRyPElzb2xhdGVkU2Vzc2lvbj4g YXBwQm91bmRTZXNzaW9uOwogCiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldpdGhDcmVkZW50 aWFsU3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlOwogICAgIFNlc3Npb25XcmFwcGVyIGVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb247CiAK IHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nv Y29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggNTYyM2E0ZTNjMTFkYmZhOTc4ZWNjNjNm M2I3NjJkODVmZTE2ZWUyOS4uZDQ1NDk2NTQyZTU4ZjcxYzVhMjRiZjEyMzJlZjE0MzU3YWE5YTAy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr U2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtMTM1Miw5ICsxMzUyLDYgQEAgdm9pZCBOZXR3b3Jr U2Vzc2lvbkNvY29hOjppbml0aWFsaXplTlNVUkxTZXNzaW9uc0luU2V0KFNlc3Npb25TZXQmIHNl c3Npb25TZXQsIE4KICAgICBhdXRvIGNvb2tpZUFjY2VwdFBvbGljeSA9IGNvbmZpZ3VyYXRpb24u SFRUUENvb2tpZVN0b3JhZ2UuY29va2llQWNjZXB0UG9saWN5OwogICAgIExPRyhOZXR3b3JrU2Vz c2lvbiwgIkNyZWF0ZWQgTmV0d29ya1Nlc3Npb24gd2l0aCBjb29raWVBY2NlcHRQb2xpY3kgJWx1 IiwgY29va2llQWNjZXB0UG9saWN5KTsKICAgICBSRUxFQVNFX0xPR19JRihjb29raWVBY2NlcHRQ b2xpY3kgPT0gTlNIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIsIE5ldHdvcmtTZXNzaW9uLCAi Q3JlYXRpbmcgbmV0d29yayBzZXNzaW9uIHdpdGggSUQgJSIgUFJJdTY0ICIgdGhhdCB3aWxsIG5v dCBhY2NlcHQgY29va2llcy4iLCBtX3Nlc3Npb25JRC50b1VJbnQ2NCgpKTsKLQotICAgIGNvbmZp Z3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7Ci0gICAgc2Vzc2lvblNldC5zZXNz aW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoY29uZmlndXJhdGlvbiwgKnRo aXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZSwgTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW46Ok5vKTsKIH0KIAogU2Vzc2lvblNldCYgTmV0d29ya1Nlc3Npb25D b2NvYTo6c2Vzc2lvblNldEZvclBhZ2UoV2ViUGFnZVByb3h5SWRlbnRpZmllciB3ZWJQYWdlUHJv eHlJRCkKQEAgLTEzODAsNyArMTM3Nyw3IEBAIFNlc3Npb25XcmFwcGVyJiBTZXNzaW9uU2V0Ojpp bml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKE5hdmlnYXRpCiAgICAg ICAgIHJldHVybiBlcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uOwogCiAgICAgTlNVUkxTZXNzaW9u Q29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiA9IFtOU1VSTFNlc3Npb25Db25maWd1cmF0aW9u IGVwaGVtZXJhbFNlc3Npb25Db25maWd1cmF0aW9uXTsKLSAgICBOU1VSTFNlc3Npb25Db25maWd1 cmF0aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKKyAgICBOU1VSTFNlc3Npb25Db25m aWd1cmF0aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0aENyZWRlbnRpYWxT dG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKIAogICAgIGNvbmZpZ3VyYXRpb24u SFRUUENvb2tpZUFjY2VwdFBvbGljeSA9IE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyOwog ICAgIGNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CkBAIC0xNDI0LDkg KzE0MjEsOCBAQCBTZXNzaW9uV3JhcHBlciYgTmV0d29ya1Nlc3Npb25Db2NvYTo6c2Vzc2lvbldy YXBwZXJGb3JUYXNrKFdlYlBhZ2VQcm94eUlkZW50aWZpZQogCiAgICAgc3dpdGNoIChzdG9yZWRD cmVkZW50aWFsc1BvbGljeSkgewogICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3k6OlVzZToKLSAgICAgICAgcmV0dXJuIHNlc3Npb25TZXRGb3JQYWdlKHdlYlBhZ2VQcm94 eUlEKS5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgIGNhc2UgV2ViQ29yZTo6U3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgotICAgICAgICByZXR1cm4gc2Vzc2lvblNl dEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2U7 CisgICAgICAgIHJldHVybiBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCkuc2Vzc2lv bldpdGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRp YWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgIHJldHVybiBpbml0aWFsaXpl RXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBhZ2VQcm94eUlELCBOYXZpZ2F0 aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm8pOwogICAgIH0KQEAgLTE0NDAsMTcgKzE0MzYsMTQgQEAg U2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmFwcEJvdW5kU2Vzc2lvbihXZWJQ YWdlUHJveHlJZGVudGlmaWVyIHdlYlAKICAgICBpZiAoIXNlc3Npb25TZXQuYXBwQm91bmRTZXNz aW9uKSB7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uID0gbWFrZVVuaXF1ZTxJ c29sYXRlZFNlc3Npb24+KCk7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5z ZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lvblNldC5zZXNzaW9u V2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbiwgKnRoaXMs IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UsIE5hdmlnYXRpbmdUb0FwcEJv dW5kRG9tYWluOjpZZXMpOwotICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vz c2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Npb25TZXQuc2Vzc2lv bldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0 aGlzLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIE5hdmlnYXRp bmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpOwogICAgIH0KIAogICAgIGF1dG8mIHNlc3Npb25XcmFw cGVyID0gWyZdIChhdXRvIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSAtPiBTZXNzaW9uV3JhcHBl ciYgewogICAgICAgICBzd2l0Y2ggKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSB7CiAgICAgICAg IGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZToKLSAgICAgICAgICAg IExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24gd2l0aCBj cmVkZW50aWFsIHN0b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBC b3VuZFNlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2Ug V2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgotICAgICAgICAgICAg TE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgYXBwLWJvdW5kIE5TVVJMU2Vzc2lvbiB3aXRob3V0 IGNyZWRlbnRpYWwgc3RvcmFnZS4iKTsKLSAgICAgICAgICAgIHJldHVybiBzZXNzaW9uU2V0LmFw cEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKKyAgICAgICAg ICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24uIik7 CisgICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25X aXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVu dGlhbHNQb2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzczoKICAgICAgICAgICAgIHJldHVybiBpbml0 aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBhZ2VQcm94eUlELCBO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzKTsKICAgICAgICAgfQpAQCAtMTQ4OSw3ICsx NDgyLDYgQEAgU2Vzc2lvbldyYXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbihXZWJD b3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBlbnRyeSA9IGlzb2xh dGVkU2Vzc2lvbnMuZW5zdXJlKGZpcnN0UGFydHlEb21haW4sIFt0aGlzLCAmc2Vzc2lvbiwgaXNO YXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbl0gewogICAgICAgICBhdXRvIG5ld0VudHJ5ID0gbWFr ZVVuaXF1ZTxJc29sYXRlZFNlc3Npb24+KCk7CiAgICAgICAgIG5ld0VudHJ5LT5zZXNzaW9uV2l0 aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFn ZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sIHNlc3Npb24sIFdlYkNvcmU6OlN0b3JlZENy ZWRlbnRpYWxzUG9saWN5OjpVc2UsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwotICAg ICAgICBuZXdFbnRyeS0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXpl KHNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0 aW9uLCBzZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2Us IGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwogICAgICAgICByZXR1cm4gbmV3RW50cnk7 CiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlOwogCkBAIC0xNDk4LDExICsxNDkwLDkgQEAgU2Vzc2lv bldyYXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbihXZWJDb3JlOjpTdG9yZWRDcmVk ZW50aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBzZXNzaW9uV3JhcHBlciA9IFsmXSAoYXV0byBz dG9yZWRDcmVkZW50aWFsc1BvbGljeSkgLT4gU2Vzc2lvbldyYXBwZXImIHsKICAgICAgICAgc3dp dGNoIChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0 b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0gICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Np b24sICJVc2luZyBpc29sYXRlZCBOU1VSTFNlc3Npb24gd2l0aCBjcmVkZW50aWFsIHN0b3JhZ2Uu Iik7Ci0gICAgICAgICAgICByZXR1cm4gZW50cnktPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3Jh Z2U7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90 VXNlOgotICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNV UkxTZXNzaW9uIHdpdGhvdXQgY3JlZGVudGlhbCBzdG9yYWdlLiIpOwotICAgICAgICAgICAgcmV0 dXJuIGVudHJ5LT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlOworICAgICAgICAgICAg TE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNVUkxTZXNzaW9uLiIpOworICAg ICAgICAgICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAg ICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0 ZWxlc3M6CiAgICAgICAgICAgICByZXR1cm4gaW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nl c3Npb25JZk5lZWRlZChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluLCBzZXNzaW9uKTsKICAg ICAgICAgfQpAQCAtMTU0OSwyNSArMTUzOSwxOSBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6 OmNsZWFySXNvbGF0ZWRTZXNzaW9ucygpCiB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmludmFs aWRhdGVBbmRDYW5jZWxTZXNzaW9uU2V0KFNlc3Npb25TZXQmIHNlc3Npb25TZXQpCiB7CiAgICAg W3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uIGludmFsaWRh dGVBbmRDYW5jZWxdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0 b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICBbc2Vzc2lvblNldC5lcGhl bWVyYWxTdGF0ZWxlc3NTZXNzaW9uLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAg W3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9u SW52YWxpZGF0ZWRdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0 b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICBbc2Vzc2lvblNldC5lcGhl bWVyYWxTdGF0ZWxlc3NTZXNzaW9uLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07CiAKICAg ICBmb3IgKGF1dG8mIHNlc3Npb24gOiBzZXNzaW9uU2V0Lmlzb2xhdGVkU2Vzc2lvbnMudmFsdWVz KCkpIHsKICAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Uuc2Vz c2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRo Q3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKLSAgICAgICAg W3Nlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlk YXRlQW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlh bFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICB9CiAgICAgc2Vzc2lv blNldC5pc29sYXRlZFNlc3Npb25zLmNsZWFyKCk7CiAKICAgICBpZiAoc2Vzc2lvblNldC5hcHBC b3VuZFNlc3Npb24pIHsKICAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNz aW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAg ICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwotICAgICAgICBbc2Vzc2lvblNl dC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lv biBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRTZXNz aW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmRlbGVnYXRlIHNlc3Npb25JbnZh bGlkYXRlZF07CiAgICAgfQogfQogCg== 459309 2022-05-13 10:13:37 -0700 2022-05-17 13:55:06 -0700 Patch bug-240362-20220513101337.patch text/plain 14289 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkMTVlZTQ5 ZDQ3ZWViZjU4YmM1Yjc3NDg1ODgyYjMwNDEyNTNkYjZjLi42N2Q3OGNhNTAwZGI2MmQ0N2UwYmQ5 MTRiMWE0MTUwOWQ5MjdhNDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMi0wNS0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgor CisgICAgICAgIFVzZSBfYWRvcHRFZmZlY3RpdmVDb25maWd1cmF0aW9uIGluc3RlYWQgb2YgYSBz ZXBhcmF0ZSBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVkZW50aWFscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMzYyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQ SS5oOgorCiAyMDIyLTA1LTEyICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29t PgogCiAgICAgICAgIFttYWNPU10gUmVtb3ZlIHN1cHBvcnQgZm9yIGRlcHJlY2F0ZWQgU2NyZWVu Q2FwdHVyZUtpdCBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOWIwZDdhYTg0ODFjNWMzZjhlYWZlOWI2ZWIzZTky ZWM5MTY0NTFlZS4uYTZkNDQyNjE0YjRmZWE2NTZlYjQ4M2UyNzM3NjJiM2NjYmQ3MjMzYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMi0wNS0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFj aHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSBfYWRvcHRFZmZlY3RpdmVDb25m aWd1cmF0aW9uIGluc3RlYWQgb2YgYSBzZXBhcmF0ZSBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVk ZW50aWFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQwMzYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbToKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6aW5pdGlhbGl6ZU5TVVJMU2Vzc2lvbnNJ blNldCk6CisgICAgICAgIChXZWJLaXQ6OlNlc3Npb25TZXQ6OmluaXRpYWxpemVFcGhlbWVyYWxT dGF0ZWxlc3NTZXNzaW9uSWZOZWVkZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lv bkNvY29hOjpzZXNzaW9uV3JhcHBlckZvclRhc2spOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr U2Vzc2lvbkNvY29hOjphcHBCb3VuZFNlc3Npb24pOgorICAgICAgICAoV2ViS2l0OjpTZXNzaW9u U2V0Ojppc29sYXRlZFNlc3Npb24pOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNv Y29hOjppbnZhbGlkYXRlQW5kQ2FuY2VsU2Vzc2lvblNldCk6CisKIDIwMjItMDUtMTIgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZlcnQg cjI5Mzg2MQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3 b3JrU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaApp bmRleCA4OTg0NjBjZWExZDk4MzBhZTc1NzAzNTY2MWU1ZGRhOTc3MTE3MGZlLi4wMTFiMWVlMThh YjM1NWJiNWVlOGRiNTY1M2EyNTMxMjU4OWU4NGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwv cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaApAQCAtMjgwLDYgKzI4MCw3IEBAIHR5cGVkZWYgTlNf RU5VTShOU0ludGVnZXIsIE5TVVJMU2Vzc2lvbkNvbXBhbmlvblByb3h5UHJlZmVyZW5jZSkgewog QGVuZAogCiBAaW50ZXJmYWNlIE5TVVJMU2Vzc2lvblRhc2sgKCkKKy0gKHZvaWQpIF9hZG9wdEVm ZmVjdGl2ZUNvbmZpZ3VyYXRpb246KE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24qKSBuZXdDb25m aWd1cmF0aW9uOwogLSAoTlNEaWN0aW9uYXJ5ICopX3RpbWluZ0RhdGE7CiBAcHJvcGVydHkgKHJl YWR3cml0ZSwgY29weSkgTlNTdHJpbmcgKl9wYXRoVG9Eb3dubG9hZFRhc2tGaWxlOwogQHByb3Bl cnR5IChjb3B5KSBOU1N0cmluZyAqX3N0b3JhZ2VQYXJ0aXRpb25JZGVudGlmaWVyOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tD b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFU YXNrQ29jb2EubW0KaW5kZXggMTc1ZmY4YWI5ZDhhYzMxNDA0NjczMmMxYjE4MzUzY2QyYWMzNDE0 Yi4uMzI3ZDkxNTI3NGE1NDU4MzYzZTdhZWIwNDEzOGU0NGE3ZWFmMDRjMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFz a0NvY29hLm1tCkBAIC0zNTYsNiArMzU2LDIwIEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3 b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAK ICAgICBtX3Rhc2sgPSBbbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbiBkYXRhVGFza1dpdGhSZXF1 ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAKKyAgICBzd2l0Y2ggKHBhcmFtZXRlcnMuc3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kpIHsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9s aWN5OjpVc2U6CisgICAgICAgIEFTU0VSVChtX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uLmdldCgp LmNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UpOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxl c3M6CisgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbi5nZXQoKS5jb25m aWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2U6CisgICAgICAgIE5T VVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gPSBtX3Nlc3Np b25XcmFwcGVyLT5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247CisgICAgICAgIGVmZmVjdGl2 ZUNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CisgICAgICAgIFttX3Rh c2sgX2Fkb3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbjplZmZlY3RpdmVDb25maWd1cmF0aW9uXTsK KyAgICAgICAgYnJlYWs7CisgICAgfTsKKwogICAgIFdURkJlZ2luU2lnbnBvc3QobV90YXNrLmdl dCgpLCAiRGF0YVRhc2siLCAiJXtwdWJsaWN9cyBwcmk6ICUuMmYgcHJlY29ubmVjdDogJWQiLCB1 cmwuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCksIHRvTlNVUkxTZXNzaW9uVGFza1ByaW9yaXR5KHJl cXVlc3QucHJpb3JpdHkoKSksIHBhcmFtZXRlcnMuc2hvdWxkUHJlY29ubmVjdE9ubHkgPT0gUHJl Y29ubmVjdE9ubHk6Olllcyk7CiAKICAgICBSRUxFQVNFX0FTU0VSVCghbV9zZXNzaW9uV3JhcHBl ci0+ZGF0YVRhc2tNYXAuY29udGFpbnMoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lv bkNvY29hLmgKaW5kZXggOWUwNjkwODZiZmFhOWRjNGViMjM2OGQ4M2NiZDEzMDI2OTgyZmViZS4u ODFlN2RmNjNjZTUyM2Y4ZjE0ZDNhOGVlYjY3MzY0YTEwNTMzZWM1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h LmgKQEAgLTY4LDcgKzY4LDYgQEAgc3RydWN0IElzb2xhdGVkU2Vzc2lvbiB7CiAgICAgV1RGX01B S0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldp dGhDcmVkZW50aWFsU3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENy ZWRlbnRpYWxTdG9yYWdlOwogICAgIFdhbGxUaW1lIGxhc3RVc2VkOwogfTsKIApAQCAtODcsNyAr ODYsNiBAQCBwdWJsaWM6CiAgICAgc3RkOjp1bmlxdWVfcHRyPElzb2xhdGVkU2Vzc2lvbj4gYXBw Qm91bmRTZXNzaW9uOwogCiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9y YWdlOwogICAgIFNlc3Npb25XcmFwcGVyIGVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb247CiAKIHBy aXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggY2RlZDNkMzYwMjQ4MzA1MDUzYjUxMmNkODg3 YjE1MDRkOTcyZjllMC4uYmE1YTkxOTBjNWJhYjFiNmJkOTlmYjJmYWVhNWYzMmQwYzc3MjBiZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtMTM1MSw5ICsxMzUxLDYgQEAgdm9pZCBOZXR3b3JrU2Vz c2lvbkNvY29hOjppbml0aWFsaXplTlNVUkxTZXNzaW9uc0luU2V0KFNlc3Npb25TZXQmIHNlc3Np b25TZXQsIE4KICAgICBhdXRvIGNvb2tpZUFjY2VwdFBvbGljeSA9IGNvbmZpZ3VyYXRpb24uSFRU UENvb2tpZVN0b3JhZ2UuY29va2llQWNjZXB0UG9saWN5OwogICAgIExPRyhOZXR3b3JrU2Vzc2lv biwgIkNyZWF0ZWQgTmV0d29ya1Nlc3Npb24gd2l0aCBjb29raWVBY2NlcHRQb2xpY3kgJWx1Iiwg Y29va2llQWNjZXB0UG9saWN5KTsKICAgICBSRUxFQVNFX0xPR19JRihjb29raWVBY2NlcHRQb2xp Y3kgPT0gTlNIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIsIE5ldHdvcmtTZXNzaW9uLCAiQ3Jl YXRpbmcgbmV0d29yayBzZXNzaW9uIHdpdGggSUQgJSIgUFJJdTY0ICIgdGhhdCB3aWxsIG5vdCBh Y2NlcHQgY29va2llcy4iLCBtX3Nlc3Npb25JRC50b1VJbnQ2NCgpKTsKLQotICAgIGNvbmZpZ3Vy YXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7Ci0gICAgc2Vzc2lvblNldC5zZXNzaW9u V2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoY29uZmlndXJhdGlvbiwgKnRoaXMs IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZSwgTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW46Ok5vKTsKIH0KIAogU2Vzc2lvblNldCYgTmV0d29ya1Nlc3Npb25Db2Nv YTo6c2Vzc2lvblNldEZvclBhZ2UoV2ViUGFnZVByb3h5SWRlbnRpZmllciB3ZWJQYWdlUHJveHlJ RCkKQEAgLTEzNzksNyArMTM3Niw3IEBAIFNlc3Npb25XcmFwcGVyJiBTZXNzaW9uU2V0Ojppbml0 aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKE5hdmlnYXRpCiAgICAgICAg IHJldHVybiBlcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uOwogCiAgICAgTlNVUkxTZXNzaW9uQ29u ZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiA9IFtOU1VSTFNlc3Npb25Db25maWd1cmF0aW9uIGVw aGVtZXJhbFNlc3Npb25Db25maWd1cmF0aW9uXTsKLSAgICBOU1VSTFNlc3Npb25Db25maWd1cmF0 aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9y YWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKKyAgICBOU1VSTFNlc3Npb25Db25maWd1 cmF0aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9y YWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKIAogICAgIGNvbmZpZ3VyYXRpb24uSFRU UENvb2tpZUFjY2VwdFBvbGljeSA9IE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyOwogICAg IGNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CkBAIC0xNDIzLDkgKzE0 MjAsOCBAQCBTZXNzaW9uV3JhcHBlciYgTmV0d29ya1Nlc3Npb25Db2NvYTo6c2Vzc2lvbldyYXBw ZXJGb3JUYXNrKFdlYlBhZ2VQcm94eUlkZW50aWZpZQogCiAgICAgc3dpdGNoIChzdG9yZWRDcmVk ZW50aWFsc1BvbGljeSkgewogICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xp Y3k6OlVzZToKLSAgICAgICAgcmV0dXJuIHNlc3Npb25TZXRGb3JQYWdlKHdlYlBhZ2VQcm94eUlE KS5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVk Q3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgotICAgICAgICByZXR1cm4gc2Vzc2lvblNldEZv clBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2U7Cisg ICAgICAgIHJldHVybiBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCkuc2Vzc2lvbldp dGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxz UG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgIHJldHVybiBpbml0aWFsaXplRXBo ZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBhZ2VQcm94eUlELCBOYXZpZ2F0aW5n VG9BcHBCb3VuZERvbWFpbjo6Tm8pOwogICAgIH0KQEAgLTE0MzksMTcgKzE0MzUsMTQgQEAgU2Vz c2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmFwcEJvdW5kU2Vzc2lvbihXZWJQYWdl UHJveHlJZGVudGlmaWVyIHdlYlAKICAgICBpZiAoIXNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9u KSB7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uID0gbWFrZVVuaXF1ZTxJc29s YXRlZFNlc3Npb24+KCk7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNz aW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lvblNldC5zZXNzaW9uV2l0 aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbiwgKnRoaXMsIFdl YkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UsIE5hdmlnYXRpbmdUb0FwcEJvdW5k RG9tYWluOjpZZXMpOwotICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lv bldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Npb25TZXQuc2Vzc2lvbldp dGhvdXRDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlz LCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIE5hdmlnYXRpbmdU b0FwcEJvdW5kRG9tYWluOjpZZXMpOwogICAgIH0KIAogICAgIGF1dG8mIHNlc3Npb25XcmFwcGVy ID0gWyZdIChhdXRvIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSAtPiBTZXNzaW9uV3JhcHBlciYg ewogICAgICAgICBzd2l0Y2ggKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSB7CiAgICAgICAgIGNh c2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZToKLSAgICAgICAgICAgIExP RyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24gd2l0aCBjcmVk ZW50aWFsIHN0b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBCb3Vu ZFNlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2UgV2Vi Q29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgotICAgICAgICAgICAgTE9H KE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgYXBwLWJvdW5kIE5TVVJMU2Vzc2lvbiB3aXRob3V0IGNy ZWRlbnRpYWwgc3RvcmFnZS4iKTsKLSAgICAgICAgICAgIHJldHVybiBzZXNzaW9uU2V0LmFwcEJv dW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKKyAgICAgICAgICAg IExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24uIik7Cisg ICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRo Q3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlh bHNQb2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzczoKICAgICAgICAgICAgIHJldHVybiBpbml0aWFs aXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBhZ2VQcm94eUlELCBOYXZp Z2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzKTsKICAgICAgICAgfQpAQCAtMTQ4OCw3ICsxNDgx LDYgQEAgU2Vzc2lvbldyYXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbihXZWJDb3Jl OjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBlbnRyeSA9IGlzb2xhdGVk U2Vzc2lvbnMuZW5zdXJlKGZpcnN0UGFydHlEb21haW4sIFt0aGlzLCAmc2Vzc2lvbiwgaXNOYXZp Z2F0aW5nVG9BcHBCb3VuZERvbWFpbl0gewogICAgICAgICBhdXRvIG5ld0VudHJ5ID0gbWFrZVVu aXF1ZTxJc29sYXRlZFNlc3Npb24+KCk7CiAgICAgICAgIG5ld0VudHJ5LT5zZXNzaW9uV2l0aENy ZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5z ZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sIHNlc3Npb24sIFdlYkNvcmU6OlN0b3JlZENyZWRl bnRpYWxzUG9saWN5OjpVc2UsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwotICAgICAg ICBuZXdFbnRyeS0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNl c3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9u LCBzZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIGlz TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwogICAgICAgICByZXR1cm4gbmV3RW50cnk7CiAg ICAgfSkuaXRlcmF0b3ItPnZhbHVlOwogCkBAIC0xNDk3LDExICsxNDg5LDkgQEAgU2Vzc2lvbldy YXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbihXZWJDb3JlOjpTdG9yZWRDcmVkZW50 aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBzZXNzaW9uV3JhcHBlciA9IFsmXSAoYXV0byBzdG9y ZWRDcmVkZW50aWFsc1BvbGljeSkgLT4gU2Vzc2lvbldyYXBwZXImIHsKICAgICAgICAgc3dpdGNo IChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0gICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24s ICJVc2luZyBpc29sYXRlZCBOU1VSTFNlc3Npb24gd2l0aCBjcmVkZW50aWFsIHN0b3JhZ2UuIik7 Ci0gICAgICAgICAgICByZXR1cm4gZW50cnktPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7 CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNl OgotICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNVUkxT ZXNzaW9uIHdpdGhvdXQgY3JlZGVudGlhbCBzdG9yYWdlLiIpOwotICAgICAgICAgICAgcmV0dXJu IGVudHJ5LT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlOworICAgICAgICAgICAgTE9H KE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNVUkxTZXNzaW9uLiIpOworICAgICAg ICAgICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgICAg ICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxl c3M6CiAgICAgICAgICAgICByZXR1cm4gaW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Np b25JZk5lZWRlZChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluLCBzZXNzaW9uKTsKICAgICAg ICAgfQpAQCAtMTU0OCwyNSArMTUzOCwxOSBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmNs ZWFySXNvbGF0ZWRTZXNzaW9ucygpCiB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmludmFsaWRh dGVBbmRDYW5jZWxTZXNzaW9uU2V0KFNlc3Npb25TZXQmIHNlc3Npb25TZXQpCiB7CiAgICAgW3Nl c3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uIGludmFsaWRhdGVB bmRDYW5jZWxdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3Jh Z2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICBbc2Vzc2lvblNldC5lcGhlbWVy YWxTdGF0ZWxlc3NTZXNzaW9uLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAgW3Nl c3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52 YWxpZGF0ZWRdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3Jh Z2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICBbc2Vzc2lvblNldC5lcGhlbWVy YWxTdGF0ZWxlc3NTZXNzaW9uLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07CiAKICAgICBm b3IgKGF1dG8mIHNlc3Npb24gOiBzZXNzaW9uU2V0Lmlzb2xhdGVkU2Vzc2lvbnMudmFsdWVzKCkp IHsKICAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lv biBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRoQ3Jl ZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKLSAgICAgICAgW3Nl c3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRl QW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0 b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICB9CiAgICAgc2Vzc2lvblNl dC5pc29sYXRlZFNlc3Npb25zLmNsZWFyKCk7CiAKICAgICBpZiAoc2Vzc2lvblNldC5hcHBCb3Vu ZFNlc3Npb24pIHsKICAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNzaW9u V2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAg ICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhDcmVkZW50aWFsU3Rv cmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwotICAgICAgICBbc2Vzc2lvblNldC5h cHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBp bnZhbGlkYXRlQW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9u LT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlk YXRlZF07CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1ByZWNvbm5lY3QubW0KaW5kZXggNTQ3YjM1N2VlOWVhMGFhMTlkYWVkYzg5MjRj YWIxYmFhYzQyNjJkYi4uYjA4YTliYWQ2NGY5OGE1YmQyNTM2NmFhYWYwNjhiMGRjMTRmY2JiNCAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25u ZWN0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJlY29u bmVjdC5tbQpAQCAtODcsMjAgKzg3LDE2IEBAIFRFU1QoUHJlY29ubmVjdCwgQ29ubmVjdGlvbkNv dW50KQogICAgIH0pOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXdd KTsKIAotICAgIC8vIFRoZSBwcmVjb25uZWN0IHRvIHRoZSBzZXJ2ZXIgd2lsbCB1c2UgdGhlIGRl ZmF1bHQgc2V0dGluZyBvZiAidXNlIHRoZSBjcmVkZW50aWFsIHN0b3JlIiwKLSAgICAvLyBhbmQg dGhlcmVmb3JlIHVzZSB0aGUgY3JlZGVudGlhbC1zdG9yZS1ibGVzc2VkIE5TVVJMU2Vzc2lvbi4K ICAgICBbd2ViVmlldyBfcHJlY29ubmVjdFRvU2VydmVyOnNlcnZlci5yZXF1ZXN0KCkuVVJMXTsK ICAgICBVdGlsOjpydW4oJmFueUNvbm5lY3Rpb25zKTsKICAgICBVdGlsOjpzcGluUnVuTG9vcCgx MCk7CiAgICAgRVhQRUNUX0ZBTFNFKHJlcXVlc3RlZCk7CiAKLSAgICAvLyBUaGVuIHRoaXMgcmVx dWVzdCB3aWxsICpub3QqIHVzZSB0aGUgY3JlZGVudGlhbCBzdG9yZSwgdGhlcmVmb3JlIHVzaW5n IGEgZGlmZmVyZW50IE5TVVJMU2Vzc2lvbgotICAgIC8vIHRoYXQgZG9lc24ndCBrbm93IGFib3V0 IHRoZSBhYm92ZSBwcmVjb25uZWN0LCB0cmlnZ2VyaW5nIGEgc2Vjb25kIGNvbm5lY3Rpb24gdG8g dGhlIHNlcnZlci4KICAgICB3ZWJWaWV3LmdldCgpLl9jYW5Vc2VDcmVkZW50aWFsU3RvcmFnZSA9 IE5POwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnNlcnZlci5yZXF1ZXN0KCldOwogICAgIFV0 aWw6OnJ1bigmcmVxdWVzdGVkKTsKIAotICAgIEVYUEVDVF9FUShjb25uZWN0aW9uQ291bnQsIDJ1 KTsKKyAgICBFWFBFQ1RfRVEoY29ubmVjdGlvbkNvdW50LCAxdSk7CiB9CiAKIFRFU1QoUHJlY29u bmVjdCwgSFRUUFMpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBT ZXJ2ZXIubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0KaW5kZXgg NzdjMGY3MzY5YWE0YTlhYmU2YmIxZjk2MjVmMDg4YmM3OTYzMzM2ZS4uZTFiNzk4MzdhY2NmYmM5 MTM3YmU4ZjVhZjBkN2Q3YjI0YzVlODM0OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9jb2NvYS9IVFRQU2VydmVyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRU UFNlcnZlci5tbQpAQCAtMjM3LDcgKzIzNywxNSBAQCB2b2lkIEhUVFBTZXJ2ZXI6OnJlc3BvbmRX aXRoQ2hhbGxlbmdlVGhlbk9LKENvbm5lY3Rpb24gY29ubmVjdGlvbikKICAgICAgICAgIkNvbnRl bnQtTGVuZ3RoOiAwXHJcbiIKICAgICAgICAgIldXVy1BdXRoZW50aWNhdGU6IEJhc2ljIHJlYWxt PVwidGVzdHJlYWxtXCJcclxuXHJcbiJfczsKICAgICAgICAgY29ubmVjdGlvbi5zZW5kKGNoYWxs ZW5nZUhlYWRlciwgW2Nvbm5lY3Rpb25dIHsKLSAgICAgICAgICAgIHJlc3BvbmRXaXRoT0soY29u bmVjdGlvbik7CisgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbY29u bmVjdGlvbl0gKFZlY3RvcjxjaGFyPiYmKSB7CisgICAgICAgICAgICAgICAgY29ubmVjdGlvbi5z ZW5kKAorICAgICAgICAgICAgICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAg ICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAzNFxyXG5cclxuIgorICAgICAgICAgICAgICAg ICAgICAiPHNjcmlwdD5hbGVydCgnc3VjY2VzcyEnKTwvc2NyaXB0PiJfcywgW2Nvbm5lY3Rpb25d IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhlbk9LKGNv bm5lY3Rpb24pOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgKTsKKyAg ICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICB9KTsKIH0K 459513 2022-05-17 13:55:09 -0700 2022-05-17 14:47:17 -0700 Patch bug-240362-20220517135508.patch text/plain 14836 achristensen RnJvbSA3MWE5NTMzMTQyODk5MWI5MDUzMWQ2YmI1MzhkNDdlYmM5YWQ3NTJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDE3IE1heSAyMDIyIDEzOjUwOjIyIC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gVXNlIF9hZG9wdEVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gaW5zdGVhZCBvZiBhIHNlcGFyYXRl CiBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVkZW50aWFscwogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI0MDM2MgoKUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCgpUaGlz IGlzIGEgUExUIHBlcmZvcm1hbmNlIGltcHJvdmVtZW50IGJlY2F1c2Ugd2Ugc3BlbmQgbGVzcyB0 aW1lIGluaXRpYXRpbmcgVENQIGNvbm5lY3Rpb25zLgoKKiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaDoKKiBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaDoK KiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29h Lm1tOgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5oOgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np b25Db2NvYS5tbToKKiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNv bm5lY3QubW06CiogVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tOgotLS0K IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oICAgICAgICAgICAgICAgICB8ICAxICsKIFNv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oICB8IDExICsrKysrKysr CiAuLi4vY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0gICAgICAgICAgICAgfCAyMSArKysr KysrKysrKysrKwogLi4uL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaCAgICAgICAgICAgICAg IHwgIDIgLS0KIC4uLi9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tICAgICAgICAgICAgICB8 IDI4ICsrKystLS0tLS0tLS0tLS0tLS0KIC4uLi9UZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0 Lm1tICAgICAgICAgICB8ICA2ICstLS0KIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNl cnZlci5tbSAgICAgICB8IDEwICsrKysrKy0KIDcgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9u cygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZv cm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRleCBiNjA1MjFmOWJk MzYuLjA4YjcwZDU4MTUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZl LmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgKQEAgLTQ1Niw2ICs0NTYsNyBA QAogCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE IDwgMTIwMDAwCiAjZGVmaW5lIEhBVkVfU0FGQVJJX0ZPUl9XRUJLSVRfREVWRUxPUE1FTlRfUkVR VUlSSU5HX0VYVFJBX1NZTUJPTFMgMQorI2RlZmluZSBIQVZFX05TVVJMU0VTU0lPTl9FRkZFQ1RJ VkVfQ09ORklHVVJBVElPTl9PQkpFQ1QgMQogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaCBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oCmluZGV4IDg5ODQ2 MGNlYTFkOS4uOWZmOGE1NTE0MWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j Zi9DRk5ldHdvcmtTUEkuaApAQCAtNjAsNiArNjAsMTIgQEAKIAogI2Vsc2UgLy8gIVVTRShBUFBM RV9JTlRFUk5BTF9TREspCiAKKyNpZiBIQVZFKE5TVVJMU0VTU0lPTl9FRkZFQ1RJVkVfQ09ORklH VVJBVElPTl9PQkpFQ1QpCitAaW50ZXJmYWNlIE5TVVJMU2Vzc2lvbkVmZmVjdGl2ZUNvbmZpZ3Vy YXRpb24gOiBOU09iamVjdCA8TlNDb3B5aW5nPgorLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aENv bmZpZ3VyYXRpb246KE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKiljb25maWc7CitAZW5kCisj ZW5kaWYgLy8gSEFWRShOU1VSTFNFU1NJT05fRUZGRUNUSVZFX0NPTkZJR1VSQVRJT05fT0JKRUNU KQorCiAjaWYgSEFWRShQUkVDT05ORUNUX1BJTkcpICYmIGRlZmluZWQoX19PQkpDX18pCiAKIEBp bnRlcmZhY2UgX05TSFRUUENvbm5lY3Rpb25JbmZvIDogTlNPYmplY3QKQEAgLTI4MCw2ICsyODYs MTEgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgTlNVUkxTZXNzaW9uQ29tcGFuaW9uUHJv eHlQcmVmZXJlbmNlKSB7CiBAZW5kCiAKIEBpbnRlcmZhY2UgTlNVUkxTZXNzaW9uVGFzayAoKQor I2lmIEhBVkUoTlNVUkxTRVNTSU9OX0VGRkVDVElWRV9DT05GSUdVUkFUSU9OX09CSkVDVCkKKy0g KHZvaWQpX2Fkb3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbjooTlNVUkxTZXNzaW9uRWZmZWN0aXZl Q29uZmlndXJhdGlvbiAqKSBuZXdDb25maWd1cmF0aW9uOworI2Vsc2UKKy0gKHZvaWQpX2Fkb3B0 RWZmZWN0aXZlQ29uZmlndXJhdGlvbjooTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqKSBuZXdD b25maWd1cmF0aW9uOworI2VuZGlmCiAtIChOU0RpY3Rpb25hcnkgKilfdGltaW5nRGF0YTsKIEBw cm9wZXJ0eSAocmVhZHdyaXRlLCBjb3B5KSBOU1N0cmluZyAqX3BhdGhUb0Rvd25sb2FkVGFza0Zp bGU7CiBAcHJvcGVydHkgKGNvcHkpIE5TU3RyaW5nICpfc3RvcmFnZVBhcnRpdGlvbklkZW50aWZp ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv cmtEYXRhVGFza0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQppbmRleCAxNzVmZjhhYjlkOGEuLjAyMWZjZGUzODY0MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0 YVRhc2tDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtEYXRhVGFza0NvY29hLm1tCkBAIC0zNTYsNiArMzU2LDI3IEBAIE5ldHdvcmtEYXRhVGFz a0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0 d29ya0RhdGFUCiAKICAgICBtX3Rhc2sgPSBbbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbiBkYXRh VGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAKKyAgICBzd2l0Y2ggKHBhcmFtZXRl cnMuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kpIHsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENy ZWRlbnRpYWxzUG9saWN5OjpVc2U6CisgICAgICAgIEFTU0VSVChtX3Nlc3Npb25XcmFwcGVyLT5z ZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UpOworICAgICAg ICBicmVhazsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhl bWVyYWxTdGF0ZWxlc3M6CisgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lv bi5nZXQoKS5jb25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlKTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2U6 CisjaWYgSEFWRShOU1VSTFNFU1NJT05fRUZGRUNUSVZFX0NPTkZJR1VSQVRJT05fT0JKRUNUKQor ICAgICAgICBOU1VSTFNlc3Npb25Db25maWd1cmF0aW9uICpjb3BpZWRDb25maWd1cmF0aW9uID0g bV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uOworICAgICAgICBj b3BpZWRDb25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOworICAgICAgICBh dXRvIGVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbTlNVUkxTZXNzaW9uRWZmZWN0 aXZlQ29uZmlndXJhdGlvbiBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpjb3BpZWRDb25m aWd1cmF0aW9uXSk7CisgICAgICAgIFttX3Rhc2sgX2Fkb3B0RWZmZWN0aXZlQ29uZmlndXJhdGlv bjplZmZlY3RpdmVDb25maWd1cmF0aW9uLmdldCgpXTsKKyNlbHNlCisgICAgICAgIE5TVVJMU2Vz c2lvbkNvbmZpZ3VyYXRpb24gKmVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gPSBtX3Nlc3Npb25XcmFw cGVyLT5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247CisgICAgICAgIGVmZmVjdGl2ZUNvbmZp Z3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7CisgICAgICAgIFttX3Rhc2sgX2Fk b3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbjplZmZlY3RpdmVDb25maWd1cmF0aW9uXTsKKyNlbmRp ZgorICAgICAgICBicmVhazsKKyAgICB9OworCiAgICAgV1RGQmVnaW5TaWducG9zdChtX3Rhc2su Z2V0KCksICJEYXRhVGFzayIsICIle3B1YmxpY31zIHByaTogJS4yZiBwcmVjb25uZWN0OiAlZCIs IHVybC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSwgdG9OU1VSTFNlc3Npb25UYXNrUHJpb3JpdHko cmVxdWVzdC5wcmlvcml0eSgpKSwgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25seSA9PSBQ cmVjb25uZWN0T25seTo6WWVzKTsKIAogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3Nlc3Npb25XcmFw cGVyLT5kYXRhVGFza01hcC5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lv bkNvY29hLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EuaAppbmRleCA5ZTA2OTA4NmJmYWEuLjgxZTdkZjYzY2U1MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNv Y29hLmgKQEAgLTY4LDcgKzY4LDYgQEAgc3RydWN0IElzb2xhdGVkU2Vzc2lvbiB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lv bldpdGhDcmVkZW50aWFsU3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91 dENyZWRlbnRpYWxTdG9yYWdlOwogICAgIFdhbGxUaW1lIGxhc3RVc2VkOwogfTsKIApAQCAtODcs NyArODYsNiBAQCBwdWJsaWM6CiAgICAgc3RkOjp1bmlxdWVfcHRyPElzb2xhdGVkU2Vzc2lvbj4g YXBwQm91bmRTZXNzaW9uOwogCiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldpdGhDcmVkZW50 aWFsU3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlOwogICAgIFNlc3Npb25XcmFwcGVyIGVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb247CiAK IHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nv Y29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggY2RlZDNkMzYwMjQ4Li5iYTVhOTE5MGM1 YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTEzNTEsOSArMTM1MSw2IEBAIHZvaWQgTmV0d29y a1Nlc3Npb25Db2NvYTo6aW5pdGlhbGl6ZU5TVVJMU2Vzc2lvbnNJblNldChTZXNzaW9uU2V0JiBz ZXNzaW9uU2V0LCBOCiAgICAgYXV0byBjb29raWVBY2NlcHRQb2xpY3kgPSBjb25maWd1cmF0aW9u LkhUVFBDb29raWVTdG9yYWdlLmNvb2tpZUFjY2VwdFBvbGljeTsKICAgICBMT0coTmV0d29ya1Nl c3Npb24sICJDcmVhdGVkIE5ldHdvcmtTZXNzaW9uIHdpdGggY29va2llQWNjZXB0UG9saWN5ICVs dSIsIGNvb2tpZUFjY2VwdFBvbGljeSk7CiAgICAgUkVMRUFTRV9MT0dfSUYoY29va2llQWNjZXB0 UG9saWN5ID09IE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyLCBOZXR3b3JrU2Vzc2lvbiwg IkNyZWF0aW5nIG5ldHdvcmsgc2Vzc2lvbiB3aXRoIElEICUiIFBSSXU2NCAiIHRoYXQgd2lsbCBu b3QgYWNjZXB0IGNvb2tpZXMuIiwgbV9zZXNzaW9uSUQudG9VSW50NjQoKSk7Ci0KLSAgICBjb25m aWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOwotICAgIHNlc3Npb25TZXQuc2Vz c2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKGNvbmZpZ3VyYXRpb24sICp0 aGlzLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIE5hdmlnYXRp bmdUb0FwcEJvdW5kRG9tYWluOjpObyk7CiB9CiAKIFNlc3Npb25TZXQmIE5ldHdvcmtTZXNzaW9u Q29jb2E6OnNlc3Npb25TZXRGb3JQYWdlKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgd2ViUGFnZVBy b3h5SUQpCkBAIC0xMzc5LDcgKzEzNzYsNyBAQCBTZXNzaW9uV3JhcHBlciYgU2Vzc2lvblNldDo6 aW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZChOYXZpZ2F0aQogICAg ICAgICByZXR1cm4gZXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbjsKIAogICAgIE5TVVJMU2Vzc2lv bkNvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24gPSBbTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlv biBlcGhlbWVyYWxTZXNzaW9uQ29uZmlndXJhdGlvbl07Ci0gICAgTlNVUkxTZXNzaW9uQ29uZmln dXJhdGlvbiAqZXhpc3RpbmdDb25maWd1cmF0aW9uID0gc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFs U3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247CisgICAgTlNVUkxTZXNzaW9uQ29u ZmlndXJhdGlvbiAqZXhpc3RpbmdDb25maWd1cmF0aW9uID0gc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247CiAKICAgICBjb25maWd1cmF0aW9u LkhUVFBDb29raWVBY2NlcHRQb2xpY3kgPSBOU0hUVFBDb29raWVBY2NlcHRQb2xpY3lOZXZlcjsK ICAgICBjb25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOwpAQCAtMTQyMyw5 ICsxNDIwLDggQEAgU2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OnNlc3Npb25X cmFwcGVyRm9yVGFzayhXZWJQYWdlUHJveHlJZGVudGlmaWUKIAogICAgIHN3aXRjaCAoc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kpIHsKICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxz UG9saWN5OjpVc2U6Ci0gICAgICAgIHJldHVybiBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJv eHlJRCkuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNvcmU6OlN0 b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZToKLSAgICAgICAgcmV0dXJuIHNlc3Npb25T ZXRGb3JQYWdlKHdlYlBhZ2VQcm94eUlEKS5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdl OworICAgICAgICByZXR1cm4gc2Vzc2lvblNldEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Np b25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50 aWFsc1BvbGljeTo6RXBoZW1lcmFsU3RhdGVsZXNzOgogICAgICAgICByZXR1cm4gaW5pdGlhbGl6 ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZCh3ZWJQYWdlUHJveHlJRCwgTmF2aWdh dGluZ1RvQXBwQm91bmREb21haW46Ok5vKTsKICAgICB9CkBAIC0xNDM5LDE3ICsxNDM1LDE0IEBA IFNlc3Npb25XcmFwcGVyJiBOZXR3b3JrU2Vzc2lvbkNvY29hOjphcHBCb3VuZFNlc3Npb24oV2Vi UGFnZVByb3h5SWRlbnRpZmllciB3ZWJQCiAgICAgaWYgKCFzZXNzaW9uU2V0LmFwcEJvdW5kU2Vz c2lvbikgewogICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbiA9IG1ha2VVbmlxdWU8 SXNvbGF0ZWRTZXNzaW9uPigpOwogICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+ c2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Npb25TZXQuc2Vzc2lv bldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlz LCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlLCBOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbjo6WWVzKTsKLSAgICAgICAgc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNl c3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShzZXNzaW9uU2V0LnNlc3Np b25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uLCAq dGhpcywgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlLCBOYXZpZ2F0 aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzKTsKICAgICB9CiAKICAgICBhdXRvJiBzZXNzaW9uV3Jh cHBlciA9IFsmXSAoYXV0byBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgLT4gU2Vzc2lvbldyYXBw ZXImIHsKICAgICAgICAgc3dpdGNoIChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgICAg ICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0gICAgICAgICAg ICBMT0coTmV0d29ya1Nlc3Npb24sICJVc2luZyBhcHAtYm91bmQgTlNVUkxTZXNzaW9uIHdpdGgg Y3JlZGVudGlhbCBzdG9yYWdlLiIpOwotICAgICAgICAgICAgcmV0dXJuIHNlc3Npb25TZXQuYXBw Qm91bmRTZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgICAgICBjYXNl IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZToKLSAgICAgICAgICAg IExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24gd2l0aG91 dCBjcmVkZW50aWFsIHN0b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5h cHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2U7CisgICAgICAg ICAgICBMT0coTmV0d29ya1Nlc3Npb24sICJVc2luZyBhcHAtYm91bmQgTlNVUkxTZXNzaW9uLiIp OworICAgICAgICAgICAgcmV0dXJuIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNzaW9u V2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRl bnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgICAgICByZXR1cm4gaW5p dGlhbGl6ZUVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZCh3ZWJQYWdlUHJveHlJRCwg TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW46Olllcyk7CiAgICAgICAgIH0KQEAgLTE0ODgsNyAr MTQ4MSw2IEBAIFNlc3Npb25XcmFwcGVyJiBTZXNzaW9uU2V0Ojppc29sYXRlZFNlc3Npb24oV2Vi Q29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgc3RvCiAgICAgYXV0byYgZW50cnkgPSBpc29s YXRlZFNlc3Npb25zLmVuc3VyZShmaXJzdFBhcnR5RG9tYWluLCBbdGhpcywgJnNlc3Npb24sIGlz TmF2aWdhdGluZ1RvQXBwQm91bmREb21haW5dIHsKICAgICAgICAgYXV0byBuZXdFbnRyeSA9IG1h a2VVbmlxdWU8SXNvbGF0ZWRTZXNzaW9uPigpOwogICAgICAgICBuZXdFbnRyeS0+c2Vzc2lvbldp dGhDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3Jh Z2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uLCBzZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRD cmVkZW50aWFsc1BvbGljeTo6VXNlLCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKLSAg ICAgICAgbmV3RW50cnktPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6 ZShzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJh dGlvbiwgc2Vzc2lvbiwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNl LCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKICAgICAgICAgcmV0dXJuIG5ld0VudHJ5 OwogICAgIH0pLml0ZXJhdG9yLT52YWx1ZTsKIApAQCAtMTQ5NywxMSArMTQ4OSw5IEBAIFNlc3Np b25XcmFwcGVyJiBTZXNzaW9uU2V0Ojppc29sYXRlZFNlc3Npb24oV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kgc3RvCiAgICAgYXV0byYgc2Vzc2lvbldyYXBwZXIgPSBbJl0gKGF1dG8g c3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kpIC0+IFNlc3Npb25XcmFwcGVyJiB7CiAgICAgICAgIHN3 aXRjaCAoc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kpIHsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOgotICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNz aW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNVUkxTZXNzaW9uIHdpdGggY3JlZGVudGlhbCBzdG9yYWdl LiIpOwotICAgICAgICAgICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9y YWdlOwogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05v dFVzZToKLSAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGlzb2xhdGVkIE5T VVJMU2Vzc2lvbiB3aXRob3V0IGNyZWRlbnRpYWwgc3RvcmFnZS4iKTsKLSAgICAgICAgICAgIHJl dHVybiBlbnRyeS0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKKyAgICAgICAgICAg IExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGlzb2xhdGVkIE5TVVJMU2Vzc2lvbi4iKTsKKyAg ICAgICAgICAgIHJldHVybiBlbnRyeS0+c2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZTsKICAg ICAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RXBoZW1lcmFsU3Rh dGVsZXNzOgogICAgICAgICAgICAgcmV0dXJuIGluaXRpYWxpemVFcGhlbWVyYWxTdGF0ZWxlc3NT ZXNzaW9uSWZOZWVkZWQoaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiwgc2Vzc2lvbik7CiAg ICAgICAgIH0KQEAgLTE1NDgsMjUgKzE1MzgsMTkgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29h OjpjbGVhcklzb2xhdGVkU2Vzc2lvbnMoKQogdm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjppbnZh bGlkYXRlQW5kQ2FuY2VsU2Vzc2lvblNldChTZXNzaW9uU2V0JiBzZXNzaW9uU2V0KQogewogICAg IFtzZXNzaW9uU2V0LnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlk YXRlQW5kQ2FuY2VsXTsKLSAgICBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAgW3Nlc3Npb25TZXQuZXBo ZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbi5zZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwogICAg IFtzZXNzaW9uU2V0LnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lv bkludmFsaWRhdGVkXTsKLSAgICBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07CiAgICAgW3Nlc3Npb25TZXQuZXBo ZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbi5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwogCiAg ICAgZm9yIChhdXRvJiBzZXNzaW9uIDogc2Vzc2lvblNldC5pc29sYXRlZFNlc3Npb25zLnZhbHVl cygpKSB7CiAgICAgICAgIFtzZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNl c3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAgICAgIFtzZXNzaW9uLT5zZXNzaW9uV2l0 aENyZWRlbnRpYWxTdG9yYWdlLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07Ci0gICAgICAg IFtzZXNzaW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxp ZGF0ZUFuZENhbmNlbF07Ci0gICAgICAgIFtzZXNzaW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRp YWxTdG9yYWdlLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07CiAgICAgfQogICAgIHNlc3Np b25TZXQuaXNvbGF0ZWRTZXNzaW9ucy5jbGVhcigpOwogCiAgICAgaWYgKHNlc3Npb25TZXQuYXBw Qm91bmRTZXNzaW9uKSB7CiAgICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vz c2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwog ICAgICAgICBbc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlh bFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKLSAgICAgICAgW3Nlc3Npb25T ZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Np b24gaW52YWxpZGF0ZUFuZENhbmNlbF07Ci0gICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vz c2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52 YWxpZGF0ZWRdOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0Lm1tCmluZGV4IDU0N2IzNTdlZTllYS4uYjA4YTliYWQ2 NGY5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By ZWNvbm5lY3QubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cmVjb25uZWN0Lm1tCkBAIC04NywyMCArODcsMTYgQEAgVEVTVChQcmVjb25uZWN0LCBDb25uZWN0 aW9uQ291bnQpCiAgICAgfSk7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3 IG5ld10pOwogCi0gICAgLy8gVGhlIHByZWNvbm5lY3QgdG8gdGhlIHNlcnZlciB3aWxsIHVzZSB0 aGUgZGVmYXVsdCBzZXR0aW5nIG9mICJ1c2UgdGhlIGNyZWRlbnRpYWwgc3RvcmUiLAotICAgIC8v IGFuZCB0aGVyZWZvcmUgdXNlIHRoZSBjcmVkZW50aWFsLXN0b3JlLWJsZXNzZWQgTlNVUkxTZXNz aW9uLgogICAgIFt3ZWJWaWV3IF9wcmVjb25uZWN0VG9TZXJ2ZXI6c2VydmVyLnJlcXVlc3QoKS5V UkxdOwogICAgIFV0aWw6OnJ1bigmYW55Q29ubmVjdGlvbnMpOwogICAgIFV0aWw6OnNwaW5SdW5M b29wKDEwKTsKICAgICBFWFBFQ1RfRkFMU0UocmVxdWVzdGVkKTsKIAotICAgIC8vIFRoZW4gdGhp cyByZXF1ZXN0IHdpbGwgKm5vdCogdXNlIHRoZSBjcmVkZW50aWFsIHN0b3JlLCB0aGVyZWZvcmUg dXNpbmcgYSBkaWZmZXJlbnQgTlNVUkxTZXNzaW9uCi0gICAgLy8gdGhhdCBkb2Vzbid0IGtub3cg YWJvdXQgdGhlIGFib3ZlIHByZWNvbm5lY3QsIHRyaWdnZXJpbmcgYSBzZWNvbmQgY29ubmVjdGlv biB0byB0aGUgc2VydmVyLgogICAgIHdlYlZpZXcuZ2V0KCkuX2NhblVzZUNyZWRlbnRpYWxTdG9y YWdlID0gTk87CiAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6c2VydmVyLnJlcXVlc3QoKV07CiAg ICAgVXRpbDo6cnVuKCZyZXF1ZXN0ZWQpOwogCi0gICAgRVhQRUNUX0VRKGNvbm5lY3Rpb25Db3Vu dCwgMnUpOworICAgIEVYUEVDVF9FUShjb25uZWN0aW9uQ291bnQsIDF1KTsKIH0KIAogVEVTVChQ cmVjb25uZWN0LCBIVFRQUykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2Ev SFRUUFNlcnZlci5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbQpp bmRleCA3N2MwZjczNjlhYTQuLmUxYjc5ODM3YWNjZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29j b2EvSFRUUFNlcnZlci5tbQpAQCAtMjM3LDcgKzIzNywxNSBAQCB2b2lkIEhUVFBTZXJ2ZXI6OnJl c3BvbmRXaXRoQ2hhbGxlbmdlVGhlbk9LKENvbm5lY3Rpb24gY29ubmVjdGlvbikKICAgICAgICAg IkNvbnRlbnQtTGVuZ3RoOiAwXHJcbiIKICAgICAgICAgIldXVy1BdXRoZW50aWNhdGU6IEJhc2lj IHJlYWxtPVwidGVzdHJlYWxtXCJcclxuXHJcbiJfczsKICAgICAgICAgY29ubmVjdGlvbi5zZW5k KGNoYWxsZW5nZUhlYWRlciwgW2Nvbm5lY3Rpb25dIHsKLSAgICAgICAgICAgIHJlc3BvbmRXaXRo T0soY29ubmVjdGlvbik7CisgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVz dChbY29ubmVjdGlvbl0gKFZlY3RvcjxjaGFyPiYmKSB7CisgICAgICAgICAgICAgICAgY29ubmVj dGlvbi5zZW5kKAorICAgICAgICAgICAgICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAg ICAgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAzNFxyXG5cclxuIgorICAgICAgICAg ICAgICAgICAgICAiPHNjcmlwdD5hbGVydCgnc3VjY2VzcyEnKTwvc2NyaXB0PiJfcywgW2Nvbm5l Y3Rpb25dIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhl bk9LKGNvbm5lY3Rpb24pOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICB9KTsKIH0KLS0gCjIuMzAuMSAo QXBwbGUgR2l0LTEzMCkKCg== 459516 2022-05-17 14:47:20 -0700 2022-05-26 17:41:02 -0700 Patch bug-240362-20220517144719.patch text/plain 14878 achristensen RnJvbSAyNWExMTZhZGU5MDcwMmRhMmVjYThkZDk0Y2Y3Njk0YzJkNjgyZTg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDE3IE1heSAyMDIyIDEzOjUwOjIyIC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gVXNlIF9hZG9wdEVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gaW5zdGVhZCBvZiBhIHNlcGFyYXRl CiBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVkZW50aWFscwogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI0MDM2MgoKUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCgpUaGlz IGlzIGEgUExUIHBlcmZvcm1hbmNlIGltcHJvdmVtZW50IGJlY2F1c2Ugd2Ugc3BlbmQgbGVzcyB0 aW1lIGluaXRpYXRpbmcgVENQIGNvbm5lY3Rpb25zLgoKKiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaDoKKiBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaDoK KiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29h Lm1tOgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5oOgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np b25Db2NvYS5tbToKKiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNv bm5lY3QubW06CiogVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tOgotLS0K IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oICAgICAgICAgICAgICAgICB8ICAxICsKIFNv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oICB8IDExICsrKysrKysr CiAuLi4vY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0gICAgICAgICAgICAgfCAyMSArKysr KysrKysrKysrKwogLi4uL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaCAgICAgICAgICAgICAg IHwgIDIgLS0KIC4uLi9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tICAgICAgICAgICAgICB8 IDI4ICsrKystLS0tLS0tLS0tLS0tLS0KIC4uLi9UZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0 Lm1tICAgICAgICAgICB8ICA2ICstLS0KIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNl cnZlci5tbSAgICAgICB8IDEwICsrKysrKy0KIDcgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9u cygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZv cm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRleCBiNjA1MjFmOWJk MzYuLjA4YjcwZDU4MTUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZl LmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgKQEAgLTQ1Niw2ICs0NTYsNyBA QAogCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE IDwgMTIwMDAwCiAjZGVmaW5lIEhBVkVfU0FGQVJJX0ZPUl9XRUJLSVRfREVWRUxPUE1FTlRfUkVR VUlSSU5HX0VYVFJBX1NZTUJPTFMgMQorI2RlZmluZSBIQVZFX05TVVJMU0VTU0lPTl9FRkZFQ1RJ VkVfQ09ORklHVVJBVElPTl9PQkpFQ1QgMQogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaCBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oCmluZGV4IDg5ODQ2 MGNlYTFkOS4uMjgyZDViOTA4ODFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j Zi9DRk5ldHdvcmtTUEkuaApAQCAtNjAsNiArNjAsMTIgQEAKIAogI2Vsc2UgLy8gIVVTRShBUFBM RV9JTlRFUk5BTF9TREspCiAKKyNpZiBIQVZFKE5TVVJMU0VTU0lPTl9FRkZFQ1RJVkVfQ09ORklH VVJBVElPTl9PQkpFQ1QpICYmIGRlZmluZWQoX19PQkpDX18pCitAaW50ZXJmYWNlIE5TVVJMU2Vz c2lvbkVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gOiBOU09iamVjdCA8TlNDb3B5aW5nPgorLSAoaW5z dGFuY2V0eXBlKV9pbml0V2l0aENvbmZpZ3VyYXRpb246KE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRp b24gKiljb25maWc7CitAZW5kCisjZW5kaWYgLy8gSEFWRShOU1VSTFNFU1NJT05fRUZGRUNUSVZF X0NPTkZJR1VSQVRJT05fT0JKRUNUKSAmJiBkZWZpbmVkKF9fT0JKQ19fKQorCiAjaWYgSEFWRShQ UkVDT05ORUNUX1BJTkcpICYmIGRlZmluZWQoX19PQkpDX18pCiAKIEBpbnRlcmZhY2UgX05TSFRU UENvbm5lY3Rpb25JbmZvIDogTlNPYmplY3QKQEAgLTI4MCw2ICsyODYsMTEgQEAgdHlwZWRlZiBO U19FTlVNKE5TSW50ZWdlciwgTlNVUkxTZXNzaW9uQ29tcGFuaW9uUHJveHlQcmVmZXJlbmNlKSB7 CiBAZW5kCiAKIEBpbnRlcmZhY2UgTlNVUkxTZXNzaW9uVGFzayAoKQorI2lmIEhBVkUoTlNVUkxT RVNTSU9OX0VGRkVDVElWRV9DT05GSUdVUkFUSU9OX09CSkVDVCkKKy0gKHZvaWQpX2Fkb3B0RWZm ZWN0aXZlQ29uZmlndXJhdGlvbjooTlNVUkxTZXNzaW9uRWZmZWN0aXZlQ29uZmlndXJhdGlvbiAq KSBuZXdDb25maWd1cmF0aW9uOworI2Vsc2UKKy0gKHZvaWQpX2Fkb3B0RWZmZWN0aXZlQ29uZmln dXJhdGlvbjooTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqKSBuZXdDb25maWd1cmF0aW9uOwor I2VuZGlmCiAtIChOU0RpY3Rpb25hcnkgKilfdGltaW5nRGF0YTsKIEBwcm9wZXJ0eSAocmVhZHdy aXRlLCBjb3B5KSBOU1N0cmluZyAqX3BhdGhUb0Rvd25sb2FkVGFza0ZpbGU7CiBAcHJvcGVydHkg KGNvcHkpIE5TU3RyaW5nICpfc3RvcmFnZVBhcnRpdGlvbklkZW50aWZpZXI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29h Lm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tD b2NvYS5tbQppbmRleCAxNzVmZjhhYjlkOGEuLjAyMWZjZGUzODY0MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tCkBAIC0zNTYsNiArMzU2LDI3IEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3Jr RGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAKICAg ICBtX3Rhc2sgPSBbbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbiBkYXRhVGFza1dpdGhSZXF1ZXN0 Om5zUmVxdWVzdC5nZXQoKV07CiAKKyAgICBzd2l0Y2ggKHBhcmFtZXRlcnMuc3RvcmVkQ3JlZGVu dGlhbHNQb2xpY3kpIHsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5 OjpVc2U6CisgICAgICAgIEFTU0VSVChtX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uLmdldCgpLmNv bmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UpOworICAgICAgICBicmVhazsKKyAgICBj YXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6 CisgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uV3JhcHBlci0+c2Vzc2lvbi5nZXQoKS5jb25maWd1 cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBX ZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2U6CisjaWYgSEFWRShOU1VS TFNFU1NJT05fRUZGRUNUSVZFX0NPTkZJR1VSQVRJT05fT0JKRUNUKQorICAgICAgICBOU1VSTFNl c3Npb25Db25maWd1cmF0aW9uICpjb3BpZWRDb25maWd1cmF0aW9uID0gbV9zZXNzaW9uV3JhcHBl ci0+c2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uOworICAgICAgICBjb3BpZWRDb25maWd1cmF0 aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOworICAgICAgICBhdXRvIGVmZmVjdGl2ZUNv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbTlNVUkxTZXNzaW9uRWZmZWN0aXZlQ29uZmlndXJhdGlv biBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpjb3BpZWRDb25maWd1cmF0aW9uXSk7Cisg ICAgICAgIFttX3Rhc2sgX2Fkb3B0RWZmZWN0aXZlQ29uZmlndXJhdGlvbjplZmZlY3RpdmVDb25m aWd1cmF0aW9uLmdldCgpXTsKKyNlbHNlCisgICAgICAgIE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRp b24gKmVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gPSBtX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uLmdl dCgpLmNvbmZpZ3VyYXRpb247CisgICAgICAgIGVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24uVVJMQ3Jl ZGVudGlhbFN0b3JhZ2UgPSBuaWw7CisgICAgICAgIFttX3Rhc2sgX2Fkb3B0RWZmZWN0aXZlQ29u ZmlndXJhdGlvbjplZmZlY3RpdmVDb25maWd1cmF0aW9uXTsKKyNlbmRpZgorICAgICAgICBicmVh azsKKyAgICB9OworCiAgICAgV1RGQmVnaW5TaWducG9zdChtX3Rhc2suZ2V0KCksICJEYXRhVGFz ayIsICIle3B1YmxpY31zIHByaTogJS4yZiBwcmVjb25uZWN0OiAlZCIsIHVybC5zdHJpbmcoKS5h c2NpaSgpLmRhdGEoKSwgdG9OU1VSTFNlc3Npb25UYXNrUHJpb3JpdHkocmVxdWVzdC5wcmlvcml0 eSgpKSwgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25seSA9PSBQcmVjb25uZWN0T25seTo6 WWVzKTsKIAogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3Nlc3Npb25XcmFwcGVyLT5kYXRhVGFza01h cC5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmggYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAppbmRl eCA5ZTA2OTA4NmJmYWEuLjgxZTdkZjYzY2U1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKQEAgLTY4LDcg KzY4LDYgQEAgc3RydWN0IElzb2xhdGVkU2Vzc2lvbiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7CiBwdWJsaWM6CiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZTsKLSAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9y YWdlOwogICAgIFdhbGxUaW1lIGxhc3RVc2VkOwogfTsKIApAQCAtODcsNyArODYsNiBAQCBwdWJs aWM6CiAgICAgc3RkOjp1bmlxdWVfcHRyPElzb2xhdGVkU2Vzc2lvbj4gYXBwQm91bmRTZXNzaW9u OwogCiAgICAgU2Vzc2lvbldyYXBwZXIgc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZTsKLSAg ICBTZXNzaW9uV3JhcHBlciBzZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlOwogICAgIFNl c3Npb25XcmFwcGVyIGVwaGVtZXJhbFN0YXRlbGVzc1Nlc3Npb247CiAKIHByaXZhdGU6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9u Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EubW0KaW5kZXggY2RlZDNkMzYwMjQ4Li5iYTVhOTE5MGM1YmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9u Q29jb2EubW0KQEAgLTEzNTEsOSArMTM1MSw2IEBAIHZvaWQgTmV0d29ya1Nlc3Npb25Db2NvYTo6 aW5pdGlhbGl6ZU5TVVJMU2Vzc2lvbnNJblNldChTZXNzaW9uU2V0JiBzZXNzaW9uU2V0LCBOCiAg ICAgYXV0byBjb29raWVBY2NlcHRQb2xpY3kgPSBjb25maWd1cmF0aW9uLkhUVFBDb29raWVTdG9y YWdlLmNvb2tpZUFjY2VwdFBvbGljeTsKICAgICBMT0coTmV0d29ya1Nlc3Npb24sICJDcmVhdGVk IE5ldHdvcmtTZXNzaW9uIHdpdGggY29va2llQWNjZXB0UG9saWN5ICVsdSIsIGNvb2tpZUFjY2Vw dFBvbGljeSk7CiAgICAgUkVMRUFTRV9MT0dfSUYoY29va2llQWNjZXB0UG9saWN5ID09IE5TSFRU UENvb2tpZUFjY2VwdFBvbGljeU5ldmVyLCBOZXR3b3JrU2Vzc2lvbiwgIkNyZWF0aW5nIG5ldHdv cmsgc2Vzc2lvbiB3aXRoIElEICUiIFBSSXU2NCAiIHRoYXQgd2lsbCBub3QgYWNjZXB0IGNvb2tp ZXMuIiwgbV9zZXNzaW9uSUQudG9VSW50NjQoKSk7Ci0KLSAgICBjb25maWd1cmF0aW9uLlVSTENy ZWRlbnRpYWxTdG9yYWdlID0gbmlsOwotICAgIHNlc3Npb25TZXQuc2Vzc2lvbldpdGhvdXRDcmVk ZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKGNvbmZpZ3VyYXRpb24sICp0aGlzLCBXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UsIE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9t YWluOjpObyk7CiB9CiAKIFNlc3Npb25TZXQmIE5ldHdvcmtTZXNzaW9uQ29jb2E6OnNlc3Npb25T ZXRGb3JQYWdlKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgd2ViUGFnZVByb3h5SUQpCkBAIC0xMzc5 LDcgKzEzNzYsNyBAQCBTZXNzaW9uV3JhcHBlciYgU2Vzc2lvblNldDo6aW5pdGlhbGl6ZUVwaGVt ZXJhbFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZChOYXZpZ2F0aQogICAgICAgICByZXR1cm4gZXBo ZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbjsKIAogICAgIE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24g KmNvbmZpZ3VyYXRpb24gPSBbTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiBlcGhlbWVyYWxTZXNz aW9uQ29uZmlndXJhdGlvbl07Ci0gICAgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqZXhpc3Rp bmdDb25maWd1cmF0aW9uID0gc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9u LmdldCgpLmNvbmZpZ3VyYXRpb247CisgICAgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqZXhp c3RpbmdDb25maWd1cmF0aW9uID0gc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9u LmdldCgpLmNvbmZpZ3VyYXRpb247CiAKICAgICBjb25maWd1cmF0aW9uLkhUVFBDb29raWVBY2Nl cHRQb2xpY3kgPSBOU0hUVFBDb29raWVBY2NlcHRQb2xpY3lOZXZlcjsKICAgICBjb25maWd1cmF0 aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOwpAQCAtMTQyMyw5ICsxNDIwLDggQEAgU2Vz c2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OnNlc3Npb25XcmFwcGVyRm9yVGFzayhX ZWJQYWdlUHJveHlJZGVudGlmaWUKIAogICAgIHN3aXRjaCAoc3RvcmVkQ3JlZGVudGlhbHNQb2xp Y3kpIHsKICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0g ICAgICAgIHJldHVybiBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCkuc2Vzc2lvbldp dGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxz UG9saWN5OjpEb05vdFVzZToKLSAgICAgICAgcmV0dXJuIHNlc3Npb25TZXRGb3JQYWdlKHdlYlBh Z2VQcm94eUlEKS5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlOworICAgICAgICByZXR1 cm4gc2Vzc2lvblNldEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Npb25XaXRoQ3JlZGVudGlh bFN0b3JhZ2U7CiAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RXBo ZW1lcmFsU3RhdGVsZXNzOgogICAgICAgICByZXR1cm4gaW5pdGlhbGl6ZUVwaGVtZXJhbFN0YXRl bGVzc1Nlc3Npb25JZk5lZWRlZCh3ZWJQYWdlUHJveHlJRCwgTmF2aWdhdGluZ1RvQXBwQm91bmRE b21haW46Ok5vKTsKICAgICB9CkBAIC0xNDM5LDE3ICsxNDM1LDE0IEBAIFNlc3Npb25XcmFwcGVy JiBOZXR3b3JrU2Vzc2lvbkNvY29hOjphcHBCb3VuZFNlc3Npb24oV2ViUGFnZVByb3h5SWRlbnRp ZmllciB3ZWJQCiAgICAgaWYgKCFzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbikgewogICAgICAg ICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbiA9IG1ha2VVbmlxdWU8SXNvbGF0ZWRTZXNzaW9u PigpOwogICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhDcmVk ZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sICp0aGlzLCBXZWJDb3JlOjpTdG9y ZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVz KTsKLSAgICAgICAgc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRob3V0Q3Jl ZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0Q3JlZGVu dGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQoKS5jb25maWd1cmF0aW9uLCAqdGhpcywgV2ViQ29yZTo6 U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERv bWFpbjo6WWVzKTsKICAgICB9CiAKICAgICBhdXRvJiBzZXNzaW9uV3JhcHBlciA9IFsmXSAoYXV0 byBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgLT4gU2Vzc2lvbldyYXBwZXImIHsKICAgICAgICAg c3dpdGNoIChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgICAgICBjYXNlIFdlYkNvcmU6 OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0gICAgICAgICAgICBMT0coTmV0d29ya1Nl c3Npb24sICJVc2luZyBhcHAtYm91bmQgTlNVUkxTZXNzaW9uIHdpdGggY3JlZGVudGlhbCBzdG9y YWdlLiIpOwotICAgICAgICAgICAgcmV0dXJuIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5z ZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZToKLSAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vz c2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNlc3Npb24gd2l0aG91dCBjcmVkZW50aWFsIHN0 b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24t PnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2U7CisgICAgICAgICAgICBMT0coTmV0d29y a1Nlc3Npb24sICJVc2luZyBhcHAtYm91bmQgTlNVUkxTZXNzaW9uLiIpOworICAgICAgICAgICAg cmV0dXJuIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxT dG9yYWdlOwogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpF cGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgICAgICByZXR1cm4gaW5pdGlhbGl6ZUVwaGVtZXJh bFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZCh3ZWJQYWdlUHJveHlJRCwgTmF2aWdhdGluZ1RvQXBw Qm91bmREb21haW46Olllcyk7CiAgICAgICAgIH0KQEAgLTE0ODgsNyArMTQ4MSw2IEBAIFNlc3Np b25XcmFwcGVyJiBTZXNzaW9uU2V0Ojppc29sYXRlZFNlc3Npb24oV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kgc3RvCiAgICAgYXV0byYgZW50cnkgPSBpc29sYXRlZFNlc3Npb25zLmVu c3VyZShmaXJzdFBhcnR5RG9tYWluLCBbdGhpcywgJnNlc3Npb24sIGlzTmF2aWdhdGluZ1RvQXBw Qm91bmREb21haW5dIHsKICAgICAgICAgYXV0byBuZXdFbnRyeSA9IG1ha2VVbmlxdWU8SXNvbGF0 ZWRTZXNzaW9uPigpOwogICAgICAgICBuZXdFbnRyeS0+c2Vzc2lvbldpdGhDcmVkZW50aWFsU3Rv cmFnZS5pbml0aWFsaXplKHNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQo KS5jb25maWd1cmF0aW9uLCBzZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGlj eTo6VXNlLCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKTsKLSAgICAgICAgbmV3RW50cnkt PnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UuaW5pdGlhbGl6ZShzZXNzaW9uV2l0aG91 dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbiwgc2Vzc2lvbiwg V2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlLCBpc05hdmlnYXRpbmdU b0FwcEJvdW5kRG9tYWluKTsKICAgICAgICAgcmV0dXJuIG5ld0VudHJ5OwogICAgIH0pLml0ZXJh dG9yLT52YWx1ZTsKIApAQCAtMTQ5NywxMSArMTQ4OSw5IEBAIFNlc3Npb25XcmFwcGVyJiBTZXNz aW9uU2V0Ojppc29sYXRlZFNlc3Npb24oV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kg c3RvCiAgICAgYXV0byYgc2Vzc2lvbldyYXBwZXIgPSBbJl0gKGF1dG8gc3RvcmVkQ3JlZGVudGlh bHNQb2xpY3kpIC0+IFNlc3Npb25XcmFwcGVyJiB7CiAgICAgICAgIHN3aXRjaCAoc3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kpIHsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFs c1BvbGljeTo6VXNlOgotICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNv bGF0ZWQgTlNVUkxTZXNzaW9uIHdpdGggY3JlZGVudGlhbCBzdG9yYWdlLiIpOwotICAgICAgICAg ICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgICAgICBj YXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZToKLSAgICAgICAg ICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGlzb2xhdGVkIE5TVVJMU2Vzc2lvbiB3aXRo b3V0IGNyZWRlbnRpYWwgc3RvcmFnZS4iKTsKLSAgICAgICAgICAgIHJldHVybiBlbnRyeS0+c2Vz c2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZTsKKyAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vz c2lvbiwgIlVzaW5nIGlzb2xhdGVkIE5TVVJMU2Vzc2lvbi4iKTsKKyAgICAgICAgICAgIHJldHVy biBlbnRyeS0+c2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICAgICAgY2FzZSBXZWJD b3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RXBoZW1lcmFsU3RhdGVsZXNzOgogICAgICAg ICAgICAgcmV0dXJuIGluaXRpYWxpemVFcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uSWZOZWVkZWQo aXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiwgc2Vzc2lvbik7CiAgICAgICAgIH0KQEAgLTE1 NDgsMjUgKzE1MzgsMTkgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpjbGVhcklzb2xhdGVk U2Vzc2lvbnMoKQogdm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjppbnZhbGlkYXRlQW5kQ2FuY2Vs U2Vzc2lvblNldChTZXNzaW9uU2V0JiBzZXNzaW9uU2V0KQogewogICAgIFtzZXNzaW9uU2V0LnNl c3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsK LSAgICBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24g aW52YWxpZGF0ZUFuZENhbmNlbF07CiAgICAgW3Nlc3Npb25TZXQuZXBoZW1lcmFsU3RhdGVsZXNz U2Vzc2lvbi5zZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwogICAgIFtzZXNzaW9uU2V0LnNl c3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsK LSAgICBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmRlbGVnYXRl IHNlc3Npb25JbnZhbGlkYXRlZF07CiAgICAgW3Nlc3Npb25TZXQuZXBoZW1lcmFsU3RhdGVsZXNz U2Vzc2lvbi5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwogCiAgICAgZm9yIChhdXRvJiBz ZXNzaW9uIDogc2Vzc2lvblNldC5pc29sYXRlZFNlc3Npb25zLnZhbHVlcygpKSB7CiAgICAgICAg IFtzZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0 ZUFuZENhbmNlbF07CiAgICAgICAgIFtzZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9y YWdlLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlkYXRlZF07Ci0gICAgICAgIFtzZXNzaW9uLT5zZXNz aW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFuZENhbmNlbF07 Ci0gICAgICAgIFtzZXNzaW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmRlbGVn YXRlIHNlc3Npb25JbnZhbGlkYXRlZF07CiAgICAgfQogICAgIHNlc3Npb25TZXQuaXNvbGF0ZWRT ZXNzaW9ucy5jbGVhcigpOwogCiAgICAgaWYgKHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uKSB7 CiAgICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhDcmVkZW50 aWFsU3RvcmFnZS5zZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwogICAgICAgICBbc2Vzc2lv blNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdh dGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKLSAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRTZXNz aW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFu ZENhbmNlbF07Ci0gICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldp dGhvdXRDcmVkZW50aWFsU3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9QcmVjb25uZWN0Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cmVjb25uZWN0Lm1tCmluZGV4IDU0N2IzNTdlZTllYS4uYjA4YTliYWQ2NGY5IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0Lm1tCkBA IC04NywyMCArODcsMTYgQEAgVEVTVChQcmVjb25uZWN0LCBDb25uZWN0aW9uQ291bnQpCiAgICAg fSk7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwogCi0gICAg Ly8gVGhlIHByZWNvbm5lY3QgdG8gdGhlIHNlcnZlciB3aWxsIHVzZSB0aGUgZGVmYXVsdCBzZXR0 aW5nIG9mICJ1c2UgdGhlIGNyZWRlbnRpYWwgc3RvcmUiLAotICAgIC8vIGFuZCB0aGVyZWZvcmUg dXNlIHRoZSBjcmVkZW50aWFsLXN0b3JlLWJsZXNzZWQgTlNVUkxTZXNzaW9uLgogICAgIFt3ZWJW aWV3IF9wcmVjb25uZWN0VG9TZXJ2ZXI6c2VydmVyLnJlcXVlc3QoKS5VUkxdOwogICAgIFV0aWw6 OnJ1bigmYW55Q29ubmVjdGlvbnMpOwogICAgIFV0aWw6OnNwaW5SdW5Mb29wKDEwKTsKICAgICBF WFBFQ1RfRkFMU0UocmVxdWVzdGVkKTsKIAotICAgIC8vIFRoZW4gdGhpcyByZXF1ZXN0IHdpbGwg Km5vdCogdXNlIHRoZSBjcmVkZW50aWFsIHN0b3JlLCB0aGVyZWZvcmUgdXNpbmcgYSBkaWZmZXJl bnQgTlNVUkxTZXNzaW9uCi0gICAgLy8gdGhhdCBkb2Vzbid0IGtub3cgYWJvdXQgdGhlIGFib3Zl IHByZWNvbm5lY3QsIHRyaWdnZXJpbmcgYSBzZWNvbmQgY29ubmVjdGlvbiB0byB0aGUgc2VydmVy LgogICAgIHdlYlZpZXcuZ2V0KCkuX2NhblVzZUNyZWRlbnRpYWxTdG9yYWdlID0gTk87CiAgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6c2VydmVyLnJlcXVlc3QoKV07CiAgICAgVXRpbDo6cnVuKCZy ZXF1ZXN0ZWQpOwogCi0gICAgRVhQRUNUX0VRKGNvbm5lY3Rpb25Db3VudCwgMnUpOworICAgIEVY UEVDVF9FUShjb25uZWN0aW9uQ291bnQsIDF1KTsKIH0KIAogVEVTVChQcmVjb25uZWN0LCBIVFRQ UykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbSBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbQppbmRleCA3N2MwZjczNjlh YTQuLmUxYjc5ODM3YWNjZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9I VFRQU2VydmVyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5t bQpAQCAtMjM3LDcgKzIzNywxNSBAQCB2b2lkIEhUVFBTZXJ2ZXI6OnJlc3BvbmRXaXRoQ2hhbGxl bmdlVGhlbk9LKENvbm5lY3Rpb24gY29ubmVjdGlvbikKICAgICAgICAgIkNvbnRlbnQtTGVuZ3Ro OiAwXHJcbiIKICAgICAgICAgIldXVy1BdXRoZW50aWNhdGU6IEJhc2ljIHJlYWxtPVwidGVzdHJl YWxtXCJcclxuXHJcbiJfczsKICAgICAgICAgY29ubmVjdGlvbi5zZW5kKGNoYWxsZW5nZUhlYWRl ciwgW2Nvbm5lY3Rpb25dIHsKLSAgICAgICAgICAgIHJlc3BvbmRXaXRoT0soY29ubmVjdGlvbik7 CisgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbY29ubmVjdGlvbl0g KFZlY3RvcjxjaGFyPiYmKSB7CisgICAgICAgICAgICAgICAgY29ubmVjdGlvbi5zZW5kKAorICAg ICAgICAgICAgICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgICAgICAgICAg ICAgIkNvbnRlbnQtTGVuZ3RoOiAzNFxyXG5cclxuIgorICAgICAgICAgICAgICAgICAgICAiPHNj cmlwdD5hbGVydCgnc3VjY2VzcyEnKTwvc2NyaXB0PiJfcywgW2Nvbm5lY3Rpb25dIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhlbk9LKGNvbm5lY3Rpb24p OworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgKTsKKyAgICAgICAgICAg IH0pOwogICAgICAgICB9KTsKICAgICB9KTsKIH0KLS0gCjIuMzAuMSAoQXBwbGUgR2l0LTEzMCkK Cg== 459800 2022-05-26 17:41:05 -0700 2022-05-26 20:51:13 -0700 Patch bug-240362-20220526174104.patch text/plain 16422 achristensen RnJvbSA5MjdhMDE3MDNiNWViYjg1NzI3NDU2YzFiMzAzM2RmOTcxMDY1YTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUaHUsIDI2IE1heSAyMDIyIDE3OjM5OjIyIC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gVXNlIF9hZG9wdEVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24gaW5zdGVhZCBvZiBhIHNlcGFyYXRl IAogTlNVUkxTZXNzaW9uIHdpdGhvdXQgY3JlZGVudGlhbHMgCiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMzYyCgpSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KClRo aXMgaXMgYSBQTFQgcGVyZm9ybWFuY2UgaW1wcm92ZW1lbnQgYmVjYXVzZSB3ZSBzcGVuZCBsZXNz IHRpbWUgaW5pdGlhdGluZyBUQ1AgY29ubmVjdGlvbnMuCgoqIFNvdXJjZS9XVEYvd3RmL1BsYXRm b3JtSGF2ZS5oOgoqIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5o OgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EubW06CihXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2Nv YSk6CiogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNv Y29hLmg6CiogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lv bkNvY29hLm1tOgooV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNvY29hOjppbml0aWFsaXplTlNVUkxT ZXNzaW9uc0luU2V0KToKKFdlYktpdDo6U2Vzc2lvblNldDo6aW5pdGlhbGl6ZUVwaGVtZXJhbFN0 YXRlbGVzc1Nlc3Npb25JZk5lZWRlZCk6CihXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OnNl c3Npb25XcmFwcGVyRm9yVGFzayk6CihXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OmFwcEJv dW5kU2Vzc2lvbik6CihXZWJLaXQ6OlNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbik6CihXZWJL aXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OmludmFsaWRhdGVBbmRDYW5jZWxTZXNzaW9uU2V0KToK KiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hTVFMubW06CihUZXN0V2Vi S2l0QVBJOjpURVNUKToKKiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By ZWNvbm5lY3QubW06CihUZXN0V2ViS2l0QVBJOjpURVNUKToKKiBUb29scy9UZXN0V2ViS2l0QVBJ L2NvY29hL0hUVFBTZXJ2ZXIubW06CihUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpyZXNwb25k V2l0aENoYWxsZW5nZVRoZW5PSyk6Ci0tLQogU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgg ICAgICAgICAgICAgICAgIHwgIDEgKwogU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZO ZXR3b3JrU1BJLmggIHwgMTEgKysrKysrKysKIC4uLi9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2Nv YS5tbSAgICAgICAgICAgICB8IDIxICsrKysrKysrKysrKysrCiAuLi4vY29jb2EvTmV0d29ya1Nl c3Npb25Db2NvYS5oICAgICAgICAgICAgICAgfCAgMiAtLQogLi4uL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EubW0gICAgICAgICAgICAgIHwgMjggKysrKy0tLS0tLS0tLS0tLS0tLQogVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9IU1RTLm1tIHwgIDYgKystLQogLi4uL1Rl c3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0gICAgICAgICAgIHwgIDYgKy0tLQogVG9vbHMv VGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tICAgICAgIHwgMTAgKysrKysrLQogOCBm aWxlcyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRm b3JtSGF2ZS5oCmluZGV4IDVmYTRkMzZmNWQ3Zi4uNDFkNGZhM2Q4YjEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaApAQCAtNDU2LDYgKzQ1Niw3IEBACiAKICNpZiBQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMjAwMDAKICNkZWZpbmUgSEFWRV9TQUZBUklf Rk9SX1dFQktJVF9ERVZFTE9QTUVOVF9SRVFVSVJJTkdfRVhUUkFfU1lNQk9MUyAxCisjZGVmaW5l IEhBVkVfTlNVUkxTRVNTSU9OX0VGRkVDVElWRV9DT05GSUdVUkFUSU9OX09CSkVDVCAxCiAjZW5k aWYKIAogI2lmIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2Yv Q0ZOZXR3b3JrU1BJLmgKaW5kZXggODk4NDYwY2VhMWQ5Li4yODJkNWI5MDg4MWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oCkBAIC02MCw2ICs2MCwx MiBAQAogCiAjZWxzZSAvLyAhVVNFKEFQUExFX0lOVEVSTkFMX1NESykKIAorI2lmIEhBVkUoTlNV UkxTRVNTSU9OX0VGRkVDVElWRV9DT05GSUdVUkFUSU9OX09CSkVDVCkgJiYgZGVmaW5lZChfX09C SkNfXykKK0BpbnRlcmZhY2UgTlNVUkxTZXNzaW9uRWZmZWN0aXZlQ29uZmlndXJhdGlvbiA6IE5T T2JqZWN0IDxOU0NvcHlpbmc+CistIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoQ29uZmlndXJhdGlv bjooTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqKWNvbmZpZzsKK0BlbmQKKyNlbmRpZiAvLyBI QVZFKE5TVVJMU0VTU0lPTl9FRkZFQ1RJVkVfQ09ORklHVVJBVElPTl9PQkpFQ1QpICYmIGRlZmlu ZWQoX19PQkpDX18pCisKICNpZiBIQVZFKFBSRUNPTk5FQ1RfUElORykgJiYgZGVmaW5lZChfX09C SkNfXykKIAogQGludGVyZmFjZSBfTlNIVFRQQ29ubmVjdGlvbkluZm8gOiBOU09iamVjdApAQCAt MjgwLDYgKzI4NiwxMSBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBOU1VSTFNlc3Npb25D b21wYW5pb25Qcm94eVByZWZlcmVuY2UpIHsKIEBlbmQKIAogQGludGVyZmFjZSBOU1VSTFNlc3Np b25UYXNrICgpCisjaWYgSEFWRShOU1VSTFNFU1NJT05fRUZGRUNUSVZFX0NPTkZJR1VSQVRJT05f T0JKRUNUKQorLSAodm9pZClfYWRvcHRFZmZlY3RpdmVDb25maWd1cmF0aW9uOihOU1VSTFNlc3Np b25FZmZlY3RpdmVDb25maWd1cmF0aW9uICopIG5ld0NvbmZpZ3VyYXRpb247CisjZWxzZQorLSAo dm9pZClfYWRvcHRFZmZlY3RpdmVDb25maWd1cmF0aW9uOihOU1VSTFNlc3Npb25Db25maWd1cmF0 aW9uICopIG5ld0NvbmZpZ3VyYXRpb247CisjZW5kaWYKIC0gKE5TRGljdGlvbmFyeSAqKV90aW1p bmdEYXRhOwogQHByb3BlcnR5IChyZWFkd3JpdGUsIGNvcHkpIE5TU3RyaW5nICpfcGF0aFRvRG93 bmxvYWRUYXNrRmlsZTsKIEBwcm9wZXJ0eSAoY29weSkgTlNTdHJpbmcgKl9zdG9yYWdlUGFydGl0 aW9uSWRlbnRpZmllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCmluZGV4IGYwNWFmY2JlNTE2Ny4uNzBm MTljZmE0N2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KQEAgLTM2Myw2ICszNjMsMjcgQEAgTmV0 d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiBz ZXNzaW9uLCBOZXR3b3JrRGF0YVQKIAogICAgIG1fdGFzayA9IFttX3Nlc3Npb25XcmFwcGVyLT5z ZXNzaW9uIGRhdGFUYXNrV2l0aFJlcXVlc3Q6bnNSZXF1ZXN0LmdldCgpXTsKIAorICAgIHN3aXRj aCAocGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgeworICAgIGNhc2UgV2ViQ29y ZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZToKKyAgICAgICAgQVNTRVJUKG1fc2Vzc2lv bldyYXBwZXItPnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbi5VUkxDcmVkZW50aWFsU3RvcmFn ZSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzczoKKyAgICAgICAgQVNTRVJUKCFtX3Nlc3Npb25XcmFw cGVyLT5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UpOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5 OjpEb05vdFVzZToKKyNpZiBIQVZFKE5TVVJMU0VTU0lPTl9FRkZFQ1RJVkVfQ09ORklHVVJBVElP Tl9PQkpFQ1QpCisgICAgICAgIE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmNvcGllZENvbmZp Z3VyYXRpb24gPSBtX3Nlc3Npb25XcmFwcGVyLT5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb247 CisgICAgICAgIGNvcGllZENvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7 CisgICAgICAgIGF1dG8gZWZmZWN0aXZlQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tOU1VSTFNl c3Npb25FZmZlY3RpdmVDb25maWd1cmF0aW9uIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9u OmNvcGllZENvbmZpZ3VyYXRpb25dKTsKKyAgICAgICAgW21fdGFzayBfYWRvcHRFZmZlY3RpdmVD b25maWd1cmF0aW9uOmVmZmVjdGl2ZUNvbmZpZ3VyYXRpb24uZ2V0KCldOworI2Vsc2UKKyAgICAg ICAgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqZWZmZWN0aXZlQ29uZmlndXJhdGlvbiA9IG1f c2Vzc2lvbldyYXBwZXItPnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKKyAgICAgICAgZWZm ZWN0aXZlQ29uZmlndXJhdGlvbi5VUkxDcmVkZW50aWFsU3RvcmFnZSA9IG5pbDsKKyAgICAgICAg W21fdGFzayBfYWRvcHRFZmZlY3RpdmVDb25maWd1cmF0aW9uOmVmZmVjdGl2ZUNvbmZpZ3VyYXRp b25dOworI2VuZGlmCisgICAgICAgIGJyZWFrOworICAgIH07CisKICAgICBXVEZCZWdpblNpZ25w b3N0KG1fdGFzay5nZXQoKSwgIkRhdGFUYXNrIiwgIiV7cHVibGljfXMgcHJpOiAlLjJmIHByZWNv bm5lY3Q6ICVkIiwgdXJsLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpLCB0b05TVVJMU2Vzc2lvblRh c2tQcmlvcml0eShyZXF1ZXN0LnByaW9yaXR5KCkpLCBwYXJhbWV0ZXJzLnNob3VsZFByZWNvbm5l Y3RPbmx5ID09IFByZWNvbm5lY3RPbmx5OjpZZXMpOwogCiAgICAgUkVMRUFTRV9BU1NFUlQoIW1f c2Vzc2lvbldyYXBwZXItPmRhdGFUYXNrTWFwLmNvbnRhaW5zKFttX3Rhc2sgdGFza0lkZW50aWZp ZXJdKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtTZXNzaW9uQ29jb2EuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya1Nlc3Npb25Db2NvYS5oCmluZGV4IDllMDY5MDg2YmZhYS4uODFlN2RmNjNjZTUyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv cmtTZXNzaW9uQ29jb2EuaApAQCAtNjgsNyArNjgsNiBAQCBzdHJ1Y3QgSXNvbGF0ZWRTZXNzaW9u IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBTZXNzaW9uV3Jh cHBlciBzZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwotICAgIFNlc3Npb25XcmFwcGVyIHNl c3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgV2FsbFRpbWUgbGFzdFVzZWQ7CiB9 OwogCkBAIC04Nyw3ICs4Niw2IEBAIHB1YmxpYzoKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SXNvbGF0 ZWRTZXNzaW9uPiBhcHBCb3VuZFNlc3Npb247CiAKICAgICBTZXNzaW9uV3JhcHBlciBzZXNzaW9u V2l0aENyZWRlbnRpYWxTdG9yYWdlOwotICAgIFNlc3Npb25XcmFwcGVyIHNlc3Npb25XaXRob3V0 Q3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgU2Vzc2lvbldyYXBwZXIgZXBoZW1lcmFsU3RhdGVsZXNz U2Vzc2lvbjsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCBiYTMzYmUzNzVmOTIu LmYzNjU0ZGIyZGZmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtMTM1Myw5ICsxMzUzLDYgQEAg dm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjppbml0aWFsaXplTlNVUkxTZXNzaW9uc0luU2V0KFNl c3Npb25TZXQmIHNlc3Npb25TZXQsIE4KICAgICBhdXRvIGNvb2tpZUFjY2VwdFBvbGljeSA9IGNv bmZpZ3VyYXRpb24uSFRUUENvb2tpZVN0b3JhZ2UuY29va2llQWNjZXB0UG9saWN5OwogICAgIExP RyhOZXR3b3JrU2Vzc2lvbiwgIkNyZWF0ZWQgTmV0d29ya1Nlc3Npb24gd2l0aCBjb29raWVBY2Nl cHRQb2xpY3kgJWx1IiwgY29va2llQWNjZXB0UG9saWN5KTsKICAgICBSRUxFQVNFX0xPR19JRihj b29raWVBY2NlcHRQb2xpY3kgPT0gTlNIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIsIE5ldHdv cmtTZXNzaW9uLCAiQ3JlYXRpbmcgbmV0d29yayBzZXNzaW9uIHdpdGggSUQgJSIgUFJJdTY0ICIg dGhhdCB3aWxsIG5vdCBhY2NlcHQgY29va2llcy4iLCBtX3Nlc3Npb25JRC50b1VJbnQ2NCgpKTsK LQotICAgIGNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7Ci0gICAgc2Vz c2lvblNldC5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoY29uZmln dXJhdGlvbiwgKnRoaXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVz ZSwgTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW46Ok5vKTsKIH0KIAogU2Vzc2lvblNldCYgTmV0 d29ya1Nlc3Npb25Db2NvYTo6c2Vzc2lvblNldEZvclBhZ2UoV2ViUGFnZVByb3h5SWRlbnRpZmll ciB3ZWJQYWdlUHJveHlJRCkKQEAgLTEzODEsNyArMTM3OCw3IEBAIFNlc3Npb25XcmFwcGVyJiBT ZXNzaW9uU2V0Ojppbml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKE5h dmlnYXRpCiAgICAgICAgIHJldHVybiBlcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uOwogCiAgICAg TlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiA9IFtOU1VSTFNlc3Npb25D b25maWd1cmF0aW9uIGVwaGVtZXJhbFNlc3Npb25Db25maWd1cmF0aW9uXTsKLSAgICBOU1VSTFNl c3Npb25Db25maWd1cmF0aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0aG91 dENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKKyAgICBOU1VS TFNlc3Npb25Db25maWd1cmF0aW9uICpleGlzdGluZ0NvbmZpZ3VyYXRpb24gPSBzZXNzaW9uV2l0 aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJhdGlvbjsKIAogICAgIGNv bmZpZ3VyYXRpb24uSFRUUENvb2tpZUFjY2VwdFBvbGljeSA9IE5TSFRUUENvb2tpZUFjY2VwdFBv bGljeU5ldmVyOwogICAgIGNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPSBuaWw7 CkBAIC0xNDI1LDkgKzE0MjIsOCBAQCBTZXNzaW9uV3JhcHBlciYgTmV0d29ya1Nlc3Npb25Db2Nv YTo6c2Vzc2lvbldyYXBwZXJGb3JUYXNrKFdlYlBhZ2VQcm94eUlkZW50aWZpZQogCiAgICAgc3dp dGNoIChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVk Q3JlZGVudGlhbHNQb2xpY3k6OlVzZToKLSAgICAgICAgcmV0dXJuIHNlc3Npb25TZXRGb3JQYWdl KHdlYlBhZ2VQcm94eUlEKS5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgIGNhc2Ug V2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgotICAgICAgICByZXR1 cm4gc2Vzc2lvblNldEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Npb25XaXRob3V0Q3JlZGVu dGlhbFN0b3JhZ2U7CisgICAgICAgIHJldHVybiBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJv eHlJRCkuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZTsKICAgICBjYXNlIFdlYkNvcmU6OlN0 b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgIHJldHVy biBpbml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBhZ2VQcm94 eUlELCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm8pOwogICAgIH0KQEAgLTE0NDEsMTcg KzE0MzcsMTQgQEAgU2Vzc2lvbldyYXBwZXImIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmFwcEJvdW5k U2Vzc2lvbihXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdlYlAKICAgICBpZiAoIXNlc3Npb25TZXQu YXBwQm91bmRTZXNzaW9uKSB7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91bmRTZXNzaW9uID0g bWFrZVVuaXF1ZTxJc29sYXRlZFNlc3Npb24+KCk7CiAgICAgICAgIHNlc3Npb25TZXQuYXBwQm91 bmRTZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lv blNldC5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24uZ2V0KCkuY29uZmlndXJh dGlvbiwgKnRoaXMsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UsIE5hdmln YXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpOwotICAgICAgICBzZXNzaW9uU2V0LmFwcEJvdW5k U2Vzc2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5pbml0aWFsaXplKHNlc3Np b25TZXQuc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZp Z3VyYXRpb24sICp0aGlzLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RV c2UsIE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZZXMpOwogICAgIH0KIAogICAgIGF1dG8m IHNlc3Npb25XcmFwcGVyID0gWyZdIChhdXRvIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KSAtPiBT ZXNzaW9uV3JhcHBlciYgewogICAgICAgICBzd2l0Y2ggKHN0b3JlZENyZWRlbnRpYWxzUG9saWN5 KSB7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZToK LSAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VSTFNl c3Npb24gd2l0aCBjcmVkZW50aWFsIHN0b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gc2Vz c2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAg ICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOgot ICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgYXBwLWJvdW5kIE5TVVJMU2Vz c2lvbiB3aXRob3V0IGNyZWRlbnRpYWwgc3RvcmFnZS4iKTsKLSAgICAgICAgICAgIHJldHVybiBz ZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFn ZTsKKyAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIlVzaW5nIGFwcC1ib3VuZCBOU1VS TFNlc3Npb24uIik7CisgICAgICAgICAgICByZXR1cm4gc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Np b24tPnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6 U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkVwaGVtZXJhbFN0YXRlbGVzczoKICAgICAgICAgICAg IHJldHVybiBpbml0aWFsaXplRXBoZW1lcmFsU3RhdGVsZXNzU2Vzc2lvbklmTmVlZGVkKHdlYlBh Z2VQcm94eUlELCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6WWVzKTsKICAgICAgICAgfQpA QCAtMTQ5MCw3ICsxNDgzLDYgQEAgU2Vzc2lvbldyYXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVk U2Vzc2lvbihXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBl bnRyeSA9IGlzb2xhdGVkU2Vzc2lvbnMuZW5zdXJlKGZpcnN0UGFydHlEb21haW4sIFt0aGlzLCAm c2Vzc2lvbiwgaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbl0gewogICAgICAgICBhdXRvIG5l d0VudHJ5ID0gbWFrZVVuaXF1ZTxJc29sYXRlZFNlc3Npb24+KCk7CiAgICAgICAgIG5ld0VudHJ5 LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmluaXRpYWxpemUoc2Vzc2lvbldpdGhDcmVk ZW50aWFsU3RvcmFnZS5zZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24sIHNlc3Npb24sIFdlYkNv cmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmRE b21haW4pOwotICAgICAgICBuZXdFbnRyeS0+c2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFn ZS5pbml0aWFsaXplKHNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbi5nZXQo KS5jb25maWd1cmF0aW9uLCBzZXNzaW9uLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGlj eTo6RG9Ob3RVc2UsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOwogICAgICAgICByZXR1 cm4gbmV3RW50cnk7CiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlOwogCkBAIC0xNDk5LDExICsxNDkx LDkgQEAgU2Vzc2lvbldyYXBwZXImIFNlc3Npb25TZXQ6Omlzb2xhdGVkU2Vzc2lvbihXZWJDb3Jl OjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG8KICAgICBhdXRvJiBzZXNzaW9uV3JhcHBlciA9 IFsmXSAoYXV0byBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgLT4gU2Vzc2lvbldyYXBwZXImIHsK ICAgICAgICAgc3dpdGNoIChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSkgewogICAgICAgICBjYXNl IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2U6Ci0gICAgICAgICAgICBMT0co TmV0d29ya1Nlc3Npb24sICJVc2luZyBpc29sYXRlZCBOU1VSTFNlc3Npb24gd2l0aCBjcmVkZW50 aWFsIHN0b3JhZ2UuIik7Ci0gICAgICAgICAgICByZXR1cm4gZW50cnktPnNlc3Npb25XaXRoQ3Jl ZGVudGlhbFN0b3JhZ2U7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3k6OkRvTm90VXNlOgotICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcg aXNvbGF0ZWQgTlNVUkxTZXNzaW9uIHdpdGhvdXQgY3JlZGVudGlhbCBzdG9yYWdlLiIpOwotICAg ICAgICAgICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlOwor ICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiVXNpbmcgaXNvbGF0ZWQgTlNVUkxTZXNz aW9uLiIpOworICAgICAgICAgICAgcmV0dXJuIGVudHJ5LT5zZXNzaW9uV2l0aENyZWRlbnRpYWxT dG9yYWdlOwogICAgICAgICBjYXNlIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpF cGhlbWVyYWxTdGF0ZWxlc3M6CiAgICAgICAgICAgICByZXR1cm4gaW5pdGlhbGl6ZUVwaGVtZXJh bFN0YXRlbGVzc1Nlc3Npb25JZk5lZWRlZChpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluLCBz ZXNzaW9uKTsKICAgICAgICAgfQpAQCAtMTU1MCwyNSArMTU0MCwxOSBAQCB2b2lkIE5ldHdvcmtT ZXNzaW9uQ29jb2E6OmNsZWFySXNvbGF0ZWRTZXNzaW9ucygpCiB2b2lkIE5ldHdvcmtTZXNzaW9u Q29jb2E6OmludmFsaWRhdGVBbmRDYW5jZWxTZXNzaW9uU2V0KFNlc3Npb25TZXQmIHNlc3Npb25T ZXQpCiB7CiAgICAgW3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNz aW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0 Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICBbc2Vz c2lvblNldC5lcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uLnNlc3Npb24gaW52YWxpZGF0ZUFuZENh bmNlbF07CiAgICAgW3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5kZWxl Z2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwotICAgIFtzZXNzaW9uU2V0LnNlc3Npb25XaXRob3V0 Q3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICBbc2Vz c2lvblNldC5lcGhlbWVyYWxTdGF0ZWxlc3NTZXNzaW9uLmRlbGVnYXRlIHNlc3Npb25JbnZhbGlk YXRlZF07CiAKICAgICBmb3IgKGF1dG8mIHNlc3Npb24gOiBzZXNzaW9uU2V0Lmlzb2xhdGVkU2Vz c2lvbnMudmFsdWVzKCkpIHsKICAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRoQ3JlZGVudGlh bFN0b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKICAgICAgICAgW3Nlc3Npb24t PnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVk XTsKLSAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2Uuc2Vz c2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb24tPnNlc3Npb25XaXRo b3V0Q3JlZGVudGlhbFN0b3JhZ2UuZGVsZWdhdGUgc2Vzc2lvbkludmFsaWRhdGVkXTsKICAgICB9 CiAgICAgc2Vzc2lvblNldC5pc29sYXRlZFNlc3Npb25zLmNsZWFyKCk7CiAKICAgICBpZiAoc2Vz c2lvblNldC5hcHBCb3VuZFNlc3Npb24pIHsKICAgICAgICAgW3Nlc3Npb25TZXQuYXBwQm91bmRT ZXNzaW9uLT5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gaW52YWxpZGF0ZUFu ZENhbmNlbF07CiAgICAgICAgIFtzZXNzaW9uU2V0LmFwcEJvdW5kU2Vzc2lvbi0+c2Vzc2lvbldp dGhDcmVkZW50aWFsU3RvcmFnZS5kZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwotICAgICAg ICBbc2Vzc2lvblNldC5hcHBCb3VuZFNlc3Npb24tPnNlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0 b3JhZ2Uuc2Vzc2lvbiBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKLSAgICAgICAgW3Nlc3Npb25TZXQu YXBwQm91bmRTZXNzaW9uLT5zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlLmRlbGVnYXRl IHNlc3Npb25JbnZhbGlkYXRlZF07CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hTVFMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL0hTVFMubW0KaW5kZXggMzk3NTYzMjcyNWZkLi5kMjhlODdmYTEw MGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSFNU Uy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hTVFMubW0K QEAgLTExNCw4ICsxMTQsMTAgQEAgVEVTVChIU1RTLCBUaGlyZFBhcnR5KQogICAgIEVYUEVDVF9X S19TVFJFUSh3ZWJWaWV3LmdldCgpLlVSTC5hYnNvbHV0ZVN0cmluZywgImh0dHBzOi8vZXhhbXBs ZS5jb20vIik7CiAKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVl c3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUub3JnLyJdXV07 Ci0gICAgRVhQRUNUX1dLX1NUUkVRKFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JBbGVydF0sICJodHRw Oi8vZXhhbXBsZS5jb20vIGhpIik7Ci0gICAgRVhQRUNUX0VRKGh0dHBTZXJ2ZXIudG90YWxSZXF1 ZXN0cygpLCAydSk7CisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlICJodHRwOi8vZXhhbXBs ZS5jb20vIGhpIiBidXQgdGhlIHJlc3BvbnNlIGdlbmVyYXRlZCBpbiBfc2NoZW1lVXBncmFkZWQg aXMgZmFpbGluZyBhIENPUlMgY2hlY2suCisgICAgLy8gVGhpcyBzaG91bGQgYmUgZml4ZWQgdG8g ZGlzYWJsZSBDT1JTIGNoZWNrcyBmb3IgSFNUUyAicmVkaXJlY3RzIgorICAgIEVYUEVDVF9XS19T VFJFUShbd2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAiICIpOworICAgIEVYUEVDVF9FUSho dHRwU2VydmVyLnRvdGFsUmVxdWVzdHMoKSwgMXUpOwogfQogCiBURVNUKEhTVFMsIENyb3NzT3Jp Z2luUmVkaXJlY3QpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1ByZWNvbm5lY3QubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1ByZWNvbm5lY3QubW0KaW5kZXggNTQ3YjM1N2VlOWVhLi5iMDhhOWJhZDY0ZjkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJlY29ubmVjdC5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3Qu bW0KQEAgLTg3LDIwICs4NywxNiBAQCBURVNUKFByZWNvbm5lY3QsIENvbm5lY3Rpb25Db3VudCkK ICAgICB9KTsKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CiAK LSAgICAvLyBUaGUgcHJlY29ubmVjdCB0byB0aGUgc2VydmVyIHdpbGwgdXNlIHRoZSBkZWZhdWx0 IHNldHRpbmcgb2YgInVzZSB0aGUgY3JlZGVudGlhbCBzdG9yZSIsCi0gICAgLy8gYW5kIHRoZXJl Zm9yZSB1c2UgdGhlIGNyZWRlbnRpYWwtc3RvcmUtYmxlc3NlZCBOU1VSTFNlc3Npb24uCiAgICAg W3dlYlZpZXcgX3ByZWNvbm5lY3RUb1NlcnZlcjpzZXJ2ZXIucmVxdWVzdCgpLlVSTF07CiAgICAg VXRpbDo6cnVuKCZhbnlDb25uZWN0aW9ucyk7CiAgICAgVXRpbDo6c3BpblJ1bkxvb3AoMTApOwog ICAgIEVYUEVDVF9GQUxTRShyZXF1ZXN0ZWQpOwogCi0gICAgLy8gVGhlbiB0aGlzIHJlcXVlc3Qg d2lsbCAqbm90KiB1c2UgdGhlIGNyZWRlbnRpYWwgc3RvcmUsIHRoZXJlZm9yZSB1c2luZyBhIGRp ZmZlcmVudCBOU1VSTFNlc3Npb24KLSAgICAvLyB0aGF0IGRvZXNuJ3Qga25vdyBhYm91dCB0aGUg YWJvdmUgcHJlY29ubmVjdCwgdHJpZ2dlcmluZyBhIHNlY29uZCBjb25uZWN0aW9uIHRvIHRoZSBz ZXJ2ZXIuCiAgICAgd2ViVmlldy5nZXQoKS5fY2FuVXNlQ3JlZGVudGlhbFN0b3JhZ2UgPSBOTzsK ICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIucmVxdWVzdCgpXTsKICAgICBVdGlsOjpy dW4oJnJlcXVlc3RlZCk7CiAKLSAgICBFWFBFQ1RfRVEoY29ubmVjdGlvbkNvdW50LCAydSk7Cisg ICAgRVhQRUNUX0VRKGNvbm5lY3Rpb25Db3VudCwgMXUpOwogfQogCiBURVNUKFByZWNvbm5lY3Qs IEhUVFBTKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVy Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCmluZGV4IDQ2NTAy ZTQ2YzI1MC4uNzdhNzAyMGU0MGMzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2Nv Y29hL0hUVFBTZXJ2ZXIubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2Vy dmVyLm1tCkBAIC0yNTMsNyArMjUzLDE1IEBAIHZvaWQgSFRUUFNlcnZlcjo6cmVzcG9uZFdpdGhD aGFsbGVuZ2VUaGVuT0soQ29ubmVjdGlvbiBjb25uZWN0aW9uKQogICAgICAgICAiQ29udGVudC1M ZW5ndGg6IDBcclxuIgogICAgICAgICAiV1dXLUF1dGhlbnRpY2F0ZTogQmFzaWMgcmVhbG09XCJ0 ZXN0cmVhbG1cIlxyXG5cclxuIl9zOwogICAgICAgICBjb25uZWN0aW9uLnNlbmQoY2hhbGxlbmdl SGVhZGVyLCBbY29ubmVjdGlvbl0gewotICAgICAgICAgICAgcmVzcG9uZFdpdGhPSyhjb25uZWN0 aW9uKTsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1ZXN0KFtjb25uZWN0 aW9uXSAoVmVjdG9yPGNoYXI+JiYpIHsKKyAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQo CisgICAgICAgICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAg ICAgICAgICAiQ29udGVudC1MZW5ndGg6IDM0XHJcblxyXG4iCisgICAgICAgICAgICAgICAgICAg ICI8c2NyaXB0PmFsZXJ0KCdzdWNjZXNzIScpPC9zY3JpcHQ+Il9zLCBbY29ubmVjdGlvbl0gewor ICAgICAgICAgICAgICAgICAgICAgICAgcmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0soY29ubmVj dGlvbik7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICApOworICAgICAg ICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgIH0pOwogfQotLSAKMi4zMi4wIChBcHBsZSBHaXQt MTMyKQoK