210998 2020-04-24 15:22:05 -0700 OSR Exit compiler should know and print the exiting DFG node's index 2020-04-27 17:51:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist Lawrence.j mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1645418 0 keith_miller 2020-04-24 15:22:05 -0700 OSR Exit compiler should know and print the exiting DFG node's index 1645419 1 397516 keith_miller 2020-04-24 15:22:28 -0700 Created attachment 397516 Patch 1645420 2 397517 keith_miller 2020-04-24 15:23:50 -0700 Created attachment 397517 Patch 1645428 3 397517 mark.lam 2020-04-24 15:31:02 -0700 Comment on attachment 397517 Patch r=me if you’ve verified that there’s no size increase. 1645457 4 keith_miller 2020-04-24 16:04:42 -0700 $ ./Tools/Scripts/dump-class-layout JavaScriptCore DFG::OSRExitBase -c Debug +0 < 32> JSC::DFG::OSRExitBase +0 < 4> uint32_t m_count +4 < 1> JSC::ExitKind m_kind +5 < :1> bool m_wasHoisted : 1 +5 < :23> uint32_t m_dfgNodeIndex : 23 +8 < 8> JSC::CodeOrigin m_codeOrigin +8 < 8> uintptr_t m_compositeValue +16 < 8> JSC::CodeOrigin m_codeOriginForExitProfile +16 < 8> uintptr_t m_compositeValue +24 < 4> JSC::CallSiteIndex m_exceptionHandlerCallSiteIndex +24 < 4> uint32_t m_bits +28 < 4> <PADDING: 4 bytes> Total byte size: 32 Total pad bytes: 4 Padding percentage: 12.50 % 1646150 5 397721 keith_miller 2020-04-27 12:51:20 -0700 Created attachment 397721 Patch for landing 1646164 6 ews-feeder 2020-04-27 13:22:36 -0700 Committed r260772: <https://trac.webkit.org/changeset/260772> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397721. 1646166 7 webkit-bug-importer 2020-04-27 13:23:20 -0700 <rdar://problem/62465824> 1646318 8 Lawrence.j 2020-04-27 17:16:56 -0700 Reverted r260772 for reason: This commit caused tests to start failing internally. Committed r260799: <https://trac.webkit.org/changeset/260799> 1646331 9 keith_miller 2020-04-27 17:51:58 -0700 Committed r260803: <https://trac.webkit.org/changeset/260803> 397516 2020-04-24 15:22:28 -0700 2020-04-24 15:23:49 -0700 Patch bug-210998-20200424152227.patch text/plain 12091 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx YTk1YmJkZDkwZjQ2YTUyNDVkMWMzOTNmODJhYThiN2Y5ZmY4MTM4Li4xMmZiYzVkZDdhNjI3M2E0 NzI0N2RhYTZmODY3MzlmNWVhYjIzNDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMC0wNC0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBPU1IgRXhpdCBjb21waWxlciBzaG91bGQga25vdyBhbmQgcHJpbnQg dGhlIGV4aXRpbmcgREZHIG5vZGUncyBpbmRleAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHT1NSRXhpdC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAgIChKU0M6OkRGRzo6b3BlcmF0aW9uQ29t cGlsZU9TUkV4aXQpOgorICAgICAgICAqIGRmZy9ERkdPU1JFeGl0QmFzZS5oOgorICAgICAgICAo SlNDOjpERkc6Ok9TUkV4aXRCYXNlOjpPU1JFeGl0QmFzZSk6CisgICAgICAgICogZnRsL0ZUTExv d2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNv bXBpbGVJbnZhbGlkYXRpb25Qb2ludCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRG R1RvQjM6OmNvbXBpbGVDaGVja1N1YkNsYXNzKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxv d2VyREZHVG9CMzo6Ymxlc3NTcGVjdWxhdGlvbik6CisgICAgICAgICogZnRsL0ZUTE9TUkV4aXQu Y3BwOgorICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjplbWl0T1NSRXhpdCk6 CisgICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdERlc2NyaXB0b3I6OmVtaXRPU1JFeGl0TGF0ZXIp OgorICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjpwcmVwYXJlT1NSRXhpdEhh bmRsZSk6CisgICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAgICog ZnRsL0ZUTE9TUkV4aXQuaDoKKyAgICAgICAgKiBmdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNwcDoK KyAgICAgICAgKEpTQzo6RlRMOjpjb21waWxlU3R1Yik6CisKIDIwMjAtMDQtMjIgIEtlaXRoIE1p bGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IE9TUiBleGl0aW5n L2l0ZXJhdG9yIG9iamVjdCBjaGVja3MgaW4gZm9yLW9mIGJ5dGVjb2RlcwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHT1NSRXhpdC5jcHAKaW5kZXggZjYzNzJhZGQ0OTBmNGM4Yzk5YTQ3MTI2 NTIxZDNlYzk1ZGUzYjIzOC4uMzI1ZjE3NDkxYjlmZDRkN2Q3OWMzN2NhNzA4M2RmYjU3YTgzMWRm MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXQuY3BwCkBAIC00OSw3ICs0 OSw3IEBACiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CiAKIE9TUkV4aXQ6Ok9TUkV4 aXQoRXhpdEtpbmQga2luZCwgSlNWYWx1ZVNvdXJjZSBqc1ZhbHVlU291cmNlLCBNZXRob2RPZkdl dHRpbmdBVmFsdWVQcm9maWxlIHZhbHVlUHJvZmlsZSwgU3BlY3VsYXRpdmVKSVQqIGppdCwgdW5z aWduZWQgc3RyZWFtSW5kZXgsIHVuc2lnbmVkIHJlY292ZXJ5SW5kZXgpCi0gICAgOiBPU1JFeGl0 QmFzZShraW5kLCBqaXQtPm1fb3JpZ2luLmZvckV4aXQsIGppdC0+bV9vcmlnaW4uc2VtYW50aWMs IGppdC0+bV9vcmlnaW4ud2FzSG9pc3RlZCkKKyAgICA6IE9TUkV4aXRCYXNlKGtpbmQsIGppdC0+ bV9vcmlnaW4uZm9yRXhpdCwgaml0LT5tX29yaWdpbi5zZW1hbnRpYywgaml0LT5tX29yaWdpbi53 YXNIb2lzdGVkLCBqaXQtPm1fY3VycmVudE5vZGUgPyBqaXQtPm1fY3VycmVudE5vZGUtPmluZGV4 KCkgOiAwKQogICAgICwgbV9qc1ZhbHVlU291cmNlKGpzVmFsdWVTb3VyY2UpCiAgICAgLCBtX3Zh bHVlUHJvZmlsZSh2YWx1ZVByb2ZpbGUpCiAgICAgLCBtX3JlY292ZXJ5SW5kZXgocmVjb3ZlcnlJ bmRleCkKQEAgLTIwOSw4ICsyMDksOCBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uQ29t cGlsZU9TUkV4aXQoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiAgICAgICAgIGV4aXQubV9jb2RlID0g RklOQUxJWkVfQ09ERV9JRigKICAgICAgICAgICAgIHNob3VsZER1bXBEaXNhc3NlbWJseSgpIHx8 IE9wdGlvbnM6OnZlcmJvc2VPU1IoKSB8fCBPcHRpb25zOjp2ZXJib3NlREZHT1NSRXhpdCgpLAog ICAgICAgICAgICAgcGF0Y2hCdWZmZXIsIE9TUkV4aXRQdHJUYWcsCi0gICAgICAgICAgICAiREZH IE9TUiBleGl0ICMldSAoJXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAotICAg ICAgICAgICAgICAgIGV4aXRJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2luKS5kYXRh KCksCisgICAgICAgICAgICAiREZHIE9TUiBleGl0ICMldSAoREAldSwgJXMsICVzKSBmcm9tICVz LCB3aXRoIG9wZXJhbmRzID0gJXMiLAorICAgICAgICAgICAgICAgIGV4aXRJbmRleCwgZXhpdC5t X2RmZ05vZGVJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2luKS5kYXRhKCksCiAgICAg ICAgICAgICAgICAgZXhpdEtpbmRUb1N0cmluZyhleGl0Lm1fa2luZCksIHRvQ1N0cmluZygqY29k ZUJsb2NrKS5kYXRhKCksCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKGlnbm9yaW5nQ29udGV4 dDxEdW1wQ29udGV4dD4ob3BlcmFuZHMpKS5kYXRhKCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaAppbmRleCAwMDNiNjE4Y2Q0NDBlNDAwYWJhYWNl YzBhZmJjM2MxMjQzNWRiOTZlLi41MTQ4YWM3MjkxMmM0OThiYjc3NjFkZWRjMTVmNjQ0Zjk4MzFm NGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRCYXNl LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0QmFzZS5oCkBAIC0z OSw5ICszOSwxMSBAQCBzdHJ1Y3QgTm9kZTsKIC8vIGFuZCB0aGUgRlRMLgogCiBzdHJ1Y3QgT1NS RXhpdEJhc2UgewotICAgIE9TUkV4aXRCYXNlKEV4aXRLaW5kIGtpbmQsIENvZGVPcmlnaW4gb3Jp Z2luLCBDb2RlT3JpZ2luIG9yaWdpbkZvclByb2ZpbGUsIGJvb2wgd2FzSG9pc3RlZCkKKyAgICBP U1JFeGl0QmFzZShFeGl0S2luZCBraW5kLCBDb2RlT3JpZ2luIG9yaWdpbiwgQ29kZU9yaWdpbiBv cmlnaW5Gb3JQcm9maWxlLCBib29sIHdhc0hvaXN0ZWQsIHVpbnQzMl90IGRmZ05vZGVJbmRleCkK ICAgICAgICAgOiBtX2tpbmQoa2luZCkKICAgICAgICAgLCBtX3dhc0hvaXN0ZWQod2FzSG9pc3Rl ZCkKKyAgICAgICAgLy8gVG8gYXZvaWQgVUIgd2UgY2xhbXAgZGZnTm9kZUluZGV4IHRvIHRoZSBt YXggYml0cyBpdCBjYW4gaG9sZCwgdGhpcyBwcmFjdGljYWxseSBzaG91bGQgbmV2ZXIgaGFwcGVu IGJ1dCBsZXQncyBiZSBzYWZlCisgICAgICAgICwgbV9kZmdOb2RlSW5kZXgoc3RkOjptaW4oZGZn Tm9kZUluZGV4LCAoMXUgPDwgMjMpIC0gMSkpCiAgICAgICAgICwgbV9jb2RlT3JpZ2luKG9yaWdp bikKICAgICAgICAgLCBtX2NvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZShvcmlnaW5Gb3JQcm9maWxl KQogICAgIHsKQEAgLTUxLDcgKzUzLDggQEAgc3RydWN0IE9TUkV4aXRCYXNlIHsKIAogICAgIHVp bnQzMl90IG1fY291bnQgeyAwIH07CiAgICAgRXhpdEtpbmQgbV9raW5kOwotICAgIGJvb2wgbV93 YXNIb2lzdGVkOworICAgIGJvb2wgbV93YXNIb2lzdGVkIDogMTsKKyAgICB1aW50MzJfdCBtX2Rm Z05vZGVJbmRleCA6IDIzOwogICAgIAogICAgIENvZGVPcmlnaW4gbV9jb2RlT3JpZ2luOwogICAg IENvZGVPcmlnaW4gbV9jb2RlT3JpZ2luRm9yRXhpdFByb2ZpbGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKaW5kZXggMDkzYmQ1ODdlNTI2MDE4Y2Nm ODEwYjYzYTE3NDljODc2M2M0NmI2Ny4uMzFhMjllYjFmMmQ0NmEzZWE2MTQzNzJmMTc0NWMwYzNj ODIxMWJjNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRG R1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0Iz LmNwcApAQCAtMTA4MDksNyArMTA4MDksNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEND YWxsSGVscGVyczo6TGFiZWwgbGFiZWwgPSBqaXQud2F0Y2hwb2ludExhYmVsKCk7CiAKICAgICAg ICAgICAgICAgICBSZWZQdHI8T1NSRXhpdEhhbmRsZT4gaGFuZGxlID0gZGVzY3JpcHRvci0+ZW1p dE9TUkV4aXRMYXRlcigKLSAgICAgICAgICAgICAgICAgICAgKnN0YXRlLCBVbmNvdW50YWJsZUlu dmFsaWRhdGlvbiwgb3JpZ2luLCBwYXJhbXMpOworICAgICAgICAgICAgICAgICAgICAqc3RhdGUs IFVuY291bnRhYmxlSW52YWxpZGF0aW9uLCBvcmlnaW4sIHBhcmFtcywgbV9ub2RlSW5kZXgpOwog CiAgICAgICAgICAgICAgICAgUmVmUHRyPEpJVENvZGU+IGppdENvZGUgPSBzdGF0ZS0+aml0Q29k ZS5nZXQoKTsKIApAQCAtMTM4NzYsNyArMTM4NzYsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBkb21KSVQtPm51bUZQU2NyYXRjaFJlZ2lzdGVy czsgKytpKQogICAgICAgICAgICAgICAgICAgICBmcFNjcmF0Y2guYXBwZW5kKHBhcmFtcy5mcFNj cmF0Y2goaSkpOwogCi0gICAgICAgICAgICAgICAgUmVmUHRyPE9TUkV4aXRIYW5kbGU+IGhhbmRs ZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhpdExhdGVyKCpzdGF0ZSwgQmFkVHlwZSwgb3Jp Z2luLCBwYXJhbXMsIG9zckV4aXRBcmd1bWVudE9mZnNldCk7CisgICAgICAgICAgICAgICAgUmVm UHRyPE9TUkV4aXRIYW5kbGU+IGhhbmRsZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhpdExh dGVyKCpzdGF0ZSwgQmFkVHlwZSwgb3JpZ2luLCBwYXJhbXMsIG1fbm9kZUluZGV4LCBvc3JFeGl0 QXJndW1lbnRPZmZzZXQpOwogCiAgICAgICAgICAgICAgICAgU25pcHBldFBhcmFtcyBkb21KSVRQ YXJhbXMoKnN0YXRlLCBwYXJhbXMsIG5vZGUsIG51bGxwdHIsIFdURk1vdmUocmVncyksIFdURk1v dmUoZ3BTY3JhdGNoKSwgV1RGTW92ZShmcFNjcmF0Y2gpKTsKICAgICAgICAgICAgICAgICBDQ2Fs bEhlbHBlcnM6Okp1bXBMaXN0IGZhaWx1cmVDYXNlcyA9IGRvbUpJVC0+Z2VuZXJhdG9yKCktPnJ1 bihqaXQsIGRvbUpJVFBhcmFtcyk7CkBAIC0xODY2OSw3ICsxODY2OSw3IEBAIHByaXZhdGU6CiAg ICAgICAgIHZhbHVlLT5zZXRHZW5lcmF0b3IoCiAgICAgICAgICAgICBbPV0gKENDYWxsSGVscGVy cyYgaml0LCBjb25zdCBCMzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMpIHsKICAg ICAgICAgICAgICAgICBleGl0RGVzY3JpcHRvci0+ZW1pdE9TUkV4aXQoCi0gICAgICAgICAgICAg ICAgICAgICpzdGF0ZSwga2luZCwgb3JpZ2luLCBqaXQsIHBhcmFtcywgMCk7CisgICAgICAgICAg ICAgICAgICAgICpzdGF0ZSwga2luZCwgb3JpZ2luLCBqaXQsIHBhcmFtcywgbV9ub2RlSW5kZXgs IDApOwogICAgICAgICAgICAgfSk7CiAgICAgfQogCkBAIC0xOTE2NCw3ICsxOTE2NCw3IEBAIHBy aXZhdGU6CiAgICAgTEJhc2ljQmxvY2sgbV9uZXh0TG93QmxvY2s7CiAKICAgICBOb2RlT3JpZ2lu IG1fb3JpZ2luOwotICAgIHVuc2lnbmVkIG1fbm9kZUluZGV4OworICAgIHVuc2lnbmVkIG1fbm9k ZUluZGV4IHsgMCB9OwogICAgIE5vZGUqIG1fbm9kZTsKIAogICAgIC8vIFRoZXNlIGFyZSB1c2Vk IGZvciB2YWxpZGF0aW5nIEFJIHN0YXRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExPU1JFeGl0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NS RXhpdC5jcHAKaW5kZXggMDRjODU3OTllNGQ0NjkyM2EzMTg2NzE4ZTE5ZjI0YmRmZmRhYmE0Zi4u MGE2ZjMzYjJmYzJiNzVkMzg0OWVhYmNhYTEwMTYwNjlkYWM1YzlmNiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTE9TUkV4aXQuY3BwCkBAIC02NSwyMCArNjUsMjAgQEAgdm9pZCBPU1JF eGl0RGVzY3JpcHRvcjo6dmFsaWRhdGVSZWZlcmVuY2VzKGNvbnN0IFRyYWNrZWRSZWZlcmVuY2Vz JiB0cmFja2VkUmVmZXIKIAogUmVmPE9TUkV4aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlwdG9yOjpl bWl0T1NSRXhpdCgKICAgICBTdGF0ZSYgc3RhdGUsIEV4aXRLaW5kIGV4aXRLaW5kLCBjb25zdCBO b2RlT3JpZ2luJiBub2RlT3JpZ2luLCBDQ2FsbEhlbHBlcnMmIGppdCwKLSAgICBjb25zdCBTdGFj a21hcEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcywgdW5zaWduZWQgb2Zmc2V0KQorICAgIGNvbnN0 IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW1zLCB1aW50MzJfdCBkZmdOb2RlSW5kZXgs IHVuc2lnbmVkIG9mZnNldCkKIHsKICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gaGFuZGxlID0KLSAg ICAgICAgcHJlcGFyZU9TUkV4aXRIYW5kbGUoc3RhdGUsIGV4aXRLaW5kLCBub2RlT3JpZ2luLCBw YXJhbXMsIG9mZnNldCk7CisgICAgICAgIHByZXBhcmVPU1JFeGl0SGFuZGxlKHN0YXRlLCBleGl0 S2luZCwgbm9kZU9yaWdpbiwgcGFyYW1zLCBkZmdOb2RlSW5kZXgsIG9mZnNldCk7CiAgICAgaGFu ZGxlLT5lbWl0RXhpdFRodW5rKHN0YXRlLCBqaXQpOwogICAgIHJldHVybiBoYW5kbGU7CiB9CiAK IFJlZjxPU1JFeGl0SGFuZGxlPiBPU1JFeGl0RGVzY3JpcHRvcjo6ZW1pdE9TUkV4aXRMYXRlcigK ICAgICBTdGF0ZSYgc3RhdGUsIEV4aXRLaW5kIGV4aXRLaW5kLCBjb25zdCBOb2RlT3JpZ2luJiBu b2RlT3JpZ2luLAotICAgIGNvbnN0IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW1zLCB1 bnNpZ25lZCBvZmZzZXQpCisgICAgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJh bXMsIHVpbnQzMl90IGRmZ05vZGVJbmRleCwgdW5zaWduZWQgb2Zmc2V0KQogewogICAgIFJlZlB0 cjxPU1JFeGl0SGFuZGxlPiBoYW5kbGUgPQotICAgICAgICBwcmVwYXJlT1NSRXhpdEhhbmRsZShz dGF0ZSwgZXhpdEtpbmQsIG5vZGVPcmlnaW4sIHBhcmFtcywgb2Zmc2V0KTsKKyAgICAgICAgcHJl cGFyZU9TUkV4aXRIYW5kbGUoc3RhdGUsIGV4aXRLaW5kLCBub2RlT3JpZ2luLCBwYXJhbXMsIGRm Z05vZGVJbmRleCwgb2Zmc2V0KTsKICAgICBwYXJhbXMuYWRkTGF0ZVBhdGgoCiAgICAgICAgIFto YW5kbGUsICZzdGF0ZV0gKENDYWxsSGVscGVycyYgaml0KSB7CiAgICAgICAgICAgICBoYW5kbGUt PmVtaXRFeGl0VGh1bmsoc3RhdGUsIGppdCk7CkBAIC04OCwxMSArODgsMTEgQEAgUmVmPE9TUkV4 aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlwdG9yOjplbWl0T1NSRXhpdExhdGVyKAogCiBSZWY8T1NS RXhpdEhhbmRsZT4gT1NSRXhpdERlc2NyaXB0b3I6OnByZXBhcmVPU1JFeGl0SGFuZGxlKAogICAg IFN0YXRlJiBzdGF0ZSwgRXhpdEtpbmQgZXhpdEtpbmQsIGNvbnN0IE5vZGVPcmlnaW4mIG5vZGVP cmlnaW4sCi0gICAgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMsIHVuc2ln bmVkIG9mZnNldCkKKyAgICBjb25zdCBTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcywg dWludDMyX3QgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQpCiB7CiAgICAgdW5zaWduZWQg aW5kZXggPSBzdGF0ZS5qaXRDb2RlLT5vc3JFeGl0LnNpemUoKTsKICAgICBPU1JFeGl0JiBleGl0 ID0gc3RhdGUuaml0Q29kZS0+b3NyRXhpdC5hbGxvYygKLSAgICAgICAgdGhpcywgZXhpdEtpbmQs IG5vZGVPcmlnaW4uZm9yRXhpdCwgbm9kZU9yaWdpbi5zZW1hbnRpYywgbm9kZU9yaWdpbi53YXNI b2lzdGVkKTsKKyAgICAgICAgdGhpcywgZXhpdEtpbmQsIG5vZGVPcmlnaW4uZm9yRXhpdCwgbm9k ZU9yaWdpbi5zZW1hbnRpYywgbm9kZU9yaWdpbi53YXNIb2lzdGVkLCBkZmdOb2RlSW5kZXgpOwog ICAgIFJlZjxPU1JFeGl0SGFuZGxlPiBoYW5kbGUgPSBhZG9wdFJlZigqbmV3IE9TUkV4aXRIYW5k bGUoaW5kZXgsIGV4aXQpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBvZmZzZXQ7IGkgPCBwYXJh bXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIGV4aXQubV92YWx1ZVJlcHMuYXBwZW5kKHBhcmFtc1tp XSk7CkBAIC0xMDIsOCArMTAyLDggQEAgUmVmPE9TUkV4aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlw dG9yOjpwcmVwYXJlT1NSRXhpdEhhbmRsZSgKIAogT1NSRXhpdDo6T1NSRXhpdCgKICAgICBPU1JF eGl0RGVzY3JpcHRvciogZGVzY3JpcHRvciwgRXhpdEtpbmQgZXhpdEtpbmQsIENvZGVPcmlnaW4g Y29kZU9yaWdpbiwKLSAgICBDb2RlT3JpZ2luIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9v bCB3YXNIb2lzdGVkKQotICAgIDogT1NSRXhpdEJhc2UoZXhpdEtpbmQsIGNvZGVPcmlnaW4sIGNv ZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgd2FzSG9pc3RlZCkKKyAgICBDb2RlT3JpZ2luIGNvZGVP cmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9vbCB3YXNIb2lzdGVkLCB1aW50MzJfdCBkZmdOb2RlSW5k ZXgpCisgICAgOiBPU1JFeGl0QmFzZShleGl0S2luZCwgY29kZU9yaWdpbiwgY29kZU9yaWdpbkZv ckV4aXRQcm9maWxlLCB3YXNIb2lzdGVkLCBkZmdOb2RlSW5kZXgpCiAgICAgLCBtX2Rlc2NyaXB0 b3IoZGVzY3JpcHRvcikKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMT1NSRXhpdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmgK aW5kZXggZmQ3ZjlmMDViYzQ4OWMxZjZhZWNlMDk3YWQ4YTRkMWUyN2I4MDMyMi4uOTc3NWY1MGYz NDRjZjk2ZmU1NDFlZTA5ZjE5MDE4Nzk5MmYwNWM0NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0 bC9GVExPU1JFeGl0LmgKQEAgLTkyLDcgKzkyLDcgQEAgc3RydWN0IE9TUkV4aXREZXNjcmlwdG9y IHsKICAgICAvLyB0aGlzIGNhbGwsIHRoZSBPU1JFeGl0IGlzIHNpbXBseSByZWFkeSB0byBnby4K ICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gZW1pdE9TUkV4aXQoCiAgICAgICAgIFN0YXRlJiwgRXhp dEtpbmQsIGNvbnN0IERGRzo6Tm9kZU9yaWdpbiYsIENDYWxsSGVscGVycyYsIGNvbnN0IEIzOjpT dGFja21hcEdlbmVyYXRpb25QYXJhbXMmLAotICAgICAgICB1bnNpZ25lZCBvZmZzZXQgPSAwKTsK KyAgICAgICAgdWludDMyX3QgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQgPSAwKTsKIAog ICAgIC8vIEluIHNvbWUgY2FzZXMgeW91IHdhbnQgYW4gT1NSRXhpdCB0byBjb21lIGludG8gZXhp c3RlbmNlLCBidXQgeW91IGRvbid0IHdhbnQgdG8gZW1pdCBpdCByaWdodCBub3cuCiAgICAgLy8g VGhpcyB3aWxsIGVtaXQgdGhlIE9TUiBleGl0IGluIGEgbGF0ZSBwYXRoLiBZb3UgY2FuJ3QgYmUg c3VyZSBleGFjdGx5IHdoZW4gdGhhdCB3aWxsIGhhcHBlbiwgYnV0CkBAIC0xMDQsNyArMTA0LDcg QEAgc3RydWN0IE9TUkV4aXREZXNjcmlwdG9yIHsKICAgICAvLyBldmVudHVhbGx5IGdldHMgYWNj ZXNzIHRvIGl0cyBsYWJlbC4KICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gZW1pdE9TUkV4aXRMYXRl cigKICAgICAgICAgU3RhdGUmLCBFeGl0S2luZCwgY29uc3QgREZHOjpOb2RlT3JpZ2luJiwgY29u c3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYsCi0gICAgICAgIHVuc2lnbmVkIG9mZnNl dCA9IDApOworICAgICAgICB1aW50MzJfdCBkZmdOb2RlSW5kZXgsIHVuc2lnbmVkIG9mZnNldCA9 IDApOwogCiBwcml2YXRlOgogICAgIC8vIFRoaXMgaXMgdGhlIGxvdy1sZXZlbCBpbnRlcmZhY2Uu IEl0IHdpbGwgY3JlYXRlIGEgaGFuZGxlIHJlcHJlc2VudGluZyB0aGUgZGVzaXJlIHRvIGVtaXQg Y29kZSBmb3IKQEAgLTExMiwxMSArMTEyLDExIEBAIHByaXZhdGU6CiAgICAgLy8gdGhhdCB0aGUg YWJvdmUgdHdvIEFQSXMgYXJlIHdyaXR0ZW4gaW4gdGVybXMgb2YgdGhpcyBhbmQgT1NSRXhpdEhh bmRsZTo6ZW1pdEV4aXRUaHVuaygpLgogICAgIFJlZjxPU1JFeGl0SGFuZGxlPiBwcmVwYXJlT1NS RXhpdEhhbmRsZSgKICAgICAgICAgU3RhdGUmLCBFeGl0S2luZCwgY29uc3QgREZHOjpOb2RlT3Jp Z2luJiwgY29uc3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYsCi0gICAgICAgIHVuc2ln bmVkIG9mZnNldCA9IDApOworICAgICAgICB1aW50MzJfdCBkZmdOb2RlSW5kZXgsIHVuc2lnbmVk IG9mZnNldCA9IDApOwogfTsKIAogc3RydWN0IE9TUkV4aXQgOiBwdWJsaWMgREZHOjpPU1JFeGl0 QmFzZSB7Ci0gICAgT1NSRXhpdChPU1JFeGl0RGVzY3JpcHRvciosIEV4aXRLaW5kLCBDb2RlT3Jp Z2luLCBDb2RlT3JpZ2luIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9vbCB3YXNIb2lzdGVk KTsKKyAgICBPU1JFeGl0KE9TUkV4aXREZXNjcmlwdG9yKiwgRXhpdEtpbmQsIENvZGVPcmlnaW4s IENvZGVPcmlnaW4gY29kZU9yaWdpbkZvckV4aXRQcm9maWxlLCBib29sIHdhc0hvaXN0ZWQsIHVp bnQzMl90IGRmZ05vZGVJbmRleCk7CiAKICAgICBPU1JFeGl0RGVzY3JpcHRvciogbV9kZXNjcmlw dG9yOwogICAgIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxPU1JFeGl0UHRyVGFnPiBtX2NvZGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXRDb21waWxlci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXRDb21waWxlci5jcHAKaW5k ZXggM2M5MTM3ZWY3MGY1ZmZkZDliYTAxN2Y3MmJiZTFiN2ZmZWU4NGEzYy4uMWY0Mzg1YTI3MmI5 Y2YwNTgyZTQwMTQyOGY1MGYwNTEzODY3NTU5NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Z0bC9GVExPU1JFeGl0Q29tcGlsZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNwcApAQCAtNTMyLDggKzUzMiw4IEBAIHN0YXRp YyB2b2lkIGNvbXBpbGVTdHViKFZNJiB2bSwgdW5zaWduZWQgZXhpdElELCBKSVRDb2RlKiBqaXRD b2RlLCBPU1JFeGl0JiBleGl0CiAgICAgZXhpdC5tX2NvZGUgPSBGSU5BTElaRV9DT0RFX0lGKAog ICAgICAgICBzaG91bGREdW1wRGlzYXNzZW1ibHkoKSB8fCBPcHRpb25zOjp2ZXJib3NlT1NSKCkg fHwgT3B0aW9uczo6dmVyYm9zZUZUTE9TUkV4aXQoKSwKICAgICAgICAgcGF0Y2hCdWZmZXIsIE9T UkV4aXRQdHJUYWcsCi0gICAgICAgICJGVEwgT1NSIGV4aXQgIyV1ICglcywgJXMpIGZyb20gJXMs IHdpdGggb3BlcmFuZHMgPSAlcyIsCi0gICAgICAgICAgICBleGl0SUQsIHRvQ1N0cmluZyhleGl0 Lm1fY29kZU9yaWdpbikuZGF0YSgpLAorICAgICAgICAiRlRMIE9TUiBleGl0ICMldSAoREAldSwg JXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAorICAgICAgICAgICAgZXhpdElE LCBleGl0Lm1fZGZnTm9kZUluZGV4LCB0b0NTdHJpbmcoZXhpdC5tX2NvZGVPcmlnaW4pLmRhdGEo KSwKICAgICAgICAgICAgIGV4aXRLaW5kVG9TdHJpbmcoZXhpdC5tX2tpbmQpLCB0b0NTdHJpbmco KmNvZGVCbG9jaykuZGF0YSgpLAogICAgICAgICAgICAgdG9DU3RyaW5nKGlnbm9yaW5nQ29udGV4 dDxEdW1wQ29udGV4dD4oZXhpdC5tX2Rlc2NyaXB0b3ItPm1fdmFsdWVzKSkuZGF0YSgpCiAgICAg ICAgICk7Cg== 397517 2020-04-24 15:23:50 -0700 2020-04-27 12:51:18 -0700 Patch bug-210998-20200424152350.patch text/plain 12265 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx YTk1YmJkZDkwZjQ2YTUyNDVkMWMzOTNmODJhYThiN2Y5ZmY4MTM4Li45MDdjMDdjNTNjZmU4OThj NmEzNjAwMGQ4NzYyODhiMGJlNjE2N2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAyMC0wNC0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBPU1IgRXhpdCBjb21waWxlciBzaG91bGQga25vdyBhbmQgcHJpbnQg dGhlIGV4aXRpbmcgREZHIG5vZGUncyBpbmRleAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIG9ubHkgaW50ZXJlc3RpbmcgdGhpbmcgaGVyZSBpcyB0 aGF0IHdlIHNldCB0aGUgbm9kZSB0byBpbmRleCAwIGlmIHRoZXJlIGlzIG5vIG5vZGUuCisgICAg ICAgIEFGQUlDVCwgd2Ugb25seSBkb24ndCBoYXZlIGEgbm9kZSB3aGVuIHdlIGFyZSBjaGVja2lu ZyBhcmd1bWVudHMuCisKKyAgICAgICAgKiBkZmcvREZHT1NSRXhpdC5jcHA6CisgICAgICAgIChK U0M6OkRGRzo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAgIChKU0M6OkRGRzo6b3BlcmF0aW9u Q29tcGlsZU9TUkV4aXQpOgorICAgICAgICAqIGRmZy9ERkdPU1JFeGl0QmFzZS5oOgorICAgICAg ICAoSlNDOjpERkc6Ok9TUkV4aXRCYXNlOjpPU1JFeGl0QmFzZSk6CisgICAgICAgICogZnRsL0ZU TExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6 OmNvbXBpbGVJbnZhbGlkYXRpb25Qb2ludCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dl ckRGR1RvQjM6OmNvbXBpbGVDaGVja1N1YkNsYXNzKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6 Okxvd2VyREZHVG9CMzo6Ymxlc3NTcGVjdWxhdGlvbik6CisgICAgICAgICogZnRsL0ZUTE9TUkV4 aXQuY3BwOgorICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjplbWl0T1NSRXhp dCk6CisgICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdERlc2NyaXB0b3I6OmVtaXRPU1JFeGl0TGF0 ZXIpOgorICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjpwcmVwYXJlT1NSRXhp dEhhbmRsZSk6CisgICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAg ICogZnRsL0ZUTE9TUkV4aXQuaDoKKyAgICAgICAgKiBmdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNw cDoKKyAgICAgICAgKEpTQzo6RlRMOjpjb21waWxlU3R1Yik6CisKIDIwMjAtMDQtMjIgIEtlaXRo IE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IE9TUiBleGl0 aW5nL2l0ZXJhdG9yIG9iamVjdCBjaGVja3MgaW4gZm9yLW9mIGJ5dGVjb2RlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdC5jcHAKaW5kZXggZjYzNzJhZGQ0OTBmNGM4Yzk5YTQ3 MTI2NTIxZDNlYzk1ZGUzYjIzOC4uMzI1ZjE3NDkxYjlmZDRkN2Q3OWMzN2NhNzA4M2RmYjU3YTgz MWRmMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXQuY3BwCkBAIC00OSw3 ICs0OSw3IEBACiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CiAKIE9TUkV4aXQ6Ok9T UkV4aXQoRXhpdEtpbmQga2luZCwgSlNWYWx1ZVNvdXJjZSBqc1ZhbHVlU291cmNlLCBNZXRob2RP ZkdldHRpbmdBVmFsdWVQcm9maWxlIHZhbHVlUHJvZmlsZSwgU3BlY3VsYXRpdmVKSVQqIGppdCwg dW5zaWduZWQgc3RyZWFtSW5kZXgsIHVuc2lnbmVkIHJlY292ZXJ5SW5kZXgpCi0gICAgOiBPU1JF eGl0QmFzZShraW5kLCBqaXQtPm1fb3JpZ2luLmZvckV4aXQsIGppdC0+bV9vcmlnaW4uc2VtYW50 aWMsIGppdC0+bV9vcmlnaW4ud2FzSG9pc3RlZCkKKyAgICA6IE9TUkV4aXRCYXNlKGtpbmQsIGpp dC0+bV9vcmlnaW4uZm9yRXhpdCwgaml0LT5tX29yaWdpbi5zZW1hbnRpYywgaml0LT5tX29yaWdp bi53YXNIb2lzdGVkLCBqaXQtPm1fY3VycmVudE5vZGUgPyBqaXQtPm1fY3VycmVudE5vZGUtPmlu ZGV4KCkgOiAwKQogICAgICwgbV9qc1ZhbHVlU291cmNlKGpzVmFsdWVTb3VyY2UpCiAgICAgLCBt X3ZhbHVlUHJvZmlsZSh2YWx1ZVByb2ZpbGUpCiAgICAgLCBtX3JlY292ZXJ5SW5kZXgocmVjb3Zl cnlJbmRleCkKQEAgLTIwOSw4ICsyMDksOCBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9u Q29tcGlsZU9TUkV4aXQoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiAgICAgICAgIGV4aXQubV9jb2Rl ID0gRklOQUxJWkVfQ09ERV9JRigKICAgICAgICAgICAgIHNob3VsZER1bXBEaXNhc3NlbWJseSgp IHx8IE9wdGlvbnM6OnZlcmJvc2VPU1IoKSB8fCBPcHRpb25zOjp2ZXJib3NlREZHT1NSRXhpdCgp LAogICAgICAgICAgICAgcGF0Y2hCdWZmZXIsIE9TUkV4aXRQdHJUYWcsCi0gICAgICAgICAgICAi REZHIE9TUiBleGl0ICMldSAoJXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAot ICAgICAgICAgICAgICAgIGV4aXRJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2luKS5k YXRhKCksCisgICAgICAgICAgICAiREZHIE9TUiBleGl0ICMldSAoREAldSwgJXMsICVzKSBmcm9t ICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAorICAgICAgICAgICAgICAgIGV4aXRJbmRleCwgZXhp dC5tX2RmZ05vZGVJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2luKS5kYXRhKCksCiAg ICAgICAgICAgICAgICAgZXhpdEtpbmRUb1N0cmluZyhleGl0Lm1fa2luZCksIHRvQ1N0cmluZygq Y29kZUJsb2NrKS5kYXRhKCksCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKGlnbm9yaW5nQ29u dGV4dDxEdW1wQ29udGV4dD4ob3BlcmFuZHMpKS5kYXRhKCkpOwogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaAppbmRleCAwMDNiNjE4Y2Q0NDBlNDAwYWJh YWNlYzBhZmJjM2MxMjQzNWRiOTZlLi41MTQ4YWM3MjkxMmM0OThiYjc3NjFkZWRjMTVmNjQ0Zjk4 MzFmNGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRC YXNlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0QmFzZS5oCkBA IC0zOSw5ICszOSwxMSBAQCBzdHJ1Y3QgTm9kZTsKIC8vIGFuZCB0aGUgRlRMLgogCiBzdHJ1Y3Qg T1NSRXhpdEJhc2UgewotICAgIE9TUkV4aXRCYXNlKEV4aXRLaW5kIGtpbmQsIENvZGVPcmlnaW4g b3JpZ2luLCBDb2RlT3JpZ2luIG9yaWdpbkZvclByb2ZpbGUsIGJvb2wgd2FzSG9pc3RlZCkKKyAg ICBPU1JFeGl0QmFzZShFeGl0S2luZCBraW5kLCBDb2RlT3JpZ2luIG9yaWdpbiwgQ29kZU9yaWdp biBvcmlnaW5Gb3JQcm9maWxlLCBib29sIHdhc0hvaXN0ZWQsIHVpbnQzMl90IGRmZ05vZGVJbmRl eCkKICAgICAgICAgOiBtX2tpbmQoa2luZCkKICAgICAgICAgLCBtX3dhc0hvaXN0ZWQod2FzSG9p c3RlZCkKKyAgICAgICAgLy8gVG8gYXZvaWQgVUIgd2UgY2xhbXAgZGZnTm9kZUluZGV4IHRvIHRo ZSBtYXggYml0cyBpdCBjYW4gaG9sZCwgdGhpcyBwcmFjdGljYWxseSBzaG91bGQgbmV2ZXIgaGFw cGVuIGJ1dCBsZXQncyBiZSBzYWZlCisgICAgICAgICwgbV9kZmdOb2RlSW5kZXgoc3RkOjptaW4o ZGZnTm9kZUluZGV4LCAoMXUgPDwgMjMpIC0gMSkpCiAgICAgICAgICwgbV9jb2RlT3JpZ2luKG9y aWdpbikKICAgICAgICAgLCBtX2NvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZShvcmlnaW5Gb3JQcm9m aWxlKQogICAgIHsKQEAgLTUxLDcgKzUzLDggQEAgc3RydWN0IE9TUkV4aXRCYXNlIHsKIAogICAg IHVpbnQzMl90IG1fY291bnQgeyAwIH07CiAgICAgRXhpdEtpbmQgbV9raW5kOwotICAgIGJvb2wg bV93YXNIb2lzdGVkOworICAgIGJvb2wgbV93YXNIb2lzdGVkIDogMTsKKyAgICB1aW50MzJfdCBt X2RmZ05vZGVJbmRleCA6IDIzOwogICAgIAogICAgIENvZGVPcmlnaW4gbV9jb2RlT3JpZ2luOwog ICAgIENvZGVPcmlnaW4gbV9jb2RlT3JpZ2luRm9yRXhpdFByb2ZpbGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKaW5kZXggMDkzYmQ1ODdlNTI2MDE4 Y2NmODEwYjYzYTE3NDljODc2M2M0NmI2Ny4uMzFhMjllYjFmMmQ0NmEzZWE2MTQzNzJmMTc0NWMw YzNjODIxMWJjNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dl ckRGR1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0IzLmNwcApAQCAtMTA4MDksNyArMTA4MDksNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAg IENDYWxsSGVscGVyczo6TGFiZWwgbGFiZWwgPSBqaXQud2F0Y2hwb2ludExhYmVsKCk7CiAKICAg ICAgICAgICAgICAgICBSZWZQdHI8T1NSRXhpdEhhbmRsZT4gaGFuZGxlID0gZGVzY3JpcHRvci0+ ZW1pdE9TUkV4aXRMYXRlcigKLSAgICAgICAgICAgICAgICAgICAgKnN0YXRlLCBVbmNvdW50YWJs ZUludmFsaWRhdGlvbiwgb3JpZ2luLCBwYXJhbXMpOworICAgICAgICAgICAgICAgICAgICAqc3Rh dGUsIFVuY291bnRhYmxlSW52YWxpZGF0aW9uLCBvcmlnaW4sIHBhcmFtcywgbV9ub2RlSW5kZXgp OwogCiAgICAgICAgICAgICAgICAgUmVmUHRyPEpJVENvZGU+IGppdENvZGUgPSBzdGF0ZS0+aml0 Q29kZS5nZXQoKTsKIApAQCAtMTM4NzYsNyArMTM4NzYsNyBAQCBwcml2YXRlOgogICAgICAgICAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBkb21KSVQtPm51bUZQU2NyYXRjaFJlZ2lz dGVyczsgKytpKQogICAgICAgICAgICAgICAgICAgICBmcFNjcmF0Y2guYXBwZW5kKHBhcmFtcy5m cFNjcmF0Y2goaSkpOwogCi0gICAgICAgICAgICAgICAgUmVmUHRyPE9TUkV4aXRIYW5kbGU+IGhh bmRsZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhpdExhdGVyKCpzdGF0ZSwgQmFkVHlwZSwg b3JpZ2luLCBwYXJhbXMsIG9zckV4aXRBcmd1bWVudE9mZnNldCk7CisgICAgICAgICAgICAgICAg UmVmUHRyPE9TUkV4aXRIYW5kbGU+IGhhbmRsZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhp dExhdGVyKCpzdGF0ZSwgQmFkVHlwZSwgb3JpZ2luLCBwYXJhbXMsIG1fbm9kZUluZGV4LCBvc3JF eGl0QXJndW1lbnRPZmZzZXQpOwogCiAgICAgICAgICAgICAgICAgU25pcHBldFBhcmFtcyBkb21K SVRQYXJhbXMoKnN0YXRlLCBwYXJhbXMsIG5vZGUsIG51bGxwdHIsIFdURk1vdmUocmVncyksIFdU Rk1vdmUoZ3BTY3JhdGNoKSwgV1RGTW92ZShmcFNjcmF0Y2gpKTsKICAgICAgICAgICAgICAgICBD Q2FsbEhlbHBlcnM6Okp1bXBMaXN0IGZhaWx1cmVDYXNlcyA9IGRvbUpJVC0+Z2VuZXJhdG9yKCkt PnJ1bihqaXQsIGRvbUpJVFBhcmFtcyk7CkBAIC0xODY2OSw3ICsxODY2OSw3IEBAIHByaXZhdGU6 CiAgICAgICAgIHZhbHVlLT5zZXRHZW5lcmF0b3IoCiAgICAgICAgICAgICBbPV0gKENDYWxsSGVs cGVycyYgaml0LCBjb25zdCBCMzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMpIHsK ICAgICAgICAgICAgICAgICBleGl0RGVzY3JpcHRvci0+ZW1pdE9TUkV4aXQoCi0gICAgICAgICAg ICAgICAgICAgICpzdGF0ZSwga2luZCwgb3JpZ2luLCBqaXQsIHBhcmFtcywgMCk7CisgICAgICAg ICAgICAgICAgICAgICpzdGF0ZSwga2luZCwgb3JpZ2luLCBqaXQsIHBhcmFtcywgbV9ub2RlSW5k ZXgsIDApOwogICAgICAgICAgICAgfSk7CiAgICAgfQogCkBAIC0xOTE2NCw3ICsxOTE2NCw3IEBA IHByaXZhdGU6CiAgICAgTEJhc2ljQmxvY2sgbV9uZXh0TG93QmxvY2s7CiAKICAgICBOb2RlT3Jp Z2luIG1fb3JpZ2luOwotICAgIHVuc2lnbmVkIG1fbm9kZUluZGV4OworICAgIHVuc2lnbmVkIG1f bm9kZUluZGV4IHsgMCB9OwogICAgIE5vZGUqIG1fbm9kZTsKIAogICAgIC8vIFRoZXNlIGFyZSB1 c2VkIGZvciB2YWxpZGF0aW5nIEFJIHN0YXRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Z0bC9GVExPU1JFeGl0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRM T1NSRXhpdC5jcHAKaW5kZXggMDRjODU3OTllNGQ0NjkyM2EzMTg2NzE4ZTE5ZjI0YmRmZmRhYmE0 Zi4uMGE2ZjMzYjJmYzJiNzVkMzg0OWVhYmNhYTEwMTYwNjlkYWM1YzlmNiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXQuY3BwCkBAIC02NSwyMCArNjUsMjAgQEAgdm9pZCBP U1JFeGl0RGVzY3JpcHRvcjo6dmFsaWRhdGVSZWZlcmVuY2VzKGNvbnN0IFRyYWNrZWRSZWZlcmVu Y2VzJiB0cmFja2VkUmVmZXIKIAogUmVmPE9TUkV4aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlwdG9y OjplbWl0T1NSRXhpdCgKICAgICBTdGF0ZSYgc3RhdGUsIEV4aXRLaW5kIGV4aXRLaW5kLCBjb25z dCBOb2RlT3JpZ2luJiBub2RlT3JpZ2luLCBDQ2FsbEhlbHBlcnMmIGppdCwKLSAgICBjb25zdCBT dGFja21hcEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcywgdW5zaWduZWQgb2Zmc2V0KQorICAgIGNv bnN0IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW1zLCB1aW50MzJfdCBkZmdOb2RlSW5k ZXgsIHVuc2lnbmVkIG9mZnNldCkKIHsKICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gaGFuZGxlID0K LSAgICAgICAgcHJlcGFyZU9TUkV4aXRIYW5kbGUoc3RhdGUsIGV4aXRLaW5kLCBub2RlT3JpZ2lu LCBwYXJhbXMsIG9mZnNldCk7CisgICAgICAgIHByZXBhcmVPU1JFeGl0SGFuZGxlKHN0YXRlLCBl eGl0S2luZCwgbm9kZU9yaWdpbiwgcGFyYW1zLCBkZmdOb2RlSW5kZXgsIG9mZnNldCk7CiAgICAg aGFuZGxlLT5lbWl0RXhpdFRodW5rKHN0YXRlLCBqaXQpOwogICAgIHJldHVybiBoYW5kbGU7CiB9 CiAKIFJlZjxPU1JFeGl0SGFuZGxlPiBPU1JFeGl0RGVzY3JpcHRvcjo6ZW1pdE9TUkV4aXRMYXRl cigKICAgICBTdGF0ZSYgc3RhdGUsIEV4aXRLaW5kIGV4aXRLaW5kLCBjb25zdCBOb2RlT3JpZ2lu JiBub2RlT3JpZ2luLAotICAgIGNvbnN0IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW1z LCB1bnNpZ25lZCBvZmZzZXQpCisgICAgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBw YXJhbXMsIHVpbnQzMl90IGRmZ05vZGVJbmRleCwgdW5zaWduZWQgb2Zmc2V0KQogewogICAgIFJl ZlB0cjxPU1JFeGl0SGFuZGxlPiBoYW5kbGUgPQotICAgICAgICBwcmVwYXJlT1NSRXhpdEhhbmRs ZShzdGF0ZSwgZXhpdEtpbmQsIG5vZGVPcmlnaW4sIHBhcmFtcywgb2Zmc2V0KTsKKyAgICAgICAg cHJlcGFyZU9TUkV4aXRIYW5kbGUoc3RhdGUsIGV4aXRLaW5kLCBub2RlT3JpZ2luLCBwYXJhbXMs IGRmZ05vZGVJbmRleCwgb2Zmc2V0KTsKICAgICBwYXJhbXMuYWRkTGF0ZVBhdGgoCiAgICAgICAg IFtoYW5kbGUsICZzdGF0ZV0gKENDYWxsSGVscGVycyYgaml0KSB7CiAgICAgICAgICAgICBoYW5k bGUtPmVtaXRFeGl0VGh1bmsoc3RhdGUsIGppdCk7CkBAIC04OCwxMSArODgsMTEgQEAgUmVmPE9T UkV4aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlwdG9yOjplbWl0T1NSRXhpdExhdGVyKAogCiBSZWY8 T1NSRXhpdEhhbmRsZT4gT1NSRXhpdERlc2NyaXB0b3I6OnByZXBhcmVPU1JFeGl0SGFuZGxlKAog ICAgIFN0YXRlJiBzdGF0ZSwgRXhpdEtpbmQgZXhpdEtpbmQsIGNvbnN0IE5vZGVPcmlnaW4mIG5v ZGVPcmlnaW4sCi0gICAgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMsIHVu c2lnbmVkIG9mZnNldCkKKyAgICBjb25zdCBTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmIHBhcmFt cywgdWludDMyX3QgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQpCiB7CiAgICAgdW5zaWdu ZWQgaW5kZXggPSBzdGF0ZS5qaXRDb2RlLT5vc3JFeGl0LnNpemUoKTsKICAgICBPU1JFeGl0JiBl eGl0ID0gc3RhdGUuaml0Q29kZS0+b3NyRXhpdC5hbGxvYygKLSAgICAgICAgdGhpcywgZXhpdEtp bmQsIG5vZGVPcmlnaW4uZm9yRXhpdCwgbm9kZU9yaWdpbi5zZW1hbnRpYywgbm9kZU9yaWdpbi53 YXNIb2lzdGVkKTsKKyAgICAgICAgdGhpcywgZXhpdEtpbmQsIG5vZGVPcmlnaW4uZm9yRXhpdCwg bm9kZU9yaWdpbi5zZW1hbnRpYywgbm9kZU9yaWdpbi53YXNIb2lzdGVkLCBkZmdOb2RlSW5kZXgp OwogICAgIFJlZjxPU1JFeGl0SGFuZGxlPiBoYW5kbGUgPSBhZG9wdFJlZigqbmV3IE9TUkV4aXRI YW5kbGUoaW5kZXgsIGV4aXQpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBvZmZzZXQ7IGkgPCBw YXJhbXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIGV4aXQubV92YWx1ZVJlcHMuYXBwZW5kKHBhcmFt c1tpXSk7CkBAIC0xMDIsOCArMTAyLDggQEAgUmVmPE9TUkV4aXRIYW5kbGU+IE9TUkV4aXREZXNj cmlwdG9yOjpwcmVwYXJlT1NSRXhpdEhhbmRsZSgKIAogT1NSRXhpdDo6T1NSRXhpdCgKICAgICBP U1JFeGl0RGVzY3JpcHRvciogZGVzY3JpcHRvciwgRXhpdEtpbmQgZXhpdEtpbmQsIENvZGVPcmln aW4gY29kZU9yaWdpbiwKLSAgICBDb2RlT3JpZ2luIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwg Ym9vbCB3YXNIb2lzdGVkKQotICAgIDogT1NSRXhpdEJhc2UoZXhpdEtpbmQsIGNvZGVPcmlnaW4s IGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgd2FzSG9pc3RlZCkKKyAgICBDb2RlT3JpZ2luIGNv ZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9vbCB3YXNIb2lzdGVkLCB1aW50MzJfdCBkZmdOb2Rl SW5kZXgpCisgICAgOiBPU1JFeGl0QmFzZShleGl0S2luZCwgY29kZU9yaWdpbiwgY29kZU9yaWdp bkZvckV4aXRQcm9maWxlLCB3YXNIb2lzdGVkLCBkZmdOb2RlSW5kZXgpCiAgICAgLCBtX2Rlc2Ny aXB0b3IoZGVzY3JpcHRvcikKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9mdGwvRlRMT1NSRXhpdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0 LmgKaW5kZXggZmQ3ZjlmMDViYzQ4OWMxZjZhZWNlMDk3YWQ4YTRkMWUyN2I4MDMyMi4uOTc3NWY1 MGYzNDRjZjk2ZmU1NDFlZTA5ZjE5MDE4Nzk5MmYwNWM0NCAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExPU1JFeGl0LmgKQEAgLTkyLDcgKzkyLDcgQEAgc3RydWN0IE9TUkV4aXREZXNjcmlw dG9yIHsKICAgICAvLyB0aGlzIGNhbGwsIHRoZSBPU1JFeGl0IGlzIHNpbXBseSByZWFkeSB0byBn by4KICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gZW1pdE9TUkV4aXQoCiAgICAgICAgIFN0YXRlJiwg RXhpdEtpbmQsIGNvbnN0IERGRzo6Tm9kZU9yaWdpbiYsIENDYWxsSGVscGVycyYsIGNvbnN0IEIz OjpTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmLAotICAgICAgICB1bnNpZ25lZCBvZmZzZXQgPSAw KTsKKyAgICAgICAgdWludDMyX3QgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQgPSAwKTsK IAogICAgIC8vIEluIHNvbWUgY2FzZXMgeW91IHdhbnQgYW4gT1NSRXhpdCB0byBjb21lIGludG8g ZXhpc3RlbmNlLCBidXQgeW91IGRvbid0IHdhbnQgdG8gZW1pdCBpdCByaWdodCBub3cuCiAgICAg Ly8gVGhpcyB3aWxsIGVtaXQgdGhlIE9TUiBleGl0IGluIGEgbGF0ZSBwYXRoLiBZb3UgY2FuJ3Qg YmUgc3VyZSBleGFjdGx5IHdoZW4gdGhhdCB3aWxsIGhhcHBlbiwgYnV0CkBAIC0xMDQsNyArMTA0 LDcgQEAgc3RydWN0IE9TUkV4aXREZXNjcmlwdG9yIHsKICAgICAvLyBldmVudHVhbGx5IGdldHMg YWNjZXNzIHRvIGl0cyBsYWJlbC4KICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gZW1pdE9TUkV4aXRM YXRlcigKICAgICAgICAgU3RhdGUmLCBFeGl0S2luZCwgY29uc3QgREZHOjpOb2RlT3JpZ2luJiwg Y29uc3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYsCi0gICAgICAgIHVuc2lnbmVkIG9m ZnNldCA9IDApOworICAgICAgICB1aW50MzJfdCBkZmdOb2RlSW5kZXgsIHVuc2lnbmVkIG9mZnNl dCA9IDApOwogCiBwcml2YXRlOgogICAgIC8vIFRoaXMgaXMgdGhlIGxvdy1sZXZlbCBpbnRlcmZh Y2UuIEl0IHdpbGwgY3JlYXRlIGEgaGFuZGxlIHJlcHJlc2VudGluZyB0aGUgZGVzaXJlIHRvIGVt aXQgY29kZSBmb3IKQEAgLTExMiwxMSArMTEyLDExIEBAIHByaXZhdGU6CiAgICAgLy8gdGhhdCB0 aGUgYWJvdmUgdHdvIEFQSXMgYXJlIHdyaXR0ZW4gaW4gdGVybXMgb2YgdGhpcyBhbmQgT1NSRXhp dEhhbmRsZTo6ZW1pdEV4aXRUaHVuaygpLgogICAgIFJlZjxPU1JFeGl0SGFuZGxlPiBwcmVwYXJl T1NSRXhpdEhhbmRsZSgKICAgICAgICAgU3RhdGUmLCBFeGl0S2luZCwgY29uc3QgREZHOjpOb2Rl T3JpZ2luJiwgY29uc3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYsCi0gICAgICAgIHVu c2lnbmVkIG9mZnNldCA9IDApOworICAgICAgICB1aW50MzJfdCBkZmdOb2RlSW5kZXgsIHVuc2ln bmVkIG9mZnNldCA9IDApOwogfTsKIAogc3RydWN0IE9TUkV4aXQgOiBwdWJsaWMgREZHOjpPU1JF eGl0QmFzZSB7Ci0gICAgT1NSRXhpdChPU1JFeGl0RGVzY3JpcHRvciosIEV4aXRLaW5kLCBDb2Rl T3JpZ2luLCBDb2RlT3JpZ2luIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9vbCB3YXNIb2lz dGVkKTsKKyAgICBPU1JFeGl0KE9TUkV4aXREZXNjcmlwdG9yKiwgRXhpdEtpbmQsIENvZGVPcmln aW4sIENvZGVPcmlnaW4gY29kZU9yaWdpbkZvckV4aXRQcm9maWxlLCBib29sIHdhc0hvaXN0ZWQs IHVpbnQzMl90IGRmZ05vZGVJbmRleCk7CiAKICAgICBPU1JFeGl0RGVzY3JpcHRvciogbV9kZXNj cmlwdG9yOwogICAgIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxPU1JFeGl0UHRyVGFnPiBtX2NvZGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXRDb21waWxl ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXRDb21waWxlci5jcHAK aW5kZXggM2M5MTM3ZWY3MGY1ZmZkZDliYTAxN2Y3MmJiZTFiN2ZmZWU4NGEzYy4uMWY0Mzg1YTI3 MmI5Y2YwNTgyZTQwMTQyOGY1MGYwNTEzODY3NTU5NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0Q29tcGlsZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNwcApAQCAtNTMyLDggKzUzMiw4IEBAIHN0 YXRpYyB2b2lkIGNvbXBpbGVTdHViKFZNJiB2bSwgdW5zaWduZWQgZXhpdElELCBKSVRDb2RlKiBq aXRDb2RlLCBPU1JFeGl0JiBleGl0CiAgICAgZXhpdC5tX2NvZGUgPSBGSU5BTElaRV9DT0RFX0lG KAogICAgICAgICBzaG91bGREdW1wRGlzYXNzZW1ibHkoKSB8fCBPcHRpb25zOjp2ZXJib3NlT1NS KCkgfHwgT3B0aW9uczo6dmVyYm9zZUZUTE9TUkV4aXQoKSwKICAgICAgICAgcGF0Y2hCdWZmZXIs IE9TUkV4aXRQdHJUYWcsCi0gICAgICAgICJGVEwgT1NSIGV4aXQgIyV1ICglcywgJXMpIGZyb20g JXMsIHdpdGggb3BlcmFuZHMgPSAlcyIsCi0gICAgICAgICAgICBleGl0SUQsIHRvQ1N0cmluZyhl eGl0Lm1fY29kZU9yaWdpbikuZGF0YSgpLAorICAgICAgICAiRlRMIE9TUiBleGl0ICMldSAoREAl dSwgJXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAorICAgICAgICAgICAgZXhp dElELCBleGl0Lm1fZGZnTm9kZUluZGV4LCB0b0NTdHJpbmcoZXhpdC5tX2NvZGVPcmlnaW4pLmRh dGEoKSwKICAgICAgICAgICAgIGV4aXRLaW5kVG9TdHJpbmcoZXhpdC5tX2tpbmQpLCB0b0NTdHJp bmcoKmNvZGVCbG9jaykuZGF0YSgpLAogICAgICAgICAgICAgdG9DU3RyaW5nKGlnbm9yaW5nQ29u dGV4dDxEdW1wQ29udGV4dD4oZXhpdC5tX2Rlc2NyaXB0b3ItPm1fdmFsdWVzKSkuZGF0YSgpCiAg ICAgICAgICk7Cg== 397721 2020-04-27 12:51:20 -0700 2020-04-27 13:22:37 -0700 Patch for landing bug-210998-20200427125119.patch text/plain 17926 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ZmVkYTI1ZDcxZGJlN2Q0NmQ3NzYxYmYwM2JhYmQ4NGYxMTRmYTkyLi45MzdhNzdlNGQ0NGFjNjY0 YmY5NzUxMWMxYTI3MmI2MzY0ZGJkYzliIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAyMC0wNC0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBPU1IgRXhpdCBjb21waWxlciBzaG91bGQga25vdyBhbmQgcHJpbnQg dGhlIGV4aXRpbmcgREZHIG5vZGUncyBpbmRleAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBM YW0uCisKKyAgICAgICAgVGhlIG9ubHkgaW50ZXJlc3RpbmcgdGhpbmcgaGVyZSBpcyB0aGF0IHdl IHNldCB0aGUgbm9kZSB0byBpbmRleCAwIGlmIHRoZXJlIGlzIG5vIG5vZGUuCisgICAgICAgIEFG QUlDVCwgd2Ugb25seSBkb24ndCBoYXZlIGEgbm9kZSB3aGVuIHdlIGFyZSBjaGVja2luZyBhcmd1 bWVudHMuCisKKyAgICAgICAgKiBkZmcvREZHT1NSRXhpdC5jcHA6CisgICAgICAgIChKU0M6OkRG Rzo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAgIChKU0M6OkRGRzo6b3BlcmF0aW9uQ29tcGls ZU9TUkV4aXQpOgorICAgICAgICAqIGRmZy9ERkdPU1JFeGl0QmFzZS5oOgorICAgICAgICAoSlND OjpERkc6Ok9TUkV4aXRCYXNlOjpPU1JFeGl0QmFzZSk6CisgICAgICAgICogZnRsL0ZUTExvd2Vy REZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBp bGVJbnZhbGlkYXRpb25Qb2ludCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1Rv QjM6OmNvbXBpbGVDaGVja1N1YkNsYXNzKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2Vy REZHVG9CMzo6Ymxlc3NTcGVjdWxhdGlvbik6CisgICAgICAgICogZnRsL0ZUTE9TUkV4aXQuY3Bw OgorICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjplbWl0T1NSRXhpdCk6Cisg ICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdERlc2NyaXB0b3I6OmVtaXRPU1JFeGl0TGF0ZXIpOgor ICAgICAgICAoSlNDOjpGVEw6Ok9TUkV4aXREZXNjcmlwdG9yOjpwcmVwYXJlT1NSRXhpdEhhbmRs ZSk6CisgICAgICAgIChKU0M6OkZUTDo6T1NSRXhpdDo6T1NSRXhpdCk6CisgICAgICAgICogZnRs L0ZUTE9TUkV4aXQuaDoKKyAgICAgICAgKiBmdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNwcDoKKyAg ICAgICAgKEpTQzo6RlRMOjpjb21waWxlU3R1Yik6CisKIDIwMjAtMDQtMjcgIFJvc3MgS2lyc2xp bmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFtKU0NdIENhbGxEYXRhL0Nv bnN0cnVjdERhdGEgc2hvdWxkIGluY2x1ZGUgQ2FsbFR5cGUvQ29uc3RydWN0VHlwZQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdC5jcHAKaW5kZXggZjYzNzJhZGQ0OTBmNGM4Yzk5 YTQ3MTI2NTIxZDNlYzk1ZGUzYjIzOC4uMzI1ZjE3NDkxYjlmZDRkN2Q3OWMzN2NhNzA4M2RmYjU3 YTgzMWRmMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0 LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXQuY3BwCkBAIC00 OSw3ICs0OSw3IEBACiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CiAKIE9TUkV4aXQ6 Ok9TUkV4aXQoRXhpdEtpbmQga2luZCwgSlNWYWx1ZVNvdXJjZSBqc1ZhbHVlU291cmNlLCBNZXRo b2RPZkdldHRpbmdBVmFsdWVQcm9maWxlIHZhbHVlUHJvZmlsZSwgU3BlY3VsYXRpdmVKSVQqIGpp dCwgdW5zaWduZWQgc3RyZWFtSW5kZXgsIHVuc2lnbmVkIHJlY292ZXJ5SW5kZXgpCi0gICAgOiBP U1JFeGl0QmFzZShraW5kLCBqaXQtPm1fb3JpZ2luLmZvckV4aXQsIGppdC0+bV9vcmlnaW4uc2Vt YW50aWMsIGppdC0+bV9vcmlnaW4ud2FzSG9pc3RlZCkKKyAgICA6IE9TUkV4aXRCYXNlKGtpbmQs IGppdC0+bV9vcmlnaW4uZm9yRXhpdCwgaml0LT5tX29yaWdpbi5zZW1hbnRpYywgaml0LT5tX29y aWdpbi53YXNIb2lzdGVkLCBqaXQtPm1fY3VycmVudE5vZGUgPyBqaXQtPm1fY3VycmVudE5vZGUt PmluZGV4KCkgOiAwKQogICAgICwgbV9qc1ZhbHVlU291cmNlKGpzVmFsdWVTb3VyY2UpCiAgICAg LCBtX3ZhbHVlUHJvZmlsZSh2YWx1ZVByb2ZpbGUpCiAgICAgLCBtX3JlY292ZXJ5SW5kZXgocmVj b3ZlcnlJbmRleCkKQEAgLTIwOSw4ICsyMDksOCBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0 aW9uQ29tcGlsZU9TUkV4aXQoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiAgICAgICAgIGV4aXQubV9j b2RlID0gRklOQUxJWkVfQ09ERV9JRigKICAgICAgICAgICAgIHNob3VsZER1bXBEaXNhc3NlbWJs eSgpIHx8IE9wdGlvbnM6OnZlcmJvc2VPU1IoKSB8fCBPcHRpb25zOjp2ZXJib3NlREZHT1NSRXhp dCgpLAogICAgICAgICAgICAgcGF0Y2hCdWZmZXIsIE9TUkV4aXRQdHJUYWcsCi0gICAgICAgICAg ICAiREZHIE9TUiBleGl0ICMldSAoJXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMi LAotICAgICAgICAgICAgICAgIGV4aXRJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2lu KS5kYXRhKCksCisgICAgICAgICAgICAiREZHIE9TUiBleGl0ICMldSAoREAldSwgJXMsICVzKSBm cm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAorICAgICAgICAgICAgICAgIGV4aXRJbmRleCwg ZXhpdC5tX2RmZ05vZGVJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9jb2RlT3JpZ2luKS5kYXRhKCks CiAgICAgICAgICAgICAgICAgZXhpdEtpbmRUb1N0cmluZyhleGl0Lm1fa2luZCksIHRvQ1N0cmlu ZygqY29kZUJsb2NrKS5kYXRhKCksCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKGlnbm9yaW5n Q29udGV4dDxEdW1wQ29udGV4dD4ob3BlcmFuZHMpKS5kYXRhKCkpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdEJhc2UuaAppbmRleCAwMDNiNjE4Y2Q0NDBlNDAw YWJhYWNlYzBhZmJjM2MxMjQzNWRiOTZlLi42MDE2ODI2MmI4YWE2MTE4NGNjMDQ0NzExMDllMWEz YjcxYzY3Y2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4 aXRCYXNlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0QmFzZS5o CkBAIC0zOSwxMSArMzksMTIgQEAgc3RydWN0IE5vZGU7CiAvLyBhbmQgdGhlIEZUTC4KIAogc3Ry dWN0IE9TUkV4aXRCYXNlIHsKLSAgICBPU1JFeGl0QmFzZShFeGl0S2luZCBraW5kLCBDb2RlT3Jp Z2luIG9yaWdpbiwgQ29kZU9yaWdpbiBvcmlnaW5Gb3JQcm9maWxlLCBib29sIHdhc0hvaXN0ZWQp CisgICAgT1NSRXhpdEJhc2UoRXhpdEtpbmQga2luZCwgQ29kZU9yaWdpbiBvcmlnaW4sIENvZGVP cmlnaW4gb3JpZ2luRm9yUHJvZmlsZSwgYm9vbCB3YXNIb2lzdGVkLCB1aW50MzJfdCBkZmdOb2Rl SW5kZXgpCiAgICAgICAgIDogbV9raW5kKGtpbmQpCiAgICAgICAgICwgbV93YXNIb2lzdGVkKHdh c0hvaXN0ZWQpCiAgICAgICAgICwgbV9jb2RlT3JpZ2luKG9yaWdpbikKICAgICAgICAgLCBtX2Nv ZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZShvcmlnaW5Gb3JQcm9maWxlKQorICAgICAgICAsIG1fZGZn Tm9kZUluZGV4KGRmZ05vZGVJbmRleCkKICAgICB7CiAgICAgICAgIEFTU0VSVChtX2NvZGVPcmln aW4uaXNTZXQoKSk7CiAgICAgICAgIEFTU0VSVChtX2NvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZS5p c1NldCgpKTsKQEAgLTU2LDYgKzU3LDcgQEAgc3RydWN0IE9TUkV4aXRCYXNlIHsKICAgICBDb2Rl T3JpZ2luIG1fY29kZU9yaWdpbjsKICAgICBDb2RlT3JpZ2luIG1fY29kZU9yaWdpbkZvckV4aXRQ cm9maWxlOwogICAgIENhbGxTaXRlSW5kZXggbV9leGNlcHRpb25IYW5kbGVyQ2FsbFNpdGVJbmRl eDsKKyAgICB1aW50MzJfdCBtX2RmZ05vZGVJbmRleDsKIAogICAgIEFMV0FZU19JTkxJTkUgYm9v bCBpc0V4Y2VwdGlvbkhhbmRsZXIoKSBjb25zdAogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAppbmRleCA4NWIxOWU4ZWE1ZTU3NDZiZTViNWFk NTRhNjMyMDRiMTFiNjI0YjQ0Li43ZGQxNzE3Mjg0ZGY2MWZkOWZhNWVhNThkMzEwZDliZTIwNjhi ODdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9C My5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3Bw CkBAIC0zNTMsNiArMzUzLDcgQEAgcHVibGljOgogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBtX25vZGUgPSBudWxscHRyOworICAgICAgICAgICAgbV9ub2RlSW5kZXhJbkdyYXBoID0gMDsK ICAgICAgICAgICAgIG1fb3JpZ2luID0gTm9kZU9yaWdpbihDb2RlT3JpZ2luKEJ5dGVjb2RlSW5k ZXgoMCkpLCBDb2RlT3JpZ2luKEJ5dGVjb2RlSW5kZXgoMCkpLCB0cnVlKTsKIAogICAgICAgICAg ICAgLy8gQ2hlY2sgQXJndW1lbnRzLgpAQCAtNTExLDggKzUxMiw4IEBAIHByaXZhdGU6CiAgICAg ICAgIG1fc3RhdGUucmVzZXQoKTsKICAgICAgICAgbV9zdGF0ZS5iZWdpbkJhc2ljQmxvY2sobV9o aWdoQmxvY2spOwogICAgICAgICAKLSAgICAgICAgZm9yIChtX25vZGVJbmRleCA9IDA7IG1fbm9k ZUluZGV4IDwgbV9oaWdoQmxvY2stPnNpemUoKTsgKyttX25vZGVJbmRleCkgewotICAgICAgICAg ICAgaWYgKCFjb21waWxlTm9kZShtX25vZGVJbmRleCkpCisgICAgICAgIGZvciAodW5zaWduZWQg bm9kZUluZGV4ID0gMDsgbm9kZUluZGV4IDwgbV9oaWdoQmxvY2stPnNpemUoKTsgKytub2RlSW5k ZXgpIHsKKyAgICAgICAgICAgIGlmICghY29tcGlsZU5vZGUobm9kZUluZGV4KSkKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KQEAgLTY3NSw2ICs2NzYsNyBAQCBwcml2 YXRlOgogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBtX25vZGUgPSBtX2hpZ2hCbG9jay0+ YXQobm9kZUluZGV4KTsKKyAgICAgICAgbV9ub2RlSW5kZXhJbkdyYXBoID0gbV9ub2RlLT5pbmRl eCgpOwogICAgICAgICBtX29yaWdpbiA9IG1fbm9kZS0+b3JpZ2luOwogICAgICAgICBtX291dC5z ZXRPcmlnaW4obV9ub2RlKTsKICAgICAgICAgCkBAIC0xMDgyMiw3ICsxMDgyNCw3IEBAIHByaXZh dGU6CiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpMYWJlbCBsYWJlbCA9IGppdC53YXRj aHBvaW50TGFiZWwoKTsKIAogICAgICAgICAgICAgICAgIFJlZlB0cjxPU1JFeGl0SGFuZGxlPiBo YW5kbGUgPSBkZXNjcmlwdG9yLT5lbWl0T1NSRXhpdExhdGVyKAotICAgICAgICAgICAgICAgICAg ICAqc3RhdGUsIFVuY291bnRhYmxlSW52YWxpZGF0aW9uLCBvcmlnaW4sIHBhcmFtcyk7CisgICAg ICAgICAgICAgICAgICAgICpzdGF0ZSwgVW5jb3VudGFibGVJbnZhbGlkYXRpb24sIG9yaWdpbiwg cGFyYW1zLCBtX25vZGVJbmRleEluR3JhcGgsIDApOwogCiAgICAgICAgICAgICAgICAgUmVmUHRy PEpJVENvZGU+IGppdENvZGUgPSBzdGF0ZS0+aml0Q29kZS5nZXQoKTsKIApAQCAtMTM4OTYsNyAr MTM4OTgsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBkb21KSVQtPm51bUZQU2NyYXRjaFJlZ2lzdGVyczsgKytpKQogICAgICAgICAgICAgICAg ICAgICBmcFNjcmF0Y2guYXBwZW5kKHBhcmFtcy5mcFNjcmF0Y2goaSkpOwogCi0gICAgICAgICAg ICAgICAgUmVmUHRyPE9TUkV4aXRIYW5kbGU+IGhhbmRsZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0 T1NSRXhpdExhdGVyKCpzdGF0ZSwgQmFkVHlwZSwgb3JpZ2luLCBwYXJhbXMsIG9zckV4aXRBcmd1 bWVudE9mZnNldCk7CisgICAgICAgICAgICAgICAgUmVmUHRyPE9TUkV4aXRIYW5kbGU+IGhhbmRs ZSA9IGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhpdExhdGVyKCpzdGF0ZSwgQmFkVHlwZSwgb3Jp Z2luLCBwYXJhbXMsIG1fbm9kZUluZGV4SW5HcmFwaCwgb3NyRXhpdEFyZ3VtZW50T2Zmc2V0KTsK IAogICAgICAgICAgICAgICAgIFNuaXBwZXRQYXJhbXMgZG9tSklUUGFyYW1zKCpzdGF0ZSwgcGFy YW1zLCBub2RlLCBudWxscHRyLCBXVEZNb3ZlKHJlZ3MpLCBXVEZNb3ZlKGdwU2NyYXRjaCksIFdU Rk1vdmUoZnBTY3JhdGNoKSk7CiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpKdW1wTGlz dCBmYWlsdXJlQ2FzZXMgPSBkb21KSVQtPmdlbmVyYXRvcigpLT5ydW4oaml0LCBkb21KSVRQYXJh bXMpOwpAQCAtMTg1ODYsNyArMTg1ODgsNyBAQCBwcml2YXRlOgogICAgICAgICBIYW5kbGVySW5m byogZXhjZXB0aW9uSGFuZGxlcjsKICAgICAgICAgYm9vbCB3aWxsQ2F0Y2hFeGNlcHRpb24gPSBt X2dyYXBoLndpbGxDYXRjaEV4Y2VwdGlvbkluTWFjaGluZUZyYW1lKG1fb3JpZ2luLmZvckV4aXQs IG9wQ2F0Y2hPcmlnaW4sIGV4Y2VwdGlvbkhhbmRsZXIpOwogICAgICAgICBpZiAoIXdpbGxDYXRj aEV4Y2VwdGlvbikKLSAgICAgICAgICAgIHJldHVybiBQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxl OjpkZWZhdWx0SGFuZGxlKG1fZnRsU3RhdGUpOworICAgICAgICAgICAgcmV0dXJuIFBhdGNocG9p bnRFeGNlcHRpb25IYW5kbGU6OmRlZmF1bHRIYW5kbGUobV9mdGxTdGF0ZSwgbV9ub2RlSW5kZXhJ bkdyYXBoKTsKIAogICAgICAgICBkYXRhTG9nTG5JZih2ZXJib3NlQ29tcGlsYXRpb25FbmFibGVk KCksICIgICAgUGF0Y2hwb2ludCBleGNlcHRpb24gT1NSIGV4aXQgIyIsIG1fZnRsU3RhdGUuaml0 Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLnNpemUoKSwgIiB3aXRoIGF2YWlsYWJpbGl0eTogIiwg YXZhaWxhYmlsaXR5TWFwKCkpOwogCkBAIC0xODYwOSw3ICsxODYxMSw3IEBAIHByaXZhdGU6CiAg ICAgICAgICAgICBWYWx1ZVJlcDo6TGF0ZUNvbGRBbnkpOwogCiAgICAgICAgIHJldHVybiBQYXRj aHBvaW50RXhjZXB0aW9uSGFuZGxlOjpjcmVhdGUoCi0gICAgICAgICAgICBtX2Z0bFN0YXRlLCBl eGl0RGVzY3JpcHRvciwgb3JpZ2luLCBvZmZzZXQsICpleGNlcHRpb25IYW5kbGVyKTsKKyAgICAg ICAgICAgIG1fZnRsU3RhdGUsIGV4aXREZXNjcmlwdG9yLCBvcmlnaW4sIG1fbm9kZUluZGV4SW5H cmFwaCwgb2Zmc2V0LCAqZXhjZXB0aW9uSGFuZGxlcik7CiAgICAgfQogCiAgICAgTEJhc2ljQmxv Y2sgbG93QmxvY2soREZHOjpCYXNpY0Jsb2NrKiBibG9jaykKQEAgLTE4NjkxLDcgKzE4NjkzLDcg QEAgcHJpdmF0ZToKICAgICAgICAgdmFsdWUtPnNldEdlbmVyYXRvcigKICAgICAgICAgICAgIFs9 XSAoQ0NhbGxIZWxwZXJzJiBqaXQsIGNvbnN0IEIzOjpTdGFja21hcEdlbmVyYXRpb25QYXJhbXMm IHBhcmFtcykgewogICAgICAgICAgICAgICAgIGV4aXREZXNjcmlwdG9yLT5lbWl0T1NSRXhpdCgK LSAgICAgICAgICAgICAgICAgICAgKnN0YXRlLCBraW5kLCBvcmlnaW4sIGppdCwgcGFyYW1zLCAw KTsKKyAgICAgICAgICAgICAgICAgICAgKnN0YXRlLCBraW5kLCBvcmlnaW4sIGppdCwgcGFyYW1z LCBtX25vZGVJbmRleEluR3JhcGgsIDApOwogICAgICAgICAgICAgfSk7CiAgICAgfQogCkBAIC0x OTE4Niw3ICsxOTE4OCw3IEBAIHByaXZhdGU6CiAgICAgTEJhc2ljQmxvY2sgbV9uZXh0TG93Qmxv Y2s7CiAKICAgICBOb2RlT3JpZ2luIG1fb3JpZ2luOwotICAgIHVuc2lnbmVkIG1fbm9kZUluZGV4 OworICAgIHVuc2lnbmVkIG1fbm9kZUluZGV4SW5HcmFwaCB7IDAgfTsKICAgICBOb2RlKiBtX25v ZGU7CiAKICAgICAvLyBUaGVzZSBhcmUgdXNlZCBmb3IgdmFsaWRhdGluZyBBSSBzdGF0ZS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NSRXhpdC5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXQuY3BwCmluZGV4IDA0Yzg1Nzk5ZTRkNDY5 MjNhMzE4NjcxOGUxOWYyNGJkZmZkYWJhNGYuLjBhNmYzM2IyZmMyYjc1ZDM4NDllYWJjYWExMDE2 MDY5ZGFjNWM5ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NS RXhpdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0LmNwcApA QCAtNjUsMjAgKzY1LDIwIEBAIHZvaWQgT1NSRXhpdERlc2NyaXB0b3I6OnZhbGlkYXRlUmVmZXJl bmNlcyhjb25zdCBUcmFja2VkUmVmZXJlbmNlcyYgdHJhY2tlZFJlZmVyCiAKIFJlZjxPU1JFeGl0 SGFuZGxlPiBPU1JFeGl0RGVzY3JpcHRvcjo6ZW1pdE9TUkV4aXQoCiAgICAgU3RhdGUmIHN0YXRl LCBFeGl0S2luZCBleGl0S2luZCwgY29uc3QgTm9kZU9yaWdpbiYgbm9kZU9yaWdpbiwgQ0NhbGxI ZWxwZXJzJiBqaXQsCi0gICAgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMs IHVuc2lnbmVkIG9mZnNldCkKKyAgICBjb25zdCBTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmIHBh cmFtcywgdWludDMyX3QgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQpCiB7CiAgICAgUmVm PE9TUkV4aXRIYW5kbGU+IGhhbmRsZSA9Ci0gICAgICAgIHByZXBhcmVPU1JFeGl0SGFuZGxlKHN0 YXRlLCBleGl0S2luZCwgbm9kZU9yaWdpbiwgcGFyYW1zLCBvZmZzZXQpOworICAgICAgICBwcmVw YXJlT1NSRXhpdEhhbmRsZShzdGF0ZSwgZXhpdEtpbmQsIG5vZGVPcmlnaW4sIHBhcmFtcywgZGZn Tm9kZUluZGV4LCBvZmZzZXQpOwogICAgIGhhbmRsZS0+ZW1pdEV4aXRUaHVuayhzdGF0ZSwgaml0 KTsKICAgICByZXR1cm4gaGFuZGxlOwogfQogCiBSZWY8T1NSRXhpdEhhbmRsZT4gT1NSRXhpdERl c2NyaXB0b3I6OmVtaXRPU1JFeGl0TGF0ZXIoCiAgICAgU3RhdGUmIHN0YXRlLCBFeGl0S2luZCBl eGl0S2luZCwgY29uc3QgTm9kZU9yaWdpbiYgbm9kZU9yaWdpbiwKLSAgICBjb25zdCBTdGFja21h cEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcywgdW5zaWduZWQgb2Zmc2V0KQorICAgIGNvbnN0IFN0 YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW1zLCB1aW50MzJfdCBkZmdOb2RlSW5kZXgsIHVu c2lnbmVkIG9mZnNldCkKIHsKICAgICBSZWZQdHI8T1NSRXhpdEhhbmRsZT4gaGFuZGxlID0KLSAg ICAgICAgcHJlcGFyZU9TUkV4aXRIYW5kbGUoc3RhdGUsIGV4aXRLaW5kLCBub2RlT3JpZ2luLCBw YXJhbXMsIG9mZnNldCk7CisgICAgICAgIHByZXBhcmVPU1JFeGl0SGFuZGxlKHN0YXRlLCBleGl0 S2luZCwgbm9kZU9yaWdpbiwgcGFyYW1zLCBkZmdOb2RlSW5kZXgsIG9mZnNldCk7CiAgICAgcGFy YW1zLmFkZExhdGVQYXRoKAogICAgICAgICBbaGFuZGxlLCAmc3RhdGVdIChDQ2FsbEhlbHBlcnMm IGppdCkgewogICAgICAgICAgICAgaGFuZGxlLT5lbWl0RXhpdFRodW5rKHN0YXRlLCBqaXQpOwpA QCAtODgsMTEgKzg4LDExIEBAIFJlZjxPU1JFeGl0SGFuZGxlPiBPU1JFeGl0RGVzY3JpcHRvcjo6 ZW1pdE9TUkV4aXRMYXRlcigKIAogUmVmPE9TUkV4aXRIYW5kbGU+IE9TUkV4aXREZXNjcmlwdG9y OjpwcmVwYXJlT1NSRXhpdEhhbmRsZSgKICAgICBTdGF0ZSYgc3RhdGUsIEV4aXRLaW5kIGV4aXRL aW5kLCBjb25zdCBOb2RlT3JpZ2luJiBub2RlT3JpZ2luLAotICAgIGNvbnN0IFN0YWNrbWFwR2Vu ZXJhdGlvblBhcmFtcyYgcGFyYW1zLCB1bnNpZ25lZCBvZmZzZXQpCisgICAgY29uc3QgU3RhY2tt YXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMsIHVpbnQzMl90IGRmZ05vZGVJbmRleCwgdW5zaWdu ZWQgb2Zmc2V0KQogewogICAgIHVuc2lnbmVkIGluZGV4ID0gc3RhdGUuaml0Q29kZS0+b3NyRXhp dC5zaXplKCk7CiAgICAgT1NSRXhpdCYgZXhpdCA9IHN0YXRlLmppdENvZGUtPm9zckV4aXQuYWxs b2MoCi0gICAgICAgIHRoaXMsIGV4aXRLaW5kLCBub2RlT3JpZ2luLmZvckV4aXQsIG5vZGVPcmln aW4uc2VtYW50aWMsIG5vZGVPcmlnaW4ud2FzSG9pc3RlZCk7CisgICAgICAgIHRoaXMsIGV4aXRL aW5kLCBub2RlT3JpZ2luLmZvckV4aXQsIG5vZGVPcmlnaW4uc2VtYW50aWMsIG5vZGVPcmlnaW4u d2FzSG9pc3RlZCwgZGZnTm9kZUluZGV4KTsKICAgICBSZWY8T1NSRXhpdEhhbmRsZT4gaGFuZGxl ID0gYWRvcHRSZWYoKm5ldyBPU1JFeGl0SGFuZGxlKGluZGV4LCBleGl0KSk7CiAgICAgZm9yICh1 bnNpZ25lZCBpID0gb2Zmc2V0OyBpIDwgcGFyYW1zLnNpemUoKTsgKytpKQogICAgICAgICBleGl0 Lm1fdmFsdWVSZXBzLmFwcGVuZChwYXJhbXNbaV0pOwpAQCAtMTAyLDggKzEwMiw4IEBAIFJlZjxP U1JFeGl0SGFuZGxlPiBPU1JFeGl0RGVzY3JpcHRvcjo6cHJlcGFyZU9TUkV4aXRIYW5kbGUoCiAK IE9TUkV4aXQ6Ok9TUkV4aXQoCiAgICAgT1NSRXhpdERlc2NyaXB0b3IqIGRlc2NyaXB0b3IsIEV4 aXRLaW5kIGV4aXRLaW5kLCBDb2RlT3JpZ2luIGNvZGVPcmlnaW4sCi0gICAgQ29kZU9yaWdpbiBj b2RlT3JpZ2luRm9yRXhpdFByb2ZpbGUsIGJvb2wgd2FzSG9pc3RlZCkKLSAgICA6IE9TUkV4aXRC YXNlKGV4aXRLaW5kLCBjb2RlT3JpZ2luLCBjb2RlT3JpZ2luRm9yRXhpdFByb2ZpbGUsIHdhc0hv aXN0ZWQpCisgICAgQ29kZU9yaWdpbiBjb2RlT3JpZ2luRm9yRXhpdFByb2ZpbGUsIGJvb2wgd2Fz SG9pc3RlZCwgdWludDMyX3QgZGZnTm9kZUluZGV4KQorICAgIDogT1NSRXhpdEJhc2UoZXhpdEtp bmQsIGNvZGVPcmlnaW4sIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgd2FzSG9pc3RlZCwgZGZn Tm9kZUluZGV4KQogICAgICwgbV9kZXNjcmlwdG9yKGRlc2NyaXB0b3IpCiB7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXQuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMT1NSRXhpdC5oCmluZGV4IGZkN2Y5ZjA1YmM0ODljMWY2YWVjZTA5 N2FkOGE0ZDFlMjdiODAzMjIuLmE2NDFlYjc0YjYxZmE0NGQ3ODFlYTViMzkyMDU3MTU3ZGI1MDQ4 MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NSRXhpdC5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NSRXhpdC5oCkBAIC05Miw3ICs5Miw3 IEBAIHN0cnVjdCBPU1JFeGl0RGVzY3JpcHRvciB7CiAgICAgLy8gdGhpcyBjYWxsLCB0aGUgT1NS RXhpdCBpcyBzaW1wbHkgcmVhZHkgdG8gZ28uCiAgICAgUmVmPE9TUkV4aXRIYW5kbGU+IGVtaXRP U1JFeGl0KAogICAgICAgICBTdGF0ZSYsIEV4aXRLaW5kLCBjb25zdCBERkc6Ok5vZGVPcmlnaW4m LCBDQ2FsbEhlbHBlcnMmLCBjb25zdCBCMzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiwKLSAg ICAgICAgdW5zaWduZWQgb2Zmc2V0ID0gMCk7CisgICAgICAgIHVpbnQzMl90IGRmZ05vZGVJbmRl eCwgdW5zaWduZWQgb2Zmc2V0KTsKIAogICAgIC8vIEluIHNvbWUgY2FzZXMgeW91IHdhbnQgYW4g T1NSRXhpdCB0byBjb21lIGludG8gZXhpc3RlbmNlLCBidXQgeW91IGRvbid0IHdhbnQgdG8gZW1p dCBpdCByaWdodCBub3cuCiAgICAgLy8gVGhpcyB3aWxsIGVtaXQgdGhlIE9TUiBleGl0IGluIGEg bGF0ZSBwYXRoLiBZb3UgY2FuJ3QgYmUgc3VyZSBleGFjdGx5IHdoZW4gdGhhdCB3aWxsIGhhcHBl biwgYnV0CkBAIC0xMDQsNyArMTA0LDcgQEAgc3RydWN0IE9TUkV4aXREZXNjcmlwdG9yIHsKICAg ICAvLyBldmVudHVhbGx5IGdldHMgYWNjZXNzIHRvIGl0cyBsYWJlbC4KICAgICBSZWY8T1NSRXhp dEhhbmRsZT4gZW1pdE9TUkV4aXRMYXRlcigKICAgICAgICAgU3RhdGUmLCBFeGl0S2luZCwgY29u c3QgREZHOjpOb2RlT3JpZ2luJiwgY29uc3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYs Ci0gICAgICAgIHVuc2lnbmVkIG9mZnNldCA9IDApOworICAgICAgICB1aW50MzJfdCBkZmdOb2Rl SW5kZXgsIHVuc2lnbmVkIG9mZnNldCk7CiAKIHByaXZhdGU6CiAgICAgLy8gVGhpcyBpcyB0aGUg bG93LWxldmVsIGludGVyZmFjZS4gSXQgd2lsbCBjcmVhdGUgYSBoYW5kbGUgcmVwcmVzZW50aW5n IHRoZSBkZXNpcmUgdG8gZW1pdCBjb2RlIGZvcgpAQCAtMTEyLDExICsxMTIsMTEgQEAgcHJpdmF0 ZToKICAgICAvLyB0aGF0IHRoZSBhYm92ZSB0d28gQVBJcyBhcmUgd3JpdHRlbiBpbiB0ZXJtcyBv ZiB0aGlzIGFuZCBPU1JFeGl0SGFuZGxlOjplbWl0RXhpdFRodW5rKCkuCiAgICAgUmVmPE9TUkV4 aXRIYW5kbGU+IHByZXBhcmVPU1JFeGl0SGFuZGxlKAogICAgICAgICBTdGF0ZSYsIEV4aXRLaW5k LCBjb25zdCBERkc6Ok5vZGVPcmlnaW4mLCBjb25zdCBCMzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFy YW1zJiwKLSAgICAgICAgdW5zaWduZWQgb2Zmc2V0ID0gMCk7CisgICAgICAgIHVpbnQzMl90IGRm Z05vZGVJbmRleCwgdW5zaWduZWQgb2Zmc2V0KTsKIH07CiAKIHN0cnVjdCBPU1JFeGl0IDogcHVi bGljIERGRzo6T1NSRXhpdEJhc2UgewotICAgIE9TUkV4aXQoT1NSRXhpdERlc2NyaXB0b3IqLCBF eGl0S2luZCwgQ29kZU9yaWdpbiwgQ29kZU9yaWdpbiBjb2RlT3JpZ2luRm9yRXhpdFByb2ZpbGUs IGJvb2wgd2FzSG9pc3RlZCk7CisgICAgT1NSRXhpdChPU1JFeGl0RGVzY3JpcHRvciosIEV4aXRL aW5kLCBDb2RlT3JpZ2luLCBDb2RlT3JpZ2luIGNvZGVPcmlnaW5Gb3JFeGl0UHJvZmlsZSwgYm9v bCB3YXNIb2lzdGVkLCB1aW50MzJfdCBkZmdOb2RlSW5kZXgpOwogCiAgICAgT1NSRXhpdERlc2Ny aXB0b3IqIG1fZGVzY3JpcHRvcjsKICAgICBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8T1NSRXhpdFB0 clRhZz4gbV9jb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExP U1JFeGl0Q29tcGlsZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFeGl0 Q29tcGlsZXIuY3BwCmluZGV4IDNjOTEzN2VmNzBmNWZmZGQ5YmEwMTdmNzJiYmUxYjdmZmVlODRh M2MuLjFmNDM4NWEyNzJiOWNmMDU4MmU0MDE0MjhmNTBmMDUxMzg2NzU1OTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT1NSRXhpdENvbXBpbGVyLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkV4aXRDb21waWxlci5jcHAKQEAgLTUzMiw4 ICs1MzIsOCBAQCBzdGF0aWMgdm9pZCBjb21waWxlU3R1YihWTSYgdm0sIHVuc2lnbmVkIGV4aXRJ RCwgSklUQ29kZSogaml0Q29kZSwgT1NSRXhpdCYgZXhpdAogICAgIGV4aXQubV9jb2RlID0gRklO QUxJWkVfQ09ERV9JRigKICAgICAgICAgc2hvdWxkRHVtcERpc2Fzc2VtYmx5KCkgfHwgT3B0aW9u czo6dmVyYm9zZU9TUigpIHx8IE9wdGlvbnM6OnZlcmJvc2VGVExPU1JFeGl0KCksCiAgICAgICAg IHBhdGNoQnVmZmVyLCBPU1JFeGl0UHRyVGFnLAotICAgICAgICAiRlRMIE9TUiBleGl0ICMldSAo JXMsICVzKSBmcm9tICVzLCB3aXRoIG9wZXJhbmRzID0gJXMiLAotICAgICAgICAgICAgZXhpdElE LCB0b0NTdHJpbmcoZXhpdC5tX2NvZGVPcmlnaW4pLmRhdGEoKSwKKyAgICAgICAgIkZUTCBPU1Ig ZXhpdCAjJXUgKERAJXUsICVzLCAlcykgZnJvbSAlcywgd2l0aCBvcGVyYW5kcyA9ICVzIiwKKyAg ICAgICAgICAgIGV4aXRJRCwgZXhpdC5tX2RmZ05vZGVJbmRleCwgdG9DU3RyaW5nKGV4aXQubV9j b2RlT3JpZ2luKS5kYXRhKCksCiAgICAgICAgICAgICBleGl0S2luZFRvU3RyaW5nKGV4aXQubV9r aW5kKSwgdG9DU3RyaW5nKCpjb2RlQmxvY2spLmRhdGEoKSwKICAgICAgICAgICAgIHRvQ1N0cmlu ZyhpZ25vcmluZ0NvbnRleHQ8RHVtcENvbnRleHQ+KGV4aXQubV9kZXNjcmlwdG9yLT5tX3ZhbHVl cykpLmRhdGEoKQogICAgICAgICApOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMUGF0Y2hwb2ludEV4Y2VwdGlvbkhhbmRsZS5jcHAKaW5kZXggZmFlZjQxN2I5 ODIzNTRmM2U2NDdhYWQyOWJhMDZjODI3MGNlMDlkMC4uMjQyMzczODY2NjU5NmRiMjAyODQxMmYx MzU1ZTM4ZGU1MWU4MmJlNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZnRsL0ZUTFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGUuY3BwCkBAIC0zOSwxNyArMzksMTcg QEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBGVEwgewogdXNpbmcgbmFtZXNwYWNlIERGRzsK IAogUmVmPFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGU+IFBhdGNocG9pbnRFeGNlcHRpb25IYW5k bGU6OmNyZWF0ZSgKLSAgICBTdGF0ZSYgc3RhdGUsIE9TUkV4aXREZXNjcmlwdG9yKiBkZXNjcmlw dG9yLCBOb2RlT3JpZ2luIG9yaWdpbiwgdW5zaWduZWQgb2Zmc2V0LAorICAgIFN0YXRlJiBzdGF0 ZSwgT1NSRXhpdERlc2NyaXB0b3IqIGRlc2NyaXB0b3IsIE5vZGVPcmlnaW4gb3JpZ2luLCB1bnNp Z25lZCBkZmdOb2RlSW5kZXgsIHVuc2lnbmVkIG9mZnNldCwKICAgICBjb25zdCBIYW5kbGVySW5m byYgaGFuZGxlcikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBQYXRjaHBvaW50RXhjZXB0 aW9uSGFuZGxlKHN0YXRlLCBkZXNjcmlwdG9yLCBvcmlnaW4sIG9mZnNldCwgaGFuZGxlcikpOwor ICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGUoc3RhdGUs IGRlc2NyaXB0b3IsIG9yaWdpbiwgZGZnTm9kZUluZGV4LCBvZmZzZXQsIGhhbmRsZXIpKTsKIH0K IAotUmVmUHRyPFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGU+IFBhdGNocG9pbnRFeGNlcHRpb25I YW5kbGU6OmRlZmF1bHRIYW5kbGUoU3RhdGUmIHN0YXRlKQorUmVmUHRyPFBhdGNocG9pbnRFeGNl cHRpb25IYW5kbGU+IFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGU6OmRlZmF1bHRIYW5kbGUoU3Rh dGUmIHN0YXRlLCB1bnNpZ25lZCBkZmdOb2RlSW5kZXgpCiB7CiAgICAgaWYgKCFzdGF0ZS5kZWZh dWx0RXhjZXB0aW9uSGFuZGxlKSB7CiAgICAgICAgIHN0YXRlLmRlZmF1bHRFeGNlcHRpb25IYW5k bGUgPSBhZG9wdFJlZigKLSAgICAgICAgICAgIG5ldyBQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxl KHN0YXRlLCBudWxscHRyLCBOb2RlT3JpZ2luKCksIDAsIEhhbmRsZXJJbmZvKCkpKTsKKyAgICAg ICAgICAgIG5ldyBQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlKHN0YXRlLCBudWxscHRyLCBOb2Rl T3JpZ2luKCksIGRmZ05vZGVJbmRleCwgMCwgSGFuZGxlckluZm8oKSkpOwogICAgIH0KICAgICBy ZXR1cm4gc3RhdGUuZGVmYXVsdEV4Y2VwdGlvbkhhbmRsZTsKIH0KQEAgLTk4LDExICs5OCwxMiBA QCB2b2lkIFBhdGNocG9pbnRFeGNlcHRpb25IYW5kbGU6OnNjaGVkdWxlRXhpdENyZWF0aW9uRm9y VW53aW5kKAogfQogCiBQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlOjpQYXRjaHBvaW50RXhjZXB0 aW9uSGFuZGxlKAotICAgIFN0YXRlJiBzdGF0ZSwgT1NSRXhpdERlc2NyaXB0b3IqIGRlc2NyaXB0 b3IsIE5vZGVPcmlnaW4gb3JpZ2luLCB1bnNpZ25lZCBvZmZzZXQsCisgICAgU3RhdGUmIHN0YXRl LCBPU1JFeGl0RGVzY3JpcHRvciogZGVzY3JpcHRvciwgTm9kZU9yaWdpbiBvcmlnaW4sIHVuc2ln bmVkIGRmZ05vZGVJbmRleCwgdW5zaWduZWQgb2Zmc2V0LAogICAgIGNvbnN0IEhhbmRsZXJJbmZv JiBoYW5kbGVyKQogICAgIDogbV9zdGF0ZShzdGF0ZSkKICAgICAsIG1fZGVzY3JpcHRvcihkZXNj cmlwdG9yKQogICAgICwgbV9vcmlnaW4ob3JpZ2luKQorICAgICwgbV9kZmdOb2RlSW5kZXgoZGZn Tm9kZUluZGV4KQogICAgICwgbV9vZmZzZXQob2Zmc2V0KQogICAgICwgbV9oYW5kbGVyKGhhbmRs ZXIpCiB7CkBAIC0xMTIsNyArMTEzLDcgQEAgUmVmPE9TUkV4aXRIYW5kbGU+IFBhdGNocG9pbnRF eGNlcHRpb25IYW5kbGU6OmNyZWF0ZUhhbmRsZSgKICAgICBFeGl0S2luZCBraW5kLCBjb25zdCBC Mzo6U3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMpCiB7CiAgICAgcmV0dXJuIG1fZGVz Y3JpcHRvci0+ZW1pdE9TUkV4aXRMYXRlcigKLSAgICAgICAgbV9zdGF0ZSwga2luZCwgbV9vcmln aW4sIHBhcmFtcywgbV9vZmZzZXQpOworICAgICAgICBtX3N0YXRlLCBraW5kLCBtX29yaWdpbiwg cGFyYW1zLCBtX2RmZ05vZGVJbmRleCwgbV9vZmZzZXQpOwogfQogCiB9IH0gLy8gbmFtZXNwYWNl IEpTQzo6RlRMCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFBhdGNo cG9pbnRFeGNlcHRpb25IYW5kbGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMUGF0 Y2hwb2ludEV4Y2VwdGlvbkhhbmRsZS5oCmluZGV4IDQ0OGUxY2Y1ZjA1ZGY1NTgzYjIzMDI3ZGZl Y2U2MTQyN2EyMzIyMWMuLjA2ZjVlOTg5ZTU4MTFjZGM0MTA0NWQzODgwYmU5MTJmMDMxYjM4MmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMUGF0Y2hwb2ludEV4Y2Vw dGlvbkhhbmRsZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMUGF0Y2hwb2lu dEV4Y2VwdGlvbkhhbmRsZS5oCkBAIC01Miw5ICs1Miw5IEBAIHN0cnVjdCBPU1JFeGl0SGFuZGxl OwogY2xhc3MgUGF0Y2hwb2ludEV4Y2VwdGlvbkhhbmRsZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVm Q291bnRlZDxQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlPiB7CiBwdWJsaWM6CiAgICAgc3RhdGlj IFJlZjxQYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlPiBjcmVhdGUoCi0gICAgICAgIFN0YXRlJiwg T1NSRXhpdERlc2NyaXB0b3IqLCBERkc6Ok5vZGVPcmlnaW4sIHVuc2lnbmVkIG9mZnNldCwgY29u c3QgSGFuZGxlckluZm8mKTsKKyAgICAgICAgU3RhdGUmLCBPU1JFeGl0RGVzY3JpcHRvciosIERG Rzo6Tm9kZU9yaWdpbiwgdW5zaWduZWQgZGZnTm9kZUluZGV4LCB1bnNpZ25lZCBvZmZzZXQsIGNv bnN0IEhhbmRsZXJJbmZvJik7CiAKLSAgICBzdGF0aWMgUmVmUHRyPFBhdGNocG9pbnRFeGNlcHRp b25IYW5kbGU+IGRlZmF1bHRIYW5kbGUoU3RhdGUmKTsKKyAgICBzdGF0aWMgUmVmUHRyPFBhdGNo cG9pbnRFeGNlcHRpb25IYW5kbGU+IGRlZmF1bHRIYW5kbGUoU3RhdGUmLCB1bnNpZ25lZCBkZmdO b2RlSW5kZXgpOwogICAgIAogICAgIH5QYXRjaHBvaW50RXhjZXB0aW9uSGFuZGxlKCk7CiAKQEAg LTg3LDEzICs4NywxNCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgUGF0Y2hwb2ludEV4Y2Vw dGlvbkhhbmRsZSgKLSAgICAgICAgU3RhdGUmLCBPU1JFeGl0RGVzY3JpcHRvciosIERGRzo6Tm9k ZU9yaWdpbiwgdW5zaWduZWQgb2Zmc2V0LCBjb25zdCBIYW5kbGVySW5mbyYpOworICAgICAgICBT dGF0ZSYsIE9TUkV4aXREZXNjcmlwdG9yKiwgREZHOjpOb2RlT3JpZ2luLCB1bnNpZ25lZCBkZmdO b2RlSW5kZXgsIHVuc2lnbmVkIG9mZnNldCwgY29uc3QgSGFuZGxlckluZm8mKTsKIAogICAgIFJl ZjxPU1JFeGl0SGFuZGxlPiBjcmVhdGVIYW5kbGUoRXhpdEtpbmQsIGNvbnN0IEIzOjpTdGFja21h cEdlbmVyYXRpb25QYXJhbXMmKTsKIAogICAgIFN0YXRlJiBtX3N0YXRlOwogICAgIE9TUkV4aXRE ZXNjcmlwdG9yKiBtX2Rlc2NyaXB0b3I7CiAgICAgREZHOjpOb2RlT3JpZ2luIG1fb3JpZ2luOwor ICAgIHVuc2lnbmVkIG1fZGZnTm9kZUluZGV4OwogICAgIHVuc2lnbmVkIG1fb2Zmc2V0OwogICAg IEhhbmRsZXJJbmZvIG1faGFuZGxlcjsKIH07Cg==