232571 2021-11-01 10:37:02 -0700 [LFC][IFC] Stop measuring text while collecting inline items when content needs bidi split 2021-11-01 15:10:21 -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 1810680 0 zalan 2021-11-01 10:37:02 -0700 bidi boundaries may be different from inline item boundaries. 1810683 1 442990 zalan 2021-11-01 10:41:57 -0700 Created attachment 442990 Patch 1810684 2 442991 zalan 2021-11-01 10:45:38 -0700 Created attachment 442991 Patch 1810688 3 442991 koivisto 2021-11-01 10:50:08 -0700 Comment on attachment 442991 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442991&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h:57 > + bool hasSeenBiDiContent() const { return !m_paragraphContentBuilder.isEmpty(); } Lets stay with bidi/Bidi since that is what most of the code uses. 1810690 4 442993 zalan 2021-11-01 10:50:57 -0700 Created attachment 442993 Patch 1810869 5 ews-feeder 2021-11-01 14:22:53 -0700 ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. 1810884 6 443018 zalan 2021-11-01 14:39:27 -0700 Created attachment 443018 Patch 1810903 7 ews-feeder 2021-11-01 15:09:51 -0700 Committed r285136 (243775@main): <https://commits.webkit.org/243775@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443018. 1810905 8 webkit-bug-importer 2021-11-01 15:10:21 -0700 <rdar://problem/84901941> 442990 2021-11-01 10:41:57 -0700 2021-11-01 10:42:11 -0700 Patch bug-232571-20211101104156.patch text/plain 5618 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1OWUzNjI4NTdlNzI4 YzRhYjZjZGUyMDVkZTYwN2NmNTQ1YjI4OC4uMzIxMTA3Y2M0ZmExMjhjMGYwYmEyZmU0Zjg3ZDQz MmIxNTUyYWJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0b3AgbWVh c3VyaW5nIHRleHQgd2hpbGUgY29sbGVjdGluZyBpbmxpbmUgaXRlbXMgd2hlbiBjb250ZW50IG5l ZWRzIGJpZGkgc3BsaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gd2Uga25vdyB3ZSBhcmUgZ29pbmcgdG8gZG8gYmlkaSBwcm9jZXNzaW5nLCB0 aGVzZSBpbmxpbmUgaXRlbSB3aWR0aCByZXN1bHRzIHdpbGwgbW9zdCBsaWtlbHkgYmVjb21lIHN0 YWxlIGF0IGJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlM ZXZlbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZVRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNC dWlsZGVyOjplbnRlckJpZGlDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lSXRlbXNCdWlsZGVyOjpleGl0QmlkaUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aXNCaURp Q29udGVudCBjb25zdCk6CisKIDIwMjEtMTEtMDEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU3RhcnQgdXNpbmcgdWJpZGkgdG8gZmluZCBiaWRp IGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmlu ZGV4IDViMmY3ZGQ5ZDc3ZmIzOGE5NTA1YjYyMDFhMGVmODQyNGZkNjc0YTUuLmY2ODNiZTA4Mzk0 YTQwNjFkYmVlYWQ1NzIzYjY0MTc2MGI4MDljZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogCiB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJ dGVtcyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgaWYgKG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu aXNFbXB0eSgpKQorICAgIGlmICghaXNCaURpQ29udGVudCgpKQogICAgICAgICByZXR1cm47CiAg ICAgQVNTRVJUKCFpbmxpbmVJdGVtcy5pc0VtcHR5KCkpOwogCkBAIC0xNzksNiArMTc5LDcgQEAg dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMoSW5saW5l SXRlbXMmIGlubGluZUl0ZW1zKQogICAgICAgICAgICAgICAgICAgICArK2N1cnJlbnRJbmxpbmVJ dGVtSW5kZXg7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQgaWYgdGhpcyBpcyB0aGUgbW9z dCBvcHRpbWFsIHBsYWNlIHRvIG1lYXN1cmUgYW5kIGNhY2hlIHRleHQgd2lkdGhzLiAKICAgICAg ICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVt PihpbmxpbmVJdGVtKTsKICAgICAgICAgICAgICAgICBpbmxpbmVUZXh0SXRlbS5zZXRCaWRpTGV2 ZWwobGV2ZWwpOwogCkBAIC0yMjEsMTMgKzIyMiwxNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwg SQogICAgIHVuc2lnbmVkIGN1cnJlbnRQb3NpdGlvbiA9IDA7CiAKICAgICBhdXRvIGlubGluZUl0 ZW1XaWR0aCA9IFsmXShhdXRvIHN0YXJ0UG9zaXRpb24sIGF1dG8gbGVuZ3RoKSAtPiBzdGQ6Om9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsKKyAgICAgICAgaWYgKGlzQmlEaUNvbnRlbnQoKSkg eworICAgICAgICAgICAgLy8gRGVsYXkgY29udGVudCBtZWFzdXJpbmcgdW50aWwgYmlkaSBzcGxp dC4KKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAgIH0KICAgICAgICAgaWYgKCFpbmxp bmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkKICAgICAgICAgICAg IHx8ICFUZXh0VXRpbDo6Y2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmdGb3JGaXJzdExpbmUo aW5saW5lVGV4dEJveC5zdHlsZSgpLCBpbmxpbmVUZXh0Qm94LmZpcnN0TGluZVN0eWxlKCkpKQog ICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChp bmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiAr IGxlbmd0aCwgeyB9KTsKICAgICB9OwogCi0gICAgaWYgKCFtX3BhcmFncmFwaENvbnRlbnRCdWls ZGVyLmlzRW1wdHkoKSkgeworICAgIGlmIChpc0JpRGlDb250ZW50KCkpIHsKICAgICAgICAgbV9j b250ZW50T2Zmc2V0TWFwLnNldCgmaW5saW5lVGV4dEJveCwgbV9wYXJhZ3JhcGhDb250ZW50QnVp bGRlci5sZW5ndGgoKSk7CiAgICAgICAgIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuYXBwZW5k KHRleHQpOwogICAgIH0KQEAgLTI5MSw3ICsyOTYsNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwg SQogICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRpb247CiAjaWYgQUxMT1df QklESV9DT05URU5UCiAgICAgICAgICAgICAvLyBDaGVjayBpZiB0aGUgY29udGVudCBoYXMgYmlk aSBkZXBlbmRlbmN5IHNvIHRoYXQgd2UgaGF2ZSB0byBzdGFydCBidWlsZGluZyB0aGUgcGFyYWdy YXBoIGNvbnRlbnQgZm9yIHViaWRpLgotICAgICAgICAgICAgaWYgKHRleHQuaXM4Qml0KCkgfHwg IW1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKQorICAgICAgICAgICAgaWYgKHRl eHQuaXM4Qml0KCkgfHwgaXNCaURpQ29udGVudCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogCiAgICAgICAgICAgICBmb3IgKGF1dG8gcG9zaXRpb24gPSBzdGFydFBvc2l0aW9uOyBw b3NpdGlvbiA8IGVuZFBvc2l0aW9uOykgewpAQCAtNDA0LDcgKzQwOSw3IEBAIHZvaWQgSW5saW5l SXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCwg SW5saW5lSXRlbXMmCiAKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjplbnRlckJpZGlDb250ZXh0 KGNvbnN0IEJveCYgYm94LCBVQ2hhciBjb250cm9sQ2hhcmFjdGVyLCBjb25zdCBJbmxpbmVJdGVt cyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgaWYgKG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNF bXB0eSgpKQorICAgIGlmICghaXNCaURpQ29udGVudCgpKQogICAgICAgICBidWlsZFByZXZpb3Vz VGV4dENvbnRlbnQoaW5saW5lSXRlbXMpOwogICAgIC8vIExldCB0aGUgZmlyc3QgY29udHJvbCBj aGFyYWN0ZXIgcmVwcmVzZW50IHRoZSAgYm94LgogICAgIG1fY29udGVudE9mZnNldE1hcC5hZGQo JmJveCwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CkBAIC00MTMsMTMgKzQx OCwxMyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6ZW50ZXJCaWRpQ29udGV4dChjb25zdCBC b3gmIGJveCwgVUNoYXIgY29udHJvbENoYXJhY3RlcgogCiB2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6ZXhpdEJpZGlDb250ZXh0KGNvbnN0IEJveCYsIFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIpCiB7 Ci0gICAgQVNTRVJUKCFtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmlzRW1wdHkoKSk7CisgICAg QVNTRVJUKGlzQmlEaUNvbnRlbnQoKSk7CiAgICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5h cHBlbmQoY29udHJvbENoYXJhY3Rlcik7CiB9CiAKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpi dWlsZFByZXZpb3VzVGV4dENvbnRlbnQoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQog ewotICAgIEFTU0VSVChtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmlzRW1wdHkoKSk7CisgICAg QVNTRVJUKCFpc0JpRGlDb250ZW50KCkpOwogICAgIEFTU0VSVChtX2NvbnRlbnRPZmZzZXRNYXAu aXNFbXB0eSgpKTsKIAogICAgIGNvbnN0IEJveCogbGFzdExheW91dEJveCA9IG51bGxwdHI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVJdGVtc0J1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5oCmluZGV4IDhlODU5NDgzOWIyM2Mw NTUwMzBjMTMxMzhlNGViODk4YjUxYjcwZTMuLjA4YzY2ZWUzYmNhYzg4NTIzZGY4YWRjMzI3MzVh OTQ5MTdmODk0ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5oCkBA IC01NCw2ICs1NCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGJ1aWxkUHJldmlvdXNUZXh0Q29u dGVudChjb25zdCBJbmxpbmVJdGVtcyYpOwogCisgICAgYm9vbCBpc0JpRGlDb250ZW50KCkgY29u c3QgeyByZXR1cm4gIW1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0eSgpOyB9CisKICAg ICBjb25zdCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25zdCB7IHJldHVybiBtX3Jvb3Q7IH0KIAog ICAgIGNvbnN0IENvbnRhaW5lckJveCYgbV9yb290Owo= 442991 2021-11-01 10:45:38 -0700 2021-11-01 10:50:54 -0700 Patch bug-232571-20211101104537.patch text/plain 5658 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1OWUzNjI4NTdlNzI4 YzRhYjZjZGUyMDVkZTYwN2NmNTQ1YjI4OC4uMzIxMTA3Y2M0ZmExMjhjMGYwYmEyZmU0Zjg3ZDQz MmIxNTUyYWJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0b3AgbWVh c3VyaW5nIHRleHQgd2hpbGUgY29sbGVjdGluZyBpbmxpbmUgaXRlbXMgd2hlbiBjb250ZW50IG5l ZWRzIGJpZGkgc3BsaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gd2Uga25vdyB3ZSBhcmUgZ29pbmcgdG8gZG8gYmlkaSBwcm9jZXNzaW5nLCB0 aGVzZSBpbmxpbmUgaXRlbSB3aWR0aCByZXN1bHRzIHdpbGwgbW9zdCBsaWtlbHkgYmVjb21lIHN0 YWxlIGF0IGJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlM ZXZlbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZVRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNC dWlsZGVyOjplbnRlckJpZGlDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lSXRlbXNCdWlsZGVyOjpleGl0QmlkaUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aXNCaURp Q29udGVudCBjb25zdCk6CisKIDIwMjEtMTEtMDEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU3RhcnQgdXNpbmcgdWJpZGkgdG8gZmluZCBiaWRp IGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmlu ZGV4IDViMmY3ZGQ5ZDc3ZmIzOGE5NTA1YjYyMDFhMGVmODQyNGZkNjc0YTUuLjlmNWFmYWFiZTY1 MWI3YmY0MjU1ZTBmN2UxN2U2ZjMxNTdkZDhhOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogCiB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJ dGVtcyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgaWYgKG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu aXNFbXB0eSgpKQorICAgIGlmICghaGFzU2VlbkJpRGlDb250ZW50KCkpCiAgICAgICAgIHJldHVy bjsKICAgICBBU1NFUlQoIWlubGluZUl0ZW1zLmlzRW1wdHkoKSk7CiAKQEAgLTE3OSw2ICsxNzks NyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJ bmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAgICAgICAgICAgICsrY3VycmVudElu bGluZUl0ZW1JbmRleDsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBGaW5kIG91dCBpZiB0aGlzIGlzIHRo ZSBtb3N0IG9wdGltYWwgcGxhY2UgdG8gbWVhc3VyZSBhbmQgY2FjaGUgdGV4dCB3aWR0aHMuIAog ICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4 dEl0ZW0+KGlubGluZUl0ZW0pOwogICAgICAgICAgICAgICAgIGlubGluZVRleHRJdGVtLnNldEJp ZGlMZXZlbChsZXZlbCk7CiAKQEAgLTIyMSwxMyArMjIyLDE3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0 Qm94LCBJCiAgICAgdW5zaWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAogICAgIGF1dG8gaW5s aW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geworICAgICAgICBpZiAoaGFzU2VlbkJpRGlD b250ZW50KCkpIHsKKyAgICAgICAgICAgIC8vIERlbGF5IGNvbnRlbnQgbWVhc3VyaW5nIHVudGls IGJpZGkgc3BsaXQuCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICB9CiAgICAgICAg IGlmICghaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpCiAg ICAgICAgICAgICB8fCAhVGV4dFV0aWw6OmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nRm9y Rmlyc3RMaW5lKGlubGluZVRleHRCb3guc3R5bGUoKSwgaW5saW5lVGV4dEJveC5maXJzdExpbmVT dHlsZSgpKSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIHJldHVybiBUZXh0VXRp bDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0 UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAotICAgIGlmICghbV9wYXJhZ3JhcGhD b250ZW50QnVpbGRlci5pc0VtcHR5KCkpIHsKKyAgICBpZiAoaGFzU2VlbkJpRGlDb250ZW50KCkp IHsKICAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmaW5saW5lVGV4dEJveCwgbV9wYXJh Z3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CiAgICAgICAgIG1fcGFyYWdyYXBoQ29udGVu dEJ1aWxkZXIuYXBwZW5kKHRleHQpOwogICAgIH0KQEAgLTI5MSw3ICsyOTYsNyBAQCB2b2lkIElu bGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgSQogICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRp b247CiAjaWYgQUxMT1dfQklESV9DT05URU5UCiAgICAgICAgICAgICAvLyBDaGVjayBpZiB0aGUg Y29udGVudCBoYXMgYmlkaSBkZXBlbmRlbmN5IHNvIHRoYXQgd2UgaGF2ZSB0byBzdGFydCBidWls ZGluZyB0aGUgcGFyYWdyYXBoIGNvbnRlbnQgZm9yIHViaWRpLgotICAgICAgICAgICAgaWYgKHRl eHQuaXM4Qml0KCkgfHwgIW1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKQorICAg ICAgICAgICAgaWYgKHRleHQuaXM4Qml0KCkgfHwgaGFzU2VlbkJpRGlDb250ZW50KCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIGZvciAoYXV0byBwb3NpdGlv biA9IHN0YXJ0UG9zaXRpb247IHBvc2l0aW9uIDwgZW5kUG9zaXRpb247KSB7CkBAIC00MDQsNyAr NDA5LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNv bnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxk ZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0 ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKIHsKLSAgICBpZiAobV9wYXJhZ3Jh cGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpCisgICAgaWYgKCFoYXNTZWVuQmlEaUNvbnRlbnQo KSkKICAgICAgICAgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGlubGluZUl0ZW1zKTsKICAgICAv LyBMZXQgdGhlIGZpcnN0IGNvbnRyb2wgY2hhcmFjdGVyIHJlcHJlc2VudCB0aGUgIGJveC4KICAg ICBtX2NvbnRlbnRPZmZzZXRNYXAuYWRkKCZib3gsIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu bGVuZ3RoKCkpOwpAQCAtNDEzLDEzICs0MTgsMTMgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6 OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIK IAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dChjb25zdCBCb3gmLCBV Q2hhciBjb250cm9sQ2hhcmFjdGVyKQogewotICAgIEFTU0VSVCghbV9wYXJhZ3JhcGhDb250ZW50 QnVpbGRlci5pc0VtcHR5KCkpOworICAgIEFTU0VSVChoYXNTZWVuQmlEaUNvbnRlbnQoKSk7CiAg ICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBlbmQoY29udHJvbENoYXJhY3Rlcik7CiB9 CiAKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpidWlsZFByZXZpb3VzVGV4dENvbnRlbnQoY29u c3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewotICAgIEFTU0VSVChtX3BhcmFncmFwaENv bnRlbnRCdWlsZGVyLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKCFoYXNTZWVuQmlEaUNvbnRlbnQo KSk7CiAgICAgQVNTRVJUKG1fY29udGVudE9mZnNldE1hcC5pc0VtcHR5KCkpOwogCiAgICAgY29u c3QgQm94KiBsYXN0TGF5b3V0Qm94ID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKaW5kZXggOGU4NTk0ODM5YjIzYzA1NTAzMGMxMzEzOGU0ZWI4OThiNTFi NzBlMy4uNGI5YjA4NzliOTY4M2ZlNDk0ZGQ5OWYxZTM3NWUyZGY5Yzk4NzU3ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKQEAgLTU0LDYgKzU0LDggQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1z Jik7CiAKKyAgICBib29sIGhhc1NlZW5CaURpQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuICFtX3Bh cmFncmFwaENvbnRlbnRCdWlsZGVyLmlzRW1wdHkoKTsgfQorCiAgICAgY29uc3QgQ29udGFpbmVy Qm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9CiAKICAgICBjb25zdCBDb250YWlu ZXJCb3gmIG1fcm9vdDsK 442993 2021-11-01 10:50:57 -0700 2021-11-01 14:39:25 -0700 Patch bug-232571-20211101105056.patch text/plain 5658 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1OWUzNjI4NTdlNzI4 YzRhYjZjZGUyMDVkZTYwN2NmNTQ1YjI4OC4uMzIxMTA3Y2M0ZmExMjhjMGYwYmEyZmU0Zjg3ZDQz MmIxNTUyYWJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0b3AgbWVh c3VyaW5nIHRleHQgd2hpbGUgY29sbGVjdGluZyBpbmxpbmUgaXRlbXMgd2hlbiBjb250ZW50IG5l ZWRzIGJpZGkgc3BsaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gd2Uga25vdyB3ZSBhcmUgZ29pbmcgdG8gZG8gYmlkaSBwcm9jZXNzaW5nLCB0 aGVzZSBpbmxpbmUgaXRlbSB3aWR0aCByZXN1bHRzIHdpbGwgbW9zdCBsaWtlbHkgYmVjb21lIHN0 YWxlIGF0IGJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlM ZXZlbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZVRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNC dWlsZGVyOjplbnRlckJpZGlDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lSXRlbXNCdWlsZGVyOjpleGl0QmlkaUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aXNCaURp Q29udGVudCBjb25zdCk6CisKIDIwMjEtMTEtMDEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU3RhcnQgdXNpbmcgdWJpZGkgdG8gZmluZCBiaWRp IGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmlu ZGV4IDViMmY3ZGQ5ZDc3ZmIzOGE5NTA1YjYyMDFhMGVmODQyNGZkNjc0YTUuLmRlNjRjNWM0M2Fm MzZjMTU1ZGQ2MjFkNjgxZTZmZDFhNGM5NDAwNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogCiB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJ dGVtcyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgaWYgKG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu aXNFbXB0eSgpKQorICAgIGlmICghaGFzU2VlbkJpZGlDb250ZW50KCkpCiAgICAgICAgIHJldHVy bjsKICAgICBBU1NFUlQoIWlubGluZUl0ZW1zLmlzRW1wdHkoKSk7CiAKQEAgLTE3OSw2ICsxNzks NyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJ bmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAgICAgICAgICAgICsrY3VycmVudElu bGluZUl0ZW1JbmRleDsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBGaW5kIG91dCBpZiB0aGlzIGlzIHRo ZSBtb3N0IG9wdGltYWwgcGxhY2UgdG8gbWVhc3VyZSBhbmQgY2FjaGUgdGV4dCB3aWR0aHMuIAog ICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4 dEl0ZW0+KGlubGluZUl0ZW0pOwogICAgICAgICAgICAgICAgIGlubGluZVRleHRJdGVtLnNldEJp ZGlMZXZlbChsZXZlbCk7CiAKQEAgLTIyMSwxMyArMjIyLDE3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0 Qm94LCBJCiAgICAgdW5zaWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAogICAgIGF1dG8gaW5s aW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geworICAgICAgICBpZiAoaGFzU2VlbkJpZGlD b250ZW50KCkpIHsKKyAgICAgICAgICAgIC8vIERlbGF5IGNvbnRlbnQgbWVhc3VyaW5nIHVudGls IGJpZGkgc3BsaXQuCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICB9CiAgICAgICAg IGlmICghaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpCiAg ICAgICAgICAgICB8fCAhVGV4dFV0aWw6OmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nRm9y Rmlyc3RMaW5lKGlubGluZVRleHRCb3guc3R5bGUoKSwgaW5saW5lVGV4dEJveC5maXJzdExpbmVT dHlsZSgpKSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIHJldHVybiBUZXh0VXRp bDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0 UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAotICAgIGlmICghbV9wYXJhZ3JhcGhD b250ZW50QnVpbGRlci5pc0VtcHR5KCkpIHsKKyAgICBpZiAoaGFzU2VlbkJpZGlDb250ZW50KCkp IHsKICAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmaW5saW5lVGV4dEJveCwgbV9wYXJh Z3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CiAgICAgICAgIG1fcGFyYWdyYXBoQ29udGVu dEJ1aWxkZXIuYXBwZW5kKHRleHQpOwogICAgIH0KQEAgLTI5MSw3ICsyOTYsNyBAQCB2b2lkIElu bGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgSQogICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRp b247CiAjaWYgQUxMT1dfQklESV9DT05URU5UCiAgICAgICAgICAgICAvLyBDaGVjayBpZiB0aGUg Y29udGVudCBoYXMgYmlkaSBkZXBlbmRlbmN5IHNvIHRoYXQgd2UgaGF2ZSB0byBzdGFydCBidWls ZGluZyB0aGUgcGFyYWdyYXBoIGNvbnRlbnQgZm9yIHViaWRpLgotICAgICAgICAgICAgaWYgKHRl eHQuaXM4Qml0KCkgfHwgIW1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKQorICAg ICAgICAgICAgaWYgKHRleHQuaXM4Qml0KCkgfHwgaGFzU2VlbkJpZGlDb250ZW50KCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIGZvciAoYXV0byBwb3NpdGlv biA9IHN0YXJ0UG9zaXRpb247IHBvc2l0aW9uIDwgZW5kUG9zaXRpb247KSB7CkBAIC00MDQsNyAr NDA5LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNv bnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxk ZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0 ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKIHsKLSAgICBpZiAobV9wYXJhZ3Jh cGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpCisgICAgaWYgKCFoYXNTZWVuQmlkaUNvbnRlbnQo KSkKICAgICAgICAgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGlubGluZUl0ZW1zKTsKICAgICAv LyBMZXQgdGhlIGZpcnN0IGNvbnRyb2wgY2hhcmFjdGVyIHJlcHJlc2VudCB0aGUgIGJveC4KICAg ICBtX2NvbnRlbnRPZmZzZXRNYXAuYWRkKCZib3gsIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu bGVuZ3RoKCkpOwpAQCAtNDEzLDEzICs0MTgsMTMgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6 OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIK IAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dChjb25zdCBCb3gmLCBV Q2hhciBjb250cm9sQ2hhcmFjdGVyKQogewotICAgIEFTU0VSVCghbV9wYXJhZ3JhcGhDb250ZW50 QnVpbGRlci5pc0VtcHR5KCkpOworICAgIEFTU0VSVChoYXNTZWVuQmlkaUNvbnRlbnQoKSk7CiAg ICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBlbmQoY29udHJvbENoYXJhY3Rlcik7CiB9 CiAKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpidWlsZFByZXZpb3VzVGV4dENvbnRlbnQoY29u c3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewotICAgIEFTU0VSVChtX3BhcmFncmFwaENv bnRlbnRCdWlsZGVyLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKCFoYXNTZWVuQmlkaUNvbnRlbnQo KSk7CiAgICAgQVNTRVJUKG1fY29udGVudE9mZnNldE1hcC5pc0VtcHR5KCkpOwogCiAgICAgY29u c3QgQm94KiBsYXN0TGF5b3V0Qm94ID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKaW5kZXggOGU4NTk0ODM5YjIzYzA1NTAzMGMxMzEzOGU0ZWI4OThiNTFi NzBlMy4uYTY0NGExNjJkYjIzMTQ2YTMyNTUyYzBjZGVkYWU3MWRlYzgxNDkyMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKQEAgLTU0LDYgKzU0LDggQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1z Jik7CiAKKyAgICBib29sIGhhc1NlZW5CaWRpQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuICFtX3Bh cmFncmFwaENvbnRlbnRCdWlsZGVyLmlzRW1wdHkoKTsgfQorCiAgICAgY29uc3QgQ29udGFpbmVy Qm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9CiAKICAgICBjb25zdCBDb250YWlu ZXJCb3gmIG1fcm9vdDsK 443018 2021-11-01 14:39:27 -0700 2021-11-01 15:09:52 -0700 Patch bug-232571-20211101143926.patch text/plain 5658 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1OWUzNjI4NTdlNzI4 YzRhYjZjZGUyMDVkZTYwN2NmNTQ1YjI4OC4uMDBkYWRjMDUzZWQyYmQ2OWIxYTZkMmU4MGI3Yjgx ZjllOTdiMTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0b3AgbWVh c3VyaW5nIHRleHQgd2hpbGUgY29sbGVjdGluZyBpbmxpbmUgaXRlbXMgd2hlbiBjb250ZW50IG5l ZWRzIGJpZGkgc3BsaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisg ICAgICAgIFdoZW4gd2Uga25vdyB3ZSBhcmUgZ29pbmcgdG8gZG8gYmlkaSBwcm9jZXNzaW5nLCB0 aGVzZSBpbmxpbmUgaXRlbSB3aWR0aCByZXN1bHRzIHdpbGwgbW9zdCBsaWtlbHkgYmVjb21lIHN0 YWxlIGF0IGJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMuCisKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlM ZXZlbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6Omhh bmRsZVRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNC dWlsZGVyOjplbnRlckJpZGlDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lSXRlbXNCdWlsZGVyOjpleGl0QmlkaUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkUHJldmlvdXNUZXh0Q29udGVudCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aXNCaURp Q29udGVudCBjb25zdCk6CisKIDIwMjEtMTEtMDEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU3RhcnQgdXNpbmcgdWJpZGkgdG8gZmluZCBiaWRp IGJvdW5kYXJpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmlu ZGV4IDViMmY3ZGQ5ZDc3ZmIzOGE5NTA1YjYyMDFhMGVmODQyNGZkNjc0YTUuLmRlNjRjNWM0M2Fm MzZjMTU1ZGQ2MjFkNjgxZTZmZDFhNGM5NDAwNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogCiB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJ dGVtcyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgaWYgKG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu aXNFbXB0eSgpKQorICAgIGlmICghaGFzU2VlbkJpZGlDb250ZW50KCkpCiAgICAgICAgIHJldHVy bjsKICAgICBBU1NFUlQoIWlubGluZUl0ZW1zLmlzRW1wdHkoKSk7CiAKQEAgLTE3OSw2ICsxNzks NyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJ bmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAgICAgICAgICAgICsrY3VycmVudElu bGluZUl0ZW1JbmRleDsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBGaW5kIG91dCBpZiB0aGlzIGlzIHRo ZSBtb3N0IG9wdGltYWwgcGxhY2UgdG8gbWVhc3VyZSBhbmQgY2FjaGUgdGV4dCB3aWR0aHMuIAog ICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4 dEl0ZW0+KGlubGluZUl0ZW0pOwogICAgICAgICAgICAgICAgIGlubGluZVRleHRJdGVtLnNldEJp ZGlMZXZlbChsZXZlbCk7CiAKQEAgLTIyMSwxMyArMjIyLDE3IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0 Qm94LCBJCiAgICAgdW5zaWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAogICAgIGF1dG8gaW5s aW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geworICAgICAgICBpZiAoaGFzU2VlbkJpZGlD b250ZW50KCkpIHsKKyAgICAgICAgICAgIC8vIERlbGF5IGNvbnRlbnQgbWVhc3VyaW5nIHVudGls IGJpZGkgc3BsaXQuCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICB9CiAgICAgICAg IGlmICghaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpCiAg ICAgICAgICAgICB8fCAhVGV4dFV0aWw6OmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nRm9y Rmlyc3RMaW5lKGlubGluZVRleHRCb3guc3R5bGUoKSwgaW5saW5lVGV4dEJveC5maXJzdExpbmVT dHlsZSgpKSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIHJldHVybiBUZXh0VXRp bDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0 UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAotICAgIGlmICghbV9wYXJhZ3JhcGhD b250ZW50QnVpbGRlci5pc0VtcHR5KCkpIHsKKyAgICBpZiAoaGFzU2VlbkJpZGlDb250ZW50KCkp IHsKICAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmaW5saW5lVGV4dEJveCwgbV9wYXJh Z3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CiAgICAgICAgIG1fcGFyYWdyYXBoQ29udGVu dEJ1aWxkZXIuYXBwZW5kKHRleHQpOwogICAgIH0KQEAgLTI5MSw3ICsyOTYsNyBAQCB2b2lkIElu bGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgSQogICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRp b247CiAjaWYgQUxMT1dfQklESV9DT05URU5UCiAgICAgICAgICAgICAvLyBDaGVjayBpZiB0aGUg Y29udGVudCBoYXMgYmlkaSBkZXBlbmRlbmN5IHNvIHRoYXQgd2UgaGF2ZSB0byBzdGFydCBidWls ZGluZyB0aGUgcGFyYWdyYXBoIGNvbnRlbnQgZm9yIHViaWRpLgotICAgICAgICAgICAgaWYgKHRl eHQuaXM4Qml0KCkgfHwgIW1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKQorICAg ICAgICAgICAgaWYgKHRleHQuaXM4Qml0KCkgfHwgaGFzU2VlbkJpZGlDb250ZW50KCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIGZvciAoYXV0byBwb3NpdGlv biA9IHN0YXJ0UG9zaXRpb247IHBvc2l0aW9uIDwgZW5kUG9zaXRpb247KSB7CkBAIC00MDQsNyAr NDA5LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNv bnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxk ZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0 ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKIHsKLSAgICBpZiAobV9wYXJhZ3Jh cGhDb250ZW50QnVpbGRlci5pc0VtcHR5KCkpCisgICAgaWYgKCFoYXNTZWVuQmlkaUNvbnRlbnQo KSkKICAgICAgICAgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGlubGluZUl0ZW1zKTsKICAgICAv LyBMZXQgdGhlIGZpcnN0IGNvbnRyb2wgY2hhcmFjdGVyIHJlcHJlc2VudCB0aGUgIGJveC4KICAg ICBtX2NvbnRlbnRPZmZzZXRNYXAuYWRkKCZib3gsIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu bGVuZ3RoKCkpOwpAQCAtNDEzLDEzICs0MTgsMTMgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6 OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIK IAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dChjb25zdCBCb3gmLCBV Q2hhciBjb250cm9sQ2hhcmFjdGVyKQogewotICAgIEFTU0VSVCghbV9wYXJhZ3JhcGhDb250ZW50 QnVpbGRlci5pc0VtcHR5KCkpOworICAgIEFTU0VSVChoYXNTZWVuQmlkaUNvbnRlbnQoKSk7CiAg ICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBlbmQoY29udHJvbENoYXJhY3Rlcik7CiB9 CiAKIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpidWlsZFByZXZpb3VzVGV4dENvbnRlbnQoY29u c3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewotICAgIEFTU0VSVChtX3BhcmFncmFwaENv bnRlbnRCdWlsZGVyLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKCFoYXNTZWVuQmlkaUNvbnRlbnQo KSk7CiAgICAgQVNTRVJUKG1fY29udGVudE9mZnNldE1hcC5pc0VtcHR5KCkpOwogCiAgICAgY29u c3QgQm94KiBsYXN0TGF5b3V0Qm94ID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKaW5kZXggOGU4NTk0ODM5YjIzYzA1NTAzMGMxMzEzOGU0ZWI4OThiNTFi NzBlMy4uYTY0NGExNjJkYjIzMTQ2YTMyNTUyYzBjZGVkYWU3MWRlYzgxNDkyMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKQEAgLTU0LDYgKzU0LDggQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1z Jik7CiAKKyAgICBib29sIGhhc1NlZW5CaWRpQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuICFtX3Bh cmFncmFwaENvbnRlbnRCdWlsZGVyLmlzRW1wdHkoKTsgfQorCiAgICAgY29uc3QgQ29udGFpbmVy Qm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9CiAKICAgICBjb25zdCBDb250YWlu ZXJCb3gmIG1fcm9vdDsK