259631 2023-07-29 15:57:05 -0700 Out-of-flow <br> should not trigger a line break 2023-08-01 08:24:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=230048 InRadar P2 Normal --- 1 zalan zalan bfulgham cdumez changseok esprehn+autocc ews-watchlist glenn kangil.han koivisto kondapallykalyan mmaxfield ntim pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1968776 0 zalan 2023-07-29 15:57:05 -0700 https://github.com/w3c/csswg-drafts/issues/5749 1968782 1 467157 zalan 2023-07-29 16:24:02 -0700 Created attachment 467157 Patch 1968785 2 467157 ntim 2023-07-29 21:32:20 -0700 Comment on attachment 467157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=467157&action=review > LayoutTests/fast/inline/out-of-flow-forced-line-break.html:1 > +<style> Would be a really good WPT especially if browsers disagree here. 1968786 3 467158 zalan 2023-07-29 21:40:22 -0700 Created attachment 467158 Patch 1968817 4 467159 zalan 2023-07-30 21:09:11 -0700 Created attachment 467159 Patch 1969030 5 zalan 2023-08-01 07:28:58 -0700 alternatively we could just create a generic RenderBox for such out-of-flow line breaks so that we don't have to promote RenderLineBreak to a RenderBox subclass. 1969031 6 zalan 2023-08-01 07:29:36 -0700 (though most of this patch would still be needed) 1969032 7 zalan 2023-08-01 07:31:08 -0700 (In reply to Tim Nguyen (:ntim) from comment #2) > Comment on attachment 467157 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=467157&action=review > > > LayoutTests/fast/inline/out-of-flow-forced-line-break.html:1 > > +<style> > > Would be a really good WPT especially if browsers disagree here. agree. we would still fail slightly more involved WPT tests though. 1969034 8 ews-feeder 2023-08-01 08:23:20 -0700 Committed 266475@main (f71ea9e98639): <https://commits.webkit.org/266475@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467159. 1969035 9 webkit-bug-importer 2023-08-01 08:24:19 -0700 <rdar://problem/113208050> 467157 2023-07-29 16:24:02 -0700 2023-07-29 21:40:20 -0700 Patch bug-259631-20230729162401.patch text/plain 15148 zalan RnJvbSAxMmJjYWM2OTMyMTczYTFiNjhlYzBlN2Q0YmM0YWYxNTAxNGNiODdmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjkgSnVsIDIwMjMgMTY6MDQ6MzEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBPdXQtb2Yt ZmxvdyA8YnI+IHNob3VsZCBub3QgdHJpZ2dlciBhIGxpbmUgYnJlYWsKIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk2MzEKClJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKQ2hhbmdpbmcgUmVuZGVyTGluZUJyZWFrJ3MgYmFzZSBjbGFzcyBmcm9tIFJlbmRlckJv eE1vZGVsT2JqZWN0IHRvIFJlbmRlckJveCBpcyBhbiB1bmZvcnR1bmF0ZQpzaWRlIGVmZmVjdCBv ZiBlbmFibGluZyBvdXQtb2YtZmxvdyBsaW5lIGJyZWFrcyAoYXMgaW4gc3VjaCBjYXNlcyB3ZSBk b24ndCBnZW5lcmF0ZQppbmxpbmUgYm94ZXMgZm9yIHRoZW0gdG8gc3RvcmUgaW5mbG93IGdlb21l dHJ5KS4KCihUaGUgcGF0Y2ggaXMgbW9zdGx5IGFib3V0IG1ha2luZyBzdXJlIDEsIFJlbmRlckJv eCBvdmVycmlkZXMgYXJlIGhhbmRsZWQgcHJvcGVybHkKMiwgcmVtb3ZlIHNvbWUgKG5vdyBpbmNv cnJlY3QpIGFzc3VtcHRpb25zIGFib3V0IGxpbmUgYnJlYWsgYmVpbmcgYWx3YXlzIGluZmxvdykK CiogTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWst ZXhwZWN0ZWQuaHRtbDogQWRkZWQuCiogTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZs b3ctZm9yY2VkLWxpbmUtYnJlYWsuaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMpOgoqIFNv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUu Y3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveFRyZWU6OmFkanVzdFN0eWxlSWZO ZWVkZWQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpM aW5lTGF5b3V0Ojp1cGRhdGVMaW5lQnJlYWtCb3hEaW1lbnNpb25zKToKKiBTb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlv dXQ6OlRyZWVCdWlsZGVyOjpjcmVhdGVMYXlvdXRCb3gpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJy ZWFrLmNwcDoKKFdlYkNvcmU6OlJlbmRlckxpbmVCcmVhazo6UmVuZGVyTGluZUJyZWFrKToKKFdl YkNvcmU6OlJlbmRlckxpbmVCcmVhazo6Ym9yZGVyQm91bmRpbmdCb3ggY29uc3QpOgooV2ViQ29y ZTo6UmVuZGVyTGluZUJyZWFrOjpvZmZzZXRXaWR0aCBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJM aW5lQnJlYWs6Om9mZnNldEhlaWdodCBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJMaW5lQnJlYWs6 OmxpbmVzQm91bmRpbmdCb3ggY29uc3QpOgooV2ViQ29yZTo6UmVuZGVyTGluZUJyZWFrOjphYnNv bHV0ZVJlY3RzIGNvbnN0KToKKFdlYkNvcmU6OlJlbmRlckxpbmVCcmVhazo6YWJzb2x1dGVRdWFk cyBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJMaW5lQnJlYWs6OnVwZGF0ZUZyb21TdHlsZSk6Ciog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5oOgotLS0KIC4uLi9pbmxp bmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCAgICAgICAgICAgICB8IDEyICsrLS0tCiAuLi4vaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCAgfCAgNiArKy0KIC4uLi9pbmxp bmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCAgICB8ICAyICsKIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCAgICAgICAgICB8IDEwICsrLS0KIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwICB8IDUwICsrKysrKysrKysrKysrLS0t LS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuaCAgICB8IDEyICsr LS0tCiAuLi51dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLWV4cGVjdGVkLmh0bWwgfCAgNyAr KysKIC4uLi9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWsuaHRtbCB8ICA3ICsr KwogOCBmaWxlcyBjaGFuZ2VkLCA3NSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3Jj ZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWsuaHRtbAoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IGRlNDQxZmE1NWY5My4u NWMyNmJmNTJjNDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5j cHAKQEAgLTIzMiw3ICsyMzIsMTEgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJ bmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIEZvcm1hdHRpbmcKIAogICAgICAg ICB3aGlsZSAoIWxheW91dFF1ZXVlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYXV0byBsYXlv dXRCb3ggPSBsYXlvdXRRdWV1ZS50YWtlTGFzdCgpOwotICAgICAgICAgICAgaWYgKGxheW91dEJv eC0+aXNJbmxpbmVUZXh0Qm94KCkpIHsKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3gtPmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpKSB7CisgICAgICAgICAgICAgICAgLy8gTGV0J3Mgbm90IGNvbnN0 cnVjdCBJbmxpbmVJdGVtcyBmb3Igb3V0LW9mLWZsb3cgY29udGVudCBhcyB0aGV5IGRvbid0IHBh cnRpY2lwYXRlIGluIHRoZSBpbmxpbmUgbGF5b3V0LgorICAgICAgICAgICAgICAgIC8vIEhvd2V2 ZXIgdG8gYmUgYWJsZSB0byBzdGF0aWMgcG9zaXRpb25pbmcgdGhlbSwgd2UgbmVlZCB0byBjb21w dXRlIHRoZWlyIGFwcHJveGltYXRlIHBvc2l0aW9ucy4KKyAgICAgICAgICAgICAgICBvdXRPZkZs b3dCb3hlcy5hcHBlbmQobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0 Qm94LT5pc0lubGluZVRleHRCb3goKSkgewogICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRl eHRCb3ggPSBkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gpOwogICAgICAgICAgICAg ICAgIGhhbmRsZVRleHRDb250ZW50KGlubGluZVRleHRCb3gsIGlubGluZUl0ZW1zLCBwYXJ0aWFs Q29udGVudE9mZnNldChpbmxpbmVUZXh0Qm94KSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGxh eW91dEJveC0+aXNBdG9taWNJbmxpbmVMZXZlbEJveCgpIHx8IGxheW91dEJveC0+aXNMaW5lQnJl YWtCb3goKSkKQEAgLTI0MSwxMSArMjQ1LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNv bGxlY3RJbmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIEZvcm1hdHRpbmcKICAg ICAgICAgICAgICAgICBoYW5kbGVJbmxpbmVCb3hFbmQobGF5b3V0Qm94LCBpbmxpbmVJdGVtcyk7 CiAgICAgICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3gtPmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkp CiAgICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKHsgbGF5b3V0Qm94LCBJbmxpbmVJ dGVtOjpUeXBlOjpGbG9hdCB9KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC0+aXNP dXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKLSAgICAgICAgICAgICAgICAvLyBMZXQncyBub3QgY29u c3RydWN0IElubGluZUl0ZW1zIGZvciBvdXQtb2YtZmxvdyBjb250ZW50IGFzIHRoZXkgZG9uJ3Qg cGFydGljaXBhdGUgaW4gdGhlIGlubGluZSBsYXlvdXQuCi0gICAgICAgICAgICAgICAgLy8gSG93 ZXZlciB0byBiZSBhYmxlIHRvIHN0YXRpYyBwb3NpdGlvbmluZyB0aGVtLCB3ZSBuZWVkIHRvIGNv bXB1dGUgdGhlaXIgYXBwcm94aW1hdGUgcG9zaXRpb25zLgotICAgICAgICAgICAgICAgIG91dE9m Rmxvd0JveGVzLmFwcGVuZChsYXlvdXRCb3gpOwotICAgICAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKICAgICAg ICAgICAgIGlmIChhdXRvKiBuZXh0U2libGluZyA9IGxheW91dEJveC0+bmV4dFNpYmxpbmcoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA4Nzg2NzhjYzg3NDAuLjYxNTgyYjQw YWE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTE2Miw5ICsxNjIsMTEgQEAg dm9pZCBCb3hUcmVlOjphZGp1c3RTdHlsZUlmTmVlZGVkKGNvbnN0IFJlbmRlckVsZW1lbnQmIHJl bmRlcmVyLCBSZW5kZXJTdHlsZSYgc3QKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog ICAgICAgICBpZiAocmVuZGVyZXIuaXNMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgc3R5bGVU b0FkanVzdC5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpJbmxpbmUpOworICAgICAgICAgICAgaWYg KCFzdHlsZVRvQWRqdXN0Lmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpIHsKKyAgICAgICAgICAgICAg ICAvLyBGb3JjZSBpbi1mbG93IGRpc3BsYXkgdmFsdWUgdG8gaW5saW5lIChzZWUgd2Via2l0Lm9y Zy9iLzIyMzE1MSkuCisgICAgICAgICAgICAgICAgc3R5bGVUb0FkanVzdC5zZXREaXNwbGF5KERp c3BsYXlUeXBlOjpJbmxpbmUpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgc3R5bGVUb0Fk anVzdC5zZXRGbG9hdGluZyhGbG9hdDo6Tm9uZSk7Ci0gICAgICAgICAgICBzdHlsZVRvQWRqdXN0 LnNldFBvc2l0aW9uKFBvc2l0aW9uVHlwZTo6U3RhdGljKTsKICAgICAgICAgICAgIC8vIENsZWFy IHByb3BlcnR5IHNob3VsZCBvbmx5IGFwcGx5IG9uIGJsb2NrIGVsZW1lbnRzLCBob3dldmVyLAog ICAgICAgICAgICAgLy8gaXQgYXBwZWFycyB0aGF0IGJyb3dzZXJzIHNlZW0gdG8gaWdub3JlIGl0 IG9uIDxicj4gaW5saW5lIGVsZW1lbnRzLgogICAgICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMu Y3Nzd2cub3JnL2NzczIvI3Byb3BkZWYtY2xlYXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCAwNzZmODZkMjljN2UuLjUwYzc4MTdlZjI4NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtNDUzLDYg KzQ1Myw4IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlTGluZUJyZWFrQm94RGltZW5zaW9ucyhj b25zdCBSZW5kZXJMaW5lQnJlYWsmIGxpbmVCcmVha0JvCiAgICAgYm94R2VvbWV0cnkuc2V0UGFk ZGluZyh7IH0pOwogICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aCh7IH0pOwogICAg IGJveEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsgfSk7CisgICAgaWYgKGxpbmVCcmVha0Jv eC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVu dEJveEhlaWdodCh7IH0pOwogfQogCiB2b2lkIExpbmVMYXlvdXQ6OnVwZGF0ZUlubGluZUJveERp bWVuc2lvbnMoY29uc3QgUmVuZGVySW5saW5lJiByZW5kZXJJbmxpbmUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggYTdkOGVhNTZiMjk0Li40MzMzMjMwNDViOTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTEwNyw3ICsxMDcsNyBAQCBwdWJsaWM6 CiAKICAgICBpbmxpbmUgTGF5b3V0UmVjdCBtYXJnaW5Cb3hSZWN0KCkgY29uc3Q7CiAgICAgTGF5 b3V0UmVjdCBib3JkZXJCb3hSZWN0KCkgY29uc3QgeyByZXR1cm4gTGF5b3V0UmVjdChMYXlvdXRQ b2ludCgpLCBzaXplKCkpOyB9Ci0gICAgTGF5b3V0UmVjdCBib3JkZXJCb3VuZGluZ0JveCgpIGNv bnN0IGZpbmFsIHsgcmV0dXJuIGJvcmRlckJveFJlY3QoKTsgfQorICAgIExheW91dFJlY3QgYm9y ZGVyQm91bmRpbmdCb3goKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBib3JkZXJCb3hSZWN0KCk7 IH0KICAgICBpbmxpbmUgTGF5b3V0U2l6ZSBib3JkZXJCb3hMb2dpY2FsU2l6ZSgpIGNvbnN0Owog CiAgICAgV0VCQ09SRV9FWFBPUlQgUm91bmRlZFJlY3RSYWRpaSBib3JkZXJSYWRpaSgpIGNvbnN0 OwpAQCAtMjI5LDE0ICsyMjksMTQgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbWFyZ2luTG9n aWNhbExlZnQoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBjb25z dCB7IHJldHVybiBtX21hcmdpbkJveC5zdGFydCgob3ZlcnJpZGVTdHlsZSA/IG92ZXJyaWRlU3R5 bGUgOiAmc3R5bGUoKSktPndyaXRpbmdNb2RlKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5M b2dpY2FsUmlnaHQoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBj b25zdCB7IHJldHVybiBtX21hcmdpbkJveC5lbmQoKG92ZXJyaWRlU3R5bGUgPyBvdmVycmlkZVN0 eWxlIDogJnN0eWxlKCkpLT53cml0aW5nTW9kZSgpKTsgfQogCi0gICAgTGF5b3V0VW5pdCBtYXJn aW5CZWZvcmUoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBjb25z dCBmaW5hbCB7IHJldHVybiBtX21hcmdpbkJveC5iZWZvcmUoKG92ZXJyaWRlU3R5bGUgPyBvdmVy cmlkZVN0eWxlIDogJnN0eWxlKCkpLT53cml0aW5nTW9kZSgpKTsgfQotICAgIExheW91dFVuaXQg bWFyZ2luQWZ0ZXIoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBj b25zdCBmaW5hbCB7IHJldHVybiBtX21hcmdpbkJveC5hZnRlcigob3ZlcnJpZGVTdHlsZSA/IG92 ZXJyaWRlU3R5bGUgOiAmc3R5bGUoKSktPndyaXRpbmdNb2RlKCkpOyB9Ci0gICAgTGF5b3V0VW5p dCBtYXJnaW5TdGFydChjb25zdCBSZW5kZXJTdHlsZSogb3ZlcnJpZGVTdHlsZSA9IG51bGxwdHIp IGNvbnN0IGZpbmFsCisgICAgTGF5b3V0VW5pdCBtYXJnaW5CZWZvcmUoY29uc3QgUmVuZGVyU3R5 bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX21h cmdpbkJveC5iZWZvcmUoKG92ZXJyaWRlU3R5bGUgPyBvdmVycmlkZVN0eWxlIDogJnN0eWxlKCkp LT53cml0aW5nTW9kZSgpKTsgfQorICAgIExheW91dFVuaXQgbWFyZ2luQWZ0ZXIoY29uc3QgUmVu ZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBjb25zdCBvdmVycmlkZSB7IHJldHVy biBtX21hcmdpbkJveC5hZnRlcigob3ZlcnJpZGVTdHlsZSA/IG92ZXJyaWRlU3R5bGUgOiAmc3R5 bGUoKSktPndyaXRpbmdNb2RlKCkpOyB9CisgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydChjb25z dCBSZW5kZXJTdHlsZSogb3ZlcnJpZGVTdHlsZSA9IG51bGxwdHIpIGNvbnN0IG92ZXJyaWRlCiAg ICAgewogICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IG92ZXJyaWRlU3R5 bGUgPyBvdmVycmlkZVN0eWxlIDogJnN0eWxlKCk7CiAgICAgICAgIHJldHVybiBtX21hcmdpbkJv eC5zdGFydChzdHlsZVRvVXNlLT53cml0aW5nTW9kZSgpLCBzdHlsZVRvVXNlLT5kaXJlY3Rpb24o KSk7CiAgICAgfQotICAgIExheW91dFVuaXQgbWFyZ2luRW5kKGNvbnN0IFJlbmRlclN0eWxlKiBv dmVycmlkZVN0eWxlID0gbnVsbHB0cikgY29uc3QgZmluYWwKKyAgICBMYXlvdXRVbml0IG1hcmdp bkVuZChjb25zdCBSZW5kZXJTdHlsZSogb3ZlcnJpZGVTdHlsZSA9IG51bGxwdHIpIGNvbnN0IG92 ZXJyaWRlCiAgICAgewogICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IG92 ZXJyaWRlU3R5bGUgPyBvdmVycmlkZVN0eWxlIDogJnN0eWxlKCk7CiAgICAgICAgIHJldHVybiBt X21hcmdpbkJveC5lbmQoc3R5bGVUb1VzZS0+d3JpdGluZ01vZGUoKSwgc3R5bGVUb1VzZS0+ZGly ZWN0aW9uKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxp bmVCcmVhay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJyZWFrLmNw cAppbmRleCAxZDZkMzFjMmJkMGUuLmVkMTVjNjJlMTIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5jcHAKQEAgLTUwLDcgKzUwLDcgQEAgV1RGX01BS0Vf SVNPX0FMTE9DQVRFRF9JTVBMKFJlbmRlckxpbmVCcmVhayk7CiBzdGF0aWMgY29uc3QgaW50IGlu dmFsaWRMaW5lSGVpZ2h0ID0gLTE7CiAKIFJlbmRlckxpbmVCcmVhazo6UmVuZGVyTGluZUJyZWFr KEhUTUxFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQotICAgIDogUmVuZGVy Qm94TW9kZWxPYmplY3QoZWxlbWVudCwgV1RGTW92ZShzdHlsZSksIDApCisgICAgOiBSZW5kZXJC b3goZWxlbWVudCwgV1RGTW92ZShzdHlsZSksIDApCiAgICAgLCBtX2lubGluZUJveFdyYXBwZXIo bnVsbHB0cikKICAgICAsIG1fY2FjaGVkTGluZUhlaWdodChpbnZhbGlkTGluZUhlaWdodCkKICAg ICAsIG1faXNXQlIoaXM8SFRNTFdCUkVsZW1lbnQ+KGVsZW1lbnQpKQpAQCAtMTM4LDYgKzEzOCwy MSBAQCBib29sIFJlbmRlckxpbmVCcmVhazo6Y2FuQmVTZWxlY3Rpb25MZWFmKCkgY29uc3QKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorTGF5b3V0UmVjdCBSZW5kZXJMaW5lQnJlYWs6OmJvcmRlckJv dW5kaW5nQm94KCkgY29uc3QKK3sKKyAgICByZXR1cm4gIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgp ID8gTGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBsaW5lc0JvdW5kaW5nQm94KCkuc2l6ZSgpKSA6 IFJlbmRlckJveDo6Ym9yZGVyQm91bmRpbmdCb3goKTsKK30KKworTGF5b3V0VW5pdCBSZW5kZXJM aW5lQnJlYWs6Om9mZnNldFdpZHRoKCkgY29uc3QKK3sKKyAgICByZXR1cm4gIWlzT3V0T2ZGbG93 UG9zaXRpb25lZCgpID8gTGF5b3V0VW5pdChsaW5lc0JvdW5kaW5nQm94KCkud2lkdGgoKSkgOiBS ZW5kZXJCb3g6Om9mZnNldFdpZHRoKCk7Cit9CisKK0xheW91dFVuaXQgUmVuZGVyTGluZUJyZWFr OjpvZmZzZXRIZWlnaHQoKSBjb25zdAoreworICAgIHJldHVybiAhaXNPdXRPZkZsb3dQb3NpdGlv bmVkKCkgPyBMYXlvdXRVbml0KGxpbmVzQm91bmRpbmdCb3goKS5oZWlnaHQoKSkgOiBSZW5kZXJC b3g6Om9mZnNldEhlaWdodCgpOworfQorCiBWaXNpYmxlUG9zaXRpb24gUmVuZGVyTGluZUJyZWFr Ojpwb3NpdGlvbkZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgUmVuZGVyRnJhZ21l bnRDb250YWluZXIqKQogewogICAgIHJldHVybiBjcmVhdGVWaXNpYmxlUG9zaXRpb24oMCwgQWZm aW5pdHk6OkRvd25zdHJlYW0pOwpAQCAtMTQ1LDYgKzE2MCw4IEBAIFZpc2libGVQb3NpdGlvbiBS ZW5kZXJMaW5lQnJlYWs6OnBvc2l0aW9uRm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmLCBjb25z dCBSZW5kCiAKIEludFJlY3QgUmVuZGVyTGluZUJyZWFrOjpsaW5lc0JvdW5kaW5nQm94KCkgY29u c3QKIHsKKyAgICBBU1NFUlQoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKKwogICAgIGF1dG8g cnVuID0gSW5saW5lSXRlcmF0b3I6OmJveEZvcigqdGhpcyk7CiAgICAgaWYgKCFydW4pCiAgICAg ICAgIHJldHVybiB7IH07CkBAIC0xNTQsMjggKzE3MSwzNyBAQCBJbnRSZWN0IFJlbmRlckxpbmVC cmVhazo6bGluZXNCb3VuZGluZ0JveCgpIGNvbnN0CiAKIHZvaWQgUmVuZGVyTGluZUJyZWFrOjph YnNvbHV0ZVJlY3RzKFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIGNvbnN0IExheW91dFBvaW50JiBh Y2N1bXVsYXRlZE9mZnNldCkgY29uc3QKIHsKLSAgICBhdXRvIGJveCA9IElubGluZUl0ZXJhdG9y Ojpib3hGb3IoKnRoaXMpOwotICAgIGlmICghYm94KQotICAgICAgICByZXR1cm47CisgICAgaWYg KCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkgeworICAgICAgICBhdXRvIGJveCA9IElubGluZUl0 ZXJhdG9yOjpib3hGb3IoKnRoaXMpOworICAgICAgICBpZiAoIWJveCkKKyAgICAgICAgICAgIHJl dHVybjsKIAotICAgIGF1dG8gcmVjdCA9IGJveC0+dmlzdWFsUmVjdElnbm9yaW5nQmxvY2tEaXJl Y3Rpb24oKTsKLSAgICByZWN0cy5hcHBlbmQoZW5jbG9zaW5nSW50UmVjdChGbG9hdFJlY3QoYWNj dW11bGF0ZWRPZmZzZXQgKyByZWN0LmxvY2F0aW9uKCksIHJlY3Quc2l6ZSgpKSkpOworICAgICAg ICBhdXRvIHJlY3QgPSBib3gtPnZpc3VhbFJlY3RJZ25vcmluZ0Jsb2NrRGlyZWN0aW9uKCk7Cisg ICAgICAgIHJlY3RzLmFwcGVuZChlbmNsb3NpbmdJbnRSZWN0KEZsb2F0UmVjdChhY2N1bXVsYXRl ZE9mZnNldCArIHJlY3QubG9jYXRpb24oKSwgcmVjdC5zaXplKCkpKSk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisgICAgUmVuZGVyQm94OjphYnNvbHV0ZVJlY3RzKHJlY3RzLCBhY2N1bXVsYXRl ZE9mZnNldCk7CiB9CiAKIHZvaWQgUmVuZGVyTGluZUJyZWFrOjphYnNvbHV0ZVF1YWRzKFZlY3Rv cjxGbG9hdFF1YWQ+JiBxdWFkcywgYm9vbCogd2FzRml4ZWQpIGNvbnN0CiB7Ci0gICAgYXV0byBi b3ggPSBJbmxpbmVJdGVyYXRvcjo6Ym94Rm9yKCp0aGlzKTsKLSAgICBpZiAoIWJveCkKLSAgICAg ICAgcmV0dXJuOworICAgIGlmICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAg YXV0byBib3ggPSBJbmxpbmVJdGVyYXRvcjo6Ym94Rm9yKCp0aGlzKTsKKyAgICAgICAgaWYgKCFi b3gpCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIHJlY3QgPSBib3gtPnZpc3VhbFJl Y3RJZ25vcmluZ0Jsb2NrRGlyZWN0aW9uKCk7Ci0gICAgcXVhZHMuYXBwZW5kKGxvY2FsVG9BYnNv bHV0ZVF1YWQoRmxvYXRSZWN0KHJlY3QubG9jYXRpb24oKSwgcmVjdC5zaXplKCkpLCBVc2VUcmFu c2Zvcm1zLCB3YXNGaXhlZCkpOworICAgICAgICBhdXRvIHJlY3QgPSBib3gtPnZpc3VhbFJlY3RJ Z25vcmluZ0Jsb2NrRGlyZWN0aW9uKCk7CisgICAgICAgIHF1YWRzLmFwcGVuZChsb2NhbFRvQWJz b2x1dGVRdWFkKEZsb2F0UmVjdChyZWN0LmxvY2F0aW9uKCksIHJlY3Quc2l6ZSgpKSwgVXNlVHJh bnNmb3Jtcywgd2FzRml4ZWQpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBSZW5kZXJC b3g6OmFic29sdXRlUXVhZHMocXVhZHMsIHdhc0ZpeGVkKTsKIH0KIAogdm9pZCBSZW5kZXJMaW5l QnJlYWs6OnVwZGF0ZUZyb21TdHlsZSgpCiB7CiAgICAgbV9jYWNoZWRMaW5lSGVpZ2h0ID0gaW52 YWxpZExpbmVIZWlnaHQ7Ci0gICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNB VElPTihpc0lubGluZSgpKTsKKyAgICBzZXRQb3NpdGlvblN0YXRlKHN0eWxlKCkucG9zaXRpb24o KSk7CisgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihpc091dE9m Rmxvd1Bvc2l0aW9uZWQoKSB8fCBpc0lubGluZSgpKTsKIH0KIAogI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJy ZWFrLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJyZWFrLmgKaW5kZXgg OWU5ZTFlMzk5NGIxLi5kZjJhYWIwMjUzNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGluZUJyZWFrLmgKQEAgLTIxLDcgKzIxLDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNp bmNsdWRlICJSZW5kZXJCb3hNb2RlbE9iamVjdC5oIgorI2luY2x1ZGUgIlJlbmRlckJveC5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTI5LDcgKzI5LDcgQEAgY2xhc3MgTGVnYWN5SW5s aW5lRWxlbWVudEJveDsKIGNsYXNzIEhUTUxFbGVtZW50OwogY2xhc3MgUG9zaXRpb247CiAKLWNs YXNzIFJlbmRlckxpbmVCcmVhayBmaW5hbCA6IHB1YmxpYyBSZW5kZXJCb3hNb2RlbE9iamVjdCB7 CitjbGFzcyBSZW5kZXJMaW5lQnJlYWsgZmluYWwgOiBwdWJsaWMgUmVuZGVyQm94IHsKICAgICBX VEZfTUFLRV9JU09fQUxMT0NBVEVEKFJlbmRlckxpbmVCcmVhayk7CiBwdWJsaWM6CiAgICAgUmVu ZGVyTGluZUJyZWFrKEhUTUxFbGVtZW50JiwgUmVuZGVyU3R5bGUmJik7CkBAIC03NywxNCArNzcs MTQgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IG1hcmdpbkFmdGVyKGNvbnN0IFJlbmRlclN0 eWxlKikgY29uc3QgZmluYWwgeyByZXR1cm4gMDsgfQogICAgIExheW91dFVuaXQgbWFyZ2luU3Rh cnQoY29uc3QgUmVuZGVyU3R5bGUqKSBjb25zdCBmaW5hbCB7IHJldHVybiAwOyB9CiAgICAgTGF5 b3V0VW5pdCBtYXJnaW5FbmQoY29uc3QgUmVuZGVyU3R5bGUqKSBjb25zdCBmaW5hbCB7IHJldHVy biAwOyB9Ci0gICAgTGF5b3V0VW5pdCBvZmZzZXRXaWR0aCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJu IGxpbmVzQm91bmRpbmdCb3goKS53aWR0aCgpOyB9Ci0gICAgTGF5b3V0VW5pdCBvZmZzZXRIZWln aHQoKSBjb25zdCBmaW5hbCB7IHJldHVybiBsaW5lc0JvdW5kaW5nQm94KCkuaGVpZ2h0KCk7IH0K LSAgICBMYXlvdXRSZWN0IGJvcmRlckJvdW5kaW5nQm94KCkgY29uc3QgZmluYWwgeyByZXR1cm4g TGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBsaW5lc0JvdW5kaW5nQm94KCkuc2l6ZSgpKTsgfQor ICAgIExheW91dFVuaXQgb2Zmc2V0V2lkdGgoKSBjb25zdCBmaW5hbDsKKyAgICBMYXlvdXRVbml0 IG9mZnNldEhlaWdodCgpIGNvbnN0IGZpbmFsOworICAgIExheW91dFJlY3QgYm9yZGVyQm91bmRp bmdCb3goKSBjb25zdCBmaW5hbDsKICAgICBMYXlvdXRSZWN0IGZyYW1lUmVjdEZvclN0aWNreVBv c2l0aW9uaW5nKCkgY29uc3QgZmluYWwgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIExh eW91dFJlY3QoKTsgfQogICAgIExheW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdChjb25zdCBS ZW5kZXJMYXllck1vZGVsT2JqZWN0KiwgVmlzaWJsZVJlY3RDb250ZXh0KSBjb25zdCBmaW5hbCB7 IHJldHVybiBMYXlvdXRSZWN0KCk7IH0KIAogICAgIHZvaWQgdXBkYXRlRnJvbVN0eWxlKCkgZmlu YWw7Ci0gICAgYm9vbCByZXF1aXJlc0xheWVyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7 IH0KKyAgICBib29sIHJlcXVpcmVzTGF5ZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBpc091dE9m Rmxvd1Bvc2l0aW9uZWQoKTsgfQogCiAgICAgTGVnYWN5SW5saW5lRWxlbWVudEJveCogbV9pbmxp bmVCb3hXcmFwcGVyOwogICAgIG11dGFibGUgaW50IG1fY2FjaGVkTGluZUhlaWdodDsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJy ZWFrLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1m b3JjZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMC4uNDk4ZGYzMTZmMDAyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWstZXhwZWN0ZWQuaHRt bApAQCAtMCwwICsxLDcgQEAKKzxzdHlsZT4KK2RpdiB7CisgIGZvbnQtZmFtaWx5OiBtb25vc3Bh Y2U7Cit9Cis8L3N0eWxlPgorPGRpdj5QQVNTIGlmIG5vIGxpbmUgYnJlYWsuPC9kaXY+Cis8ZGl2 PlBBU1MgaWYgbm8gbGluZSBicmVhay48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uZDY5ZTE4OWVlMzI0Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUt YnJlYWsuaHRtbApAQCAtMCwwICsxLDcgQEAKKzxzdHlsZT4KK2RpdiB7CisgIGZvbnQtZmFtaWx5 OiBtb25vc3BhY2U7Cit9Cis8L3N0eWxlPgorPGRpdj5QQVNTIGlmPGJyIHN0eWxlPSJwb3NpdGlv bjogYWJzb2x1dGU7Ij4gbm8gbGluZSBicmVhay48L2Rpdj4KKzxkaXY+UEFTUyBpZjxiciBzdHls ZT0icG9zaXRpb246IGZpeGVkOyI+IG5vIGxpbmUgYnJlYWsuPC9kaXY+Cg== 467158 2023-07-29 21:40:22 -0700 2023-07-30 21:09:08 -0700 Patch bug-259631-20230729214021.patch text/plain 24164 zalan RnJvbSAyMWJkZGU1OTA0YjUwYjcxY2I1NjBiZGM0MWRhMzVmY2MyOWZkMzRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjkgSnVsIDIwMjMgMTY6MDQ6MzEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBPdXQtb2Yt ZmxvdyA8YnI+IHNob3VsZCBub3QgdHJpZ2dlciBhIGxpbmUgYnJlYWsKIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk2MzEKClJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKQ2hhbmdpbmcgUmVuZGVyTGluZUJyZWFrJ3MgYmFzZSBjbGFzcyBmcm9tIFJlbmRlckJv eE1vZGVsT2JqZWN0IHRvIFJlbmRlckJveCBpcyBhbiB1bmZvcnR1bmF0ZQpzaWRlIGVmZmVjdCBv ZiBlbmFibGluZyBvdXQtb2YtZmxvdyBsaW5lIGJyZWFrcyAoYXMgaW4gc3VjaCBjYXNlcyB3ZSBk b24ndCBnZW5lcmF0ZQppbmxpbmUgYm94ZXMgZm9yIHRoZW0gdG8gc3RvcmUgaW5mbG93IGdlb21l dHJ5KS4KCihUaGUgcGF0Y2ggaXMgbW9zdGx5IGFib3V0IG1ha2luZyBzdXJlIDEsIFJlbmRlckJv eCBvdmVycmlkZXMgYXJlIGhhbmRsZWQgcHJvcGVybHkKMiwgcmVtb3ZlIHNvbWUgKG5vdyBpbmNv cnJlY3QpIGFzc3VtcHRpb25zIGFib3V0IGxpbmUgYnJlYWsgYmVpbmcgYWx3YXlzIGluZmxvdwoz LCBmaXggKHJlb3JkZXIpIGNhc2VzIHdoZXJlIFJlbmRlckJveCB3YXMgdHJlYXRlZCBhcyBhIHNw ZWNpYWwgdHlwZSBvZiBpbmxpbmUgYm94KQoKKiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQt b2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sOiBBZGRlZC4KKiBMYXlvdXRU ZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay5odG1sOiBBZGRl ZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVJdGVtc0J1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6 OmNvbGxlY3RJbmxpbmVJdGVtcyk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6Qm94VHJlZTo6YWRqdXN0U3R5bGVJZk5lZWRlZCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgooV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnVwZGF0ZUxpbmVCcmVha0JveERp bWVuc2lvbnMpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVC dWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxheW91dEJv eCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oOgoqIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwOgooV2ViQ29yZTo6UmVuZGVyTGluZUJy ZWFrOjpSZW5kZXJMaW5lQnJlYWspOgooV2ViQ29yZTo6UmVuZGVyTGluZUJyZWFrOjpib3JkZXJC b3VuZGluZ0JveCBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJMaW5lQnJlYWs6Om9mZnNldFdpZHRo IGNvbnN0KToKKFdlYkNvcmU6OlJlbmRlckxpbmVCcmVhazo6b2Zmc2V0SGVpZ2h0IGNvbnN0KToK KFdlYkNvcmU6OlJlbmRlckxpbmVCcmVhazo6bGluZXNCb3VuZGluZ0JveCBjb25zdCk6CihXZWJD b3JlOjpSZW5kZXJMaW5lQnJlYWs6OmFic29sdXRlUmVjdHMgY29uc3QpOgooV2ViQ29yZTo6UmVu ZGVyTGluZUJyZWFrOjphYnNvbHV0ZVF1YWRzIGNvbnN0KToKKFdlYkNvcmU6OlJlbmRlckxpbmVC cmVhazo6dXBkYXRlRnJvbVN0eWxlKToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGluZUJyZWFrLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmNwcCAgICAgICAg ICAgICAgIHwgIDIgLQogLi4uL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwICAgICAgICAg ICAgIHwgMTIgKy0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNw cCAgfCAgNiArLQogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwICAg IHwgIDIgKwogU291cmNlL1dlYkNvcmUvcGFnZS9JbnRlcnNlY3Rpb25PYnNlcnZlci5jcHAgIHwg IDYgKy0KIC4uLi9yZW5kZXJpbmcvTGVnYWN5SW5saW5lRWxlbWVudEJveC5jcHAgICAgICB8ICA2 IC0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5TGluZUxheW91dC5jcHAgfCAxNyAr Ky0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggICAgICAgICAgfCAxMCAr LS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwICB8IDg3ICsr KysrKysrKy0tLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJl YWsuaCAgICB8IDE4ICsrLS0KIC4uLi9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXIuY3BwICB8ICAyIC0KIC4uLnV0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWstZXhwZWN0ZWQu aHRtbCB8ICA3ICsrCiAuLi4vaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLmh0 bWwgfCAgNyArKwogMTMgZmlsZXMgY2hhbmdlZCwgODggaW5zZXJ0aW9ucygrKSwgOTQgZGVsZXRp b25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9m LWZsb3ctZm9yY2VkLWxpbmUtYnJlYWstZXhwZWN0ZWQuaHRtbAogY3JlYXRlIG1vZGUgMTAwNjQ0 IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLmh0 bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmNwcAppbmRleCA2MWZlYWRkYmQxYTkuLmMzNmY1MWVjY2I0 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCkBAIC03NSw4ICs3NSw2IEBAIHN0YXRpYyBib29s IGhhc0lubGluZVJ1bihSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICBpZiAoaXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpICYmIElubGluZUl0ZXJhdG9yOjpm aXJzdFRleHRCb3hGb3IoZG93bmNhc3Q8UmVuZGVyVGV4dD4ocmVuZGVyZXIpKSkKICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIpICYmIElu bGluZUl0ZXJhdG9yOjpib3hGb3IoZG93bmNhc3Q8UmVuZGVyTGluZUJyZWFrPihyZW5kZXJlcikp KQotICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IGRlNDQxZmE1NWY5My4uNWMy NmJmNTJjNDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK QEAgLTIzMiw3ICsyMzIsMTEgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJbmxp bmVJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIEZvcm1hdHRpbmcKIAogICAgICAgICB3 aGlsZSAoIWxheW91dFF1ZXVlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYXV0byBsYXlvdXRC b3ggPSBsYXlvdXRRdWV1ZS50YWtlTGFzdCgpOwotICAgICAgICAgICAgaWYgKGxheW91dEJveC0+ aXNJbmxpbmVUZXh0Qm94KCkpIHsKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3gtPmlzT3V0T2ZG bG93UG9zaXRpb25lZCgpKSB7CisgICAgICAgICAgICAgICAgLy8gTGV0J3Mgbm90IGNvbnN0cnVj dCBJbmxpbmVJdGVtcyBmb3Igb3V0LW9mLWZsb3cgY29udGVudCBhcyB0aGV5IGRvbid0IHBhcnRp Y2lwYXRlIGluIHRoZSBpbmxpbmUgbGF5b3V0LgorICAgICAgICAgICAgICAgIC8vIEhvd2V2ZXIg dG8gYmUgYWJsZSB0byBzdGF0aWMgcG9zaXRpb25pbmcgdGhlbSwgd2UgbmVlZCB0byBjb21wdXRl IHRoZWlyIGFwcHJveGltYXRlIHBvc2l0aW9ucy4KKyAgICAgICAgICAgICAgICBvdXRPZkZsb3dC b3hlcy5hcHBlbmQobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94 LT5pc0lubGluZVRleHRCb3goKSkgewogICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRC b3ggPSBkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAg IGhhbmRsZVRleHRDb250ZW50KGlubGluZVRleHRCb3gsIGlubGluZUl0ZW1zLCBwYXJ0aWFsQ29u dGVudE9mZnNldChpbmxpbmVUZXh0Qm94KSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGxheW91 dEJveC0+aXNBdG9taWNJbmxpbmVMZXZlbEJveCgpIHx8IGxheW91dEJveC0+aXNMaW5lQnJlYWtC b3goKSkKQEAgLTI0MSwxMSArMjQ1LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxl Y3RJbmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIEZvcm1hdHRpbmcKICAgICAg ICAgICAgICAgICBoYW5kbGVJbmxpbmVCb3hFbmQobGF5b3V0Qm94LCBpbmxpbmVJdGVtcyk7CiAg ICAgICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3gtPmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAg ICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKHsgbGF5b3V0Qm94LCBJbmxpbmVJdGVt OjpUeXBlOjpGbG9hdCB9KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC0+aXNPdXRP ZkZsb3dQb3NpdGlvbmVkKCkpIHsKLSAgICAgICAgICAgICAgICAvLyBMZXQncyBub3QgY29uc3Ry dWN0IElubGluZUl0ZW1zIGZvciBvdXQtb2YtZmxvdyBjb250ZW50IGFzIHRoZXkgZG9uJ3QgcGFy dGljaXBhdGUgaW4gdGhlIGlubGluZSBsYXlvdXQuCi0gICAgICAgICAgICAgICAgLy8gSG93ZXZl ciB0byBiZSBhYmxlIHRvIHN0YXRpYyBwb3NpdGlvbmluZyB0aGVtLCB3ZSBuZWVkIHRvIGNvbXB1 dGUgdGhlaXIgYXBwcm94aW1hdGUgcG9zaXRpb25zLgotICAgICAgICAgICAgICAgIG91dE9mRmxv d0JveGVzLmFwcGVuZChsYXlvdXRCb3gpOwotICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKICAgICAgICAg ICAgIGlmIChhdXRvKiBuZXh0U2libGluZyA9IGxheW91dEJveC0+bmV4dFNpYmxpbmcoKSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA4Nzg2NzhjYzg3NDAuLjYxNTgyYjQwYWE3 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTE2Miw5ICsxNjIsMTEgQEAgdm9p ZCBCb3hUcmVlOjphZGp1c3RTdHlsZUlmTmVlZGVkKGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRl cmVyLCBSZW5kZXJTdHlsZSYgc3QKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAg ICAgICBpZiAocmVuZGVyZXIuaXNMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgc3R5bGVUb0Fk anVzdC5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpJbmxpbmUpOworICAgICAgICAgICAgaWYgKCFz dHlsZVRvQWRqdXN0Lmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpIHsKKyAgICAgICAgICAgICAgICAv LyBGb3JjZSBpbi1mbG93IGRpc3BsYXkgdmFsdWUgdG8gaW5saW5lIChzZWUgd2Via2l0Lm9yZy9i LzIyMzE1MSkuCisgICAgICAgICAgICAgICAgc3R5bGVUb0FkanVzdC5zZXREaXNwbGF5KERpc3Bs YXlUeXBlOjpJbmxpbmUpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgc3R5bGVUb0FkanVz dC5zZXRGbG9hdGluZyhGbG9hdDo6Tm9uZSk7Ci0gICAgICAgICAgICBzdHlsZVRvQWRqdXN0LnNl dFBvc2l0aW9uKFBvc2l0aW9uVHlwZTo6U3RhdGljKTsKICAgICAgICAgICAgIC8vIENsZWFyIHBy b3BlcnR5IHNob3VsZCBvbmx5IGFwcGx5IG9uIGJsb2NrIGVsZW1lbnRzLCBob3dldmVyLAogICAg ICAgICAgICAgLy8gaXQgYXBwZWFycyB0aGF0IGJyb3dzZXJzIHNlZW0gdG8gaWdub3JlIGl0IG9u IDxicj4gaW5saW5lIGVsZW1lbnRzLgogICAgICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nz d2cub3JnL2NzczIvI3Byb3BkZWYtY2xlYXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmNwcAppbmRleCAwNzZmODZkMjljN2UuLjUwYzc4MTdlZjI4NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtNDUzLDYgKzQ1 Myw4IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlTGluZUJyZWFrQm94RGltZW5zaW9ucyhjb25z dCBSZW5kZXJMaW5lQnJlYWsmIGxpbmVCcmVha0JvCiAgICAgYm94R2VvbWV0cnkuc2V0UGFkZGlu Zyh7IH0pOwogICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aCh7IH0pOwogICAgIGJv eEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsgfSk7CisgICAgaWYgKGxpbmVCcmVha0JveC5p c091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJv eEhlaWdodCh7IH0pOwogfQogCiB2b2lkIExpbmVMYXlvdXQ6OnVwZGF0ZUlubGluZUJveERpbWVu c2lvbnMoY29uc3QgUmVuZGVySW5saW5lJiByZW5kZXJJbmxpbmUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ludGVyc2VjdGlvbk9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvSW50ZXJzZWN0aW9uT2JzZXJ2ZXIuY3BwCmluZGV4IDFhNDZhMDZjOTEwOC4uODQ0Mjk4 YTBmNzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ludGVyc2VjdGlvbk9ic2Vy dmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ludGVyc2VjdGlvbk9ic2VydmVyLmNw cApAQCAtMzQ4LDkgKzM0OCw3IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPEludGVyc2VjdGlvbk9i c2VydmF0aW9uU3RhdGU+IGNvbXB1dGVJbnRlcnNlY3Rpb25TdGF0ZShMb2NhCiAgICAgICAgIGV4 cGFuZFJvb3RCb3VuZHNXaXRoUm9vdE1hcmdpbihsb2NhbFJvb3RCb3VuZHMsIG9ic2VydmVyLnJv b3RNYXJnaW5Cb3goKSwgcm9vdFJlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiAK ICAgICBMYXlvdXRSZWN0IGxvY2FsVGFyZ2V0Qm91bmRzOwotICAgIGlmIChpczxSZW5kZXJCb3g+ KCp0YXJnZXRSZW5kZXJlcikpCi0gICAgICAgIGxvY2FsVGFyZ2V0Qm91bmRzID0gZG93bmNhc3Q8 UmVuZGVyQm94Pih0YXJnZXRSZW5kZXJlciktPmJvcmRlckJvdW5kaW5nQm94KCk7Ci0gICAgZWxz ZSBpZiAoaXM8UmVuZGVySW5saW5lPih0YXJnZXRSZW5kZXJlcikpIHsKKyAgICBpZiAoaXM8UmVu ZGVySW5saW5lPih0YXJnZXRSZW5kZXJlcikpIHsKICAgICAgICAgYXV0byBwYWlyID0gdGFyZ2V0 LmJvdW5kaW5nQWJzb2x1dGVSZWN0V2l0aG91dExheW91dCgpOwogICAgICAgICBpZiAocGFpcikg ewogICAgICAgICAgICAgRmxvYXRSZWN0IGFic29sdXRlVGFyZ2V0Qm91bmRzID0gcGFpci0+c2Vj b25kOwpAQCAtMzU4LDYgKzM1Niw4IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPEludGVyc2VjdGlv bk9ic2VydmF0aW9uU3RhdGU+IGNvbXB1dGVJbnRlcnNlY3Rpb25TdGF0ZShMb2NhCiAgICAgICAg IH0KICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4odGFyZ2V0UmVuZGVyZXIpKQog ICAgICAgICBsb2NhbFRhcmdldEJvdW5kcyA9IGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4odGFy Z2V0UmVuZGVyZXIpLT5saW5lc0JvdW5kaW5nQm94KCk7CisgICAgZWxzZSBpZiAoaXM8UmVuZGVy Qm94PigqdGFyZ2V0UmVuZGVyZXIpKQorICAgICAgICBsb2NhbFRhcmdldEJvdW5kcyA9IGRvd25j YXN0PFJlbmRlckJveD4odGFyZ2V0UmVuZGVyZXIpLT5ib3JkZXJCb3VuZGluZ0JveCgpOwogCiAg ICAgc3RkOjpvcHRpb25hbDxMYXlvdXRSZWN0PiByb290TG9jYWxUYXJnZXRSZWN0OwogICAgIGlm IChvYnNlcnZlci5yb290KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9MZWdhY3lJbmxpbmVFbGVtZW50Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9M ZWdhY3lJbmxpbmVFbGVtZW50Qm94LmNwcAppbmRleCA0NTk5MmU5MmMyMGUuLjEzNzk0NjFiODY2 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUlubGluZUVsZW1l bnRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lJbmxpbmVFbGVt ZW50Qm94LmNwcApAQCAtNDMsOCArNDMsNiBAQCB2b2lkIExlZ2FjeUlubGluZUVsZW1lbnRCb3g6 OmRlbGV0ZUxpbmUoKQogICAgIGlmICghZXh0cmFjdGVkKCkpIHsKICAgICAgICAgaWYgKGlzPFJl bmRlckJveD4ocmVuZGVyZXIoKSkpCiAgICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJCb3g+KHJl bmRlcmVyKCkpLnNldElubGluZUJveFdyYXBwZXIobnVsbHB0cik7Ci0gICAgICAgIGVsc2UgaWYg KGlzPFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIoKSkpCi0gICAgICAgICAgICBkb3duY2FzdDxS ZW5kZXJMaW5lQnJlYWs+KHJlbmRlcmVyKCkpLnNldElubGluZUJveFdyYXBwZXIobnVsbHB0cik7 CiAgICAgfQogICAgIGRlbGV0ZSB0aGlzOwogfQpAQCAtNTQsOCArNTIsNiBAQCB2b2lkIExlZ2Fj eUlubGluZUVsZW1lbnRCb3g6OmV4dHJhY3RMaW5lKCkKICAgICBzZXRFeHRyYWN0ZWQodHJ1ZSk7 CiAgICAgaWYgKGlzPFJlbmRlckJveD4ocmVuZGVyZXIoKSkpCiAgICAgICAgIGRvd25jYXN0PFJl bmRlckJveD4ocmVuZGVyZXIoKSkuc2V0SW5saW5lQm94V3JhcHBlcihudWxscHRyKTsKLSAgICBl bHNlIGlmIChpczxSZW5kZXJMaW5lQnJlYWs+KHJlbmRlcmVyKCkpKQotICAgICAgICBkb3duY2Fz dDxSZW5kZXJMaW5lQnJlYWs+KHJlbmRlcmVyKCkpLnNldElubGluZUJveFdyYXBwZXIobnVsbHB0 cik7CiB9CiAKIHZvaWQgTGVnYWN5SW5saW5lRWxlbWVudEJveDo6YXR0YWNoTGluZSgpCkBAIC02 Myw4ICs1OSw2IEBAIHZvaWQgTGVnYWN5SW5saW5lRWxlbWVudEJveDo6YXR0YWNoTGluZSgpCiAg ICAgc2V0RXh0cmFjdGVkKGZhbHNlKTsKICAgICBpZiAoaXM8UmVuZGVyQm94PihyZW5kZXJlcigp KSkKICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5zZXRJbmxpbmVCb3hX cmFwcGVyKHRoaXMpOwotICAgIGVsc2UgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIo KSkpCi0gICAgICAgIGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIoKSkuc2V0SW5s aW5lQm94V3JhcHBlcih0aGlzKTsKIH0KIAogdm9pZCBMZWdhY3lJbmxpbmVFbGVtZW50Qm94Ojpw YWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0 LCBMYXlvdXRVbml0IC8qIGxpbmVUb3AgKi8sIExheW91dFVuaXQgLypsaW5lQm90dG9tKi8pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5TGluZUxheW91dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5TGluZUxheW91dC5jcHAKaW5kZXggOWRi ZTg4MjI5YTgwLi4yZTI1N2IzZjZmMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9MZWdhY3lMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TGVnYWN5TGluZUxheW91dC5jcHAKQEAgLTE3MSwxMSArMTcxLDYgQEAgTGVnYWN5SW5saW5lQm94 KiBMZWdhY3lMaW5lTGF5b3V0OjpjcmVhdGVJbmxpbmVCb3hGb3JSZW5kZXJlcihSZW5kZXJPYmpl Y3QqIHJlbmQKICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oKnJlbmRlcmVyKSkKICAgICAgICAgcmV0 dXJuIGRvd25jYXN0PFJlbmRlclRleHQ+KCpyZW5kZXJlcikuY3JlYXRlSW5saW5lVGV4dEJveCgp OwogCi0gICAgaWYgKGlzPFJlbmRlckJveD4oKnJlbmRlcmVyKSkgewotICAgICAgICAvLyBGSVhN RTogVGhpcyBpcyB0ZXJyaWJsZS4gVGhpcyBicmFuY2ggcmV0dXJucyBhbiAqb3duZWQqIHBvaW50 ZXIhCi0gICAgICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJCb3g+KCpyZW5kZXJlcikuY3JlYXRl SW5saW5lQm94KCkucmVsZWFzZSgpOwotICAgIH0KLQogICAgIGlmIChpczxSZW5kZXJMaW5lQnJl YWs+KCpyZW5kZXJlcikpIHsKICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgdGVycmlibGUuIFRo aXMgYnJhbmNoIHJldHVybnMgYW4gKm93bmVkKiBwb2ludGVyIQogICAgICAgICBhdXRvIGlubGlu ZUJveCA9IGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4oKnJlbmRlcmVyKS5jcmVhdGVJbmxpbmVC b3goKS5yZWxlYXNlKCk7CkBAIC0xODUsNiArMTgwLDExIEBAIExlZ2FjeUlubGluZUJveCogTGVn YWN5TGluZUxheW91dDo6Y3JlYXRlSW5saW5lQm94Rm9yUmVuZGVyZXIoUmVuZGVyT2JqZWN0KiBy ZW5kCiAgICAgICAgIHJldHVybiBpbmxpbmVCb3g7CiAgICAgfQogCisgICAgaWYgKGlzPFJlbmRl ckJveD4oKnJlbmRlcmVyKSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyB0ZXJyaWJsZS4g VGhpcyBicmFuY2ggcmV0dXJucyBhbiAqb3duZWQqIHBvaW50ZXIhCisgICAgICAgIHJldHVybiBk b3duY2FzdDxSZW5kZXJCb3g+KCpyZW5kZXJlcikuY3JlYXRlSW5saW5lQm94KCkucmVsZWFzZSgp OworICAgIH0KKwogICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJJbmxpbmU+KCpyZW5kZXJlciku Y3JlYXRlQW5kQXBwZW5kSW5saW5lRmxvd0JveCgpOwogfQogCkBAIC0xMDUzLDExICsxMDUzLDEy IEBAIHZvaWQgTGVnYWN5TGluZUxheW91dDo6Y29tcHV0ZUJsb2NrRGlyZWN0aW9uUG9zaXRpb25z Rm9yTGluZShMZWdhY3lSb290SW5saW5lQm94CiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0 Qm94ID0gZG93bmNhc3Q8TGVnYWN5SW5saW5lVGV4dEJveD4oKnJ1bi0+Ym94KCkpOwogICAgICAg ICAgICAgZG93bmNhc3Q8UmVuZGVyVGV4dD4ocmVuZGVyZXIpLnBvc2l0aW9uTGluZUJveChpbmxp bmVUZXh0Qm94KTsKICAgICAgICAgICAgIGlubGluZUJveElzUmVkdW5kYW50ID0gIWlubGluZVRl eHRCb3guaGFzVGV4dENvbnRlbnQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChpczxSZW5kZXJCb3g+ KHJlbmRlcmVyKSkgewotICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlciku cG9zaXRpb25MaW5lQm94KGRvd25jYXN0PExlZ2FjeUlubGluZUVsZW1lbnRCb3g+KCpydW4tPmJv eCgpKSk7Ci0gICAgICAgICAgICBpbmxpbmVCb3hJc1JlZHVuZGFudCA9IHJlbmRlcmVyLmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpOwogICAgICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlckxpbmVCcmVh az4ocmVuZGVyZXIpKQogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyTGluZUJyZWFrPihyZW5k ZXJlcikucmVwbGFjZUlubGluZUJveFdyYXBwZXIoZG93bmNhc3Q8TGVnYWN5SW5saW5lRWxlbWVu dEJveD4oKnJ1bi0+Ym94KCkpKTsKKyAgICAgICAgZWxzZSBpZiAoaXM8UmVuZGVyQm94PihyZW5k ZXJlcikpIHsKKyAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpLnBvc2l0 aW9uTGluZUJveChkb3duY2FzdDxMZWdhY3lJbmxpbmVFbGVtZW50Qm94PigqcnVuLT5ib3goKSkp OworICAgICAgICAgICAgaW5saW5lQm94SXNSZWR1bmRhbnQgPSByZW5kZXJlci5pc091dE9mRmxv d1Bvc2l0aW9uZWQoKTsKKyAgICAgICAgfQogICAgICAgICAvLyBDaGVjayBpZiB3ZSBuZWVkIHRv IGtlZXAgdGhpcyBib3ggb24gdGhlIGxpbmUgYXQgYWxsLgogICAgICAgICBpZiAoaW5saW5lQm94 SXNSZWR1bmRhbnQpCiAgICAgICAgICAgICByZW1vdmVJbmxpbmVCb3goKnJ1biwgKmxpbmVCb3gp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IGE3ZDhlYTU2YjI5NC4uNDMz MzIzMDQ1Yjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC0xMDcsNyAr MTA3LDcgQEAgcHVibGljOgogCiAgICAgaW5saW5lIExheW91dFJlY3QgbWFyZ2luQm94UmVjdCgp IGNvbnN0OwogICAgIExheW91dFJlY3QgYm9yZGVyQm94UmVjdCgpIGNvbnN0IHsgcmV0dXJuIExh eW91dFJlY3QoTGF5b3V0UG9pbnQoKSwgc2l6ZSgpKTsgfQotICAgIExheW91dFJlY3QgYm9yZGVy Qm91bmRpbmdCb3goKSBjb25zdCBmaW5hbCB7IHJldHVybiBib3JkZXJCb3hSZWN0KCk7IH0KKyAg ICBMYXlvdXRSZWN0IGJvcmRlckJvdW5kaW5nQm94KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g Ym9yZGVyQm94UmVjdCgpOyB9CiAgICAgaW5saW5lIExheW91dFNpemUgYm9yZGVyQm94TG9naWNh bFNpemUoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIFJvdW5kZWRSZWN0UmFkaWkgYm9y ZGVyUmFkaWkoKSBjb25zdDsKQEAgLTIyOSwxNCArMjI5LDE0IEBAIHB1YmxpYzoKICAgICBMYXlv dXRVbml0IG1hcmdpbkxvZ2ljYWxMZWZ0KGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0eWxl ID0gbnVsbHB0cikgY29uc3QgeyByZXR1cm4gbV9tYXJnaW5Cb3guc3RhcnQoKG92ZXJyaWRlU3R5 bGUgPyBvdmVycmlkZVN0eWxlIDogJnN0eWxlKCkpLT53cml0aW5nTW9kZSgpKTsgfQogICAgIExh eW91dFVuaXQgbWFyZ2luTG9naWNhbFJpZ2h0KGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0 eWxlID0gbnVsbHB0cikgY29uc3QgeyByZXR1cm4gbV9tYXJnaW5Cb3guZW5kKChvdmVycmlkZVN0 eWxlID8gb3ZlcnJpZGVTdHlsZSA6ICZzdHlsZSgpKS0+d3JpdGluZ01vZGUoKSk7IH0KIAotICAg IExheW91dFVuaXQgbWFyZ2luQmVmb3JlKGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0eWxl ID0gbnVsbHB0cikgY29uc3QgZmluYWwgeyByZXR1cm4gbV9tYXJnaW5Cb3guYmVmb3JlKChvdmVy cmlkZVN0eWxlID8gb3ZlcnJpZGVTdHlsZSA6ICZzdHlsZSgpKS0+d3JpdGluZ01vZGUoKSk7IH0K LSAgICBMYXlvdXRVbml0IG1hcmdpbkFmdGVyKGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0 eWxlID0gbnVsbHB0cikgY29uc3QgZmluYWwgeyByZXR1cm4gbV9tYXJnaW5Cb3guYWZ0ZXIoKG92 ZXJyaWRlU3R5bGUgPyBvdmVycmlkZVN0eWxlIDogJnN0eWxlKCkpLT53cml0aW5nTW9kZSgpKTsg fQotICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRl U3R5bGUgPSBudWxscHRyKSBjb25zdCBmaW5hbAorICAgIExheW91dFVuaXQgbWFyZ2luQmVmb3Jl KGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0eWxlID0gbnVsbHB0cikgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gbV9tYXJnaW5Cb3guYmVmb3JlKChvdmVycmlkZVN0eWxlID8gb3ZlcnJpZGVT dHlsZSA6ICZzdHlsZSgpKS0+d3JpdGluZ01vZGUoKSk7IH0KKyAgICBMYXlvdXRVbml0IG1hcmdp bkFmdGVyKGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZVN0eWxlID0gbnVsbHB0cikgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gbV9tYXJnaW5Cb3guYWZ0ZXIoKG92ZXJyaWRlU3R5bGUgPyBvdmVy cmlkZVN0eWxlIDogJnN0eWxlKCkpLT53cml0aW5nTW9kZSgpKTsgfQorICAgIExheW91dFVuaXQg bWFyZ2luU3RhcnQoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBudWxscHRyKSBj b25zdCBvdmVycmlkZQogICAgIHsKICAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlVG9V c2UgPSBvdmVycmlkZVN0eWxlID8gb3ZlcnJpZGVTdHlsZSA6ICZzdHlsZSgpOwogICAgICAgICBy ZXR1cm4gbV9tYXJnaW5Cb3guc3RhcnQoc3R5bGVUb1VzZS0+d3JpdGluZ01vZGUoKSwgc3R5bGVU b1VzZS0+ZGlyZWN0aW9uKCkpOwogICAgIH0KLSAgICBMYXlvdXRVbml0IG1hcmdpbkVuZChjb25z dCBSZW5kZXJTdHlsZSogb3ZlcnJpZGVTdHlsZSA9IG51bGxwdHIpIGNvbnN0IGZpbmFsCisgICAg TGF5b3V0VW5pdCBtYXJnaW5FbmQoY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlU3R5bGUgPSBu dWxscHRyKSBjb25zdCBvdmVycmlkZQogICAgIHsKICAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUq IHN0eWxlVG9Vc2UgPSBvdmVycmlkZVN0eWxlID8gb3ZlcnJpZGVTdHlsZSA6ICZzdHlsZSgpOwog ICAgICAgICByZXR1cm4gbV9tYXJnaW5Cb3guZW5kKHN0eWxlVG9Vc2UtPndyaXRpbmdNb2RlKCks IHN0eWxlVG9Vc2UtPmRpcmVjdGlvbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxpbmVCcmVhay5jcHAKaW5kZXggMWQ2ZDMxYzJiZDBlLi41ODY2YjgxNTYzNTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQnJlYWsuY3BwCkBAIC01MCw4ICs1 MCw3IEBAIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChSZW5kZXJMaW5lQnJlYWspOwogc3Rh dGljIGNvbnN0IGludCBpbnZhbGlkTGluZUhlaWdodCA9IC0xOwogCiBSZW5kZXJMaW5lQnJlYWs6 OlJlbmRlckxpbmVCcmVhayhIVE1MRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHls ZSkKLSAgICA6IFJlbmRlckJveE1vZGVsT2JqZWN0KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpLCAw KQotICAgICwgbV9pbmxpbmVCb3hXcmFwcGVyKG51bGxwdHIpCisgICAgOiBSZW5kZXJCb3goZWxl bWVudCwgV1RGTW92ZShzdHlsZSksIDApCiAgICAgLCBtX2NhY2hlZExpbmVIZWlnaHQoaW52YWxp ZExpbmVIZWlnaHQpCiAgICAgLCBtX2lzV0JSKGlzPEhUTUxXQlJFbGVtZW50PihlbGVtZW50KSkK IHsKQEAgLTYwLDcgKzU5LDYgQEAgUmVuZGVyTGluZUJyZWFrOjpSZW5kZXJMaW5lQnJlYWsoSFRN TEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUpCiAKIFJlbmRlckxpbmVCcmVh azo6flJlbmRlckxpbmVCcmVhaygpCiB7Ci0gICAgZGVsZXRlIG1faW5saW5lQm94V3JhcHBlcjsK IH0KIAogTGF5b3V0VW5pdCBSZW5kZXJMaW5lQnJlYWs6OmxpbmVIZWlnaHQoYm9vbCBmaXJzdExp bmUsIExpbmVEaXJlY3Rpb25Nb2RlIC8qZGlyZWN0aW9uKi8sIExpbmVQb3NpdGlvbk1vZGUgLyps aW5lUG9zaXRpb25Nb2RlKi8pIGNvbnN0CkBAIC04NCw0NSArODIsMTIgQEAgTGF5b3V0VW5pdCBS ZW5kZXJMaW5lQnJlYWs6OmJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlw ZSwgYm9vbCBmaXIKICAgICByZXR1cm4gTGF5b3V0VW5pdCB7IChmb250TWV0cmljcy5hc2NlbnQo YmFzZWxpbmVUeXBlKSArIChsaW5lSGVpZ2h0KGZpcnN0TGluZSwgZGlyZWN0aW9uLCBsaW5lUG9z aXRpb25Nb2RlKSAtIGZvbnRNZXRyaWNzLmhlaWdodCgpKSAvIDIpLnRvSW50KCkgfTsKIH0KIAot c3RkOjp1bmlxdWVfcHRyPExlZ2FjeUlubGluZUVsZW1lbnRCb3g+IFJlbmRlckxpbmVCcmVhazo6 Y3JlYXRlSW5saW5lQm94KCkKLXsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxMZWdhY3lJbmxpbmVF bGVtZW50Qm94PigqdGhpcyk7Ci19Ci0KLXZvaWQgUmVuZGVyTGluZUJyZWFrOjpzZXRJbmxpbmVC b3hXcmFwcGVyKExlZ2FjeUlubGluZUVsZW1lbnRCb3gqIGlubGluZUJveCkKLXsKLSAgICBBU1NF UlQoIWlubGluZUJveCB8fCAhbV9pbmxpbmVCb3hXcmFwcGVyKTsKLSAgICBtX2lubGluZUJveFdy YXBwZXIgPSBpbmxpbmVCb3g7Ci19Ci0KIHZvaWQgUmVuZGVyTGluZUJyZWFrOjpyZXBsYWNlSW5s aW5lQm94V3JhcHBlcihMZWdhY3lJbmxpbmVFbGVtZW50Qm94JiBpbmxpbmVCb3gpCiB7Ci0gICAg ZGVsZXRlSW5saW5lQm94V3JhcHBlcigpOworICAgIGRlbGV0ZUxpbmVCb3hXcmFwcGVyKCk7CiAg ICAgc2V0SW5saW5lQm94V3JhcHBlcigmaW5saW5lQm94KTsKIH0KIAotdm9pZCBSZW5kZXJMaW5l QnJlYWs6OmRlbGV0ZUlubGluZUJveFdyYXBwZXIoKQotewotICAgIGlmICghbV9pbmxpbmVCb3hX cmFwcGVyKQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKCFyZW5kZXJUcmVlQmVpbmdEZXN0cm95 ZWQoKSkKLSAgICAgICAgbV9pbmxpbmVCb3hXcmFwcGVyLT5yZW1vdmVGcm9tUGFyZW50KCk7Ci0g ICAgZGVsZXRlIG1faW5saW5lQm94V3JhcHBlcjsKLSAgICBtX2lubGluZUJveFdyYXBwZXIgPSBu dWxscHRyOwotfQotCi12b2lkIFJlbmRlckxpbmVCcmVhazo6ZGlydHlMaW5lQm94ZXMoYm9vbCBm dWxsTGF5b3V0KQotewotICAgIGlmICghbV9pbmxpbmVCb3hXcmFwcGVyKQotICAgICAgICByZXR1 cm47Ci0gICAgaWYgKGZ1bGxMYXlvdXQpIHsKLSAgICAgICAgZGVsZXRlIG1faW5saW5lQm94V3Jh cHBlcjsKLSAgICAgICAgbV9pbmxpbmVCb3hXcmFwcGVyID0gbnVsbHB0cjsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLSAgICBtX2lubGluZUJveFdyYXBwZXItPmRpcnR5TGluZUJveGVzKCk7Ci19 Ci0KIGludCBSZW5kZXJMaW5lQnJlYWs6OmNhcmV0TWluT2Zmc2V0KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gMDsKQEAgLTEzOCw2ICsxMDMsMjEgQEAgYm9vbCBSZW5kZXJMaW5lQnJlYWs6OmNhbkJl U2VsZWN0aW9uTGVhZigpIGNvbnN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK0xheW91dFJlY3Qg UmVuZGVyTGluZUJyZWFrOjpib3JkZXJCb3VuZGluZ0JveCgpIGNvbnN0Cit7CisgICAgcmV0dXJu ICFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSA/IExheW91dFJlY3QoTGF5b3V0UG9pbnQoKSwgbGlu ZXNCb3VuZGluZ0JveCgpLnNpemUoKSkgOiBSZW5kZXJCb3g6OmJvcmRlckJvdW5kaW5nQm94KCk7 Cit9CisKK0xheW91dFVuaXQgUmVuZGVyTGluZUJyZWFrOjpvZmZzZXRXaWR0aCgpIGNvbnN0Cit7 CisgICAgcmV0dXJuICFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSA/IExheW91dFVuaXQobGluZXNC b3VuZGluZ0JveCgpLndpZHRoKCkpIDogUmVuZGVyQm94OjpvZmZzZXRXaWR0aCgpOworfQorCitM YXlvdXRVbml0IFJlbmRlckxpbmVCcmVhazo6b2Zmc2V0SGVpZ2h0KCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpID8gTGF5b3V0VW5pdChsaW5lc0JvdW5kaW5n Qm94KCkuaGVpZ2h0KCkpIDogUmVuZGVyQm94OjpvZmZzZXRIZWlnaHQoKTsKK30KKwogVmlzaWJs ZVBvc2l0aW9uIFJlbmRlckxpbmVCcmVhazo6cG9zaXRpb25Gb3JQb2ludChjb25zdCBMYXlvdXRQ b2ludCYsIGNvbnN0IFJlbmRlckZyYWdtZW50Q29udGFpbmVyKikKIHsKICAgICByZXR1cm4gY3Jl YXRlVmlzaWJsZVBvc2l0aW9uKDAsIEFmZmluaXR5OjpEb3duc3RyZWFtKTsKQEAgLTE0NSw2ICsx MjUsOCBAQCBWaXNpYmxlUG9zaXRpb24gUmVuZGVyTGluZUJyZWFrOjpwb3NpdGlvbkZvclBvaW50 KGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgUmVuZAogCiBJbnRSZWN0IFJlbmRlckxpbmVCcmVh azo6bGluZXNCb3VuZGluZ0JveCgpIGNvbnN0CiB7CisgICAgQVNTRVJUKCFpc091dE9mRmxvd1Bv c2l0aW9uZWQoKSk7CisKICAgICBhdXRvIHJ1biA9IElubGluZUl0ZXJhdG9yOjpib3hGb3IoKnRo aXMpOwogICAgIGlmICghcnVuKQogICAgICAgICByZXR1cm4geyB9OwpAQCAtMTU0LDI4ICsxMzYs MzcgQEAgSW50UmVjdCBSZW5kZXJMaW5lQnJlYWs6OmxpbmVzQm91bmRpbmdCb3goKSBjb25zdAog CiB2b2lkIFJlbmRlckxpbmVCcmVhazo6YWJzb2x1dGVSZWN0cyhWZWN0b3I8SW50UmVjdD4mIHJl Y3RzLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNvbnN0CiB7Ci0gICAg YXV0byBib3ggPSBJbmxpbmVJdGVyYXRvcjo6Ym94Rm9yKCp0aGlzKTsKLSAgICBpZiAoIWJveCkK LSAgICAgICAgcmV0dXJuOworICAgIGlmICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKKyAg ICAgICAgYXV0byBib3ggPSBJbmxpbmVJdGVyYXRvcjo6Ym94Rm9yKCp0aGlzKTsKKyAgICAgICAg aWYgKCFib3gpCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIHJlY3QgPSBib3gtPnZp c3VhbFJlY3RJZ25vcmluZ0Jsb2NrRGlyZWN0aW9uKCk7Ci0gICAgcmVjdHMuYXBwZW5kKGVuY2xv c2luZ0ludFJlY3QoRmxvYXRSZWN0KGFjY3VtdWxhdGVkT2Zmc2V0ICsgcmVjdC5sb2NhdGlvbigp LCByZWN0LnNpemUoKSkpKTsKKyAgICAgICAgYXV0byByZWN0ID0gYm94LT52aXN1YWxSZWN0SWdu b3JpbmdCbG9ja0RpcmVjdGlvbigpOworICAgICAgICByZWN0cy5hcHBlbmQoZW5jbG9zaW5nSW50 UmVjdChGbG9hdFJlY3QoYWNjdW11bGF0ZWRPZmZzZXQgKyByZWN0LmxvY2F0aW9uKCksIHJlY3Qu c2l6ZSgpKSkpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIFJlbmRlckJveDo6YWJzb2x1 dGVSZWN0cyhyZWN0cywgYWNjdW11bGF0ZWRPZmZzZXQpOwogfQogCiB2b2lkIFJlbmRlckxpbmVC cmVhazo6YWJzb2x1dGVRdWFkcyhWZWN0b3I8RmxvYXRRdWFkPiYgcXVhZHMsIGJvb2wqIHdhc0Zp eGVkKSBjb25zdAogewotICAgIGF1dG8gYm94ID0gSW5saW5lSXRlcmF0b3I6OmJveEZvcigqdGhp cyk7Ci0gICAgaWYgKCFib3gpCi0gICAgICAgIHJldHVybjsKKyAgICBpZiAoIWlzT3V0T2ZGbG93 UG9zaXRpb25lZCgpKSB7CisgICAgICAgIGF1dG8gYm94ID0gSW5saW5lSXRlcmF0b3I6OmJveEZv cigqdGhpcyk7CisgICAgICAgIGlmICghYm94KQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg YXV0byByZWN0ID0gYm94LT52aXN1YWxSZWN0SWdub3JpbmdCbG9ja0RpcmVjdGlvbigpOwotICAg IHF1YWRzLmFwcGVuZChsb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVjdChyZWN0LmxvY2F0aW9u KCksIHJlY3Quc2l6ZSgpKSwgVXNlVHJhbnNmb3Jtcywgd2FzRml4ZWQpKTsKKyAgICAgICAgYXV0 byByZWN0ID0gYm94LT52aXN1YWxSZWN0SWdub3JpbmdCbG9ja0RpcmVjdGlvbigpOworICAgICAg ICBxdWFkcy5hcHBlbmQobG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QocmVjdC5sb2NhdGlv bigpLCByZWN0LnNpemUoKSksIFVzZVRyYW5zZm9ybXMsIHdhc0ZpeGVkKSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgUmVuZGVyQm94OjphYnNvbHV0ZVF1YWRzKHF1YWRzLCB3YXNGaXhl ZCk7CiB9CiAKIHZvaWQgUmVuZGVyTGluZUJyZWFrOjp1cGRhdGVGcm9tU3R5bGUoKQogewogICAg IG1fY2FjaGVkTGluZUhlaWdodCA9IGludmFsaWRMaW5lSGVpZ2h0OwotICAgIFJFTEVBU0VfQVNT RVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaXNJbmxpbmUoKSk7CisgICAgc2V0UG9zaXRp b25TdGF0ZShzdHlsZSgpLnBvc2l0aW9uKCkpOworICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VD VVJJVFlfSU1QTElDQVRJT04oaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgaXNJbmxpbmUoKSk7 CiB9CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxpbmVCcmVhay5oCmluZGV4IDllOWUxZTM5OTRiMS4uYTJhYTQ1M2ZkZjFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJyZWFrLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5oCkBAIC0yMSw3ICsyMSw3 IEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiUmVuZGVyQm94TW9kZWxPYmplY3QuaCIK KyNpbmNsdWRlICJSZW5kZXJCb3guaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0yOSw3 ICsyOSw3IEBAIGNsYXNzIExlZ2FjeUlubGluZUVsZW1lbnRCb3g7CiBjbGFzcyBIVE1MRWxlbWVu dDsKIGNsYXNzIFBvc2l0aW9uOwogCi1jbGFzcyBSZW5kZXJMaW5lQnJlYWsgZmluYWwgOiBwdWJs aWMgUmVuZGVyQm94TW9kZWxPYmplY3QgeworY2xhc3MgUmVuZGVyTGluZUJyZWFrIGZpbmFsIDog cHVibGljIFJlbmRlckJveCB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRChSZW5kZXJMaW5l QnJlYWspOwogcHVibGljOgogICAgIFJlbmRlckxpbmVCcmVhayhIVE1MRWxlbWVudCYsIFJlbmRl clN0eWxlJiYpOwpAQCAtNDAsMTIgKzQwLDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc1dCUigp IGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1faXNXQlI7IH0KIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxM ZWdhY3lJbmxpbmVFbGVtZW50Qm94PiBjcmVhdGVJbmxpbmVCb3goKTsKLSAgICBMZWdhY3lJbmxp bmVFbGVtZW50Qm94KiBpbmxpbmVCb3hXcmFwcGVyKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVC b3hXcmFwcGVyOyB9Ci0gICAgdm9pZCBzZXRJbmxpbmVCb3hXcmFwcGVyKExlZ2FjeUlubGluZUVs ZW1lbnRCb3gqKTsKLSAgICB2b2lkIGRlbGV0ZUlubGluZUJveFdyYXBwZXIoKTsKICAgICB2b2lk IHJlcGxhY2VJbmxpbmVCb3hXcmFwcGVyKExlZ2FjeUlubGluZUVsZW1lbnRCb3gmKTsKLSAgICB2 b2lkIGRpcnR5TGluZUJveGVzKGJvb2wgZnVsbExheW91dCk7CiAKICAgICBJbnRSZWN0IGxpbmVz Qm91bmRpbmdCb3goKSBjb25zdDsKIApAQCAtNzcsMTYgKzcyLDE1IEBAIHByaXZhdGU6CiAgICAg TGF5b3V0VW5pdCBtYXJnaW5BZnRlcihjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0IGZpbmFsIHsg cmV0dXJuIDA7IH0KICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0KGNvbnN0IFJlbmRlclN0eWxl KikgY29uc3QgZmluYWwgeyByZXR1cm4gMDsgfQogICAgIExheW91dFVuaXQgbWFyZ2luRW5kKGNv bnN0IFJlbmRlclN0eWxlKikgY29uc3QgZmluYWwgeyByZXR1cm4gMDsgfQotICAgIExheW91dFVu aXQgb2Zmc2V0V2lkdGgoKSBjb25zdCBmaW5hbCB7IHJldHVybiBsaW5lc0JvdW5kaW5nQm94KCku d2lkdGgoKTsgfQotICAgIExheW91dFVuaXQgb2Zmc2V0SGVpZ2h0KCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gbGluZXNCb3VuZGluZ0JveCgpLmhlaWdodCgpOyB9Ci0gICAgTGF5b3V0UmVjdCBib3Jk ZXJCb3VuZGluZ0JveCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIExheW91dFJlY3QoTGF5b3V0UG9p bnQoKSwgbGluZXNCb3VuZGluZ0JveCgpLnNpemUoKSk7IH0KKyAgICBMYXlvdXRVbml0IG9mZnNl dFdpZHRoKCkgY29uc3QgZmluYWw7CisgICAgTGF5b3V0VW5pdCBvZmZzZXRIZWlnaHQoKSBjb25z dCBmaW5hbDsKKyAgICBMYXlvdXRSZWN0IGJvcmRlckJvdW5kaW5nQm94KCkgY29uc3QgZmluYWw7 CiAgICAgTGF5b3V0UmVjdCBmcmFtZVJlY3RGb3JTdGlja3lQb3NpdGlvbmluZygpIGNvbnN0IGZp bmFsIHsgQVNTRVJUX05PVF9SRUFDSEVEKCk7IHJldHVybiBMYXlvdXRSZWN0KCk7IH0KICAgICBM YXlvdXRSZWN0IGNsaXBwZWRPdmVyZmxvd1JlY3QoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVj dCosIFZpc2libGVSZWN0Q29udGV4dCkgY29uc3QgZmluYWwgeyByZXR1cm4gTGF5b3V0UmVjdCgp OyB9CiAKICAgICB2b2lkIHVwZGF0ZUZyb21TdHlsZSgpIGZpbmFsOwotICAgIGJvb2wgcmVxdWly ZXNMYXllcigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgYm9vbCByZXF1aXJl c0xheWVyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCk7IH0K IAotICAgIExlZ2FjeUlubGluZUVsZW1lbnRCb3gqIG1faW5saW5lQm94V3JhcHBlcjsKICAgICBt dXRhYmxlIGludCBtX2NhY2hlZExpbmVIZWlnaHQ7CiAgICAgYm9vbCBtX2lzV0JSOwogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1 aWxkZXIuY3BwCmluZGV4IGU2ZWEyYTljMTRkYS4uY2QxMTQwZDgzYjk3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5j cHAKQEAgLTk1Miw4ICs5NTIsNiBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVl QnVpbGRlcjo6ZGV0YWNoRnJvbVJlbmRlckVsZW1lbnQoUmVuZGVyRWxlbWVudAogICAgIC8vIElm IHdlIGhhdmUgYSBsaW5lIGJveCB3cmFwcGVyLCBkZWxldGUgaXQuCiAgICAgaWYgKGlzPFJlbmRl ckJveD4oY2hpbGQpKQogICAgICAgICBkb3duY2FzdDxSZW5kZXJCb3g+KGNoaWxkKS5kZWxldGVM aW5lQm94V3JhcHBlcigpOwotICAgIGVsc2UgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4oY2hpbGQp KQotICAgICAgICBkb3duY2FzdDxSZW5kZXJMaW5lQnJlYWs+KGNoaWxkKS5kZWxldGVJbmxpbmVC b3hXcmFwcGVyKCk7CiAgICAgZWxzZSBpZiAoaXM8UmVuZGVyVGV4dD4oY2hpbGQpKQogICAgICAg ICBkb3duY2FzdDxSZW5kZXJUZXh0PihjaGlsZCkucmVtb3ZlQW5kRGVzdHJveVRleHRCb3hlcygp OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3Jj ZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0 LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWstZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjQ5OGRmMzE2ZjAwMgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLWV4 cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw3IEBACis8c3R5bGU+CitkaXYgeworICBmb250LWZhbWls eTogbW9ub3NwYWNlOworfQorPC9zdHlsZT4KKzxkaXY+UEFTUyBpZiBubyBsaW5lIGJyZWFrLjwv ZGl2PgorPGRpdj5QQVNTIGlmIG5vIGxpbmUgYnJlYWsuPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWsuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmQ2OWUxODllZTMyNAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LWZv cmNlZC1saW5lLWJyZWFrLmh0bWwKQEAgLTAsMCArMSw3IEBACis8c3R5bGU+CitkaXYgeworICBm b250LWZhbWlseTogbW9ub3NwYWNlOworfQorPC9zdHlsZT4KKzxkaXY+UEFTUyBpZjxiciBzdHls ZT0icG9zaXRpb246IGFic29sdXRlOyI+IG5vIGxpbmUgYnJlYWsuPC9kaXY+Cis8ZGl2PlBBU1Mg aWY8YnIgc3R5bGU9InBvc2l0aW9uOiBmaXhlZDsiPiBubyBsaW5lIGJyZWFrLjwvZGl2Pgo= 467159 2023-07-30 21:09:11 -0700 2023-08-01 08:23:22 -0700 Patch bug-259631-20230730210911.patch text/plain 7360 zalan RnJvbSBkNzgxZDA0ZmY5MDRmZGIyYTU4ZDY1YWU1ZDdkZDk0MjVkNWI1N2JjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMzAgSnVsIDIwMjMgMjA6Mzc6MTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBPdXQtb2Yt ZmxvdyA8YnI+IHNob3VsZCBub3QgdHJpZ2dlciBhIGxpbmUgYnJlYWsKIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk2MzEKClJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKVGhpcyBpcyBqdXN0IHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCBpbmNsdWRlIG91dC1vZi1m bG93IGxpbmUgYnJlYWsgaW4gaW5mbG93IGlubGluZSBsYXlvdXQKcHJvZHVjaW5nIGZvcmNlZCBs aW5lIGJyZWFrIGF0IHN1Y2ggYm94ZXMuCkhvd2V2ZXIgdGhpcyBwYXRjaCBkb2VzIG5vdCBhZGRy ZXNzIHRoZSBpbmNvcnJlY3Qgb2Zmc2V0VG9wL2xlZnQvY2xpZW50IHJlY3QgZXRjIHZhbHVlcy4K KEluIG9yZGVyIHRvIHN1cHBvcnQgYSBmdWxsLWZsZWRnZWQgb3V0LW9mLWZsb3cgbGluZSBicmVh aywgd2Ugd291bGQgbmVlZCB0byBpbmhlcml0IFJlbmRlckxpbmVCcmVhayBmcm9tIFJlbmRlckJv eAp3aGljaCBpcyBxdWl0ZSBhIG1lbW9yeSB3YXN0ZSBjb25zaWRlcmluZyBSZW5kZXJMaW5lQnJl YWsgaXMgaW4tZmxvdyBtb3N0IG9mIHRoZSB0aW1lIC1hbHNvLCBpdCB3b3VsZCByZXF1aXJlIHNv bWUgaW52b2x2ZWQgY2hhbmdlcyBhcwpjdXJyZW50bHkgc29tZSBjb2RlIGFzc3VtZXMgdGhhdCBS ZW5kZXJMaW5lQnJlYWsgaXMgbmV2ZXIgYSBSZW5kZXJCb3guKQoKKiBMYXlvdXRUZXN0cy9mYXN0 L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sOiBBZGRl ZC4KKiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVh ay5odG1sOiBBZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJ dGVtc0J1aWxkZXI6OmNvbGxlY3RJbmxpbmVJdGVtcyk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CihXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6Qm94VHJlZTo6YWRqdXN0U3R5bGVJZk5lZWRlZCk6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnVwZGF0ZUxp bmVCcmVha0JveERpbWVuc2lvbnMpOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ6OnVwZGF0ZVJlbmRlclRyZWVQb3NpdGlvbnMpOgotLS0KIC4uLi9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgfCAxMiArKysrKystLS0tLS0KIC4u Li9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCAgfCAgNiAr KysrLS0KIC4uLi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCAgICAgICAg ICAgfCAgNSArKysrLQogLi4uL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLWV4cGVjdGVk Lmh0bWwgICAgICB8ICA3ICsrKysrKysKIC4uLi9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3Jj ZWQtbGluZS1icmVhay5odG1sICAgfCAgNyArKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDI4IGlu c2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWstZXhwZWN0ZWQuaHRt bAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93 LWZvcmNlZC1saW5lLWJyZWFrLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcAppbmRleCBkZTQ0MWZhNTVmOTMuLjVjMjZiZjUyYzQ2OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCkBAIC0yMzIsNyArMjMyLDExIEBAIHZv aWQgSW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRlbXMmIGlu bGluZUl0ZW1zLCBGb3JtYXR0aW5nCiAKICAgICAgICAgd2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0Vt cHR5KCkpIHsKICAgICAgICAgICAgIGF1dG8gbGF5b3V0Qm94ID0gbGF5b3V0UXVldWUudGFrZUxh c3QoKTsKLSAgICAgICAgICAgIGlmIChsYXlvdXRCb3gtPmlzSW5saW5lVGV4dEJveCgpKSB7Cisg ICAgICAgICAgICBpZiAobGF5b3V0Qm94LT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkgeworICAg ICAgICAgICAgICAgIC8vIExldCdzIG5vdCBjb25zdHJ1Y3QgSW5saW5lSXRlbXMgZm9yIG91dC1v Zi1mbG93IGNvbnRlbnQgYXMgdGhleSBkb24ndCBwYXJ0aWNpcGF0ZSBpbiB0aGUgaW5saW5lIGxh eW91dC4KKyAgICAgICAgICAgICAgICAvLyBIb3dldmVyIHRvIGJlIGFibGUgdG8gc3RhdGljIHBv c2l0aW9uaW5nIHRoZW0sIHdlIG5lZWQgdG8gY29tcHV0ZSB0aGVpciBhcHByb3hpbWF0ZSBwb3Np dGlvbnMuCisgICAgICAgICAgICAgICAgb3V0T2ZGbG93Qm94ZXMuYXBwZW5kKGxheW91dEJveCk7 CisgICAgICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC0+aXNJbmxpbmVUZXh0Qm94KCkpIHsK ICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0Qm94ID0gZG93bmNhc3Q8SW5saW5lVGV4 dEJveD4obGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBoYW5kbGVUZXh0Q29udGVudChpbmxp bmVUZXh0Qm94LCBpbmxpbmVJdGVtcywgcGFydGlhbENvbnRlbnRPZmZzZXQoaW5saW5lVGV4dEJv eCkpOwogICAgICAgICAgICAgfSBlbHNlIGlmIChsYXlvdXRCb3gtPmlzQXRvbWljSW5saW5lTGV2 ZWxCb3goKSB8fCBsYXlvdXRCb3gtPmlzTGluZUJyZWFrQm94KCkpCkBAIC0yNDEsMTEgKzI0NSw3 IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpjb2xsZWN0SW5saW5lSXRlbXMoSW5saW5lSXRl bXMmIGlubGluZUl0ZW1zLCBGb3JtYXR0aW5nCiAgICAgICAgICAgICAgICAgaGFuZGxlSW5saW5l Qm94RW5kKGxheW91dEJveCwgaW5saW5lSXRlbXMpOwogICAgICAgICAgICAgZWxzZSBpZiAobGF5 b3V0Qm94LT5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgICAgIGlubGluZUl0 ZW1zLmFwcGVuZCh7IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6RmxvYXQgfSk7Ci0gICAg ICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3gtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKSB7Ci0g ICAgICAgICAgICAgICAgLy8gTGV0J3Mgbm90IGNvbnN0cnVjdCBJbmxpbmVJdGVtcyBmb3Igb3V0 LW9mLWZsb3cgY29udGVudCBhcyB0aGV5IGRvbid0IHBhcnRpY2lwYXRlIGluIHRoZSBpbmxpbmUg bGF5b3V0LgotICAgICAgICAgICAgICAgIC8vIEhvd2V2ZXIgdG8gYmUgYWJsZSB0byBzdGF0aWMg cG9zaXRpb25pbmcgdGhlbSwgd2UgbmVlZCB0byBjb21wdXRlIHRoZWlyIGFwcHJveGltYXRlIHBv c2l0aW9ucy4KLSAgICAgICAgICAgICAgICBvdXRPZkZsb3dCb3hlcy5hcHBlbmQobGF5b3V0Qm94 KTsKLSAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAgICAgICAgICBpZiAoYXV0byogbmV4dFNpYmxp bmcgPSBsYXlvdXRCb3gtPm5leHRTaWJsaW5nKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5j cHAKaW5kZXggODc4Njc4Y2M4NzQwLi42MTU4MmI0MGFhN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJv eFRyZWUuY3BwCkBAIC0xNjIsOSArMTYyLDExIEBAIHZvaWQgQm94VHJlZTo6YWRqdXN0U3R5bGVJ Zk5lZWRlZChjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgUmVuZGVyU3R5bGUmIHN0CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlbmRlcmVyLmlzTGlu ZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIHN0eWxlVG9BZGp1c3Quc2V0RGlzcGxheShEaXNwbGF5 VHlwZTo6SW5saW5lKTsKKyAgICAgICAgICAgIGlmICghc3R5bGVUb0FkanVzdC5oYXNPdXRPZkZs b3dQb3NpdGlvbigpKSB7CisgICAgICAgICAgICAgICAgLy8gRm9yY2UgaW4tZmxvdyBkaXNwbGF5 IHZhbHVlIHRvIGlubGluZSAoc2VlIHdlYmtpdC5vcmcvYi8yMjMxNTEpLgorICAgICAgICAgICAg ICAgIHN0eWxlVG9BZGp1c3Quc2V0RGlzcGxheShEaXNwbGF5VHlwZTo6SW5saW5lKTsKKyAgICAg ICAgICAgIH0KICAgICAgICAgICAgIHN0eWxlVG9BZGp1c3Quc2V0RmxvYXRpbmcoRmxvYXQ6Ok5v bmUpOwotICAgICAgICAgICAgc3R5bGVUb0FkanVzdC5zZXRQb3NpdGlvbihQb3NpdGlvblR5cGU6 OlN0YXRpYyk7CiAgICAgICAgICAgICAvLyBDbGVhciBwcm9wZXJ0eSBzaG91bGQgb25seSBhcHBs eSBvbiBibG9jayBlbGVtZW50cywgaG93ZXZlciwKICAgICAgICAgICAgIC8vIGl0IGFwcGVhcnMg dGhhdCBicm93c2VycyBzZWVtIHRvIGlnbm9yZSBpdCBvbiA8YnI+IGlubGluZSBlbGVtZW50cy4K ICAgICAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MyLyNwcm9wZGVmLWNs ZWFyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5l L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5kZXgg MDc2Zjg2ZDI5YzdlLi5iYzliMjJiMjQ0MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVn cmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTQ1Myw2ICs0NTMsOCBAQCB2b2lkIExpbmVMYXlvdXQ6 OnVwZGF0ZUxpbmVCcmVha0JveERpbWVuc2lvbnMoY29uc3QgUmVuZGVyTGluZUJyZWFrJiBsaW5l QnJlYWtCbwogICAgIGJveEdlb21ldHJ5LnNldFBhZGRpbmcoeyB9KTsKICAgICBib3hHZW9tZXRy eS5zZXRDb250ZW50Qm94V2lkdGgoeyB9KTsKICAgICBib3hHZW9tZXRyeS5zZXRWZXJ0aWNhbE1h cmdpbih7IH0pOworICAgIGlmIChsaW5lQnJlYWtCb3guc3R5bGUoKS5oYXNPdXRPZkZsb3dQb3Np dGlvbigpKQorICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KHsgfSk7CiB9 CiAKIHZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQm94RGltZW5zaW9ucyhjb25zdCBSZW5k ZXJJbmxpbmUmIHJlbmRlcklubGluZSkKQEAgLTY1NCw3ICs2NTYsOCBAQCB2b2lkIExpbmVMYXlv dXQ6OnVwZGF0ZVJlbmRlclRyZWVQb3NpdGlvbnMoY29uc3QgVmVjdG9yPExpbmVBZGp1c3RtZW50 PiYgbGluZUFkagogICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqcmVuZGVyT2JqZWN0LT5sYXlv dXRCb3goKTsKICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSAm JiAhbGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAgICAgICAgY29udGlu dWU7Ci0KKyAgICAgICAgaWYgKGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKQorICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIGF1dG8mIHJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyQm94 PihtX2JveFRyZWUucmVuZGVyZXJGb3JMYXlvdXRCb3gobGF5b3V0Qm94KSk7CiAgICAgICAgIGF1 dG8mIGxvZ2ljYWxHZW9tZXRyeSA9IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5 KGxheW91dEJveCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1v Zi1mbG93LWZvcmNlZC1saW5lLWJyZWFrLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGluZS1icmVhay1leHBlY3RlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNDk4ZGYzMTZmMDAyCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0LW9mLWZsb3ctZm9yY2VkLWxp bmUtYnJlYWstZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDcgQEAKKzxzdHlsZT4KK2RpdiB7Cisg IGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Cit9Cis8L3N0eWxlPgorPGRpdj5QQVNTIGlmIG5vIGxp bmUgYnJlYWsuPC9kaXY+Cis8ZGl2PlBBU1MgaWYgbm8gbGluZSBicmVhay48L2Rpdj4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL291dC1vZi1mbG93LWZvcmNlZC1saW5lLWJy ZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9vdXQtb2YtZmxvdy1mb3JjZWQtbGlu ZS1icmVhay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uZDY5 ZTE4OWVlMzI0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvb3V0 LW9mLWZsb3ctZm9yY2VkLWxpbmUtYnJlYWsuaHRtbApAQCAtMCwwICsxLDcgQEAKKzxzdHlsZT4K K2RpdiB7CisgIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Cit9Cis8L3N0eWxlPgorPGRpdj5QQVNT IGlmPGJyIHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7Ij4gbm8gbGluZSBicmVhay48L2Rpdj4K KzxkaXY+UEFTUyBpZjxiciBzdHlsZT0icG9zaXRpb246IGZpeGVkOyI+IG5vIGxpbmUgYnJlYWsu PC9kaXY+Cg==