207640 2020-02-12 09:55:11 -0800 [LFC][IFC] LineBuilder should be able to take a partial trailing inline text item 2020-02-12 16:24:50 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1618064 0 zalan 2020-02-12 09:55:11 -0800 so that we can say that this trailing item ends with a hyphen 1618065 1 webkit-bug-importer 2020-02-12 09:56:11 -0800 <rdar://problem/59390284> 1618069 2 390532 zalan 2020-02-12 10:02:18 -0800 Created attachment 390532 Patch 1618210 3 390557 zalan 2020-02-12 13:59:48 -0800 Created attachment 390557 Patch 1618278 4 commit-queue 2020-02-12 16:04:54 -0800 The commit-queue encountered the following flaky tests while processing attachment 390557: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1618282 5 commit-queue 2020-02-12 16:05:17 -0800 The commit-queue encountered the following flaky tests while processing attachment 390557: editing/spelling/spellcheck-attribute.html bug 206178 (authors: g.czajkowski@samsung.com, mark.lam@apple.com, and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1618294 6 390557 commit-queue 2020-02-12 16:24:48 -0800 Comment on attachment 390557 Patch Clearing flags on attachment: 390557 Committed r256490: <https://trac.webkit.org/changeset/256490> 1618295 7 commit-queue 2020-02-12 16:24:50 -0800 All reviewed patches have been landed. Closing bug. 390532 2020-02-12 10:02:18 -0800 2020-02-12 11:10:02 -0800 Patch bug-207640-20200212100217.patch text/plain 14254 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U4NTMxMWM5OGU5NmMz Mzk5OTdhNWM4NDFmMmFkZjRmNjgzNGQwYS4uYjAyMGM4NjhjZDQ0MGZiNmEwOTYxZWQ3NWNiMzQz YzM1MGY2MGY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTAyLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlciBzaG91bGQgYmUgYWJsZSB0byB0YWtlIGEgcGFydGlhbCB0cmFpbGluZyBpbmxpbmUgdGV4 dCBpdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDc2NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5MzkwMjg0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpdGggdGhpcyBwYXRjaCwgbm93IHRo ZSB0cmFpbGluZyBydW4gb24gdGhlIGxpbmUgaGFzIHRoZSBuZWVkc0h5cGhlbiBiaXQgc2V0Lgor ICAgICAgICBXaGVuIGNvbnN0cnVjdGluZyB0aGUgZmluYWwgRGlzcGxheTpSdW5zIGluIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lIHVzaW5nCisgICAgICAg IHRoZSBsaW5lIHJ1bnMsIHdlIHRyYW5zZmVyIHRoZSBuZWVkc0h5cGhlbiBiaXQgaW5zdGVhZCBv ZiBleHBsaWNpdGx5IHNldCBvbiB0aGUgdHJhaWxpbmcgcnVuLiAgCisKKyAgICAgICAgKiBsYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 UnVuOjpUZXh0Q29udGVudDo6VGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUp OgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFwcGVuZFBhcnRpYWxU cmFpbGluZ1RleHRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV90ZXh0Q29u dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpSdW46OlJ1bik6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OlJ1bjo6c2V0TmVlZHNIeXBo ZW4pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OmNsb3Nl KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OnRyeUFkZGlu Z0lubGluZUl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRl eHQ6OmNvbW1pdFBhcnRpYWxDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oOgorCiAyMDIwLTAyLTEyICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUgRGlzcGxheTo6UnVu OjpUZXh0Q29udGV4dCB0byBUZXh0Q29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9k aXNwbGF5dHJlZS9EaXNwbGF5UnVuLmgKaW5kZXggYzhhMjlkZjQ4NjQwYzhlYjczOTJhZGMwZTA3 M2ZmMDEzNTlkZjk1ZS4uZjNjMGI3ZDk3ZjIxMDJkNTA0MzcxOWU2NTBkZmI5MGM1ZTg1MmVlZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oCkBA IC00Myw3ICs0Myw3IEBAIHN0cnVjdCBSdW4gewogICAgIHN0cnVjdCBUZXh0Q29udGVudCB7CiAg ICAgICAgIFdURl9NQUtFX1NUUlVDVF9GQVNUX0FMTE9DQVRFRDsKICAgICBwdWJsaWM6Ci0gICAg ICAgIFRleHRDb250ZW50KHVuc2lnbmVkIHBvc2l0aW9uLCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0 IFN0cmluZyYpOworICAgICAgICBUZXh0Q29udGVudCh1bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWdu ZWQgbGVuZ3RoLCBjb25zdCBTdHJpbmcmLCBib29sIG5lZWRzSHlwaGVuKTsKIAogICAgICAgICB1 bnNpZ25lZCBzdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnQ7IH0KICAgICAgICAgdW5zaWdu ZWQgZW5kKCkgY29uc3QgeyByZXR1cm4gc3RhcnQoKSArIGxlbmd0aCgpOyB9CkBAIC0xMjgsOSAr MTI4LDEwIEBAIGlubGluZSBSdW46OlJ1bihzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6 OkJveCYgbGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0CiB7CiB9CiAKLWlubGluZSBSdW46OlRl eHRDb250ZW50OjpUZXh0Q29udGVudCh1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBj b25zdCBTdHJpbmcmIGNvbnRlbnRTdHJpbmcpCitpbmxpbmUgUnVuOjpUZXh0Q29udGVudDo6VGV4 dENvbnRlbnQodW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgU3RyaW5nJiBj b250ZW50U3RyaW5nLCBib29sIG5lZWRzSHlwaGVuKQogICAgIDogbV9zdGFydChzdGFydCkKICAg ICAsIG1fbGVuZ3RoKGxlbmd0aCkKKyAgICAsIG1fbmVlZHNIeXBoZW4obmVlZHNIeXBoZW4pCiAg ICAgLCBtX2NvbnRlbnRTdHJpbmcoY29udGVudFN0cmluZykKIHsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA2ZWEzMTMwMmQ2MDI5MDc1MzRiM2M4ZWM1OGFmOWNh NmEyMTAwMGIwLi5jNmJlNDQ1ZTdiNTdmMTI4YjhlOWU1MjZjNTM5NDA5MjExODIwNGI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC00NTQsNyArNDU0LDYgQEAgdm9p ZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBM aW5lTGF5b3V0Q29udGV4dDo6TGkKICAgICBhdXRvJiBpbmxpbmVDb250ZW50ID0gZm9ybWF0dGlu Z1N0YXRlLmVuc3VyZURpc3BsYXlJbmxpbmVDb250ZW50KCk7CiAgICAgYXV0byBsaW5lSW5kZXgg PSBpbmxpbmVDb250ZW50LmxpbmVCb3hlcy5zaXplKCk7CiAgICAgYXV0byBsaW5lSW5rT3ZlcmZs b3cgPSBsaW5lQm94LnNjcm9sbGFibGVPdmVyZmxvdygpOwotICAgIE9wdGlvbmFsPHVuc2lnbmVk PiBsYXN0VGV4dEl0ZW1JbmRleDsKICAgICAvLyBDb21wdXRlIGJveCBmaW5hbCBnZW9tZXRyeS4K ICAgICBhdXRvJiBsaW5lUnVucyA9IGxpbmVDb250ZW50LnJ1bkxpc3Q7CiAgICAgZm9yICh1bnNp Z25lZCBpbmRleCA9IDA7IGluZGV4IDwgbGluZVJ1bnMuc2l6ZSgpOyArK2luZGV4KSB7CkBAIC01 MjYsNyArNTI1LDYgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJv eGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4dDo6TGkKICAgICAgICAgfQogCiAgICAg ICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpKSB7Ci0gICAgICAgICAgICBsYXN0VGV4dEl0ZW1JbmRl eCA9IGlubGluZUNvbnRlbnQucnVucy5zaXplKCkgLSAxOwogICAgICAgICAgICAgYXV0byBmaXJz dFJ1bkZvckxheW91dEJveCA9ICFpbmRleCB8fCAmbGluZVJ1bnNbaW5kZXggLSAxXS5sYXlvdXRC b3goKSAhPSAmbGF5b3V0Qm94OyAKICAgICAgICAgICAgIGlmIChmaXJzdFJ1bkZvckxheW91dEJv eCkgewogICAgICAgICAgICAgICAgIC8vIFNldHVwIGRpc3BsYXkgYm94IGZvciB0aGUgYXNzb2Np YXRlZCBsYXlvdXQgYm94LgpAQCAtNTQxLDkgKzUzOSw2IEBAIHZvaWQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxheW91dENvbnRleHQ6 OkxpCiAgICAgICAgIH0KICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQotICAg IC8vIE1ha2Ugc3VyZSB0aGUgdHJhaWxpbmcgdGV4dCBydW4gZ2V0cyBhIGh5cGhlbiB3aGVuIGl0 IG5lZWRzIG9uZS4KLSAgICBpZiAobGluZUNvbnRlbnQucGFydGlhbENvbnRlbnQgJiYgbGluZUNv bnRlbnQucGFydGlhbENvbnRlbnQtPnRyYWlsaW5nQ29udGVudE5lZWRzSHlwaGVuKQotICAgICAg ICBpbmxpbmVDb250ZW50LnJ1bnNbKmxhc3RUZXh0SXRlbUluZGV4XS50ZXh0Q29udGVudCgpLT5z ZXROZWVkc0h5cGhlbigpOwogICAgIC8vIEZJWE1FOiBUaGlzIGlzIHdoZXJlIHRoZSBsb2dpY2Fs IHRvIHBoeXNpY2FsIHRyYW5zbGF0ZSBzaG91bGQgaGFwcGVuLgogICAgIGF1dG8mIGJhc2VsaW5l ID0gbGluZUJveC5iYXNlbGluZSgpOwogICAgIGlubGluZUNvbnRlbnQubGluZUJveGVzLmFwcGVu ZCh7IGxpbmVCb3gubG9naWNhbFJlY3QoKSwgbGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3coKSwg bGluZUlua092ZXJmbG93LCB7IGJhc2VsaW5lLmFzY2VudCgpLCBiYXNlbGluZS5kZXNjZW50KCkg fSwgbGluZUJveC5iYXNlbGluZU9mZnNldCgpLCBsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCkg fSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMmEzYjM1MjEyMmY3OTVhOWYyYmZiMmU3 YzQ5YjUyMmJkODEwYjQ2Ni4uMWRlNTUwMGY4ODYyZjRhMDZkOGZlZjYwNzJjMWRjOWE2MmJhOGQ5 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtNDEzLDYgKzQxMywxMSBAQCB2b2lkIExp bmVCdWlsZGVyOjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5 b3V0VW5pdCBsb2dpY2FsVwogICAgICAgICBtX2xpbmVCb3guc2V0SXNDb25zaWRlcmVkTm9uRW1w dHkoKTsKIH0KIAordm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kUGFydGlhbFRyYWlsaW5nVGV4dEl0 ZW0oY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGhlbikKK3sKKyAgICBhcHBlbmRUZXh0Q29udGVu dChpbmxpbmVUZXh0SXRlbSwgbG9naWNhbFdpZHRoLCBuZWVkc0h5cGhlbik7Cit9CisKIHZvaWQg TGluZUJ1aWxkZXI6OmFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKGNvbnN0IElubGluZUl0ZW0mIGlu bGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoKQogewogICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsb2dpY2Fs TGVmdCwgbG9naWNhbFdpZHRoIH0pOwpAQCAtNDM5LDcgKzQ0NCw3IEBAIHZvaWQgTGluZUJ1aWxk ZXI6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVt LCBJbmxpbmVMCiAgICAgYXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoaW5saW5lSXRlbSwgY29udGVu dExvZ2ljYWxSaWdodCgpLCBsb2dpY2FsV2lkdGgpOwogfQogCi12b2lkIExpbmVCdWlsZGVyOjph cHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElu bGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQordm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kVGV4 dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGhlbikKIHsKICAgICBhdXRvIHdpbGxD b2xsYXBzZUNvbXBsZXRlbHkgPSBbJl0gewogICAgICAgICBpZiAoIWlubGluZVRleHRJdGVtLmlz Q29sbGFwc2libGUoKSkKQEAgLTQ3MCwxMSArNDc1LDE2IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmFw cGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5s aW5lCiAgICAgaWYgKCFtX3J1bnMuaXNFbXB0eSgpKSB7CiAgICAgICAgIGF1dG8mIGxhc3RSdW4g PSBtX3J1bnMubGFzdCgpOwogICAgICAgICBpbmxpbmVUZXh0SXRlbU5lZWRzTmV3UnVuID0gbGFz dFJ1bi5oYXNDb2xsYXBzZWRUcmFpbGluZ1doaXRlc3BhY2UoKSB8fCAhbGFzdFJ1bi5pc1RleHQo KSB8fCAmbGFzdFJ1bi5sYXlvdXRCb3goKSAhPSAmaW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCk7 Ci0gICAgICAgIGlmICghaW5saW5lVGV4dEl0ZW1OZWVkc05ld1J1bikKKyAgICAgICAgaWYgKCFp bmxpbmVUZXh0SXRlbU5lZWRzTmV3UnVuKSB7CiAgICAgICAgICAgICBsYXN0UnVuLmV4cGFuZChp bmxpbmVUZXh0SXRlbSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAgIGlmIChuZWVkc0h5cGhl bikgeworICAgICAgICAgICAgICAgIEFTU0VSVCghbGFzdFJ1bi50ZXh0Q29udGVudCgpLT5uZWVk c0h5cGhlbigpKTsKKyAgICAgICAgICAgICAgICBsYXN0UnVuLnNldE5lZWRzSHlwaGVuKCk7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9CiAgICAgaWYgKGlubGluZVRleHRJdGVtTmVl ZHNOZXdSdW4pCi0gICAgICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVUZXh0SXRlbSwgY29udGVu dExvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsV2lkdGggfSk7CisgICAgICAgIG1fcnVucy5hcHBlbmQo eyBpbmxpbmVUZXh0SXRlbSwgY29udGVudExvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsV2lkdGgsIG5l ZWRzSHlwaGVuIH0pOwogCiAgICAgbV9saW5lQm94LmV4cGFuZEhvcml6b250YWxseShsb2dpY2Fs V2lkdGgpOwogCkBAIC03NTAsMTYgKzc2MCwxNiBAQCBMaW5lQnVpbGRlcjo6UnVuOjpSdW4oY29u c3QgSW5saW5lU29mdExpbmVCcmVha0l0ZW0mIHNvZnRMaW5lQnJlYWtJdGVtLCBJbmxpbmVMYQog ICAgIDogbV90eXBlKHNvZnRMaW5lQnJlYWtJdGVtLnR5cGUoKSkKICAgICAsIG1fbGF5b3V0Qm94 KCZzb2Z0TGluZUJyZWFrSXRlbS5sYXlvdXRCb3goKSkKICAgICAsIG1fbG9naWNhbFJlY3QoeyAw LCBsb2dpY2FsTGVmdCwgMCwgMCB9KQotICAgICwgbV90ZXh0Q29udGVudCh7IHNvZnRMaW5lQnJl YWtJdGVtLnBvc2l0aW9uKCksIDEsIHNvZnRMaW5lQnJlYWtJdGVtLmlubGluZVRleHRCb3goKS5j b250ZW50KCkgfSkKKyAgICAsIG1fdGV4dENvbnRlbnQoeyBzb2Z0TGluZUJyZWFrSXRlbS5wb3Np dGlvbigpLCAxLCBzb2Z0TGluZUJyZWFrSXRlbS5pbmxpbmVUZXh0Qm94KCkuY29udGVudCgpLCBm YWxzZSB9KQogewogfQogCi1MaW5lQnVpbGRlcjo6UnVuOjpSdW4oY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKK0xpbmVCdWlsZGVyOjpSdW46OlJ1bihjb25zdCBJbmxp bmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQs IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBib29sIG5lZWRzSHlwaGVuKQogICAgIDog bV90eXBlKElubGluZUl0ZW06OlR5cGU6OlRleHQpCiAgICAgLCBtX2xheW91dEJveCgmaW5saW5l VGV4dEl0ZW0ubGF5b3V0Qm94KCkpCiAgICAgLCBtX2xvZ2ljYWxSZWN0KHsgMCwgbG9naWNhbExl ZnQsIGxvZ2ljYWxXaWR0aCwgMCB9KQogICAgICwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlKHRy YWlsaW5nV2hpdGVzcGFjZVR5cGUoaW5saW5lVGV4dEl0ZW0pKQotICAgICwgbV90ZXh0Q29udGVu dCh7IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIG1fdHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSA9PSBU cmFpbGluZ1doaXRlc3BhY2U6OkNvbGxhcHNlZCA/IDEgOiBpbmxpbmVUZXh0SXRlbS5sZW5ndGgo KSwgaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKSB9KQorICAgICwgbV90 ZXh0Q29udGVudCh7IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIG1fdHJhaWxpbmdXaGl0ZXNwYWNl VHlwZSA9PSBUcmFpbGluZ1doaXRlc3BhY2U6OkNvbGxhcHNlZCA/IDEgOiBpbmxpbmVUZXh0SXRl bS5sZW5ndGgoKSwgaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKSwgbmVl ZHNIeXBoZW4gfSkKIHsKICAgICBpZiAobV90cmFpbGluZ1doaXRlc3BhY2VUeXBlICE9IFRyYWls aW5nV2hpdGVzcGFjZTo6Tm9uZSkgewogICAgICAgICBtX3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRo ID0gbG9naWNhbFdpZHRoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggYWY4MjYwMTY3NTI5YzE1 NTBjNjhlMjI2MTZjMTI5NDRhM2UwNzZmZi4uMWQyZTkwNGMwMDZkNDg5NzEwNGU2M2UwM2VjOTJk YmNiY2Q5ZTY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC02MSw2ICs2MSw3IEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBDb25zdHJhaW50cyYpOwogICAgIHZvaWQg YXBwZW5kKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7 CisgICAgdm9pZCBhcHBlbmRQYXJ0aWFsVHJhaWxpbmdUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0 SXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBib29sIG5lZWRzSHlwZW4pOwog ICAgIHZvaWQgcmVzZXRDb250ZW50KCk7CiAgICAgYm9vbCBpc1Zpc3VhbGx5RW1wdHkoKSBjb25z dCB7IHJldHVybiBtX2xpbmVCb3guaXNDb25zaWRlcmVkRW1wdHkoKTsgfQogICAgIGJvb2wgaGFz SW50cnVzaXZlRmxvYXQoKSBjb25zdCB7IHJldHVybiBtX2hhc0ludHJ1c2l2ZUZsb2F0OyB9CkBA IC05Myw3ICs5NCw3IEBAIHB1YmxpYzoKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xh c3MgTGluZUJ1aWxkZXI7CiAKLSAgICAgICAgUnVuKGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp OworICAgICAgICBSdW4oY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGVu KTsKICAgICAgICAgUnVuKGNvbnN0IElubGluZVNvZnRMaW5lQnJlYWtJdGVtJiwgSW5saW5lTGF5 b3V0VW5pdCBsb2dpY2FsTGVmdCk7CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVtJiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp OwogCkBAIC0xMTQsNiArMTE1LDggQEAgcHVibGljOgogICAgICAgICB2b2lkIHNldENvbXB1dGVk SG9yaXpvbnRhbEV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxFeHBhbnNpb24pOwog ICAgICAgICB2b2lkIHNldEV4cGFuc2lvbkJlaGF2aW9yKEV4cGFuc2lvbkJlaGF2aW9yKTsKIAor ICAgICAgICB2b2lkIHNldE5lZWRzSHlwaGVuKCkgeyBtX3RleHRDb250ZW50LT5zZXROZWVkc0h5 cGhlbigpOyB9CisKICAgICAgICAgZW51bSBjbGFzcyBUcmFpbGluZ1doaXRlc3BhY2UgewogICAg ICAgICAgICAgTm9uZSwKICAgICAgICAgICAgIE5vdENvbGxhcHNpYmxlLApAQCAtMTYyLDcgKzE2 NSw3IEBAIHByaXZhdGU6CiAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCgpIGNv bnN0IHsgcmV0dXJuIG1fbGluZUJveC5iYXNlbGluZU9mZnNldCgpOyB9CiAKICAgICB2b2lkIGFw cGVuZE5vbkJyZWFrYWJsZVNwYWNlKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7Ci0gICAgdm9pZCBh cHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRl eHRJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIGJvb2wgbmVlZHNIeXBoZW4g PSBmYWxzZSk7CiAgICAgdm9pZCBhcHBlbmROb25SZXBsYWNlZElubGluZUJveChjb25zdCBJbmxp bmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQgYXBwZW5k UmVwbGFjZWRJbmxpbmVCb3goY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9n aWNhbFdpZHRoKTsKICAgICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lclN0YXJ0KGNvbnN0IElu bGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29u dGV4dC5jcHAKaW5kZXggNzgxMjI5YTFiZDJkYzA1YmFjZjMyYWVhNzc4MDQzZDU4NDE2NDE1Zi4u MDI0YjQ3ZGE3ZmI1MDFiMWI0ZTQ3Zjg5MjI3Yzg0ZTJjODcxNTdiYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRD b250ZXh0LmNwcApAQCAtMzEwLDEyICszMTAsNiBAQCBMaW5lTGF5b3V0Q29udGV4dDo6TGluZUNv bnRlbnQgTGluZUxheW91dENvbnRleHQ6OmNsb3NlKExpbmVCdWlsZGVyJiBsaW5lLCBjb25zdAog ICAgIGlmICghY29tbWl0dGVkSW5saW5lSXRlbUNvdW50KQogICAgICAgICByZXR1cm4gTGluZUNv bnRlbnQgeyB7IH0sIHsgfSwgV1RGTW92ZShtX2Zsb2F0cyksIGxpbmUuY2xvc2UoKSwgbGluZS5s aW5lQm94KCkgfTsKIAotICAgIC8vIEFkanVzdCBoeXBoZW5hdGVkIGxpbmUgY291bnQuCi0gICAg aWYgKHBhcnRpYWxDb250ZW50ICYmIHBhcnRpYWxDb250ZW50LT50cmFpbGluZ0NvbnRlbnROZWVk c0h5cGhlbikKLSAgICAgICAgKyttX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50OwotICAg IGVsc2UKLSAgICAgICAgbV9zdWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudCA9IDA7Ci0KICAg ICB1bnNpZ25lZCB0cmFpbGluZ0lubGluZUl0ZW1JbmRleCA9IGxheW91dFJhbmdlLnN0YXJ0ICsg Y29tbWl0dGVkSW5saW5lSXRlbUNvdW50IC0gMTsKICAgICBBU1NFUlQodHJhaWxpbmdJbmxpbmVJ dGVtSW5kZXggPCBsYXlvdXRSYW5nZS5lbmQpOwogICAgIGF1dG8gaXNMYXN0TGluZVdpdGhJbmxp bmVDb250ZW50ID0gWyZdIHsKQEAgLTQ0OSw3ICs0NDMsMTIgQEAgTGluZUxheW91dENvbnRleHQ6 OlJlc3VsdCBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMoTGluZUJyZWFr ZXImIGwKICAgICAgICAgYXV0byBwYXJ0aWFsUnVuID0gKnJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdD b250ZW50LT5wYXJ0aWFsUnVuOwogICAgICAgICBhdXRvJiB0cmFpbGluZ0lubGluZVRleHRJdGVt ID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGNhbmRpZGF0ZVJ1bnNbdHJhaWxpbmdSdW5JbmRl eF0uaW5saW5lSXRlbSk7CiAgICAgICAgIGF1dG8gb3ZlcmZsb3dMZW5ndGggPSB0cmFpbGluZ0lu bGluZVRleHRJdGVtLmxlbmd0aCgpIC0gcGFydGlhbFJ1bi5sZW5ndGg7Ci0gICAgICAgIHJldHVy biB7IHJlc3VsdC5pc0VuZE9mTGluZSwgY29tbWl0dGVkSW5saW5lSXRlbUNvdW50LCBMaW5lQ29u dGVudDo6UGFydGlhbENvbnRlbnQgeyBwYXJ0aWFsUnVuLm5lZWRzSHlwaGVuLCBvdmVyZmxvd0xl bmd0aCB9IH07CisgICAgICAgIC8vIEFkanVzdCBoeXBoZW5hdGVkIGxpbmUgY291bnQuCisgICAg ICAgIGlmIChwYXJ0aWFsUnVuLm5lZWRzSHlwaGVuKQorICAgICAgICAgICAgKyttX3N1Y2Nlc3Np dmVIeXBoZW5hdGVkTGluZUNvdW50OworICAgICAgICBlbHNlCisgICAgICAgICAgICBtX3N1Y2Nl c3NpdmVIeXBoZW5hdGVkTGluZUNvdW50ID0gMDsKKyAgICAgICAgcmV0dXJuIHsgcmVzdWx0Lmlz RW5kT2ZMaW5lLCBjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQsIExpbmVDb250ZW50OjpQYXJ0aWFs Q29udGVudCB7IG92ZXJmbG93TGVuZ3RoIH0gfTsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgcmV0dXJuIHsgTGluZUJyZWFrZXI6OklzRW5kT2ZMaW5lOjpObyB9OwpAQCAt NDY3LDcgKzQ2Niw3IEBAIHZvaWQgTGluZUxheW91dENvbnRleHQ6OmNvbW1pdFBhcnRpYWxDb250 ZW50KExpbmVCdWlsZGVyJiBsaW5lLCBjb25zdCBMaW5lQnJlYWtlCiAgICAgICAgICAgICAgICAg Ly8gRklYTUU6IExpbmVCdWlsZGVyIHNob3VsZCBub3QgaG9sZCBvbiB0byB0aGUgSW5saW5lSXRl bS4KICAgICAgICAgICAgICAgICBBU1NFUlQoIW1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0pOwog ICAgICAgICAgICAgICAgIG1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0gPSB0cmFpbGluZ0lubGlu ZVRleHRJdGVtLmxlZnQocGFydGlhbFJ1bi0+bGVuZ3RoKTsKLSAgICAgICAgICAgICAgICBsaW5l LmFwcGVuZCgqbV9wYXJ0aWFsVHJhaWxpbmdUZXh0SXRlbSwgcGFydGlhbFJ1bi0+bG9naWNhbFdp ZHRoKTsKKyAgICAgICAgICAgICAgICBsaW5lLmFwcGVuZFBhcnRpYWxUcmFpbGluZ1RleHRJdGVt KCptX3BhcnRpYWxUcmFpbGluZ1RleHRJdGVtLCBwYXJ0aWFsUnVuLT5sb2dpY2FsV2lkdGgsIHBh cnRpYWxSdW4tPm5lZWRzSHlwaGVuKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAvLyBUaGUgcGFydGlhbCBydW4gaXMgdGhlIGxhc3QgY29udGVu dCB0byBjb21taXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaAppbmRleCA4MzUwNmRkNGI5OGNkZTA4ZTcw MjE3OGFjMTY2YTM0ZGIxMDM1YjNlLi5iYTgxMjk4MjFmZWQ2MTg0YjNlNzYxNDkzODBlOTk0ZGUz YzRmYWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKQEAgLTQxLDcgKzQxLDYgQEAgcHVibGljOgog CiAgICAgc3RydWN0IExpbmVDb250ZW50IHsKICAgICAgICAgc3RydWN0IFBhcnRpYWxDb250ZW50 IHsKLSAgICAgICAgICAgIGJvb2wgdHJhaWxpbmdDb250ZW50TmVlZHNIeXBoZW4geyBmYWxzZSB9 OwogICAgICAgICAgICAgdW5zaWduZWQgb3ZlcmZsb3dDb250ZW50TGVuZ3RoIHsgMCB9OwogICAg ICAgICB9OwogICAgICAgICBPcHRpb25hbDx1bnNpZ25lZD4gdHJhaWxpbmdJbmxpbmVJdGVtSW5k ZXg7Cg== 390557 2020-02-12 13:59:48 -0800 2020-02-12 16:24:48 -0800 Patch bug-207640-20200212135948.patch text/plain 15126 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWMyNWU2YjRhNWZjZDdm NTBhYzkyZjc4N2NhZTlmOTY2OWE0NjAwNS4uMjJkNGY4YzNmYmVjM2EwYjA3NzcyMTBmNDlmMGVj MDRlNmU3NGQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTAyLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlciBzaG91bGQgYmUgYWJsZSB0byB0YWtlIGEgcGFydGlhbCB0cmFpbGluZyBpbmxpbmUgdGV4 dCBpdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDc2NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5MzkwMjg0PgorCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdpdGggdGhpcyBwYXRjaCwgbm93IHRo ZSB0cmFpbGluZyBydW4gb24gdGhlIGxpbmUgaGFzIHRoZSBuZWVkc0h5cGhlbiBiaXQgc2V0Lgor ICAgICAgICBXaGVuIGNvbnN0cnVjdGluZyB0aGUgZmluYWwgRGlzcGxheTpSdW5zIGluIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lIHVzaW5nCisgICAgICAg IHRoZSBsaW5lIHJ1bnMsIHdlIHRyYW5zZmVyIHRoZSBuZWVkc0h5cGhlbiBiaXQgaW5zdGVhZCBv ZiBleHBsaWNpdGx5IHNldCBvbiB0aGUgdHJhaWxpbmcgcnVuLiAgCisKKyAgICAgICAgKiBsYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 UnVuOjpUZXh0Q29udGVudDo6VGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUp OgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFwcGVuZFBhcnRpYWxU cmFpbGluZ1RleHRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV90ZXh0Q29u dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpSdW46OlJ1bik6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OlJ1bjo6c2V0TmVlZHNIeXBo ZW4pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OmNsb3Nl KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OnRyeUFkZGlu Z0lubGluZUl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRl eHQ6OmNvbW1pdFBhcnRpYWxDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oOgorCiAyMDIwLTAyLTEyICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEbyBub3QgY3JlYXRlIERpc3Bs YXk6OkJveGVzIGZvciBhbm9ueW1vdXMgaW5saW5lIHRleHQgYm94ZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UnVuLmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oCmluZGV4IGQyMzk2Yzk2ZmNjN2Y2 YmVmODZkNjYyY2JjYTA2MWI0OGZjNmY2N2MuLjM3NTQ0OWFjN2IyMzFlOWJlNWQzMDllMTRhYTcw ZmVkNjFhYmZmMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJl ZS9EaXNwbGF5UnVuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rp c3BsYXlSdW4uaApAQCAtNDMsNyArNDMsNyBAQCBzdHJ1Y3QgUnVuIHsKICAgICBzdHJ1Y3QgVGV4 dENvbnRlbnQgewogICAgICAgICBXVEZfTUFLRV9TVFJVQ1RfRkFTVF9BTExPQ0FURUQ7CiAgICAg cHVibGljOgotICAgICAgICBUZXh0Q29udGVudCh1bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWduZWQg bGVuZ3RoLCBjb25zdCBTdHJpbmcmKTsKKyAgICAgICAgVGV4dENvbnRlbnQodW5zaWduZWQgcG9z aXRpb24sIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgU3RyaW5nJiwgYm9vbCBuZWVkc0h5cGhlbik7 CiAKICAgICAgICAgdW5zaWduZWQgc3RhcnQoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0OyB9CiAg ICAgICAgIHVuc2lnbmVkIGVuZCgpIGNvbnN0IHsgcmV0dXJuIHN0YXJ0KCkgKyBsZW5ndGgoKTsg fQpAQCAtMTE2LDkgKzExNiwxMCBAQCBpbmxpbmUgUnVuOjpSdW4oc2l6ZV90IGxpbmVJbmRleCwg Y29uc3QgTGF5b3V0OjpCb3gmIGxheW91dEJveCwgY29uc3QgSW5saW5lUmVjdAogewogfQogCi1p bmxpbmUgUnVuOjpUZXh0Q29udGVudDo6VGV4dENvbnRlbnQodW5zaWduZWQgc3RhcnQsIHVuc2ln bmVkIGxlbmd0aCwgY29uc3QgU3RyaW5nJiBjb250ZW50U3RyaW5nKQoraW5saW5lIFJ1bjo6VGV4 dENvbnRlbnQ6OlRleHRDb250ZW50KHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGNv bnN0IFN0cmluZyYgY29udGVudFN0cmluZywgYm9vbCBuZWVkc0h5cGhlbikKICAgICA6IG1fc3Rh cnQoc3RhcnQpCiAgICAgLCBtX2xlbmd0aChsZW5ndGgpCisgICAgLCBtX25lZWRzSHlwaGVuKG5l ZWRzSHlwaGVuKQogICAgICwgbV9jb250ZW50U3RyaW5nKGNvbnRlbnRTdHJpbmcpCiB7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYTU5NzMzNmNjMmE1ZDJhZTE3 MmY5ODRhOGQ1NGQwYTMyOTZhYTNmZC4uOWJkZDg0NjljZTYzZjU3ZTVhNWQxN2FhMzdlOTMyZGE1 ZGY3MWM1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDU0LDcg KzQ1NCw2IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0Zv ckxpbmUoY29uc3QgTGluZUxheW91dENvbnRleHQ6OkxpCiAgICAgYXV0byYgaW5saW5lQ29udGVu dCA9IGZvcm1hdHRpbmdTdGF0ZS5lbnN1cmVEaXNwbGF5SW5saW5lQ29udGVudCgpOwogICAgIGF1 dG8gbGluZUluZGV4ID0gaW5saW5lQ29udGVudC5saW5lQm94ZXMuc2l6ZSgpOwogICAgIGF1dG8g bGluZUlua092ZXJmbG93ID0gbGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3coKTsKLSAgICBPcHRp b25hbDx1bnNpZ25lZD4gbGFzdFRleHRJdGVtSW5kZXg7CiAgICAgLy8gQ29tcHV0ZSBib3ggZmlu YWwgZ2VvbWV0cnkuCiAgICAgYXV0byYgbGluZVJ1bnMgPSBsaW5lQ29udGVudC5ydW5MaXN0Owog ICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IGxpbmVSdW5zLnNpemUoKTsgKytp bmRleCkgewpAQCAtNDg3LDYgKzQ4Niw5IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxheW91dENvbnRleHQ6OkxpCiAgICAg ICAgICAgICBpbmxpbmVDb250ZW50LnJ1bnMuYXBwZW5kKHsgbGluZUluZGV4LCBsaW5lUnVuLmxh eW91dEJveCgpLCBsb2dpY2FsUmVjdCwgaW5rT3ZlcmZsb3csIGxpbmVSdW4uZXhwYW5zaW9uKCks IGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgfQogCisgICAgICAgIGlmIChsaW5l UnVuLmlzVGV4dCgpKQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAgICAgaWYgKGxpbmVS dW4uaXNMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFNpbmNlIDxicj4gYW5k IDx3YnI+IHJ1bnMgaGF2ZSBhc3NvY2lhdGVkIERPTSBlbGVtZW50cywgd2UgbWlnaHQgbmVlZCB0 byBjb25zdHJ1Y3QgYSBkaXNwbGF5IGJveCBoZXJlLiAKICAgICAgICAgICAgIGNvbnRpbnVlOwpA QCAtNTI1LDE2ICs1MjcsOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNw bGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSkgewot ICAgICAgICAgICAgLy8gQW5vbnltb3VzIGlubGluZSB0ZXh0IGJveGVzIGRvIG5vdCBjcmVhdGUg ZGlzcGxheSBib3hlcy4KLSAgICAgICAgICAgIGxhc3RUZXh0SXRlbUluZGV4ID0gaW5saW5lQ29u dGVudC5ydW5zLnNpemUoKSAtIDE7Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9Ci0gICAgLy8gTWFrZSBzdXJlIHRo ZSB0cmFpbGluZyB0ZXh0IHJ1biBnZXRzIGEgaHlwaGVuIHdoZW4gaXQgbmVlZHMgb25lLgotICAg IGlmIChsaW5lQ29udGVudC5wYXJ0aWFsQ29udGVudCAmJiBsaW5lQ29udGVudC5wYXJ0aWFsQ29u dGVudC0+dHJhaWxpbmdDb250ZW50TmVlZHNIeXBoZW4pCi0gICAgICAgIGlubGluZUNvbnRlbnQu cnVuc1sqbGFzdFRleHRJdGVtSW5kZXhdLnRleHRDb250ZW50KCktPnNldE5lZWRzSHlwaGVuKCk7 CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgd2hlcmUgdGhlIGxvZ2ljYWwgdG8gcGh5c2ljYWwgdHJh bnNsYXRlIHNob3VsZCBoYXBwZW4uCiAgICAgYXV0byYgYmFzZWxpbmUgPSBsaW5lQm94LmJhc2Vs aW5lKCk7CiAgICAgaW5saW5lQ29udGVudC5saW5lQm94ZXMuYXBwZW5kKHsgbGluZUJveC5sb2dp Y2FsUmVjdCgpLCBsaW5lQm94LnNjcm9sbGFibGVPdmVyZmxvdygpLCBsaW5lSW5rT3ZlcmZsb3cs IHsgYmFzZWxpbmUuYXNjZW50KCksIGJhc2VsaW5lLmRlc2NlbnQoKSB9LCBsaW5lQm94LmJhc2Vs aW5lT2Zmc2V0KCksIGxpbmVCb3guaXNDb25zaWRlcmVkRW1wdHkoKSB9KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmNwcAppbmRleCAyYTNiMzUyMTIyZjc5NWE5ZjJiZmIyZTdjNDliNTIyYmQ4MTBiNDY2 Li5lMjRjZWVlMGQxOTlkOTlhNmU3YjU3M2JjOGY1N2U4YjFhN2NlMjA1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCkBAIC0zOTIsMTkgKzM5MiwyOSBAQCB2b2lkIExpbmVCdWlsZGVyOjptb3Zl TG9naWNhbFJpZ2h0KElubGluZUxheW91dFVuaXQgZGVsdGEpCiB9CiAKIHZvaWQgTGluZUJ1aWxk ZXI6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCkKK3sKKyAgICBhcHBlbmRXaXRoKGlubGluZUl0ZW0sIHsgbG9naWNhbFdp ZHRoLCBmYWxzZSB9KTsKK30KKwordm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kUGFydGlhbFRyYWls aW5nVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGhlbikKK3sKKyAgICBhcHBlbmRX aXRoKGlubGluZVRleHRJdGVtLCB7IGxvZ2ljYWxXaWR0aCwgbmVlZHNIeXBoZW4gfSk7Cit9CisK K3ZvaWQgTGluZUJ1aWxkZXI6OmFwcGVuZFdpdGgoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgY29uc3QgSW5saW5lUnVuRGV0YWlscyYgaW5saW5lUnVuRGV0YWlscykKIHsKICAgICBpZiAo aW5saW5lSXRlbS5pc1RleHQoKSkKLSAgICAgICAgYXBwZW5kVGV4dENvbnRlbnQoZG93bmNhc3Q8 SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLCBsb2dpY2FsV2lkdGgpOworICAgICAgICBhcHBl bmRUZXh0Q29udGVudChkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSksIGlubGlu ZVJ1bkRldGFpbHMubG9naWNhbFdpZHRoLCBpbmxpbmVSdW5EZXRhaWxzLm5lZWRzSHlwaGVuKTsK ICAgICBlbHNlIGlmIChpbmxpbmVJdGVtLmlzTGluZUJyZWFrKCkpCiAgICAgICAgIGFwcGVuZExp bmVCcmVhayhpbmxpbmVJdGVtKTsKICAgICBlbHNlIGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVy U3RhcnQoKSkKLSAgICAgICAgYXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoaW5saW5lSXRlbSwg bG9naWNhbFdpZHRoKTsKKyAgICAgICAgYXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoaW5saW5l SXRlbSwgaW5saW5lUnVuRGV0YWlscy5sb2dpY2FsV2lkdGgpOwogICAgIGVsc2UgaWYgKGlubGlu ZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKLSAgICAgICAgYXBwZW5kSW5saW5lQ29udGFpbmVyRW5k KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CisgICAgICAgIGFwcGVuZElubGluZUNvbnRhaW5l ckVuZChpbmxpbmVJdGVtLCBpbmxpbmVSdW5EZXRhaWxzLmxvZ2ljYWxXaWR0aCk7CiAgICAgZWxz ZSBpZiAoaW5saW5lSXRlbS5sYXlvdXRCb3goKS5pc1JlcGxhY2VkQm94KCkpCi0gICAgICAgIGFw cGVuZFJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CisgICAgICAg IGFwcGVuZFJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGlubGluZVJ1bkRldGFpbHMubG9n aWNhbFdpZHRoKTsKICAgICBlbHNlIGlmIChpbmxpbmVJdGVtLmlzQm94KCkpCi0gICAgICAgIGFw cGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CisgICAg ICAgIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGlubGluZVJ1bkRldGFp bHMubG9naWNhbFdpZHRoKTsKICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogCkBAIC00MzksNyArNDQ5LDcgQEAgdm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kSW5saW5lQ29u dGFpbmVyRW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUwKICAgICBhcHBl bmROb25CcmVha2FibGVTcGFjZShpbmxpbmVJdGVtLCBjb250ZW50TG9naWNhbFJpZ2h0KCksIGxv Z2ljYWxXaWR0aCk7CiB9CiAKLXZvaWQgTGluZUJ1aWxkZXI6OmFwcGVuZFRleHRDb250ZW50KGNv bnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsV2lkdGgpCit2b2lkIExpbmVCdWlsZGVyOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxp bmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo LCBib29sIG5lZWRzSHlwaGVuKQogewogICAgIGF1dG8gd2lsbENvbGxhcHNlQ29tcGxldGVseSA9 IFsmXSB7CiAgICAgICAgIGlmICghaW5saW5lVGV4dEl0ZW0uaXNDb2xsYXBzaWJsZSgpKQpAQCAt NDcwLDExICs0ODAsMTYgQEAgdm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kVGV4dENvbnRlbnQoY29u c3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmUKICAgICBpZiAoIW1fcnVu cy5pc0VtcHR5KCkpIHsKICAgICAgICAgYXV0byYgbGFzdFJ1biA9IG1fcnVucy5sYXN0KCk7CiAg ICAgICAgIGlubGluZVRleHRJdGVtTmVlZHNOZXdSdW4gPSBsYXN0UnVuLmhhc0NvbGxhcHNlZFRy YWlsaW5nV2hpdGVzcGFjZSgpIHx8ICFsYXN0UnVuLmlzVGV4dCgpIHx8ICZsYXN0UnVuLmxheW91 dEJveCgpICE9ICZpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKTsKLSAgICAgICAgaWYgKCFpbmxp bmVUZXh0SXRlbU5lZWRzTmV3UnVuKQorICAgICAgICBpZiAoIWlubGluZVRleHRJdGVtTmVlZHNO ZXdSdW4pIHsKICAgICAgICAgICAgIGxhc3RSdW4uZXhwYW5kKGlubGluZVRleHRJdGVtLCBsb2dp Y2FsV2lkdGgpOworICAgICAgICAgICAgaWYgKG5lZWRzSHlwaGVuKSB7CisgICAgICAgICAgICAg ICAgQVNTRVJUKCFsYXN0UnVuLnRleHRDb250ZW50KCktPm5lZWRzSHlwaGVuKCkpOworICAgICAg ICAgICAgICAgIGxhc3RSdW4uc2V0TmVlZHNIeXBoZW4oKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQogICAgIH0KICAgICBpZiAoaW5saW5lVGV4dEl0ZW1OZWVkc05ld1J1bikKLSAgICAgICAg bV9ydW5zLmFwcGVuZCh7IGlubGluZVRleHRJdGVtLCBjb250ZW50TG9naWNhbFdpZHRoKCksIGxv Z2ljYWxXaWR0aCB9KTsKKyAgICAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZVRleHRJdGVtLCBj b250ZW50TG9naWNhbFdpZHRoKCksIGxvZ2ljYWxXaWR0aCwgbmVlZHNIeXBoZW4gfSk7CiAKICAg ICBtX2xpbmVCb3guZXhwYW5kSG9yaXpvbnRhbGx5KGxvZ2ljYWxXaWR0aCk7CiAKQEAgLTc1MCwx NiArNzY1LDE2IEBAIExpbmVCdWlsZGVyOjpSdW46OlJ1bihjb25zdCBJbmxpbmVTb2Z0TGluZUJy ZWFrSXRlbSYgc29mdExpbmVCcmVha0l0ZW0sIElubGluZUxhCiAgICAgOiBtX3R5cGUoc29mdExp bmVCcmVha0l0ZW0udHlwZSgpKQogICAgICwgbV9sYXlvdXRCb3goJnNvZnRMaW5lQnJlYWtJdGVt LmxheW91dEJveCgpKQogICAgICwgbV9sb2dpY2FsUmVjdCh7IDAsIGxvZ2ljYWxMZWZ0LCAwLCAw IH0pCi0gICAgLCBtX3RleHRDb250ZW50KHsgc29mdExpbmVCcmVha0l0ZW0ucG9zaXRpb24oKSwg MSwgc29mdExpbmVCcmVha0l0ZW0uaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKSB9KQorICAgICwg bV90ZXh0Q29udGVudCh7IHNvZnRMaW5lQnJlYWtJdGVtLnBvc2l0aW9uKCksIDEsIHNvZnRMaW5l QnJlYWtJdGVtLmlubGluZVRleHRCb3goKS5jb250ZW50KCksIGZhbHNlIH0pCiB7CiB9CiAKLUxp bmVCdWlsZGVyOjpSdW46OlJ1bihjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0s IElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdp ZHRoKQorTGluZUJ1aWxkZXI6OlJ1bjo6UnVuKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVU ZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBs b2dpY2FsV2lkdGgsIGJvb2wgbmVlZHNIeXBoZW4pCiAgICAgOiBtX3R5cGUoSW5saW5lSXRlbTo6 VHlwZTo6VGV4dCkKICAgICAsIG1fbGF5b3V0Qm94KCZpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3go KSkKICAgICAsIG1fbG9naWNhbFJlY3QoeyAwLCBsb2dpY2FsTGVmdCwgbG9naWNhbFdpZHRoLCAw IH0pCiAgICAgLCBtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUodHJhaWxpbmdXaGl0ZXNwYWNlVHlw ZShpbmxpbmVUZXh0SXRlbSkpCi0gICAgLCBtX3RleHRDb250ZW50KHsgaW5saW5lVGV4dEl0ZW0u c3RhcnQoKSwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWlsaW5nV2hpdGVzcGFjZTo6 Q29sbGFwc2VkID8gMSA6IGlubGluZVRleHRJdGVtLmxlbmd0aCgpLCBpbmxpbmVUZXh0SXRlbS5p bmxpbmVUZXh0Qm94KCkuY29udGVudCgpIH0pCisgICAgLCBtX3RleHRDb250ZW50KHsgaW5saW5l VGV4dEl0ZW0uc3RhcnQoKSwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWlsaW5nV2hp dGVzcGFjZTo6Q29sbGFwc2VkID8gMSA6IGlubGluZVRleHRJdGVtLmxlbmd0aCgpLCBpbmxpbmVU ZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCkuY29udGVudCgpLCBuZWVkc0h5cGhlbiB9KQogewogICAg IGlmIChtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUgIT0gVHJhaWxpbmdXaGl0ZXNwYWNlOjpOb25l KSB7CiAgICAgICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggPSBsb2dpY2FsV2lkdGg7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuaAppbmRleCBhZjgyNjAxNjc1MjljMTU1MGM2OGUyMjYxNmMxMjk0NGEz ZTA3NmZmLi4yNDRlM2I2MmRkODFjZTg1OWQ1YmUxODBmMDc1NTVjNjU2NDMxOTBlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCdWlsZGVyLmgKQEAgLTYxLDYgKzYxLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBpbml0 aWFsaXplKGNvbnN0IENvbnN0cmFpbnRzJik7CiAgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5l SXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFwcGVuZFBh cnRpYWxUcmFpbGluZ1RleHRJdGVtKGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgsIGJvb2wgbmVlZHNIeXBlbik7CiAgICAgdm9pZCByZXNldENvbnRl bnQoKTsKICAgICBib29sIGlzVmlzdWFsbHlFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJv eC5pc0NvbnNpZGVyZWRFbXB0eSgpOyB9CiAgICAgYm9vbCBoYXNJbnRydXNpdmVGbG9hdCgpIGNv bnN0IHsgcmV0dXJuIG1faGFzSW50cnVzaXZlRmxvYXQ7IH0KQEAgLTkzLDcgKzk0LDcgQEAgcHVi bGljOgogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lQnVpbGRlcjsKIAot ICAgICAgICBSdW4oY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAgICAgIFJ1bihjb25z dCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxh eW91dFVuaXQgbG9naWNhbFdpZHRoLCBib29sIG5lZWRzSHlwZW4pOwogICAgICAgICBSdW4oY29u c3QgSW5saW5lU29mdExpbmVCcmVha0l0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0 KTsKICAgICAgICAgUnVuKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAKQEAgLTExNCw2ICsxMTUs OCBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0Q29tcHV0ZWRIb3Jpem9udGFsRXhwYW5zaW9u KElubGluZUxheW91dFVuaXQgbG9naWNhbEV4cGFuc2lvbik7CiAgICAgICAgIHZvaWQgc2V0RXhw YW5zaW9uQmVoYXZpb3IoRXhwYW5zaW9uQmVoYXZpb3IpOwogCisgICAgICAgIHZvaWQgc2V0TmVl ZHNIeXBoZW4oKSB7IG1fdGV4dENvbnRlbnQtPnNldE5lZWRzSHlwaGVuKCk7IH0KKwogICAgICAg ICBlbnVtIGNsYXNzIFRyYWlsaW5nV2hpdGVzcGFjZSB7CiAgICAgICAgICAgICBOb25lLAogICAg ICAgICAgICAgTm90Q29sbGFwc2libGUsCkBAIC0xNjEsOCArMTY0LDEzIEBAIHByaXZhdGU6CiAg ICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4g bV9saW5lQm94LmxvZ2ljYWxSaWdodCgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGlu ZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveC5iYXNlbGluZU9mZnNldCgpOyB9CiAK KyAgICBzdHJ1Y3QgSW5saW5lUnVuRGV0YWlscyB7CisgICAgICAgIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoIHsgMCB9OworICAgICAgICBib29sIG5lZWRzSHlwaGVuIHsgZmFsc2UgfTsK KyAgICB9OworICAgIHZvaWQgYXBwZW5kV2l0aChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgSW5s aW5lUnVuRGV0YWlscyYpOwogICAgIHZvaWQgYXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3Qg SW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKTsKLSAgICB2b2lkIGFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGlu ZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworICAgIHZvaWQgYXBw ZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGhlbik7CiAgICAgdm9pZCBhcHBlbmROb25SZXBsYWNl ZElubGluZUJveChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lk dGgpOwogICAgIHZvaWQgYXBwZW5kUmVwbGFjZWRJbmxpbmVCb3goY29uc3QgSW5saW5lSXRlbSYs IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICB2b2lkIGFwcGVuZElubGluZUNv bnRhaW5lclN0YXJ0KGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKaW5kZXggNzgxMjI5YTFiZDJkYzA1YmFjZjMy YWVhNzc4MDQzZDU4NDE2NDE1Zi4uMWRiNzk5Nzg4NTJiYmQwMjQ1Mzk2MGNmZDZmZTFkMzYzMDY5 OTdjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcApAQCAtMzExLDExICszMTEsMTAgQEAgTGlu ZUxheW91dENvbnRleHQ6OkxpbmVDb250ZW50IExpbmVMYXlvdXRDb250ZXh0OjpjbG9zZShMaW5l QnVpbGRlciYgbGluZSwgY29uc3QKICAgICAgICAgcmV0dXJuIExpbmVDb250ZW50IHsgeyB9LCB7 IH0sIFdURk1vdmUobV9mbG9hdHMpLCBsaW5lLmNsb3NlKCksIGxpbmUubGluZUJveCgpIH07CiAK ICAgICAvLyBBZGp1c3QgaHlwaGVuYXRlZCBsaW5lIGNvdW50LgotICAgIGlmIChwYXJ0aWFsQ29u dGVudCAmJiBwYXJ0aWFsQ29udGVudC0+dHJhaWxpbmdDb250ZW50TmVlZHNIeXBoZW4pCisgICAg aWYgKHBhcnRpYWxDb250ZW50ICYmIHBhcnRpYWxDb250ZW50LT50cmFpbGluZ0NvbnRlbnRIYXNI eXBoZW4pCiAgICAgICAgICsrbV9zdWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudDsKICAgICBl bHNlCiAgICAgICAgIG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5lQ291bnQgPSAwOwotCiAgICAg dW5zaWduZWQgdHJhaWxpbmdJbmxpbmVJdGVtSW5kZXggPSBsYXlvdXRSYW5nZS5zdGFydCArIGNv bW1pdHRlZElubGluZUl0ZW1Db3VudCAtIDE7CiAgICAgQVNTRVJUKHRyYWlsaW5nSW5saW5lSXRl bUluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kKTsKICAgICBhdXRvIGlzTGFzdExpbmVXaXRoSW5saW5l Q29udGVudCA9IFsmXSB7CkBAIC00NjcsNyArNDY2LDcgQEAgdm9pZCBMaW5lTGF5b3V0Q29udGV4 dDo6Y29tbWl0UGFydGlhbENvbnRlbnQoTGluZUJ1aWxkZXImIGxpbmUsIGNvbnN0IExpbmVCcmVh a2UKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogTGluZUJ1aWxkZXIgc2hvdWxkIG5vdCBob2xk IG9uIHRvIHRoZSBJbmxpbmVJdGVtLgogICAgICAgICAgICAgICAgIEFTU0VSVCghbV9wYXJ0aWFs VHJhaWxpbmdUZXh0SXRlbSk7CiAgICAgICAgICAgICAgICAgbV9wYXJ0aWFsVHJhaWxpbmdUZXh0 SXRlbSA9IHRyYWlsaW5nSW5saW5lVGV4dEl0ZW0ubGVmdChwYXJ0aWFsUnVuLT5sZW5ndGgpOwot ICAgICAgICAgICAgICAgIGxpbmUuYXBwZW5kKCptX3BhcnRpYWxUcmFpbGluZ1RleHRJdGVtLCBw YXJ0aWFsUnVuLT5sb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgICAgIGxpbmUuYXBwZW5kUGFy dGlhbFRyYWlsaW5nVGV4dEl0ZW0oKm1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0sIHBhcnRpYWxS dW4tPmxvZ2ljYWxXaWR0aCwgcGFydGlhbFJ1bi0+bmVlZHNIeXBoZW4pOwogICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIFRoZSBwYXJ0aWFsIHJ1 biBpcyB0aGUgbGFzdCBjb250ZW50IHRvIGNvbW1pdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oCmluZGV4 IDgzNTA2ZGQ0Yjk4Y2RlMDhlNzAyMTc4YWMxNjZhMzRkYjEwMzViM2UuLmJiZDY5ZDg0NWMxNTM3 YjM5ZGQ0YWEwYjUzMGVlNzI2MzZlMzdkN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaApAQCAtNDEs NyArNDEsNyBAQCBwdWJsaWM6CiAKICAgICBzdHJ1Y3QgTGluZUNvbnRlbnQgewogICAgICAgICBz dHJ1Y3QgUGFydGlhbENvbnRlbnQgewotICAgICAgICAgICAgYm9vbCB0cmFpbGluZ0NvbnRlbnRO ZWVkc0h5cGhlbiB7IGZhbHNlIH07CisgICAgICAgICAgICBib29sIHRyYWlsaW5nQ29udGVudEhh c0h5cGhlbiB7IGZhbHNlIH07CiAgICAgICAgICAgICB1bnNpZ25lZCBvdmVyZmxvd0NvbnRlbnRM ZW5ndGggeyAwIH07CiAgICAgICAgIH07CiAgICAgICAgIE9wdGlvbmFsPHVuc2lnbmVkPiB0cmFp bGluZ0lubGluZUl0ZW1JbmRleDsK