268692 2024-02-03 05:22:22 -0800 [Painting] Default gap is only used by computedUnderlineOffset 2024-07-26 19:23:06 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 245559 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 2010365 0 zalan 2024-02-03 05:22:22 -0800 ssia 2010367 1 469687 zalan 2024-02-03 05:30:41 -0800 Created attachment 469687 Patch 2010401 2 469694 zalan 2024-02-03 11:55:00 -0800 Created attachment 469694 Patch 2010414 3 469695 zalan 2024-02-03 14:36:53 -0800 Created attachment 469695 [fast-cq]Patch 2010430 4 ews-feeder 2024-02-03 16:13:53 -0800 Committed 274055@main (0aa3d40bc28f): <https://commits.webkit.org/274055@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469695. 2010431 5 webkit-bug-importer 2024-02-03 16:14:15 -0800 <rdar://problem/122247816> 469687 2024-02-03 05:30:41 -0800 2024-02-03 11:54:58 -0800 Patch bug-268692-20240203053040.patch text/plain 7623 zalan RnJvbSA3NGZiY2IzNTk0YzNlNTg4MDI4N2MzZTgwZTcyNTllYjE0MWYwY2E1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMyBGZWIgMjAyNCAwNToyMjo1NSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtQYWludGlu Z10gRGVmYXVsdCBnYXAgaXMgb25seSB1c2VkIGJ5CiBjb21wdXRlZFVuZGVybGluZU9mZnNldCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY4NjkyCgpSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyB0ZXh0 LXVuZGVybGluZSBsZWZ0L3JpZ2h0IHBhaW50aW5nIHN1cHBvcnQuCgoxLiBSZW1vdmUgZGVmYXVs dEdhcCBmcm9tIFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyBzdHJ1Y3QgYW5kIGluc3RlYWQgY2Fs bCB0aGUgaGVscGVyIGZ1bmN0aW9uIGRpcmVjdGx5IGZyb20gY29tcHV0ZWRVbmRlcmxpbmVPZmZz ZXQgKG9ubHkgcGxhY2Ugd2hlcmUgaXQgaXMgdXNlZCkKCjIuIEFkZCB0aGlzIGRlZmF1bHQgZ2Fw IHZhbHVlIHRvIGFsbCB0aGUgZGlmZmVyZW50IHR5cGVzIG9mIG9mZnNldHRpbmcuIFRoaXMgaXMg YSBzbGlnaHQgYmVoYXZpb3IgY2hhbmdlLCBidXQgaXQgbWF5IGJlIGEgcHJvZ3Jlc3Npb24gYWZ0 ZXIgYWxsIChjdXJyZW50IHVzZSBsb29rcyByYXRoZXIgcmFuZG9tKS4KCiogU291cmNlL1dlYkNv cmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcDoKKFdlYkNvcmU6OmRlZmF1bHRHYXApOgoo V2ViQ29yZTo6Y29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQpOgooV2ViQ29yZTo6dmlzdWFsT3ZlcmZs b3dGb3JEZWNvcmF0aW9ucyk6CihXZWJDb3JlOjp1bmRlcmxpbmVPZmZzZXRGb3JUZXh0Qm94UGFp bnRpbmcpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAg fCAzMiArKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJv eFN0eWxlLmNwcAppbmRleCBiNDY1NzE3NzUxYTQuLjFkNTQ3YjdmMDNkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwCkBAIC0zOSw3ICszOSw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyB7CiAg ICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZTsKLSAgICBmbG9hdCBkZWZhdWx0R2FwIHsg MCB9OwogICAgIHN0ZDo6b3B0aW9uYWw8VGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXI+IHRleHRV bmRlcmxpbmVQb3NpdGlvblVuZGVyIHsgfTsKIH07CiAKQEAgLTE1MiwxNCArMTUxLDExIEBAIHN0 YXRpYyBmbG9hdCB0ZXh0UnVuT2Zmc2V0RnJvbUJvdHRvbU1vc3QoY29uc3QgSW5saW5lSXRlcmF0 b3I6OkxpbmVCb3hJdGVyYXRvciYKIHN0YXRpYyBpbmxpbmUgZmxvYXQgZGVmYXVsdEdhcChjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgY29uc3QgZmxvYXQgdGV4dERlY29yYXRpb25C YXNlRm9udFNpemUgPSAxNi5mOwotICAgIHJldHVybiBzdHlsZS5jb21wdXRlZEZvbnRTaXplKCkg LyB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZTsKKyAgICByZXR1cm4gc3RkOjptYXgoMS5mLCBj ZWlsZihzdHlsZS5jb21wdXRlZEZvbnRTaXplKCkgLyB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6 ZSAvIDIuZikpOwogfQogCiBzdGF0aWMgZmxvYXQgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoY29u c3QgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzJiBjb250ZXh0KQogewotICAgIC8vIFRoaXMgcmVw cmVzZW50cyB0aGUgZ2FwIGJldHdlZW4gdGhlIGJhc2VsaW5lIGFuZCB0aGUgY2xvc2VzdCBlZGdl IG9mIHRoZSB1bmRlcmxpbmUuCi0gICAgYXV0byBnYXAgPSBzdGQ6Om1heCgxLmYsIHN0ZDo6Y2Vp bChjb250ZXh0LmRlZmF1bHRHYXAgLyAyLmYpKTsKLQogICAgIC8vIEZJWE1FOiBUaGUgY29kZSBm b3IgdmlzdWFsIG92ZXJmbG93IGRldGVjdGlvbiBwYXNzZXMgaW4gYSBudWxsIGlubGluZSB0ZXh0 IGJveC4gVGhpcyBtZWFucyBpdCBpcyBub3cKICAgICAvLyBicm9rZW4gZm9yIHRoZSBjYXNlIHdo ZXJlIGF1dG8gbmVlZHMgdG8gYmVoYXZlIGxpa2UgInVuZGVyIi4KICAgICAKQEAgLTE2OSwxNSAr MTY1LDE0IEBAIHN0YXRpYyBmbG9hdCBjb21wdXRlZFVuZGVybGluZU9mZnNldChjb25zdCBVbmRl cmxpbmVPZmZzZXRBcmd1bWVudHMmIGNvbnRleHQpCiAgICAgLy8gZXZlbiBpZiBpdCBpcyBob3Jp em9udGFsLCBidXQgZGV0ZWN0aW5nIHRoaXMgaGFzIHBlcmZvcm1hbmNlIGltcGxpY2F0aW9ucy4g Rm9yIG5vdyB3ZSBvbmx5IHdvcmsgd2l0aAogICAgIC8vIHZlcnRpY2FsIHRleHQsIHNpbmNlIHdl IGFscmVhZHkgZGV0ZXJtaW5lZCB0aGUgYmFzZWxpbmUgdHlwZSB0byBiZSBpZGVvZ3JhcGhpYyBp biB0aGF0IGNhc2UuCiAgICAgYXV0byYgc3R5bGVUb1VzZSA9IGNvbnRleHQubGluZVN0eWxlOwot ICAgIGF1dG8gdW5kZXJsaW5lT2Zmc2V0ID0gc3R5bGVUb1VzZS50ZXh0VW5kZXJsaW5lT2Zmc2V0 KCk7CiAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZVRvVXNlLm1ldHJpY3NPZlByaW1hcnlG b250KCk7Ci0gICAgYXV0byBjb21wdXRlZFVuZGVybGluZU9mZnNldCA9IDAuZjsKKyAgICBhdXRv IHVuZGVybGluZU9mZnNldCA9IDAuZjsKIAogICAgIGlmIChpc0FsaWduZWRGb3JVbmRlcihzdHls ZVRvVXNlKSkgewogICAgICAgICBBU1NFUlQoY29udGV4dC50ZXh0VW5kZXJsaW5lUG9zaXRpb25V bmRlcik7CiAgICAgICAgIC8vIFBvc2l0aW9uIHVuZGVybGluZSByZWxhdGl2ZSB0byB0aGUgYm90 dG9tIGVkZ2Ugb2YgdGhlIGxvd2VzdCBlbGVtZW50J3MgY29udGVudCBib3guCi0gICAgICAgIGF1 dG8gZGVzaXJlZE9mZnNldCA9IGNvbnRleHQudGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXItPnRl eHRSdW5Mb2dpY2FsSGVpZ2h0ICsgZ2FwICsgc3RkOjptYXgoY29udGV4dC50ZXh0VW5kZXJsaW5l UG9zaXRpb25VbmRlci0+dGV4dFJ1bk9mZnNldEZyb21Cb3R0b21Nb3N0LCAwLmYpICsgdW5kZXJs aW5lT2Zmc2V0Lmxlbmd0aE9yKDAuZik7Ci0gICAgICAgIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0 ID0gc3RkOjptYXg8ZmxvYXQ+KGRlc2lyZWRPZmZzZXQsIGZvbnRNZXRyaWNzLmFzY2VudCgpKTsK KyAgICAgICAgYXV0byBkZXNpcmVkT2Zmc2V0ID0gY29udGV4dC50ZXh0VW5kZXJsaW5lUG9zaXRp b25VbmRlci0+dGV4dFJ1bkxvZ2ljYWxIZWlnaHQgKyBzdGQ6Om1heChjb250ZXh0LnRleHRVbmRl cmxpbmVQb3NpdGlvblVuZGVyLT50ZXh0UnVuT2Zmc2V0RnJvbUJvdHRvbU1vc3QsIDAuZik7Cisg ICAgICAgIHVuZGVybGluZU9mZnNldCA9IHN0ZDo6bWF4PGZsb2F0PihkZXNpcmVkT2Zmc2V0LCBm b250TWV0cmljcy5hc2NlbnQoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgc3dpdGNoIChzdHls ZVRvVXNlLnRleHRVbmRlcmxpbmVQb3NpdGlvbigpKSB7CiAgICAgICAgIGNhc2UgVGV4dFVuZGVy bGluZVBvc2l0aW9uOjpMZWZ0OgpAQCAtMTg2LDE4ICsxODEsMTkgQEAgc3RhdGljIGZsb2F0IGNv bXB1dGVkVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyYgY29u dGV4dCkKICAgICAgICAgICAgIEFTU0VSVChzdHlsZVRvVXNlLmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkpOwogICAgICAgICAgICAgRkFMTFRIUk9VR0g7CiAgICAgICAgIGNhc2UgVGV4dFVuZGVy bGluZVBvc2l0aW9uOjpBdXRvOgotICAgICAgICAgICAgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQg PSBmb250TWV0cmljcy5hc2NlbnQoKSArIHVuZGVybGluZU9mZnNldC5sZW5ndGhPcihnYXApOwor ICAgICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkZyb21G b250OgotICAgICAgICAgICAgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQgPSBmb250TWV0cmljcy5h c2NlbnQoKSArIGZvbnRNZXRyaWNzLnVuZGVybGluZVBvc2l0aW9uKCkgKyB1bmRlcmxpbmVPZmZz ZXQubGVuZ3RoT3IoMC5mKTsKKyAgICAgICAgICAgIHVuZGVybGluZU9mZnNldCA9IGZvbnRNZXRy aWNzLmFzY2VudCgpICsgZm9udE1ldHJpY3MudW5kZXJsaW5lUG9zaXRpb24oKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgICAgICAgICBjb21wdXRlZFVuZGVybGluZU9mZnNldCA9IGZvbnRNZXRyaWNz LmFzY2VudCgpICsgZ2FwOworICAgICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gZm9udE1ldHJp Y3MuYXNjZW50KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KLSAgICBy ZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQ7CisgICAgLy8gVGhpcyByZXByZXNlbnRzIHRo ZSBnYXAgYmV0d2VlbiB0aGUgYmFzZWxpbmUgYW5kIHRoZSBjbG9zZXN0IGVkZ2Ugb2YgdGhlIHVu ZGVybGluZS4KKyAgICByZXR1cm4gdW5kZXJsaW5lT2Zmc2V0ICsgc3R5bGVUb1VzZS50ZXh0VW5k ZXJsaW5lT2Zmc2V0KCkubGVuZ3RoT3IoZGVmYXVsdEdhcChzdHlsZVRvVXNlKSk7CiB9CiAKIFdh dnlTdHJva2VQYXJhbWV0ZXJzIHdhdnlTdHJva2VQYXJhbWV0ZXJzKGZsb2F0IGZvbnRTaXplKQpA QCAtMjg3LDcgKzI4Myw3IEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0 aW9ucyhjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiAgICAgfQogCiAgICAg YXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNv bnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKQotICAgICAgICA/IHN0ZDo6bWFr ZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0 eWxlKSwgdGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgfSkpCisgICAgICAgID8gc3RkOjptYWtl X29wdGlvbmFsKGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIHRleHRVbmRlcmxpbmVQ b3NpdGlvblVuZGVyIH0pKQogICAgICAgICA6IHN0ZDo6bnVsbG9wdDsKICAgICByZXR1cm4gY29t cHV0ZWRWaXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKHN0eWxlLCB1bmRlcmxpbmVPZmZzZXQp OwogfQpAQCAtMjk1LDcgKzI5MSw3IEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JE ZWNvcmF0aW9ucyhjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiBHbHlwaE92 ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlLCBUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRl cikKIHsKICAgICBhdXRvIHVuZGVybGluZU9mZnNldCA9IHN0eWxlLnRleHREZWNvcmF0aW9uc0lu RWZmZWN0KCkuY29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpCi0gICAgICAg ID8gc3RkOjptYWtlX29wdGlvbmFsKGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRl ZmF1bHRHYXAoc3R5bGUpLCB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB9KSkKKyAgICAgICAg PyBzdGQ6Om1ha2Vfb3B0aW9uYWwoY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgdGV4 dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgfSkpCiAgICAgICAgIDogc3RkOjpudWxsb3B0OwogICAg IHJldHVybiBjb21wdXRlZFZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVy bGluZU9mZnNldCk7CiB9CkBAIC0zMDMsNyArMjk5LDcgQEAgR2x5cGhPdmVyZmxvdyB2aXN1YWxP dmVyZmxvd0ZvckRlY29yYXRpb25zKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgVGV4dFVuZGVy bGkKIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgYXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0 RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJs aW5lKQotICAgICAgICA/IHN0ZDo6bWFrZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNl dCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0eWxlKSwgeyB9IH0pKQorICAgICAgICA/IHN0ZDo6bWFr ZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCB7IH0gfSkpCiAgICAg ICAgIDogc3RkOjpudWxsb3B0OwogICAgIHJldHVybiBjb21wdXRlZFZpc3VhbE92ZXJmbG93Rm9y RGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVybGluZU9mZnNldCk7CiB9CkBAIC0zMTEsMTMgKzMwNywx MyBAQCBHbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlKQogZmxvYXQgdW5kZXJsaW5lT2Zmc2V0Rm9yVGV4dEJveFBhaW50aW5n KGNvbnN0IElubGluZUl0ZXJhdG9yOjpJbmxpbmVCb3gmIGlubGluZUJveCwgY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlKQogewogICAgIGlmICghaXNBbGlnbmVkRm9yVW5kZXIoc3R5bGUpKQotICAg ICAgICByZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgZGVmYXVsdEdhcChz dHlsZSksIHsgfSB9KTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsg c3R5bGUsIHsgfSB9KTsKIAogICAgIGF1dG8gaW5saW5lQm94Q29udGVudEJveEhlaWdodCA9IGlu bGluZUJveC5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgaWYgKCFpbmxpbmVCb3guaXNSb290SW5saW5l Qm94KCkpCiAgICAgICAgIGlubGluZUJveENvbnRlbnRCb3hIZWlnaHQgLT0gKGlubGluZUJveC5y ZW5kZXJlcigpLmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSArIGlubGluZUJveC5yZW5kZXJlcigp LmJvcmRlckFuZFBhZGRpbmdBZnRlcigpKTsKICAgICBhdXRvIHRleHRSdW5PZmZzZXQgPSBib3hP ZmZzZXRGcm9tQm90dG9tTW9zdChpbmxpbmVCb3gubGluZUJveCgpLCBpbmxpbmVCb3gucmVuZGVy ZXIoKSwgaW5saW5lQm94LmxvZ2ljYWxUb3AoKSwgaW5saW5lQm94LmxvZ2ljYWxCb3R0b20oKSk7 Ci0gICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRlZmF1bHRHYXAo c3R5bGUpLCBUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB7IGlubGluZUJveENvbnRlbnRCb3hI ZWlnaHQsIHRleHRSdW5PZmZzZXQgfSB9KTsKKyAgICByZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVP ZmZzZXQoeyBzdHlsZSwgVGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgeyBpbmxpbmVCb3hDb250 ZW50Qm94SGVpZ2h0LCB0ZXh0UnVuT2Zmc2V0IH0gfSk7CiB9CiAKIH0K 469694 2024-02-03 11:55:00 -0800 2024-02-03 14:36:51 -0800 Patch bug-268692-20240203115459.patch text/plain 7623 zalan RnJvbSBhMjFjYjlhMGJiMWJlNTI1NzQ0M2QxOGZlODU4NDRjMDUzZDYzYWIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMyBGZWIgMjAyNCAwNToyMjo1NSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtQYWludGlu Z10gRGVmYXVsdCBnYXAgaXMgb25seSB1c2VkIGJ5CiBjb21wdXRlZFVuZGVybGluZU9mZnNldCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY4NjkyCgpSZXZpZXdlZCBi eSBBbnR0aSBLb2l2aXN0by4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyB0ZXh0 LXVuZGVybGluZSBsZWZ0L3JpZ2h0IHBhaW50aW5nIHN1cHBvcnQuCgoxLiBSZW1vdmUgZGVmYXVs dEdhcCBmcm9tIFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyBzdHJ1Y3QgYW5kIGluc3RlYWQgY2Fs bCB0aGUgaGVscGVyIGZ1bmN0aW9uIGRpcmVjdGx5IGZyb20gY29tcHV0ZWRVbmRlcmxpbmVPZmZz ZXQgKG9ubHkgcGxhY2Ugd2hlcmUgaXQgaXMgdXNlZCkKCjIuIEFkZCB0aGlzIGRlZmF1bHQgZ2Fw IHZhbHVlIHRvIGFsbCB0aGUgZGlmZmVyZW50IHR5cGVzIG9mIG9mZnNldHRpbmcuIFRoaXMgaXMg YSBzbGlnaHQgYmVoYXZpb3IgY2hhbmdlLCBidXQgaXQgbWF5IGJlIGEgcHJvZ3Jlc3Npb24gYWZ0 ZXIgYWxsIChjdXJyZW50IHVzZSBsb29rcyByYXRoZXIgcmFuZG9tKS4KCiogU291cmNlL1dlYkNv cmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcDoKKFdlYkNvcmU6OmRlZmF1bHRHYXApOgoo V2ViQ29yZTo6Y29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQpOgooV2ViQ29yZTo6dmlzdWFsT3ZlcmZs b3dGb3JEZWNvcmF0aW9ucyk6CihXZWJDb3JlOjp1bmRlcmxpbmVPZmZzZXRGb3JUZXh0Qm94UGFp bnRpbmcpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAg fCAzMiArKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJv eFN0eWxlLmNwcAppbmRleCBlOTQzOGVkYmI4OWUuLjNjY2RmYzMwOTE1ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwCkBAIC0zOSw3ICszOSw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyB7CiAg ICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZTsKLSAgICBmbG9hdCBkZWZhdWx0R2FwIHsg MCB9OwogICAgIHN0ZDo6b3B0aW9uYWw8VGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXI+IHRleHRV bmRlcmxpbmVQb3NpdGlvblVuZGVyIHsgfTsKIH07CiAKQEAgLTE1MSwxNCArMTUwLDExIEBAIHN0 YXRpYyBmbG9hdCB0ZXh0UnVuT2Zmc2V0RnJvbUJvdHRvbU1vc3QoY29uc3QgSW5saW5lSXRlcmF0 b3I6OkxpbmVCb3hJdGVyYXRvciYKIHN0YXRpYyBpbmxpbmUgZmxvYXQgZGVmYXVsdEdhcChjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgY29uc3QgZmxvYXQgdGV4dERlY29yYXRpb25C YXNlRm9udFNpemUgPSAxNi5mOwotICAgIHJldHVybiBzdHlsZS5jb21wdXRlZEZvbnRTaXplKCkg LyB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZTsKKyAgICByZXR1cm4gc3RkOjptYXgoMS5mLCBj ZWlsZihzdHlsZS5jb21wdXRlZEZvbnRTaXplKCkgLyB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6 ZSAvIDIuZikpOwogfQogCiBzdGF0aWMgZmxvYXQgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoY29u c3QgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzJiBjb250ZXh0KQogewotICAgIC8vIFRoaXMgcmVw cmVzZW50cyB0aGUgZ2FwIGJldHdlZW4gdGhlIGJhc2VsaW5lIGFuZCB0aGUgY2xvc2VzdCBlZGdl IG9mIHRoZSB1bmRlcmxpbmUuCi0gICAgYXV0byBnYXAgPSBzdGQ6Om1heCgxLmYsIHN0ZDo6Y2Vp bChjb250ZXh0LmRlZmF1bHRHYXAgLyAyLmYpKTsKLQogICAgIC8vIEZJWE1FOiBUaGUgY29kZSBm b3IgdmlzdWFsIG92ZXJmbG93IGRldGVjdGlvbiBwYXNzZXMgaW4gYSBudWxsIGlubGluZSB0ZXh0 IGJveC4gVGhpcyBtZWFucyBpdCBpcyBub3cKICAgICAvLyBicm9rZW4gZm9yIHRoZSBjYXNlIHdo ZXJlIGF1dG8gbmVlZHMgdG8gYmVoYXZlIGxpa2UgInVuZGVyIi4KICAgICAKQEAgLTE2OCwxNSAr MTY0LDE0IEBAIHN0YXRpYyBmbG9hdCBjb21wdXRlZFVuZGVybGluZU9mZnNldChjb25zdCBVbmRl cmxpbmVPZmZzZXRBcmd1bWVudHMmIGNvbnRleHQpCiAgICAgLy8gZXZlbiBpZiBpdCBpcyBob3Jp em9udGFsLCBidXQgZGV0ZWN0aW5nIHRoaXMgaGFzIHBlcmZvcm1hbmNlIGltcGxpY2F0aW9ucy4g Rm9yIG5vdyB3ZSBvbmx5IHdvcmsgd2l0aAogICAgIC8vIHZlcnRpY2FsIHRleHQsIHNpbmNlIHdl IGFscmVhZHkgZGV0ZXJtaW5lZCB0aGUgYmFzZWxpbmUgdHlwZSB0byBiZSBpZGVvZ3JhcGhpYyBp biB0aGF0IGNhc2UuCiAgICAgYXV0byYgc3R5bGVUb1VzZSA9IGNvbnRleHQubGluZVN0eWxlOwot ICAgIGF1dG8gdW5kZXJsaW5lT2Zmc2V0ID0gc3R5bGVUb1VzZS50ZXh0VW5kZXJsaW5lT2Zmc2V0 KCk7CiAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZVRvVXNlLm1ldHJpY3NPZlByaW1hcnlG b250KCk7Ci0gICAgYXV0byBjb21wdXRlZFVuZGVybGluZU9mZnNldCA9IDAuZjsKKyAgICBhdXRv IHVuZGVybGluZU9mZnNldCA9IDAuZjsKIAogICAgIGlmIChpc0FsaWduZWRGb3JVbmRlcihzdHls ZVRvVXNlKSkgewogICAgICAgICBBU1NFUlQoY29udGV4dC50ZXh0VW5kZXJsaW5lUG9zaXRpb25V bmRlcik7CiAgICAgICAgIC8vIFBvc2l0aW9uIHVuZGVybGluZSByZWxhdGl2ZSB0byB0aGUgYm90 dG9tIGVkZ2Ugb2YgdGhlIGxvd2VzdCBlbGVtZW50J3MgY29udGVudCBib3guCi0gICAgICAgIGF1 dG8gZGVzaXJlZE9mZnNldCA9IGNvbnRleHQudGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXItPnRl eHRSdW5Mb2dpY2FsSGVpZ2h0ICsgZ2FwICsgc3RkOjptYXgoY29udGV4dC50ZXh0VW5kZXJsaW5l UG9zaXRpb25VbmRlci0+dGV4dFJ1bk9mZnNldEZyb21Cb3R0b21Nb3N0LCAwLmYpICsgdW5kZXJs aW5lT2Zmc2V0Lmxlbmd0aE9yKDAuZik7Ci0gICAgICAgIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0 ID0gc3RkOjptYXg8ZmxvYXQ+KGRlc2lyZWRPZmZzZXQsIGZvbnRNZXRyaWNzLmFzY2VudCgpKTsK KyAgICAgICAgYXV0byBkZXNpcmVkT2Zmc2V0ID0gY29udGV4dC50ZXh0VW5kZXJsaW5lUG9zaXRp b25VbmRlci0+dGV4dFJ1bkxvZ2ljYWxIZWlnaHQgKyBzdGQ6Om1heChjb250ZXh0LnRleHRVbmRl cmxpbmVQb3NpdGlvblVuZGVyLT50ZXh0UnVuT2Zmc2V0RnJvbUJvdHRvbU1vc3QsIDAuZik7Cisg ICAgICAgIHVuZGVybGluZU9mZnNldCA9IHN0ZDo6bWF4PGZsb2F0PihkZXNpcmVkT2Zmc2V0LCBm b250TWV0cmljcy5hc2NlbnQoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgc3dpdGNoIChzdHls ZVRvVXNlLnRleHRVbmRlcmxpbmVQb3NpdGlvbigpKSB7CiAgICAgICAgIGNhc2UgVGV4dFVuZGVy bGluZVBvc2l0aW9uOjpMZWZ0OgpAQCAtMTg1LDE4ICsxODAsMTkgQEAgc3RhdGljIGZsb2F0IGNv bXB1dGVkVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyYgY29u dGV4dCkKICAgICAgICAgICAgIEFTU0VSVChzdHlsZVRvVXNlLmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkpOwogICAgICAgICAgICAgRkFMTFRIUk9VR0g7CiAgICAgICAgIGNhc2UgVGV4dFVuZGVy bGluZVBvc2l0aW9uOjpBdXRvOgotICAgICAgICAgICAgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQg PSBmb250TWV0cmljcy5hc2NlbnQoKSArIHVuZGVybGluZU9mZnNldC5sZW5ndGhPcihnYXApOwor ICAgICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkZyb21G b250OgotICAgICAgICAgICAgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQgPSBmb250TWV0cmljcy5h c2NlbnQoKSArIGZvbnRNZXRyaWNzLnVuZGVybGluZVBvc2l0aW9uKCkgKyB1bmRlcmxpbmVPZmZz ZXQubGVuZ3RoT3IoMC5mKTsKKyAgICAgICAgICAgIHVuZGVybGluZU9mZnNldCA9IGZvbnRNZXRy aWNzLmFzY2VudCgpICsgZm9udE1ldHJpY3MudW5kZXJsaW5lUG9zaXRpb24oKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgICAgICAgICBjb21wdXRlZFVuZGVybGluZU9mZnNldCA9IGZvbnRNZXRyaWNz LmFzY2VudCgpICsgZ2FwOworICAgICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gZm9udE1ldHJp Y3MuYXNjZW50KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KLSAgICBy ZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQ7CisgICAgLy8gVGhpcyByZXByZXNlbnRzIHRo ZSBnYXAgYmV0d2VlbiB0aGUgYmFzZWxpbmUgYW5kIHRoZSBjbG9zZXN0IGVkZ2Ugb2YgdGhlIHVu ZGVybGluZS4KKyAgICByZXR1cm4gdW5kZXJsaW5lT2Zmc2V0ICsgc3R5bGVUb1VzZS50ZXh0VW5k ZXJsaW5lT2Zmc2V0KCkubGVuZ3RoT3IoZGVmYXVsdEdhcChzdHlsZVRvVXNlKSk7CiB9CiAKIFdh dnlTdHJva2VQYXJhbWV0ZXJzIHdhdnlTdHJva2VQYXJhbWV0ZXJzKGZsb2F0IGZvbnRTaXplKQpA QCAtMjg2LDcgKzI4Miw3IEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0 aW9ucyhjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiAgICAgfQogCiAgICAg YXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNv bnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKQotICAgICAgICA/IHN0ZDo6bWFr ZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0 eWxlKSwgdGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgfSkpCisgICAgICAgID8gc3RkOjptYWtl X29wdGlvbmFsKGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIHRleHRVbmRlcmxpbmVQ b3NpdGlvblVuZGVyIH0pKQogICAgICAgICA6IHN0ZDo6bnVsbG9wdDsKICAgICByZXR1cm4gY29t cHV0ZWRWaXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKHN0eWxlLCB1bmRlcmxpbmVPZmZzZXQp OwogfQpAQCAtMjk0LDcgKzI5MCw3IEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JE ZWNvcmF0aW9ucyhjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiBHbHlwaE92 ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlLCBUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRl cikKIHsKICAgICBhdXRvIHVuZGVybGluZU9mZnNldCA9IHN0eWxlLnRleHREZWNvcmF0aW9uc0lu RWZmZWN0KCkuY29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpCi0gICAgICAg ID8gc3RkOjptYWtlX29wdGlvbmFsKGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRl ZmF1bHRHYXAoc3R5bGUpLCB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB9KSkKKyAgICAgICAg PyBzdGQ6Om1ha2Vfb3B0aW9uYWwoY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgdGV4 dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgfSkpCiAgICAgICAgIDogc3RkOjpudWxsb3B0OwogICAg IHJldHVybiBjb21wdXRlZFZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVy bGluZU9mZnNldCk7CiB9CkBAIC0zMDIsNyArMjk4LDcgQEAgR2x5cGhPdmVyZmxvdyB2aXN1YWxP dmVyZmxvd0ZvckRlY29yYXRpb25zKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgVGV4dFVuZGVy bGkKIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgYXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0 RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJs aW5lKQotICAgICAgICA/IHN0ZDo6bWFrZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNl dCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0eWxlKSwgeyB9IH0pKQorICAgICAgICA/IHN0ZDo6bWFr ZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCB7IH0gfSkpCiAgICAg ICAgIDogc3RkOjpudWxsb3B0OwogICAgIHJldHVybiBjb21wdXRlZFZpc3VhbE92ZXJmbG93Rm9y RGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVybGluZU9mZnNldCk7CiB9CkBAIC0zMTAsMTMgKzMwNiwx MyBAQCBHbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlKQogZmxvYXQgdW5kZXJsaW5lT2Zmc2V0Rm9yVGV4dEJveFBhaW50aW5n KGNvbnN0IElubGluZUl0ZXJhdG9yOjpJbmxpbmVCb3gmIGlubGluZUJveCwgY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlKQogewogICAgIGlmICghaXNBbGlnbmVkRm9yVW5kZXIoc3R5bGUpKQotICAg ICAgICByZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgZGVmYXVsdEdhcChz dHlsZSksIHsgfSB9KTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsg c3R5bGUsIHsgfSB9KTsKIAogICAgIGF1dG8gaW5saW5lQm94Q29udGVudEJveEhlaWdodCA9IGlu bGluZUJveC5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgaWYgKCFpbmxpbmVCb3guaXNSb290SW5saW5l Qm94KCkpCiAgICAgICAgIGlubGluZUJveENvbnRlbnRCb3hIZWlnaHQgLT0gKGlubGluZUJveC5y ZW5kZXJlcigpLmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSArIGlubGluZUJveC5yZW5kZXJlcigp LmJvcmRlckFuZFBhZGRpbmdBZnRlcigpKTsKICAgICBhdXRvIHRleHRSdW5PZmZzZXQgPSBib3hP ZmZzZXRGcm9tQm90dG9tTW9zdChpbmxpbmVCb3gubGluZUJveCgpLCBpbmxpbmVCb3gucmVuZGVy ZXIoKSwgaW5saW5lQm94LmxvZ2ljYWxUb3AoKSwgaW5saW5lQm94LmxvZ2ljYWxCb3R0b20oKSk7 Ci0gICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRlZmF1bHRHYXAo c3R5bGUpLCBUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB7IGlubGluZUJveENvbnRlbnRCb3hI ZWlnaHQsIHRleHRSdW5PZmZzZXQgfSB9KTsKKyAgICByZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVP ZmZzZXQoeyBzdHlsZSwgVGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgeyBpbmxpbmVCb3hDb250 ZW50Qm94SGVpZ2h0LCB0ZXh0UnVuT2Zmc2V0IH0gfSk7CiB9CiAKIH0K 469695 2024-02-03 14:36:53 -0800 2024-02-03 16:13:54 -0800 [fast-cq]Patch bug-268692-20240203143652.patch text/plain 10284 zalan RnJvbSBiODExYmUzNTM4MGUyMjU5NTM1YTI3ZmZmMGFhNTk0NjAxYjlhYzRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMyBGZWIgMjAyNCAwNToyMjo1NSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtQYWludGlu Z10gRGVmYXVsdCBnYXAgaXMgb25seSB1c2VkIGJ5CiBjb21wdXRlZFVuZGVybGluZU9mZnNldCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY4NjkyCgpSZXZpZXdlZCBi eSBBbnR0aSBLb2l2aXN0by4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyB0ZXh0 LXVuZGVybGluZSBsZWZ0L3JpZ2h0IHBhaW50aW5nIHN1cHBvcnQuCgpSZW1vdmUgZGVmYXVsdEdh cCBmcm9tIFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyBzdHJ1Y3QgYW5kIGluc3RlYWQgY2FsbCB0 aGUgaGVscGVyIGZ1bmN0aW9uIGRpcmVjdGx5IGZyb20gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQg KG9ubHkgcGxhY2Ugd2hlcmUgaXQgaXMgdXNlZCkKCih0ZXN0IGNhc2UgY2hhbmdlOiBsZXQncyBn byBiYWNrIHRvIHRoZSBpbml0aWFsIHRlc3QgY2FzZSB3aXRoIEFoZW0gZm9udCBub3cuIFRoZSB0 ZXN0IHVwZGF0ZSBoYWQgaW5jb3JyZWN0IGFzc3VtcHRpb25zIGFib3V0IHdoYXQgd2FzIGJlaW5n IHRlc3RlZCBoZXJlLikKCiogU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxl LmNwcDoKKFdlYkNvcmU6OmRlZmF1bHRHYXApOgooV2ViQ29yZTo6Y29tcHV0ZWRVbmRlcmxpbmVP ZmZzZXQpOgooV2ViQ29yZTo6dmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyk6CihXZWJDb3Jl Ojp1bmRlcmxpbmVPZmZzZXRGb3JUZXh0Qm94UGFpbnRpbmcpOgotLS0KIFNvdXJjZS9XZWJDb3Jl L3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAgICB8IDMzICsrKysrKysrKy0tLS0tLS0tLS0K IC4uLi11bmRlcmxpbmUtaW5saW5lLWJveC1vZmZzZXQtZXhwZWN0ZWQuaHRtbCB8IDIxICsrKysr LS0tLS0tLQogLi4uZWNvcmF0aW9uLXVuZGVybGluZS1pbmxpbmUtYm94LW9mZnNldC5odG1sIHwg MjQgKysrKy0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgNDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4 dEJveFN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5j cHAKaW5kZXggZTk0MzhlZGJiODllLi4wYzc4NWY0ZTJmNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcApAQCAtMzksNyArMzksNiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIHN0cnVjdCBVbmRlcmxpbmVPZmZzZXRBcmd1bWVudHMgewogICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBsaW5lU3R5bGU7Ci0gICAgZmxvYXQgZGVmYXVsdEdhcCB7IDAgfTsKICAg ICBzdGQ6Om9wdGlvbmFsPFRleHRVbmRlcmxpbmVQb3NpdGlvblVuZGVyPiB0ZXh0VW5kZXJsaW5l UG9zaXRpb25VbmRlciB7IH07CiB9OwogCkBAIC0xNTAsMTUgKzE0OSwxMyBAQCBzdGF0aWMgZmxv YXQgdGV4dFJ1bk9mZnNldEZyb21Cb3R0b21Nb3N0KGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5l Qm94SXRlcmF0b3ImCiAKIHN0YXRpYyBpbmxpbmUgZmxvYXQgZGVmYXVsdEdhcChjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7CisgICAgLy8gVGhpcyByZXByZXNlbnRzIHRoZSBnYXAgYmV0d2Vl biB0aGUgYmFzZWxpbmUgYW5kIHRoZSBjbG9zZXN0IGVkZ2Ugb2YgdGhlIHVuZGVybGluZS4KICAg ICBjb25zdCBmbG9hdCB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZSA9IDE2LmY7Ci0gICAgcmV0 dXJuIHN0eWxlLmNvbXB1dGVkRm9udFNpemUoKSAvIHRleHREZWNvcmF0aW9uQmFzZUZvbnRTaXpl OworICAgIHJldHVybiBzdGQ6Om1heCgxLmYsIGNlaWxmKHN0eWxlLmNvbXB1dGVkRm9udFNpemUo KSAvIHRleHREZWNvcmF0aW9uQmFzZUZvbnRTaXplIC8gMi5mKSk7CiB9CiAKIHN0YXRpYyBmbG9h dCBjb21wdXRlZFVuZGVybGluZU9mZnNldChjb25zdCBVbmRlcmxpbmVPZmZzZXRBcmd1bWVudHMm IGNvbnRleHQpCiB7Ci0gICAgLy8gVGhpcyByZXByZXNlbnRzIHRoZSBnYXAgYmV0d2VlbiB0aGUg YmFzZWxpbmUgYW5kIHRoZSBjbG9zZXN0IGVkZ2Ugb2YgdGhlIHVuZGVybGluZS4KLSAgICBhdXRv IGdhcCA9IHN0ZDo6bWF4KDEuZiwgc3RkOjpjZWlsKGNvbnRleHQuZGVmYXVsdEdhcCAvIDIuZikp OwotCiAgICAgLy8gRklYTUU6IFRoZSBjb2RlIGZvciB2aXN1YWwgb3ZlcmZsb3cgZGV0ZWN0aW9u IHBhc3NlcyBpbiBhIG51bGwgaW5saW5lIHRleHQgYm94LiBUaGlzIG1lYW5zIGl0IGlzIG5vdwog ICAgIC8vIGJyb2tlbiBmb3IgdGhlIGNhc2Ugd2hlcmUgYXV0byBuZWVkcyB0byBiZWhhdmUgbGlr ZSAidW5kZXIiLgogICAgIApAQCAtMTY4LDE1ICsxNjUsMTUgQEAgc3RhdGljIGZsb2F0IGNvbXB1 dGVkVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyYgY29udGV4 dCkKICAgICAvLyBldmVuIGlmIGl0IGlzIGhvcml6b250YWwsIGJ1dCBkZXRlY3RpbmcgdGhpcyBo YXMgcGVyZm9ybWFuY2UgaW1wbGljYXRpb25zLiBGb3Igbm93IHdlIG9ubHkgd29yayB3aXRoCiAg ICAgLy8gdmVydGljYWwgdGV4dCwgc2luY2Ugd2UgYWxyZWFkeSBkZXRlcm1pbmVkIHRoZSBiYXNl bGluZSB0eXBlIHRvIGJlIGlkZW9ncmFwaGljIGluIHRoYXQgY2FzZS4KICAgICBhdXRvJiBzdHls ZVRvVXNlID0gY29udGV4dC5saW5lU3R5bGU7Ci0gICAgYXV0byB1bmRlcmxpbmVPZmZzZXQgPSBz dHlsZVRvVXNlLnRleHRVbmRlcmxpbmVPZmZzZXQoKTsKICAgICBhdXRvJiBmb250TWV0cmljcyA9 IHN0eWxlVG9Vc2UubWV0cmljc09mUHJpbWFyeUZvbnQoKTsKLSAgICBhdXRvIGNvbXB1dGVkVW5k ZXJsaW5lT2Zmc2V0ID0gMC5mOworICAgIGF1dG8gdW5kZXJsaW5lT2Zmc2V0ID0gMC5mOwogCiAg ICAgaWYgKGlzQWxpZ25lZEZvclVuZGVyKHN0eWxlVG9Vc2UpKSB7CiAgICAgICAgIEFTU0VSVChj b250ZXh0LnRleHRVbmRlcmxpbmVQb3NpdGlvblVuZGVyKTsKICAgICAgICAgLy8gUG9zaXRpb24g dW5kZXJsaW5lIHJlbGF0aXZlIHRvIHRoZSBib3R0b20gZWRnZSBvZiB0aGUgbG93ZXN0IGVsZW1l bnQncyBjb250ZW50IGJveC4KLSAgICAgICAgYXV0byBkZXNpcmVkT2Zmc2V0ID0gY29udGV4dC50 ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlci0+dGV4dFJ1bkxvZ2ljYWxIZWlnaHQgKyBnYXAgKyBz dGQ6Om1heChjb250ZXh0LnRleHRVbmRlcmxpbmVQb3NpdGlvblVuZGVyLT50ZXh0UnVuT2Zmc2V0 RnJvbUJvdHRvbU1vc3QsIDAuZikgKyB1bmRlcmxpbmVPZmZzZXQubGVuZ3RoT3IoMC5mKTsKLSAg ICAgICAgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQgPSBzdGQ6Om1heDxmbG9hdD4oZGVzaXJlZE9m ZnNldCwgZm9udE1ldHJpY3MuYXNjZW50KCkpOworICAgICAgICBhdXRvIGRlc2lyZWRPZmZzZXQg PSBjb250ZXh0LnRleHRVbmRlcmxpbmVQb3NpdGlvblVuZGVyLT50ZXh0UnVuTG9naWNhbEhlaWdo dCArIHN0ZDo6bWF4KGNvbnRleHQudGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXItPnRleHRSdW5P ZmZzZXRGcm9tQm90dG9tTW9zdCwgMC5mKTsKKyAgICAgICAgZGVzaXJlZE9mZnNldCArPSBzdHls ZVRvVXNlLnRleHRVbmRlcmxpbmVPZmZzZXQoKS5sZW5ndGhPcigwLmYpICsgZGVmYXVsdEdhcChz dHlsZVRvVXNlKTsKKyAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gc3RkOjptYXg8ZmxvYXQ+KGRl c2lyZWRPZmZzZXQsIGZvbnRNZXRyaWNzLmFzY2VudCgpKTsKICAgICB9IGVsc2UgewogICAgICAg ICBzd2l0Y2ggKHN0eWxlVG9Vc2UudGV4dFVuZGVybGluZVBvc2l0aW9uKCkpIHsKICAgICAgICAg Y2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkxlZnQ6CkBAIC0xODUsMTggKzE4MiwxOCBAQCBz dGF0aWMgZmxvYXQgY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoY29uc3QgVW5kZXJsaW5lT2Zmc2V0 QXJndW1lbnRzJiBjb250ZXh0KQogICAgICAgICAgICAgQVNTRVJUKHN0eWxlVG9Vc2UuaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSk7CiAgICAgICAgICAgICBGQUxMVEhST1VHSDsKICAgICAgICAg Y2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkF1dG86Ci0gICAgICAgICAgICBjb21wdXRlZFVu ZGVybGluZU9mZnNldCA9IGZvbnRNZXRyaWNzLmFzY2VudCgpICsgdW5kZXJsaW5lT2Zmc2V0Lmxl bmd0aE9yKGdhcCk7CisgICAgICAgICAgICB1bmRlcmxpbmVPZmZzZXQgPSBmb250TWV0cmljcy5h c2NlbnQoKSArIHN0eWxlVG9Vc2UudGV4dFVuZGVybGluZU9mZnNldCgpLmxlbmd0aE9yKGRlZmF1 bHRHYXAoc3R5bGVUb1VzZSkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgVGV4 dFVuZGVybGluZVBvc2l0aW9uOjpGcm9tRm9udDoKLSAgICAgICAgICAgIGNvbXB1dGVkVW5kZXJs aW5lT2Zmc2V0ID0gZm9udE1ldHJpY3MuYXNjZW50KCkgKyBmb250TWV0cmljcy51bmRlcmxpbmVQ b3NpdGlvbigpICsgdW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aE9yKDAuZik7CisgICAgICAgICAgICB1 bmRlcmxpbmVPZmZzZXQgPSBmb250TWV0cmljcy5hc2NlbnQoKSArIGZvbnRNZXRyaWNzLnVuZGVy bGluZVBvc2l0aW9uKCkgKyBzdHlsZVRvVXNlLnRleHRVbmRlcmxpbmVPZmZzZXQoKS5sZW5ndGhP cigwLmYpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgIGNvbXB1dGVkVW5kZXJsaW5lT2Zm c2V0ID0gZm9udE1ldHJpY3MuYXNjZW50KCkgKyBnYXA7CisgICAgICAgICAgICB1bmRlcmxpbmVP ZmZzZXQgPSBmb250TWV0cmljcy5hc2NlbnQoKSArIHN0eWxlVG9Vc2UudGV4dFVuZGVybGluZU9m ZnNldCgpLmxlbmd0aE9yKGRlZmF1bHRHYXAoc3R5bGVUb1VzZSkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0 OworICAgIHJldHVybiB1bmRlcmxpbmVPZmZzZXQ7CiB9CiAKIFdhdnlTdHJva2VQYXJhbWV0ZXJz IHdhdnlTdHJva2VQYXJhbWV0ZXJzKGZsb2F0IGZvbnRTaXplKQpAQCAtMjg2LDcgKzI4Myw3IEBA IEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBJbmxpbmVJ dGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiAgICAgfQogCiAgICAgYXV0byB1bmRlcmxpbmVPZmZz ZXQgPSBzdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNvbnRhaW5zKFRleHREZWNvcmF0 aW9uTGluZTo6VW5kZXJsaW5lKQotICAgICAgICA/IHN0ZDo6bWFrZV9vcHRpb25hbChjb21wdXRl ZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0eWxlKSwgdGV4dFVuZGVybGlu ZVBvc2l0aW9uVW5kZXIgfSkpCisgICAgICAgID8gc3RkOjptYWtlX29wdGlvbmFsKGNvbXB1dGVk VW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIHRleHRVbmRlcmxpbmVQb3NpdGlvblVuZGVyIH0pKQog ICAgICAgICA6IHN0ZDo6bnVsbG9wdDsKICAgICByZXR1cm4gY29tcHV0ZWRWaXN1YWxPdmVyZmxv d0ZvckRlY29yYXRpb25zKHN0eWxlLCB1bmRlcmxpbmVPZmZzZXQpOwogfQpAQCAtMjk0LDcgKzI5 MSw3IEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBJ bmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yCiBHbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJm bG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBUZXh0VW5kZXJsaW5l UG9zaXRpb25VbmRlciB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlcikKIHsKICAgICBhdXRvIHVu ZGVybGluZU9mZnNldCA9IHN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuY29udGFpbnMo VGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpCi0gICAgICAgID8gc3RkOjptYWtlX29wdGlv bmFsKGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRlZmF1bHRHYXAoc3R5bGUpLCB0 ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB9KSkKKyAgICAgICAgPyBzdGQ6Om1ha2Vfb3B0aW9u YWwoY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgdGV4dFVuZGVybGluZVBvc2l0aW9u VW5kZXIgfSkpCiAgICAgICAgIDogc3RkOjpudWxsb3B0OwogICAgIHJldHVybiBjb21wdXRlZFZp c3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVybGluZU9mZnNldCk7CiB9CkBA IC0zMDIsNyArMjk5LDcgQEAgR2x5cGhPdmVyZmxvdyB2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRp b25zKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgVGV4dFVuZGVybGkKIEdseXBoT3ZlcmZsb3cg dmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7 CiAgICAgYXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVj dCgpLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKQotICAgICAgICA/IHN0 ZDo6bWFrZV9vcHRpb25hbChjb21wdXRlZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCBkZWZhdWx0 R2FwKHN0eWxlKSwgeyB9IH0pKQorICAgICAgICA/IHN0ZDo6bWFrZV9vcHRpb25hbChjb21wdXRl ZFVuZGVybGluZU9mZnNldCh7IHN0eWxlLCB7IH0gfSkpCiAgICAgICAgIDogc3RkOjpudWxsb3B0 OwogICAgIHJldHVybiBjb21wdXRlZFZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUs IHVuZGVybGluZU9mZnNldCk7CiB9CkBAIC0zMTAsMTMgKzMwNywxMyBAQCBHbHlwaE92ZXJmbG93 IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQog ZmxvYXQgdW5kZXJsaW5lT2Zmc2V0Rm9yVGV4dEJveFBhaW50aW5nKGNvbnN0IElubGluZUl0ZXJh dG9yOjpJbmxpbmVCb3gmIGlubGluZUJveCwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogewog ICAgIGlmICghaXNBbGlnbmVkRm9yVW5kZXIoc3R5bGUpKQotICAgICAgICByZXR1cm4gY29tcHV0 ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgZGVmYXVsdEdhcChzdHlsZSksIHsgfSB9KTsKKyAg ICAgICAgcmV0dXJuIGNvbXB1dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIHsgfSB9KTsKIAog ICAgIGF1dG8gaW5saW5lQm94Q29udGVudEJveEhlaWdodCA9IGlubGluZUJveC5sb2dpY2FsSGVp Z2h0KCk7CiAgICAgaWYgKCFpbmxpbmVCb3guaXNSb290SW5saW5lQm94KCkpCiAgICAgICAgIGlu bGluZUJveENvbnRlbnRCb3hIZWlnaHQgLT0gKGlubGluZUJveC5yZW5kZXJlcigpLmJvcmRlckFu ZFBhZGRpbmdCZWZvcmUoKSArIGlubGluZUJveC5yZW5kZXJlcigpLmJvcmRlckFuZFBhZGRpbmdB ZnRlcigpKTsKICAgICBhdXRvIHRleHRSdW5PZmZzZXQgPSBib3hPZmZzZXRGcm9tQm90dG9tTW9z dChpbmxpbmVCb3gubGluZUJveCgpLCBpbmxpbmVCb3gucmVuZGVyZXIoKSwgaW5saW5lQm94Lmxv Z2ljYWxUb3AoKSwgaW5saW5lQm94LmxvZ2ljYWxCb3R0b20oKSk7Ci0gICAgcmV0dXJuIGNvbXB1 dGVkVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRlZmF1bHRHYXAoc3R5bGUpLCBUZXh0VW5kZXJs aW5lUG9zaXRpb25VbmRlciB7IGlubGluZUJveENvbnRlbnRCb3hIZWlnaHQsIHRleHRSdW5PZmZz ZXQgfSB9KTsKKyAgICByZXR1cm4gY29tcHV0ZWRVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgVGV4 dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgeyBpbmxpbmVCb3hDb250ZW50Qm94SGVpZ2h0LCB0ZXh0 UnVuT2Zmc2V0IH0gfSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5s aW5lL3RleHQtZGVjb3JhdGlvbi11bmRlcmxpbmUtaW5saW5lLWJveC1vZmZzZXQtZXhwZWN0ZWQu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3RleHQtZGVjb3JhdGlvbi11bmRlcmxpbmUt aW5saW5lLWJveC1vZmZzZXQtZXhwZWN0ZWQuaHRtbAppbmRleCBmYjQyYzM4NTk5YTEuLjhmYWUw NzI0OTQ3YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdGV4dC1kZWNvcmF0 aW9uLXVuZGVybGluZS1pbmxpbmUtYm94LW9mZnNldC1leHBlY3RlZC5odG1sCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvaW5saW5lL3RleHQtZGVjb3JhdGlvbi11bmRlcmxpbmUtaW5saW5lLWJveC1v ZmZzZXQtZXhwZWN0ZWQuaHRtbApAQCAtMSwyMyArMSwyMCBAQAogPHN0eWxlPgotQGZvbnQtZmFj ZSB7Ci0gIGZvbnQtZmFtaWx5OiAiR3VsZiI7Ci0gIHNyYzogdXJsKCJyZXNvdXJjZXMvR3VsZi1y ZWd1bGFyLnR0ZiIpOwotfQogZGl2IHsKLSAgZm9udC1mYW1pbHk6IEd1bGY7CisgIHdoaXRlLXNw YWNlOiBwcmU7CisgIGZvbnQtZmFtaWx5OiBBaGVtOwogICBmb250LXNpemU6IDQwcHg7CiAgIG1h cmdpbjogNTBweDsKIH0KIHNwYW4gewotICBwYWRkaW5nOiAwOwotfQotLmhvcml6b250YWwgewot ICBib3JkZXItYm90dG9tOiAycHggc29saWQgYmxhY2s7CisgIHRleHQtZGVjb3JhdGlvbjogdW5k ZXJsaW5lOworICBib3JkZXI6IDIwcHggc29saWQgdHJhbnNwYXJlbnQ7CisgIHBhZGRpbmc6IDMw cHg7CiB9CiAudmVydGljYWwgewogICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOwotICBib3Jk ZXItbGVmdDogMnB4IHNvbGlkIGJsYWNrOworICB0ZXh0LXVuZGVybGluZS1wb3NpdGlvbjogdW5k ZXI7CisgIHRleHQtdW5kZXJsaW5lLW9mZnNldDogLTEwcHg7CiB9CiA8L3N0eWxlPgotPGRpdj48 c3BhbiBjbGFzcz0iaG9yaXpvbnRhbCI+WFhYPC9zcGFuPjwvZGl2PgotPGRpdj48c3BhbiBjbGFz cz0idmVydGljYWwiPlhYWDwvc3Bhbj48L2Rpdj4KKzxkaXY+PHNwYW4+ICAgPC9zcGFuPjwvZGl2 PgorPGRpdiBjbGFzcz12ZXJ0aWNhbD48c3Bhbj4gICA8L3NwYW4+PC9kaXY+ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdGV4 dC1kZWNvcmF0aW9uLXVuZGVybGluZS1pbmxpbmUtYm94LW9mZnNldC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvdGV4dC1kZWNvcmF0aW9uLXVuZGVybGluZS1pbmxpbmUtYm94LW9mZnNl dC5odG1sCmluZGV4IDhlNDRkMTI5ZjgxMS4uZDlkZDY4MDc1MmM2IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS90ZXh0LWRlY29yYXRpb24tdW5kZXJsaW5lLWlubGluZS1ib3gt b2Zmc2V0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdGV4dC1kZWNvcmF0aW9u LXVuZGVybGluZS1pbmxpbmUtYm94LW9mZnNldC5odG1sCkBAIC0xLDI3ICsxLDE3IEBACiA8c3R5 bGU+Ci1AZm9udC1mYWNlIHsKLSAgZm9udC1mYW1pbHk6ICJHdWxmIjsKLSAgc3JjOiB1cmwoInJl c291cmNlcy9HdWxmLXJlZ3VsYXIudHRmIik7Ci19CiBkaXYgewotICBmb250LWZhbWlseTogR3Vs ZjsKKyAgZm9udC1mYW1pbHk6IEFoZW07CiAgIGZvbnQtc2l6ZTogNDBweDsKICAgbWFyZ2luOiA1 MHB4OworICB3aGl0ZS1zcGFjZTogcHJlOwogfQogc3BhbiB7CiAgIHRleHQtZGVjb3JhdGlvbjog dW5kZXJsaW5lOwotICB0ZXh0LWRlY29yYXRpb24tdGhpY2tuZXNzOiAycHg7CiAgIHRleHQtdW5k ZXJsaW5lLXBvc2l0aW9uOiB1bmRlcjsKLX0KLS5ob3Jpem9udGFsIHsKLSAgdGV4dC11bmRlcmxp bmUtb2Zmc2V0OiAtMnB4OwotICBib3JkZXItYm90dG9tOiAycHggc29saWQgcmVkOwotfQotLnZl cnRpY2FsIHsKLSAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsKLSAgdGV4dC11bmRlcmxpbmUt b2Zmc2V0OiA2cHg7Ci0gIGJvcmRlci1sZWZ0OiAycHggc29saWQgcmVkOworICB0ZXh0LXVuZGVy bGluZS1vZmZzZXQ6IC04cHg7CisgIGJvcmRlcjogMjBweCBzb2xpZCB0cmFuc3BhcmVudDsKKyAg cGFkZGluZzogMzBweDsKIH0KIDwvc3R5bGU+Ci08ZGl2PjxzcGFuIGNsYXNzPSJob3Jpem9udGFs Ij5YWFg8L3NwYW4+PC9kaXY+Ci08ZGl2PjxzcGFuIGNsYXNzPSJ2ZXJ0aWNhbCI+WFhYPC9zcGFu PjwvZGl2PgorPGRpdj48c3Bhbj4gICA8L3NwYW4+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ3cml0aW5n LW1vZGU6IHZlcnRpY2FsLWxyOyI+PHNwYW4gc3R5bGU9InRleHQtdW5kZXJsaW5lLW9mZnNldDog LTEwcHgiPiAgIDwvc3Bhbj48L2Rpdj4K