214733 2020-07-24 06:59:58 -0700 [LFC][IFC] Introduce the root inline box 2020-08-23 10:06:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215087 215752 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1674617 0 zalan 2020-07-24 06:59:58 -0700 This is in preparation for having proper inline boxes on the line. 1674620 1 405140 zalan 2020-07-24 07:04:45 -0700 Created attachment 405140 Patch 1676810 2 webkit-bug-importer 2020-07-31 07:00:20 -0700 <rdar://problem/66378814> 1682237 3 407072 zalan 2020-08-23 08:37:41 -0700 Created attachment 407072 Patch 1682240 4 407074 zalan 2020-08-23 09:40:16 -0700 Created attachment 407074 Patch 1682241 5 ews-feeder 2020-08-23 10:06:42 -0700 Committed r266048: <https://trac.webkit.org/changeset/266048> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407074. 405140 2020-07-24 07:04:45 -0700 2020-08-23 08:37:40 -0700 Patch bug-214733-20200724070444.patch text/plain 16047 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRlYjA4YTQ5N2IxNTQz YzRjYmJmNmU1ZDk2MGZhMzljZjJiNzhkOS4uMGE4NmNkZDRlOWQ2MDc1MjY2YWIzMzY1ZWI2M2Jj OTJjOTUyYjc5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcyIEBACisyMDIwLTA3LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgTGluZUJveCBhbmQgcm9vdCBpbmxpbmUgYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcg YSBkZWRpY2F0ZWQgbGluZSBib3ggZm9yIGVhY2ggbGluZSB3aXRoIGlubGluZSBib3hlcyBpbnNp ZGUuCisgICAgICAgIFNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNtb2Rl bAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpo ZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVC b3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRMb2dpY2FsSGVpZ2h0 SWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6YmFzZWxpbmUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRCYXNlbGluZU9m ZnNldElmR3JlYXRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldEFz Y2VudElmR3JlYXRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldERl c2NlbnRJZkdyZWF0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpiYXNl bGluZU9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnJl c2V0QmFzZWxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVC b3g6OkJhc2VsaW5lOjpCYXNlbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC b3g6OklubGluZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6OnNldERlc2NlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6 OmFzY2VudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGlu ZUJveDo6QmFzZWxpbmU6OmRlc2NlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpoZWlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxSZWN0IGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzY3JvbGxhYmxlT3ZlcmZsb3cg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6Omxv Z2ljYWxMZWZ0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lQm94Ojpsb2dpY2FsUmlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxUb3AgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxCb3R0b20gY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxXaWR0aCBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNh bEhlaWdodCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6cmVzZXREZXNjZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQm94OjpzZXRMb2dpY2FsSGVpZ2h0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lQm94OjpzZXRMb2dpY2FsV2lkdGgpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldFNjcm9sbGFibGVPdmVyZmxvdyk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bW92ZUhvcml6b250YWxs eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6ZXhwYW5k SG9yaXpvbnRhbGx5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Qm94OjpzaHJpbmtIb3Jpem9udGFsbHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVCb3g6OmV4cGFuZFZlcnRpY2FsbHkpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNocmlua1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmlzQ29uc2lkZXJlZEVtcHR5IGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzZXRJc0Nv bnNpZGVyZWRFbXB0eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6c2V0SXNDb25zaWRlcmVkTm9uRW1wdHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVCb3g6OklubGluZUJveCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUJveDo6c2V0TG9naWNhbEhlaWdodElmR3JlYXRlcik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6YmFzZWxpbmUgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldEJhc2Vs aW5lT2Zmc2V0SWZHcmVhdGVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQm94OjpzZXRBc2NlbnRJZkdyZWF0ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldERlc2NlbnRJZkdyZWF0ZXIpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmJhc2VsaW5lT2Zmc2V0IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpyZXNldEJhc2Vs aW5lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpCYXNl bGluZTo6QmFzZWxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVCb3g6OkJhc2VsaW5lOjpzZXRBc2NlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpzZXREZXNjZW50KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpCYXNlbGluZTo6cmVzZXQpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjphc2NlbnQg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OkJh c2VsaW5lOjpkZXNjZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmxpbmVCb3ggY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0Lmg6CisKIDIwMjAtMDctMjQgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIFJlbW92ZSByZWR1bmRh bnQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2NlbnROZWVkc0NvbGxh cHNpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guaAppbmRleCAyY2VkZjgzODQ1NmI3NDMzNDBiZjIwOGVhOGIwZjE3NWE1 ZjY5MDlmLi4yZTBkYTMwNDczNTJmNzlmZjVlYWM5YWIwM2NhOGI0NDZlYTdhNGFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5oCkBAIC0zMywzMyArMzMsMzkgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFj ZSBMYXlvdXQgewogCi1jbGFzcyBJbmxpbmVCb3ggeworY2xhc3MgTGluZUJveCB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RydWN0IEJhc2VsaW5lIHsKLSAg ICAgICAgQmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQg ZGVzY2VudCk7Ci0gICAgICAgIEJhc2VsaW5lKCkgPSBkZWZhdWx0OworICAgIHN0cnVjdCBJbmxp bmVCb3ggeworICAgICAgICBzdHJ1Y3QgQmFzZWxpbmUgeworICAgICAgICAgICAgQmFzZWxpbmUo SW5saW5lTGF5b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzY2VudCk7CisgICAg ICAgICAgICBCYXNlbGluZSgpID0gZGVmYXVsdDsKIAotICAgICAgICB2b2lkIHNldEFzY2VudChJ bmxpbmVMYXlvdXRVbml0KTsKLSAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVu aXQpOworICAgICAgICAgICAgdm9pZCBzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5pdCk7CisgICAg ICAgICAgICB2b2lkIHNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCk7CiAKLSAgICAgICAgdm9p ZCByZXNldCgpOworICAgICAgICAgICAgdm9pZCByZXNldCgpOwogCi0gICAgICAgIElubGluZUxh eW91dFVuaXQgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gYXNjZW50KCkgKyBkZXNjZW50KCk7IH0K LSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQoKSBjb25zdDsKLSAgICAgICAgSW5saW5l TGF5b3V0VW5pdCBkZXNjZW50KCkgY29uc3Q7CisgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0 IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGFzY2VudCgpICsgZGVzY2VudCgpOyB9CisgICAgICAg ICAgICBJbmxpbmVMYXlvdXRVbml0IGFzY2VudCgpIGNvbnN0OworICAgICAgICAgICAgSW5saW5l TGF5b3V0VW5pdCBkZXNjZW50KCkgY29uc3Q7CiAKLSAgICBwcml2YXRlOgorICAgICAgICBwcml2 YXRlOgogI2lmIEFTU0VSVF9FTkFCTEVECi0gICAgICAgIGJvb2wgbV9oYXNWYWxpZEFzY2VudCB7 IGZhbHNlIH07Ci0gICAgICAgIGJvb2wgbV9oYXNWYWxpZERlc2NlbnQgeyBmYWxzZSB9OworICAg ICAgICAgICAgYm9vbCBtX2hhc1ZhbGlkQXNjZW50IHsgZmFsc2UgfTsKKyAgICAgICAgICAgIGJv b2wgbV9oYXNWYWxpZERlc2NlbnQgeyBmYWxzZSB9OwogI2VuZGlmCi0gICAgICAgIElubGluZUxh eW91dFVuaXQgbV9hc2NlbnQgeyAwIH07Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbV9kZXNj ZW50IHsgMCB9OworICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2FzY2VudCB7IDAgfTsK KyAgICAgICAgICAgIElubGluZUxheW91dFVuaXQgbV9kZXNjZW50IHsgMCB9OworICAgICAgICB9 OworICAgICAgICBJbmxpbmVCb3goY29uc3QgQmFzZWxpbmUmKTsKKyAgICAgICAgSW5saW5lQm94 KCkgPSBkZWZhdWx0OworCisgICAgICAgIEJhc2VsaW5lIGJhc2VsaW5lOwogICAgIH07CiAKLSAg ICBJbmxpbmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIGNvbnN0IEJhc2VsaW5lJiwg SW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCk7Ci0gICAgSW5saW5lQm94KCkgPSBkZWZh dWx0OworICAgIExpbmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIGNvbnN0IElubGlu ZUJveDo6QmFzZWxpbmUmLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0KTsKKyAgICBM aW5lQm94KCkgPSBkZWZhdWx0OwogCiAgICAgY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYgbG9n aWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KICAgICBjb25zdCBEaXNwbGF5OjpJ bmxpbmVSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFi bGVPdmVyZmxvdzsgfQpAQCAtNzIsNyArNzgsNyBAQCBwdWJsaWM6CiAgICAgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3JlY3Qud2lkdGgoKTsgfQogICAg IElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5o ZWlnaHQoKTsgfQogCi0gICAgY29uc3QgQmFzZWxpbmUmIGJhc2VsaW5lKCkgY29uc3Q7CisgICAg Y29uc3QgSW5saW5lQm94OjpCYXNlbGluZSYgYmFzZWxpbmUoKSBjb25zdDsKICAgICAvLyBCYXNl bGluZSBvZmZzZXQgZnJvbSBsaW5lIGxvZ2ljYWwgdG9wLiBOb3RlIHRoYXQgb2Zmc2V0IGRvZXMg bm90IG5lY2Vzc2FyaWx5IGVxdWFsIHRvIGFzY2VudC4KICAgICAvLwogICAgIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0gICAgbGluZSBsb2dpY2FsIHRvcCAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLSAo dG9wIGFsaWduKQpAQCAtOTQsNyArMTAwLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGVzY2Vu dElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0KTsKIAogICAgIHZvaWQgcmVzZXRCYXNlbGluZSgp OwotICAgIHZvaWQgcmVzZXREZXNjZW50KCkgeyBtX2Jhc2VsaW5lLnNldERlc2NlbnQoMF9sdSk7 IH0KIAogICAgIHZvaWQgc2V0TG9naWNhbEhlaWdodChJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxI ZWlnaHQpIHsgbV9yZWN0LnNldEhlaWdodChsb2dpY2FsSGVpZ2h0KTsgfQogCkBAIC0xMjgsMTUg KzEzMywxNSBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgRGlzcGxheTo6SW5saW5lUmVjdCBtX3Jl Y3Q7CiAgICAgRGlzcGxheTo6SW5saW5lUmVjdCBtX3Njcm9sbGFibGVPdmVyZmxvdzsKLSAgICBC YXNlbGluZSBtX2Jhc2VsaW5lOwogICAgIElubGluZUxheW91dFVuaXQgbV9iYXNlbGluZU9mZnNl dCB7IDAgfTsKICAgICBib29sIG1faXNDb25zaWRlcmVkRW1wdHkgeyB0cnVlIH07CisgICAgSW5s aW5lQm94IG1fcm9vdElubGluZUJveDsKIH07CiAKLWlubGluZSBJbmxpbmVCb3g6OklubGluZUJv eChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBCYXNlbGluZSYgYmFzZWxp bmUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpCitpbmxpbmUgTGluZUJveDo6TGlu ZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBJbmxpbmVCb3g6OkJh c2VsaW5lJiBiYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCkKICAgICA6 IG1fcmVjdChyZWN0KQotICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKICAgICAsIG1fYmFzZWxp bmVPZmZzZXQoYmFzZWxpbmVPZmZzZXQpCisgICAgLCBtX3Jvb3RJbmxpbmVCb3goYmFzZWxpbmUp CiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkQmFzZWxpbmUgPSB0cnVlOwpA QCAtMTQ0LDIwICsxNDksMjUgQEAgaW5saW5lIElubGluZUJveDo6SW5saW5lQm94KGNvbnN0IERp c3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEJhc2VsaW5lJiBiYXMKICNlbmRpZgogfQog Ci1pbmxpbmUgdm9pZCBJbmxpbmVCb3g6OnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIoSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KQoraW5saW5lIExpbmVCb3g6OklubGluZUJveDo6SW5s aW5lQm94KGNvbnN0IExpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmUmIGJhc2VsaW5lKQorICAg IDogYmFzZWxpbmUoYmFzZWxpbmUpCit7Cit9CisKK2lubGluZSB2b2lkIExpbmVCb3g6OnNldExv Z2ljYWxIZWlnaHRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KQogewog ICAgIGlmIChsb2dpY2FsSGVpZ2h0IDw9IG1fcmVjdC5oZWlnaHQoKSkKICAgICAgICAgcmV0dXJu OwogICAgIG1fcmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCk7CiB9CiAKLWlubGluZSBjb25z dCBJbmxpbmVCb3g6OkJhc2VsaW5lJiBJbmxpbmVCb3g6OmJhc2VsaW5lKCkgY29uc3QKK2lubGlu ZSBjb25zdCBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lJiBMaW5lQm94OjpiYXNlbGluZSgp IGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faGFzVmFsaWRCYXNlbGluZSk7Ci0gICAgcmV0dXJuIG1f YmFzZWxpbmU7CisgICAgcmV0dXJuIG1fcm9vdElubGluZUJveC5iYXNlbGluZTsKIH0KIAotaW5s aW5lIHZvaWQgSW5saW5lQm94OjpzZXRCYXNlbGluZU9mZnNldElmR3JlYXRlcihJbmxpbmVMYXlv dXRVbml0IGJhc2VsaW5lT2Zmc2V0KQoraW5saW5lIHZvaWQgTGluZUJveDo6c2V0QmFzZWxpbmVP ZmZzZXRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCkKIHsKICNpZiBB U1NFUlRfRU5BQkxFRAogICAgIG1faGFzVmFsaWRCYXNlbGluZU9mZnNldCA9IHRydWU7CkBAIC0x NjUsMzcgKzE3NSwzNyBAQCBpbmxpbmUgdm9pZCBJbmxpbmVCb3g6OnNldEJhc2VsaW5lT2Zmc2V0 SWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZQogICAgIG1fYmFzZWxpbmVP ZmZzZXQgPSBzdGQ6Om1heChiYXNlbGluZU9mZnNldCwgbV9iYXNlbGluZU9mZnNldCk7CiB9CiAK LWlubGluZSB2b2lkIElubGluZUJveDo6c2V0QXNjZW50SWZHcmVhdGVyKElubGluZUxheW91dFVu aXQgYXNjZW50KQoraW5saW5lIHZvaWQgTGluZUJveDo6c2V0QXNjZW50SWZHcmVhdGVyKElubGlu ZUxheW91dFVuaXQgYXNjZW50KQogewotICAgIGlmIChhc2NlbnQgPCBtX2Jhc2VsaW5lLmFzY2Vu dCgpKQorICAgIGlmIChhc2NlbnQgPCBtX3Jvb3RJbmxpbmVCb3guYmFzZWxpbmUuYXNjZW50KCkp CiAgICAgICAgIHJldHVybjsKICAgICBzZXRCYXNlbGluZU9mZnNldElmR3JlYXRlcihhc2NlbnQp OwotICAgIG1fYmFzZWxpbmUuc2V0QXNjZW50KGFzY2VudCk7CisgICAgbV9yb290SW5saW5lQm94 LmJhc2VsaW5lLnNldEFzY2VudChhc2NlbnQpOwogfQogCi1pbmxpbmUgdm9pZCBJbmxpbmVCb3g6 OnNldERlc2NlbnRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KQoraW5saW5lIHZv aWQgTGluZUJveDo6c2V0RGVzY2VudElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQp CiB7Ci0gICAgaWYgKGRlc2NlbnQgPCBtX2Jhc2VsaW5lLmRlc2NlbnQoKSkKKyAgICBpZiAoZGVz Y2VudCA8IG1fcm9vdElubGluZUJveC5iYXNlbGluZS5kZXNjZW50KCkpCiAgICAgICAgIHJldHVy bjsKLSAgICBtX2Jhc2VsaW5lLnNldERlc2NlbnQoZGVzY2VudCk7CisgICAgbV9yb290SW5saW5l Qm94LmJhc2VsaW5lLnNldERlc2NlbnQoZGVzY2VudCk7CiB9CiAKLWlubGluZSBJbmxpbmVMYXlv dXRVbml0IElubGluZUJveDo6YmFzZWxpbmVPZmZzZXQoKSBjb25zdAoraW5saW5lIElubGluZUxh eW91dFVuaXQgTGluZUJveDo6YmFzZWxpbmVPZmZzZXQoKSBjb25zdAogewogICAgIEFTU0VSVCht X2hhc1ZhbGlkQmFzZWxpbmVPZmZzZXQpOwogICAgIHJldHVybiBtX2Jhc2VsaW5lT2Zmc2V0Owog fQogCi1pbmxpbmUgdm9pZCBJbmxpbmVCb3g6OnJlc2V0QmFzZWxpbmUoKQoraW5saW5lIHZvaWQg TGluZUJveDo6cmVzZXRCYXNlbGluZSgpCiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICBtX2hh c1ZhbGlkQmFzZWxpbmVPZmZzZXQgPSB0cnVlOwogI2VuZGlmCiAgICAgbV9iYXNlbGluZU9mZnNl dCA9IDBfbHU7Ci0gICAgbV9iYXNlbGluZS5yZXNldCgpOworICAgIG1fcm9vdElubGluZUJveC5i YXNlbGluZS5yZXNldCgpOwogfQogCi1pbmxpbmUgSW5saW5lQm94OjpCYXNlbGluZTo6QmFzZWxp bmUoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzY2VudCkKK2lu bGluZSBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpCYXNlbGluZShJbmxpbmVMYXlvdXRV bml0IGFzY2VudCwgSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KQogICAgIDogbV9hc2NlbnQoYXNj ZW50KQogICAgICwgbV9kZXNjZW50KGRlc2NlbnQpCiB7CkBAIC0yMDUsNyArMjE1LDcgQEAgaW5s aW5lIElubGluZUJveDo6QmFzZWxpbmU6OkJhc2VsaW5lKElubGluZUxheW91dFVuaXQgYXNjZW50 LCBJbmxpbmVMYXlvdXRVbml0IGQKICNlbmRpZgogfQogCi1pbmxpbmUgdm9pZCBJbmxpbmVCb3g6 OkJhc2VsaW5lOjpzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpCitpbmxpbmUgdm9p ZCBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5p dCBhc2NlbnQpCiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkQXNjZW50ID0g dHJ1ZTsKQEAgLTIxMyw3ICsyMjMsNyBAQCBpbmxpbmUgdm9pZCBJbmxpbmVCb3g6OkJhc2VsaW5l OjpzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpCiAgICAgbV9hc2NlbnQgPSBhc2Nl bnQ7CiB9CiAKLWlubGluZSB2b2lkIElubGluZUJveDo6QmFzZWxpbmU6OnNldERlc2NlbnQoSW5s aW5lTGF5b3V0VW5pdCBkZXNjZW50KQoraW5saW5lIHZvaWQgTGluZUJveDo6SW5saW5lQm94OjpC YXNlbGluZTo6c2V0RGVzY2VudChJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQpCiB7CiAjaWYgQVNT RVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkRGVzY2VudCA9IHRydWU7CkBAIC0yMjEsNyArMjMx LDcgQEAgaW5saW5lIHZvaWQgSW5saW5lQm94OjpCYXNlbGluZTo6c2V0RGVzY2VudChJbmxpbmVM YXlvdXRVbml0IGRlc2NlbnQpCiAgICAgbV9kZXNjZW50ID0gZGVzY2VudDsKIH0KIAotaW5saW5l IHZvaWQgSW5saW5lQm94OjpCYXNlbGluZTo6cmVzZXQoKQoraW5saW5lIHZvaWQgTGluZUJveDo6 SW5saW5lQm94OjpCYXNlbGluZTo6cmVzZXQoKQogewogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAg bV9oYXNWYWxpZEFzY2VudCA9IHRydWU7CkBAIC0yMzEsMTMgKzI0MSwxMyBAQCBpbmxpbmUgdm9p ZCBJbmxpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCgpCiAgICAgbV9kZXNjZW50ID0gMF9sdTsKIH0K IAotaW5saW5lIElubGluZUxheW91dFVuaXQgSW5saW5lQm94OjpCYXNlbGluZTo6YXNjZW50KCkg Y29uc3QKK2lubGluZSBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3g6OklubGluZUJveDo6QmFzZWxp bmU6OmFzY2VudCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faGFzVmFsaWRBc2NlbnQpOwogICAg IHJldHVybiBtX2FzY2VudDsKIH0KIAotaW5saW5lIElubGluZUxheW91dFVuaXQgSW5saW5lQm94 OjpCYXNlbGluZTo6ZGVzY2VudCgpIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5l Qm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpkZXNjZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlQo bV9oYXNWYWxpZERlc2NlbnQpOwogICAgIHJldHVybiBtX2Rlc2NlbnQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5jcHAKaW5kZXggMGE0OWM2Y2JhYThhMTcxZWRiNmFkM2Q1Nzg5NDkzN2Q3NThlNjM3Yi4u YmY1N2MxODYxZTk1MTY3ZTM0ZmNjZGVhZWYwMDJjOTg1NzhlMmQwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmNwcApAQCAtODksOCArODksOCBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXpl KGNvbnN0IENvbnN0cmFpbnRzJiBjb25zdHJhaW50cykKICAgICB9CiAKICAgICBhdXRvIGxpbmVS ZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3BMZWZ0LCAw X2x1LCBpbml0aWFsTGluZUhlaWdodCB9OwotICAgIGF1dG8gYmFzZWxpbmUgPSBJbmxpbmVCb3g6 OkJhc2VsaW5lIHsgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0LCBpbml0aWFsTGluZUhlaWdodCAtIGlu aXRpYWxCYXNlbGluZU9mZnNldCB9OwotICAgIG1fbGluZUJveCA9IElubGluZUJveCB7IGxpbmVS ZWN0LCBiYXNlbGluZSwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0IH07CisgICAgYXV0byBiYXNlbGlu ZSA9IExpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmUgeyBpbml0aWFsQmFzZWxpbmVPZmZzZXQs IGluaXRpYWxMaW5lSGVpZ2h0IC0gaW5pdGlhbEJhc2VsaW5lT2Zmc2V0IH07CisgICAgbV9saW5l Qm94ID0gTGluZUJveCB7IGxpbmVSZWN0LCBiYXNlbGluZSwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0 IH07CiAgICAgbV9saW5lTG9naWNhbFdpZHRoID0gY29uc3RyYWludHMuYXZhaWxhYmxlTG9naWNh bFdpZHRoOwogICAgIG1faGFzSW50cnVzaXZlRmxvYXQgPSBjb25zdHJhaW50cy5saW5lSXNDb25z dHJhaW5lZEJ5RmxvYXQ7CiAKQEAgLTY5NSw3ICs2OTUsNyBAQCBib29sIExpbmVCdWlsZGVyOjpp c1Zpc3VhbGx5Tm9uRW1wdHkoY29uc3QgUnVuJiBydW4pIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1JbmxpbmVCb3g6OkJhc2VsaW5lIExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJp Y3MoY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVM b2dpY2FsSGVpZ2h0KQorTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZSBMaW5lQnVpbGRlcjo6 aGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcywgSW5saW5l TGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCkKIHsKICAgICBhdXRvIGFzY2VudCA9IGZvbnRN ZXRyaWNzLmFzY2VudCgpOwogICAgIGF1dG8gZGVzY2VudCA9IGZvbnRNZXRyaWNzLmRlc2NlbnQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDg2N2U4MjZjNWJlYTkyMDk1ZmIzMDUzN2NmZDBm OWFjZjkyOTM2YzkuLjRkNTBmN2QzYjM3ZTQ1MDhjOWJiYTJlOGZmZDY5ZGUwNzZmYzg4NjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuaApAQCAtNjksNyArNjksNyBAQCBwdWJsaWM6CiAgICAgSW5saW5l TGF5b3V0VW5pdCB0cmltbWFibGVUcmFpbGluZ1dpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmlt bWFibGVUcmFpbGluZ0NvbnRlbnQud2lkdGgoKTsgfQogICAgIGJvb2wgaXNUcmFpbGluZ1J1bkZ1 bGx5VHJpbW1hYmxlKCkgY29uc3QgeyByZXR1cm4gbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQu aXNUcmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCk7IH0KIAotICAgIGNvbnN0IElubGluZUJveCYg bGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveDsgfQorICAgIGNvbnN0IExpbmVCb3gm IGxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3g7IH0KICAgICB2b2lkIG1vdmVMb2dp Y2FsTGVmdChJbmxpbmVMYXlvdXRVbml0KTsKICAgICB2b2lkIG1vdmVMb2dpY2FsUmlnaHQoSW5s aW5lTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBzZXRIYXNJbnRydXNpdmVGbG9hdCgpIHsgbV9oYXNJ bnRydXNpdmVGbG9hdCA9IHRydWU7IH0KQEAgLTE0Nyw3ICsxNDcsNyBAQCBwdWJsaWM6CiAgICAg ZW51bSBjbGFzcyBJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgeyBObywgWWVzIH07CiAgICAg UnVuTGlzdCBjbG9zZShJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgPSBJc0xhc3RMaW5lV2l0 aElubGluZUNvbnRlbnQ6Ok5vKTsKIAotICAgIHN0YXRpYyBJbmxpbmVCb3g6OkJhc2VsaW5lIGhh bGZMZWFkaW5nTWV0cmljcyhjb25zdCBGb250TWV0cmljcyYsIElubGluZUxheW91dFVuaXQgbGlu ZUxvZ2ljYWxIZWlnaHQpOworICAgIHN0YXRpYyBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5l IGhhbGZMZWFkaW5nTWV0cmljcyhjb25zdCBGb250TWV0cmljcyYsIElubGluZUxheW91dFVuaXQg bGluZUxvZ2ljYWxIZWlnaHQpOwogCiBwcml2YXRlOgogICAgIElubGluZUxheW91dFVuaXQgbG9n aWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveC5sb2dpY2FsVG9wKCk7IH0KQEAgLTIy Miw3ICsyMjIsNyBAQCBwcml2YXRlOgogICAgIE9wdGlvbmFsPFRleHRBbGlnbk1vZGU+IG1faG9y aXpvbnRhbEFsaWdubWVudDsKICAgICBib29sIG1faXNJbnRyaW5zaWNTaXppbmcgeyBmYWxzZSB9 OwogICAgIGJvb2wgbV9oYXNJbnRydXNpdmVGbG9hdCB7IGZhbHNlIH07Ci0gICAgSW5saW5lQm94 IG1fbGluZUJveDsKKyAgICBMaW5lQm94IG1fbGluZUJveDsKICAgICBPcHRpb25hbDxib29sPiBt X2xpbmVJc1Zpc3VhbGx5RW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CiAgICAg Ym9vbCBtX3Nob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZyB7IGZhbHNlIH07CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xp bmVMYXlvdXRDb250ZXh0LmgKaW5kZXggMDY3OTdiNmIxYTQ2MmJkNzE5NjA3ODM0MzJiNzFhY2Ix NWJjNDExYS4uMzFmZjg2YmZkMjQzM2EwMDRjZTIwNTU3MGQyODk4NzI1NWE2ZmMxZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5l TGF5b3V0Q29udGV4dC5oCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICAgICAgdXNpbmcg RmxvYXRMaXN0ID0gVmVjdG9yPEZsb2F0PjsKICAgICAgICAgRmxvYXRMaXN0IGZsb2F0czsKICAg ICAgICAgY29uc3QgTGluZUJ1aWxkZXI6OlJ1bkxpc3QgcnVuTGlzdDsKLSAgICAgICAgY29uc3Qg SW5saW5lQm94IGxpbmVCb3g7CisgICAgICAgIGNvbnN0IExpbmVCb3ggbGluZUJveDsKICAgICB9 OwogICAgIHN0cnVjdCBJbmxpbmVJdGVtUmFuZ2UgewogICAgICAgICBib29sIGlzRW1wdHkoKSBj b25zdCB7IHJldHVybiBzdGFydCA9PSBlbmQ7IH0K 407072 2020-08-23 08:37:41 -0700 2020-08-23 09:40:15 -0700 Patch bug-214733-20200823083740.patch text/plain 16189 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ5NjNhMzE0ZDU5MDgy NWQ4Y2M5MDk1MTExM2RkZmI4ZDMwZWUzYy4uYWM0YjY0MDA0MDAxMDliNGJlOWYxZTEwOWNmYWU2 Y2JjOTUyMjg4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcyIEBACisyMDIwLTA4LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgTGluZUJveCBhbmQgcm9vdCBpbmxpbmUgYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcg YSBkZWRpY2F0ZWQgbGluZSBib3ggZm9yIGVhY2ggbGluZSB3aXRoIGlubGluZSBib3hlcyBpbnNp ZGUuCisgICAgICAgIFNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNtb2Rl bAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpo ZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVC b3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRMb2dpY2FsSGVpZ2h0 SWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6YmFzZWxpbmUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRCYXNlbGluZU9m ZnNldElmR3JlYXRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldEFz Y2VudElmR3JlYXRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldERl c2NlbnRJZkdyZWF0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpiYXNl bGluZU9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnJl c2V0QmFzZWxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVC b3g6OkJhc2VsaW5lOjpCYXNlbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC b3g6OklubGluZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6OnNldERlc2NlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6 OmFzY2VudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGlu ZUJveDo6QmFzZWxpbmU6OmRlc2NlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpoZWlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxSZWN0IGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzY3JvbGxhYmxlT3ZlcmZsb3cg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6Omxv Z2ljYWxMZWZ0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lQm94Ojpsb2dpY2FsUmlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxUb3AgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxCb3R0b20gY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxXaWR0aCBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNh bEhlaWdodCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6cmVzZXREZXNjZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQm94OjpzZXRMb2dpY2FsSGVpZ2h0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lQm94OjpzZXRMb2dpY2FsV2lkdGgpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldFNjcm9sbGFibGVPdmVyZmxvdyk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bW92ZUhvcml6b250YWxs eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6ZXhwYW5k SG9yaXpvbnRhbGx5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Qm94OjpzaHJpbmtIb3Jpem9udGFsbHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVCb3g6OmV4cGFuZFZlcnRpY2FsbHkpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNocmlua1ZlcnRpY2FsbHkpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmlzQ29uc2lkZXJlZEVtcHR5IGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzZXRJc0Nv bnNpZGVyZWRFbXB0eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6c2V0SXNDb25zaWRlcmVkTm9uRW1wdHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVCb3g6OklubGluZUJveCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUJveDo6c2V0TG9naWNhbEhlaWdodElmR3JlYXRlcik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6YmFzZWxpbmUgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldEJhc2Vs aW5lT2Zmc2V0SWZHcmVhdGVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQm94OjpzZXRBc2NlbnRJZkdyZWF0ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldERlc2NlbnRJZkdyZWF0ZXIpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmJhc2VsaW5lT2Zmc2V0IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpyZXNldEJhc2Vs aW5lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpCYXNl bGluZTo6QmFzZWxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVCb3g6OkJhc2VsaW5lOjpzZXRBc2NlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpzZXREZXNjZW50KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpCYXNlbGluZTo6cmVzZXQpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjphc2NlbnQg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OkJh c2VsaW5lOjpkZXNjZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmxpbmVCb3ggY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0Lmg6CisKIDIwMjAtMDgtMjMgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXk6OkxpbmVC b3ggZG9lcyBub3QgbmVlZCBhc2NlbnQvZGVzY2VudCBnZW9tZXRyeQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IGM2NjYwNjgzNTUyY2FhYzA5MDg2 MjdjNGJiZjhjOWVhNTMzYWZmM2YuLmZlYTNiY2NmYTNhMDI3NjY4MDg4MDM4Yjc5YTE1MzZmYTVl M2FiYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAK QEAgLTgzLDEyICs4MywxMiBAQCBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJh c2VsaW5lIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbgogICAgIGF1dG8gbGlu ZUhlaWdodCA9IGZvcm1hdHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwogICAgIGlmIChs aW5lSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7CiAgICAgICAgIGF1dG8gaW5pdGlh bEJhc2VsaW5lT2Zmc2V0ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0 aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudCgpOwotICAgICAgICBy ZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGluZU9mZnNldCwgTGlu ZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhlaWdodCAtIHN0cnV0 QmFzZWxpbmVPZmZzZXQgfSB9OworICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZz ZXQsIGluaXRpYWxCYXNlbGluZU9mZnNldCwgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZSB7 IHN0cnV0QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVpZ2h0IC0gc3RydXRCYXNlbGluZU9mZnNldCB9 IH07CiAgICAgfQogICAgIC8vIEZJWE1FOiBUaGUgb25seSByZWFzb24gd2h5IHdlIHVzZSBpbnRW YWx1ZSgpIGhlcmUgaXMgdG8gbWF0Y2ggY3VycmVudCBpbmxpbmUgdHJlZSAoaW50ZWdyYWwpYmVo YXZpb3IuCiAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodCA9IGxpbmVIZWln aHQuaW50VmFsdWUoKTsKICAgICBhdXRvIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IExpbmVCdWls ZGVyOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmlj cygpLCBpbml0aWFsTGluZUhlaWdodCkuYXNjZW50KCk7Ci0gICAgcmV0dXJuIHsgaW5pdGlhbExp bmVIZWlnaHQsIGluaXRpYWxCYXNlbGluZU9mZnNldCwgTGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1 dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhlaWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9Owor ICAgIHJldHVybiB7IGluaXRpYWxMaW5lSGVpZ2h0LCBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIExp bmVCb3g6OklubGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhl aWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9OwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXgg YTA2MGIyOGZlMWI4YjYwMjIyMDI5NDcwZmZhNTc4ZDIyM2QzMDQ2OC4uMzRhMjFjMGY4ZTk2NmI4 YzQ1MjY3M2ViOGZmMDAxMzI2NDY4OTE1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMzYsMjkgKzM2LDM1 IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogY2xhc3MgTGluZUJveCB7CiAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RydWN0IEJhc2VsaW5lIHsKLSAgICAgICAgQmFz ZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzY2VudCk7 Ci0gICAgICAgIEJhc2VsaW5lKCkgPSBkZWZhdWx0OworICAgIHN0cnVjdCBJbmxpbmVCb3ggewor ICAgICAgICBzdHJ1Y3QgQmFzZWxpbmUgeworICAgICAgICAgICAgQmFzZWxpbmUoSW5saW5lTGF5 b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzY2VudCk7CisgICAgICAgICAgICBC YXNlbGluZSgpID0gZGVmYXVsdDsKIAotICAgICAgICB2b2lkIHNldEFzY2VudChJbmxpbmVMYXlv dXRVbml0KTsKLSAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVuaXQpOworICAg ICAgICAgICAgdm9pZCBzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5pdCk7CisgICAgICAgICAgICB2 b2lkIHNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCk7CiAKLSAgICAgICAgdm9pZCByZXNldCgp OworICAgICAgICAgICAgdm9pZCByZXNldCgpOwogCi0gICAgICAgIElubGluZUxheW91dFVuaXQg aGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gYXNjZW50KCkgKyBkZXNjZW50KCk7IH0KLSAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBhc2NlbnQoKSBjb25zdDsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBkZXNjZW50KCkgY29uc3Q7CisgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIGFzY2VudCgpICsgZGVzY2VudCgpOyB9CisgICAgICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGFzY2VudCgpIGNvbnN0OworICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBkZXNjZW50KCkgY29uc3Q7CiAKLSAgICBwcml2YXRlOgorICAgICAgICBwcml2YXRlOgogI2lm IEFTU0VSVF9FTkFCTEVECi0gICAgICAgIGJvb2wgbV9oYXNWYWxpZEFzY2VudCB7IGZhbHNlIH07 Ci0gICAgICAgIGJvb2wgbV9oYXNWYWxpZERlc2NlbnQgeyBmYWxzZSB9OworICAgICAgICAgICAg Ym9vbCBtX2hhc1ZhbGlkQXNjZW50IHsgZmFsc2UgfTsKKyAgICAgICAgICAgIGJvb2wgbV9oYXNW YWxpZERlc2NlbnQgeyBmYWxzZSB9OwogI2VuZGlmCi0gICAgICAgIElubGluZUxheW91dFVuaXQg bV9hc2NlbnQgeyAwIH07Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbV9kZXNjZW50IHsgMCB9 OworICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2FzY2VudCB7IDAgfTsKKyAgICAgICAg ICAgIElubGluZUxheW91dFVuaXQgbV9kZXNjZW50IHsgMCB9OworICAgICAgICB9OworICAgICAg ICBJbmxpbmVCb3goY29uc3QgQmFzZWxpbmUmKTsKKyAgICAgICAgSW5saW5lQm94KCkgPSBkZWZh dWx0OworCisgICAgICAgIEJhc2VsaW5lIGJhc2VsaW5lOwogICAgIH07CiAKLSAgICBMaW5lQm94 KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmLCBjb25zdCBCYXNlbGluZSYsIElubGluZUxheW91 dFVuaXQgYmFzZWxpbmVPZmZzZXQpOworICAgIExpbmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5l UmVjdCYsIGNvbnN0IElubGluZUJveDo6QmFzZWxpbmUmLCBJbmxpbmVMYXlvdXRVbml0IGJhc2Vs aW5lT2Zmc2V0KTsKICAgICBMaW5lQm94KCkgPSBkZWZhdWx0OwogCiAgICAgY29uc3QgRGlzcGxh eTo6SW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KQEAg LTcyLDcgKzc4LDcgQEAgcHVibGljOgogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LndpZHRoKCk7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaGVpZ2h0KCk7IH0KIAotICAg IGNvbnN0IEJhc2VsaW5lJiBiYXNlbGluZSgpIGNvbnN0OworICAgIGNvbnN0IElubGluZUJveDo6 QmFzZWxpbmUmIGJhc2VsaW5lKCkgY29uc3Q7CiAgICAgLy8gQmFzZWxpbmUgb2Zmc2V0IGZyb20g bGluZSBsb2dpY2FsIHRvcC4gTm90ZSB0aGF0IG9mZnNldCBkb2VzIG5vdCBuZWNlc3NhcmlseSBl cXVhbCB0byBhc2NlbnQuCiAgICAgLy8KICAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tICAgIGxp bmUgbG9naWNhbCB0b3AgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0gKHRvcCBhbGlnbikKQEAgLTk0 LDcgKzEwMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERlc2NlbnRJZkdyZWF0ZXIoSW5saW5l TGF5b3V0VW5pdCk7CiAKICAgICB2b2lkIHJlc2V0QmFzZWxpbmUoKTsKLSAgICB2b2lkIHJlc2V0 RGVzY2VudCgpIHsgbV9iYXNlbGluZS5zZXREZXNjZW50KDBfbHUpOyB9CisgICAgdm9pZCByZXNl dERlc2NlbnQoKSB7IG1fcm9vdElubGluZUJveC5iYXNlbGluZS5zZXREZXNjZW50KDBfbHUpOyB9 CiAKICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHQoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVp Z2h0KSB7IG1fcmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCk7IH0KIApAQCAtMTI4LDE1ICsx MzQsMTUgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9yZWN0 OwogICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZsb3c7Ci0gICAgQmFz ZWxpbmUgbV9iYXNlbGluZTsKICAgICBJbmxpbmVMYXlvdXRVbml0IG1fYmFzZWxpbmVPZmZzZXQg eyAwIH07CiAgICAgYm9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OworICAgIElubGlu ZUJveCBtX3Jvb3RJbmxpbmVCb3g7CiB9OwogCi1pbmxpbmUgTGluZUJveDo6TGluZUJveChjb25z dCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBCYXNlbGluZSYgYmFzZWxpbmUsIElu bGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpCitpbmxpbmUgTGluZUJveDo6TGluZUJveChj b25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBJbmxpbmVCb3g6OkJhc2VsaW5l JiBiYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCkKICAgICA6IG1fcmVj dChyZWN0KQotICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKICAgICAsIG1fYmFzZWxpbmVPZmZz ZXQoYmFzZWxpbmVPZmZzZXQpCisgICAgLCBtX3Jvb3RJbmxpbmVCb3goYmFzZWxpbmUpCiB7CiAj aWYgQVNTRVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkQmFzZWxpbmUgPSB0cnVlOwpAQCAtMTQ0 LDYgKzE1MCwxMSBAQCBpbmxpbmUgTGluZUJveDo6TGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxp bmVSZWN0JiByZWN0LCBjb25zdCBCYXNlbGluZSYgYmFzZWxpbgogI2VuZGlmCiB9CiAKK2lubGlu ZSBMaW5lQm94OjpJbmxpbmVCb3g6OklubGluZUJveChjb25zdCBCYXNlbGluZSYgYmFzZWxpbmUp CisgICAgOiBiYXNlbGluZShiYXNlbGluZSkKK3sKK30KKwogaW5saW5lIHZvaWQgTGluZUJveDo6 c2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQp CiB7CiAgICAgaWYgKGxvZ2ljYWxIZWlnaHQgPD0gbV9yZWN0LmhlaWdodCgpKQpAQCAtMTUxLDEw ICsxNjIsMTAgQEAgaW5saW5lIHZvaWQgTGluZUJveDo6c2V0TG9naWNhbEhlaWdodElmR3JlYXRl cihJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQpCiAgICAgbV9yZWN0LnNldEhlaWdodChs b2dpY2FsSGVpZ2h0KTsKIH0KIAotaW5saW5lIGNvbnN0IExpbmVCb3g6OkJhc2VsaW5lJiBMaW5l Qm94OjpiYXNlbGluZSgpIGNvbnN0CitpbmxpbmUgY29uc3QgTGluZUJveDo6SW5saW5lQm94OjpC YXNlbGluZSYgTGluZUJveDo6YmFzZWxpbmUoKSBjb25zdAogewogICAgIEFTU0VSVChtX2hhc1Zh bGlkQmFzZWxpbmUpOwotICAgIHJldHVybiBtX2Jhc2VsaW5lOworICAgIHJldHVybiBtX3Jvb3RJ bmxpbmVCb3guYmFzZWxpbmU7CiB9CiAKIGlubGluZSB2b2lkIExpbmVCb3g6OnNldEJhc2VsaW5l T2Zmc2V0SWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpCkBAIC0xNjcs MTcgKzE3OCwxNyBAQCBpbmxpbmUgdm9pZCBMaW5lQm94OjpzZXRCYXNlbGluZU9mZnNldElmR3Jl YXRlcihJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0KQogCiBpbmxpbmUgdm9pZCBMaW5l Qm94OjpzZXRBc2NlbnRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpCiB7Ci0gICAg aWYgKGFzY2VudCA8IG1fYmFzZWxpbmUuYXNjZW50KCkpCisgICAgaWYgKGFzY2VudCA8IG1fcm9v dElubGluZUJveC5iYXNlbGluZS5hc2NlbnQoKSkKICAgICAgICAgcmV0dXJuOwogICAgIHNldEJh c2VsaW5lT2Zmc2V0SWZHcmVhdGVyKGFzY2VudCk7Ci0gICAgbV9iYXNlbGluZS5zZXRBc2NlbnQo YXNjZW50KTsKKyAgICBtX3Jvb3RJbmxpbmVCb3guYmFzZWxpbmUuc2V0QXNjZW50KGFzY2VudCk7 CiB9CiAKIGlubGluZSB2b2lkIExpbmVCb3g6OnNldERlc2NlbnRJZkdyZWF0ZXIoSW5saW5lTGF5 b3V0VW5pdCBkZXNjZW50KQogewotICAgIGlmIChkZXNjZW50IDwgbV9iYXNlbGluZS5kZXNjZW50 KCkpCisgICAgaWYgKGRlc2NlbnQgPCBtX3Jvb3RJbmxpbmVCb3guYmFzZWxpbmUuZGVzY2VudCgp KQogICAgICAgICByZXR1cm47Ci0gICAgbV9iYXNlbGluZS5zZXREZXNjZW50KGRlc2NlbnQpOwor ICAgIG1fcm9vdElubGluZUJveC5iYXNlbGluZS5zZXREZXNjZW50KGRlc2NlbnQpOwogfQogCiBp bmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjpiYXNlbGluZU9mZnNldCgpIGNvbnN0CkBA IC0xOTIsMTAgKzIwMywxMCBAQCBpbmxpbmUgdm9pZCBMaW5lQm94OjpyZXNldEJhc2VsaW5lKCkK ICAgICBtX2hhc1ZhbGlkQmFzZWxpbmVPZmZzZXQgPSB0cnVlOwogI2VuZGlmCiAgICAgbV9iYXNl bGluZU9mZnNldCA9IDBfbHU7Ci0gICAgbV9iYXNlbGluZS5yZXNldCgpOworICAgIG1fcm9vdElu bGluZUJveC5iYXNlbGluZS5yZXNldCgpOwogfQogCi1pbmxpbmUgTGluZUJveDo6QmFzZWxpbmU6 OkJhc2VsaW5lKElubGluZUxheW91dFVuaXQgYXNjZW50LCBJbmxpbmVMYXlvdXRVbml0IGRlc2Nl bnQpCitpbmxpbmUgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZTo6QmFzZWxpbmUoSW5saW5l TGF5b3V0VW5pdCBhc2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzY2VudCkKICAgICA6IG1fYXNj ZW50KGFzY2VudCkKICAgICAsIG1fZGVzY2VudChkZXNjZW50KQogewpAQCAtMjA1LDcgKzIxNiw3 IEBAIGlubGluZSBMaW5lQm94OjpCYXNlbGluZTo6QmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBh c2NlbnQsIElubGluZUxheW91dFVuaXQgZGVzCiAjZW5kaWYKIH0KIAotaW5saW5lIHZvaWQgTGlu ZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudChJbmxpbmVMYXlvdXRVbml0IGFzY2VudCkKK2lubGlu ZSB2b2lkIExpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudChJbmxpbmVMYXlv dXRVbml0IGFzY2VudCkKIHsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIG1faGFzVmFsaWRBc2Nl bnQgPSB0cnVlOwpAQCAtMjEzLDcgKzIyNCw3IEBAIGlubGluZSB2b2lkIExpbmVCb3g6OkJhc2Vs aW5lOjpzZXRBc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpCiAgICAgbV9hc2NlbnQgPSBh c2NlbnQ7CiB9CiAKLWlubGluZSB2b2lkIExpbmVCb3g6OkJhc2VsaW5lOjpzZXREZXNjZW50KElu bGluZUxheW91dFVuaXQgZGVzY2VudCkKK2lubGluZSB2b2lkIExpbmVCb3g6OklubGluZUJveDo6 QmFzZWxpbmU6OnNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KQogewogI2lmIEFT U0VSVF9FTkFCTEVECiAgICAgbV9oYXNWYWxpZERlc2NlbnQgPSB0cnVlOwpAQCAtMjIxLDcgKzIz Miw3IEBAIGlubGluZSB2b2lkIExpbmVCb3g6OkJhc2VsaW5lOjpzZXREZXNjZW50KElubGluZUxh eW91dFVuaXQgZGVzY2VudCkKICAgICBtX2Rlc2NlbnQgPSBkZXNjZW50OwogfQogCi1pbmxpbmUg dm9pZCBMaW5lQm94OjpCYXNlbGluZTo6cmVzZXQoKQoraW5saW5lIHZvaWQgTGluZUJveDo6SW5s aW5lQm94OjpCYXNlbGluZTo6cmVzZXQoKQogewogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgbV9o YXNWYWxpZEFzY2VudCA9IHRydWU7CkBAIC0yMzEsMTMgKzI0MiwxMyBAQCBpbmxpbmUgdm9pZCBM aW5lQm94OjpCYXNlbGluZTo6cmVzZXQoKQogICAgIG1fZGVzY2VudCA9IDBfbHU7CiB9CiAKLWlu bGluZSBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3g6OkJhc2VsaW5lOjphc2NlbnQoKSBjb25zdAor aW5saW5lIElubGluZUxheW91dFVuaXQgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZTo6YXNj ZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxpZEFzY2VudCk7CiAgICAgcmV0dXJu IG1fYXNjZW50OwogfQogCi1pbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjpCYXNlbGlu ZTo6ZGVzY2VudCgpIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjpJbmxp bmVCb3g6OkJhc2VsaW5lOjpkZXNjZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxp ZERlc2NlbnQpOwogICAgIHJldHVybiBtX2Rlc2NlbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAK aW5kZXggYWQ4MzYyN2VmZTkyYWViMjQ1ZTRmODc3ZWExOTM3OWRkNGVkOTRlZi4uYmY2YjhiZmQ3 NWI3ZTcyZDRhM2ViM2RlODVmMGYzYWMxNGM4OGViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNw cApAQCAtOTEsNyArOTEsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IENv bnN0cmFpbnRzJiBjb25zdHJhaW50cykKICAgICAgICAgbV9pbml0aWFsU3RydXQgPSB7IH07CiAK ICAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRzLmxv Z2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFsTGluZUhlaWdodCB9OwotICAgIGF1dG8gYmFzZWxp bmUgPSBMaW5lQm94OjpCYXNlbGluZSB7IGluaXRpYWxCYXNlbGluZU9mZnNldCwgaW5pdGlhbExp bmVIZWlnaHQgLSBpbml0aWFsQmFzZWxpbmVPZmZzZXQgfTsKKyAgICBhdXRvIGJhc2VsaW5lID0g TGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZSB7IGluaXRpYWxCYXNlbGluZU9mZnNldCwgaW5p dGlhbExpbmVIZWlnaHQgLSBpbml0aWFsQmFzZWxpbmVPZmZzZXQgfTsKICAgICBtX2xpbmVCb3gg PSBMaW5lQm94IHsgbGluZVJlY3QsIGJhc2VsaW5lLCBpbml0aWFsQmFzZWxpbmVPZmZzZXQgfTsK ICAgICBtX2xpbmVMb2dpY2FsV2lkdGggPSBjb25zdHJhaW50cy5hdmFpbGFibGVMb2dpY2FsV2lk dGg7CiAgICAgbV9oYXNJbnRydXNpdmVGbG9hdCA9IGNvbnN0cmFpbnRzLmxpbmVJc0NvbnN0cmFp bmVkQnlGbG9hdDsKQEAgLTcwNSw3ICs3MDUsNyBAQCBib29sIExpbmVCdWlsZGVyOjppc1Zpc3Vh bGx5Tm9uRW1wdHkoY29uc3QgUnVuJiBydW4pIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQog Ci1MaW5lQm94OjpCYXNlbGluZSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0 IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcywgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhl aWdodCkKK0xpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmUgTGluZUJ1aWxkZXI6OmhhbGZMZWFk aW5nTWV0cmljcyhjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3MsIElubGluZUxheW91dFVu aXQgbGluZUxvZ2ljYWxIZWlnaHQpCiB7CiAgICAgYXV0byBhc2NlbnQgPSBmb250TWV0cmljcy5h c2NlbnQoKTsKICAgICBhdXRvIGRlc2NlbnQgPSBmb250TWV0cmljcy5kZXNjZW50KCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuaAppbmRleCA4NDk2ZWMwZjk3NTkwYWJkMWQ3NWZjMmMyNTQ4YThmZmIzY2Rk ZGMwLi4xNjY3NWYyYWFmN2MyNDZiZGM4OTkzODZlODZkMjNkNjdlYzU2Mjg4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmgKQEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAgICAgICBzdHJ1Y3QgSGVp Z2h0QW5kQmFzZWxpbmUgewogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBoZWlnaHQgeyAw IH07CiAgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0IHsgMCB9Owot ICAgICAgICAgICAgT3B0aW9uYWw8TGluZUJveDo6QmFzZWxpbmU+IHN0cnV0OworICAgICAgICAg ICAgT3B0aW9uYWw8TGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZT4gc3RydXQ7CiAgICAgICAg IH07CiAgICAgICAgIE9wdGlvbmFsPEhlaWdodEFuZEJhc2VsaW5lPiBoZWlnaHRBbmRCYXNlbGlu ZTsKICAgICB9OwpAQCAtMTQ4LDcgKzE0OCw3IEBAIHB1YmxpYzoKICAgICBlbnVtIGNsYXNzIElz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudCB7IE5vLCBZZXMgfTsKICAgICBSdW5MaXN0IGNsb3Nl KElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCA9IElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu dDo6Tm8pOwogCi0gICAgc3RhdGljIExpbmVCb3g6OkJhc2VsaW5lIGhhbGZMZWFkaW5nTWV0cmlj cyhjb25zdCBGb250TWV0cmljcyYsIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQp OworICAgIHN0YXRpYyBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lIGhhbGZMZWFkaW5nTWV0 cmljcyhjb25zdCBGb250TWV0cmljcyYsIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxIZWln aHQpOwogCiBwcml2YXRlOgogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0 IHsgcmV0dXJuIG1fbGluZUJveC5sb2dpY2FsVG9wKCk7IH0KQEAgLTIxOSw3ICsyMTksNyBAQCBw cml2YXRlOgogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBtX2lubGluZUZvcm1h dHRpbmdDb250ZXh0OwogICAgIFJ1bkxpc3QgbV9ydW5zOwogICAgIFRyaW1tYWJsZVRyYWlsaW5n Q29udGVudCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKLSAgICBPcHRpb25hbDxMaW5lQm94 OjpCYXNlbGluZT4gbV9pbml0aWFsU3RydXQ7CisgICAgT3B0aW9uYWw8TGluZUJveDo6SW5saW5l Qm94OjpCYXNlbGluZT4gbV9pbml0aWFsU3RydXQ7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xp bmVMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgT3B0aW9uYWw8VGV4dEFsaWduTW9kZT4gbV9ob3Jp em9udGFsQWxpZ25tZW50OwogICAgIGJvb2wgbV9pc0ludHJpbnNpY1NpemluZyB7IGZhbHNlIH07 Cg== 407074 2020-08-23 09:40:16 -0700 2020-08-23 10:06:42 -0700 Patch bug-214733-20200823094016.patch text/plain 16269 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ5NjNhMzE0ZDU5MDgy NWQ4Y2M5MDk1MTExM2RkZmI4ZDMwZWUzYy4uN2FlODY5MDQwODBhZDhjNDk0ZjhhNDJiMjg1NGUz MzkwYTg5ZDgxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDczIEBACisyMDIwLTA4LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgdGhlIHJvb3QgaW5saW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE0NzMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgaGF2aW5nIGEgZGVkaWNh dGVkIGxpbmUgYm94IGZvciBlYWNoIGxpbmUgd2l0aCBpbmxpbmUgYm94ZXMgaW5zaWRlLgorICAg ICAgICBBdCB0aGlzIHBvaW50IHdlIG9ubHkgdXNlIHRoZSByb290IGlubGluZSBib3ggdG8gcHJv eHkgdGhlIGJhc2VsaW5lIGhhbmRsaW5nLiAKKyAgICAgICAgU2VlIGh0dHBzOi8vd3d3LnczLm9y Zy9UUi9jc3MtaW5saW5lLTMvI21vZGVsCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6 OklubGluZUJveDo6QmFzZWxpbmU6OmhlaWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94OjpJbmxpbmVCb3g6OklubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3g6OnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQm94OjpiYXNlbGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCb3g6OnNldEJhc2VsaW5lT2Zmc2V0SWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6c2V0QXNjZW50SWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6c2V0RGVzY2VudElmR3JlYXRlcik6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmVCb3g6OmJhc2VsaW5lT2Zmc2V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6cmVzZXRCYXNlbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6OkJhc2VsaW5lKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZTo6c2V0QXNjZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpCYXNlbGlu ZTo6c2V0RGVzY2VudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGlu ZUJveDo6QmFzZWxpbmU6OnJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6SW5saW5lQm94OjpCYXNlbGluZTo6YXNjZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZTo6ZGVzY2VudCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6QmFzZWxpbmU6OmhlaWdodCBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNh bFJlY3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVC b3g6OnNjcm9sbGFibGVPdmVyZmxvdyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNhbExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OmxvZ2ljYWxSaWdodCBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNhbFRvcCBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6bG9naWNh bEJvdHRvbSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6bG9naWNhbFdpZHRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lQm94Ojpsb2dpY2FsSGVpZ2h0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpyZXNldERlc2NlbnQpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldExvZ2ljYWxIZWlnaHQpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldExvZ2ljYWxXaWR0 aCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6c2V0U2Ny b2xsYWJsZU92ZXJmbG93KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lQm94Ojptb3ZlSG9yaXpvbnRhbGx5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lQm94OjpleHBhbmRIb3Jpem9udGFsbHkpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNocmlua0hvcml6b250YWxseSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6ZXhwYW5kVmVydGljYWxseSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6c2hyaW5rVmVy dGljYWxseSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6 aXNDb25zaWRlcmVkRW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVCb3g6OnNldElzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzZXRJc0NvbnNpZGVyZWROb25FbXB0eSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6SW5saW5lQm94KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQm94OjpzZXRMb2dpY2Fs SGVpZ2h0SWZHcmVhdGVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lQm94OjpiYXNlbGluZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUJveDo6c2V0QmFzZWxpbmVPZmZzZXRJZkdyZWF0ZXIpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OnNldEFzY2VudElmR3JlYXRlcik6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6c2V0RGVzY2VudElm R3JlYXRlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6 YmFzZWxpbmVPZmZzZXQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVCb3g6OnJlc2V0QmFzZWxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpCYXNlbGluZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6QmFzZWxpbmU6OnNldERl c2NlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVCb3g6OkJh c2VsaW5lOjpyZXNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUJveDo6QmFzZWxpbmU6OmFzY2VudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUJveDo6QmFzZWxpbmU6OmRlc2NlbnQgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGluZUJveCBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaDoKKwog MjAyMC0wOC0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gRGlzcGxheTo6TGluZUJveCBkb2VzIG5vdCBuZWVkIGFzY2VudC9kZXNjZW50IGdl b21ldHJ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5k ZXggYzY2NjA2ODM1NTJjYWFjMDkwODYyN2M0YmJmOGM5ZWE1MzNhZmYzZi4uZmVhM2JjY2ZhM2Ew Mjc2NjgwODgwMzhiNzlhMTUzNmZhNWUzYWJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtODMsMTIgKzgzLDEyIEBAIExpbmVCdWlsZGVyOjpD b25zdHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1 aXJrczo6bGluCiAgICAgYXV0byBsaW5lSGVpZ2h0ID0gZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5s aW5lSGVpZ2h0KCk7CiAgICAgaWYgKGxpbmVIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkp IHsKICAgICAgICAgYXV0byBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSBMaW5lQnVpbGRlcjo6aGFs ZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgMF9s dSkuYXNjZW50KCk7Ci0gICAgICAgIHJldHVybiB7IGluaXRpYWxCYXNlbGluZU9mZnNldCwgaW5p dGlhbEJhc2VsaW5lT2Zmc2V0LCBMaW5lQm94OjpCYXNlbGluZSB7IHN0cnV0QmFzZWxpbmVPZmZz ZXQsIHN0cnV0SGVpZ2h0IC0gc3RydXRCYXNlbGluZU9mZnNldCB9IH07CisgICAgICAgIHJldHVy biB7IGluaXRpYWxCYXNlbGluZU9mZnNldCwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0LCBMaW5lQm94 OjpJbmxpbmVCb3g6OkJhc2VsaW5lIHsgc3RydXRCYXNlbGluZU9mZnNldCwgc3RydXRIZWlnaHQg LSBzdHJ1dEJhc2VsaW5lT2Zmc2V0IH0gfTsKICAgICB9CiAgICAgLy8gRklYTUU6IFRoZSBvbmx5 IHJlYXNvbiB3aHkgd2UgdXNlIGludFZhbHVlKCkgaGVyZSBpcyB0byBtYXRjaCBjdXJyZW50IGlu bGluZSB0cmVlIChpbnRlZ3JhbCliZWhhdmlvci4KICAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRp YWxMaW5lSGVpZ2h0ID0gbGluZUhlaWdodC5pbnRWYWx1ZSgpOwogICAgIGF1dG8gaW5pdGlhbEJh c2VsaW5lT2Zmc2V0ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5n Um9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIGluaXRpYWxMaW5lSGVpZ2h0KS5hc2NlbnQoKTsK LSAgICByZXR1cm4geyBpbml0aWFsTGluZUhlaWdodCwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0LCBM aW5lQm94OjpCYXNlbGluZSB7IHN0cnV0QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVpZ2h0IC0gc3Ry dXRCYXNlbGluZU9mZnNldCB9IH07CisgICAgcmV0dXJuIHsgaW5pdGlhbExpbmVIZWlnaHQsIGlu aXRpYWxCYXNlbGluZU9mZnNldCwgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZSB7IHN0cnV0 QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVpZ2h0IC0gc3RydXRCYXNlbGluZU9mZnNldCB9IH07CiB9 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guaAppbmRleCBhMDYwYjI4ZmUxYjhiNjAyMjIwMjk0NzBmZmE1NzhkMjIz ZDMwNDY4Li4zNGEyMWMwZjhlOTY2YjhjNDUyNjczZWI4ZmYwMDEzMjY0Njg5MTU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5oCkBAIC0zNiwyOSArMzYsMzUgQEAgbmFtZXNwYWNlIExheW91dCB7CiBjbGFzcyBMaW5l Qm94IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBzdHJ1Y3Qg QmFzZWxpbmUgewotICAgICAgICBCYXNlbGluZShJbmxpbmVMYXlvdXRVbml0IGFzY2VudCwgSW5s aW5lTGF5b3V0VW5pdCBkZXNjZW50KTsKLSAgICAgICAgQmFzZWxpbmUoKSA9IGRlZmF1bHQ7Cisg ICAgc3RydWN0IElubGluZUJveCB7CisgICAgICAgIHN0cnVjdCBCYXNlbGluZSB7CisgICAgICAg ICAgICBCYXNlbGluZShJbmxpbmVMYXlvdXRVbml0IGFzY2VudCwgSW5saW5lTGF5b3V0VW5pdCBk ZXNjZW50KTsKKyAgICAgICAgICAgIEJhc2VsaW5lKCkgPSBkZWZhdWx0OwogCi0gICAgICAgIHZv aWQgc2V0QXNjZW50KElubGluZUxheW91dFVuaXQpOwotICAgICAgICB2b2lkIHNldERlc2NlbnQo SW5saW5lTGF5b3V0VW5pdCk7CisgICAgICAgICAgICB2b2lkIHNldEFzY2VudChJbmxpbmVMYXlv dXRVbml0KTsKKyAgICAgICAgICAgIHZvaWQgc2V0RGVzY2VudChJbmxpbmVMYXlvdXRVbml0KTsK IAotICAgICAgICB2b2lkIHJlc2V0KCk7CisgICAgICAgICAgICB2b2lkIHJlc2V0KCk7CiAKLSAg ICAgICAgSW5saW5lTGF5b3V0VW5pdCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBhc2NlbnQoKSAr IGRlc2NlbnQoKTsgfQotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGFzY2VudCgpIGNvbnN0Owot ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQoKSBjb25zdDsKKyAgICAgICAgICAgIElu bGluZUxheW91dFVuaXQgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gYXNjZW50KCkgKyBkZXNjZW50 KCk7IH0KKyAgICAgICAgICAgIElubGluZUxheW91dFVuaXQgYXNjZW50KCkgY29uc3Q7CisgICAg ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQoKSBjb25zdDsKIAotICAgIHByaXZhdGU6 CisgICAgICAgIHByaXZhdGU6CiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICAgICAgYm9vbCBtX2hh c1ZhbGlkQXNjZW50IHsgZmFsc2UgfTsKLSAgICAgICAgYm9vbCBtX2hhc1ZhbGlkRGVzY2VudCB7 IGZhbHNlIH07CisgICAgICAgICAgICBib29sIG1faGFzVmFsaWRBc2NlbnQgeyBmYWxzZSB9Owor ICAgICAgICAgICAgYm9vbCBtX2hhc1ZhbGlkRGVzY2VudCB7IGZhbHNlIH07CiAjZW5kaWYKLSAg ICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2FzY2VudCB7IDAgfTsKLSAgICAgICAgSW5saW5lTGF5 b3V0VW5pdCBtX2Rlc2NlbnQgeyAwIH07CisgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1f YXNjZW50IHsgMCB9OworICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2Rlc2NlbnQgeyAw IH07CisgICAgICAgIH07CisgICAgICAgIElubGluZUJveChjb25zdCBCYXNlbGluZSYpOworICAg ICAgICBJbmxpbmVCb3goKSA9IGRlZmF1bHQ7CisKKyAgICAgICAgQmFzZWxpbmUgYmFzZWxpbmU7 CiAgICAgfTsKIAotICAgIExpbmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIGNvbnN0 IEJhc2VsaW5lJiwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCk7CisgICAgTGluZUJv eChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiwgY29uc3QgSW5saW5lQm94OjpCYXNlbGluZSYs IElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpOwogICAgIExpbmVCb3goKSA9IGRlZmF1 bHQ7CiAKICAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0 IHsgcmV0dXJuIG1fcmVjdDsgfQpAQCAtNzIsNyArNzgsNyBAQCBwdWJsaWM6CiAgICAgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3JlY3Qud2lkdGgoKTsg fQogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVjdC5oZWlnaHQoKTsgfQogCi0gICAgY29uc3QgQmFzZWxpbmUmIGJhc2VsaW5lKCkgY29uc3Q7 CisgICAgY29uc3QgSW5saW5lQm94OjpCYXNlbGluZSYgYmFzZWxpbmUoKSBjb25zdDsKICAgICAv LyBCYXNlbGluZSBvZmZzZXQgZnJvbSBsaW5lIGxvZ2ljYWwgdG9wLiBOb3RlIHRoYXQgb2Zmc2V0 IGRvZXMgbm90IG5lY2Vzc2FyaWx5IGVxdWFsIHRvIGFzY2VudC4KICAgICAvLwogICAgIC8vIC0t LS0tLS0tLS0tLS0tLS0tLS0gICAgbGluZSBsb2dpY2FsIHRvcCAgICAgLS0tLS0tLS0tLS0tLS0t LS0tLSAodG9wIGFsaWduKQpAQCAtOTQsNyArMTAwLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 RGVzY2VudElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0KTsKIAogICAgIHZvaWQgcmVzZXRCYXNl bGluZSgpOwotICAgIHZvaWQgcmVzZXREZXNjZW50KCkgeyBtX2Jhc2VsaW5lLnNldERlc2NlbnQo MF9sdSk7IH0KKyAgICB2b2lkIHJlc2V0RGVzY2VudCgpIHsgbV9yb290SW5saW5lQm94LmJhc2Vs aW5lLnNldERlc2NlbnQoMF9sdSk7IH0KIAogICAgIHZvaWQgc2V0TG9naWNhbEhlaWdodChJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQpIHsgbV9yZWN0LnNldEhlaWdodChsb2dpY2FsSGVp Z2h0KTsgfQogCkBAIC0xMjgsMTUgKzEzNCwxNSBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgRGlz cGxheTo6SW5saW5lUmVjdCBtX3JlY3Q7CiAgICAgRGlzcGxheTo6SW5saW5lUmVjdCBtX3Njcm9s bGFibGVPdmVyZmxvdzsKLSAgICBCYXNlbGluZSBtX2Jhc2VsaW5lOwogICAgIElubGluZUxheW91 dFVuaXQgbV9iYXNlbGluZU9mZnNldCB7IDAgfTsKICAgICBib29sIG1faXNDb25zaWRlcmVkRW1w dHkgeyB0cnVlIH07CisgICAgSW5saW5lQm94IG1fcm9vdElubGluZUJveDsKIH07CiAKLWlubGlu ZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0 IEJhc2VsaW5lJiBiYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCkKK2lu bGluZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNv bnN0IElubGluZUJveDo6QmFzZWxpbmUmIGJhc2VsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGJhc2Vs aW5lT2Zmc2V0KQogICAgIDogbV9yZWN0KHJlY3QpCi0gICAgLCBtX2Jhc2VsaW5lKGJhc2VsaW5l KQogICAgICwgbV9iYXNlbGluZU9mZnNldChiYXNlbGluZU9mZnNldCkKKyAgICAsIG1fcm9vdElu bGluZUJveChiYXNlbGluZSkKIHsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIG1faGFzVmFsaWRC YXNlbGluZSA9IHRydWU7CkBAIC0xNDQsNiArMTUwLDExIEBAIGlubGluZSBMaW5lQm94OjpMaW5l Qm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEJhc2VsaW5lJiBiYXNl bGluCiAjZW5kaWYKIH0KIAoraW5saW5lIExpbmVCb3g6OklubGluZUJveDo6SW5saW5lQm94KGNv bnN0IEJhc2VsaW5lJiBiYXNlbGluZSkKKyAgICA6IGJhc2VsaW5lKGJhc2VsaW5lKQoreworfQor CiBpbmxpbmUgdm9pZCBMaW5lQm94OjpzZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKElubGluZUxh eW91dFVuaXQgbG9naWNhbEhlaWdodCkKIHsKICAgICBpZiAobG9naWNhbEhlaWdodCA8PSBtX3Jl Y3QuaGVpZ2h0KCkpCkBAIC0xNTEsMTAgKzE2MiwxMCBAQCBpbmxpbmUgdm9pZCBMaW5lQm94Ojpz ZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCkK ICAgICBtX3JlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOwogfQogCi1pbmxpbmUgY29uc3Qg TGluZUJveDo6QmFzZWxpbmUmIExpbmVCb3g6OmJhc2VsaW5lKCkgY29uc3QKK2lubGluZSBjb25z dCBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lJiBMaW5lQm94OjpiYXNlbGluZSgpIGNvbnN0 CiB7CiAgICAgQVNTRVJUKG1faGFzVmFsaWRCYXNlbGluZSk7Ci0gICAgcmV0dXJuIG1fYmFzZWxp bmU7CisgICAgcmV0dXJuIG1fcm9vdElubGluZUJveC5iYXNlbGluZTsKIH0KIAogaW5saW5lIHZv aWQgTGluZUJveDo6c2V0QmFzZWxpbmVPZmZzZXRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBi YXNlbGluZU9mZnNldCkKQEAgLTE2NywxNyArMTc4LDE3IEBAIGlubGluZSB2b2lkIExpbmVCb3g6 OnNldEJhc2VsaW5lT2Zmc2V0SWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZz ZXQpCiAKIGlubGluZSB2b2lkIExpbmVCb3g6OnNldEFzY2VudElmR3JlYXRlcihJbmxpbmVMYXlv dXRVbml0IGFzY2VudCkKIHsKLSAgICBpZiAoYXNjZW50IDwgbV9iYXNlbGluZS5hc2NlbnQoKSkK KyAgICBpZiAoYXNjZW50IDwgbV9yb290SW5saW5lQm94LmJhc2VsaW5lLmFzY2VudCgpKQogICAg ICAgICByZXR1cm47CiAgICAgc2V0QmFzZWxpbmVPZmZzZXRJZkdyZWF0ZXIoYXNjZW50KTsKLSAg ICBtX2Jhc2VsaW5lLnNldEFzY2VudChhc2NlbnQpOworICAgIG1fcm9vdElubGluZUJveC5iYXNl bGluZS5zZXRBc2NlbnQoYXNjZW50KTsKIH0KIAogaW5saW5lIHZvaWQgTGluZUJveDo6c2V0RGVz Y2VudElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQpCiB7Ci0gICAgaWYgKGRlc2Nl bnQgPCBtX2Jhc2VsaW5lLmRlc2NlbnQoKSkKKyAgICBpZiAoZGVzY2VudCA8IG1fcm9vdElubGlu ZUJveC5iYXNlbGluZS5kZXNjZW50KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2Jhc2VsaW5l LnNldERlc2NlbnQoZGVzY2VudCk7CisgICAgbV9yb290SW5saW5lQm94LmJhc2VsaW5lLnNldERl c2NlbnQoZGVzY2VudCk7CiB9CiAKIGlubGluZSBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3g6OmJh c2VsaW5lT2Zmc2V0KCkgY29uc3QKQEAgLTE5MiwxMCArMjAzLDEwIEBAIGlubGluZSB2b2lkIExp bmVCb3g6OnJlc2V0QmFzZWxpbmUoKQogICAgIG1faGFzVmFsaWRCYXNlbGluZU9mZnNldCA9IHRy dWU7CiAjZW5kaWYKICAgICBtX2Jhc2VsaW5lT2Zmc2V0ID0gMF9sdTsKLSAgICBtX2Jhc2VsaW5l LnJlc2V0KCk7CisgICAgbV9yb290SW5saW5lQm94LmJhc2VsaW5lLnJlc2V0KCk7CiB9CiAKLWlu bGluZSBMaW5lQm94OjpCYXNlbGluZTo6QmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQs IElubGluZUxheW91dFVuaXQgZGVzY2VudCkKK2lubGluZSBMaW5lQm94OjpJbmxpbmVCb3g6OkJh c2VsaW5lOjpCYXNlbGluZShJbmxpbmVMYXlvdXRVbml0IGFzY2VudCwgSW5saW5lTGF5b3V0VW5p dCBkZXNjZW50KQogICAgIDogbV9hc2NlbnQoYXNjZW50KQogICAgICwgbV9kZXNjZW50KGRlc2Nl bnQpCiB7CkBAIC0yMDUsNyArMjE2LDcgQEAgaW5saW5lIExpbmVCb3g6OkJhc2VsaW5lOjpCYXNl bGluZShJbmxpbmVMYXlvdXRVbml0IGFzY2VudCwgSW5saW5lTGF5b3V0VW5pdCBkZXMKICNlbmRp ZgogfQogCi1pbmxpbmUgdm9pZCBMaW5lQm94OjpCYXNlbGluZTo6c2V0QXNjZW50KElubGluZUxh eW91dFVuaXQgYXNjZW50KQoraW5saW5lIHZvaWQgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGlu ZTo6c2V0QXNjZW50KElubGluZUxheW91dFVuaXQgYXNjZW50KQogewogI2lmIEFTU0VSVF9FTkFC TEVECiAgICAgbV9oYXNWYWxpZEFzY2VudCA9IHRydWU7CkBAIC0yMTMsNyArMjI0LDcgQEAgaW5s aW5lIHZvaWQgTGluZUJveDo6QmFzZWxpbmU6OnNldEFzY2VudChJbmxpbmVMYXlvdXRVbml0IGFz Y2VudCkKICAgICBtX2FzY2VudCA9IGFzY2VudDsKIH0KIAotaW5saW5lIHZvaWQgTGluZUJveDo6 QmFzZWxpbmU6OnNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KQoraW5saW5lIHZv aWQgTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGluZTo6c2V0RGVzY2VudChJbmxpbmVMYXlvdXRV bml0IGRlc2NlbnQpCiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkRGVzY2Vu dCA9IHRydWU7CkBAIC0yMjEsNyArMjMyLDcgQEAgaW5saW5lIHZvaWQgTGluZUJveDo6QmFzZWxp bmU6OnNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KQogICAgIG1fZGVzY2VudCA9 IGRlc2NlbnQ7CiB9CiAKLWlubGluZSB2b2lkIExpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCgpCitp bmxpbmUgdm9pZCBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCgpCiB7CiAjaWYg QVNTRVJUX0VOQUJMRUQKICAgICBtX2hhc1ZhbGlkQXNjZW50ID0gdHJ1ZTsKQEAgLTIzMSwxMyAr MjQyLDEzIEBAIGlubGluZSB2b2lkIExpbmVCb3g6OkJhc2VsaW5lOjpyZXNldCgpCiAgICAgbV9k ZXNjZW50ID0gMF9sdTsKIH0KIAotaW5saW5lIElubGluZUxheW91dFVuaXQgTGluZUJveDo6QmFz ZWxpbmU6OmFzY2VudCgpIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjpJ bmxpbmVCb3g6OkJhc2VsaW5lOjphc2NlbnQoKSBjb25zdAogewogICAgIEFTU0VSVChtX2hhc1Zh bGlkQXNjZW50KTsKICAgICByZXR1cm4gbV9hc2NlbnQ7CiB9CiAKLWlubGluZSBJbmxpbmVMYXlv dXRVbml0IExpbmVCb3g6OkJhc2VsaW5lOjpkZXNjZW50KCkgY29uc3QKK2lubGluZSBJbmxpbmVM YXlvdXRVbml0IExpbmVCb3g6OklubGluZUJveDo6QmFzZWxpbmU6OmRlc2NlbnQoKSBjb25zdAog ewogICAgIEFTU0VSVChtX2hhc1ZhbGlkRGVzY2VudCk7CiAgICAgcmV0dXJuIG1fZGVzY2VudDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBhZDgzNjI3ZWZlOTJhZWIyNDVlNGY4NzdlYTE5 Mzc5ZGQ0ZWQ5NGVmLi5iZjZiOGJmZDc1YjdlNzJkNGEzZWIzZGU4NWYwZjNhYzE0Yzg4ZWJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC05MSw3ICs5MSw3IEBAIHZvaWQgTGluZUJ1aWxk ZXI6OmluaXRpYWxpemUoY29uc3QgQ29uc3RyYWludHMmIGNvbnN0cmFpbnRzKQogICAgICAgICBt X2luaXRpYWxTdHJ1dCA9IHsgfTsKIAogICAgIGF1dG8gbGluZVJlY3QgPSBEaXNwbGF5OjpJbmxp bmVSZWN0IHsgY29uc3RyYWludHMubG9naWNhbFRvcExlZnQsIDBfbHUsIGluaXRpYWxMaW5lSGVp Z2h0IH07Ci0gICAgYXV0byBiYXNlbGluZSA9IExpbmVCb3g6OkJhc2VsaW5lIHsgaW5pdGlhbEJh c2VsaW5lT2Zmc2V0LCBpbml0aWFsTGluZUhlaWdodCAtIGluaXRpYWxCYXNlbGluZU9mZnNldCB9 OworICAgIGF1dG8gYmFzZWxpbmUgPSBMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lIHsgaW5p dGlhbEJhc2VsaW5lT2Zmc2V0LCBpbml0aWFsTGluZUhlaWdodCAtIGluaXRpYWxCYXNlbGluZU9m ZnNldCB9OwogICAgIG1fbGluZUJveCA9IExpbmVCb3ggeyBsaW5lUmVjdCwgYmFzZWxpbmUsIGlu aXRpYWxCYXNlbGluZU9mZnNldCB9OwogICAgIG1fbGluZUxvZ2ljYWxXaWR0aCA9IGNvbnN0cmFp bnRzLmF2YWlsYWJsZUxvZ2ljYWxXaWR0aDsKICAgICBtX2hhc0ludHJ1c2l2ZUZsb2F0ID0gY29u c3RyYWludHMubGluZUlzQ29uc3RyYWluZWRCeUZsb2F0OwpAQCAtNzA1LDcgKzcwNSw3IEBAIGJv b2wgTGluZUJ1aWxkZXI6OmlzVmlzdWFsbHlOb25FbXB0eShjb25zdCBSdW4mIHJ1bikgY29uc3QK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUxpbmVCb3g6OkJhc2VsaW5lIExpbmVCdWlsZGVyOjpo YWxmTGVhZGluZ01ldHJpY3MoY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzLCBJbmxpbmVM YXlvdXRVbml0IGxpbmVMb2dpY2FsSGVpZ2h0KQorTGluZUJveDo6SW5saW5lQm94OjpCYXNlbGlu ZSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0IEZvbnRNZXRyaWNzJiBmb250 TWV0cmljcywgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCkKIHsKICAgICBhdXRv IGFzY2VudCA9IGZvbnRNZXRyaWNzLmFzY2VudCgpOwogICAgIGF1dG8gZGVzY2VudCA9IGZvbnRN ZXRyaWNzLmRlc2NlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDg0OTZlYzBmOTc1OTBh YmQxZDc1ZmMyYzI1NDhhOGZmYjNjZGRkYzAuLjE2Njc1ZjJhYWY3YzI0NmJkYzg5OTM4NmU4NmQy M2Q2N2VjNTYyODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtNTAsNyArNTAsNyBAQCBwdWJs aWM6CiAgICAgICAgIHN0cnVjdCBIZWlnaHRBbmRCYXNlbGluZSB7CiAgICAgICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGhlaWdodCB7IDAgfTsKICAgICAgICAgICAgIElubGluZUxheW91dFVuaXQg YmFzZWxpbmVPZmZzZXQgeyAwIH07Ci0gICAgICAgICAgICBPcHRpb25hbDxMaW5lQm94OjpCYXNl bGluZT4gc3RydXQ7CisgICAgICAgICAgICBPcHRpb25hbDxMaW5lQm94OjpJbmxpbmVCb3g6OkJh c2VsaW5lPiBzdHJ1dDsKICAgICAgICAgfTsKICAgICAgICAgT3B0aW9uYWw8SGVpZ2h0QW5kQmFz ZWxpbmU+IGhlaWdodEFuZEJhc2VsaW5lOwogICAgIH07CkBAIC0xNDgsNyArMTQ4LDcgQEAgcHVi bGljOgogICAgIGVudW0gY2xhc3MgSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IHsgTm8sIFll cyB9OwogICAgIFJ1bkxpc3QgY2xvc2UoSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50ID0gSXNM YXN0TGluZVdpdGhJbmxpbmVDb250ZW50OjpObyk7CiAKLSAgICBzdGF0aWMgTGluZUJveDo6QmFz ZWxpbmUgaGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0IEZvbnRNZXRyaWNzJiwgSW5saW5lTGF5b3V0 VW5pdCBsaW5lTG9naWNhbEhlaWdodCk7CisgICAgc3RhdGljIExpbmVCb3g6OklubGluZUJveDo6 QmFzZWxpbmUgaGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0IEZvbnRNZXRyaWNzJiwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCk7CiAKIHByaXZhdGU6CiAgICAgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94LmxvZ2ljYWxUb3AoKTsg fQpAQCAtMjE5LDcgKzIxOSw3IEBAIHByaXZhdGU6CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiAgICAgUnVuTGlzdCBtX3J1bnM7 CiAgICAgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50 OwotICAgIE9wdGlvbmFsPExpbmVCb3g6OkJhc2VsaW5lPiBtX2luaXRpYWxTdHJ1dDsKKyAgICBP cHRpb25hbDxMaW5lQm94OjpJbmxpbmVCb3g6OkJhc2VsaW5lPiBtX2luaXRpYWxTdHJ1dDsKICAg ICBJbmxpbmVMYXlvdXRVbml0IG1fbGluZUxvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICBPcHRpb25h bDxUZXh0QWxpZ25Nb2RlPiBtX2hvcml6b250YWxBbGlnbm1lbnQ7CiAgICAgYm9vbCBtX2lzSW50 cmluc2ljU2l6aW5nIHsgZmFsc2UgfTsK