201796 2019-09-14 06:15:58 -0700 [LFC] FormattingContext::Geometry::inlineReplacedHeightAndMargin should not read containing block's width 2019-09-14 11:06:03 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201795 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1570870 0 zalan 2019-09-14 06:15:58 -0700 see bug 201795 1570871 1 webkit-bug-importer 2019-09-14 06:16:39 -0700 <rdar://problem/55366109> 1570872 2 378795 zalan 2019-09-14 06:18:47 -0700 Created attachment 378795 Patch 1570891 3 zalan 2019-09-14 11:06:03 -0700 Committed r249878: <https://trac.webkit.org/changeset/249878> 378795 2019-09-14 06:18:47 -0700 2019-09-14 09:36:43 -0700 Patch bug-201796-20190914061842.patch text/plain 19979 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI2NzJmMTA3MjUzNTdh OGYyN2I3NjFiN2M1M2M1NDQxNThmZmE3NC4uNTExZDQ0YWE1NTg3MmY2NzdkOWU1ZWU0NTc5MjFh ZTQ0OThjNzY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbiBzaG91bGQgbm90 IHJlYWQgY29udGFpbmluZyBibG9jaydzIHdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE3OTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1 MzY2MTA5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHVzaW5nIGNvbnN0cmFpbnQgdmFsdWVzIGluc3Rl YWQgb2YgcXVlcnlpbmcgdGhlIGRpc3BsYXkgdHJlZSBmb3IgY29udGFpbmluZyBibG9jayBnZW9t ZXRyeSBpbmZvcm1hdGlvbi4KKyAgICAgICAgU2VlIHdlYmtpdC5vcmcvYi8yMDE3OTUKKworICAg ICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9Gb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0 cnkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2FzZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nUmVwbGFjZWRIZWlnaHRB bmRNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBs YWNlZEhlaWdodEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbik6CisgICAg ICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6Cisg ICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5k TWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZUJsb2NrSGVpZ2h0QW5kTWFy Z2luIGNvbnN0KToKKwogMjAxOS0wOS0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93 UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5IHNob3VsZCBub3QgcmVhZCBjb250YWluaW5nIGJsb2Nr J3Mgd2lkdGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4 IDE4Mzk2YmQyMTIzN2FlYzFiZGJmODIxYzBjNjg3ODRlYjc3YWJjNmQuLmU4NjhhNGNjNWJkZjE0 MDBjNmQ2ZWFhMTQ5Nzg4ZGY1NDhlYjRiMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC05OCwxNSArOTgsMTUgQEAgcHJvdGVjdGVkOgogICAgICAgICBW ZXJ0aWNhbEdlb21ldHJ5IG91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94JiwgVXNl ZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcykgY29uc3Q7CiAgICAgICAgIEhv cml6b250YWxHZW9tZXRyeSBvdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkoY29uc3QgQm94Jiwg VXNlZEhvcml6b250YWxWYWx1ZXMpOwogCi0gICAgICAgIEhlaWdodEFuZE1hcmdpbiBmbG9hdGlu Z0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkVmVydGljYWxWYWx1ZXMsIFVzZWRIb3Jp em9udGFsVmFsdWVzKSBjb25zdDsKKyAgICAgICAgSGVpZ2h0QW5kTWFyZ2luIGZsb2F0aW5nSGVp Z2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGlj YWxWYWx1ZXMpIGNvbnN0OwogICAgICAgICBXaWR0aEFuZE1hcmdpbiBmbG9hdGluZ1dpZHRoQW5k TWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIAotICAgICAgICBIZWln aHRBbmRNYXJnaW4gaW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiwgVXNl ZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKKyAgICAgICAgSGVpZ2h0QW5kTWFyZ2luIGlubGluZVJl cGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBV c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0OwogICAgICAgICBXaWR0aEFuZE1hcmdpbiBpbmxpbmVS ZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKSBj b25zdDsKIAogICAgICAgICBMYXlvdXRTaXplIGluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9mZnNl dChjb25zdCBCb3gmKSBjb25zdDsKIAotICAgICAgICBIZWlnaHRBbmRNYXJnaW4gY29tcGxpY2F0 ZWRDYXNlcyhjb25zdCBCb3gmLCBVc2VkVmVydGljYWxWYWx1ZXMsIFVzZWRIb3Jpem9udGFsVmFs dWVzKSBjb25zdDsKKyAgICAgICAgSGVpZ2h0QW5kTWFyZ2luIGNvbXBsaWNhdGVkQ2FzZXMoY29u c3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcykgY29uc3Q7 CiAgICAgICAgIExheW91dFVuaXQgc2hyaW5rVG9GaXRXaWR0aChjb25zdCBCb3gmLCBVc2VkSG9y aXpvbnRhbFZhbHVlcyk7CiAKICAgICAgICAgRWRnZXMgY29tcHV0ZWRCb3JkZXIoY29uc3QgQm94 JikgY29uc3Q7CkBAIC0xNDAsNyArMTQwLDcgQEAgcHJvdGVjdGVkOgogICAgICAgICBWZXJ0aWNh bEdlb21ldHJ5IG91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXRyeShjb25zdCBCb3gm LCBVc2VkSG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKICAgICAg ICAgSG9yaXpvbnRhbEdlb21ldHJ5IG91dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21l dHJ5KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIAotICAgICAgICBIZWlnaHRB bmRNYXJnaW4gZmxvYXRpbmdSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2Vk VmVydGljYWxWYWx1ZXMpIGNvbnN0OworICAgICAgICBIZWlnaHRBbmRNYXJnaW4gZmxvYXRpbmdS ZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcywg VXNlZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKICAgICAgICAgV2lkdGhBbmRNYXJnaW4gZmxvYXRp bmdSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVz KSBjb25zdDsKIAogICAgICAgICBXaWR0aEFuZE1hcmdpbiBmbG9hdGluZ05vblJlcGxhY2VkV2lk dGhBbmRNYXJnaW4oY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4 IDUyY2FkYWE4MzFjNjYwNjc4YjFkOTdmM2FmN2NiYmQ4N2ZiNTg2MGIuLjhkNzc4YmJkNDM3MmEw N2Q3NDkwNzYwNDc3NmQyYThhYzMxNGJhMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTU3MCw3ICs1NzAsNyBAQCBW ZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVw bGFjZWRWZXJ0aWNhbEdlb21ldHJ5KAogCiAgICAgYXV0byB0b3AgPSBjb21wdXRlZFZhbHVlSWZO b3RBdXRvKHN0eWxlLmxvZ2ljYWxUb3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogICAgIGF1 dG8gYm90dG9tID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsQm90dG9tKCks IGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKLSAgICBhdXRvIGhlaWdodCA9IGlubGluZVJlcGxhY2Vk SGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgdXNlZFZlcnRpY2FsVmFsdWVzKS5oZWlnaHQ7Cisg ICAgYXV0byBoZWlnaHQgPSBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gs IHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpLmhlaWdodDsKICAgICBh dXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1h cmdpbihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKICAgICBPcHRpb25hbDxMYXlv dXRVbml0PiB1c2VkTWFyZ2luQmVmb3JlID0gY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5iZWZvcmU7 CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdpbkFmdGVyID0gY29tcHV0ZWRWZXJ0 aWNhbE1hcmdpbi5hZnRlcjsKQEAgLTczNCw3ICs3MzQsNyBAQCBIb3Jpem9udGFsR2VvbWV0cnkg Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxH ZW9tZQogICAgIHJldHVybiB7ICpsZWZ0LCAqcmlnaHQsIHsgd2lkdGgsIHsgKnVzZWRNYXJnaW5T dGFydCwgKnVzZWRNYXJnaW5FbmQgfSwgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIH0gfTsKIH0K IAotSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0 ZWRDYXNlcyhjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZFZlcnRpY2FsVmFsdWVzIHVzZWRWYWx1 ZXMsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdAorSGVp Z2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNl cyhjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgdXNlZEhvcml6b250 YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0CiB7 CiAgICAgQVNTRVJUKCFsYXlvdXRCb3gucmVwbGFjZWQoKSk7CiAgICAgLy8gVE9ETzogVXNlIGNv bXBsaWNhdGVkLWNhc2UgZm9yIGRvY3VtZW50IHJlbmRlcmVyIGZvciBub3cgKHNlZSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKS4KQEAgLTc0 OSw3ICs3NDksNyBAQCBIZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 Ojpjb21wbGljYXRlZENhc2VzKGNvbnN0IEJveCYgbGF5b3V0QgogICAgIC8vIDEuIElmICdtYXJn aW4tdG9wJywgb3IgJ21hcmdpbi1ib3R0b20nIGFyZSAnYXV0bycsIHRoZWlyIHVzZWQgdmFsdWUg aXMgMC4KICAgICAvLyAyLiBJZiAnaGVpZ2h0JyBpcyAnYXV0bycsIHRoZSBoZWlnaHQgZGVwZW5k cyBvbiB0aGUgZWxlbWVudCdzIGRlc2NlbmRhbnRzIHBlciAxMC42LjcuCiAKLSAgICBhdXRvIGhl aWdodCA9IHVzZWRWYWx1ZXMuaGVpZ2h0ID8gdXNlZFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNv bXB1dGVkSGVpZ2h0VmFsdWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpOb3JtYWwpOworICAgIGF1 dG8gaGVpZ2h0ID0gdXNlZFZlcnRpY2FsVmFsdWVzLmhlaWdodCA/IHVzZWRWZXJ0aWNhbFZhbHVl cy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVkSGVpZ2h0VmFsdWUobGF5b3V0Qm94LCBIZWlnaHRU eXBlOjpOb3JtYWwpOwogICAgIGF1dG8gY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbiA9IEdlb21ldHJ5 Ojpjb21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMp OwogICAgIC8vICMxCiAgICAgYXV0byB1c2VkVmVydGljYWxNYXJnaW4gPSBVc2VkVmVydGljYWxN YXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyB7IGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3Jl LnZhbHVlT3IoMCksIGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigwKSB9OyAK QEAgLTc4NywxNCArNzg3LDE0IEBAIFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6ZmxvYXRpbmdOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvCiAgICAgcmV0dXJu IFdpZHRoQW5kTWFyZ2luIHsgKndpZHRoLCB1c2VkSG9yaXpvbnRhbGxNYXJnaW4sIGNvbXB1dGVk SG9yaXpvbnRhbE1hcmdpbiB9OwogfQogCi1IZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5OjpmbG9hdGluZ1JlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYg bGF5b3V0Qm94LCBVc2VkVmVydGljYWxWYWx1ZXMgdXNlZFZhbHVlcykgY29uc3QKK0hlaWdodEFu ZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nUmVwbGFjZWRIZWln aHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVz ZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVz KSBjb25zdAogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSAm JiBsYXlvdXRCb3gucmVwbGFjZWQoKSk7CiAKICAgICAvLyAxMC42LjIgSW5saW5lIHJlcGxhY2Vk IGVsZW1lbnRzLCBibG9jay1sZXZlbCByZXBsYWNlZCBlbGVtZW50cyBpbiBub3JtYWwgZmxvdywg J2lubGluZS1ibG9jaycKICAgICAvLyByZXBsYWNlZCBlbGVtZW50cyBpbiBub3JtYWwgZmxvdyBh bmQgZmxvYXRpbmcgcmVwbGFjZWQgZWxlbWVudHMKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0 dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0hlaWdodF1bTWFyZ2luXSAtPiBmbG9hdGlu ZyByZXBsYWNlZCAtPiByZWRpcmVjdGVkIHRvIGlubGluZSByZXBsYWNlZCIpOwotICAgIHJldHVy biBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwor ICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRI b3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOwogfQogCiBXaWR0aEFuZE1hcmdp biBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nUmVwbGFjZWRXaWR0aEFuZE1h cmdpbihjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgdXNlZFZhbHVl cykgY29uc3QKQEAgLTgzMCwxMyArODMwLDEzIEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShjb25zCiAg ICAgcmV0dXJuIG91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dEJveCwg dXNlZFZhbHVlcyk7CiB9CiAKLUhlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2Vk VmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1 c2VkSG9yaXpvbnRhbFZhbHVlcykgY29uc3QKK0hlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRp Y2FsVmFsdWVzIHVzZWRWZXJ0aWNhbFZhbHVlcykgY29uc3QKIHsKICAgICBBU1NFUlQobGF5b3V0 Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpOwogCiAgICAgaWYgKCFsYXlvdXRCb3gucmVwbGFj ZWQoKSkKLSAgICAgICAgcmV0dXJuIGNvbXBsaWNhdGVkQ2FzZXMobGF5b3V0Qm94LCB1c2VkVmVy dGljYWxWYWx1ZXMsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKLSAgICByZXR1cm4gZmxvYXRpbmdS ZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7Cisg ICAgICAgIHJldHVybiBjb21wbGljYXRlZENhc2VzKGxheW91dEJveCwgdXNlZEhvcml6b250YWxW YWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7CisgICAgcmV0dXJuIGZsb2F0aW5nUmVwbGFjZWRI ZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcywgdXNlZFZlcnRp Y2FsVmFsdWVzKTsKIH0KIAogV2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjpmbG9hdGluZ1dpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkSG9y aXpvbnRhbFZhbHVlcyB1c2VkVmFsdWVzKQpAQCAtODQ4LDkgKzg0OCwxMCBAQCBXaWR0aEFuZE1h cmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nV2lkdGhBbmRNYXJnaW4o Y29uc3QgQm94JiBsYQogICAgIHJldHVybiBmbG9hdGluZ1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4o bGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsKIH0KIAotSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94 JiBsYXlvdXRCb3gsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0 CitIZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBs YWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxW YWx1ZXMgdXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVydGlj YWxWYWx1ZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94 LmlzSW5GbG93KCkpICYmIGxheW91dEJveC5yZXBsYWNlZCgpKTsKKyAgICBBU1NFUlQodXNlZEhv cml6b250YWxWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogCiAgICAgLy8gMTAuNi4yIElu bGluZSByZXBsYWNlZCBlbGVtZW50cywgYmxvY2stbGV2ZWwgcmVwbGFjZWQgZWxlbWVudHMgaW4g bm9ybWFsIGZsb3csICdpbmxpbmUtYmxvY2snIHJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBm bG93IGFuZCBmbG9hdGluZyByZXBsYWNlZCBlbGVtZW50cwogICAgIC8vCkBAIC04NjQsOCArODY1 LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5l UmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oY29uc3QKIAogICAgIC8vICMxCiAgICAgYXV0byYgZm9y bWF0dGluZ0NvbnRleHQgPSB0aGlzLT5mb3JtYXR0aW5nQ29udGV4dCgpOwotICAgIGF1dG8gY29u dGFpbmluZ0Jsb2NrV2lkdGggPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveCgqbGF5 b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKTsKLSAgICBhdXRvIGNv bXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbihs YXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgY29udGFpbmluZ0Jsb2NrV2lkdGggfSk7 CisgICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVkVmVy dGljYWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAgICAgYXV0byB1 c2VkVmVydGljYWxNYXJnaW4gPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVl cyB7IGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3JlLnZhbHVlT3IoMCksIGNvbXB1dGVkVmVy dGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigwKSB9OwogICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0 Qm94LnN0eWxlKCk7CiAgICAgYXV0byByZXBsYWNlZCA9IGxheW91dEJveC5yZXBsYWNlZCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZDYzYmRmZDI2M2NmNzU3YTI5ZGVi NTEzN2RhMjEwNmFmN2JiNDE1Mi4uNzhjYTk0YTMyN2M3MGY4OWJkZWIzMTIzMjBjMWEyOWEyMDg3 YzBmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0zODQsMTMgKzM4NCwx NCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0aEFuZE1hcmdpbihj b25zdCBCb3gmIGxheW91dEJveCwgT3B0aW9uYQogCiB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7Ci0gICAg YXV0byBjb21wdXRlID0gWyZdKGF1dG8gdXNlZFZhbHVlcykgLT4gSGVpZ2h0QW5kTWFyZ2luIHsK KyAgICBhdXRvIGNvbXB1dGUgPSBbJl0oYXV0byB1c2VkVmVydGljYWxWYWx1ZXMpIC0+IEhlaWdo dEFuZE1hcmdpbiB7CiAKKyAgICAgICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9IFVzZWRI b3Jpem9udGFsVmFsdWVzIHsgZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxv Y2soKSkuY29udGVudEJveFdpZHRoKCkgfTsKICAgICAgICAgaWYgKGxheW91dEJveC5pc0luRmxv dygpKQotICAgICAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuaW5GbG93SGVpZ2h0QW5kTWFyZ2lu KGxheW91dEJveCwgdXNlZFZhbHVlcyk7CisgICAgICAgICAgICByZXR1cm4gZ2VvbWV0cnkoKS5p bkZsb3dIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcywgdXNl ZFZlcnRpY2FsVmFsdWVzKTsKIAogICAgICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3Np dGlvbmVkKCkpCi0gICAgICAgICAgICByZXR1cm4gZ2VvbWV0cnkoKS5mbG9hdGluZ0hlaWdodEFu ZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgZ2Vv bWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveFdpZHRo KCkgfSk7CisgICAgICAgICAgICByZXR1cm4gZ2VvbWV0cnkoKS5mbG9hdGluZ0hlaWdodEFuZE1h cmdpbihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMp OwogCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4geyB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAzYTBmZmVjNmFkNDkyNGMwNDA2YjYxYTM2 MGNmNzg2Y2RlYWM3MGRhLi4yZmQ1MjBkNmZiYTViOTM4ZmI2OGQzZGU5Zjk0YTkyMTNlNmEzNjkw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNzcsNyArNzcsNyBAQCBwcml2YXRl OgogICAgIHB1YmxpYzoKICAgICAgICAgR2VvbWV0cnkoY29uc3QgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dCYpOwogCi0gICAgICAgIEhlaWdodEFuZE1hcmdpbiBpbkZsb3dIZWlnaHRBbmRNYXJnaW4o Y29uc3QgQm94JiwgVXNlZFZlcnRpY2FsVmFsdWVzKTsKKyAgICAgICAgSGVpZ2h0QW5kTWFyZ2lu IGluRmxvd0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcywg VXNlZFZlcnRpY2FsVmFsdWVzKTsKICAgICAgICAgV2lkdGhBbmRNYXJnaW4gaW5GbG93V2lkdGhB bmRNYXJnaW4oY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpOwogCiAgICAgICAgIFBv aW50IHN0YXRpY1Bvc2l0aW9uKGNvbnN0IEJveCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGRmY2YxOWU5ZWNkNTBiNzFlYTY5ZjJk ZDg1ZmYxMmU5NWFmOThmZTEuLmQ2MDgxZjY2NGMxZjg1M2VjZmQ1ZGY3MTliMDU2NjcwNzkyZmZm MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAg LTI1MSwyOCArMjUxLDI4IEBAIFBvaW50IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpzdGF0aWNQb3NpdGlvbihjb25zdCBCb3gmIGxheW91dEJveCkgY29uCiAgICAgcmV0dXJuIHsg c3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGxheW91dEJveCksIHN0YXRpY1ZlcnRpY2FsUG9zaXRp b24obGF5b3V0Qm94KSB9OwogfQogCi1IZWlnaHRBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJv eCwgVXNlZFZlcnRpY2FsVmFsdWVzIHVzZWRWYWx1ZXMpCitIZWlnaHRBbmRNYXJnaW4gQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbihjb25zdCBC b3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgdXNlZEhvcml6b250YWxWYWx1ZXMs IFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVydGljYWxWYWx1ZXMpCiB7CiAgICAgQVNTRVJUKGxh eW91dEJveC5pc0luRmxvdygpKTsKIAogICAgIC8vIDEwLjYuMiBJbmxpbmUgcmVwbGFjZWQgZWxl bWVudHMsIGJsb2NrLWxldmVsIHJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93LCAnaW5s aW5lLWJsb2NrJwogICAgIC8vIHJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93IGFuZCBm bG9hdGluZyByZXBsYWNlZCBlbGVtZW50cwogICAgIGlmIChsYXlvdXRCb3gucmVwbGFjZWQoKSkK LSAgICAgICAgcmV0dXJuIGlubGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwg dXNlZFZhbHVlcyk7CisgICAgICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdp bihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOwog CiAgICAgSGVpZ2h0QW5kTWFyZ2luIGhlaWdodEFuZE1hcmdpbjsKICAgICAvLyBGSVhNRTogTGV0 J3Mgc3BlY2lhbCBjYXNlIHRoZSB0YWJsZSBoZWlnaHQgY29tcHV0YXRpb24gZm9yIG5vdyAtPiBm aWd1cmUgb3V0IHdoZXRoZXIgdGFibGVzIGZhbGwgaW50byB0aGUgImluRmxvd05vblJlcGxhY2Vk SGVpZ2h0QW5kTWFyZ2luIiBjYXRlZ29yeS4KICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVz VGFibGVGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAgICAgIGF1dG8gdXNlZEhvcml6b250YWxW YWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0 cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveFdpZHRoKCkg fTsKLSAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gY29tcGxpY2F0ZWRDYXNlcyhsYXlvdXRCb3gs IHVzZWRWYWx1ZXMsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKKyAgICAgICAgaGVpZ2h0QW5kTWFy Z2luID0gY29tcGxpY2F0ZWRDYXNlcyhsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1 c2VkVmVydGljYWxWYWx1ZXMpOwogICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmlzT3ZlcmZsb3dW aXNpYmxlKCkgJiYgIWxheW91dEJveC5pc0RvY3VtZW50Qm94KCkpIHsKICAgICAgICAgLy8gVE9E TzogRmlndXJlIG91dCB0aGUgY2FzZSBmb3IgdGhlIGRvY3VtZW50IGVsZW1lbnQuIExldCdzIGp1 c3QgY29tcGxpY2F0ZWQtY2FzZSBpdCBmb3Igbm93LgotICAgICAgICBoZWlnaHRBbmRNYXJnaW4g PSBpbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMp OworICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBpbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1h cmdpbihsYXlvdXRCb3gsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7CiAgICAgfSBlbHNlIHsKICAgICAg ICAgLy8gMTAuNi42IENvbXBsaWNhdGVkIGNhc2VzCiAgICAgICAgIC8vIEJsb2NrLWxldmVsLCBu b24tcmVwbGFjZWQgZWxlbWVudHMgaW4gbm9ybWFsIGZsb3cgd2hlbiAnb3ZlcmZsb3cnIGRvZXMg bm90IGNvbXB1dGUgdG8gJ3Zpc2libGUnIChleGNlcHQgaWYgdGhlICdvdmVyZmxvdycgcHJvcGVy dHkncyB2YWx1ZSBoYXMgYmVlbiBwcm9wYWdhdGVkIHRvIHRoZSB2aWV3cG9ydCkuCiAgICAgICAg IGF1dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGZvcm1h dHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2so KSkuY29udGVudEJveFdpZHRoKCkgfTsKLSAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gY29tcGxp Y2F0ZWRDYXNlcyhsYXlvdXRCb3gsIHVzZWRWYWx1ZXMsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsK KyAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gY29tcGxpY2F0ZWRDYXNlcyhsYXlvdXRCb3gsIHVz ZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOwogICAgIH0KIAogICAgIGF1 dG8gcXVpcmtzID0gZm9ybWF0dGluZ0NvbnRleHQoKS5xdWlya3MoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBmOWJhOTdmY2Y4YTgxMDE4ZDA1ZDc4MmJmNTE0MDBi YTc0ZjMzNmMwLi41NTM5NDg2OWZjYjI1YTBkODdmYTc1MmI2MzQyN2IxNWFlNDc4NjMwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0yMTEsMTIgKzIxMSwxMyBAQCB2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3Qg Qm94JiBsYXlvdXRCb3gsIFVzZWRIbwogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBIZWlnaHRB bmRNYXJnaW4gaGVpZ2h0QW5kTWFyZ2luOworICAgIGF1dG8gdXNlZEhvcml6b250YWxWYWx1ZXMg PSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGdlb21ldHJ5Rm9yQm94KCpsYXlvdXRCb3guY29udGFp bmluZ0Jsb2NrKCkpLmNvbnRlbnRCb3hXaWR0aCgpIH07CiAgICAgaWYgKGxheW91dEJveC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpKQotICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBnZW9tZXRyeSgp LmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgeyB9LCBVc2VkSG9yaXpvbnRhbFZh bHVlcyB7IGdlb21ldHJ5Rm9yQm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmNvbnRl bnRCb3hXaWR0aCgpIH0pOworICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBnZW9tZXRyeSgpLmZs b2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHsg fSk7CiAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzSW5saW5lQmxvY2tCb3goKSkKLSAgICAgICAg aGVpZ2h0QW5kTWFyZ2luID0gZ2VvbWV0cnkoKS5pbmxpbmVCbG9ja0hlaWdodEFuZE1hcmdpbihs YXlvdXRCb3gpOworICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBnZW9tZXRyeSgpLmlubGluZUJs b2NrSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOwogICAg IGVsc2UgaWYgKGxheW91dEJveC5yZXBsYWNlZCgpKQotICAgICAgICBoZWlnaHRBbmRNYXJnaW4g PSBnZW9tZXRyeSgpLmlubGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgeyB9 KTsKKyAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gZ2VvbWV0cnkoKS5pbmxpbmVSZXBsYWNlZEhl aWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB7IH0pOwogICAg IGVsc2UKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5oCmluZGV4IGYwNTRiZWJmZmE1ODM5Y2IzNjg5ZTUxYTVjMDUwNmQ0NzBjYmVl M2IuLjQ2NTc0OGI1MWE5YTFmYWFiYTA4MWYzMzRiMDAzYmE2MTVlYjU3ZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtODYsNyArODYsNyBAQCBwcml2YXRlOgogICAgIHB1 YmxpYzoKICAgICAgICAgR2VvbWV0cnkoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmKTsK IAotICAgICAgICBIZWlnaHRBbmRNYXJnaW4gaW5saW5lQmxvY2tIZWlnaHRBbmRNYXJnaW4oY29u c3QgQm94JikgY29uc3Q7CisgICAgICAgIEhlaWdodEFuZE1hcmdpbiBpbmxpbmVCbG9ja0hlaWdo dEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcykgY29uc3Q7CiAgICAg ICAgIFdpZHRoQW5kTWFyZ2luIGlubGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94Jiwg VXNlZEhvcml6b250YWxWYWx1ZXMpOwogCiAgICAgcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggMjFmZWUyM2M1MWE1YzBhMDBj ZDQ5ODRlYTg1Y2U3ZWM1MWE4Y2UxZi4uZjA4YjA3YTJlZWZlNGRjZmFhOTJlZjk3ZGM0YjkyZmQ3 MGM4MDc1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKQEAgLTYzLDE4ICs2MywxNyBAQCBXaWR0aEFuZE1hcmdpbiBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OmlubGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29ucwogICAgIHJl dHVybiBXaWR0aEFuZE1hcmdpbiB7ICp3aWR0aCwgeyBjb21wdXRlZEhvcml6b250YWxNYXJnaW4u c3RhcnQudmFsdWVPcigwX2x1KSwgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLmVuZC52YWx1ZU9y KDBfbHUpIH0sIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiB9OwogfQogCi1IZWlnaHRBbmRNYXJn aW4gSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVCbG9ja0hlaWdodEFu ZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKK0hlaWdodEFuZE1hcmdpbiBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZUJsb2NrSGVpZ2h0QW5kTWFyZ2lu KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpvbnRh bFZhbHVlcykgY29uc3QKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkpOwogCiAg ICAgLy8gMTAuNi4yIElubGluZSByZXBsYWNlZCBlbGVtZW50cywgYmxvY2stbGV2ZWwgcmVwbGFj ZWQgZWxlbWVudHMgaW4gbm9ybWFsIGZsb3csICdpbmxpbmUtYmxvY2snIHJlcGxhY2VkIGVsZW1l bnRzIGluIG5vcm1hbCBmbG93IGFuZCBmbG9hdGluZyByZXBsYWNlZCBlbGVtZW50cwogICAgIGlm IChsYXlvdXRCb3gucmVwbGFjZWQoKSkKLSAgICAgICAgcmV0dXJuIGlubGluZVJlcGxhY2VkSGVp Z2h0QW5kTWFyZ2luKGxheW91dEJveCwgeyB9KTsKKyAgICAgICAgcmV0dXJuIGlubGluZVJlcGxh Y2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHsgfSk7 CiAKICAgICAvLyAxMC42LjYgQ29tcGxpY2F0ZWQgY2FzZXMKICAgICAvLyAtICdJbmxpbmUtYmxv Y2snLCBub24tcmVwbGFjZWQgZWxlbWVudHMuCi0gICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVl cyA9IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZv ckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9Owot ICAgIHJldHVybiBjb21wbGljYXRlZENhc2VzKGxheW91dEJveCwgeyB9LCB1c2VkSG9yaXpvbnRh bFZhbHVlcyk7CisgICAgcmV0dXJuIGNvbXBsaWNhdGVkQ2FzZXMobGF5b3V0Qm94LCB1c2VkSG9y aXpvbnRhbFZhbHVlcywgeyB9KTsKIH0KIAogfQo=