238542 2022-03-30 02:31:12 -0700 [CSS Container Queries] Keep colon syntax when serializing container condition 2022-03-30 13:22:27 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/33423 InRadar P2 Normal --- 229659 238346 1 koivisto koivisto clopez esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard ntim pangle webkit-bug-importer youennf oldest_to_newest 1856335 0 koivisto 2022-03-30 02:31:12 -0700 Instead of always serializing using the range syntax. 1856337 1 456105 koivisto 2022-03-30 02:37:14 -0700 Created attachment 456105 Patch 1856338 2 ews-watchlist 2022-03-30 02:38:51 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1856375 3 456116 koivisto 2022-03-30 06:57:59 -0700 Created attachment 456116 Patch 1856376 4 koivisto 2022-03-30 06:58:24 -0700 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/33423 1856430 5 456116 ntim 2022-03-30 10:10:40 -0700 Comment on attachment 456116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456116&action=review > Source/WebCore/css/ContainerQuery.cpp:164 > + case Syntax::Range: Maybe assert that at least one of leftComparison or rightComparison is present. 1856468 6 koivisto 2022-03-30 10:52:42 -0700 > Maybe assert that at least one of leftComparison or rightComparison is > present. That's really just the boolean syntax case though I separated it for clarity. 1856541 7 ews-feeder 2022-03-30 13:21:34 -0700 Committed r292117 (249030@main): <https://commits.webkit.org/249030@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456116. 1856543 8 webkit-bug-importer 2022-03-30 13:22:27 -0700 <rdar://problem/91063095> 456105 2022-03-30 02:37:14 -0700 2022-03-30 06:57:54 -0700 Patch bug-238542-20220330123713.patch text/plain 12767 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM3ZDNjNWY5OGRkNjAz Yjg4NzNkZDU4MDZhMDQ5ZDUxZTVkNGJjYi4uYzhhNWIwMjVlZjNiNDM3NjRjZTFlOTY1ZTk0ZmU3 YzRlZGNiM2Y1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAzLTMwICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBLZWVwIGNvbG9uIHN5bnRheCB3aGVuIHNlcmlhbGl6aW5nIGNvbnRhaW5lciBjb25k aXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz ODU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERv bid0IHN3aXRjaCB0byB0aGUgcmFuZ2Ugc3ludGF4IHdoZW4gc2VyaWFsaXppbmcgKG1pbi13aWR0 aDogMTAwcHgpIGFuZCBzaW1pbGFyLgorCisgICAgICAgICogY3NzL0NvbnRhaW5lclF1ZXJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNROjpzZXJpYWxpemUpOgorCisgICAgICAgIEFkZCBhbiBl bnVtIHRoYXQgcmVtZW1iZXJzIHRoZSBzeW50YXggdXNlZCBhbmQgdXNlIGl0IHdoZW4gZGVjaWRp bmcgaG93IHRvIHNlcmlhbGl6ZS4KKworICAgICAgICAqIGNzcy9Db250YWluZXJRdWVyeS5oOgor ICAgICAgICAqIGNzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojpjb25zdW1lRmVhdHVyZU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQ YXJzZXI6OmNvbnN1bWVQbGFpblNpemVGZWF0dXJlKToKKworICAgICAgICBBbHNvIGZpeCBhIGJ1 ZyB3aGVyZSBwbGFpbiBzaXplIGZlYXR1cmUgbmFtZXMgd2VyZSBub3QgbG93ZXJjYXNlZC4KKwor ICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVG ZWF0dXJlKToKKwogMjAyMi0wMy0yOSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHQ0NdIFVidW50dSBMVFMgYnVpbGQgYnJva2VuIGFmdGVyIHIyOTE5 NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnkuY3BwCmluZGV4IDBkOTA3NWZhOTliOGQz Nzc2OWM2NGNlYzhlOGUwZjA1NTdkM2VlMTUuLjViNWExOGU2NTQ1ZDgwNTdmNDQwYTY1YWZmOTFk MjI4ZGMwZjA1MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5LmNwcApAQCAtMTEz LDcgKzExMyw3IEBAIHZvaWQgc2VyaWFsaXplKFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0 IFNpemVRdWVyeSYgc2l6ZVF1ZXJ5KQogCiB2b2lkIHNlcmlhbGl6ZShTdHJpbmdCdWlsZGVyJiBi dWlsZGVyLCBjb25zdCBTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUpCiB7Ci0gICAgYXV0byBzZXJp YWxpemVDb21wYXJpc29uT3BlcmF0b3IgPSBbJl0oQ29tcGFyaXNvbk9wZXJhdG9yIG9wKSB7Cisg ICAgYXV0byBzZXJpYWxpemVSYW5nZUNvbXBhcmlzb25PcGVyYXRvciA9IFsmXShDb21wYXJpc29u T3BlcmF0b3Igb3ApIHsKICAgICAgICAgYnVpbGRlci5hcHBlbmQoJyAnKTsKICAgICAgICAgc3dp dGNoIChvcCkgewogICAgICAgICBjYXNlIENvbXBhcmlzb25PcGVyYXRvcjo6TGVzc1RoYW46CkBA IC0xMzUsMTYgKzEzNSw0NSBAQCB2b2lkIHNlcmlhbGl6ZShTdHJpbmdCdWlsZGVyJiBidWlsZGVy LCBjb25zdCBTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUpCiAgICAgICAgIGJ1aWxkZXIuYXBwZW5k KCcgJyk7CiAgICAgfTsKIAotICAgIGlmIChzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbikgewot ICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbi0+dmFsdWUt PmNzc1RleHQoKSk7Ci0gICAgICAgIHNlcmlhbGl6ZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVh dHVyZS5sZWZ0Q29tcGFyaXNvbi0+b3ApOwotICAgIH0KKyAgICBzd2l0Y2ggKHNpemVGZWF0dXJl LnN5bnRheCkgeworICAgIGNhc2UgU3ludGF4OjpCb29sZWFuOgorICAgICAgICBzZXJpYWxpemVJ ZGVudGlmaWVyKHNpemVGZWF0dXJlLm5hbWUsIGJ1aWxkZXIpOworICAgICAgICBicmVhazsKIAot ICAgIHNlcmlhbGl6ZUlkZW50aWZpZXIoc2l6ZUZlYXR1cmUubmFtZSwgYnVpbGRlcik7CisgICAg Y2FzZSBTeW50YXg6OkNvbG9uOgorICAgICAgICBzd2l0Y2ggKHNpemVGZWF0dXJlLnJpZ2h0Q29t cGFyaXNvbi0+b3ApIHsKKyAgICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFu T3JFcXVhbDoKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJtYXgtIik7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsOgorICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ29tcGFyaXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhh bk9yRXF1YWw6CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgibWluLSIpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ29tcGFyaXNvbk9wZXJhdG9yOjpMZXNzVGhhbjoKKyAg ICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6OkdyZWF0ZXJUaGFuOgorICAgICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAg ICAgICBzZXJpYWxpemVJZGVudGlmaWVyKHNpemVGZWF0dXJlLm5hbWUsIGJ1aWxkZXIpOwogCi0g ICAgaWYgKHNpemVGZWF0dXJlLnJpZ2h0Q29tcGFyaXNvbikgewotICAgICAgICBzZXJpYWxpemVD b21wYXJpc29uT3BlcmF0b3Ioc2l6ZUZlYXR1cmUucmlnaHRDb21wYXJpc29uLT5vcCk7CisgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKCI6ICIpOwogICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVh dHVyZS5yaWdodENvbXBhcmlzb24tPnZhbHVlLT5jc3NUZXh0KCkpOworICAgICAgICBicmVhazsK KworICAgIGNhc2UgU3ludGF4OjpSYW5nZToKKyAgICAgICAgaWYgKHNpemVGZWF0dXJlLmxlZnRD b21wYXJpc29uKSB7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVhdHVyZS5sZWZ0 Q29tcGFyaXNvbi0+dmFsdWUtPmNzc1RleHQoKSk7CisgICAgICAgICAgICBzZXJpYWxpemVSYW5n ZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbi0+b3ApOworICAg ICAgICB9CisKKyAgICAgICAgc2VyaWFsaXplSWRlbnRpZmllcihzaXplRmVhdHVyZS5uYW1lLCBi dWlsZGVyKTsKKworICAgICAgICBpZiAoc2l6ZUZlYXR1cmUucmlnaHRDb21wYXJpc29uKSB7Cisg ICAgICAgICAgICBzZXJpYWxpemVSYW5nZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVhdHVyZS5y aWdodENvbXBhcmlzb24tPm9wKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHNpemVGZWF0 dXJlLnJpZ2h0Q29tcGFyaXNvbi0+dmFsdWUtPmNzc1RleHQoKSk7CisgICAgICAgIH0KKyAgICAg ICAgYnJlYWs7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29u dGFpbmVyUXVlcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeS5oCmluZGV4 IDFmYjAyYTI0YjA5MjgzZjMzMTNhMjcwNWRhZTJkY2Q5ZmMyMTlmOTAuLmQ0NDY3YTc3MzEyYzE2 Y2NmNGVmZTA4OThlYjJlMzRjZGZiNzE0NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9Db250YWluZXJRdWVyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVy eS5oCkBAIC00OSw2ICs0OSw3IEBAIHVzaW5nIENvbnRhaW5lclF1ZXJ5ID0gc3RkOjp2YXJpYW50 PENvbnRhaW5lckNvbmRpdGlvbiwgU2l6ZVF1ZXJ5LCBVbmtub3duUXVlcnk+CiAKIGVudW0gY2xh c3MgTG9naWNhbE9wZXJhdG9yIDogdWludDhfdCB7IEFuZCwgT3IsIE5vdCB9OwogZW51bSBjbGFz cyBDb21wYXJpc29uT3BlcmF0b3IgOiB1aW50OF90IHsgTGVzc1RoYW4sIExlc3NUaGFuT3JFcXVh bCwgRXF1YWwsIEdyZWF0ZXJUaGFuLCBHcmVhdGVyVGhhbk9yRXF1YWwgfTsKK2VudW0gY2xhc3Mg U3ludGF4IDogdWludDhfdCB7IEJvb2xlYW4sIENvbG9uLCBSYW5nZSB9OwogCiBzdHJ1Y3QgQ29u dGFpbmVyQ29uZGl0aW9uIHsKICAgICBMb2dpY2FsT3BlcmF0b3IgbG9naWNhbE9wZXJhdG9yIHsg TG9naWNhbE9wZXJhdG9yOjpBbmQgfTsKQEAgLTY3LDYgKzY4LDcgQEAgc3RydWN0IENvbXBhcmlz b24gewogCiBzdHJ1Y3QgU2l6ZUZlYXR1cmUgewogICAgIEF0b21TdHJpbmcgbmFtZTsKKyAgICBT eW50YXggc3ludGF4OwogICAgIHN0ZDo6b3B0aW9uYWw8Q29tcGFyaXNvbj4gbGVmdENvbXBhcmlz b247CiAgICAgc3RkOjpvcHRpb25hbDxDb21wYXJpc29uPiByaWdodENvbXBhcmlzb247CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5UGFyc2VyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKaW5kZXggYmJmNjgz NTlhODExNThmNzZlYmY2Y2Y2ZDY4ZDM0MTg2OTMyMmJlYy4uMmI4MWYyYTI0MjZmYzgwY2Y0NzQy ZjUxMTY3ZGIxN2NlNTE1MGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRh aW5lclF1ZXJ5UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVl cnlQYXJzZXIuY3BwCkBAIC0xNzYsMTkgKzE3NiwyNSBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXpl RmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVTaXplRmVhdHVyZShDU1NQYXJz ZQogICAgIHJldHVybiBjb25zdW1lUmFuZ2VTaXplRmVhdHVyZShyYW5nZSk7CiB9CiAKK3N0YXRp YyBTdHJpbmcgY29uc3VtZUZlYXR1cmVOYW1lKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQor eworICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpICE9IElkZW50VG9rZW4pCisgICAgICAgIHJl dHVybiBudWxsQXRvbSgpOworICAgIHJldHVybiByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVz cGFjZSgpLnZhbHVlKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKTsKK30KKwogc3RkOjpvcHRp b25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpjb25zdW1lUGxhaW5T aXplRmVhdHVyZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkKIHsKICAgICBhdXRvIGNvbnN1 bWVQbGFpbkZlYXR1cmVOYW1lID0gWyZdKCkgLT4gc3RkOjpwYWlyPEF0b21TdHJpbmcsIENROjpD b21wYXJpc29uT3BlcmF0b3I+IHsKLSAgICAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0g SWRlbnRUb2tlbikKKyAgICAgICAgYXV0byBuYW1lID0gY29uc3VtZUZlYXR1cmVOYW1lKHJhbmdl KTsKKyAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsK LSAgICAgICAgYXV0byB0b2tlbiA9IHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCk7 Ci0gICAgICAgIGF1dG8gbmFtZSA9IHRva2VuLnZhbHVlKCk7CiAgICAgICAgIGlmIChuYW1lLnN0 YXJ0c1dpdGgoIm1pbi0iKSkKLSAgICAgICAgICAgIHJldHVybiB7IG5hbWUuc3Vic3RyaW5nKDQp LnRvQXRvbVN0cmluZygpLCBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhhbk9yRXF1 YWwgfTsKKyAgICAgICAgICAgIHJldHVybiB7IG5hbWUuc3Vic3RyaW5nKDQpLCBDUTo6Q29tcGFy aXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhhbk9yRXF1YWwgfTsKICAgICAgICAgaWYgKG5hbWUuc3Rh cnRzV2l0aCgibWF4LSIpKQotICAgICAgICAgICAgcmV0dXJuIHsgbmFtZS5zdWJzdHJpbmcoNCku dG9BdG9tU3RyaW5nKCksIENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuT3JFcXVhbCB9 OworICAgICAgICAgICAgcmV0dXJuIHsgbmFtZS5zdWJzdHJpbmcoNCksIENROjpDb21wYXJpc29u T3BlcmF0b3I6Okxlc3NUaGFuT3JFcXVhbCB9OwogCi0gICAgICAgIHJldHVybiB7IG5hbWUudG9B dG9tU3RyaW5nKCksIENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsIH07CisgICAgICAgIHJl dHVybiB7IG5hbWUsIENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsIH07CiAgICAgfTsKIAog ICAgIGF1dG8gW2ZlYXR1cmVOYW1lLCBvcF0gPSBjb25zdW1lUGxhaW5GZWF0dXJlTmFtZSgpOwpA QCAtMjAwLDcgKzIwNiw3IEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NTCiAgICAgaWYgKHJhbmdl LmF0RW5kKCkpIHsKICAgICAgICAgaWYgKG9wICE9IENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVx dWFsKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgcmV0dXJuIENROjpTaXplRmVh dHVyZSB7IGZlYXR1cmVOYW1lLCB7IH0sIHsgfSB9OworICAgICAgICByZXR1cm4gQ1E6OlNpemVG ZWF0dXJlIHsgZmVhdHVyZU5hbWUsIENROjpTeW50YXg6OkJvb2xlYW4sIHsgfSwgeyB9IH07CiAg ICAgfQogCiAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0gQ29sb25Ub2tlbikKQEAgLTIx MiwxNyArMjE4LDExIEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJR dWVyeVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NTCiAKICAgICBhdXRvIHZhbHVl ID0gY29uc3VtZVZhbHVlKHJhbmdlKTsKICAgICAKLSAgICByZXR1cm4gQ1E6OlNpemVGZWF0dXJl IHsgZmVhdHVyZU5hbWUsIHsgfSwgQ1E6OkNvbXBhcmlzb24geyBvcCwgV1RGTW92ZSh2YWx1ZSkg fSB9OworICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBmZWF0dXJlTmFtZSwgQ1E6OlN5bnRh eDo6Q29sb24sIHsgfSwgQ1E6OkNvbXBhcmlzb24geyBvcCwgV1RGTW92ZSh2YWx1ZSkgfSB9Owog fQogCiBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6 OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogewot ICAgIGF1dG8gY29uc3VtZUZlYXR1cmVOYW1lID0gWyZdKCkgLT4gQXRvbVN0cmluZyB7Ci0gICAg ICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpICE9IElkZW50VG9rZW4pCi0gICAgICAgICAgICBy ZXR1cm4geyB9OwotICAgICAgICByZXR1cm4gcmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3Bh Y2UoKS52YWx1ZSgpLnRvQXRvbVN0cmluZygpOwotICAgIH07Ci0KICAgICBhdXRvIGNvbnN1bWVS YW5nZU9wZXJhdG9yID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxDUTo6Q29tcGFyaXNvbk9wZXJh dG9yPiB7CiAgICAgICAgIGlmIChyYW5nZS5hdEVuZCgpKQogICAgICAgICAgICAgcmV0dXJuIHsg fTsKQEAgLTI3NSw3ICsyNzUsNyBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29u dGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwogCiAgICAgYXV0 byBsZWZ0Q29tcGFyaXNvbiA9IGNvbnN1bWVMZWZ0Q29tcGFyaXNvbigpOwogCi0gICAgYXV0byBm ZWF0dXJlTmFtZSA9IGNvbnN1bWVGZWF0dXJlTmFtZSgpOworICAgIGF1dG8gZmVhdHVyZU5hbWUg PSBjb25zdW1lRmVhdHVyZU5hbWUocmFuZ2UpOwogICAgIGlmIChmZWF0dXJlTmFtZS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKQEAgLTI4NCw3ICsyODQsNyBAQCBzdGQ6Om9wdGlv bmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNp emVGZWF0dXJlKENTUwogICAgIGlmICghbGVmdENvbXBhcmlzb24gJiYgIXJpZ2h0Q29tcGFyaXNv bikKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBX VEZNb3ZlKGZlYXR1cmVOYW1lKSwgV1RGTW92ZShsZWZ0Q29tcGFyaXNvbiksIFdURk1vdmUocmln aHRDb21wYXJpc29uKSB9OworICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBXVEZNb3ZlKGZl YXR1cmVOYW1lKSwgQ1E6OlN5bnRheDo6UmFuZ2UsIFdURk1vdmUobGVmdENvbXBhcmlzb24pLCBX VEZNb3ZlKHJpZ2h0Q29tcGFyaXNvbikgfTsKIH0KIAogUmVmUHRyPENTU1ZhbHVlPiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVZhbHVlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYWYzZjU0Njk0ZmI4NjRiNmFmMDgzYzdh MzM3NWI0ZDk1NjJmZWVlZC4uY2FjMWUxZDc1YmYwZjdlYThhNTI1OGQ3YTM4ZTgzMWJhY2Y1ZDNj NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjIt MDMtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1Mg Q29udGFpbmVyIFF1ZXJpZXNdIEtlZXAgY29sb24gc3ludGF4IHdoZW4gc2VyaWFsaXppbmcgY29u dGFpbmVyIGNvbmRpdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM4NTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x dWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0 LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLmh0bWw6CisKIDIwMjItMDMtMjkgIEZ1amlpIEhpcm9u b3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgZHJvcC1zaGFkb3cgZmls dGVyIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgaW4gdGlsZWQgYmFja2luZyBsYXllcgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVyLXNlcmlhbGl6YXRpb24tZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVyLXNlcmlhbGl6YXRp b24tZXhwZWN0ZWQudHh0CmluZGV4IDRkMzdmYzljMGQ5MTg2N2M5ZmYzMWUxMDFhM2FiMDAwZThl NjFiZTguLmEyOWU1ODVjZWYxNzRjYzE0MWMwYmI0YjZhNmE3OTFjMzY0ZTkwZTIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j b250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItc2VyaWFsaXph dGlvbi1leHBlY3RlZC50eHQKQEAgLTIsNCArMiw3IEBACiBQQVNTIFNlcmlhbGl6YXRpb24gb2Yg Y29uZGl0aW9uVGV4dAogUEFTUyBTZXJpYWxpemF0aW9uIG9mIGlubmVyIEBjb250YWluZXIgcnVs ZQogUEFTUyBTZXJpYWxpemF0aW9uIG9mIG5lc3RlZCBAY29udGFpbmVyIHJ1bGUKK1BBU1MgU2Vy aWFsaXphdGlvbiBvZiBib29sZWFuIGNvbmRpdGlvbiBzeW50YXgKK1BBU1MgU2VyaWFsaXphdGlv biBvZiBjb2xvbiBjb25kaXRpb24gc3ludGF4CitQQVNTIFNlcmlhbGl6YXRpb24gb2YgcmFuZ2Ug Y29uZGl0aW9uIHN5bnRheAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1j b250YWluZXItc2VyaWFsaXphdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29u dGFpbmVyLXNlcmlhbGl6YXRpb24uaHRtbAppbmRleCA3NThhN2MzYjJkMzViNGUzOWJhZmZlODhl NWZiZmI2YTc4OTM0ZjE4Li5lZjMxNDczYzgxMjJhYWNjNzQyYWFiOTI5ZjA2MGNjMDFlMDNhMWVh IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItc2VyaWFsaXph dGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxp emF0aW9uLmh0bWwKQEAgLTEyLDYgKzEyLDE4IEBACiAgICAgfQogICAgICNpZCB7IGNvbG9yOiBn cmVlbiB9CiAgIH0KKyAgQGNvbnRhaW5lciAoICB3aURUaCAgKSB7IH0KKyAgQGNvbnRhaW5lciAo d2lkdGg6MTAwcHgpIHsgfQorICBAY29udGFpbmVyIChtaW4td2lkdGg6ICAxMDBweCkgeyB9Cisg IEBjb250YWluZXIgKCAgIE1BWC1XSURUSDoxMDBweCAgKSB7IH0KKyAgQGNvbnRhaW5lciAod2lk dGggPiAxMDBweCkgeyB9CisgIEBjb250YWluZXIgKHdpZHRoIDwgMTAwcHgpIHsgfQorICBAY29u dGFpbmVyICh3aWRUSCA+PSAxMDBweCkgeyB9CisgIEBjb250YWluZXIgKHdpZHRoIDw9IDEwMHB4 KSB7IH0KKyAgQGNvbnRhaW5lciAoMTBweCA8IHdpZHRoIDwgMTAwcHgpIHsgfQorICBAY29udGFp bmVyICgxMHB4IDw9ICB3aWR0aCAgPD0gIDEwMHB4KSB7IH0KKyAgQGNvbnRhaW5lciAoMTAwcHg+ V0lEVEg+MTBweCkgeyB9CisgIEBjb250YWluZXIgKCAgMTAwcHggPj0gd2lkdGggPj0gMTBweCAg KSB7IH0KIDwvc3R5bGU+CiA8c2NyaXB0PgogICBzZXR1cCgoKSA9PiBhc3NlcnRfaW1wbGVtZW50 c19jb250YWluZXJfcXVlcmllcygpKTsKQEAgLTE5LDcgKzMxLDcgQEAKICAgbGV0IHJ1bGVzID0g dGVzdFNoZWV0LnNoZWV0LmNzc1J1bGVzOwogCiAgIHRlc3QoKCkgPT4gewotICAgIGFzc2VydF9l cXVhbHMocnVsZXMubGVuZ3RoLCAxKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzLmxlbmd0aCwg MTMpOwogICAgIGFzc2VydF9lcXVhbHMocnVsZXNbMF0uY3NzUnVsZXMubGVuZ3RoLCAyKTsKIAog ICAgIGFzc2VydF9lcXVhbHMocnVsZXNbMF0uY29uZGl0aW9uVGV4dCwgIih3aWR0aCA9IDEwMHB4 KSIpOwpAQCAtMzQsNCArNDYsMjQgQEAKICAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzBdLmNzc1Rl eHQsICJAY29udGFpbmVyICh3aWR0aCA9IDEwMHB4KSB7XG4gIEBjb250YWluZXIgXFwhLW5hbWUg KGlubGluZS1zaXplID4gMjAwcHgpIHtcbiAgI2lkIHsgY29sb3I6IGxpbWU7IH1cbn1cbiAgI2lk IHsgY29sb3I6IGdyZWVuOyB9XG59Iik7CiAgIH0sICJTZXJpYWxpemF0aW9uIG9mIG5lc3RlZCBA Y29udGFpbmVyIHJ1bGUiKTsKIAorICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzFdLmNvbmRpdGlvblRleHQsICIod2lkdGgpIik7CisgIH0sICJTZXJpYWxpemF0aW9uIG9m IGJvb2xlYW4gY29uZGl0aW9uIHN5bnRheCIpOworCisgIHRlc3QoKCkgPT4geworICAgIGFzc2Vy dF9lcXVhbHMocnVsZXNbMl0uY29uZGl0aW9uVGV4dCwgIih3aWR0aDogMTAwcHgpIik7CisgICAg YXNzZXJ0X2VxdWFscyhydWxlc1szXS5jb25kaXRpb25UZXh0LCAiKG1pbi13aWR0aDogMTAwcHgp Iik7CisgICAgYXNzZXJ0X2VxdWFscyhydWxlc1s0XS5jb25kaXRpb25UZXh0LCAiKG1heC13aWR0 aDogMTAwcHgpIik7CisgIH0sICJTZXJpYWxpemF0aW9uIG9mIGNvbG9uIGNvbmRpdGlvbiBzeW50 YXgiKTsKKworICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzVdLmNvbmRp dGlvblRleHQsICIod2lkdGggPiAxMDBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzZd LmNvbmRpdGlvblRleHQsICIod2lkdGggPCAxMDBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzddLmNvbmRpdGlvblRleHQsICIod2lkdGggPj0gMTAwcHgpIik7CisgICAgYXNzZXJ0X2Vx dWFscyhydWxlc1s4XS5jb25kaXRpb25UZXh0LCAiKHdpZHRoIDw9IDEwMHB4KSIpOworICAgIGFz c2VydF9lcXVhbHMocnVsZXNbOV0uY29uZGl0aW9uVGV4dCwgIigxMHB4IDwgd2lkdGggPCAxMDBw eCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzEwXS5jb25kaXRpb25UZXh0LCAiKDEwcHgg PD0gd2lkdGggPD0gMTAwcHgpIik7CisgICAgYXNzZXJ0X2VxdWFscyhydWxlc1sxMV0uY29uZGl0 aW9uVGV4dCwgIigxMDBweCA+IHdpZHRoID4gMTBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzEyXS5jb25kaXRpb25UZXh0LCAiKDEwMHB4ID49IHdpZHRoID49IDEwcHgpIik7CisgIH0s ICJTZXJpYWxpemF0aW9uIG9mIHJhbmdlIGNvbmRpdGlvbiBzeW50YXgiKTsKIDwvc2NyaXB0Pgo= 456116 2022-03-30 06:57:59 -0700 2022-03-30 13:21:37 -0700 Patch bug-238542-20220330165758.patch text/plain 12767 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM3ZDNjNWY5OGRkNjAz Yjg4NzNkZDU4MDZhMDQ5ZDUxZTVkNGJjYi4uYzhhNWIwMjVlZjNiNDM3NjRjZTFlOTY1ZTk0ZmU3 YzRlZGNiM2Y1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAzLTMwICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBLZWVwIGNvbG9uIHN5bnRheCB3aGVuIHNlcmlhbGl6aW5nIGNvbnRhaW5lciBjb25k aXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz ODU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERv bid0IHN3aXRjaCB0byB0aGUgcmFuZ2Ugc3ludGF4IHdoZW4gc2VyaWFsaXppbmcgKG1pbi13aWR0 aDogMTAwcHgpIGFuZCBzaW1pbGFyLgorCisgICAgICAgICogY3NzL0NvbnRhaW5lclF1ZXJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNROjpzZXJpYWxpemUpOgorCisgICAgICAgIEFkZCBhbiBl bnVtIHRoYXQgcmVtZW1iZXJzIHRoZSBzeW50YXggdXNlZCBhbmQgdXNlIGl0IHdoZW4gZGVjaWRp bmcgaG93IHRvIHNlcmlhbGl6ZS4KKworICAgICAgICAqIGNzcy9Db250YWluZXJRdWVyeS5oOgor ICAgICAgICAqIGNzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojpjb25zdW1lRmVhdHVyZU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQ YXJzZXI6OmNvbnN1bWVQbGFpblNpemVGZWF0dXJlKToKKworICAgICAgICBBbHNvIGZpeCBhIGJ1 ZyB3aGVyZSBwbGFpbiBzaXplIGZlYXR1cmUgbmFtZXMgd2VyZSBub3QgbG93ZXJjYXNlZC4KKwor ICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVG ZWF0dXJlKToKKwogMjAyMi0wMy0yOSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHQ0NdIFVidW50dSBMVFMgYnVpbGQgYnJva2VuIGFmdGVyIHIyOTE5 NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnkuY3BwCmluZGV4IDBkOTA3NWZhOTliOGQz Nzc2OWM2NGNlYzhlOGUwZjA1NTdkM2VlMTUuLjViNWExOGU2NTQ1ZDgwNTdmNDQwYTY1YWZmOTFk MjI4ZGMwZjA1MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5LmNwcApAQCAtMTEz LDcgKzExMyw3IEBAIHZvaWQgc2VyaWFsaXplKFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0 IFNpemVRdWVyeSYgc2l6ZVF1ZXJ5KQogCiB2b2lkIHNlcmlhbGl6ZShTdHJpbmdCdWlsZGVyJiBi dWlsZGVyLCBjb25zdCBTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUpCiB7Ci0gICAgYXV0byBzZXJp YWxpemVDb21wYXJpc29uT3BlcmF0b3IgPSBbJl0oQ29tcGFyaXNvbk9wZXJhdG9yIG9wKSB7Cisg ICAgYXV0byBzZXJpYWxpemVSYW5nZUNvbXBhcmlzb25PcGVyYXRvciA9IFsmXShDb21wYXJpc29u T3BlcmF0b3Igb3ApIHsKICAgICAgICAgYnVpbGRlci5hcHBlbmQoJyAnKTsKICAgICAgICAgc3dp dGNoIChvcCkgewogICAgICAgICBjYXNlIENvbXBhcmlzb25PcGVyYXRvcjo6TGVzc1RoYW46CkBA IC0xMzUsMTYgKzEzNSw0NSBAQCB2b2lkIHNlcmlhbGl6ZShTdHJpbmdCdWlsZGVyJiBidWlsZGVy LCBjb25zdCBTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUpCiAgICAgICAgIGJ1aWxkZXIuYXBwZW5k KCcgJyk7CiAgICAgfTsKIAotICAgIGlmIChzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbikgewot ICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbi0+dmFsdWUt PmNzc1RleHQoKSk7Ci0gICAgICAgIHNlcmlhbGl6ZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVh dHVyZS5sZWZ0Q29tcGFyaXNvbi0+b3ApOwotICAgIH0KKyAgICBzd2l0Y2ggKHNpemVGZWF0dXJl LnN5bnRheCkgeworICAgIGNhc2UgU3ludGF4OjpCb29sZWFuOgorICAgICAgICBzZXJpYWxpemVJ ZGVudGlmaWVyKHNpemVGZWF0dXJlLm5hbWUsIGJ1aWxkZXIpOworICAgICAgICBicmVhazsKIAot ICAgIHNlcmlhbGl6ZUlkZW50aWZpZXIoc2l6ZUZlYXR1cmUubmFtZSwgYnVpbGRlcik7CisgICAg Y2FzZSBTeW50YXg6OkNvbG9uOgorICAgICAgICBzd2l0Y2ggKHNpemVGZWF0dXJlLnJpZ2h0Q29t cGFyaXNvbi0+b3ApIHsKKyAgICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFu T3JFcXVhbDoKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJtYXgtIik7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsOgorICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ29tcGFyaXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhh bk9yRXF1YWw6CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgibWluLSIpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ29tcGFyaXNvbk9wZXJhdG9yOjpMZXNzVGhhbjoKKyAg ICAgICAgY2FzZSBDb21wYXJpc29uT3BlcmF0b3I6OkdyZWF0ZXJUaGFuOgorICAgICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAg ICAgICBzZXJpYWxpemVJZGVudGlmaWVyKHNpemVGZWF0dXJlLm5hbWUsIGJ1aWxkZXIpOwogCi0g ICAgaWYgKHNpemVGZWF0dXJlLnJpZ2h0Q29tcGFyaXNvbikgewotICAgICAgICBzZXJpYWxpemVD b21wYXJpc29uT3BlcmF0b3Ioc2l6ZUZlYXR1cmUucmlnaHRDb21wYXJpc29uLT5vcCk7CisgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKCI6ICIpOwogICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVh dHVyZS5yaWdodENvbXBhcmlzb24tPnZhbHVlLT5jc3NUZXh0KCkpOworICAgICAgICBicmVhazsK KworICAgIGNhc2UgU3ludGF4OjpSYW5nZToKKyAgICAgICAgaWYgKHNpemVGZWF0dXJlLmxlZnRD b21wYXJpc29uKSB7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChzaXplRmVhdHVyZS5sZWZ0 Q29tcGFyaXNvbi0+dmFsdWUtPmNzc1RleHQoKSk7CisgICAgICAgICAgICBzZXJpYWxpemVSYW5n ZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVhdHVyZS5sZWZ0Q29tcGFyaXNvbi0+b3ApOworICAg ICAgICB9CisKKyAgICAgICAgc2VyaWFsaXplSWRlbnRpZmllcihzaXplRmVhdHVyZS5uYW1lLCBi dWlsZGVyKTsKKworICAgICAgICBpZiAoc2l6ZUZlYXR1cmUucmlnaHRDb21wYXJpc29uKSB7Cisg ICAgICAgICAgICBzZXJpYWxpemVSYW5nZUNvbXBhcmlzb25PcGVyYXRvcihzaXplRmVhdHVyZS5y aWdodENvbXBhcmlzb24tPm9wKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHNpemVGZWF0 dXJlLnJpZ2h0Q29tcGFyaXNvbi0+dmFsdWUtPmNzc1RleHQoKSk7CisgICAgICAgIH0KKyAgICAg ICAgYnJlYWs7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29u dGFpbmVyUXVlcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeS5oCmluZGV4 IDFmYjAyYTI0YjA5MjgzZjMzMTNhMjcwNWRhZTJkY2Q5ZmMyMTlmOTAuLmQ0NDY3YTc3MzEyYzE2 Y2NmNGVmZTA4OThlYjJlMzRjZGZiNzE0NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9Db250YWluZXJRdWVyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVy eS5oCkBAIC00OSw2ICs0OSw3IEBAIHVzaW5nIENvbnRhaW5lclF1ZXJ5ID0gc3RkOjp2YXJpYW50 PENvbnRhaW5lckNvbmRpdGlvbiwgU2l6ZVF1ZXJ5LCBVbmtub3duUXVlcnk+CiAKIGVudW0gY2xh c3MgTG9naWNhbE9wZXJhdG9yIDogdWludDhfdCB7IEFuZCwgT3IsIE5vdCB9OwogZW51bSBjbGFz cyBDb21wYXJpc29uT3BlcmF0b3IgOiB1aW50OF90IHsgTGVzc1RoYW4sIExlc3NUaGFuT3JFcXVh bCwgRXF1YWwsIEdyZWF0ZXJUaGFuLCBHcmVhdGVyVGhhbk9yRXF1YWwgfTsKK2VudW0gY2xhc3Mg U3ludGF4IDogdWludDhfdCB7IEJvb2xlYW4sIENvbG9uLCBSYW5nZSB9OwogCiBzdHJ1Y3QgQ29u dGFpbmVyQ29uZGl0aW9uIHsKICAgICBMb2dpY2FsT3BlcmF0b3IgbG9naWNhbE9wZXJhdG9yIHsg TG9naWNhbE9wZXJhdG9yOjpBbmQgfTsKQEAgLTY3LDYgKzY4LDcgQEAgc3RydWN0IENvbXBhcmlz b24gewogCiBzdHJ1Y3QgU2l6ZUZlYXR1cmUgewogICAgIEF0b21TdHJpbmcgbmFtZTsKKyAgICBT eW50YXggc3ludGF4OwogICAgIHN0ZDo6b3B0aW9uYWw8Q29tcGFyaXNvbj4gbGVmdENvbXBhcmlz b247CiAgICAgc3RkOjpvcHRpb25hbDxDb21wYXJpc29uPiByaWdodENvbXBhcmlzb247CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5UGFyc2VyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKaW5kZXggYmJmNjgz NTlhODExNThmNzZlYmY2Y2Y2ZDY4ZDM0MTg2OTMyMmJlYy4uMmI4MWYyYTI0MjZmYzgwY2Y0NzQy ZjUxMTY3ZGIxN2NlNTE1MGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRh aW5lclF1ZXJ5UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVl cnlQYXJzZXIuY3BwCkBAIC0xNzYsMTkgKzE3NiwyNSBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXpl RmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVTaXplRmVhdHVyZShDU1NQYXJz ZQogICAgIHJldHVybiBjb25zdW1lUmFuZ2VTaXplRmVhdHVyZShyYW5nZSk7CiB9CiAKK3N0YXRp YyBTdHJpbmcgY29uc3VtZUZlYXR1cmVOYW1lKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQor eworICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpICE9IElkZW50VG9rZW4pCisgICAgICAgIHJl dHVybiBudWxsQXRvbSgpOworICAgIHJldHVybiByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVz cGFjZSgpLnZhbHVlKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKTsKK30KKwogc3RkOjpvcHRp b25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpjb25zdW1lUGxhaW5T aXplRmVhdHVyZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkKIHsKICAgICBhdXRvIGNvbnN1 bWVQbGFpbkZlYXR1cmVOYW1lID0gWyZdKCkgLT4gc3RkOjpwYWlyPEF0b21TdHJpbmcsIENROjpD b21wYXJpc29uT3BlcmF0b3I+IHsKLSAgICAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0g SWRlbnRUb2tlbikKKyAgICAgICAgYXV0byBuYW1lID0gY29uc3VtZUZlYXR1cmVOYW1lKHJhbmdl KTsKKyAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsK LSAgICAgICAgYXV0byB0b2tlbiA9IHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCk7 Ci0gICAgICAgIGF1dG8gbmFtZSA9IHRva2VuLnZhbHVlKCk7CiAgICAgICAgIGlmIChuYW1lLnN0 YXJ0c1dpdGgoIm1pbi0iKSkKLSAgICAgICAgICAgIHJldHVybiB7IG5hbWUuc3Vic3RyaW5nKDQp LnRvQXRvbVN0cmluZygpLCBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhhbk9yRXF1 YWwgfTsKKyAgICAgICAgICAgIHJldHVybiB7IG5hbWUuc3Vic3RyaW5nKDQpLCBDUTo6Q29tcGFy aXNvbk9wZXJhdG9yOjpHcmVhdGVyVGhhbk9yRXF1YWwgfTsKICAgICAgICAgaWYgKG5hbWUuc3Rh cnRzV2l0aCgibWF4LSIpKQotICAgICAgICAgICAgcmV0dXJuIHsgbmFtZS5zdWJzdHJpbmcoNCku dG9BdG9tU3RyaW5nKCksIENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuT3JFcXVhbCB9 OworICAgICAgICAgICAgcmV0dXJuIHsgbmFtZS5zdWJzdHJpbmcoNCksIENROjpDb21wYXJpc29u T3BlcmF0b3I6Okxlc3NUaGFuT3JFcXVhbCB9OwogCi0gICAgICAgIHJldHVybiB7IG5hbWUudG9B dG9tU3RyaW5nKCksIENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsIH07CisgICAgICAgIHJl dHVybiB7IG5hbWUsIENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsIH07CiAgICAgfTsKIAog ICAgIGF1dG8gW2ZlYXR1cmVOYW1lLCBvcF0gPSBjb25zdW1lUGxhaW5GZWF0dXJlTmFtZSgpOwpA QCAtMjAwLDcgKzIwNiw3IEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NTCiAgICAgaWYgKHJhbmdl LmF0RW5kKCkpIHsKICAgICAgICAgaWYgKG9wICE9IENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVx dWFsKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgcmV0dXJuIENROjpTaXplRmVh dHVyZSB7IGZlYXR1cmVOYW1lLCB7IH0sIHsgfSB9OworICAgICAgICByZXR1cm4gQ1E6OlNpemVG ZWF0dXJlIHsgZmVhdHVyZU5hbWUsIENROjpTeW50YXg6OkJvb2xlYW4sIHsgfSwgeyB9IH07CiAg ICAgfQogCiAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0gQ29sb25Ub2tlbikKQEAgLTIx MiwxNyArMjE4LDExIEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJR dWVyeVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NTCiAKICAgICBhdXRvIHZhbHVl ID0gY29uc3VtZVZhbHVlKHJhbmdlKTsKICAgICAKLSAgICByZXR1cm4gQ1E6OlNpemVGZWF0dXJl IHsgZmVhdHVyZU5hbWUsIHsgfSwgQ1E6OkNvbXBhcmlzb24geyBvcCwgV1RGTW92ZSh2YWx1ZSkg fSB9OworICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBmZWF0dXJlTmFtZSwgQ1E6OlN5bnRh eDo6Q29sb24sIHsgfSwgQ1E6OkNvbXBhcmlzb24geyBvcCwgV1RGTW92ZSh2YWx1ZSkgfSB9Owog fQogCiBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6 OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogewot ICAgIGF1dG8gY29uc3VtZUZlYXR1cmVOYW1lID0gWyZdKCkgLT4gQXRvbVN0cmluZyB7Ci0gICAg ICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpICE9IElkZW50VG9rZW4pCi0gICAgICAgICAgICBy ZXR1cm4geyB9OwotICAgICAgICByZXR1cm4gcmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3Bh Y2UoKS52YWx1ZSgpLnRvQXRvbVN0cmluZygpOwotICAgIH07Ci0KICAgICBhdXRvIGNvbnN1bWVS YW5nZU9wZXJhdG9yID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxDUTo6Q29tcGFyaXNvbk9wZXJh dG9yPiB7CiAgICAgICAgIGlmIChyYW5nZS5hdEVuZCgpKQogICAgICAgICAgICAgcmV0dXJuIHsg fTsKQEAgLTI3NSw3ICsyNzUsNyBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29u dGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwogCiAgICAgYXV0 byBsZWZ0Q29tcGFyaXNvbiA9IGNvbnN1bWVMZWZ0Q29tcGFyaXNvbigpOwogCi0gICAgYXV0byBm ZWF0dXJlTmFtZSA9IGNvbnN1bWVGZWF0dXJlTmFtZSgpOworICAgIGF1dG8gZmVhdHVyZU5hbWUg PSBjb25zdW1lRmVhdHVyZU5hbWUocmFuZ2UpOwogICAgIGlmIChmZWF0dXJlTmFtZS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKQEAgLTI4NCw3ICsyODQsNyBAQCBzdGQ6Om9wdGlv bmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNp emVGZWF0dXJlKENTUwogICAgIGlmICghbGVmdENvbXBhcmlzb24gJiYgIXJpZ2h0Q29tcGFyaXNv bikKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBX VEZNb3ZlKGZlYXR1cmVOYW1lKSwgV1RGTW92ZShsZWZ0Q29tcGFyaXNvbiksIFdURk1vdmUocmln aHRDb21wYXJpc29uKSB9OworICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBXVEZNb3ZlKGZl YXR1cmVOYW1lKSwgQ1E6OlN5bnRheDo6UmFuZ2UsIFdURk1vdmUobGVmdENvbXBhcmlzb24pLCBX VEZNb3ZlKHJpZ2h0Q29tcGFyaXNvbikgfTsKIH0KIAogUmVmUHRyPENTU1ZhbHVlPiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVZhbHVlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYWYzZjU0Njk0ZmI4NjRiNmFmMDgzYzdh MzM3NWI0ZDk1NjJmZWVlZC4uY2FjMWUxZDc1YmYwZjdlYThhNTI1OGQ3YTM4ZTgzMWJhY2Y1ZDNj NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjIt MDMtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1Mg Q29udGFpbmVyIFF1ZXJpZXNdIEtlZXAgY29sb24gc3ludGF4IHdoZW4gc2VyaWFsaXppbmcgY29u dGFpbmVyIGNvbmRpdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM4NTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x dWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0 LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLmh0bWw6CisKIDIwMjItMDMtMjkgIEZ1amlpIEhpcm9u b3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgZHJvcC1zaGFkb3cgZmls dGVyIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgaW4gdGlsZWQgYmFja2luZyBsYXllcgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVyLXNlcmlhbGl6YXRpb24tZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVyLXNlcmlhbGl6YXRp b24tZXhwZWN0ZWQudHh0CmluZGV4IDRkMzdmYzljMGQ5MTg2N2M5ZmYzMWUxMDFhM2FiMDAwZThl NjFiZTguLmEyOWU1ODVjZWYxNzRjYzE0MWMwYmI0YjZhNmE3OTFjMzY0ZTkwZTIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j b250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxpemF0aW9uLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItc2VyaWFsaXph dGlvbi1leHBlY3RlZC50eHQKQEAgLTIsNCArMiw3IEBACiBQQVNTIFNlcmlhbGl6YXRpb24gb2Yg Y29uZGl0aW9uVGV4dAogUEFTUyBTZXJpYWxpemF0aW9uIG9mIGlubmVyIEBjb250YWluZXIgcnVs ZQogUEFTUyBTZXJpYWxpemF0aW9uIG9mIG5lc3RlZCBAY29udGFpbmVyIHJ1bGUKK1BBU1MgU2Vy aWFsaXphdGlvbiBvZiBib29sZWFuIGNvbmRpdGlvbiBzeW50YXgKK1BBU1MgU2VyaWFsaXphdGlv biBvZiBjb2xvbiBjb25kaXRpb24gc3ludGF4CitQQVNTIFNlcmlhbGl6YXRpb24gb2YgcmFuZ2Ug Y29uZGl0aW9uIHN5bnRheAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1j b250YWluZXItc2VyaWFsaXphdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29u dGFpbmVyLXNlcmlhbGl6YXRpb24uaHRtbAppbmRleCA3NThhN2MzYjJkMzViNGUzOWJhZmZlODhl NWZiZmI2YTc4OTM0ZjE4Li5lZjMxNDczYzgxMjJhYWNjNzQyYWFiOTI5ZjA2MGNjMDFlMDNhMWVh IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItc2VyaWFsaXph dGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRhaW5lci1zZXJpYWxp emF0aW9uLmh0bWwKQEAgLTEyLDYgKzEyLDE4IEBACiAgICAgfQogICAgICNpZCB7IGNvbG9yOiBn cmVlbiB9CiAgIH0KKyAgQGNvbnRhaW5lciAoICB3aURUaCAgKSB7IH0KKyAgQGNvbnRhaW5lciAo d2lkdGg6MTAwcHgpIHsgfQorICBAY29udGFpbmVyIChtaW4td2lkdGg6ICAxMDBweCkgeyB9Cisg IEBjb250YWluZXIgKCAgIE1BWC1XSURUSDoxMDBweCAgKSB7IH0KKyAgQGNvbnRhaW5lciAod2lk dGggPiAxMDBweCkgeyB9CisgIEBjb250YWluZXIgKHdpZHRoIDwgMTAwcHgpIHsgfQorICBAY29u dGFpbmVyICh3aWRUSCA+PSAxMDBweCkgeyB9CisgIEBjb250YWluZXIgKHdpZHRoIDw9IDEwMHB4 KSB7IH0KKyAgQGNvbnRhaW5lciAoMTBweCA8IHdpZHRoIDwgMTAwcHgpIHsgfQorICBAY29udGFp bmVyICgxMHB4IDw9ICB3aWR0aCAgPD0gIDEwMHB4KSB7IH0KKyAgQGNvbnRhaW5lciAoMTAwcHg+ V0lEVEg+MTBweCkgeyB9CisgIEBjb250YWluZXIgKCAgMTAwcHggPj0gd2lkdGggPj0gMTBweCAg KSB7IH0KIDwvc3R5bGU+CiA8c2NyaXB0PgogICBzZXR1cCgoKSA9PiBhc3NlcnRfaW1wbGVtZW50 c19jb250YWluZXJfcXVlcmllcygpKTsKQEAgLTE5LDcgKzMxLDcgQEAKICAgbGV0IHJ1bGVzID0g dGVzdFNoZWV0LnNoZWV0LmNzc1J1bGVzOwogCiAgIHRlc3QoKCkgPT4gewotICAgIGFzc2VydF9l cXVhbHMocnVsZXMubGVuZ3RoLCAxKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzLmxlbmd0aCwg MTMpOwogICAgIGFzc2VydF9lcXVhbHMocnVsZXNbMF0uY3NzUnVsZXMubGVuZ3RoLCAyKTsKIAog ICAgIGFzc2VydF9lcXVhbHMocnVsZXNbMF0uY29uZGl0aW9uVGV4dCwgIih3aWR0aCA9IDEwMHB4 KSIpOwpAQCAtMzQsNCArNDYsMjQgQEAKICAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzBdLmNzc1Rl eHQsICJAY29udGFpbmVyICh3aWR0aCA9IDEwMHB4KSB7XG4gIEBjb250YWluZXIgXFwhLW5hbWUg KGlubGluZS1zaXplID4gMjAwcHgpIHtcbiAgI2lkIHsgY29sb3I6IGxpbWU7IH1cbn1cbiAgI2lk IHsgY29sb3I6IGdyZWVuOyB9XG59Iik7CiAgIH0sICJTZXJpYWxpemF0aW9uIG9mIG5lc3RlZCBA Y29udGFpbmVyIHJ1bGUiKTsKIAorICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzFdLmNvbmRpdGlvblRleHQsICIod2lkdGgpIik7CisgIH0sICJTZXJpYWxpemF0aW9uIG9m IGJvb2xlYW4gY29uZGl0aW9uIHN5bnRheCIpOworCisgIHRlc3QoKCkgPT4geworICAgIGFzc2Vy dF9lcXVhbHMocnVsZXNbMl0uY29uZGl0aW9uVGV4dCwgIih3aWR0aDogMTAwcHgpIik7CisgICAg YXNzZXJ0X2VxdWFscyhydWxlc1szXS5jb25kaXRpb25UZXh0LCAiKG1pbi13aWR0aDogMTAwcHgp Iik7CisgICAgYXNzZXJ0X2VxdWFscyhydWxlc1s0XS5jb25kaXRpb25UZXh0LCAiKG1heC13aWR0 aDogMTAwcHgpIik7CisgIH0sICJTZXJpYWxpemF0aW9uIG9mIGNvbG9uIGNvbmRpdGlvbiBzeW50 YXgiKTsKKworICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzVdLmNvbmRp dGlvblRleHQsICIod2lkdGggPiAxMDBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzZd LmNvbmRpdGlvblRleHQsICIod2lkdGggPCAxMDBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzddLmNvbmRpdGlvblRleHQsICIod2lkdGggPj0gMTAwcHgpIik7CisgICAgYXNzZXJ0X2Vx dWFscyhydWxlc1s4XS5jb25kaXRpb25UZXh0LCAiKHdpZHRoIDw9IDEwMHB4KSIpOworICAgIGFz c2VydF9lcXVhbHMocnVsZXNbOV0uY29uZGl0aW9uVGV4dCwgIigxMHB4IDwgd2lkdGggPCAxMDBw eCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1bGVzWzEwXS5jb25kaXRpb25UZXh0LCAiKDEwcHgg PD0gd2lkdGggPD0gMTAwcHgpIik7CisgICAgYXNzZXJ0X2VxdWFscyhydWxlc1sxMV0uY29uZGl0 aW9uVGV4dCwgIigxMDBweCA+IHdpZHRoID4gMTBweCkiKTsKKyAgICBhc3NlcnRfZXF1YWxzKHJ1 bGVzWzEyXS5jb25kaXRpb25UZXh0LCAiKDEwMHB4ID49IHdpZHRoID49IDEwcHgpIik7CisgIH0s ICJTZXJpYWxpemF0aW9uIG9mIHJhbmdlIGNvbmRpdGlvbiBzeW50YXgiKTsKIDwvc2NyaXB0Pgo=