187129 2018-06-27 19:37:10 -0700 [LFC] Compute both the collapsed and the non-collapsed margins values. 2018-06-27 20:06:37 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1437231 0 zalan 2018-06-27 19:37:10 -0700 Only for validating purposes only at this point. 1437237 1 343784 zalan 2018-06-27 19:59:29 -0700 Created attachment 343784 Patch 1437238 2 zalan 2018-06-27 20:05:25 -0700 Committed r233298: <https://trac.webkit.org/changeset/233298> 1437239 3 webkit-bug-importer 2018-06-27 20:06:37 -0700 <rdar://problem/41559493> 343784 2018-06-27 19:59:29 -0700 2018-06-27 20:02:03 -0700 Patch bug-187129-20180627195928.patch text/plain 16944 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM0MmU0MmI3YWJiNjUx MmY4MzFjYzk2YTk0YjFmYTA0NDk4ZjRhYS4uOGU2MWViY2FiNjQ1MGU3MTkwZDE5ODJhMmEzM2Rm ZDg4ZjFjM2JmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTA2LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQ29tcHV0ZSBib3Ro IHRoZSBjb2xsYXBzZWQgYW5kIHRoZSBub24tY29sbGFwc2VkIG1hcmdpbiB2YWx1ZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODcxMjkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgdmFsaWRhdGlv biBwdXJwb3NlcyBvbmx5IGF0IHRoaXMgcG9pbnQuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dWZXJ0aWNh bEdlb21ldHJ5IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoK KyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93 Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2Vv bWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZVJlcGxhY2Vk SGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW5GbG93SGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAg ICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbik6CisgICAgICAg ICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6aXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29s bGFwc2U6OmNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdp blRvcCk6CisKIDIwMTgtMDYtMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXSBBbGlnbiBpbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbigpIHN0 eWxlIHdpdGggdGhlIHJlc3Qgb2YgdGhlIGNvbXB1dGUgZnVuY3Rpb25zLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggN2M1OGI2NjkyMTliMjEyM2U1 ODJjNmJhZWViMDBmNjc5ZDJhNzQ3Zi4uMDhmMzVkOTc0Yjk3YmE1YjhiYzQxMzU4YzZhNWNmM2Uw N2Y3NmFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3Bw CkBAIC01NSw3ICs1NSw3IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVGbG9hdGlu Z0hlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250CiB7CiAgICAgYXV0byBo ZWlnaHRBbmRNYXJnaW4gPSBHZW9tZXRyeTo6ZmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4obGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KTsKICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQo aGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7Ci0gICAgZGlzcGxheUJveC5tb3ZlVmVydGljYWxseSho ZWlnaHRBbmRNYXJnaW4ubWFyZ2luLnRvcCk7CisgICAgZGlzcGxheUJveC5tb3ZlVmVydGljYWxs eShoZWlnaHRBbmRNYXJnaW4uY29sbGFwc2VkTWFyZ2luLnZhbHVlX29yKGhlaWdodEFuZE1hcmdp bi5tYXJnaW4pLnRvcCk7CiAgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRB bmRNYXJnaW4ubWFyZ2luKTsKIH0KIApAQCAtNzksNyArNzksOCBAQCB2b2lkIEZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBs YXlvdXRDbwogewogICAgIGF1dG8gdmVydGljYWxHZW9tZXRyeSA9IEdlb21ldHJ5OjpvdXRPZkZs b3dWZXJ0aWNhbEdlb21ldHJ5KGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiAgICAgZGlzcGxh eUJveC5zZXRUb3AodmVydGljYWxHZW9tZXRyeS50b3ApOwotICAgIGRpc3BsYXlCb3guc2V0Q29u dGVudEJveEhlaWdodCh2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1hcmdpbi5oZWlnaHQpOwor ICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodCh2ZXJ0aWNhbEdlb21ldHJ5LmJvdHRv bSAtIHZlcnRpY2FsR2VvbWV0cnkudG9wKTsKKyAgICBBU1NFUlQoIXZlcnRpY2FsR2VvbWV0cnku aGVpZ2h0QW5kTWFyZ2luLmNvbGxhcHNlZE1hcmdpbik7CiAgICAgZGlzcGxheUJveC5zZXRWZXJ0 aWNhbE1hcmdpbih2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGVhMTdjN2Ji MWI4MmU5YzA5ZjdhNzIxOGY0ZGM0YmY1MzlmZjI2NWMuLjA1YjgyODg3MGJiMWY2YTY0OTY1N2M0 Y2FiZmE3MjFlMDVmZDJkOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5oCkBAIC05Niw2ICs5Niw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgc3RydWN0IEhlaWdo dEFuZE1hcmdpbiB7CiAgICAgICAgICAgICBMYXlvdXRVbml0IGhlaWdodDsKICAgICAgICAgICAg IERpc3BsYXk6OkJveDo6VmVydGljYWxFZGdlcyBtYXJnaW47CisgICAgICAgICAgICBzdGQ6Om9w dGlvbmFsPERpc3BsYXk6OkJveDo6VmVydGljYWxFZGdlcz4gY29sbGFwc2VkTWFyZ2luOwogICAg ICAgICB9OwogCiAgICAgICAgICBzdHJ1Y3QgSG9yaXpvbnRhbEdlb21ldHJ5IHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRl eCAyNDY2ZjJkZWM5ZjU0ZTI2NWU1NDhlODRhNGU5ZjI3NjU2MDU3ZWU5Li5jNjJiMjMzOTUwOTc2 NTMwZDBkYzc5MDY2ZTE3ZGMyYmNhY2UxNjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yMjcsNyArMjI3LDcgQEAg Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6b3V0T2YKICAgICBBU1NFUlQobWFyZ2luQm90dG9tKTsKIAogICAg IExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbUG9z aXRpb25dW0hlaWdodF1bTWFyZ2luXSAtPiBvdXQtb2YtZmxvdyBub24tcmVwbGFjZWQgLT4gdG9w KCIgPDwgKnRvcCA8PCAicHgpIGJvdHRvbSgiICA8PCAqYm90dG9tIDw8ICJweCkgaGVpZ2h0KCIg PDwgKmhlaWdodCA8PCAicHgpIG1hcmdpbigiIDw8ICptYXJnaW5Ub3AgPDwgInB4LCAiICA8PCAq bWFyZ2luQm90dG9tIDw8ICJweCkgbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwot ICAgIHJldHVybiB7ICp0b3AsICpib3R0b20sIHsgKmhlaWdodCwgeyAqbWFyZ2luVG9wLCAqbWFy Z2luQm90dG9tIH0gfSB9OworICAgIHJldHVybiB7ICp0b3AsICpib3R0b20sIHsgKmhlaWdodCwg eyAqbWFyZ2luVG9wLCAqbWFyZ2luQm90dG9tIH0sIHsgfSB9IH07CiB9CiAKIEZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6SG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29u dGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCkBAIC00NDAsNyArNDQw LDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNhbEdlb21ldHJ5IEZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2YKICAgICAgICAgYm90dG9tID0gY29udGFpbmlu Z0Jsb2NrSGVpZ2h0IC0gKCp0b3AgKyAqbWFyZ2luVG9wICsgYm9yZGVyVG9wICsgcGFkZGluZ1Rv cCArIGhlaWdodCArIHBhZGRpbmdCb3R0b20gKyBib3JkZXJCb3R0b20gKyAqbWFyZ2luQm90dG9t KTsgCiAKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVh bSA8PCAiW1Bvc2l0aW9uXVtIZWlnaHRdW01hcmdpbl0gLT4gb3V0LW9mLWZsb3cgcmVwbGFjZWQg LT4gdG9wKCIgPDwgKnRvcCA8PCAicHgpIGJvdHRvbSgiICA8PCAqYm90dG9tIDw8ICJweCkgaGVp Z2h0KCIgPDwgaGVpZ2h0IDw8ICJweCkgbWFyZ2luKCIgPDwgKm1hcmdpblRvcCA8PCAicHgsICIg IDw8ICptYXJnaW5Cb3R0b20gPDwgInB4KSBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIp Iik7Ci0gICAgcmV0dXJuIHsgKnRvcCwgKmJvdHRvbSwgeyBoZWlnaHQsIHsgKm1hcmdpblRvcCwg Km1hcmdpbkJvdHRvbSB9IH0gfTsKKyAgICByZXR1cm4geyAqdG9wLCAqYm90dG9tLCB7IGhlaWdo dCwgeyAqbWFyZ2luVG9wLCAqbWFyZ2luQm90dG9tIH0sIHsgfSB9IH07CiB9CiAKIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6SG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29u dGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCkBAIC01NzAsNyArNTcw LDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJnaW4gRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGkKICAgICAgICAgaGVpZ2h0ID0gY29udGVudEhl aWdodEZvckZvcm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwog CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwg IltIZWlnaHRdW01hcmdpbl0gLT4gZmxvYXRpbmcgbm9uLXJlcGxhY2VkIC0+IGhlaWdodCgiIDw8 ICpoZWlnaHQgPDwgInB4KSBtYXJnaW4oIiA8PCAqbWFyZ2luVG9wIDw8ICJweCwgIiA8PCAqbWFy Z2luQm90dG9tIDw8ICJweCkgLT4gbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwot ICAgIHJldHVybiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkhlaWdodEFuZE1hcmdpbiB7 ICpoZWlnaHQsIHsgKm1hcmdpblRvcCwgKm1hcmdpbkJvdHRvbSB9IH07CisgICAgcmV0dXJuIEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIHsgKmhlaWdodCwgeyAq bWFyZ2luVG9wLCAqbWFyZ2luQm90dG9tIH0sIHsgfSB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 ZmxvYXRpbmdOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQpAQCAtNjk5LDcgKzY5OSw3IEBAIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6aW5saW5lCiAgICAgQVNTRVJUKGhlaWdodCk7CiAKICAgICBMT0dfV0lUSF9TVFJF QU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0hlaWdodF1bTWFyZ2luXSAt PiBpbmZsb3cgcmVwbGFjZWQgLT4gaGVpZ2h0KCIgPDwgKmhlaWdodCA8PCAicHgpIG1hcmdpbigi IDw8IG1hcmdpbi50b3AgPDwgInB4LCAiIDw8IG1hcmdpbi5ib3R0b20gPDwgInB4KSAtPiBsYXlv dXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7Ci0gICAgcmV0dXJuIHsgKmhlaWdodCwgbWFy Z2luIH07CisgICAgcmV0dXJuIHsgKmhlaWdodCwgbWFyZ2luLCB7IH0gfTsKIH0KIAogRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpXaWR0aEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5 b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcAppbmRleCAxZDM0MmJiY2YyMmZlZTMxYTJmZDM1NDBiMWIxODQ3NmEyOWQ2ZWE5Li40 MzU3NzM1Y2I5ODMxZTllZmU1MWFmMjQ0MDUzYmEzMDA3YzU1YTlmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTE5Miw3ICsxOTIsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5 b3V0QwogewogICAgIGF1dG8gaGVpZ2h0QW5kTWFyZ2luID0gR2VvbWV0cnk6OmluRmxvd0hlaWdo dEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogICAgIGRpc3BsYXlCb3guc2V0 Q29udGVudEJveEhlaWdodChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKLSAgICBkaXNwbGF5Qm94 Lm1vdmVWZXJ0aWNhbGx5KGhlaWdodEFuZE1hcmdpbi5tYXJnaW4udG9wKTsKKyAgICBkaXNwbGF5 Qm94Lm1vdmVWZXJ0aWNhbGx5KGhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJnaW4udmFsdWVf b3IoaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbikudG9wKTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRp Y2FsTWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggZDI3YmRmY2NlY2FjNjFhM2RkNTQ0 NTBkMzk1NmI2MDA1YmYxZDBjYy4uN2VkZDJjZGIxMDQxZGFjZmI5NTQwODJhMTAyZmM3ZTA0NGQz NjdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApA QCAtNzksMjAgKzc5LDIxIEBAIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5k TWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppCiAgICAgICAgIGF1dG8g Y29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRC b3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPmNvbnRlbnRCb3hXaWR0aCgpOwogICAg ICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91 dEJveChsYXlvdXRCb3gpOwogCi0gICAgICAgIGF1dG8gbWFyZ2luVG9wID0gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpblRvcCgp LCBjb250YWluaW5nQmxvY2tXaWR0aCkudmFsdWVfb3IoMCk7Ci0gICAgICAgIGF1dG8gbWFyZ2lu Qm90dG9tID0gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RB dXRvKHN0eWxlLm1hcmdpbkJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCkudmFsdWVfb3Io MCk7CisgICAgICAgIERpc3BsYXk6OkJveDo6VmVydGljYWxFZGdlcyBub25Db2xsYXBzZWRNYXJn aW4gPSB7IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRWYWx1ZUlmTm90QXV0 byhzdHlsZS5tYXJnaW5Ub3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpLnZhbHVlX29yKDApLAor ICAgICAgICAgICAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZO b3RBdXRvKHN0eWxlLm1hcmdpbkJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCkudmFsdWVf b3IoMCkgfTsgCisgICAgICAgIERpc3BsYXk6OkJveDo6VmVydGljYWxFZGdlcyBjb2xsYXBzZWRN YXJnaW4gPSB7IE1hcmdpbkNvbGxhcHNlOjptYXJnaW5Ub3AobGF5b3V0Q29udGV4dCwgbGF5b3V0 Qm94KSwgTWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJvdHRvbShsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpIH07CiAgICAgICAgIGF1dG8gYm9yZGVyQW5kUGFkZGluZ1RvcCA9IGRpc3BsYXlCb3guYm9y ZGVyVG9wKCkgKyBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKTsKICAgICAgICAgCiAgICAgICAgIGlm ICghc3R5bGUubG9naWNhbEhlaWdodCgpLmlzQXV0bygpKQotICAgICAgICAgICAgcmV0dXJuIHsg c3R5bGUubG9naWNhbEhlaWdodCgpLnZhbHVlKCksIHsgbWFyZ2luVG9wLCBtYXJnaW5Cb3R0b20g fSB9OworICAgICAgICAgICAgcmV0dXJuIHsgc3R5bGUubG9naWNhbEhlaWdodCgpLnZhbHVlKCks IG5vbkNvbGxhcHNlZE1hcmdpbiwgY29sbGFwc2VkTWFyZ2luIH07CiAKICAgICAgICAgaWYgKCFp czxDb250YWluZXI+KGxheW91dEJveCkgfHwgIWRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94 KS5oYXNJbkZsb3dDaGlsZCgpKQotICAgICAgICAgICAgcmV0dXJuIHsgMCwgeyBtYXJnaW5Ub3As IG1hcmdpbkJvdHRvbSB9IH07CisgICAgICAgICAgICByZXR1cm4geyAwLCBub25Db2xsYXBzZWRN YXJnaW4sIGNvbGxhcHNlZE1hcmdpbiB9OwogCiAgICAgICAgIC8vIDEuIHRoZSBib3R0b20gZWRn ZSBvZiB0aGUgbGFzdCBsaW5lIGJveCwgaWYgdGhlIGJveCBlc3RhYmxpc2hlcyBhIGlubGluZSBm b3JtYXR0aW5nIGNvbnRleHQgd2l0aCBvbmUgb3IgbW9yZSBsaW5lcwogICAgICAgICBpZiAobGF5 b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAg ICAgLy8gaGVpZ2h0ID0gbGFzdExpbmVCb3goKS5ib3R0b20oKTsKLSAgICAgICAgICAgIHJldHVy biB7IDAsIHsgbWFyZ2luVG9wLCBtYXJnaW5Cb3R0b20gfSB9OworICAgICAgICAgICAgcmV0dXJu IHsgMCwgbm9uQ29sbGFwc2VkTWFyZ2luLCBjb2xsYXBzZWRNYXJnaW4gfTsKICAgICAgICAgfQog CiAgICAgICAgIC8vIDIuIHRoZSBib3R0b20gZWRnZSBvZiB0aGUgYm90dG9tIChwb3NzaWJseSBj b2xsYXBzZWQpIG1hcmdpbiBvZiBpdHMgbGFzdCBpbi1mbG93IGNoaWxkLCBpZiB0aGUgY2hpbGQn cyBib3R0b20gbWFyZ2luLi4uCkBAIC0xMDEsNyArMTAyLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OmkKICAgICAgICAgaWYgKCFNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBz ZWRXaXRoUGFyZW50KCpsYXN0SW5GbG93Q2hpbGQpKSB7CiAgICAgICAgICAgICBhdXRvKiBsYXN0 SW5GbG93RGlzcGxheUJveCA9IGxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgq bGFzdEluRmxvd0NoaWxkKTsKICAgICAgICAgICAgIEFTU0VSVChsYXN0SW5GbG93RGlzcGxheUJv eCk7Ci0gICAgICAgICAgICByZXR1cm4geyBsYXN0SW5GbG93RGlzcGxheUJveC0+Ym90dG9tKCkg KyBsYXN0SW5GbG93RGlzcGxheUJveC0+bWFyZ2luQm90dG9tKCkgLSBib3JkZXJBbmRQYWRkaW5n VG9wLCB7IG1hcmdpblRvcCwgbWFyZ2luQm90dG9tIH0gfTsKKyAgICAgICAgICAgIHJldHVybiB7 IGxhc3RJbkZsb3dEaXNwbGF5Qm94LT5ib3R0b20oKSArIGxhc3RJbkZsb3dEaXNwbGF5Qm94LT5t YXJnaW5Cb3R0b20oKSAtIGJvcmRlckFuZFBhZGRpbmdUb3AsIG5vbkNvbGxhcHNlZE1hcmdpbiwg Y29sbGFwc2VkTWFyZ2luIH07CiAgICAgICAgIH0KIAogICAgICAgICAvLyAzLiB0aGUgYm90dG9t IGJvcmRlciBlZGdlIG9mIHRoZSBsYXN0IGluLWZsb3cgY2hpbGQgd2hvc2UgdG9wIG1hcmdpbiBk b2Vzbid0IGNvbGxhcHNlIHdpdGggdGhlIGVsZW1lbnQncyBib3R0b20gbWFyZ2luCkBAIC0xMTEs MjkgKzExMiwyNyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkhlaWdodEFuZE1hcmdp biBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aQogICAgICAgICBpZiAoaW5GbG93 Q2hpbGQpIHsKICAgICAgICAgICAgIGF1dG8qIGluRmxvd0Rpc3BsYXlCb3ggPSBsYXlvdXRDb250 ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKmluRmxvd0NoaWxkKTsKICAgICAgICAgICAgIEFT U0VSVChpbkZsb3dEaXNwbGF5Qm94KTsKLSAgICAgICAgICAgIHJldHVybiB7IGluRmxvd0Rpc3Bs YXlCb3gtPnRvcCgpICsgaW5GbG93RGlzcGxheUJveC0+Ym9yZGVyQm94KCkuaGVpZ2h0KCkgLSBi b3JkZXJBbmRQYWRkaW5nVG9wLCB7IG1hcmdpblRvcCwgbWFyZ2luQm90dG9tIH0gfTsKKyAgICAg ICAgICAgIHJldHVybiB7IGluRmxvd0Rpc3BsYXlCb3gtPnRvcCgpICsgaW5GbG93RGlzcGxheUJv eC0+Ym9yZGVyQm94KCkuaGVpZ2h0KCkgLSBib3JkZXJBbmRQYWRkaW5nVG9wLCBub25Db2xsYXBz ZWRNYXJnaW4sIGNvbGxhcHNlZE1hcmdpbiB9OwogICAgICAgICB9CiAKICAgICAgICAgLy8gNC4g emVybywgb3RoZXJ3aXNlCi0gICAgICAgIHJldHVybiB7IDAsIHsgbWFyZ2luVG9wLCBtYXJnaW5C b3R0b20gfSB9OworICAgICAgICByZXR1cm4geyAwLCBub25Db2xsYXBzZWRNYXJnaW4sIGNvbGxh cHNlZE1hcmdpbiB9OwogICAgIH07CiAKICAgICBhdXRvIGhlaWdodEFuZE1hcmdpbiA9IGNvbXB1 dGUoKTsKLSAgICBhdXRvIGNvbGxhcHNlZE1hcmdpblRvcCA9IE1hcmdpbkNvbGxhcHNlOjptYXJn aW5Ub3AobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKLSAgICBhdXRvIGNvbGxhcHNlZE1hcmdp bkJvdHRvbSA9ICBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQm90dG9tKGxheW91dENvbnRleHQsIGxh eW91dEJveCk7CiAKICAgICBpZiAoIWlzU3RyZXRjaGVkVG9WaWV3cG9ydChsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpKSB7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4 dExheW91dCwgc3RyZWFtIDw8ICJbSGVpZ2h0XVtNYXJnaW5dIC0+IGluZmxvdyBub24tcmVwbGFj ZWQgLT4gaGVpZ2h0KCIgPDwgaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCA8PCAicHgpIG1hcmdpbigi IDw8IGNvbGxhcHNlZE1hcmdpblRvcCA8PCAicHgsICIgPDwgY29sbGFwc2VkTWFyZ2luQm90dG9t IDw8ICJweCkgLT4gbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwotICAgICAgICBy ZXR1cm4geyBoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0LCB7IGNvbGxhcHNlZE1hcmdpblRvcCwgY29s bGFwc2VkTWFyZ2luQm90dG9tIH0gfTsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRp bmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltIZWlnaHRdW01hcmdpbl0gLT4gaW5mbG93IG5v bi1yZXBsYWNlZCAtPiBoZWlnaHQoIiA8PCBoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0IDw8ICJweCkg bWFyZ2luKCIgPDwgaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi50b3AgPDwgInB4LCAiIDw8IGhlaWdo dEFuZE1hcmdpbi5tYXJnaW4uYm90dG9tIDw8ICJweCkgLT4gbGF5b3V0Qm94KCIgPDwgJmxheW91 dEJveCA8PCAiKSIpOworICAgICAgICByZXR1cm4gaGVpZ2h0QW5kTWFyZ2luOwogICAgIH0KIAog ICAgIGF1dG8gaW5pdGlhbENvbnRhaW5pbmdCbG9ja0hlaWdodCA9IGxheW91dENvbnRleHQuZGlz cGxheUJveEZvckxheW91dEJveChpbml0aWFsQ29udGFpbmluZ0Jsb2NrKGxheW91dEJveCkpLT5j b250ZW50Qm94SGVpZ2h0KCk7CiAgICAgLy8gU3RyZXRjaCBidXQgbmV2ZXIgb3ZlcnN0cmV0Y2gg d2l0aCB0aGUgbWFyZ2lucy4KLSAgICBpZiAoaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCArIGNvbGxh cHNlZE1hcmdpblRvcCArIGNvbGxhcHNlZE1hcmdpbkJvdHRvbSA8IGluaXRpYWxDb250YWluaW5n QmxvY2tIZWlnaHQpCi0gICAgICAgIGhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPSBpbml0aWFsQ29u dGFpbmluZ0Jsb2NrSGVpZ2h0IC0gY29sbGFwc2VkTWFyZ2luVG9wIC0gY29sbGFwc2VkTWFyZ2lu Qm90dG9tOworICAgIGlmIChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0ICsgaGVpZ2h0QW5kTWFyZ2lu Lm1hcmdpbi50b3AgKyBoZWlnaHRBbmRNYXJnaW4ubWFyZ2luLmJvdHRvbSA8IGluaXRpYWxDb250 YWluaW5nQmxvY2tIZWlnaHQpCisgICAgICAgIGhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPSBpbml0 aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi50b3AgLSBo ZWlnaHRBbmRNYXJnaW4ubWFyZ2luLmJvdHRvbTsKIAotICAgIExPR19XSVRIX1NUUkVBTShGb3Jt YXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbSGVpZ2h0XVtNYXJnaW5dIC0+IGluZmxv dyBub24tcmVwbGFjZWQgLT4gc3RyZWNoZWQgdG8gdmlld3BvcnQgLT4gaGVpZ2h0KCIgPDwgaGVp Z2h0QW5kTWFyZ2luLmhlaWdodCA8PCAicHgpIG1hcmdpbigiIDw8IGNvbGxhcHNlZE1hcmdpblRv cCA8PCAicHgsICIgPDwgY29sbGFwc2VkTWFyZ2luQm90dG9tIDw8ICJweCkgLT4gbGF5b3V0Qm94 KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwotICAgIHJldHVybiB7IGhlaWdodEFuZE1hcmdpbi5o ZWlnaHQsIHsgY29sbGFwc2VkTWFyZ2luVG9wLCBjb2xsYXBzZWRNYXJnaW5Cb3R0b20gfSB9Owor ICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJb SGVpZ2h0XVtNYXJnaW5dIC0+IGluZmxvdyBub24tcmVwbGFjZWQgLT4gc3RyZWNoZWQgdG8gdmll d3BvcnQgLT4gaGVpZ2h0KCIgPDwgaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCA8PCAicHgpIG1hcmdp bigiIDw8IGhlaWdodEFuZE1hcmdpbi5tYXJnaW4udG9wIDw8ICJweCwgIiA8PCBoZWlnaHRBbmRN YXJnaW4ubWFyZ2luLmJvdHRvbSA8PCAicHgpIC0+IGxheW91dEJveCgiIDw8ICZsYXlvdXRCb3gg PDwgIikiKTsKKyAgICByZXR1cm4gaGVpZ2h0QW5kTWFyZ2luOwogfQogCiBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmIGxh eW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5j cHAKaW5kZXggNDJhOWViOGUzNDA0YjdiNzBkYTZmZWVmMTVhODNhYTAwMTA5YzRhMS4uZWE2Y2Fh ODdlNzU2NTNjMDQyZThhNTUyNmQ2NTkxMTY4YTZiNTYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFw c2UuY3BwCkBAIC03OCw3ICs3OCw3IEBAIHN0YXRpYyBib29sIGlzTWFyZ2luQm90dG9tQ29sbGFw c2VkV2l0aFNpYmxpbmcoY29uc3QgQm94JiBsYXlvdXRCb3gpCiAgICAgcmV0dXJuIGxheW91dEJv eC5zdHlsZSgpLmJvdHRvbSgpLmlzQXV0bygpOwogfQogCi1zdGF0aWMgYm9vbCBpc01hcmdpblRv cENvbGxhcHNlZFdpdGhQYXJlbnQoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IERpc3BsYXk6 OkJveCYgZGlzcGxheUJveCkKK3N0YXRpYyBib29sIGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBh cmVudChjb25zdCBMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91 dEJveCkKIHsKICAgICAvLyBUaGUgZmlyc3QgaW5mbG93IGNoaWxkIGNvdWxkIHByb3BhZ2F0ZSBp dHMgdG9wIG1hcmdpbiB0byBwYXJlbnQuCiAgICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL0NT UzIxL2JveC5odG1sI2NvbGxhcHNpbmctbWFyZ2lucwpAQCAtOTksMTMgKzk5LDE0IEBAIHN0YXRp YyBib29sIGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVudChjb25zdCBCb3gmIGxheW91dEJv eCwgY29uc3QgRGlzcGxheTo6CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIE1hcmdp bnMgb2YgdGhlIHJvb3QgZWxlbWVudCdzIGJveCBkbyBub3QgY29sbGFwc2UuCi0gICAgaWYgKGxh eW91dEJveC5pc0luaXRpYWxDb250YWluaW5nQmxvY2soKSkKKyAgICBpZiAocGFyZW50LmlzRG9j dW1lbnRCb3goKSB8fCBwYXJlbnQuaXNJbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIGlmIChkaXNwbGF5Qm94LmJvcmRlclRvcCgpKQorICAgIGF1 dG8mIHBhcmVudERpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0 Qm94KHBhcmVudCk7CisgICAgaWYgKHBhcmVudERpc3BsYXlCb3guYm9yZGVyVG9wKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghZGlzcGxheUJveC5wYWRkaW5nVG9wKCkpCisg ICAgaWYgKHBhcmVudERpc3BsYXlCb3gucGFkZGluZ1RvcCgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTExOCw4ICsxMTksNyBAQCBMYXlvdXRVbml0IEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpjb2xsYXBzZWRNYXJnaW5Ub3BG cm9tRmlyc3RDaAogICAgICAgICByZXR1cm4gMDsKIAogICAgIGF1dG8mIGZpcnN0SW5GbG93Q2hp bGQgPSAqZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmZpcnN0SW5GbG93Q2hpbGQoKTsK LSAgICBhdXRvJiBmaXN0SW5mbG93RGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlC b3hGb3JMYXlvdXRCb3goZmlyc3RJbkZsb3dDaGlsZCk7Ci0gICAgaWYgKCFpc01hcmdpblRvcENv bGxhcHNlZFdpdGhQYXJlbnQoZmlyc3RJbkZsb3dDaGlsZCwgZmlzdEluZmxvd0Rpc3BsYXlCb3gp KQorICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGxheW91dENvbnRleHQs IGZpcnN0SW5GbG93Q2hpbGQpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIC8vIENvbGxlY3Qg Y29sbGFwc2VkIG1hcmdpbiB0b3AgcmVjdXJzaXZlbHkuCkBAIC0xNjIsOCArMTYyLDcgQEAgTGF5 b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVG9w KGNvbnN0IExheW91dENvbnRleHQKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAvLyBUT0RPOiB0 YWtlIF9oYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oKSBpbnRvIGFjY291bnQuCi0gICAg YXV0byYgZGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94KTsKLSAgICBpZiAoaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGxheW91 dEJveCwgZGlzcGxheUJveCkpCisgICAgaWYgKGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVu dChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIC8v IEZsb2F0cyBhbmQgb3V0IG9mIGZsb3cgcG9zaXRpb25lZCBib3hlcyBkbyBub3QgY29sbGFwc2Ug dGhlaXIgbWFyZ2lucy4K