159404 2016-07-04 04:15:36 -0700 Remove CredentialRequest ResourceLoaderOptions 2016-07-05 00:59:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 151937 1 youennf youennf achristensen commit-queue dbates oldest_to_newest 1207646 0 youennf 2016-07-04 04:15:36 -0700 CredentialRequest is only used by DocumentThreadableLoader to disable credential sending in case of cross-origin redirection. This is handled by FetchOptions::Credentials::SameOrigin. 1207647 1 youennf 2016-07-04 04:16:37 -0700 Note that ultimately, all credential-related ResourceLoaderOptions should probably be removed except for FetchOptions::Credentials. 1207652 2 282706 youennf 2016-07-04 04:44:09 -0700 Created attachment 282706 Patch 1207765 3 282754 youennf 2016-07-05 00:30:48 -0700 Created attachment 282754 Patch for landing 1207769 4 282754 commit-queue 2016-07-05 00:59:53 -0700 Comment on attachment 282754 Patch for landing Clearing flags on attachment: 282754 Committed r202815: <http://trac.webkit.org/changeset/202815> 1207770 5 commit-queue 2016-07-05 00:59:57 -0700 All reviewed patches have been landed. Closing bug. 282706 2016-07-04 04:44:09 -0700 2016-07-05 00:30:41 -0700 Patch bug-159404-20160704134340.patch text/plain 25698 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QwYTM5MzRmYTY1MzA1 OTk5ZDRhOThlZGU4YTY5MzhmMTlhNjZkYi4uY2MxMmU4ZjE4MTllYmEzYzgzNTA0MjcxN2E1MGUx Yjk4OWEwMjllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE2LTA3LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgQ3JlZGVudGlh bFJlcXVlc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBvYnNlcnZhYmxlIGNoYW5nZSBvZiBiZWhhdmlvci4K KyAgICAgICAgUmVtb3ZpbmcgQ3JlZGVudGlhbFJlcXVlc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25z IGFuZCByZXBsYWNlIGl0IGJ5IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHMuCisgICAgICAgIEFz IHBlciBodHRwczovL2ZldGNoLnNwZWMud2hhdHdnLm9yZy8jaHR0cC1mZXRjaCwgY3JlZGVudGlh bHMgZmxhZyBpcyBzZXQgYWNjb3JkaW5nIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHMuCisKKyAg ICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSk6IFNldCBjcmVkZW50aWFscyBt b2RlIHRvIEluY2x1ZGUuCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnJlZGly ZWN0UmVjZWl2ZWQpOiBEaXNhYmxlIGNyZWRlbnRpYWxzIGlmIGNyZWRlbnRpYWxzIG1vZGUgaXMg U2FtZU9yaWdpbgorICAgICAgICAocmVxdWVzdCBiZWluZyBjcm9zcyBvcmlnaW4pLgorICAgICAg ICAqIGxvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcDogUmVmcWN0b3JpbmcgdG8gdXNlIENh Y2hlZFJlc291cmNlUmVhdWVzdDo6c2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luLgorICAgICAg ICBSZW1vdmVkIHVubmVjZXNzYXJ5IFJlc291cmNlUmVxdWVzdCBjb3B5IGJ5IHVzaW5nIHRoZSBt dXRhYmxlIHJlcXVlc3Qgb2YgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKiBsb2Fk ZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0 c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyKTogU2V0 IGNyZWRlbnRpYWwgbW9kZSAgdG8gSW5jbHVkZQorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxv YWRlck9wdGlvbnMuaDogUmVtb3ZpbmcgQ3JlZGVudGlhbFJlcXVlc3Qgb3B0aW9uLgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJPcHRpb25zOjpSZXNvdXJjZUxvYWRlck9wdGlvbnMp OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJPcHRpb25zOjpjcmVkZW50aWFsUmVx dWVzdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6 OnNldENyZWRlbnRpYWxSZXF1ZXN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3Vy Y2VMb2FkZXI6OnJlcXVlc3RVc2VyQ1NTU3R5bGVTaGVldCk6IFNldCBjcmVkZW50aWFsIG1vZGUg dG8gSW5jbHVkZS4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpkZWZh dWx0Q2FjaGVkUmVzb3VyY2VPcHRpb25zKTogRGl0dG8uCisgICAgICAgICogbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNv dXJjZVJlcXVlc3Q6OnNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbik6IFNldCBjcmVkZW50aWFs IG1vZGUgYWNjb3JkaW5nIGNyb3Nzb3JpZ2luCisgICAgICAgIGF0cmlidXRlIHZhbHVlLgorICAg ICAgICAqIGxvYWRlci9pY29uL0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNv bkxvYWRlcjo6c3RhcnRMb2FkaW5nKTogU2V0IGNyZWRlbnRpYWwgbW9kZSB0byBPbWl0LgorICAg ICAgICAqIHBhZ2UvRXZlbnRTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRTb3Vy Y2U6OmNvbm5lY3QpOiBTZXQgY3JlZGVudGlhbCBtb2RlIGFjY29yZGluZyBjcm9zc29yaWdpbiBh dHJpYnV0ZSB2YWx1ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v Y2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJD b3JlQVZDRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOiBTZXQgY3JlZGVudGlhbCBtb2Rl IHRvIE9taXQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFW RlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMuaDogUmVtb3ZlZCBkZWZpbml0aW9uIG9mIENy ZWRlbnRpYWxSZXF1ZXN0LgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdCk6IFNldCBjcmVkZW50 aWFsIG1vZGUgYWNjb3JkaW5nIGNyb3Nzb3JpZ2luIGF0cmlidXRlIHZhbHVlLgorCiAyMDE2LTA3 LTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTeW5jaHJv bm91cyBwcmVmbGlnaHQgY2hlY2tlciBzaG91bGQgc2V0IGxvYWRpbmcgb3B0aW9ucyB0byBub3Qg dXNlIGNyZWRlbnRpYWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApp bmRleCAzMmEwNWViYjNmNjUxYmEwYTQ0NGE4MDAxNTFmNzcyN2UwOGEyNTdlLi4zM2RiYWNmMTBl NTg5MWRmMTc3YzU4MjU2MTZhZmM0YzY0YTIzZjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5jcHAKQEAgLTE1MTAsNyArMTUxMCw3IEBAIHZvaWQgRG9jdW1lbnRMb2Fk ZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpCiAgICAgLy8gSWYgdGhpcyBpcyBhIHJlbG9h ZCB0aGUgY2FjaGUgbGF5ZXIgbWlnaHQgaGF2ZSBtYWRlIHRoZSBwcmV2aW91cyByZXF1ZXN0IGNv bmRpdGlvbmFsLiBEb2N1bWVudExvYWRlciBjYW4ndCBoYW5kbGUgMzA0IHJlc3BvbnNlcyBpdHNl bGYuCiAgICAgcmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwogCi0gICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPFJlc291cmNlTG9hZGVyT3B0aW9ucz4gbWFpblJlc291cmNlTG9hZE9wdGlvbnMo U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRl bnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVu dGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9y VHlwZSwgSW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3Np dGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2Fk aW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpOworICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxSZXNvdXJjZUxvYWRlck9wdGlvbnM+IG1haW5SZXNvdXJjZUxvYWRPcHRpb25zKFNlbmRD YWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFs cywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6 OkluY2x1ZGUsIFNraXBTZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25z Rm9yVHlwZSwgSW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1w b3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNM b2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpOwogICAgIENhY2hlZFJlc291cmNl UmVxdWVzdCBjYWNoZWRSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCwgbWFpblJlc291cmNlTG9hZE9w dGlvbnMpOwogICAgIGNhY2hlZFJlc291cmNlUmVxdWVzdC5zZXRJbml0aWF0b3IoKnRoaXMpOwog ICAgIG1fbWFpblJlc291cmNlID0gbV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+cmVxdWVzdE1haW5S ZXNvdXJjZShjYWNoZWRSZXNvdXJjZVJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcAppbmRleCBjZTQyMzY1NWU1MjY0ZWY4 ODE0OTA1OGExZGIxNDMxNTgwYWE1ZjJhLi5iYjczNmQxYTQ0NWNlZDMyMmIyMmIzYzVjNzgxM2My M2EyNDVkYzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyLmNwcApAQCAtMjQ0LDkgKzI0NCw3IEBAIHZvaWQgRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyOjpyZWRpcmVjdFJlY2VpdmVkKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSwgUmVz b3VyCiAgICAgICAgICAgICAvLyBGb3JjZSBhbnkgc3Vic2VxdWVudCByZXF1ZXN0IHRvIHVzZSB0 aGVzZSBjaGVja3MuCiAgICAgICAgICAgICBtX3NhbWVPcmlnaW5SZXF1ZXN0ID0gZmFsc2U7CiAK LSAgICAgICAgICAgIC8vIFNpbmNlIHRoZSByZXF1ZXN0IGlzIG5vIGxvbmdlciBzYW1lLW9yaWdp biwgaWYgdGhlIHVzZXIgZGlkbid0IHJlcXVlc3QgY3JlZGVudGlhbHMgaW4KLSAgICAgICAgICAg IC8vIHRoZSBmaXJzdCBwbGFjZSwgdXBkYXRlIG91ciBzdGF0ZSBzbyB3ZSBuZWl0aGVyIHJlcXVl c3QgdGhlbSBub3IgZXhwZWN0IHRoZXkgbXVzdCBiZSBhbGxvd2VkLgotICAgICAgICAgICAgaWYg KG1fb3B0aW9ucy5jcmVkZW50aWFsUmVxdWVzdCgpID09IENsaWVudERpZE5vdFJlcXVlc3RDcmVk ZW50aWFscykKKyAgICAgICAgICAgIGlmIChtX29wdGlvbnMuY3JlZGVudGlhbHMgPT0gRmV0Y2hP cHRpb25zOjpDcmVkZW50aWFsczo6U2FtZU9yaWdpbikKICAgICAgICAgICAgICAgICBtX29wdGlv bnMuc2V0QWxsb3dDcmVkZW50aWFscyhEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwogCiAg ICAgICAgICAgICBjbGVhblJlZGlyZWN0ZWRSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbChyZXF1ZXN0 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAppbmRl eCBlYzVmYzRiY2I0YzkxYjg4MWE0N2E5Zjk5OGZlNmMzOTI1YWVlZDExLi5kYWVlMGIxMjNhYjdm MzZmZmRiZDRlM2E3ZDYyNjk4Mzk0ZmRlNmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L01lZGlhUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC02MywyNyArNjMsMjEgQEAgUmVmUHRyPFBsYXRm b3JtTWVkaWFSZXNvdXJjZT4gTWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKGNv bnN0IFJlc291cmMKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBEYXRhQnVmZmVyaW5n UG9saWN5IGJ1ZmZlcmluZ1BvbGljeSA9IG9wdGlvbnMgJiBMb2FkT3B0aW9uOjpCdWZmZXJEYXRh ID8gV2ViQ29yZTo6QnVmZmVyRGF0YSA6IFdlYkNvcmU6OkRvTm90QnVmZmVyRGF0YTsKLSAgICBS ZXF1ZXN0T3JpZ2luUG9saWN5IGNvcnNQb2xpY3kgPSAhbV9jcm9zc09yaWdpbk1vZGUuaXNOdWxs KCkgPyBQb3RlbnRpYWxseUNyb3NzT3JpZ2luRW5hYmxlZCA6IFVzZURlZmF1bHRPcmlnaW5SZXN0 cmljdGlvbnNGb3JUeXBlOwogICAgIGF1dG8gY2FjaGluZ1BvbGljeSA9IG9wdGlvbnMgJiBMb2Fk T3B0aW9uOjpEaXNhbGxvd0NhY2hpbmcgPyBDYWNoaW5nUG9saWN5OjpEaXNhbGxvd0NhY2hpbmcg OiBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmc7Ci0gICAgU3RvcmVkQ3JlZGVudGlhbHMgYWxs b3dDcmVkZW50aWFscyA9IG1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpIHx8IGVxdWFsTGV0dGVy c0lnbm9yaW5nQVNDSUlDYXNlKG1fY3Jvc3NPcmlnaW5Nb2RlLCAidXNlLWNyZWRlbnRpYWxzIikg PyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOwog Ci0gICAgYXV0byB1cGRhdGVkUmVxdWVzdCA9IHJlcXVlc3Q7Ci0gICAgdXBkYXRlZFJlcXVlc3Qu c2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpNZWRpYSk7CisgICAgLy8g RklYTUU6IFNraXAgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgY2hlY2sgaWYgdGhlIGVsZW1lbnQg dGhhdCBpbml0aXRhdGVkIHRoaXMgcmVxdWVzdCBpcyBpbiBhIHVzZXItYWdlbnQgc2hhZG93IHRy ZWUuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTUwNT4u CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hlUmVxdWVzdChyZXF1ZXN0LCBSZXNvdXJj ZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIGJ1ZmZlcmlu Z1BvbGljeSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlh bHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OkluY2x1ZGUsIERvU2VjdXJpdHlDaGVjaywg VXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmlj YXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywg RGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBjYWNoaW5nUG9saWN5KSk7 CisKKyAgICBjYWNoZVJlcXVlc3Quc2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKG1fY3Jvc3NP cmlnaW5Nb2RlLCAqbV9kb2N1bWVudCk7CisgICAgY2FjaGVSZXF1ZXN0Lm11dGFibGVSZXNvdXJj ZVJlcXVlc3QoKS5zZXRSZXF1ZXN0ZXIoUmVzb3VyY2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6Ok1lZGlh KTsKICNpZiBIQVZFKEFWRk9VTkRBVElPTl9MT0FERVJfREVMRUdBVEUpICYmIFBMQVRGT1JNKE1B QykKICAgICAvLyBGSVhNRTogV29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzI2MDcxNjA3 Pi4gV2UgYXJlIG5vdCBhYmxlIHRvIGRvIENPUlMgY2hlY2tpbmcgb24gMzA0IHJlc3BvbnNlcyBi ZWNhdXNlIHRoZXkKICAgICAvLyBhcmUgdXN1YWxseSBtaXNzaW5nIHRoZSBoZWFkZXJzIHdlIG5l ZWQuCi0gICAgaWYgKGNvcnNQb2xpY3kgPT0gUG90ZW50aWFsbHlDcm9zc09yaWdpbkVuYWJsZWQp Ci0gICAgICAgIHVwZGF0ZWRSZXF1ZXN0Lm1ha2VVbmNvbmRpdGlvbmFsKCk7CisgICAgaWYgKGNh Y2hlUmVxdWVzdC5vcHRpb25zKCkucmVxdWVzdE9yaWdpblBvbGljeSgpID09IFBvdGVudGlhbGx5 Q3Jvc3NPcmlnaW5FbmFibGVkKQorICAgICAgICBjYWNoZVJlcXVlc3QubXV0YWJsZVJlc291cmNl UmVxdWVzdCgpLm1ha2VVbmNvbmRpdGlvbmFsKCk7CiAjZW5kaWYKIAotICAgIC8vIEZJWE1FOiBT a2lwIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGNoZWNrIGlmIHRoZSBlbGVtZW50IHRoYXQgaW5p dGl0YXRlZCB0aGlzIHJlcXVlc3QKLSAgICAvLyBpcyBpbiBhIHVzZXItYWdlbnQgc2hhZG93IHRy ZWUuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTUwNT4u Ci0gICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hlUmVxdWVzdCh1cGRhdGVkUmVxdWVzdCwg UmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50LCBi dWZmZXJpbmdQb2xpY3ksIGFsbG93Q3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRp YWxzLCBDbGllbnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgY29y c1BvbGljeSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xp Y3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0Rl ZmVyc0xvYWRpbmcsIGNhY2hpbmdQb2xpY3kpKTsKIAotICAgIGlmICghbV9jcm9zc09yaWdpbk1v ZGUuaXNOdWxsKCkpIHsKLSAgICAgICAgQVNTRVJUKG1fZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2lu KCkpOwotICAgICAgICB1cGRhdGVSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbChjYWNoZVJlcXVlc3Qu bXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLCAqbV9kb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwg YWxsb3dDcmVkZW50aWFscyk7Ci0gICAgfQogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hl ZFJhd1Jlc291cmNlPiByZXNvdXJjZSA9IG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVy KCkucmVxdWVzdE1lZGlhKGNhY2hlUmVxdWVzdCk7CiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0 c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNj YXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAppbmRleCAzYTVkYzZiYmNkMWM2NDY5YjU0YmQ0NDhi M2Q0NGI0ZWFmMmMwM2VmLi42MTIxYTU3NDRiODRiMWJjMzYxYTA4ZjhhYjcyOThmNTEzODI0Zjlk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVh bUxvYWRlci5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gRklY TUU6IFNraXAgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgY2hlY2sgd2hlbiBhc3NvY2lhdGVkIHBs dWdpbiBlbGVtZW50IGlzIGluIGEgdXNlciBhZ2VudCBzaGFkb3cgdHJlZS4KIC8vIFNlZSA8aHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjY2Mz4uCiBOZXRzY2FwZVBs dWdJblN0cmVhbUxvYWRlcjo6TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIoRnJhbWUmIGZyYW1l LCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlckNsaWVudCYgY2xpZW50KQotICAgIDogUmVzb3Vy Y2VMb2FkZXIoZnJhbWUsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlm ZkNvbnRlbnQsIERvTm90QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xp ZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBTa2lwU2Vj dXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5j bHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Q b2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNo aW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpKQorICAgIDogUmVzb3VyY2VMb2FkZXIoZnJhbWUsIFJl c291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIERvTm90QnVm ZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlh bHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OkluY2x1ZGUsIFNraXBTZWN1cml0eUNoZWNr LCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlm aWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNr LCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6 OkFsbG93Q2FjaGluZykpCiAgICAgLCBtX2NsaWVudCgmY2xpZW50KQogewogI2lmIEVOQUJMRShD T05URU5UX0VYVEVOU0lPTlMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkZXJPcHRpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk ZXJPcHRpb25zLmgKaW5kZXggODU3ODgzMjE5ZmQyYmYxY2ZlNGJjNTJkZmU5MWEyMjU1NmUxN2Nh MC4uNTIxZWI5MGE5ZmJkNjY1NjFhNGI0ODExZjk0OTQzMjFjNGI0MzUyMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaApAQCAtODgsMjAgKzg4LDE4 IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgOiBwdWJsaWMgRmV0Y2hPcHRpb25zIHsK ICAgICAgICAgLCBtX2RhdGFCdWZmZXJpbmdQb2xpY3koQnVmZmVyRGF0YSkKICAgICAgICAgLCBt X2FsbG93Q3JlZGVudGlhbHMoRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzKQogICAgICAgICAs IG1fY2xpZW50Q3JlZGVudGlhbFBvbGljeShEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxz KQotICAgICAgICAsIG1fY3JlZGVudGlhbFJlcXVlc3QoQ2xpZW50RGlkTm90UmVxdWVzdENyZWRl bnRpYWxzKQogICAgICAgICAsIG1fc2VjdXJpdHlDaGVjayhEb1NlY3VyaXR5Q2hlY2spCiAgICAg ICAgICwgbV9yZXF1ZXN0T3JpZ2luUG9saWN5KFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNG b3JUeXBlKQogICAgICAgICAsIG1fY2VydGlmaWNhdGVJbmZvUG9saWN5KERvTm90SW5jbHVkZUNl cnRpZmljYXRlSW5mbykKICAgICB7CiAgICAgfQogCi0gICAgUmVzb3VyY2VMb2FkZXJPcHRpb25z KFNlbmRDYWxsYmFja1BvbGljeSBzZW5kTG9hZENhbGxiYWNrcywgQ29udGVudFNuaWZmaW5nUG9s aWN5IHNuaWZmQ29udGVudCwgRGF0YUJ1ZmZlcmluZ1BvbGljeSBkYXRhQnVmZmVyaW5nUG9saWN5 LCBTdG9yZWRDcmVkZW50aWFscyBhbGxvd0NyZWRlbnRpYWxzLCBDbGllbnRDcmVkZW50aWFsUG9s aWN5IGNyZWRlbnRpYWxQb2xpY3ksIENyZWRlbnRpYWxSZXF1ZXN0IGNyZWRlbnRpYWxSZXF1ZXN0 LCBTZWN1cml0eUNoZWNrUG9saWN5IHNlY3VyaXR5Q2hlY2ssIFJlcXVlc3RPcmlnaW5Qb2xpY3kg cmVxdWVzdE9yaWdpblBvbGljeSwgQ2VydGlmaWNhdGVJbmZvUG9saWN5IGNlcnRpZmljYXRlSW5m b1BvbGljeSwgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiBjb250ZW50U2VjdXJpdHlQ b2xpY3lJbXBvc2l0aW9uLCBEZWZlcnNMb2FkaW5nUG9saWN5IGRlZmVyc0xvYWRpbmdQb2xpY3ks IENhY2hpbmdQb2xpY3kgY2FjaGluZ1BvbGljeSkKKyAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMo U2VuZENhbGxiYWNrUG9saWN5IHNlbmRMb2FkQ2FsbGJhY2tzLCBDb250ZW50U25pZmZpbmdQb2xp Y3kgc25pZmZDb250ZW50LCBEYXRhQnVmZmVyaW5nUG9saWN5IGRhdGFCdWZmZXJpbmdQb2xpY3ks IFN0b3JlZENyZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMsIENsaWVudENyZWRlbnRpYWxQb2xp Y3kgY3JlZGVudGlhbFBvbGljeSwgRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFscyBjcmVkZW50aWFs cywgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNrLCBSZXF1ZXN0T3JpZ2luUG9saWN5 IHJlcXVlc3RPcmlnaW5Qb2xpY3ksIENlcnRpZmljYXRlSW5mb1BvbGljeSBjZXJ0aWZpY2F0ZUlu Zm9Qb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24gY29udGVudFNlY3VyaXR5 UG9saWN5SW1wb3NpdGlvbiwgRGVmZXJzTG9hZGluZ1BvbGljeSBkZWZlcnNMb2FkaW5nUG9saWN5 LCBDYWNoaW5nUG9saWN5IGNhY2hpbmdQb2xpY3kpCiAgICAgICAgIDogbV9zZW5kTG9hZENhbGxi YWNrcyhzZW5kTG9hZENhbGxiYWNrcykKICAgICAgICAgLCBtX3NuaWZmQ29udGVudChzbmlmZkNv bnRlbnQpCiAgICAgICAgICwgbV9kYXRhQnVmZmVyaW5nUG9saWN5KGRhdGFCdWZmZXJpbmdQb2xp Y3kpCiAgICAgICAgICwgbV9hbGxvd0NyZWRlbnRpYWxzKGFsbG93Q3JlZGVudGlhbHMpCiAgICAg ICAgICwgbV9jbGllbnRDcmVkZW50aWFsUG9saWN5KGNyZWRlbnRpYWxQb2xpY3kpCi0gICAgICAg ICwgbV9jcmVkZW50aWFsUmVxdWVzdChjcmVkZW50aWFsUmVxdWVzdCkKICAgICAgICAgLCBtX3Nl Y3VyaXR5Q2hlY2soc2VjdXJpdHlDaGVjaykKICAgICAgICAgLCBtX3JlcXVlc3RPcmlnaW5Qb2xp Y3kocmVxdWVzdE9yaWdpblBvbGljeSkKICAgICAgICAgLCBtX2NlcnRpZmljYXRlSW5mb1BvbGlj eShjZXJ0aWZpY2F0ZUluZm9Qb2xpY3kpCkBAIC0xMDksNiArMTA3LDcgQEAgc3RydWN0IFJlc291 cmNlTG9hZGVyT3B0aW9ucyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgICAgICAsIG1fZGVm ZXJzTG9hZGluZ1BvbGljeShkZWZlcnNMb2FkaW5nUG9saWN5KQogICAgICAgICAsIG1fY2FjaGlu Z1BvbGljeShjYWNoaW5nUG9saWN5KQogICAgIHsKKyAgICAgICAgdGhpcy0+Y3JlZGVudGlhbHMg PSBjcmVkZW50aWFsczsKICAgICB9CiAKICAgICBTZW5kQ2FsbGJhY2tQb2xpY3kgc2VuZExvYWRD YWxsYmFja3MoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxTZW5kQ2FsbGJhY2tQb2xpY3k+ KG1fc2VuZExvYWRDYWxsYmFja3MpOyB9CkBAIC0xMjEsOCArMTIwLDYgQEAgc3RydWN0IFJlc291 cmNlTG9hZGVyT3B0aW9ucyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgIHZvaWQgc2V0QWxs b3dDcmVkZW50aWFscyhTdG9yZWRDcmVkZW50aWFscyBhbGxvdykgeyBtX2FsbG93Q3JlZGVudGlh bHMgPSBhbGxvdzsgfQogICAgIENsaWVudENyZWRlbnRpYWxQb2xpY3kgY2xpZW50Q3JlZGVudGlh bFBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PENsaWVudENyZWRlbnRpYWxQb2xp Y3k+KG1fY2xpZW50Q3JlZGVudGlhbFBvbGljeSk7IH0KICAgICB2b2lkIHNldENsaWVudENyZWRl bnRpYWxQb2xpY3koQ2xpZW50Q3JlZGVudGlhbFBvbGljeSBwb2xpY3kpIHsgbV9jbGllbnRDcmVk ZW50aWFsUG9saWN5ID0gcG9saWN5OyB9Ci0gICAgQ3JlZGVudGlhbFJlcXVlc3QgY3JlZGVudGlh bFJlcXVlc3QoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxDcmVkZW50aWFsUmVxdWVzdD4obV9jcmVk ZW50aWFsUmVxdWVzdCk7IH0KLSAgICB2b2lkIHNldENyZWRlbnRpYWxSZXF1ZXN0KENyZWRlbnRp YWxSZXF1ZXN0IGNyZWRlbnRpYWxSZXF1ZXN0KSB7IG1fY3JlZGVudGlhbFJlcXVlc3QgPSBjcmVk ZW50aWFsUmVxdWVzdDsgfQogICAgIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVjaygp IGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFNlY3VyaXR5Q2hlY2tQb2xpY3k+KG1fc2VjdXJp dHlDaGVjayk7IH0KICAgICB2b2lkIHNldFNlY3VyaXR5Q2hlY2soU2VjdXJpdHlDaGVja1BvbGlj eSBjaGVjaykgeyBtX3NlY3VyaXR5Q2hlY2sgPSBjaGVjazsgfQogICAgIFJlcXVlc3RPcmlnaW5Q b2xpY3kgcmVxdWVzdE9yaWdpblBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFJl cXVlc3RPcmlnaW5Qb2xpY3k+KG1fcmVxdWVzdE9yaWdpblBvbGljeSk7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4 IDc3ZTY0MzdmYmZlMzUwMTE1OTQ3MjI4NTgzOWRkOGVjNjM2NzZlZTUuLmY4Y2UzNTRhMjVkNjgw NTY3NzA0NmFkYWM1NWZlZmFjYzUxOGZiYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtMjQxLDcgKzI0MSw3IEBA IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZENTU1N0eWxlU2hlZXQ+IENhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0VXNlckNTU1N0CiAgICAgICAgIG1lbW9yeUNhY2hlLmFkZCgqdXNlclNo ZWV0KTsKICAgICAvLyBGSVhNRTogbG9hZFJlc291cmNlIGNhbGxzIHNldE93bmluZ0NhY2hlZFJl c291cmNlTG9hZGVyKCkgaWYgdGhlIHJlc291cmNlIGNvdWxkbid0IGJlIGFkZGVkIHRvIGNhY2hl LiBEb2VzIHRoaXMgZnVuY3Rpb24gbmVlZCB0byBjYWxsIGl0LCB0b28/CiAKLSAgICB1c2VyU2hl ZXQtPmxvYWQoKnRoaXMsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhEb05vdFNlbmRDYWxsYmFja3Ms IFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xp ZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBTa2lwU2Vj dXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5j bHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6U2tp cFBvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENh Y2hpbmdQb2xpY3k6OkFsbG93Q2FjaGluZykpOworICAgIHVzZXJTaGVldC0+bG9hZCgqdGhpcywg UmVzb3VyY2VMb2FkZXJPcHRpb25zKERvTm90U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBC dWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50 aWFscywgRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6SW5jbHVkZSwgU2tpcFNlY3VyaXR5Q2hl Y2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0 aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OlNraXBQb2xpY3lD aGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9s aWN5OjpBbGxvd0NhY2hpbmcpKTsKICAgICAKICAgICByZXR1cm4gdXNlclNoZWV0OwogfQpAQCAt MTE5MCw3ICsxMTkwLDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cHJpbnRQcmVsb2Fk U3RhdHMoKQogCiBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmIENhY2hlZFJlc291cmNlTG9h ZGVyOjpkZWZhdWx0Q2FjaGVkUmVzb3VyY2VPcHRpb25zKCkKIHsKLSAgICBzdGF0aWMgUmVzb3Vy Y2VMb2FkZXJPcHRpb25zIG9wdGlvbnMoU2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZm ZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFs cywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVs dE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywg Q29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9h ZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hp bmcpOworICAgIHN0YXRpYyBSZXNvdXJjZUxvYWRlck9wdGlvbnMgb3B0aW9ucyhTZW5kQ2FsbGJh Y2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFz a0NsaWVudEZvckFsbENyZWRlbnRpYWxzLCBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpJbmNs dWRlLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBl LCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9z aXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9h ZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNoaW5nKTsKICAgICByZXR1cm4gb3B0aW9uczsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0LmNwcAppbmRleCAxZDI1NWJjZmQ2YjJlOTU3MWE0MGE0M2E5MTVhMTI5YzA4ZDgz YWU2Li5lZjY3MDE1ZmM0MGFmYTc3NjgyM2Y0OGYzNzgyMGUwYjhiNjU1NDhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNw cApAQCAtOTUsOSArOTUsMTEgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBDYWNoZWRSZXNvdXJjZVJl cXVlc3Q6OmluaXRpYXRvck5hbWUoKSBjb25zdAogCiB2b2lkIENhY2hlZFJlc291cmNlUmVxdWVz dDo6c2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKGNvbnN0IFN0cmluZyYgbW9kZSwgRG9jdW1l bnQmIGRvY3VtZW50KQogeworICAgIEFTU0VSVChtX29wdGlvbnMucmVxdWVzdE9yaWdpblBvbGlj eSgpID09IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlKTsKICAgICBpZiAobW9k ZS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fb3B0aW9ucy5zZXRSZXF1ZXN0T3Jp Z2luUG9saWN5KFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkKTsKKyAgICBtX29wdGlvbnMu Y3JlZGVudGlhbHMgPSBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShtb2RlLCAidXNlLWNy ZWRlbnRpYWxzIikgPyBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpJbmNsdWRlIDogRmV0Y2hP cHRpb25zOjpDcmVkZW50aWFsczo6U2FtZU9yaWdpbjsKICAgICBtX29wdGlvbnMuc2V0QWxsb3dD cmVkZW50aWFscyhlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShtb2RlLCAidXNlLWNyZWRl bnRpYWxzIikgPyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRl bnRpYWxzKTsKIAogICAgIEFTU0VSVChkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25Mb2FkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKaW5kZXggNGEwZmQyN2M2MDE2ZTc2 YWNiNjA0ZjA5NWViMzNkM2UzNTQ4MzAwNS4uZjE3YWYzZTgxNGNiYjNiNDlmNjg2MWJlOWYwZjc1 ODQ3ZjYwNzllYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAK QEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBJY29uTG9hZGVyOjpzdGFydExvYWRpbmcoKQogICAgICAg ICByZXR1cm47CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1Bv bGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90IGFmZmVjdCB0aGUg cmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5vdCBhcHBseSB0byBy YXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNl UmVxdWVzdChtX2ZyYW1lLmxvYWRlcigpLmljb24oKS51cmwoKSksIFJlc291cmNlTG9hZGVyT3B0 aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIERvTm90QWxsb3dT dG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JBbnlDcmVkZW50aWFscywgQ2xpZW50 RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmln aW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRl bnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQ b2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNoaW5nKSk7 CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KG1fZnJh bWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxs YmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRp YWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzLCBGZXRjaE9wdGlvbnM6OkNyZWRl bnRpYWxzOjpPbWl0LCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlv bnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBv bGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93 RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNoaW5nKSk7CiAKICAgICByZXF1 ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlv cml0eTo6TG93KTsKICAgICByZXF1ZXN0LnNldEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVl c3RJbml0aWF0b3JzKCkuaWNvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50U291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCmluZGV4 IDgwNzgyOTNhOThjZTcwY2VlN2Y0ZTE4NjM1NzQxZTc3NTkwZWIxZWIuLmE3YmY0NTk3Y2U1MGJk ZGY0ZWMzZmU2ZGMwZjBhMDg3Yjc1Y2FjZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2Uu Y3BwCkBAIC0xMDksNyArMTA5LDcgQEAgdm9pZCBFdmVudFNvdXJjZTo6Y29ubmVjdCgpCiAgICAg b3B0aW9ucy5zZXRTZW5kTG9hZENhbGxiYWNrcyhTZW5kQ2FsbGJhY2tzKTsKICAgICBvcHRpb25z LnNldFNuaWZmQ29udGVudChEb05vdFNuaWZmQ29udGVudCk7CiAgICAgb3B0aW9ucy5zZXRBbGxv d0NyZWRlbnRpYWxzKChvcmlnaW4uY2FuUmVxdWVzdChtX3VybCkgfHwgbV93aXRoQ3JlZGVudGlh bHMpID8gQWxsb3dTdG9yZWRDcmVkZW50aWFscyA6IERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFs cyk7Ci0gICAgb3B0aW9ucy5zZXRDcmVkZW50aWFsUmVxdWVzdChtX3dpdGhDcmVkZW50aWFscyA/ IENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzIDogQ2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRp YWxzKTsKKyAgICBvcHRpb25zLmNyZWRlbnRpYWxzID0gbV93aXRoQ3JlZGVudGlhbHMgPyBGZXRj aE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpJbmNsdWRlIDogRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFs czo6U2FtZU9yaWdpbjsKICAgICBvcHRpb25zLnByZWZsaWdodFBvbGljeSA9IFByZXZlbnRQcmVm bGlnaHQ7CiAgICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBVc2VBY2Nlc3ND b250cm9sOwogICAgIG9wdGlvbnMuc2V0RGF0YUJ1ZmZlcmluZ1BvbGljeShEb05vdEJ1ZmZlckRh dGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VMb2Fk ZXIuY3BwCmluZGV4IDY3YzNkNTdjMjg0MzA4MmFmODkyOGY2M2M3YmU3ZTczYTUyZWQ5ODkuLjc2 MTg5YTE2YTk5NDYxMGEyZThjOTk5M2IzYzNhZGU3MGJjYzE3NmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9XZWJDb3JlQVZDRlJl c291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTcxLDcgKzcx LDcgQEAgdm9pZCBXZWJDb3JlQVZDRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcoKQogICAg IFJldGFpblB0cjxDRlVSTFJlcXVlc3RSZWY+IHVybFJlcXVlc3QgPSBBVkNGQXNzZXRSZXNvdXJj ZUxvYWRpbmdSZXF1ZXN0R2V0VVJMUmVxdWVzdChtX2F2UmVxdWVzdC5nZXQoKSk7CiAKICAgICAv LyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxh Y2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250 ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5vdCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAg IENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdCh1cmxSZXF1ZXN0 LmdldCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25pZmZD b250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIERvTm90QXNr Q2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENyZWRl bnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JU eXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUlt cG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJz TG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHVybFJlcXVlc3QuZ2V0KCkpLCBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1 ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JD cm9zc09yaWdpbkNyZWRlbnRpYWxzLCBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0LCBE b1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05v dEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246 OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywg Q2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CiAKICAgICByZXF1ZXN0Lm11dGFibGVS ZXNvdXJjZVJlcXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eTo6TG93KTsK ICAgICBDYWNoZWRSZXNvdXJjZUxvYWRlciogbG9hZGVyID0gbV9wYXJlbnQtPnBsYXllcigpLT5j YWNoZWRSZXNvdXJjZUxvYWRlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2Vi Q29yZUFWRlJlc291cmNlTG9hZGVyLm1tCmluZGV4IDkyNjlmZTFlMDdiMjlmZGIwZGI1ZTQ0OTcw MzkyMTYwOTExMGI1YTUuLjA1YzE4MTRmNWQ4OTg2NjFlYjA2MWM5ZDE3Y2I3Yjg5OWE1MzFhODkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2Fk ZXIubW0KQEAgLTY5LDcgKzY5LDcgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6OnN0 YXJ0TG9hZGluZygpCiAKICAgICAvLyBGSVhNRTogU2tpcCBDb250ZW50IFNlY3VyaXR5IFBvbGlj eSBjaGVjayBpZiB0aGUgZWxlbWVudCB0aGF0IGluaXRpdGF0ZWQgdGhpcyByZXF1ZXN0CiAgICAg Ly8gaXMgaW4gYSB1c2VyLWFnZW50IHNoYWRvdyB0cmVlLiBTZWUgPGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU1MDU+LgotICAgIENhY2hlZFJlc291cmNlUmVxdWVz dCByZXF1ZXN0KG5zUmVxdWVzdCwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3Ms IERvTm90U25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlh bHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90 UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0 cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1 cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6 OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7Cisg ICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobnNSZXF1ZXN0LCBSZXNvdXJjZUxvYWRl ck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIERv Tm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNy ZWRlbnRpYWxzLCBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0LCBEb1NlY3VyaXR5Q2hl Y2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0 aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hl Y2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGlj eTo6RGlzYWxsb3dDYWNoaW5nKSk7CiAgICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0 KCkuc2V0UHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHk6Okxvdyk7CiAgICAgaWYgKGF1dG8q IGxvYWRlciA9IG1fcGFyZW50LT5wbGF5ZXIoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSkKICAg ICAgICAgbV9yZXNvdXJjZSA9IGxvYWRlci0+cmVxdWVzdE1lZGlhKHJlcXVlc3QpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZVR5cGVz LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMu aAppbmRleCA5NWIwOWNkNzcxMDg3M2RiZmE4NTA5NGI0YmE5NzU0M2U1NWZkMTE2Li4wYzMxZjky ZTZkNmI0N2QxNzM5NjYyYmEwNzIxN2Q5NTgzYzMyNTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMuaApAQCAtMzksMTUg KzM5LDYgQEAgZW51bSBDbGllbnRDcmVkZW50aWFsUG9saWN5IHsKICAgICBEb05vdEFza0NsaWVu dEZvckFueUNyZWRlbnRpYWxzCiB9OwogCi0vLyBBUElzIGxpa2UgWE1MSHR0cFJlcXVlc3QgYW5k IEV2ZW50U291cmNlIGxldCB0aGUgdXNlciBkZWNpZGUKLS8vIHdoZXRoZXIgdG8gc2VuZCBjcmVk ZW50aWFscywgYnV0IHRoZXkncmUgYWx3YXlzIHNlbnQgZm9yCi0vLyBzYW1lLW9yaWdpbiByZXF1 ZXN0cy4gQWRkaXRpb25hbCBpbmZvcm1hdGlvbiBpcyBuZWVkZWQgdG8gaGFuZGxlCi0vLyBjcm9z cy1vcmlnaW4gcmVkaXJlY3RzIGNvcnJlY3RseS4KLWVudW0gQ3JlZGVudGlhbFJlcXVlc3Qgewot ICAgIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLAotICAgIENsaWVudERpZE5vdFJlcXVlc3RD cmVkZW50aWFscwotfTsKLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gUmVz b3VyY2VIYW5kbGVUeXBlc19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRl eCA4ZGY4Y2U1NDVkYmM1ZDJmOWZjMzI4YjU0OWYzNWI1MjY3NDI5NjIwLi5lNzE5ZGYyYmMwMzEx YWMwY2VmNWM2ZjM4ZmQ1NmQ3N2Y1N2U4ZDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94 bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx dWVzdC5jcHAKQEAgLTcxMyw3ICs3MTMsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVS ZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIG9wdGlvbnMuc2V0U25pZmZDb250ZW50KERv Tm90U25pZmZDb250ZW50KTsKICAgICBvcHRpb25zLnByZWZsaWdodFBvbGljeSA9IHVwbG9hZEV2 ZW50cyA/IEZvcmNlUHJlZmxpZ2h0IDogQ29uc2lkZXJQcmVmbGlnaHQ7CiAgICAgb3B0aW9ucy5z ZXRBbGxvd0NyZWRlbnRpYWxzKChtX3NhbWVPcmlnaW5SZXF1ZXN0IHx8IG1faW5jbHVkZUNyZWRl bnRpYWxzKSA/IEFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBEb05vdEFsbG93U3RvcmVkQ3JlZGVu dGlhbHMpOwotICAgIG9wdGlvbnMuc2V0Q3JlZGVudGlhbFJlcXVlc3QobV9pbmNsdWRlQ3JlZGVu dGlhbHMgPyBDbGllbnRSZXF1ZXN0ZWRDcmVkZW50aWFscyA6IENsaWVudERpZE5vdFJlcXVlc3RD cmVkZW50aWFscyk7CisgICAgb3B0aW9ucy5jcmVkZW50aWFscyA9IG1faW5jbHVkZUNyZWRlbnRp YWxzID8gRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6SW5jbHVkZSA6IEZldGNoT3B0aW9uczo6 Q3JlZGVudGlhbHM6OlNhbWVPcmlnaW47CiAgICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQ b2xpY3kgPSBVc2VBY2Nlc3NDb250cm9sOwogICAgIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9s aWN5RW5mb3JjZW1lbnQgPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNob3VsZEJ5cGFzc01h aW5Xb3JsZENvbnRlbnRTZWN1cml0eVBvbGljeSgpID8gQ29udGVudFNlY3VyaXR5UG9saWN5RW5m b3JjZW1lbnQ6OkRvTm90RW5mb3JjZSA6IENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50 OjpFbmZvcmNlQ29ubmVjdFNyY0RpcmVjdGl2ZTsKICAgICBvcHRpb25zLmluaXRpYXRvciA9IGNh Y2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS54bWxodHRwcmVxdWVzdDsK 282754 2016-07-05 00:30:48 -0700 2016-07-05 00:59:53 -0700 Patch for landing bug-159404-20160705093017.patch text/plain 26982 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y2Nzc4MTljMGY4NzUx MTliYjdhYTNmMGY4NzRiYTEyNDM1MjRkMy4uZTQ2MDc0YjhkYzczYTZhNzc4MWVkMDg5Njg1YzBm ZjA4ZjQwNGZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE2LTA3LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgQ3JlZGVudGlh bFJlcXVlc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBTYW0g V2VpbmlnLgorCisgICAgICAgIE5vIG9ic2VydmFibGUgY2hhbmdlIG9mIGJlaGF2aW9yLgorICAg ICAgICBSZW1vdmluZyBDcmVkZW50aWFsUmVxdWVzdCBmcm9tIFJlc291cmNlTG9hZGVyT3B0aW9u cyBhbmQgcmVwbGFjaW5nIGl0IGJ5IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHMuCisgICAgICAg IEFzIHBlciBodHRwczovL2ZldGNoLnNwZWMud2hhdHdnLm9yZy8jaHR0cC1mZXRjaCwgY3JlZGVu dGlhbHMgZmxhZyBpcyBzZXQgYWNjb3JkaW5nIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHMuCisK KyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSk6IFNldCBjcmVkZW50aWFs cyBtb2RlIHRvIEluY2x1ZGUuCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnJl ZGlyZWN0UmVjZWl2ZWQpOiBEaXNhYmxlIGNyZWRlbnRpYWxzIGlmIGNyZWRlbnRpYWxzIG1vZGUg aXMgU2FtZU9yaWdpbgorICAgICAgICAocmVxdWVzdCBiZWluZyBjcm9zcyBvcmlnaW4pLgorICAg ICAgICAqIGxvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcDogUmVmcWN0b3JpbmcgdG8gdXNl IENhY2hlZFJlc291cmNlUmVhdWVzdDo6c2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luLgorICAg ICAgICBSZW1vdmVkIHVubmVjZXNzYXJ5IFJlc291cmNlUmVxdWVzdCBjb3B5IGJ5IHVzaW5nIHRo ZSBtdXRhYmxlIHJlcXVlc3Qgb2YgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKiBs b2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyKTog U2V0IGNyZWRlbnRpYWwgbW9kZSAgdG8gSW5jbHVkZQorICAgICAgICAqIGxvYWRlci9SZXNvdXJj ZUxvYWRlck9wdGlvbnMuaDogUmVtb3ZpbmcgQ3JlZGVudGlhbFJlcXVlc3Qgb3B0aW9uLgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJPcHRpb25zOjpSZXNvdXJjZUxvYWRlck9wdGlv bnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXJPcHRpb25zOjpjcmVkZW50aWFs UmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlv bnM6OnNldENyZWRlbnRpYWxSZXF1ZXN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VMb2FkZXI6OnJlcXVlc3RVc2VyQ1NTU3R5bGVTaGVldCk6IFNldCBjcmVkZW50aWFsIG1v ZGUgdG8gSW5jbHVkZS4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpk ZWZhdWx0Q2FjaGVkUmVzb3VyY2VPcHRpb25zKTogRGl0dG8uCisgICAgICAgICogbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRS ZXNvdXJjZVJlcXVlc3Q6OnNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbik6IFNldCBjcmVkZW50 aWFsIG1vZGUgYWNjb3JkaW5nIGNyb3Nzb3JpZ2luCisgICAgICAgIGF0cmlidXRlIHZhbHVlLgor ICAgICAgICAqIGxvYWRlci9pY29uL0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SWNvbkxvYWRlcjo6c3RhcnRMb2FkaW5nKTogU2V0IGNyZWRlbnRpYWwgbW9kZSB0byBPbWl0Lgor ICAgICAgICAqIHBhZ2UvRXZlbnRTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRT b3VyY2U6OmNvbm5lY3QpOiBTZXQgY3JlZGVudGlhbCBtb2RlIGFjY29yZGluZyBjcm9zc29yaWdp biBhdHJpYnV0ZSB2YWx1ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpX ZWJDb3JlQVZDRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOiBTZXQgY3JlZGVudGlhbCBt b2RlIHRvIE9taXQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29y ZUFWRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMuaDogUmVtb3ZlZCBkZWZpbml0aW9uIG9m IENyZWRlbnRpYWxSZXF1ZXN0LgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdCk6IFNldCBjcmVk ZW50aWFsIG1vZGUgYWNjb3JkaW5nIGNyb3Nzb3JpZ2luIGF0cmlidXRlIHZhbHVlLgorCiAyMDE2 LTA3LTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIE1vZGVybml6ZSBhbmQgY2xlYW51cCBDb21wb3Np dGluZ0Nvb3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApp bmRleCA1OGMxNWRjYmIyNTY3ZGUwYThjMjkwZDUwMjczOGJjNDRmYzgzMzFhLi5hNTM1OTE4MWIx MmVjMWI1NDY3OWIxMTVmZGIwYzg3ZGM0MmUwZmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5jcHAKQEAgLTE1MTAsNyArMTUxMCw3IEBAIHZvaWQgRG9jdW1lbnRMb2Fk ZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpCiAgICAgLy8gSWYgdGhpcyBpcyBhIHJlbG9h ZCB0aGUgY2FjaGUgbGF5ZXIgbWlnaHQgaGF2ZSBtYWRlIHRoZSBwcmV2aW91cyByZXF1ZXN0IGNv bmRpdGlvbmFsLiBEb2N1bWVudExvYWRlciBjYW4ndCBoYW5kbGUgMzA0IHJlc3BvbnNlcyBpdHNl bGYuCiAgICAgcmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwogCi0gICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPFJlc291cmNlTG9hZGVyT3B0aW9ucz4gbWFpblJlc291cmNlTG9hZE9wdGlvbnMo U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRl bnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVu dGlhbHMsIFNraXBTZWN1cml0eUNoZWNrLCBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5vQ29ycywgSW5j bHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Q b2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNo aW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXNv dXJjZUxvYWRlck9wdGlvbnM+IG1haW5SZXNvdXJjZUxvYWRPcHRpb25zKFNlbmRDYWxsYmFja3Ms IFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xp ZW50Rm9yQWxsQ3JlZGVudGlhbHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OkluY2x1ZGUs IFNraXBTZWN1cml0eUNoZWNrLCBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5vQ29ycywgSW5jbHVkZUNl cnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lD aGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9s aWN5OjpBbGxvd0NhY2hpbmcpOwogICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBjYWNoZWRSZXNv dXJjZVJlcXVlc3QocmVxdWVzdCwgbWFpblJlc291cmNlTG9hZE9wdGlvbnMpOwogICAgIGNhY2hl ZFJlc291cmNlUmVxdWVzdC5zZXRJbml0aWF0b3IoKnRoaXMpOwogICAgIG1fbWFpblJlc291cmNl ID0gbV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+cmVxdWVzdE1haW5SZXNvdXJjZShjYWNoZWRSZXNv dXJjZVJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 VGhyZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyLmNwcAppbmRleCBjZTQyMzY1NWU1MjY0ZWY4ODE0OTA1OGExZGIxNDMxNTgw YWE1ZjJhLi5iYjczNmQxYTQ0NWNlZDMyMmIyMmIzYzVjNzgxM2MyM2EyNDVkYzc5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcApA QCAtMjQ0LDkgKzI0NCw3IEBAIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpyZWRpcmVj dFJlY2VpdmVkKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSwgUmVzb3VyCiAgICAgICAgICAgICAv LyBGb3JjZSBhbnkgc3Vic2VxdWVudCByZXF1ZXN0IHRvIHVzZSB0aGVzZSBjaGVja3MuCiAgICAg ICAgICAgICBtX3NhbWVPcmlnaW5SZXF1ZXN0ID0gZmFsc2U7CiAKLSAgICAgICAgICAgIC8vIFNp bmNlIHRoZSByZXF1ZXN0IGlzIG5vIGxvbmdlciBzYW1lLW9yaWdpbiwgaWYgdGhlIHVzZXIgZGlk bid0IHJlcXVlc3QgY3JlZGVudGlhbHMgaW4KLSAgICAgICAgICAgIC8vIHRoZSBmaXJzdCBwbGFj ZSwgdXBkYXRlIG91ciBzdGF0ZSBzbyB3ZSBuZWl0aGVyIHJlcXVlc3QgdGhlbSBub3IgZXhwZWN0 IHRoZXkgbXVzdCBiZSBhbGxvd2VkLgotICAgICAgICAgICAgaWYgKG1fb3B0aW9ucy5jcmVkZW50 aWFsUmVxdWVzdCgpID09IENsaWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscykKKyAgICAgICAg ICAgIGlmIChtX29wdGlvbnMuY3JlZGVudGlhbHMgPT0gRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFs czo6U2FtZU9yaWdpbikKICAgICAgICAgICAgICAgICBtX29wdGlvbnMuc2V0QWxsb3dDcmVkZW50 aWFscyhEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwogCiAgICAgICAgICAgICBjbGVhblJl ZGlyZWN0ZWRSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbChyZXF1ZXN0KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAppbmRleCBlYTVkMGY1ZGZiNjcwOTc3 ODVmN2RkODUxOGRjZTA1MWE4Yzg2ZmM0Li5kYzUzMDE2ZTA1MGMzMjU4NzRkNjNmZjhmZTY1N2Fm MGQyMjhiZjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWVkaWFSZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC02MywyNyArNjMsMjEgQEAgUmVmUHRyPFBsYXRmb3JtTWVkaWFSZXNvdXJjZT4g TWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKGNvbnN0IFJlc291cmMKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBEYXRhQnVmZmVyaW5nUG9saWN5IGJ1ZmZlcmluZ1Bv bGljeSA9IG9wdGlvbnMgJiBMb2FkT3B0aW9uOjpCdWZmZXJEYXRhID8gV2ViQ29yZTo6QnVmZmVy RGF0YSA6IFdlYkNvcmU6OkRvTm90QnVmZmVyRGF0YTsKLSAgICBGZXRjaE9wdGlvbnM6Ok1vZGUg Y29yc1BvbGljeSA9ICFtX2Nyb3NzT3JpZ2luTW9kZS5pc051bGwoKSA/IEZldGNoT3B0aW9uczo6 TW9kZTo6Q29ycyA6IEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3JzOwogICAgIGF1dG8gY2FjaGlu Z1BvbGljeSA9IG9wdGlvbnMgJiBMb2FkT3B0aW9uOjpEaXNhbGxvd0NhY2hpbmcgPyBDYWNoaW5n UG9saWN5OjpEaXNhbGxvd0NhY2hpbmcgOiBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmc7Ci0g ICAgU3RvcmVkQ3JlZGVudGlhbHMgYWxsb3dDcmVkZW50aWFscyA9IG1fY3Jvc3NPcmlnaW5Nb2Rl LmlzTnVsbCgpIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1fY3Jvc3NPcmlnaW5N b2RlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RB bGxvd1N0b3JlZENyZWRlbnRpYWxzOwogCi0gICAgYXV0byB1cGRhdGVkUmVxdWVzdCA9IHJlcXVl c3Q7Ci0gICAgdXBkYXRlZFJlcXVlc3Quc2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVzdDo6UmVx dWVzdGVyOjpNZWRpYSk7CisgICAgLy8gRklYTUU6IFNraXAgQ29udGVudCBTZWN1cml0eSBQb2xp Y3kgY2hlY2sgaWYgdGhlIGVsZW1lbnQgdGhhdCBpbml0aXRhdGVkIHRoaXMgcmVxdWVzdCBpcyBp biBhIHVzZXItYWdlbnQgc2hhZG93IHRyZWUuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTUwNT4uCisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hl UmVxdWVzdChyZXF1ZXN0LCBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9O b3RTbmlmZkNvbnRlbnQsIGJ1ZmZlcmluZ1BvbGljeSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywg QXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Oklu Y2x1ZGUsIERvU2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90 SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6 RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBj YWNoaW5nUG9saWN5KSk7CisKKyAgICBjYWNoZVJlcXVlc3Quc2V0QXNQb3RlbnRpYWxseUNyb3Nz T3JpZ2luKG1fY3Jvc3NPcmlnaW5Nb2RlLCAqbV9kb2N1bWVudCk7CisKKyAgICBjYWNoZVJlcXVl c3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLnNldFJlcXVlc3RlcihSZXNvdXJjZVJlcXVlc3Q6 OlJlcXVlc3Rlcjo6TWVkaWEpOwogI2lmIEhBVkUoQVZGT1VOREFUSU9OX0xPQURFUl9ERUxFR0FU RSkgJiYgUExBVEZPUk0oTUFDKQogICAgIC8vIEZJWE1FOiBXb3JrYXJvdW5kIGZvciA8cmRhcjov L3Byb2JsZW0vMjYwNzE2MDc+LiBXZSBhcmUgbm90IGFibGUgdG8gZG8gQ09SUyBjaGVja2luZyBv biAzMDQgcmVzcG9uc2VzIGJlY2F1c2UgdGhleQogICAgIC8vIGFyZSB1c3VhbGx5IG1pc3Npbmcg dGhlIGhlYWRlcnMgd2UgbmVlZC4KLSAgICBpZiAoY29yc1BvbGljeSA9PSBGZXRjaE9wdGlvbnM6 Ok1vZGU6OkNvcnMpCi0gICAgICAgIHVwZGF0ZWRSZXF1ZXN0Lm1ha2VVbmNvbmRpdGlvbmFsKCk7 CisgICAgaWYgKGNhY2hlUmVxdWVzdC5vcHRpb25zKCkubW9kZSA9PSBGZXRjaE9wdGlvbnM6Ok1v ZGU6OkNvcnMpCisgICAgICAgIGNhY2hlUmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCku bWFrZVVuY29uZGl0aW9uYWwoKTsKICNlbmRpZgogCi0gICAgLy8gRklYTUU6IFNraXAgQ29udGVu dCBTZWN1cml0eSBQb2xpY3kgY2hlY2sgaWYgdGhlIGVsZW1lbnQgdGhhdCBpbml0aXRhdGVkIHRo aXMgcmVxdWVzdAotICAgIC8vIGlzIGluIGEgdXNlci1hZ2VudCBzaGFkb3cgdHJlZS4gU2VlIDxo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NTA1Pi4KLSAgICBDYWNo ZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVSZXF1ZXN0KHVwZGF0ZWRSZXF1ZXN0LCBSZXNvdXJjZUxv YWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIGJ1ZmZlcmluZ1Bv bGljeSwgYWxsb3dDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVu dERpZE5vdFJlcXVlc3RDcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBjb3JzUG9saWN5LCBE b05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGlu ZywgY2FjaGluZ1BvbGljeSkpOwotCi0gICAgaWYgKCFtX2Nyb3NzT3JpZ2luTW9kZS5pc051bGwo KSkgewotICAgICAgICBBU1NFUlQobV9kb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSk7Ci0gICAg ICAgIHVwZGF0ZVJlcXVlc3RGb3JBY2Nlc3NDb250cm9sKGNhY2hlUmVxdWVzdC5tdXRhYmxlUmVz b3VyY2VSZXF1ZXN0KCksICptX2RvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLCBhbGxvd0NyZWRl bnRpYWxzKTsKLSAgICB9CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmF3UmVzb3Vy Y2U+IHJlc291cmNlID0gbV9kb2N1bWVudC0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0 TWVkaWEoY2FjaGVSZXF1ZXN0KTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJ blN0cmVhbUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5T dHJlYW1Mb2FkZXIuY3BwCmluZGV4IGI0NTc1OTBlNzRiYzdhZDFkZDM1MWQ3YmQ1MTY2NDc0MmVk MzJlN2QuLmRhNDA4NGUyNjBiZDdjN2I4ZDkwMzc4YjgzODRlOWU3MDFhNTJlOWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNw cApAQCAtNDMsNyArNDMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBGSVhNRTogU2tpcCBD b250ZW50IFNlY3VyaXR5IFBvbGljeSBjaGVjayB3aGVuIGFzc29jaWF0ZWQgcGx1Z2luIGVsZW1l bnQgaXMgaW4gYSB1c2VyIGFnZW50IHNoYWRvdyB0cmVlLgogLy8gU2VlIDxodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NjYzPi4KIE5ldHNjYXBlUGx1Z0luU3RyZWFt TG9hZGVyOjpOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcihGcmFtZSYgZnJhbWUsIE5ldHNjYXBl UGx1Z0luU3RyZWFtTG9hZGVyQ2xpZW50JiBjbGllbnQpCi0gICAgOiBSZXNvdXJjZUxvYWRlcihm cmFtZSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwg RG9Ob3RCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxD cmVkZW50aWFscywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVudGlhbHMsIFNraXBTZWN1cml0eUNoZWNr LCBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5vQ29ycywgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZv LCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNM b2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkFsbG93Q2Fj aGluZykpCisgICAgOiBSZXNvdXJjZUxvYWRlcihmcmFtZSwgUmVzb3VyY2VMb2FkZXJPcHRpb25z KFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgRG9Ob3RCdWZmZXJEYXRhLCBBbGxvd1N0b3Jl ZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgRmV0Y2hPcHRpb25zOjpD cmVkZW50aWFsczo6SW5jbHVkZSwgU2tpcFNlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9k ZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBv bGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93 RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNoaW5nKSkKICAgICAsIG1fY2xp ZW50KCZjbGllbnQpCiB7CiAjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaAppbmRleCAxODhmNjg5ZTg3 OGRhNzg5N2ZiYzYyZTQxZTViOWVkNmU3ZjA3NTBhLi43NGEwNDdjZjA3NDliMWRiOTZhYThkOGQw Nzk3NGM1M2FlZTI0YjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXJPcHRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZGVyT3B0aW9ucy5oCkBAIC04MiwyNSArODIsMjQgQEAgc3RydWN0IFJlc291cmNlTG9hZGVyT3B0 aW9ucyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgICAgICAsIG1fZGF0YUJ1ZmZlcmluZ1Bv bGljeShCdWZmZXJEYXRhKQogICAgICAgICAsIG1fYWxsb3dDcmVkZW50aWFscyhEb05vdEFsbG93 U3RvcmVkQ3JlZGVudGlhbHMpCiAgICAgICAgICwgbV9jbGllbnRDcmVkZW50aWFsUG9saWN5KERv Tm90QXNrQ2xpZW50Rm9yQW55Q3JlZGVudGlhbHMpCi0gICAgICAgICwgbV9jcmVkZW50aWFsUmVx dWVzdChDbGllbnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMpCiAgICAgICAgICwgbV9zZWN1cml0 eUNoZWNrKERvU2VjdXJpdHlDaGVjaykKICAgICAgICAgLCBtX2NlcnRpZmljYXRlSW5mb1BvbGlj eShEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8pCiAgICAgewogICAgIH0KIAotICAgIFJlc291 cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tQb2xpY3kgc2VuZExvYWRDYWxsYmFja3MsIENv bnRlbnRTbmlmZmluZ1BvbGljeSBzbmlmZkNvbnRlbnQsIERhdGFCdWZmZXJpbmdQb2xpY3kgZGF0 YUJ1ZmZlcmluZ1BvbGljeSwgU3RvcmVkQ3JlZGVudGlhbHMgYWxsb3dDcmVkZW50aWFscywgQ2xp ZW50Q3JlZGVudGlhbFBvbGljeSBjcmVkZW50aWFsUG9saWN5LCBDcmVkZW50aWFsUmVxdWVzdCBj cmVkZW50aWFsUmVxdWVzdCwgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNrLCBGZXRj aE9wdGlvbnM6Ok1vZGUgbW9kZSwgQ2VydGlmaWNhdGVJbmZvUG9saWN5IGNlcnRpZmljYXRlSW5m b1BvbGljeSwgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiBjb250ZW50U2VjdXJpdHlQ b2xpY3lJbXBvc2l0aW9uLCBEZWZlcnNMb2FkaW5nUG9saWN5IGRlZmVyc0xvYWRpbmdQb2xpY3ks IENhY2hpbmdQb2xpY3kgY2FjaGluZ1BvbGljeSkKKyAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMo U2VuZENhbGxiYWNrUG9saWN5IHNlbmRMb2FkQ2FsbGJhY2tzLCBDb250ZW50U25pZmZpbmdQb2xp Y3kgc25pZmZDb250ZW50LCBEYXRhQnVmZmVyaW5nUG9saWN5IGRhdGFCdWZmZXJpbmdQb2xpY3ks IFN0b3JlZENyZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMsIENsaWVudENyZWRlbnRpYWxQb2xp Y3kgY3JlZGVudGlhbFBvbGljeSwgRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFscyBjcmVkZW50aWFs cywgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNrLCBGZXRjaE9wdGlvbnM6Ok1vZGUg bW9kZSwgQ2VydGlmaWNhdGVJbmZvUG9saWN5IGNlcnRpZmljYXRlSW5mb1BvbGljeSwgQ29udGVu dFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiBjb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9u LCBEZWZlcnNMb2FkaW5nUG9saWN5IGRlZmVyc0xvYWRpbmdQb2xpY3ksIENhY2hpbmdQb2xpY3kg Y2FjaGluZ1BvbGljeSkKICAgICAgICAgOiBtX3NlbmRMb2FkQ2FsbGJhY2tzKHNlbmRMb2FkQ2Fs bGJhY2tzKQogICAgICAgICAsIG1fc25pZmZDb250ZW50KHNuaWZmQ29udGVudCkKICAgICAgICAg LCBtX2RhdGFCdWZmZXJpbmdQb2xpY3koZGF0YUJ1ZmZlcmluZ1BvbGljeSkKICAgICAgICAgLCBt X2FsbG93Q3JlZGVudGlhbHMoYWxsb3dDcmVkZW50aWFscykKICAgICAgICAgLCBtX2NsaWVudENy ZWRlbnRpYWxQb2xpY3koY3JlZGVudGlhbFBvbGljeSkKLSAgICAgICAgLCBtX2NyZWRlbnRpYWxS ZXF1ZXN0KGNyZWRlbnRpYWxSZXF1ZXN0KQogICAgICAgICAsIG1fc2VjdXJpdHlDaGVjayhzZWN1 cml0eUNoZWNrKQogICAgICAgICAsIG1fY2VydGlmaWNhdGVJbmZvUG9saWN5KGNlcnRpZmljYXRl SW5mb1BvbGljeSkKICAgICAgICAgLCBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24o Y29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbikKICAgICAgICAgLCBtX2RlZmVyc0xvYWRp bmdQb2xpY3koZGVmZXJzTG9hZGluZ1BvbGljeSkKICAgICAgICAgLCBtX2NhY2hpbmdQb2xpY3ko Y2FjaGluZ1BvbGljeSkKICAgICB7CisgICAgICAgIHRoaXMtPmNyZWRlbnRpYWxzID0gY3JlZGVu dGlhbHM7CiAgICAgICAgIHRoaXMtPm1vZGUgPSBtb2RlOwogICAgIH0KIApAQCAtMTE0LDggKzEx Myw2IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgOiBwdWJsaWMgRmV0Y2hPcHRpb25z IHsKICAgICB2b2lkIHNldEFsbG93Q3JlZGVudGlhbHMoU3RvcmVkQ3JlZGVudGlhbHMgYWxsb3cp IHsgbV9hbGxvd0NyZWRlbnRpYWxzID0gYWxsb3c7IH0KICAgICBDbGllbnRDcmVkZW50aWFsUG9s aWN5IGNsaWVudENyZWRlbnRpYWxQb2xpY3koKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxD bGllbnRDcmVkZW50aWFsUG9saWN5PihtX2NsaWVudENyZWRlbnRpYWxQb2xpY3kpOyB9CiAgICAg dm9pZCBzZXRDbGllbnRDcmVkZW50aWFsUG9saWN5KENsaWVudENyZWRlbnRpYWxQb2xpY3kgcG9s aWN5KSB7IG1fY2xpZW50Q3JlZGVudGlhbFBvbGljeSA9IHBvbGljeTsgfQotICAgIENyZWRlbnRp YWxSZXF1ZXN0IGNyZWRlbnRpYWxSZXF1ZXN0KCkgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Q3JlZGVu dGlhbFJlcXVlc3Q+KG1fY3JlZGVudGlhbFJlcXVlc3QpOyB9Ci0gICAgdm9pZCBzZXRDcmVkZW50 aWFsUmVxdWVzdChDcmVkZW50aWFsUmVxdWVzdCBjcmVkZW50aWFsUmVxdWVzdCkgeyBtX2NyZWRl bnRpYWxSZXF1ZXN0ID0gY3JlZGVudGlhbFJlcXVlc3Q7IH0KICAgICBTZWN1cml0eUNoZWNrUG9s aWN5IHNlY3VyaXR5Q2hlY2soKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxTZWN1cml0eUNo ZWNrUG9saWN5PihtX3NlY3VyaXR5Q2hlY2spOyB9CiAgICAgdm9pZCBzZXRTZWN1cml0eUNoZWNr KFNlY3VyaXR5Q2hlY2tQb2xpY3kgY2hlY2spIHsgbV9zZWN1cml0eUNoZWNrID0gY2hlY2s7IH0K ICAgICBDZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgY2VydGlmaWNhdGVJbmZvUG9saWN5KCkgY29uc3Qg eyByZXR1cm4gc3RhdGljX2Nhc3Q8Q2VydGlmaWNhdGVJbmZvUG9saWN5PihtX2NlcnRpZmljYXRl SW5mb1BvbGljeSk7IH0KQEAgLTEzMiw3ICsxMjksNiBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJP cHRpb25zIDogcHVibGljIEZldGNoT3B0aW9ucyB7CiAgICAgdW5zaWduZWQgbV9kYXRhQnVmZmVy aW5nUG9saWN5IDogMTsKICAgICB1bnNpZ25lZCBtX2FsbG93Q3JlZGVudGlhbHMgOiAxOyAvLyBX aGV0aGVyIEhUVFAgY3JlZGVudGlhbHMgYW5kIGNvb2tpZXMgYXJlIHNlbnQgd2l0aCB0aGUgcmVx dWVzdC4KICAgICB1bnNpZ25lZCBtX2NsaWVudENyZWRlbnRpYWxQb2xpY3kgOiAyOyAvLyBXaGVu IHdlIHNob3VsZCBhc2sgdGhlIGNsaWVudCBmb3IgY3JlZGVudGlhbHMgKGlmIHdlIGFsbG93IGNy ZWRlbnRpYWxzIGF0IGFsbCkuCi0gICAgdW5zaWduZWQgbV9jcmVkZW50aWFsUmVxdWVzdDogMTsg Ly8gV2hldGhlciB0aGUgY2xpZW50IChlLmcuIFhIUikgd2FudGVkIGNyZWRlbnRpYWxzIGluIHRo ZSBmaXJzdCBwbGFjZS4KICAgICB1bnNpZ25lZCBtX3NlY3VyaXR5Q2hlY2sgOiAxOwogICAgIHVu c2lnbmVkIG1fY2VydGlmaWNhdGVJbmZvUG9saWN5IDogMTsgLy8gV2hldGhlciB0aGUgcmVzcG9u c2Ugc2hvdWxkIGluY2x1ZGUgY2VydGlmaWNhdGUgaW5mby4KICAgICBDb250ZW50U2VjdXJpdHlQ b2xpY3lJbXBvc2l0aW9uIG1fY29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiB7IENvbnRl bnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2sgfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4 IDIzYTRmYTZiNjRlNjgyNWU4MGYzYWVhOTNlYTBkZTllYzYxM2QwOGEuLjQ3MzNiZjJmZGZlNGI2 OTRjNWM5ODRlOTJhYzdhZTNiYjc2ODU2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtMjQxLDcgKzI0MSw3IEBA IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZENTU1N0eWxlU2hlZXQ+IENhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0VXNlckNTU1N0CiAgICAgICAgIG1lbW9yeUNhY2hlLmFkZCgqdXNlclNo ZWV0KTsKICAgICAvLyBGSVhNRTogbG9hZFJlc291cmNlIGNhbGxzIHNldE93bmluZ0NhY2hlZFJl c291cmNlTG9hZGVyKCkgaWYgdGhlIHJlc291cmNlIGNvdWxkbid0IGJlIGFkZGVkIHRvIGNhY2hl LiBEb2VzIHRoaXMgZnVuY3Rpb24gbmVlZCB0byBjYWxsIGl0LCB0b28/CiAKLSAgICB1c2VyU2hl ZXQtPmxvYWQoKnRoaXMsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhEb05vdFNlbmRDYWxsYmFja3Ms IFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xp ZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBTa2lwU2Vj dXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90SW5jbHVkZUNlcnRp ZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6U2tpcFBvbGljeUNo ZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xp Y3k6OkFsbG93Q2FjaGluZykpOworICAgIHVzZXJTaGVldC0+bG9hZCgqdGhpcywgUmVzb3VyY2VM b2FkZXJPcHRpb25zKERvTm90U2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRh LCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgRmV0 Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6SW5jbHVkZSwgU2tpcFNlY3VyaXR5Q2hlY2ssIEZldGNo T3B0aW9uczo6TW9kZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRl bnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OlNraXBQb2xpY3lDaGVjaywgRGVmZXJzTG9hZGlu Z1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcp KTsKICAgICAKICAgICByZXR1cm4gdXNlclNoZWV0OwogfQpAQCAtMTE1Nyw3ICsxMTU3LDcgQEAg dm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cHJpbnRQcmVsb2FkU3RhdHMoKQogICAgICAgICAg ICAgcHJpbnRmKCJISVQgQ09NUExFVEUgUFJFTE9BRCAlc1xuIiwgcmVzb3VyY2UtPnVybCgpLmxh dGluMSgpLmRhdGEoKSk7CiAgICAgICAgIGVsc2UgaWYgKHJlc291cmNlLT5wcmVsb2FkUmVzdWx0 KCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlByZWxvYWRSZWZlcmVuY2VkV2hpbGVMb2FkaW5nKQogICAg ICAgICAgICAgcHJpbnRmKCJISVQgTE9BRElORyBQUkVMT0FEICVzXG4iLCByZXNvdXJjZS0+dXJs KCkubGF0aW4xKCkuZGF0YSgpKTsKLSAgICAgICAgCisKICAgICAgICAgaWYgKHJlc291cmNlLT50 eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCkgewogICAgICAgICAgICAgc2NyaXB0cysr OwogICAgICAgICAgICAgaWYgKHJlc291cmNlLT5wcmVsb2FkUmVzdWx0KCkgPCBDYWNoZWRSZXNv dXJjZTo6UHJlbG9hZFJlZmVyZW5jZWRXaGlsZUxvYWRpbmcpCkBAIC0xMTcxLDE0ICsxMTcxLDE0 IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnByaW50UHJlbG9hZFN0YXRzKCkKICAgICAg ICAgICAgIGlmIChyZXNvdXJjZS0+cHJlbG9hZFJlc3VsdCgpIDwgQ2FjaGVkUmVzb3VyY2U6OlBy ZWxvYWRSZWZlcmVuY2VkV2hpbGVMb2FkaW5nKQogICAgICAgICAgICAgICAgIGltYWdlTWlzc2Vz Kys7CiAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgaWYgKHJlc291cmNlLT5lcnJvck9j Y3VycmVkKCkgJiYgcmVzb3VyY2UtPnByZWxvYWRSZXN1bHQoKSA9PSBDYWNoZWRSZXNvdXJjZTo6 UHJlbG9hZE5vdFJlZmVyZW5jZWQpCiAgICAgICAgICAgICBNZW1vcnlDYWNoZTo6c2luZ2xldG9u KCkucmVtb3ZlKHJlc291cmNlKTsKLSAgICAgICAgCisKICAgICAgICAgcmVzb3VyY2UtPmRlY3Jl YXNlUHJlbG9hZENvdW50KCk7CiAgICAgfQogICAgIG1fcHJlbG9hZHMgPSBudWxscHRyOwotICAg IAorCiAgICAgaWYgKHNjcmlwdHMpCiAgICAgICAgIHByaW50ZigiU0NSSVBUUzogJWQgKCVkIGhp dHMsIGhpdCByYXRlICVkJSUpXG4iLCBzY3JpcHRzLCBzY3JpcHRzIC0gc2NyaXB0TWlzc2VzLCAo c2NyaXB0cyAtIHNjcmlwdE1pc3NlcykgKiAxMDAgLyBzY3JpcHRzKTsKICAgICBpZiAoc3R5bGVz aGVldHMpCkBAIC0xMTkwLDcgKzExOTAsNyBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpw cmludFByZWxvYWRTdGF0cygpCiAKIGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgQ2FjaGVk UmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMoKQogewotICAgIHN0 YXRpYyBSZXNvdXJjZUxvYWRlck9wdGlvbnMgb3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNv bnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFs bENyZWRlbnRpYWxzLCBDbGllbnRSZXF1ZXN0ZWRDcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNr LCBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5vQ29ycywgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZv LCBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNM b2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkFsbG93Q2Fj aGluZyk7CisgICAgc3RhdGljIFJlc291cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKFNlbmRDYWxs YmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywg QXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Oklu Y2x1ZGUsIERvU2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90 SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6 RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBD YWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpOwogICAgIHJldHVybiBvcHRpb25zOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1 ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVl c3QuY3BwCmluZGV4IDZhOWU0MjExNTU4OWYyMzVhMzI5NjE4MWMwMjI4NjFiZGEyZGYwYTAuLjU3 MzQ1MDBhNzYyOTc2NjkyOTA0MGVmY2E0MWQyNDBlZjYxYjZjOGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCkBAIC05 OSw2ICs5OSw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0OjpzZXRBc1BvdGVudGlhbGx5 Q3Jvc3NPcmlnaW4oY29uc3QgU3RyaW5nJiBtb2RlLCBEb2N1CiAgICAgaWYgKG1vZGUuaXNOdWxs KCkpCiAgICAgICAgIHJldHVybjsKICAgICBtX29wdGlvbnMubW9kZSA9IEZldGNoT3B0aW9uczo6 TW9kZTo6Q29yczsKKyAgICBtX29wdGlvbnMuY3JlZGVudGlhbHMgPSBlcXVhbExldHRlcnNJZ25v cmluZ0FTQ0lJQ2FzZShtb2RlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBGZXRjaE9wdGlvbnM6OkNy ZWRlbnRpYWxzOjpJbmNsdWRlIDogRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6U2FtZU9yaWdp bjsKICAgICBtX29wdGlvbnMuc2V0QWxsb3dDcmVkZW50aWFscyhlcXVhbExldHRlcnNJZ25vcmlu Z0FTQ0lJQ2FzZShtb2RlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBBbGxvd1N0b3JlZENyZWRlbnRp YWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzKTsKIAogICAgIEFTU0VSVChkb2N1bWVu dC5zZWN1cml0eU9yaWdpbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9p Y29uL0ljb25Mb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRl ci5jcHAKaW5kZXggNTU3MTEzYjhhY2Y4ZjFkYTkzMjFmOGJkZjdiOWYwYjA0MTc0ZDU0MC4uYTJi MWQ4N2NiYTdmZGE4NTBiMjZlNTU5ZDI1ODM1YTJkYWNhNmQ5MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBJY29uTG9h ZGVyOjpzdGFydExvYWRpbmcoKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb250ZW50U2Vj dXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFs dWUuIEl0IGRvZXMgbm90IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5 IFBvbGljeSBkb2VzIG5vdCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291 cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChtX2ZyYW1lLmxvYWRlcigpLmljb24o KS51cmwoKSksIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRl bnQsIEJ1ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGll bnRGb3JBbnlDcmVkZW50aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzLCBEb1Nl Y3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0 aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hl Y2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGlj eTo6QWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVz b3VyY2VSZXF1ZXN0KG1fZnJhbWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3VyY2VMb2Fk ZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RB bGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzLCBG ZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0LCBEb1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0 aW9uczo6TW9kZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRT ZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xp Y3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNoaW5nKSk7CiAK ICAgICByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJj ZUxvYWRQcmlvcml0eTo6TG93KTsKICAgICByZXF1ZXN0LnNldEluaXRpYXRvcihjYWNoZWRSZXNv dXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuaWNvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50U291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2Uu Y3BwCmluZGV4IDgwNzgyOTNhOThjZTcwY2VlN2Y0ZTE4NjM1NzQxZTc3NTkwZWIxZWIuLmE3YmY0 NTk3Y2U1MGJkZGY0ZWMzZmU2ZGMwZjBhMDg3Yjc1Y2FjZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRTb3VyY2UuY3BwCkBAIC0xMDksNyArMTA5LDcgQEAgdm9pZCBFdmVudFNvdXJjZTo6Y29ubmVj dCgpCiAgICAgb3B0aW9ucy5zZXRTZW5kTG9hZENhbGxiYWNrcyhTZW5kQ2FsbGJhY2tzKTsKICAg ICBvcHRpb25zLnNldFNuaWZmQ29udGVudChEb05vdFNuaWZmQ29udGVudCk7CiAgICAgb3B0aW9u cy5zZXRBbGxvd0NyZWRlbnRpYWxzKChvcmlnaW4uY2FuUmVxdWVzdChtX3VybCkgfHwgbV93aXRo Q3JlZGVudGlhbHMpID8gQWxsb3dTdG9yZWRDcmVkZW50aWFscyA6IERvTm90QWxsb3dTdG9yZWRD cmVkZW50aWFscyk7Ci0gICAgb3B0aW9ucy5zZXRDcmVkZW50aWFsUmVxdWVzdChtX3dpdGhDcmVk ZW50aWFscyA/IENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzIDogQ2xpZW50RGlkTm90UmVxdWVz dENyZWRlbnRpYWxzKTsKKyAgICBvcHRpb25zLmNyZWRlbnRpYWxzID0gbV93aXRoQ3JlZGVudGlh bHMgPyBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpJbmNsdWRlIDogRmV0Y2hPcHRpb25zOjpD cmVkZW50aWFsczo6U2FtZU9yaWdpbjsKICAgICBvcHRpb25zLnByZWZsaWdodFBvbGljeSA9IFBy ZXZlbnRQcmVmbGlnaHQ7CiAgICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBV c2VBY2Nlc3NDb250cm9sOwogICAgIG9wdGlvbnMuc2V0RGF0YUJ1ZmZlcmluZ1BvbGljeShEb05v dEJ1ZmZlckRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVz b3VyY2VMb2FkZXIuY3BwCmluZGV4IDUyMTA0Nzk0YzNmNjg4ZTk1YWEwOGYwOTUzNGNlY2I4YzU5 YWVkMzUuLjdhOTdhZGFiMzUxYTIyMTUwODM0MmUyMzgzMjdlYjIzZjZmOTJhMjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9XZWJD b3JlQVZDRlJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHAKQEAg LTcxLDcgKzcxLDcgQEAgdm9pZCBXZWJDb3JlQVZDRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRp bmcoKQogICAgIFJldGFpblB0cjxDRlVSTFJlcXVlc3RSZWY+IHVybFJlcXVlc3QgPSBBVkNGQXNz ZXRSZXNvdXJjZUxvYWRpbmdSZXF1ZXN0R2V0VVJMUmVxdWVzdChtX2F2UmVxdWVzdC5nZXQoKSk7 CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNr IGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMgbm90IGFmZmVjdCB0aGUgcmVxdWVzdCBz aW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2VzIG5vdCBhcHBseSB0byByYXcgcmVzb3Vy Y2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdCh1 cmxSZXF1ZXN0LmdldCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERv Tm90U25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMs IERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90UmVx dWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9kZTo6Tm9D b3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUlt cG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJz TG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHVybFJlcXVlc3QuZ2V0KCkpLCBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1 ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JD cm9zc09yaWdpbkNyZWRlbnRpYWxzLCBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0LCBE b1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVD ZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5 Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1Bv bGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CiAKICAgICByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJl cXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eTo6TG93KTsKICAgICBDYWNo ZWRSZXNvdXJjZUxvYWRlciogbG9hZGVyID0gbV9wYXJlbnQtPnBsYXllcigpLT5jYWNoZWRSZXNv dXJjZUxvYWRlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJl c291cmNlTG9hZGVyLm1tCmluZGV4IGMyNzBkMWI2Zjg1ZWJhYjgwN2I5OTk2ZTJmMTg5NTNjNzhk ZTYwODkuLjlmMDc1ZWM2ZTcwOWYwNmNlYmVmOWY0NWRlNTllMTRkOTM1MzY3ZTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dl YkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KQEAg LTY5LDcgKzY5LDcgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGlu ZygpCiAKICAgICAvLyBGSVhNRTogU2tpcCBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBjaGVjayBp ZiB0aGUgZWxlbWVudCB0aGF0IGluaXRpdGF0ZWQgdGhpcyByZXF1ZXN0CiAgICAgLy8gaXMgaW4g YSB1c2VyLWFnZW50IHNoYWRvdyB0cmVlLiBTZWUgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTU1MDU+LgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0 KG5zUmVxdWVzdCwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25p ZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIERvTm90 QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENy ZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3JzLCBE b05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGlu ZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0IHJlcXVlc3QobnNSZXF1ZXN0LCBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxi YWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVk ZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNyZWRlbnRpYWxzLCBGZXRjaE9w dGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0LCBEb1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6 TW9kZTo6Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0 eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFs bG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CiAgICAg cmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCkuc2V0UHJpb3JpdHkoUmVzb3VyY2VMb2Fk UHJpb3JpdHk6Okxvdyk7CiAgICAgaWYgKGF1dG8qIGxvYWRlciA9IG1fcGFyZW50LT5wbGF5ZXIo KS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSkKICAgICAgICAgbV9yZXNvdXJjZSA9IGxvYWRlci0+ cmVxdWVzdE1lZGlhKHJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlVHlwZXMuaAppbmRleCA5NWIwOWNkNzcxMDg3M2RiZmE4 NTA5NGI0YmE5NzU0M2U1NWZkMTE2Li4wYzMxZjkyZTZkNmI0N2QxNzM5NjYyYmEwNzIxN2Q5NTgz YzMyNTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlSGFuZGxlVHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlSGFuZGxlVHlwZXMuaApAQCAtMzksMTUgKzM5LDYgQEAgZW51bSBDbGllbnRDcmVkZW50 aWFsUG9saWN5IHsKICAgICBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzCiB9OwogCi0v LyBBUElzIGxpa2UgWE1MSHR0cFJlcXVlc3QgYW5kIEV2ZW50U291cmNlIGxldCB0aGUgdXNlciBk ZWNpZGUKLS8vIHdoZXRoZXIgdG8gc2VuZCBjcmVkZW50aWFscywgYnV0IHRoZXkncmUgYWx3YXlz IHNlbnQgZm9yCi0vLyBzYW1lLW9yaWdpbiByZXF1ZXN0cy4gQWRkaXRpb25hbCBpbmZvcm1hdGlv biBpcyBuZWVkZWQgdG8gaGFuZGxlCi0vLyBjcm9zcy1vcmlnaW4gcmVkaXJlY3RzIGNvcnJlY3Rs eS4KLWVudW0gQ3JlZGVudGlhbFJlcXVlc3QgewotICAgIENsaWVudFJlcXVlc3RlZENyZWRlbnRp YWxzLAotICAgIENsaWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscwotfTsKLQogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gUmVzb3VyY2VIYW5kbGVUeXBlc19oCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA4ZGY4Y2U1NDVkYmM1ZDJmOWZjMzI4YjU0 OWYzNWI1MjY3NDI5NjIwLi5lNzE5ZGYyYmMwMzExYWMwY2VmNWM2ZjM4ZmQ1NmQ3N2Y1N2U4ZDM5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTcxMyw3ICs3MTMsNyBA QCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVjKQog ICAgIG9wdGlvbnMuc2V0U25pZmZDb250ZW50KERvTm90U25pZmZDb250ZW50KTsKICAgICBvcHRp b25zLnByZWZsaWdodFBvbGljeSA9IHVwbG9hZEV2ZW50cyA/IEZvcmNlUHJlZmxpZ2h0IDogQ29u c2lkZXJQcmVmbGlnaHQ7CiAgICAgb3B0aW9ucy5zZXRBbGxvd0NyZWRlbnRpYWxzKChtX3NhbWVP cmlnaW5SZXF1ZXN0IHx8IG1faW5jbHVkZUNyZWRlbnRpYWxzKSA/IEFsbG93U3RvcmVkQ3JlZGVu dGlhbHMgOiBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwotICAgIG9wdGlvbnMuc2V0Q3Jl ZGVudGlhbFJlcXVlc3QobV9pbmNsdWRlQ3JlZGVudGlhbHMgPyBDbGllbnRSZXF1ZXN0ZWRDcmVk ZW50aWFscyA6IENsaWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscyk7CisgICAgb3B0aW9ucy5j cmVkZW50aWFscyA9IG1faW5jbHVkZUNyZWRlbnRpYWxzID8gRmV0Y2hPcHRpb25zOjpDcmVkZW50 aWFsczo6SW5jbHVkZSA6IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OlNhbWVPcmlnaW47CiAg ICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBVc2VBY2Nlc3NDb250cm9sOwog ICAgIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQgPSBzY3JpcHRFeGVj dXRpb25Db250ZXh0KCktPnNob3VsZEJ5cGFzc01haW5Xb3JsZENvbnRlbnRTZWN1cml0eVBvbGlj eSgpID8gQ29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQ6OkRvTm90RW5mb3JjZSA6IENv bnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50OjpFbmZvcmNlQ29ubmVjdFNyY0RpcmVjdGl2 ZTsKICAgICBvcHRpb25zLmluaXRpYXRvciA9IGNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRv cnMoKS54bWxodHRwcmVxdWVzdDsK