236675 2022-02-15 16:01:03 -0800 [LFC][IFC] Decouple line box relative alignment types when computing the root inline box's baseline position 2022-02-17 07:04:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1841996 0 zalan 2022-02-15 16:01:03 -0800 ssia 1842007 1 452107 zalan 2022-02-15 16:11:16 -0800 Created attachment 452107 Patch 1842263 2 452192 zalan 2022-02-16 06:28:50 -0800 Created attachment 452192 Patch 1842686 3 452303 zalan 2022-02-16 20:53:27 -0800 Created attachment 452303 [cq-fast]Patch 1842884 4 ews-feeder 2022-02-17 07:03:47 -0800 Committed r290016 (247402@main): <https://commits.webkit.org/247402@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452303. 1842885 5 webkit-bug-importer 2022-02-17 07:04:16 -0800 <rdar://problem/89084602> 452107 2022-02-15 16:11:16 -0800 2022-02-16 06:28:48 -0800 Patch bug-236675-20220215161115.patch text/plain 10854 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlNzY1MzFlZjkzZWIw YzlmMWIxNmM1MzUwOTlkMWUwNzUxNjU4Zi4uYmU3Njk5ZGY4MGFlYTBlNTRmYTFiOTA3NWFlYWFl YWQzYWU5NWNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERlY291cGxl IGxpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudCB0eXBlcyB3aGVuIGNvbXB1dGluZyB0aGUgcm9v dCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIExpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudHMgKHRv cC9ib3R0b20pIGltcGFjdCBvbiB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgaXMgc2xp Z2h0bHkgZGlmZmVyZW50IGZyb20KKyAgICAgICAgdGhlIHJlc3Qgb2YgdGhlIGFsaWdubWVudHMg KGJhc2VsaW5lIGV0YykuIEluIHRoZXNlIHBhdGNoIHRoZXNlIGFsaWdubWVudCB0eXBlIGFyZSBt b3ZlZCBvdXQgb2YgdGhlIG1haW4gbG9vcCB3aGVyZQorICAgICAgICBhbGwgdGhlIG90aGVyIGFs aWdubWVudHMgYXJlIGhhbmRsZWQgKHRoaXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGF0IG90 aGVyIHBsYWNlZCBlLmcuIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9n aWNhbEhlaWdodCkuCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIGZp eGluZyB0aGUgYnVnIHdoZXJlIHRoZSAndmVydGljYWwtYm90dG9tJyBhbGlnbmVkIGJveCBtYWtl cyBvdGhlciBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRoZWlyIHBhcmVudCBibG9j ay4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24g Y29uc3QpOgorCiAyMDIyLTAyLTE0ICBGcsOpZMOpcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29t PgogCiAgICAgICAgIE51bGxwdHIgY3Jhc2ggaW4gQ29tcG9zaXRlRWRpdENvbW1hbmQ6OnNwbGl0 VHJlZVRvTm9kZSB2aWEgSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG9BcHBseQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVy LmNwcAppbmRleCA1ZTZlNmM0ODMzMjgwYmQzNjQwOGQyNTVjZmY3YzUzM2QxZjY4M2EzLi44MjFh OGJhNzlhOTQ3OTkzODM3MjNhMzBmMDY2Yjg5N2Q3YzNkYTRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVy dGljYWxBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcApAQCAtMjMwLDYg KzIzMCw3IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxpbmVC b3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiB7CiAgICAgYXV0byYgcm9vdElubGlu ZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwogICAgIGF1dG8mIGZvcm1hdHRpbmdHZW9t ZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOworICAgIFZlY3Rvcjx1bnNpZ25lZD4g aW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFsaWdubWVudDsKIAogICAgIEhhc2hNYXA8 Y29uc3QgSW5saW5lTGV2ZWxCb3gqLCBJbmxpbmVMYXlvdXRVbml0PiBpbmxpbmVMZXZlbEJveEFi c29sdXRlQmFzZWxpbmVPZmZzZXRNYXA7CiAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2Vs aW5lT2Zmc2V0TWFwLmFkZCgmcm9vdElubGluZUJveCwgSW5saW5lTGF5b3V0VW5pdCB7IH0pOwpA QCAtMjM4LDcwICsyMzksNjggQEAgdm9pZCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRl Um9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGluZUIKICAgICBpZiAoZm9y bWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3gocm9vdElubGluZUJv eCwgbGluZUJveCkpCiAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJh c2VsaW5lID0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7CiAKLSAgICBmb3Ig KGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJveC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygp KSB7Ci0gICAgICAgIGF1dG8gYWJzb2x1dGVCYXNlbGluZU9mZnNldCA9IElubGluZUxheW91dFVu aXQgeyB9OwotICAgICAgICBpZiAoIWlubGluZUxldmVsQm94Lmhhc0xpbmVCb3hSZWxhdGl2ZUFs aWdubWVudCgpKSB7Ci0gICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJv eC5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVC b3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKTsKLSAgICAg ICAgICAgIGF1dG8gYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBJbmxpbmVMYXlv dXRVbml0IHsgfTsKKyAgICBhdXRvJiBub25Sb290SW5saW5lTGV2ZWxCb3hlcyA9IGxpbmVCb3gu bm9uUm9vdElubGluZUxldmVsQm94ZXMoKTsKKyAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGlu ZGV4IDwgbm9uUm9vdElubGluZUxldmVsQm94ZXMuc2l6ZSgpOyArK2luZGV4KSB7CisgICAgICAg IGF1dG8mIGlubGluZUxldmVsQm94ID0gbm9uUm9vdElubGluZUxldmVsQm94ZXNbaW5kZXhdOwor ICAgICAgICBhdXRvIHZlcnRpY2FsQWxpZ24gPSBpbmxpbmVMZXZlbEJveC52ZXJ0aWNhbEFsaWdu KCk7CiAKLSAgICAgICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9IGlubGluZUxldmVsQm94LnZl cnRpY2FsQWxpZ24oKTsKLSAgICAgICAgICAgIHN3aXRjaCAodmVydGljYWxBbGlnbi50eXBlKSB7 Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lOgotICAgICAgICAgICAg ICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0geyB9OwotICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpNaWRkbGU6IHsKLSAg ICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAo aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkgLyAyICsgcGFyZW50SW5saW5l Qm94LnByaW1hcnltZXRyaWNzT2ZQcmltYXJ5Rm9udCgpLnhIZWlnaHQoKSAvIDIpOwotICAgICAg ICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9m ZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFz Y2VudDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmVNaWRkbGU6IHsKLSAgICAgICAgICAgICAgICBh dXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBpbmxpbmVMZXZlbEJveC5s YXlvdXRCb3VuZHMoKS5oZWlnaHQoKSAvIDI7Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZz ZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5l IC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwotICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpM ZW5ndGg6IHsKLSAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50 QmFzZWxpbmUgPSAqdmVydGljYWxBbGlnbi5iYXNlbGluZU9mZnNldCArIGlubGluZUxldmVsQm94 LmFzY2VudCgpOwotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94 LmFzY2VudCgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUZXh0VG9wOgotICAgICAgICAgICAgICAgIGJhc2Vs aW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gcGFyZW50SW5saW5lQm94LmFzY2VudCgpIC0g aW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwotICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUZXh0Qm90dG9tOgotICAgICAg ICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtICpwYXJlbnRJbmxpbmVCb3guZGVzY2VudCgpOwot ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpT dWI6Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAt KHBhcmVudElubGluZUJveC5mb250U2l6ZSgpIC8gNSArIDEpOwotICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpTdXBlcjoKLSAgICAgICAgICAg ICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IHBhcmVudElubGluZUJveC5m b250U2l6ZSgpIC8gMyArIDE7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBk ZWZhdWx0OgotICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBhYnNvbHV0 ZUJhc2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFw LmdldCgmcGFyZW50SW5saW5lQm94KSArIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5l OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc3dpdGNoIChpbmxpbmVMZXZlbEJveC52 ZXJ0aWNhbEFsaWduKCkudHlwZSkgewotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpU b3A6IHsKLSAgICAgICAgICAgICAgICBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ID0gcm9vdElubGlu ZUJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMo KS5hc2NlbnQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbTogewotICAgICAgICAgICAgICAgIGFic29s dXRlQmFzZWxpbmVPZmZzZXQgPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50 IC0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50OwotICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAg ICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOwotICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiA9IFsm XSB7CisgICAgICAgICAgICBpZiAodmVydGljYWxBbGlnbi50eXBlID09IFZlcnRpY2FsQWxpZ246 OlRvcCkgeworICAgICAgICAgICAgICAgIC8vIHZlcnRpY2FsLWFsaWduOiB0b3AgaXMgYSBsaW5l IGJveCByZWxhdGl2ZSBhbGlnbm1lbnQuIEl0IHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggZG93bndh cmRzIG1lYW5pbmcgdGhhdCBpdCBkb2VzIG5vdCBhZmZlY3QgdGhlIHJvb3QgaW5saW5lIGJveCdz IGJhc2VsaW5lIHBvc2l0aW9uLgorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hTdHJlY2hlc0xpbmVCb3gg PSBmb3JtYXR0aW5nR2VvbWV0cnkuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChpbmxpbmVM ZXZlbEJveCwgbGluZUJveCk7CisgICAgICAgICAgICByZXR1cm4gaW5saW5lTGV2ZWxCb3hTdHJl Y2hlc0xpbmVCb3ggfHwgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSAm JiBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKSk7CisgICAgICAgIH07CisKKyAgICAgICAgaWYgKGlu bGluZUxldmVsQm94Lmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpKSB7CisgICAgICAgICAg ICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKCkpCisgICAgICAgICAg ICAgICAgaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFsaWdubWVudC5hcHBlbmQoaW5k ZXgpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgYXV0byYgbGF5 b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7CisgICAgICAgIGF1dG8mIHBhcmVu dElubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94 LnBhcmVudCgpKTsKKyAgICAgICAgYXV0byBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGlu ZSA9IElubGluZUxheW91dFVuaXQgeyB9OworCisgICAgICAgIHN3aXRjaCAodmVydGljYWxBbGln bi50eXBlKSB7CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6CisgICAgICAg ICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IHsgfTsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246Ok1pZGRsZTogeworICAgICAgICAg ICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gKGlubGluZUxldmVs Qm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpIC8gMiArIHBhcmVudElubGluZUJveC5wcmltYXJ5 bWV0cmljc09mUHJpbWFyeUZvbnQoKS54SGVpZ2h0KCkgLyAyKTsKKyAgICAgICAgICAgIGJhc2Vs aW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRC YXNlbGluZSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxp bmVNaWRkbGU6IHsKKyAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRC YXNlbGluZSA9IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpIC8gMjsKKyAg ICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9m ZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFz Y2VudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGNhc2UgVmVydGlj YWxBbGlnbjo6TGVuZ3RoOiB7CisgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9t UGFyZW50QmFzZWxpbmUgPSAqdmVydGljYWxBbGlnbi5iYXNlbGluZU9mZnNldCArIGlubGluZUxl dmVsQm94LmFzY2VudCgpOworICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFz ZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxC b3guYXNjZW50KCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNl IFZlcnRpY2FsQWxpZ246OlRleHRUb3A6CisgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21Q YXJlbnRCYXNlbGluZSA9IHBhcmVudElubGluZUJveC5hc2NlbnQoKSAtIGlubGluZUxldmVsQm94 LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IFZlcnRpY2FsQWxpZ246OlRleHRCb3R0b206CisgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZy b21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQg LSAqcGFyZW50SW5saW5lQm94LmRlc2NlbnQoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1YjoKKyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJv bVBhcmVudEJhc2VsaW5lID0gLShwYXJlbnRJbmxpbmVCb3guZm9udFNpemUoKSAvIDUgKyAxKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1cGVyOgor ICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBwYXJlbnRJbmxp bmVCb3guZm9udFNpemUoKSAvIDMgKyAxOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRl ZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgYXV0byBhYnNvbHV0ZUJhc2VsaW5lT2Zm c2V0ID0gaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmdldCgmcGFyZW50 SW5saW5lQm94KSArIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lOwogICAgICAgICBp bmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXAuYWRkKCZpbmxpbmVMZXZlbEJv eCwgYWJzb2x1dGVCYXNlbGluZU9mZnNldCk7CiAKLSAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJv eFN0cmVjaGVzTGluZUJveCA9IGZvcm1hdHRpbmdHZW9tZXRyeS5pbmxpbmVMZXZlbEJveEFmZmVj dHNMaW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94KTsKLSAgICAgICAgYXV0byBhZmZlY3Rz Um9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGlu ZUJveCB8fCAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpICYmIGlubGlu ZUxldmVsQm94LmFzY2VudCgpKTsKLSAgICAgICAgaWYgKGFmZmVjdHNSb290SW5saW5lQm94VmVy dGljYWxQb3NpdGlvbikgeworICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNh bFBvc2l0aW9uKCkpIHsKICAgICAgICAgICAgIGF1dG8gdG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVC b3hCYXNlbGluZSA9IGFic29sdXRlQmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3VuZHMoKS5hc2NlbnQ7CiAgICAgICAgICAgICBpZiAobWF4aW11bVRvcE9mZnNldEZyb21S b290SW5saW5lQm94QmFzZWxpbmUpCiAgICAgICAgICAgICAgICAgbWF4aW11bVRvcE9mZnNldEZy b21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBzdGQ6Om1heCgqbWF4aW11bVRvcE9mZnNldEZyb21S b290SW5saW5lQm94QmFzZWxpbmUsIHRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUp OwpAQCAtMzE0LDYgKzMxMywxNiBAQCB2b2lkIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1 dGVSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihMaW5lQm94JiBsaW5lQgogICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgfQorCisgICAgZm9yIChhdXRvIGluZGV4IDogaW5saW5lTGV2 ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFsaWdubWVudCkgeworICAgICAgICBhdXRvJiBib3R0b21B bGlnbmVkSW5saW5lTGV2ZWxCb3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF07Cisg ICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9IGJvdHRvbUFsaWduZWRJbmxpbmVMZXZlbEJveC52 ZXJ0aWNhbEFsaWduKCkudHlwZTsKKyAgICAgICAgQVNTRVJUKHZlcnRpY2FsQWxpZ24gPT0gVmVy dGljYWxBbGlnbjo6Qm90dG9tKTsKKworICAgICAgICBhdXRvIGJhc2VsaW5lT2Zmc2V0ID0gYm90 dG9tQWxpZ25lZElubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSByb290SW5s aW5lQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQ7CisgICAgICAgIGF1dG8gdG9wT2Zmc2V0RnJv bVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGJhc2VsaW5lT2Zmc2V0ICsgYm90dG9tQWxpZ25lZElu bGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgbWF4aW11bVRvcE9m ZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBzdGQ6Om1heCgqbWF4aW11bVRvcE9mZnNl dEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUsIHRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFz ZWxpbmUpOworICAgIH0KICAgICBhdXRvIHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gbWF4aW11 bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUudmFsdWVfb3IoMC5mKSAtIHJvb3RJ bmxpbmVCb3guYXNjZW50KCk7CiAgICAgcm9vdElubGluZUJveC5zZXRMb2dpY2FsVG9wKHJvb3RJ bmxpbmVCb3hMb2dpY2FsVG9wKTsKIH0K 452192 2022-02-16 06:28:50 -0800 2022-02-16 20:53:25 -0800 Patch bug-236675-20220216062850.patch text/plain 10770 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDAwN2Q3YTU4NDYyYmFi ZGRhZDlmNjE0MzBmMTIxMWJkZTU3YzlkNy4uM2RlODVmNTM4YzFkMTgzZmU3ZDAyZTE3ODY1MTg5 YjNmZWIzOGFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERlY291cGxl IGxpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudCB0eXBlcyB3aGVuIGNvbXB1dGluZyB0aGUgcm9v dCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIExpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudHMgKHRv cC9ib3R0b20pIGltcGFjdCBvbiB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgaXMgc2xp Z2h0bHkgZGlmZmVyZW50IGZyb20KKyAgICAgICAgdGhlIHJlc3Qgb2YgdGhlIGFsaWdubWVudHMg KGJhc2VsaW5lIGV0YykuIEluIHRoZXNlIHBhdGNoIHRoZXNlIGFsaWdubWVudCB0eXBlIGFyZSBt b3ZlZCBvdXQgb2YgdGhlIG1haW4gbG9vcCB3aGVyZQorICAgICAgICBhbGwgdGhlIG90aGVyIGFs aWdubWVudHMgYXJlIGhhbmRsZWQgKHRoaXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGF0IG90 aGVyIHBsYWNlZCBlLmcuIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9n aWNhbEhlaWdodCkuCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIGZp eGluZyB0aGUgYnVnIHdoZXJlIHRoZSAndmVydGljYWwtYm90dG9tJyBhbGlnbmVkIGJveCBtYWtl cyBvdGhlciBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRoZWlyIHBhcmVudCBibG9j ay4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24g Y29uc3QpOgorCiAyMDIyLTAyLTE0ICBEYW4gR2xhc3RvbmJ1cnkgIDxkamdAYXBwbGUuY29tPgog CiAgICAgICAgIE1vdmUgUERGRG9jdW1lbnQuY3BwL2ggaW4gY29ycmVjdCBwb3NpdGlvbiBpbiBX ZWJDb3JlLnhjb2RlcHJvagpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94VmVydGljYWxBbGlnbmVyLmNwcAppbmRleCA1ZTZlNmM0ODMzMjgwYmQzNjQwOGQyNTVjZmY3 YzUzM2QxZjY4M2EzLi45OGY3MDAxOWM0YzVlMWY2MGM2NDQ2ZjY5YmNmNmFmYTAyMDYzNTMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGln bmVyLmNwcApAQCAtMjMwLDYgKzIzMCw3IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6 Y29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiB7CiAg ICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwogICAgIGF1 dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOworICAg IFZlY3Rvcjx1bnNpZ25lZD4gaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFsaWdubWVu dDsKIAogICAgIEhhc2hNYXA8Y29uc3QgSW5saW5lTGV2ZWxCb3gqLCBJbmxpbmVMYXlvdXRVbml0 PiBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXA7CiAgICAgaW5saW5lTGV2 ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZCgmcm9vdElubGluZUJveCwgSW5saW5l TGF5b3V0VW5pdCB7IH0pOwpAQCAtMjM4LDcwICsyMzksNjggQEAgdm9pZCBMaW5lQm94VmVydGlj YWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYg bGluZUIKICAgICBpZiAoZm9ybWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xp bmVCb3gocm9vdElubGluZUJveCwgbGluZUJveCkpCiAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRG cm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5h c2NlbnQ7CiAKLSAgICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJveC5ub25Sb290 SW5saW5lTGV2ZWxCb3hlcygpKSB7Ci0gICAgICAgIGF1dG8gYWJzb2x1dGVCYXNlbGluZU9mZnNl dCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgICAgICBpZiAoIWlubGluZUxldmVsQm94Lmhh c0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpKSB7Ci0gICAgICAgICAgICBhdXRvJiBsYXlvdXRC b3ggPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgIGF1dG8mIHBhcmVu dElubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94 LnBhcmVudCgpKTsKLSAgICAgICAgICAgIGF1dG8gYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFz ZWxpbmUgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICBhdXRvJiBub25Sb290SW5saW5lTGV2 ZWxCb3hlcyA9IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKTsKKyAgICBmb3IgKHNp emVfdCBpbmRleCA9IDA7IGluZGV4IDwgbm9uUm9vdElubGluZUxldmVsQm94ZXMuc2l6ZSgpOyAr K2luZGV4KSB7CisgICAgICAgIGF1dG8mIGlubGluZUxldmVsQm94ID0gbm9uUm9vdElubGluZUxl dmVsQm94ZXNbaW5kZXhdOworICAgICAgICBhdXRvIHZlcnRpY2FsQWxpZ24gPSBpbmxpbmVMZXZl bEJveC52ZXJ0aWNhbEFsaWduKCk7CiAKLSAgICAgICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9 IGlubGluZUxldmVsQm94LnZlcnRpY2FsQWxpZ24oKTsKLSAgICAgICAgICAgIHN3aXRjaCAodmVy dGljYWxBbGlnbi50eXBlKSB7Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJhc2Vs aW5lOgotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0g eyB9OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFs aWduOjpNaWRkbGU6IHsKLSAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9t UGFyZW50QmFzZWxpbmUgPSAoaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkg LyAyICsgcGFyZW50SW5saW5lQm94LnByaW1hcnltZXRyaWNzT2ZQcmltYXJ5Rm9udCgpLnhIZWln aHQoKSAvIDIpOwotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94 LmxheW91dEJvdW5kcygpLmFzY2VudDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmVNaWRkbGU6IHsK LSAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUg PSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSAvIDI7Ci0gICAgICAgICAg ICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0 RnJvbVBhcmVudEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50 OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgY2Fz ZSBWZXJ0aWNhbEFsaWduOjpMZW5ndGg6IHsKLSAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxU b3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAqdmVydGljYWxBbGlnbi5iYXNlbGluZU9mZnNl dCArIGlubGluZUxldmVsQm94LmFzY2VudCgpOwotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zm c2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGlu ZSAtIGlubGluZUxldmVsQm94LmFzY2VudCgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgfQotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUZXh0VG9wOgotICAg ICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gcGFyZW50SW5s aW5lQm94LmFzY2VudCgpIC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50Owot ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpU ZXh0Qm90dG9tOgotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtICpwYXJlbnRJbmxp bmVCb3guZGVzY2VudCgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2Fz ZSBWZXJ0aWNhbEFsaWduOjpTdWI6Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9t UGFyZW50QmFzZWxpbmUgPSAtKHBhcmVudElubGluZUJveC5mb250U2l6ZSgpIC8gNSArIDEpOwot ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpT dXBlcjoKLSAgICAgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9 IHBhcmVudElubGluZUJveC5mb250U2l6ZSgpIC8gMyArIDE7Ci0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1Q TEVNRU5URURfWUVUKCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3hBYnNvbHV0 ZUJhc2VsaW5lT2Zmc2V0TWFwLmdldCgmcGFyZW50SW5saW5lQm94KSArIGJhc2VsaW5lT2Zmc2V0 RnJvbVBhcmVudEJhc2VsaW5lOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc3dpdGNo IChpbmxpbmVMZXZlbEJveC52ZXJ0aWNhbEFsaWduKCkudHlwZSkgewotICAgICAgICAgICAgY2Fz ZSBWZXJ0aWNhbEFsaWduOjpUb3A6IHsKLSAgICAgICAgICAgICAgICBhYnNvbHV0ZUJhc2VsaW5l T2Zmc2V0ID0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQgLSBpbmxpbmVMZXZl bEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbTogewotICAg ICAgICAgICAgICAgIGFic29sdXRlQmFzZWxpbmVPZmZzZXQgPSBpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3VuZHMoKS5kZXNjZW50IC0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50 OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZGVm YXVsdDoKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOwotICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5lQm94VmVy dGljYWxQb3NpdGlvbiA9IFsmXSB7CisgICAgICAgICAgICBpZiAodmVydGljYWxBbGlnbi50eXBl ID09IFZlcnRpY2FsQWxpZ246OlRvcCkgeworICAgICAgICAgICAgICAgIC8vIHZlcnRpY2FsLWFs aWduOiB0b3AgaXMgYSBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbm1lbnQuIEl0IHN0cmV0Y2hlcyB0 aGUgbGluZSBib3ggZG93bndhcmRzIG1lYW5pbmcgdGhhdCBpdCBkb2VzIG5vdCBhZmZlY3QgdGhl IHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHBvc2l0aW9uLgorICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxC b3hTdHJlY2hlc0xpbmVCb3ggPSBmb3JtYXR0aW5nR2VvbWV0cnkuaW5saW5lTGV2ZWxCb3hBZmZl Y3RzTGluZUJveChpbmxpbmVMZXZlbEJveCwgbGluZUJveCk7CisgICAgICAgICAgICByZXR1cm4g aW5saW5lTGV2ZWxCb3hTdHJlY2hlc0xpbmVCb3ggfHwgKGlubGluZUxldmVsQm94LmlzQXRvbWlj SW5saW5lTGV2ZWxCb3goKSAmJiBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKSk7CisgICAgICAgIH07 CisKKyAgICAgICAgaWYgKGlubGluZUxldmVsQm94Lmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVu dCgpKSB7CisgICAgICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0 aW9uKCkpCisgICAgICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFs aWdubWVudC5hcHBlbmQoaW5kZXgpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0K KyAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7Cisg ICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JM YXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKTsKKyAgICAgICAgYXV0byBiYXNlbGluZU9mZnNl dEZyb21QYXJlbnRCYXNlbGluZSA9IElubGluZUxheW91dFVuaXQgeyB9OworCisgICAgICAgIHN3 aXRjaCAodmVydGljYWxBbGlnbi50eXBlKSB7CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6 QmFzZWxpbmU6CisgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9 IHsgfTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246Ok1p ZGRsZTogeworICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0gKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpIC8gMiArIHBhcmVu dElubGluZUJveC5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZvbnQoKS54SGVpZ2h0KCkgLyAyKTsK KyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRv cE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmFzY2VudDsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CisgICAgICAgIGNhc2UgVmVy dGljYWxBbGlnbjo6QmFzZWxpbmVNaWRkbGU6IHsKKyAgICAgICAgICAgIGF1dG8gbG9naWNhbFRv cE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmhlaWdodCgpIC8gMjsKKyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94 LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9Cisg ICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6TGVuZ3RoOiB7CisgICAgICAgICAgICBhdXRvIGxv Z2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAqdmVydGljYWxBbGlnbi5iYXNlbGlu ZU9mZnNldCArIGlubGluZUxldmVsQm94LmFzY2VudCgpOworICAgICAgICAgICAgYmFzZWxpbmVP ZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lIC0gaW5saW5lTGV2ZWxCb3guYXNjZW50KCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgfQorICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRUb3A6CisgICAgICAgICAgICBi YXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IHBhcmVudElubGluZUJveC5hc2NlbnQo KSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRCb3R0b206CisgICAgICAgICAg ICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxldmVsQm94LmxheW91 dEJvdW5kcygpLmRlc2NlbnQgLSAqcGFyZW50SW5saW5lQm94LmRlc2NlbnQoKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1YjoKKyAgICAgICAgICAg IGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gLShwYXJlbnRJbmxpbmVCb3guZm9u dFNpemUoKSAvIDUgKyAxKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRp Y2FsQWxpZ246OlN1cGVyOgorICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFz ZWxpbmUgPSBwYXJlbnRJbmxpbmVCb3guZm9udFNpemUoKSAvIDMgKyAxOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVO VEVEX1lFVCgpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgYXV0byBh YnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zm c2V0TWFwLmdldCgmcGFyZW50SW5saW5lQm94KSArIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJh c2VsaW5lOwogICAgICAgICBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXAu YWRkKCZpbmxpbmVMZXZlbEJveCwgYWJzb2x1dGVCYXNlbGluZU9mZnNldCk7CiAKLSAgICAgICAg YXV0byBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGluZUJveCA9IGZvcm1hdHRpbmdHZW9tZXRyeS5p bmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGlubGluZUxldmVsQm94LCBsaW5lQm94KTsKLSAg ICAgICAgYXV0byBhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBpbmxpbmVM ZXZlbEJveFN0cmVjaGVzTGluZUJveCB8fCAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVM ZXZlbEJveCgpICYmIGlubGluZUxldmVsQm94LmFzY2VudCgpKTsKLSAgICAgICAgaWYgKGFmZmVj dHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbikgeworICAgICAgICBpZiAoYWZmZWN0c1Jv b3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKCkpIHsKICAgICAgICAgICAgIGF1dG8gdG9wT2Zm c2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGFic29sdXRlQmFzZWxpbmVPZmZzZXQgKyBp bmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7CiAgICAgICAgICAgICBpZiAobWF4 aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUpCiAgICAgICAgICAgICAgICAg bWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBzdGQ6Om1heCgqbWF4 aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUsIHRvcE9mZnNldEZyb21Sb290 SW5saW5lQm94QmFzZWxpbmUpOwpAQCAtMzE0LDYgKzMxMywxNSBAQCB2b2lkIExpbmVCb3hWZXJ0 aWNhbEFsaWduZXI6OmNvbXB1dGVSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihMaW5lQm94 JiBsaW5lQgogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQorCisgICAgZm9yIChhdXRv IGluZGV4IDogaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aEJvdHRvbUFsaWdubWVudCkgeworICAg ICAgICBhdXRvJiBib3R0b21BbGlnbmVkSW5saW5lTGV2ZWxCb3ggPSBub25Sb290SW5saW5lTGV2 ZWxCb3hlc1tpbmRleF07CisgICAgICAgIEFTU0VSVChib3R0b21BbGlnbmVkSW5saW5lTGV2ZWxC b3gudmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tKTsKKworICAg ICAgICBhdXRvIGJhc2VsaW5lT2Zmc2V0ID0gYm90dG9tQWxpZ25lZElubGluZUxldmVsQm94Lmxh eW91dEJvdW5kcygpLmRlc2NlbnQgLSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmRlc2Nl bnQ7CisgICAgICAgIGF1dG8gdG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGJh c2VsaW5lT2Zmc2V0ICsgYm90dG9tQWxpZ25lZElubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmFzY2VudDsKKyAgICAgICAgbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxp bmUgPSBzdGQ6Om1heCgqbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUs IHRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUpOworICAgIH0KICAgICBhdXRvIHJv b3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94 QmFzZWxpbmUudmFsdWVfb3IoMC5mKSAtIHJvb3RJbmxpbmVCb3guYXNjZW50KCk7CiAgICAgcm9v dElubGluZUJveC5zZXRMb2dpY2FsVG9wKHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKTsKIH0K 452303 2022-02-16 20:53:27 -0800 2022-02-17 07:03:49 -0800 [cq-fast]Patch bug-236675-20220216205326.patch text/plain 11584 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDAwN2Q3YTU4NDYyYmFi ZGRhZDlmNjE0MzBmMTIxMWJkZTU3YzlkNy4uNTA5NTBmZjIxNjgxYjkxOTE0YTE1NTc3YzMxYWM2 YmI5NGE5MTdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERlY291cGxl IGxpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudCB0eXBlcyB3aGVuIGNvbXB1dGluZyB0aGUgcm9v dCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IEFu dHRpIEtvaXZpc3RvLgorCisgICAgICAgIExpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudHMgKHRv cC9ib3R0b20pIGltcGFjdCBvbiB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgaXMgc2xp Z2h0bHkgZGlmZmVyZW50IGZyb20KKyAgICAgICAgdGhlIHJlc3Qgb2YgdGhlIGFsaWdubWVudHMg KGJhc2VsaW5lIGV0YykuIEluIHRoZXNlIHBhdGNoIHRoZXNlIGFsaWdubWVudCB0eXBlIGFyZSBt b3ZlZCBvdXQgb2YgdGhlIG1haW4gbG9vcCB3aGVyZQorICAgICAgICBhbGwgdGhlIG90aGVyIGFs aWdubWVudHMgYXJlIGhhbmRsZWQgKHRoaXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGF0IG90 aGVyIHBsYWNlZCBlLmcuIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9n aWNhbEhlaWdodCkuCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIGZp eGluZyB0aGUgYnVnIHdoZXJlIHRoZSAndmVydGljYWwtYm90dG9tJyBhbGlnbmVkIGJveCBtYWtl cyBvdGhlciBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRoZWlyIHBhcmVudCBibG9j ay4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24g Y29uc3QpOgorCiAyMDIyLTAyLTE0ICBEYW4gR2xhc3RvbmJ1cnkgIDxkamdAYXBwbGUuY29tPgog CiAgICAgICAgIE1vdmUgUERGRG9jdW1lbnQuY3BwL2ggaW4gY29ycmVjdCBwb3NpdGlvbiBpbiBX ZWJDb3JlLnhjb2RlcHJvagpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94VmVydGljYWxBbGlnbmVyLmNwcAppbmRleCA1ZTZlNmM0ODMzMjgwYmQzNjQwOGQyNTVjZmY3 YzUzM2QxZjY4M2EzLi40MmMyNTRhNzRjZWJmOGY5ZWUwMzMwOWM4ZWYyN2NiYmQ5Mjk2MWU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGln bmVyLmNwcApAQCAtMjMwLDYgKzIzMCw3IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6 Y29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiB7CiAg ICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwogICAgIGF1 dG8mIGZvcm1hdHRpbmdHZW9tZXRyeSA9IHRoaXMtPmZvcm1hdHRpbmdHZW9tZXRyeSgpOworICAg IFZlY3Rvcjx1bnNpZ25lZD4gaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aExpbmVCb3hSZWxhdGl2 ZUFsaWdubWVudDsKIAogICAgIEhhc2hNYXA8Y29uc3QgSW5saW5lTGV2ZWxCb3gqLCBJbmxpbmVM YXlvdXRVbml0PiBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXA7CiAgICAg aW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZCgmcm9vdElubGluZUJv eCwgSW5saW5lTGF5b3V0VW5pdCB7IH0pOwpAQCAtMjM4LDcwICsyMzksNjkgQEAgdm9pZCBMaW5l Qm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24o TGluZUJveCYgbGluZUIKICAgICBpZiAoZm9ybWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94 QWZmZWN0c0xpbmVCb3gocm9vdElubGluZUJveCwgbGluZUJveCkpCiAgICAgICAgIG1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5sYXlvdXRC b3VuZHMoKS5hc2NlbnQ7CiAKLSAgICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJv eC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygpKSB7Ci0gICAgICAgIGF1dG8gYWJzb2x1dGVCYXNl bGluZU9mZnNldCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgICAgICBpZiAoIWlubGluZUxl dmVsQm94Lmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpKSB7Ci0gICAgICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKLSAgICAgICAgICAgIGF1 dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94LnBhcmVudCgpKTsKLSAgICAgICAgICAgIGF1dG8gYmFzZWxpbmVPZmZzZXRGcm9t UGFyZW50QmFzZWxpbmUgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICBhdXRvIGFmZmVjdHNS b290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiA9IFsmXShhdXRvJiBpbmxpbmVMZXZlbEJveCkg eworICAgICAgICBhdXRvIGlubGluZUxldmVsQm94U3RyZWNoZXNMaW5lQm94ID0gZm9ybWF0dGlu Z0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGxp bmVCb3gpOworICAgICAgICByZXR1cm4gaW5saW5lTGV2ZWxCb3hTdHJlY2hlc0xpbmVCb3ggfHwg KGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSAmJiBpbmxpbmVMZXZlbEJv eC5hc2NlbnQoKSk7CisgICAgfTsKIAotICAgICAgICAgICAgYXV0byB2ZXJ0aWNhbEFsaWduID0g aW5saW5lTGV2ZWxCb3gudmVydGljYWxBbGlnbigpOwotICAgICAgICAgICAgc3dpdGNoICh2ZXJ0 aWNhbEFsaWduLnR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxp bmU6Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSB7 IH07Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxp Z246Ok1pZGRsZTogewotICAgICAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcE9mZnNldEZyb21Q YXJlbnRCYXNlbGluZSA9IChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSAv IDIgKyBwYXJlbnRJbmxpbmVCb3gucHJpbWFyeW1ldHJpY3NPZlByaW1hcnlGb250KCkueEhlaWdo dCgpIC8gMik7Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxp bmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxCb3gu bGF5b3V0Qm91bmRzKCkuYXNjZW50OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgfQotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZU1pZGRsZTogewot ICAgICAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9 IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpIC8gMjsKLSAgICAgICAgICAg ICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGxvZ2ljYWxUb3BPZmZzZXRG cm9tUGFyZW50QmFzZWxpbmUgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7 Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBjYXNl IFZlcnRpY2FsQWxpZ246Okxlbmd0aDogewotICAgICAgICAgICAgICAgIGF1dG8gbG9naWNhbFRv cE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9ICp2ZXJ0aWNhbEFsaWduLmJhc2VsaW5lT2Zmc2V0 ICsgaW5saW5lTGV2ZWxCb3guYXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZz ZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5l IC0gaW5saW5lTGV2ZWxCb3guYXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRUb3A6Ci0gICAg ICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBwYXJlbnRJbmxp bmVCb3guYXNjZW50KCkgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRl eHRCb3R0b206Ci0gICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxp bmUgPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50IC0gKnBhcmVudElubGlu ZUJveC5kZXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNl IFZlcnRpY2FsQWxpZ246OlN1YjoKLSAgICAgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21Q YXJlbnRCYXNlbGluZSA9IC0ocGFyZW50SW5saW5lQm94LmZvbnRTaXplKCkgLyA1ICsgMSk7Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1 cGVyOgotICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0g cGFyZW50SW5saW5lQm94LmZvbnRTaXplKCkgLyAzICsgMTsKLSAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBM RU1FTlRFRF9ZRVQoKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIGFic29sdXRlQmFzZWxpbmVPZmZzZXQgPSBpbmxpbmVMZXZlbEJveEFic29sdXRl QmFzZWxpbmVPZmZzZXRNYXAuZ2V0KCZwYXJlbnRJbmxpbmVCb3gpICsgYmFzZWxpbmVPZmZzZXRG cm9tUGFyZW50QmFzZWxpbmU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBzd2l0Y2gg KGlubGluZUxldmVsQm94LnZlcnRpY2FsQWxpZ24oKS50eXBlKSB7Ci0gICAgICAgICAgICBjYXNl IFZlcnRpY2FsQWxpZ246OlRvcDogewotICAgICAgICAgICAgICAgIGFic29sdXRlQmFzZWxpbmVP ZmZzZXQgPSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIGlubGluZUxldmVs Qm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6Qm90dG9tOiB7Ci0gICAg ICAgICAgICAgICAgYWJzb2x1dGVCYXNlbGluZU9mZnNldCA9IGlubGluZUxldmVsQm94LmxheW91 dEJvdW5kcygpLmRlc2NlbnQgLSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQ7 Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBkZWZh dWx0OgotICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgYXV0byYgbm9uUm9vdElubGlu ZUxldmVsQm94ZXMgPSBsaW5lQm94Lm5vblJvb3RJbmxpbmVMZXZlbEJveGVzKCk7CisgICAgZm9y IChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IG5vblJvb3RJbmxpbmVMZXZlbEJveGVzLnNpemUo KTsgKytpbmRleCkgeworICAgICAgICBhdXRvJiBpbmxpbmVMZXZlbEJveCA9IG5vblJvb3RJbmxp bmVMZXZlbEJveGVzW2luZGV4XTsKKyAgICAgICAgYXV0byB2ZXJ0aWNhbEFsaWduID0gaW5saW5l TGV2ZWxCb3gudmVydGljYWxBbGlnbigpOworCisgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5o YXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgeworICAgICAgICAgICAgaWYgKHZlcnRpY2Fs QWxpZ24udHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpUb3ApCisgICAgICAgICAgICAgICAgaW5saW5l TGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZCgmaW5saW5lTGV2ZWxCb3gsIHJv b3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0 Qm91bmRzKCkuYXNjZW50KTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHZlcnRpY2FsQWxpZ24udHlw ZSA9PSBWZXJ0aWNhbEFsaWduOjpCb3R0b20pCisgICAgICAgICAgICAgICAgaW5saW5lTGV2ZWxC b3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZCgmaW5saW5lTGV2ZWxCb3gsIGlubGluZUxl dmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSByb290SW5saW5lQm94LmxheW91dEJvdW5k cygpLmRlc2NlbnQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hJbmRleGVzV2l0aExpbmVC b3hSZWxhdGl2ZUFsaWdubWVudC5hcHBlbmQoaW5kZXgpOworICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KKyAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5 b3V0Qm94KCk7CisgICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVCb3guaW5saW5l TGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKTsKKyAgICAgICAgYXV0byBi YXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IElubGluZUxheW91dFVuaXQgeyB9Owor CisgICAgICAgIHN3aXRjaCAodmVydGljYWxBbGlnbi50eXBlKSB7CisgICAgICAgIGNhc2UgVmVy dGljYWxBbGlnbjo6QmFzZWxpbmU6CisgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJl bnRCYXNlbGluZSA9IHsgfTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRp Y2FsQWxpZ246Ok1pZGRsZTogeworICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJv bVBhcmVudEJhc2VsaW5lID0gKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgp IC8gMiArIHBhcmVudElubGluZUJveC5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZvbnQoKS54SGVp Z2h0KCkgLyAyKTsKKyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5l ID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94Lmxh eW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CisgICAg ICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmVNaWRkbGU6IHsKKyAgICAgICAgICAgIGF1 dG8gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxldmVsQm94Lmxh eW91dEJvdW5kcygpLmhlaWdodCgpIC8gMjsKKyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJv bVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlu bGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6TGVuZ3RoOiB7CisgICAgICAg ICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAqdmVydGljYWxB bGlnbi5iYXNlbGluZU9mZnNldCArIGlubGluZUxldmVsQm94LmFzY2VudCgpOworICAgICAgICAg ICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2FsVG9wT2Zmc2V0RnJv bVBhcmVudEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxCb3guYXNjZW50KCk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRUb3A6Cisg ICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IHBhcmVudElubGlu ZUJveC5hc2NlbnQoKSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRCb3R0b206 CisgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxl dmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSAqcGFyZW50SW5saW5lQm94LmRlc2NlbnQo KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1YjoK KyAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gLShwYXJlbnRJ bmxpbmVCb3guZm9udFNpemUoKSAvIDUgKyAxKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlIFZlcnRpY2FsQWxpZ246OlN1cGVyOgorICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRG cm9tUGFyZW50QmFzZWxpbmUgPSBwYXJlbnRJbmxpbmVCb3guZm9udFNpemUoKSAvIDMgKyAxOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRf Tk9UX0lNUExFTUVOVEVEX1lFVCgpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAg ICAgICAgYXV0byBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3hBYnNvbHV0 ZUJhc2VsaW5lT2Zmc2V0TWFwLmdldCgmcGFyZW50SW5saW5lQm94KSArIGJhc2VsaW5lT2Zmc2V0 RnJvbVBhcmVudEJhc2VsaW5lOwogICAgICAgICBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxp bmVPZmZzZXRNYXAuYWRkKCZpbmxpbmVMZXZlbEJveCwgYWJzb2x1dGVCYXNlbGluZU9mZnNldCk7 CiAKLSAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGluZUJveCA9IGZvcm1hdHRp bmdHZW9tZXRyeS5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGlubGluZUxldmVsQm94LCBs aW5lQm94KTsKLSAgICAgICAgYXV0byBhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRp b24gPSBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGluZUJveCB8fCAoaW5saW5lTGV2ZWxCb3guaXNB dG9taWNJbmxpbmVMZXZlbEJveCgpICYmIGlubGluZUxldmVsQm94LmFzY2VudCgpKTsKLSAgICAg ICAgaWYgKGFmZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbikgeworICAgICAgICBp ZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKGlubGluZUxldmVsQm94KSkg ewogICAgICAgICAgICAgYXV0byB0b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0g YWJzb2x1dGVCYXNlbGluZU9mZnNldCArIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFz Y2VudDsKICAgICAgICAgICAgIGlmIChtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hC YXNlbGluZSkKICAgICAgICAgICAgICAgICBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVC b3hCYXNlbGluZSA9IHN0ZDo6bWF4KCptYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hC YXNlbGluZSwgdG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSk7CkBAIC0zMTQsNiAr MzE0LDI0IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxpbmVC b3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiAgICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICB9CisKKyAgICBmb3IgKGF1dG8gaW5kZXggOiBpbmxpbmVMZXZlbEJveEluZGV4ZXNX aXRoTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KSB7CisgICAgICAgIGF1dG8mIGlubGluZUxldmVs Qm94ID0gbm9uUm9vdElubGluZUxldmVsQm94ZXNbaW5kZXhdOworICAgICAgICBpZiAoIWFmZmVj dHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihpbmxpbmVMZXZlbEJveCkpCisgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gudmVydGljYWxBbGln bigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tKSB7CisgICAgICAgICAgICBhdXRvIGJh c2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtIHJv b3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudDsKKyAgICAgICAgICAgIGF1dG8gdG9w T2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGJhc2VsaW5lT2Zmc2V0ICsgaW5saW5l TGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OworICAgICAgICAgICAgbWF4aW11bVRvcE9m ZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBzdGQ6Om1heCgqbWF4aW11bVRvcE9mZnNl dEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUsIHRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFz ZWxpbmUpOworICAgICAgICB9IGVsc2UgaWYgKGlubGluZUxldmVsQm94LnZlcnRpY2FsQWxpZ24o KS50eXBlID09IFZlcnRpY2FsQWxpZ246OlRvcCkgeworICAgICAgICAgICAgLy8gdmVydGljYWwt YWxpZ246IHRvcCBpcyBhIGxpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudC4gSXQgc3RyZXRjaGVz IHRoZSBsaW5lIGJveCBkb3dud2FyZHMgbWVhbmluZyB0aGF0IGl0IGRvZXMgbm90IGFmZmVjdAor ICAgICAgICAgICAgLy8gdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHBvc2l0aW9uLCBi dXQgaW4gcXVpcmtzIG1vZGUgd2UgaGF2ZSB0byBlbnN1cmUgdGhhdCB0aGUgcm9vdCBpbmxpbmUg Ym94IGRvZXMgbm90IGVuZCB1cCBhdCAwcHguCisgICAgICAgICAgICBpZiAoIW1heGltdW1Ub3BP ZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lKQorICAgICAgICAgICAgICAgIG1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5hc2NlbnQo KTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICB9CiAgICAgYXV0byByb290SW5saW5lQm94TG9naWNhbFRvcCA9IG1heGltdW1Ub3BPZmZzZXRG cm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlX29yKDAuZikgLSByb290SW5saW5lQm94LmFz Y2VudCgpOwogICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcChyb290SW5saW5lQm94TG9n aWNhbFRvcCk7CiB9Cg==