239118 2022-04-12 01:54:19 -0700 [CSS Container Queries] Limit query range syntax 2022-04-13 11:50:17 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto darin esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard simon.fraser webkit-bug-importer oldest_to_newest 1860622 0 koivisto 2022-04-12 01:54:19 -0700 The spec disallows things like (100px == width == 50px) and (100px < width > 10px). 1860634 1 457319 koivisto 2022-04-12 02:41:10 -0700 Created attachment 457319 Patch 1860638 2 457322 koivisto 2022-04-12 02:46:48 -0700 Created attachment 457322 Patch 1860799 3 457322 darin 2022-04-12 13:07:08 -0700 Comment on attachment 457322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457322&action=review > Source/WebCore/css/ContainerQueryParser.cpp:82 > + if (!sizeFeature || !blockRange.atEnd()) Why do we need the blockRange.atEnd() check, but no conditionRange.atEnd() check? 1861036 4 koivisto 2022-04-12 21:35:40 -0700 > Why do we need the blockRange.atEnd() check, but no conditionRange.atEnd() > check? consumeCondition always loops the range to the end, or returns a nullopt. consumeSizeFeature consumes the feature and returns a value whether at the end or not. Maybe it would be better to check in consumeSizeFeature itself. 1861060 5 457516 koivisto 2022-04-13 01:55:22 -0700 Created attachment 457516 Patch 1861188 6 ews-feeder 2022-04-13 11:49:32 -0700 Committed r292816 (249596@main): <https://commits.webkit.org/249596@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457516. 1861189 7 webkit-bug-importer 2022-04-13 11:50:17 -0700 <rdar://problem/91705554> 457319 2022-04-12 02:41:10 -0700 2022-04-12 02:46:44 -0700 Patch bug-239118-20220412124108.patch text/plain 7247 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEzMjkxMDFkOWMwMDZj NDFhZDBlYmVjNGM3NGJhNzc0NjA3ZTNmMy4uOTZlNjdhNzc1MDcyMjFkNTY3ZDA5MmFhYmMyNDcz ZWUwYmZiNDM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTA0LTEyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBzcGVjIGRpc2FsbG93cyB0aGluZ3MgbGlrZSAo MTAwcHggPSB3aWR0aCA8IDIwMHB4KSBhbmQgKDEwMHB4IDwgd2lkdGggPiAyMDBweCkuCisKKyAg ICAgICAgaHR0cHM6Ly93d3cudzMub3JnL1RSL21lZGlhcXVlcmllcy00LyNtcS1yYW5nZS1jb250 ZXh0CisKKyAgICAgICAgKiBjc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeSk6CisK KyAgICAgICAgVHJ5IGFzIGEgY29uZGl0aW9uIGZpcnN0LgorICAgICAgICBSZXR1cm4gVW5rbm93 blF1ZXJ5IG9uIHBhcnNlIGZhaWx1cmUuCisKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lclF1 ZXJ5UGFyc2VyOjpjb25zdW1lUmFuZ2VTaXplRmVhdHVyZSk6CisKKyAgICAgICAgVmFsaWRhdGUg dGhlIHJhbmdlcyBzbyB3aGF0IGVuZHMgdXAgYmVpbmcgYWxsb3dlZCBtYXRjaGVzIHRoZSBzcGVj IHByb2R1Y3Rpb25zLgorCiAyMDIyLTA0LTExICBUeWxlciBXaWxjb2NrICA8dHlsZXJfd0BhcHBs ZS5jb20+CiAKICAgICAgICAgQVg6IFVwZGF0ZSBpc29sYXRlZCB0cmVlIGluIHJlc3BvbnNlIHRv IEFYUmVhZE9ubHlTdGF0dXNDaGFuZ2VkLCBBWFJlcXVpcmVkU3RhdHVzQ2hhbmdlZCwgYW5kIEFY UHJlc3NlZFN0YXRlQ2hhbmdlZCBub3RpZmljYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0Nv bnRhaW5lclF1ZXJ5UGFyc2VyLmNwcAppbmRleCA3MTEyZTY5YTZkMGI3MDQwM2Q0ZmI2M2MzMTQ3 YmJlYTEwZDBhYzQ4Li44MDc0OTE5MDE5NTE3ZTIxZTA1ZjcxMzZlNmFjYmE2OTllNzQ1OGE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKQEAgLTczLDEz ICs3MywxNiBAQCBzdGQ6Om9wdGlvbmFsPENROjpDb250YWluZXJRdWVyeT4gQ29udGFpbmVyUXVl cnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeShDUwogCiAgICAgICAgIGJsb2NrUmFuZ2Uu Y29uc3VtZVdoaXRlc3BhY2UoKTsKIAotICAgICAgICAvLyBUcnkgdG8gcGFyc2UgYXMgYSBzaXpl IHF1ZXJ5IGZpcnN0LgotICAgICAgICBhdXRvIGJsb2NrRm9yU2l6ZUZlYXR1cmUgPSBibG9ja1Jh bmdlOwotICAgICAgICBpZiAoYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXplRmVhdHVyZShi bG9ja0ZvclNpemVGZWF0dXJlKSkKLSAgICAgICAgICAgIHJldHVybiB7ICpzaXplRmVhdHVyZSB9 OwotCi0gICAgICAgIGlmIChhdXRvIGNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248Q1E6OkNv bnRhaW5lckNvbmRpdGlvbj4oYmxvY2tSYW5nZSkpCisgICAgICAgIC8vIFRyeSB0byBwYXJzZSBh cyBhIGNvbmRpdGlvbiBmaXJzdC4KKyAgICAgICAgYXV0byBjb25kaXRpb25SYW5nZSA9IGJsb2Nr UmFuZ2U7CisgICAgICAgIGlmIChhdXRvIGNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248Q1E6 OkNvbnRhaW5lckNvbmRpdGlvbj4oY29uZGl0aW9uUmFuZ2UpKQogICAgICAgICAgICAgcmV0dXJu IHsgY29uZGl0aW9uIH07CisKKyAgICAgICAgYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXpl RmVhdHVyZShibG9ja1JhbmdlKTsKKyAgICAgICAgaWYgKCFzaXplRmVhdHVyZSB8fCAhYmxvY2tS YW5nZS5hdEVuZCgpKQorICAgICAgICAgICAgcmV0dXJuIENROjpVbmtub3duUXVlcnkgeyB7IH0s IGJsb2NrUmFuZ2Uuc2VyaWFsaXplKCkgfTsKKworICAgICAgICByZXR1cm4geyAqc2l6ZUZlYXR1 cmUgfTsKICAgICB9CiAKICAgICByZXR1cm4geyB9OwpAQCAtMjAzLDYgKzIwNiw4IEBAIHN0ZDo6 b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVBs YWluU2l6ZUZlYXR1cmUoQ1NTCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBhdXRvIHZhbHVl ID0gY29uc3VtZVZhbHVlKHJhbmdlKTsKKyAgICBpZiAoIXZhbHVlKQorICAgICAgICByZXR1cm4g eyB9OwogCiAgICAgcmV0dXJuIENROjpTaXplRmVhdHVyZSB7IGZlYXR1cmVOYW1lLCBDUTo6U3lu dGF4OjpDb2xvbiwgeyB9LCBDUTo6Q29tcGFyaXNvbiB7IG9wLCBXVEZNb3ZlKHZhbHVlKSB9IH07 CiB9CkBAIC0yMzksMTMgKzI0NCwxOSBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4g Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwogICAgICAg ICB9CiAgICAgfTsKIAorICAgIGJvb2wgZGlkRmFpbCA9IGZhbHNlOworCiAgICAgYXV0byBjb25z dW1lTGVmdENvbXBhcmlzb24gPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPENROjpDb21wYXJpc29u PiB7CiAgICAgICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpID09IElkZW50VG9rZW4pCiAgICAg ICAgICAgICByZXR1cm4geyB9OwogICAgICAgICBhdXRvIHZhbHVlID0gY29uc3VtZVZhbHVlKHJh bmdlKTsKKyAgICAgICAgaWYgKCF2YWx1ZSkKKyAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAg ICAgIGF1dG8gb3AgPSBjb25zdW1lUmFuZ2VPcGVyYXRvcigpOwotICAgICAgICBpZiAoIW9wKQor ICAgICAgICBpZiAoIW9wKSB7CisgICAgICAgICAgICBkaWRGYWlsID0gdHJ1ZTsKICAgICAgICAg ICAgIHJldHVybiB7IH07CisgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gQ1E6OkNvbXBhcmlz b24geyAqb3AsIFdURk1vdmUodmFsdWUpIH07CiAgICAgfTsKQEAgLTI1NSw2ICsyNjYsMTAgQEAg c3RkOjpvcHRpb25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpjb25z dW1lUmFuZ2VTaXplRmVhdHVyZShDU1MKICAgICAgICAgaWYgKCFvcCkKICAgICAgICAgICAgIHJl dHVybiB7IH07CiAgICAgICAgIGF1dG8gdmFsdWUgPSBjb25zdW1lVmFsdWUocmFuZ2UpOworICAg ICAgICBpZiAoIXZhbHVlKSB7CisgICAgICAgICAgICBkaWRGYWlsID0gdHJ1ZTsKKyAgICAgICAg ICAgIHJldHVybiB7IH07CisgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gQ1E6OkNvbXBhcmlz b24geyAqb3AsIFdURk1vdmUodmFsdWUpIH07CiAgICAgfTsKQEAgLTI2Nyw3ICsyODIsMjQgQEAg c3RkOjpvcHRpb25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpjb25z dW1lUmFuZ2VTaXplRmVhdHVyZShDU1MKIAogICAgIGF1dG8gcmlnaHRDb21wYXJpc29uID0gY29u c3VtZVJpZ2h0Q29tcGFyaXNvbigpOwogCi0gICAgaWYgKCFsZWZ0Q29tcGFyaXNvbiAmJiAhcmln aHRDb21wYXJpc29uKQorICAgIGlmIChkaWRGYWlsKQorICAgICAgICByZXR1cm4geyB9OworCisg ICAgYXV0byB2YWxpZGF0ZUNvbXBhcmlzb25zID0gWyZdIHsKKyAgICAgICAgaWYgKCFsZWZ0Q29t cGFyaXNvbiAmJiAhcmlnaHRDb21wYXJpc29uKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICBpZiAoIWxlZnRDb21wYXJpc29uIHx8ICFyaWdodENvbXBhcmlzb24pCisgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgLy8gRGlzYWxsb3cgY29tcGFyaXNvbnMgbGlrZSAo YT1iPWMpLCAoYT1iPGMpLgorICAgICAgICBpZiAobGVmdENvbXBhcmlzb24tPm9wID09IENROjpD b21wYXJpc29uT3BlcmF0b3I6OkVxdWFsIHx8IHJpZ2h0Q29tcGFyaXNvbi0+b3AgPT0gQ1E6OkNv bXBhcmlzb25PcGVyYXRvcjo6RXF1YWwpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIC8vIERpc2FsbG93IGNvbXBhcmlzb25zIGxpa2UgKGE8Yj5jKS4KKyAgICAgICAgYm9vbCBs ZWZ0SXNMZXNzID0gbGVmdENvbXBhcmlzb24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6 Okxlc3NUaGFuIHx8IGxlZnRDb21wYXJpc29uLT5vcCA9PSBDUTo6Q29tcGFyaXNvbk9wZXJhdG9y OjpMZXNzVGhhbk9yRXF1YWw7CisgICAgICAgIGJvb2wgcmlnaHRJc0xlc3MgPSByaWdodENvbXBh cmlzb24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuIHx8IHJpZ2h0Q29t cGFyaXNvbi0+b3AgPT0gQ1E6OkNvbXBhcmlzb25PcGVyYXRvcjo6TGVzc1RoYW5PckVxdWFsOwor ICAgICAgICByZXR1cm4gbGVmdElzTGVzcyA9PSByaWdodElzTGVzczsKKyAgICB9OworCisgICAg aWYgKCF2YWxpZGF0ZUNvbXBhcmlzb25zKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBy ZXR1cm4gQ1E6OlNpemVGZWF0dXJlIHsgV1RGTW92ZShmZWF0dXJlTmFtZSksIENROjpTeW50YXg6 OlJhbmdlLCBXVEZNb3ZlKGxlZnRDb21wYXJpc29uKSwgV1RGTW92ZShyaWdodENvbXBhcmlzb24p IH07CkBAIC0yODMsNyArMzE1LDYgQEAgUmVmUHRyPENTU1ZhbHVlPiBDb250YWluZXJRdWVyeVBh cnNlcjo6Y29uc3VtZVZhbHVlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICBy ZXR1cm4gdmFsdWU7CiAgICAgaWYgKGF1dG8gdmFsdWUgPSBDU1NQcm9wZXJ0eVBhcnNlckhlbHBl cnM6OmNvbnN1bWVBc3BlY3RSYXRpb1ZhbHVlKHJhbmdlKSkKICAgICAgICAgcmV0dXJuIHZhbHVl OwotICAgIHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCk7CiAgICAgcmV0dXJuIG51 bGxwdHI7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDZlMTk3NzQyYzNl NmI4ZDliODFlNzE0NjAxMTJkMmFlYzA5MjI1OWYuLjlmOTNhNGE2YjMzNzdkM2E1YmJlNjg2OTk3 YjA2OGRhNmE3MmM1ODYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDIyLTA0LTEyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKwor ICAgICAgICBbQ1NTIENvbnRhaW5lciBRdWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWlu ZXItcGFyc2luZy1leHBlY3RlZC50eHQ6CisKIDIwMjItMDQtMTEgIEFudHRpIEtvaXZpc3RvICA8 YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIFVwZGF0 ZSBjb250YWluZXIgc2hvcnRoYW5kIG9yZGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl cmllcy9hdC1jb250YWluZXItcGFyc2luZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl cmllcy9hdC1jb250YWluZXItcGFyc2luZy1leHBlY3RlZC50eHQKaW5kZXggODdmYWY3MjA5MmU0 ZTIyM2JiYmI0MDdiMTcwNzBmOWM3NzZlMDI3NC4uZjUzMjVmYjEzZWM3YWE2YmIzN2NmNzdhNGE3 NjdkNGM4NzZlNGJmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFp bmVyLXBhcnNpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNv bnRhaW5lci1wYXJzaW5nLWV4cGVjdGVkLnR4dApAQCAtNTEsMTMgKzUxLDEzIEBAIFBBU1MgKGNv bG9yLWluZGV4ID49IDEpCiBQQVNTIHNpemUoZ3JpZCkKIFBBU1MgKGdyaWQpCiBQQVNTICh3aWR0 aCA9PSAxMDBweCkKLUZBSUwgKDEwMHB4ID09IHdpZHRoKSBhc3NlcnRfZXF1YWxzOiBleHBlY3Rl ZCAyIGJ1dCBnb3QgMAotRkFJTCAoMTAwcHggPSB3aWR0aCA9IDIwMHB4KSBhc3NlcnRfZXF1YWxz OiBleHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPCB3aWR0aCA+IDIwMHB4 KSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHgg PD0gd2lkdGggPj0gMjAwcHgpIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgInRy dWUiCi1GQUlMICgxMDBweCA8PSB3aWR0aCA+IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBlY3Rl ZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkgYXNzZXJ0 X2VxdWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAidHJ1ZSIKLUZBSUwgKDEwMHB4IDogd2lkdGgg OiAyMDBweCkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgMiBidXQgZ290IDAKK1BBU1MgKDEwMHB4 ID09IHdpZHRoKQorUEFTUyAoMTAwcHggPSB3aWR0aCA9IDIwMHB4KQorUEFTUyAoMTAwcHggPCB3 aWR0aCA+IDIwMHB4KQorUEFTUyAoMTAwcHggPD0gd2lkdGggPj0gMjAwcHgpCitQQVNTICgxMDBw eCA8PSB3aWR0aCA+IDIwMHB4KQorUEFTUyAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkKK1BBU1Mg KDEwMHB4IDogd2lkdGggOiAyMDBweCkKIFBBU1Mgc2NyZWVuCiBQQVNTIHByaW50CiBQQVNTIG5v dCBwcmludAo= 457322 2022-04-12 02:46:48 -0700 2022-04-13 01:55:17 -0700 Patch bug-239118-20220412124647.patch text/plain 7283 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEzMjkxMDFkOWMwMDZj NDFhZDBlYmVjNGM3NGJhNzc0NjA3ZTNmMy4uOTZlNjdhNzc1MDcyMjFkNTY3ZDA5MmFhYmMyNDcz ZWUwYmZiNDM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTA0LTEyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBzcGVjIGRpc2FsbG93cyB0aGluZ3MgbGlrZSAo MTAwcHggPSB3aWR0aCA8IDIwMHB4KSBhbmQgKDEwMHB4IDwgd2lkdGggPiAyMDBweCkuCisKKyAg ICAgICAgaHR0cHM6Ly93d3cudzMub3JnL1RSL21lZGlhcXVlcmllcy00LyNtcS1yYW5nZS1jb250 ZXh0CisKKyAgICAgICAgKiBjc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeSk6CisK KyAgICAgICAgVHJ5IGFzIGEgY29uZGl0aW9uIGZpcnN0LgorICAgICAgICBSZXR1cm4gVW5rbm93 blF1ZXJ5IG9uIHBhcnNlIGZhaWx1cmUuCisKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lclF1 ZXJ5UGFyc2VyOjpjb25zdW1lUmFuZ2VTaXplRmVhdHVyZSk6CisKKyAgICAgICAgVmFsaWRhdGUg dGhlIHJhbmdlcyBzbyB3aGF0IGVuZHMgdXAgYmVpbmcgYWxsb3dlZCBtYXRjaGVzIHRoZSBzcGVj IHByb2R1Y3Rpb25zLgorCiAyMDIyLTA0LTExICBUeWxlciBXaWxjb2NrICA8dHlsZXJfd0BhcHBs ZS5jb20+CiAKICAgICAgICAgQVg6IFVwZGF0ZSBpc29sYXRlZCB0cmVlIGluIHJlc3BvbnNlIHRv IEFYUmVhZE9ubHlTdGF0dXNDaGFuZ2VkLCBBWFJlcXVpcmVkU3RhdHVzQ2hhbmdlZCwgYW5kIEFY UHJlc3NlZFN0YXRlQ2hhbmdlZCBub3RpZmljYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0Nv bnRhaW5lclF1ZXJ5UGFyc2VyLmNwcAppbmRleCA3MTEyZTY5YTZkMGI3MDQwM2Q0ZmI2M2MzMTQ3 YmJlYTEwZDBhYzQ4Li40ODIxMTliNDI5OGFiODE0NzcxZjlmYmU1MTdhYWVhMWZmNWUyYjVmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKQEAgLTczLDEz ICs3MywxNiBAQCBzdGQ6Om9wdGlvbmFsPENROjpDb250YWluZXJRdWVyeT4gQ29udGFpbmVyUXVl cnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeShDUwogCiAgICAgICAgIGJsb2NrUmFuZ2Uu Y29uc3VtZVdoaXRlc3BhY2UoKTsKIAotICAgICAgICAvLyBUcnkgdG8gcGFyc2UgYXMgYSBzaXpl IHF1ZXJ5IGZpcnN0LgotICAgICAgICBhdXRvIGJsb2NrRm9yU2l6ZUZlYXR1cmUgPSBibG9ja1Jh bmdlOwotICAgICAgICBpZiAoYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXplRmVhdHVyZShi bG9ja0ZvclNpemVGZWF0dXJlKSkKLSAgICAgICAgICAgIHJldHVybiB7ICpzaXplRmVhdHVyZSB9 OwotCi0gICAgICAgIGlmIChhdXRvIGNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248Q1E6OkNv bnRhaW5lckNvbmRpdGlvbj4oYmxvY2tSYW5nZSkpCisgICAgICAgIC8vIFRyeSB0byBwYXJzZSBh cyBhIGNvbmRpdGlvbiBmaXJzdC4KKyAgICAgICAgYXV0byBjb25kaXRpb25SYW5nZSA9IGJsb2Nr UmFuZ2U7CisgICAgICAgIGlmIChhdXRvIGNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248Q1E6 OkNvbnRhaW5lckNvbmRpdGlvbj4oY29uZGl0aW9uUmFuZ2UpKQogICAgICAgICAgICAgcmV0dXJu IHsgY29uZGl0aW9uIH07CisKKyAgICAgICAgYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXpl RmVhdHVyZShibG9ja1JhbmdlKTsKKyAgICAgICAgaWYgKCFzaXplRmVhdHVyZSB8fCAhYmxvY2tS YW5nZS5hdEVuZCgpKQorICAgICAgICAgICAgcmV0dXJuIENROjpVbmtub3duUXVlcnkgeyB7IH0s IGJsb2NrUmFuZ2Uuc2VyaWFsaXplKCkgfTsKKworICAgICAgICByZXR1cm4geyAqc2l6ZUZlYXR1 cmUgfTsKICAgICB9CiAKICAgICByZXR1cm4geyB9OwpAQCAtMjAzLDYgKzIwNiw4IEBAIHN0ZDo6 b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVBs YWluU2l6ZUZlYXR1cmUoQ1NTCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBhdXRvIHZhbHVl ID0gY29uc3VtZVZhbHVlKHJhbmdlKTsKKyAgICBpZiAoIXZhbHVlKQorICAgICAgICByZXR1cm4g eyB9OwogCiAgICAgcmV0dXJuIENROjpTaXplRmVhdHVyZSB7IGZlYXR1cmVOYW1lLCBDUTo6U3lu dGF4OjpDb2xvbiwgeyB9LCBDUTo6Q29tcGFyaXNvbiB7IG9wLCBXVEZNb3ZlKHZhbHVlKSB9IH07 CiB9CkBAIC0yMzksMTMgKzI0NCwxOSBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4g Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwogICAgICAg ICB9CiAgICAgfTsKIAorICAgIGJvb2wgZGlkRmFpbFBhcnNpbmcgPSBmYWxzZTsKKwogICAgIGF1 dG8gY29uc3VtZUxlZnRDb21wYXJpc29uID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxDUTo6Q29t cGFyaXNvbj4gewogICAgICAgICBpZiAocmFuZ2UucGVlaygpLnR5cGUoKSA9PSBJZGVudFRva2Vu KQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgYXV0byB2YWx1ZSA9IGNvbnN1bWVW YWx1ZShyYW5nZSk7CisgICAgICAgIGlmICghdmFsdWUpCisgICAgICAgICAgICByZXR1cm4geyB9 OwogICAgICAgICBhdXRvIG9wID0gY29uc3VtZVJhbmdlT3BlcmF0b3IoKTsKLSAgICAgICAgaWYg KCFvcCkKKyAgICAgICAgaWYgKCFvcCkgeworICAgICAgICAgICAgZGlkRmFpbFBhcnNpbmcgPSB0 cnVlOwogICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVy biBDUTo6Q29tcGFyaXNvbiB7ICpvcCwgV1RGTW92ZSh2YWx1ZSkgfTsKICAgICB9OwpAQCAtMjU1 LDYgKzI2NiwxMCBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVl cnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwogICAgICAgICBpZiAoIW9wKQog ICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgYXV0byB2YWx1ZSA9IGNvbnN1bWVWYWx1 ZShyYW5nZSk7CisgICAgICAgIGlmICghdmFsdWUpIHsKKyAgICAgICAgICAgIGRpZEZhaWxQYXJz aW5nID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAgIH0KIAogICAgICAg ICByZXR1cm4gQ1E6OkNvbXBhcmlzb24geyAqb3AsIFdURk1vdmUodmFsdWUpIH07CiAgICAgfTsK QEAgLTI2Nyw3ICsyODIsMjMgQEAgc3RkOjpvcHRpb25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRh aW5lclF1ZXJ5UGFyc2VyOjpjb25zdW1lUmFuZ2VTaXplRmVhdHVyZShDU1MKIAogICAgIGF1dG8g cmlnaHRDb21wYXJpc29uID0gY29uc3VtZVJpZ2h0Q29tcGFyaXNvbigpOwogCi0gICAgaWYgKCFs ZWZ0Q29tcGFyaXNvbiAmJiAhcmlnaHRDb21wYXJpc29uKQorICAgIGF1dG8gdmFsaWRhdGVDb21w YXJpc29ucyA9IFsmXSB7CisgICAgICAgIGlmIChkaWRGYWlsUGFyc2luZykKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFsZWZ0Q29tcGFyaXNvbiAmJiAhcmlnaHRDb21w YXJpc29uKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWxlZnRDb21w YXJpc29uIHx8ICFyaWdodENvbXBhcmlzb24pCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgLy8gRGlzYWxsb3cgY29tcGFyaXNvbnMgbGlrZSAoYT1iPWMpLCAoYT1iPGMpLgorICAg ICAgICBpZiAobGVmdENvbXBhcmlzb24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVx dWFsIHx8IHJpZ2h0Q29tcGFyaXNvbi0+b3AgPT0gQ1E6OkNvbXBhcmlzb25PcGVyYXRvcjo6RXF1 YWwpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIC8vIERpc2FsbG93IGNvbXBh cmlzb25zIGxpa2UgKGE8Yj5jKS4KKyAgICAgICAgYm9vbCBsZWZ0SXNMZXNzID0gbGVmdENvbXBh cmlzb24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuIHx8IGxlZnRDb21w YXJpc29uLT5vcCA9PSBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpMZXNzVGhhbk9yRXF1YWw7Cisg ICAgICAgIGJvb2wgcmlnaHRJc0xlc3MgPSByaWdodENvbXBhcmlzb24tPm9wID09IENROjpDb21w YXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuIHx8IHJpZ2h0Q29tcGFyaXNvbi0+b3AgPT0gQ1E6OkNv bXBhcmlzb25PcGVyYXRvcjo6TGVzc1RoYW5PckVxdWFsOworICAgICAgICByZXR1cm4gbGVmdElz TGVzcyA9PSByaWdodElzTGVzczsKKyAgICB9OworCisgICAgaWYgKCF2YWxpZGF0ZUNvbXBhcmlz b25zKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICByZXR1cm4gQ1E6OlNpemVGZWF0dXJl IHsgV1RGTW92ZShmZWF0dXJlTmFtZSksIENROjpTeW50YXg6OlJhbmdlLCBXVEZNb3ZlKGxlZnRD b21wYXJpc29uKSwgV1RGTW92ZShyaWdodENvbXBhcmlzb24pIH07CkBAIC0yODMsNyArMzE0LDYg QEAgUmVmUHRyPENTU1ZhbHVlPiBDb250YWluZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVZhbHVlKENT U1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgaWYg KGF1dG8gdmFsdWUgPSBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVBc3BlY3RSYXRp b1ZhbHVlKHJhbmdlKSkKICAgICAgICAgcmV0dXJuIHZhbHVlOwotICAgIHJhbmdlLmNvbnN1bWVJ bmNsdWRpbmdXaGl0ZXNwYWNlKCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDZlMTk3NzQyYzNlNmI4ZDliODFlNzE0NjAxMTJkMmFl YzA5MjI1OWYuLjlmOTNhNGE2YjMzNzdkM2E1YmJlNjg2OTk3YjA2OGRhNmE3MmM1ODYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIyLTA0LTEyICBB bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5l ciBRdWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Y29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItcGFyc2luZy1leHBlY3RlZC50 eHQ6CisKIDIwMjItMDQtMTEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIFVwZGF0ZSBjb250YWluZXIgc2hvcnRoYW5k IG9yZGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItcGFy c2luZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXItcGFy c2luZy1leHBlY3RlZC50eHQKaW5kZXggODdmYWY3MjA5MmU0ZTIyM2JiYmI0MDdiMTcwNzBmOWM3 NzZlMDI3NC4uZjUzMjVmYjEzZWM3YWE2YmIzN2NmNzdhNGE3NjdkNGM4NzZlNGJmNSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVyLXBhcnNpbmctZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRhaW5lci1wYXJzaW5nLWV4cGVj dGVkLnR4dApAQCAtNTEsMTMgKzUxLDEzIEBAIFBBU1MgKGNvbG9yLWluZGV4ID49IDEpCiBQQVNT IHNpemUoZ3JpZCkKIFBBU1MgKGdyaWQpCiBQQVNTICh3aWR0aCA9PSAxMDBweCkKLUZBSUwgKDEw MHB4ID09IHdpZHRoKSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAyIGJ1dCBnb3QgMAotRkFJTCAo MTAwcHggPSB3aWR0aCA9IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290 ICJ0cnVlIgotRkFJTCAoMTAwcHggPCB3aWR0aCA+IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBl Y3RlZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPD0gd2lkdGggPj0gMjAwcHgpIGFz c2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgInRydWUiCi1GQUlMICgxMDBweCA8PSB3 aWR0aCA+IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgot RkFJTCAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIg YnV0IGdvdCAidHJ1ZSIKLUZBSUwgKDEwMHB4IDogd2lkdGggOiAyMDBweCkgYXNzZXJ0X2VxdWFs czogZXhwZWN0ZWQgMiBidXQgZ290IDAKK1BBU1MgKDEwMHB4ID09IHdpZHRoKQorUEFTUyAoMTAw cHggPSB3aWR0aCA9IDIwMHB4KQorUEFTUyAoMTAwcHggPCB3aWR0aCA+IDIwMHB4KQorUEFTUyAo MTAwcHggPD0gd2lkdGggPj0gMjAwcHgpCitQQVNTICgxMDBweCA8PSB3aWR0aCA+IDIwMHB4KQor UEFTUyAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkKK1BBU1MgKDEwMHB4IDogd2lkdGggOiAyMDBw eCkKIFBBU1Mgc2NyZWVuCiBQQVNTIHByaW50CiBQQVNTIG5vdCBwcmludAo= 457516 2022-04-13 01:55:22 -0700 2022-04-13 11:49:33 -0700 Patch bug-239118-20220413115520.patch text/plain 7529 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEzMjkxMDFkOWMwMDZj NDFhZDBlYmVjNGM3NGJhNzc0NjA3ZTNmMy4uOTZlNjdhNzc1MDcyMjFkNTY3ZDA5MmFhYmMyNDcz ZWUwYmZiNDM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTA0LTEyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBzcGVjIGRpc2FsbG93cyB0aGluZ3MgbGlrZSAo MTAwcHggPSB3aWR0aCA8IDIwMHB4KSBhbmQgKDEwMHB4IDwgd2lkdGggPiAyMDBweCkuCisKKyAg ICAgICAgaHR0cHM6Ly93d3cudzMub3JnL1RSL21lZGlhcXVlcmllcy00LyNtcS1yYW5nZS1jb250 ZXh0CisKKyAgICAgICAgKiBjc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeSk6CisK KyAgICAgICAgVHJ5IGFzIGEgY29uZGl0aW9uIGZpcnN0LgorICAgICAgICBSZXR1cm4gVW5rbm93 blF1ZXJ5IG9uIHBhcnNlIGZhaWx1cmUuCisKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lclF1 ZXJ5UGFyc2VyOjpjb25zdW1lUmFuZ2VTaXplRmVhdHVyZSk6CisKKyAgICAgICAgVmFsaWRhdGUg dGhlIHJhbmdlcyBzbyB3aGF0IGVuZHMgdXAgYmVpbmcgYWxsb3dlZCBtYXRjaGVzIHRoZSBzcGVj IHByb2R1Y3Rpb25zLgorCiAyMDIyLTA0LTExICBUeWxlciBXaWxjb2NrICA8dHlsZXJfd0BhcHBs ZS5jb20+CiAKICAgICAgICAgQVg6IFVwZGF0ZSBpc29sYXRlZCB0cmVlIGluIHJlc3BvbnNlIHRv IEFYUmVhZE9ubHlTdGF0dXNDaGFuZ2VkLCBBWFJlcXVpcmVkU3RhdHVzQ2hhbmdlZCwgYW5kIEFY UHJlc3NlZFN0YXRlQ2hhbmdlZCBub3RpZmljYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0Nv bnRhaW5lclF1ZXJ5UGFyc2VyLmNwcAppbmRleCA3MTEyZTY5YTZkMGI3MDQwM2Q0ZmI2M2MzMTQ3 YmJlYTEwZDBhYzQ4Li40YmNhZmMyMzIzYWU3N2U0MWM3ODU1ODZhOGYxNTg1NzJjYmQ2OWU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKQEAgLTczLDEz ICs3MywxNSBAQCBzdGQ6Om9wdGlvbmFsPENROjpDb250YWluZXJRdWVyeT4gQ29udGFpbmVyUXVl cnlQYXJzZXI6OmNvbnN1bWVDb250YWluZXJRdWVyeShDUwogCiAgICAgICAgIGJsb2NrUmFuZ2Uu Y29uc3VtZVdoaXRlc3BhY2UoKTsKIAotICAgICAgICAvLyBUcnkgdG8gcGFyc2UgYXMgYSBzaXpl IHF1ZXJ5IGZpcnN0LgotICAgICAgICBhdXRvIGJsb2NrRm9yU2l6ZUZlYXR1cmUgPSBibG9ja1Jh bmdlOwotICAgICAgICBpZiAoYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXplRmVhdHVyZShi bG9ja0ZvclNpemVGZWF0dXJlKSkKKyAgICAgICAgLy8gVHJ5IHRvIHBhcnNlIGFzIGEgY29uZGl0 aW9uIGZpcnN0LgorICAgICAgICBhdXRvIGNvbmRpdGlvblJhbmdlID0gYmxvY2tSYW5nZTsKKyAg ICAgICAgaWYgKGF1dG8gY29uZGl0aW9uID0gY29uc3VtZUNvbmRpdGlvbjxDUTo6Q29udGFpbmVy Q29uZGl0aW9uPihjb25kaXRpb25SYW5nZSkpCisgICAgICAgICAgICByZXR1cm4geyBjb25kaXRp b24gfTsKKworICAgICAgICBpZiAoYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVTaXplRmVhdHVy ZShibG9ja1JhbmdlKSkKICAgICAgICAgICAgIHJldHVybiB7ICpzaXplRmVhdHVyZSB9OwogCi0g ICAgICAgIGlmIChhdXRvIGNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248Q1E6OkNvbnRhaW5l ckNvbmRpdGlvbj4oYmxvY2tSYW5nZSkpCi0gICAgICAgICAgICByZXR1cm4geyBjb25kaXRpb24g fTsKKyAgICAgICAgcmV0dXJuIENROjpVbmtub3duUXVlcnkgeyB7IH0sIGJsb2NrUmFuZ2Uuc2Vy aWFsaXplKCkgfTsKICAgICB9CiAKICAgICByZXR1cm4geyB9OwpAQCAtMTU1LDYgKzE1NywxMCBA QCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNv bnN1bWVTaXplRmVhdHVyZShDU1NQYXJzZQogICAgIH07CiAKICAgICBhdXRvIHNpemVGZWF0dXJl ID0gY29uc3VtZSgpOworCisgICAgaWYgKCFyYW5nZS5hdEVuZCgpKQorICAgICAgICByZXR1cm4g eyB9OworCiAgICAgaWYgKHNpemVGZWF0dXJlKQogICAgICAgICBtX3JlcXVpcmVkQXhlcy5hZGQo Q1E6OnJlcXVpcmVkQXhlc0ZvckZlYXR1cmUoc2l6ZUZlYXR1cmUtPm5hbWUpKTsKIApAQCAtMjAz LDYgKzIwOSw4IEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJRdWVy eVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NTCiAgICAgICAgIHJldHVybiB7IH07 CiAKICAgICBhdXRvIHZhbHVlID0gY29uc3VtZVZhbHVlKHJhbmdlKTsKKyAgICBpZiAoIXZhbHVl KQorICAgICAgICByZXR1cm4geyB9OwogCiAgICAgcmV0dXJuIENROjpTaXplRmVhdHVyZSB7IGZl YXR1cmVOYW1lLCBDUTo6U3ludGF4OjpDb2xvbiwgeyB9LCBDUTo6Q29tcGFyaXNvbiB7IG9wLCBX VEZNb3ZlKHZhbHVlKSB9IH07CiB9CkBAIC0yMzksMTMgKzI0NywxOSBAQCBzdGQ6Om9wdGlvbmFs PENROjpTaXplRmVhdHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVG ZWF0dXJlKENTUwogICAgICAgICB9CiAgICAgfTsKIAorICAgIGJvb2wgZGlkRmFpbFBhcnNpbmcg PSBmYWxzZTsKKwogICAgIGF1dG8gY29uc3VtZUxlZnRDb21wYXJpc29uID0gWyZdKCkgLT4gc3Rk OjpvcHRpb25hbDxDUTo6Q29tcGFyaXNvbj4gewogICAgICAgICBpZiAocmFuZ2UucGVlaygpLnR5 cGUoKSA9PSBJZGVudFRva2VuKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgYXV0 byB2YWx1ZSA9IGNvbnN1bWVWYWx1ZShyYW5nZSk7CisgICAgICAgIGlmICghdmFsdWUpCisgICAg ICAgICAgICByZXR1cm4geyB9OwogICAgICAgICBhdXRvIG9wID0gY29uc3VtZVJhbmdlT3BlcmF0 b3IoKTsKLSAgICAgICAgaWYgKCFvcCkKKyAgICAgICAgaWYgKCFvcCkgeworICAgICAgICAgICAg ZGlkRmFpbFBhcnNpbmcgPSB0cnVlOwogICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAg fQogCiAgICAgICAgIHJldHVybiBDUTo6Q29tcGFyaXNvbiB7ICpvcCwgV1RGTW92ZSh2YWx1ZSkg fTsKICAgICB9OwpAQCAtMjU1LDYgKzI2OSwxMCBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVh dHVyZT4gQ29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVSYW5nZVNpemVGZWF0dXJlKENTUwog ICAgICAgICBpZiAoIW9wKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgYXV0byB2 YWx1ZSA9IGNvbnN1bWVWYWx1ZShyYW5nZSk7CisgICAgICAgIGlmICghdmFsdWUpIHsKKyAgICAg ICAgICAgIGRpZEZhaWxQYXJzaW5nID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiB7IH07Cisg ICAgICAgIH0KIAogICAgICAgICByZXR1cm4gQ1E6OkNvbXBhcmlzb24geyAqb3AsIFdURk1vdmUo dmFsdWUpIH07CiAgICAgfTsKQEAgLTI2Nyw3ICsyODUsMjMgQEAgc3RkOjpvcHRpb25hbDxDUTo6 U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpjb25zdW1lUmFuZ2VTaXplRmVhdHVy ZShDU1MKIAogICAgIGF1dG8gcmlnaHRDb21wYXJpc29uID0gY29uc3VtZVJpZ2h0Q29tcGFyaXNv bigpOwogCi0gICAgaWYgKCFsZWZ0Q29tcGFyaXNvbiAmJiAhcmlnaHRDb21wYXJpc29uKQorICAg IGF1dG8gdmFsaWRhdGVDb21wYXJpc29ucyA9IFsmXSB7CisgICAgICAgIGlmIChkaWRGYWlsUGFy c2luZykKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFsZWZ0Q29tcGFy aXNvbiAmJiAhcmlnaHRDb21wYXJpc29uKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICBpZiAoIWxlZnRDb21wYXJpc29uIHx8ICFyaWdodENvbXBhcmlzb24pCisgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgLy8gRGlzYWxsb3cgY29tcGFyaXNvbnMgbGlrZSAoYT1i PWMpLCAoYT1iPGMpLgorICAgICAgICBpZiAobGVmdENvbXBhcmlzb24tPm9wID09IENROjpDb21w YXJpc29uT3BlcmF0b3I6OkVxdWFsIHx8IHJpZ2h0Q29tcGFyaXNvbi0+b3AgPT0gQ1E6OkNvbXBh cmlzb25PcGVyYXRvcjo6RXF1YWwpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg IC8vIERpc2FsbG93IGNvbXBhcmlzb25zIGxpa2UgKGE8Yj5jKS4KKyAgICAgICAgYm9vbCBsZWZ0 SXNMZXNzID0gbGVmdENvbXBhcmlzb24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxl c3NUaGFuIHx8IGxlZnRDb21wYXJpc29uLT5vcCA9PSBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpM ZXNzVGhhbk9yRXF1YWw7CisgICAgICAgIGJvb2wgcmlnaHRJc0xlc3MgPSByaWdodENvbXBhcmlz b24tPm9wID09IENROjpDb21wYXJpc29uT3BlcmF0b3I6Okxlc3NUaGFuIHx8IHJpZ2h0Q29tcGFy aXNvbi0+b3AgPT0gQ1E6OkNvbXBhcmlzb25PcGVyYXRvcjo6TGVzc1RoYW5PckVxdWFsOworICAg ICAgICByZXR1cm4gbGVmdElzTGVzcyA9PSByaWdodElzTGVzczsKKyAgICB9OworCisgICAgaWYg KCF2YWxpZGF0ZUNvbXBhcmlzb25zKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICByZXR1 cm4gQ1E6OlNpemVGZWF0dXJlIHsgV1RGTW92ZShmZWF0dXJlTmFtZSksIENROjpTeW50YXg6OlJh bmdlLCBXVEZNb3ZlKGxlZnRDb21wYXJpc29uKSwgV1RGTW92ZShyaWdodENvbXBhcmlzb24pIH07 CkBAIC0yODMsNyArMzE3LDYgQEAgUmVmUHRyPENTU1ZhbHVlPiBDb250YWluZXJRdWVyeVBhcnNl cjo6Y29uc3VtZVZhbHVlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICByZXR1 cm4gdmFsdWU7CiAgICAgaWYgKGF1dG8gdmFsdWUgPSBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6 OmNvbnN1bWVBc3BlY3RSYXRpb1ZhbHVlKHJhbmdlKSkKICAgICAgICAgcmV0dXJuIHZhbHVlOwot ICAgIHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCk7CiAgICAgcmV0dXJuIG51bGxw dHI7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDZlMTk3NzQyYzNlNmI4 ZDliODFlNzE0NjAxMTJkMmFlYzA5MjI1OWYuLjlmOTNhNGE2YjMzNzdkM2E1YmJlNjg2OTk3YjA2 OGRhNmE3MmM1ODYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIyLTA0LTEyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ1NTIENvbnRhaW5lciBRdWVyaWVzXSBMaW1pdCBxdWVyeSByYW5nZSBzeW50YXgKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTExOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hdC1jb250YWluZXIt cGFyc2luZy1leHBlY3RlZC50eHQ6CisKIDIwMjItMDQtMTEgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIFVwZGF0ZSBj b250YWluZXIgc2hvcnRoYW5kIG9yZGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll cy9hdC1jb250YWluZXItcGFyc2luZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll cy9hdC1jb250YWluZXItcGFyc2luZy1leHBlY3RlZC50eHQKaW5kZXggODdmYWY3MjA5MmU0ZTIy M2JiYmI0MDdiMTcwNzBmOWM3NzZlMDI3NC4uZjUzMjVmYjEzZWM3YWE2YmIzN2NmNzdhNGE3Njdk NGM4NzZlNGJmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXQtY29udGFpbmVy LXBhcnNpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2F0LWNvbnRh aW5lci1wYXJzaW5nLWV4cGVjdGVkLnR4dApAQCAtNTEsMTMgKzUxLDEzIEBAIFBBU1MgKGNvbG9y LWluZGV4ID49IDEpCiBQQVNTIHNpemUoZ3JpZCkKIFBBU1MgKGdyaWQpCiBQQVNTICh3aWR0aCA9 PSAxMDBweCkKLUZBSUwgKDEwMHB4ID09IHdpZHRoKSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAy IGJ1dCBnb3QgMAotRkFJTCAoMTAwcHggPSB3aWR0aCA9IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBl eHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPCB3aWR0aCA+IDIwMHB4KSBh c3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPD0g d2lkdGggPj0gMjAwcHgpIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgInRydWUi Ci1GQUlMICgxMDBweCA8PSB3aWR0aCA+IDIwMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAi IiBidXQgZ290ICJ0cnVlIgotRkFJTCAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkgYXNzZXJ0X2Vx dWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAidHJ1ZSIKLUZBSUwgKDEwMHB4IDogd2lkdGggOiAy MDBweCkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgMiBidXQgZ290IDAKK1BBU1MgKDEwMHB4ID09 IHdpZHRoKQorUEFTUyAoMTAwcHggPSB3aWR0aCA9IDIwMHB4KQorUEFTUyAoMTAwcHggPCB3aWR0 aCA+IDIwMHB4KQorUEFTUyAoMTAwcHggPD0gd2lkdGggPj0gMjAwcHgpCitQQVNTICgxMDBweCA8 PSB3aWR0aCA+IDIwMHB4KQorUEFTUyAoMTAwcHggPCB3aWR0aCA+PSAyMDBweCkKK1BBU1MgKDEw MHB4IDogd2lkdGggOiAyMDBweCkKIFBBU1Mgc2NyZWVuCiBQQVNTIHByaW50CiBQQVNTIG5vdCBw cmludAo=