247521 2022-11-04 22:08:26 -0700 [LFC][IFC] Do not consult root box's geometry in line layout 2022-11-05 10:02:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1910500 0 zalan 2022-11-04 22:08:26 -0700 use the constraint values instead 1910501 1 463417 zalan 2022-11-04 22:11:07 -0700 Created attachment 463417 Patch 1910517 2 463423 zalan 2022-11-05 06:04:23 -0700 Created attachment 463423 Patch 1910518 3 463424 zalan 2022-11-05 06:14:52 -0700 Created attachment 463424 Patch 1910539 4 ews-feeder 2022-11-05 10:01:18 -0700 Committed 256355@main (ce48d377e882): <https://commits.webkit.org/256355@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463424. 1910540 5 webkit-bug-importer 2022-11-05 10:02:20 -0700 <rdar://problem/101998151> 463417 2022-11-04 22:11:07 -0700 2022-11-05 06:04:22 -0700 Patch bug-247521-20221104221107.patch text/plain 7103 zalan RnJvbSAyYTI4OTJkZDhmNjUwM2Y0MWRjMjY0MDVmMjU0MTI0N2NiMWUxM2YyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgNCBOb3YgMjAyMiAyMjowODozNyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtMRkNdW0lG Q10gRG8gbm90IGNvbnN1bHQgcm9vdCBib3gncyBnZW9tZXRyeSBpbiBsaW5lIGxheW91dAogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzUyMQoKUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgpVc2UgdGhlIHBhc3NlZCBpbiBjb25zdHJhaW4gKGhvcml6b250YWwp IHZhbHVlcyBpbnN0ZWFkLgooVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3Igbm90IG11dGF0aW5n IHRoZSByb290IGJveCdzIGdlb21ldHJ5IHdpdGggbG9naWNhbCB2YWx1ZXMuKQoKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojps aW5lTGF5b3V0KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUxp bmVCdWlsZGVyOjpidWlsZCBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaDoKLS0t CiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAgfCA2ICsrKy0tLQogLi4uL2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaCAgIHwgMiArLQogLi4uL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlM aW5lQnVpbGRlci5jcHAgICAgICAgICAgIHwgOCArKystLS0tLQogLi4uL2lubGluZS9kaXNwbGF5 L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5oICAgICAgICAgICAgIHwgMiArLQogNCBmaWxlcyBj aGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBjOWM2ZGRiOTcwMGUu LmVjYzUyNjQ1MTg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcApAQCAtMjI5LDcgKzIyOSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmxpbmVMYXlvdXQoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zLCBjb25zdCBMaW5lQnVp CiAKICAgICAgICAgYXV0byBsaW5lSW5pdGlhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUxvZ2lj YWxUb3AsIGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCwgY29uc3RyYWludHMu aG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCwgZm9ybWF0dGluZ0dlb21ldHJ5KCkuaW5pdGlhbExp bmVIZWlnaHQoIXByZXZpb3VzTGluZS5oYXNfdmFsdWUoKSkgfTsKICAgICAgICAgYXV0byBsaW5l Q29udGVudCA9IGxpbmVCdWlsZGVyLmxheW91dElubGluZUNvbnRlbnQoeyBmaXJzdElubGluZUl0 ZW1OZWVkc0xheW91dCwgbmVlZHNMYXlvdXRSYW5nZS5lbmQgfSwgbGluZUluaXRpYWxSZWN0LCBw cmV2aW91c0xpbmUpOwotICAgICAgICBhdXRvIGxpbmVMb2dpY2FsUmVjdCA9IGNvbXB1dGVHZW9t ZXRyeUZvckxpbmVDb250ZW50KGxpbmVDb250ZW50KTsKKyAgICAgICAgYXV0byBsaW5lTG9naWNh bFJlY3QgPSBjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChsaW5lQ29udGVudCwgY29uc3Ry YWludHMpOwogICAgICAgICBpZiAobGluZUNvbnRlbnQuaXNMYXN0TGluZVdpdGhJbmxpbmVDb250 ZW50KQogICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLnNldENsZWFyR2FwQWZ0ZXJMYXN0TGlu ZShmb3JtYXR0aW5nR2VvbWV0cnkoKS5sb2dpY2FsVG9wRm9yTmV4dExpbmUobGluZUNvbnRlbnQs IGxpbmVMb2dpY2FsUmVjdCwgZmxvYXRpbmdDb250ZXh0KSAtIGxpbmVMb2dpY2FsUmVjdC5ib3R0 b20oKSk7CiAKQEAgLTQzOCwxMyArNDM4LDEzIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxp bmVJdGVtcyhpbmxpbmVJdGVtc0J1aWxkZXIuYnVpbGQoKSk7CiB9CiAKLUlubGluZVJlY3QgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0 IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCitJbmxpbmVSZWN0IElubGlu ZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBM aW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBjb25zdCBDb25zdHJhaW50c0Zv ckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0 ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwogICAgIGF1dG8gY3VycmVudExpbmVJbmRleCA9 IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLnNpemUoKTsKIAogICAgIGF1dG8gbGluZUJveCA9IExp bmVCb3hCdWlsZGVyIHsgKnRoaXMgfS5idWlsZChsaW5lQ29udGVudCwgY3VycmVudExpbmVJbmRl eCk7Ci0gICAgYXV0byBkaXNwbGF5TGluZSA9IElubGluZURpc3BsYXlMaW5lQnVpbGRlciB7ICp0 aGlzIH0uYnVpbGQobGluZUNvbnRlbnQsIGxpbmVCb3gpOworICAgIGF1dG8gZGlzcGxheUxpbmUg PSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIgeyAqdGhpcyB9LmJ1aWxkKGxpbmVDb250ZW50LCBs aW5lQm94LCBjb25zdHJhaW50cyk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZEJveGVzKElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlciB7ICp0aGlzLCBmb3JtYXR0aW5nU3RhdGUgfS5idWlsZChs aW5lQ29udGVudCwgbGluZUJveCwgZGlzcGxheUxpbmUsIGN1cnJlbnRMaW5lSW5kZXgpKTsKICAg ICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZUJveChXVEZNb3ZlKGxpbmVCb3gpKTsKICAgICBmb3Jt YXR0aW5nU3RhdGUuYWRkTGluZShkaXNwbGF5TGluZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjZGMzY2Q3YWVlN2EuLjZhZDk5NTNiMGRl NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBA IC03MCw3ICs3MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlV2lkdGhBbmRNYXJnaW4o Y29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJik7CiAKICAgICB2b2lkIGNv bGxlY3RDb250ZW50SWZOZWVkZWQoKTsKLSAgICBJbmxpbmVSZWN0IGNvbXB1dGVHZW9tZXRyeUZv ckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYpOworICAgIElubGlu ZVJlY3QgY29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6Okxp bmVDb250ZW50JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAgICAgdm9p ZCBpbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKCk7CiAKICAgICBjb25zdCBJbmxpbmVEYW1hZ2Uq IG1fbGluZURhbWFnZSB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVC dWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcAppbmRleCA1YmRhNDY4ZjEw NjkuLjIyNjdjNDkwMDQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rp c3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApAQCAtOTAsMTcgKzkwLDE1IEBAIElu bGluZURpc3BsYXlMaW5lQnVpbGRlcjo6RW5jbG9zaW5nTGluZUdlb21ldHJ5IElubGluZURpc3Bs YXlMaW5lQnVpbGRlcjo6Y29sbGVjCiAgICAgcmV0dXJuIHsgeyBlbmNsb3NpbmdUb3AudmFsdWVf b3IobGluZUJveFJlY3QudG9wKCkpLCBlbmNsb3NpbmdCb3R0b20udmFsdWVfb3IobGluZUJveFJl Y3QudG9wKCkpIH0sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgfTsKIH0KIAotSW5saW5lRGlzcGxh eTo6TGluZSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVy OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0 CitJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgY29uc3QgTGluZUJveCYg bGluZUJveCwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykg Y29uc3QKIHsKICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94 KCk7Ci0gICAgYXV0byYgcm9vdEdlb21ldHJ5ID0gbGF5b3V0U3RhdGUoKS5nZW9tZXRyeUZvckJv eChyb290KCkpOwogICAgIGF1dG8gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA9IGxpbmVDb250ZW50 LmlubGluZUJhc2VEaXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6TFRSOwotICAgIGF1dG8gbGlu ZU9mZnNldEZyb21Db250ZW50Qm94ID0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0Lngo KSAtIHJvb3RHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpOwogICAgIGF1dG8gbGluZUJveExvZ2lj YWxXaWR0aCA9IGxpbmVCb3gubG9naWNhbFJlY3QoKS53aWR0aCgpOwogCiAgICAgYXV0byBsaW5l Qm94VmlzdWFsTGVmdCA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24KLSAgICAgICAgPyByb290R2Vv bWV0cnkuY29udGVudEJveExlZnQoKSArIGxpbmVPZmZzZXRGcm9tQ29udGVudEJveAotICAgICAg ICA6ICBJbmxpbmVMYXlvdXRVbml0IHsgcm9vdEdlb21ldHJ5LmJvcmRlckVuZCgpIH0gKyByb290 R2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKCkgKyByb290R2VvbWV0cnkucGFk ZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUpICsgcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hXaWR0aCgp IC0gbGluZU9mZnNldEZyb21Db250ZW50Qm94IC0gbGluZUJveExvZ2ljYWxXaWR0aDsKKyAgICAg ICAgPyBsaW5lQ29udGVudC5saW5lTG9naWNhbFRvcExlZnQueCgpCisgICAgICAgIDogIElubGlu ZUxheW91dFVuaXQgeyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoICB9IC0g KGxpbmVDb250ZW50LmxpbmVMb2dpY2FsVG9wTGVmdC54KCkgKyBsaW5lQm94TG9naWNhbFdpZHRo KTsKIAogICAgIGF1dG8gY29udGVudFZpc3VhbExlZnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9u CiAgICAgICAgID8gbGluZUJveC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rp c3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRl ci5oCmluZGV4IDE1YzM4NmNhZTFhNy4uNzJkMGVmNjk4OGU3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURp c3BsYXlMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmgKQEAgLTM4 LDcgKzM4LDcgQEAgY2xhc3MgSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyIHsKIHB1YmxpYzoKICAg ICBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQm KTsKIAotICAgIElubGluZURpc3BsYXk6OkxpbmUgYnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6Okxp bmVDb250ZW50JiwgY29uc3QgTGluZUJveCYpIGNvbnN0OworICAgIElubGluZURpc3BsYXk6Okxp bmUgYnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgTGluZUJveCYs IGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpIGNvbnN0OwogCiBwcml2YXRlOgog ICAgIHN0cnVjdCBFbmNsb3NpbmdMaW5lR2VvbWV0cnkgewo= 463423 2022-11-05 06:04:23 -0700 2022-11-05 06:14:50 -0700 Patch bug-247521-20221105060423.patch text/plain 11393 zalan RnJvbSAyODc4NTc4NmIyNmZlNjI5ZjFmZTc4NWM0NzdmYzljY2JhMGJjNGE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgNCBOb3YgMjAyMiAyMjowODozNyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtMRkNdW0lG Q10gRG8gbm90IGNvbnN1bHQgcm9vdCBib3gncyBnZW9tZXRyeSBpbiBsaW5lIGxheW91dAogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzUyMQoKUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgpVc2UgdGhlIHBhc3NlZCBpbiBjb25zdHJhaW4gKGhvcml6b250YWwp IHZhbHVlcyBpbnN0ZWFkIC1leHBhbmQgdGhlIGNvbnN0cmFpbnRzIGNvbnRleHQgd2l0aCB2aXN1 YWwgbGVmdCB0byBiZSBhYmxlIHRvIGNvbXB1dGUgcnRsIGNvbnRlbnQgb2Zmc2V0LgooVGhpcyBp cyBpbiBwcmVwYXJhdGlvbiBmb3Igbm90IG11dGF0aW5nIHRoZSByb290IGJveCdzIGdlb21ldHJ5 IHdpdGggbG9naWNhbCB2YWx1ZXMuKQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250 ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcDoK KFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZCBjb25zdCk6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxh eS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaDoKLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRz L0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oICAgIHwgMTUgKysrKysrKysrLS0tLS0tCiAuLi4vaW5s aW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgICAgIHwgIDYgKysrLS0tCiAu Li4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggICAgICAgICAgICAgIHwgIDIgKy0K IC4uLi9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwICAgfCAgOSAr KystLS0tLS0KIC4uLi9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaCAg ICAgfCAgMiArLQogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwICAg ICAgICB8ICA0ICsrLS0KIDYgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTkgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKaW5kZXggZTg5NjU3ZmUx ZTU4Li5iN2FmYjg0YjBmYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaApAQCAt NDMsMTIgKzQzLDEzIEBAIHN0cnVjdCBWZXJ0aWNhbENvbnN0cmFpbnRzIHsKICAgICBMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQ7CiB9OwogCi0vLyBGSVhNRTogTW92ZSB0aGUgdmVydGljYWwgYml0 cyB0byBhIGRlZGljYXRlZCBDb25zdHJhaW50c0ZvckJsb2NrQ29udGVudCBjbGFzcy4KKy8vIEZJ WE1FOiBDcmVhdGUgYSBkZWRpY2F0ZWQgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50IGNsYXNz Lgogc3RydWN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCB7Ci0gICAgQ29uc3RyYWludHNG b3JJbkZsb3dDb250ZW50KEhvcml6b250YWxDb25zdHJhaW50cywgTGF5b3V0VW5pdCBsb2dpY2Fs VG9wKTsKKyAgICBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQoSG9yaXpvbnRhbENvbnN0cmFp bnRzLCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgdmlzdWFsTGVmdCA9IHsgfSk7 CiAKICAgICBIb3Jpem9udGFsQ29uc3RyYWludHMgaG9yaXpvbnRhbCgpIGNvbnN0IHsgcmV0dXJu IG1faG9yaXpvbnRhbDsgfQogICAgIExheW91dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0 dXJuIG1fbG9naWNhbFRvcDsgfQorICAgIExheW91dFVuaXQgdmlzdWFsTGVmdCgpIGNvbnN0IHsg cmV0dXJuIG1fdmlzdWFsTGVmdDsgfQogCiAgICAgZW51bSBCYXNlVHlwZUZsYWcgOiB1aW50OF90 IHsKICAgICAgICAgR2VuZXJpY0NvbnRlbnQgPSAxIDw8IDAsCkBAIC01OSw3ICs2MCw3IEBAIHN0 cnVjdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQgewogICAgIGJvb2wgaXNDb25zdHJhaW50 c0ZvckZsZXhDb250ZW50KCkgY29uc3QgeyByZXR1cm4gYmFzZVR5cGVGbGFncygpLmNvbnRhaW5z KEZsZXhDb250ZW50KTsgfQogCiBwcm90ZWN0ZWQ6Ci0gICAgQ29uc3RyYWludHNGb3JJbkZsb3dD b250ZW50KEhvcml6b250YWxDb25zdHJhaW50cywgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBPcHRp b25TZXQ8QmFzZVR5cGVGbGFnPik7CisgICAgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KEhv cml6b250YWxDb25zdHJhaW50cywgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IHZp c3VhbExlZnQsIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+KTsKIAogcHJpdmF0ZToKICAgICBPcHRp b25TZXQ8QmFzZVR5cGVGbGFnPiBiYXNlVHlwZUZsYWdzKCkgY29uc3QgeyByZXR1cm4gT3B0aW9u U2V0PEJhc2VUeXBlRmxhZz46OmZyb21SYXcobV9iYXNlVHlwZUZsYWdzKTsgfQpAQCAtNjcsNiAr NjgsNyBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fYmFzZVR5cGVGbGFncyA6IDM7IC8vIE9w dGlvblNldDxCYXNlVHlwZUZsYWc+CiAgICAgSG9yaXpvbnRhbENvbnN0cmFpbnRzIG1faG9yaXpv bnRhbDsKICAgICBMYXlvdXRVbml0IG1fbG9naWNhbFRvcDsKKyAgICBMYXlvdXRVbml0IG1fdmlz dWFsTGVmdDsKIH07CiAKIHN0cnVjdCBDb25zdHJhaW50c0Zvck91dE9mRmxvd0NvbnRlbnQgewpA QCAtNzYsMTUgKzc4LDE2IEBAIHN0cnVjdCBDb25zdHJhaW50c0Zvck91dE9mRmxvd0NvbnRlbnQg ewogICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0NvbnN0cmFpbnRzOwogfTsKIAotaW5s aW5lIENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudDo6Q29uc3RyYWludHNGb3JJbkZsb3dDb250 ZW50KEhvcml6b250YWxDb25zdHJhaW50cyBob3Jpem9udGFsLCBMYXlvdXRVbml0IGxvZ2ljYWxU b3AsIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+IGJhc2VUeXBlRmxhZ3MpCitpbmxpbmUgQ29uc3Ry YWludHNGb3JJbkZsb3dDb250ZW50OjpDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQoSG9yaXpv bnRhbENvbnN0cmFpbnRzIGhvcml6b250YWwsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0 VW5pdCB2aXN1YWxMZWZ0LCBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPiBiYXNlVHlwZUZsYWdzKQog ICAgIDogbV9iYXNlVHlwZUZsYWdzKGJhc2VUeXBlRmxhZ3MudG9SYXcoKSkKICAgICAsIG1faG9y aXpvbnRhbChob3Jpem9udGFsKQogICAgICwgbV9sb2dpY2FsVG9wKGxvZ2ljYWxUb3ApCisgICAg LCBtX3Zpc3VhbExlZnQodmlzdWFsTGVmdCkKIHsKIH0KIAotaW5saW5lIENvbnN0cmFpbnRzRm9y SW5GbG93Q29udGVudDo6Q29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KEhvcml6b250YWxDb25z dHJhaW50cyBob3Jpem9udGFsLCBMYXlvdXRVbml0IGxvZ2ljYWxUb3ApCi0gICAgOiBDb25zdHJh aW50c0ZvckluRmxvd0NvbnRlbnQoaG9yaXpvbnRhbCwgbG9naWNhbFRvcCwgR2VuZXJpY0NvbnRl bnQpCitpbmxpbmUgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50OjpDb25zdHJhaW50c0Zvcklu Rmxvd0NvbnRlbnQoSG9yaXpvbnRhbENvbnN0cmFpbnRzIGhvcml6b250YWwsIExheW91dFVuaXQg bG9naWNhbFRvcCwgTGF5b3V0VW5pdCB2aXN1YWxMZWZ0KQorICAgIDogQ29uc3RyYWludHNGb3JJ bkZsb3dDb250ZW50KGhvcml6b250YWwsIGxvZ2ljYWxUb3AsIHZpc3VhbExlZnQsIEdlbmVyaWND b250ZW50KQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKaW5kZXggYzljNmRkYjk3MDBlLi5lY2M1MjY0NTE4NzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTIyOSw3ICsy MjksNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KElubGluZUl0 ZW1zJiBpbmxpbmVJdGVtcywgY29uc3QgTGluZUJ1aQogCiAgICAgICAgIGF1dG8gbGluZUluaXRp YWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVMb2dpY2FsVG9wLCBjb25zdHJhaW50cy5ob3Jpem9u dGFsKCkubG9naWNhbExlZnQsIGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGgs IGZvcm1hdHRpbmdHZW9tZXRyeSgpLmluaXRpYWxMaW5lSGVpZ2h0KCFwcmV2aW91c0xpbmUuaGFz X3ZhbHVlKCkpIH07CiAgICAgICAgIGF1dG8gbGluZUNvbnRlbnQgPSBsaW5lQnVpbGRlci5sYXlv dXRJbmxpbmVDb250ZW50KHsgZmlyc3RJbmxpbmVJdGVtTmVlZHNMYXlvdXQsIG5lZWRzTGF5b3V0 UmFuZ2UuZW5kIH0sIGxpbmVJbml0aWFsUmVjdCwgcHJldmlvdXNMaW5lKTsKLSAgICAgICAgYXV0 byBsaW5lTG9naWNhbFJlY3QgPSBjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChsaW5lQ29u dGVudCk7CisgICAgICAgIGF1dG8gbGluZUxvZ2ljYWxSZWN0ID0gY29tcHV0ZUdlb21ldHJ5Rm9y TGluZUNvbnRlbnQobGluZUNvbnRlbnQsIGNvbnN0cmFpbnRzKTsKICAgICAgICAgaWYgKGxpbmVD b250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKICAgICAgICAgICAgIGZvcm1hdHRp bmdTdGF0ZS5zZXRDbGVhckdhcEFmdGVyTGFzdExpbmUoZm9ybWF0dGluZ0dlb21ldHJ5KCkubG9n aWNhbFRvcEZvck5leHRMaW5lKGxpbmVDb250ZW50LCBsaW5lTG9naWNhbFJlY3QsIGZsb2F0aW5n Q29udGV4dCkgLSBsaW5lTG9naWNhbFJlY3QuYm90dG9tKCkpOwogCkBAIC00MzgsMTMgKzQzOCwx MyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0Q29udGVudElmTmVlZGVk KCkKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lSXRlbXMoaW5saW5lSXRlbXNCdWlsZGVy LmJ1aWxkKCkpOwogfQogCi1JbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50KQorSW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBs aW5lQ29udGVudCwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50 cykKIHsKICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUo KTsKICAgICBhdXRvIGN1cnJlbnRMaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5z aXplKCk7CiAKICAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94QnVpbGRlciB7ICp0aGlzIH0uYnVp bGQobGluZUNvbnRlbnQsIGN1cnJlbnRMaW5lSW5kZXgpOwotICAgIGF1dG8gZGlzcGxheUxpbmUg PSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIgeyAqdGhpcyB9LmJ1aWxkKGxpbmVDb250ZW50LCBs aW5lQm94KTsKKyAgICBhdXRvIGRpc3BsYXlMaW5lID0gSW5saW5lRGlzcGxheUxpbmVCdWlsZGVy IHsgKnRoaXMgfS5idWlsZChsaW5lQ29udGVudCwgbGluZUJveCwgY29uc3RyYWludHMpOwogICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRCb3hlcyhJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIgeyAq dGhpcywgZm9ybWF0dGluZ1N0YXRlIH0uYnVpbGQobGluZUNvbnRlbnQsIGxpbmVCb3gsIGRpc3Bs YXlMaW5lLCBjdXJyZW50TGluZUluZGV4KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVC b3goV1RGTW92ZShsaW5lQm94KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmUoZGlzcGxh eUxpbmUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgK aW5kZXggY2RjM2NkN2FlZTdhLi42YWQ5OTUzYjBkZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNzAsNyArNzAsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250 YWxDb25zdHJhaW50cyYpOwogCiAgICAgdm9pZCBjb2xsZWN0Q29udGVudElmTmVlZGVkKCk7Ci0g ICAgSW5saW5lUmVjdCBjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVp bGRlcjo6TGluZUNvbnRlbnQmKTsKKyAgICBJbmxpbmVSZWN0IGNvbXB1dGVHZW9tZXRyeUZvckxp bmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIGNvbnN0IENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudCYpOwogICAgIHZvaWQgaW52YWxpZGF0ZUZvcm1hdHRpbmdTdGF0 ZSgpOwogCiAgICAgY29uc3QgSW5saW5lRGFtYWdlKiBtX2xpbmVEYW1hZ2UgeyBudWxscHRyIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlM aW5lQnVpbGRlci5jcHAKaW5kZXggNWJkYTQ2OGYxMDY5Li4zMjA2NTI2ZTg4MWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3Bs YXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVp bGRlci5jcHAKQEAgLTkwLDE3ICs5MCwxNCBAQCBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OkVu Y2xvc2luZ0xpbmVHZW9tZXRyeSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OmNvbGxlYwogICAg IHJldHVybiB7IHsgZW5jbG9zaW5nVG9wLnZhbHVlX29yKGxpbmVCb3hSZWN0LnRvcCgpKSwgZW5j bG9zaW5nQm90dG9tLnZhbHVlX29yKGxpbmVCb3hSZWN0LnRvcCgpKSB9LCBzY3JvbGxhYmxlT3Zl cmZsb3dSZWN0IH07CiB9CiAKLUlubGluZURpc3BsYXk6OkxpbmUgSW5saW5lRGlzcGxheUxpbmVC dWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50 LCBjb25zdCBMaW5lQm94JiBsaW5lQm94KSBjb25zdAorSW5saW5lRGlzcGxheTo6TGluZSBJbmxp bmVEaXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVu dCYgbGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IENvbnN0cmFpbnRz Rm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpIGNvbnN0CiB7CiAgICAgYXV0byYgcm9vdElu bGluZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwotICAgIGF1dG8mIHJvb3RHZW9tZXRy eSA9IGxheW91dFN0YXRlKCkuZ2VvbWV0cnlGb3JCb3gocm9vdCgpKTsKICAgICBhdXRvIGlzTGVm dFRvUmlnaHREaXJlY3Rpb24gPSBsaW5lQ29udGVudC5pbmxpbmVCYXNlRGlyZWN0aW9uID09IFRl eHREaXJlY3Rpb246OkxUUjsKLSAgICBhdXRvIGxpbmVPZmZzZXRGcm9tQ29udGVudEJveCA9IGxp bmVDb250ZW50LmxpbmVMb2dpY2FsVG9wTGVmdC54KCkgLSByb290R2VvbWV0cnkuY29udGVudEJv eExlZnQoKTsKICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsV2lkdGggPSBsaW5lQm94LmxvZ2ljYWxS ZWN0KCkud2lkdGgoKTsKLQogICAgIGF1dG8gbGluZUJveFZpc3VhbExlZnQgPSBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uCi0gICAgICAgID8gcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hMZWZ0KCkgKyBs aW5lT2Zmc2V0RnJvbUNvbnRlbnRCb3gKLSAgICAgICAgOiAgSW5saW5lTGF5b3V0VW5pdCB7IHJv b3RHZW9tZXRyeS5ib3JkZXJFbmQoKSB9ICsgcm9vdEdlb21ldHJ5Lmhvcml6b250YWxTcGFjZUZv clNjcm9sbGJhcigpICsgcm9vdEdlb21ldHJ5LnBhZGRpbmdFbmQoKS52YWx1ZV9vcigwX2x1KSAr IHJvb3RHZW9tZXRyeS5jb250ZW50Qm94V2lkdGgoKSAtIGxpbmVPZmZzZXRGcm9tQ29udGVudEJv eCAtIGxpbmVCb3hMb2dpY2FsV2lkdGg7CisgICAgICAgID8gbGluZUNvbnRlbnQubGluZUxvZ2lj YWxUb3BMZWZ0LngoKQorICAgICAgICA6IElubGluZUxheW91dFVuaXQgeyBjb25zdHJhaW50cy52 aXN1YWxMZWZ0KCkgKyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoICsgY29u c3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICB9IC0gKGxpbmVDb250ZW50LmxpbmVM b2dpY2FsVG9wTGVmdC54KCkgKyBsaW5lQm94TG9naWNhbFdpZHRoKTsKIAogICAgIGF1dG8gY29u dGVudFZpc3VhbExlZnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uCiAgICAgICAgID8gbGluZUJv eC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5oCmluZGV4IDE1YzM4NmNh ZTFhNy4uNzJkMGVmNjk4OGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rp c3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmgKQEAgLTM4LDcgKzM4LDcgQEAgY2xhc3Mg SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyIHsKIHB1YmxpYzoKICAgICBJbmxpbmVEaXNwbGF5TGlu ZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmKTsKIAotICAgIElubGluZURp c3BsYXk6OkxpbmUgYnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3Qg TGluZUJveCYpIGNvbnN0OworICAgIElubGluZURpc3BsYXk6OkxpbmUgYnVpbGQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgTGluZUJveCYsIGNvbnN0IENvbnN0cmFpbnRz Rm9ySW5GbG93Q29udGVudCYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHN0cnVjdCBFbmNsb3Np bmdMaW5lR2VvbWV0cnkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCmluZGV4IDkwMzdhOTkxMjJmMy4uM2UwOGQ0MmFlYmY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGlu ZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGlu ZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC00NDMsOCArNDQzLDggQEAgdm9p ZCBMaW5lTGF5b3V0OjpsYXlvdXQoKQogICAgIGF1dG8gaW5saW5lRm9ybWF0dGluZ0NvbnRleHQg PSBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0IHsgcm9vdExheW91dEJveCwgbV9pbmxp bmVGb3JtYXR0aW5nU3RhdGUsIG1fbGluZURhbWFnZS5nZXQoKSB9OwogCiAgICAgYXV0byBob3Jp em9udGFsQ29uc3RyYWludHMgPSBMYXlvdXQ6Okhvcml6b250YWxDb25zdHJhaW50cyB7IHJvb3RH ZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpLCByb290R2VvbWV0cnkuY29udGVudEJveFdpZHRoKCkg fTsKLQotICAgIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmxheW91dEluRmxvd0NvbnRlbnRGb3JJ bnRlZ3JhdGlvbih7IGhvcml6b250YWxDb25zdHJhaW50cywgcm9vdEdlb21ldHJ5LmNvbnRlbnRC b3hUb3AoKSB9KTsKKyAgICBhdXRvIHZpc3VhbExlZnQgPSByb290TGF5b3V0Qm94LnN0eWxlKCku aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hMZWZ0KCkg OiByb290R2VvbWV0cnkuYm9yZGVyRW5kKCkgKyByb290R2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNl Rm9yU2Nyb2xsYmFyKCkgKyByb290R2VvbWV0cnkucGFkZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUp OworICAgIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRl Z3JhdGlvbih7IGhvcml6b250YWxDb25zdHJhaW50cywgcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hU b3AoKSwgdmlzdWFsTGVmdCB9KTsKIAogICAgIGNvbnN0cnVjdENvbnRlbnQoKTsKIAo= 463424 2022-11-05 06:14:52 -0700 2022-11-05 10:01:19 -0700 Patch bug-247521-20221105061451.patch text/plain 13349 zalan RnJvbSAzOGUxZTk1NDZhYjUzNmI2MTA1ZGZmZWQ2MzI5MzI0ZGZjN2VlNjA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgNCBOb3YgMjAyMiAyMjowODozNyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtMRkNdW0lG Q10gRG8gbm90IGNvbnN1bHQgcm9vdCBib3gncyBnZW9tZXRyeSBpbiBsaW5lIGxheW91dAogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzUyMQoKUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgpVc2UgdGhlIHBhc3NlZCBpbiBjb25zdHJhaW4gKGhvcml6b250YWwp IHZhbHVlcyBpbnN0ZWFkIC1leHBhbmQgdGhlIGNvbnN0cmFpbnRzIGNvbnRleHQgd2l0aCB2aXN1 YWwgbGVmdCB0byBiZSBhYmxlIHRvIGNvbXB1dGUgcnRsIGNvbnRlbnQgb2Zmc2V0LgooVGhpcyBp cyBpbiBwcmVwYXJhdGlvbiBmb3Igbm90IG11dGF0aW5nIHRoZSByb290IGJveCdzIGdlb21ldHJ5 IHdpdGggbG9naWNhbCB2YWx1ZXMuKQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250 ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcDoK KFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZCBjb25zdCk6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxh eS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaDoKLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRz L0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oICAgIHwgMTUgKysrKysrKysrLS0tLS0tCiAuLi4vZmxl eC9GbGV4Rm9ybWF0dGluZ0NvbnN0cmFpbnRzLmggICAgICAgICAgICAgIHwgIDIgKy0KIC4uLi9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwICAgICAgICAgICAgfCAgNiArKystLS0K IC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCAgICAgICAgICAgICAgfCAgMiAr LQogLi4uL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgICB8ICA5 ICsrKy0tLS0tLQogLi4uL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5o ICAgICB8ICAyICstCiAuLi4vdGFibGUvVGFibGVGb3JtYXR0aW5nQ29uc3RyYWludHMuaCAgICAg ICAgICAgIHwgIDIgKy0KIC4uLi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cCAgICAgICAgfCAgNCArKy0tCiA4IGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDIx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oCmluZGV4IGU4OTY1 N2ZlMWU1OC4uYjdhZmI4NGIwZmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgK QEAgLTQzLDEyICs0MywxMyBAQCBzdHJ1Y3QgVmVydGljYWxDb25zdHJhaW50cyB7CiAgICAgTGF5 b3V0VW5pdCBsb2dpY2FsSGVpZ2h0OwogfTsKIAotLy8gRklYTUU6IE1vdmUgdGhlIHZlcnRpY2Fs IGJpdHMgdG8gYSBkZWRpY2F0ZWQgQ29uc3RyYWludHNGb3JCbG9ja0NvbnRlbnQgY2xhc3MuCisv LyBGSVhNRTogQ3JlYXRlIGEgZGVkaWNhdGVkIENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCBj bGFzcy4KIHN0cnVjdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQgewotICAgIENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudChIb3Jpem9udGFsQ29uc3RyYWludHMsIExheW91dFVuaXQgbG9n aWNhbFRvcCk7CisgICAgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KEhvcml6b250YWxDb25z dHJhaW50cywgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IHZpc3VhbExlZnQgPSB7 IH0pOwogCiAgICAgSG9yaXpvbnRhbENvbnN0cmFpbnRzIGhvcml6b250YWwoKSBjb25zdCB7IHJl dHVybiBtX2hvcml6b250YWw7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7 IHJldHVybiBtX2xvZ2ljYWxUb3A7IH0KKyAgICBMYXlvdXRVbml0IHZpc3VhbExlZnQoKSBjb25z dCB7IHJldHVybiBtX3Zpc3VhbExlZnQ7IH0KIAogICAgIGVudW0gQmFzZVR5cGVGbGFnIDogdWlu dDhfdCB7CiAgICAgICAgIEdlbmVyaWNDb250ZW50ID0gMSA8PCAwLApAQCAtNTksNyArNjAsNyBA QCBzdHJ1Y3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50IHsKICAgICBib29sIGlzQ29uc3Ry YWludHNGb3JGbGV4Q29udGVudCgpIGNvbnN0IHsgcmV0dXJuIGJhc2VUeXBlRmxhZ3MoKS5jb250 YWlucyhGbGV4Q29udGVudCk7IH0KIAogcHJvdGVjdGVkOgotICAgIENvbnN0cmFpbnRzRm9ySW5G bG93Q29udGVudChIb3Jpem9udGFsQ29uc3RyYWludHMsIExheW91dFVuaXQgbG9naWNhbFRvcCwg T3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4pOworICAgIENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVu dChIb3Jpem9udGFsQ29uc3RyYWludHMsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5p dCB2aXN1YWxMZWZ0LCBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPik7CiAKIHByaXZhdGU6CiAgICAg T3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4gYmFzZVR5cGVGbGFncygpIGNvbnN0IHsgcmV0dXJuIE9w dGlvblNldDxCYXNlVHlwZUZsYWc+Ojpmcm9tUmF3KG1fYmFzZVR5cGVGbGFncyk7IH0KQEAgLTY3 LDYgKzY4LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2Jhc2VUeXBlRmxhZ3MgOiAzOyAv LyBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPgogICAgIEhvcml6b250YWxDb25zdHJhaW50cyBtX2hv cml6b250YWw7CiAgICAgTGF5b3V0VW5pdCBtX2xvZ2ljYWxUb3A7CisgICAgTGF5b3V0VW5pdCBt X3Zpc3VhbExlZnQ7CiB9OwogCiBzdHJ1Y3QgQ29uc3RyYWludHNGb3JPdXRPZkZsb3dDb250ZW50 IHsKQEAgLTc2LDE1ICs3OCwxNiBAQCBzdHJ1Y3QgQ29uc3RyYWludHNGb3JPdXRPZkZsb3dDb250 ZW50IHsKICAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdDb25zdHJhaW50czsKIH07CiAK LWlubGluZSBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQ6OkNvbnN0cmFpbnRzRm9ySW5GbG93 Q29udGVudChIb3Jpem9udGFsQ29uc3RyYWludHMgaG9yaXpvbnRhbCwgTGF5b3V0VW5pdCBsb2dp Y2FsVG9wLCBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPiBiYXNlVHlwZUZsYWdzKQoraW5saW5lIENv bnN0cmFpbnRzRm9ySW5GbG93Q29udGVudDo6Q29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KEhv cml6b250YWxDb25zdHJhaW50cyBob3Jpem9udGFsLCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExh eW91dFVuaXQgdmlzdWFsTGVmdCwgT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4gYmFzZVR5cGVGbGFn cykKICAgICA6IG1fYmFzZVR5cGVGbGFncyhiYXNlVHlwZUZsYWdzLnRvUmF3KCkpCiAgICAgLCBt X2hvcml6b250YWwoaG9yaXpvbnRhbCkKICAgICAsIG1fbG9naWNhbFRvcChsb2dpY2FsVG9wKQor ICAgICwgbV92aXN1YWxMZWZ0KHZpc3VhbExlZnQpCiB7CiB9CiAKLWlubGluZSBDb25zdHJhaW50 c0ZvckluRmxvd0NvbnRlbnQ6OkNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudChIb3Jpem9udGFs Q29uc3RyYWludHMgaG9yaXpvbnRhbCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wKQotICAgIDogQ29u c3RyYWludHNGb3JJbkZsb3dDb250ZW50KGhvcml6b250YWwsIGxvZ2ljYWxUb3AsIEdlbmVyaWND b250ZW50KQoraW5saW5lIENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudDo6Q29uc3RyYWludHNG b3JJbkZsb3dDb250ZW50KEhvcml6b250YWxDb25zdHJhaW50cyBob3Jpem9udGFsLCBMYXlvdXRV bml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgdmlzdWFsTGVmdCkKKyAgICA6IENvbnN0cmFpbnRz Rm9ySW5GbG93Q29udGVudChob3Jpem9udGFsLCBsb2dpY2FsVG9wLCB2aXN1YWxMZWZ0LCBHZW5l cmljQ29udGVudCkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29uc3RyYWludHMuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0Nv bnN0cmFpbnRzLmgKaW5kZXggZjZlNzk4Y2MzNjczLi4yNDdhOWMxZjUwZjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnN0cmFpbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29uc3RyYWludHMuaApAQCAtNDIsNyArNDIsNyBA QCBwcml2YXRlOgogfTsKIAogaW5saW5lIENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQ6OkNvbnN0 cmFpbnRzRm9yRmxleENvbnRlbnQoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBn ZW5lcmljQ29udHJhaW50cywgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBhdmFpbGFibGVWZXJ0 aWNhbFNwYWNlLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1pbmltdW1WZXJ0aWNhbFNwYWNl KQotICAgIDogQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGdlbmVyaWNDb250cmFpbnRzLmhv cml6b250YWwoKSwgZ2VuZXJpY0NvbnRyYWludHMubG9naWNhbFRvcCgpLCBGbGV4Q29udGVudCkK KyAgICA6IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudChnZW5lcmljQ29udHJhaW50cy5ob3Jp em9udGFsKCksIGdlbmVyaWNDb250cmFpbnRzLmxvZ2ljYWxUb3AoKSwgeyB9LCBGbGV4Q29udGVu dCkKICAgICAsIG1fYXZhaWxhYmxlVmVydGljYWxTcGFjZShhdmFpbGFibGVWZXJ0aWNhbFNwYWNl KQogICAgICwgbV9taW5pbXVtVmVydGljYWxTcGFjZShtaW5pbXVtVmVydGljYWxTcGFjZSkKIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRl eCBjOWM2ZGRiOTcwMGUuLmVjYzUyNjQ1MTg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjI5LDcgKzIyOSw3IEBAIHZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1z LCBjb25zdCBMaW5lQnVpCiAKICAgICAgICAgYXV0byBsaW5lSW5pdGlhbFJlY3QgPSBJbmxpbmVS ZWN0IHsgbGluZUxvZ2ljYWxUb3AsIGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVm dCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCwgZm9ybWF0dGluZ0dlb21l dHJ5KCkuaW5pdGlhbExpbmVIZWlnaHQoIXByZXZpb3VzTGluZS5oYXNfdmFsdWUoKSkgfTsKICAg ICAgICAgYXV0byBsaW5lQ29udGVudCA9IGxpbmVCdWlsZGVyLmxheW91dElubGluZUNvbnRlbnQo eyBmaXJzdElubGluZUl0ZW1OZWVkc0xheW91dCwgbmVlZHNMYXlvdXRSYW5nZS5lbmQgfSwgbGlu ZUluaXRpYWxSZWN0LCBwcmV2aW91c0xpbmUpOwotICAgICAgICBhdXRvIGxpbmVMb2dpY2FsUmVj dCA9IGNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGxpbmVDb250ZW50KTsKKyAgICAgICAg YXV0byBsaW5lTG9naWNhbFJlY3QgPSBjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChsaW5l Q29udGVudCwgY29uc3RyYWludHMpOwogICAgICAgICBpZiAobGluZUNvbnRlbnQuaXNMYXN0TGlu ZVdpdGhJbmxpbmVDb250ZW50KQogICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLnNldENsZWFy R2FwQWZ0ZXJMYXN0TGluZShmb3JtYXR0aW5nR2VvbWV0cnkoKS5sb2dpY2FsVG9wRm9yTmV4dExp bmUobGluZUNvbnRlbnQsIGxpbmVMb2dpY2FsUmVjdCwgZmxvYXRpbmdDb250ZXh0KSAtIGxpbmVM b2dpY2FsUmVjdC5ib3R0b20oKSk7CiAKQEAgLTQzOCwxMyArNDM4LDEzIEBAIHZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogICAgIGZvcm1hdHRp bmdTdGF0ZS5hZGRJbmxpbmVJdGVtcyhpbmxpbmVJdGVtc0J1aWxkZXIuYnVpbGQoKSk7CiB9CiAK LUlubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxp bmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCitJ bmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5l Q29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBjb25z dCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8m IGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwogICAgIGF1dG8gY3Vy cmVudExpbmVJbmRleCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLnNpemUoKTsKIAogICAgIGF1 dG8gbGluZUJveCA9IExpbmVCb3hCdWlsZGVyIHsgKnRoaXMgfS5idWlsZChsaW5lQ29udGVudCwg Y3VycmVudExpbmVJbmRleCk7Ci0gICAgYXV0byBkaXNwbGF5TGluZSA9IElubGluZURpc3BsYXlM aW5lQnVpbGRlciB7ICp0aGlzIH0uYnVpbGQobGluZUNvbnRlbnQsIGxpbmVCb3gpOworICAgIGF1 dG8gZGlzcGxheUxpbmUgPSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIgeyAqdGhpcyB9LmJ1aWxk KGxpbmVDb250ZW50LCBsaW5lQm94LCBjb25zdHJhaW50cyk7CiAgICAgZm9ybWF0dGluZ1N0YXRl LmFkZEJveGVzKElubGluZURpc3BsYXlDb250ZW50QnVpbGRlciB7ICp0aGlzLCBmb3JtYXR0aW5n U3RhdGUgfS5idWlsZChsaW5lQ29udGVudCwgbGluZUJveCwgZGlzcGxheUxpbmUsIGN1cnJlbnRM aW5lSW5kZXgpKTsKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZUJveChXVEZNb3ZlKGxpbmVC b3gpKTsKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZShkaXNwbGF5TGluZSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjZGMzY2Q3YWVl N2EuLjZhZDk5NTNiMGRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5oCkBAIC03MCw3ICs3MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRl V2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJik7 CiAKICAgICB2b2lkIGNvbGxlY3RDb250ZW50SWZOZWVkZWQoKTsKLSAgICBJbmxpbmVSZWN0IGNv bXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVu dCYpOworICAgIElubGluZVJlY3QgY29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250 ZW50Jik7CiAgICAgdm9pZCBpbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKCk7CiAKICAgICBjb25z dCBJbmxpbmVEYW1hZ2UqIG1fbGluZURhbWFnZSB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5s aW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApp bmRleCA1YmRhNDY4ZjEwNjkuLjMyMDY1MjZlODgxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5 TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApAQCAtOTAs MTcgKzkwLDE0IEBAIElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6RW5jbG9zaW5nTGluZUdlb21l dHJ5IElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6Y29sbGVjCiAgICAgcmV0dXJuIHsgeyBlbmNs b3NpbmdUb3AudmFsdWVfb3IobGluZUJveFJlY3QudG9wKCkpLCBlbmNsb3NpbmdCb3R0b20udmFs dWVfb3IobGluZUJveFJlY3QudG9wKCkpIH0sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgfTsKIH0K IAotSW5saW5lRGlzcGxheTo6TGluZSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkKGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gm IGxpbmVCb3gpIGNvbnN0CitJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVp bGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwg Y29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 JiBjb25zdHJhaW50cykgY29uc3QKIHsKICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJv eC5yb290SW5saW5lQm94KCk7Ci0gICAgYXV0byYgcm9vdEdlb21ldHJ5ID0gbGF5b3V0U3RhdGUo KS5nZW9tZXRyeUZvckJveChyb290KCkpOwogICAgIGF1dG8gaXNMZWZ0VG9SaWdodERpcmVjdGlv biA9IGxpbmVDb250ZW50LmlubGluZUJhc2VEaXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6TFRS OwotICAgIGF1dG8gbGluZU9mZnNldEZyb21Db250ZW50Qm94ID0gbGluZUNvbnRlbnQubGluZUxv Z2ljYWxUb3BMZWZ0LngoKSAtIHJvb3RHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpOwogICAgIGF1 dG8gbGluZUJveExvZ2ljYWxXaWR0aCA9IGxpbmVCb3gubG9naWNhbFJlY3QoKS53aWR0aCgpOwot CiAgICAgYXV0byBsaW5lQm94VmlzdWFsTGVmdCA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24KLSAg ICAgICAgPyByb290R2VvbWV0cnkuY29udGVudEJveExlZnQoKSArIGxpbmVPZmZzZXRGcm9tQ29u dGVudEJveAotICAgICAgICA6ICBJbmxpbmVMYXlvdXRVbml0IHsgcm9vdEdlb21ldHJ5LmJvcmRl ckVuZCgpIH0gKyByb290R2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKCkgKyBy b290R2VvbWV0cnkucGFkZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUpICsgcm9vdEdlb21ldHJ5LmNv bnRlbnRCb3hXaWR0aCgpIC0gbGluZU9mZnNldEZyb21Db250ZW50Qm94IC0gbGluZUJveExvZ2lj YWxXaWR0aDsKKyAgICAgICAgPyBsaW5lQ29udGVudC5saW5lTG9naWNhbFRvcExlZnQueCgpCisg ICAgICAgIDogSW5saW5lTGF5b3V0VW5pdCB7IGNvbnN0cmFpbnRzLnZpc3VhbExlZnQoKSArIGNv bnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGggKyBjb25zdHJhaW50cy5ob3Jpem9u dGFsKCkubG9naWNhbExlZnQgIH0gLSAobGluZUNvbnRlbnQubGluZUxvZ2ljYWxUb3BMZWZ0Lngo KSArIGxpbmVCb3hMb2dpY2FsV2lkdGgpOwogCiAgICAgYXV0byBjb250ZW50VmlzdWFsTGVmdCA9 IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24KICAgICAgICAgPyBsaW5lQm94LnJvb3RJbmxpbmVCb3hB bGlnbm1lbnRPZmZzZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkv SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmgKaW5kZXggMTVjMzg2Y2FlMWE3Li43MmQwZWY2OTg4 ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5TGluZUJ1aWxkZXIuaApAQCAtMzgsNyArMzgsNyBAQCBjbGFzcyBJbmxpbmVEaXNwbGF5TGlu ZUJ1aWxkZXIgewogcHVibGljOgogICAgIElubGluZURpc3BsYXlMaW5lQnVpbGRlcihjb25zdCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwogCi0gICAgSW5saW5lRGlzcGxheTo6TGluZSBidWls ZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBjb25zdCBMaW5lQm94JikgY29uc3Q7 CisgICAgSW5saW5lRGlzcGxheTo6TGluZSBidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnRlbnQmLCBjb25zdCBMaW5lQm94JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 JikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IEVuY2xvc2luZ0xpbmVHZW9tZXRyeSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3Rh YmxlL1RhYmxlRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKaW5k ZXggMTc0YmZiM2Y0ZmI3Li5mNzJiM2ExNmNiNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29uc3RyYWlu dHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl L1RhYmxlRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKQEAgLTQwLDcgKzQwLDcgQEAgcHJpdmF0ZToK IH07CiAKIGlubGluZSBDb25zdHJhaW50c0ZvclRhYmxlQ29udGVudDo6Q29uc3RyYWludHNGb3JU YWJsZUNvbnRlbnQoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBpbkZsb3dDb250 cmFpbnRzLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGF2YWlsYWJsZVZlcnRpY2FsU3BhY2VG b3JDb250ZW50KQotICAgIDogQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGluRmxvd0NvbnRy YWludHMuaG9yaXpvbnRhbCgpLCBpbkZsb3dDb250cmFpbnRzLmxvZ2ljYWxUb3AoKSwgVGFibGVD b250ZW50KQorICAgIDogQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGluRmxvd0NvbnRyYWlu dHMuaG9yaXpvbnRhbCgpLCBpbkZsb3dDb250cmFpbnRzLmxvZ2ljYWxUb3AoKSwgeyB9LCBUYWJs ZUNvbnRlbnQpCiAgICAgLCBtX2F2YWlsYWJsZVZlcnRpY2FsU3BhY2VGb3JDb250ZW50KGF2YWls YWJsZVZlcnRpY2FsU3BhY2VGb3JDb250ZW50KQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDkwMzdhOTkxMjJmMy4uM2UwOGQ0MmFlYmY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC00 NDMsOCArNDQzLDggQEAgdm9pZCBMaW5lTGF5b3V0OjpsYXlvdXQoKQogICAgIGF1dG8gaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0IHsgcm9v dExheW91dEJveCwgbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUsIG1fbGluZURhbWFnZS5nZXQoKSB9 OwogCiAgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHMgPSBMYXlvdXQ6Okhvcml6b250YWxD b25zdHJhaW50cyB7IHJvb3RHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpLCByb290R2VvbWV0cnku Y29udGVudEJveFdpZHRoKCkgfTsKLQotICAgIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmxheW91 dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbih7IGhvcml6b250YWxDb25zdHJhaW50cywgcm9v dEdlb21ldHJ5LmNvbnRlbnRCb3hUb3AoKSB9KTsKKyAgICBhdXRvIHZpc3VhbExlZnQgPSByb290 TGF5b3V0Qm94LnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gcm9vdEdlb21ldHJ5 LmNvbnRlbnRCb3hMZWZ0KCkgOiByb290R2VvbWV0cnkuYm9yZGVyRW5kKCkgKyByb290R2VvbWV0 cnkuaG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKCkgKyByb290R2VvbWV0cnkucGFkZGluZ0Vu ZCgpLnZhbHVlX29yKDBfbHUpOworICAgIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbih7IGhvcml6b250YWxDb25zdHJhaW50cywgcm9vdEdl b21ldHJ5LmNvbnRlbnRCb3hUb3AoKSwgdmlzdWFsTGVmdCB9KTsKIAogICAgIGNvbnN0cnVjdENv bnRlbnQoKTsKIAo=