208447 2020-03-02 06:32:58 -0800 Make FrameLoadRequest ctor take move parameter 2020-03-02 23:37:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez commit-queue ews-watchlist hi japhet joepeck simon.fraser webkit-bug-importer oldest_to_newest 1624523 0 rbuis 2020-03-02 06:32:58 -0800 Make FrameLoadRequest ctor take move parameter for ResourceRequest 1624526 1 392139 rbuis 2020-03-02 06:38:41 -0800 Created attachment 392139 Patch 1624552 2 392141 rbuis 2020-03-02 08:13:26 -0800 Created attachment 392141 Patch 1624728 3 392185 rbuis 2020-03-02 13:52:10 -0800 Created attachment 392185 Patch 1624965 4 392185 commit-queue 2020-03-02 23:36:48 -0800 Comment on attachment 392185 Patch Clearing flags on attachment: 392185 Committed r257767: <https://trac.webkit.org/changeset/257767> 1624966 5 commit-queue 2020-03-02 23:36:49 -0800 All reviewed patches have been landed. Closing bug. 1624967 6 webkit-bug-importer 2020-03-02 23:37:16 -0800 <rdar://problem/59984865> 392139 2020-03-02 06:38:41 -0800 2020-03-02 08:13:23 -0800 Patch bug-208447-20200302153839.patch text/plain 19119 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M4MDRmOWUwMTQwZGM4 NjA1Y2NiNDMyZjIwNzE0MWUzMWQyNTAyMS4uOGVhYmVlZTZmZWJmNjI0ZDFmYjc4OWE3MDliYzUw N2E5NmIxODI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTAyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwODQ0NworICAgICAgICBNYWtlIEZyYW1lTG9hZFJlcXVlc3Qg Y3RvciB0YWtlIG1vdmUgcGFyYW1ldGVyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBGcmFtZUxvYWRSZXF1ZXN0IGN0b3IgdGFrZSBtb3ZlIHBh cmFtZXRlciBmb3IgUmVzb3VyY2VSZXF1ZXN0LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RnJvbnRlbmRDbGllbnRMb2NhbDo6b3BlbkluTmV3VGFiKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6Om5hdmlnYXRlKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkUmVxdWVz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRSZXF1ZXN0OjpGcmFtZUxvYWRSZXF1 ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5oOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkUmVxdWVzdDo6RnJhbWVMb2FkUmVxdWVzdCk6CisgICAgICAgICogbG9h ZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmF2aWdhdGlv blNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5nZSk6CisgICAgICAgICogcGFnZS9Db250 ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250 cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgICogcGFnZS9ET01XaW5k b3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjpjcmVhdGVXaW5kb3cpOgorCiAy MDIwLTAzLTAxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXggZm9yIG5vbi11bmlmaWVkIGJ1aWxkcyBhZnRlciByMjU3NTA3Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCBkMzg5MjRhNGIyOTg0NWM2NTU0OWIwZGQwMzhmMjE0NWQwZmMyYWUyLi41ZTE0 MmY1MWIwYjc3YjVlZjYwYmZhMTA1YmNjYmZiMmFiZDIzNGUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDIwLTAzLTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODQ0NworICAgICAg ICBNYWtlIEZyYW1lTG9hZFJlcXVlc3QgY3RvciB0YWtlIG1vdmUgcGFyYW1ldGVyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRhcHQgdG8gQVBJIGNo YW5nZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlz cGF0Y2hDcmVhdGVQYWdlKToKKwogMjAyMC0wMy0wMSAgVGluZy1XZWkgTGFuICA8bGFudHc0NEBn bWFpbC5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHRoZSBidWlsZCB3aGVuIFdheWxhbmQgdGFy Z2V0IGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKaW5kZXggMGQ4MzE5MjUyNzgyZGE5NWE3 MmVkMzZjYTVmMDQ4YzdjZDhjODQ2MS4uMTY5M2I0ODAwMjAyZGM4NzA5NGYwODVlMjk0YjRlNTY2 MjM1OWEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kQ2xpZW50TG9jYWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcApAQCAtMjY2LDcgKzI2Niw3IEBAIHZvaWQgSW5z cGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6b3BlbkluTmV3VGFiKGNvbnN0IFN0cmluZyYgdXJs KQogCiAgICAgLy8gRklYTUU6IFdoeSBkbyB3ZSBjb21wdXRlIHRoZSBhYnNvbHV0ZSBVUkwgd2l0 aCByZXNwZWN0IHRvIHxmcmFtZXwgaW5zdGVhZCBvZiB8bWFpbkZyYW1lfD8KICAgICBSZXNvdXJj ZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0IHsgZnJhbWUtPmRvY3VtZW50KCktPmNvbXBsZXRlVVJM KHVybCkgfTsKLSAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QyIHsgKm1haW5G cmFtZS5kb2N1bWVudCgpLCBtYWluRnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwg cmVzb3VyY2VSZXF1ZXN0LCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3 YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRV Ukw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25vd24g fTsKKyAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QyIHsgKm1haW5GcmFtZS5k b2N1bWVudCgpLCBtYWluRnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92 ZShyZXNvdXJjZVJlcXVlc3QpLCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tG b3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRPcGVuRXh0ZXJu YWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25v d24gfTsKICAgICBmcmFtZS0+bG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oV1RGTW92ZShmcmFtZUxv YWRSZXF1ZXN0MikpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5kZXggNzg3ZDYzZDAxMWMzOGNkZDgyZjg4 YmZhZGVlY2RmZWFmZTZhNWQ5Yy4uY2Q1NjVmMzc1YmU0OTc3NTlkYTgwYWU0ODU3MmFiNDhmMTZh ZTE0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0 b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yUGFnZUFnZW50LmNwcApAQCAtNDIxLDcgKzQyMSw3IEBAIHZvaWQgSW5zcGVjdG9yUGFn ZUFnZW50OjpuYXZpZ2F0ZShFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgdXJsKQogICAgIEZy YW1lJiBmcmFtZSA9IG1faW5zcGVjdGVkUGFnZS5tYWluRnJhbWUoKTsKIAogICAgIFJlc291cmNl UmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyBmcmFtZS5kb2N1bWVudCgpLT5jb21wbGV0ZVVSTCh1 cmwpIH07Ci0gICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmZyYW1lLmRv Y3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVx dWVzdCwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5v LCBNYXliZVNlbmRSZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpObywgTmV3 RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpT aG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25vd24gfTsKKyAgICBGcmFt ZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqZnJhbWUuZG9jdW1lbnQoKSwgZnJhbWUu ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJjZVJlcXVlc3QpLCAi X3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJl U2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9w ZW5lclBvbGljeTo6QWxsb3csIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5v dEFsbG93LCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93biB9OwogICAgIGZyYW1lLmxvYWRl cigpLmNoYW5nZUxvY2F0aW9uKFdURk1vdmUoZnJhbWVMb2FkUmVxdWVzdCkpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5jcHAKaW5kZXggODI3ZTQ5MzgyZmM2 ZDhmMjZkODA1NTJkMWYyZDJmNzI4MDhmMjM2Yy4uNTYxNzYyOTFjNzEyYjc5MDAwODRhYjNmZjVm M2Q4YzVlZDBjMzNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRSZXF1ZXN0 LmNwcApAQCAtMzcsMTAgKzM3LDEwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotRnJhbWVM b2FkUmVxdWVzdDo6RnJhbWVMb2FkUmVxdWVzdChEb2N1bWVudCYgcmVxdWVzdGVyLCBTZWN1cml0 eU9yaWdpbiYgcmVxdWVzdGVyU2VjdXJpdHlPcmlnaW4sIGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgTG9ja0hpc3RvcnkgbG9j a0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hvdWxk U2VuZFJlZmVycmVyIHNob3VsZFNlbmRSZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgTmV3RnJhbWVPcGVuZXJQb2xpY3kgbmV3 RnJhbWVPcGVuZXJQb2xpY3ksIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeSwgSW5pdGlhdGVkQnlNYWluRnJhbWUgaW5pdGlhdGVkQnlNYWlu RnJhbWUsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNl RG9jdW1lbnRJZkphdmFTY3JpcHRVUkwsIGNvbnN0IEF0b21TdHJpbmcmIGRvd25sb2FkQXR0cmli dXRlLCBjb25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYgc3lzdGVtUHJldmlld0luZm8pCitGcmFtZUxv YWRSZXF1ZXN0OjpGcmFtZUxvYWRSZXF1ZXN0KERvY3VtZW50JiByZXF1ZXN0ZXIsIFNlY3VyaXR5 T3JpZ2luJiByZXF1ZXN0ZXJTZWN1cml0eU9yaWdpbiwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVzb3Vy Y2VSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgTG9ja0hpc3RvcnkgbG9ja0hpc3Rv cnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hvdWxkU2VuZFJl ZmVycmVyIHNob3VsZFNlbmRSZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFs bG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgTmV3RnJhbWVPcGVuZXJQb2xpY3kgbmV3RnJhbWVP cGVuZXJQb2xpY3ksIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVy bmFsVVJMc1BvbGljeSwgSW5pdGlhdGVkQnlNYWluRnJhbWUgaW5pdGlhdGVkQnlNYWluRnJhbWUs IFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNlRG9jdW1l bnRJZkphdmFTY3JpcHRVUkwsIGNvbnN0IEF0b21TdHJpbmcmIGRvd25sb2FkQXR0cmlidXRlLCBj b25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYgc3lzdGVtUHJldmlld0luZm8pCiAgICAgOiBtX3JlcXVl c3RlciB7IG1ha2VSZWYocmVxdWVzdGVyKSB9CiAgICAgLCBtX3JlcXVlc3RlclNlY3VyaXR5T3Jp Z2luIHsgbWFrZVJlZihyZXF1ZXN0ZXJTZWN1cml0eU9yaWdpbikgfQotICAgICwgbV9yZXNvdXJj ZVJlcXVlc3QgeyByZXNvdXJjZVJlcXVlc3QgfQorICAgICwgbV9yZXNvdXJjZVJlcXVlc3QgeyBX VEZNb3ZlKHJlc291cmNlUmVxdWVzdCkgfQogICAgICwgbV9mcmFtZU5hbWUgeyBmcmFtZU5hbWUg fQogICAgICwgbV9sb2NrSGlzdG9yeSB7IGxvY2tIaXN0b3J5IH0KICAgICAsIG1fbG9ja0JhY2tG b3J3YXJkTGlzdCB7IGxvY2tCYWNrRm9yd2FyZExpc3QgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRSZXF1ZXN0LmgKaW5kZXggNzlhNGJhMmIwOWIyM2QzYzhkMzdiMTljOTdhOTg5OTlm ZWU3NGQ2OC4uZGMwNzVjMjU2NzE4YzM0YWIwNjVkODFkMDg5MWE4NDJlMDBiY2MzMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJlcXVlc3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5oCkBAIC0zOCw3ICszOCw3IEBAIGNs YXNzIFNlY3VyaXR5T3JpZ2luOwogCiBjbGFzcyBGcmFtZUxvYWRSZXF1ZXN0IHsKIHB1YmxpYzoK LSAgICBXRUJDT1JFX0VYUE9SVCBGcmFtZUxvYWRSZXF1ZXN0KERvY3VtZW50JiwgU2VjdXJpdHlP cmlnaW4mLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwg TG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QsIFNob3VsZFNlbmRSZWZlcnJlciwgQWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBOZXdGcmFtZU9wZW5lclBvbGljeSwgU2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeSwgSW5pdGlhdGVkQnlNYWluRnJhbWUsIFNob3VsZFJlcGxhY2VE b2N1bWVudElmSmF2YVNjcmlwdFVSTCA9IFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCwg Y29uc3QgQXRvbVN0cmluZyYgZG93bmxvYWRBdHRyaWJ1dGUgPSB7IH0sIGNvbnN0IFN5c3RlbVBy ZXZpZXdJbmZvJiA9IHsgfSk7CisgICAgV0VCQ09SRV9FWFBPUlQgRnJhbWVMb2FkUmVxdWVzdChE b2N1bWVudCYsIFNlY3VyaXR5T3JpZ2luJiwgUmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFN0cmlu ZyYgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCwgU2hvdWxkU2Vu ZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIE5ld0ZyYW1lT3BlbmVyUG9s aWN5LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBJbml0aWF0ZWRCeU1haW5GcmFtZSwg U2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMID0gUmVwbGFjZURvY3VtZW50SWZK YXZhU2NyaXB0VVJMLCBjb25zdCBBdG9tU3RyaW5nJiBkb3dubG9hZEF0dHJpYnV0ZSA9IHsgfSwg Y29uc3QgU3lzdGVtUHJldmlld0luZm8mID0geyB9KTsKICAgICBXRUJDT1JFX0VYUE9SVCBGcmFt ZUxvYWRSZXF1ZXN0KEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeSwgY29uc3QgU3Vic3RpdHV0ZURhdGEmID0gU3Vic3RpdHV0ZURhdGEo KSk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB+RnJhbWVMb2FkUmVxdWVzdCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwCmluZGV4IDgwZGVkNzk5MjY4 NmMwZmJkY2IxOWFlNDE0MzlkMGFjOWMzMzVlZWYuLmYxODE4YjA3ZGNkYzY2NTcxYmVmY2E2MTVh YmNkZTNiOGNlZGMzNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0 aW9uU2NoZWR1bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNj aGVkdWxlci5jcHAKQEAgLTE4NSw3ICsxODUsNyBAQCBwdWJsaWM6CiAgICAgICAgIFJlc291cmNl UmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyB1cmwoKSwgcmVmZXJyZXIoKSwgcmVmcmVzaCA/IFJl c291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSA6IFJlc291 cmNlUmVxdWVzdENhY2hlUG9saWN5OjpVc2VQcm90b2NvbENhY2hlUG9saWN5IH07CiAgICAgICAg IGlmIChpbml0aWF0ZWRCeU1haW5GcmFtZSgpID09IEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpZZXMp CiAgICAgICAgICAgICByZXNvdXJjZVJlcXVlc3Quc2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVz dDo6UmVxdWVzdGVyOjpNYWluKTsKLSAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRS ZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1cml0eU9yaWdpbigpLCByZXNvdXJj ZVJlcXVlc3QsICJfc2VsZiIsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwg TWF5YmVTZW5kUmVmZXJyZXIsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6Tm8sIE5ld0Zy YW1lT3BlbmVyUG9saWN5OjpBbGxvdywgc2hvdWxkT3BlbkV4dGVybmFsVVJMcygpLCBpbml0aWF0 ZWRCeU1haW5GcmFtZSgpIH07CisgICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVx dWVzdCB7IGluaXRpYXRpbmdEb2N1bWVudCgpLCAqc2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShy ZXNvdXJjZVJlcXVlc3QpLCAiX3NlbGYiLCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFja0ZvcndhcmRM aXN0KCksIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Ok5v LCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwg aW5pdGlhdGVkQnlNYWluRnJhbWUoKSB9OwogCiAgICAgICAgIGZyYW1lLmxvYWRlcigpLmNoYW5n ZUxvY2F0aW9uKFdURk1vdmUoZnJhbWVMb2FkUmVxdWVzdCkpOwogICAgIH0KQEAgLTIxMCw3ICsy MTAsNyBAQCBwdWJsaWM6CiAgICAgICAgIFVzZXJHZXN0dXJlSW5kaWNhdG9yIGdlc3R1cmVJbmRp Y2F0b3IgeyB1c2VyR2VzdHVyZVRvRm9yd2FyZCgpIH07CiAKICAgICAgICAgUmVzb3VyY2VSZXF1 ZXN0IHJlc291cmNlUmVxdWVzdCB7IHVybCgpLCByZWZlcnJlcigpLCBSZXNvdXJjZVJlcXVlc3RD YWNoZVBvbGljeTo6VXNlUHJvdG9jb2xDYWNoZVBvbGljeSB9OwotICAgICAgICBGcmFtZUxvYWRS ZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1lbnQoKSwgKnNlY3VyaXR5 T3JpZ2luKCksIHJlc291cmNlUmVxdWVzdCwgIl9zZWxmIiwgbG9ja0hpc3RvcnkoKSwgbG9ja0Jh Y2tGb3J3YXJkTGlzdCgpLCBNYXliZVNlbmRSZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZh bGlkVVJMOjpObywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJu YWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lKCkgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVx dWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1cml0eU9y aWdpbigpLCBXVEZNb3ZlKHJlc291cmNlUmVxdWVzdCksICJfc2VsZiIsIGxvY2tIaXN0b3J5KCks IGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgTWF5YmVTZW5kUmVmZXJyZXIsIEFsbG93TmF2aWdhdGlv blRvSW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgc2hvdWxkT3Bl bkV4dGVybmFsVVJMcygpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSgpIH07CiAKICAgICAgICAgYXV0 byBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUobV9jb21wbGV0aW9uSGFuZGxlcik7CiAgICAg ICAgIGZyYW1lLmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFdURk1vdmUoZnJhbWVMb2FkUmVxdWVz dCkpOwpAQCAtMjMzLDcgKzIzMyw3IEBAIHB1YmxpYzoKICAgICAgICAgVXNlckdlc3R1cmVJbmRp Y2F0b3IgZ2VzdHVyZUluZGljYXRvciB7IHVzZXJHZXN0dXJlVG9Gb3J3YXJkKCkgfTsKIAogICAg ICAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0IHsgdXJsKCksIHJlZmVycmVyKCks IFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSB9Owot ICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9j dW1lbnQoKSwgKnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVxdWVzdCwgIl9zZWxmIiwgbG9j a0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBNYXliZVNlbmRSZWZlcnJlciwgQWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxv dywgc2hvdWxkT3BlbkV4dGVybmFsVVJMcygpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSgpIH07Cisg ICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7IGluaXRpYXRpbmdEb2N1 bWVudCgpLCAqc2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJjZVJlcXVlc3QpLCAiX3Nl bGYiLCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFja0ZvcndhcmRMaXN0KCksIE1heWJlU2VuZFJlZmVy cmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xp Y3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1l KCkgfTsKIAogICAgICAgICBmcmFtZS5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihXVEZNb3ZlKGZy YW1lTG9hZFJlcXVlc3QpKTsKICAgICB9CkBAIC0zMzksNyArMzM5LDcgQEAgcHVibGljOgogICAg ICAgICBTdWJzdGl0dXRlRGF0YSByZXBsYWNlbWVudERhdGEgeyBTaGFyZWRCdWZmZXI6OmNyZWF0 ZSgpLCBtX29yaWdpbkRvY3VtZW50LnVybCgpLCByZXBsYWNlbWVudFJlc3BvbnNlLCBTdWJzdGl0 dXRlRGF0YTo6U2Vzc2lvbkhpc3RvcnlWaXNpYmlsaXR5OjpIaWRkZW4gfTsKIAogICAgICAgICBS ZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0IHsgbV9vcmlnaW5Eb2N1bWVudC51cmwoKSwg ZW1wdHlTdHJpbmcoKSwgUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3k6OlJlbG9hZElnbm9yaW5n Q2FjaGVEYXRhIH07Ci0gICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7 IG1fb3JpZ2luRG9jdW1lbnQsIG1fb3JpZ2luRG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgcmVz b3VyY2VSZXF1ZXN0LCB7IH0sIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwg TWF5YmVTZW5kUmVmZXJyZXIsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBOZXdG cmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwgaW5pdGlh dGVkQnlNYWluRnJhbWUoKSB9OworICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJl cXVlc3QgeyBtX29yaWdpbkRvY3VtZW50LCBtX29yaWdpbkRvY3VtZW50LnNlY3VyaXR5T3JpZ2lu KCksIFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0KSwgeyB9LCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFj a0ZvcndhcmRMaXN0KCksIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJu YWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lKCkgfTsKICAgICAgICAgZnJhbWVMb2FkUmVx dWVzdC5zZXRTdWJzdGl0dXRlRGF0YShyZXBsYWNlbWVudERhdGEpOwogICAgICAgICBmcmFtZS5s b2FkZXIoKS5sb2FkKFdURk1vdmUoZnJhbWVMb2FkUmVxdWVzdCkpOwogICAgIH0KQEAgLTQzOSw3 ICs0MzksNyBAQCB2b2lkIE5hdmlnYXRpb25TY2hlZHVsZXI6OnNjaGVkdWxlTG9jYXRpb25DaGFu Z2UoRG9jdW1lbnQmIGluaXRpYXRpbmdEb2N1bWVudCwgUwogICAgICAgICBhdXRvKiBmcmFtZSA9 IGxleGljYWxGcmFtZUZyb21Db21tb25WTSgpOwogICAgICAgICBhdXRvIGluaXRpYXRlZEJ5TWFp bkZyYW1lID0gZnJhbWUgJiYgZnJhbWUtPmlzTWFpbkZyYW1lKCkgPyBJbml0aWF0ZWRCeU1haW5G cmFtZTo6WWVzIDogSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25vd247CiAgICAgICAgIAotICAg ICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1l bnQsIHNlY3VyaXR5T3JpZ2luLCByZXNvdXJjZVJlcXVlc3QsICJfc2VsZiJfcywgbG9ja0hpc3Rv cnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIGluaXRpYXRp bmdEb2N1bWVudC5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSwgaW5p dGlhdGVkQnlNYWluRnJhbWUgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRS ZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50LCBzZWN1cml0eU9yaWdpbiwgV1RGTW92ZShyZXNv dXJjZVJlcXVlc3QpLCAiX3NlbGYiX3MsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0 LCBNYXliZVNlbmRSZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpObywgTmV3 RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBpbml0aWF0aW5nRG9jdW1lbnQuc2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lIH07CiAg ICAgICAgIGxvYWRlci5jaGFuZ2VMb2NhdGlvbihXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpKTsK ICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IDY4ODg3OGRkMWJhYjcx YjUyYWRjMzQ3ZDNjMWIxYTc3ZDQ3ZTJjYTAuLmRmNWQ3OGVjMTUyMThiNTg1ZWQxM2Y2ZjVhZjY1 YmI2NjFiZmJlY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVD b250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAKQEAgLTQwNSw3ICs0MDUsNyBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6 Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoQ29udGV4dE1lbnVBY3Rpb24gYWN0aW9uLCBjbwogICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3Blbkxpbms6CiAgICAgICAgIGlmIChGcmFtZSogdGFy Z2V0RnJhbWUgPSBtX2NvbnRleHQuaGl0VGVzdFJlc3VsdCgpLnRhcmdldEZyYW1lKCkpIHsKICAg ICAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyBtX2NvbnRleHQuaGl0 VGVzdFJlc3VsdCgpLmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCkub3V0Z29pbmdS ZWZlcnJlcigpIH07Ci0gICAgICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVl c3QgeyAqZnJhbWUtPmRvY3VtZW50KCksIGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdp bigpLCByZXNvdXJjZVJlcXVlc3QsIHsgfSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0Zvcndh cmRMaXN0OjpObywgTWF5YmVTZW5kUmVmZXJyZXIsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6U3VwcHJlc3MsIHRhcmdldEZyYW1lLT5pc01h aW5GcmFtZSgpID8gU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3cgOiBT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlN YWluRnJhbWU6OlVua25vd24gfTsKKyAgICAgICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVM b2FkUmVxdWVzdCB7ICpmcmFtZS0+ZG9jdW1lbnQoKSwgZnJhbWUtPmRvY3VtZW50KCktPnNlY3Vy aXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0KSwgeyB9LCBMb2NrSGlzdG9yeTo6 Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNlbmRSZWZlcnJlciwgQWxsb3dOYXZp Z2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpTdXBwcmVzcywg dGFyZ2V0RnJhbWUtPmlzTWFpbkZyYW1lKCkgPyBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 OjpTaG91bGRBbGxvdyA6IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFs bG93LCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93biB9OwogICAgICAgICAgICAgdGFyZ2V0 RnJhbWUtPmxvYWRlcigpLmxvYWRGcmFtZVJlcXVlc3QoV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0 KSwgbnVsbHB0ciwgIHsgfSk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgb3Blbk5ld1dp bmRvdyhtX2NvbnRleHQuaGl0VGVzdFJlc3VsdCgpLmFic29sdXRlTGlua1VSTCgpLCAqZnJhbWUs IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RE9NV2luZG93LmNwcAppbmRleCA2ZmRjNjdiOTFjYjlkMTI2YzRkYWNhNWM0YjMwNjU0ZTgwOTVj Mjk2Li5iYzY5YjEwZDIyMDYyNWJhZGE1MTQyMGU3ZmZhOGE3YjFlMDQyNDRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9ET01XaW5kb3cuY3BwCkBAIC0yNDgxLDcgKzI0ODEsNyBAQCBFeGNlcHRpb25PcjxSZWZQ dHI8RnJhbWU+PiBET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyhjb25zdCBTdHJpbmcmIHVybFN0cmlu ZywgY29ucwogICAgIGF1dG8gaW5pdGlhdGVkQnlNYWluRnJhbWUgPSBhY3RpdmVGcmFtZS0+aXNN YWluRnJhbWUoKSA/IEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpZZXMgOiBJbml0aWF0ZWRCeU1haW5G cmFtZTo6VW5rbm93bjsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyBj b21wbGV0ZWRVUkwsIHJlZmVycmVyIH07Ci0gICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRS ZXF1ZXN0IHsgKmFjdGl2ZURvY3VtZW50LCBhY3RpdmVEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4o KSwgcmVzb3VyY2VSZXF1ZXN0LCBmcmFtZU5hbWUsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tG b3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBhY3RpdmVEb2N1bWVudC0+ c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCksIGluaXRpYXRlZEJ5TWFp bkZyYW1lIH07CisgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmFjdGl2 ZURvY3VtZW50LCBhY3RpdmVEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNv dXJjZVJlcXVlc3QpLCBmcmFtZU5hbWUsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJk TGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6 OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBhY3RpdmVEb2N1bWVudC0+c2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1l IH07CiAKICAgICAvLyBXZSBwYXNzIHRoZSBvcGVuZXIgZnJhbWUgZm9yIHRoZSBsb29rdXBGcmFt ZSBpbiBjYXNlIHRoZSBhY3RpdmUgZnJhbWUgaXMgZGlmZmVyZW50IGZyb20KICAgICAvLyB0aGUg b3BlbmVyIGZyYW1lLCBhbmQgdGhlIG5hbWUgcmVmZXJlbmNlcyBhIGZyYW1lIHJlbGF0aXZlIHRv IHRoZSBvcGVuZXIgZnJhbWUuCkBAIC0yNTA2LDcgKzI1MDYsNyBAQCBFeGNlcHRpb25PcjxSZWZQ dHI8RnJhbWU+PiBET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyhjb25zdCBTdHJpbmcmIHVybFN0cmlu ZywgY29ucwogICAgIGlmIChjcmVhdGVkKSB7CiAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNv dXJjZVJlcXVlc3QgeyBjb21wbGV0ZWRVUkwsIHJlZmVycmVyLCBSZXNvdXJjZVJlcXVlc3RDYWNo ZVBvbGljeTo6VXNlUHJvdG9jb2xDYWNoZVBvbGljeSB9OwogICAgICAgICBGcmFtZUxvYWRlcjo6 YWRkU2FtZVNpdGVJbmZvVG9SZXF1ZXN0SWZOZWVkZWQocmVzb3VyY2VSZXF1ZXN0LCBvcGVuZXJG cmFtZS5kb2N1bWVudCgpKTsKLSAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1 ZXN0IHsgKmFjdGl2ZVdpbmRvdy5kb2N1bWVudCgpLCBhY3RpdmVXaW5kb3cuZG9jdW1lbnQoKS0+ c2VjdXJpdHlPcmlnaW4oKSwgcmVzb3VyY2VSZXF1ZXN0LCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5 OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05h dmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBh Y3RpdmVEb2N1bWVudC0+c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCks IGluaXRpYXRlZEJ5TWFpbkZyYW1lIH07CisgICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVM b2FkUmVxdWVzdCB7ICphY3RpdmVXaW5kb3cuZG9jdW1lbnQoKSwgYWN0aXZlV2luZG93LmRvY3Vt ZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0KSwgIl9zZWxm Il9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNlbmRS ZWZlcnJlciwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVy UG9saWN5OjpBbGxvdywgYWN0aXZlRG9jdW1lbnQtPnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xp Y3lUb1Byb3BhZ2F0ZSgpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSB9OwogICAgICAgICBuZXdGcmFt ZS0+bG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSk7CiAg ICAgfSBlbHNlIGlmICghdXJsU3RyaW5nLmlzRW1wdHkoKSkgewogICAgICAgICBMb2NrSGlzdG9y eSBsb2NrSGlzdG9yeSA9IFVzZXJHZXN0dXJlSW5kaWNhdG9yOjpwcm9jZXNzaW5nVXNlckdlc3R1 cmUoKSA/IExvY2tIaXN0b3J5OjpObyA6IExvY2tIaXN0b3J5OjpZZXM7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcAppbmRleCAyNmU4Y2U0MTY0YjRkMjI3N2QzNzUwYmMyNDIxODNhMjhi NWUwYWZlLi42NjNlOTE0ZDM2ZmY1MjU3YTY3ZWZiZWFmZDM1OTQwYWE0MmE4MDBhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTc4OCw3ICs3ODgsOCBAQCBGcmFtZSogV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoQ3JlYXRlUGFnZShjb25zdCBOYXZpZ2F0aW9uQWN0 aW9uJiBuYXZpZ2F0aQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIC8vIEp1c3QgY2Fs bCB0aHJvdWdoIHRvIHRoZSBjaHJvbWUgY2xpZW50LgotICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJh bWVMb2FkUmVxdWVzdCB7ICptX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKSwgbV9mcmFt ZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIG5hdmlnYXRpb25B Y3Rpb24ucmVzb3VyY2VSZXF1ZXN0KCksIHsgfSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0Zv cndhcmRMaXN0OjpObywgTWF5YmVTZW5kUmVmZXJyZXIsIEFsbG93TmF2aWdhdGlvblRvSW52YWxp ZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIG5hdmlnYXRpb25BY3Rpb24u c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSgpLCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5r bm93biB9OworICAgIGF1dG8gcmVxdWVzdCA9IG5hdmlnYXRpb25BY3Rpb24ucmVzb3VyY2VSZXF1 ZXN0KCk7CisgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKm1fZnJhbWUt PmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQo KS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXF1ZXN0KSwgeyB9LCBMb2NrSGlzdG9yeTo6 Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNlbmRSZWZlcnJlciwgQWxsb3dOYXZp Z2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgbmF2 aWdhdGlvbkFjdGlvbi5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KCksIEluaXRpYXRlZEJ5 TWFpbkZyYW1lOjpVbmtub3duIH07CiAgICAgUGFnZSogbmV3UGFnZSA9IHdlYlBhZ2UtPmNvcmVQ YWdlKCktPmNocm9tZSgpLmNyZWF0ZVdpbmRvdygqbV9mcmFtZS0+Y29yZUZyYW1lKCksIGZyYW1l TG9hZFJlcXVlc3QsIHsgfSwgbmF2aWdhdGlvbkFjdGlvbik7CiAgICAgaWYgKCFuZXdQYWdlKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsK 392141 2020-03-02 08:13:26 -0800 2020-03-02 13:52:06 -0800 Patch bug-208447-20200302171325.patch text/plain 19389 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODk2YWZkMmRiMDE4ZjI0 NDAxNzQyOGIxZTgzMWEwNWRlMjQ3ZWMzMy4uYjQyNjkyMGI5MjcwYjU4NTQ1OTkxZDM3ZmY1Njc2 NmE0NzY4NWRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTAyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwODQ0NworICAgICAgICBNYWtlIEZyYW1lTG9hZFJlcXVlc3Qg Y3RvciB0YWtlIG1vdmUgcGFyYW1ldGVyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBGcmFtZUxvYWRSZXF1ZXN0IGN0b3IgdGFrZSBtb3ZlIHBh cmFtZXRlciBmb3IgUmVzb3VyY2VSZXF1ZXN0LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RnJvbnRlbmRDbGllbnRMb2NhbDo6b3BlbkluTmV3VGFiKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6Om5hdmlnYXRlKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkUmVxdWVz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRSZXF1ZXN0OjpGcmFtZUxvYWRSZXF1 ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5oOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkUmVxdWVzdDo6RnJhbWVMb2FkUmVxdWVzdCk6CisgICAgICAgICogbG9h ZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmF2aWdhdGlv blNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5nZSk6CisgICAgICAgICogcGFnZS9Db250 ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250 cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgICogcGFnZS9ET01XaW5k b3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjpjcmVhdGVXaW5kb3cpOgorCiAy MDIwLTAzLTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBM b2NhbFNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBpcyBub3QgY29tcHV0aW5nIHRoZSBjb3JyZWN0 IGJvdW5kcy9wb3NpdGlvbiBpbiBHUFVQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliMTQxNWMwMGE2OTdh ZGJlYzFlNmE2NmQzOTNjOGQzNDNhNmViODUuLjhiOWEzYjk4ODE3ZTA1YTJiZjljNTc5MjNkMWFl N2UzOGYxNTM3MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDIgIFJvYiBC dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NDQ3CisgICAgICAgIE1ha2UgRnJhbWVMb2FkUmVxdWVzdCBj dG9yIHRha2UgbW92ZSBwYXJhbWV0ZXIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaENyZWF0ZVBhZ2UpOgorCiAyMDIw LTAzLTAyICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFi bGUgY2FwdHVyZSBpbiBHUFVQcm9jZXNzIGJ5IGRlZmF1bHQgZm9yIHJlY2VudCBwbGF0Zm9ybXMg b25seQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kQ2xpZW50TG9jYWwuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kQ2xpZW50TG9jYWwuY3BwCmluZGV4IGYyNjg1ZmM2MTQzODUxNDZiNzkwNDFlZTE5ZTU0 ZTdjNTM2Y2MwOTcuLmE0ODYxMjc4MmQyYmIzOTFhYjZhZTVlN2Q4YzMyNDkwMWFlYzFkOWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRMb2NhbC5jcHAKQEAgLTI2Niw3ICsyNjYsNyBAQCB2b2lkIEluc3BlY3RvckZyb250 ZW5kQ2xpZW50TG9jYWw6Om9wZW5Jbk5ld1RhYihjb25zdCBTdHJpbmcmIHVybCkKIAogICAgIC8v IEZJWE1FOiBXaHkgZG8gd2UgY29tcHV0ZSB0aGUgYWJzb2x1dGUgVVJMIHdpdGggcmVzcGVjdCB0 byB8ZnJhbWV8IGluc3RlYWQgb2YgfG1haW5GcmFtZXw/CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl c291cmNlUmVxdWVzdCB7IGZyYW1lLT5kb2N1bWVudCgpLT5jb21wbGV0ZVVSTCh1cmwpIH07Ci0g ICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0MiB7ICptYWluRnJhbWUuZG9jdW1l bnQoKSwgbWFpbkZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVx dWVzdCwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5v LCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIFNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3k6OlNob3VsZE5vdEFsbG93LCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93biB9 OworICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdDIgeyAqbWFpbkZyYW1lLmRv Y3VtZW50KCksIG1haW5GcmFtZS5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBXVEZNb3Zl KHJlc291cmNlUmVxdWVzdCksICJfc2VsZiJfcywgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0Zv cndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRP cGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJh bWU6OlVua25vd24gfTsKICAgICBmcmFtZS0+bG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oV1RGTW92 ZShmcmFtZUxvYWRSZXF1ZXN0MikpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5kZXggOWI5OTdhYTI2MGZm NmM0YzE2ZDhiMTg5NzgyNWUxYTQxZmIwNzM0YS4uNDRhN2RhMzdmNTg4ZDM4ZTMwNzBlOTY3Y2Rj MjNhOWZkOWRhZDIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50 cy9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9h Z2VudHMvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAtNDIxLDcgKzQyMSw3IEBAIHZvaWQgSW5z cGVjdG9yUGFnZUFnZW50OjpuYXZpZ2F0ZShFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgdXJs KQogICAgIEZyYW1lJiBmcmFtZSA9IG1faW5zcGVjdGVkUGFnZS5tYWluRnJhbWUoKTsKIAogICAg IFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyBmcmFtZS5kb2N1bWVudCgpLT5jb21w bGV0ZVVSTCh1cmwpIH07Ci0gICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsg KmZyYW1lLmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIHJl c291cmNlUmVxdWVzdCwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2Fy ZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3csIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpV bmtub3duIH07CisgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmZyYW1l LmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUo cmVzb3VyY2VSZXF1ZXN0KSwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9y d2FyZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlv blRvSW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgU2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3csIEluaXRpYXRlZEJ5TWFpbkZyYW1l OjpVbmtub3duIH07CiAgICAgZnJhbWUubG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oV1RGTW92ZShm cmFtZUxvYWRSZXF1ZXN0KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRS ZXF1ZXN0LmNwcAppbmRleCA3NDNkNzNkMGVhYjE2OWNkOGVjMmZjM2IxMDMyYjg1MjJmNjU4NmE4 Li45OTQzYzBlNzI5MjFjOWM0OWYzMzEyMGQyYzdiOTkyZTE4ZDlmZTJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJlcXVlc3QuY3BwCkBAIC0zNywxMCArMzcsMTAgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1GcmFtZUxvYWRSZXF1ZXN0OjpGcmFtZUxvYWRSZXF1ZXN0 KERvY3VtZW50JiByZXF1ZXN0ZXIsIFNlY3VyaXR5T3JpZ2luJiByZXF1ZXN0ZXJTZWN1cml0eU9y aWdpbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFN0cmlu ZyYgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlz dCBsb2NrQmFja0ZvcndhcmRMaXN0LCBjb25zdCBSZWZlcnJlclBvbGljeSYgcmVmZXJyZXJQb2xp Y3ksIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRV UkwsIE5ld0ZyYW1lT3BlbmVyUG9saWN5IG5ld0ZyYW1lT3BlbmVyUG9saWN5LCBTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEluaXRpYXRl ZEJ5TWFpbkZyYW1lIGluaXRpYXRlZEJ5TWFpbkZyYW1lLCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJ ZkphdmFTY3JpcHRVUkwgc2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMLCBjb25z dCBBdG9tU3RyaW5nJiBkb3dubG9hZEF0dHJpYnV0ZSwgY29uc3QgU3lzdGVtUHJldmlld0luZm8m IHN5c3RlbVByZXZpZXdJbmZvKQorRnJhbWVMb2FkUmVxdWVzdDo6RnJhbWVMb2FkUmVxdWVzdChE b2N1bWVudCYgcmVxdWVzdGVyLCBTZWN1cml0eU9yaWdpbiYgcmVxdWVzdGVyU2VjdXJpdHlPcmln aW4sIFJlc291cmNlUmVxdWVzdCYmIHJlc291cmNlUmVxdWVzdCwgY29uc3QgU3RyaW5nJiBmcmFt ZU5hbWUsIExvY2tIaXN0b3J5IGxvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0IGxvY2tC YWNrRm9yd2FyZExpc3QsIGNvbnN0IFJlZmVycmVyUG9saWN5JiByZWZlcnJlclBvbGljeSwgQWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgTmV3 RnJhbWVPcGVuZXJQb2xpY3kgbmV3RnJhbWVPcGVuZXJQb2xpY3ksIFNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgSW5pdGlhdGVkQnlNYWlu RnJhbWUgaW5pdGlhdGVkQnlNYWluRnJhbWUsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNj cmlwdFVSTCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwsIGNvbnN0IEF0b21T dHJpbmcmIGRvd25sb2FkQXR0cmlidXRlLCBjb25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYgc3lzdGVt UHJldmlld0luZm8pCiAgICAgOiBtX3JlcXVlc3RlciB7IG1ha2VSZWYocmVxdWVzdGVyKSB9CiAg ICAgLCBtX3JlcXVlc3RlclNlY3VyaXR5T3JpZ2luIHsgbWFrZVJlZihyZXF1ZXN0ZXJTZWN1cml0 eU9yaWdpbikgfQotICAgICwgbV9yZXNvdXJjZVJlcXVlc3QgeyByZXNvdXJjZVJlcXVlc3QgfQor ICAgICwgbV9yZXNvdXJjZVJlcXVlc3QgeyBXVEZNb3ZlKHJlc291cmNlUmVxdWVzdCkgfQogICAg ICwgbV9mcmFtZU5hbWUgeyBmcmFtZU5hbWUgfQogICAgICwgbV9sb2NrSGlzdG9yeSB7IGxvY2tI aXN0b3J5IH0KICAgICAsIG1fbG9ja0JhY2tGb3J3YXJkTGlzdCB7IGxvY2tCYWNrRm9yd2FyZExp c3QgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJlcXVlc3Qu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRSZXF1ZXN0LmgKaW5kZXggOTY3Yzk5 YmQ3YzY2ZWYzMGQyOTFhYTlkOTA4ZjE3YTg1NjM0OGUxMC4uZDhiYzE3YjFkNzQyNzUzYTJjZWFh MjJmODUzNjM1ZDg0MWQ0NjRlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVx dWVzdC5oCkBAIC0zOSw3ICszOSw3IEBAIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogCiBjbGFzcyBG cmFtZUxvYWRSZXF1ZXN0IHsKIHB1YmxpYzoKLSAgICBXRUJDT1JFX0VYUE9SVCBGcmFtZUxvYWRS ZXF1ZXN0KERvY3VtZW50JiwgU2VjdXJpdHlPcmlnaW4mLCBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgTG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExp c3QsIGNvbnN0IFJlZmVycmVyUG9saWN5JiwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBO ZXdGcmFtZU9wZW5lclBvbGljeSwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgSW5pdGlh dGVkQnlNYWluRnJhbWUsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCA9IFJl cGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCwgY29uc3QgQXRvbVN0cmluZyYgZG93bmxvYWRB dHRyaWJ1dGUgPSB7IH0sIGNvbnN0IFN5c3RlbVByZXZpZXdJbmZvJiA9IHsgfSk7CisgICAgV0VC Q09SRV9FWFBPUlQgRnJhbWVMb2FkUmVxdWVzdChEb2N1bWVudCYsIFNlY3VyaXR5T3JpZ2luJiwg UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeSwg TG9ja0JhY2tGb3J3YXJkTGlzdCwgY29uc3QgUmVmZXJyZXJQb2xpY3kmLCBBbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkwsIE5ld0ZyYW1lT3BlbmVyUG9saWN5LCBTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5LCBJbml0aWF0ZWRCeU1haW5GcmFtZSwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZK YXZhU2NyaXB0VVJMID0gUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMLCBjb25zdCBBdG9t U3RyaW5nJiBkb3dubG9hZEF0dHJpYnV0ZSA9IHsgfSwgY29uc3QgU3lzdGVtUHJldmlld0luZm8m ID0geyB9KTsKICAgICBXRUJDT1JFX0VYUE9SVCBGcmFtZUxvYWRSZXF1ZXN0KEZyYW1lJiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgY29uc3Qg U3Vic3RpdHV0ZURhdGEmID0gU3Vic3RpdHV0ZURhdGEoKSk7CiAKICAgICBXRUJDT1JFX0VYUE9S VCB+RnJhbWVMb2FkUmVxdWVzdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L05hdmlnYXRpb25TY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRp b25TY2hlZHVsZXIuY3BwCmluZGV4IDkyOWRhMDY2OWIyZDg1MWIzOTNkZTA3YzBjM2Y0ZmE2YWZk MjVhNmQuLjJjNTBmNDM3NzI3N2ZiYTM1NzM5ZmZmZmFiMDk5NmJiYjczZThmMmMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAKQEAgLTE4NSw3ICsx ODUsNyBAQCBwdWJsaWM6CiAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3Qg eyB1cmwoKSwgcmVmZXJyZXIoKSwgcmVmcmVzaCA/IFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5 OjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSA6IFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpV c2VQcm90b2NvbENhY2hlUG9saWN5IH07CiAgICAgICAgIGlmIChpbml0aWF0ZWRCeU1haW5GcmFt ZSgpID09IEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpZZXMpCiAgICAgICAgICAgICByZXNvdXJjZVJl cXVlc3Quc2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpNYWluKTsKLSAg ICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3Vt ZW50KCksICpzZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVlc3QsICJfc2VsZiIsIGxvY2tI aXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3Ry aW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9wZW5lclBvbGlj eTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUo KSB9OworICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0 aW5nRG9jdW1lbnQoKSwgKnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0 KSwgIl9zZWxmIiwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBSZWZlcnJl clBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6Tm8sIE5l d0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgc2hvdWxkT3BlbkV4dGVybmFsVVJMcygpLCBpbml0 aWF0ZWRCeU1haW5GcmFtZSgpIH07CiAKICAgICAgICAgZnJhbWUubG9hZGVyKCkuY2hhbmdlTG9j YXRpb24oV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSk7CiAgICAgfQpAQCAtMjEwLDcgKzIxMCw3 IEBAIHB1YmxpYzoKICAgICAgICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRv ciB7IHVzZXJHZXN0dXJlVG9Gb3J3YXJkKCkgfTsKIAogICAgICAgICBSZXNvdXJjZVJlcXVlc3Qg cmVzb3VyY2VSZXF1ZXN0IHsgdXJsKCksIHJlZmVycmVyKCksIFJlc291cmNlUmVxdWVzdENhY2hl UG9saWN5OjpVc2VQcm90b2NvbENhY2hlUG9saWN5IH07Ci0gICAgICAgIEZyYW1lTG9hZFJlcXVl c3QgZnJhbWVMb2FkUmVxdWVzdCB7IGluaXRpYXRpbmdEb2N1bWVudCgpLCAqc2VjdXJpdHlPcmln aW4oKSwgcmVzb3VyY2VSZXF1ZXN0LCAiX3NlbGYiLCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFja0Zv cndhcmRMaXN0KCksIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9u VG9JbnZhbGlkVVJMOjpObywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVu RXh0ZXJuYWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lKCkgfTsKKyAgICAgICAgRnJhbWVM b2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1 cml0eU9yaWdpbigpLCBXVEZNb3ZlKHJlc291cmNlUmVxdWVzdCksICJfc2VsZiIsIGxvY2tIaXN0 b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5n LCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6 QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUoKSB9 OwogCiAgICAgICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKG1fY29tcGxldGlv bkhhbmRsZXIpOwogICAgICAgICBmcmFtZS5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihXVEZNb3Zl KGZyYW1lTG9hZFJlcXVlc3QpKTsKQEAgLTIzMyw3ICsyMzMsNyBAQCBwdWJsaWM6CiAgICAgICAg IFVzZXJHZXN0dXJlSW5kaWNhdG9yIGdlc3R1cmVJbmRpY2F0b3IgeyB1c2VyR2VzdHVyZVRvRm9y d2FyZCgpIH07CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlc291cmNlUmVxdWVzdCB7IHVy bCgpLCByZWZlcnJlcigpLCBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVsb2FkSWdub3Jp bmdDYWNoZURhdGEgfTsKLSAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0 IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVl c3QsICJfc2VsZiIsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgUmVmZXJy ZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Olllcywg TmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzKCksIGlu aXRpYXRlZEJ5TWFpbkZyYW1lKCkgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxv YWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1cml0eU9yaWdpbigpLCBXVEZN b3ZlKHJlc291cmNlUmVxdWVzdCksICJfc2VsZiIsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9y d2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25U b0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVu RXh0ZXJuYWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lKCkgfTsKIAogICAgICAgICBmcmFt ZS5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpKTsKICAg ICB9CkBAIC0zMzksNyArMzM5LDcgQEAgcHVibGljOgogICAgICAgICBTdWJzdGl0dXRlRGF0YSBy ZXBsYWNlbWVudERhdGEgeyBTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpLCBtX29yaWdpbkRvY3VtZW50 LnVybCgpLCByZXBsYWNlbWVudFJlc3BvbnNlLCBTdWJzdGl0dXRlRGF0YTo6U2Vzc2lvbkhpc3Rv cnlWaXNpYmlsaXR5OjpIaWRkZW4gfTsKIAogICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3Vy Y2VSZXF1ZXN0IHsgbV9vcmlnaW5Eb2N1bWVudC51cmwoKSwgZW1wdHlTdHJpbmcoKSwgUmVzb3Vy Y2VSZXF1ZXN0Q2FjaGVQb2xpY3k6OlJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhIH07Ci0gICAgICAg IEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7IG1fb3JpZ2luRG9jdW1lbnQsIG1f b3JpZ2luRG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgcmVzb3VyY2VSZXF1ZXN0LCB7IH0sIGxv Y2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5 U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQ b2xpY3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzKCksIGluaXRpYXRlZEJ5TWFpbkZy YW1lKCkgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgbV9v cmlnaW5Eb2N1bWVudCwgbV9vcmlnaW5Eb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLCBXVEZNb3Zl KHJlc291cmNlUmVxdWVzdCksIHsgfSwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlz dCgpLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxp ZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5h bFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUoKSB9OwogICAgICAgICBmcmFtZUxvYWRSZXF1 ZXN0LnNldFN1YnN0aXR1dGVEYXRhKHJlcGxhY2VtZW50RGF0YSk7CiAgICAgICAgIGZyYW1lLmxv YWRlcigpLmxvYWQoV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSk7CiAgICAgfQpAQCAtNDM5LDcg KzQzOSw3IEBAIHZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5n ZShEb2N1bWVudCYgaW5pdGlhdGluZ0RvY3VtZW50LCBTCiAgICAgICAgIGF1dG8qIGZyYW1lID0g bGV4aWNhbEZyYW1lRnJvbUNvbW1vblZNKCk7CiAgICAgICAgIGF1dG8gaW5pdGlhdGVkQnlNYWlu RnJhbWUgPSBmcmFtZSAmJiBmcmFtZS0+aXNNYWluRnJhbWUoKSA/IEluaXRpYXRlZEJ5TWFpbkZy YW1lOjpZZXMgOiBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93bjsKICAgICAgICAgCi0gICAg ICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7IGluaXRpYXRpbmdEb2N1bWVu dCwgc2VjdXJpdHlPcmlnaW4sIHJlc291cmNlUmVxdWVzdCwgIl9zZWxmIl9zLCBsb2NrSGlzdG9y eSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxv d05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3cs IGluaXRpYXRpbmdEb2N1bWVudC5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdh dGUoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBm cmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50LCBzZWN1cml0eU9yaWdpbiwgV1RG TW92ZShyZXNvdXJjZVJlcXVlc3QpLCAiX3NlbGYiX3MsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0Zv cndhcmRMaXN0LCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgaW5pdGlhdGluZ0Rv Y3VtZW50LnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBpbml0aWF0 ZWRCeU1haW5GcmFtZSB9OwogICAgICAgICBsb2FkZXIuY2hhbmdlTG9jYXRpb24oV1RGTW92ZShm cmFtZUxvYWRSZXF1ZXN0KSk7CiAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcigpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApp bmRleCA0N2ZiZjdkZDgxZWU4OTg4MGU1YjJmYzZmOGQ2Nzk1YTQ0ZmEyYzk1Li5mZThiNGIzN2Ni YzhjYWIzODdlNDcyYTRlNmU1MjkyMmMzMDZkMDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCkBAIC00MDUsNyArNDA1LDcgQEAgdm9pZCBDb250 ZXh0TWVudUNvbnRyb2xsZXI6OmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKENvbnRleHRNZW51QWN0 aW9uIGFjdGlvbiwgY28KICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOgogICAg ICAgICBpZiAoRnJhbWUqIHRhcmdldEZyYW1lID0gbV9jb250ZXh0LmhpdFRlc3RSZXN1bHQoKS50 YXJnZXRGcmFtZSgpKSB7CiAgICAgICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1 ZXN0IHsgbV9jb250ZXh0LmhpdFRlc3RSZXN1bHQoKS5hYnNvbHV0ZUxpbmtVUkwoKSwgZnJhbWUt PmxvYWRlcigpLm91dGdvaW5nUmVmZXJyZXIoKSB9OwotICAgICAgICAgICAgRnJhbWVMb2FkUmVx dWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmZyYW1lLT5kb2N1bWVudCgpLCBmcmFtZS0+ZG9jdW1l bnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgcmVzb3VyY2VSZXF1ZXN0LCB7IH0sIExvY2tIaXN0b3J5 OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmlu ZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5 OjpTdXBwcmVzcywgdGFyZ2V0RnJhbWUtPmlzTWFpbkZyYW1lKCkgPyBTaG91bGRPcGVuRXh0ZXJu YWxVUkxzUG9saWN5OjpTaG91bGRBbGxvdyA6IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6 OlNob3VsZE5vdEFsbG93LCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93biB9OworICAgICAg ICAgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmZyYW1lLT5kb2N1bWVu dCgpLCBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJj ZVJlcXVlc3QpLCB7IH0sIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8s IFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJM OjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpTdXBwcmVzcywgdGFyZ2V0RnJhbWUtPmlzTWFp bkZyYW1lKCkgPyBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvdyA6IFNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93LCBJbml0aWF0ZWRCeU1h aW5GcmFtZTo6VW5rbm93biB9OwogICAgICAgICAgICAgdGFyZ2V0RnJhbWUtPmxvYWRlcigpLmxv YWRGcmFtZVJlcXVlc3QoV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSwgbnVsbHB0ciwgIHsgfSk7 CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgb3Blbk5ld1dpbmRvdyhtX2NvbnRleHQuaGl0 VGVzdFJlc3VsdCgpLmFic29sdXRlTGlua1VSTCgpLCAqZnJhbWUsIFNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3k6OlNob3VsZEFsbG93KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAppbmRl eCBiZGZkOTdmMGYyNzg3MjE2YmQ2YmQ4MzFhMTE0ZTk4Y2E3OTljMzEzLi5hMWUxN2UwODM1M2Rl MTIxNDY1MjJjN2FlZmU0MzkzNmZlZWE4ZmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3Bw CkBAIC0yNDgxLDcgKzI0ODEsNyBAQCBFeGNlcHRpb25PcjxSZWZQdHI8RnJhbWU+PiBET01XaW5k b3c6OmNyZWF0ZVdpbmRvdyhjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29ucwogICAgIGF1dG8g aW5pdGlhdGVkQnlNYWluRnJhbWUgPSBhY3RpdmVGcmFtZS0+aXNNYWluRnJhbWUoKSA/IEluaXRp YXRlZEJ5TWFpbkZyYW1lOjpZZXMgOiBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93bjsKIAog ICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgeyBjb21wbGV0ZWRVUkwsIHJlZmVy cmVyIH07Ci0gICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmFjdGl2ZURv Y3VtZW50LCBhY3RpdmVEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwgcmVzb3VyY2VSZXF1ZXN0 LCBmcmFtZU5hbWUsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIFJl ZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZ ZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgYWN0aXZlRG9jdW1lbnQtPnNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSB9 OworICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7ICphY3RpdmVEb2N1bWVu dCwgYWN0aXZlRG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1 ZXN0KSwgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5v LCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIGFjdGl2ZURvY3VtZW50LT5zaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSwgaW5pdGlhdGVkQnlNYWluRnJh bWUgfTsKIAogICAgIC8vIFdlIHBhc3MgdGhlIG9wZW5lciBmcmFtZSBmb3IgdGhlIGxvb2t1cEZy YW1lIGluIGNhc2UgdGhlIGFjdGl2ZSBmcmFtZSBpcyBkaWZmZXJlbnQgZnJvbQogICAgIC8vIHRo ZSBvcGVuZXIgZnJhbWUsIGFuZCB0aGUgbmFtZSByZWZlcmVuY2VzIGEgZnJhbWUgcmVsYXRpdmUg dG8gdGhlIG9wZW5lciBmcmFtZS4KQEAgLTI1MDYsNyArMjUwNiw3IEBAIEV4Y2VwdGlvbk9yPFJl ZlB0cjxGcmFtZT4+IERPTVdpbmRvdzo6Y3JlYXRlV2luZG93KGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nLCBjb25zCiAgICAgaWYgKGNyZWF0ZWQpIHsKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl c291cmNlUmVxdWVzdCB7IGNvbXBsZXRlZFVSTCwgcmVmZXJyZXIsIFJlc291cmNlUmVxdWVzdENh Y2hlUG9saWN5OjpVc2VQcm90b2NvbENhY2hlUG9saWN5IH07CiAgICAgICAgIEZyYW1lTG9hZGVy OjphZGRTYW1lU2l0ZUluZm9Ub1JlcXVlc3RJZk5lZWRlZChyZXNvdXJjZVJlcXVlc3QsIG9wZW5l ckZyYW1lLmRvY3VtZW50KCkpOwotICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJl cXVlc3QgeyAqYWN0aXZlV2luZG93LmRvY3VtZW50KCksIGFjdGl2ZVdpbmRvdy5kb2N1bWVudCgp LT5zZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVlc3QsICJfc2VsZiJfcywgTG9ja0hpc3Rv cnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3Ry aW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xp Y3k6OkFsbG93LCBhY3RpdmVEb2N1bWVudC0+c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRv UHJvcGFnYXRlKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lIH07CisgICAgICAgIEZyYW1lTG9hZFJl cXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7ICphY3RpdmVXaW5kb3cuZG9jdW1lbnQoKSwgYWN0aXZl V2luZG93LmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1 ZXN0KSwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5v LCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIGFjdGl2ZURvY3VtZW50LT5zaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSwgaW5pdGlhdGVkQnlNYWluRnJh bWUgfTsKICAgICAgICAgbmV3RnJhbWUtPmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFdURk1vdmUo ZnJhbWVMb2FkUmVxdWVzdCkpOwogICAgIH0gZWxzZSBpZiAoIXVybFN0cmluZy5pc0VtcHR5KCkp IHsKICAgICAgICAgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnkgPSBVc2VyR2VzdHVyZUluZGljYXRv cjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkgPyBMb2NrSGlzdG9yeTo6Tm8gOiBMb2NrSGlzdG9y eTo6WWVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggYjgxOGE2NmZmMTBm ZmViMTgxYWExODNjZjRiMjIyNThhM2MxMTUxMS4uYTgxNGQzZDFiMWQ2OGJkNDA4OTM1NWI0NmJk YjFlODA3MTA3MjQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC03ODgs NyArNzg4LDggQEAgRnJhbWUqIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaENyZWF0ZVBh Z2UoY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgbmF2aWdhdGkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKICAgICAvLyBKdXN0IGNhbGwgdGhyb3VnaCB0byB0aGUgY2hyb21lIGNsaWVudC4KLSAg ICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqbV9mcmFtZS0+Y29yZUZyYW1l KCktPmRvY3VtZW50KCksIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5zZWN1cml0 eU9yaWdpbigpLCBuYXZpZ2F0aW9uQWN0aW9uLnJlc291cmNlUmVxdWVzdCgpLCB7IH0sIExvY2tI aXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0 eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVy UG9saWN5OjpBbGxvdywgbmF2aWdhdGlvbkFjdGlvbi5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5KCksIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duIH07CisgICAgYXV0byByZXF1ZXN0 ID0gbmF2aWdhdGlvbkFjdGlvbi5yZXNvdXJjZVJlcXVlc3QoKTsKKyAgICBGcmFtZUxvYWRSZXF1 ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqbV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCks IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBXVEZN b3ZlKHJlcXVlc3QpLCB7IH0sIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6 Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgbmF2aWdhdGlvbkFjdGlvbi5z aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KCksIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtu b3duIH07CiAgICAgUGFnZSogbmV3UGFnZSA9IHdlYlBhZ2UtPmNvcmVQYWdlKCktPmNocm9tZSgp LmNyZWF0ZVdpbmRvdygqbV9mcmFtZS0+Y29yZUZyYW1lKCksIGZyYW1lTG9hZFJlcXVlc3QsIHsg fSwgbmF2aWdhdGlvbkFjdGlvbik7CiAgICAgaWYgKCFuZXdQYWdlKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsK 392185 2020-03-02 13:52:10 -0800 2020-03-02 23:36:48 -0800 Patch bug-208447-20200302225208.patch text/plain 19388 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNjYzkwMTM0NmRkMGFk MDk5Y2Q4ODlmNzRiYTY1ZmQ2MGNjNWFhMC4uYmU2YTAwNWVlNzZjNjlkNTdjZjliMDkzYjY5MTgz MjJiMjZjYzk0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTAyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwODQ0NworICAgICAgICBNYWtlIEZyYW1lTG9hZFJlcXVlc3Qg Y3RvciB0YWtlIG1vdmUgcGFyYW1ldGVyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBGcmFtZUxvYWRSZXF1ZXN0IGN0b3IgdXNlIG1vdmUgc2Vt YW50aWNzIGZvciB0aGUKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHBhcmFtZXRlciB0byBhdm9p ZCBjb3BpZXMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRM b2NhbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2Fs OjpvcGVuSW5OZXdUYWIpOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUGFn ZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6bmF2aWdh dGUpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZFJlcXVlc3Q6OkZyYW1lTG9hZFJlcXVlc3QpOgorICAgICAgICAqIGxv YWRlci9GcmFtZUxvYWRSZXF1ZXN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRSZXF1 ZXN0OjpGcmFtZUxvYWRSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvTmF2aWdhdGlvblNjaGVk dWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVs ZUxvY2F0aW9uQ2hhbmdlKToKKyAgICAgICAgKiBwYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNvbnRleHRNZW51 SXRlbVNlbGVjdGVkKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyk6CisKIDIwMjAtMDMtMDIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBQYXRoOjpQYXRo KGNvbnN0IFBhdGgmKSBhbmQgUGF0aDo6b3BlcmF0b3I9KGNvbnN0IFBhdGgmKSBjaGVhcApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCBkODMzZmNjYjFlNTY0NjdmMzczMzEzZWE2NDg1Y2M0OTNhNGE1ZDY0Li5kYWM3MDJm OTg5NTdmNzdkMjYyODNlOGY0YmI5OGE2ZDQ0ZGQ4MDJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIwLTAzLTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODQ0NworICAgICAgICBN YWtlIEZyYW1lTG9hZFJlcXVlc3QgY3RvciB0YWtlIG1vdmUgcGFyYW1ldGVyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRhcHQgdG8gQVBJIGNoYW5n ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hDcmVhdGVQYWdlKToKKwogMjAyMC0wMy0wMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhh bGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCB0aGUgcmVtb3RlIEltYWdlQnVm ZmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRMb2NhbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbC5jcHAKaW5kZXggZjI2ODVmYzYxNDM4NTE0NmI3OTA0MWVlMTllNTRl N2M1MzZjYzA5Ny4uYTQ4NjEyNzgyZDJiYjM5MWFiNmFlNWU3ZDhjMzI0OTAxYWVjMWQ5YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50 TG9jYWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZENsaWVudExvY2FsLmNwcApAQCAtMjY2LDcgKzI2Niw3IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRMb2NhbDo6b3BlbkluTmV3VGFiKGNvbnN0IFN0cmluZyYgdXJsKQogCiAgICAgLy8g RklYTUU6IFdoeSBkbyB3ZSBjb21wdXRlIHRoZSBhYnNvbHV0ZSBVUkwgd2l0aCByZXNwZWN0IHRv IHxmcmFtZXwgaW5zdGVhZCBvZiB8bWFpbkZyYW1lfD8KICAgICBSZXNvdXJjZVJlcXVlc3QgcmVz b3VyY2VSZXF1ZXN0IHsgZnJhbWUtPmRvY3VtZW50KCktPmNvbXBsZXRlVVJMKHVybCkgfTsKLSAg ICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QyIHsgKm1haW5GcmFtZS5kb2N1bWVu dCgpLCBtYWluRnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgcmVzb3VyY2VSZXF1 ZXN0LCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8s IFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJM OjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgU2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeTo6U2hvdWxkTm90QWxsb3csIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duIH07 CisgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0MiB7ICptYWluRnJhbWUuZG9j dW1lbnQoKSwgbWFpbkZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUo cmVzb3VyY2VSZXF1ZXN0KSwgIl9zZWxmIl9zLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9y d2FyZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlv blRvSW52YWxpZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIFNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93LCBJbml0aWF0ZWRCeU1haW5GcmFt ZTo6VW5rbm93biB9OwogICAgIGZyYW1lLT5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihXVEZNb3Zl KGZyYW1lTG9hZFJlcXVlc3QyKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAppbmRleCA5Yjk5N2FhMjYwZmY2 YzRjMTZkOGIxODk3ODI1ZTFhNDFmYjA3MzRhLi40NGE3ZGEzN2Y1ODhkMzhlMzA3MGU5NjdjZGMy M2E5ZmQ5ZGFkMjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRz L0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC00MjEsNyArNDIxLDcgQEAgdm9pZCBJbnNw ZWN0b3JQYWdlQWdlbnQ6Om5hdmlnYXRlKEVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiB1cmwp CiAgICAgRnJhbWUmIGZyYW1lID0gbV9pbnNwZWN0ZWRQYWdlLm1haW5GcmFtZSgpOwogCiAgICAg UmVzb3VyY2VSZXF1ZXN0IHJlc291cmNlUmVxdWVzdCB7IGZyYW1lLmRvY3VtZW50KCktPmNvbXBs ZXRlVVJMKHVybCkgfTsKLSAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAq ZnJhbWUuZG9jdW1lbnQoKSwgZnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgcmVz b3VyY2VSZXF1ZXN0LCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJk TGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9J bnZhbGlkVVJMOjpObywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVu a25vd24gfTsKKyAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqZnJhbWUu ZG9jdW1lbnQoKSwgZnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShy ZXNvdXJjZVJlcXVlc3QpLCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3 YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9u VG9JbnZhbGlkVVJMOjpObywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdywgSW5pdGlhdGVkQnlNYWluRnJhbWU6 OlVua25vd24gfTsKICAgICBmcmFtZS5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihXVEZNb3ZlKGZy YW1lTG9hZFJlcXVlc3QpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJl cXVlc3QuY3BwCmluZGV4IDc0M2Q3M2QwZWFiMTY5Y2Q4ZWMyZmMzYjEwMzJiODUyMmY2NTg2YTgu Ljk5NDNjMGU3MjkyMWM5YzQ5ZjMzMTIwZDJjN2I5OTJlMThkOWZlMmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5jcHAKQEAgLTM3LDEwICszNywxMCBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLUZyYW1lTG9hZFJlcXVlc3Q6OkZyYW1lTG9hZFJlcXVlc3Qo RG9jdW1lbnQmIHJlcXVlc3RlciwgU2VjdXJpdHlPcmlnaW4mIHJlcXVlc3RlclNlY3VyaXR5T3Jp Z2luLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgY29uc3QgU3RyaW5n JiBmcmFtZU5hbWUsIExvY2tIaXN0b3J5IGxvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0 IGxvY2tCYWNrRm9yd2FyZExpc3QsIGNvbnN0IFJlZmVycmVyUG9saWN5JiByZWZlcnJlclBvbGlj eSwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TCwgTmV3RnJhbWVPcGVuZXJQb2xpY3kgbmV3RnJhbWVPcGVuZXJQb2xpY3ksIFNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgSW5pdGlhdGVk QnlNYWluRnJhbWUgaW5pdGlhdGVkQnlNYWluRnJhbWUsIFNob3VsZFJlcGxhY2VEb2N1bWVudElm SmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwsIGNvbnN0 IEF0b21TdHJpbmcmIGRvd25sb2FkQXR0cmlidXRlLCBjb25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYg c3lzdGVtUHJldmlld0luZm8pCitGcmFtZUxvYWRSZXF1ZXN0OjpGcmFtZUxvYWRSZXF1ZXN0KERv Y3VtZW50JiByZXF1ZXN0ZXIsIFNlY3VyaXR5T3JpZ2luJiByZXF1ZXN0ZXJTZWN1cml0eU9yaWdp biwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnksIExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgY29uc3QgUmVmZXJyZXJQb2xpY3kmIHJlZmVycmVyUG9saWN5LCBBbGxv d05hdmlnYXRpb25Ub0ludmFsaWRVUkwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBOZXdG cmFtZU9wZW5lclBvbGljeSBuZXdGcmFtZU9wZW5lclBvbGljeSwgU2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBJbml0aWF0ZWRCeU1haW5G cmFtZSBpbml0aWF0ZWRCeU1haW5GcmFtZSwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2Ny aXB0VVJMIHNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCwgY29uc3QgQXRvbVN0 cmluZyYgZG93bmxvYWRBdHRyaWJ1dGUsIGNvbnN0IFN5c3RlbVByZXZpZXdJbmZvJiBzeXN0ZW1Q cmV2aWV3SW5mbykKICAgICA6IG1fcmVxdWVzdGVyIHsgbWFrZVJlZihyZXF1ZXN0ZXIpIH0KICAg ICAsIG1fcmVxdWVzdGVyU2VjdXJpdHlPcmlnaW4geyBtYWtlUmVmKHJlcXVlc3RlclNlY3VyaXR5 T3JpZ2luKSB9Ci0gICAgLCBtX3Jlc291cmNlUmVxdWVzdCB7IHJlc291cmNlUmVxdWVzdCB9Cisg ICAgLCBtX3Jlc291cmNlUmVxdWVzdCB7IFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0KSB9CiAgICAg LCBtX2ZyYW1lTmFtZSB7IGZyYW1lTmFtZSB9CiAgICAgLCBtX2xvY2tIaXN0b3J5IHsgbG9ja0hp c3RvcnkgfQogICAgICwgbV9sb2NrQmFja0ZvcndhcmRMaXN0IHsgbG9ja0JhY2tGb3J3YXJkTGlz dCB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkUmVxdWVzdC5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZFJlcXVlc3QuaAppbmRleCA5NjdjOTli ZDdjNjZlZjMwZDI5MWFhOWQ5MDhmMTdhODU2MzQ4ZTEwLi5kOGJjMTdiMWQ3NDI3NTNhMmNlYWEy MmY4NTM2MzVkODQxZDQ2NGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRSZXF1 ZXN0LmgKQEAgLTM5LDcgKzM5LDcgQEAgY2xhc3MgU2VjdXJpdHlPcmlnaW47CiAKIGNsYXNzIEZy YW1lTG9hZFJlcXVlc3QgewogcHVibGljOgotICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lTG9hZFJl cXVlc3QoRG9jdW1lbnQmLCBTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYs IGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlz dCwgY29uc3QgUmVmZXJyZXJQb2xpY3kmLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIE5l d0ZyYW1lT3BlbmVyUG9saWN5LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBJbml0aWF0 ZWRCeU1haW5GcmFtZSwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMID0gUmVw bGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMLCBjb25zdCBBdG9tU3RyaW5nJiBkb3dubG9hZEF0 dHJpYnV0ZSA9IHsgfSwgY29uc3QgU3lzdGVtUHJldmlld0luZm8mID0geyB9KTsKKyAgICBXRUJD T1JFX0VYUE9SVCBGcmFtZUxvYWRSZXF1ZXN0KERvY3VtZW50JiwgU2VjdXJpdHlPcmlnaW4mLCBS ZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIExvY2tIaXN0b3J5LCBM b2NrQmFja0ZvcndhcmRMaXN0LCBjb25zdCBSZWZlcnJlclBvbGljeSYsIEFsbG93TmF2aWdhdGlv blRvSW52YWxpZFVSTCwgTmV3RnJhbWVPcGVuZXJQb2xpY3ksIFNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3ksIEluaXRpYXRlZEJ5TWFpbkZyYW1lLCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJZkph dmFTY3JpcHRVUkwgPSBSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwsIGNvbnN0IEF0b21T dHJpbmcmIGRvd25sb2FkQXR0cmlidXRlID0geyB9LCBjb25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYg PSB7IH0pOwogICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lTG9hZFJlcXVlc3QoRnJhbWUmLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBjb25zdCBT dWJzdGl0dXRlRGF0YSYgPSBTdWJzdGl0dXRlRGF0YSgpKTsKIAogICAgIFdFQkNPUkVfRVhQT1JU IH5GcmFtZUxvYWRSZXF1ZXN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TmF2aWdhdGlvblNjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlv blNjaGVkdWxlci5jcHAKaW5kZXggOTI5ZGEwNjY5YjJkODUxYjM5M2RlMDdjMGMzZjRmYTZhZmQy NWE2ZC4uMmM1MGY0Mzc3Mjc3ZmJhMzU3MzlmZmZmYWIwOTk2YmJiNzNlOGYyYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcApAQCAtMTg1LDcgKzE4 NSw3IEBAIHB1YmxpYzoKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlc291cmNlUmVxdWVzdCB7 IHVybCgpLCByZWZlcnJlcigpLCByZWZyZXNoID8gUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3k6 OlJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhIDogUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3k6OlVz ZVByb3RvY29sQ2FjaGVQb2xpY3kgfTsKICAgICAgICAgaWYgKGluaXRpYXRlZEJ5TWFpbkZyYW1l KCkgPT0gSW5pdGlhdGVkQnlNYWluRnJhbWU6OlllcykKICAgICAgICAgICAgIHJlc291cmNlUmVx dWVzdC5zZXRSZXF1ZXN0ZXIoUmVzb3VyY2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6Ok1haW4pOwotICAg ICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1l bnQoKSwgKnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVxdWVzdCwgIl9zZWxmIiwgbG9ja0hp c3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJp bmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5 OjpBbGxvdywgc2hvdWxkT3BlbkV4dGVybmFsVVJMcygpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSgp IH07CisgICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7IGluaXRpYXRp bmdEb2N1bWVudCgpLCAqc2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJjZVJlcXVlc3Qp LCAiX3NlbGYiLCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFja0ZvcndhcmRMaXN0KCksIFJlZmVycmVy UG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpObywgTmV3 RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzKCksIGluaXRp YXRlZEJ5TWFpbkZyYW1lKCkgfTsKIAogICAgICAgICBmcmFtZS5sb2FkZXIoKS5jaGFuZ2VMb2Nh dGlvbihXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpKTsKICAgICB9CkBAIC0yMTAsNyArMjEwLDcg QEAgcHVibGljOgogICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9y IHsgdXNlckdlc3R1cmVUb0ZvcndhcmQoKSB9OwogCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCBy ZXNvdXJjZVJlcXVlc3QgeyB1cmwoKSwgcmVmZXJyZXIoKSwgUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQ b2xpY3k6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3kgfTsKLSAgICAgICAgRnJhbWVMb2FkUmVxdWVz dCBmcmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50KCksICpzZWN1cml0eU9yaWdp bigpLCByZXNvdXJjZVJlcXVlc3QsICJfc2VsZiIsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9y d2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25U b0ludmFsaWRVUkw6Ok5vLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5F eHRlcm5hbFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUoKSB9OworICAgICAgICBGcmFtZUxv YWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1lbnQoKSwgKnNlY3Vy aXR5T3JpZ2luKCksIFdURk1vdmUocmVzb3VyY2VSZXF1ZXN0KSwgIl9zZWxmIiwgbG9ja0hpc3Rv cnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcs IEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpB bGxvdywgc2hvdWxkT3BlbkV4dGVybmFsVVJMcygpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSgpIH07 CiAKICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUobV9jb21wbGV0aW9u SGFuZGxlcik7CiAgICAgICAgIGZyYW1lLmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFdURk1vdmUo ZnJhbWVMb2FkUmVxdWVzdCkpOwpAQCAtMjMzLDcgKzIzMyw3IEBAIHB1YmxpYzoKICAgICAgICAg VXNlckdlc3R1cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRvciB7IHVzZXJHZXN0dXJlVG9Gb3J3 YXJkKCkgfTsKIAogICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0IHsgdXJs KCksIHJlZmVycmVyKCksIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZWxvYWRJZ25vcmlu Z0NhY2hlRGF0YSB9OwotICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3Qg eyBpbml0aWF0aW5nRG9jdW1lbnQoKSwgKnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVxdWVz dCwgIl9zZWxmIiwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBSZWZlcnJl clBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBO ZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwgaW5p dGlhdGVkQnlNYWluRnJhbWUoKSB9OworICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9h ZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1lbnQoKSwgKnNlY3VyaXR5T3JpZ2luKCksIFdURk1v dmUocmVzb3VyY2VSZXF1ZXN0KSwgIl9zZWxmIiwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3 YXJkTGlzdCgpLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3csIHNob3VsZE9wZW5F eHRlcm5hbFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUoKSB9OwogCiAgICAgICAgIGZyYW1l LmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFdURk1vdmUoZnJhbWVMb2FkUmVxdWVzdCkpOwogICAg IH0KQEAgLTMzOSw3ICszMzksNyBAQCBwdWJsaWM6CiAgICAgICAgIFN1YnN0aXR1dGVEYXRhIHJl cGxhY2VtZW50RGF0YSB7IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCksIG1fb3JpZ2luRG9jdW1lbnQu dXJsKCksIHJlcGxhY2VtZW50UmVzcG9uc2UsIFN1YnN0aXR1dGVEYXRhOjpTZXNzaW9uSGlzdG9y eVZpc2liaWxpdHk6OkhpZGRlbiB9OwogCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJj ZVJlcXVlc3QgeyBtX29yaWdpbkRvY3VtZW50LnVybCgpLCBlbXB0eVN0cmluZygpLCBSZXNvdXJj ZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVsb2FkSWdub3JpbmdDYWNoZURhdGEgfTsKLSAgICAgICAg RnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgbV9vcmlnaW5Eb2N1bWVudCwgbV9v cmlnaW5Eb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVlc3QsIHsgfSwgbG9j a0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCBSZWZlcnJlclBvbGljeTo6RW1wdHlT dHJpbmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBv bGljeTo6QWxsb3csIHNob3VsZE9wZW5FeHRlcm5hbFVSTHMoKSwgaW5pdGlhdGVkQnlNYWluRnJh bWUoKSB9OworICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyBtX29y aWdpbkRvY3VtZW50LCBtX29yaWdpbkRvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCksIFdURk1vdmUo cmVzb3VyY2VSZXF1ZXN0KSwgeyB9LCBsb2NrSGlzdG9yeSgpLCBsb2NrQmFja0ZvcndhcmRMaXN0 KCksIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgc2hvdWxkT3BlbkV4dGVybmFs VVJMcygpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSgpIH07CiAgICAgICAgIGZyYW1lTG9hZFJlcXVl c3Quc2V0U3Vic3RpdHV0ZURhdGEocmVwbGFjZW1lbnREYXRhKTsKICAgICAgICAgZnJhbWUubG9h ZGVyKCkubG9hZChXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpKTsKICAgICB9CkBAIC00MzksNyAr NDM5LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZUxvY2F0aW9uQ2hhbmdl KERvY3VtZW50JiBpbml0aWF0aW5nRG9jdW1lbnQsIFMKICAgICAgICAgYXV0byogZnJhbWUgPSBs ZXhpY2FsRnJhbWVGcm9tQ29tbW9uVk0oKTsKICAgICAgICAgYXV0byBpbml0aWF0ZWRCeU1haW5G cmFtZSA9IGZyYW1lICYmIGZyYW1lLT5pc01haW5GcmFtZSgpID8gSW5pdGlhdGVkQnlNYWluRnJh bWU6OlllcyA6IEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duOwogICAgICAgICAKLSAgICAg ICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgaW5pdGlhdGluZ0RvY3VtZW50 LCBzZWN1cml0eU9yaWdpbiwgcmVzb3VyY2VSZXF1ZXN0LCAiX3NlbGYiX3MsIGxvY2tIaXN0b3J5 LCBsb2NrQmFja0ZvcndhcmRMaXN0LCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIEFsbG93 TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6Tm8sIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywg aW5pdGlhdGluZ0RvY3VtZW50LnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0 ZSgpLCBpbml0aWF0ZWRCeU1haW5GcmFtZSB9OworICAgICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZy YW1lTG9hZFJlcXVlc3QgeyBpbml0aWF0aW5nRG9jdW1lbnQsIHNlY3VyaXR5T3JpZ2luLCBXVEZN b3ZlKHJlc291cmNlUmVxdWVzdCksICJfc2VsZiJfcywgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9y d2FyZExpc3QsIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9J bnZhbGlkVVJMOjpObywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBpbml0aWF0aW5nRG9j dW1lbnQuc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCksIGluaXRpYXRl ZEJ5TWFpbkZyYW1lIH07CiAgICAgICAgIGxvYWRlci5jaGFuZ2VMb2NhdGlvbihXVEZNb3ZlKGZy YW1lTG9hZFJlcXVlc3QpKTsKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmlu ZGV4IDQ3ZmJmN2RkODFlZTg5ODgwZTViMmZjNmY4ZDY3OTVhNDRmYTJjOTUuLmZlOGI0YjM3Y2Jj OGNhYjM4N2U0NzJhNGU2ZTUyOTIyYzMwNmQwMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKQEAgLTQwNSw3ICs0MDUsNyBAQCB2b2lkIENvbnRl eHRNZW51Q29udHJvbGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoQ29udGV4dE1lbnVBY3Rp b24gYWN0aW9uLCBjbwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3Blbkxpbms6CiAgICAg ICAgIGlmIChGcmFtZSogdGFyZ2V0RnJhbWUgPSBtX2NvbnRleHQuaGl0VGVzdFJlc3VsdCgpLnRh cmdldEZyYW1lKCkpIHsKICAgICAgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVl c3QgeyBtX2NvbnRleHQuaGl0VGVzdFJlc3VsdCgpLmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+ bG9hZGVyKCkub3V0Z29pbmdSZWZlcnJlcigpIH07Ci0gICAgICAgICAgICBGcmFtZUxvYWRSZXF1 ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqZnJhbWUtPmRvY3VtZW50KCksIGZyYW1lLT5kb2N1bWVu dCgpLT5zZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVlc3QsIHsgfSwgTG9ja0hpc3Rvcnk6 Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5n LCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6 OlN1cHByZXNzLCB0YXJnZXRGcmFtZS0+aXNNYWluRnJhbWUoKSA/IFNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3k6OlNob3VsZEFsbG93IDogU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6 U2hvdWxkTm90QWxsb3csIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duIH07CisgICAgICAg ICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqZnJhbWUtPmRvY3VtZW50 KCksIGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBXVEZNb3ZlKHJlc291cmNl UmVxdWVzdCksIHsgfSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywg UmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6 OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OlN1cHByZXNzLCB0YXJnZXRGcmFtZS0+aXNNYWlu RnJhbWUoKSA/IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93IDogU2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3csIEluaXRpYXRlZEJ5TWFp bkZyYW1lOjpVbmtub3duIH07CiAgICAgICAgICAgICB0YXJnZXRGcmFtZS0+bG9hZGVyKCkubG9h ZEZyYW1lUmVxdWVzdChXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpLCBudWxscHRyLCAgeyB9KTsK ICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBvcGVuTmV3V2luZG93KG1fY29udGV4dC5oaXRU ZXN0UmVzdWx0KCkuYWJzb2x1dGVMaW5rVVJMKCksICpmcmFtZSwgU2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeTo6U2hvdWxkQWxsb3cpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4 IGJkZmQ5N2YwZjI3ODcyMTZiZDZiZDgzMWExMTRlOThjYTc5OWMzMTMuLmExZTE3ZTA4MzUzZGUx MjE0NjUyMmM3YWVmZTQzOTM2ZmVlYThmZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAK QEAgLTI0ODEsNyArMjQ4MSw3IEBAIEV4Y2VwdGlvbk9yPFJlZlB0cjxGcmFtZT4+IERPTVdpbmRv dzo6Y3JlYXRlV2luZG93KGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zCiAgICAgYXV0byBp bml0aWF0ZWRCeU1haW5GcmFtZSA9IGFjdGl2ZUZyYW1lLT5pc01haW5GcmFtZSgpID8gSW5pdGlh dGVkQnlNYWluRnJhbWU6OlllcyA6IEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duOwogCiAg ICAgUmVzb3VyY2VSZXF1ZXN0IHJlc291cmNlUmVxdWVzdCB7IGNvbXBsZXRlZFVSTCwgcmVmZXJy ZXIgfTsKLSAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QgeyAqYWN0aXZlRG9j dW1lbnQsIGFjdGl2ZURvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLCByZXNvdXJjZVJlcXVlc3Qs IGZyYW1lTmFtZSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVm ZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Olll cywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBhY3RpdmVEb2N1bWVudC0+c2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCksIGluaXRpYXRlZEJ5TWFpbkZyYW1lIH07 CisgICAgRnJhbWVMb2FkUmVxdWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmFjdGl2ZURvY3VtZW50 LCBhY3RpdmVEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJjZVJlcXVl c3QpLCBmcmFtZU5hbWUsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8s IFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJM OjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgYWN0aXZlRG9jdW1lbnQtPnNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBpbml0aWF0ZWRCeU1haW5GcmFt ZSB9OwogCiAgICAgLy8gV2UgcGFzcyB0aGUgb3BlbmVyIGZyYW1lIGZvciB0aGUgbG9va3VwRnJh bWUgaW4gY2FzZSB0aGUgYWN0aXZlIGZyYW1lIGlzIGRpZmZlcmVudCBmcm9tCiAgICAgLy8gdGhl IG9wZW5lciBmcmFtZSwgYW5kIHRoZSBuYW1lIHJlZmVyZW5jZXMgYSBmcmFtZSByZWxhdGl2ZSB0 byB0aGUgb3BlbmVyIGZyYW1lLgpAQCAtMjUwNiw3ICsyNTA2LDcgQEAgRXhjZXB0aW9uT3I8UmVm UHRyPEZyYW1lPj4gRE9NV2luZG93OjpjcmVhdGVXaW5kb3coY29uc3QgU3RyaW5nJiB1cmxTdHJp bmcsIGNvbnMKICAgICBpZiAoY3JlYXRlZCkgewogICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVz b3VyY2VSZXF1ZXN0IHsgY29tcGxldGVkVVJMLCByZWZlcnJlciwgUmVzb3VyY2VSZXF1ZXN0Q2Fj aGVQb2xpY3k6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3kgfTsKICAgICAgICAgRnJhbWVMb2FkZXI6 OmFkZFNhbWVTaXRlSW5mb1RvUmVxdWVzdElmTmVlZGVkKHJlc291cmNlUmVxdWVzdCwgb3BlbmVy RnJhbWUuZG9jdW1lbnQoKSk7Ci0gICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVx dWVzdCB7ICphY3RpdmVXaW5kb3cuZG9jdW1lbnQoKSwgYWN0aXZlV2luZG93LmRvY3VtZW50KCkt PnNlY3VyaXR5T3JpZ2luKCksIHJlc291cmNlUmVxdWVzdCwgIl9zZWxmIl9zLCBMb2NrSGlzdG9y eTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJp bmcsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGlj eTo6QWxsb3csIGFjdGl2ZURvY3VtZW50LT5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Q cm9wYWdhdGUoKSwgaW5pdGlhdGVkQnlNYWluRnJhbWUgfTsKKyAgICAgICAgRnJhbWVMb2FkUmVx dWVzdCBmcmFtZUxvYWRSZXF1ZXN0IHsgKmFjdGl2ZVdpbmRvdy5kb2N1bWVudCgpLCBhY3RpdmVX aW5kb3cuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgV1RGTW92ZShyZXNvdXJjZVJlcXVl c3QpLCAiX3NlbGYiX3MsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8s IFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJM OjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpBbGxvdywgYWN0aXZlRG9jdW1lbnQtPnNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBpbml0aWF0ZWRCeU1haW5GcmFt ZSB9OwogICAgICAgICBuZXdGcmFtZS0+bG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oV1RGTW92ZShm cmFtZUxvYWRSZXF1ZXN0KSk7CiAgICAgfSBlbHNlIGlmICghdXJsU3RyaW5nLmlzRW1wdHkoKSkg ewogICAgICAgICBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSA9IFVzZXJHZXN0dXJlSW5kaWNhdG9y Ojpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSA/IExvY2tIaXN0b3J5OjpObyA6IExvY2tIaXN0b3J5 OjpZZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBiODE4YTY2ZmYxMGZm ZWIxODFhYTE4M2NmNGIyMjI1OGEzYzExNTExLi5hODE0ZDNkMWIxZDY4YmQ0MDg5MzU1YjQ2YmRi MWU4MDcxMDcyNDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTc4OCw3 ICs3ODgsOCBAQCBGcmFtZSogV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoQ3JlYXRlUGFn ZShjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBuYXZpZ2F0aQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAogICAgIC8vIEp1c3QgY2FsbCB0aHJvdWdoIHRvIHRoZSBjaHJvbWUgY2xpZW50LgotICAg IEZyYW1lTG9hZFJlcXVlc3QgZnJhbWVMb2FkUmVxdWVzdCB7ICptX2ZyYW1lLT5jb3JlRnJhbWUo KS0+ZG9jdW1lbnQoKSwgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCksIG5hdmlnYXRpb25BY3Rpb24ucmVzb3VyY2VSZXF1ZXN0KCksIHsgfSwgTG9ja0hp c3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5 U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQ b2xpY3k6OkFsbG93LCBuYXZpZ2F0aW9uQWN0aW9uLnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xp Y3koKSwgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25vd24gfTsKKyAgICBhdXRvIHJlcXVlc3Qg PSBuYXZpZ2F0aW9uQWN0aW9uLnJlc291cmNlUmVxdWVzdCgpOworICAgIEZyYW1lTG9hZFJlcXVl c3QgZnJhbWVMb2FkUmVxdWVzdCB7ICptX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKSwg bV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFdURk1v dmUocmVxdWVzdCksIHsgfSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpO bywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRV Ukw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBuYXZpZ2F0aW9uQWN0aW9uLnNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koKSwgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25v d24gfTsKICAgICBQYWdlKiBuZXdQYWdlID0gd2ViUGFnZS0+Y29yZVBhZ2UoKS0+Y2hyb21lKCku Y3JlYXRlV2luZG93KCptX2ZyYW1lLT5jb3JlRnJhbWUoKSwgZnJhbWVMb2FkUmVxdWVzdCwgeyB9 LCBuYXZpZ2F0aW9uQWN0aW9uKTsKICAgICBpZiAoIW5ld1BhZ2UpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwo=