189973 2018-09-25 13:44:07 -0700 Revert some of the changes in r236471 2018-09-25 18:28:28 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 189927 1 cdumez cdumez achristensen commit-queue ggaren webkit-bug-importer oldest_to_newest 1463315 0 cdumez 2018-09-25 13:44:07 -0700 Revert some of the changes in r236471 as they should not be needed. 1463317 1 350784 cdumez 2018-09-25 13:46:37 -0700 Created attachment 350784 Patch 1463365 2 350784 cdumez 2018-09-25 15:17:56 -0700 Comment on attachment 350784 Patch Clearing flags on attachment: 350784 Committed r236480: <https://trac.webkit.org/changeset/236480> 1463366 3 cdumez 2018-09-25 15:17:59 -0700 All reviewed patches have been landed. Closing bug. 1463367 4 webkit-bug-importer 2018-09-25 15:18:23 -0700 <rdar://problem/44776101> 1463453 5 cdumez 2018-09-25 18:28:02 -0700 Reverted r236471 and r236480 for reason: Seems to be causing some flaky crashes Committed r236492: <https://trac.webkit.org/changeset/236492> 350784 2018-09-25 13:46:37 -0700 2018-09-25 15:17:56 -0700 Patch bug-189973-20180925134636.patch text/plain 21518 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdhNTUyYmQ5MmFmMTI1ZWFm NTM0ZGVhYmEzNDc4OWRmOTcwYmFkYzIuLjUxOGZhYTYxYTZmMWEzYTI1ZjJhNWMxNTMyOWRhNTU0 MmVhZjQwMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDktMjUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZlcnQgc29tZSBvZiB0aGUgY2hh bmdlcyBpbiByMjM2NDcxCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODk5NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZXZlcnQgc29tZSBvZiB0aGUgY2hhbmdlcyBpbiByMjM2NDcxIGFzIHRoZXkgc2hv dWxkIG5vdCBiZSBuZWVkZWQuIEluIHBhcnRpY3VsYXIsCisgICAgICAgIGl0IHNob3VsZCBub3Qg YmUgcG9zc2libGUgZm9yIHRoZSBEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uU3luYyBJ UEMgdG8gZ2V0CisgICAgICAgIHByb2Nlc3NlZCAqYmVmb3JlKiB0aGUgRGlkQ3JlYXRlTWFpbkZy YW1lIC8gRGlkQ3JlYXRlU3ViZnJhbWUgb25lcyBiZWNhdXNlIHRob3NlCisgICAgICAgIHVzZSBJ UEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBs eS4gVGhleSBhcmUgdGh1cworICAgICAgICBwcm9jZXNzZWQgZWFybHkgd2hlbiBuZWNlc3Nhcnks IHRoZSBzYW1lIHdheSBhcyBzeW5jaHJvbm91cyBJUEMgbWVzc2FnZXMuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZENyZWF0ZVN1YmZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVM b2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViRnJhbWU6OmNyZWF0ZVdpdGhDb3JlTWFpbkZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWU6OmNyZWF0ZVN1YmZyYW1lKToKKwogMjAxOC0wOS0yNSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVJUHJvY2VzcyBzaG91bGQgcHJvY2VzcyBpbmNv bWluZyBzeW5jIElQQyBmcm9tIFdlYlByb2Nlc3Mgd2hlbiB3YWl0aW5nIGZvciBhIHN5bmMgSVBD IHJlcGx5IGZyb20gaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmlu ZGV4IDRkNjE2MzljM2I2NjNiMmQxY2IxY2I1MzMxYjgyNTg4YjMzYTg1ZmQuLjljMjAyNTFjNjA2 ZjQyZDRlMDNmODNhOWEyYmY1NGYxNzQ0NmMyMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcApAQCAtMzM1Nyw5ICszMzU3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnByZWZlcmVuY2VzRGlkQ2hhbmdlKCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1h aW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogewotICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21h aW5GcmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpCi0gICAgICAgIHJldHVybjsKLQogICAgIFBh Z2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBNRVNTQUdF X0NIRUNLKCFtX21haW5GcmFtZSk7CkBAIC0zMzgyLDEwICszMzc5LDYgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAgICAgUGFnZUNsaWVu dFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIE1FU1NBR0VfQ0hFQ0so bV9tYWluRnJhbWUpOwotCi0gICAgaWYgKG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCkpCi0g ICAgICAgIHJldHVybjsKLQogICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLT5jYW5DcmVhdGVG cmFtZShmcmFtZUlEKSk7CiAgICAgCiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IHN1YkZyYW1l ID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKHRoaXMsIGZyYW1lSUQpOwpAQCAtNDAwMywxNSArMzk5 NiwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6YmVnaW5TYWZlQnJvd3NpbmdDaGVjayhjb25zdCBV UkwmLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveAogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmIG5hdmlnYXRpb25BY3Rpb25E YXRhLCBjb25zdCBGcmFtZUluZm9EYXRhJiBmcmFtZUluZm9EYXRhLCB1aW50NjRfdCBvcmlnaW5h dGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVl c3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIFdl YkNvcmU6OlNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjayBzaG91bGRTa2lwU2FmZUJyb3dzaW5n Q2hlY2ssIHVpbnQ2NF90IGxpc3RlbmVySUQpCiB7Ci0gICAgYXV0byogZnJhbWUgPSBtX3Byb2Nl c3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwotCi0gICAg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIGZyYW1lU2VjdXJpdHlPcmln aW4sIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIGZyYW1lSW5m b0RhdGEsIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVz dCksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBzaG91bGRTa2lwU2FmZUJy b3dzaW5nQ2hlY2ssIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJn cykgeworICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oZnJhbWVJRCwgZnJhbWVT ZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRh KSwgZnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RG TW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIHNob3Vs ZFNraXBTYWZlQnJvd3NpbmdDaGVjaywgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAo YXV0by4uLiBhcmdzKSB7CiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4p LCBtX3BhZ2VJRCk7CiAgICAgfSkpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJGcmFtZVByb3h5JiBmcmFtZSwgY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIGNv bnN0IEZyYW1lSW5mb0RhdGEmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3Jp Z2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxS ZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRh LCBXZWJDb3JlOjpTaG91bGRTa2lwU2FmZUJyb3dzaW5nQ2hlY2sgc2hvdWxkU2tpcFNhZmVCcm93 c2luZ0NoZWNrLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYgc2VuZGVyKQordm9pZCBXZWJQ YWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJ RCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2lu LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlv bkFjdGlvbkRhdGEsIGNvbnN0IEZyYW1lSW5mb0RhdGEmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0 YSwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0 LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNl ckRhdGEmIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRTa2lwU2FmZUJyb3dzaW5nQ2hlY2sgc2hv dWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYgc2Vu ZGVyKQogewogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uIC0gT3JpZ2luYWwgVVJMICVzLCBjdXJyZW50IHRhcmdldCBVUkwgJXMi LCBvcmlnaW5hbFJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcmVxdWVzdC51 cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIApAQCAtNDAyMyw2ICs0MDEzLDggQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQ cm94eSYgZnJhbWUsIGNvbnN0IFcKICAgICBpZiAoIWZyb21BUEkpCiAgICAgICAgIG1fcGFnZUxv YWRTdGF0ZS5jbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uKTsKIAorICAgIGF1 dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NI RUNLKGZyYW1lKTsKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXF1ZXN0LnVybCgpKTsKICAgICBN RVNTQUdFX0NIRUNLX1VSTChvcmlnaW5hbFJlcXVlc3QudXJsKCkpOwogCkBAIC00MDU5LDMxICs0 MDUxLDMxIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKFdlYkZyYW1lUHJveHkmIGZyYW1lLCBjb25zdCBXCiAgICAgbmF2aWdhdGlvbi0+c2V0UmVx dWVzdGVyT3JpZ2luKG5hdmlnYXRpb25BY3Rpb25EYXRhLnJlcXVlc3Rlck9yaWdpbik7CiAKICNp ZiBFTkFCTEUoQ09OVEVOVF9GSUxURVJJTkcpCi0gICAgaWYgKGZyYW1lLmRpZEhhbmRsZUNvbnRl bnRGaWx0ZXJVbmJsb2NrTmF2aWdhdGlvbihyZXF1ZXN0KSkKKyAgICBpZiAoZnJhbWUtPmRpZEhh bmRsZUNvbnRlbnRGaWx0ZXJVbmJsb2NrTmF2aWdhdGlvbihyZXF1ZXN0KSkKICAgICAgICAgcmV0 dXJuIHJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uOjpJZ25vcmUsIG1fbmF2aWdh dGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5ld05hdmlnYXRpb25JRCksIHN0ZDo6bnVsbG9wdCwgV1RG TW92ZShzZW5kZXIpKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG5ld05hdmlnYXRpb25JRCk7 CiAjZW5kaWYKIAotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLnNldFVwUG9saWN5 TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFt ZSA9IG1ha2VSZWYoZnJhbWUpLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIG5hdmlnYXRpb25d IChXZWJDb3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2ll cyogcG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgVmVjdG9yPFJlZjxTYWZlQnJvd3NpbmdSZXN1bHQ+PiYmKSBtdXRhYmxl IHsKKyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5l clByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lID0gbWFr ZVJlZigqZnJhbWUpLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIG5hdmlnYXRpb25dIChXZWJD b3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyogcG9s aWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCwgVmVjdG9yPFJlZjxTYWZlQnJvd3NpbmdSZXN1bHQ+PiYmKSBtdXRhYmxlIHsKICAg ICAgICAgLy8gRklYTUU6IGRvIHNvbWV0aGluZyB3aXRoIHRoZSBTYWZlQnJvd3NpbmdSZXN1bHRz LgogICAgICAgICByZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24s IG5hdmlnYXRpb24uZ2V0KCksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIGZyYW1lLCBw b2xpY2llcywgV1RGTW92ZShzZW5kZXIpKTsKICAgICB9LCBzaG91bGRTa2lwU2FmZUJyb3dzaW5n Q2hlY2sgPT0gU2hvdWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrOjpZZXMgPyBTaG91bGRFeHBlY3RT YWZlQnJvd3NpbmdSZXN1bHQ6Ok5vIDogU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpZ ZXMpKTsKICAgICBpZiAoc2hvdWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrID09IFNob3VsZFNraXBT YWZlQnJvd3NpbmdDaGVjazo6Tm8pCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hlY2socmVx dWVzdC51cmwoKSwgbGlzdGVuZXIpOwogCi0gICAgQVBJOjpOYXZpZ2F0aW9uKiBtYWluRnJhbWVO YXZpZ2F0aW9uID0gZnJhbWUuaXNNYWluRnJhbWUoKSA/IG5hdmlnYXRpb24uZ2V0KCkgOiBudWxs cHRyOworICAgIEFQSTo6TmF2aWdhdGlvbiogbWFpbkZyYW1lTmF2aWdhdGlvbiA9IGZyYW1lLT5p c01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6IG51bGxwdHI7CiAgICAgV2ViRnJhbWVQ cm94eSogb3JpZ2luYXRpbmdGcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUob3JpZ2luYXRpbmdG cmFtZUluZm9EYXRhLmZyYW1lSUQpOwogCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZSA9IHdlYnNpdGVEYXRhU3RvcmUoKS5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkp Ci0gICAgICAgIHJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS0+bG9nRnJhbWVOYXZpZ2F0aW9u KGZyYW1lLCBVUkwoVVJMKCksIG1fcGFnZUxvYWRTdGF0ZS51cmwoKSksIHJlcXVlc3QsIHJlZGly ZWN0UmVzcG9uc2UudXJsKCkpOworICAgICAgICByZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUt PmxvZ0ZyYW1lTmF2aWdhdGlvbigqZnJhbWUsIFVSTChVUkwoKSwgbV9wYWdlTG9hZFN0YXRlLnVy bCgpKSwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZS51cmwoKSk7CiAKICAgICBpZiAobV9wb2xp Y3lDbGllbnQpCi0gICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uKCp0aGlzLCAmZnJhbWUsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBv cmlnaW5hdGluZ0ZyYW1lLCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1v dmUobGlzdGVuZXIpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRh dGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9wb2xpY3lDbGllbnQtPmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsIGZyYW1lLCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rp b25EYXRhKSwgb3JpZ2luYXRpbmdGcmFtZSwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVl c3QpLCBXVEZNb3ZlKGxpc3RlbmVyKSwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8g ZGVzdGluYXRpb25GcmFtZUluZm8gPSBBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKGZyYW1lLCBmcmFt ZVNlY3VyaXR5T3JpZ2luLnNlY3VyaXR5T3JpZ2luKCkpOworICAgICAgICBhdXRvIGRlc3RpbmF0 aW9uRnJhbWVJbmZvID0gQVBJOjpGcmFtZUluZm86OmNyZWF0ZSgqZnJhbWUsIGZyYW1lU2VjdXJp dHlPcmlnaW4uc2VjdXJpdHlPcmlnaW4oKSk7CiAgICAgICAgIFJlZlB0cjxBUEk6OkZyYW1lSW5m bz4gc291cmNlRnJhbWVJbmZvOwotICAgICAgICBpZiAoIWZyb21BUEkgJiYgb3JpZ2luYXRpbmdG cmFtZSA9PSAmZnJhbWUpCisgICAgICAgIGlmICghZnJvbUFQSSAmJiBvcmlnaW5hdGluZ0ZyYW1l ID09IGZyYW1lKQogICAgICAgICAgICAgc291cmNlRnJhbWVJbmZvID0gZGVzdGluYXRpb25GcmFt ZUluZm8uY29weVJlZigpOwogICAgICAgICBlbHNlIGlmICghZnJvbUFQSSkKICAgICAgICAgICAg IHNvdXJjZUZyYW1lSW5mbyA9IEFQSTo6RnJhbWVJbmZvOjpjcmVhdGUob3JpZ2luYXRpbmdGcmFt ZUluZm9EYXRhLCBvcmlnaW5hdGluZ1BhZ2VJRCA/IG1fcHJvY2Vzcy0+d2ViUGFnZShvcmlnaW5h dGluZ1BhZ2VJRCkgOiBudWxscHRyKTsKQEAgLTQwOTksMjMgKzQwOTEsMTEgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYg ZnJhbWUsIGNvbnN0IFcKICAgICBtX3Nob3VsZFN1cHByZXNzQXBwTGlua3NJbk5leHROYXZpZ2F0 aW9uUG9saWN5RGVjaXNpb24gPSBmYWxzZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaXNN YWluRnJhbWUsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0 eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmIG5h dmlnYXRpb25BY3Rpb25EYXRhLCBjb25zdCBGcmFtZUluZm9EYXRhJiBmcmFtZUluZm9EYXRhLCB1 aW50NjRfdCBvcmlnaW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiBvcmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdl YkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjayBzaG91bGRT a2lwU2FmZUJyb3dzaW5nQ2hlY2ssIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb25TeW5jOjpEZWxheWVkUmVwbHkmJiByZXBseSkKK3ZvaWQgV2Vi UGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uU3luYyh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlP cmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZp Z2F0aW9uQWN0aW9uRGF0YSwgY29uc3QgRnJhbWVJbmZvRGF0YSYgZnJhbWVJbmZvRGF0YSwgdWlu dDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYg b3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRTa2lwU2FmZUJyb3dzaW5nQ2hlY2sgc2hvdWxkU2tp cFNhZmVCcm93c2luZ0NoZWNrLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uU3luYzo6RGVsYXllZFJlcGx5JiYgcmVwbHkpCiB7CiAgICAgYXV0 byBzZW5kZXIgPSBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFdURk1vdmUocmVwbHkpKTsK LQotICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBp ZiAoIWZyYW1lKSB7Ci0gICAgICAgIC8vIFRoaXMgc3luY2hyb25vdXMgSVBDIG1lc3NhZ2Ugd2Fz IHByb2Nlc3NlZCBiZWZvcmUgdGhlIGFzeW5jaHJvbm91cyBEaWRDcmVhdGVNYWluRnJhbWUgLyBE aWRDcmVhdGVTdWJmcmFtZSBvbmUgc28gd2UgZG8gbm90IGtub3cgYWJvdXQgdGhpcyBmcmFtZUlE IHlldC4KLSAgICAgICAgaWYgKGlzTWFpbkZyYW1lKQotICAgICAgICAgICAgZGlkQ3JlYXRlTWFp bkZyYW1lKGZyYW1lSUQpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBkaWRDcmVhdGVTdWJm cmFtZShmcmFtZUlEKTsKLQotICAgICAgICBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJh bWVJRCk7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKGZyYW1lKTsKLSAgICB9CiAgICAgCi0gICAg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIGZyYW1lU2VjdXJpdHlPcmln aW4sIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIGZyYW1lSW5m b0RhdGEsIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVz dCksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBzaG91bGRTa2lwU2FmZUJy b3dzaW5nQ2hlY2ssIHNlbmRlci5jb3B5UmVmKCkpOworICAgIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24oZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBX VEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgZnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQ YWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZWRpcmVj dFJlc3BvbnNlKSwgdXNlckRhdGEsIHNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjaywgc2VuZGVy LmNvcHlSZWYoKSk7CiAKICAgICAvLyBJZiB0aGUgY2xpZW50IGRpZCBub3QgcmVzcG9uZCBzeW5j aHJvbm91c2x5LCBwcm9jZWVkIHdpdGggdGhlIGxvYWQuCiAgICAgc2VuZGVyLT5zZW5kKFBvbGlj eUFjdGlvbjo6VXNlLCBuYXZpZ2F0aW9uSUQsIERvd25sb2FkSUQoKSwgc3RkOjpudWxsb3B0KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMmI2NzVhNjkyMjg0YTI2 OTJjN2Q3MTE0OGNmNDdmZmRmMzlkZWE4Mi4uMjM1YmVlNGRmZTc4NTRkMTJhMWE0ZDQ1ZmQ1Yjk5 MmJmMDlmMDQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTE0 MzQsOSArMTQzNCw5IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpZERlc3Ryb3lOYXZpZ2F0aW9u KHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CiAKLSAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0 aW9uQWN0aW9uRGF0YSYmLCBjb25zdCBGcmFtZUluZm9EYXRhJiwgdWludDY0X3Qgb3JpZ2luYXRp bmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0 LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm IHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgV2ViQ29yZTo6U2hvdWxkU2tpcFNh ZmVCcm93c2luZ0NoZWNrLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYpOworICAgIHZvaWQg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih1aW50NjRfdCBmcmFtZUlELCBjb25zdCBX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgY29uc3QgRnJhbWVJbmZvRGF0 YSYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYs IFdlYkNvcmU6OlNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjaywgUmVmPFBvbGljeURlY2lzaW9u U2VuZGVyPiYmKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3lu Yyh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZy YW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlv bkRhdGEmJiwgY29uc3QgRnJhbWVJbmZvRGF0YSYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlE LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVj dFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYsIFdlYkNvcmU6OlNob3VsZFNraXBTYWZlQnJvd3Np bmdDaGVjaywgdWludDY0X3QgbGlzdGVuZXJJRCk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uU3luYyh1aW50NjRfdCBmcmFtZUlELCBib29sIGlzTWFpbkZyYW1lLCBj b25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgY29uc3QgRnJhbWVJ bmZvRGF0YSYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2Vy RGF0YSYsIFdlYkNvcmU6OlNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjaywgTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblN5bmM6OkRlbGF5ZWRS ZXBseSYmKTsKKyAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVT ZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0 YSYmLCBjb25zdCBGcmFtZUluZm9EYXRhJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVz cG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgV2ViQ29yZTo6U2hvdWxkU2tpcFNhZmVCcm93c2luZ0No ZWNrLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uU3luYzo6RGVsYXllZFJlcGx5JiYpOwogICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmV3V2lu ZG93QWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCB1aW50NjRfdCBs aXN0ZW5lcklELCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRh JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBi b29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEm KTsKICAgICB2b2lkIHVuYWJsZVRvSW1wbGVtZW50UG9saWN5KHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDhlNjUy NTExMmZjNjVjMGUxMGFhYzBlYWZlYjM2ZWIxOTgwOTU0NDYuLjRjZmM3ZjYwYTFkYWY2MDQzMTlj ZDc2N2UyNzBkMzcyMzNkMDljYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTEwOCw3ICsxMDgsNyBAQCBtZXNzYWdlcyAtPiBX ZWJQYWdlUHJveHkgewogICAgICMgUG9saWN5IG1lc3NhZ2VzCiAgICAgRGVjaWRlUG9saWN5Rm9y UmVzcG9uc2UodWludDY0X3QgZnJhbWVJRCwgc3RydWN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1 ZXN0LCBib29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgV2ViS2l0OjpV c2VyRGF0YSB1c2VyRGF0YSkKICAgICBEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5 bmModWludDY0X3QgZnJhbWVJRCwgc3RydWN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSBm cmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHN0cnVjdCBXZWJLaXQ6 Ok5hdmlnYXRpb25BY3Rpb25EYXRhIG5hdmlnYXRpb25BY3Rpb25EYXRhLCBzdHJ1Y3QgV2ViS2l0 OjpGcmFtZUluZm9EYXRhIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2lu YXRpbmdQYWdlSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVlc3QsIFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNl IHJlZGlyZWN0UmVzcG9uc2UsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEsIGVudW0gV2ViQ29y ZTo6U2hvdWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrIHNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVj aywgdWludDY0X3QgbGlzdGVuZXJJRCkKLSAgICBEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uU3luYyh1aW50NjRfdCBmcmFtZUlELCBib29sIGlzTWFpbkZyYW1lLCBzdHJ1Y3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgc3RydWN0IFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbkRhdGEgbmF2aWdhdGlvbkFj dGlvbkRhdGEsIHN0cnVjdCBXZWJLaXQ6OkZyYW1lSW5mb0RhdGEgb3JpZ2luYXRpbmdGcmFtZUlu Zm9EYXRhLCB1aW50NjRfdCBvcmlnaW5hdGluZ1BhZ2VJRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0IG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QsIFdl YkNvcmU6OlJlc291cmNlUmVzcG9uc2UgcmVkaXJlY3RSZXNwb25zZSwgV2ViS2l0OjpVc2VyRGF0 YSB1c2VyRGF0YSwgZW51bSBXZWJDb3JlOjpTaG91bGRTa2lwU2FmZUJyb3dzaW5nQ2hlY2sgc2hv dWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrKSAtPiAoZW51bSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24g cG9saWN5QWN0aW9uLCB1aW50NjRfdCBuZXdOYXZpZ2F0aW9uSUQsIFdlYktpdDo6RG93bmxvYWRJ RCBkb3dubG9hZElELCBzdGQ6Om9wdGlvbmFsPFdlYktpdDo6V2Vic2l0ZVBvbGljaWVzRGF0YT4g d2Vic2l0ZVBvbGljaWVzKSBEZWxheWVkCisgICAgRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvblN5bmModWludDY0X3QgZnJhbWVJRCwgc3RydWN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHN0cnVjdCBX ZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhIG5hdmlnYXRpb25BY3Rpb25EYXRhLCBzdHJ1Y3Qg V2ViS2l0OjpGcmFtZUluZm9EYXRhIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qg b3JpZ2luYXRpbmdQYWdlSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVl c3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlIHJlZGlyZWN0UmVzcG9uc2UsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEsIGVudW0g V2ViQ29yZTo6U2hvdWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrIHNob3VsZFNraXBTYWZlQnJvd3Np bmdDaGVjaykgLT4gKGVudW0gV2ViQ29yZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgdWlu dDY0X3QgbmV3TmF2aWdhdGlvbklELCBXZWJLaXQ6OkRvd25sb2FkSUQgZG93bmxvYWRJRCwgc3Rk OjpvcHRpb25hbDxXZWJLaXQ6OldlYnNpdGVQb2xpY2llc0RhdGE+IHdlYnNpdGVQb2xpY2llcykg RGVsYXllZAogICAgIERlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRfdCBmcmFt ZUlELCBzdHJ1Y3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhIGZyYW1lU2VjdXJpdHlPcmln aW4sIHN0cnVjdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhIG5hdmlnYXRpb25BY3Rpb25E YXRhLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgU3RyaW5nIGZyYW1lTmFtZSwg dWludDY0X3QgbGlzdGVuZXJJRCwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKICAgICBVbmFi bGVUb0ltcGxlbWVudFBvbGljeSh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yIGVycm9yLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAppbmRleCAyNDczNTY4NzQ4NWY4MjJjM2YxMDM3YzAyNWExNzBmZDc1YzQ4 NDFhLi43MDNhOGEwNGFmODZjZDgyODU2Y2Q2OTY0ZmU3ZWFhOThkNmY3ZmVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTg5NCw3ICs4OTQsNyBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oY29u c3QgTmF2aWdhdAogICAgICAgICBEb3dubG9hZElEIGRvd25sb2FkSUQ7CiAgICAgICAgIHN0ZDo6 b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4gd2Vic2l0ZVBvbGljaWVzOwogCi0gICAgICAg IGlmICghd2ViUGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvblN5bmMobV9mcmFtZS0+ZnJhbWVJRCgpLCBtX2ZyYW1lLT5p c01haW5GcmFtZSgpLCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21GcmFtZShjb3JlRnJhbWUpLCBk b2N1bWVudExvYWRlci0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb25BY3Rpb25EYXRhLCBvcmln aW5hdGluZ0ZyYW1lSW5mb0RhdGEsIG9yaWdpbmF0aW5nUGFnZUlELCBuYXZpZ2F0aW9uQWN0aW9u LnJlc291cmNlUmVxdWVzdCgpLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlLCBVc2VyRGF0YShX ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRh LmdldCgpKS5nZXQoKSksIHNob3VsZFNraXBTYWZlQnJvd3NpbmdDaGVjayksIE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jOjpSZXBseShw b2xpY3lBY3Rpb24sIG5ld05hdmlnYXRpb25JRCwgZG93bmxvYWRJRCwgd2Vic2l0ZVBvbGljaWVz KSkpIHsKKyAgICAgICAgaWYgKCF3ZWJQYWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uU3luYyhtX2ZyYW1lLT5mcmFtZUlE KCksIFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbUZyYW1lKGNvcmVGcmFtZSksIGRvY3VtZW50TG9h ZGVyLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIG9yaWdpbmF0aW5nRnJh bWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdlSUQsIG5hdmlnYXRpb25BY3Rpb24ucmVzb3VyY2VS ZXF1ZXN0KCksIHJlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UsIFVzZXJEYXRhKFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdl dCgpKSwgc2hvdWxkU2tpcFNhZmVCcm93c2luZ0NoZWNrKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblN5bmM6OlJlcGx5KHBvbGljeUFjdGlv biwgbmV3TmF2aWdhdGlvbklELCBkb3dubG9hZElELCB3ZWJzaXRlUG9saWNpZXMpKSkgewogICAg ICAgICAgICAgbV9mcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIFBv bGljeUFjdGlvbjo6SWdub3JlLCAwLCB7IH0sIHsgfSk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNw cAppbmRleCA3YzJkZTNlZTFmNDQyZTEwYTQxNzYzY2FhMzU5YzFjYjVkZDE5MDA3Li5mMzk4ZDUx Y2Y4YTBiMzdjNjZkZTlkYzEyZmIwODVlNDQ3OTNhNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCkBAIC0xMTEsNiArMTExLDggQEAgc3RhdGlj IHVpbnQ2NF90IGdlbmVyYXRlTGlzdGVuZXJJRCgpCiBSZWY8V2ViRnJhbWU+IFdlYkZyYW1lOjpj cmVhdGVXaXRoQ29yZU1haW5GcmFtZShXZWJQYWdlKiBwYWdlLCBXZWJDb3JlOjpGcmFtZSogY29y ZUZyYW1lKQogewogICAgIGF1dG8gZnJhbWUgPSBjcmVhdGUoc3RkOjp1bmlxdWVfcHRyPFdlYkZy YW1lTG9hZGVyQ2xpZW50PihzdGF0aWNfY2FzdDxXZWJGcmFtZUxvYWRlckNsaWVudCo+KCZjb3Jl RnJhbWUtPmxvYWRlcigpLmNsaWVudCgpKSkpOworICAgIC8vIERpc3BhdGNoTWVzc2FnZUV2ZW5X aGVuV2FpdGluZ0ZvclN5bmNSZXBseSBTZW5kT3B0aW9uIGlzIG5lZWRlZCB0byBlbnN1cmUgdGhh dCB0aGlzIElQQyBhbHdheXMgZ2V0cyByZWNlaXZlZCBiZWZvcmUgdGhlIERlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25TeW5jIHN5bmNocm9ub3VzCisgICAgLy8gSVBDIGZvciB0aGlzIGZyYW1lLgog ICAgIHBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1l KGZyYW1lLT5mcmFtZUlEKCkpLCBwYWdlLT5wYWdlSUQoKSwgSVBDOjpTZW5kT3B0aW9uOjpEaXNw YXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwogCiAgICAgZnJhbWUtPm1f Y29yZUZyYW1lID0gY29yZUZyYW1lOwpAQCAtMTIyLDYgKzEyNCw4IEBAIFJlZjxXZWJGcmFtZT4g V2ViRnJhbWU6OmNyZWF0ZVdpdGhDb3JlTWFpbkZyYW1lKFdlYlBhZ2UqIHBhZ2UsIFdlYkNvcmU6 OkZyYW1lKiBjCiBSZWY8V2ViRnJhbWU+IFdlYkZyYW1lOjpjcmVhdGVTdWJmcmFtZShXZWJQYWdl KiBwYWdlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBv d25lckVsZW1lbnQpCiB7CiAgICAgYXV0byBmcmFtZSA9IGNyZWF0ZShzdGQ6Om1ha2VfdW5pcXVl PFdlYkZyYW1lTG9hZGVyQ2xpZW50PigpKTsKKyAgICAvLyBEaXNwYXRjaE1lc3NhZ2VFdmVuV2hl bldhaXRpbmdGb3JTeW5jUmVwbHkgU2VuZE9wdGlvbiBpcyBuZWVkZWQgdG8gZW5zdXJlIHRoYXQg dGhpcyBJUEMgYWx3YXlzIGdldHMgcmVjZWl2ZWQgYmVmb3JlIHRoZSBEZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uU3luYyBzeW5jaHJvbm91cworICAgIC8vIElQQyBmb3IgdGhpcyBmcmFtZS4KICAg ICBwYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZVN1YmZyYW1lKGZy YW1lLT5mcmFtZUlEKCkpLCBwYWdlLT5wYWdlSUQoKSwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRj aE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwogCiAgICAgYXV0byBjb3JlRnJh bWUgPSBGcmFtZTo6Y3JlYXRlKHBhZ2UtPmNvcmVQYWdlKCksIG93bmVyRWxlbWVudCwgZnJhbWUt Pm1fZnJhbWVMb2FkZXJDbGllbnQuZ2V0KCkpOwo=