190934 2018-10-25 16:55:10 -0700 [LFC][IFC] Add line logical top and bottom 2018-10-26 07:35:36 -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 1472255 0 zalan 2018-10-25 16:55:10 -0700 ssia. 1472262 1 353130 zalan 2018-10-25 16:59:22 -0700 Created attachment 353130 Patch 1472287 2 353140 zalan 2018-10-25 18:54:46 -0700 Created attachment 353140 Patch 1472432 3 zalan 2018-10-26 07:35:01 -0700 Committed r237453: <https://trac.webkit.org/changeset/237453> 1472433 4 webkit-bug-importer 2018-10-26 07:35:36 -0700 <rdar://problem/45587023> 353130 2018-10-25 16:59:22 -0700 2018-10-25 18:54:46 -0700 Patch Patch.txt text/plain 8665 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5N2RmZmM2NzVjNC4uZDY5Y2EyZTJhNjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxOC0xMC0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0lGQ10gQWRkIGxpbmUgbG9naWNhbCB0b3AgYW5kIGJvdHRvbQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwOTM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW50cm9kdWNlIGxv Z2ljYWwgdG9wIGFuZCBib3R0b20gaW4gb3JkZXIgdG8gYmUgYWJsZSB0byBzdXBwb3J0IGZsb2F0 IGJveGVzIGluIElGQy4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVOZXdMaW5lIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElubGluZUNvbnRl bnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0OjpMaW5lOjppc0ZpcnN0TGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lOjpsb2dpY2FsVG9wIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6 OmxvZ2ljYWxCb3R0b20gY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0xpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6TGluZTo6aW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdDb250ZXh0OjpMaW5lOjpjb250ZW50TG9naWNhbFJpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6OmNsb3NlKToKKwogMjAx OC0xMC0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNd IElubGluZSBmb3JtYXR0aW5nIGNvbnRleHQgaGFzIGhpZ2hlciBwcmlvcml0eSB0aGFuIGJsb2Nr CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNjFiN2E2MjU0NjkuLjZm MWFiNzI5NGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMDEs MTcgKzEwMSwzMCBAQCBzdGF0aWMgYm9vbCB0cmltTGVhZGluZ1J1bihjb25zdCBJbmxpbmVMaW5l QnJlYWtlcjo6UnVuJiBydW4pCiAgICAgcmV0dXJuIHJ1bi5jb250ZW50LnN0eWxlKCkuY29sbGFw c2VXaGl0ZVNwYWNlKCk7CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dElubGluZUNvbnRlbnQoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgSW5saW5l Rm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIGNvbnN0IElubGluZVJ1blBy b3ZpZGVyJiBpbmxpbmVSdW5Qcm92aWRlcikgY29uc3QKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmluaXRpYWxpemVOZXdMaW5lKGNvbnN0IExheW91dENvbnRleHQmIGxheW91dENvbnRl eHQsIExpbmUmIGxpbmUpIGNvbnN0CiB7CiAgICAgYXV0byYgZm9ybWF0dGluZ1Jvb3QgPSBkb3du Y2FzdDxDb250YWluZXI+KHJvb3QoKSk7CiAgICAgYXV0byYgZm9ybWF0dGluZ1Jvb3REaXNwbGF5 Qm94ID0gbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGZvcm1hdHRpbmdSb290 KTsKIAogICAgIGF1dG8gbGluZUxvZ2ljYWxMZWZ0ID0gZm9ybWF0dGluZ1Jvb3REaXNwbGF5Qm94 LmNvbnRlbnRCb3hMZWZ0KCk7CisgICAgYXV0byBsaW5lTG9naWNhbFRvcCA9IGxpbmUuaXNGaXJz dExpbmUoKSA/IGZvcm1hdHRpbmdSb290RGlzcGxheUJveC5jb250ZW50Qm94VG9wKCkgOiBsaW5l LmxvZ2ljYWxCb3R0b20oKTsKICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gZm9ybWF0dGluZ1Jv b3REaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpOworCisgICAgRGlzcGxheTo6Qm94OjpSZWN0 IGxvZ2ljYWxSZWN0OworICAgIGxvZ2ljYWxSZWN0LnNldFRvcChsaW5lTG9naWNhbFRvcCk7Cisg ICAgbG9naWNhbFJlY3Quc2V0TGVmdChsaW5lTG9naWNhbExlZnQpOworICAgIGxvZ2ljYWxSZWN0 LnNldFdpZHRoKGF2YWlsYWJsZVdpZHRoKTsKKyAgICBsb2dpY2FsUmVjdC5zZXRIZWlnaHQoZm9y bWF0dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKSk7CisKKyAgICBsaW5lLmlu aXQobG9naWNhbFJlY3QpOworfQorCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlv dXRJbmxpbmVDb250ZW50KGNvbnN0IExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIElubGlu ZUZvcm1hdHRpbmdTdGF0ZSYgaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBjb25zdCBJbmxpbmVSdW5Q cm92aWRlciYgaW5saW5lUnVuUHJvdmlkZXIpIGNvbnN0Cit7CiAgICAgYXV0byBwcmV2aW91c1J1 blBvc2l0aW9uSXNMaW5lRW5kID0gZmFsc2U7CiAKICAgICBMaW5lIGxpbmUoaW5saW5lRm9ybWF0 dGluZ1N0YXRlLCByb290KCkpOwotICAgIGxpbmUuaW5pdChsaW5lTG9naWNhbExlZnQsIGF2YWls YWJsZVdpZHRoKTsKKyAgICBpbml0aWFsaXplTmV3TGluZShsYXlvdXRDb250ZXh0LCBsaW5lKTsK IAogICAgIElubGluZUxpbmVCcmVha2VyIGxpbmVCcmVha2VyKGxheW91dENvbnRleHQsIGlubGlu ZUZvcm1hdHRpbmdTdGF0ZS5pbmxpbmVDb250ZW50KCksIGlubGluZVJ1blByb3ZpZGVyLnJ1bnMo KSk7CiAgICAgd2hpbGUgKGF1dG8gcnVuID0gbGluZUJyZWFrZXIubmV4dFJ1bihsaW5lLmNvbnRl bnRMb2dpY2FsUmlnaHQoKSwgbGluZS5hdmFpbGFibGVXaWR0aCgpLCAhbGluZS5oYXNDb250ZW50 KCkpKSB7CkBAIC0xMjIsNyArMTM1LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMYXlvdXRDb250ZXh0JiBsYXlvdXRDb24KICAgICAg ICAgICAgIC8vIFByZXZpb3VzIHJ1biBlbmRlZCB1cCBiZWluZyBhdCB0aGUgbGluZSBlbmQuIEFk anVzdCB0aGUgbGluZSBhY2NvcmRpbmdseS4KICAgICAgICAgICAgIGlmICghcHJldmlvdXNSdW5Q b3NpdGlvbklzTGluZUVuZCkgewogICAgICAgICAgICAgICAgIGxpbmUuY2xvc2UoKTsKLSAgICAg ICAgICAgICAgICBsaW5lLmluaXQobGluZUxvZ2ljYWxMZWZ0LCBhdmFpbGFibGVXaWR0aCk7Cisg ICAgICAgICAgICAgICAgaW5pdGlhbGl6ZU5ld0xpbmUobGF5b3V0Q29udGV4dCwgbGluZSk7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBTa2lwIGxlYWRpbmcgd2hpdGVzcGFjZS4KICAg ICAgICAgICAgIGlmICghdHJpbUxlYWRpbmdSdW4oKnJ1bikpCkBAIC0xMzYsNyArMTQ5LDcgQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBM YXlvdXRDb250ZXh0JiBsYXlvdXRDb24KICAgICAgICAgICAgIGxpbmUuYXBwZW5kQ29udGVudCgq cnVuKTsKICAgICAgICAgICAgIC8vIE1vdmUgb3ZlciB0byB0aGUgbmV4dCBsaW5lLgogICAgICAg ICAgICAgbGluZS5jbG9zZSgpOwotICAgICAgICAgICAgbGluZS5pbml0KGxpbmVMb2dpY2FsTGVm dCwgYXZhaWxhYmxlV2lkdGgpOworICAgICAgICAgICAgaW5pdGlhbGl6ZU5ld0xpbmUobGF5b3V0 Q29udGV4dCwgbGluZSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAwNjgzZjFjMmNlNC4uOGE4MGMzOWViZTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtMjcsNiArMjcsNyBAQAogCiAj aWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNpbmNsdWRlICJEaXNwbGF5 Qm94LmgiCiAjaW5jbHVkZSAiRm9ybWF0dGluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJJbmxpbmVM aW5lQnJlYWtlci5oIgogI2luY2x1ZGUgPHd0Zi9Jc29NYWxsb2MuaD4KQEAgLTUxLDE1ICs1Miwy MCBAQCBwcml2YXRlOgogICAgIHB1YmxpYzoKICAgICAgICAgTGluZShJbmxpbmVGb3JtYXR0aW5n U3RhdGUmLCBjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290KTsKIAotICAgICAgICB2b2lkIGluaXQo TGF5b3V0VW5pdCBsaW5lTG9naWNhbExlZnQsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpOwor ICAgICAgICB2b2lkIGluaXQoY29uc3QgRGlzcGxheTo6Qm94OjpSZWN0Jik7CisKICAgICAgICAg dm9pZCBhcHBlbmRDb250ZW50KGNvbnN0IElubGluZUxpbmVCcmVha2VyOjpSdW4mKTsKICAgICAg ICAgZW51bSBjbGFzcyBMYXN0TGluZSB7IE5vLCBZZXMgfTsKICAgICAgICAgdm9pZCBjbG9zZShM YXN0TGluZSA9IExhc3RMaW5lOjpObyk7CiAKICAgICAgICAgYm9vbCBoYXNDb250ZW50KCkgY29u c3QgeyByZXR1cm4gbV9maXJzdFJ1bkluZGV4Lmhhc192YWx1ZSgpOyB9CisgICAgICAgIGJvb2wg aXNGaXJzdExpbmUoKSBjb25zdCB7IHJldHVybiBtX2lzRmlyc3RMaW5lOyB9CiAgICAgICAgIExh eW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpOwogICAgICAgICBMYXlvdXRVbml0IGF2YWls YWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9hdmFpbGFibGVXaWR0aDsgfQogCisgICAgICAg IExheW91dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QudG9w KCk7IH0KKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4g bV9sb2dpY2FsUmVjdC5ib3R0b20oKTsgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBq dXN0aWZ5UnVucygpOwogICAgICAgICB2b2lkIGNvbXB1dGVFeHBhbnNpb25PcHBvcnR1bml0aWVz KGNvbnN0IElubGluZUxpbmVCcmVha2VyOjpSdW4mKTsKQEAgLTc1LDE1ICs4MSwxNiBAQCBwcml2 YXRlOgogICAgICAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIG1fZm9ybWF0dGluZ1N0YXRlOwog ICAgICAgICBjb25zdCBCb3gmIG1fZm9ybWF0dGluZ1Jvb3Q7CiAKLSAgICAgICAgTGF5b3V0VW5p dCBtX2xpbmVMb2dpY2FsTGVmdDsKKyAgICAgICAgRGlzcGxheTo6Qm94OjpSZWN0IG1fbG9naWNh bFJlY3Q7CiAgICAgICAgIExheW91dFVuaXQgbV9hdmFpbGFibGVXaWR0aDsKLSAgICAgICAgTGF5 b3V0VW5pdCBtX2xpbmVXaWR0aDsKIAogICAgICAgICBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkPiBt X2ZpcnN0UnVuSW5kZXg7CiAgICAgICAgIGJvb2wgbV9hbGlnbm1lbnRJc0p1c3RpZnkgeyBmYWxz ZSB9OworICAgICAgICBib29sIG1faXNGaXJzdExpbmUgeyB0cnVlIH07CiAgICAgfTsKIAogICAg IHZvaWQgbGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMYXlvdXRDb250ZXh0JiwgSW5saW5lRm9y bWF0dGluZ1N0YXRlJiwgY29uc3QgSW5saW5lUnVuUHJvdmlkZXImKSBjb25zdDsKKyAgICB2b2lk IGluaXRpYWxpemVOZXdMaW5lKGNvbnN0IExheW91dENvbnRleHQmLCBMaW5lJikgY29uc3Q7CiAK ICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZEhlaWdodChjb25zdCBMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94JikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlU3RhdGljUG9zaXRpb24oY29uc3QgTGF5 b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcAppbmRleCA3MGMxOWY4YTFiZi4u MGJhMjBhZDU4MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0xpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0xpbmUuY3BwCkBAIC00MCwxMSArNDAsMTAgQEAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OkxpbmU6OkxpbmUoSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUsIGNvbnMK IHsKIH0KIAotdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6aW5pdChMYXlvdXRV bml0IGxpbmVMb2dpY2FsTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCkKK3ZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6OmluaXQoY29uc3QgRGlzcGxheTo6Qm94OjpSZWN0 JiBsb2dpY2FsUmVjdCkKIHsKLSAgICBtX2xpbmVMb2dpY2FsTGVmdCA9IGxpbmVMb2dpY2FsTGVm dDsKLSAgICBtX2xpbmVXaWR0aCA9IGF2YWlsYWJsZVdpZHRoOwotICAgIG1fYXZhaWxhYmxlV2lk dGggPSBhdmFpbGFibGVXaWR0aDsKKyAgICBtX2xvZ2ljYWxSZWN0ID0gbG9naWNhbFJlY3Q7Cisg ICAgbV9hdmFpbGFibGVXaWR0aCA9IGxvZ2ljYWxSZWN0LndpZHRoKCk7CiAKICAgICBtX2ZpcnN0 UnVuSW5kZXggPSB7IH07CiAgICAgbV9sYXN0UnVuSXNXaGl0ZXNwYWNlID0gZmFsc2U7CkBAIC04 Miw3ICs4MSw3IEBAIHN0YXRpYyBib29sIGlzVHJpbW1hYmxlQ29udGVudChjb25zdCBJbmxpbmVS dW5Qcm92aWRlcjo6UnVuJiBpbmxpbmVSdW4pCiBMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpMaW5lOjpjb250ZW50TG9naWNhbFJpZ2h0KCkKIHsKICAgICBpZiAoIW1fZmlyc3RS dW5JbmRleC5oYXNfdmFsdWUoKSkKLSAgICAgICAgcmV0dXJuIG1fbGluZUxvZ2ljYWxMZWZ0Owor ICAgICAgICByZXR1cm4gbV9sb2dpY2FsUmVjdC5sZWZ0KCk7CiAKICAgICByZXR1cm4gbV9mb3Jt YXR0aW5nU3RhdGUuaW5saW5lUnVucygpLmxhc3QoKS5sb2dpY2FsUmlnaHQoKTsKIH0KQEAgLTIx NCwxMiArMjEzLDEyIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6OmNsb3Nl KExhc3RMaW5lIGlzTGFzdExpbmUpCiAgICAgICAgIGlmICghaGFzQ29udGVudCgpKQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gYWRqdXN0ZWRMb2dpY2FsTGVmdCA9IGFkanVz dGVkTGluZUxvZ2ljYWxMZWZ0KGFsaWdubWVudCwgbV9saW5lTG9naWNhbExlZnQsIG1fYXZhaWxh YmxlV2lkdGgpOwotICAgICAgICBpZiAobV9saW5lTG9naWNhbExlZnQgPT0gYWRqdXN0ZWRMb2dp Y2FsTGVmdCkKKyAgICAgICAgYXV0byBhZGp1c3RlZExvZ2ljYWxMZWZ0ID0gYWRqdXN0ZWRMaW5l TG9naWNhbExlZnQoYWxpZ25tZW50LCBtX2xvZ2ljYWxSZWN0LmxlZnQoKSwgbV9hdmFpbGFibGVX aWR0aCk7CisgICAgICAgIGlmIChtX2xvZ2ljYWxSZWN0LmxlZnQoKSA9PSBhZGp1c3RlZExvZ2lj YWxMZWZ0KQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGF1dG8mIGlubGluZVJ1bnMg PSBtX2Zvcm1hdHRpbmdTdGF0ZS5pbmxpbmVSdW5zKCk7Ci0gICAgICAgIGF1dG8gZGVsdGEgPSBh ZGp1c3RlZExvZ2ljYWxMZWZ0IC0gbV9saW5lTG9naWNhbExlZnQ7CisgICAgICAgIGF1dG8gZGVs dGEgPSBhZGp1c3RlZExvZ2ljYWxMZWZ0IC0gbV9sb2dpY2FsUmVjdC5sZWZ0KCk7CiAgICAgICAg IGZvciAoYXV0byBydW5JbmRleCA9ICptX2ZpcnN0UnVuSW5kZXg7IHJ1bkluZGV4IDwgaW5saW5l UnVucy5zaXplKCk7ICsrcnVuSW5kZXgpCiAgICAgICAgICAgICBpbmxpbmVSdW5zW3J1bkluZGV4 XS5zZXRMb2dpY2FsTGVmdChpbmxpbmVSdW5zW3J1bkluZGV4XS5sb2dpY2FsTGVmdCgpICsgZGVs dGEpOwogICAgIH07CkBAIC0yMzcsNyArMjM2LDkgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6TGluZTo6Y2xvc2UoTGFzdExpbmUgaXNMYXN0TGluZSkKICAgICAgICAgfQogICAgICAg ICB0ZXh0QWxpZ25tZW50ID0gVGV4dEFsaWduTW9kZTo6TGVmdDsKICAgICB9CisKICAgICBhbGln blJ1bnModGV4dEFsaWdubWVudCk7CisgICAgbV9pc0ZpcnN0TGluZSA9IGZhbHNlOwogfQogCiB9 Cg== 353140 2018-10-25 18:54:46 -0700 2018-10-26 07:33:54 -0700 Patch Patch.txt text/plain 8570 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5N2RmZmM2NzVjNC4uMGFmOGFiZTY2NmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOC0xMC0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0lGQ10gQWRkIGxpbmUgbG9naWNhbCB0b3AgYW5kIGJvdHRvbQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwOTM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojppbml0aWFsaXplTmV3TGluZSBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRJbmxpbmVDb250ZW50IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6aXNGaXJzdExpbmUgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6 bG9naWNhbFRvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdDb250ZXh0OjpMaW5lOjpsb2dpY2FsQm90dG9tIGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6OmluaXQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6Y29udGVudExvZ2ljYWxSaWdo dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpM aW5lOjpjbG9zZSk6CisKIDIwMTgtMTAtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDXSBJbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0IGhhcyBoaWdoZXIg cHJpb3JpdHkgdGhhbiBibG9jawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDYxYjdhNjI1NDY5Li42ZjFhYjcyOTRmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtMTAxLDE3ICsxMDEsMzAgQEAgc3RhdGljIGJvb2wgdHJpbUxlYWRpbmdS dW4oY29uc3QgSW5saW5lTGluZUJyZWFrZXI6OlJ1biYgcnVuKQogICAgIHJldHVybiBydW4uY29u dGVudC5zdHlsZSgpLmNvbGxhcHNlV2hpdGVTcGFjZSgpOwogfQogCi12b2lkIElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IExheW91dENvbnRleHQmIGxh eW91dENvbnRleHQsIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5saW5lRm9ybWF0dGluZ1N0YXRl LCBjb25zdCBJbmxpbmVSdW5Qcm92aWRlciYgaW5saW5lUnVuUHJvdmlkZXIpIGNvbnN0Cit2b2lk IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojppbml0aWFsaXplTmV3TGluZShjb25zdCBMYXlvdXRD b250ZXh0JiBsYXlvdXRDb250ZXh0LCBMaW5lJiBsaW5lKSBjb25zdAogewogICAgIGF1dG8mIGZv cm1hdHRpbmdSb290ID0gZG93bmNhc3Q8Q29udGFpbmVyPihyb290KCkpOwogICAgIGF1dG8mIGZv cm1hdHRpbmdSb290RGlzcGxheUJveCA9IGxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91 dEJveChmb3JtYXR0aW5nUm9vdCk7CiAKICAgICBhdXRvIGxpbmVMb2dpY2FsTGVmdCA9IGZvcm1h dHRpbmdSb290RGlzcGxheUJveC5jb250ZW50Qm94TGVmdCgpOworICAgIGF1dG8gbGluZUxvZ2lj YWxUb3AgPSBsaW5lLmlzRmlyc3RMaW5lKCkgPyBmb3JtYXR0aW5nUm9vdERpc3BsYXlCb3guY29u dGVudEJveFRvcCgpIDogbGluZS5sb2dpY2FsQm90dG9tKCk7CiAgICAgYXV0byBhdmFpbGFibGVX aWR0aCA9IGZvcm1hdHRpbmdSb290RGlzcGxheUJveC5jb250ZW50Qm94V2lkdGgoKTsKKworICAg IERpc3BsYXk6OkJveDo6UmVjdCBsb2dpY2FsUmVjdDsKKyAgICBsb2dpY2FsUmVjdC5zZXRUb3Ao bGluZUxvZ2ljYWxUb3ApOworICAgIGxvZ2ljYWxSZWN0LnNldExlZnQobGluZUxvZ2ljYWxMZWZ0 KTsKKyAgICBsb2dpY2FsUmVjdC5zZXRXaWR0aChhdmFpbGFibGVXaWR0aCk7CisgICAgbG9naWNh bFJlY3Quc2V0SGVpZ2h0KGZvcm1hdHRpbmdSb290LnN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0 KCkpOworCisgICAgbGluZS5pbml0KGxvZ2ljYWxSZWN0KTsKK30KKwordm9pZCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMYXlvdXRDb250ZXh0JiBs YXlvdXRDb250ZXh0LCBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZvcm1hdHRpbmdTdGF0 ZSwgY29uc3QgSW5saW5lUnVuUHJvdmlkZXImIGlubGluZVJ1blByb3ZpZGVyKSBjb25zdAorewog ICAgIGF1dG8gcHJldmlvdXNSdW5Qb3NpdGlvbklzTGluZUVuZCA9IGZhbHNlOwogCiAgICAgTGlu ZSBsaW5lKGlubGluZUZvcm1hdHRpbmdTdGF0ZSwgcm9vdCgpKTsKLSAgICBsaW5lLmluaXQobGlu ZUxvZ2ljYWxMZWZ0LCBhdmFpbGFibGVXaWR0aCk7CisgICAgaW5pdGlhbGl6ZU5ld0xpbmUobGF5 b3V0Q29udGV4dCwgbGluZSk7CiAKICAgICBJbmxpbmVMaW5lQnJlYWtlciBsaW5lQnJlYWtlcihs YXlvdXRDb250ZXh0LCBpbmxpbmVGb3JtYXR0aW5nU3RhdGUuaW5saW5lQ29udGVudCgpLCBpbmxp bmVSdW5Qcm92aWRlci5ydW5zKCkpOwogICAgIHdoaWxlIChhdXRvIHJ1biA9IGxpbmVCcmVha2Vy Lm5leHRSdW4obGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGxpbmUuYXZhaWxhYmxlV2lkdGgo KSwgIWxpbmUuaGFzQ29udGVudCgpKSkgewpAQCAtMTIyLDcgKzEzNSw3IEBAIHZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgTGF5b3V0Q29udGV4 dCYgbGF5b3V0Q29uCiAgICAgICAgICAgICAvLyBQcmV2aW91cyBydW4gZW5kZWQgdXAgYmVpbmcg YXQgdGhlIGxpbmUgZW5kLiBBZGp1c3QgdGhlIGxpbmUgYWNjb3JkaW5nbHkuCiAgICAgICAgICAg ICBpZiAoIXByZXZpb3VzUnVuUG9zaXRpb25Jc0xpbmVFbmQpIHsKICAgICAgICAgICAgICAgICBs aW5lLmNsb3NlKCk7Ci0gICAgICAgICAgICAgICAgbGluZS5pbml0KGxpbmVMb2dpY2FsTGVmdCwg YXZhaWxhYmxlV2lkdGgpOworICAgICAgICAgICAgICAgIGluaXRpYWxpemVOZXdMaW5lKGxheW91 dENvbnRleHQsIGxpbmUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8gU2tpcCBsZWFk aW5nIHdoaXRlc3BhY2UuCiAgICAgICAgICAgICBpZiAoIXRyaW1MZWFkaW5nUnVuKCpydW4pKQpA QCAtMTM2LDcgKzE0OSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu bGluZUNvbnRlbnQoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29uCiAgICAgICAgICAgICBs aW5lLmFwcGVuZENvbnRlbnQoKnJ1bik7CiAgICAgICAgICAgICAvLyBNb3ZlIG92ZXIgdG8gdGhl IG5leHQgbGluZS4KICAgICAgICAgICAgIGxpbmUuY2xvc2UoKTsKLSAgICAgICAgICAgIGxpbmUu aW5pdChsaW5lTG9naWNhbExlZnQsIGF2YWlsYWJsZVdpZHRoKTsKKyAgICAgICAgICAgIGluaXRp YWxpemVOZXdMaW5lKGxheW91dENvbnRleHQsIGxpbmUpOwogICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMDY4M2Yx YzJjZTQuLjhhODBjMzllYmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAg LTI3LDYgKzI3LDcgQEAKIAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQog CisjaW5jbHVkZSAiRGlzcGxheUJveC5oIgogI2luY2x1ZGUgIkZvcm1hdHRpbmdDb250ZXh0Lmgi CiAjaW5jbHVkZSAiSW5saW5lTGluZUJyZWFrZXIuaCIKICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9j Lmg+CkBAIC01MSwxNSArNTIsMjAgQEAgcHJpdmF0ZToKICAgICBwdWJsaWM6CiAgICAgICAgIExp bmUoSW5saW5lRm9ybWF0dGluZ1N0YXRlJiwgY29uc3QgQm94JiBmb3JtYXR0aW5nUm9vdCk7CiAK LSAgICAgICAgdm9pZCBpbml0KExheW91dFVuaXQgbGluZUxvZ2ljYWxMZWZ0LCBMYXlvdXRVbml0 IGF2YWlsYWJsZVdpZHRoKTsKKyAgICAgICAgdm9pZCBpbml0KGNvbnN0IERpc3BsYXk6OkJveDo6 UmVjdCYpOworCiAgICAgICAgIHZvaWQgYXBwZW5kQ29udGVudChjb25zdCBJbmxpbmVMaW5lQnJl YWtlcjo6UnVuJik7CiAgICAgICAgIGVudW0gY2xhc3MgTGFzdExpbmUgeyBObywgWWVzIH07CiAg ICAgICAgIHZvaWQgY2xvc2UoTGFzdExpbmUgPSBMYXN0TGluZTo6Tm8pOwogCiAgICAgICAgIGJv b2wgaGFzQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZmlyc3RSdW5JbmRleC5oYXNfdmFsdWUo KTsgfQorICAgICAgICBib29sIGlzRmlyc3RMaW5lKCkgY29uc3QgeyByZXR1cm4gbV9pc0ZpcnN0 TGluZTsgfQogICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICAg ICAgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fYXZhaWxhYmxl V2lkdGg7IH0KIAorICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVy biBtX2xvZ2ljYWxSZWN0LnRvcCgpOyB9CisgICAgICAgIExheW91dFVuaXQgbG9naWNhbEJvdHRv bSgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QuYm90dG9tKCk7IH0KKwogICAgIHByaXZh dGU6CiAgICAgICAgIHZvaWQganVzdGlmeVJ1bnMoKTsKICAgICAgICAgdm9pZCBjb21wdXRlRXhw YW5zaW9uT3Bwb3J0dW5pdGllcyhjb25zdCBJbmxpbmVMaW5lQnJlYWtlcjo6UnVuJik7CkBAIC03 NSwxNSArODEsMTYgQEAgcHJpdmF0ZToKICAgICAgICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBt X2Zvcm1hdHRpbmdTdGF0ZTsKICAgICAgICAgY29uc3QgQm94JiBtX2Zvcm1hdHRpbmdSb290Owog Ci0gICAgICAgIExheW91dFVuaXQgbV9saW5lTG9naWNhbExlZnQ7CisgICAgICAgIERpc3BsYXk6 OkJveDo6UmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgICAgICBMYXlvdXRVbml0IG1fYXZhaWxhYmxl V2lkdGg7Ci0gICAgICAgIExheW91dFVuaXQgbV9saW5lV2lkdGg7CiAKICAgICAgICAgc3RkOjpv cHRpb25hbDx1bnNpZ25lZD4gbV9maXJzdFJ1bkluZGV4OwogICAgICAgICBib29sIG1fYWxpZ25t ZW50SXNKdXN0aWZ5IHsgZmFsc2UgfTsKKyAgICAgICAgYm9vbCBtX2lzRmlyc3RMaW5lIHsgdHJ1 ZSB9OwogICAgIH07CiAKICAgICB2b2lkIGxheW91dElubGluZUNvbnRlbnQoY29uc3QgTGF5b3V0 Q29udGV4dCYsIElubGluZUZvcm1hdHRpbmdTdGF0ZSYsIGNvbnN0IElubGluZVJ1blByb3ZpZGVy JikgY29uc3Q7CisgICAgdm9pZCBpbml0aWFsaXplTmV3TGluZShjb25zdCBMYXlvdXRDb250ZXh0 JiwgTGluZSYpIGNvbnN0OwogCiAgICAgdm9pZCBjb21wdXRlV2lkdGhBbmRIZWlnaHQoY29uc3Qg TGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZVN0YXRp Y1Bvc2l0aW9uKGNvbnN0IExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdCBvdmVycmlk ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xp bmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZS5jcHAK aW5kZXggNzBjMTlmOGExYmYuLjBiYTIwYWQ1ODBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcApAQCAtNDAsMTEgKzQwLDEwIEBAIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lOjpMaW5lKElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9y bWF0dGluZ1N0YXRlLCBjb25zCiB7CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OkxpbmU6OmluaXQoTGF5b3V0VW5pdCBsaW5lTG9naWNhbExlZnQsIExheW91dFVuaXQgYXZhaWxh YmxlV2lkdGgpCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lOjppbml0KGNvbnN0 IERpc3BsYXk6OkJveDo6UmVjdCYgbG9naWNhbFJlY3QpCiB7Ci0gICAgbV9saW5lTG9naWNhbExl ZnQgPSBsaW5lTG9naWNhbExlZnQ7Ci0gICAgbV9saW5lV2lkdGggPSBhdmFpbGFibGVXaWR0aDsK LSAgICBtX2F2YWlsYWJsZVdpZHRoID0gYXZhaWxhYmxlV2lkdGg7CisgICAgbV9sb2dpY2FsUmVj dCA9IGxvZ2ljYWxSZWN0OworICAgIG1fYXZhaWxhYmxlV2lkdGggPSBsb2dpY2FsUmVjdC53aWR0 aCgpOwogCiAgICAgbV9maXJzdFJ1bkluZGV4ID0geyB9OwogICAgIG1fbGFzdFJ1bklzV2hpdGVz cGFjZSA9IGZhbHNlOwpAQCAtODIsNyArODEsNyBAQCBzdGF0aWMgYm9vbCBpc1RyaW1tYWJsZUNv bnRlbnQoY29uc3QgSW5saW5lUnVuUHJvdmlkZXI6OlJ1biYgaW5saW5lUnVuKQogTGF5b3V0VW5p dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6Y29udGVudExvZ2ljYWxSaWdodCgpCiB7 CiAgICAgaWYgKCFtX2ZpcnN0UnVuSW5kZXguaGFzX3ZhbHVlKCkpCi0gICAgICAgIHJldHVybiBt X2xpbmVMb2dpY2FsTGVmdDsKKyAgICAgICAgcmV0dXJuIG1fbG9naWNhbFJlY3QubGVmdCgpOwog CiAgICAgcmV0dXJuIG1fZm9ybWF0dGluZ1N0YXRlLmlubGluZVJ1bnMoKS5sYXN0KCkubG9naWNh bFJpZ2h0KCk7CiB9CkBAIC0yMTQsMTIgKzIxMywxMiBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpMaW5lOjpjbG9zZShMYXN0TGluZSBpc0xhc3RMaW5lKQogICAgICAgICBpZiAoIWhh c0NvbnRlbnQoKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBhdXRvIGFkanVzdGVk TG9naWNhbExlZnQgPSBhZGp1c3RlZExpbmVMb2dpY2FsTGVmdChhbGlnbm1lbnQsIG1fbGluZUxv Z2ljYWxMZWZ0LCBtX2F2YWlsYWJsZVdpZHRoKTsKLSAgICAgICAgaWYgKG1fbGluZUxvZ2ljYWxM ZWZ0ID09IGFkanVzdGVkTG9naWNhbExlZnQpCisgICAgICAgIGF1dG8gYWRqdXN0ZWRMb2dpY2Fs TGVmdCA9IGFkanVzdGVkTGluZUxvZ2ljYWxMZWZ0KGFsaWdubWVudCwgbV9sb2dpY2FsUmVjdC5s ZWZ0KCksIG1fYXZhaWxhYmxlV2lkdGgpOworICAgICAgICBpZiAobV9sb2dpY2FsUmVjdC5sZWZ0 KCkgPT0gYWRqdXN0ZWRMb2dpY2FsTGVmdCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICBhdXRvJiBpbmxpbmVSdW5zID0gbV9mb3JtYXR0aW5nU3RhdGUuaW5saW5lUnVucygpOwotICAg ICAgICBhdXRvIGRlbHRhID0gYWRqdXN0ZWRMb2dpY2FsTGVmdCAtIG1fbGluZUxvZ2ljYWxMZWZ0 OworICAgICAgICBhdXRvIGRlbHRhID0gYWRqdXN0ZWRMb2dpY2FsTGVmdCAtIG1fbG9naWNhbFJl Y3QubGVmdCgpOwogICAgICAgICBmb3IgKGF1dG8gcnVuSW5kZXggPSAqbV9maXJzdFJ1bkluZGV4 OyBydW5JbmRleCA8IGlubGluZVJ1bnMuc2l6ZSgpOyArK3J1bkluZGV4KQogICAgICAgICAgICAg aW5saW5lUnVuc1tydW5JbmRleF0uc2V0TG9naWNhbExlZnQoaW5saW5lUnVuc1tydW5JbmRleF0u bG9naWNhbExlZnQoKSArIGRlbHRhKTsKICAgICB9OwpAQCAtMjM3LDcgKzIzNiw5IEBAIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6OmNsb3NlKExhc3RMaW5lIGlzTGFzdExpbmUp CiAgICAgICAgIH0KICAgICAgICAgdGV4dEFsaWdubWVudCA9IFRleHRBbGlnbk1vZGU6OkxlZnQ7 CiAgICAgfQorCiAgICAgYWxpZ25SdW5zKHRleHRBbGlnbm1lbnQpOworICAgIG1faXNGaXJzdExp bmUgPSBmYWxzZTsKIH0KIAogfQo=