214785 2020-07-25 06:21:59 -0700 [LFC][IFC] The initial alignment baseline is always set by the strut 2020-08-25 09:39:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215087 215752 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1675004 0 zalan 2020-07-25 06:21:59 -0700 ssia 1675005 1 405228 zalan 2020-07-25 06:23:46 -0700 Created attachment 405228 Patch 1677116 2 webkit-bug-importer 2020-08-01 06:22:18 -0700 <rdar://problem/66423085> 1682627 3 407185 zalan 2020-08-25 06:24:27 -0700 Created attachment 407185 Patch 1682643 4 407190 zalan 2020-08-25 08:27:05 -0700 Created attachment 407190 Patch 1682675 5 ews-feeder 2020-08-25 09:39:16 -0700 Committed r266125: <https://trac.webkit.org/changeset/266125> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407190. 405228 2020-07-25 06:23:46 -0700 2020-08-25 06:24:26 -0700 Patch bug-214785-20200725062345.patch text/plain 12159 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDllYmQ0Njk1Y2ZlZWQ1 OWU4OTIwMTY0YzcyMzg2MDQ3YjQ2MWU3YS4uMmMyOTg2NmZmM2M2MjBiZGY4OGZlMmU2NzNlMjkx YmIyMmM0ODAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA3LTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUaGUgaW5p dGlhbCBhbGlnbm1lbnQgYmFzZWxpbmUgaXMgYWx3YXlzIHNldCBieSB0aGUgc3RydXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc4NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGp1c3QgdXNl IHRoZSBzdHJ1dCBhc2NlbnQgYXMgdGhlIGluaXRpYWwgYWxpZ25tZW50IGJhc2VsaW5lLgorCisg ICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojpyb290IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoRm9yQ29uc3RyYWludCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzOjppbml0aWFsTGluZUhlaWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJhaW50 cyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94 KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OnJvb3QgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjAtMDctMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFJlbmFtZSBMaW5lQm94OjpiYXNlbGluZSB0byBhbGlnbm1lbnQgYmFzZWxpbmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZTA1MjIxNGIwZmQ0 YzA0MjUyMWE5ZDBlMmIxNzgzODljZjU1ZDZjNy4uNGY1YmIyNmJhYjVhYjNkMGU3OGYwZTg5YTlm ZWIyY2U3YjY1MDVlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0 LmgKQEAgLTEwOCwxMSArMTA4LDExIEBAIHB1YmxpYzoKICAgICAgICAgVGFibGVOZWVkc0FjY2Vz c1RvVGFibGVXcmFwcGVyCiAgICAgfTsKICAgICBjb25zdCBEaXNwbGF5OjpCb3gmIGdlb21ldHJ5 Rm9yQm94KGNvbnN0IEJveCYsIE9wdGlvbmFsPEVzY2FwZVJlYXNvbj4gPSBXVEY6Om51bGxvcHQp IGNvbnN0OworICAgIGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuICpt X3Jvb3Q7IH0KIAogcHJvdGVjdGVkOgogICAgIHVzaW5nIExheW91dFF1ZXVlID0gVmVjdG9yPGNv bnN0IEJveCo+OwogCi0gICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1 cm4gKm1fcm9vdDsgfQogICAgIExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSgpIGNvbnN0OwogICAg IGNvbnN0IEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyByZXR1cm4g bV9mb3JtYXR0aW5nU3RhdGU7IH0KICAgICBGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0 ZSgpIHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0YXRlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKaW5kZXggNTFlZTYzOTViZDg4ZjUyN2ZmMjBmNDJiNWU0YzFkMzdkMjIxZDI2 Ny4uZmU4MjdjMDE5MTU3MjM0MDg3NjM1NGE2NmVmOTM4NGUxMTdkYzdkMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBAIElubGluZUxheW91 dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhGb3JD b25zdHJhaW50KEluCiAgICAgYXV0byBsYXlvdXRSYW5nZSA9IExpbmVMYXlvdXRDb250ZXh0OjpJ bmxpbmVJdGVtUmFuZ2UgeyAwICwgaW5saW5lSXRlbXMuc2l6ZSgpIH07CiAgICAgd2hpbGUgKCFs YXlvdXRSYW5nZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gT25seSB0aGUgaG9yaXp0b25hbCBh dmFpbGFibGUgd2lkdGggaXMgY29uc3RyYWluZWQgd2hlbiBjb21wdXRpbmcgaW50cmluc2ljIHdp ZHRoLgotICAgICAgICBsaW5lQnVpbGRlci5pbml0aWFsaXplKExpbmVCdWlsZGVyOjpDb25zdHJh aW50cyB7IHsgfSwgYXZhaWxhYmxlV2lkdGgsIGZhbHNlLCB7IH0gfSk7CisgICAgICAgIGxpbmVC dWlsZGVyLmluaXRpYWxpemUoTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzIHsgeyB9LCBhdmFpbGFi bGVXaWR0aCwgeyB9LCBmYWxzZSB9KTsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9IGxpbmVM YXlvdXRDb250ZXh0LmxheW91dExpbmUobGluZUJ1aWxkZXIsIGxheW91dFJhbmdlLCB7IH0pOwog ICAgICAgICBsYXlvdXRSYW5nZS5zdGFydCA9ICpsaW5lQ29udGVudC50cmFpbGluZ0lubGluZUl0 ZW1JbmRleCArIDE7CiAgICAgICAgIC8vIEZJWE1FOiBVc2UgbGluZSBsb2dpY2FsIGxlZnQgYW5k IHJpZ2h0IHRvIHRha2UgZmxvYXRzIGludG8gYWNjb3VudC4KQEAgLTM5OCwxNCArMzk4LDE0IEBA IExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29uc3Ry YWludHNGb3JMaW5lKGNvbnN0IEhvcml6CiB7CiAgICAgYXV0byBsaW5lTG9naWNhbExlZnQgPSBo b3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbExlZnQ7CiAgICAgYXV0byBsaW5lTG9naWNhbFJp Z2h0ID0gbGluZUxvZ2ljYWxMZWZ0ICsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0 aDsKLSAgICBhdXRvIGxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IHF1aXJrcygpLmxpbmVIZWlnaHRD b25zdHJhaW50cyhyb290KCkpOworICAgIGF1dG8gaW5pdGlhbExpbmVIZWlnaHQgPSBxdWlya3Mo KS5pbml0aWFsTGluZUhlaWdodChyb290KCkpOwogICAgIGF1dG8gbGluZUlzQ29uc3RyYWluZWRC eUZsb2F0ID0gZmFsc2U7CiAKICAgICBhdXRvIGZsb2F0aW5nQ29udGV4dCA9IEZsb2F0aW5nQ29u dGV4dCB7IHJvb3QoKSwgKnRoaXMsIGZvcm1hdHRpbmdTdGF0ZSgpLmZsb2F0aW5nU3RhdGUoKSB9 OwogICAgIC8vIENoZWNrIGZvciBpbnRydWRpbmcgZmxvYXRzIGFuZCBhZGp1c3QgbG9naWNhbCBs ZWZ0L2F2YWlsYWJsZSB3aWR0aCBmb3IgdGhpcyBsaW5lIGFjY29yZGluZ2x5LgogICAgIGlmICgh ZmxvYXRpbmdDb250ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBv cnQgZm9yIHZhcmlhYmxlIGxpbmUgaGVpZ2h0LCB3aGVyZSB0aGUgaW50cnVzaXZlIGZsb2F0cyBz aG91bGQgYmUgcHJvYmVkIGFzIHRoZSBsaW5lIGhlaWdodCBncm93cy4KLSAgICAgICAgYXV0byBm bG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5p dChsaW5lTG9naWNhbFRvcCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGxpbmVIZWln aHRBbmRCYXNlbGluZS5oZWlnaHQpKTsKKyAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRzID0g ZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCks IHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGluaXRpYWxMaW5lSGVpZ2h0KSk7CiAgICAg ICAgIC8vIENoZWNrIGlmIHRoZXNlIGNvbnN0cmFpbnRzIGFjdHVhbGx5IHB1dCBsaW1pdGF0aW9u IG9uIHRoZSBsaW5lLgogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZsb2F0 Q29uc3RyYWludHMubGVmdC0+eCA8PSBsaW5lTG9naWNhbExlZnQpCiAgICAgICAgICAgICBmbG9h dENvbnN0cmFpbnRzLmxlZnQgPSB7IH07CkBAIC00NjEsNyArNDYxLDcgQEAgTGluZUJ1aWxkZXI6 OkNvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUo Y29uc3QgSG9yaXoKICAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuY29tcHV0ZWRUZXh0SW5kZW50 KHJvb3QsIGhvcml6b250YWxDb25zdHJhaW50cykudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0IHsg fSk7CiAgICAgfTsKICAgICBsaW5lTG9naWNhbExlZnQgKz0gY29tcHV0ZWRUZXh0SW5kZW50KCk7 Ci0gICAgcmV0dXJuIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyB7IHsgbGluZUxvZ2ljYWxMZWZ0 LCBsaW5lTG9naWNhbFRvcCB9LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0LCBs aW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQsIGxpbmVIZWlnaHRBbmRCYXNlbGluZSB9OworICAgIHJl dHVybiBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHMgeyB7IGxpbmVMb2dpY2FsTGVmdCwgbGluZUxv Z2ljYWxUb3AgfSwgbGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5pdGlhbExp bmVIZWlnaHQsIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9OwogfQogCiB2b2lkIElubGluZUZv cm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlvdXRD b250ZXh0OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IEhvcml6b250YWxDb25zdHJh aW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmgKaW5kZXggY2Q2OTEwNjA3OGJmM2ExYmFiOWUwMThhODc1YmY3Y2YxYjBlY2EwMS4uOWFmZWNm MGI0YWFjYTBlODI3N2IyNmFiMjE0YjViZWU2ODdlNjNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5oCkBAIC01MCw3ICs1MCw3IEBAIHByaXZhdGU6CiAKICAgICBjbGFzcyBRdWly a3MgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrcyB7CiAgICAgcHVibGljOgotICAg ICAgICBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJhc2VsaW5lIGxpbmVIZWln aHRDb25zdHJhaW50cyhjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdDsK KyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodChjb25zdCBDb250YWlu ZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdDsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIGZy aWVuZCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVp cmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCAxM2I4ZDA3ODc1ZDYxODQ2NzhhYTc0MDk5 OTY0ZjY1OTQzMDMzMzVhLi41ZWUyYTJjNDQ0YjZiMDcyMGFjNTQ0NGI0M2I5NzcyMTZkN2U3NDkx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC0y OCwyMiArMjgsMTcgQEAKIAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQog Ci0jaW5jbHVkZSAiSW5saW5lTGluZUJ1aWxkZXIuaCIKLSNpbmNsdWRlICJMYXlvdXRTdGF0ZS5o IgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotTGluZUJ1aWxk ZXI6OkNvbnN0cmFpbnRzOjpIZWlnaHRBbmRCYXNlbGluZSBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3RyYWludHMoY29uc3QgQ29udGFpbmVyQm94JiBmb3Jt YXR0aW5nUm9vdCkgY29uc3QKK0lubGluZUxheW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OlF1aXJrczo6aW5pdGlhbExpbmVIZWlnaHQoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0 aW5nUm9vdCkgY29uc3QKIHsKICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkTGluZUhlaWdo dCA9IGZvcm1hdHRpbmdSb290LnN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7Ci0gICAgYXV0 byBoYWxmTGVhZGluZ0FzY2VudCA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9y bWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBjb21wdXRlZExpbmVIZWlnaHQpLmFz Y2VudDsKICAgICAvLyBOZWdhdGl2ZSBsaW5lSGVpZ2h0IHZhbHVlIG1lYW5zIHRoZSBsaW5lLWhl aWdodCBpcyBub3Qgc2V0CiAgICAgaWYgKGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSB8 fCAhZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKQotICAg ICAgICByZXR1cm4geyBjb21wdXRlZExpbmVIZWlnaHQsIGhhbGZMZWFkaW5nQXNjZW50IH07Cisg ICAgICAgIHJldHVybiBjb21wdXRlZExpbmVIZWlnaHQ7CiAKLSAgICBhdXRvIHF1aXJrSGFsZkxl YWRpbmcgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRpbmdSb290LnN0 eWxlKCkuZm9udE1ldHJpY3MoKSwgMF9sdSk7Ci0gICAgcmV0dXJuIHsgcXVpcmtIYWxmTGVhZGlu Zy5oZWlnaHQoKSwgcXVpcmtIYWxmTGVhZGluZy5hc2NlbnQgfTsKKyAgICByZXR1cm4gTGluZUJ1 aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRy aWNzKCksIDBfbHUpLmhlaWdodCgpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggYWQwODIwMzQy ZWM2OGFjMTIxMDdkOWI3MmQ3MjY4YmQ4M2MzMzA0Ny4uNjNlMWRlMjBiZmNjMjIwMTg2MDAyNTgw NTBiNjE1YzRmMTY4MzAwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6 CiAgICAgICAgIEFzY2VudEFuZERlc2NlbnQgYXNjZW50QW5kRGVzY2VudDsKICAgICB9OwogCi0g ICAgTGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiwgY29uc3QgQXNjZW50QW5kRGVz Y2VudCYsIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUpOworICAgIExpbmVCb3go Y29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQmKTsKICAg ICBMaW5lQm94KCkgPSBkZWZhdWx0OwogCiAgICAgY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYg bG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KQEAgLTEyNCw5ICsxMjQsOSBA QCBwcml2YXRlOgogICAgIElubGluZUJveCBtX3Jvb3RJbmxpbmVCb3g7CiB9OwogCi1pbmxpbmUg TGluZUJveDo6TGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBB c2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNjZW50LCBJbmxpbmVMYXlvdXRVbml0IGFsaWdu bWVudEJhc2VsaW5lKQoraW5saW5lIExpbmVCb3g6OkxpbmVCb3goY29uc3QgRGlzcGxheTo6SW5s aW5lUmVjdCYgcmVjdCwgY29uc3QgQXNjZW50QW5kRGVzY2VudCYgYXNjZW50QW5kRGVzY2VudCkK ICAgICA6IG1fcmVjdChyZWN0KQotICAgICwgbV9hbGlnbm1lbnRCYXNlbGluZShhbGlnbm1lbnRC YXNlbGluZSkKKyAgICAsIG1fYWxpZ25tZW50QmFzZWxpbmUoYXNjZW50QW5kRGVzY2VudC5hc2Nl bnQpCiAgICAgLCBtX3Jvb3RJbmxpbmVCb3goYXNjZW50QW5kRGVzY2VudCkKIHsKICNpZiBBU1NF UlRfRU5BQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDJhZWE2N2VjYzgzZmJhZTQz NWJlNjhkNzE1NzlhODVkNTUyMjlhZDAuLjI3ZjRlNjYwNWQ1NzA5ZmY1MWQxY2MwOTBiMWNiZDA5 MzE2ZTlmNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTc5LDIwICs3OSwxMSBAQCBM aW5lQnVpbGRlcjo6fkxpbmVCdWlsZGVyKCkKIAogdm9pZCBMaW5lQnVpbGRlcjo6aW5pdGlhbGl6 ZShjb25zdCBDb25zdHJhaW50cyYgY29uc3RyYWludHMpCiB7Ci0gICAgQVNTRVJUKG1faXNJbnRy aW5zaWNTaXppbmcgfHwgY29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUpOwotCi0gICAgSW5s aW5lTGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodCA9IDA7Ci0gICAgSW5saW5lTGF5b3V0VW5p dCBpbml0aWFsQmFzZWxpbmUgPSAwOwotICAgIGlmIChjb25zdHJhaW50cy5oZWlnaHRBbmRCYXNl bGluZSkgewotICAgICAgICBpbml0aWFsTGluZUhlaWdodCA9IGNvbnN0cmFpbnRzLmhlaWdodEFu ZEJhc2VsaW5lLT5oZWlnaHQ7Ci0gICAgICAgIGluaXRpYWxCYXNlbGluZSA9IGNvbnN0cmFpbnRz LmhlaWdodEFuZEJhc2VsaW5lLT5iYXNlbGluZTsKLSAgICB9Ci0KLSAgICBhdXRvIGxpbmVSZWN0 ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3BMZWZ0LCAwX2x1 LCBpbml0aWFsTGluZUhlaWdodCB9OwotICAgIGF1dG8gYXNjZW50QW5kRGVzY2VudCA9IEFzY2Vu dEFuZERlc2NlbnQgeyBpbml0aWFsQmFzZWxpbmUsIGluaXRpYWxMaW5lSGVpZ2h0IC0gaW5pdGlh bEJhc2VsaW5lIH07Ci0gICAgbV9saW5lQm94ID0gTGluZUJveCB7IGxpbmVSZWN0LCBhc2NlbnRB bmREZXNjZW50LCBpbml0aWFsQmFzZWxpbmUgfTsKICAgICBtX2xpbmVMb2dpY2FsV2lkdGggPSBj b25zdHJhaW50cy5hdmFpbGFibGVMb2dpY2FsV2lkdGg7CiAgICAgbV9oYXNJbnRydXNpdmVGbG9h dCA9IGNvbnN0cmFpbnRzLmxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAgICBhdXRvIGluaXRp YWxMaW5lSGVpZ2h0ID0gY29uc3RyYWludHMubGluZUhlaWdodDsKKyAgICBhdXRvIGxpbmVSZWN0 ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3BMZWZ0LCAwX2x1 LCBpbml0aWFsTGluZUhlaWdodCB9OworICAgIG1fbGluZUJveCA9IExpbmVCb3ggeyBsaW5lUmVj dCwgTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhyb290KCkuc3R5bGUoKS5mb250TWV0 cmljcygpLCBpbml0aWFsTGluZUhlaWdodCkgfTsKIAogICAgIHJlc2V0Q29udGVudCgpOwogfQpA QCAtNzE3LDYgKzcwOCwxMSBAQCBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgTGluZUJ1 aWxkZXI6OmZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QKICAgICByZXR1cm4gbV9pbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDsKIH0KIAorY29uc3QgQ29udGFpbmVyQm94JiBMaW5lQnVpbGRlcjo6cm9v dCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpOworfQor CiBMaW5lQnVpbGRlcjo6VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50OjpUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQoUnVuTGlzdCYgcnVucykKICAgICA6IG1fcnVucyhydW5zKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmgKaW5kZXggNTc0ZDE4Njg1MmI4YTBkZmFkODQ5YjI5MTY2MDcyYzhhNDdlMGFjOS4u ZGIzZWI4OTdjMmQ2MTg1MjUyNWJmMzhmNWU5OGYyZTk3NGE2ZjIzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5oCkBAIC00NiwxMiArNDYsOCBAQCBwdWJsaWM6CiAgICAgc3RydWN0IENvbnN0cmFpbnRz IHsKICAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQ7CiAgICAgICAgIElu bGluZUxheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoIHsgMCB9OworICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGxpbmVIZWlnaHQgeyAwIH07CiAgICAgICAgIGJvb2wgbGluZUlzQ29uc3Ry YWluZWRCeUZsb2F0IHsgZmFsc2UgfTsKLSAgICAgICAgc3RydWN0IEhlaWdodEFuZEJhc2VsaW5l IHsKLSAgICAgICAgICAgIElubGluZUxheW91dFVuaXQgaGVpZ2h0IHsgMCB9OwotICAgICAgICAg ICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSB7IDAgfTsKLSAgICAgICAgfTsKLSAgICAgICAg T3B0aW9uYWw8SGVpZ2h0QW5kQmFzZWxpbmU+IGhlaWdodEFuZEJhc2VsaW5lOwogICAgIH07CiAK ICAgICBlbnVtIGNsYXNzIEludHJpbnNpY1NpemluZyB7IE5vLCBZZXMgfTsKQEAgLTE5MSw2ICsx ODcsNyBAQCBwcml2YXRlOgogCiAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgY29uc3Q7 CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkg Y29uc3Q7CisgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3Q7CiAKICAgICBzdHJ1 Y3QgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50IHsKICAgICAgICAgVHJpbW1hYmxlVHJhaWxpbmdD b250ZW50KFJ1bkxpc3QmKTsK 407185 2020-08-25 06:24:27 -0700 2020-08-25 08:27:03 -0700 Patch bug-214785-20200825062427.patch text/plain 13598 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDMwZTMwOTFmMmNkZTg5 NTUxOWM2Y2FhMGZjMTdmMmRlNmJiNWIyYS4uNjk3N2RiZTExZWY3OGQ5ZGQ4MmEyY2E3MDc0Zjdm ZDVkNWI1YzZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA4LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUaGUgaW5p dGlhbCBhbGlnbm1lbnQgYmFzZWxpbmUgaXMgYWx3YXlzIHNldCBieSB0aGUgc3RydXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc4NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGp1c3QgdXNl IHRoZSBzdHJ1dCBhc2NlbnQgYXMgdGhlIGluaXRpYWwgYWxpZ25tZW50IGJhc2VsaW5lLgorCisg ICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojpyb290IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoRm9yQ29uc3RyYWludCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzOjppbml0aWFsTGluZUhlaWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJhaW50 cyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94 KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OnJvb3QgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjAtMDgtMjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBJbXBsZW1lbnQgUmVxdWVzdC9SZXNwb25zZSBjb25zdW1pbmcgYXMgRm9ybURhdGEK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNjc5ZTg2YmY2 ZWJiYjM4ZmFhZDFjYWVkZWI3ZmE1ZmU5ZTk2MDdjNi4uZTk0ZDZmNGZhNDE3NjNlZmI3NzM4MmQ4 Y2VhZWEzZGQ4ZjhlMmRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTEwNywxMSArMTA3LDExIEBAIHB1YmxpYzoKICAgICAgICAgVGFibGVOZWVkc0Fj Y2Vzc1RvVGFibGVXcmFwcGVyCiAgICAgfTsKICAgICBjb25zdCBEaXNwbGF5OjpCb3gmIGdlb21l dHJ5Rm9yQm94KGNvbnN0IEJveCYsIE9wdGlvbmFsPEVzY2FwZVJlYXNvbj4gPSBXVEY6Om51bGxv cHQpIGNvbnN0OworICAgIGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJu ICptX3Jvb3Q7IH0KIAogcHJvdGVjdGVkOgogICAgIHVzaW5nIExheW91dFF1ZXVlID0gVmVjdG9y PGNvbnN0IEJveCo+OwogCi0gICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyBy ZXR1cm4gKm1fcm9vdDsgfQogICAgIExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSgpIGNvbnN0Owog ICAgIGNvbnN0IEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyByZXR1 cm4gbV9mb3JtYXR0aW5nU3RhdGU7IH0KICAgICBGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdT dGF0ZSgpIHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0YXRlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKaW5kZXggYTVlYmY5MDI1YTUxZTdmM2ViMDgyMDVmM2Q5OTQzNDBkYjFj MTliMS4uYWIyNDY3ZWY5ZWRkNTBhZmJkMmU5NjQ2NTg4YjUzNWExMmVmMDQyNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBAIElubGluZUxh eW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhG b3JDb25zdHJhaW50KEluCiAgICAgYXV0byBsYXlvdXRSYW5nZSA9IExpbmVMYXlvdXRDb250ZXh0 OjpJbmxpbmVJdGVtUmFuZ2UgeyAwICwgaW5saW5lSXRlbXMuc2l6ZSgpIH07CiAgICAgd2hpbGUg KCFsYXlvdXRSYW5nZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gT25seSB0aGUgaG9yaXp0b25h bCBhdmFpbGFibGUgd2lkdGggaXMgY29uc3RyYWluZWQgd2hlbiBjb21wdXRpbmcgaW50cmluc2lj IHdpZHRoLgotICAgICAgICBsaW5lQnVpbGRlci5pbml0aWFsaXplKExpbmVCdWlsZGVyOjpDb25z dHJhaW50cyB7IHsgfSwgYXZhaWxhYmxlV2lkdGgsIGZhbHNlLCB7IH0gfSk7CisgICAgICAgIGxp bmVCdWlsZGVyLmluaXRpYWxpemUoTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzIHsgeyB9LCBhdmFp bGFibGVXaWR0aCwgeyB9LCBmYWxzZSB9KTsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9IGxp bmVMYXlvdXRDb250ZXh0LmxheW91dExpbmUobGluZUJ1aWxkZXIsIGxheW91dFJhbmdlLCB7IH0p OwogICAgICAgICBsYXlvdXRSYW5nZS5zdGFydCA9ICpsaW5lQ29udGVudC50cmFpbGluZ0lubGlu ZUl0ZW1JbmRleCArIDE7CiAgICAgICAgIC8vIEZJWE1FOiBVc2UgbGluZSBsb2dpY2FsIGxlZnQg YW5kIHJpZ2h0IHRvIHRha2UgZmxvYXRzIGludG8gYWNjb3VudC4KQEAgLTM5OCwxNCArMzk4LDE0 IEBAIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29u c3RyYWludHNGb3JMaW5lKGNvbnN0IEhvcml6CiB7CiAgICAgYXV0byBsaW5lTG9naWNhbExlZnQg PSBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbExlZnQ7CiAgICAgYXV0byBsaW5lTG9naWNh bFJpZ2h0ID0gbGluZUxvZ2ljYWxMZWZ0ICsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxX aWR0aDsKLSAgICBhdXRvIGxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IHF1aXJrcygpLmxpbmVIZWln aHRDb25zdHJhaW50cyhyb290KCkpOworICAgIGF1dG8gaW5pdGlhbExpbmVIZWlnaHQgPSBxdWly a3MoKS5pbml0aWFsTGluZUhlaWdodChyb290KCkpOwogICAgIGF1dG8gbGluZUlzQ29uc3RyYWlu ZWRCeUZsb2F0ID0gZmFsc2U7CiAKICAgICBhdXRvIGZsb2F0aW5nQ29udGV4dCA9IEZsb2F0aW5n Q29udGV4dCB7IHJvb3QoKSwgKnRoaXMsIGZvcm1hdHRpbmdTdGF0ZSgpLmZsb2F0aW5nU3RhdGUo KSB9OwogICAgIC8vIENoZWNrIGZvciBpbnRydWRpbmcgZmxvYXRzIGFuZCBhZGp1c3QgbG9naWNh bCBsZWZ0L2F2YWlsYWJsZSB3aWR0aCBmb3IgdGhpcyBsaW5lIGFjY29yZGluZ2x5LgogICAgIGlm ICghZmxvYXRpbmdDb250ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBGSVhNRTogQWRkIHN1 cHBvcnQgZm9yIHZhcmlhYmxlIGxpbmUgaGVpZ2h0LCB3aGVyZSB0aGUgaW50cnVzaXZlIGZsb2F0 cyBzaG91bGQgYmUgcHJvYmVkIGFzIHRoZSBsaW5lIGhlaWdodCBncm93cy4KLSAgICAgICAgYXV0 byBmbG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0 VW5pdChsaW5lTG9naWNhbFRvcCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGxpbmVI ZWlnaHRBbmRCYXNlbGluZS5oZWlnaHQpKTsKKyAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRz ID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRv cCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGluaXRpYWxMaW5lSGVpZ2h0KSk7CiAg ICAgICAgIC8vIENoZWNrIGlmIHRoZXNlIGNvbnN0cmFpbnRzIGFjdHVhbGx5IHB1dCBsaW1pdGF0 aW9uIG9uIHRoZSBsaW5lLgogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZs b2F0Q29uc3RyYWludHMubGVmdC0+eCA8PSBsaW5lTG9naWNhbExlZnQpCiAgICAgICAgICAgICBm bG9hdENvbnN0cmFpbnRzLmxlZnQgPSB7IH07CkBAIC00NjEsNyArNDYxLDcgQEAgTGluZUJ1aWxk ZXI6OkNvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0Zvckxp bmUoY29uc3QgSG9yaXoKICAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuY29tcHV0ZWRUZXh0SW5k ZW50KHJvb3QsIGhvcml6b250YWxDb25zdHJhaW50cykudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0 IHsgfSk7CiAgICAgfTsKICAgICBsaW5lTG9naWNhbExlZnQgKz0gY29tcHV0ZWRUZXh0SW5kZW50 KCk7Ci0gICAgcmV0dXJuIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyB7IHsgbGluZUxvZ2ljYWxM ZWZ0LCBsaW5lTG9naWNhbFRvcCB9LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0 LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQsIGxpbmVIZWlnaHRBbmRCYXNlbGluZSB9OworICAg IHJldHVybiBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHMgeyB7IGxpbmVMb2dpY2FsTGVmdCwgbGlu ZUxvZ2ljYWxUb3AgfSwgbGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5pdGlh bExpbmVIZWlnaHQsIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9OwogfQogCiB2b2lkIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlv dXRDb250ZXh0OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IEhvcml6b250YWxDb25z dHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmgKaW5kZXggYmMxOWIyZmZiOGJhM2I3NTZjMDg3ZGJlNDQ2YzMwZjI4MWIxNDRjYy4uZDIw YWE5ZWE5NjM4YWM1YmI1NjE1ZDljZWNhYTM5OGJlNjBlN2JiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC01MSw3ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgUXVp cmtzIDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MgewogICAgIHB1YmxpYzoKICAg ICAgICAgYm9vbCBsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBMaW5lQnVpbGRlcjo6 UnVuTGlzdCYpIGNvbnN0OwotICAgICAgICBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdo dEFuZEJhc2VsaW5lIGxpbmVIZWlnaHRDb25zdHJhaW50cyhjb25zdCBDb250YWluZXJCb3gmIGZv cm1hdHRpbmdSb290KSBjb25zdDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTGlu ZUhlaWdodChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdDsKIAogICAg IHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBlNmUx NTUxMTIxMjJiOTJkMTk3ODY1YjI2ZDQzZTNhNmUyMTI0YTdlLi42YWJhNDAwZWZjMTBkZjAxZjg2 OGY3NzlkY2U0NmNiY2M0ZGU0YWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRRdWlya3MuY3BwCkBAIC0yOCw5ICsyOCw2IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZP Uk1BVFRJTkdfQ09OVEVYVCkKIAotI2luY2x1ZGUgIklubGluZUxpbmVCdWlsZGVyLmgiCi0jaW5j bHVkZSAiTGF5b3V0U3RhdGUuaCIKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExh eW91dCB7CiAKQEAgLTcxLDI0ICs2OCwxMyBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpRdWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmVCdWlsZAogICAg IHJldHVybiB0cnVlOwogfQogCi1MaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJh c2VsaW5lIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJh aW50cyhjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdAorSW5saW5lTGF5 b3V0VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbml0aWFsTGluZUhlaWdo dChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdAogewotICAgIC8vIGNv bXB1dGVkTGluZUhlaWdodCB0YWtlcyBmb250LXNpemUgaW50byBhY2NvdW50IHdoZW4gbGluZS1o ZWlnaHQgaXMgbm90IHNldC4KLSAgICAvLyBTdHJ1dCBpcyB0aGUgaW1hZ2luYXJ5IGJveCB0aGF0 IHdlIHB1dCBvbiBldmVyeSBsaW5lLiBJdCBzZXRzIHRoZSBpbml0aWFsIHZlcnRpY2FsIGNvbnN0 cmFpbnRzIGZvciBlYWNoIG5ldyBsaW5lLgotICAgIElubGluZUxheW91dFVuaXQgc3RydXRIZWln aHQgPSBmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgIGF1 dG8gc3RydXRCYXNlbGluZSA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0 dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBzdHJ1dEhlaWdodCkuYXNjZW50OwotICAg IGlmIChsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCi0gICAgICAgIHJldHVybiB7IHN0 cnV0SGVpZ2h0LCBzdHJ1dEJhc2VsaW5lLCB7IH0gfTsKLQotICAgIGF1dG8gbGluZUhlaWdodCA9 IGZvcm1hdHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwotICAgIGlmIChsaW5lSGVpZ2h0 LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGF1dG8gaW5pdGlhbEJhc2VsaW5l ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgp LmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudDsKLSAgICAgICAgcmV0dXJuIHsgaW5pdGlhbEJh c2VsaW5lLCBpbml0aWFsQmFzZWxpbmUsIEFzY2VudEFuZERlc2NlbnQgeyBzdHJ1dEJhc2VsaW5l LCBzdHJ1dEhlaWdodCAtIHN0cnV0QmFzZWxpbmUgfSB9OwotICAgIH0KLSAgICAvLyBGSVhNRTog VGhlIG9ubHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRvIG1hdGNoIGN1 cnJlbnQgaW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgotICAgIElubGluZUxheW91dFVu aXQgaW5pdGlhbExpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0LmludFZhbHVlKCk7Ci0gICAgYXV0byBp bml0aWFsQmFzZWxpbmUgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRp bmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExpbmVIZWlnaHQpLmFzY2VudDsK LSAgICByZXR1cm4geyBpbml0aWFsTGluZUhlaWdodCwgaW5pdGlhbEJhc2VsaW5lLCBBc2NlbnRB bmREZXNjZW50IHsgc3RydXRCYXNlbGluZSwgc3RydXRIZWlnaHQgLSBzdHJ1dEJhc2VsaW5lIH0g fTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkTGluZUhlaWdodCA9IGZvcm1hdHRpbmdS b290LnN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7CisgICAgLy8gTmVnYXRpdmUgbGluZUhl aWdodCB2YWx1ZSBtZWFucyB0aGUgbGluZS1oZWlnaHQgaXMgbm90IHNldAorICAgIGlmIChsYXlv dXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkgfHwgIWZvcm1hdHRpbmdSb290LnN0eWxlKCkubGlu ZUhlaWdodCgpLmlzTmVnYXRpdmUoKSkKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVkTGluZUhlaWdo dDsKKyAgICByZXR1cm4gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5n Um9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIGNvbXB1dGVkTGluZUhlaWdodCkuaGVpZ2h0KCk7 CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA2ZGFhODNjNmJjZjQwZTIxNzc1MzI5MmUyNjJmMjE1 MTFlNGM4YWRmLi42NWJlZWYzZWJlN2IzMDdjNWVjNzJjNDY0MjhkM2ZhOGVjOWZlZTA0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKICAgICAgICAgQXNjZW50QW5kRGVz Y2VudCBhc2NlbnRBbmREZXNjZW50OwogICAgIH07CiAKLSAgICBMaW5lQm94KGNvbnN0IERpc3Bs YXk6OklubGluZVJlY3QmLCBjb25zdCBBc2NlbnRBbmREZXNjZW50JiwgSW5saW5lTGF5b3V0VW5p dCBhbGlnbm1lbnRCYXNlbGluZSk7CisgICAgTGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVS ZWN0JiwgY29uc3QgQXNjZW50QW5kRGVzY2VudCYpOwogICAgIExpbmVCb3goKSA9IGRlZmF1bHQ7 CiAKICAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsg cmV0dXJuIG1fcmVjdDsgfQpAQCAtMTI1LDkgKzEyNSw5IEBAIHByaXZhdGU6CiAgICAgSW5saW5l Qm94IG1fcm9vdElubGluZUJveDsKIH07CiAKLWlubGluZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0 IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQmIGFzY2Vu dEFuZERlc2NlbnQsIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUpCitpbmxpbmUg TGluZUJveDo6TGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBB c2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNjZW50KQogICAgIDogbV9yZWN0KHJlY3QpCi0g ICAgLCBtX2FsaWdubWVudEJhc2VsaW5lKGFsaWdubWVudEJhc2VsaW5lKQorICAgICwgbV9hbGln bm1lbnRCYXNlbGluZShhc2NlbnRBbmREZXNjZW50LmFzY2VudCkKICAgICAsIG1fcm9vdElubGlu ZUJveChhc2NlbnRBbmREZXNjZW50KQogewogI2lmIEFTU0VSVF9FTkFCTEVECmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5jcHAKaW5kZXggNWZhYTNiN2M2ODhjMzI3ODQ2YzQ1YmU2YzA1NWIzNGU0YTFjYWJh OC4uOGNmNTAxMDgzODk5MzU2Mzg1MmZlNmI2NDcyMzE2MTlhOTFkNDM1ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcApAQCAtNzksMjIgKzc5LDE2IEBAIExpbmVCdWlsZGVyOjp+TGluZUJ1aWxk ZXIoKQogCiB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IENvbnN0cmFpbnRzJiBj b25zdHJhaW50cykKIHsKLSAgICBBU1NFUlQobV9pc0ludHJpbnNpY1NpemluZyB8fCBjb25zdHJh aW50cy5oZWlnaHRBbmRCYXNlbGluZSk7Ci0KLSAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxM aW5lSGVpZ2h0ID0gMDsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxCYXNlbGluZSA9IDA7 Ci0gICAgaWYgKGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lKSB7Ci0gICAgICAgIG1faW5p dGlhbFN0cnV0ID0gY29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUtPnN0cnV0OwotICAgICAg ICBpbml0aWFsTGluZUhlaWdodCA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLT5oZWln aHQ7Ci0gICAgICAgIGluaXRpYWxCYXNlbGluZSA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2Vs aW5lLT5iYXNlbGluZTsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9pbml0aWFsU3RydXQgPSB7IH07 Ci0KLSAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFsTGluZUhlaWdodCB9OwotICAgIGF1dG8gYXNj ZW50QW5kRGVzY2VudCA9IEFzY2VudEFuZERlc2NlbnQgeyBpbml0aWFsQmFzZWxpbmUsIGluaXRp YWxMaW5lSGVpZ2h0IC0gaW5pdGlhbEJhc2VsaW5lIH07Ci0gICAgbV9saW5lQm94ID0gTGluZUJv eCB7IGxpbmVSZWN0LCBhc2NlbnRBbmREZXNjZW50LCBpbml0aWFsQmFzZWxpbmUgfTsKICAgICBt X2xpbmVMb2dpY2FsV2lkdGggPSBjb25zdHJhaW50cy5hdmFpbGFibGVMb2dpY2FsV2lkdGg7CiAg ICAgbV9oYXNJbnRydXNpdmVGbG9hdCA9IGNvbnN0cmFpbnRzLmxpbmVJc0NvbnN0cmFpbmVkQnlG bG9hdDsKKyAgICBhdXRvIGluaXRpYWxMaW5lSGVpZ2h0ID0gY29uc3RyYWludHMubGluZUhlaWdo dDsKKyAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFsTGluZUhlaWdodCB9OworICAgIGF1dG8gYXNj ZW50QW5kRGVzY2VudCA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3Mocm9vdCgpLnN0 eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExpbmVIZWlnaHQpOworICAgIG1fbGluZUJveCA9 IExpbmVCb3ggeyBsaW5lUmVjdCwgYXNjZW50QW5kRGVzY2VudCB9OworICAgIGlmICghbGF5b3V0 U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpKQorICAgICAgICBtX2luaXRpYWxTdHJ1dCA9IGFzY2Vu dEFuZERlc2NlbnQ7CisgICAgZWxzZQorICAgICAgICBtX2luaXRpYWxTdHJ1dCA9IHsgfTsKIAog ICAgIHJlc2V0Q29udGVudCgpOwogfQpAQCAtNzI3LDYgKzcyMSwxMSBAQCBjb25zdCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dCYgTGluZUJ1aWxkZXI6OmZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QK ICAgICByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKIH0KIAorY29uc3QgQ29udGFp bmVyQm94JiBMaW5lQnVpbGRlcjo6cm9vdCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZvcm1hdHRp bmdDb250ZXh0KCkucm9vdCgpOworfQorCiBMaW5lQnVpbGRlcjo6VHJpbW1hYmxlVHJhaWxpbmdD b250ZW50OjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQoUnVuTGlzdCYgcnVucykKICAgICA6IG1f cnVucyhydW5zKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggNDhkMmQ1MWZmYTEwNmM2ZmU2 NDQyYzY2YWMxNTlhZjRiOTMyMWZjMC4uZWJhMzA1N2M4YzkyYTZlNTUzMTAyNWRiZDI4ZTE4ODU4 NzI0OTNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC00NiwxMyArNDYsOCBAQCBwdWJsaWM6 CiAgICAgc3RydWN0IENvbnN0cmFpbnRzIHsKICAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9n aWNhbFRvcExlZnQ7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdp ZHRoIHsgMCB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVIZWlnaHQgeyAwIH07CiAg ICAgICAgIGJvb2wgbGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IHsgZmFsc2UgfTsKLSAgICAgICAg c3RydWN0IEhlaWdodEFuZEJhc2VsaW5lIHsKLSAgICAgICAgICAgIElubGluZUxheW91dFVuaXQg aGVpZ2h0IHsgMCB9OwotICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSB7IDAg fTsKLSAgICAgICAgICAgIE9wdGlvbmFsPEFzY2VudEFuZERlc2NlbnQ+IHN0cnV0OwotICAgICAg ICB9OwotICAgICAgICBPcHRpb25hbDxIZWlnaHRBbmRCYXNlbGluZT4gaGVpZ2h0QW5kQmFzZWxp bmU7CiAgICAgfTsKIAogICAgIGVudW0gY2xhc3MgSW50cmluc2ljU2l6aW5nIHsgTm8sIFllcyB9 OwpAQCAtMTkyLDYgKzE4Nyw3IEBAIHByaXZhdGU6CiAKICAgICBMYXlvdXRTdGF0ZSYgbGF5b3V0 U3RhdGUoKSBjb25zdDsKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0 dGluZ0NvbnRleHQoKSBjb25zdDsKKyAgICBjb25zdCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25z dDsKIAogICAgIHN0cnVjdCBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgewogICAgICAgICBUcmlt bWFibGVUcmFpbGluZ0NvbnRlbnQoUnVuTGlzdCYpOwo= 407190 2020-08-25 08:27:05 -0700 2020-08-25 09:39:16 -0700 Patch bug-214785-20200825082704.patch text/plain 13671 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDMwZTMwOTFmMmNkZTg5 NTUxOWM2Y2FhMGZjMTdmMmRlNmJiNWIyYS4uNjk3N2RiZTExZWY3OGQ5ZGQ4MmEyY2E3MDc0Zjdm ZDVkNWI1YzZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA4LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUaGUgaW5p dGlhbCBhbGlnbm1lbnQgYmFzZWxpbmUgaXMgYWx3YXlzIHNldCBieSB0aGUgc3RydXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc4NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIGp1c3QgdXNl IHRoZSBzdHJ1dCBhc2NlbnQgYXMgdGhlIGluaXRpYWwgYWxpZ25tZW50IGJhc2VsaW5lLgorCisg ICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojpyb290IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoRm9yQ29uc3RyYWludCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzOjppbml0aWFsTGluZUhlaWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJhaW50 cyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94 KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppbml0aWFsaXplKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OnJvb3QgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIw MjAtMDgtMjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBJbXBsZW1lbnQgUmVxdWVzdC9SZXNwb25zZSBjb25zdW1pbmcgYXMgRm9ybURhdGEK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNjc5ZTg2YmY2 ZWJiYjM4ZmFhZDFjYWVkZWI3ZmE1ZmU5ZTk2MDdjNi4uZTk0ZDZmNGZhNDE3NjNlZmI3NzM4MmQ4 Y2VhZWEzZGQ4ZjhlMmRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTEwNywxMSArMTA3LDExIEBAIHB1YmxpYzoKICAgICAgICAgVGFibGVOZWVkc0Fj Y2Vzc1RvVGFibGVXcmFwcGVyCiAgICAgfTsKICAgICBjb25zdCBEaXNwbGF5OjpCb3gmIGdlb21l dHJ5Rm9yQm94KGNvbnN0IEJveCYsIE9wdGlvbmFsPEVzY2FwZVJlYXNvbj4gPSBXVEY6Om51bGxv cHQpIGNvbnN0OworICAgIGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJu ICptX3Jvb3Q7IH0KIAogcHJvdGVjdGVkOgogICAgIHVzaW5nIExheW91dFF1ZXVlID0gVmVjdG9y PGNvbnN0IEJveCo+OwogCi0gICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyBy ZXR1cm4gKm1fcm9vdDsgfQogICAgIExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSgpIGNvbnN0Owog ICAgIGNvbnN0IEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyByZXR1 cm4gbV9mb3JtYXR0aW5nU3RhdGU7IH0KICAgICBGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdT dGF0ZSgpIHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0YXRlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKaW5kZXggYTVlYmY5MDI1YTUxZTdmM2ViMDgyMDVmM2Q5OTQzNDBkYjFj MTliMS4uYWIyNDY3ZWY5ZWRkNTBhZmJkMmU5NjQ2NTg4YjUzNWExMmVmMDQyNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjU2LDcgKzI1Niw3IEBAIElubGluZUxh eW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhG b3JDb25zdHJhaW50KEluCiAgICAgYXV0byBsYXlvdXRSYW5nZSA9IExpbmVMYXlvdXRDb250ZXh0 OjpJbmxpbmVJdGVtUmFuZ2UgeyAwICwgaW5saW5lSXRlbXMuc2l6ZSgpIH07CiAgICAgd2hpbGUg KCFsYXlvdXRSYW5nZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gT25seSB0aGUgaG9yaXp0b25h bCBhdmFpbGFibGUgd2lkdGggaXMgY29uc3RyYWluZWQgd2hlbiBjb21wdXRpbmcgaW50cmluc2lj IHdpZHRoLgotICAgICAgICBsaW5lQnVpbGRlci5pbml0aWFsaXplKExpbmVCdWlsZGVyOjpDb25z dHJhaW50cyB7IHsgfSwgYXZhaWxhYmxlV2lkdGgsIGZhbHNlLCB7IH0gfSk7CisgICAgICAgIGxp bmVCdWlsZGVyLmluaXRpYWxpemUoTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzIHsgeyB9LCBhdmFp bGFibGVXaWR0aCwgeyB9LCBmYWxzZSB9KTsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9IGxp bmVMYXlvdXRDb250ZXh0LmxheW91dExpbmUobGluZUJ1aWxkZXIsIGxheW91dFJhbmdlLCB7IH0p OwogICAgICAgICBsYXlvdXRSYW5nZS5zdGFydCA9ICpsaW5lQ29udGVudC50cmFpbGluZ0lubGlu ZUl0ZW1JbmRleCArIDE7CiAgICAgICAgIC8vIEZJWE1FOiBVc2UgbGluZSBsb2dpY2FsIGxlZnQg YW5kIHJpZ2h0IHRvIHRha2UgZmxvYXRzIGludG8gYWNjb3VudC4KQEAgLTM5OCwxNCArMzk4LDE0 IEBAIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29u c3RyYWludHNGb3JMaW5lKGNvbnN0IEhvcml6CiB7CiAgICAgYXV0byBsaW5lTG9naWNhbExlZnQg PSBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbExlZnQ7CiAgICAgYXV0byBsaW5lTG9naWNh bFJpZ2h0ID0gbGluZUxvZ2ljYWxMZWZ0ICsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxX aWR0aDsKLSAgICBhdXRvIGxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IHF1aXJrcygpLmxpbmVIZWln aHRDb25zdHJhaW50cyhyb290KCkpOworICAgIGF1dG8gaW5pdGlhbExpbmVIZWlnaHQgPSBxdWly a3MoKS5pbml0aWFsTGluZUhlaWdodChyb290KCkpOwogICAgIGF1dG8gbGluZUlzQ29uc3RyYWlu ZWRCeUZsb2F0ID0gZmFsc2U7CiAKICAgICBhdXRvIGZsb2F0aW5nQ29udGV4dCA9IEZsb2F0aW5n Q29udGV4dCB7IHJvb3QoKSwgKnRoaXMsIGZvcm1hdHRpbmdTdGF0ZSgpLmZsb2F0aW5nU3RhdGUo KSB9OwogICAgIC8vIENoZWNrIGZvciBpbnRydWRpbmcgZmxvYXRzIGFuZCBhZGp1c3QgbG9naWNh bCBsZWZ0L2F2YWlsYWJsZSB3aWR0aCBmb3IgdGhpcyBsaW5lIGFjY29yZGluZ2x5LgogICAgIGlm ICghZmxvYXRpbmdDb250ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBGSVhNRTogQWRkIHN1 cHBvcnQgZm9yIHZhcmlhYmxlIGxpbmUgaGVpZ2h0LCB3aGVyZSB0aGUgaW50cnVzaXZlIGZsb2F0 cyBzaG91bGQgYmUgcHJvYmVkIGFzIHRoZSBsaW5lIGhlaWdodCBncm93cy4KLSAgICAgICAgYXV0 byBmbG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0 VW5pdChsaW5lTG9naWNhbFRvcCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGxpbmVI ZWlnaHRBbmRCYXNlbGluZS5oZWlnaHQpKTsKKyAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRz ID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRv cCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGluaXRpYWxMaW5lSGVpZ2h0KSk7CiAg ICAgICAgIC8vIENoZWNrIGlmIHRoZXNlIGNvbnN0cmFpbnRzIGFjdHVhbGx5IHB1dCBsaW1pdGF0 aW9uIG9uIHRoZSBsaW5lLgogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZs b2F0Q29uc3RyYWludHMubGVmdC0+eCA8PSBsaW5lTG9naWNhbExlZnQpCiAgICAgICAgICAgICBm bG9hdENvbnN0cmFpbnRzLmxlZnQgPSB7IH07CkBAIC00NjEsNyArNDYxLDcgQEAgTGluZUJ1aWxk ZXI6OkNvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0Zvckxp bmUoY29uc3QgSG9yaXoKICAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuY29tcHV0ZWRUZXh0SW5k ZW50KHJvb3QsIGhvcml6b250YWxDb25zdHJhaW50cykudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0 IHsgfSk7CiAgICAgfTsKICAgICBsaW5lTG9naWNhbExlZnQgKz0gY29tcHV0ZWRUZXh0SW5kZW50 KCk7Ci0gICAgcmV0dXJuIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyB7IHsgbGluZUxvZ2ljYWxM ZWZ0LCBsaW5lTG9naWNhbFRvcCB9LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0 LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQsIGxpbmVIZWlnaHRBbmRCYXNlbGluZSB9OworICAg IHJldHVybiBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHMgeyB7IGxpbmVMb2dpY2FsTGVmdCwgbGlu ZUxvZ2ljYWxUb3AgfSwgbGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5pdGlh bExpbmVIZWlnaHQsIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9OwogfQogCiB2b2lkIElubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlv dXRDb250ZXh0OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IEhvcml6b250YWxDb25z dHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmgKaW5kZXggYmMxOWIyZmZiOGJhM2I3NTZjMDg3ZGJlNDQ2YzMwZjI4MWIxNDRjYy4uZDIw YWE5ZWE5NjM4YWM1YmI1NjE1ZDljZWNhYTM5OGJlNjBlN2JiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC01MSw3ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgUXVp cmtzIDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MgewogICAgIHB1YmxpYzoKICAg ICAgICAgYm9vbCBsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBMaW5lQnVpbGRlcjo6 UnVuTGlzdCYpIGNvbnN0OwotICAgICAgICBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdo dEFuZEJhc2VsaW5lIGxpbmVIZWlnaHRDb25zdHJhaW50cyhjb25zdCBDb250YWluZXJCb3gmIGZv cm1hdHRpbmdSb290KSBjb25zdDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTGlu ZUhlaWdodChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdDsKIAogICAg IHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBlNmUx NTUxMTIxMjJiOTJkMTk3ODY1YjI2ZDQzZTNhNmUyMTI0YTdlLi42YWJhNDAwZWZjMTBkZjAxZjg2 OGY3NzlkY2U0NmNiY2M0ZGU0YWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRRdWlya3MuY3BwCkBAIC0yOCw5ICsyOCw2IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZP Uk1BVFRJTkdfQ09OVEVYVCkKIAotI2luY2x1ZGUgIklubGluZUxpbmVCdWlsZGVyLmgiCi0jaW5j bHVkZSAiTGF5b3V0U3RhdGUuaCIKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExh eW91dCB7CiAKQEAgLTcxLDI0ICs2OCwxMyBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpRdWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmVCdWlsZAogICAg IHJldHVybiB0cnVlOwogfQogCi1MaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJh c2VsaW5lIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJh aW50cyhjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdAorSW5saW5lTGF5 b3V0VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbml0aWFsTGluZUhlaWdo dChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdAogewotICAgIC8vIGNv bXB1dGVkTGluZUhlaWdodCB0YWtlcyBmb250LXNpemUgaW50byBhY2NvdW50IHdoZW4gbGluZS1o ZWlnaHQgaXMgbm90IHNldC4KLSAgICAvLyBTdHJ1dCBpcyB0aGUgaW1hZ2luYXJ5IGJveCB0aGF0 IHdlIHB1dCBvbiBldmVyeSBsaW5lLiBJdCBzZXRzIHRoZSBpbml0aWFsIHZlcnRpY2FsIGNvbnN0 cmFpbnRzIGZvciBlYWNoIG5ldyBsaW5lLgotICAgIElubGluZUxheW91dFVuaXQgc3RydXRIZWln aHQgPSBmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgIGF1 dG8gc3RydXRCYXNlbGluZSA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0 dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBzdHJ1dEhlaWdodCkuYXNjZW50OwotICAg IGlmIChsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCi0gICAgICAgIHJldHVybiB7IHN0 cnV0SGVpZ2h0LCBzdHJ1dEJhc2VsaW5lLCB7IH0gfTsKLQotICAgIGF1dG8gbGluZUhlaWdodCA9 IGZvcm1hdHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwotICAgIGlmIChsaW5lSGVpZ2h0 LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGF1dG8gaW5pdGlhbEJhc2VsaW5l ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgp LmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudDsKLSAgICAgICAgcmV0dXJuIHsgaW5pdGlhbEJh c2VsaW5lLCBpbml0aWFsQmFzZWxpbmUsIEFzY2VudEFuZERlc2NlbnQgeyBzdHJ1dEJhc2VsaW5l LCBzdHJ1dEhlaWdodCAtIHN0cnV0QmFzZWxpbmUgfSB9OwotICAgIH0KLSAgICAvLyBGSVhNRTog VGhlIG9ubHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRvIG1hdGNoIGN1 cnJlbnQgaW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgotICAgIElubGluZUxheW91dFVu aXQgaW5pdGlhbExpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0LmludFZhbHVlKCk7Ci0gICAgYXV0byBp bml0aWFsQmFzZWxpbmUgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRp bmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExpbmVIZWlnaHQpLmFzY2VudDsK LSAgICByZXR1cm4geyBpbml0aWFsTGluZUhlaWdodCwgaW5pdGlhbEJhc2VsaW5lLCBBc2NlbnRB bmREZXNjZW50IHsgc3RydXRCYXNlbGluZSwgc3RydXRIZWlnaHQgLSBzdHJ1dEJhc2VsaW5lIH0g fTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkTGluZUhlaWdodCA9IGZvcm1hdHRpbmdS b290LnN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7CisgICAgLy8gTmVnYXRpdmUgbGluZUhl aWdodCB2YWx1ZSBtZWFucyB0aGUgbGluZS1oZWlnaHQgaXMgbm90IHNldAorICAgIGlmIChsYXlv dXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkgfHwgIWZvcm1hdHRpbmdSb290LnN0eWxlKCkubGlu ZUhlaWdodCgpLmlzTmVnYXRpdmUoKSkKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVkTGluZUhlaWdo dDsKKyAgICByZXR1cm4gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmljcyhmb3JtYXR0aW5n Um9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIGNvbXB1dGVkTGluZUhlaWdodCkuaGVpZ2h0KCk7 CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA2ZGFhODNjNmJjZjQwZTIxNzc1MzI5MmUyNjJmMjE1 MTFlNGM4YWRmLi42NWJlZWYzZWJlN2IzMDdjNWVjNzJjNDY0MjhkM2ZhOGVjOWZlZTA0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKICAgICAgICAgQXNjZW50QW5kRGVz Y2VudCBhc2NlbnRBbmREZXNjZW50OwogICAgIH07CiAKLSAgICBMaW5lQm94KGNvbnN0IERpc3Bs YXk6OklubGluZVJlY3QmLCBjb25zdCBBc2NlbnRBbmREZXNjZW50JiwgSW5saW5lTGF5b3V0VW5p dCBhbGlnbm1lbnRCYXNlbGluZSk7CisgICAgTGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVS ZWN0JiwgY29uc3QgQXNjZW50QW5kRGVzY2VudCYpOwogICAgIExpbmVCb3goKSA9IGRlZmF1bHQ7 CiAKICAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsg cmV0dXJuIG1fcmVjdDsgfQpAQCAtMTI1LDkgKzEyNSw5IEBAIHByaXZhdGU6CiAgICAgSW5saW5l Qm94IG1fcm9vdElubGluZUJveDsKIH07CiAKLWlubGluZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0 IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQmIGFzY2Vu dEFuZERlc2NlbnQsIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUpCitpbmxpbmUg TGluZUJveDo6TGluZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBB c2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNjZW50KQogICAgIDogbV9yZWN0KHJlY3QpCi0g ICAgLCBtX2FsaWdubWVudEJhc2VsaW5lKGFsaWdubWVudEJhc2VsaW5lKQorICAgICwgbV9hbGln bm1lbnRCYXNlbGluZShhc2NlbnRBbmREZXNjZW50LmFzY2VudCkKICAgICAsIG1fcm9vdElubGlu ZUJveChhc2NlbnRBbmREZXNjZW50KQogewogI2lmIEFTU0VSVF9FTkFCTEVECmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5jcHAKaW5kZXggNWZhYTNiN2M2ODhjMzI3ODQ2YzQ1YmU2YzA1NWIzNGU0YTFjYWJh OC4uNmNjZjIyZjY4MmNhYmFjODE4MzRhNTdiOTg5MDBmNDA0ZDBmMzVkNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcApAQCAtNzksMjIgKzc5LDE2IEBAIExpbmVCdWlsZGVyOjp+TGluZUJ1aWxk ZXIoKQogCiB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IENvbnN0cmFpbnRzJiBj b25zdHJhaW50cykKIHsKLSAgICBBU1NFUlQobV9pc0ludHJpbnNpY1NpemluZyB8fCBjb25zdHJh aW50cy5oZWlnaHRBbmRCYXNlbGluZSk7Ci0KLSAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxM aW5lSGVpZ2h0ID0gMDsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxCYXNlbGluZSA9IDA7 Ci0gICAgaWYgKGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lKSB7Ci0gICAgICAgIG1faW5p dGlhbFN0cnV0ID0gY29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUtPnN0cnV0OwotICAgICAg ICBpbml0aWFsTGluZUhlaWdodCA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLT5oZWln aHQ7Ci0gICAgICAgIGluaXRpYWxCYXNlbGluZSA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2Vs aW5lLT5iYXNlbGluZTsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9pbml0aWFsU3RydXQgPSB7IH07 Ci0KLSAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFsTGluZUhlaWdodCB9OwotICAgIGF1dG8gYXNj ZW50QW5kRGVzY2VudCA9IEFzY2VudEFuZERlc2NlbnQgeyBpbml0aWFsQmFzZWxpbmUsIGluaXRp YWxMaW5lSGVpZ2h0IC0gaW5pdGlhbEJhc2VsaW5lIH07Ci0gICAgbV9saW5lQm94ID0gTGluZUJv eCB7IGxpbmVSZWN0LCBhc2NlbnRBbmREZXNjZW50LCBpbml0aWFsQmFzZWxpbmUgfTsKICAgICBt X2xpbmVMb2dpY2FsV2lkdGggPSBjb25zdHJhaW50cy5hdmFpbGFibGVMb2dpY2FsV2lkdGg7CiAg ICAgbV9oYXNJbnRydXNpdmVGbG9hdCA9IGNvbnN0cmFpbnRzLmxpbmVJc0NvbnN0cmFpbmVkQnlG bG9hdDsKKyAgICBhdXRvIGluaXRpYWxMaW5lSGVpZ2h0ID0gY29uc3RyYWludHMubGluZUhlaWdo dDsKKyAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFsTGluZUhlaWdodCB9OworICAgIGF1dG8gYXNj ZW50QW5kRGVzY2VudCA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3Mocm9vdCgpLnN0 eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExpbmVIZWlnaHQpOworICAgIG1fbGluZUJveCA9 IExpbmVCb3ggeyBsaW5lUmVjdCwgYXNjZW50QW5kRGVzY2VudCB9OworICAgIGlmICghbGF5b3V0 U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpKQorICAgICAgICBtX2luaXRpYWxTdHJ1dCA9IEFzY2Vu dEFuZERlc2NlbnQgeyBhc2NlbnRBbmREZXNjZW50LmFzY2VudCwgaW5pdGlhbExpbmVIZWlnaHQg LSBhc2NlbnRBbmREZXNjZW50LmFzY2VudCB9OworICAgIGVsc2UKKyAgICAgICAgbV9pbml0aWFs U3RydXQgPSB7IH07CiAKICAgICByZXNldENvbnRlbnQoKTsKIH0KQEAgLTcyNyw2ICs3MjEsMTEg QEAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIExpbmVCdWlsZGVyOjpmb3JtYXR0aW5n Q29udGV4dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiB9 CiAKK2NvbnN0IENvbnRhaW5lckJveCYgTGluZUJ1aWxkZXI6OnJvb3QoKSBjb25zdAoreworICAg IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKTsKK30KKwogTGluZUJ1aWxkZXI6OlRy aW1tYWJsZVRyYWlsaW5nQ29udGVudDo6VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50KFJ1bkxpc3Qm IHJ1bnMpCiAgICAgOiBtX3J1bnMocnVucykKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDQ4 ZDJkNTFmZmExMDZjNmZlNjQ0MmM2NmFjMTU5YWY0YjkzMjFmYzAuLmViYTMwNTdjOGM5MmE2ZTU1 MzEwMjVkYmQyOGUxODg1ODcyNDkzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtNDYsMTMg KzQ2LDggQEAgcHVibGljOgogICAgIHN0cnVjdCBDb25zdHJhaW50cyB7CiAgICAgICAgIElubGlu ZUxheW91dFBvaW50IGxvZ2ljYWxUb3BMZWZ0OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGF2 YWlsYWJsZUxvZ2ljYWxXaWR0aCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5l SGVpZ2h0IHsgMCB9OwogICAgICAgICBib29sIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZh bHNlIH07Ci0gICAgICAgIHN0cnVjdCBIZWlnaHRBbmRCYXNlbGluZSB7Ci0gICAgICAgICAgICBJ bmxpbmVMYXlvdXRVbml0IGhlaWdodCB7IDAgfTsKLSAgICAgICAgICAgIElubGluZUxheW91dFVu aXQgYmFzZWxpbmUgeyAwIH07Ci0gICAgICAgICAgICBPcHRpb25hbDxBc2NlbnRBbmREZXNjZW50 PiBzdHJ1dDsKLSAgICAgICAgfTsKLSAgICAgICAgT3B0aW9uYWw8SGVpZ2h0QW5kQmFzZWxpbmU+ IGhlaWdodEFuZEJhc2VsaW5lOwogICAgIH07CiAKICAgICBlbnVtIGNsYXNzIEludHJpbnNpY1Np emluZyB7IE5vLCBZZXMgfTsKQEAgLTE5Miw2ICsxODcsNyBAQCBwcml2YXRlOgogCiAgICAgTGF5 b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgY29uc3Q7CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3Q7CisgICAgY29uc3QgQ29udGFpbmVy Qm94JiByb290KCkgY29uc3Q7CiAKICAgICBzdHJ1Y3QgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50 IHsKICAgICAgICAgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50KFJ1bkxpc3QmKTsK