230757 2021-09-24 09:41:20 -0700 [LFC][IFC] Line breaking only uses a few style properties 2021-09-24 14:22:14 -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 1796920 0 zalan 2021-09-24 09:41:20 -0700 let's let it have those only 1796923 1 439156 zalan 2021-09-24 09:44:24 -0700 Created attachment 439156 Patch 1796945 2 ews-feeder 2021-09-24 10:44:21 -0700 Committed r283047 (242107@main): <https://commits.webkit.org/242107@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439156. 1796946 3 webkit-bug-importer 2021-09-24 10:45:22 -0700 <rdar://problem/83502508> 1797030 4 439196 zalan 2021-09-24 14:10:43 -0700 Created attachment 439196 [fast-cq]Patch to fix the debug failures 1797031 5 zalan 2021-09-24 14:13:15 -0700 fix the debug failures 1797033 6 zalan 2021-09-24 14:22:05 -0700 https://trac.webkit.org/changeset/283055/webkit 439156 2021-09-24 09:44:24 -0700 2021-09-24 13:37:06 -0700 Patch bug-230757-20210924094423.patch text/plain 19614 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEzYzkyZDEwOWEzMmQ1 OTIyYTEzNTI5MGJlNGM2NDJhMGU3YTUxZC4uNmY0NGIwYTZhN2VhODg0NjMzZjllNTA3OGViNDkw OTIwNGNkMzE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA5LTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmUgYnJl YWtpbmcgb25seSB1c2VzIGEgZmV3IHN0eWxlIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDc1NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb250aW51b3VzIHJ1bnMsIGlucHV0 IHRvIHRoZSBsaW5lIGJyZWFraW5nLCBzaG91bGQgb25seSBjb250YWluIHN0eWxlIHByb3BlcnRp ZXMgdGhhdCBsaW5lIGJyZWFraW5nIGFjdHVhbGx5IHVzZXMuIAorICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIGZpcnN0LWxpbmUuCisKKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjppc1dyYXBwaW5n QWxsb3dlZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2Vy OjpzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFjZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnRXaXRoVGV4dCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJlYWtCZWhhdmlvciBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp0cnlC cmVha2luZ1RleHRSdW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVD b250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6cmVz ZXQpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNv bnRlbnRCcmVha2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuOjpSdW4pOgorICAgICAgICAqIGxheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5s aW5lSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpoYW5kbGVJ bmxpbmVDb250ZW50KToKKwogMjAyMS0wOS0yNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBMaW5lOjpSdW4gb25seSBuZWVkcyBhIGhhbmRmdWwg b2Ygc3R5bGUgcHJvcGVydGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuY3BwCmluZGV4IDhmZjFmMDdhYmIzYmFmMDYzZTU2ZjQwYmUwNGVjMjRkNzZkMzhkOWEu LmIxNzk4ZjUyYmU0OTNkYzJjZWI2YWY1M2IwZjExOTJlOGZmMDJiZGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTExMiwxMSArMTEyLDEwIEBA IHN0YXRpYyBpbmxpbmUgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGZpcnN0VGV4dFJ1bkluZGV4KGNv bnN0IElubGluZUNvbnRlbnRCcmVha2VyCiAgICAgcmV0dXJuIHsgfTsKIH0KIAotYm9vbCBJbmxp bmVDb250ZW50QnJlYWtlcjo6aXNXcmFwcGluZ0FsbG93ZWQoY29uc3QgSW5saW5lSXRlbSYgaW5s aW5lSXRlbSkKK2Jvb2wgSW5saW5lQ29udGVudEJyZWFrZXI6OmlzV3JhcHBpbmdBbGxvd2VkKGNv bnN0IENvbnRpbnVvdXNDb250ZW50OjpSdW4mIHJ1bikKIHsKLSAgICBhdXRvJiBzdHlsZVRvVXNl ID0gaW5saW5lSXRlbS5pc0JveCgpID8gaW5saW5lSXRlbS5sYXlvdXRCb3goKS5wYXJlbnQoKS5z dHlsZSgpIDogaW5saW5lSXRlbS5sYXlvdXRCb3goKS5zdHlsZSgpOyAKICAgICAvLyBEbyBub3Qg dHJ5IHRvIHdyYXAgb3ZlcmZsb3duICdwcmUnIGFuZCAnbm8td3JhcCcgY29udGVudCB0byBuZXh0 IGxpbmUuCi0gICAgcmV0dXJuIHN0eWxlVG9Vc2Uud2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6 OlByZSAmJiBzdHlsZVRvVXNlLndoaXRlU3BhY2UoKSAhPSBXaGl0ZVNwYWNlOjpOb1dyYXA7Cisg ICAgcmV0dXJuIHJ1bi5zdHlsZS53aGl0ZVNwYWNlICE9IFdoaXRlU3BhY2U6OlByZSAmJiBydW4u c3R5bGUud2hpdGVTcGFjZSAhPSBXaGl0ZVNwYWNlOjpOb1dyYXA7CiB9CiAKIGJvb2wgSW5saW5l Q29udGVudEJyZWFrZXI6OnNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENvbnRp bnVvdXNDb250ZW50JiBjb250aW51b3VzQ29udGVudCkgY29uc3QKQEAgLTEyNSw3ICsxMjQsNyBA QCBib29sIElubGluZUNvbnRlbnRCcmVha2VyOjpzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFj ZShjb25zdCBDb250aW51b3VzQ29udGVudAogICAgIC8vIE5vdGUgdGhhdCB0aGUgImtlZXAiIGlu IHRoaXMgY29udGV4dCBtZWFucyB3ZSBsZXQgdGhlIHdoaXRlc3BhY2UgY29udGVudCBzaXQgb24g dGhlIGN1cnJlbnQgbGluZS4KICAgICAvLyBJdCBtaWdodCB2ZXJ5IHdlbGwgZ2V0IGNvbGxhcHNl ZCB3aGVuIHdlIGNsb3NlIHRoZSBsaW5lIChub3JtYWwvbm93cmFwL3ByZS1saW5lKS4KICAgICAv LyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy10ZXh0LTMvI3doaXRlLXNwYWNlLXByb3Bl cnR5Ci0gICAgYXV0byB3aGl0ZXNwYWNlID0gY29udGludW91c0NvbnRlbnQucnVucygpWypmaXJz dFRleHRSdW5JbmRleChjb250aW51b3VzQ29udGVudCldLmlubGluZUl0ZW0uc3R5bGUoKS53aGl0 ZVNwYWNlKCk7CisgICAgYXV0byB3aGl0ZXNwYWNlID0gY29udGludW91c0NvbnRlbnQucnVucygp WypmaXJzdFRleHRSdW5JbmRleChjb250aW51b3VzQ29udGVudCldLnN0eWxlLndoaXRlU3BhY2U7 CiAgICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6Tm9ybWFsIHx8IHdoaXRlc3Bh Y2UgPT0gV2hpdGVTcGFjZTo6Tm9XcmFwIHx8IHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJl V3JhcCB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZUxpbmU7CiB9CiAKQEAgLTI2Niw3 ICsyNjUsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVh a2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogICAgICAgICAvLyBQYXJlbnQgc3R5 bGUgZHJpdmVzIHRoZSB3cmFwcGluZyBiZWhhdmlvciBoZXJlLgogICAgICAgICAvLyBlLmcuIDxk aXYgc3R5bGU9IndoaXRlLXNwYWNlOiBub3dyYXAiPnNvbWUgdGV4dDxkaXYgc3R5bGU9ImRpc3Bs YXk6IGlubGluZS1ibG9jazsgd2hpdGUtc3BhY2U6IHByZS13cmFwIj48L2Rpdj48L2Rpdj4uCiAg ICAgICAgIC8vIFdoaWxlIHRoZSBpbmxpbmUtYmxvY2sgaGFzIHByZS13cmFwIHdoaWNoIGFsbG93 cyB3cmFwcGluZywgdGhlIGNvbnRlbnQgbGl2ZXMgaW4gYSBub3dyYXAgY29udGV4dC4KLSAgICAg ICAgcmV0dXJuIGlzV3JhcHBpbmdBbGxvd2VkKGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKVtvdmVy Zmxvd2luZ1J1bkluZGV4XS5pbmxpbmVJdGVtKTsKKyAgICAgICAgcmV0dXJuIGlzV3JhcHBpbmdB bGxvd2VkKGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKVtvdmVyZmxvd2luZ1J1bkluZGV4XSk7CiAg ICAgfTsKICAgICBpZiAoc2hvdWxkV3JhcFVuYnJlYWthYmxlQ29udGVudFRvTmV4dExpbmUoKSkK ICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5lOjpZZXMg fTsKQEAgLTI4OCw3ICsyODcsNyBAQCBPdmVyZmxvd2luZ1RleHRDb250ZW50IElubGluZUNvbnRl bnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50V2l0aFRleHQoYwogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIC8vIENoZWNrIGlmIHRoaXMgdGV4 dCBydW4gbmVlZHMgdG8gc3RheSBvbiB0aGUgY3VycmVudCBsaW5lLiAgCi0gICAgICAgIHJldHVy biBpc1dyYXBwaW5nQWxsb3dlZChydW4uaW5saW5lSXRlbSk7CisgICAgICAgIHJldHVybiBpc1dy YXBwaW5nQWxsb3dlZChydW4pOwogICAgIH07CiAKICAgICBhdXRvIGZpbmRUcmFpbGluZ1J1bklu ZGV4ID0gWyZdIChhdXRvIGJyZWFrYWJsZVJ1bkluZGV4KSAtPiBzdGQ6Om9wdGlvbmFsPHNpemVf dD4gewpAQCAtMzcxLDcgKzM3MCw3IEBAIE92ZXJmbG93aW5nVGV4dENvbnRlbnQgSW5saW5lQ29u dGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnRXaXRoVGV4dChjCiAgICAgICAg ICAgICBpZiAoaXNCcmVha2FibGVSdW4ocnVuKSkgewogICAgICAgICAgICAgICAgIEFTU0VSVChy dW4uaW5saW5lSXRlbS5pc1RleHQoKSk7CiAgICAgICAgICAgICAgICAgLy8gV2Uga25vdyB0aGF0 IHRoaXMgcnVuIGRvZXMgbm90IGZpdCB0aGUgYXZhaWxhYmxlIHNwYWNlLiBJZiB3ZSBjYW4gYnJl YWsgaXQgYXQgYW55IHBvc2l0aW9uLCBsZXQncyBqdXN0IHVzZSB0aGUgc3RhcnQgb2YgdGhlIHJ1 bi4KLSAgICAgICAgICAgICAgICBpZiAod29yZEJyZWFrQmVoYXZpb3IocnVuLmlubGluZUl0ZW0u c3R5bGUoKSwgbGluZVN0YXR1cy5oYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24p ID09IFdvcmRCcmVha1J1bGU6OkF0QXJiaXRyYXJ5UG9zaXRpb24pIHsKKyAgICAgICAgICAgICAg ICBpZiAod29yZEJyZWFrQmVoYXZpb3IocnVuLnN0eWxlLCBsaW5lU3RhdHVzLmhhc1dyYXBPcHBv cnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikgPT0gV29yZEJyZWFrUnVsZTo6QXRBcmJpdHJhcnlQ b3NpdGlvbikgewogICAgICAgICAgICAgICAgICAgICAvLyBXZSBtdXN0IGJlIG9uIGFuIGlubGlu ZSBib3ggYm91bmRhcnkuIExldCdzIGdvIGJhY2sgdG8gdGhlIHJ1biBpbiBmcm9udCBvZiB0aGUg aW5saW5lIGJveCBzdGFydCBydW4uCiAgICAgICAgICAgICAgICAgICAgIC8vIGUuZy4gPHNwYW4+ dW5icmVha2FibGVfYW5kX292ZXJmbG93PHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IGJyZWFrLWFs bCI+YnJlYWthYmxlPC9zcGFuPgogICAgICAgICAgICAgICAgICAgICAvLyBXZSBhcmUgYXQgImJy ZWFrYWJsZSIsIDxzcGFuPiBpcyBhdCBpbmRleCAtIDEgYW5kIHRoZSB0cmFpbGluZyBydW4gaXMg YXQgaW5kZXggLSAyLgpAQCAtNDA1LDE2ICs0MDQsMTYgQEAgT3ZlcmZsb3dpbmdUZXh0Q29udGVu dCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudFdpdGhUZXh0 KGMKICAgICByZXR1cm4geyBvdmVyZmxvd2luZ1J1bkluZGV4IH07CiB9CiAKLU9wdGlvblNldDxJ bmxpbmVDb250ZW50QnJlYWtlcjo6V29yZEJyZWFrUnVsZT4gSW5saW5lQ29udGVudEJyZWFrZXI6 OndvcmRCcmVha0JlaGF2aW9yKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgYm9vbCBoYXNXcmFw T3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pIGNvbnN0CitPcHRpb25TZXQ8SW5saW5lQ29u dGVudEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IElubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJl YWtCZWhhdmlvcihjb25zdCBDb250aW51b3VzQ29udGVudDo6UnVuOjpTdHlsZSYgc3R5bGUsIGJv b2wgaGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9uKSBjb25zdAogewogICAgIC8v IERpc3JlZ2FyZCBhbnkgcHJvaGliaXRpb24gYWdhaW5zdCBsaW5lIGJyZWFrcyBtYW5kYXRlZCBi eSB0aGUgd29yZC1icmVhayBwcm9wZXJ0eS4KICAgICAvLyBUaGUgZGlmZmVyZW50IHdyYXBwaW5n IG9wcG9ydHVuaXRpZXMgbXVzdCBub3QgYmUgcHJpb3JpdGl6ZWQuCiAgICAgLy8gTm90ZSBoeXBo ZW5hdGlvbiBpcyBub3QgYXBwbGllZC4KLSAgICBpZiAoc3R5bGUubGluZUJyZWFrKCkgPT0gTGlu ZUJyZWFrOjpBbnl3aGVyZSkKKyAgICBpZiAoc3R5bGUubGluZUJyZWFrID09IExpbmVCcmVhazo6 QW55d2hlcmUpCiAgICAgICAgIHJldHVybiB7IFdvcmRCcmVha1J1bGU6OkF0QXJiaXRyYXJ5UG9z aXRpb24gfTsKIAogICAgIGF1dG8gaW5jbHVkZUh5cGhlbmF0aW9uSWZBbGxvd2VkID0gWyZdKHN0 ZDo6b3B0aW9uYWw8SW5saW5lQ29udGVudEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IHdvcmRCcmVh a1J1bGUpIC0+IE9wdGlvblNldDxJbmxpbmVDb250ZW50QnJlYWtlcjo6V29yZEJyZWFrUnVsZT4g ewotICAgICAgICBhdXRvIGh5cGhlbmF0aW9uSXNBbGxvd2VkID0gIW5faHlwaGVuYXRpb25Jc0Rp c2FibGVkICYmIHN0eWxlLmh5cGhlbnMoKSA9PSBIeXBoZW5zOjpBdXRvICYmIGNhbkh5cGhlbmF0 ZShzdHlsZS5jb21wdXRlZExvY2FsZSgpKTsKKyAgICAgICAgYXV0byBoeXBoZW5hdGlvbklzQWxs b3dlZCA9ICFuX2h5cGhlbmF0aW9uSXNEaXNhYmxlZCAmJiBzdHlsZS5oeXBoZW5zID09IEh5cGhl bnM6OkF1dG8gJiYgY2FuSHlwaGVuYXRlKHN0eWxlLmxvY2FsZSk7CiAgICAgICAgIGlmIChoeXBo ZW5hdGlvbklzQWxsb3dlZCkgewogICAgICAgICAgICAgaWYgKHdvcmRCcmVha1J1bGUpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHsgKndvcmRCcmVha1J1bGUsIFdvcmRCcmVha1J1bGU6OkF0SHlw aGVuYXRpb25PcHBvcnR1bml0aWVzIH07CkBAIC00MjUsMTggKzQyNCwxOCBAQCBPcHRpb25TZXQ8 SW5saW5lQ29udGVudEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IElubGluZUNvbnRlbnRCcmVha2Vy Ojp3b3JkQnJlYWtCZQogICAgICAgICByZXR1cm4geyB9OwogICAgIH07CiAgICAgLy8gQnJlYWtp bmcgaXMgYWxsb3dlZCB3aXRoaW4g4oCcd29yZHPigJ0uCi0gICAgaWYgKHN0eWxlLndvcmRCcmVh aygpID09IFdvcmRCcmVhazo6QnJlYWtBbGwpCisgICAgaWYgKHN0eWxlLndvcmRCcmVhayA9PSBX b3JkQnJlYWs6OkJyZWFrQWxsKQogICAgICAgICByZXR1cm4gaW5jbHVkZUh5cGhlbmF0aW9uSWZB bGxvd2VkKFdvcmRCcmVha1J1bGU6OkF0QXJiaXRyYXJ5UG9zaXRpb24pOwogICAgIC8vIEZvciBj b21wYXRpYmlsaXR5IHdpdGggbGVnYWN5IGNvbnRlbnQsIHRoZSB3b3JkLWJyZWFrIHByb3BlcnR5 IGFsc28gc3VwcG9ydHMgYSBkZXByZWNhdGVkIGJyZWFrLXdvcmQga2V5d29yZC4KICAgICAvLyBX aGVuIHNwZWNpZmllZCwgdGhpcyBoYXMgdGhlIHNhbWUgZWZmZWN0IGFzIHdvcmQtYnJlYWs6IG5v cm1hbCBhbmQgb3ZlcmZsb3ctd3JhcDogYW55d2hlcmUsIHJlZ2FyZGxlc3Mgb2YgdGhlIGFjdHVh bCB2YWx1ZSBvZiB0aGUgb3ZlcmZsb3ctd3JhcCBwcm9wZXJ0eS4KLSAgICBpZiAoc3R5bGUud29y ZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpCcmVha1dvcmQgJiYgIWhhc1dyYXBPcHBvcnR1bml0eUF0 UHJldmlvdXNQb3NpdGlvbikKKyAgICBpZiAoc3R5bGUud29yZEJyZWFrID09IFdvcmRCcmVhazo6 QnJlYWtXb3JkICYmICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pCiAgICAg ICAgIHJldHVybiBpbmNsdWRlSHlwaGVuYXRpb25JZkFsbG93ZWQoV29yZEJyZWFrUnVsZTo6QXRB cmJpdHJhcnlQb3NpdGlvbik7CiAgICAgLy8gT3ZlcmZsb3dXcmFwOjpCcmVha1dvcmQvQW55d2hl cmUgQW4gb3RoZXJ3aXNlIHVuYnJlYWthYmxlIHNlcXVlbmNlIG9mIGNoYXJhY3RlcnMgbWF5IGJl IGJyb2tlbiBhdCBhbiBhcmJpdHJhcnkgcG9pbnQgaWYgdGhlcmUgYXJlIG5vIG90aGVyd2lzZS1h Y2NlcHRhYmxlIGJyZWFrIHBvaW50cyBpbiB0aGUgbGluZS4KICAgICAvLyBOb3RlIHRoYXQgdGhp cyBhcHBsaWVzIHRvIGNvbnRlbnQgd2hlcmUgQ1NTIHByb3BlcnRpZXMgKGUuZy4gV29yZEJyZWFr OjpLZWVwQWxsKSBtYWtlIGl0IHVuYnJlYWthYmxlLiAKLSAgICBpZiAoKHN0eWxlLm92ZXJmbG93 V3JhcCgpID09IE92ZXJmbG93V3JhcDo6QnJlYWtXb3JkIHx8IHN0eWxlLm92ZXJmbG93V3JhcCgp ID09IE92ZXJmbG93V3JhcDo6QW55d2hlcmUpICYmICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZp b3VzUG9zaXRpb24pCisgICAgaWYgKChzdHlsZS5vdmVyZmxvd1dyYXAgPT0gT3ZlcmZsb3dXcmFw OjpCcmVha1dvcmQgfHwgc3R5bGUub3ZlcmZsb3dXcmFwID09IE92ZXJmbG93V3JhcDo6QW55d2hl cmUpICYmICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pCiAgICAgICAgIHJl dHVybiBpbmNsdWRlSHlwaGVuYXRpb25JZkFsbG93ZWQoV29yZEJyZWFrUnVsZTo6QXRBcmJpdHJh cnlQb3NpdGlvbik7CiAgICAgLy8gQnJlYWtpbmcgaXMgZm9yYmlkZGVuIHdpdGhpbiDigJx3b3Jk c+KAnS4KLSAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsKQor ICAgIGlmIChzdHlsZS53b3JkQnJlYWsgPT0gV29yZEJyZWFrOjpLZWVwQWxsKQogICAgICAgICBy ZXR1cm4geyB9OwogICAgIHJldHVybiBpbmNsdWRlSHlwaGVuYXRpb25JZkFsbG93ZWQoeyB9KTsK IH0KQEAgLTQ0NSw3ICs0NDQsNyBAQCBzdGQ6Om9wdGlvbmFsPElubGluZUNvbnRlbnRCcmVha2Vy OjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtpbgogewogICAgIEFT U0VSVChvdmVyZmxvd2luZ1J1bi5pbmxpbmVJdGVtLmlzVGV4dCgpKTsKICAgICBhdXRvJiBpbmxp bmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihvdmVyZmxvd2luZ1J1bi5pbmxp bmVJdGVtKTsKLSAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRJdGVtLnN0eWxlKCk7CisgICAg YXV0byYgc3R5bGUgPSBvdmVyZmxvd2luZ1J1bi5zdHlsZTsKICAgICBhdXRvIGF2YWlsYWJsZVNw YWNlSXNJbmZpbml0ZSA9ICFhdmFpbGFibGVXaWR0aC5oYXNfdmFsdWUoKTsKIAogICAgIGF1dG8g YnJlYWtSdWxlcyA9IHdvcmRCcmVha0JlaGF2aW9yKHN0eWxlLCBoYXNXcmFwT3Bwb3J0dW5pdHlB dFByZXZpb3VzUG9zaXRpb24pOwpAQCAtNDYyLDE4ICs0NjEsMTcgQEAgc3RkOjpvcHRpb25hbDxJ bmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRy eUJyZWFraW4KICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgYXV0byBydW5MZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKLSAgICAg ICAgICAgIHVuc2lnbmVkIGxpbWl0QmVmb3JlID0gc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9y ZSgpID09IFJlbmRlclN0eWxlOjppbml0aWFsSHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpID8gMCA6 IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUoKTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGxp bWl0QWZ0ZXIgPSBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoKSA9PSBSZW5kZXJTdHlsZTo6 aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRBZnRlcigpID8gMCA6IHN0eWxlLmh5cGhlbmF0aW9uTGlt aXRBZnRlcigpOworICAgICAgICAgICAgYXV0byBsaW1pdEJlZm9yZSA9IHN0eWxlLmh5cGhlbmF0 aW9uTGltaXRCZWZvcmUudmFsdWVfb3IoMCk7CisgICAgICAgICAgICBhdXRvIGxpbWl0QWZ0ZXIg PSBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIudmFsdWVfb3IoMCk7CiAgICAgICAgICAgICAv LyBDaGVjayBpZiB0aGlzIHJ1biBjYW4gYWNjb21tb2RhdGUgdGhlIGJlZm9yZS9hZnRlciBsaW1p dHMgYXQgYWxsIGJlZm9yZSBzdGFydCBtZWFzdXJpbmcgdGV4dC4KICAgICAgICAgICAgIGlmIChs aW1pdEJlZm9yZSA+PSBydW5MZW5ndGggfHwgbGltaXRBZnRlciA+PSBydW5MZW5ndGggfHwgbGlt aXRCZWZvcmUgKyBsaW1pdEFmdGVyID4gcnVuTGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVy biB7IH07CiAKICAgICAgICAgICAgIHVuc2lnbmVkIGxlZnRTaWRlTGVuZ3RoID0gcnVuTGVuZ3Ro OwotICAgICAgICAgICAgYXV0byYgZm9udENhc2NhZGUgPSBzdHlsZS5mb250Q2FzY2FkZSgpOwot ICAgICAgICAgICAgYXV0byBoeXBoZW5XaWR0aCA9IElubGluZUxheW91dFVuaXQgeyBmb250Q2Fz Y2FkZS53aWR0aChUZXh0UnVuIHsgU3RyaW5nVmlldyB7IHN0eWxlLmh5cGhlblN0cmluZygpIH0g fSkgfTsKKyAgICAgICAgICAgIGF1dG8gaHlwaGVuV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsg c3R5bGUuZm9udENhc2NhZGUud2lkdGgoVGV4dFJ1biB7IFN0cmluZ1ZpZXcgeyBzdHlsZS5oeXBo ZW5TdHJpbmcgfSB9KSB9OwogICAgICAgICAgICAgaWYgKCFhdmFpbGFibGVTcGFjZUlzSW5maW5p dGUpIHsKICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVu ID0gKmF2YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7Ci0gICAgICAgICAgICAgICAgaWYgKGF2 YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVu YXRpb24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGZvbnRDYXNjYWRlLnBpeGVsU2l6 ZSgpKSkKKyAgICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4g PD0gMCB8fCAhZW5vdWdoV2lkdGhGb3JIeXBoZW5hdGlvbihhdmFpbGFibGVXaWR0aEV4Y2x1ZGlu Z0h5cGhlbiwgc3R5bGUuZm9udENhc2NhZGUucGl4ZWxTaXplKCkpKQogICAgICAgICAgICAgICAg ICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgICAgIGxlZnRTaWRlTGVuZ3RoID0gVGV4dFV0 aWw6Om1pZFdvcmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdp ZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgbG9naWNhbExlZnQpLmxlbmd0aDsK ICAgICAgICAgICAgIH0KQEAgLTQ4MSw3ICs0NzksNyBAQCBzdGQ6Om9wdGlvbmFsPElubGluZUNv bnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtp bgogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgICAgICAvLyBBZGp1c3QgYmVm b3JlIGluZGV4IHRvIGFjY29tbW9kYXRlIHRoZSBsaW1pdC1hZnRlciB2YWx1ZSAoaXQncyB0aGUg bGFzdCBwb3RlbnRpYWwgaHlwaGVuIGxvY2F0aW9uIGluIHRoaXMgcnVuKS4KICAgICAgICAgICAg IGF1dG8gaHlwaGVuQmVmb3JlID0gc3RkOjptaW4obGVmdFNpZGVMZW5ndGgsIHJ1bkxlbmd0aCAt IGxpbWl0QWZ0ZXIpICsgMTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGh5cGhlbkxvY2F0aW9uID0g bGFzdEh5cGhlbkxvY2F0aW9uKFN0cmluZ1ZpZXcoaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJv eCgpLmNvbnRlbnQoKSkuc3Vic3RyaW5nKGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRl eHRJdGVtLmxlbmd0aCgpKSwgaHlwaGVuQmVmb3JlLCBzdHlsZS5jb21wdXRlZExvY2FsZSgpKTsK KyAgICAgICAgICAgIHVuc2lnbmVkIGh5cGhlbkxvY2F0aW9uID0gbGFzdEh5cGhlbkxvY2F0aW9u KFN0cmluZ1ZpZXcoaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKSkuc3Vi c3RyaW5nKGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmxlbmd0aCgpKSwg aHlwaGVuQmVmb3JlLCBzdHlsZS5sb2NhbGUpOwogICAgICAgICAgICAgaWYgKCFoeXBoZW5Mb2Nh dGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAgICAgIHJl dHVybiB7IH07CiAgICAgICAgICAgICAvLyBoeXBoZW5Mb2NhdGlvbiBpcyByZWxhdGl2ZSB0byB0 aGUgc3RhcnQgb2YgdGhpcyBJbmxpbmVJdGVtVGV4dC4KQEAgLTUxOCw5ICs1MTYsOSBAQCBzdGQ6 Om9wdGlvbmFsPElubGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50 QnJlYWtlcjo6dHJ5QnJlYWtpbgogICAgIHJldHVybiB7IH07CiB9CiAKLXZvaWQgSW5saW5lQ29u dGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYg aW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0ZDo6b3B0aW9uYWw8 SW5saW5lTGF5b3V0VW5pdD4gY29sbGFwc2libGVXaWR0aCkKK3ZvaWQgSW5saW5lQ29udGVudEJy ZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5l SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBjb2xsYXBzaWJsZVdpZHRoKQog ewotICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsV2lkdGggfSk7CisgICAg bV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIHN0eWxlLCBsb2dpY2FsV2lkdGggfSk7CiAgICAg bV9sb2dpY2FsV2lkdGggPSBjbGFtcFRvPElubGluZUxheW91dFVuaXQ+KG1fbG9naWNhbFdpZHRo ICsgbG9naWNhbFdpZHRoKTsKICAgICBpZiAoIWNvbGxhcHNpYmxlV2lkdGgpIHsKICAgICAgICAg bV9jb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCA9IHsgfTsKQEAgLTU0Myw3ICs1NDEsNiBAQCB2b2lk IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6cmVzZXQoKQogICAgIG1f Y29sbGFwc2libGVMb2dpY2FsV2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFyKCk7CiB9Ci0K IH0KIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgK aW5kZXggYzZkOTVhNjk1MmFiYTJkNDQzOTJmYWM0ZjhkZDMwNmE2MzkxYzcwZi4uOGNmMzc4ZDBj MDViNGViNTRmYTljYTI0MzllZWI4YWM0MzFhMWZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVDb250ZW50QnJlYWtlci5oCkBAIC0yOCwxMSArMjgsOSBAQAogI2lmIEVOQUJMRShMQVlP VVRfRk9STUFUVElOR19DT05URVhUKQogCiAjaW5jbHVkZSAiTGF5b3V0VW5pdHMuaCIKKyNpbmNs dWRlICJSZW5kZXJTdHlsZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7Ci0KLWNsYXNzIFJlbmRl clN0eWxlOwotCiBuYW1lc3BhY2UgTGF5b3V0IHsKIAogY2xhc3MgSW5saW5lSXRlbTsKQEAgLTg0 LDE1ICs4MiwyOCBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaGFzVHJhaWxpbmdDb2xsYXBzaWJs ZUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiAhIWNvbGxhcHNpYmxlTG9naWNhbFdpZHRoKCk7IH0K ICAgICAgICAgYm9vbCBpc0Z1bGx5Q29sbGFwc2libGUoKSBjb25zdCB7IHJldHVybiBsb2dpY2Fs V2lkdGgoKSA9PSBjb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCgpOyB9CiAKLSAgICAgICAgdm9pZCBh cHBlbmQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBz dGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGNvbGxhcHNpYmxlV2lkdGgpOworICAgICAg ICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiBjb2xsYXBzaWJsZVdpZHRoKTsKICAgICAgICAgdm9pZCByZXNldCgpOwogCiAgICAgICAgIHN0 cnVjdCBSdW4gewotICAgICAgICAgICAgUnVuKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICBSdW4oY29uc3QgSW5saW5lSXRlbSYs IGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAg ICAgICAgICAgUnVuKGNvbnN0IFJ1biYpOwogICAgICAgICAgICAgUnVuJiBvcGVyYXRvcj0oY29u c3QgUnVuJik7CiAKICAgICAgICAgICAgIGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW07Cisg ICAgICAgICAgICBzdHJ1Y3QgU3R5bGUgeworICAgICAgICAgICAgICAgIFdoaXRlU3BhY2Ugd2hp dGVTcGFjZSB7IFdoaXRlU3BhY2U6Ok5vcm1hbCB9OworICAgICAgICAgICAgICAgIExpbmVCcmVh ayBsaW5lQnJlYWsgeyBMaW5lQnJlYWs6OkF1dG8gfTsKKyAgICAgICAgICAgICAgICBXb3JkQnJl YWsgd29yZEJyZWFrIHsgV29yZEJyZWFrOjpOb3JtYWwgfTsKKyAgICAgICAgICAgICAgICBPdmVy Zmxvd1dyYXAgb3ZlcmZsb3dXcmFwIHsgT3ZlcmZsb3dXcmFwOjpOb3JtYWwgfTsKKyAgICAgICAg ICAgICAgICBIeXBoZW5zIGh5cGhlbnMgeyBIeXBoZW5zOjpOb25lIH07CisgICAgICAgICAgICAg ICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gaHlwaGVuYXRpb25MaW1pdEJlZm9yZTsKKyAgICAg ICAgICAgICAgICBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkPiBoeXBoZW5hdGlvbkxpbWl0QWZ0ZXI7 CisgICAgICAgICAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlOworICAgICAg ICAgICAgICAgIGNvbnN0IEF0b21TdHJpbmcmIGh5cGhlblN0cmluZzsKKyAgICAgICAgICAgICAg ICBjb25zdCBBdG9tU3RyaW5nJiBsb2NhbGU7CisgICAgICAgICAgICB9OworICAgICAgICAgICAg U3R5bGUgc3R5bGU7CiAgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7 IDAgfTsKICAgICAgICAgfTsKICAgICAgICAgdXNpbmcgUnVuTGlzdCA9IFZlY3RvcjxSdW4sIDM+ OwpAQCAtMTE2LDcgKzEyNyw3IEBAIHB1YmxpYzoKICAgICBSZXN1bHQgcHJvY2Vzc0lubGluZUNv bnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJik7CiAgICAg dm9pZCBzZXRIeXBoZW5hdGlvbkRpc2FibGVkKCkgeyBuX2h5cGhlbmF0aW9uSXNEaXNhYmxlZCA9 IHRydWU7IH0KIAotICAgIHN0YXRpYyBib29sIGlzV3JhcHBpbmdBbGxvd2VkKGNvbnN0IElubGlu ZUl0ZW0mKTsKKyAgICBzdGF0aWMgYm9vbCBpc1dyYXBwaW5nQWxsb3dlZChjb25zdCBDb250aW51 b3VzQ29udGVudDo6UnVuJik7CiAKIHByaXZhdGU6CiAgICAgUmVzdWx0IHByb2Nlc3NPdmVyZmxv d2luZ0NvbnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJikg Y29uc3Q7CkBAIC0xMjcsMjAgKzEzOCwzMSBAQCBwcml2YXRlOgogICAgICAgICBBdEFyYml0cmFy eVBvc2l0aW9uICAgICAgICA9IDEgPDwgMCwKICAgICAgICAgQXRIeXBoZW5hdGlvbk9wcG9ydHVu aXRpZXMgPSAxIDw8IDEKICAgICB9OwotICAgIE9wdGlvblNldDxXb3JkQnJlYWtSdWxlPiB3b3Jk QnJlYWtCZWhhdmlvcihjb25zdCBSZW5kZXJTdHlsZSYsIGJvb2wgaGFzV3JhcE9wcG9ydHVuaXR5 QXRQcmV2aW91c1Bvc2l0aW9uKSBjb25zdDsKKyAgICBPcHRpb25TZXQ8V29yZEJyZWFrUnVsZT4g d29yZEJyZWFrQmVoYXZpb3IoY29uc3QgQ29udGludW91c0NvbnRlbnQ6OlJ1bjo6U3R5bGUmLCBi b29sIGhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikgY29uc3Q7CiAgICAgYm9v bCBzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFjZShjb25zdCBDb250aW51b3VzQ29udGVudCYp IGNvbnN0OwogCiAgICAgYm9vbCBuX2h5cGhlbmF0aW9uSXNEaXNhYmxlZCB7IGZhbHNlIH07CiB9 OwogCi1pbmxpbmUgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpSdW46 OlJ1bihjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCkKK2lubGluZSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6 OlJ1bjo6UnVuKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiAgICAgOiBpbmxpbmVJdGVt KGlubGluZUl0ZW0pCisgICAgLCBzdHlsZSh7IHN0eWxlLndoaXRlU3BhY2UoKQorICAgICAgICAs IHN0eWxlLmxpbmVCcmVhaygpCisgICAgICAgICwgc3R5bGUud29yZEJyZWFrKCkKKyAgICAgICAg LCBzdHlsZS5vdmVyZmxvd1dyYXAoKQorICAgICAgICAsIHN0eWxlLmh5cGhlbnMoKQorICAgICAg ICAsIHN0eWxlLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUoKSAhPSBzdHlsZS5pbml0aWFsSHlwaGVu YXRpb25MaW1pdEJlZm9yZSgpID8gc3RkOjptYWtlX29wdGlvbmFsKHN0eWxlLmh5cGhlbmF0aW9u TGltaXRCZWZvcmUoKSkgOiBzdGQ6Om51bGxvcHQKKyAgICAgICAgLCBzdHlsZS5oeXBoZW5hdGlv bkxpbWl0QWZ0ZXIoKSAhPSBzdHlsZS5pbml0aWFsSHlwaGVuYXRpb25MaW1pdEFmdGVyKCkgPyBz dGQ6Om1ha2Vfb3B0aW9uYWwoc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFmdGVyKCkpIDogc3RkOjpu dWxsb3B0CisgICAgICAgICwgc3R5bGUuZm9udENhc2NhZGUoKQorICAgICAgICAsIHN0eWxlLmh5 cGhlblN0cmluZygpCisgICAgICAgICwgc3R5bGUuZm9udERlc2NyaXB0aW9uKCkuY29tcHV0ZWRM b2NhbGUoKSB9KQogICAgICwgbG9naWNhbFdpZHRoKGxvZ2ljYWxXaWR0aCkKIHsKIH0KIAogaW5s aW5lIElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuOjpSdW4oY29u c3QgUnVuJiBvdGhlcikKICAgICA6IGlubGluZUl0ZW0ob3RoZXIuaW5saW5lSXRlbSkKKyAgICAs IHN0eWxlKG90aGVyLnN0eWxlKQogICAgICwgbG9naWNhbFdpZHRoKG90aGVyLmxvZ2ljYWxXaWR0 aCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBm YTU4YTdjZTY3Y2E3NDI5MzdmMTgwNDczMDFlMjU0ZTM1Y2U1MDZkLi5lYjhjYmVmNWY0MTA1Y2Zk MGY4ZWVhYWI3MzNmZGMwYzY3ZTRkOWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCkBAIC0xOTUsNyArMTk1LDggQEAgaW5saW5lIHZvaWQgTGluZUNhbmRpZGF0 ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmwK ICAgICAgICAgQVNTRVJUKGxvZ2ljYWxXaWR0aCA+IGxldHRlclNwYWNpbmcpOwogICAgICAgICBy ZXR1cm4gbGV0dGVyU3BhY2luZzsKICAgICB9OwotICAgIG1fY29udGludW91c0NvbnRlbnQuYXBw ZW5kKGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCwgY29sbGFwc2libGVXaWR0aCgpKTsKKyAgICAv LyBGSVhNRTogV2hpbGUgdGhlIGxpbmUgYnJlYWtpbmcgcmVsYXRlZCBwcm9wZXJ0aWVzIGZvciBh dG9taWMgbGV2ZWwgYm94ZXMgZG8gbm90IGRlcGVuZCBvbiB0aGUgbGluZSBpbmRleCAoZmlyc3Qg bGluZSBzdHlsZSkgaXQnZCBiZSBncmVhdCB0byBmaWd1cmUgb3V0IHRoZSBjb3JyZWN0IHN0eWxl IHRvIHBhc3MgaW4uCisgICAgbV9jb250aW51b3VzQ29udGVudC5hcHBlbmQoaW5saW5lSXRlbSwg IWlubGluZUl0ZW0uaXNCb3goKSA/IGlubGluZUl0ZW0uc3R5bGUoKSA6IGlubGluZUl0ZW0ubGF5 b3V0Qm94KCkucGFyZW50KCkuc3R5bGUoKSwgbG9naWNhbFdpZHRoLCBjb2xsYXBzaWJsZVdpZHRo KCkpOwogICAgIG1faGFzSW5saW5lTGV2ZWxCb3ggPSBtX2hhc0lubGluZUxldmVsQm94IHx8IGlu bGluZUl0ZW0uaXNCb3goKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKTsKIH0KIApA QCAtNjkyLDExICs2OTMsMTEgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFu ZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYgaW5saW4KICAgICAgICAgICAg IG1fbGluZS5hcHBlbmQocnVuLmlubGluZUl0ZW0sIHJ1bi5sb2dpY2FsV2lkdGgpOwogICAgICAg ICBpZiAobGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50Lmhhc1RyYWlsaW5nU29mdFdyYXBPcHBv cnR1bml0eSgpKSB7CiAgICAgICAgICAgICAvLyBDaGVjayBpZiB3ZSBhcmUgYWxsb3dlZCB0byB3 cmFwIGF0IHRoaXMgcG9zaXRpb24uCi0gICAgICAgICAgICBhdXRvJiB0cmFpbGluZ0l0ZW0gPSBj YW5kaWRhdGVSdW5zLmxhc3QoKS5pbmxpbmVJdGVtOworICAgICAgICAgICAgYXV0byYgdHJhaWxp bmdSdW4gPSBjYW5kaWRhdGVSdW5zLmxhc3QoKTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGVy ZSBtdXN0IGJlIGEgd2F5IHRvIGRlY2lkZSBpZiB0aGUgdHJhaWxpbmcgcnVuIGFjdHVhbGx5IGVu ZGVkIHVwIG9uIHRoZSBsaW5lLgogICAgICAgICAgICAgLy8gTGV0J3MganVzdCBkZWFsIHdpdGgg Y29sbGFwc2VkIGxlYWRpbmcgd2hpdGVzcGFjZSBmb3Igbm93LgotICAgICAgICAgICAgaWYgKCFt X2xpbmUucnVucygpLmlzRW1wdHkoKSAmJiBJbmxpbmVDb250ZW50QnJlYWtlcjo6aXNXcmFwcGlu Z0FsbG93ZWQodHJhaWxpbmdJdGVtKSkKLSAgICAgICAgICAgICAgICBtX3dyYXBPcHBvcnR1bml0 eUxpc3QuYXBwZW5kKCZ0cmFpbGluZ0l0ZW0pOworICAgICAgICAgICAgaWYgKCFtX2xpbmUucnVu cygpLmlzRW1wdHkoKSAmJiBJbmxpbmVDb250ZW50QnJlYWtlcjo6aXNXcmFwcGluZ0FsbG93ZWQo dHJhaWxpbmdSdW4pKQorICAgICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5hcHBl bmQoJnRyYWlsaW5nUnVuLmlubGluZUl0ZW0pOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiB7 IHJlc3VsdC5pc0VuZE9mTGluZSwgeyBjYW5kaWRhdGVSdW5zLnNpemUoKSwgZmFsc2UgfSB9Owog ICAgIH0K 439196 2021-09-24 14:10:43 -0700 2021-09-24 14:18:15 -0700 [fast-cq]Patch to fix the debug failures Patch.txt text/plain 1635 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMTRlMTJmMzI0ZWYuLjJiNWU5YzI4YmYzYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIxLTA5LTI0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICByMjgzMDQ3IGJyb2tlIHNvbWUgaHlwaGVuIHJlbGF0ZWQgZGVidWcgdGVzdHMu CisKKyAgICAgICAgVW5yZXZpZXdlZC4KKworICAgICAgICBBcHBhcmVudGx5IHdlIGNhbid0IGFj Y2VzcyB0aGUgaHlwaGVuIHN0cmluZyB3aGVuIHRoZSBoeXBoZW4gcHJvcGVydHkgaXMgbm90IHNl dC4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNv bnRlbnRCcmVha2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuOjpSdW4pOgorCiAyMDIxLTA5LTI0ICBFcmlj IEh1dGNoaXNvbiAgPGVodXRjaGlzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJldmVydGluZyByMjgzMDUwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmgKaW5kZXggOGNmMzc4ZDBjMDViLi4zNGQzMTc0YmEyZjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRC cmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaApAQCAtMTU0LDcgKzE1NCw3IEBAIGlubGluZSBJ bmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1bjo6UnVuKGNvbnN0IElu bGluZUl0ZW0mIGlubGluCiAgICAgICAgICwgc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgp ICE9IHN0eWxlLmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCkgPyBzdGQ6Om1ha2Vfb3B0 aW9uYWwoc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpKSA6IHN0ZDo6bnVsbG9wdAogICAg ICAgICAsIHN0eWxlLmh5cGhlbmF0aW9uTGltaXRBZnRlcigpICE9IHN0eWxlLmluaXRpYWxIeXBo ZW5hdGlvbkxpbWl0QWZ0ZXIoKSA/IHN0ZDo6bWFrZV9vcHRpb25hbChzdHlsZS5oeXBoZW5hdGlv bkxpbWl0QWZ0ZXIoKSkgOiBzdGQ6Om51bGxvcHQKICAgICAgICAgLCBzdHlsZS5mb250Q2FzY2Fk ZSgpCi0gICAgICAgICwgc3R5bGUuaHlwaGVuU3RyaW5nKCkKKyAgICAgICAgLCAoc3R5bGUuaHlw aGVucygpID09IEh5cGhlbnM6Ok5vbmUgPyBudWxsQXRvbSgpIDogc3R5bGUuaHlwaGVuU3RyaW5n KCkpCiAgICAgICAgICwgc3R5bGUuZm9udERlc2NyaXB0aW9uKCkuY29tcHV0ZWRMb2NhbGUoKSB9 KQogICAgICwgbG9naWNhbFdpZHRoKGxvZ2ljYWxXaWR0aCkKIHsK