159406 2016-07-04 06:02:21 -0700 Remove RequestOriginPolicy from ResourceLoaderOptions 2016-07-05 05:17:24 -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 1207659 0 youennf 2016-07-04 06:02:21 -0700 This is redundant with FetchOptions::Mode 1207660 1 282710 youennf 2016-07-04 06:09:38 -0700 Created attachment 282710 Patch 1207703 2 282710 sam 2016-07-04 10:53:38 -0700 Comment on attachment 282710 Patch Not related to the patch exactly, but I wish it was spelled FetchOptions::Mode::CORS rather than FetchOptions::Mode::Cors since it's an acronym. 1207707 3 282710 commit-queue 2016-07-04 11:37:02 -0700 Comment on attachment 282710 Patch Clearing flags on attachment: 282710 Committed r202811: <http://trac.webkit.org/changeset/202811> 1207708 4 commit-queue 2016-07-04 11:37:06 -0700 All reviewed patches have been landed. Closing bug. 1207799 5 youennf 2016-07-05 05:17:24 -0700 (In reply to comment #2) > Comment on attachment 282710 [details] > Patch > > Not related to the patch exactly, but I wish it was spelled > FetchOptions::Mode::CORS rather than FetchOptions::Mode::Cors since it's an > acronym. That is not really possible as "cors" comes from an IDL enumeration. 282710 2016-07-04 06:09:38 -0700 2016-07-04 11:37:02 -0700 Patch bug-159406-20160704150909.patch text/plain 24736 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QwYTM5MzRmYTY1MzA1 OTk5ZDRhOThlZGU4YTY5MzhmMTlhNjZkYi4uNDAwNzQ1ZDczNWZkMzBiMDg5YTk1ZGUwZTFkMzcw NmU2YjQ0YTg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE2LTA3LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgUmVxdWVzdE9y aWdpblBvbGljeSBmcm9tIFJlc291cmNlTG9hZGVyT3B0aW9ucworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NDA2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgRmV0Y2hPcHRpb25zOjptb2RlIGlu IGxpZXUgb2YgUmVzb3VyY2VMb2FkZXJPcHRpb25zOjpSZXF1ZXN0T3JpZ2luUG9saWN5LgorICAg ICAgICBUaGUgY29ycywgbm8tY29ycyBhbmQgc2FtZS1vcmlnaW4gdmFsdWVzIG1hdGNoIFBvdGVu dGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkLAorICAgICAgICBVc2VEZWZhdWx0T3JpZ2luUmVzdHJp Y3Rpb25zRm9yVHlwZSBhbmQgUmVzdHJpY3RUb1NhbWVPcmlnaW4sIGRlZmF1bHQgYmVpbmcKKyAg ICAgICAgY29ycy9Vc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSBhcyBwZXIgZmV0 Y2ggc3BlY2lmaWNhdGlvbi4KKworICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAg ICAgICAgKiBjc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NJ bWFnZVNldFZhbHVlOjpjYWNoZWRJbWFnZVNldCk6CisgICAgICAgICogY3NzL0NTU0ltYWdlVmFs dWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW1hZ2VWYWx1ZTo6Y2FjaGVkSW1hZ2UpOgor ICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgKiBsb2Fk ZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlc291 cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9OZXRzY2FwZVBs dWdJblN0cmVhbUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXRzY2FwZVBsdWdJblN0 cmVhbUxvYWRlcjo6TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIpOgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h ZGVyT3B0aW9uczo6UmVzb3VyY2VMb2FkZXJPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlTG9hZGVyT3B0aW9uczo6cmVxdWVzdE9yaWdpblBvbGljeSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6OnNldFJlcXVlc3RPcmlnaW5Qb2xp Y3kpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6aW5pdCk6CisgICAgICAgIChXZWJD b3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwpOgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFVzZXJDU1NTdHlsZVNoZWV0KToKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpkZWZhdWx0Q2FjaGVkUmVzb3VyY2VP cHRpb25zKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0QXNQb3RlbnRp YWxseUNyb3NzT3JpZ2luKToKKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okljb25Mb2FkZXI6OnN0YXJ0TG9hZGluZyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlcjo6c3Rh cnRMb2FkaW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW06CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3Jl QVZGUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGluZyk6CisgICAgICAgICogc3R5bGUvU3R5bGVQ ZW5kaW5nUmVzb3VyY2VzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpsb2FkUGVuZGlu Z0ltYWdlKToKKwogMjAxNi0wNy0wMiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CiAKICAgICAgICAgU3luY2hyb25vdXMgcHJlZmxpZ2h0IGNoZWNrZXIgc2hvdWxkIHNldCBsb2Fk aW5nIG9wdGlvbnMgdG8gbm90IHVzZSBjcmVkZW50aWFscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0lt YWdlU2V0VmFsdWUuY3BwCmluZGV4IDU5NjY4NjExY2EzNjk1MDU4YWZjOGJmNzlhODk0ODAzZmQx M2RhZTIuLjI4MmMwYWQzNTE1MjcwZTY4MTk4ZDQzZGI4Y2I3YzM2NjljNTIxNzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZhbHVlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5jcHAKQEAgLTExOCw3ICsxMTgsNyBAQCBTdHls ZUNhY2hlZEltYWdlU2V0KiBDU1NJbWFnZVNldFZhbHVlOjpjYWNoZWRJbWFnZVNldChDYWNoZWRS ZXNvdXJjZUxvYWRlciYgbG9hZAogICAgICAgICBJbWFnZVdpdGhTY2FsZSBpbWFnZSA9IGJlc3RJ bWFnZUZvclNjYWxlRmFjdG9yKCk7CiAgICAgICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1 ZXN0KFJlc291cmNlUmVxdWVzdChkb2N1bWVudC0+Y29tcGxldGVVUkwoaW1hZ2UuaW1hZ2VVUkwp KSwgb3B0aW9ucyk7CiAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNl UmVxdWVzdEluaXRpYXRvcnMoKS5jc3MpOwotICAgICAgICBpZiAob3B0aW9ucy5yZXF1ZXN0T3Jp Z2luUG9saWN5KCkgPT0gUG90ZW50aWFsbHlDcm9zc09yaWdpbkVuYWJsZWQpIHsKKyAgICAgICAg aWYgKG9wdGlvbnMubW9kZSA9PSBGZXRjaE9wdGlvbnM6Ok1vZGU6OkNvcnMpIHsKICAgICAgICAg ICAgIEFTU0VSVChkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSk7CiAgICAgICAgICAgICB1cGRh dGVSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbChyZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3Qo KSwgKmRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLCBvcHRpb25zLmFsbG93Q3JlZGVudGlhbHMo KSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVZh bHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVZhbHVlLmNwcAppbmRleCA2ODEz MWJlM2Y5YjI1OWEyM2I4ZTU3ZTI4NDhmMTAyMjVmOTk5NjIyLi4yMjUzZTVlYWViOThjZWZhYjNi ZDlhY2IwNGVhMDY1YmZlNDVlNzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT SW1hZ2VWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlVmFsdWUuY3Bw CkBAIC04Miw3ICs4Miw3IEBAIFN0eWxlQ2FjaGVkSW1hZ2UqIENTU0ltYWdlVmFsdWU6OmNhY2hl ZEltYWdlKENhY2hlZFJlc291cmNlTG9hZGVyJiBsb2FkZXIsIGNvbnN0CiAgICAgICAgIGVsc2UK ICAgICAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKG1faW5pdGlhdG9yTmFtZSk7CiAKLSAg ICAgICAgaWYgKG9wdGlvbnMucmVxdWVzdE9yaWdpblBvbGljeSgpID09IFBvdGVudGlhbGx5Q3Jv c3NPcmlnaW5FbmFibGVkKSB7CisgICAgICAgIGlmIChvcHRpb25zLm1vZGUgPT0gRmV0Y2hPcHRp b25zOjpNb2RlOjpDb3JzKSB7CiAgICAgICAgICAgICBBU1NFUlQobG9hZGVyLmRvY3VtZW50KCkt PnNlY3VyaXR5T3JpZ2luKCkpOwogICAgICAgICAgICAgdXBkYXRlUmVxdWVzdEZvckFjY2Vzc0Nv bnRyb2wocmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCksICpsb2FkZXIuZG9jdW1lbnQo KS0+c2VjdXJpdHlPcmlnaW4oKSwgb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzKCkpOwogICAgICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAzMmEwNWVi YjNmNjUxYmEwYTQ0NGE4MDAxNTFmNzcyN2UwOGEyNTdlLi41OGMxNWRjYmIyNTY3ZGUwYThjMjkw ZDUwMjczOGJjNDRmYzgzMzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5jcHAKQEAgLTE1MTAsNyArMTUxMCw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9h ZGluZ01haW5SZXNvdXJjZSgpCiAgICAgLy8gSWYgdGhpcyBpcyBhIHJlbG9hZCB0aGUgY2FjaGUg bGF5ZXIgbWlnaHQgaGF2ZSBtYWRlIHRoZSBwcmV2aW91cyByZXF1ZXN0IGNvbmRpdGlvbmFsLiBE b2N1bWVudExvYWRlciBjYW4ndCBoYW5kbGUgMzA0IHJlc3BvbnNlcyBpdHNlbGYuCiAgICAgcmVx dWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwogCi0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJl c291cmNlTG9hZGVyT3B0aW9ucz4gbWFpblJlc291cmNlTG9hZE9wdGlvbnMoU2VuZENhbGxiYWNr cywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tD bGllbnRGb3JBbGxDcmVkZW50aWFscywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVudGlhbHMsIFNraXBT ZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgSW5jbHVk ZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xp Y3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5n UG9saWN5OjpBbGxvd0NhY2hpbmcpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXNvdXJj ZUxvYWRlck9wdGlvbnM+IG1haW5SZXNvdXJjZUxvYWRPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNu aWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50 Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBTa2lwU2VjdXJp dHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIEluY2x1ZGVDZXJ0aWZpY2F0ZUlu Zm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVy c0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dD YWNoaW5nKTsKICAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVkUmVzb3VyY2VSZXF1ZXN0 KHJlcXVlc3QsIG1haW5SZXNvdXJjZUxvYWRPcHRpb25zKTsKICAgICBjYWNoZWRSZXNvdXJjZVJl cXVlc3Quc2V0SW5pdGlhdG9yKCp0aGlzKTsKICAgICBtX21haW5SZXNvdXJjZSA9IG1fY2FjaGVk UmVzb3VyY2VMb2FkZXItPnJlcXVlc3RNYWluUmVzb3VyY2UoY2FjaGVkUmVzb3VyY2VSZXF1ZXN0 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAppbmRl eCBlYzVmYzRiY2I0YzkxYjg4MWE0N2E5Zjk5OGZlNmMzOTI1YWVlZDExLi5lYTVkMGY1ZGZiNjcw OTc3ODVmN2RkODUxOGRjZTA1MWE4Yzg2ZmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L01lZGlhUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC02Myw3ICs2Myw3IEBAIFJlZlB0cjxQbGF0Zm9y bU1lZGlhUmVzb3VyY2U+IE1lZGlhUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShjb25z dCBSZXNvdXJjCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgRGF0YUJ1ZmZlcmluZ1Bv bGljeSBidWZmZXJpbmdQb2xpY3kgPSBvcHRpb25zICYgTG9hZE9wdGlvbjo6QnVmZmVyRGF0YSA/ IFdlYkNvcmU6OkJ1ZmZlckRhdGEgOiBXZWJDb3JlOjpEb05vdEJ1ZmZlckRhdGE7Ci0gICAgUmVx dWVzdE9yaWdpblBvbGljeSBjb3JzUG9saWN5ID0gIW1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgp ID8gUG90ZW50aWFsbHlDcm9zc09yaWdpbkVuYWJsZWQgOiBVc2VEZWZhdWx0T3JpZ2luUmVzdHJp Y3Rpb25zRm9yVHlwZTsKKyAgICBGZXRjaE9wdGlvbnM6Ok1vZGUgY29yc1BvbGljeSA9ICFtX2Ny b3NzT3JpZ2luTW9kZS5pc051bGwoKSA/IEZldGNoT3B0aW9uczo6TW9kZTo6Q29ycyA6IEZldGNo T3B0aW9uczo6TW9kZTo6Tm9Db3JzOwogICAgIGF1dG8gY2FjaGluZ1BvbGljeSA9IG9wdGlvbnMg JiBMb2FkT3B0aW9uOjpEaXNhbGxvd0NhY2hpbmcgPyBDYWNoaW5nUG9saWN5OjpEaXNhbGxvd0Nh Y2hpbmcgOiBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmc7CiAgICAgU3RvcmVkQ3JlZGVudGlh bHMgYWxsb3dDcmVkZW50aWFscyA9IG1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpIHx8IGVxdWFs TGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1fY3Jvc3NPcmlnaW5Nb2RlLCAidXNlLWNyZWRlbnRp YWxzIikgPyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRp YWxzOwogCkBAIC03Miw3ICs3Miw3IEBAIFJlZlB0cjxQbGF0Zm9ybU1lZGlhUmVzb3VyY2U+IE1l ZGlhUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShjb25zdCBSZXNvdXJjCiAjaWYgSEFW RShBVkZPVU5EQVRJT05fTE9BREVSX0RFTEVHQVRFKSAmJiBQTEFURk9STShNQUMpCiAgICAgLy8g RklYTUU6IFdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS8yNjA3MTYwNz4uIFdlIGFyZSBu b3QgYWJsZSB0byBkbyBDT1JTIGNoZWNraW5nIG9uIDMwNCByZXNwb25zZXMgYmVjYXVzZSB0aGV5 CiAgICAgLy8gYXJlIHVzdWFsbHkgbWlzc2luZyB0aGUgaGVhZGVycyB3ZSBuZWVkLgotICAgIGlm IChjb3JzUG9saWN5ID09IFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkKQorICAgIGlmIChj b3JzUG9saWN5ID09IEZldGNoT3B0aW9uczo6TW9kZTo6Q29ycykKICAgICAgICAgdXBkYXRlZFJl cXVlc3QubWFrZVVuY29uZGl0aW9uYWwoKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAppbmRleCAzYTVkYzZi YmNkMWM2NDY5YjU0YmQ0NDhiM2Q0NGI0ZWFmMmMwM2VmLi5iNDU3NTkwZTc0YmM3YWQxZGQzNTFk N2JkNTE2NjQ3NDJlZDMyZTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0 c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9O ZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogLy8gRklYTUU6IFNraXAgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgY2hlY2sg d2hlbiBhc3NvY2lhdGVkIHBsdWdpbiBlbGVtZW50IGlzIGluIGEgdXNlciBhZ2VudCBzaGFkb3cg dHJlZS4KIC8vIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NjY2Mz4uCiBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6TmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXIoRnJhbWUmIGZyYW1lLCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlckNsaWVudCYgY2xp ZW50KQotICAgIDogUmVzb3VyY2VMb2FkZXIoZnJhbWUsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhT ZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIERvTm90QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRD cmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENy ZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9u c0ZvclR5cGUsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9s aWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dE ZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpKQorICAgIDogUmVzb3Vy Y2VMb2FkZXIoZnJhbWUsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlm ZkNvbnRlbnQsIERvTm90QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xp ZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBTa2lwU2Vj dXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90SW5jbHVkZUNlcnRp ZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVj aywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5 OjpBbGxvd0NhY2hpbmcpKQogICAgICwgbV9jbGllbnQoJmNsaWVudCkKIHsKICNpZiBFTkFCTEUo Q09OVEVOVF9FWFRFTlNJT05TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyT3B0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZGVyT3B0aW9ucy5oCmluZGV4IDg1Nzg4MzIxOWZkMmJmMWNmZTRiYzUyZGZlOTFhMjI1NTZlMTdj YTAuLjE4OGY2ODllODc4ZGE3ODk3ZmJjNjJlNDFlNWI5ZWQ2ZTdmMDc1MGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmgKQEAgLTU1LDEyICs1NSw2 IEBAIGVudW0gU2VjdXJpdHlDaGVja1BvbGljeSB7CiAgICAgRG9TZWN1cml0eUNoZWNrCiB9Owog Ci1lbnVtIFJlcXVlc3RPcmlnaW5Qb2xpY3kgewotICAgIFVzZURlZmF1bHRPcmlnaW5SZXN0cmlj dGlvbnNGb3JUeXBlLAotICAgIFJlc3RyaWN0VG9TYW1lT3JpZ2luLAotICAgIFBvdGVudGlhbGx5 Q3Jvc3NPcmlnaW5FbmFibGVkIC8vIEluZGljYXRlcyAicG90ZW50aWFsbHkgQ09SUy1lbmFibGVk IGZldGNoIiBpbiBIVE1MIHN0YW5kYXJkLgotfTsKLQogZW51bSBDZXJ0aWZpY2F0ZUluZm9Qb2xp Y3kgewogICAgIEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sCiAgICAgRG9Ob3RJbmNsdWRlQ2VydGlm aWNhdGVJbmZvCkBAIC05MCwxMiArODQsMTEgQEAgc3RydWN0IFJlc291cmNlTG9hZGVyT3B0aW9u cyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgICAgICAsIG1fY2xpZW50Q3JlZGVudGlhbFBv bGljeShEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzKQogICAgICAgICAsIG1fY3JlZGVu dGlhbFJlcXVlc3QoQ2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzKQogICAgICAgICAsIG1f c2VjdXJpdHlDaGVjayhEb1NlY3VyaXR5Q2hlY2spCi0gICAgICAgICwgbV9yZXF1ZXN0T3JpZ2lu UG9saWN5KFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlKQogICAgICAgICAsIG1f Y2VydGlmaWNhdGVJbmZvUG9saWN5KERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbykKICAgICB7 CiAgICAgfQogCi0gICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja1BvbGljeSBz ZW5kTG9hZENhbGxiYWNrcywgQ29udGVudFNuaWZmaW5nUG9saWN5IHNuaWZmQ29udGVudCwgRGF0 YUJ1ZmZlcmluZ1BvbGljeSBkYXRhQnVmZmVyaW5nUG9saWN5LCBTdG9yZWRDcmVkZW50aWFscyBh bGxvd0NyZWRlbnRpYWxzLCBDbGllbnRDcmVkZW50aWFsUG9saWN5IGNyZWRlbnRpYWxQb2xpY3ks IENyZWRlbnRpYWxSZXF1ZXN0IGNyZWRlbnRpYWxSZXF1ZXN0LCBTZWN1cml0eUNoZWNrUG9saWN5 IHNlY3VyaXR5Q2hlY2ssIFJlcXVlc3RPcmlnaW5Qb2xpY3kgcmVxdWVzdE9yaWdpblBvbGljeSwg Q2VydGlmaWNhdGVJbmZvUG9saWN5IGNlcnRpZmljYXRlSW5mb1BvbGljeSwgQ29udGVudFNlY3Vy aXR5UG9saWN5SW1wb3NpdGlvbiBjb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uLCBEZWZl cnNMb2FkaW5nUG9saWN5IGRlZmVyc0xvYWRpbmdQb2xpY3ksIENhY2hpbmdQb2xpY3kgY2FjaGlu Z1BvbGljeSkKKyAgICBSZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrUG9saWN5IHNl bmRMb2FkQ2FsbGJhY2tzLCBDb250ZW50U25pZmZpbmdQb2xpY3kgc25pZmZDb250ZW50LCBEYXRh QnVmZmVyaW5nUG9saWN5IGRhdGFCdWZmZXJpbmdQb2xpY3ksIFN0b3JlZENyZWRlbnRpYWxzIGFs bG93Q3JlZGVudGlhbHMsIENsaWVudENyZWRlbnRpYWxQb2xpY3kgY3JlZGVudGlhbFBvbGljeSwg Q3JlZGVudGlhbFJlcXVlc3QgY3JlZGVudGlhbFJlcXVlc3QsIFNlY3VyaXR5Q2hlY2tQb2xpY3kg c2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlIG1vZGUsIENlcnRpZmljYXRlSW5mb1Bv bGljeSBjZXJ0aWZpY2F0ZUluZm9Qb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRp b24gY29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiwgRGVmZXJzTG9hZGluZ1BvbGljeSBk ZWZlcnNMb2FkaW5nUG9saWN5LCBDYWNoaW5nUG9saWN5IGNhY2hpbmdQb2xpY3kpCiAgICAgICAg IDogbV9zZW5kTG9hZENhbGxiYWNrcyhzZW5kTG9hZENhbGxiYWNrcykKICAgICAgICAgLCBtX3Nu aWZmQ29udGVudChzbmlmZkNvbnRlbnQpCiAgICAgICAgICwgbV9kYXRhQnVmZmVyaW5nUG9saWN5 KGRhdGFCdWZmZXJpbmdQb2xpY3kpCkBAIC0xMDMsMTIgKzk2LDEyIEBAIHN0cnVjdCBSZXNvdXJj ZUxvYWRlck9wdGlvbnMgOiBwdWJsaWMgRmV0Y2hPcHRpb25zIHsKICAgICAgICAgLCBtX2NsaWVu dENyZWRlbnRpYWxQb2xpY3koY3JlZGVudGlhbFBvbGljeSkKICAgICAgICAgLCBtX2NyZWRlbnRp YWxSZXF1ZXN0KGNyZWRlbnRpYWxSZXF1ZXN0KQogICAgICAgICAsIG1fc2VjdXJpdHlDaGVjayhz ZWN1cml0eUNoZWNrKQotICAgICAgICAsIG1fcmVxdWVzdE9yaWdpblBvbGljeShyZXF1ZXN0T3Jp Z2luUG9saWN5KQogICAgICAgICAsIG1fY2VydGlmaWNhdGVJbmZvUG9saWN5KGNlcnRpZmljYXRl SW5mb1BvbGljeSkKICAgICAgICAgLCBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24o Y29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbikKICAgICAgICAgLCBtX2RlZmVyc0xvYWRp bmdQb2xpY3koZGVmZXJzTG9hZGluZ1BvbGljeSkKICAgICAgICAgLCBtX2NhY2hpbmdQb2xpY3ko Y2FjaGluZ1BvbGljeSkKICAgICB7CisgICAgICAgIHRoaXMtPm1vZGUgPSBtb2RlOwogICAgIH0K IAogICAgIFNlbmRDYWxsYmFja1BvbGljeSBzZW5kTG9hZENhbGxiYWNrcygpIGNvbnN0IHsgcmV0 dXJuIHN0YXRpY19jYXN0PFNlbmRDYWxsYmFja1BvbGljeT4obV9zZW5kTG9hZENhbGxiYWNrcyk7 IH0KQEAgLTEyNSw4ICsxMTgsNiBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIDogcHVi bGljIEZldGNoT3B0aW9ucyB7CiAgICAgdm9pZCBzZXRDcmVkZW50aWFsUmVxdWVzdChDcmVkZW50 aWFsUmVxdWVzdCBjcmVkZW50aWFsUmVxdWVzdCkgeyBtX2NyZWRlbnRpYWxSZXF1ZXN0ID0gY3Jl ZGVudGlhbFJlcXVlc3Q7IH0KICAgICBTZWN1cml0eUNoZWNrUG9saWN5IHNlY3VyaXR5Q2hlY2so KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxTZWN1cml0eUNoZWNrUG9saWN5PihtX3NlY3Vy aXR5Q2hlY2spOyB9CiAgICAgdm9pZCBzZXRTZWN1cml0eUNoZWNrKFNlY3VyaXR5Q2hlY2tQb2xp Y3kgY2hlY2spIHsgbV9zZWN1cml0eUNoZWNrID0gY2hlY2s7IH0KLSAgICBSZXF1ZXN0T3JpZ2lu UG9saWN5IHJlcXVlc3RPcmlnaW5Qb2xpY3koKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxS ZXF1ZXN0T3JpZ2luUG9saWN5PihtX3JlcXVlc3RPcmlnaW5Qb2xpY3kpOyB9Ci0gICAgdm9pZCBz ZXRSZXF1ZXN0T3JpZ2luUG9saWN5KFJlcXVlc3RPcmlnaW5Qb2xpY3kgcG9saWN5KSB7IG1fcmVx dWVzdE9yaWdpblBvbGljeSA9IHBvbGljeTsgfQogICAgIENlcnRpZmljYXRlSW5mb1BvbGljeSBj ZXJ0aWZpY2F0ZUluZm9Qb2xpY3koKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxDZXJ0aWZp Y2F0ZUluZm9Qb2xpY3k+KG1fY2VydGlmaWNhdGVJbmZvUG9saWN5KTsgfQogICAgIHZvaWQgc2V0 Q2VydGlmaWNhdGVJbmZvUG9saWN5KENlcnRpZmljYXRlSW5mb1BvbGljeSBwb2xpY3kpIHsgbV9j ZXJ0aWZpY2F0ZUluZm9Qb2xpY3kgPSBwb2xpY3k7IH0KICAgICBDb250ZW50U2VjdXJpdHlQb2xp Y3lJbXBvc2l0aW9uIGNvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBtX2NvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb247IH0KQEAgLTE0Myw3ICsxMzQs NiBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIDogcHVibGljIEZldGNoT3B0aW9ucyB7 CiAgICAgdW5zaWduZWQgbV9jbGllbnRDcmVkZW50aWFsUG9saWN5IDogMjsgLy8gV2hlbiB3ZSBz aG91bGQgYXNrIHRoZSBjbGllbnQgZm9yIGNyZWRlbnRpYWxzIChpZiB3ZSBhbGxvdyBjcmVkZW50 aWFscyBhdCBhbGwpLgogICAgIHVuc2lnbmVkIG1fY3JlZGVudGlhbFJlcXVlc3Q6IDE7IC8vIFdo ZXRoZXIgdGhlIGNsaWVudCAoZS5nLiBYSFIpIHdhbnRlZCBjcmVkZW50aWFscyBpbiB0aGUgZmly c3QgcGxhY2UuCiAgICAgdW5zaWduZWQgbV9zZWN1cml0eUNoZWNrIDogMTsKLSAgICB1bnNpZ25l ZCBtX3JlcXVlc3RPcmlnaW5Qb2xpY3kgOiAyOwogICAgIHVuc2lnbmVkIG1fY2VydGlmaWNhdGVJ bmZvUG9saWN5IDogMTsgLy8gV2hldGhlciB0aGUgcmVzcG9uc2Ugc2hvdWxkIGluY2x1ZGUgY2Vy dGlmaWNhdGUgaW5mby4KICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uIG1fY29u dGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiB7IENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9z aXRpb246OkRvUG9saWN5Q2hlY2sgfTsKICAgICBEZWZlcnNMb2FkaW5nUG9saWN5IG1fZGVmZXJz TG9hZGluZ1BvbGljeSB7IERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZyB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYmQ5 OTM0ZDFiYWM0ODlmMzUyYTQzZTZmMzQxOGU4OTM4YjIxODNhYi4uZWYyODhmMjgxZjUwNTk5MTMy OTc1YmY2MjVmNDYwNDBlNzFkMWQ4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVz b3VyY2VMb2FkZXIuY3BwCkBAIC0xNTAsOCArMTUwLDggQEAgYm9vbCBTdWJyZXNvdXJjZUxvYWRl cjo6aW5pdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiAKICAgICAvLyBGSVhNRTog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTYzMy4KICAgICAvLyBT dWJyZXNvdXJjZUxvYWRlciBjb3VsZCB1c2UgdGhlIGRvY3VtZW50IG9yaWdpbiBhcyBhIGRlZmF1 bHQgYW5kIHNldCBQb3RlbnRpYWxseUNyb3NzT3JpZ2luRW5hYmxlZCByZXF1ZXN0cyBhY2NvcmRp bmdseS4KLSAgICAvLyBUaGlzIHdvdWxkIHNpbXBsaWZ5IHJlc291cmNlIGxvYWRlciB1c2VycyBh cyB0aGV5IHdvdWxkIG9ubHkgbmVlZCB0byBzZXQgdGhlIHBvbGljeSB0byBQb3RlbnRpYWxseUNy b3NzT3JpZ2luRW5hYmxlZC4KLSAgICBpZiAob3B0aW9ucygpLnJlcXVlc3RPcmlnaW5Qb2xpY3ko KSA9PSBQb3RlbnRpYWxseUNyb3NzT3JpZ2luRW5hYmxlZCkKKyAgICAvLyBUaGlzIHdvdWxkIHNp bXBsaWZ5IHJlc291cmNlIGxvYWRlciB1c2VycyBhcyB0aGV5IHdvdWxkIG9ubHkgbmVlZCB0byBz ZXQgZmV0Y2ggbW9kZSB0byBDb3JzLgorICAgIGlmIChvcHRpb25zKCkubW9kZSA9PSBGZXRjaE9w dGlvbnM6Ok1vZGU6OkNvcnMpCiAgICAgICAgIG1fb3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNy ZWF0ZUZyb21TdHJpbmcocmVxdWVzdC5odHRwT3JpZ2luKCkpOwogCiAgICAgcmV0dXJuIHRydWU7 CkBAIC0yMDIsNyArMjAyLDcgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1 ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0LCBjb24KICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChvcHRpb25zKCkucmVxdWVzdE9yaWdp blBvbGljeSgpID09IFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkICYmICFjaGVja0Nyb3Nz T3JpZ2luQWNjZXNzQ29udHJvbChyZXF1ZXN0KCksIHJlZGlyZWN0UmVzcG9uc2UsIG5ld1JlcXVl c3QpKSB7CisgICAgICAgIGlmIChvcHRpb25zKCkubW9kZSA9PSBGZXRjaE9wdGlvbnM6Ok1vZGU6 OkNvcnMgJiYgIWNoZWNrQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9sKHJlcXVlc3QoKSwgcmVkaXJl Y3RSZXNwb25zZSwgbmV3UmVxdWVzdCkpIHsKICAgICAgICAgICAgIGNhbmNlbCgpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCA3N2U2NDM3ZmJmZTM1MDExNTk0 NzIyODU4MzlkZDhlYzYzNjc2ZWU1Li4yM2E0ZmE2YjY0ZTY4MjVlODBmM2FlYTkzZWEwZGU5ZWM2 MTNkMDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZUxvYWRlci5jcHAKQEAgLTI0MSw3ICsyNDEsNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRs ZTxDYWNoZWRDU1NTdHlsZVNoZWV0PiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFVzZXJD U1NTdAogICAgICAgICBtZW1vcnlDYWNoZS5hZGQoKnVzZXJTaGVldCk7CiAgICAgLy8gRklYTUU6 IGxvYWRSZXNvdXJjZSBjYWxscyBzZXRPd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlcigpIGlmIHRo ZSByZXNvdXJjZSBjb3VsZG4ndCBiZSBhZGRlZCB0byBjYWNoZS4gRG9lcyB0aGlzIGZ1bmN0aW9u IG5lZWQgdG8gY2FsbCBpdCwgdG9vPwogCi0gICAgdXNlclNoZWV0LT5sb2FkKCp0aGlzLCBSZXNv dXJjZUxvYWRlck9wdGlvbnMoRG9Ob3RTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZl ckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRpYWxz LCBDbGllbnRSZXF1ZXN0ZWRDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ssIFVzZURlZmF1 bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8s IENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OlNraXBQb2xpY3lDaGVjaywgRGVmZXJz TG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0Nh Y2hpbmcpKTsKKyAgICB1c2VyU2hlZXQtPmxvYWQoKnRoaXMsIFJlc291cmNlTG9hZGVyT3B0aW9u cyhEb05vdFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9y ZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIENsaWVudFJlcXVlc3Rl ZENyZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0Nv cnMsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1w b3NpdGlvbjo6U2tpcFBvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVy c0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkFsbG93Q2FjaGluZykpOwogICAgIAogICAgIHJldHVy biB1c2VyU2hlZXQ7CiB9CkBAIC00MTEsNyArNDExLDcgQEAgYm9vbCBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6Y2FuUmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBjb25zdCBVUkwmIHVy bCwKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6VGV4 dFRyYWNrUmVzb3VyY2U6CiAjZW5kaWYKLSAgICAgICAgaWYgKG9wdGlvbnMucmVxdWVzdE9yaWdp blBvbGljeSgpID09IFJlc3RyaWN0VG9TYW1lT3JpZ2luICYmICFtX2RvY3VtZW50LT5zZWN1cml0 eU9yaWdpbigpLT5jYW5SZXF1ZXN0KHVybCkpIHsKKyAgICAgICAgaWYgKG9wdGlvbnMubW9kZSA9 PSBGZXRjaE9wdGlvbnM6Ok1vZGU6OlNhbWVPcmlnaW4gJiYgIW1fZG9jdW1lbnQtPnNlY3VyaXR5 T3JpZ2luKCktPmNhblJlcXVlc3QodXJsKSkgewogICAgICAgICAgICAgcHJpbnRBY2Nlc3NEZW5p ZWRNZXNzYWdlKHVybCk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAg LTExOTAsNyArMTE5MCw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnByaW50UHJlbG9h ZFN0YXRzKCkKIAogY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6ZGVmYXVsdENhY2hlZFJlc291cmNlT3B0aW9ucygpCiB7Ci0gICAgc3RhdGljIFJlc291 cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVm ZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlh bHMsIENsaWVudFJlcXVlc3RlZENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1 bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8s IENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xv YWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6QWxsb3dDYWNo aW5nKTsKKyAgICBzdGF0aWMgUmVzb3VyY2VMb2FkZXJPcHRpb25zIG9wdGlvbnMoU2VuZENhbGxi YWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBB c2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgQ2xpZW50UmVxdWVzdGVkQ3JlZGVudGlhbHMsIERv U2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90SW5jbHVkZUNl cnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lD aGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9s aWN5OjpBbGxvd0NhY2hpbmcpOwogICAgIHJldHVybiBvcHRpb25zOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCmlu ZGV4IDFkMjU1YmNmZDZiMmU5NTcxYTQwYTQzYTkxNWExMjljMDhkODNhZTYuLjZhOWU0MjExNTU4 OWYyMzVhMzI5NjE4MWMwMjI4NjFiZGEyZGYwYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCkBAIC05NSw5ICs5NSwx MCBAQCBjb25zdCBBdG9taWNTdHJpbmcmIENhY2hlZFJlc291cmNlUmVxdWVzdDo6aW5pdGlhdG9y TmFtZSgpIGNvbnN0CiAKIHZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0OjpzZXRBc1BvdGVudGlh bGx5Q3Jvc3NPcmlnaW4oY29uc3QgU3RyaW5nJiBtb2RlLCBEb2N1bWVudCYgZG9jdW1lbnQpCiB7 CisgICAgQVNTRVJUKG1fb3B0aW9ucy5tb2RlID09IEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3Jz KTsKICAgICBpZiAobW9kZS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwotICAgIG1fb3B0aW9u cy5zZXRSZXF1ZXN0T3JpZ2luUG9saWN5KFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkKTsK KyAgICBtX29wdGlvbnMubW9kZSA9IEZldGNoT3B0aW9uczo6TW9kZTo6Q29yczsKICAgICBtX29w dGlvbnMuc2V0QWxsb3dDcmVkZW50aWFscyhlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZSht b2RlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RB bGxvd1N0b3JlZENyZWRlbnRpYWxzKTsKIAogICAgIEFTU0VSVChkb2N1bWVudC5zZWN1cml0eU9y aWdpbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25Mb2Fk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKaW5kZXgg NGEwZmQyN2M2MDE2ZTc2YWNiNjA0ZjA5NWViMzNkM2UzNTQ4MzAwNS4uNTU3MTEzYjhhY2Y4ZjFk YTkzMjFmOGJkZjdiOWYwYjA0MTc0ZDU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24v SWNvbkxvYWRlci5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBJY29uTG9hZGVyOjpzdGFydExv YWRpbmcoKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb250ZW50U2VjdXJpdHlQb2xpY3lJ bXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrIGlzIGEgcGxhY2Vob2xkZXIgdmFsdWUuIEl0IGRvZXMg bm90IGFmZmVjdCB0aGUgcmVxdWVzdCBzaW5jZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkb2Vz IG5vdCBhcHBseSB0byByYXcgcmVzb3VyY2VzLgotICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBy ZXF1ZXN0KFJlc291cmNlUmVxdWVzdChtX2ZyYW1lLmxvYWRlcigpLmljb24oKS51cmwoKSksIFJl c291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRh dGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JBbnlDcmVk ZW50aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ss IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZp Y2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ss IERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6 QWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3Vy Y2VSZXF1ZXN0KG1fZnJhbWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3VyY2VMb2FkZXJP cHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxv d1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzLCBDbGll bnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25z OjpNb2RlOjpOb0NvcnMsIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3Vy aXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6 QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpKTsKIAogICAg IHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLnNldFByaW9yaXR5KFJlc291cmNlTG9h ZFByaW9yaXR5OjpMb3cpOwogICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNl UmVxdWVzdEluaXRpYXRvcnMoKS5pY29uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9XZWJDb3JlQVZDRlJlc291cmNlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9X ZWJDb3JlQVZDRlJlc291cmNlTG9hZGVyLmNwcAppbmRleCA2N2MzZDU3YzI4NDMwODJhZjg5Mjhm NjNjN2JlN2U3M2E1MmVkOTg5Li41MjEwNDc5NGMzZjY4OGU5NWFhMDhmMDk1MzRjZWNiOGM1OWFl ZDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vY2YvV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL1dlYkNvcmVBVkNGUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC03MSw3ICs3MSw3IEBAIHZvaWQgV2ViQ29yZUFWQ0ZSZXNvdXJjZUxvYWRl cjo6c3RhcnRMb2FkaW5nKCkKICAgICBSZXRhaW5QdHI8Q0ZVUkxSZXF1ZXN0UmVmPiB1cmxSZXF1 ZXN0ID0gQVZDRkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVzdEdldFVSTFJlcXVlc3QobV9hdlJl cXVlc3QuZ2V0KCkpOwogCiAgICAgLy8gQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6 RG9Qb2xpY3lDaGVjayBpcyBhIHBsYWNlaG9sZGVyIHZhbHVlLiBJdCBkb2VzIG5vdCBhZmZlY3Qg dGhlIHJlcXVlc3Qgc2luY2UgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgZG9lcyBub3QgYXBwbHkg dG8gcmF3IHJlc291cmNlcy4KLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNv dXJjZVJlcXVlc3QodXJsUmVxdWVzdC5nZXQoKSksIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5k Q2FsbGJhY2tzLCBEb05vdFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3Jl ZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckNyb3NzT3JpZ2luQ3JlZGVudGlhbHMsIENs aWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0 T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBD b250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2Fk aW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkRpc2FsbG93Q2Fj aGluZykpOworICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVz dCh1cmxSZXF1ZXN0LmdldCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3Ms IERvTm90U25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlh bHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90 UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIEZldGNoT3B0aW9uczo6TW9kZTo6 Tm9Db3JzLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGlj eUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVm ZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nKSk7CiAKICAgICByZXF1 ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlv cml0eTo6TG93KTsKICAgICBDYWNoZWRSZXNvdXJjZUxvYWRlciogbG9hZGVyID0gbV9wYXJlbnQt PnBsYXllcigpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291 cmNlTG9hZGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCmluZGV4IDkyNjlmZTFlMDdiMjlm ZGIwZGI1ZTQ0OTcwMzkyMTYwOTExMGI1YTUuLmMyNzBkMWI2Zjg1ZWJhYjgwN2I5OTk2ZTJmMTg5 NTNjNzhkZTYwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZG UmVzb3VyY2VMb2FkZXIubW0KQEAgLTY5LDcgKzY5LDcgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3Vy Y2VMb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAKICAgICAvLyBGSVhNRTogU2tpcCBDb250ZW50IFNl Y3VyaXR5IFBvbGljeSBjaGVjayBpZiB0aGUgZWxlbWVudCB0aGF0IGluaXRpdGF0ZWQgdGhpcyBy ZXF1ZXN0CiAgICAgLy8gaXMgaW4gYSB1c2VyLWFnZW50IHNoYWRvdyB0cmVlLiBTZWUgPGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU1MDU+LgotICAgIENhY2hlZFJl c291cmNlUmVxdWVzdCByZXF1ZXN0KG5zUmVxdWVzdCwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNl bmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBEb05vdEFsbG93U3Rv cmVkQ3JlZGVudGlhbHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywg Q2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1 bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8s IENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xv YWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dD YWNoaW5nKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobnNSZXF1ZXN0LCBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIEJ1 ZmZlckRhdGEsIERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JD cm9zc09yaWdpbkNyZWRlbnRpYWxzLCBDbGllbnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMsIERv U2VjdXJpdHlDaGVjaywgRmV0Y2hPcHRpb25zOjpNb2RlOjpOb0NvcnMsIERvTm90SW5jbHVkZUNl cnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lD aGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9s aWN5OjpEaXNhbGxvd0NhY2hpbmcpKTsKICAgICByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVl c3QoKS5zZXRQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eTo6TG93KTsKICAgICBpZiAoYXV0 byogbG9hZGVyID0gbV9wYXJlbnQtPnBsYXllcigpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpKQog ICAgICAgICBtX3Jlc291cmNlID0gbG9hZGVyLT5yZXF1ZXN0TWVkaWEocmVxdWVzdCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVBlbmRpbmdSZXNvdXJjZXMuY3BwIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVQZW5kaW5nUmVzb3VyY2VzLmNwcAppbmRleCBlMTli Mzc1MGJlMTExNWQwZDE1Y2QwNTU4NzdjMTZmYzRiZTcxMWY2Li5lZmNkNWY1NDJhY2Y3NDhlYzcw ODFhM2QzZWJhYmY4ZWYxYzhlYzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZVBlbmRpbmdSZXNvdXJjZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl UGVuZGluZ1Jlc291cmNlcy5jcHAKQEAgLTUyLDcgKzUyLDcgQEAgc3RhdGljIFJlZlB0cjxTdHls ZUltYWdlPiBsb2FkUGVuZGluZ0ltYWdlKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgU3R5bGVJ bWFnZSYKIAogICAgIC8vIEZJWE1FOiBXaHkgZG9lcyBzaGFwZS1vdXRzaWRlIGhhdmUgZGlmZmVy ZW50IHBvbGljeSB0aGFuIG90aGVyIHByb3BlcnRpZXM/CiAgICAgaWYgKGxvYWRQb2xpY3kgPT0g TG9hZFBvbGljeTo6U2hhcGVPdXRzaWRlKSB7Ci0gICAgICAgIG9wdGlvbnMuc2V0UmVxdWVzdE9y aWdpblBvbGljeShQb3RlbnRpYWxseUNyb3NzT3JpZ2luRW5hYmxlZCk7CisgICAgICAgIG9wdGlv bnMubW9kZSA9IEZldGNoT3B0aW9uczo6TW9kZTo6Q29yczsKICAgICAgICAgb3B0aW9ucy5zZXRB bGxvd0NyZWRlbnRpYWxzKERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFscyk7CiAgICAgfQogCg==