205709 2020-01-02 20:19:49 -0800 Reformat WebPage logging 2020-01-06 12:46:52 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin bfulgham cdumez commit-queue webkit-bug-importer oldest_to_newest 1602324 0 krollin 2020-01-02 20:19:49 -0800 Update the format used by WebPage in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values> So, for example: 0x4a1df5000 - WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (frame=0x4a1db0220, priority=0, webPageID=15, frameID=3, resourceID=32)', becomes: 0x4a1df5000 - [resourceLoader=0x1418b7200, frameLoader=0x1326d7340, frame=0x4a1db0220, webPageID=15, frameID=3, resourceID=32] WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (priority=2) 1602325 1 webkit-bug-importer 2020-01-02 20:19:58 -0800 <rdar://problem/58290285> 1602329 2 386656 krollin 2020-01-02 20:49:22 -0800 Created attachment 386656 Patch 1603193 3 386656 bfulgham 2020-01-06 12:05:04 -0800 Comment on attachment 386656 Patch Much tidier! r=me 1603217 4 386656 commit-queue 2020-01-06 12:46:46 -0800 Comment on attachment 386656 Patch Clearing flags on attachment: 386656 Committed r254078: <https://trac.webkit.org/changeset/254078> 1603218 5 commit-queue 2020-01-06 12:46:52 -0800 All reviewed patches have been landed. Closing bug. 386656 2020-01-02 20:49:22 -0800 2020-01-06 12:46:46 -0800 Patch bug-205709-20200102204921.patch text/plain 18554 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhmZThkZGExOWQ3MGY4MjVj NGZjYTE5NmEwZGYwNmE3NGI1OGI0YjUuLjEzMjkyMzJkMDY5NjBmYjk1OWM0ZjQ0NTdlZjMyYmI5 MmVkOThiMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjAtMDEtMDIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFdlYlBhZ2UgbG9n Z2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1 NzA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODI5MDI4NT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGZvcm1hdCB1c2VkIGJ5 IFdlYlBhZ2UgaW4gaXRzIFJFTEVBU0VfTE9HIGxvZ2dpbmcuIFVzZSB0aGUKKyAgICAgICAgZm9y bWF0IHVzZWQgYnkgV2ViUGFnZVByb3h5IGFuZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXIsIHdoaWNo IGlzCisgICAgICAgIGdlbmVyYWxseSBvZiB0aGUgZm9ybToKKworICAgICAgICAgICAgPG9iamVj dC1hZGRyZXNzPiAtIFs8dmFsdWVzIHRoYXQgaGVscCB0aHJlYWQgdG9nZXRoZXIgb3BlcmF0aW9u cz5dIDxjbGFzcz46OjxtZXRob2Q+OiA8bWVzc2FnZSBhbmQgb3RoZXIgdXNlZnVsIHZhbHVlcz4K KworICAgICAgICBTbywgZm9yIGV4YW1wbGU6CisKKyAgICAgICAgICAgIDB4NGExZGY1MDAwIC0g V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZDogUmVzb3VyY2UgaXMgYmVpbmcgc2NoZWR1 bGVkIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIChmcmFtZT0weDRhMWRiMDIyMCwgcHJpb3JpdHk9 MCwgd2ViUGFnZUlEPTE1LCBmcmFtZUlEPTMsIHJlc291cmNlSUQ9MzIpJywKKworICAgICAgICBi ZWNvbWVzOgorCisgICAgICAgICAgICAweDRhMWRmNTAwMCAtIFtyZXNvdXJjZUxvYWRlcj0weDE0 MThiNzIwMCwgZnJhbWVMb2FkZXI9MHgxMzI2ZDczNDAsIGZyYW1lPTB4NGExZGIwMjIwLCB3ZWJQ YWdlSUQ9MTUsIGZyYW1lSUQ9MywgcmVzb3VyY2VJRD0zMl0gV2ViTG9hZGVyU3RyYXRlZ3k6OnNj aGVkdWxlTG9hZDogUmVzb3VyY2UgaXMgYmVpbmcgc2NoZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQ cm9jZXNzIChwcmlvcml0eT0yKQorCisgICAgICAgIFRoaXMgbmV3IGZvcm0gaXMgYSBsb3QgbW9y ZSB2ZXJib3NlLCBidXQgaXQgcmVhbGx5IGhlbHBzIGluIHRyYWNpbmcKKyAgICAgICAgYWN0aXZp dHkgZnJvbSB0aGUgdG9wIG9mIG91ciBwYWdlL2ZyYW1lL3Jlc291cmNlIGxvYWQgc3RhY2sgdG8g dGhlCisgICAgICAgIGJvdHRvbS4KKworICAgICAgICBObyBuZXcgdGVzdHMgLSBubyBhZGRlZCBv ciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVn eTo6c2NoZWR1bGVMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnRy eUxvYWRpbmdVc2luZ1VSTFNjaGVtZUhhbmRsZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2Fk ZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKFdl YktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KToK KyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaDoKKwogMjAy MC0wMS0wMiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVm b3JtYXQgV2ViUGFnZSBsb2dnaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggZDcyM2NhZTMzMzE1NTFkZmY4 NjYxNzFhODU5YzY0MTgyMGE2Mzc2ZS4uYjczMDNlODI4NDU2ZjUxYmEyYzdmYTRiYzViODg2MGI0 YWZhZmY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtNzYsOCArNzYsMjEgQEAKICNpbmNsdWRlIDxXZWJD b3JlL1F1aWNrTG9vay5oPgogI2VuZGlmCiAKLSNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2Vzc2lv bklEKCkuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIE5ldHdvcmssICIlcCAtIFdlYkxvYWRl clN0cmF0ZWd5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKLSNkZWZpbmUgUkVMRUFTRV9M T0dfRVJST1JfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYoV2ViUHJv Y2Vzczo6c2luZ2xldG9uKCkuc2Vzc2lvbklEKCkuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCks IE5ldHdvcmssICIlcCAtIFdlYkxvYWRlclN0cmF0ZWd5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FS R1NfXykKKworI2RlZmluZSBSRUxFQVNFX0xPR19JU19BTExPV0VEIChXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZXNzaW9uSUQoKS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSkKKworI2RlZmlu ZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihSRUxFQVNF X0xPR19JU19BTExPV0VELCBOZXR3b3JrLCAiJXAgLSBXZWJMb2FkZXJTdHJhdGVneTo6IiBmbXQs IHRoaXMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9X RUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKFJFTEVBU0VfTE9HX0lTX0FMTE9XRUQs IE5ldHdvcmssICIlcCAtIFdlYkxvYWRlclN0cmF0ZWd5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FS R1NfXykKKworI2RlZmluZSBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19TVEFOREFSRF9U RU1QTEFURSAiJXAgLSBbcmVzb3VyY2VMb2FkZXI9JXAsIGZyYW1lTG9hZGVyPSVwLCBmcmFtZT0l cCwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlE PSUiIFBSSXU2NCAiXSBXZWJMb2FkZXJTdHJhdGVneTo6IgorI2RlZmluZSBXRUJMT0FERVJTVFJB VEVHWV9SRUxFQVNFX0xPR19TVEFOREFSRF9QQVJBTUVURVJTIHRoaXMsICZyZXNvdXJjZUxvYWRl ciwgcmVzb3VyY2VMb2FkZXIuZnJhbWVMb2FkZXIoKSwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwg dHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMu ZnJhbWVJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRAorI2RlZmlu ZSBXRUJMT0FERVJTVFJBVEVHWV9XSVRIX0ZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX1NUQU5EQVJE X1BBUkFNRVRFUlMgdGhpcywgbnVsbHB0ciwgJmZyYW1lTG9hZGVyLCAmZnJhbWVMb2FkZXIuZnJh bWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFt ZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRAor CisjZGVmaW5lIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoZm10LCAu Li4pIFJFTEVBU0VfTE9HX0lGKFJFTEVBU0VfTE9HX0lTX0FMTE9XRUQsIE5ldHdvcmssIFdFQkxP QURFUlNUUkFURUdZX1JFTEVBU0VfTE9HX1NUQU5EQVJEX1RFTVBMQVRFIGZtdCwgV0VCTE9BREVS U1RSQVRFR1lfUkVMRUFTRV9MT0dfU1RBTkRBUkRfUEFSQU1FVEVSUywgIyNfX1ZBX0FSR1NfXykK KyNkZWZpbmUgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChm bXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYoUkVMRUFTRV9MT0dfSVNfQUxMT1dFRCwgTmV0 d29yaywgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfU1RBTkRBUkRfVEVNUExBVEUgZm10 LCBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19TVEFOREFSRF9QQVJBTUVURVJTLCAjI19f VkFfQVJHU19fKQorCisjZGVmaW5lIFdFQkxPQURFUlNUUkFURUdZX1dJVEhfRlJBTUVMT0FERVJf UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoUkVMRUFTRV9M T0dfSVNfQUxMT1dFRCwgTmV0d29yaywgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfU1RB TkRBUkRfVEVNUExBVEUgZm10LCBXRUJMT0FERVJTVFJBVEVHWV9XSVRIX0ZSQU1FTE9BREVSX1JF TEVBU0VfTE9HX1NUQU5EQVJEX1BBUkFNRVRFUlMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFdF QkxPQURFUlNUUkFURUdZX1dJVEhfRlJBTUVMT0FERVJfUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxM T1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYoUkVMRUFTRV9MT0dfSVNfQUxMT1dF RCwgTmV0d29yaywgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfU1RBTkRBUkRfVEVNUExB VEUgZm10LCBXRUJMT0FERVJTVFJBVEVHWV9XSVRIX0ZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX1NU QU5EQVJEX1BBUkFNRVRFUlMsICMjX19WQV9BUkdTX18pCiAKIG5hbWVzcGFjZSBXZWJLaXQgewog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xNzQsNyArMTg3LDcgQEAgdm9pZCBXZWJMb2Fk ZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwg Q2FjaGVkUmVzb3UKICAgICAvLyB0aGVuIHdlIHNob3VsZCByZW1lbWJlciB0aGUgUmVzb3VyY2VM b2FkZXIgaW4gb3VyIHJlY29yZHMgYnV0IG5vdCBzY2hlZHVsZSBpdCBpbiB0aGUgTmV0d29ya1By b2Nlc3MuCiAgICAgaWYgKHJlc291cmNlTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPnNjaGVkdWxl QXJjaGl2ZUxvYWQocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKSkpIHsK ICAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0 cmF0ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgaGFuZGxlZCBhcyBhbiBhcmNo aXZlIHJlc291cmNlLiIsIHJlc291cmNlTG9hZGVyLnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3 aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSByZXNvdXJjZSAoZnJhbWU9JXAsIHdlYlBhZ2VJ RD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQg IikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRv VUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZp ZXIpOworICAgICAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJz Y2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSByZXNvdXJjZSIp OwogICAgICAgICBtX3dlYlJlc291cmNlTG9hZGVycy5zZXQoaWRlbnRpZmllciwgV2ViUmVzb3Vy Y2VMb2FkZXI6OmNyZWF0ZShyZXNvdXJjZUxvYWRlciwgdHJhY2tpbmdQYXJhbWV0ZXJzKSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xODIsMTQgKzE5NSwxNCBAQCB2b2lkIFdlYkxvYWRl clN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyLCBD YWNoZWRSZXNvdQogCiAgICAgaWYgKHJlc291cmNlTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPmFw cGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkUmVzb3VyY2UocmVzb3VyY2VMb2FkZXIsIHJl c291cmNlTG9hZGVyLnJlcXVlc3QoKSwgcmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnVybCgpKSkg ewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIoV2ViUHJvY2VzcykgV2ViTG9hZGVy U3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICclcycgd2lsbCBiZSBsb2FkZWQgZnJvbSBhcHBs aWNhdGlvbiBjYWNoZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBVUkwg d2lsbCBiZSBsb2FkZWQgZnJvbSBhcHBsaWNhdGlvbiBjYWNoZSAoZnJhbWU9JXAsIHdlYlBhZ2VJ RD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQg IikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRv VUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZp ZXIpOworICAgICAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJz Y2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGxvYWRlZCBmcm9tIGFwcGxpY2F0aW9uIGNhY2hlIik7 CiAgICAgICAgIG1fd2ViUmVzb3VyY2VMb2FkZXJzLnNldChpZGVudGlmaWVyLCBXZWJSZXNvdXJj ZUxvYWRlcjo6Y3JlYXRlKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1BhcmFtZXRlcnMpKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCku dXJsKCkucHJvdG9jb2xJc0RhdGEoKSkgewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcs ICIoV2ViUHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICclcycg d2lsbCBiZSBsb2FkZWQgYXMgZGF0YS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmcoKS51 dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVM b2FkOiBVUkwgd2lsbCBiZSBsb2FkZWQgYXMgZGF0YSAoZnJhbWU9JXAsIHdlYlBhZ2VJRD0lIiBQ Ukl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCBy ZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0 KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwor ICAgICAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVs ZUxvYWQ6IFVSTCB3aWxsIGJlIGxvYWRlZCBhcyBkYXRhIik7CiAgICAgICAgIHN0YXJ0TG9jYWxM b2FkKHJlc291cmNlTG9hZGVyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE5Nyw3ICsy MTAsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQoUmVzb3VyY2VMb2Fk ZXImIHJlc291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQogI2lmIFVTRShRVUlDS19MT09LKQogICAg IGlmIChpc1F1aWNrTG9va1ByZXZpZXdVUkwocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnVybCgp KSkgewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIoV2ViUHJvY2VzcykgV2ViTG9h ZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICclcycgd2lsbCBiZSBoYW5kbGVkIGFzIGEg UXVpY2tMb29rIHJlc291cmNlLiIsIHJlc291cmNlTG9hZGVyLnVybCgpLnN0cmluZygpLnV0Zjgo KS5kYXRhKCkpOwotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6 IFVSTCB3aWxsIGJlIGhhbmRsZWQgYXMgYSBRdWlja0xvb2sgcmVzb3VyY2UgKGZyYW1lPSVwLCB3 ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIg UFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBh Z2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBp ZGVudGlmaWVyKTsKKyAgICAgICAgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGFzIGEgUXVpY2tMb29rIHJl c291cmNlIik7CiAgICAgICAgIHN0YXJ0TG9jYWxMb2FkKHJlc291cmNlTG9hZGVyKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KQEAgLTIwOCwyMSArMjIxLDIyIEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hl ZFJlc291CiAgICAgLy8gaHR0cHM6Ly9ibG9ncy5nbm9tZS5vcmcvYWxleGwvMjAxMi8wMS8yNi9y ZXNvdXJjZXMtaW4tZ2xpYi8KICAgICBpZiAocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnVybCgp LnByb3RvY29sSXMoInJlc291cmNlIikpIHsKICAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5n LCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMn IHdpbGwgYmUgaGFuZGxlZCBhcyBhIEdSZXNvdXJjZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5z dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi c2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGFzIGEgR1Jlc291cmNlIChmcmFtZT0l cCwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlE PSUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVy cy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQo KSwgaWRlbnRpZmllcik7CisgICAgICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HX0lG X0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIEdSZXNvdXJj ZSIpOwogICAgICAgICBzdGFydExvY2FsTG9hZChyZXNvdXJjZUxvYWRlcik7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAjZW5kaWYKIAotICAgIGlmICghdHJ5TG9hZGluZ1VzaW5nVVJMU2NoZW1l SGFuZGxlcihyZXNvdXJjZUxvYWRlcikpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1By b2Nlc3MgKGZyYW1lPSVwLCB3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0 ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJh Y2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJh bWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKKyAgICBpZiAoIXRyeUxvYWRpbmdVc2luZ1VS TFNjaGVtZUhhbmRsZXIocmVzb3VyY2VMb2FkZXIsIHRyYWNraW5nUGFyYW1ldGVycykpIHsKKyAg ICAgICAgV0VCTE9BREVSU1RSQVRFR1lfUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVM b2FkOiBVUkwgd2lsbCBiZSBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MiKTsKICAg ICAgICAgc2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKHJlc291cmNlTG9hZGVyLCByZXNv dXJjZUxvYWRlci5yZXF1ZXN0KCksIHRyYWNraW5nUGFyYW1ldGVycywgc2hvdWxkQ2xlYXJSZWZl cnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgbWF4aW11bUJ1ZmZlcmluZ1RpbWUocmVzb3VyY2Up KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJz Y2hlZHVsZUxvYWQ6IFVSTCBub3QgaGFuZGxlZCBieSBhbnkgaGFuZGxlcnMgKGZyYW1lPSVwLCB3 ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIg UFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBh Z2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBp ZGVudGlmaWVyKTsKKworICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInNjaGVkdWxlTG9hZDogVVJMIG5vdCBoYW5kbGVkIGJ5IGFueSBoYW5kbGVycyIpOwogfQog Ci1ib29sIFdlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVy KFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlcikKK2Jvb2wgV2ViTG9hZGVyU3RyYXRlZ3k6 OnRyeUxvYWRpbmdVc2luZ1VSTFNjaGVtZUhhbmRsZXIoUmVzb3VyY2VMb2FkZXImIHJlc291cmNl TG9hZGVyLCBjb25zdCBXZWJSZXNvdXJjZUxvYWRlcjo6VHJhY2tpbmdQYXJhbWV0ZXJzJiB0cmFj a2luZ1BhcmFtZXRlcnMpCiB7CiAgICAgYXV0byogd2ViRnJhbWVMb2FkZXJDbGllbnQgPSB0b1dl YkZyYW1lTG9hZGVyQ2xpZW50KHJlc291cmNlTG9hZGVyLmZyYW1lTG9hZGVyKCktPmNsaWVudCgp KTsKICAgICBhdXRvKiB3ZWJGcmFtZSA9IHdlYkZyYW1lTG9hZGVyQ2xpZW50ID8gd2ViRnJhbWVM b2FkZXJDbGllbnQtPndlYkZyYW1lKCkgOiBudWxscHRyOwpAQCAtMjMwLDcgKzI0NCw3IEBAIGJv b2wgV2ViTG9hZGVyU3RyYXRlZ3k6OnRyeUxvYWRpbmdVc2luZ1VSTFNjaGVtZUhhbmRsZXIoUmVz b3VyY2VMb2FkZXImIHJlc291cmNlCiAgICAgaWYgKHdlYlBhZ2UpIHsKICAgICAgICAgaWYgKGF1 dG8qIGhhbmRsZXIgPSB3ZWJQYWdlLT51cmxTY2hlbWVIYW5kbGVyRm9yU2NoZW1lKHJlc291cmNl TG9hZGVyLnJlcXVlc3QoKS51cmwoKS5wcm90b2NvbCgpLnRvU3RyaW5nV2l0aG91dENvcHlpbmco KSkpIHsKICAgICAgICAgICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQcm9jZXNzKSBX ZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkLCBVUkwgJyVzJyB3aWxsIGJlIGhhbmRsZWQg YnkgYSBVSVByb2Nlc3MgVVJMIHNjaGVtZSBoYW5kbGVyLiIsIHJlc291cmNlTG9hZGVyLnVybCgp LnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGJ5IGEgVUlQcm9jZXNzIFVS TCBzY2hlbWUgaGFuZGxlciAoZnJhbWU9JXAsIHJlc291cmNlSUQ9JWx1KSIsIHJlc291cmNlTG9h ZGVyLmZyYW1lKCksIHJlc291cmNlTG9hZGVyLmlkZW50aWZpZXIoKSk7CisgICAgICAgICAgICBX RUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJ0cnlMb2FkaW5nVXNpbmdV UkxTY2hlbWVIYW5kbGVyOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGJ5IGEgVUlQcm9jZXNzIFVSTCBz Y2hlbWUgaGFuZGxlciIpOwogCiAgICAgICAgICAgICBoYW5kbGVyLT5zdGFydE5ld1Rhc2socmVz b3VyY2VMb2FkZXIpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zMjEsNyArMzM1LDcg QEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNz KFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKICAgICBpZiAobG9hZFBhcmFtZXRlcnMub3B0aW9u cy5tb2RlICE9IEZldGNoT3B0aW9uczo6TW9kZTo6TmF2aWdhdGUpIHsKICAgICAgICAgQVNTRVJU KGxvYWRQYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbik7CiAgICAgICAgIGlmICghbG9hZFBhcmFtZXRl cnMuc291cmNlT3JpZ2luKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExP V0VEKCJzY2hlZHVsZUxvYWQ6IG5vIHNvdXJjZU9yaWdpbiAoZnJhbWU9JXAsIHByaW9yaXR5PSVk LCB3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9 JSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgc3RhdGljX2Nhc3Q8aW50Pihy ZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkucHJpb3JpdHkoKSksIGxvYWRQYXJhbWV0ZXJzLndlYlBh Z2VJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy53ZWJGcmFtZUlELnRvVUludDY0KCksIGxv YWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIpOworICAgICAgICAgICAgV0VCTE9BREVSU1RSQVRFR1lf UkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBubyBzb3VyY2VPcmln aW4gKHByaW9yaXR5PSVkKSIsIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIucmVxdWVz dCgpLnByaW9yaXR5KCkpKTsKICAgICAgICAgICAgIHNjaGVkdWxlSW50ZXJuYWxseUZhaWxlZExv YWQocmVzb3VyY2VMb2FkZXIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0z NDQsOSArMzU4LDkgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5l dHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKIAogICAgIEFTU0VSVCgobG9h ZFBhcmFtZXRlcnMud2ViUGFnZUlEICYmIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQpIHx8IGxv YWRQYXJhbWV0ZXJzLmNsaWVudENyZWRlbnRpYWxQb2xpY3kgPT0gQ2xpZW50Q3JlZGVudGlhbFBv bGljeTo6Q2Fubm90QXNrQ2xpZW50Rm9yQ3JlZGVudGlhbHMpOwogCi0gICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBSZXNvdXJjZSBpcyBiZWluZyBzY2hlZHVsZWQgd2l0 aCB0aGUgTmV0d29ya1Byb2Nlc3MgKGZyYW1lPSVwLCBwcmlvcml0eT0lZCwgd2ViUGFnZUlEPSUi IFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIs IHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIu cmVxdWVzdCgpLnByaW9yaXR5KCkpLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQo KSwgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5p ZGVudGlmaWVyKTsKKyAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPR19JRl9BTExPV0VE KCJzY2hlZHVsZUxvYWQ6IFJlc291cmNlIGlzIGJlaW5nIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3 b3JrUHJvY2VzcyAocHJpb3JpdHk9JWQpIiwgc3RhdGljX2Nhc3Q8aW50PihyZXNvdXJjZUxvYWRl ci5yZXF1ZXN0KCkucHJpb3JpdHkoKSkpOwogICAgIGlmICghV2ViUHJvY2Vzczo6c2luZ2xldG9u KCkuZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVz c2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpTY2hlZHVsZVJlc291cmNlTG9h ZChsb2FkUGFyYW1ldGVycyksIDApKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FM TE9XRUQoInNjaGVkdWxlTG9hZDogVW5hYmxlIHRvIHNjaGVkdWxlIHJlc291cmNlIHdpdGggdGhl IE5ldHdvcmtQcm9jZXNzIChmcmFtZT0lcCwgcHJpb3JpdHk9JWQsIHdlYlBhZ2VJRD0lIiBQUkl1 NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCByZXNv dXJjZUxvYWRlci5mcmFtZSgpLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNlTG9hZGVyLnJlcXVl c3QoKS5wcmlvcml0eSgpKSwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0KCksIGxv YWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRp Zmllcik7CisgICAgICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FM TE9XRUQoInNjaGVkdWxlTG9hZDogVW5hYmxlIHRvIHNjaGVkdWxlIHJlc291cmNlIHdpdGggdGhl IE5ldHdvcmtQcm9jZXNzIChwcmlvcml0eT0lZCkiLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNl TG9hZGVyLnJlcXVlc3QoKS5wcmlvcml0eSgpKSk7CiAgICAgICAgIC8vIFdlIHByb2JhYmx5IGZh aWxlZCB0byBzY2hlZHVsZSB0aGlzIGxvYWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MgYmVjYXVz ZSBpdCBoYWQgY3Jhc2hlZC4KICAgICAgICAgLy8gVGhpcyBsb2FkIHdpbGwgbmV2ZXIgc3VjY2Vl ZCBzbyB3ZSB3aWxsIHNjaGVkdWxlIGl0IHRvIGZhaWwgYXN5bmNocm9ub3VzbHkuCiAgICAgICAg IHNjaGVkdWxlSW50ZXJuYWxseUZhaWxlZExvYWQocmVzb3VyY2VMb2FkZXIpOwpAQCAtNDU3LDcg KzQ3MSw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnJlc3VtZVBlbmRpbmdSZXF1ZXN0cygp CiAKIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgpCiB7Ci0g ICAgUkVMRUFTRV9MT0dfRVJST1IoTmV0d29yaywgIldlYkxvYWRlclN0cmF0ZWd5OjpuZXR3b3Jr UHJvY2Vzc0NyYXNoZWQ6IGZhaWxpbmcgYWxsIHBlbmRpbmcgcmVzb3VyY2UgbG9hZGVycyIpOwor ICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoIm5ldHdvcmtQcm9jZXNzQ3Jhc2hlZDog ZmFpbGluZyBhbGwgcGVuZGluZyByZXNvdXJjZSBsb2FkZXJzIik7CiAKICAgICBmb3IgKGF1dG8m IGxvYWRlciA6IG1fd2ViUmVzb3VyY2VMb2FkZXJzLnZhbHVlcygpKSB7CiAgICAgICAgIHNjaGVk dWxlSW50ZXJuYWxseUZhaWxlZExvYWQoKmxvYWRlci0+cmVzb3VyY2VMb2FkZXIoKSk7CkBAIC01 MTQsMTUgKzUyOCwyMCBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2VTeW5j aHJvbm91c2x5KEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgdW5zaQogICAgIGF1dG8gcGFnZUlE ID0gd2ViUGFnZSA/IHdlYlBhZ2UtPmlkZW50aWZpZXIoKSA6IFBhZ2VJZGVudGlmaWVyIHsgfTsK ICAgICBhdXRvIGZyYW1lSUQgPSB3ZWJGcmFtZSA/IHdlYkZyYW1lLT5mcmFtZUlEKCkgOiBGcmFt ZUlkZW50aWZpZXIgeyB9OwogCisgICAgV2ViUmVzb3VyY2VMb2FkZXI6OlRyYWNraW5nUGFyYW1l dGVycyB0cmFja2luZ1BhcmFtZXRlcnM7CisgICAgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCA9 IHBhZ2VJRDsKKyAgICB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRCA9IGZyYW1lSUQ7CisgICAg dHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQgPSByZXNvdXJjZUxvYWRJZGVudGlmaWVyOwor CiAgICAgYXV0byogZG9jdW1lbnQgPSBmcmFtZUxvYWRlci5mcmFtZSgpLmRvY3VtZW50KCk7CiAg ICAgaWYgKCFkb2N1bWVudCkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VE KCJsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBubyBkb2N1bWVudCAod2ViUGFnZUlEPSUiIFBS SXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSVsdSkiLCBwYWdlSUQudG9V SW50NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCByZXNvdXJjZUxvYWRJZGVudGlmaWVyKTsKKyAg ICAgICAgV0VCTE9BREVSU1RSQVRFR1lfV0lUSF9GUkFNRUxPQURFUl9SRUxFQVNFX0xPR19FUlJP Ul9JRl9BTExPV0VEKCJsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBubyBkb2N1bWVudCIpOwog ICAgICAgICBlcnJvciA9IGludGVybmFsRXJyb3IocmVxdWVzdC51cmwoKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKICAgICBpZiAoYXV0byBzeW5jTG9hZFJlc3VsdCA9IHRyeUxvYWRpbmdT eW5jaHJvbm91c2x5VXNpbmdVUkxTY2hlbWVIYW5kbGVyKGZyYW1lTG9hZGVyLCByZXNvdXJjZUxv YWRJZGVudGlmaWVyLCByZXF1ZXN0KSkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9B TExPV0VEKCJsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBmYWlsZWQgY2FsbGluZyB0cnlMb2Fk aW5nU3luY2hyb25vdXNseVVzaW5nVVJMU2NoZW1lSGFuZGxlciAod2ViUGFnZUlEPSUiIFBSSXU2 NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSVsdSwgZXJyb3I9JWQpIiwgcGFn ZUlELnRvVUludDY0KCksIGZyYW1lSUQudG9VSW50NjQoKSwgcmVzb3VyY2VMb2FkSWRlbnRpZmll ciwgc3luY0xvYWRSZXN1bHQtPmVycm9yLmVycm9yQ29kZSgpKTsKKyAgICAgICAgV0VCTE9BREVS U1RSQVRFR1lfV0lUSF9GUkFNRUxPQURFUl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJs b2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBmYWlsZWQgY2FsbGluZyB0cnlMb2FkaW5nU3luY2hy b25vdXNseVVzaW5nVVJMU2NoZW1lSGFuZGxlciAoZXJyb3I9JWQpIiwgc3luY0xvYWRSZXN1bHQt PmVycm9yLmVycm9yQ29kZSgpKTsKICAgICAgICAgZXJyb3IgPSBXVEZNb3ZlKHN5bmNMb2FkUmVz dWx0LT5lcnJvcik7CiAgICAgICAgIHJlc3BvbnNlID0gV1RGTW92ZShzeW5jTG9hZFJlc3VsdC0+ cmVzcG9uc2UpOwogICAgICAgICBkYXRhID0gV1RGTW92ZShzeW5jTG9hZFJlc3VsdC0+ZGF0YSk7 CkBAIC01NjUsNyArNTg0LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNl U3luY2hyb25vdXNseShGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIsIHVuc2kKICAgICAgICAgV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNz YWdlczo6V2ViUHJvY2Vzc1Bvb2w6OlNldFdlYlByb2Nlc3NIYXNVcGxvYWRzIHsgUHJvY2Vzczo6 aWRlbnRpZmllcigpIH0sIDApOwogCiAgICAgaWYgKCFXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5l bnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZFN5bmMoTWVz c2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNM b2FkKGxvYWRQYXJhbWV0ZXJzKSwgTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpSZXBseShlcnJvciwgcmVzcG9uc2UsIGRhdGEp LCAwKSkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJsb2FkUmVzb3Vy Y2VTeW5jaHJvbm91c2x5OiBmYWlsZWQgc2VuZGluZyBzeW5jaHJvbm91cyBuZXR3b3JrIHByb2Nl c3MgbWVzc2FnZSAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBy ZXNvdXJjZUlEPSVsdSkiLCBwYWdlSUQudG9VSW50NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCBy ZXNvdXJjZUxvYWRJZGVudGlmaWVyKTsKKyAgICAgICAgV0VCTE9BREVSU1RSQVRFR1lfV0lUSF9G UkFNRUxPQURFUl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJsb2FkUmVzb3VyY2VTeW5j aHJvbm91c2x5OiBmYWlsZWQgc2VuZGluZyBzeW5jaHJvbm91cyBuZXR3b3JrIHByb2Nlc3MgbWVz c2FnZSIpOwogICAgICAgICBpZiAoYXV0byogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5jb3Jl UGFnZSgpIDogbnVsbHB0cikKICAgICAgICAgICAgIHBhZ2UtPmRpYWdub3N0aWNMb2dnaW5nQ2xp ZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2UoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlz OjppbnRlcm5hbEVycm9yS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6c3lu Y2hyb25vdXNNZXNzYWdlRmFpbGVkS2V5KCksIFdlYkNvcmU6OlNob3VsZFNhbXBsZTo6Tm8pOwog ICAgICAgICByZXNwb25zZSA9IFJlc291cmNlUmVzcG9uc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmggYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCmluZGV4IGY0ZDVh M2Y4MDY1OWFlNzdmOTdlNjEzYmQ0OTJjYTQ5ODFhYzk4YzUuLjlhNzhhNWZlMjRkYTc4YjM0ZWJl ZmE3ODVhMDdiNTA0OWJhNDczYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaApAQCAtOTMsNyArOTMsNyBAQCBwcml2YXRl OgogICAgIHZvaWQgc2NoZWR1bGVJbnRlcm5hbGx5RmFpbGVkTG9hZChXZWJDb3JlOjpSZXNvdXJj ZUxvYWRlciYpOwogICAgIHZvaWQgaW50ZXJuYWxseUZhaWxlZExvYWRUaW1lckZpcmVkKCk7CiAg ICAgdm9pZCBzdGFydExvY2FsTG9hZChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlciYpOwotICAgIGJv b2wgdHJ5TG9hZGluZ1VzaW5nVVJMU2NoZW1lSGFuZGxlcihXZWJDb3JlOjpSZXNvdXJjZUxvYWRl ciYpOworICAgIGJvb2wgdHJ5TG9hZGluZ1VzaW5nVVJMU2NoZW1lSGFuZGxlcihXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlciYsIGNvbnN0IFdlYlJlc291cmNlTG9hZGVyOjpUcmFja2luZ1BhcmFtZXRl cnMmKTsKICAgICAKICAgICBzdHJ1Y3QgU3luY0xvYWRSZXN1bHQgewogICAgICAgICBXZWJDb3Jl OjpSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOwo=