237492 2022-03-04 20:28:54 -0800 [LFC][Integration] RenderInline should use ADD_REASONS_AND_RETURN_IF_NEEDED 2022-03-05 08:28:16 -0800 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 1848480 0 zalan 2022-03-04 20:28:54 -0800 ssia 1848482 1 453892 zalan 2022-03-04 20:31:29 -0800 Created attachment 453892 Patch 1848527 2 ews-feeder 2022-03-05 08:27:48 -0800 Committed r290866 (248097@main): <https://commits.webkit.org/248097@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453892. 1848528 3 webkit-bug-importer 2022-03-05 08:28:16 -0800 <rdar://problem/89857629> 453892 2022-03-04 20:31:29 -0800 2022-03-05 08:27:49 -0800 Patch bug-237492-20220304203128.patch text/plain 10166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhmZmZkY2NjZTlmY2Vk NDg1ZWRmMDdmOWIyNTg1M2ZlZDA1ODljOS4uYmNiMmEwZWVlOTkxYWZkMDFkM2M5NDA3OWQ5YzRl NTY5NjUzM2NjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAzLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g UmVuZGVySW5saW5lIHNob3VsZCB1c2UgQUREX1JFQVNPTlNfQU5EX1JFVFVSTl9JRl9ORUVERUQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ5Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnRlbnQg aW5zaWRlIFJlbmRlcklubGluZSBzaG91bGQgYmUgYWNjb3VudGVkIGZvciB3aGVuIGNvbGxlY3Rp bmcgY292ZXJhZ2UgaW5mb3JtYXRpb24uCisgICAgICAgIChUaGlzIHBhdGNoIGFsc28gaGFzIGEg Yml0IG9mIGEgcHJpbnRNb2Rlcm5MaW5lTGF5b3V0Q292ZXJhZ2UmY28gcmVmYWN0b3JpbmcuKQor CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnByaW50VGV4dEZvclN1 YnRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNvbnRlbnRMZW5n dGhGb3JTdWJ0cmVlU3RheVdpdGhpbkJsb2NrRmxvdyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6Y29udGVudExlbmd0aEZvckJsb2NrRmxvdyk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cHJpbnRNb2Rlcm5MaW5lTGF5b3V0QmxvY2tMaXN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpwcmludE1vZGVybkxpbmVMYXlv dXRDb3ZlcmFnZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y2FuVXNl Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnRleHRMZW5n dGhGb3JTdWJ0cmVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpjb2xsZWN0Tm9uRW1wdHlMZWFmUmVuZGVyQmxvY2tGbG93cyk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y29sbGVjdE5vbkVtcHR5TGVhZlJlbmRl ckJsb2NrRmxvd3NGb3JDdXJyZW50UGFnZSk6IERlbGV0ZWQuCisKIDIwMjItMDMtMDMgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRWxlbWVudCB3aXRo IHBvc2l0aW9uOiBzdGlja3kgYWZ0ZXIgc3RpY2tpbmcsIHN0YXJ0cyB0byBtb3ZlIGluY29ycmVj dGx5IHdoZW4gc2Nyb2xsaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKaW5kZXggYWM4 YmFkOGE1ZmUwM2RlODFhZjNlMmU1MTZhMGM1ZGVkY2M3ZGMyOS4uOWMxYWZlYzZjMGNlY2U3ZDI3 ZTZiNzliMDA4ZjIxYWZhOTE5MmY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcApA QCAtMjA4LDc4ICsyMDgsNjkgQEAgc3RhdGljIHZvaWQgcHJpbnRSZWFzb25zKE9wdGlvblNldDxB dm9pZGFuY2VSZWFzb24+IHJlYXNvbnMsIFRleHRTdHJlYW0mIHN0cmVhbSkKICAgICB9CiB9CiAK LXN0YXRpYyB2b2lkIHByaW50VGV4dEZvclN1YnRyZWUoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5k ZXJlciwgdW5zaWduZWQmIGNoYXJhY3RlcnNMZWZ0LCBUZXh0U3RyZWFtJiBzdHJlYW0pCitzdGF0 aWMgdm9pZCBwcmludFRleHRGb3JTdWJ0cmVlKGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRlcmVy LCB1bnNpZ25lZCYgY2hhcmFjdGVyc0xlZnQsIFRleHRTdHJlYW0mIHN0cmVhbSkKIHsKLSAgICBp ZiAoIWNoYXJhY3RlcnNMZWZ0KQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKGlzPFJlbmRlclRl eHQ+KHJlbmRlcmVyKSkgewotICAgICAgICBTdHJpbmcgdGV4dCA9IGRvd25jYXN0PFJlbmRlclRl eHQ+KHJlbmRlcmVyKS50ZXh0KCk7Ci0gICAgICAgIHRleHQgPSB0ZXh0LnN0cmlwV2hpdGVTcGFj ZSgpOwotICAgICAgICB1bnNpZ25lZCBsZW4gPSBzdGQ6Om1pbihjaGFyYWN0ZXJzTGVmdCwgdGV4 dC5sZW5ndGgoKSk7Ci0gICAgICAgIHN0cmVhbSA8PCB0ZXh0LmxlZnQobGVuKTsKLSAgICAgICAg Y2hhcmFjdGVyc0xlZnQgLT0gbGVuOwotICAgICAgICByZXR1cm47CisgICAgZm9yIChhdXRvJiBj aGlsZCA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oZG93bmNhc3Q8UmVuZGVyRWxlbWVu dD4ocmVuZGVyZXIpKSkgeworICAgICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oY2hpbGQpKSB7Cisg ICAgICAgICAgICBTdHJpbmcgdGV4dCA9IGRvd25jYXN0PFJlbmRlclRleHQ+KGNoaWxkKS50ZXh0 KCk7CisgICAgICAgICAgICB0ZXh0ID0gdGV4dC5zdHJpcFdoaXRlU3BhY2UoKTsKKyAgICAgICAg ICAgIGF1dG8gbGVuID0gc3RkOjptaW4oY2hhcmFjdGVyc0xlZnQsIHRleHQubGVuZ3RoKCkpOwor ICAgICAgICAgICAgc3RyZWFtIDw8IHRleHQubGVmdChsZW4pOworICAgICAgICAgICAgY2hhcmFj dGVyc0xlZnQgLT0gbGVuOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAg ICAgcHJpbnRUZXh0Rm9yU3VidHJlZShkb3duY2FzdDxSZW5kZXJFbGVtZW50PihjaGlsZCksIGNo YXJhY3RlcnNMZWZ0LCBzdHJlYW0pOwogICAgIH0KLSAgICBpZiAoIWlzPFJlbmRlckVsZW1lbnQ+ KHJlbmRlcmVyKSkKLSAgICAgICAgcmV0dXJuOwotICAgIGZvciAoY29uc3QgYXV0byogY2hpbGQg PSBkb3duY2FzdDxSZW5kZXJFbGVtZW50PihyZW5kZXJlcikuZmlyc3RDaGlsZCgpOyBjaGlsZDsg Y2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAgcHJpbnRUZXh0Rm9yU3VidHJl ZSgqY2hpbGQsIGNoYXJhY3RlcnNMZWZ0LCBzdHJlYW0pOwogfQogCi1zdGF0aWMgdW5zaWduZWQg dGV4dExlbmd0aEZvclN1YnRyZWUoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlcikKK3N0YXRp YyB1bnNpZ25lZCBjb250ZW50TGVuZ3RoRm9yU3VidHJlZVN0YXlXaXRoaW5CbG9ja0Zsb3coY29u c3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCiB7Ci0gICAgaWYgKGlzPFJlbmRlclRleHQ+KHJl bmRlcmVyKSkKLSAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRleHQ+KHJlbmRlcmVyKS50 ZXh0KCkubGVuZ3RoKCk7Ci0gICAgaWYgKCFpczxSZW5kZXJFbGVtZW50PihyZW5kZXJlcikpCi0g ICAgICAgIHJldHVybiAwOwogICAgIHVuc2lnbmVkIHRleHRMZW5ndGggPSAwOwotICAgIGZvciAo Y29uc3QgYXV0byogY2hpbGQgPSBkb3duY2FzdDxSZW5kZXJFbGVtZW50PihyZW5kZXJlcikuZmly c3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAg dGV4dExlbmd0aCArPSB0ZXh0TGVuZ3RoRm9yU3VidHJlZSgqY2hpbGQpOworICAgIGZvciAoYXV0 byYgY2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KHJlbmRlcmVyKSkgeworICAg ICAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93PihjaGlsZCkpIHsKKyAgICAgICAgICAgIC8vIERv IG5vdCBkZXNjZW5kIGludG8gbmVzdGVkIFJlbmRlckJsb2NrRmxvdy4KKyAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZCkpIHsK KyAgICAgICAgICAgIHRleHRMZW5ndGggKz0gZG93bmNhc3Q8UmVuZGVyVGV4dD4oY2hpbGQpLnRl eHQoKS5sZW5ndGgoKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAg IHRleHRMZW5ndGggKz0gY29udGVudExlbmd0aEZvclN1YnRyZWVTdGF5V2l0aGluQmxvY2tGbG93 KGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KGNoaWxkKSk7CisgICAgfQogICAgIHJldHVybiB0ZXh0 TGVuZ3RoOwogfQogCi1zdGF0aWMgdm9pZCBjb2xsZWN0Tm9uRW1wdHlMZWFmUmVuZGVyQmxvY2tG bG93cyhjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBIYXNoU2V0PGNvbnN0IFJlbmRlckJs b2NrRmxvdyo+JiBsZWFmUmVuZGVyZXJzKQorc3RhdGljIHVuc2lnbmVkIGNvbnRlbnRMZW5ndGhG b3JCbG9ja0Zsb3coY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3cpCiB7Ci0gICAgaWYg KGlzPFJlbmRlclRleHQ+KHJlbmRlcmVyKSkgewotICAgICAgICBpZiAoIWRvd25jYXN0PFJlbmRl clRleHQ+KHJlbmRlcmVyKS50ZXh0KCkubGVuZ3RoKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIC8vIEZpbmQgUmVuZGVyQmxvY2tGbG93IGFuY2VzdG9yLgotICAgICAgICBmb3IgKGNv bnN0IGF1dG8qIGN1cnJlbnQgPSByZW5kZXJlci5wYXJlbnQoKTsgY3VycmVudDsgY3VycmVudCA9 IGN1cnJlbnQtPnBhcmVudCgpKSB7Ci0gICAgICAgICAgICBpZiAoIWlzPFJlbmRlckJsb2NrRmxv dz4oY3VycmVudCkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBsZWFm UmVuZGVyZXJzLmFkZChkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KGN1cnJlbnQpKTsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgaWYg KCFpczxSZW5kZXJFbGVtZW50PihyZW5kZXJlcikpCi0gICAgICAgIHJldHVybjsKLSAgICBmb3Ig KGNvbnN0IGF1dG8qIGNoaWxkID0gZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4ocmVuZGVyZXIpLmZp cnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCi0gICAgICAg IGNvbGxlY3ROb25FbXB0eUxlYWZSZW5kZXJCbG9ja0Zsb3dzKCpjaGlsZCwgbGVhZlJlbmRlcmVy cyk7CisgICAgcmV0dXJuIGNvbnRlbnRMZW5ndGhGb3JTdWJ0cmVlU3RheVdpdGhpbkJsb2NrRmxv dyhibG9ja0Zsb3cpOwogfQogCi1zdGF0aWMgdm9pZCBjb2xsZWN0Tm9uRW1wdHlMZWFmUmVuZGVy QmxvY2tGbG93c0ZvckN1cnJlbnRQYWdlKEhhc2hTZXQ8Y29uc3QgUmVuZGVyQmxvY2tGbG93Kj4m IGxlYWZSZW5kZXJlcnMpCitzdGF0aWMgVmVjdG9yPGNvbnN0IFJlbmRlckJsb2NrRmxvdyo+IGNv bGxlY3RSZW5kZXJCbG9ja0Zsb3dzRm9yQ3VycmVudFBhZ2UoKQogeworICAgIFZlY3Rvcjxjb25z dCBSZW5kZXJCbG9ja0Zsb3cqPiByZW5kZXJGbG93czsKICAgICBmb3IgKGNvbnN0IGF1dG8qIGRv Y3VtZW50IDogRG9jdW1lbnQ6OmFsbERvY3VtZW50cygpKSB7CiAgICAgICAgIGlmICghZG9jdW1l bnQtPnJlbmRlclZpZXcoKSB8fCBkb2N1bWVudC0+YmFja0ZvcndhcmRDYWNoZVN0YXRlKCkgIT0g RG9jdW1lbnQ6Ok5vdEluQmFja0ZvcndhcmRDYWNoZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICBpZiAoIWRvY3VtZW50LT5pc0hUTUxEb2N1bWVudCgpICYmICFkb2N1bWVudC0+aXNY SFRNTERvY3VtZW50KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgY29sbGVjdE5v bkVtcHR5TGVhZlJlbmRlckJsb2NrRmxvd3MoKmRvY3VtZW50LT5yZW5kZXJWaWV3KCksIGxlYWZS ZW5kZXJlcnMpOworICAgICAgICBmb3IgKGF1dG8mIGRlc2NlbmRhbnQgOiBkZXNjZW5kYW50c09m VHlwZTxSZW5kZXJCbG9ja0Zsb3c+KCpkb2N1bWVudC0+cmVuZGVyVmlldygpKSkgeworICAgICAg ICAgICAgaWYgKGRlc2NlbmRhbnQuY2hpbGRyZW5JbmxpbmUoKSkKKyAgICAgICAgICAgICAgICBy ZW5kZXJGbG93cy5hcHBlbmQoJmRlc2NlbmRhbnQpOworICAgICAgICB9CiAgICAgfQorICAgIHJl dHVybiByZW5kZXJGbG93czsKIH0KIAogc3RhdGljIHZvaWQgcHJpbnRNb2Rlcm5MaW5lTGF5b3V0 QmxvY2tMaXN0KHZvaWQpCiB7Ci0gICAgSGFzaFNldDxjb25zdCBSZW5kZXJCbG9ja0Zsb3cqPiBs ZWFmUmVuZGVyZXJzOwotICAgIGNvbGxlY3ROb25FbXB0eUxlYWZSZW5kZXJCbG9ja0Zsb3dzRm9y Q3VycmVudFBhZ2UobGVhZlJlbmRlcmVycyk7Ci0gICAgaWYgKCFsZWFmUmVuZGVyZXJzLnNpemUo KSkgeworICAgIGF1dG8gcmVuZGVyQmxvY2tGbG93cyA9IGNvbGxlY3RSZW5kZXJCbG9ja0Zsb3dz Rm9yQ3VycmVudFBhZ2UoKTsKKyAgICBpZiAoIXJlbmRlckJsb2NrRmxvd3Muc2l6ZSgpKSB7CiAg ICAgICAgIFdURkxvZ0Fsd2F5cygiTm8gdGV4dCBmb3VuZCBpbiB0aGlzIGRvY3VtZW50XG4iKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBUZXh0U3RyZWFtIHN0cmVhbTsKICAgICBzdHJl YW0gPDwgIi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LVxuIjsKLSAgICBmb3IgKGNvbnN0IGF1dG8qIGZsb3cgOiBsZWFmUmVuZGVyZXJzKSB7CisgICAg Zm9yIChhdXRvKiBmbG93IDogcmVuZGVyQmxvY2tGbG93cykgewogICAgICAgICBhdXRvIHJlYXNv bnMgPSBjYW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbigqZmxvdywgSW5jbHVkZVJlYXNvbnM6 OkFsbCk7CiAgICAgICAgIGlmIChyZWFzb25zLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRp bnVlOwpAQCAtMjg4LDcgKzI3OSw3IEBAIHN0YXRpYyB2b2lkIHByaW50TW9kZXJuTGluZUxheW91 dEJsb2NrTGlzdCh2b2lkKQogICAgICAgICBwcmludFRleHRGb3JTdWJ0cmVlKCpmbG93LCBwcmlu dGVkTGVuZ3RoLCBzdHJlYW0pOwogICAgICAgICBmb3IgKDtwcmludGVkTGVuZ3RoID4gMDsgLS1w cmludGVkTGVuZ3RoKQogICAgICAgICAgICAgc3RyZWFtIDw8ICIgIjsKLSAgICAgICAgc3RyZWFt IDw8ICJcIigiIDw8IHRleHRMZW5ndGhGb3JTdWJ0cmVlKCpmbG93KSA8PCAiKToiOworICAgICAg ICBzdHJlYW0gPDwgIlwiKCIgPDwgY29udGVudExlbmd0aEZvckJsb2NrRmxvdygqZmxvdykgPDwg Iik6IjsKICAgICAgICAgcHJpbnRSZWFzb25zKHJlYXNvbnMsIHN0cmVhbSk7CiAgICAgICAgIHN0 cmVhbSA8PCAiXG4iOwogICAgIH0KQEAgLTI5OCw5ICsyODksOCBAQCBzdGF0aWMgdm9pZCBwcmlu dE1vZGVybkxpbmVMYXlvdXRCbG9ja0xpc3Qodm9pZCkKIAogc3RhdGljIHZvaWQgcHJpbnRNb2Rl cm5MaW5lTGF5b3V0Q292ZXJhZ2Uodm9pZCkKIHsKLSAgICBIYXNoU2V0PGNvbnN0IFJlbmRlckJs b2NrRmxvdyo+IGxlYWZSZW5kZXJlcnM7Ci0gICAgY29sbGVjdE5vbkVtcHR5TGVhZlJlbmRlckJs b2NrRmxvd3NGb3JDdXJyZW50UGFnZShsZWFmUmVuZGVyZXJzKTsKLSAgICBpZiAoIWxlYWZSZW5k ZXJlcnMuc2l6ZSgpKSB7CisgICAgYXV0byByZW5kZXJCbG9ja0Zsb3dzID0gY29sbGVjdFJlbmRl ckJsb2NrRmxvd3NGb3JDdXJyZW50UGFnZSgpOworICAgIGlmICghcmVuZGVyQmxvY2tGbG93cy5z aXplKCkpIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCJObyB0ZXh0IGZvdW5kIGluIHRoaXMgZG9j dW1lbnRcbiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMzExLDggKzMwMSw4IEBAIHN0 YXRpYyB2b2lkIHByaW50TW9kZXJuTGluZUxheW91dENvdmVyYWdlKHZvaWQpCiAgICAgdW5zaWdu ZWQgbnVtYmVyT2ZVbnN1cHBvcnRlZExlYWZCbG9ja3MgPSAwOwogICAgIHVuc2lnbmVkIHN1cHBv cnRlZEJ1dEZvcmNlZFRvTGluZUxheW91dFRleHRMZW5ndGggPSAwOwogICAgIHVuc2lnbmVkIG51 bWJlck9mU3VwcG9ydGVkQnV0Rm9yY2VkVG9MaW5lTGF5b3V0TGVhZkJsb2NrcyA9IDA7Ci0gICAg Zm9yIChjb25zdCBhdXRvKiBmbG93IDogbGVhZlJlbmRlcmVycykgewotICAgICAgICBhdXRvIGZs b3dMZW5ndGggPSB0ZXh0TGVuZ3RoRm9yU3VidHJlZSgqZmxvdyk7CisgICAgZm9yIChhdXRvKiBm bG93IDogcmVuZGVyQmxvY2tGbG93cykgeworICAgICAgICBhdXRvIGZsb3dMZW5ndGggPSBjb250 ZW50TGVuZ3RoRm9yQmxvY2tGbG93KCpmbG93KTsKICAgICAgICAgdGV4dExlbmd0aCArPSBmbG93 TGVuZ3RoOwogICAgICAgICBhdXRvIHJlYXNvbnMgPSBjYW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJl YXNvbigqZmxvdywgSW5jbHVkZVJlYXNvbnM6OkFsbCk7CiAgICAgICAgIGlmIChyZWFzb25zLmlz RW1wdHkoKSkgewpAQCAtMzIyLDYgKzMxMiw4IEBAIHN0YXRpYyB2b2lkIHByaW50TW9kZXJuTGlu ZUxheW91dENvdmVyYWdlKHZvaWQpCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQorICAgICAgICBpZiAocmVhc29ucy5jb250YWlucyhBdm9pZGFuY2VSZWFz b246OkZsb3dEb2VzTm90RXN0YWJsaXNoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpKQorICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICsrbnVtYmVyT2ZVbnN1cHBvcnRlZExlYWZCbG9ja3M7 CiAgICAgICAgIHVuc3VwcG9ydGVkVGV4dExlbmd0aCArPSBmbG93TGVuZ3RoOwogICAgICAgICBm b3IgKGF1dG8gcmVhc29uIDogcmVhc29ucykgewpAQCAtMzM3LDcgKzMyOSw3IEBAIHN0YXRpYyB2 b2lkIHByaW50TW9kZXJuTGluZUxheW91dENvdmVyYWdlKHZvaWQpCiAgICAgfSBlbHNlCiAgICAg ICAgIHN0cmVhbSA8PCAiTW9kZXJuIGxpbmUgbGF5b3V0IGNvdmVyYWdlOiAiIDw8IChmbG9hdCko dGV4dExlbmd0aCAtIHVuc3VwcG9ydGVkVGV4dExlbmd0aCkgLyAoZmxvYXQpdGV4dExlbmd0aCAq IDEwMCA8PCAiJSI7CiAgICAgc3RyZWFtIDw8ICJcblxuIjsKLSAgICBzdHJlYW0gPDwgIk51bWJl ciBvZiBibG9ja3M6IHRvdGFsKCIgPDwgIGxlYWZSZW5kZXJlcnMuc2l6ZSgpIDw8ICIpIGxlZ2Fj eSgiIDw8IG51bWJlck9mVW5zdXBwb3J0ZWRMZWFmQmxvY2tzIDw8ICIpXG5Db250ZW50IGxlbmd0 aDogdG90YWwoIiA8PAorICAgIHN0cmVhbSA8PCAiTnVtYmVyIG9mIGJsb2NrczogdG90YWwoIiA8 PCAgcmVuZGVyQmxvY2tGbG93cy5zaXplKCkgPDwgIikgbGVnYWN5KCIgPDwgbnVtYmVyT2ZVbnN1 cHBvcnRlZExlYWZCbG9ja3MgPDwgIilcbkNvbnRlbnQgbGVuZ3RoOiB0b3RhbCgiIDw8CiAgICAg ICAgIHRleHRMZW5ndGggPDwgIikgbGVnYWN5KCIgPDwgdW5zdXBwb3J0ZWRUZXh0TGVuZ3RoIDw8 ICIpXG4iOwogICAgIGZvciAoY29uc3QgYXV0byYgcmVhc29uRW50cnkgOiBmbG93U3RhdGlzdGlj cykgewogICAgICAgICBwcmludFJlYXNvbihzdGF0aWNfY2FzdDxBdm9pZGFuY2VSZWFzb24+KHJl YXNvbkVudHJ5LmtleSksIHN0cmVhbSk7CkBAIC01MjgsOCArNTIwLDEyIEBAIHN0YXRpYyBPcHRp b25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5Vc2VGb3JDaGlsZChjb25zdCBSZW5kZXJCbG9ja0Zs b3cmIGZsb3csIGNvCiAgICAgICAgIHJldHVybiByZWFzb25zOwogICAgIH0KIAotICAgIGlmIChp czxSZW5kZXJJbmxpbmU+KGNoaWxkKSkKLSAgICAgICAgcmV0dXJuIGNhblVzZUZvclJlbmRlcklu bGluZUNoaWxkKGRvd25jYXN0PFJlbmRlcklubGluZT4oY2hpbGQpLCBpbmNsdWRlUmVhc29ucyk7 CisgICAgaWYgKGlzPFJlbmRlcklubGluZT4oY2hpbGQpKSB7CisgICAgICAgIGF1dG8gcmVuZGVy SW5saW5lUmVhc29ucyA9IGNhblVzZUZvclJlbmRlcklubGluZUNoaWxkKGRvd25jYXN0PFJlbmRl cklubGluZT4oY2hpbGQpLCBpbmNsdWRlUmVhc29ucyk7CisgICAgICAgIGlmIChyZW5kZXJJbmxp bmVSZWFzb25zKQorICAgICAgICAgICAgQUREX1JFQVNPTlNfQU5EX1JFVFVSTl9JRl9ORUVERUQo cmVuZGVySW5saW5lUmVhc29ucywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOworICAgICAgICBy ZXR1cm4gcmVhc29uczsKKyAgICB9CiAKICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVF REVEKEZsb3dIYXNOb25TdXBwb3J0ZWRDaGlsZCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwog ICAgIHJldHVybiByZWFzb25zOwo=