249107 2022-12-11 13:08:02 -0800 canonicalUnitTypeForCategory should handle percent category 2022-12-12 04:01:21 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 249131 249132 189692 1 koivisto koivisto commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard ntim philn webkit-bug-importer oldest_to_newest 1918322 0 koivisto 2022-12-11 13:08:02 -0800 Fix some FIXMEs. 1918323 1 webkit-bug-importer 2022-12-11 13:08:23 -0800 <rdar://problem/103231020> 1918324 2 463989 koivisto 2022-12-11 13:17:51 -0800 Created attachment 463989 Patch 1918332 3 463990 koivisto 2022-12-11 13:43:24 -0800 Created attachment 463990 Patch 1918385 4 464000 koivisto 2022-12-11 22:18:25 -0800 Created attachment 464000 Patch 1918389 5 464000 ntim 2022-12-11 23:24:08 -0800 Comment on attachment 464000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=464000&action=review > Source/WebCore/css/typedom/CSSUnitValue.cpp:161 > auto canonicalUnit = [] (CSSUnitType unit) { > - // FIXME: We probably want to change the definition of canonicalUnitTypeForCategory so this lambda isn't necessary. > - auto category = unitCategory(unit); > - switch (category) { > - case CSSUnitCategory::Percent: > - return CSSUnitType::CSS_PERCENTAGE; > - case CSSUnitCategory::Flex: > - return CSSUnitType::CSS_FR; > - default: > - break; > - } > - auto result = canonicalUnitTypeForCategory(category); > + auto result = canonicalUnitTypeForUnitType(unit); > return result == CSSUnitType::CSS_UNKNOWN ? unit : result; > } (m_unit); Do we really need this lambda? Can we just call `canonicalUnitTypeForUnitType` directly ? 1918390 6 464002 koivisto 2022-12-11 23:27:31 -0800 Created attachment 464002 Patch for landing 1918406 7 ews-feeder 2022-12-12 00:31:47 -0800 Committed 257716@main (f23f94eab4ca): <https://commits.webkit.org/257716@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464002. 1918433 8 commit-queue 2022-12-12 03:00:03 -0800 Re-opened since this is blocked by bug 249131 1918443 9 philn 2022-12-12 03:19:00 -0800 Manually reverted, see https://bugs.webkit.org/show_bug.cgi?id=249133 1918445 10 philn 2022-12-12 04:01:21 -0800 Revert no longer needed. 463989 2022-12-11 13:17:51 -0800 2022-12-11 14:01:08 -0800 Patch bug-249107-20221211231750.patch text/plain 8393 koivisto RnJvbSA5NjZjNjU2NjRiYzMxMTYxZTE3MDg1OWViNTNmYzg1NmExNzJmMmY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBTdW4sIDExIERlYyAyMDIyIDIzOjEwOjA3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzaG91bGQgaGFuZGxlIHBlcmNlbnQgY2F0ZWdvcnkKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDkxMDcgcmRhcjovLzEwMzIz MTAyMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpGaXggc29tZSBGSVhNRXMuCgoqIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6CihXZWJDb3JlOjpDU1NQcmlt aXRpdmVWYWx1ZTo6ZG91YmxlVmFsdWVJbnRlcm5hbCBjb25zdCk6CgpIYW5kbGUgdGhlIHBlcmNl bnQgY2FzZSBoZXJlIGluc3RlYWQgb2YgaW4gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeS4K CiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcDoKKFdlYkNvcmU6OmNhbm9uaWNhbFVu aXRUeXBlRm9yQ2F0ZWdvcnkpOgooV2ViQ29yZTo6Y2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlw ZSk6CgpBZGQgYSBzaG9ydGN1dC4KCiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmg6Ciog U291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHA6CihX ZWJDb3JlOjpDU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlOjphZGQpOgoqIFNvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgooV2ViQ29yZTo6Q1NTUHJvcGVydHlQ YXJzZXI6OnBhcnNlVHlwZWRDdXN0b21Qcm9wZXJ0eVZhbHVlKToKClVzZSBjYW5vbmljYWxVbml0 VHlwZUZvclVuaXRUeXBlLgoKKiBTb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFs dWUuY3BwOgooV2ViQ29yZTo6Q1NTVW5pdFZhbHVlOjp0b1N1bVZhbHVlIGNvbnN0KToKLS0tCiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwICAgICAgICAgICAgIHwgIDYg KysrKysrCiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwICAgICAgICAgICAgICAgICAg ICAgIHwgIDcgKysrKysrLQogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmggICAgICAgICAg ICAgICAgICAgICAgICB8ICAxICsKIC4uLi9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRp dmVWYWx1ZU5vZGUuY3BwICAgfCAgNCArLS0tCiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1Byb3BlcnR5UGFyc2VyLmNwcCAgICAgIHwgIDcgKysrLS0tLQogU291cmNlL1dlYkNvcmUvY3Nz L3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcCAgICAgICAgICB8IDEyICstLS0tLS0tLS0tLQogNiBm aWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAppbmRleCAyNmRlY2VkODliNzEuLmFmYTc4 MmE3ZGE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCkBAIC0x MTQ2LDYgKzExNDYsOSBAQCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gQ1NTUHJpbWl0aXZlVmFsdWU6 OmRvdWJsZVZhbHVlSW50ZXJuYWwoQ1NTVW5pdFR5cGUgcmVxdWVzdAogICAgICAgICByZXR1cm4g c3RkOjpudWxsb3B0OwogCiAgICAgaWYgKHRhcmdldENhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29y eTo6TnVtYmVyKSB7CisgICAgICAgIC8vIENhbm5vdCBjb252ZXJ0IGJldHdlZW4gbnVtYmVycyBh bmQgcGVyY2VudC4KKyAgICAgICAgaWYgKHNvdXJjZUNhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29y eTo6UGVyY2VudCkKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgICAgIC8v IFdlIGludGVycHJldCBjb252ZXJzaW9uIHRvIENTU1VuaXRUeXBlOjpDU1NfTlVNQkVSIGFzIGNv bnZlcnNpb24gdG8gYSBjYW5vbmljYWwgdW5pdCBpbiB0aGlzIHZhbHVlJ3MgY2F0ZWdvcnkuCiAg ICAgICAgIHRhcmdldFVuaXRUeXBlID0gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeShzb3Vy Y2VDYXRlZ29yeSk7CiAgICAgICAgIGlmICh0YXJnZXRVbml0VHlwZSA9PSBDU1NVbml0VHlwZTo6 Q1NTX1VOS05PV04pCkBAIC0xMTUzLDYgKzExNTYsOSBAQCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4g Q1NTUHJpbWl0aXZlVmFsdWU6OmRvdWJsZVZhbHVlSW50ZXJuYWwoQ1NTVW5pdFR5cGUgcmVxdWVz dAogICAgIH0KIAogICAgIGlmIChzb3VyY2VVbml0VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NTX05V TUJFUiB8fCBzb3VyY2VVbml0VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NTX0lOVEVHRVIpIHsKKyAg ICAgICAgLy8gQ2Fubm90IGNvbnZlcnQgYmV0d2VlbiBudW1iZXJzIGFuZCBwZXJjZW50LgorICAg ICAgICBpZiAodGFyZ2V0Q2F0ZWdvcnkgPT0gQ1NTVW5pdENhdGVnb3J5OjpQZXJjZW50KQorICAg ICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgLy8gV2UgaW50ZXJwcmV0IGNv bnZlcnNpb24gZnJvbSBDU1NVbml0VHlwZTo6Q1NTX05VTUJFUiBpbiB0aGUgc2FtZSB3YXkgYXMg Q1NTUGFyc2VyOjp2YWxpZFVuaXQoKSB3aGlsZSB1c2luZyBub24tc3RyaWN0IG1vZGUuCiAgICAg ICAgIHNvdXJjZVVuaXRUeXBlID0gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSh0YXJnZXRD YXRlZ29yeSk7CiAgICAgICAgIGlmIChzb3VyY2VVbml0VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NT X1VOS05PV04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcAppbmRleCAwN2U0M2IzZmVlMjIuLjQzYTVl MWMwMzM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgQ1NT VW5pdFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeShDU1NVbml0Q2F0ZWdvcnkgY2F0 ZWdvcnkpCiAgICAgY2FzZSBDU1NVbml0Q2F0ZWdvcnk6OkFic29sdXRlTGVuZ3RoOgogICAgICAg ICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19QWDsKICAgICBjYXNlIENTU1VuaXRDYXRlZ29yeTo6 UGVyY2VudDoKLSAgICAgICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfVU5LTk9XTjsgLy8gQ2Fu bm90IGNvbnZlcnQgYmV0d2VlbiBudW1iZXJzIGFuZCBwZXJjZW50LgorICAgICAgICByZXR1cm4g Q1NTVW5pdFR5cGU6OkNTU19QRVJDRU5UQUdFOwogICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpU aW1lOgogICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19TOwogICAgIGNhc2UgQ1NTVW5p dENhdGVnb3J5OjpBbmdsZToKQEAgLTE2MSw2ICsxNjEsMTEgQEAgQ1NTVW5pdFR5cGUgY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeShDU1NVbml0Q2F0ZWdvcnkgY2F0ZWdvcnkpCiAgICAgcmV0 dXJuIENTU1VuaXRUeXBlOjpDU1NfVU5LTk9XTjsKIH0KIAorQ1NTVW5pdFR5cGUgY2Fub25pY2Fs VW5pdFR5cGVGb3JVbml0VHlwZShDU1NVbml0VHlwZSB1bml0VHlwZSkKK3sKKyAgICByZXR1cm4g Y2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSh1bml0Q2F0ZWdvcnkodW5pdFR5cGUpKTsKK30K KwogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgQ1NTVW5pdENhdGVnb3J5 IGNhdGVnb3J5KQogewogICAgIHN3aXRjaCAoY2F0ZWdvcnkpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmgK aW5kZXggMTZlZDk2NGE3NDc5Li5kNmVkZjNjMmE3Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NVbml0cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5oCkBA IC0xNDksNiArMTQ5LDcgQEAgZW51bSBjbGFzcyBDU1NVbml0Q2F0ZWdvcnkgOiB1aW50OF90IHsK IAogQ1NTVW5pdENhdGVnb3J5IHVuaXRDYXRlZ29yeShDU1NVbml0VHlwZSk7CiBDU1NVbml0VHlw ZSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KENTU1VuaXRDYXRlZ29yeSk7CitDU1NVbml0 VHlwZSBjYW5vbmljYWxVbml0VHlwZUZvclVuaXRUeXBlKENTU1VuaXRUeXBlKTsKIAogV1RGOjpU ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIENTU1VuaXRDYXRlZ29yeSk7 CiBXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFtJiwgQ1NTVW5pdFR5 cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2 ZVZhbHVlTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0aXZl VmFsdWVOb2RlLmNwcAppbmRleCA4NzA1NTljYjEyYWQuLjhmYjkwYjc1ZTNhNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5j cHAKQEAgLTEwMSw5ICsxMDEsNyBAQCB2b2lkIENTU0NhbGNQcmltaXRpdmVWYWx1ZU5vZGU6OmFk ZChjb25zdCBDU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlJiBub2RlLCBVbml0QwogICAgICAgICBt X3ZhbHVlID0gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShtX3ZhbHVlLT5kb3VibGVWYWx1ZSgp ICsgbm9kZS5kb3VibGVWYWx1ZSh2YWx1ZVR5cGUpLCB2YWx1ZVR5cGUpOwogICAgICAgICBicmVh azsKICAgICBjYXNlIFVuaXRDb252ZXJzaW9uOjpDYW5vbmljYWxpemU6IHsKLSAgICAgICAgYXV0 byB2YWx1ZUNhdGVnb3J5ID0gdW5pdENhdGVnb3J5KHZhbHVlVHlwZSk7Ci0gICAgICAgIC8vIEZJ WE1FOiBJdCdzIGF3a3dhcmQgdGhhdCBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KCkgaGFz IHNwZWNpYWwgaGFuZGxpbmcgZm9yIENTU1VuaXRDYXRlZ29yeTo6UGVyY2VudC4KLSAgICAgICAg YXV0byBjYW5vbmljYWxUeXBlID0gdmFsdWVDYXRlZ29yeSA9PSBDU1NVbml0Q2F0ZWdvcnk6OlBl cmNlbnQgPyBDU1NVbml0VHlwZTo6Q1NTX1BFUkNFTlRBR0UgOiBjYW5vbmljYWxVbml0VHlwZUZv ckNhdGVnb3J5KHZhbHVlQ2F0ZWdvcnkpOworICAgICAgICBhdXRvIGNhbm9uaWNhbFR5cGUgPSBj YW5vbmljYWxVbml0VHlwZUZvclVuaXRUeXBlKHZhbHVlVHlwZSk7CiAgICAgICAgIEFTU0VSVChj YW5vbmljYWxUeXBlICE9IENTU1VuaXRUeXBlOjpDU1NfVU5LTk9XTik7CiAgICAgICAgIGRvdWJs ZSBsZWZ0VmFsdWUgPSBtX3ZhbHVlLT5kb3VibGVWYWx1ZShjYW5vbmljYWxUeXBlKTsKICAgICAg ICAgZG91YmxlIHJpZ2h0VmFsdWUgPSBub2RlLmRvdWJsZVZhbHVlKGNhbm9uaWNhbFR5cGUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAppbmRl eCA3Y2RhMDEwZTNiYTMuLjA2MzIwZTQ2YThlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKQEAgLTQ0MSwxMyArNDQxLDEyIEBAIFJlZlB0 cjxDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlPiBDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VUeXBlZEN1 c3RvbVByb3BlcnR5VmFsdWUoCiAgICAgICAgIHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVl OjpjcmVhdGVGb3JMZW5ndGhTeW50YXgobmFtZSwgV1RGTW92ZShsZW5ndGgpKTsKICAgICB9CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6UGVyY2VudGFnZToKLSAgICAgICAgcmV0 dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwg cHJpbWl0aXZlVmFsdWUtPmRvdWJsZVZhbHVlKCksIENTU1VuaXRUeXBlOjpDU1NfUEVSQ0VOVEFH RSk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6SW50ZWdlcjoKLSAgICAgICAg cmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFt ZSwgcHJpbWl0aXZlVmFsdWUtPmludFZhbHVlKCksIENTU1VuaXRUeXBlOjpDU1NfSU5URUdFUik7 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6TnVtYmVyOgotICAgICAgICByZXR1 cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChuYW1lLCBw cmltaXRpdmVWYWx1ZS0+ZG91YmxlVmFsdWUoKSwgQ1NTVW5pdFR5cGU6OkNTU19OVU1CRVIpOwog ICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6OkFuZ2xlOgotICAgICAgICByZXR1cm4g Q1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChuYW1lLCBwcmlt aXRpdmVWYWx1ZS0+Y29tcHV0ZURlZ3JlZXMoKSwgQ1NTVW5pdFR5cGU6OkNTU19ERUcpOworICAg ICAgICBhdXRvIGNhbm9uaWNhbFVuaXQgPSBjYW5vbmljYWxVbml0VHlwZUZvclVuaXRUeXBlKHBy aW1pdGl2ZVZhbHVlLT5wcmltaXRpdmVUeXBlKCkpOworICAgICAgICByZXR1cm4gQ1NTQ3VzdG9t UHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChuYW1lLCBwcmltaXRpdmVWYWx1 ZS0+ZG91YmxlVmFsdWUoY2Fub25pY2FsVW5pdCksIGNhbm9uaWNhbFVuaXQpOworICAgIH0KICAg ICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpDb2xvcjogewogICAgICAgICBhdXRvIGNv bG9yID0gYnVpbGRlclN0YXRlLmNvbG9yRnJvbVByaW1pdGl2ZVZhbHVlKCpwcmltaXRpdmVWYWx1 ZSwgU3R5bGU6OkZvclZpc2l0ZWRMaW5rOjpObyk7CiAgICAgICAgIHJldHVybiBDU1NDdXN0b21Q cm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JDb2xvclN5bnRheChuYW1lLCBjb2xvcik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFsdWUuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcAppbmRleCAyMGE4YzlmOTlkOTYu LjViOGUwZDNmODA5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NT VW5pdFZhbHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFs dWUuY3BwCkBAIC0xNTYsMTcgKzE1Niw3IEBAIGF1dG8gQ1NTVW5pdFZhbHVlOjp0b1N1bVZhbHVl KCkgY29uc3QgLT4gc3RkOjpvcHRpb25hbDxTdW1WYWx1ZT4KIHsKICAgICAvLyBodHRwczovL2Ry YWZ0cy5jc3MtaG91ZGluaS5vcmcvY3NzLXR5cGVkLW9tLyNjcmVhdGUtYS1zdW0tdmFsdWUKICAg ICBhdXRvIGNhbm9uaWNhbFVuaXQgPSBbXSAoQ1NTVW5pdFR5cGUgdW5pdCkgewotICAgICAgICAv LyBGSVhNRTogV2UgcHJvYmFibHkgd2FudCB0byBjaGFuZ2UgdGhlIGRlZmluaXRpb24gb2YgY2Fu b25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzbyB0aGlzIGxhbWJkYSBpc24ndCBuZWNlc3Nhcnku Ci0gICAgICAgIGF1dG8gY2F0ZWdvcnkgPSB1bml0Q2F0ZWdvcnkodW5pdCk7Ci0gICAgICAgIHN3 aXRjaCAoY2F0ZWdvcnkpIHsKLSAgICAgICAgY2FzZSBDU1NVbml0Q2F0ZWdvcnk6OlBlcmNlbnQ6 Ci0gICAgICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19QRVJDRU5UQUdFOwotICAgICAg ICBjYXNlIENTU1VuaXRDYXRlZ29yeTo6RmxleDoKLSAgICAgICAgICAgIHJldHVybiBDU1NVbml0 VHlwZTo6Q1NTX0ZSOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIH0KLSAgICAgICAgYXV0byByZXN1bHQgPSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5 KGNhdGVnb3J5KTsKKyAgICAgICAgYXV0byByZXN1bHQgPSBjYW5vbmljYWxVbml0VHlwZUZvclVu aXRUeXBlKHVuaXQpOwogICAgICAgICByZXR1cm4gcmVzdWx0ID09IENTU1VuaXRUeXBlOjpDU1Nf VU5LTk9XTiA/IHVuaXQgOiByZXN1bHQ7CiAgICAgfSAobV91bml0KTsKICAgICBhdXRvIGNvbnZl cnRlZFZhbHVlID0gbV92YWx1ZSAqIGNvbnZlcnNpb25Ub0Nhbm9uaWNhbFVuaXRzU2NhbGVGYWN0 b3IodW5pdEVudW0oKSkgLyBjb252ZXJzaW9uVG9DYW5vbmljYWxVbml0c1NjYWxlRmFjdG9yKGNh bm9uaWNhbFVuaXQpOwo= 463990 2022-12-11 13:43:24 -0800 2022-12-11 22:18:21 -0800 Patch bug-249107-20221211234323.patch text/plain 8439 koivisto RnJvbSA1YWZhMjVhZDEwNmQwNTc3ZTMzNDZhY2MxMjBlMGQyMWU0ZmE0ZThhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBTdW4sIDExIERlYyAyMDIyIDIzOjEwOjA3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzaG91bGQgaGFuZGxlIHBlcmNlbnQgY2F0ZWdvcnkKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDkxMDcgcmRhcjovLzEwMzIz MTAyMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpGaXggc29tZSBGSVhNRXMuCgoqIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6CihXZWJDb3JlOjpDU1NQcmlt aXRpdmVWYWx1ZTo6ZG91YmxlVmFsdWVJbnRlcm5hbCBjb25zdCk6CgpIYW5kbGUgdGhlIHBlcmNl bnQgY2FzZSBoZXJlIGluc3RlYWQgb2YgaW4gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeS4K CiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcDoKKFdlYkNvcmU6OmNhbm9uaWNhbFVu aXRUeXBlRm9yQ2F0ZWdvcnkpOgooV2ViQ29yZTo6Y2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlw ZSk6CgpBZGQgYSBzaG9ydGN1dC4KCiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmg6Ciog U291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHA6CihX ZWJDb3JlOjpDU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlOjphZGQpOgoqIFNvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgooV2ViQ29yZTo6Q1NTUHJvcGVydHlQ YXJzZXI6OnBhcnNlVHlwZWRDdXN0b21Qcm9wZXJ0eVZhbHVlKToKClVzZSBjYW5vbmljYWxVbml0 VHlwZUZvclVuaXRUeXBlLgoKKiBTb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFs dWUuY3BwOgooV2ViQ29yZTo6Q1NTVW5pdFZhbHVlOjp0b1N1bVZhbHVlIGNvbnN0KToKLS0tCiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwICAgICAgICAgICAgIHwgIDYg KysrKysrCiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwICAgICAgICAgICAgICAgICAg ICAgIHwgIDcgKysrKysrLQogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmggICAgICAgICAg ICAgICAgICAgICAgICB8ICAxICsKIC4uLi9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRp dmVWYWx1ZU5vZGUuY3BwICAgfCAgNCArLS0tCiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1Byb3BlcnR5UGFyc2VyLmNwcCAgICAgIHwgIDkgKysrKy0tLS0tCiBTb3VyY2UvV2ViQ29yZS9j c3MvdHlwZWRvbS9DU1NVbml0VmFsdWUuY3BwICAgICAgICAgIHwgMTIgKy0tLS0tLS0tLS0tCiA2 IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCmluZGV4IDI2ZGVjZWQ4OWI3MS4uYWZh NzgyYTdkYTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKQEAg LTExNDYsNiArMTE0Niw5IEBAIHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBDU1NQcmltaXRpdmVWYWx1 ZTo6ZG91YmxlVmFsdWVJbnRlcm5hbChDU1NVbml0VHlwZSByZXF1ZXN0CiAgICAgICAgIHJldHVy biBzdGQ6Om51bGxvcHQ7CiAKICAgICBpZiAodGFyZ2V0Q2F0ZWdvcnkgPT0gQ1NTVW5pdENhdGVn b3J5OjpOdW1iZXIpIHsKKyAgICAgICAgLy8gQ2Fubm90IGNvbnZlcnQgYmV0d2VlbiBudW1iZXJz IGFuZCBwZXJjZW50LgorICAgICAgICBpZiAoc291cmNlQ2F0ZWdvcnkgPT0gQ1NTVW5pdENhdGVn b3J5OjpQZXJjZW50KQorICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAg Ly8gV2UgaW50ZXJwcmV0IGNvbnZlcnNpb24gdG8gQ1NTVW5pdFR5cGU6OkNTU19OVU1CRVIgYXMg Y29udmVyc2lvbiB0byBhIGNhbm9uaWNhbCB1bml0IGluIHRoaXMgdmFsdWUncyBjYXRlZ29yeS4K ICAgICAgICAgdGFyZ2V0VW5pdFR5cGUgPSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KHNv dXJjZUNhdGVnb3J5KTsKICAgICAgICAgaWYgKHRhcmdldFVuaXRUeXBlID09IENTU1VuaXRUeXBl OjpDU1NfVU5LTk9XTikKQEAgLTExNTMsNiArMTE1Niw5IEBAIHN0ZDo6b3B0aW9uYWw8ZG91Ymxl PiBDU1NQcmltaXRpdmVWYWx1ZTo6ZG91YmxlVmFsdWVJbnRlcm5hbChDU1NVbml0VHlwZSByZXF1 ZXN0CiAgICAgfQogCiAgICAgaWYgKHNvdXJjZVVuaXRUeXBlID09IENTU1VuaXRUeXBlOjpDU1Nf TlVNQkVSIHx8IHNvdXJjZVVuaXRUeXBlID09IENTU1VuaXRUeXBlOjpDU1NfSU5URUdFUikgewor ICAgICAgICAvLyBDYW5ub3QgY29udmVydCBiZXR3ZWVuIG51bWJlcnMgYW5kIHBlcmNlbnQuCisg ICAgICAgIGlmICh0YXJnZXRDYXRlZ29yeSA9PSBDU1NVbml0Q2F0ZWdvcnk6OlBlcmNlbnQpCisg ICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogICAgICAgICAvLyBXZSBpbnRlcnByZXQg Y29udmVyc2lvbiBmcm9tIENTU1VuaXRUeXBlOjpDU1NfTlVNQkVSIGluIHRoZSBzYW1lIHdheSBh cyBDU1NQYXJzZXI6OnZhbGlkVW5pdCgpIHdoaWxlIHVzaW5nIG5vbi1zdHJpY3QgbW9kZS4KICAg ICAgICAgc291cmNlVW5pdFR5cGUgPSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KHRhcmdl dENhdGVnb3J5KTsKICAgICAgICAgaWYgKHNvdXJjZVVuaXRUeXBlID09IENTU1VuaXRUeXBlOjpD U1NfVU5LTk9XTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwCmluZGV4IDA3ZTQzYjNmZWUyMi4uNDNh NWUxYzAzMzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5jcHAKQEAgLTE0MSw3ICsxNDEsNyBAQCBD U1NVbml0VHlwZSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KENTU1VuaXRDYXRlZ29yeSBj YXRlZ29yeSkKICAgICBjYXNlIENTU1VuaXRDYXRlZ29yeTo6QWJzb2x1dGVMZW5ndGg6CiAgICAg ICAgIHJldHVybiBDU1NVbml0VHlwZTo6Q1NTX1BYOwogICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5 OjpQZXJjZW50OgotICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19VTktOT1dOOyAvLyBD YW5ub3QgY29udmVydCBiZXR3ZWVuIG51bWJlcnMgYW5kIHBlcmNlbnQuCisgICAgICAgIHJldHVy biBDU1NVbml0VHlwZTo6Q1NTX1BFUkNFTlRBR0U7CiAgICAgY2FzZSBDU1NVbml0Q2F0ZWdvcnk6 OlRpbWU6CiAgICAgICAgIHJldHVybiBDU1NVbml0VHlwZTo6Q1NTX1M7CiAgICAgY2FzZSBDU1NV bml0Q2F0ZWdvcnk6OkFuZ2xlOgpAQCAtMTYxLDYgKzE2MSwxMSBAQCBDU1NVbml0VHlwZSBjYW5v bmljYWxVbml0VHlwZUZvckNhdGVnb3J5KENTU1VuaXRDYXRlZ29yeSBjYXRlZ29yeSkKICAgICBy ZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19VTktOT1dOOwogfQogCitDU1NVbml0VHlwZSBjYW5vbmlj YWxVbml0VHlwZUZvclVuaXRUeXBlKENTU1VuaXRUeXBlIHVuaXRUeXBlKQoreworICAgIHJldHVy biBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KHVuaXRDYXRlZ29yeSh1bml0VHlwZSkpOwor fQorCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBDU1NVbml0Q2F0ZWdv cnkgY2F0ZWdvcnkpCiB7CiAgICAgc3dpdGNoIChjYXRlZ29yeSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMu aAppbmRleCAxNmVkOTY0YTc0NzkuLmQ2ZWRmM2MyYTdjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1VuaXRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmgK QEAgLTE0OSw2ICsxNDksNyBAQCBlbnVtIGNsYXNzIENTU1VuaXRDYXRlZ29yeSA6IHVpbnQ4X3Qg ewogCiBDU1NVbml0Q2F0ZWdvcnkgdW5pdENhdGVnb3J5KENTU1VuaXRUeXBlKTsKIENTU1VuaXRU eXBlIGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkoQ1NTVW5pdENhdGVnb3J5KTsKK0NTU1Vu aXRUeXBlIGNhbm9uaWNhbFVuaXRUeXBlRm9yVW5pdFR5cGUoQ1NTVW5pdFR5cGUpOwogCiBXVEY6 OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFtJiwgQ1NTVW5pdENhdGVnb3J5 KTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBDU1NVbml0 VHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0 aXZlVmFsdWVOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRp dmVWYWx1ZU5vZGUuY3BwCmluZGV4IDg3MDU1OWNiMTJhZC4uOGZiOTBiNzVlM2E1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2Rl LmNwcApAQCAtMTAxLDkgKzEwMSw3IEBAIHZvaWQgQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZTo6 YWRkKGNvbnN0IENTU0NhbGNQcmltaXRpdmVWYWx1ZU5vZGUmIG5vZGUsIFVuaXRDCiAgICAgICAg IG1fdmFsdWUgPSBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKG1fdmFsdWUtPmRvdWJsZVZhbHVl KCkgKyBub2RlLmRvdWJsZVZhbHVlKHZhbHVlVHlwZSksIHZhbHVlVHlwZSk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgVW5pdENvbnZlcnNpb246OkNhbm9uaWNhbGl6ZTogewotICAgICAgICBh dXRvIHZhbHVlQ2F0ZWdvcnkgPSB1bml0Q2F0ZWdvcnkodmFsdWVUeXBlKTsKLSAgICAgICAgLy8g RklYTUU6IEl0J3MgYXdrd2FyZCB0aGF0IGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkoKSBo YXMgc3BlY2lhbCBoYW5kbGluZyBmb3IgQ1NTVW5pdENhdGVnb3J5OjpQZXJjZW50LgotICAgICAg ICBhdXRvIGNhbm9uaWNhbFR5cGUgPSB2YWx1ZUNhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29yeTo6 UGVyY2VudCA/IENTU1VuaXRUeXBlOjpDU1NfUEVSQ0VOVEFHRSA6IGNhbm9uaWNhbFVuaXRUeXBl Rm9yQ2F0ZWdvcnkodmFsdWVDYXRlZ29yeSk7CisgICAgICAgIGF1dG8gY2Fub25pY2FsVHlwZSA9 IGNhbm9uaWNhbFVuaXRUeXBlRm9yVW5pdFR5cGUodmFsdWVUeXBlKTsKICAgICAgICAgQVNTRVJU KGNhbm9uaWNhbFR5cGUgIT0gQ1NTVW5pdFR5cGU6OkNTU19VTktOT1dOKTsKICAgICAgICAgZG91 YmxlIGxlZnRWYWx1ZSA9IG1fdmFsdWUtPmRvdWJsZVZhbHVlKGNhbm9uaWNhbFR5cGUpOwogICAg ICAgICBkb3VibGUgcmlnaHRWYWx1ZSA9IG5vZGUuZG91YmxlVmFsdWUoY2Fub25pY2FsVHlwZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCmlu ZGV4IDdjZGEwMTBlM2JhMy4uYThlMGJmM2NlMDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcApAQCAtNDQxLDEzICs0NDEsMTIgQEAgUmVm UHRyPENTU0N1c3RvbVByb3BlcnR5VmFsdWU+IENTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZVR5cGVk Q3VzdG9tUHJvcGVydHlWYWx1ZSgKICAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFs dWU6OmNyZWF0ZUZvckxlbmd0aFN5bnRheChuYW1lLCBXVEZNb3ZlKGxlbmd0aCkpOwogICAgIH0K ICAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpQZXJjZW50YWdlOgotICAgICAgICBy ZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChuYW1l LCBwcmltaXRpdmVWYWx1ZS0+ZG91YmxlVmFsdWUoKSwgQ1NTVW5pdFR5cGU6OkNTU19QRVJDRU5U QUdFKTsKICAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpJbnRlZ2VyOgotICAgICAg ICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChu YW1lLCBwcmltaXRpdmVWYWx1ZS0+aW50VmFsdWUoKSwgQ1NTVW5pdFR5cGU6OkNTU19JTlRFR0VS KTsKICAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpOdW1iZXI6Ci0gICAgICAgIHJl dHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JOdW1lcmljU3ludGF4KG5hbWUs IHByaW1pdGl2ZVZhbHVlLT5kb3VibGVWYWx1ZSgpLCBDU1NVbml0VHlwZTo6Q1NTX05VTUJFUik7 Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6QW5nbGU6Ci0gICAgICAgIHJldHVy biBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JOdW1lcmljU3ludGF4KG5hbWUsIHBy aW1pdGl2ZVZhbHVlLT5jb21wdXRlRGVncmVlcygpLCBDU1NVbml0VHlwZTo6Q1NTX0RFRyk7Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6QW5nbGU6IHsKKyAgICAgICAgYXV0byBj YW5vbmljYWxVbml0ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZShwcmltaXRpdmVWYWx1 ZS0+cHJpbWl0aXZlVHlwZSgpKTsKKyAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFs dWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwgcHJpbWl0aXZlVmFsdWUtPmRvdWJsZVZh bHVlKGNhbm9uaWNhbFVuaXQpLCBjYW5vbmljYWxVbml0KTsKKyAgICB9CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVN5bnRheDo6VHlwZTo6Q29sb3I6IHsKICAgICAgICAgYXV0byBjb2xvciA9IGJ1aWxk ZXJTdGF0ZS5jb2xvckZyb21QcmltaXRpdmVWYWx1ZSgqcHJpbWl0aXZlVmFsdWUsIFN0eWxlOjpG b3JWaXNpdGVkTGluazo6Tm8pOwogICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1 ZTo6Y3JlYXRlRm9yQ29sb3JTeW50YXgobmFtZSwgY29sb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5jcHAKaW5kZXggMjBhOGM5Zjk5ZDk2Li41YjhlMGQzZjgw OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcApAQCAt MTU2LDE3ICsxNTYsNyBAQCBhdXRvIENTU1VuaXRWYWx1ZTo6dG9TdW1WYWx1ZSgpIGNvbnN0IC0+ IHN0ZDo6b3B0aW9uYWw8U3VtVmFsdWU+CiB7CiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3NzLWhv dWRpbmkub3JnL2Nzcy10eXBlZC1vbS8jY3JlYXRlLWEtc3VtLXZhbHVlCiAgICAgYXV0byBjYW5v bmljYWxVbml0ID0gW10gKENTU1VuaXRUeXBlIHVuaXQpIHsKLSAgICAgICAgLy8gRklYTUU6IFdl IHByb2JhYmx5IHdhbnQgdG8gY2hhbmdlIHRoZSBkZWZpbml0aW9uIG9mIGNhbm9uaWNhbFVuaXRU eXBlRm9yQ2F0ZWdvcnkgc28gdGhpcyBsYW1iZGEgaXNuJ3QgbmVjZXNzYXJ5LgotICAgICAgICBh dXRvIGNhdGVnb3J5ID0gdW5pdENhdGVnb3J5KHVuaXQpOwotICAgICAgICBzd2l0Y2ggKGNhdGVn b3J5KSB7Ci0gICAgICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpQZXJjZW50OgotICAgICAgICAg ICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfUEVSQ0VOVEFHRTsKLSAgICAgICAgY2FzZSBDU1NV bml0Q2F0ZWdvcnk6OkZsZXg6Ci0gICAgICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19G UjsKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAg ICAgIGF1dG8gcmVzdWx0ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeShjYXRlZ29yeSk7 CisgICAgICAgIGF1dG8gcmVzdWx0ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZSh1bml0 KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdCA9PSBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV04gPyB1 bml0IDogcmVzdWx0OwogICAgIH0gKG1fdW5pdCk7CiAgICAgYXV0byBjb252ZXJ0ZWRWYWx1ZSA9 IG1fdmFsdWUgKiBjb252ZXJzaW9uVG9DYW5vbmljYWxVbml0c1NjYWxlRmFjdG9yKHVuaXRFbnVt KCkpIC8gY29udmVyc2lvblRvQ2Fub25pY2FsVW5pdHNTY2FsZUZhY3RvcihjYW5vbmljYWxVbml0 KTsK 464000 2022-12-11 22:18:25 -0800 2022-12-11 23:27:27 -0800 Patch bug-249107-20221212081823.patch text/plain 8818 koivisto RnJvbSBhMDJhN2M0YWYxZDhjYTRhMjViNjBkMDY0OGI1ZThiNDgzNzY5MzZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBTdW4sIDExIERlYyAyMDIyIDIzOjEwOjA3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzaG91bGQgaGFuZGxlIHBlcmNlbnQgY2F0ZWdvcnkKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDkxMDcgcmRhcjovLzEwMzIz MTAyMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpGaXggc29tZSBGSVhNRXMuCgoqIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6CihXZWJDb3JlOjpDU1NQcmlt aXRpdmVWYWx1ZTo6ZG91YmxlVmFsdWVJbnRlcm5hbCBjb25zdCk6CgpIYW5kbGUgdGhlIHBlcmNl bnQgY2FzZSBoZXJlIGluc3RlYWQgb2YgaW4gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeS4K CiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcDoKKFdlYkNvcmU6OmNhbm9uaWNhbFVu aXRUeXBlRm9yQ2F0ZWdvcnkpOgooV2ViQ29yZTo6Y2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlw ZSk6CgpBZGQgYSBzaG9ydGN1dC4KCiogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmg6Ciog U291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHA6CihX ZWJDb3JlOjpDU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlOjphZGQpOgoqIFNvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgooV2ViQ29yZTo6Q1NTUHJvcGVydHlQ YXJzZXI6OnBhcnNlVHlwZWRDdXN0b21Qcm9wZXJ0eVZhbHVlKToKClVzZSBjYW5vbmljYWxVbml0 VHlwZUZvclVuaXRUeXBlLgoKKiBTb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFs dWUuY3BwOgooV2ViQ29yZTo6Q1NTVW5pdFZhbHVlOjp0b1N1bVZhbHVlIGNvbnN0KToKLS0tCiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwICAgICAgICAgICAgIHwgIDYg KysrKysrCiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwICAgICAgICAgICAgICAgICAg ICAgIHwgIDcgKysrKysrLQogU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmggICAgICAgICAg ICAgICAgICAgICAgICB8ICAxICsKIC4uLi9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRp dmVWYWx1ZU5vZGUuY3BwICAgfCAgNCArLS0tCiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1Byb3BlcnR5UGFyc2VyLmNwcCAgICAgIHwgMTEgKysrKy0tLS0tLS0KIFNvdXJjZS9XZWJDb3Jl L2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5jcHAgICAgICAgICAgfCAxMiArLS0tLS0tLS0tLS0K IDYgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKaW5kZXggYTVhMTFjNzVjYzExLi5m ZjE3NDBkMjQ5OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVW YWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcApA QCAtMTE0Nyw2ICsxMTQ3LDkgQEAgc3RkOjpvcHRpb25hbDxkb3VibGU+IENTU1ByaW1pdGl2ZVZh bHVlOjpkb3VibGVWYWx1ZUludGVybmFsKENTU1VuaXRUeXBlIHJlcXVlc3QKICAgICAgICAgcmV0 dXJuIHN0ZDo6bnVsbG9wdDsKIAogICAgIGlmICh0YXJnZXRDYXRlZ29yeSA9PSBDU1NVbml0Q2F0 ZWdvcnk6Ok51bWJlcikgeworICAgICAgICAvLyBDYW5ub3QgY29udmVydCBiZXR3ZWVuIG51bWJl cnMgYW5kIHBlcmNlbnQuCisgICAgICAgIGlmIChzb3VyY2VDYXRlZ29yeSA9PSBDU1NVbml0Q2F0 ZWdvcnk6OlBlcmNlbnQpCisgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogICAgICAg ICAvLyBXZSBpbnRlcnByZXQgY29udmVyc2lvbiB0byBDU1NVbml0VHlwZTo6Q1NTX05VTUJFUiBh cyBjb252ZXJzaW9uIHRvIGEgY2Fub25pY2FsIHVuaXQgaW4gdGhpcyB2YWx1ZSdzIGNhdGVnb3J5 LgogICAgICAgICB0YXJnZXRVbml0VHlwZSA9IGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnko c291cmNlQ2F0ZWdvcnkpOwogICAgICAgICBpZiAodGFyZ2V0VW5pdFR5cGUgPT0gQ1NTVW5pdFR5 cGU6OkNTU19VTktOT1dOKQpAQCAtMTE1NCw2ICsxMTU3LDkgQEAgc3RkOjpvcHRpb25hbDxkb3Vi bGU+IENTU1ByaW1pdGl2ZVZhbHVlOjpkb3VibGVWYWx1ZUludGVybmFsKENTU1VuaXRUeXBlIHJl cXVlc3QKICAgICB9CiAKICAgICBpZiAoc291cmNlVW5pdFR5cGUgPT0gQ1NTVW5pdFR5cGU6OkNT U19OVU1CRVIgfHwgc291cmNlVW5pdFR5cGUgPT0gQ1NTVW5pdFR5cGU6OkNTU19JTlRFR0VSKSB7 CisgICAgICAgIC8vIENhbm5vdCBjb252ZXJ0IGJldHdlZW4gbnVtYmVycyBhbmQgcGVyY2VudC4K KyAgICAgICAgaWYgKHRhcmdldENhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29yeTo6UGVyY2VudCkK KyAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgICAgIC8vIFdlIGludGVycHJl dCBjb252ZXJzaW9uIGZyb20gQ1NTVW5pdFR5cGU6OkNTU19OVU1CRVIgaW4gdGhlIHNhbWUgd2F5 IGFzIENTU1BhcnNlcjo6dmFsaWRVbml0KCkgd2hpbGUgdXNpbmcgbm9uLXN0cmljdCBtb2RlLgog ICAgICAgICBzb3VyY2VVbml0VHlwZSA9IGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkodGFy Z2V0Q2F0ZWdvcnkpOwogICAgICAgICBpZiAoc291cmNlVW5pdFR5cGUgPT0gQ1NTVW5pdFR5cGU6 OkNTU19VTktOT1dOKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5jcHAKaW5kZXggMDdlNDNiM2ZlZTIyLi40 M2E1ZTFjMDMzODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNwcApAQCAtMTQxLDcgKzE0MSw3IEBA IENTU1VuaXRUeXBlIGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkoQ1NTVW5pdENhdGVnb3J5 IGNhdGVnb3J5KQogICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpBYnNvbHV0ZUxlbmd0aDoKICAg ICAgICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfUFg7CiAgICAgY2FzZSBDU1NVbml0Q2F0ZWdv cnk6OlBlcmNlbnQ6Ci0gICAgICAgIHJldHVybiBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV047IC8v IENhbm5vdCBjb252ZXJ0IGJldHdlZW4gbnVtYmVycyBhbmQgcGVyY2VudC4KKyAgICAgICAgcmV0 dXJuIENTU1VuaXRUeXBlOjpDU1NfUEVSQ0VOVEFHRTsKICAgICBjYXNlIENTU1VuaXRDYXRlZ29y eTo6VGltZToKICAgICAgICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfUzsKICAgICBjYXNlIENT U1VuaXRDYXRlZ29yeTo6QW5nbGU6CkBAIC0xNjEsNiArMTYxLDExIEBAIENTU1VuaXRUeXBlIGNh bm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkoQ1NTVW5pdENhdGVnb3J5IGNhdGVnb3J5KQogICAg IHJldHVybiBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV047CiB9CiAKK0NTU1VuaXRUeXBlIGNhbm9u aWNhbFVuaXRUeXBlRm9yVW5pdFR5cGUoQ1NTVW5pdFR5cGUgdW5pdFR5cGUpCit7CisgICAgcmV0 dXJuIGNhbm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkodW5pdENhdGVnb3J5KHVuaXRUeXBlKSk7 Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIENTU1VuaXRDYXRl Z29yeSBjYXRlZ29yeSkKIHsKICAgICBzd2l0Y2ggKGNhdGVnb3J5KSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0 cy5oCmluZGV4IDE2ZWQ5NjRhNzQ3OS4uZDZlZGYzYzJhN2NhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTVW5pdHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMu aApAQCAtMTQ5LDYgKzE0OSw3IEBAIGVudW0gY2xhc3MgQ1NTVW5pdENhdGVnb3J5IDogdWludDhf dCB7CiAKIENTU1VuaXRDYXRlZ29yeSB1bml0Q2F0ZWdvcnkoQ1NTVW5pdFR5cGUpOwogQ1NTVW5p dFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeShDU1NVbml0Q2F0ZWdvcnkpOworQ1NT VW5pdFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZShDU1NVbml0VHlwZSk7CiAKIFdU Rjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBDU1NVbml0Q2F0ZWdv cnkpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIENTU1Vu aXRUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmlt aXRpdmVWYWx1ZU5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1p dGl2ZVZhbHVlTm9kZS5jcHAKaW5kZXggMzVjNjFhNWMzNzE1Li5kNWIxZWRiMGE2ODQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRpdmVWYWx1ZU5vZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRpdmVWYWx1ZU5v ZGUuY3BwCkBAIC0xMDEsOSArMTAxLDcgQEAgdm9pZCBDU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2Rl OjphZGQoY29uc3QgQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZSYgbm9kZSwgVW5pdEMKICAgICAg ICAgbV92YWx1ZSA9IENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUobV92YWx1ZS0+ZG91YmxlVmFs dWUoKSArIG5vZGUuZG91YmxlVmFsdWUodmFsdWVUeXBlKSwgdmFsdWVUeXBlKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBVbml0Q29udmVyc2lvbjo6Q2Fub25pY2FsaXplOiB7Ci0gICAgICAg IGF1dG8gdmFsdWVDYXRlZ29yeSA9IHVuaXRDYXRlZ29yeSh2YWx1ZVR5cGUpOwotICAgICAgICAv LyBGSVhNRTogSXQncyBhd2t3YXJkIHRoYXQgY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSgp IGhhcyBzcGVjaWFsIGhhbmRsaW5nIGZvciBDU1NVbml0Q2F0ZWdvcnk6OlBlcmNlbnQuCi0gICAg ICAgIGF1dG8gY2Fub25pY2FsVHlwZSA9IHZhbHVlQ2F0ZWdvcnkgPT0gQ1NTVW5pdENhdGVnb3J5 OjpQZXJjZW50ID8gQ1NTVW5pdFR5cGU6OkNTU19QRVJDRU5UQUdFIDogY2Fub25pY2FsVW5pdFR5 cGVGb3JDYXRlZ29yeSh2YWx1ZUNhdGVnb3J5KTsKKyAgICAgICAgYXV0byBjYW5vbmljYWxUeXBl ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZSh2YWx1ZVR5cGUpOwogICAgICAgICBBU1NF UlQoY2Fub25pY2FsVHlwZSAhPSBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV04pOwogICAgICAgICBk b3VibGUgbGVmdFZhbHVlID0gbV92YWx1ZS0+ZG91YmxlVmFsdWUoY2Fub25pY2FsVHlwZSk7CiAg ICAgICAgIGRvdWJsZSByaWdodFZhbHVlID0gbm9kZS5kb3VibGVWYWx1ZShjYW5vbmljYWxUeXBl KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJz ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAK aW5kZXggNGUzY2YwNDVlMWE2Li44OWI1YzZlNTQ0NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCkBAIC00NDUsMTcgKzQ0NSwxNCBAQCBS ZWZQdHI8Q1NTQ3VzdG9tUHJvcGVydHlWYWx1ZT4gQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlVHlw ZWRDdXN0b21Qcm9wZXJ0eVZhbHVlKAogICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlW YWx1ZTo6Y3JlYXRlRm9yTGVuZ3RoU3ludGF4KG5hbWUsIFdURk1vdmUobGVuZ3RoKSk7CiAgICAg fQogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6OlBlcmNlbnRhZ2U6Ci0gICAgICAg IHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JOdW1lcmljU3ludGF4KG5h bWUsIHByaW1pdGl2ZVZhbHVlLT5kb3VibGVWYWx1ZSgpLCBDU1NVbml0VHlwZTo6Q1NTX1BFUkNF TlRBR0UpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6OkludGVnZXI6Ci0gICAg ICAgIHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JOdW1lcmljU3ludGF4 KG5hbWUsIHByaW1pdGl2ZVZhbHVlLT5pbnRWYWx1ZSgpLCBDU1NVbml0VHlwZTo6Q1NTX0lOVEVH RVIpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6Ok51bWJlcjoKLSAgICAgICAg cmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFt ZSwgcHJpbWl0aXZlVmFsdWUtPmRvdWJsZVZhbHVlKCksIENTU1VuaXRUeXBlOjpDU1NfTlVNQkVS KTsKICAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpBbmdsZToKLSAgICAgICAgcmV0 dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwg cHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVEZWdyZWVzKCksIENTU1VuaXRUeXBlOjpDU1NfREVHKTsK ICAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpUaW1lOgotICAgICAgICByZXR1cm4g Q1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5bnRheChuYW1lLCBwcmlt aXRpdmVWYWx1ZS0+ZG91YmxlVmFsdWUoQ1NTVW5pdFR5cGU6OkNTU19TKSwgQ1NTVW5pdFR5cGU6 OkNTU19TKTsKLSAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4OjpUeXBlOjpSZXNvbHV0aW9uOgot ICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRlRm9yTnVtZXJpY1N5 bnRheChuYW1lLCBwcmltaXRpdmVWYWx1ZS0+ZG91YmxlVmFsdWUoQ1NTVW5pdFR5cGU6OkNTU19E UFBYKSwgQ1NTVW5pdFR5cGU6OkNTU19EUFBYKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5U3ludGF4 OjpUeXBlOjpSZXNvbHV0aW9uOiB7CisgICAgICAgIGF1dG8gY2Fub25pY2FsVW5pdCA9IGNhbm9u aWNhbFVuaXRUeXBlRm9yVW5pdFR5cGUocHJpbWl0aXZlVmFsdWUtPnByaW1pdGl2ZVR5cGUoKSk7 CisgICAgICAgIHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JOdW1lcmlj U3ludGF4KG5hbWUsIHByaW1pdGl2ZVZhbHVlLT5kb3VibGVWYWx1ZShjYW5vbmljYWxVbml0KSwg Y2Fub25pY2FsVW5pdCk7CisgICAgfQogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6 OkNvbG9yOiB7CiAgICAgICAgIGF1dG8gY29sb3IgPSBidWlsZGVyU3RhdGUuY29sb3JGcm9tUHJp bWl0aXZlVmFsdWUoKnByaW1pdGl2ZVZhbHVlLCBTdHlsZTo6Rm9yVmlzaXRlZExpbms6Ok5vKTsK ICAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNyZWF0ZUZvckNvbG9yU3lu dGF4KG5hbWUsIGNvbG9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy90eXBlZG9t L0NTU1VuaXRWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFs dWUuY3BwCmluZGV4IDIwYThjOWY5OWQ5Ni4uNWI4ZTBkM2Y4MDkyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9DU1NVbml0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5jcHAKQEAgLTE1NiwxNyArMTU2LDcgQEAgYXV0 byBDU1NVbml0VmFsdWU6OnRvU3VtVmFsdWUoKSBjb25zdCAtPiBzdGQ6Om9wdGlvbmFsPFN1bVZh bHVlPgogewogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzcy1ob3VkaW5pLm9yZy9jc3MtdHlwZWQt b20vI2NyZWF0ZS1hLXN1bS12YWx1ZQogICAgIGF1dG8gY2Fub25pY2FsVW5pdCA9IFtdIChDU1NV bml0VHlwZSB1bml0KSB7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBwcm9iYWJseSB3YW50IHRvIGNo YW5nZSB0aGUgZGVmaW5pdGlvbiBvZiBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5IHNvIHRo aXMgbGFtYmRhIGlzbid0IG5lY2Vzc2FyeS4KLSAgICAgICAgYXV0byBjYXRlZ29yeSA9IHVuaXRD YXRlZ29yeSh1bml0KTsKLSAgICAgICAgc3dpdGNoIChjYXRlZ29yeSkgewotICAgICAgICBjYXNl IENTU1VuaXRDYXRlZ29yeTo6UGVyY2VudDoKLSAgICAgICAgICAgIHJldHVybiBDU1NVbml0VHlw ZTo6Q1NTX1BFUkNFTlRBR0U7Ci0gICAgICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpGbGV4Ogot ICAgICAgICAgICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfRlI7Ci0gICAgICAgIGRlZmF1bHQ6 Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgICAgICBhdXRvIHJlc3VsdCA9IGNh bm9uaWNhbFVuaXRUeXBlRm9yQ2F0ZWdvcnkoY2F0ZWdvcnkpOworICAgICAgICBhdXRvIHJlc3Vs dCA9IGNhbm9uaWNhbFVuaXRUeXBlRm9yVW5pdFR5cGUodW5pdCk7CiAgICAgICAgIHJldHVybiBy ZXN1bHQgPT0gQ1NTVW5pdFR5cGU6OkNTU19VTktOT1dOID8gdW5pdCA6IHJlc3VsdDsKICAgICB9 IChtX3VuaXQpOwogICAgIGF1dG8gY29udmVydGVkVmFsdWUgPSBtX3ZhbHVlICogY29udmVyc2lv blRvQ2Fub25pY2FsVW5pdHNTY2FsZUZhY3Rvcih1bml0RW51bSgpKSAvIGNvbnZlcnNpb25Ub0Nh bm9uaWNhbFVuaXRzU2NhbGVGYWN0b3IoY2Fub25pY2FsVW5pdCk7Cg== 464002 2022-12-11 23:27:31 -0800 2022-12-12 00:31:49 -0800 Patch for landing bug-249107-20221212092730.patch text/plain 8997 koivisto RnJvbSBkMGRmNWFjOGFlZTFjNGRkZjU3YWRiOWI1ZjdiZDcyNjc4NDRmMGNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBTdW4sIDExIERlYyAyMDIyIDIzOjEwOjA3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzaG91bGQgaGFuZGxlIHBlcmNlbnQgY2F0ZWdvcnkKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDkxMDcgcmRhcjovLzEwMzIz MTAyMAoKUmV2aWV3ZWQgYnkgVGltIE5ndXllbi4KCkZpeCBzb21lIEZJWE1Fcy4KCiogU291cmNl L1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcDoKKFdlYkNvcmU6OkNTU1ByaW1pdGl2 ZVZhbHVlOjpkb3VibGVWYWx1ZUludGVybmFsIGNvbnN0KToKCkhhbmRsZSB0aGUgcGVyY2VudCBj YXNlIGhlcmUgaW5zdGVhZCBvZiBpbiBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5LgoKKiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwOgooV2ViQ29yZTo6Y2Fub25pY2FsVW5pdFR5 cGVGb3JDYXRlZ29yeSk6CihXZWJDb3JlOjpjYW5vbmljYWxVbml0VHlwZUZvclVuaXRUeXBlKToK CkFkZCBhIHNob3J0Y3V0LgoKKiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuaDoKKiBTb3Vy Y2UvV2ViQ29yZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlLmNwcDoKKFdlYkNv cmU6OkNTU0NhbGNQcmltaXRpdmVWYWx1ZU5vZGU6OmFkZCk6CiogU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHA6CihXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNl cjo6cGFyc2VUeXBlZEN1c3RvbVByb3BlcnR5VmFsdWUpOgoKVXNlIGNhbm9uaWNhbFVuaXRUeXBl Rm9yVW5pdFR5cGUuCgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5j cHA6CihXZWJDb3JlOjpDU1NVbml0VmFsdWU6OnRvU3VtVmFsdWUgY29uc3QpOgotLS0KIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgICAgICAgfCAgNiArKysrKysKIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5jcHAgICAgICAgICAgICAgICAgfCAgNyArKysrKyst CiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMuaCAgICAgICAgICAgICAgICAgIHwgIDEgKwog Li4uL2Nzcy9jYWxjL0NTU0NhbGNQcmltaXRpdmVWYWx1ZU5vZGUuY3BwICAgICB8ICA0ICstLS0K IC4uLi9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwICAgfCAxMSArKysr LS0tLS0tLQogU291cmNlL1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcCAgICB8 IDE4ICsrKystLS0tLS0tLS0tLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp LCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJp bWl0aXZlVmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNw cAppbmRleCBhNWExMWM3NWNjMTEuLmZmMTc0MGQyNDk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJpbWl0aXZlVmFsdWUuY3BwCkBAIC0xMTQ3LDYgKzExNDcsOSBAQCBzdGQ6Om9wdGlvbmFs PGRvdWJsZT4gQ1NTUHJpbWl0aXZlVmFsdWU6OmRvdWJsZVZhbHVlSW50ZXJuYWwoQ1NTVW5pdFR5 cGUgcmVxdWVzdAogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCiAgICAgaWYgKHRhcmdl dENhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29yeTo6TnVtYmVyKSB7CisgICAgICAgIC8vIENhbm5v dCBjb252ZXJ0IGJldHdlZW4gbnVtYmVycyBhbmQgcGVyY2VudC4KKyAgICAgICAgaWYgKHNvdXJj ZUNhdGVnb3J5ID09IENTU1VuaXRDYXRlZ29yeTo6UGVyY2VudCkKKyAgICAgICAgICAgIHJldHVy biBzdGQ6Om51bGxvcHQ7CiAgICAgICAgIC8vIFdlIGludGVycHJldCBjb252ZXJzaW9uIHRvIENT U1VuaXRUeXBlOjpDU1NfTlVNQkVSIGFzIGNvbnZlcnNpb24gdG8gYSBjYW5vbmljYWwgdW5pdCBp biB0aGlzIHZhbHVlJ3MgY2F0ZWdvcnkuCiAgICAgICAgIHRhcmdldFVuaXRUeXBlID0gY2Fub25p Y2FsVW5pdFR5cGVGb3JDYXRlZ29yeShzb3VyY2VDYXRlZ29yeSk7CiAgICAgICAgIGlmICh0YXJn ZXRVbml0VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV04pCkBAIC0xMTU0LDYgKzExNTcs OSBAQCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gQ1NTUHJpbWl0aXZlVmFsdWU6OmRvdWJsZVZhbHVl SW50ZXJuYWwoQ1NTVW5pdFR5cGUgcmVxdWVzdAogICAgIH0KIAogICAgIGlmIChzb3VyY2VVbml0 VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NTX05VTUJFUiB8fCBzb3VyY2VVbml0VHlwZSA9PSBDU1NV bml0VHlwZTo6Q1NTX0lOVEVHRVIpIHsKKyAgICAgICAgLy8gQ2Fubm90IGNvbnZlcnQgYmV0d2Vl biBudW1iZXJzIGFuZCBwZXJjZW50LgorICAgICAgICBpZiAodGFyZ2V0Q2F0ZWdvcnkgPT0gQ1NT VW5pdENhdGVnb3J5OjpQZXJjZW50KQorICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsK ICAgICAgICAgLy8gV2UgaW50ZXJwcmV0IGNvbnZlcnNpb24gZnJvbSBDU1NVbml0VHlwZTo6Q1NT X05VTUJFUiBpbiB0aGUgc2FtZSB3YXkgYXMgQ1NTUGFyc2VyOjp2YWxpZFVuaXQoKSB3aGlsZSB1 c2luZyBub24tc3RyaWN0IG1vZGUuCiAgICAgICAgIHNvdXJjZVVuaXRUeXBlID0gY2Fub25pY2Fs VW5pdFR5cGVGb3JDYXRlZ29yeSh0YXJnZXRDYXRlZ29yeSk7CiAgICAgICAgIGlmIChzb3VyY2VV bml0VHlwZSA9PSBDU1NVbml0VHlwZTo6Q1NTX1VOS05PV04pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTVW5pdHMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmNw cAppbmRleCAwN2U0M2IzZmVlMjIuLjQzYTVlMWMwMzM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1VuaXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVW5pdHMu Y3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgQ1NTVW5pdFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JD YXRlZ29yeShDU1NVbml0Q2F0ZWdvcnkgY2F0ZWdvcnkpCiAgICAgY2FzZSBDU1NVbml0Q2F0ZWdv cnk6OkFic29sdXRlTGVuZ3RoOgogICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19QWDsK ICAgICBjYXNlIENTU1VuaXRDYXRlZ29yeTo6UGVyY2VudDoKLSAgICAgICAgcmV0dXJuIENTU1Vu aXRUeXBlOjpDU1NfVU5LTk9XTjsgLy8gQ2Fubm90IGNvbnZlcnQgYmV0d2VlbiBudW1iZXJzIGFu ZCBwZXJjZW50LgorICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19QRVJDRU5UQUdFOwog ICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpUaW1lOgogICAgICAgICByZXR1cm4gQ1NTVW5pdFR5 cGU6OkNTU19TOwogICAgIGNhc2UgQ1NTVW5pdENhdGVnb3J5OjpBbmdsZToKQEAgLTE2MSw2ICsx NjEsMTEgQEAgQ1NTVW5pdFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeShDU1NVbml0 Q2F0ZWdvcnkgY2F0ZWdvcnkpCiAgICAgcmV0dXJuIENTU1VuaXRUeXBlOjpDU1NfVU5LTk9XTjsK IH0KIAorQ1NTVW5pdFR5cGUgY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZShDU1NVbml0VHlw ZSB1bml0VHlwZSkKK3sKKyAgICByZXR1cm4gY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSh1 bml0Q2F0ZWdvcnkodW5pdFR5cGUpKTsKK30KKwogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0 U3RyZWFtJiB0cywgQ1NTVW5pdENhdGVnb3J5IGNhdGVnb3J5KQogewogICAgIHN3aXRjaCAoY2F0 ZWdvcnkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5oIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1VuaXRzLmgKaW5kZXggMTZlZDk2NGE3NDc5Li5kNmVkZjNjMmE3 Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NVbml0cy5oCkBAIC0xNDksNiArMTQ5LDcgQEAgZW51bSBjbGFzcyBD U1NVbml0Q2F0ZWdvcnkgOiB1aW50OF90IHsKIAogQ1NTVW5pdENhdGVnb3J5IHVuaXRDYXRlZ29y eShDU1NVbml0VHlwZSk7CiBDU1NVbml0VHlwZSBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5 KENTU1VuaXRDYXRlZ29yeSk7CitDU1NVbml0VHlwZSBjYW5vbmljYWxVbml0VHlwZUZvclVuaXRU eXBlKENTU1VuaXRUeXBlKTsKIAogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4 dFN0cmVhbSYsIENTU1VuaXRDYXRlZ29yeSk7CiBXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwo V1RGOjpUZXh0U3RyZWFtJiwgQ1NTVW5pdFR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL2NhbGMvQ1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvY2FsYy9DU1NDYWxjUHJpbWl0aXZlVmFsdWVOb2RlLmNwcAppbmRleCAzNWM2MWE1YzM3 MTUuLmQ1YjFlZGIwYTY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMvQ1NT Q2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL2NhbGMv Q1NTQ2FsY1ByaW1pdGl2ZVZhbHVlTm9kZS5jcHAKQEAgLTEwMSw5ICsxMDEsNyBAQCB2b2lkIENT U0NhbGNQcmltaXRpdmVWYWx1ZU5vZGU6OmFkZChjb25zdCBDU1NDYWxjUHJpbWl0aXZlVmFsdWVO b2RlJiBub2RlLCBVbml0QwogICAgICAgICBtX3ZhbHVlID0gQ1NTUHJpbWl0aXZlVmFsdWU6OmNy ZWF0ZShtX3ZhbHVlLT5kb3VibGVWYWx1ZSgpICsgbm9kZS5kb3VibGVWYWx1ZSh2YWx1ZVR5cGUp LCB2YWx1ZVR5cGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFVuaXRDb252ZXJzaW9uOjpD YW5vbmljYWxpemU6IHsKLSAgICAgICAgYXV0byB2YWx1ZUNhdGVnb3J5ID0gdW5pdENhdGVnb3J5 KHZhbHVlVHlwZSk7Ci0gICAgICAgIC8vIEZJWE1FOiBJdCdzIGF3a3dhcmQgdGhhdCBjYW5vbmlj YWxVbml0VHlwZUZvckNhdGVnb3J5KCkgaGFzIHNwZWNpYWwgaGFuZGxpbmcgZm9yIENTU1VuaXRD YXRlZ29yeTo6UGVyY2VudC4KLSAgICAgICAgYXV0byBjYW5vbmljYWxUeXBlID0gdmFsdWVDYXRl Z29yeSA9PSBDU1NVbml0Q2F0ZWdvcnk6OlBlcmNlbnQgPyBDU1NVbml0VHlwZTo6Q1NTX1BFUkNF TlRBR0UgOiBjYW5vbmljYWxVbml0VHlwZUZvckNhdGVnb3J5KHZhbHVlQ2F0ZWdvcnkpOworICAg ICAgICBhdXRvIGNhbm9uaWNhbFR5cGUgPSBjYW5vbmljYWxVbml0VHlwZUZvclVuaXRUeXBlKHZh bHVlVHlwZSk7CiAgICAgICAgIEFTU0VSVChjYW5vbmljYWxUeXBlICE9IENTU1VuaXRUeXBlOjpD U1NfVU5LTk9XTik7CiAgICAgICAgIGRvdWJsZSBsZWZ0VmFsdWUgPSBtX3ZhbHVlLT5kb3VibGVW YWx1ZShjYW5vbmljYWxUeXBlKTsKICAgICAgICAgZG91YmxlIHJpZ2h0VmFsdWUgPSBub2RlLmRv dWJsZVZhbHVlKGNhbm9uaWNhbFR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2Vy L0NTU1Byb3BlcnR5UGFyc2VyLmNwcAppbmRleCA0ZTNjZjA0NWUxYTYuLjg5YjVjNmU1NDQ3NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAK QEAgLTQ0NSwxNyArNDQ1LDE0IEBAIFJlZlB0cjxDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlPiBDU1NQ cm9wZXJ0eVBhcnNlcjo6cGFyc2VUeXBlZEN1c3RvbVByb3BlcnR5VmFsdWUoCiAgICAgICAgIHJl dHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JMZW5ndGhTeW50YXgobmFtZSwg V1RGTW92ZShsZW5ndGgpKTsKICAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6VHlw ZTo6UGVyY2VudGFnZToKLSAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6OmNy ZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwgcHJpbWl0aXZlVmFsdWUtPmRvdWJsZVZhbHVlKCks IENTU1VuaXRUeXBlOjpDU1NfUEVSQ0VOVEFHRSk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRh eDo6VHlwZTo6SW50ZWdlcjoKLSAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5VmFsdWU6 OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwgcHJpbWl0aXZlVmFsdWUtPmludFZhbHVlKCks IENTU1VuaXRUeXBlOjpDU1NfSU5URUdFUik7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVN5bnRheDo6 VHlwZTo6TnVtYmVyOgotICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3Jl YXRlRm9yTnVtZXJpY1N5bnRheChuYW1lLCBwcmltaXRpdmVWYWx1ZS0+ZG91YmxlVmFsdWUoKSwg Q1NTVW5pdFR5cGU6OkNTU19OVU1CRVIpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5 cGU6OkFuZ2xlOgotICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZTo6Y3JlYXRl Rm9yTnVtZXJpY1N5bnRheChuYW1lLCBwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZURlZ3JlZXMoKSwg Q1NTVW5pdFR5cGU6OkNTU19ERUcpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6 OlRpbWU6Ci0gICAgICAgIHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZhbHVlOjpjcmVhdGVGb3JO dW1lcmljU3ludGF4KG5hbWUsIHByaW1pdGl2ZVZhbHVlLT5kb3VibGVWYWx1ZShDU1NVbml0VHlw ZTo6Q1NTX1MpLCBDU1NVbml0VHlwZTo6Q1NTX1MpOwotICAgIGNhc2UgQ1NTUHJvcGVydHlTeW50 YXg6OlR5cGU6OlJlc29sdXRpb246Ci0gICAgICAgIHJldHVybiBDU1NDdXN0b21Qcm9wZXJ0eVZh bHVlOjpjcmVhdGVGb3JOdW1lcmljU3ludGF4KG5hbWUsIHByaW1pdGl2ZVZhbHVlLT5kb3VibGVW YWx1ZShDU1NVbml0VHlwZTo6Q1NTX0RQUFgpLCBDU1NVbml0VHlwZTo6Q1NTX0RQUFgpOworICAg IGNhc2UgQ1NTUHJvcGVydHlTeW50YXg6OlR5cGU6OlJlc29sdXRpb246IHsKKyAgICAgICAgYXV0 byBjYW5vbmljYWxVbml0ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZShwcmltaXRpdmVW YWx1ZS0+cHJpbWl0aXZlVHlwZSgpKTsKKyAgICAgICAgcmV0dXJuIENTU0N1c3RvbVByb3BlcnR5 VmFsdWU6OmNyZWF0ZUZvck51bWVyaWNTeW50YXgobmFtZSwgcHJpbWl0aXZlVmFsdWUtPmRvdWJs ZVZhbHVlKGNhbm9uaWNhbFVuaXQpLCBjYW5vbmljYWxVbml0KTsKKyAgICB9CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVN5bnRheDo6VHlwZTo6Q29sb3I6IHsKICAgICAgICAgYXV0byBjb2xvciA9IGJ1 aWxkZXJTdGF0ZS5jb2xvckZyb21QcmltaXRpdmVWYWx1ZSgqcHJpbWl0aXZlVmFsdWUsIFN0eWxl OjpGb3JWaXNpdGVkTGluazo6Tm8pOwogICAgICAgICByZXR1cm4gQ1NTQ3VzdG9tUHJvcGVydHlW YWx1ZTo6Y3JlYXRlRm9yQ29sb3JTeW50YXgobmFtZSwgY29sb3IpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1ZS5jcHAKaW5kZXggMjBhOGM5Zjk5ZDk2Li42NTNiMjg2 ZWY2MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy90eXBlZG9tL0NTU1VuaXRWYWx1 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3R5cGVkb20vQ1NTVW5pdFZhbHVlLmNwcApA QCAtMTU1LDIwICsxNTUsMTAgQEAgUmVmUHRyPENTU1VuaXRWYWx1ZT4gQ1NTVW5pdFZhbHVlOjpj b252ZXJ0VG8oQ1NTVW5pdFR5cGUgdW5pdCkgY29uc3QKIGF1dG8gQ1NTVW5pdFZhbHVlOjp0b1N1 bVZhbHVlKCkgY29uc3QgLT4gc3RkOjpvcHRpb25hbDxTdW1WYWx1ZT4KIHsKICAgICAvLyBodHRw czovL2RyYWZ0cy5jc3MtaG91ZGluaS5vcmcvY3NzLXR5cGVkLW9tLyNjcmVhdGUtYS1zdW0tdmFs dWUKLSAgICBhdXRvIGNhbm9uaWNhbFVuaXQgPSBbXSAoQ1NTVW5pdFR5cGUgdW5pdCkgewotICAg ICAgICAvLyBGSVhNRTogV2UgcHJvYmFibHkgd2FudCB0byBjaGFuZ2UgdGhlIGRlZmluaXRpb24g b2YgY2Fub25pY2FsVW5pdFR5cGVGb3JDYXRlZ29yeSBzbyB0aGlzIGxhbWJkYSBpc24ndCBuZWNl c3NhcnkuCi0gICAgICAgIGF1dG8gY2F0ZWdvcnkgPSB1bml0Q2F0ZWdvcnkodW5pdCk7Ci0gICAg ICAgIHN3aXRjaCAoY2F0ZWdvcnkpIHsKLSAgICAgICAgY2FzZSBDU1NVbml0Q2F0ZWdvcnk6OlBl cmNlbnQ6Ci0gICAgICAgICAgICByZXR1cm4gQ1NTVW5pdFR5cGU6OkNTU19QRVJDRU5UQUdFOwot ICAgICAgICBjYXNlIENTU1VuaXRDYXRlZ29yeTo6RmxleDoKLSAgICAgICAgICAgIHJldHVybiBD U1NVbml0VHlwZTo6Q1NTX0ZSOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgIH0KLSAgICAgICAgYXV0byByZXN1bHQgPSBjYW5vbmljYWxVbml0VHlwZUZvckNh dGVnb3J5KGNhdGVnb3J5KTsKLSAgICAgICAgcmV0dXJuIHJlc3VsdCA9PSBDU1NVbml0VHlwZTo6 Q1NTX1VOS05PV04gPyB1bml0IDogcmVzdWx0OwotICAgIH0gKG1fdW5pdCk7CisgICAgYXV0byBj YW5vbmljYWxVbml0ID0gY2Fub25pY2FsVW5pdFR5cGVGb3JVbml0VHlwZShtX3VuaXQpOworICAg IGlmIChjYW5vbmljYWxVbml0ID09IENTU1VuaXRUeXBlOjpDU1NfVU5LTk9XTikKKyAgICAgICAg Y2Fub25pY2FsVW5pdCA9IG1fdW5pdDsKKyAgICAKICAgICBhdXRvIGNvbnZlcnRlZFZhbHVlID0g bV92YWx1ZSAqIGNvbnZlcnNpb25Ub0Nhbm9uaWNhbFVuaXRzU2NhbGVGYWN0b3IodW5pdEVudW0o KSkgLyBjb252ZXJzaW9uVG9DYW5vbmljYWxVbml0c1NjYWxlRmFjdG9yKGNhbm9uaWNhbFVuaXQp OwogCiAgICAgaWYgKG1fdW5pdCA9PSBDU1NVbml0VHlwZTo6Q1NTX05VTUJFUikK