227573 2021-07-01 01:16:19 -0700 [CSS-grid] Ignore the aspect-ratio of a replaced element if stretch alignments are applied to both axes 2021-07-19 01:39:10 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zsun zsun changseok esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan obrufau pdr rbuis rego svillar webkit-bug-importer oldest_to_newest 1774032 0 zsun 2021-07-01 01:16:19 -0700 Affected tests - imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html 1774045 1 432671 zsun 2021-07-01 02:39:35 -0700 Created attachment 432671 Patch 1774099 2 obrufau 2021-07-01 07:02:43 -0700 Informal LGTM. 1774798 3 432671 jfernandez 2021-07-05 06:42:39 -0700 Comment on attachment 432671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432671&action=review > Source/WebCore/ChangeLog:12 > + This CL only fixed the case when both axes have stretch alignments applied and there is no auto margin(s) Perhaps it'd be better to add our own description of the change. > Source/WebCore/rendering/RenderBox.cpp:2635 > + } else if (shouldComputeLogicalWidthFromAspectRatio() && style().logicalWidth().isAuto() && (!isGridItem() || !hasStretchedLogicalWidth() || !hasStretchedLogicalHeight())) { I'm not sure this is the right approach. I know in Chromium there are these clauses as well to added the case of grid items with stretched size in any size to the ones that should ignore aspect ratio. However, in Chromium we also tried to do it in shouldComputeLogicalWidthFromAspectRatio, which is called in other functions of this class and seems a more appropriated candidate for this logic. Had you consider that approach already ? 1774937 4 432925 zsun 2021-07-06 07:25:12 -0700 Created attachment 432925 Patch 1774943 5 432930 zsun 2021-07-06 07:54:32 -0700 Created attachment 432930 Patch 1775489 6 432930 jfernandez 2021-07-07 15:31:13 -0700 Comment on attachment 432930 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432930&action=review > Source/WebCore/rendering/RenderBox.cpp:2609 > + treatAsReplaced = treatAsReplaced && (!isGridItem() || (!hasStretchedLogicalWidth() && !shouldComputeLogicalWidthFromAspectRatio())); I still have doubts about this change; sorry, because I suggested this approach in my last review, but I think we need to study it a bit more before we can land it. First of all, aren't hasStretchedLogicalWidth and shouldComputeLogicalWidthFromAspectRatio clauses redundant ? I mean, inside the second one, we are already checking out whether we are using 'stretch' as the value for the justify-self property. As a matter of fact, the current implementation of shouldComputeLogicalWidthFromAspectRatio regarding how we are checking the justify-self property for 'stretch' is not totally correct. We should also consider the case of justify-items: stretch | normal in the containing block, when this RenderBox instance's justify-self property has 'auto' for its value. This is precisely why hasStretchedLogicalWidth() uses style.resolvedJustifySelf to determine whether the size is being stretched or not. Finally, and this is why I asked sorry in the first place, I think we are mixing now the concepts of 'treatAsReplaced' vs 'compute-size-from-aspect-ratio'. I assumed in my last review that they were equivalent, but looking a the code (some lines after this) it seems we have different branches for these 2 concepts. > Source/WebCore/rendering/RenderGrid.cpp:1870 > + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().alignSelf().position() != ItemPosition::Stretch) { I think we should use resolveAlingSelf instead (as I commented before) > Source/WebCore/rendering/RenderGrid.cpp:1874 > + } else if (child.style().justifySelf().position() != ItemPosition::Stretch) { I think we should use resolveJustifySelf instead. > Source/WebCore/rendering/RenderGrid.cpp:1886 > + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().justifySelf().position() != ItemPosition::Stretch) { ditto > Source/WebCore/rendering/RenderGrid.cpp:1891 > + } else if (child.style().alignSelf().position() != ItemPosition::Stretch) { ditto 1775637 7 webkit-bug-importer 2021-07-08 01:17:17 -0700 <rdar://problem/80311333> 1775658 8 433129 zsun 2021-07-08 06:23:07 -0700 Created attachment 433129 Patch 1777177 9 433576 zsun 2021-07-15 05:28:17 -0700 Created attachment 433576 Patch 1777703 10 433576 jfernandez 2021-07-17 02:57:46 -0700 Comment on attachment 433576 Patch r=me 1777829 11 ews-feeder 2021-07-19 01:39:08 -0700 Committed r280022 (239764@main): <https://commits.webkit.org/239764@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433576. 432671 2021-07-01 02:39:35 -0700 2021-07-06 07:25:08 -0700 Patch bug-227573-20210701103934.patch text/plain 6419 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc5YmI2ZjhkMTQ3ZDRl MWY2ZWUwNjg3NTdiZjRkZTNjOTllNmVkOC4uYzBmYTk0NzRiNjgzMGI3YzQ2ZjA0YmZmNzg2YjM4 Y2YzNDdmMTg5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA3LTAxICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBJZ25vcmVkIHRo ZSBhc3BlY3QtcmF0aW8gb2YgYSByZXBsYWNlZCBlbGVtZW50IGlmIHN0cmV0Y2ggYWxpZ25tZW50 IGlzIGFwcGxpZWQgdG8gYm90aCBheGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjc1NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBcyBkaXNjdXNzZWQgaW4gaHR0cHM6Ly9naXRodWIuY29tL3czYy9j c3N3Zy1kcmFmdHMvaXNzdWVzLzU3MTMKKworICAgICAgICBJdCBpcyBhbiBpbXBvcnQgb2YgQ2hy b21pdW0gQ0wgYXQKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1bS1yZXZpZXcuZ29vZ2xlc291cmNl LmNvbS9jL2Nocm9taXVtL3NyYy8rLzI2NTE2NTEKKyAgICAgICAgVGhpcyBDTCBvbmx5IGZpeGVk IHRoZSBjYXNlIHdoZW4gYm90aCBheGVzIGhhdmUgc3RyZXRjaCBhbGlnbm1lbnRzIGFwcGxpZWQg YW5kIHRoZXJlIGlzIG5vIGF1dG8gbWFyZ2luKHMpCisgICAgICAgIHByZXNlbnRlZC4gT3RoZXIg dGVzdCBjYXNlcyBpbmNsdWRlZCBpbiB0aGlzIENocm9taXVtIENMIHdpbGwgYmUgYWRkcmVzc2Vk IGluIGRpZmZlcmVudCBXZWJLaXQgYnVncy4KKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsV2lkdGhJbkZyYWdtZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 aGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5oOgorCiAyMDIxLTA2LTMwICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFBDTTogQ2hhbmdlIGltcG9ydCBmcm9tIENyeXB0b0tpdENCcmlkZ2lu ZyB0byBDcnlwdG9LaXRQcml2YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IGNhNWE2YzMzNDg4OTkyYWRkNDYyMTBjN2ZhNzFiOThiMDY3ZDNkODcuLmE5MzVhMWJh ZDMxZWEyMzRhOTFmNDE4MGZlOTQ5NWJlYjY1ZTU4ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCkBAIC0yNjMyLDcgKzI2MzIsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29t cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBj b21wdQogICAgIC8vIFdpZHRoIGNhbGN1bGF0aW9ucwogICAgIGlmICh0cmVhdEFzUmVwbGFjZWQp IHsKICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBsb2dpY2FsV2lkdGhMZW5ndGgu dmFsdWUoKSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKLSAgICB9IGVsc2UgaWYg KHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSAmJiBzdHlsZSgpLmxv Z2ljYWxXaWR0aCgpLmlzQXV0bygpKSB7CisgICAgfSBlbHNlIGlmIChzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1 dG8oKSAmJiAoIWlzR3JpZEl0ZW0oKSB8fCAhaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgfHwg IWhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkpIHsKICAgICAgICAgY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQgPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKGZyYWdtZW50KTsK ICAgICB9IGVsc2UgewogICAgICAgICBMYXlvdXRVbml0IHByZWZlcnJlZFdpZHRoID0gY29tcHV0 ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNYWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZVRv VXNlLmxvZ2ljYWxXaWR0aCgpLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCBjYiwg ZnJhZ21lbnQpOwpAQCAtMjc3OCw2ICsyNzc4LDIzIEBAIGJvb2wgUmVuZGVyQm94OjpoYXNTdHJl dGNoZWRMb2dpY2FsV2lkdGgoKSBjb25zdAogICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3Rp ZnlTZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+c2VsZkFs aWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6 U3RyZXRjaDsKIH0KIAorLy8gRklYTUU6IENhbi9TaG91bGQgd2UgbW92ZSB0aGlzIGluc2lkZSBz cGVjaWZpYyBsYXlvdXQgY2xhc3NlcyAoZmxleC4gZ3JpZCk/IENhbiB3ZSByZWZhY3RvciBjb2x1 bW5GbGV4SXRlbUhhc1N0cmV0Y2hBbGlnbm1lbnQgbG9naWM/Citib29sIFJlbmRlckJveDo6aGFz U3RyZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0Cit7CisgICAgYXV0byYgc3R5bGUgPSB0aGlz LT5zdHlsZSgpOworICAgIGlmICghc3R5bGUubG9naWNhbEhlaWdodCgpLmlzQXV0bygpIHx8IHN0 eWxlLm1hcmdpbkJlZm9yZSgpLmlzQXV0bygpIHx8IHN0eWxlLm1hcmdpbkFmdGVyKCkuaXNBdXRv KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBSZW5kZXJCbG9jayogY29udGFpbmluZ0Js b2NrID0gdGhpcy0+Y29udGFpbmluZ0Jsb2NrKCk7CisgICAgaWYgKCFjb250YWluaW5nQmxvY2sp IHsKKyAgICAgICAgLy8gV2UgYXJlIGV2YWx1YXRpbmcgYWxpZ24tc2VsZi9qdXN0aWZ5LXNlbGYs IHdoaWNoIGRlZmF1bHQgdG8gJ25vcm1hbCcgZm9yIHRoZSByb290IGVsZW1lbnQuCisgICAgICAg IC8vIFRoZSAnbm9ybWFsJyB2YWx1ZSBiZWhhdmVzIGxpa2UgJ3N0YXJ0JyBleGNlcHQgZm9yIEZs ZXhib3ggSXRlbXMsIHdoaWNoIG9idmlvdXNseSBzaG91bGQgaGF2ZSBhIGNvbnRhaW5lci4KKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5pc0hv cml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAg ICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3RpZnlTZWxmKCZjb250YWluaW5nQmxvY2stPnN0 eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+c2VsZkFsaWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMp KS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaDsKKyAgICByZXR1cm4gc3R5bGUu cmVzb2x2ZWRBbGlnblNlbGYoJmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29udGFpbmluZ0Js b2NrLT5zZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9uKCkgPT0gSXRl bVBvc2l0aW9uOjpTdHJldGNoOworfQorCiBib29sIFJlbmRlckJveDo6c2l6ZXNMb2dpY2FsV2lk dGhUb0ZpdENvbnRlbnQoU2l6ZVR5cGUgd2lkdGhUeXBlKSBjb25zdAogewogICAgIC8vIE1hcnF1 ZWVzIGluIFdpbklFIGFyZSBsaWtlIGEgbWl4dHVyZSBvZiBibG9ja3MgYW5kIGlubGluZS1ibG9j a3MuICBUaGV5IHNpemUgYXMgdGhvdWdoIHRoZXkncmUgYmxvY2tzLApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oCmluZGV4IDFkOTliZjBjMzg5NmI0Njc0MDA0NjM1MzdmMTc1NmZkYTcz M2Y5NTIuLmRjYTYwYjRhYTYwMDQxOGE4MzZhNDFkNDA3ODkxNWQ3NDJiZDk2NTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQzNyw2ICs0MzcsNyBAQCBvdmVycmlkZTsK ICAgICBib29sIHNpemVzTG9naWNhbFdpZHRoVG9GaXRDb250ZW50KFNpemVUeXBlKSBjb25zdDsK IAogICAgIGJvb2wgaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgY29uc3Q7CisgICAgYm9vbCBo YXNTdHJldGNoZWRMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CiAgICAgYm9vbCBpc1N0cmV0Y2hpbmdD b2x1bW5GbGV4SXRlbSgpIGNvbnN0OwogICAgIGJvb2wgY29sdW1uRmxleEl0ZW1IYXNTdHJldGNo QWxpZ25tZW50KCkgY29uc3Q7CiAgICAgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTdiMDdlNWM5NzZhZWRkNmY5MGYyOWY3 Y2I4NjQzNjk0NGU5ZTUwNC4uZGMwYzEwMTYxZTc4MzgyMzJmOTAyZmEzNGJkMzc1MjcwY2FiZjFh MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA3LTAxICBaaXJhbiBTdW4gIDx6c3VuQGln YWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBJZ25vcmVkIHRoZSBhc3BlY3QtcmF0aW8g b2YgYSByZXBsYWNlZCBlbGVtZW50IGlmIHN0cmV0Y2ggYWxpZ25tZW50IGlzIGFwcGxpZWQgdG8g Ym90aCBheGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjc1NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMDEgIFRpbSBOZ3V5ZW4gIDxudGltQGFw cGxlLmNvbT4KIAogICAgICAgICBNZXJnZSBMYXlvdXRUZXN0cy9pbXBvcnRlZC9ibGluay9mYXN0 L2RvbS9IVE1MRGlhbG9nRWxlbWVudCBhbmQgTGF5b3V0VGVzdHMvaW1wb3J0ZWQvYmxpbmsvZGlh bG9nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxMjRiOGM5ZTlhYzY3MzdjZTYyMTUzZDE5ZDhjODdi ZGUxMGJlM2I1Li45M2M3OTA2M2E2MTgwNjc0YTNlMmM4MDJiNzZhMTkwZTdlNzdhNzdjIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTEzMjUsOCArMTMyNSw2IEBAIHdlYmtpdC5vcmcvYi8yMTYxNDUg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dy aWQtCiB3ZWJraXQub3JnL2IvMjE2MTQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWl0ZW0tbm8tYXNwZWN0LXJhdGlvLXN0cmV0Y2gt MTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVj dC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13 aXRoLWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFs aWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3Jl cGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxp Z25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDYuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDcu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1y YXRpby0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo= 432925 2021-07-06 07:25:12 -0700 2021-07-06 07:54:28 -0700 Patch bug-227573-20210706152511.patch text/plain 10560 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc5YmI2ZjhkMTQ3ZDRl MWY2ZWUwNjg3NTdiZjRkZTNjOTllNmVkOC4uY2VkYmE2OTc3MGQxOGZmN2YwOTEyZjFlZmNjYjBj Y2RmNzliOWJjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA3LTA2ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBBcHBseSBhc3Bl Y3QtcmF0aW8gY29ycmVjdGx5IGZvciBhIHJlcGxhY2VkIGVsZW1lbnQgd2hlbiBzdHJldGNoIGFs aWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcyBvciBvbmUgYXhpcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NTczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgZGlzY3Vzc2VkIGluIGh0dHBz Oi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy81NzEzCisgICAgICAgIAorICAg ICAgICBJZiBzdHJldGNoIGFsaWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcywgdGhlIGFz cGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgc2hvdWxkIGJlIGlnbm9yZWQuIEhvd2V2 ZXIsIHdoZW4KKyAgICAgICAgYXV0byBtYXJnaW5zIGFyZSBwcmVzZW50LCB3ZSBzaG91bGQgcHJl c2VydmUgdGhlIGFzcGVjdC1yYXRpby4KKworICAgICAgICBXaGVuIHN0cmV0Y2ggYWxpZ25tZW50 IGlzIGFwcGxpZWQgdG8gaW4gb25lIGF4aXMsIHdlIHNob3VsZCBhcHBseSBhc3BlY3QtcmF0aW8g aW4gdGhlIG90aGVyLgorICAgICAgICAKKyAgICAgICAgV2hlbiBjb25zaWRlcmluZyBzcGVjaWFs IGNhc2VzIHRoYXQgZ3JpZCBpdGVtcyBoYXZlIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxl bWVudCwgd2UgYWxzbyBuZWVkIHRvIGNoZWNrIGlmCisgICAgICAgIGFzcGVjdC1yYXRpbyBoYXMg YmVlbiBhcHBsaWVkLgorCisgICAgICAgIEluIG9yZGVyIHRvIGxldCByZXBsYWNlZCBlbGVtZW50 cywgc3VjaCBhcyBpbWFnZXMsIHRvIGJlIHN0cmV0Y2hlZCBhcyBhIGNvbnNlcXVlbmNlIG9mIHRo ZSBDU1MgYWxpZ25tZW50IHByb3BlcnRpZXMsCisgICAgICAgIHdlIG5lZWQgdG8gZXhjbHVkZSBn cmlkIGl0ZW1zIGZyb20gdGhlIGNhc2VzIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxlbWVu dCBkdXJpbmcgdGhlIGhlaWdodCBjb21wdXRhdGlvbiBhcyB3ZWxsLiAgICAgICAgCisgICAgICAg IAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNw ZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpoYXNBdXRv U2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpo YXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisKIDIwMjEtMDYtMzAgIEpvaG4gV2lsYW5kZXIg IDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgUENNOiBDaGFuZ2UgaW1wb3J0IGZyb20g Q3J5cHRvS2l0Q0JyaWRnaW5nIHRvIENyeXB0b0tpdFByaXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKaW5kZXggY2E1YTZjMzM0ODg5OTJhZGQ0NjIxMGM3ZmE3MWI5OGIw NjdkM2Q4Ny4uZWY2NDM3Y2EwZWI0ZDc5NTlhNDgwZjQwM2YzNjkxNzk1ZmRhYTUzYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI2MDcsNyArMjYwNyw3IEBAIHZv aWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudChMb2dpY2FsRXh0ZW50 Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1CiAgICAgLy8gRklYTUU6IFN0cmV0Y2hpbmcgaXMgdGhlIG9u bHkgcmVhc29uIHdoeSB3ZSBkb24ndCB3YW50IHRoZSBib3ggdG8gYmUgdHJlYXRlZCBhcyBhIHJl cGxhY2VkIGVsZW1lbnQsIHNvIHdlIGNvdWxkIHBlcmhhcHMKICAgICAvLyByZWZhY3RvciBhbGwg dGhpcyBsb2dpYywgbm90IG9ubHkgZm9yIGZsZXggYW5kIGdyaWQgc2luY2UgYWxpZ25tZW50IGlz IGludGVuZGVkIHRvIGJlIGFwcGxpZWQgdG8gYW55IGJsb2NrLgogICAgIGJvb2wgdHJlYXRBc1Jl cGxhY2VkID0gc2hvdWxkQ29tcHV0ZVNpemVBc1JlcGxhY2VkKCkgJiYgKCFpblZlcnRpY2FsQm94 IHx8ICFzdHJldGNoaW5nKTsKLSAgICB0cmVhdEFzUmVwbGFjZWQgPSB0cmVhdEFzUmVwbGFjZWQg JiYgKCFpc0dyaWRJdGVtKCkgfHwgIWhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpKTsKKyAgICB0 cmVhdEFzUmVwbGFjZWQgPSB0cmVhdEFzUmVwbGFjZWQgJiYgKCFpc0dyaWRJdGVtKCkgfHwgKCFo YXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoKSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpbygpKSk7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9 IHN0eWxlKCk7CiAgICAgTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0aCA9IHRyZWF0QXNSZXBsYWNl ZCA/IExlbmd0aChjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoKSwgTGVuZ3RoVHlwZTo6Rml4 ZWQpIDogc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKTsKQEAgLTMwMTAsNyArMzAxMCw3IEBAIFJl bmRlckJveDo6TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIFJlbmRlckJveDo6Y29tcHV0ZUxv Z2ljYWxIZWlnaHQoTGF5b3V0VW5pCiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NjQxOAogICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBh cmVudCgpLT5pc0RlcHJlY2F0ZWRGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJv eE9yaWVudCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbDsKICAgICAgICAgYm9vbCBzdHJldGNo aW5nID0gcGFyZW50KCktPnN0eWxlKCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0 Y2g7Ci0gICAgICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gc2hvdWxkQ29tcHV0ZVNpemVBc1Jl cGxhY2VkKCkgJiYgKCFpbkhvcml6b250YWxCb3ggfHwgIXN0cmV0Y2hpbmcpOworICAgICAgICBi b29sIHRyZWF0QXNSZXBsYWNlZCA9IHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpICYmICgh aW5Ib3Jpem9udGFsQm94IHx8ICFzdHJldGNoaW5nKSAmJiAoIWlzR3JpZEl0ZW0oKSB8fCAhc2hv dWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSB8fCAhaGFzU3RyZXRjaGVk TG9naWNhbFdpZHRoKCkpOwogICAgICAgICBib29sIGNoZWNrTWluTWF4SGVpZ2h0ID0gZmFsc2U7 CiAKICAgICAgICAgLy8gVGhlIHBhcmVudCBib3ggaXMgZmxleGluZyB1cywgc28gaXQgaGFzIGlu Y3JlYXNlZCBvciBkZWNyZWFzZWQgb3VyIGhlaWdodC4gIFdlIGhhdmUgdG8KQEAgLTUyNDAsNiAr NTI0MCw5IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21B c3BlY3RSYXRpbygpIGNvbnN0CiB7CiAgICAgaWYgKHNob3VsZElnbm9yZUFzcGVjdFJhdGlvKCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHN0 eWxlKCkuYWxpZ25TZWxmKCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2ggICYm ICFzdHlsZSgpLm1hcmdpbkJlZm9yZSgpLmlzQXV0bygpICYmICFzdHlsZSgpLm1hcmdpbkFmdGVy KCkuaXNBdXRvKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChzaG91bGRDb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCp0aGlzKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtNTI1Myw2ICs1MjU2LDkgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgIGlmIChzaG91 bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAo aXNHcmlkSXRlbSgpICYmIHN0eWxlKCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigpID09IEl0ZW1Q b3NpdGlvbjo6U3RyZXRjaCAmJiAhc3R5bGUoKS5tYXJnaW5TdGFydCgpLmlzQXV0bygpICYmICFz dHlsZSgpLm1hcmdpbkVuZCgpLmlzQXV0bygpKQorICAgICAgICByZXR1cm4gZmFsc2U7IAorCiAg ICAgYXV0byBpc1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0ID0gWyZdIHsKICAgICAgICAgcmV0 dXJuIHN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChp c091dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2 YWJsZSgpKTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmlu ZGV4IDllMDA3ZjhkZGI3MGQ4MDVmMGYxY2ZlMGVhYmZkYjI3Y2I4ZTYxNTYuLmE2ZTA2MmFmZjYy MThiMjAzYTU5YmQ4YjA3NTMxZWFjNzcyZWE2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyR3JpZC5jcHAKQEAgLTE4NjcsMTEgKzE4NjcsMTEgQEAgY29uc3QgY2hhciogUmVuZGVy R3JpZDo6cmVuZGVyTmFtZSgpIGNvbnN0CiBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5D b2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgaWYgKGNoaWxk LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAg IGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Q b3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24tYXV0byBpbmxpbmUgc2l6 ZSBtZWFucyB0aGUgc2FtZSBmb3IgYmxvY2sgc2l6ZSAoY29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVz ZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxv Z2ljYWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmp1c3RpZnlT ZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAg IGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdo dCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2Fs SGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2Fs SGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAg LTE4ODMsMTIgKzE4ODMsMTIgQEAgYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1u QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogYm9vbCBSZW5kZXJHcmlkOjpoYXNB dXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIGlm IChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAgaWYgKGlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgewor ICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpICYmIGNoaWxkLnN0eWxlKCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigp ICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24tYXV0byBi bG9jayBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBpbmxpbmUgc2l6ZSAocm93IGF4aXMgc2l6ZSkg YmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBs b2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAg ICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50 T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFi bGUoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9IGVsc2Ugewor ICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuYWxpZ25TZWxmKCkucG9zaXRpb24oKSAh PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUo KS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCA5N2IwN2U1Yzk3NmFlZGQ2ZjkwZjI5ZjdjYjg2NDM2OTQ0ZTll NTA0Li41YzU1MWQ0Y2ZlZmExZGExMjZjNzE4ZTU0YjFiMTExNzk0ZjY1MmJkIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMjEtMDctMDYgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KKwor ICAgICAgICBbQ1NTLWdyaWRdIEFwcGx5IGFzcGVjdC1yYXRpbyBjb3JyZWN0bHkgZm9yIGEgcmVw bGFjZWQgZWxlbWVudCB3aGVuIHN0cmV0Y2ggYWxpZ25tZW50IGlzIGFwcGxpZWQgdG8gYm90aCBh eGVzIG9yIG9uZSBheGlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjc1NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGVkIFRlc3RFeHBlY3RhdGlvbnMgYXMgOCB0ZXN0cyBhcmUgbm93IHBhc3Np bmcuICAgICAgICAKKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMDEg IFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXJnZSBMYXlvdXRUZXN0 cy9pbXBvcnRlZC9ibGluay9mYXN0L2RvbS9IVE1MRGlhbG9nRWxlbWVudCBhbmQgTGF5b3V0VGVz dHMvaW1wb3J0ZWQvYmxpbmsvZGlhbG9nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxMjRiOGM5ZTlh YzY3MzdjZTYyMTUzZDE5ZDhjODdiZGUxMGJlM2I1Li5iOWRiM2IxN2FmMTk5YWE3NzY4OGViNWQ2 YTBkNWRjNmFjZTM3MmQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEzMjUsMTIgKzEzMjUsNiBA QCB3ZWJraXQub3JnL2IvMjE2MTQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLQogd2Via2l0Lm9yZy9iLzIxNjE0NSBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pdGVtLW5v LWFzcGVjdC1yYXRpby1zdHJldGNoLTEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNl ZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVu dC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlk L2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8t MDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3Bl Y3QtcmF0aW8tMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQt d2l0aC1hc3BlY3QtcmF0aW8tMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1h bGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9y ZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIAogCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3Jp ZC9ncmlkLWRlZmluaXRpb24vZ3JpZC1hdXRvLXJlcGVhdC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ2MjIsOCArNDYxNiw2IEBAIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw ZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAx OS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQt YXNwZWN0LXJhdGlvLTAyMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDM0Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0K 432930 2021-07-06 07:54:32 -0700 2021-07-08 06:23:03 -0700 Patch bug-227573-20210706155431.patch text/plain 10838 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI1YmU2NGJlNjdlYjFm MDgwY2MzMjgwMDNhYjc5Yzg3ZTBhYzZjOC4uOTcyMGNlNGI3MTVjMzQzNWM1Yzg1Yjk3NjgxMTYy M2FkYzY5YjlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA3LTA2ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBBcHBseSBhc3Bl Y3QtcmF0aW8gY29ycmVjdGx5IGZvciBhIHJlcGxhY2VkIGVsZW1lbnQgd2hlbiBzdHJldGNoIGFs aWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcyBvciBvbmUgYXhpcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NTczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgZGlzY3Vzc2VkIGluIGh0dHBz Oi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy81NzEzCisgICAgICAgIAorICAg ICAgICBJZiBzdHJldGNoIGFsaWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcywgdGhlIGFz cGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgc2hvdWxkIGJlIGlnbm9yZWQuIEhvd2V2 ZXIsIHdoZW4KKyAgICAgICAgYXV0byBtYXJnaW5zIGFyZSBwcmVzZW50LCB3ZSBzaG91bGQgcHJl c2VydmUgdGhlIGFzcGVjdC1yYXRpby4KKworICAgICAgICBXaGVuIHN0cmV0Y2ggYWxpZ25tZW50 IGlzIGFwcGxpZWQgdG8gaW4gb25lIGF4aXMsIHdlIHNob3VsZCBhcHBseSBhc3BlY3QtcmF0aW8g aW4gdGhlIG90aGVyLgorICAgICAgICAKKyAgICAgICAgV2hlbiBjb25zaWRlcmluZyBzcGVjaWFs IGNhc2VzIHRoYXQgZ3JpZCBpdGVtcyBoYXZlIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxl bWVudCwgd2UgYWxzbyBuZWVkIHRvIGNoZWNrIGlmCisgICAgICAgIGFzcGVjdC1yYXRpbyBoYXMg YmVlbiBhcHBsaWVkLgorCisgICAgICAgIEluIG9yZGVyIHRvIGxldCByZXBsYWNlZCBlbGVtZW50 cywgc3VjaCBhcyBpbWFnZXMsIHRvIGJlIHN0cmV0Y2hlZCBhcyBhIGNvbnNlcXVlbmNlIG9mIHRo ZSBDU1MgYWxpZ25tZW50IHByb3BlcnRpZXMsCisgICAgICAgIHdlIG5lZWQgdG8gZXhjbHVkZSBn cmlkIGl0ZW1zIGZyb20gdGhlIGNhc2VzIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxlbWVu dCBkdXJpbmcgdGhlIGhlaWdodCBjb21wdXRhdGlvbiBhcyB3ZWxsLgorCisgICAgICAgIFBhcnQg b2YgdGhpcyBjaGFuZ2UgaXMgYW4gaW1wb3J0IG9mIENocm9taXVtIENMIGF0CisgICAgICAgIGh0 dHBzOi8vY2hyb21pdW0tcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20vYy9jaHJvbWl1bS9zcmMvKy8y ODgzNjE1ICAgICAKKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdt ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRl TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNvbnN0KToKKwogMjAyMS0w Ny0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IGtW VENvbXByZXNzaW9uUHJvcGVydHlLZXlfTWF4S2V5RnJhbWVJbnRlcnZhbCBpbiBWaWRlb1NhbXBs ZUJ1ZmZlckNvbXByZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5k ZXggNjg5YjE3ZGMwODBlZWI1NTBhMmFiNzQ4NmJmYjg3ZWM4Y2E5ODRmMS4uZWEzOGQ2OWVmNjRj NGM4NjNjNzg1YTNkYzBmM2MwNTBmMTVjZTNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKQEAgLTI2MDYsNyArMjYwNiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1 CiAgICAgLy8gRklYTUU6IFN0cmV0Y2hpbmcgaXMgdGhlIG9ubHkgcmVhc29uIHdoeSB3ZSBkb24n dCB3YW50IHRoZSBib3ggdG8gYmUgdHJlYXRlZCBhcyBhIHJlcGxhY2VkIGVsZW1lbnQsIHNvIHdl IGNvdWxkIHBlcmhhcHMKICAgICAvLyByZWZhY3RvciBhbGwgdGhpcyBsb2dpYywgbm90IG9ubHkg Zm9yIGZsZXggYW5kIGdyaWQgc2luY2UgYWxpZ25tZW50IGlzIGludGVuZGVkIHRvIGJlIGFwcGxp ZWQgdG8gYW55IGJsb2NrLgogICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gc2hvdWxkQ29tcHV0 ZVNpemVBc1JlcGxhY2VkKCkgJiYgKCFpblZlcnRpY2FsQm94IHx8ICFzdHJldGNoaW5nKTsKLSAg ICB0cmVhdEFzUmVwbGFjZWQgPSB0cmVhdEFzUmVwbGFjZWQgJiYgKCFpc0dyaWRJdGVtKCkgfHwg IWhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpKTsKKyAgICB0cmVhdEFzUmVwbGFjZWQgPSB0cmVh dEFzUmVwbGFjZWQgJiYgKCFpc0dyaWRJdGVtKCkgfHwgKCFoYXNTdHJldGNoZWRMb2dpY2FsV2lk dGgoKSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSk7CiAK ICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAgICAgTGVuZ3Ro IGxvZ2ljYWxXaWR0aExlbmd0aCA9IHRyZWF0QXNSZXBsYWNlZCA/IExlbmd0aChjb21wdXRlUmVw bGFjZWRMb2dpY2FsV2lkdGgoKSwgTGVuZ3RoVHlwZTo6Rml4ZWQpIDogc3R5bGVUb1VzZS5sb2dp Y2FsV2lkdGgoKTsKQEAgLTMwMDksNyArMzAwOSw3IEBAIFJlbmRlckJveDo6TG9naWNhbEV4dGVu dENvbXB1dGVkVmFsdWVzIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5p CiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQx OAogICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBhcmVudCgpLT5pc0RlcHJlY2F0ZWRG bGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVudCgpID09IEJveE9yaWVu dDo6SG9yaXpvbnRhbDsKICAgICAgICAgYm9vbCBzdHJldGNoaW5nID0gcGFyZW50KCktPnN0eWxl KCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0Y2g7Ci0gICAgICAgIGJvb2wgdHJl YXRBc1JlcGxhY2VkID0gc2hvdWxkQ29tcHV0ZVNpemVBc1JlcGxhY2VkKCkgJiYgKCFpbkhvcml6 b250YWxCb3ggfHwgIXN0cmV0Y2hpbmcpOworICAgICAgICBib29sIHRyZWF0QXNSZXBsYWNlZCA9 IHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpICYmICghaW5Ib3Jpem9udGFsQm94IHx8ICFz dHJldGNoaW5nKSAmJiAoIWlzR3JpZEl0ZW0oKSB8fCAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWln aHRGcm9tQXNwZWN0UmF0aW8oKSB8fCAhaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkpOwogICAg ICAgICBib29sIGNoZWNrTWluTWF4SGVpZ2h0ID0gZmFsc2U7CiAKICAgICAgICAgLy8gVGhlIHBh cmVudCBib3ggaXMgZmxleGluZyB1cywgc28gaXQgaGFzIGluY3JlYXNlZCBvciBkZWNyZWFzZWQg b3VyIGhlaWdodC4gIFdlIGhhdmUgdG8KQEAgLTUyMzksNiArNTIzOSw5IEBAIGJvb2wgUmVuZGVy Qm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiB7 CiAgICAgaWYgKHNob3VsZElnbm9yZUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAKKyAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHN0eWxlKCkuYWxpZ25TZWxmKCkucG9z aXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2ggICYmICFzdHlsZSgpLm1hcmdpbkJlZm9y ZSgpLmlzQXV0bygpICYmICFzdHlsZSgpLm1hcmdpbkFmdGVyKCkuaXNBdXRvKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvQW5kSW5zZXRzKCp0aGlzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNTI1 Miw2ICs1MjU1LDkgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgIGlmIChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHN0eWxl KCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiAh c3R5bGUoKS5tYXJnaW5TdGFydCgpLmlzQXV0bygpICYmICFzdHlsZSgpLm1hcmdpbkVuZCgpLmlz QXV0bygpKQorICAgICAgICByZXR1cm4gZmFsc2U7IAorCiAgICAgYXV0byBpc1Jlc29sdmFibGVQ ZXJjZW50YWdlSGVpZ2h0ID0gWyZdIHsKICAgICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNhbEhl aWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091dE9mRmxvd1Bvc2l0aW9uZWQo KSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKICAgICB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDllMDA3ZjhkZGI3MGQ4MDVm MGYxY2ZlMGVhYmZkYjI3Y2I4ZTYxNTYuLmE2ZTA2MmFmZjYyMThiMjAzYTU5YmQ4YjA3NTMxZWFj NzcyZWE2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE4 NjcsMTEgKzE4NjcsMTEgQEAgY29uc3QgY2hhciogUmVuZGVyR3JpZDo6cmVuZGVyTmFtZSgpIGNv bnN0CiBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0 aW8oKSkgewotICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5p c0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0 aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQuc3R5 bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewog ICAgICAgICAgICAgLy8gQSBub24tYXV0byBpbmxpbmUgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3Ig YmxvY2sgc2l6ZSAoY29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlv LgogICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygp KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmp1c3RpZnlTZWxmKCkucG9zaXRpb24oKSAhPSBJ dGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNh bEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgaWYg KGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2Fs Y3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkp KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE4ODMsMTIgKzE4ODMsMTIgQEAg Ym9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gm IGNoaWxkKSBjb25zdAogYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25z dCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0Fz cGVjdFJhdGlvKCkpIHsKLSAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0g Y2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAgICBpZiAoaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIGNo aWxkLnN0eWxlKCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3Ry ZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24tYXV0byBibG9jayBzaXplIG1lYW5zIHRoZSBz YW1lIGZvciBpbmxpbmUgc2l6ZSAocm93IGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0 IHJhdGlvLgogICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQu c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5p c0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hp bGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKGNo aWxkLnN0eWxlKCkuYWxpZ25TZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0 Y2gpIHsKICAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1 dG8oKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBh YmViMTE1NjE3YWFiMTI5NjViMzIzZmYyMDM3YjEyN2ZjYjNiYjI2Li43ZjNhYzcxNzI5M2QxMDRh MjUzY2Y5MDE2NzFjMWI5MTZmOGNjNDZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDct MDYgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbQ1NTLWdyaWRdIEFw cGx5IGFzcGVjdC1yYXRpbyBjb3JyZWN0bHkgZm9yIGEgcmVwbGFjZWQgZWxlbWVudCB3aGVuIHN0 cmV0Y2ggYWxpZ25tZW50IGlzIGFwcGxpZWQgdG8gYm90aCBheGVzIG9yIG9uZSBheGlzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc1NzMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIFRlc3RF eHBlY3RhdGlvbnMgYXMgOCB0ZXN0cyBhcmUgbm93IHBhc3NpbmcuICAgICAgICAKKworICAgICAg ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMDUgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTGl2ZSBUZXh0IHNob3VsZCBub3QgYmUgdmlz aWJsZSBpbiB2aWRlbyB0aHVtYm5haWwgaW1hZ2VzIGJlaGluZCAiU2tpcCBBZCIgYnV0dG9uIG9u IFlvdVR1YmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlv dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDE5Njk2ZWY4NTNkNmFjNDU3NjFkOWNiMTBm YTJkMTZhYTZiNDA5NjIuLmM0N2QwZDkwNDEzMGVmNjEwODNlM2EwOGI4ZDQ4OGJiYmEzMjFlZGIg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTMyOCwxMyArMTMyOCw2IEBAIHdlYmtpdC5vcmcvYi8y MTYxNDUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25t ZW50L2dyaWQtCiB3ZWJraXQub3JnL2IvMjE2MTQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWl0ZW0tbm8tYXNwZWN0LXJhdGlvLXN0 cmV0Y2gtMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRo LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdu bWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxh Y2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25t ZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdy aWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRpby0wMDYuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFzcGVjdC1yYXRp by0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVudC13aXRoLWFz cGVjdC1yYXRpby0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L3JlcGxhY2VkLWFsaWdubWVu dC13aXRoLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotCiAKIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtZGVmaW5pdGlv bi9ncmlkLWF1dG8tcmVwZWF0LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1k ZWZpbml0aW9uL2dyaWQtYXV0by1yZXBlYXQtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCkBAIC00NjEyLDggKzQ2MDUsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv Lwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp by0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m bGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMzAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMzEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzIuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQo= 433129 2021-07-08 06:23:07 -0700 2021-07-15 05:28:12 -0700 Patch bug-227573-20210708142306.patch text/plain 11694 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI1YmU2NGJlNjdlYjFm MDgwY2MzMjgwMDNhYjc5Yzg3ZTBhYzZjOC4uOTcyMGNlNGI3MTVjMzQzNWM1Yzg1Yjk3NjgxMTYy M2FkYzY5YjlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA3LTA2ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBBcHBseSBhc3Bl Y3QtcmF0aW8gY29ycmVjdGx5IGZvciBhIHJlcGxhY2VkIGVsZW1lbnQgd2hlbiBzdHJldGNoIGFs aWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcyBvciBvbmUgYXhpcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NTczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgZGlzY3Vzc2VkIGluIGh0dHBz Oi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy81NzEzCisgICAgICAgIAorICAg ICAgICBJZiBzdHJldGNoIGFsaWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcywgdGhlIGFz cGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgc2hvdWxkIGJlIGlnbm9yZWQuIEhvd2V2 ZXIsIHdoZW4KKyAgICAgICAgYXV0byBtYXJnaW5zIGFyZSBwcmVzZW50LCB3ZSBzaG91bGQgcHJl c2VydmUgdGhlIGFzcGVjdC1yYXRpby4KKworICAgICAgICBXaGVuIHN0cmV0Y2ggYWxpZ25tZW50 IGlzIGFwcGxpZWQgdG8gaW4gb25lIGF4aXMsIHdlIHNob3VsZCBhcHBseSBhc3BlY3QtcmF0aW8g aW4gdGhlIG90aGVyLgorICAgICAgICAKKyAgICAgICAgV2hlbiBjb25zaWRlcmluZyBzcGVjaWFs IGNhc2VzIHRoYXQgZ3JpZCBpdGVtcyBoYXZlIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxl bWVudCwgd2UgYWxzbyBuZWVkIHRvIGNoZWNrIGlmCisgICAgICAgIGFzcGVjdC1yYXRpbyBoYXMg YmVlbiBhcHBsaWVkLgorCisgICAgICAgIEluIG9yZGVyIHRvIGxldCByZXBsYWNlZCBlbGVtZW50 cywgc3VjaCBhcyBpbWFnZXMsIHRvIGJlIHN0cmV0Y2hlZCBhcyBhIGNvbnNlcXVlbmNlIG9mIHRo ZSBDU1MgYWxpZ25tZW50IHByb3BlcnRpZXMsCisgICAgICAgIHdlIG5lZWQgdG8gZXhjbHVkZSBn cmlkIGl0ZW1zIGZyb20gdGhlIGNhc2VzIHRvIGJlIHRyZWF0ZWQgYXMgcmVwbGFjZWQgZWxlbWVu dCBkdXJpbmcgdGhlIGhlaWdodCBjb21wdXRhdGlvbiBhcyB3ZWxsLgorCisgICAgICAgIFBhcnQg b2YgdGhpcyBjaGFuZ2UgaXMgYW4gaW1wb3J0IG9mIENocm9taXVtIENMIGF0CisgICAgICAgIGh0 dHBzOi8vY2hyb21pdW0tcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20vYy9jaHJvbWl1bS9zcmMvKy8y ODgzNjE1ICAgICAKKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdt ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRl TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNvbnN0KToKKwogMjAyMS0w Ny0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IGtW VENvbXByZXNzaW9uUHJvcGVydHlLZXlfTWF4S2V5RnJhbWVJbnRlcnZhbCBpbiBWaWRlb1NhbXBs ZUJ1ZmZlckNvbXByZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5k ZXggNjg5YjE3ZGMwODBlZWI1NTBhMmFiNzQ4NmJmYjg3ZWM4Y2E5ODRmMS4uMzYxYzQ2ZTJmN2Qw NzQzMzYyYzA3NjcwYTc3ODUwZTE0NTNmODk0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKQEAgLTI2MDYsNyArMjYwNiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1 CiAgICAgLy8gRklYTUU6IFN0cmV0Y2hpbmcgaXMgdGhlIG9ubHkgcmVhc29uIHdoeSB3ZSBkb24n dCB3YW50IHRoZSBib3ggdG8gYmUgdHJlYXRlZCBhcyBhIHJlcGxhY2VkIGVsZW1lbnQsIHNvIHdl IGNvdWxkIHBlcmhhcHMKICAgICAvLyByZWZhY3RvciBhbGwgdGhpcyBsb2dpYywgbm90IG9ubHkg Zm9yIGZsZXggYW5kIGdyaWQgc2luY2UgYWxpZ25tZW50IGlzIGludGVuZGVkIHRvIGJlIGFwcGxp ZWQgdG8gYW55IGJsb2NrLgogICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gc2hvdWxkQ29tcHV0 ZVNpemVBc1JlcGxhY2VkKCkgJiYgKCFpblZlcnRpY2FsQm94IHx8ICFzdHJldGNoaW5nKTsKLSAg ICB0cmVhdEFzUmVwbGFjZWQgPSB0cmVhdEFzUmVwbGFjZWQgJiYgKCFpc0dyaWRJdGVtKCkgfHwg IWhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpKTsKKyAgICB0cmVhdEFzUmVwbGFjZWQgPSB0cmVh dEFzUmVwbGFjZWQgJiYgKCFpc0dyaWRJdGVtKCkgfHwgKCFoYXNTdHJldGNoZWRMb2dpY2FsV2lk dGgoKSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSk7CiAK ICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAgICAgTGVuZ3Ro IGxvZ2ljYWxXaWR0aExlbmd0aCA9IHRyZWF0QXNSZXBsYWNlZCA/IExlbmd0aChjb21wdXRlUmVw bGFjZWRMb2dpY2FsV2lkdGgoKSwgTGVuZ3RoVHlwZTo6Rml4ZWQpIDogc3R5bGVUb1VzZS5sb2dp Y2FsV2lkdGgoKTsKQEAgLTMwMDksNyArMzAwOSw3IEBAIFJlbmRlckJveDo6TG9naWNhbEV4dGVu dENvbXB1dGVkVmFsdWVzIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5p CiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQx OAogICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBhcmVudCgpLT5pc0RlcHJlY2F0ZWRG bGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVudCgpID09IEJveE9yaWVu dDo6SG9yaXpvbnRhbDsKICAgICAgICAgYm9vbCBzdHJldGNoaW5nID0gcGFyZW50KCktPnN0eWxl KCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0Y2g7Ci0gICAgICAgIGJvb2wgdHJl YXRBc1JlcGxhY2VkID0gc2hvdWxkQ29tcHV0ZVNpemVBc1JlcGxhY2VkKCkgJiYgKCFpbkhvcml6 b250YWxCb3ggfHwgIXN0cmV0Y2hpbmcpOworICAgICAgICBib29sIHRyZWF0QXNSZXBsYWNlZCA9 IHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpICYmICghaW5Ib3Jpem9udGFsQm94IHx8ICFz dHJldGNoaW5nKSAmJiAoIWlzR3JpZEl0ZW0oKSB8fCAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWln aHRGcm9tQXNwZWN0UmF0aW8oKSB8fCAhaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkpOwogICAg ICAgICBib29sIGNoZWNrTWluTWF4SGVpZ2h0ID0gZmFsc2U7CiAKICAgICAgICAgLy8gVGhlIHBh cmVudCBib3ggaXMgZmxleGluZyB1cywgc28gaXQgaGFzIGluY3JlYXNlZCBvciBkZWNyZWFzZWQg b3VyIGhlaWdodC4gIFdlIGhhdmUgdG8KQEAgLTUyMzksNiArNTIzOSwxNiBAQCBib29sIFJlbmRl ckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAog ewogICAgIGlmIChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgCisgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jayA9IHRoaXMtPmNvbnRh aW5pbmdCbG9jaygpOworICAgIGlmICghY29udGFpbmluZ0Jsb2NrKSB7CisgICAgICAgIC8vIFdl IGFyZSBldmFsdWF0aW5nIGFsaWduLXNlbGYvanVzdGlmeS1zZWxmLCB3aGljaCBkZWZhdWx0IHRv ICdub3JtYWwnIGZvciB0aGUgcm9vdCBlbGVtZW50LgorICAgICAgICAvLyBUaGUgJ25vcm1hbCcg dmFsdWUgYmVoYXZlcyBsaWtlICdzdGFydCcgZXhjZXB0IGZvciBGbGV4Ym94IEl0ZW1zLCB3aGlj aCBvYnZpb3VzbHkgc2hvdWxkIGhhdmUgYSBjb250YWluZXIuCisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICB9CisKKyAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHN0eWxlKCkucmVzb2x2ZWRBbGln blNlbGYoJmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29udGFpbmluZ0Jsb2NrLT5zZWxmQWxp Z25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpT dHJldGNoICAmJiAhc3R5bGUoKS5tYXJnaW5CZWZvcmUoKS5pc0F1dG8oKSAmJiAhc3R5bGUoKS5t YXJnaW5BZnRlcigpLmlzQXV0bygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAo c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygqdGhpcykp CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTUyNTIsNiArNTI2MiwxNiBAQCBib29sIFJlbmRl ckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAg ICAgaWYgKHNob3VsZElnbm9yZUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAorICAgIFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2sgPSB0aGlzLT5jb250YWluaW5nQmxv Y2soKTsKKyAgICBpZiAoIWNvbnRhaW5pbmdCbG9jaykgeworICAgICAgICAvLyBXZSBhcmUgZXZh bHVhdGluZyBhbGlnbi1zZWxmL2p1c3RpZnktc2VsZiwgd2hpY2ggZGVmYXVsdCB0byAnbm9ybWFs JyBmb3IgdGhlIHJvb3QgZWxlbWVudC4KKyAgICAgICAgLy8gVGhlICdub3JtYWwnIHZhbHVlIGJl aGF2ZXMgbGlrZSAnc3RhcnQnIGV4Y2VwdCBmb3IgRmxleGJveCBJdGVtcywgd2hpY2ggb2J2aW91 c2x5IHNob3VsZCBoYXZlIGEgY29udGFpbmVyLgorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQorCisgICAgaWYgKGlzR3JpZEl0ZW0oKSAmJiBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeVNlbGYo JmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29udGFpbmluZ0Jsb2NrLT5zZWxmQWxpZ25tZW50 Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNo ICYmICFzdHlsZSgpLm1hcmdpblN0YXJ0KCkuaXNBdXRvKCkgJiYgIXN0eWxlKCkubWFyZ2luRW5k KCkuaXNBdXRvKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsgCisKICAgICBhdXRvIGlzUmVzb2x2 YWJsZVBlcmNlbnRhZ2VIZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dp Y2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRp b25lZCgpIHx8IHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogICAgIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggOWUwMDdmOGRkYjcw ZDgwNWYwZjFjZmUwZWFiZmRiMjdjYjhlNjE1Ni4uNDg2OGY0NzI3NDYxMWU2ZmJhNmM1YjgyZjAy Yjk0NGRmMGM2MjVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApA QCAtMTg2NywxMSArMTg2NywxMSBAQCBjb25zdCBjaGFyKiBSZW5kZXJHcmlkOjpyZW5kZXJOYW1l KCkgY29uc3QKIGJvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3Qg UmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKICAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3Bl Y3RSYXRpbygpKSB7Ci0gICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNo aWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiBhbGln blNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gp IHsKICAgICAgICAgICAgIC8vIEEgbm9uLWF1dG8gaW5saW5lIHNpemUgbWVhbnMgdGhlIHNhbWUg Zm9yIGJsb2NrIHNpemUgKGNvbHVtbiBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCBy YXRpby4KICAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1 dG8oKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7Cisg ICAgICAgIH0gZWxzZSBpZiAoanVzdGlmeVNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRpb24oKSAh PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9n aWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAg aWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9y Q2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxl KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE4ODMsMTIgKzE4ODMsMTIg QEAgYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJC b3gmIGNoaWxkKSBjb25zdAogYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhj b25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIGlmIChjaGlsZC5zdHlsZSgpLmhh c0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAgICBpZiAoaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYm IGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpT dHJldGNoKSB7CiAgICAgICAgICAgICAvLyBBIG5vbi1hdXRvIGJsb2NrIHNpemUgbWVhbnMgdGhl IHNhbWUgZm9yIGlubGluZSBzaXplIChyb3cgYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3Bl Y3QgcmF0aW8uCiAgICAgICAgICAgICBjb25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGls ZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0 LmlzRml4ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBj aGlsZC5wZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKSkKICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZSBpZiAo YWxpZ25TZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJl dGNoKSB7CiAgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNB dXRvKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg YWJlYjExNTYxN2FhYjEyOTY1YjMyM2ZmMjAzN2IxMjdmY2IzYmIyNi4uN2YzYWM3MTcyOTNkMTA0 YTI1M2NmOTAxNjcxYzFiOTE2ZjhjYzQ2YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA3 LTA2ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBB cHBseSBhc3BlY3QtcmF0aW8gY29ycmVjdGx5IGZvciBhIHJlcGxhY2VkIGVsZW1lbnQgd2hlbiBz dHJldGNoIGFsaWdubWVudCBpcyBhcHBsaWVkIHRvIGJvdGggYXhlcyBvciBvbmUgYXhpcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NTczCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCBUZXN0 RXhwZWN0YXRpb25zIGFzIDggdGVzdHMgYXJlIG5vdyBwYXNzaW5nLiAgICAgICAgCisKKyAgICAg ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTA1ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIExpdmUgVGV4dCBzaG91bGQgbm90IGJlIHZp c2libGUgaW4gdmlkZW8gdGh1bWJuYWlsIGltYWdlcyBiZWhpbmQgIlNraXAgQWQiIGJ1dHRvbiBv biBZb3VUdWJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxOTY5NmVmODUzZDZhYzQ1NzYxZDljYjEw ZmEyZDE2YWE2YjQwOTYyLi5jNDdkMGQ5MDQxMzBlZjYxMDgzZTNhMDhiOGQ0ODhiYmJhMzIxZWRi IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEzMjgsMTMgKzEzMjgsNiBAQCB3ZWJraXQub3JnL2Iv MjE2MTQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdu bWVudC9ncmlkLQogd2Via2l0Lm9yZy9iLzIxNjE0NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pdGVtLW5vLWFzcGVjdC1yYXRpby1z dHJldGNoLTEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0 aC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGln bm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBs YWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdu bWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n cmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA2Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1hc3BlY3QtcmF0 aW8tMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1lbnQtd2l0aC1h c3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLWltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9yZXBsYWNlZC1hbGlnbm1l bnQtd2l0aC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLQogCiBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlkLWRlZmluaXRp b24vZ3JpZC1hdXRvLXJlcGVhdC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQt ZGVmaW5pdGlvbi9ncmlkLWF1dG8tcmVwZWF0LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQpAQCAtNDYxMiw4ICs0NjA1LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0 aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v ZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3Qt cmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMyLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0K 433576 2021-07-15 05:28:17 -0700 2021-07-19 01:39:09 -0700 Patch bug-227573-20210715132815.patch text/plain 6103 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M0Y2E2NjZiYjRlNjJm YzIyM2UyOTRiMGY5MmQ0OWY5YWU3NTI1Mi4uNzFhODhmMDg5NGM2YTZiM2Q0ZGU5M2FkYmY4ZGVi MzQ2NDcwYzBmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA3LTE1ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUy1ncmlkXSBJZ25vcmUgdGhl IGFzcGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgaWYgc3RyZXRjaCBhbGlnbm1lbnRz IGFyZSBhcHBsaWVkIHRvIGJvdGggYXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NTczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQXMgZGlzY3Vzc2VkIGluIGh0dHBzOi8vZ2l0aHViLmNvbS93M2Mv Y3Nzd2ctZHJhZnRzL2lzc3Vlcy81NzEzLCBmb3IgdGhlIHJlcGxhY2VkIGVsZW1lbnQgYXMgYSBn cmlkIGl0ZW0sCisgICAgICAgIHdoZW4gYm90aCBheGVzIGhhdmUgc3RyZXRjaCBhbGlnbm1lbnRz IGFwcGxpZWQgYW5kIHRoZXJlIGlzIG5vIGF1dG8gbWFyZ2luKHMpIHByZXNlbnRlZCwgdGhlIGFz cGVjdCByYXRpbworICAgICAgICBzaG91bGQgYmUgaWdub3JlZCBpZiB0aGVyZSBpcyBhbnkuIAor CisgICAgICAgIFBhcnQgb2YgdGhpcyBwYXRjaCBpcyBhbiBpbXBvcnQgb2YgQ2hyb21pdW0gQ0wg YXQKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1bS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbS9jL2No cm9taXVtL3NyYy8rLzI2NTE2NTEKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNTdHJldGNoZWRMb2dpY2FsSGVpZ2h0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJveC5oOgorCiAyMDIxLTA3LTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4gYW5kIE1pZ3VlbCBHb21leiAgPG1hZ29tZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1N0cmVhbWVyXVtHTF0gQTQyMCBjb21wb3NpdGluZyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDQwMjgwZWFhMTNlMTYzMTFkYTQyMmY5NGU1NDRlM2I2 ZDZmYmJkYWIuLmMyODRlNTQ4M2M3M2U5N2UyNjU1YzhlZGVjODI3YTFiMjZiYjcxYTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yNzYwLDYgKzI3NjAsMjMgQEAg Ym9vbCBSZW5kZXJCb3g6OmlzU3RyZXRjaGluZ0NvbHVtbkZsZXhJdGVtKCkgY29uc3QKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKKy8vIEZJWE1FOiBDYW4vU2hvdWxkIHdlIG1vdmUgdGhpcyBpbnNp ZGUgc3BlY2lmaWMgbGF5b3V0IGNsYXNzZXMgKGZsZXguIGdyaWQpPyBDYW4gd2UgcmVmYWN0b3Ig Y29sdW1uRmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50IGxvZ2ljPworYm9vbCBSZW5kZXJCb3g6 Omhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSBjb25zdAoreworICAgIGF1dG8mIHN0eWxlID0g dGhpcy0+c3R5bGUoKTsKKyAgICBpZiAoIXN0eWxlLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSB8 fCBzdHlsZS5tYXJnaW5CZWZvcmUoKS5pc0F1dG8oKSB8fCBzdHlsZS5tYXJnaW5BZnRlcigpLmlz QXV0bygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5p bmdCbG9jayA9IHRoaXMtPmNvbnRhaW5pbmdCbG9jaygpOworICAgIGlmICghY29udGFpbmluZ0Js b2NrKSB7CisgICAgICAgIC8vIFdlIGFyZSBldmFsdWF0aW5nIGFsaWduLXNlbGYvanVzdGlmeS1z ZWxmLCB3aGljaCBkZWZhdWx0IHRvICdub3JtYWwnIGZvciB0aGUgcm9vdCBlbGVtZW50LgorICAg ICAgICAvLyBUaGUgJ25vcm1hbCcgdmFsdWUgYmVoYXZlcyBsaWtlICdzdGFydCcgZXhjZXB0IGZv ciBGbGV4Ym94IEl0ZW1zLCB3aGljaCBvYnZpb3VzbHkgc2hvdWxkIGhhdmUgYSBjb250YWluZXIu CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+ aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQor ICAgICAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRKdXN0aWZ5U2VsZigmY29udGFpbmluZ0Jsb2Nr LT5zdHlsZSgpLCBjb250YWluaW5nQmxvY2stPnNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcih0 aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7CisgICAgcmV0dXJuIHN0 eWxlLnJlc29sdmVkQWxpZ25TZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5p bmdCbG9jay0+c2VsZkFsaWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09 IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaDsKK30KKwogLy8gRklYTUU6IENhbi9TaG91bGQgd2UgbW92 ZSB0aGlzIGluc2lkZSBzcGVjaWZpYyBsYXlvdXQgY2xhc3NlcyAoZmxleC4gZ3JpZCk/IENhbiB3 ZSByZWZhY3RvciBjb2x1bW5GbGV4SXRlbUhhc1N0cmV0Y2hBbGlnbm1lbnQgbG9naWM/CiBib29s IFJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgY29uc3QKIHsKQEAgLTUyNTIs NiArNTI2OSw5IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBpZiAoc2hvdWxkSWdub3JlQXNwZWN0UmF0aW8oKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKGlzR3JpZEl0ZW0oKSAmJiBzaG91bGRD b21wdXRlU2l6ZUFzUmVwbGFjZWQoKSAmJiBoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoKSAmJiBo YXNTdHJldGNoZWRMb2dpY2FsSGVpZ2h0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAg IGF1dG8gaXNSZXNvbHZhYmxlUGVyY2VudGFnZUhlaWdodCA9IFsmXSB7CiAgICAgICAgIHJldHVy biBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAoaXNP dXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFi bGUoKSk7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA0MDhl ZDFhM2Q0NDNiMDZkM2U1MWMxYmMxNTZhZWY5ODk2OWExMTcwLi43NzE4YTRhZGE4MmM5ZjFlN2Ji ZDQ3M2E5YzQxMTNkNWJlYjc1MjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CkBAIC00MzYsNiArNDM2LDcgQEAgb3ZlcnJpZGU7CiAgICAgLy8gb2YgYSBjb250YWluaW5nIGJs b2NrKS4gIEhUTUw0IGJ1dHRvbnMsIDxzZWxlY3Q+cywgPGlucHV0PnMsIGxlZ2VuZHMsIGFuZCBm bG9hdGluZy9jb21wYWN0IGVsZW1lbnRzIGRvIHRoaXMuCiAgICAgYm9vbCBzaXplc0xvZ2ljYWxX aWR0aFRvRml0Q29udGVudChTaXplVHlwZSkgY29uc3Q7CiAKKyAgICBib29sIGhhc1N0cmV0Y2hl ZExvZ2ljYWxIZWlnaHQoKSBjb25zdDsKICAgICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0 aCgpIGNvbnN0OwogICAgIGJvb2wgaXNTdHJldGNoaW5nQ29sdW1uRmxleEl0ZW0oKSBjb25zdDsK ICAgICBib29sIGNvbHVtbkZsZXhJdGVtSGFzU3RyZXRjaEFsaWdubWVudCgpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDgwNzc3NTI4ZTM3ODlmODAwYjBjNWYwZGNlYzYzZGNlMzE4MDc0NDIuLmY5MGZmYWMyNWYx NmUxMWFjNzAyN2Q5YzUzNTI4Nzc4ODhhM2FjZjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy MS0wNy0xNSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MtZ3Jp ZF0gSWdub3JlIHRoZSBhc3BlY3QtcmF0aW8gb2YgYSByZXBsYWNlZCBlbGVtZW50IGlmIHN0cmV0 Y2ggYWxpZ25tZW50cyBhcmUgYXBwbGllZCB0byBib3RoIGF4ZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzU3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBncmlkIFdQVCB0ZXN0cyBhcmUgbm93 IHBhc3NpbmcuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTE1ICBa aXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVzeW5jIHdlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQgdGVzdHMgZnJvbSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMTc4M2NmYzI1OGU5MjU4ZjFlNGI1ZWMwODM0Njk0MGRjZmQ3N2FkZS4uMGQxNTg5NjU0 YWJkM2E3ZWRjMjY2YTA0M2E2ZDg2ZDAzNzMxYjRjNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0x NDM4LDggKzE0MzgsNiBAQCB3ZWJraXQub3JnL2IvMjE2MTQ2IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLQogd2Via2l0Lm9yZy9iLzIx NjE0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1l bnQvZ3JpZC1iYXNlbGluZS1qdXN0aWZ5LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVw bGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln bm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Z3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwNC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJh dGlvLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgt YXNwZWN0LXJhdGlvLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25t ZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFj ZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCg==