229922 2021-09-05 08:00:45 -0700 [LFC][Integration] Skip inline boxes in iterator 2021-09-05 12:18:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1790543 0 koivisto 2021-09-05 08:00:45 -0700 Don't change iterator behavior when including inline boxes to the run list. 1790544 1 437360 koivisto 2021-09-05 08:04:13 -0700 Created attachment 437360 wip 1790546 2 437362 koivisto 2021-09-05 08:50:47 -0700 Created attachment 437362 wip 1790554 3 437363 koivisto 2021-09-05 10:55:54 -0700 Created attachment 437363 patch 1790556 4 437363 zalan 2021-09-05 10:58:33 -0700 Comment on attachment 437363 patch Nice! 1790560 5 ews-feeder 2021-09-05 12:17:20 -0700 Committed r282050 (241350@main): <https://commits.webkit.org/241350@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437363. 1790561 6 webkit-bug-importer 2021-09-05 12:18:18 -0700 <rdar://problem/82776110> 437360 2021-09-05 08:04:13 -0700 2021-09-05 08:50:47 -0700 wip lfc-inlinebox-skip.patch text/plain 7937 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIu Y3BwCmluZGV4IDFhMTNhMmEyOWUxMS4uY2RhMGRiMjc1MTUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTM2LDggKzM2 LDYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi0jZGVmaW5l IEFMTE9XX1JPT1RfQU5EX0xJTkVfU1BBTk5JTkdfSU5MSU5FX0JPWCAwCi0KIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyKGNvbnN0IENvbnRh aW5lckJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGZv cm1hdHRpbmdTdGF0ZSkKICAgICA6IG1fZm9ybWF0dGluZ0NvbnRleHRSb290KGZvcm1hdHRpbmdD b250ZXh0Um9vdCkKICAgICAsIG1fZm9ybWF0dGluZ1N0YXRlKGZvcm1hdHRpbmdTdGF0ZSkKQEAg LTQ4LDEyICs0NiwxMCBAQCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OklubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcihjb25zdCBDb250YWluZXJCb3gmIGZvcgogdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYg bGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIGNvbnN0IHNpemVfdCBsaW5lSW5kZXgpCiB7CiAg ICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7Ci0jaWYg QUxMT1dfUk9PVF9BTkRfTElORV9TUEFOTklOR19JTkxJTkVfQk9YCiAgICAgLy8gRXZlcnkgbGlu ZSBzdGFydHMgd2l0aCBhIHJvb3QgcnVuLCBldmVuIHRoZSBlbXB0eSBvbmVzLgogICAgIGF1dG8g cm9vdElubGluZUJveFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgp OwogICAgIHJvb3RJbmxpbmVCb3hSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwog ICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6VHlwZTo6Um9vdElu bGluZUJveCwgcm9vdCgpLCByb290SW5saW5lQm94UmVjdCwgcm9vdElubGluZUJveFJlY3QsIHsg fSwgeyB9LCAgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpfSk7Ci0jZW5kaWYK ICAgICAvLyBTcGFubmluZyBpbmxpbmUgYm94ZXMgc3RhcnQgYXQgdGhlIHZlcnkgYmVnaW5uaW5n IG9mIHRoZSBsaW5lLgogICAgIGF1dG8gbGluZVNwYW5uaW5nSW5saW5lQm94SW5kZXggPSBmb3Jt YXR0aW5nU3RhdGUucnVucygpLnNpemUoKTsKICAgICBjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudChsaW5lQ29udGVudCwgbGluZUJveCwgbGluZUJveExvZ2ljYWxUb3BM ZWZ0LCBsaW5lSW5kZXgpOwpAQCAtMTgzLDcgKzE3OSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChj b25zCiAgICAgZm9ybWF0dGluZ1N0YXRlLmxpbmVzKCkubGFzdCgpLnNldE5lZWRzSW50ZWdyYWxQ b3NpdGlvbihsaW5lTmVlZEludGVncmFsUG9zaXRpb24pOwogfQogCi12b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5u aW5nSW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0 UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgY29uc3Qgc2l6ZV90IC8qbGluZUluZGV4Ki8s IHNpemVfdCAvKmxpbmVTcGFubmluZ0lubGluZUJveEluZGV4Ki8pCit2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5u aW5nSW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0 UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgY29uc3Qgc2l6ZV90IGxpbmVJbmRleCwgc2l6 ZV90IGxpbmVTcGFubmluZ0lubGluZUJveEluZGV4KQogewogICAgIGlmICghbGluZUJveC5oYXND b250ZW50KCkpIHsKICAgICAgICAgLy8gV2hlbiBhIHNwYW5uaW5nIGlubGluZSBib3ggKGUuZy4g PGRpdj50ZXh0PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4pIGxhbmRzIG9uIGFuIGVtcHR5IGxpbmUK QEAgLTIwNCw5ICsyMDAsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3Jl YXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saQogICAgICAgICBhdXRv IGlubGluZUJveEJvcmRlckJveCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJv eChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1v dmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwogCi0jaWYgQUxMT1dfUk9PVF9BTkRfTElORV9T UEFOTklOR19JTkxJTkVfQk9YCiAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5ydW5zKCkuaW5zZXJ0 KGxpbmVTcGFubmluZ0lubGluZUJveEluZGV4KyssIHsgbGluZUluZGV4LCBSdW46OlR5cGU6Ok5v blJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxpbmVCb3hC b3JkZXJCb3gsIHsgfSwgeyB9LCBpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCksIHRydWUgfSk7 Ci0jZW5kaWYKKwogICAgICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlvdXRTaXplIHsgTGF5 b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gud2lkdGgoKSksIExheW91 dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LmhlaWdodCgpKSB9OwogICAg ICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gUmVjdCB7IExheW91dFBvaW50IHsgaW5saW5lQm94Qm9y ZGVyQm94LnRvcExlZnQoKSB9LCBpbmxpbmVCb3hTaXplIH07CiAgICAgICAgIC8vIE1pZGRsZSBv ciBlbmQgb2YgdGhlIGlubGluZSBib3guIExldCdzIHN0cmV0Y2ggdGhlIGJveCBhcyBuZWVkZWQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKaW5k ZXggOWY2YzFjNzk5NDA3Li5kYTFhYmRmNzIyN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBh dGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTk5LDcgKzk5LDEwIEBAIHB1YmxpYzoK ICAgICB7CiAgICAgICAgIGlmICghbGluZSgpLnJ1bkNvdW50KCkpCiAgICAgICAgICAgICByZXR1 cm4geyAqbV9pbmxpbmVDb250ZW50IH07Ci0gICAgICAgIHJldHVybiB7ICptX2lubGluZUNvbnRl bnQsIGxpbmUoKS5maXJzdFJ1bkluZGV4KCkgfTsKKyAgICAgICAgYXV0byBydW5JdGVyYXRvciA9 IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCB7ICptX2lubGluZUNvbnRlbnQsIGxpbmUoKS5maXJzdFJ1 bkluZGV4KCkgfTsKKyAgICAgICAgaWYgKHJ1bkl0ZXJhdG9yLnJ1bigpLmlzSW5saW5lQm94KCkp CisgICAgICAgICAgICBydW5JdGVyYXRvci50cmF2ZXJzZU5leHRMZWFmKCk7CisgICAgICAgIHJl dHVybiBydW5JdGVyYXRvcjsKICAgICB9CiAKICAgICBSdW5JdGVyYXRvck1vZGVyblBhdGggbGFz dFJ1bigpIGNvbnN0CkBAIC0xMDcsNyArMTEwLDEwIEBAIHB1YmxpYzoKICAgICAgICAgYXV0byBy dW5Db3VudCA9IGxpbmUoKS5ydW5Db3VudCgpOwogICAgICAgICBpZiAoIXJ1bkNvdW50KQogICAg ICAgICAgICAgcmV0dXJuIHsgKm1faW5saW5lQ29udGVudCB9OwotICAgICAgICByZXR1cm4geyAq bV9pbmxpbmVDb250ZW50LCBsaW5lKCkuZmlyc3RSdW5JbmRleCgpICsgcnVuQ291bnQgLSAxIH07 CisgICAgICAgIGF1dG8gcnVuSXRlcmF0b3IgPSBSdW5JdGVyYXRvck1vZGVyblBhdGggeyAqbV9p bmxpbmVDb250ZW50LCBsaW5lKCkuZmlyc3RSdW5JbmRleCgpICsgcnVuQ291bnQgLSAxIH07Cisg ICAgICAgIGlmIChydW5JdGVyYXRvci5ydW4oKS5pc0lubGluZUJveCgpKQorICAgICAgICAgICAg cnVuSXRlcmF0b3IudHJhdmVyc2VQcmV2aW91c0xlYWYoKTsKKyAgICAgICAgcmV0dXJuIHJ1bkl0 ZXJhdG9yOwogICAgIH0KIAogICAgIFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCBsb2dpY2FsU3RhcnRS dW4oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCBmZWQ1MTYz ZDU3NjAuLmZiODgzNzAyMjhlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAK QEAgLTQ1NSw2ICs0NTUsOCBAQCB2b2lkIExpbmVMYXlvdXQ6OnBhaW50KFBhaW50SW5mbyYgcGFp bnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpCiAgICAgcGFpbnRSZWN0Lm1v dmVCeSgtcGFpbnRPZmZzZXQpOwogCiAgICAgZm9yIChhdXRvJiBydW4gOiBtX2lubGluZUNvbnRl bnQtPnJ1bnNGb3JSZWN0KHBhaW50UmVjdCkpIHsKKyAgICAgICAgaWYgKHJ1bi5pc0lubGluZUJv eCgpKQorICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmIChydW4udGV4dCgpKQogICAg ICAgICAgICAgcGFpbnRUZXh0UnVuVXNpbmdQaHlzaWNhbENvb3JkaW5hdGVzKHBhaW50SW5mbywg cGFpbnRPZmZzZXQsIG1faW5saW5lQ29udGVudC0+bGluZUZvclJ1bihydW4pLCBydW4pOwogICAg ICAgICBlbHNlIGlmIChhdXRvJiByZW5kZXJlciA9IG1fYm94VHJlZS5yZW5kZXJlckZvckxheW91 dEJveChydW4ubGF5b3V0Qm94KCkpOyBpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSAmJiByZW5kZXJl ci5pc1JlcGxhY2VkKCkpIHsKQEAgLTQ3Nyw2ICs0NzksMTAgQEAgYm9vbCBMaW5lTGF5b3V0Ojpo aXRUZXN0KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiByZXN1 bHQsIGMKIAogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBkbyBzb21ldGhpbmcgZWZmaWNpZW50 IHRvIGZpbmQgdGhlIHJ1biByYW5nZS4KICAgICBmb3IgKGF1dG8mIHJ1biA6IFdURjo6bWFrZVJl dmVyc2VkUmFuZ2UoaW5saW5lQ29udGVudC5ydW5zKSkgeworICAgICAgICAvLyBGSVhNRTogVXNl IGZvciBoaXQgdGVzdGluZyBpbnN0ZWFkIG9mIG5vblJvb3RJbmxpbmVCb3hlcy4KKyAgICAgICAg aWYgKHJ1bi5pc0lubGluZUJveCgpKQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAgICAg YXV0byYgcmVuZGVyZXIgPSBtX2JveFRyZWUucmVuZGVyZXJGb3JMYXlvdXRCb3gocnVuLmxheW91 dEJveCgpKTsKIAogICAgICAgICBpZiAoaXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25SdW5JdGVyYXRvck1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IDVjZGRh M2JjZjA1Ny4uNjY5ZDE3MDI1MzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5J dGVyYXRvck1vZGVyblBhdGguaApAQCAtMTQxLDEwICsxNDEsMTIgQEAgcHVibGljOgogCiAgICAg ICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bigpLmxheW91dEJveCgpOwogCi0gICAgICAgICsrbV9y dW5JbmRleDsKKyAgICAgICAgdHJhdmVyc2VOZXh0TGVhZigpOwogCiAgICAgICAgIGlmICghYXRF bmQoKSAmJiAmbGF5b3V0Qm94ICE9ICZydW4oKS5sYXlvdXRCb3goKSkKICAgICAgICAgICAgIHNl dEF0RW5kKCk7CisKKyAgICAgICAgQVNTRVJUKGF0RW5kKCkgfHwgcnVuKCkudGV4dCgpKTsKICAg ICB9CiAKICAgICB2b2lkIHRyYXZlcnNlTmV4dFRleHRSdW5JblRleHRPcmRlcigpCkBAIC0xNTks NyArMTYxLDcgQEAgcHVibGljOgogCiAgICAgICAgIGF1dG8gb2xkTGluZUluZGV4ID0gcnVuKCku bGluZUluZGV4KCk7CiAKLSAgICAgICAgKyttX3J1bkluZGV4OworICAgICAgICB0cmF2ZXJzZU5l eHRMZWFmKCk7CiAKICAgICAgICAgaWYgKCFhdEVuZCgpICYmIG9sZExpbmVJbmRleCAhPSBydW4o KS5saW5lSW5kZXgoKSkKICAgICAgICAgICAgIHNldEF0RW5kKCk7CkBAIC0xNjksMTYgKzE3MSwx MSBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBBU1NFUlQoIWF0RW5kKCkpOwogCi0gICAgICAg IGlmICghbV9ydW5JbmRleCkgewotICAgICAgICAgICAgc2V0QXRFbmQoKTsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQotCiAgICAgICAgIGF1dG8gb2xkTGluZUluZGV4ID0gcnVuKCku bGluZUluZGV4KCk7CiAKLSAgICAgICAgLS1tX3J1bkluZGV4OworICAgICAgICB0cmF2ZXJzZVBy ZXZpb3VzTGVhZigpOwogCi0gICAgICAgIGlmIChvbGRMaW5lSW5kZXggIT0gcnVuKCkubGluZUlu ZGV4KCkpCisgICAgICAgIGlmICghYXRFbmQoKSAmJiBvbGRMaW5lSW5kZXggIT0gcnVuKCkubGlu ZUluZGV4KCkpCiAgICAgICAgICAgICBzZXRBdEVuZCgpOwogICAgIH0KIApAQCAtMjAyLDkgKzE5 OSwyNiBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgorICAgIGZyaWVuZCBjbGFzcyBMaW5l SXRlcmF0b3JNb2Rlcm5QYXRoOwogICAgIGZyaWVuZCBjbGFzcyBQYXRoUnVuOwogICAgIGZyaWVu ZCBjbGFzcyBSdW5JdGVyYXRvcjsKIAorICAgIHZvaWQgdHJhdmVyc2VOZXh0TGVhZigpCisgICAg eworICAgICAgICBBU1NFUlQoIWF0RW5kKCkpOworICAgICAgICBkbworICAgICAgICAgICAgKytt X3J1bkluZGV4OworICAgICAgICB3aGlsZSAoIWF0RW5kKCkgJiYgcnVuKCkuaXNJbmxpbmVCb3go KSk7CisgICAgfQorCisgICAgdm9pZCB0cmF2ZXJzZVByZXZpb3VzTGVhZigpCisgICAgeworICAg ICAgICBBU1NFUlQoIWF0RW5kKCkpOworICAgICAgICBkbworICAgICAgICAgICAgbV9ydW5JbmRl eCA9IG1fcnVuSW5kZXggPyBtX3J1bkluZGV4IC0gMSA6IHJ1bnMoKS5zaXplKCk7CisgICAgICAg IHdoaWxlICghYXRFbmQoKSAmJiBydW4oKS5pc0lubGluZUJveCgpKTsKKyAgICB9CisKICAgICBU ZXh0Qm94U2VsZWN0YWJsZVJhbmdlIHNlbGVjdGFibGVSYW5nZSgpIGNvbnN0CiAgICAgewogICAg ICAgICByZXR1cm4gewo= 437362 2021-09-05 08:50:47 -0700 2021-09-05 10:55:54 -0700 wip lfc-inlinebox-skip-2.patch text/plain 10053 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIu Y3BwCmluZGV4IDFhMTNhMmEyOWUxMS4uY2RhMGRiMjc1MTUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTM2LDggKzM2 LDYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi0jZGVmaW5l IEFMTE9XX1JPT1RfQU5EX0xJTkVfU1BBTk5JTkdfSU5MSU5FX0JPWCAwCi0KIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyKGNvbnN0IENvbnRh aW5lckJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGZv cm1hdHRpbmdTdGF0ZSkKICAgICA6IG1fZm9ybWF0dGluZ0NvbnRleHRSb290KGZvcm1hdHRpbmdD b250ZXh0Um9vdCkKICAgICAsIG1fZm9ybWF0dGluZ1N0YXRlKGZvcm1hdHRpbmdTdGF0ZSkKQEAg LTQ4LDEyICs0NiwxMCBAQCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OklubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcihjb25zdCBDb250YWluZXJCb3gmIGZvcgogdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYg bGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIGNvbnN0IHNpemVfdCBsaW5lSW5kZXgpCiB7CiAg ICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7Ci0jaWYg QUxMT1dfUk9PVF9BTkRfTElORV9TUEFOTklOR19JTkxJTkVfQk9YCiAgICAgLy8gRXZlcnkgbGlu ZSBzdGFydHMgd2l0aCBhIHJvb3QgcnVuLCBldmVuIHRoZSBlbXB0eSBvbmVzLgogICAgIGF1dG8g cm9vdElubGluZUJveFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgp OwogICAgIHJvb3RJbmxpbmVCb3hSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwog ICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6VHlwZTo6Um9vdElu bGluZUJveCwgcm9vdCgpLCByb290SW5saW5lQm94UmVjdCwgcm9vdElubGluZUJveFJlY3QsIHsg fSwgeyB9LCAgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpfSk7Ci0jZW5kaWYK ICAgICAvLyBTcGFubmluZyBpbmxpbmUgYm94ZXMgc3RhcnQgYXQgdGhlIHZlcnkgYmVnaW5uaW5n IG9mIHRoZSBsaW5lLgogICAgIGF1dG8gbGluZVNwYW5uaW5nSW5saW5lQm94SW5kZXggPSBmb3Jt YXR0aW5nU3RhdGUucnVucygpLnNpemUoKTsKICAgICBjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudChsaW5lQ29udGVudCwgbGluZUJveCwgbGluZUJveExvZ2ljYWxUb3BM ZWZ0LCBsaW5lSW5kZXgpOwpAQCAtMTgzLDcgKzE3OSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChj b25zCiAgICAgZm9ybWF0dGluZ1N0YXRlLmxpbmVzKCkubGFzdCgpLnNldE5lZWRzSW50ZWdyYWxQ b3NpdGlvbihsaW5lTmVlZEludGVncmFsUG9zaXRpb24pOwogfQogCi12b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5u aW5nSW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0 UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgY29uc3Qgc2l6ZV90IC8qbGluZUluZGV4Ki8s IHNpemVfdCAvKmxpbmVTcGFubmluZ0lubGluZUJveEluZGV4Ki8pCit2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5u aW5nSW5saW5lQm94ZXMoY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0 UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgY29uc3Qgc2l6ZV90IGxpbmVJbmRleCwgc2l6 ZV90IGxpbmVTcGFubmluZ0lubGluZUJveEluZGV4KQogewogICAgIGlmICghbGluZUJveC5oYXND b250ZW50KCkpIHsKICAgICAgICAgLy8gV2hlbiBhIHNwYW5uaW5nIGlubGluZSBib3ggKGUuZy4g PGRpdj50ZXh0PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4pIGxhbmRzIG9uIGFuIGVtcHR5IGxpbmUK QEAgLTIwNCw5ICsyMDAsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3Jl YXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saQogICAgICAgICBhdXRv IGlubGluZUJveEJvcmRlckJveCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJv eChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1v dmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwogCi0jaWYgQUxMT1dfUk9PVF9BTkRfTElORV9T UEFOTklOR19JTkxJTkVfQk9YCiAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5ydW5zKCkuaW5zZXJ0 KGxpbmVTcGFubmluZ0lubGluZUJveEluZGV4KyssIHsgbGluZUluZGV4LCBSdW46OlR5cGU6Ok5v blJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxpbmVCb3hC b3JkZXJCb3gsIHsgfSwgeyB9LCBpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCksIHRydWUgfSk7 Ci0jZW5kaWYKKwogICAgICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlvdXRTaXplIHsgTGF5 b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gud2lkdGgoKSksIExheW91 dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LmhlaWdodCgpKSB9OwogICAg ICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gUmVjdCB7IExheW91dFBvaW50IHsgaW5saW5lQm94Qm9y ZGVyQm94LnRvcExlZnQoKSB9LCBpbmxpbmVCb3hTaXplIH07CiAgICAgICAgIC8vIE1pZGRsZSBv ciBlbmQgb2YgdGhlIGlubGluZSBib3guIExldCdzIHN0cmV0Y2ggdGhlIGJveCBhcyBuZWVkZWQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwCmluZGV4IGZkYjc0YjQ1M2Ez NC4uODUzMGU0YTg3NDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNw cApAQCAtNDEsNiArNDEsMTUgQEAgSW5saW5lQ29udGVudDo6SW5saW5lQ29udGVudChjb25zdCBM aW5lTGF5b3V0JiBsaW5lTGF5b3V0KQogewogfQogCitib29sIElubGluZUNvbnRlbnQ6Omhhc0xl YWZSdW5zKCkgY29uc3QKK3sKKyAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKKyAgICAgICAg aWYgKCFydW4uaXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KyAgICByZXR1cm4gZmFsc2U7Cit9OworCiBXVEY6Okl0ZXJhdG9yUmFuZ2U8Y29uc3QgUnVuKj4g SW5saW5lQ29udGVudDo6cnVuc0ZvclJlY3QoY29uc3QgTGF5b3V0UmVjdCYpIGNvbnN0CiB7CiAg ICAgLy8gRklYTUU6IERvIHNvbWV0aGluZyBlZmZpY2llbnQgZS5nLiB1c2luZyBsaW5lIGJveGVz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCmluZGV4IGIwN2IxMGUwYzhlMC4u ZDg3ODFhNWQ3YmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCkBAIC02 Myw2ICs2Myw4IEBAIHN0cnVjdCBJbmxpbmVDb250ZW50IDogcHVibGljIFJlZkNvdW50ZWQ8SW5s aW5lQ29udGVudD4gewogCiAgICAgZmxvYXQgY2xlYXJHYXBBZnRlckxhc3RMaW5lIHsgMCB9Owog CisgICAgYm9vbCBoYXNMZWFmUnVucygpIGNvbnN0OworICAgIAogICAgIGNvbnN0IExpbmUmIGxp bmVGb3JSdW4oY29uc3QgUnVuJiBydW4pIGNvbnN0IHsgcmV0dXJuIGxpbmVzW3J1bi5saW5lSW5k ZXgoKV07IH0KICAgICBXVEY6Okl0ZXJhdG9yUmFuZ2U8Y29uc3QgUnVuKj4gcnVuc0ZvclJlY3Qo Y29uc3QgTGF5b3V0UmVjdCYpIGNvbnN0OwogICAgIHZvaWQgc2hyaW5rVG9GaXQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkxpbmVJdGVyYXRvck1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaAppbmRleCA5ZjZj MWM3OTk0MDcuLmRhMWFiZGY3MjI3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVJdGVyYXRvck1vZGVyblBhdGguaApAQCAtOTksNyArOTksMTAgQEAgcHVibGljOgogICAgIHsK ICAgICAgICAgaWYgKCFsaW5lKCkucnVuQ291bnQoKSkKICAgICAgICAgICAgIHJldHVybiB7ICpt X2lubGluZUNvbnRlbnQgfTsKLSAgICAgICAgcmV0dXJuIHsgKm1faW5saW5lQ29udGVudCwgbGlu ZSgpLmZpcnN0UnVuSW5kZXgoKSB9OworICAgICAgICBhdXRvIHJ1bkl0ZXJhdG9yID0gUnVuSXRl cmF0b3JNb2Rlcm5QYXRoIHsgKm1faW5saW5lQ29udGVudCwgbGluZSgpLmZpcnN0UnVuSW5kZXgo KSB9OworICAgICAgICBpZiAocnVuSXRlcmF0b3IucnVuKCkuaXNJbmxpbmVCb3goKSkKKyAgICAg ICAgICAgIHJ1bkl0ZXJhdG9yLnRyYXZlcnNlTmV4dExlYWYoKTsKKyAgICAgICAgcmV0dXJuIHJ1 bkl0ZXJhdG9yOwogICAgIH0KIAogICAgIFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCBsYXN0UnVuKCkg Y29uc3QKQEAgLTEwNyw3ICsxMTAsMTAgQEAgcHVibGljOgogICAgICAgICBhdXRvIHJ1bkNvdW50 ID0gbGluZSgpLnJ1bkNvdW50KCk7CiAgICAgICAgIGlmICghcnVuQ291bnQpCiAgICAgICAgICAg ICByZXR1cm4geyAqbV9pbmxpbmVDb250ZW50IH07Ci0gICAgICAgIHJldHVybiB7ICptX2lubGlu ZUNvbnRlbnQsIGxpbmUoKS5maXJzdFJ1bkluZGV4KCkgKyBydW5Db3VudCAtIDEgfTsKKyAgICAg ICAgYXV0byBydW5JdGVyYXRvciA9IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCB7ICptX2lubGluZUNv bnRlbnQsIGxpbmUoKS5maXJzdFJ1bkluZGV4KCkgKyBydW5Db3VudCAtIDEgfTsKKyAgICAgICAg aWYgKHJ1bkl0ZXJhdG9yLnJ1bigpLmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICBydW5JdGVy YXRvci50cmF2ZXJzZVByZXZpb3VzTGVhZigpOworICAgICAgICByZXR1cm4gcnVuSXRlcmF0b3I7 CiAgICAgfQogCiAgICAgUnVuSXRlcmF0b3JNb2Rlcm5QYXRoIGxvZ2ljYWxTdGFydFJ1bigpIGNv bnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IGZlZDUxNjNkNTc2MC4u NjdmMmE4MGYyMjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMzAy LDcgKzMwMiw3IEBAIHNpemVfdCBMaW5lTGF5b3V0OjpsaW5lQ291bnQoKSBjb25zdAogewogICAg IGlmICghbV9pbmxpbmVDb250ZW50KQogICAgICAgICByZXR1cm4gMDsKLSAgICBpZiAobV9pbmxp bmVDb250ZW50LT5ydW5zLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1faW5saW5lQ29udGVudC0+aGFz TGVhZlJ1bnMoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gbV9pbmxpbmVDb250 ZW50LT5saW5lcy5zaXplKCk7CkBAIC00MTYsNyArNDE2LDggQEAgTGF5b3V0UmVjdCBMaW5lTGF5 b3V0OjplbmNsb3NpbmdCb3JkZXJCb3hSZWN0Rm9yKGNvbnN0IFJlbmRlcklubGluZSYgcmVuZGVy SW5saW4KICAgICBpZiAoIW1faW5saW5lQ29udGVudCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIGlmIChtX2lubGluZUNvbnRlbnQtPnJ1bnMuaXNFbXB0eSgpKQorICAgIC8vIEZJWE1FOiBU aGlzIGtlZXBzIHRoZSBleGlzdGluZyBvdXRwdXQuCisgICAgaWYgKCFtX2lubGluZUNvbnRlbnQt Pmhhc0xlYWZSdW5zKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICByZXR1cm4gTGF5b3V0 OjpCb3hHZW9tZXRyeTo6Ym9yZGVyQm94UmVjdChtX2lubGluZUZvcm1hdHRpbmdTdGF0ZS5ib3hH ZW9tZXRyeShtX2JveFRyZWUubGF5b3V0Qm94Rm9yUmVuZGVyZXIocmVuZGVySW5saW5lKSkpOwpA QCAtNDU1LDYgKzQ1Niw4IEBAIHZvaWQgTGluZUxheW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWlu dEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKICAgICBwYWludFJlY3QubW92 ZUJ5KC1wYWludE9mZnNldCk7CiAKICAgICBmb3IgKGF1dG8mIHJ1biA6IG1faW5saW5lQ29udGVu dC0+cnVuc0ZvclJlY3QocGFpbnRSZWN0KSkgeworICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94 KCkpCisgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKHJ1bi50ZXh0KCkpCiAgICAg ICAgICAgICBwYWludFRleHRSdW5Vc2luZ1BoeXNpY2FsQ29vcmRpbmF0ZXMocGFpbnRJbmZvLCBw YWludE9mZnNldCwgbV9pbmxpbmVDb250ZW50LT5saW5lRm9yUnVuKHJ1biksIHJ1bik7CiAgICAg ICAgIGVsc2UgaWYgKGF1dG8mIHJlbmRlcmVyID0gbV9ib3hUcmVlLnJlbmRlcmVyRm9yTGF5b3V0 Qm94KHJ1bi5sYXlvdXRCb3goKSk7IGlzPFJlbmRlckJveD4ocmVuZGVyZXIpICYmIHJlbmRlcmVy LmlzUmVwbGFjZWQoKSkgewpAQCAtNDc3LDYgKzQ4MCwxMCBAQCBib29sIExpbmVMYXlvdXQ6Omhp dFRlc3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3Vs dCwgYwogCiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGRvIHNvbWV0aGluZyBlZmZpY2llbnQg dG8gZmluZCB0aGUgcnVuIHJhbmdlLgogICAgIGZvciAoYXV0byYgcnVuIDogV1RGOjptYWtlUmV2 ZXJzZWRSYW5nZShpbmxpbmVDb250ZW50LnJ1bnMpKSB7CisgICAgICAgIC8vIEZJWE1FOiBVc2Ug Zm9yIGhpdCB0ZXN0aW5nIGluc3RlYWQgb2Ygbm9uUm9vdElubGluZUJveGVzLgorICAgICAgICBp ZiAocnVuLmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICBjb250aW51ZTsKKwogICAgICAgICBh dXRvJiByZW5kZXJlciA9IG1fYm94VHJlZS5yZW5kZXJlckZvckxheW91dEJveChydW4ubGF5b3V0 Qm94KCkpOwogCiAgICAgICAgIGlmIChpczxSZW5kZXJUZXh0PihyZW5kZXJlcikpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv blJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3JNb2Rlcm5QYXRoLmgKaW5kZXggNWNkZGEz YmNmMDU3Li5iMDViZDA1ZWQxNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0 ZXJhdG9yTW9kZXJuUGF0aC5oCkBAIC0xNDEsMTAgKzE0MSwxMiBAQCBwdWJsaWM6CiAKICAgICAg ICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuKCkubGF5b3V0Qm94KCk7CiAKLSAgICAgICAgKyttX3J1 bkluZGV4OworICAgICAgICB0cmF2ZXJzZU5leHRMZWFmKCk7CiAKICAgICAgICAgaWYgKCFhdEVu ZCgpICYmICZsYXlvdXRCb3ggIT0gJnJ1bigpLmxheW91dEJveCgpKQogICAgICAgICAgICAgc2V0 QXRFbmQoKTsKKworICAgICAgICBBU1NFUlQoYXRFbmQoKSB8fCBydW4oKS50ZXh0KCkpOwogICAg IH0KIAogICAgIHZvaWQgdHJhdmVyc2VOZXh0VGV4dFJ1bkluVGV4dE9yZGVyKCkKQEAgLTE1OSw3 ICsxNjEsNyBAQCBwdWJsaWM6CiAKICAgICAgICAgYXV0byBvbGRMaW5lSW5kZXggPSBydW4oKS5s aW5lSW5kZXgoKTsKIAotICAgICAgICArK21fcnVuSW5kZXg7CisgICAgICAgIHRyYXZlcnNlTmV4 dExlYWYoKTsKIAogICAgICAgICBpZiAoIWF0RW5kKCkgJiYgb2xkTGluZUluZGV4ICE9IHJ1bigp LmxpbmVJbmRleCgpKQogICAgICAgICAgICAgc2V0QXRFbmQoKTsKQEAgLTE2OSwxNiArMTcxLDEx IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFTU0VSVCghYXRFbmQoKSk7CiAKLSAgICAgICAg aWYgKCFtX3J1bkluZGV4KSB7Ci0gICAgICAgICAgICBzZXRBdEVuZCgpOwotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9Ci0KICAgICAgICAgYXV0byBvbGRMaW5lSW5kZXggPSBydW4oKS5s aW5lSW5kZXgoKTsKIAotICAgICAgICAtLW1fcnVuSW5kZXg7CisgICAgICAgIHRyYXZlcnNlUHJl dmlvdXNMZWFmKCk7CiAKLSAgICAgICAgaWYgKG9sZExpbmVJbmRleCAhPSBydW4oKS5saW5lSW5k ZXgoKSkKKyAgICAgICAgaWYgKCFhdEVuZCgpICYmIG9sZExpbmVJbmRleCAhPSBydW4oKS5saW5l SW5kZXgoKSkKICAgICAgICAgICAgIHNldEF0RW5kKCk7CiAgICAgfQogCkBAIC0yMDIsOSArMTk5 LDI2IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIExpbmVJ dGVyYXRvck1vZGVyblBhdGg7CiAgICAgZnJpZW5kIGNsYXNzIFBhdGhSdW47CiAgICAgZnJpZW5k IGNsYXNzIFJ1bkl0ZXJhdG9yOwogCisgICAgdm9pZCB0cmF2ZXJzZU5leHRMZWFmKCkKKyAgICB7 CisgICAgICAgIEFTU0VSVCghYXRFbmQoKSk7CisgICAgICAgIGRvIHsKKyAgICAgICAgICAgICsr bV9ydW5JbmRleDsKKyAgICAgICAgfSB3aGlsZSAoIWF0RW5kKCkgJiYgcnVuKCkuaXNJbmxpbmVC b3goKSk7CisgICAgfQorCisgICAgdm9pZCB0cmF2ZXJzZVByZXZpb3VzTGVhZigpCisgICAgewor ICAgICAgICBBU1NFUlQoIWF0RW5kKCkpOworICAgICAgICBkbyB7CisgICAgICAgICAgICBtX3J1 bkluZGV4ID0gbV9ydW5JbmRleCA/IG1fcnVuSW5kZXggLSAxIDogcnVucygpLnNpemUoKTsKKyAg ICAgICAgfSB3aGlsZSAoIWF0RW5kKCkgJiYgcnVuKCkuaXNJbmxpbmVCb3goKSk7CisgICAgfQor CiAgICAgVGV4dEJveFNlbGVjdGFibGVSYW5nZSBzZWxlY3RhYmxlUmFuZ2UoKSBjb25zdAogICAg IHsKICAgICAgICAgcmV0dXJuIHsK 437363 2021-09-05 10:55:54 -0700 2021-09-05 12:17:21 -0700 patch lfc-inlinebox-skip-3.patch text/plain 13382 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NGQ1YjNiYzBkYjUuLjA3Nzc5MGY2NjI5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA CisyMDIxLTA5LTA1ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBbTEZDXVtJbnRlZ3JhdGlvbl0gU2tpcCBpbmxpbmUgYm94ZXMgaW4gaXRlcmF0b3IKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTkyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9yZXBhaW50 L2lmcmFtZS1vbi1zdWJwaXhlbC1wb3NpdGlvbi1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDktMDMg IEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAgVXNlIGlzUmVu ZGVyZXJSZXBsYWNlZEVsZW1lbnQgZm9yIFNpbXBsaWZpZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3IK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9pZnJhbWUtb24tc3VicGl4ZWwt cG9zaXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2lmcmFtZS1v bi1zdWJwaXhlbC1wb3NpdGlvbi1leHBlY3RlZC50eHQKaW5kZXggOWZlY2E2ZjZkOTg4Li5mOWM0 MzVmMTIwZWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9pZnJhbWUtb24t c3VicGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVw YWludC9pZnJhbWUtb24tc3VicGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQudHh0CkBAIC04LDcgKzgs NyBAQAogICAgICAgKGNvbnRlbnRzT3BhcXVlIDEpCiAgICAgICAoY2hpbGRyZW4gMQogICAgICAg ICAoR3JhcGhpY3NMYXllcgotICAgICAgICAgIChib3VuZHMgMzAxLjAwIDE1MS4wMCkKKyAgICAg ICAgICAoYm91bmRzIDMwMS4wMCAxNTUuMDApCiAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQog ICAgICAgICAgIChyZXBhaW50IHJlY3RzCiAgICAgICAgICAgICAocmVjdCAwLjAwIDAuMDAgMTAx LjAwIDEwMS4wMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1N2YxOTAzMjI5MmYuLmE0ODZmZDYwNTUyOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTA5LTA1ICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gU2tpcCBpbmxpbmUg Ym94ZXMgaW4gaXRlcmF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyOTkyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFN0YXJ0IGluY2x1ZGluZyByb290IGFuZCBub24tcm9vdCBpbmxpbmUgYm94ZXMg dG8gdGhlIHJ1biB2ZWN0b3IuCisgICAgICAgIENoYW5nZSB0aGUgaXRlcmF0b3IgdG8gc2tpcCBv dmVyIHRoZXNlIGJveGVzLgorCisgICAgICAgIFRoZSBuZXcgYm94ZXMgYXJlIG5vdCB1c2VkIGZv ciBhbnl0aGluZyB5ZXQuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5k VXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxpbmVCb3hlcyk6CisgICAgICAgICogbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudDo6aGFzQ29udGVu dCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudC5oOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpmaXJzdFJ1biBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0 aDo6bGFzdFJ1biBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6TGluZUxheW91dDo6bGluZUNvdW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjplbmNsb3NpbmdCb3JkZXJCb3hSZWN0Rm9yIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpw YWludCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6 aGl0VGVzdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u UnVuSXRlcmF0b3JNb2Rlcm5QYXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6UnVuSXRlcmF0b3JNb2Rlcm5QYXRoOjp0cmF2ZXJzZU5leHRUZXh0UnVuKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVyYXRvck1vZGVyblBhdGg6OnRy YXZlcnNlTmV4dE9uTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 UnVuSXRlcmF0b3JNb2Rlcm5QYXRoOjp0cmF2ZXJzZVByZXZpb3VzT25MaW5lKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVyYXRvck1vZGVyblBhdGg6OnRyYXZl cnNlTmV4dExlYWYpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OlJ1bkl0 ZXJhdG9yTW9kZXJuUGF0aDo6dHJhdmVyc2VQcmV2aW91c0xlYWYpOgorCiAyMDIxLTA5LTAzICBG csOpZMOpcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVzZSBpc1JlbmRl cmVyUmVwbGFjZWRFbGVtZW50IGZvciBTaW1wbGlmaWVkQmFja3dhcmRzVGV4dEl0ZXJhdG9yCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNw cAppbmRleCAxYTEzYTJhMjllMTEuLmNkYTBkYjI3NTE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC0zNiw4ICszNiw2 IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotI2RlZmluZSBB TExPV19ST09UX0FORF9MSU5FX1NQQU5OSU5HX0lOTElORV9CT1ggMAotCiBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcihjb25zdCBDb250YWlu ZXJCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBmb3Jt YXR0aW5nU3RhdGUpCiAgICAgOiBtX2Zvcm1hdHRpbmdDb250ZXh0Um9vdChmb3JtYXR0aW5nQ29u dGV4dFJvb3QpCiAgICAgLCBtX2Zvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nU3RhdGUpCkBAIC00 OCwxMiArNDYsMTAgQEAgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIoY29uc3QgQ29udGFpbmVyQm94JiBmb3IKIHZvaWQgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxp bmVDb250ZW50LCBjb25zdCBMaW5lQm94JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2lu dCYgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBjb25zdCBzaXplX3QgbGluZUluZGV4KQogewogICAg IGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwotI2lmIEFM TE9XX1JPT1RfQU5EX0xJTkVfU1BBTk5JTkdfSU5MSU5FX0JPWAogICAgIC8vIEV2ZXJ5IGxpbmUg c3RhcnRzIHdpdGggYSByb290IHJ1biwgZXZlbiB0aGUgZW1wdHkgb25lcy4KICAgICBhdXRvIHJv b3RJbmxpbmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclJvb3RJbmxpbmVCb3goKTsK ICAgICByb290SW5saW5lQm94UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKICAg ICBmb3JtYXR0aW5nU3RhdGUuYWRkUnVuKHsgbGluZUluZGV4LCBSdW46OlR5cGU6OlJvb3RJbmxp bmVCb3gsIHJvb3QoKSwgcm9vdElubGluZUJveFJlY3QsIHJvb3RJbmxpbmVCb3hSZWN0LCB7IH0s IHsgfSwgIGxpbmVCb3gucm9vdElubGluZUJveCgpLmhhc0NvbnRlbnQoKX0pOwotI2VuZGlmCiAg ICAgLy8gU3Bhbm5pbmcgaW5saW5lIGJveGVzIHN0YXJ0IGF0IHRoZSB2ZXJ5IGJlZ2lubmluZyBv ZiB0aGUgbGluZS4KICAgICBhdXRvIGxpbmVTcGFubmluZ0lubGluZUJveEluZGV4ID0gZm9ybWF0 dGluZ1N0YXRlLnJ1bnMoKS5zaXplKCk7CiAgICAgY3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5 Rm9yTGluZUNvbnRlbnQobGluZUNvbnRlbnQsIGxpbmVCb3gsIGxpbmVCb3hMb2dpY2FsVG9wTGVm dCwgbGluZUluZGV4KTsKQEAgLTE4Myw3ICsxNzksNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29u cwogICAgIGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLmxhc3QoKS5zZXROZWVkc0ludGVncmFsUG9z aXRpb24obGluZU5lZWRJbnRlZ3JhbFBvc2l0aW9uKTsKIH0KIAotdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmlu Z0lubGluZUJveGVzKGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIGNvbnN0IHNpemVfdCAvKmxpbmVJbmRleCovLCBz aXplX3QgLypsaW5lU3Bhbm5pbmdJbmxpbmVCb3hJbmRleCovKQordm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmlu Z0lubGluZUJveGVzKGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBv aW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIGNvbnN0IHNpemVfdCBsaW5lSW5kZXgsIHNpemVf dCBsaW5lU3Bhbm5pbmdJbmxpbmVCb3hJbmRleCkKIHsKICAgICBpZiAoIWxpbmVCb3guaGFzQ29u dGVudCgpKSB7CiAgICAgICAgIC8vIFdoZW4gYSBzcGFubmluZyBpbmxpbmUgYm94IChlLmcuIDxk aXY+dGV4dDxzcGFuPjxicj48L3NwYW4+PC9kaXY+KSBsYW5kcyBvbiBhbiBlbXB0eSBsaW5lCkBA IC0yMDQsOSArMjAwLDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0 ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubGkKICAgICAgICAgYXV0byBp bmxpbmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3go bGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgIGlubGluZUJveEJvcmRlckJveC5tb3Zl QnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKIAotI2lmIEFMTE9XX1JPT1RfQU5EX0xJTkVfU1BB Tk5JTkdfSU5MSU5FX0JPWAogICAgICAgICBmb3JtYXR0aW5nU3RhdGUucnVucygpLmluc2VydChs aW5lU3Bhbm5pbmdJbmxpbmVCb3hJbmRleCsrLCB7IGxpbmVJbmRleCwgUnVuOjpUeXBlOjpOb25S b290SW5saW5lQm94LCBsYXlvdXRCb3gsIGlubGluZUJveEJvcmRlckJveCwgaW5saW5lQm94Qm9y ZGVyQm94LCB7IH0sIHsgfSwgaW5saW5lTGV2ZWxCb3guaGFzQ29udGVudCgpLCB0cnVlIH0pOwot I2VuZGlmCisKICAgICAgICAgYXV0byBpbmxpbmVCb3hTaXplID0gTGF5b3V0U2l6ZSB7IExheW91 dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVyQm94LndpZHRoKCkpLCBMYXlvdXRV bml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJveC5oZWlnaHQoKSkgfTsKICAgICAg ICAgYXV0byBsb2dpY2FsUmVjdCA9IFJlY3QgeyBMYXlvdXRQb2ludCB7IGlubGluZUJveEJvcmRl ckJveC50b3BMZWZ0KCkgfSwgaW5saW5lQm94U2l6ZSB9OwogICAgICAgICAvLyBNaWRkbGUgb3Ig ZW5kIG9mIHRoZSBpbmxpbmUgYm94LiBMZXQncyBzdHJldGNoIHRoZSBib3ggYXMgbmVlZGVkLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAppbmRleCBmZGI3NGI0NTNhMzQu LjMzMzU5NzQ2NTE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHAK QEAgLTQxLDYgKzQxLDEyIEBAIElubGluZUNvbnRlbnQ6OklubGluZUNvbnRlbnQoY29uc3QgTGlu ZUxheW91dCYgbGluZUxheW91dCkKIHsKIH0KIAorYm9vbCBJbmxpbmVDb250ZW50OjpoYXNDb250 ZW50KCkgY29uc3QKK3sKKyAgICBBU1NFUlQocnVucy5pc0VtcHR5KCkgfHwgcnVuc1swXS5pc1Jv b3RJbmxpbmVCb3goKSk7CisgICAgcmV0dXJuIHJ1bnMuc2l6ZSgpID4gMTsKK307CisKIFdURjo6 SXRlcmF0b3JSYW5nZTxjb25zdCBSdW4qPiBJbmxpbmVDb250ZW50OjpydW5zRm9yUmVjdChjb25z dCBMYXlvdXRSZWN0JikgY29uc3QKIHsKICAgICAvLyBGSVhNRTogRG8gc29tZXRoaW5nIGVmZmlj aWVudCBlLmcuIHVzaW5nIGxpbmUgYm94ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50LmgKaW5kZXggYjA3YjEwZTBjOGUwLi5iNTc0MDI2MmE2ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50LmgKQEAgLTYzLDYgKzYzLDggQEAgc3RydWN0IElubGluZUNvbnRl bnQgOiBwdWJsaWMgUmVmQ291bnRlZDxJbmxpbmVDb250ZW50PiB7CiAKICAgICBmbG9hdCBjbGVh ckdhcEFmdGVyTGFzdExpbmUgeyAwIH07CiAKKyAgICBib29sIGhhc0NvbnRlbnQoKSBjb25zdDsK KyAgICAKICAgICBjb25zdCBMaW5lJiBsaW5lRm9yUnVuKGNvbnN0IFJ1biYgcnVuKSBjb25zdCB7 IHJldHVybiBsaW5lc1tydW4ubGluZUluZGV4KCldOyB9CiAgICAgV1RGOjpJdGVyYXRvclJhbmdl PGNvbnN0IFJ1bio+IHJ1bnNGb3JSZWN0KGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsKICAgICB2 b2lkIHNocmlua1RvRml0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0 b3JNb2Rlcm5QYXRoLmgKaW5kZXggOWY2YzFjNzk5NDA3Li5kYTFhYmRmNzIyN2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVJdGVyYXRvck1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTk5LDcg Kzk5LDEwIEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIGlmICghbGluZSgpLnJ1bkNvdW50KCkp CiAgICAgICAgICAgICByZXR1cm4geyAqbV9pbmxpbmVDb250ZW50IH07Ci0gICAgICAgIHJldHVy biB7ICptX2lubGluZUNvbnRlbnQsIGxpbmUoKS5maXJzdFJ1bkluZGV4KCkgfTsKKyAgICAgICAg YXV0byBydW5JdGVyYXRvciA9IFJ1bkl0ZXJhdG9yTW9kZXJuUGF0aCB7ICptX2lubGluZUNvbnRl bnQsIGxpbmUoKS5maXJzdFJ1bkluZGV4KCkgfTsKKyAgICAgICAgaWYgKHJ1bkl0ZXJhdG9yLnJ1 bigpLmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICBydW5JdGVyYXRvci50cmF2ZXJzZU5leHRM ZWFmKCk7CisgICAgICAgIHJldHVybiBydW5JdGVyYXRvcjsKICAgICB9CiAKICAgICBSdW5JdGVy YXRvck1vZGVyblBhdGggbGFzdFJ1bigpIGNvbnN0CkBAIC0xMDcsNyArMTEwLDEwIEBAIHB1Ymxp YzoKICAgICAgICAgYXV0byBydW5Db3VudCA9IGxpbmUoKS5ydW5Db3VudCgpOwogICAgICAgICBp ZiAoIXJ1bkNvdW50KQogICAgICAgICAgICAgcmV0dXJuIHsgKm1faW5saW5lQ29udGVudCB9Owot ICAgICAgICByZXR1cm4geyAqbV9pbmxpbmVDb250ZW50LCBsaW5lKCkuZmlyc3RSdW5JbmRleCgp ICsgcnVuQ291bnQgLSAxIH07CisgICAgICAgIGF1dG8gcnVuSXRlcmF0b3IgPSBSdW5JdGVyYXRv ck1vZGVyblBhdGggeyAqbV9pbmxpbmVDb250ZW50LCBsaW5lKCkuZmlyc3RSdW5JbmRleCgpICsg cnVuQ291bnQgLSAxIH07CisgICAgICAgIGlmIChydW5JdGVyYXRvci5ydW4oKS5pc0lubGluZUJv eCgpKQorICAgICAgICAgICAgcnVuSXRlcmF0b3IudHJhdmVyc2VQcmV2aW91c0xlYWYoKTsKKyAg ICAgICAgcmV0dXJuIHJ1bkl0ZXJhdG9yOwogICAgIH0KIAogICAgIFJ1bkl0ZXJhdG9yTW9kZXJu UGF0aCBsb2dpY2FsU3RhcnRSdW4oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0 LmNwcAppbmRleCBmZWQ1MTYzZDU3NjAuLjFkOWI4ZmRlMmViYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uTGluZUxheW91dC5jcHAKQEAgLTMwMiw3ICszMDIsNyBAQCBzaXplX3QgTGluZUxheW91dDo6 bGluZUNvdW50KCkgY29uc3QKIHsKICAgICBpZiAoIW1faW5saW5lQ29udGVudCkKICAgICAgICAg cmV0dXJuIDA7Ci0gICAgaWYgKG1faW5saW5lQ29udGVudC0+cnVucy5pc0VtcHR5KCkpCisgICAg aWYgKCFtX2lubGluZUNvbnRlbnQtPmhhc0NvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK ICAgICByZXR1cm4gbV9pbmxpbmVDb250ZW50LT5saW5lcy5zaXplKCk7CkBAIC00MTYsNyArNDE2 LDggQEAgTGF5b3V0UmVjdCBMaW5lTGF5b3V0OjplbmNsb3NpbmdCb3JkZXJCb3hSZWN0Rm9yKGNv bnN0IFJlbmRlcklubGluZSYgcmVuZGVySW5saW4KICAgICBpZiAoIW1faW5saW5lQ29udGVudCkK ICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIGlmIChtX2lubGluZUNvbnRlbnQtPnJ1bnMuaXNF bXB0eSgpKQorICAgIC8vIEZJWE1FOiBUaGlzIGtlZXBzIHRoZSBleGlzdGluZyBvdXRwdXQuCisg ICAgaWYgKCFtX2lubGluZUNvbnRlbnQtPmhhc0NvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuIHsg fTsKIAogICAgIHJldHVybiBMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJCb3hSZWN0KG1faW5s aW5lRm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5k ZXJlcihyZW5kZXJJbmxpbmUpKSk7CkBAIC00NTUsNiArNDU2LDggQEAgdm9pZCBMaW5lTGF5b3V0 OjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zm c2V0KQogICAgIHBhaW50UmVjdC5tb3ZlQnkoLXBhaW50T2Zmc2V0KTsKIAogICAgIGZvciAoYXV0 byYgcnVuIDogbV9pbmxpbmVDb250ZW50LT5ydW5zRm9yUmVjdChwYWludFJlY3QpKSB7CisgICAg ICAgIGlmIChydW4uaXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICBpZiAocnVuLnRleHQoKSkKICAgICAgICAgICAgIHBhaW50VGV4dFJ1blVzaW5nUGh5c2ljYWxD b29yZGluYXRlcyhwYWludEluZm8sIHBhaW50T2Zmc2V0LCBtX2lubGluZUNvbnRlbnQtPmxpbmVG b3JSdW4ocnVuKSwgcnVuKTsKICAgICAgICAgZWxzZSBpZiAoYXV0byYgcmVuZGVyZXIgPSBtX2Jv eFRyZWUucmVuZGVyZXJGb3JMYXlvdXRCb3gocnVuLmxheW91dEJveCgpKTsgaXM8UmVuZGVyQm94 PihyZW5kZXJlcikgJiYgcmVuZGVyZXIuaXNSZXBsYWNlZCgpKSB7CkBAIC00NzcsNiArNDgwLDEw IEBAIGJvb2wgTGluZUxheW91dDo6aGl0VGVzdChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVz dCwgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjCiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQg ZG8gc29tZXRoaW5nIGVmZmljaWVudCB0byBmaW5kIHRoZSBydW4gcmFuZ2UuCiAgICAgZm9yIChh dXRvJiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKGlubGluZUNvbnRlbnQucnVucykpIHsK KyAgICAgICAgLy8gRklYTUU6IFVzZSBmb3IgaGl0IHRlc3RpbmcgaW5zdGVhZCBvZiBub25Sb290 SW5saW5lQm94ZXMuCisgICAgICAgIGlmIChydW4uaXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAg IGNvbnRpbnVlOworCiAgICAgICAgIGF1dG8mIHJlbmRlcmVyID0gbV9ib3hUcmVlLnJlbmRlcmVy Rm9yTGF5b3V0Qm94KHJ1bi5sYXlvdXRCb3goKSk7CiAKICAgICAgICAgaWYgKGlzPFJlbmRlclRl eHQ+KHJlbmRlcmVyKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3JNb2Rlcm5QYXRoLmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1v ZGVyblBhdGguaAppbmRleCA1Y2RkYTNiY2YwNTcuLmIwNWJkMDVlZDE3MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRl cmF0b3JNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTE0MSwxMCArMTQx LDEyIEBAIHB1YmxpYzoKIAogICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBydW4oKS5sYXlvdXRC b3goKTsKIAotICAgICAgICArK21fcnVuSW5kZXg7CisgICAgICAgIHRyYXZlcnNlTmV4dExlYWYo KTsKIAogICAgICAgICBpZiAoIWF0RW5kKCkgJiYgJmxheW91dEJveCAhPSAmcnVuKCkubGF5b3V0 Qm94KCkpCiAgICAgICAgICAgICBzZXRBdEVuZCgpOworCisgICAgICAgIEFTU0VSVChhdEVuZCgp IHx8IHJ1bigpLnRleHQoKSk7CiAgICAgfQogCiAgICAgdm9pZCB0cmF2ZXJzZU5leHRUZXh0UnVu SW5UZXh0T3JkZXIoKQpAQCAtMTU5LDcgKzE2MSw3IEBAIHB1YmxpYzoKIAogICAgICAgICBhdXRv IG9sZExpbmVJbmRleCA9IHJ1bigpLmxpbmVJbmRleCgpOwogCi0gICAgICAgICsrbV9ydW5JbmRl eDsKKyAgICAgICAgdHJhdmVyc2VOZXh0TGVhZigpOwogCiAgICAgICAgIGlmICghYXRFbmQoKSAm JiBvbGRMaW5lSW5kZXggIT0gcnVuKCkubGluZUluZGV4KCkpCiAgICAgICAgICAgICBzZXRBdEVu ZCgpOwpAQCAtMTY5LDE2ICsxNzEsMTEgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgQVNTRVJU KCFhdEVuZCgpKTsKIAotICAgICAgICBpZiAoIW1fcnVuSW5kZXgpIHsKLSAgICAgICAgICAgIHNl dEF0RW5kKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAgICAgICBhdXRv IG9sZExpbmVJbmRleCA9IHJ1bigpLmxpbmVJbmRleCgpOwogCi0gICAgICAgIC0tbV9ydW5JbmRl eDsKKyAgICAgICAgdHJhdmVyc2VQcmV2aW91c0xlYWYoKTsKIAotICAgICAgICBpZiAob2xkTGlu ZUluZGV4ICE9IHJ1bigpLmxpbmVJbmRleCgpKQorICAgICAgICBpZiAoIWF0RW5kKCkgJiYgb2xk TGluZUluZGV4ICE9IHJ1bigpLmxpbmVJbmRleCgpKQogICAgICAgICAgICAgc2V0QXRFbmQoKTsK ICAgICB9CiAKQEAgLTIwMiw5ICsxOTksMjYgQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToK KyAgICBmcmllbmQgY2xhc3MgTGluZUl0ZXJhdG9yTW9kZXJuUGF0aDsKICAgICBmcmllbmQgY2xh c3MgUGF0aFJ1bjsKICAgICBmcmllbmQgY2xhc3MgUnVuSXRlcmF0b3I7CiAKKyAgICB2b2lkIHRy YXZlcnNlTmV4dExlYWYoKQorICAgIHsKKyAgICAgICAgQVNTRVJUKCFhdEVuZCgpKTsKKyAgICAg ICAgZG8geworICAgICAgICAgICAgKyttX3J1bkluZGV4OworICAgICAgICB9IHdoaWxlICghYXRF bmQoKSAmJiBydW4oKS5pc0lubGluZUJveCgpKTsKKyAgICB9CisKKyAgICB2b2lkIHRyYXZlcnNl UHJldmlvdXNMZWFmKCkKKyAgICB7CisgICAgICAgIEFTU0VSVCghYXRFbmQoKSk7CisgICAgICAg IGRvIHsKKyAgICAgICAgICAgIG1fcnVuSW5kZXggPSBtX3J1bkluZGV4ID8gbV9ydW5JbmRleCAt IDEgOiBydW5zKCkuc2l6ZSgpOworICAgICAgICB9IHdoaWxlICghYXRFbmQoKSAmJiBydW4oKS5p c0lubGluZUJveCgpKTsKKyAgICB9CisKICAgICBUZXh0Qm94U2VsZWN0YWJsZVJhbmdlIHNlbGVj dGFibGVSYW5nZSgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gewo=