232552 2021-10-31 21:16:07 -0700 [LFC][IFC] Start using ubidi to find bidi boundaries 2021-11-01 12:23:50 -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 1810545 0 zalan 2021-10-31 21:16:07 -0700 ssia 1810547 1 442953 zalan 2021-10-31 21:33:43 -0700 Created attachment 442953 Patch 1810562 2 442953 koivisto 2021-10-31 23:03:57 -0700 Comment on attachment 442953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442953&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:136 > +void InlineItemsBuilder::breakInlineItemsAtBidiBoundaries(InlineItems& inlineItems) breakAndComputeBidiLevels() or something? (InlineItems is bit redundant since we are in InlineItemBuilder). 1810646 3 442953 koivisto 2021-11-01 09:24:25 -0700 Comment on attachment 442953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442953&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:156 > + ubidi_close(ubidi); could use ScopeExit for safe closing. 1810675 4 442988 zalan 2021-11-01 10:19:51 -0700 Created attachment 442988 Patch 1810756 5 ews-feeder 2021-11-01 12:22:27 -0700 Committed r285119 (243760@main): <https://commits.webkit.org/243760@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442988. 1810758 6 webkit-bug-importer 2021-11-01 12:23:50 -0700 <rdar://problem/84893664> 442953 2021-10-31 21:33:43 -0700 2021-11-01 10:19:49 -0700 Patch bug-232552-20211031213343.patch text/plain 8155 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MxMjg0ZjE2MWQxOGVm MGUzZDVjYTk4MDdiNjEyZTAxYzQ4YmYyYi4uM2JiNWRmYzdlODIyY2U5ZTA2NmI3OTE3ZDcxODFk ODIyZjNlN2FkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTMxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0YXJ0IHVz aW5nIHViaWRpIHRvIGZpbmQgYmlkaSBib3VuZGFyaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBzdGFydCB1c2luZyB1 YmlkaSB0byBmaW5kIHRoZSBiaWRpIGJvdW5kYXJpZXMgaW4gdGhlIHBhcmFncmFwaCBjb250ZW50 LgorICAgICAgICBXZSBhbHNvIHNldCB0aGUgYmlkaSBsZXZlbHMgb24gdGhlIGFzc29jaWF0ZWQg aW5saW5lIGl0ZW0gcmFuZ2UuIExhdGVyIHdlJ2xsIGJlIHVzaW5nIHRoZXNlIGxldmVscworICAg ICAgICB0byBjb21wdXRlIHRoZSB2aXN1YWwgb3JkZXIgKGFmdGVyIGxpbmUgYnJlYWtpbmcpLgor ICAgICAgICAoc2VlIGJyZWFrSW5saW5lSXRlbXNBdEJpZGlCb3VuZGFyaWVzIGZvciBkZXRhaWxz KQorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtOjpzZXRCaWRpTGV2ZWwp OgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1z QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRl cjo6YnJlYWtJbmxpbmVJdGVtc0F0QmlkaUJvdW5kYXJpZXMpOgorICAgICAgICAqIGxheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnNwbGl0QXQpOgorICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmg6CisKIDIwMjEtMTAt MzEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g SW50cm9kdWNlIHBhcmFncmFwaCBjb250ZW50IGJ1aWxkaW5nIHRvIElubGluZUl0ZW1zQnVpbGRl cjo6aGFuZGxlVGV4dENvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaAppbmRleCAzODdlNmZh M2E2NGRlYTY4NGQ3Nzg5ZmI3NmVlOGFlNzY3OWU0OWU0Li5hYmU5MTRhOTc0MTMyY2NjMjdjYWNl ZmFlNTNlYTcyMzZmZjAxYjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbS5oCkBAIC0zNCw2ICsz NCw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorY2xhc3Mg SW5saW5lSXRlbXNCdWlsZGVyOworCiBjbGFzcyBJbmxpbmVJdGVtIHsKIHB1YmxpYzoKICAgICBl bnVtIGNsYXNzIFR5cGUgOiB1aW50OF90IHsKQEAgLTY1LDYgKzY3LDEwIEBAIHB1YmxpYzoKICAg ICBib29sIGlzSW5saW5lQm94RW5kKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09IFR5cGU6Oklu bGluZUJveEVuZDsgfQogCiBwcml2YXRlOgorICAgIGZyaWVuZCBjbGFzcyBJbmxpbmVJdGVtc0J1 aWxkZXI7CisKKyAgICB2b2lkIHNldEJpZGlMZXZlbChVQmlEaUxldmVsIGJpZGlMZXZlbCkgeyBt X2JpZGlMZXZlbCA9IGJpZGlMZXZlbDsgfQorCiAgICAgY29uc3QgQm94KiBtX2xheW91dEJveCB7 IG51bGxwdHIgfTsKICAgICBUeXBlIG1fdHlwZSB7IH07CiAgICAgVUJpRGlMZXZlbCBtX2JpZGlM ZXZlbCB7IFVCSURJX0RFRkFVTFRfTFRSIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcAppbmRleCAxNDI2ZDY0OWE3MjEyOGUwY2QzNmUzMWRkYTliMmM2YWRkYmU3 OTE2Li43NTcyMDg0ODc5MWMxODgxYTBiMmVlYWZhMTFiMjAzODI2ZmFiNGJhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJ dGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKQEAgLTEzMyw5ICsxMzMsNzIgQEAg dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJbmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYg aW5saW5lSXRlbXMpCiAgICAgfQogfQogCi12b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtJ bmxpbmVJdGVtc0F0QmlkaUJvdW5kYXJpZXMoSW5saW5lSXRlbXMmKQordm9pZCBJbmxpbmVJdGVt c0J1aWxkZXI6OmJyZWFrSW5saW5lSXRlbXNBdEJpZGlCb3VuZGFyaWVzKElubGluZUl0ZW1zJiBp bmxpbmVJdGVtcykKIHsKLSAgICAvLyBGSVhNRTogVXNlIHViaWRpIHRvIHNwbGl0IHRoZSBjb250 ZW50IGF0IGJpZGkgYm91bmRhcmllcy4KKyAgICBpZiAobV9wYXJhZ3JhcGhDb250ZW50QnVpbGRl ci5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKyAgICBBU1NFUlQoIWlubGluZUl0ZW1zLmlz RW1wdHkoKSk7CisKKyAgICAvLyAxLiBTZXR1cCB0aGUgYmlkaSBib3VuZGFyeSBsb29wIGJ5IGNh bGxpbmcgdWJpZGlfc2V0UGFyYSB3aXRoIHRoZSBwYXJhZ3JhcGggdGV4dC4KKyAgICAvLyAyLiBD YWxsIHViaWRpX2dldExvZ2ljYWxSdW4gdG8gYWR2YW5jZSB0byB0aGUgbmV4dCBiaWRpIGJvdW5k YXJ5IHVudGlsIHdlIGhpdCB0aGUgZW5kIG9mIHRoZSBjb250ZW50LgorICAgIC8vIDMuIFNldCB0 aGUgY29tcHV0ZWQgYmlkaSBsZXZlbCBvbiB0aGUgYXNzb2NpYXRlZCBpbmxpbmUgaXRlbXMuIFNw bGl0IHRoZW0gYXMgbmVlZGVkLgorICAgIFVCaURpKiB1YmlkaSA9IHViaWRpX29wZW4oKTsKKwor ICAgIFVCaURpTGV2ZWwgYmlkaUxldmVsID0gVUJJRElfREVGQVVMVF9MVFI7CisgICAgYm9vbCB1 c2VIZXVyaXN0aWNCYXNlRGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkudW5pY29kZUJpZGkoKSA9 PSBFVW5pY29kZUJpZGk6OlBsYWludGV4dDsKKyAgICBpZiAoIXVzZUhldXJpc3RpY0Jhc2VEaXJl Y3Rpb24pCisgICAgICAgIGJpZGlMZXZlbCA9IHJvb3QoKS5zdHlsZSgpLmlzTGVmdFRvUmlnaHRE aXJlY3Rpb24oKSA/IFVCSURJX0xUUiA6IFVCSURJX1JUTDsKKworICAgIFVFcnJvckNvZGUgZXJy b3IgPSBVX1pFUk9fRVJST1I7CisgICAgdWJpZGlfc2V0UGFyYSh1YmlkaSwgbV9wYXJhZ3JhcGhD b250ZW50QnVpbGRlci5jaGFyYWN0ZXJzMTYoKSwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5s ZW5ndGgoKSwgYmlkaUxldmVsLCBudWxscHRyLCAmZXJyb3IpOworICAgIGlmIChVX0ZBSUxVUkUo ZXJyb3IpKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB1YmlkaV9j bG9zZSh1YmlkaSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzaXplX3QgY3VycmVu dElubGluZUl0ZW1JbmRleCA9IDA7CisgICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0aW9uID0g MDsgY3VycmVudFBvc2l0aW9uIDwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKTsp IHsKKyAgICAgICAgVUJpRGlMZXZlbCBsZXZlbDsKKyAgICAgICAgaW50MzJfdCBlbmRQb3NpdGlv biA9IGN1cnJlbnRQb3NpdGlvbjsKKyAgICAgICAgdWJpZGlfZ2V0TG9naWNhbFJ1bih1YmlkaSwg Y3VycmVudFBvc2l0aW9uLCAmZW5kUG9zaXRpb24sICZsZXZlbCk7CisKKyAgICAgICAgYXV0byBz ZXRCaWRpTGV2ZWxPblJhbmdlID0gWyZdIHsKKyAgICAgICAgICAgIC8vIFdlIHNob3VsZCBhbHdh eXMgaGF2ZSBpbmxpbmUgaXRlbShzKSBhc3NvY2lhdGVkIHdpdGggYSBiaWRpIHJhbmdlLgorICAg ICAgICAgICAgQVNTRVJUKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPCBpbmxpbmVJdGVtcy5zaXpl KCkpOworCisgICAgICAgICAgICB3aGlsZSAoY3VycmVudElubGluZUl0ZW1JbmRleCA8IGlubGlu ZUl0ZW1zLnNpemUoKSkgeworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSBpbmxp bmVJdGVtc1tjdXJyZW50SW5saW5lSXRlbUluZGV4XTsKKyAgICAgICAgICAgICAgICBpZiAoIWlu bGluZUl0ZW0uaXNUZXh0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMg ZmFpbHMgd2l0aCBtdWx0aXBsZSBpbmxpbmUgYm94ZXMgYXMgdGhleSBkb24ndCBhZHZhbmNlIHBv c2l0aW9uLgorICAgICAgICAgICAgICAgICAgICBpbmxpbmVJdGVtLnNldEJpZGlMZXZlbChsZXZl bCk7CisgICAgICAgICAgICAgICAgICAgICsrY3VycmVudElubGluZUl0ZW1JbmRleDsKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGlu ZUl0ZW0pOworICAgICAgICAgICAgICAgIGlubGluZVRleHRJdGVtLnNldEJpZGlMZXZlbChsZXZl bCk7CisKKyAgICAgICAgICAgICAgICBhdXRvIGlubGluZVRleHRJdGVtRW5kID0gaW5saW5lVGV4 dEl0ZW0uZW5kKCk7CisgICAgICAgICAgICAgICAgYXV0byBiaWRpRW5kID0gZW5kUG9zaXRpb24g LSBtX2NvbnRlbnRPZmZzZXRNYXAuZ2V0KCZpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSk7Cisg ICAgICAgICAgICAgICAgaWYgKGJpZGlFbmQgPT0gaW5saW5lVGV4dEl0ZW1FbmQpIHsKKyAgICAg ICAgICAgICAgICAgICAgKytjdXJyZW50SW5saW5lSXRlbUluZGV4OworICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKGJpZGlF bmQgPCBpbmxpbmVUZXh0SXRlbUVuZCkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVu dElubGluZUl0ZW1JbmRleCA9PSBpbmxpbmVJdGVtcy5zaXplKCkgLSAxKQorICAgICAgICAgICAg ICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKGlubGluZVRleHRJdGVtLnNwbGl0QXQoYmlk aUVuZCkpOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAg ICBpbmxpbmVJdGVtcy5pbnNlcnQoY3VycmVudElubGluZUl0ZW1JbmRleCArIDEsIGlubGluZVRl eHRJdGVtLnNwbGl0QXQoYmlkaUVuZCkpOworICAgICAgICAgICAgICAgICAgICArK2N1cnJlbnRJ bmxpbmVJdGVtSW5kZXg7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICArK2N1cnJlbnRJbmxpbmVJdGVtSW5kZXg7CisgICAgICAg ICAgICB9CisgICAgICAgIH07CisgICAgICAgIHNldEJpZGlMZXZlbE9uUmFuZ2UoKTsKKyAgICAg ICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRpb247CisgICAgfQorICAgIHViaWRpX2Nsb3Nl KHViaWRpKTsKIH0KIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50 KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcAppbmRleCBkNzUzZDUwNDlj MzdjODllOTYzM2Y4MjZlNjJlMWIyYWEyZGZmN2QwLi43ZTQzNDhmYjMyZjJjZjhiOTFiMTI4MWRl Njc5NWVjZjJiM2RmM2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwCkBA IC03MSw2ICs3MSwxNSBAQCBJbmxpbmVUZXh0SXRlbSBJbmxpbmVUZXh0SXRlbTo6cmlnaHQodW5z aWduZWQgbGVuZ3RoLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dAogICAgIHJldHVybiB7IGlu bGluZVRleHRCb3goKSwgZW5kKCkgLSBsZW5ndGgsIGxlbmd0aCwgYmlkaUxldmVsKCksIGhhc1Ry YWlsaW5nU29mdEh5cGhlbigpLCBpc1dvcmRTZXBhcmF0b3IoKSwgd2lkdGgsIG1fdGV4dEl0ZW1U eXBlIH07CiB9CiAKK0lubGluZVRleHRJdGVtIElubGluZVRleHRJdGVtOjpzcGxpdEF0KHNpemVf dCBwb3NpdGlvbikKK3sKKyAgICBSRUxFQVNFX0FTU0VSVChsZW5ndGgoKSA+IDEpOworICAgIFJF TEVBU0VfQVNTRVJUKHBvc2l0aW9uID4gc3RhcnQoKSAmJiBwb3NpdGlvbiA8IGVuZCgpKTsKKyAg ICBhdXRvIHJpZ2h0U2lkZSA9IHJpZ2h0KGVuZCgpIC0gcG9zaXRpb24sIHsgfSk7CisgICAgbV9s ZW5ndGggPSBsZW5ndGgoKSAtIHJpZ2h0U2lkZS5sZW5ndGgoKTsKKyAgICByZXR1cm4gcmlnaHRT aWRlOworfQorCiBib29sIElubGluZVRleHRJdGVtOjppc1plcm9XaWR0aFNwYWNlU2VwYXJhdG9y KCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGNoZWNrIGZvciBtb3JlIHplcm8g d2lkdGggY29udGVudCBhbmQgbm90IGp1c3QgVSsyMDBCLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRl eHRJdGVtLmgKaW5kZXggNDMzODc5YjBiYjgyMWM3YWNjNTNhYzc0Zjg5OGQ2NDA1NzEzY2I1Zi4u MzhiNDMyODBiNDljMDVkODYzYzJkNTFjZTZjOTk0NjZmMzk1ODhmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0 ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVUZXh0SXRlbS5oCkBAIC0zMyw2ICszMyw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorY2xhc3MgSW5saW5lSXRlbXNCdWlsZGVyOworCiB1c2lu ZyBJbmxpbmVJdGVtcyA9IFZlY3RvcjxJbmxpbmVJdGVtPjsKIAogY2xhc3MgSW5saW5lVGV4dEl0 ZW0gOiBwdWJsaWMgSW5saW5lSXRlbSB7CkBAIC01OSw4ICs2MSwxMSBAQCBwdWJsaWM6CiAgICAg c3RhdGljIGJvb2wgc2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGNvbnN0IElubGluZVRleHRJ dGVtJik7CiAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIElubGluZUl0ZW1zQnVpbGRlcjsK ICAgICB1c2luZyBJbmxpbmVJdGVtOjpUZXh0SXRlbVR5cGU7CiAKKyAgICBJbmxpbmVUZXh0SXRl bSBzcGxpdEF0KHNpemVfdCBwb3NpdGlvbik7CisKICAgICBJbmxpbmVUZXh0SXRlbShjb25zdCBJ bmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgVUJpRGlMZXZl bCwgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIGJvb2wgaXNXb3JkU2VwYXJhdG9yLCBzdGQ6 Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRoLCBUZXh0SXRlbVR5cGUpOwogICAgIGV4 cGxpY2l0IElubGluZVRleHRJdGVtKGNvbnN0IElubGluZVRleHRCb3gmLCBVQmlEaUxldmVsKTsK IH07Cg== 442988 2021-11-01 10:19:51 -0700 2021-11-01 12:22:28 -0700 Patch bug-232552-20211101101951.patch text/plain 9257 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM1ZWRmYjBhYjQ2MDkx MDcyZjc4MTI1NTYxYzdkZjgzYjFiMTc3OC4uNTY1OWUzNjI4NTdlNzI4YzRhYjZjZGUyMDVkZTYw N2NmNTQ1YjI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTExLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFN0YXJ0IHVz aW5nIHViaWRpIHRvIGZpbmQgYmlkaSBib3VuZGFyaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBzdGFydCB1c2luZyB1 YmlkaSB0byBmaW5kIHRoZSBiaWRpIGJvdW5kYXJpZXMgaW4gdGhlIHBhcmFncmFwaCBjb250ZW50 LgorICAgICAgICBXZSBhbHNvIHNldCB0aGUgYmlkaSBsZXZlbHMgb24gdGhlIGFzc29jaWF0ZWQg aW5saW5lIGl0ZW0gcmFuZ2UuIExhdGVyIHdlJ2xsIGJlIHVzaW5nIHRoZXNlIGxldmVscworICAg ICAgICB0byBjb21wdXRlIHRoZSB2aXN1YWwgb3JkZXIgKGFmdGVyIGxpbmUgYnJlYWtpbmcpLgor ICAgICAgICAoc2VlIGJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMgZm9yIGRldGFpbHMpCisKKyAg ICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW06OnNldEJpZGlMZXZlbCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpicmVh a0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZVRleHRJdGVtOjpzcGxpdEF0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5oOgorCiAyMDIxLTExLTAxICBBbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzaW5nIHBvc3QtY29tbWl0IGNv bW1lbnQgKHIyODUwOTMpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbS5oCmluZGV4IDM4N2U2ZmEzYTY0 ZGVhNjg0ZDc3ODlmYjc2ZWU4YWU3Njc5ZTQ5ZTQuLmFiZTkxNGE5NzQxMzJjY2MyN2NhY2VmYWU1 M2VhNzIzNmZmMDFiMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmgKQEAgLTM0LDYgKzM0LDgg QEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCitjbGFzcyBJbmxp bmVJdGVtc0J1aWxkZXI7CisKIGNsYXNzIElubGluZUl0ZW0gewogcHVibGljOgogICAgIGVudW0g Y2xhc3MgVHlwZSA6IHVpbnQ4X3QgewpAQCAtNjUsNiArNjcsMTAgQEAgcHVibGljOgogICAgIGJv b2wgaXNJbmxpbmVCb3hFbmQoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gVHlwZTo6SW5saW5l Qm94RW5kOyB9CiAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIElubGluZUl0ZW1zQnVpbGRl cjsKKworICAgIHZvaWQgc2V0QmlkaUxldmVsKFVCaURpTGV2ZWwgYmlkaUxldmVsKSB7IG1fYmlk aUxldmVsID0gYmlkaUxldmVsOyB9CisKICAgICBjb25zdCBCb3gqIG1fbGF5b3V0Qm94IHsgbnVs bHB0ciB9OwogICAgIFR5cGUgbV90eXBlIHsgfTsKICAgICBVQmlEaUxldmVsIG1fYmlkaUxldmVs IHsgVUJJRElfREVGQVVMVF9MVFIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1 aWxkZXIuY3BwCmluZGV4IDc4NDhiYmMxZTcyZGYyNTA5NWQxM2IwZWEzMzJlMzY4MjRmZmUzMjUu LjViMmY3ZGQ5ZDc3ZmIzOGE5NTA1YjYyMDFhMGVmODQyNGZkNjc0YTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1z QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtMjksNiArMjksNyBAQAogI2lmIEVO QUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCiAjaW5jbHVkZSAiSW5saW5lU29mdExp bmVCcmVha0l0ZW0uaCIKKyNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewogbmFtZXNwYWNlIExheW91dCB7CkBAIC04Myw3ICs4NCw3IEBAIElubGluZUl0ZW1zIElu bGluZUl0ZW1zQnVpbGRlcjo6YnVpbGQoKQogewogICAgIElubGluZUl0ZW1zIGlubGluZUl0ZW1z OwogICAgIGNvbGxlY3RJbmxpbmVJdGVtcyhpbmxpbmVJdGVtcyk7Ci0gICAgYnJlYWtJbmxpbmVJ dGVtc0F0QmlkaUJvdW5kYXJpZXMoaW5saW5lSXRlbXMpOworICAgIGJyZWFrQW5kQ29tcHV0ZUJp ZGlMZXZlbHMoaW5saW5lSXRlbXMpOwogICAgIHJldHVybiBpbmxpbmVJdGVtczsKIH0KIApAQCAt MTMzLDkgKzEzNCw3NCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6Y29sbGVjdElubGluZUl0 ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKICAgICB9CiB9CiAKLXZvaWQgSW5saW5lSXRl bXNCdWlsZGVyOjpicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRhcmllcyhJbmxpbmVJdGVtcyYp Cit2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxp bmVJdGVtcyYgaW5saW5lSXRlbXMpCiB7Ci0gICAgLy8gRklYTUU6IFVzZSB1YmlkaSB0byBzcGxp dCB0aGUgY29udGVudCBhdCBiaWRpIGJvdW5kYXJpZXMuCisgICAgaWYgKG1fcGFyYWdyYXBoQ29u dGVudEJ1aWxkZXIuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKCFpbmxp bmVJdGVtcy5pc0VtcHR5KCkpOworCisgICAgLy8gMS4gU2V0dXAgdGhlIGJpZGkgYm91bmRhcnkg bG9vcCBieSBjYWxsaW5nIHViaWRpX3NldFBhcmEgd2l0aCB0aGUgcGFyYWdyYXBoIHRleHQuCisg ICAgLy8gMi4gQ2FsbCB1YmlkaV9nZXRMb2dpY2FsUnVuIHRvIGFkdmFuY2UgdG8gdGhlIG5leHQg YmlkaSBib3VuZGFyeSB1bnRpbCB3ZSBoaXQgdGhlIGVuZCBvZiB0aGUgY29udGVudC4KKyAgICAv LyAzLiBTZXQgdGhlIGNvbXB1dGVkIGJpZGkgbGV2ZWwgb24gdGhlIGFzc29jaWF0ZWQgaW5saW5l IGl0ZW1zLiBTcGxpdCB0aGVtIGFzIG5lZWRlZC4KKyAgICBVQmlEaSogdWJpZGkgPSB1YmlkaV9v cGVuKCk7CisKKyAgICBhdXRvIGNsb3NlVUJpRGlPbkV4aXQgPSBtYWtlU2NvcGVFeGl0KFsmXSB7 CisgICAgICAgIHViaWRpX2Nsb3NlKHViaWRpKTsKKyAgICB9KTsKKworICAgIFVCaURpTGV2ZWwg YmlkaUxldmVsID0gVUJJRElfREVGQVVMVF9MVFI7CisgICAgYm9vbCB1c2VIZXVyaXN0aWNCYXNl RGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkudW5pY29kZUJpZGkoKSA9PSBFVW5pY29kZUJpZGk6 OlBsYWludGV4dDsKKyAgICBpZiAoIXVzZUhldXJpc3RpY0Jhc2VEaXJlY3Rpb24pCisgICAgICAg IGJpZGlMZXZlbCA9IHJvb3QoKS5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IFVC SURJX0xUUiA6IFVCSURJX1JUTDsKKworICAgIFVFcnJvckNvZGUgZXJyb3IgPSBVX1pFUk9fRVJS T1I7CisgICAgdWJpZGlfc2V0UGFyYSh1YmlkaSwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5j aGFyYWN0ZXJzMTYoKSwgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSwgYmlkaUxl dmVsLCBudWxscHRyLCAmZXJyb3IpOworICAgIGlmIChVX0ZBSUxVUkUoZXJyb3IpKSB7CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg c2l6ZV90IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPSAwOworICAgIGZvciAoc2l6ZV90IGN1cnJl bnRQb3NpdGlvbiA9IDA7IGN1cnJlbnRQb3NpdGlvbiA8IG1fcGFyYWdyYXBoQ29udGVudEJ1aWxk ZXIubGVuZ3RoKCk7KSB7CisgICAgICAgIFVCaURpTGV2ZWwgbGV2ZWw7CisgICAgICAgIGludDMy X3QgZW5kUG9zaXRpb24gPSBjdXJyZW50UG9zaXRpb247CisgICAgICAgIHViaWRpX2dldExvZ2lj YWxSdW4odWJpZGksIGN1cnJlbnRQb3NpdGlvbiwgJmVuZFBvc2l0aW9uLCAmbGV2ZWwpOworCisg ICAgICAgIGF1dG8gc2V0QmlkaUxldmVsT25SYW5nZSA9IFsmXSB7CisgICAgICAgICAgICAvLyBX ZSBzaG91bGQgYWx3YXlzIGhhdmUgaW5saW5lIGl0ZW0ocykgYXNzb2NpYXRlZCB3aXRoIGEgYmlk aSByYW5nZS4KKyAgICAgICAgICAgIEFTU0VSVChjdXJyZW50SW5saW5lSXRlbUluZGV4IDwgaW5s aW5lSXRlbXMuc2l6ZSgpKTsKKworICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVJdGVt SW5kZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxp bmVJdGVtID0gaW5saW5lSXRlbXNbY3VycmVudElubGluZUl0ZW1JbmRleF07CisgICAgICAgICAg ICAgICAgaWYgKCFpbmxpbmVJdGVtLmlzVGV4dCgpKSB7CisgICAgICAgICAgICAgICAgICAgIC8v IEZJWE1FOiBUaGlzIGZhaWxzIHdpdGggbXVsdGlwbGUgaW5saW5lIGJveGVzIGFzIHRoZXkgZG9u J3QgYWR2YW5jZSBwb3NpdGlvbi4KKyAgICAgICAgICAgICAgICAgICAgaW5saW5lSXRlbS5zZXRC aWRpTGV2ZWwobGV2ZWwpOworICAgICAgICAgICAgICAgICAgICArK2N1cnJlbnRJbmxpbmVJdGVt SW5kZXg7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRl eHRJdGVtPihpbmxpbmVJdGVtKTsKKyAgICAgICAgICAgICAgICBpbmxpbmVUZXh0SXRlbS5zZXRC aWRpTGV2ZWwobGV2ZWwpOworCisgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVUZXh0SXRlbUVu ZCA9IGlubGluZVRleHRJdGVtLmVuZCgpOworICAgICAgICAgICAgICAgIGF1dG8gYmlkaUVuZCA9 IGVuZFBvc2l0aW9uIC0gbV9jb250ZW50T2Zmc2V0TWFwLmdldCgmaW5saW5lVGV4dEl0ZW0ubGF5 b3V0Qm94KCkpOworICAgICAgICAgICAgICAgIGlmIChiaWRpRW5kID09IGlubGluZVRleHRJdGVt RW5kKSB7CisgICAgICAgICAgICAgICAgICAgICsrY3VycmVudElubGluZUl0ZW1JbmRleDsKKyAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGlmIChiaWRpRW5kIDwgaW5saW5lVGV4dEl0ZW1FbmQpIHsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPT0gaW5saW5lSXRlbXMuc2l6ZSgpIC0gMSkK KyAgICAgICAgICAgICAgICAgICAgICAgIGlubGluZUl0ZW1zLmFwcGVuZChpbmxpbmVUZXh0SXRl bS5zcGxpdEF0KGJpZGlFbmQpKTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuaW5zZXJ0KGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgg KyAxLCBpbmxpbmVUZXh0SXRlbS5zcGxpdEF0KGJpZGlFbmQpKTsKKyAgICAgICAgICAgICAgICAg ICAgKytjdXJyZW50SW5saW5lSXRlbUluZGV4OworICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgKytjdXJyZW50SW5saW5lSXRlbUlu ZGV4OworICAgICAgICAgICAgfQorICAgICAgICB9OworICAgICAgICBzZXRCaWRpTGV2ZWxPblJh bmdlKCk7CisgICAgICAgIGN1cnJlbnRQb3NpdGlvbiA9IGVuZFBvc2l0aW9uOworICAgIH0KIH0K IAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGlu ZVRleHRCb3gmIGlubGluZVRleHRCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUl0ZW1zQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKaW5kZXggYTIyMGRiZjllZmI4NThkZjJm ODAyZDdkOWI1NjQ1Mjg0ZjY2YjdhYi4uOGU4NTk0ODM5YjIzYzA1NTAzMGMxMzEzOGU0ZWI4OThi NTFiNzBlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKQEAgLTQy LDcgKzQyLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZvaWQgY29sbGVjdElubGluZUl0 ZW1zKElubGluZUl0ZW1zJik7Ci0gICAgdm9pZCBicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRh cmllcyhJbmxpbmVJdGVtcyYpOworICAgIHZvaWQgYnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJ bmxpbmVJdGVtcyYpOwogCiAgICAgdm9pZCBoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVU ZXh0Qm94JiwgSW5saW5lSXRlbXMmKTsKICAgICB2b2lkIGhhbmRsZUlubGluZUJveFN0YXJ0KGNv bnN0IEJveCYsIElubGluZUl0ZW1zJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5j cHAKaW5kZXggZDc1M2Q1MDQ5YzM3Yzg5ZTk2MzNmODI2ZTYyZTFiMmFhMmRmZjdkMC4uN2U0MzQ4 ZmIzMmYyY2Y4YjkxYjEyODFkZTY3OTVlY2YyYjNkZjNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZVRleHRJdGVtLmNwcApAQCAtNzEsNiArNzEsMTUgQEAgSW5saW5lVGV4dEl0ZW0gSW5saW5l VGV4dEl0ZW06OnJpZ2h0KHVuc2lnbmVkIGxlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlv dXQKICAgICByZXR1cm4geyBpbmxpbmVUZXh0Qm94KCksIGVuZCgpIC0gbGVuZ3RoLCBsZW5ndGgs IGJpZGlMZXZlbCgpLCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4oKSwgaXNXb3JkU2VwYXJhdG9yKCks IHdpZHRoLCBtX3RleHRJdGVtVHlwZSB9OwogfQogCitJbmxpbmVUZXh0SXRlbSBJbmxpbmVUZXh0 SXRlbTo6c3BsaXRBdChzaXplX3QgcG9zaXRpb24pCit7CisgICAgUkVMRUFTRV9BU1NFUlQobGVu Z3RoKCkgPiAxKTsKKyAgICBSRUxFQVNFX0FTU0VSVChwb3NpdGlvbiA+IHN0YXJ0KCkgJiYgcG9z aXRpb24gPCBlbmQoKSk7CisgICAgYXV0byByaWdodFNpZGUgPSByaWdodChlbmQoKSAtIHBvc2l0 aW9uLCB7IH0pOworICAgIG1fbGVuZ3RoID0gbGVuZ3RoKCkgLSByaWdodFNpZGUubGVuZ3RoKCk7 CisgICAgcmV0dXJuIHJpZ2h0U2lkZTsKK30KKwogYm9vbCBJbmxpbmVUZXh0SXRlbTo6aXNaZXJv V2lkdGhTcGFjZVNlcGFyYXRvcigpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBj aGVjayBmb3IgbW9yZSB6ZXJvIHdpZHRoIGNvbnRlbnQgYW5kIG5vdCBqdXN0IFUrMjAwQi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZVRleHRJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5oCmluZGV4IDQzMzg3OWIwYmI4MjFjN2FjYzUzYWM3 NGY4OThkNjQwNTcxM2NiNWYuLjM4YjQzMjgwYjQ5YzA1ZDg2M2MyZDUxY2U2Yzk5NDY2ZjM5NTg4 ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZVRleHRJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaApAQCAtMzMsNiArMzMsOCBAQAog bmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKK2NsYXNzIElubGluZUl0 ZW1zQnVpbGRlcjsKKwogdXNpbmcgSW5saW5lSXRlbXMgPSBWZWN0b3I8SW5saW5lSXRlbT47CiAK IGNsYXNzIElubGluZVRleHRJdGVtIDogcHVibGljIElubGluZUl0ZW0gewpAQCAtNTksOCArNjEs MTEgQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFi cyhjb25zdCBJbmxpbmVUZXh0SXRlbSYpOwogCiBwcml2YXRlOgorICAgIGZyaWVuZCBjbGFzcyBJ bmxpbmVJdGVtc0J1aWxkZXI7CiAgICAgdXNpbmcgSW5saW5lSXRlbTo6VGV4dEl0ZW1UeXBlOwog CisgICAgSW5saW5lVGV4dEl0ZW0gc3BsaXRBdChzaXplX3QgcG9zaXRpb24pOworCiAgICAgSW5s aW5lVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25l ZCBsZW5ndGgsIFVCaURpTGV2ZWwsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBib29sIGlz V29yZFNlcGFyYXRvciwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgVGV4 dEl0ZW1UeXBlKTsKICAgICBleHBsaWNpdCBJbmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0 Qm94JiwgVUJpRGlMZXZlbCk7CiB9Owo=