219505 2020-12-03 12:54:10 -0800 Issue logging in to Microsoft Teams if logged into other Microsoft accounts and navigating directly to teams.microsoft.com 2020-12-03 17:32:50 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen bfulgham cdumez ews-watchlist japhet wilander oldest_to_newest 1711773 0 katherine_cheney 2020-12-03 12:54:10 -0800 In https://bugs.webkit.org/show_bug.cgi?id=218778, we fixed multiple login paths for Microsoft Teams, which relies on third party cookies from login.microsoftonline.com. There is one edge case which this fix did not cover: 1. The user was logged into other Microsoft sites prior to https://bugs.webkit.org/show_bug.cgi?id=218778 2. They go straight to teams.microsoft.com (not through the login page on www.microsoft.com/en-us/microsoft-365/microsoft-teams/) 3. Since a login has occurred on another Microsoft site, it seems that the login step is skipped 4. Teams enters a login loop because there is no storage access 1711777 1 415331 katherine_cheney 2020-12-03 12:57:21 -0800 Created attachment 415331 Patch 1711804 2 415331 bfulgham 2020-12-03 13:59:34 -0800 Comment on attachment 415331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415331&action=review I think this looks correct. r=me > Source/WebCore/ChangeLog:21 > + reboot loop will occur because the site has login credentials from a previous Reboot? Or just endless redirect (I suspect the latter!) 1711805 3 415331 achristensen 2020-12-03 14:02:05 -0800 Comment on attachment 415331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415331&action=review > Source/WebCore/ChangeLog:28 > + (WebCore::FrameLoader::receivedFirstData): DocumentLoader::responseReceived might be a better place for this. > Source/WebCore/page/Quirks.cpp:982 > +bool Quirks::isMicrosoftTeamsRedirectCase(const URL& url) "Case" -> "URL"? > Source/WebCore/page/Quirks.cpp:984 > + return url.string().contains("teams.microsoft.com") && url.query().toString().contains("Retried+3+times+without+success"); Could we check the host instead of the whole url? I'd rather not match https://example.com/teams.microsoft.com?Retried+3+times+without+success > Source/WebCore/page/Quirks.cpp:987 > +URL Quirks::microsoftTeamsRedirectURL() I'm not sure this URL should be in Quirks. 1711816 4 katherine_cheney 2020-12-03 14:19:37 -0800 (In reply to Brent Fulgham from comment #2) > Comment on attachment 415331 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=415331&action=review > > I think this looks correct. r=me Thanks for looking. I will hold off based on Alex's r-. > > > Source/WebCore/ChangeLog:21 > > + reboot loop will occur because the site has login credentials from a previous > > Reboot? Or just endless redirect (I suspect the latter!) Oops! Will fix in the next upload. 1711817 5 katherine_cheney 2020-12-03 14:22:10 -0800 (In reply to Alex Christensen from comment #3) > Comment on attachment 415331 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=415331&action=review > > > Source/WebCore/ChangeLog:28 > > + (WebCore::FrameLoader::receivedFirstData): > > DocumentLoader::responseReceived might be a better place for this. > Ok, I'll move it there instead. > > Source/WebCore/page/Quirks.cpp:982 > > +bool Quirks::isMicrosoftTeamsRedirectCase(const URL& url) > > "Case" -> "URL"? > Will change. > > Source/WebCore/page/Quirks.cpp:984 > > + return url.string().contains("teams.microsoft.com") && url.query().toString().contains("Retried+3+times+without+success"); > > Could we check the host instead of the whole url? I'd rather not match > https://example.com/teams.microsoft.com?Retried+3+times+without+success > It is a combination of the host being teams.microsoft.com and the query containing the "Retried+3+times+without+success" message that means the login has failed because no storage access. If the user has previously granted storage access or has not logged in yet then we do not want to redirect, so we cannot redirect based on the host alone. > > Source/WebCore/page/Quirks.cpp:987 > > +URL Quirks::microsoftTeamsRedirectURL() > > I'm not sure this URL should be in Quirks. Do you think in DocumentLoader::responseReceived instead? 1711824 6 achristensen 2020-12-03 14:30:30 -0800 (In reply to katherine_cheney from comment #5) > It is a combination of the host being teams.microsoft.com and the query > containing the "Retried+3+times+without+success" message that means the > login has failed because no storage access. If the user has previously > granted storage access or has not logged in yet then we do not want to > redirect, so we cannot redirect based on the host alone. Right, but I think you want to replace url.string()...&&... with url.host()...&&... > Do you think in DocumentLoader::responseReceived instead? Yes, or wherever it ends up being used. 1711827 7 katherine_cheney 2020-12-03 14:32:11 -0800 (In reply to Alex Christensen from comment #6) > (In reply to katherine_cheney from comment #5) > > It is a combination of the host being teams.microsoft.com and the query > > containing the "Retried+3+times+without+success" message that means the > > login has failed because no storage access. If the user has previously > > granted storage access or has not logged in yet then we do not want to > > redirect, so we cannot redirect based on the host alone. > Right, but I think you want to replace url.string()...&&... with > url.host()...&&... Oh! I see. Yes I will do that. > > Do you think in DocumentLoader::responseReceived instead? > Yes, or wherever it ends up being used. Ok, will fix. Thanks for looking! 1711861 8 415358 katherine_cheney 2020-12-03 15:32:41 -0800 Created attachment 415358 Patch 1711865 9 415358 achristensen 2020-12-03 15:35:14 -0800 Comment on attachment 415358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415358&action=review > Source/WebCore/loader/DocumentLoader.cpp:769 > +static URL microsoftTeamsRedirectURL() This should be inside #if ENABLE(RESOURCE_LOAD_STATISTICS) or just inline where it's used. 1711868 10 415362 katherine_cheney 2020-12-03 15:37:19 -0800 Created attachment 415362 Patch 1711903 11 katherine_cheney 2020-12-03 17:17:00 -0800 <rdar://problem/71391657> 1711911 12 ews-feeder 2020-12-03 17:32:49 -0800 Committed r270421: <https://trac.webkit.org/changeset/270421> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415362. 415331 2020-12-03 12:57:21 -0800 2020-12-03 15:32:39 -0800 Patch bug-219505-20201203125720.patch text/plain 4976 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzEwMDAxYmM1YmM0MTVk MzY1YTA0ZTgwYjA0ZTUxZWNkNmIwNGFhOS4uZTc0ODE0Mjc2YjBjODZlYzMwYjA0MzcxZGViZmRk YmZiODM0ZWQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTEyLTAzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIElzc3VlIGxv Z2dpbmcgaW4gdG8gTWljcm9zb2Z0IFRlYW1zIGlmIGxvZ2dlZCBpbnRvIG90aGVyIE1pY3Jvc29m dCBhY2NvdW50cyBhbmQgbmF2aWdhdGluZyBkaXJlY3RseSB0byB0ZWFtcy5taWNyb3NvZnQuY29t CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk1MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxMzkxNjU3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSB0ZW1wb3JhcnkgcXVpcmsgdG8g YXNzaXN0IGEgaGlnaC10cmFmZmljIHdlYnNpdGUgd2hpbGUgdGhleQorICAgICAgICBjb21wbGV0 ZSB0aGUgbGFyZ2UgdGFzayBvZiBtaWdyYXRpbmcgYXdheSBmcm9tIGxvZ2luIGZsb3dzIHRoYXQK KyAgICAgICAgcmVxdWlyZSB0aGlyZCBwYXJ0eSBjb29raWVzLiBUaGlzIHF1aXJrIHdpbGwgYmUg cmVtb3ZlZCB3aGVuIHRoZSBzaXRlCisgICAgICAgIGlzIHVwZGF0ZWQuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBzaXRlIHNwZWNpZmljIHF1aXJrLgorCisgICAgICAgIEluIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg3Nzggd2UgYWRkZWQgYSBxdWlyayB0bwor ICAgICAgICBjYWxsIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkgb24gYmVoYWxmIG9mIG1pY3Jvc29m dC5jb20gd2hlbiBsb2dnaW5nCisgICAgICAgIGludG8gTWljcm9zb2Z0IFRlYW1zLiBUaGlzIHBh dGNoIGNvdmVycyBhIGZpbmFsIGVkZ2UgY2FzZSB3aGVyZSBhIHVzZXIKKyAgICAgICAgd2FzIGxv Z2dlZCBpbnRvIG90aGVyIE1pY3Jvc29mdCBhY2NvdW50cyBwcmlvciB0byB0aGUgZml4LiBJbiB0 aGlzCisgICAgICAgIGNhc2UsIGlmIHRoZSB1c2VyIHRyaWVzIHRvIGdvIHN0cmFpZ2h0IHRvIHRl YW1zLm1pY3Jvc29mdC5jb20sIGFuIGVuZGxlc3MKKyAgICAgICAgcmVib290IGxvb3Agd2lsbCBv Y2N1ciBiZWNhdXNlIHRoZSBzaXRlIGhhcyBsb2dpbiBjcmVkZW50aWFscyBmcm9tIGEgcHJldmlv dXMKKyAgICAgICAgTWljcm9zb2Z0IGxvZ2luIGJ1dCBkb2VzIG5vdCBoYXZlIDNyZCBwYXJ0eSBj b29raWUgYWNjZXNzIHRvIGF1dGhlbnRpY2F0ZSB0aGUKKyAgICAgICAgbG9naW4gb24gdGVhbXMu bWljcm9zb2Z0LmNvbS4gVGhlIHNvbHV0aW9uIGlzIHRvIHJlZGlyZWN0IHRoZSB1c2VyIHRvCisg ICAgICAgIHRoZSBsb2dpbiBwYWdlIGZvciBUZWFtcyBvbiBtaWNyb3NvZnQuY29tIHdoZXJlIHRo ZSBwcmV2aW91cyBmaXggYWRkZWQKKyAgICAgICAgYSBTdG9yYWdlIEFjY2VzcyBwcm9tcHQuCisK KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OnJlY2VpdmVkRmlyc3REYXRhKToKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpRdWlya3M6OmlzTWljcm9zb2Z0VGVhbXNSZWRpcmVjdENhc2Up OgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjptaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKToK KyAgICAgICAgKiBwYWdlL1F1aXJrcy5oOgorCiAyMDIwLTExLTMwICBBZGl0eWEgS2VlcnRoaSAg PGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgcmVhbCBkYXRlcyBhbmQgdGltZXMg YXMgcGxhY2Vob2xkZXJzIGZvciBkYXRlL3RpbWUgaW5wdXRzIHdpdGggZWRpdGFibGUgY29tcG9u ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZmU0NjM4MDkyNzI1 MzA0N2ZjOWM5NjI0N2ExZmU1M2I1NzE5MTg1Mi4uYmRiNjdlZmI4ZmZjYjRmMWVkNjg4ZmY5ZmRl OWYwZmI4ZmNlNWYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC05 MSw2ICs5MSw3IEBACiAjaW5jbHVkZSAiTWVtb3J5UmVsZWFzZS5oIgogI2luY2x1ZGUgIk5hdmln YXRpb25EaXNhYmxlci5oIgogI2luY2x1ZGUgIk5hdmlnYXRpb25TY2hlZHVsZXIuaCIKKyNpbmNs dWRlICJOZXR3b3JrU3RvcmFnZVNlc3Npb24uaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VUcmFuc2l0aW9uRXZlbnQuaCIKQEAgLTcyMyw2ICs3 MjQsMTcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6cmVjZWl2ZWRGaXJzdERhdGEoKQogICAgIEFTU0VS VChtX2ZyYW1lLmRvY3VtZW50KCkpOwogICAgIGF1dG8mIGRvY3VtZW50ID0gKm1fZnJhbWUuZG9j dW1lbnQoKTsKIAorICAgIC8vIEZJWE1FKDIxODc3OSk6IFJlbW92ZSB0aGlzIHF1aXJrIG9uY2Ug bWljcm9zb2Z0LmNvbSBjb21wbGV0ZXMgdGhlaXIgbG9naW4gZmxvdyByZWRlc2lnbi4KKyAgICBp ZiAoUXVpcmtzOjppc01pY3Jvc29mdFRlYW1zUmVkaXJlY3RDYXNlKGRvY3VtZW50LnVybCgpKSkg eworICAgICAgICBhdXRvIGZpcnN0UGFydHlEb21haW4gPSBSZWdpc3RyYWJsZURvbWFpbihkb2N1 bWVudC51cmwoKSk7CisgICAgICAgIGlmIChhdXRvIGxvZ2luRG9tYWluID0gTmV0d29ya1N0b3Jh Z2VTZXNzaW9uOjpsb2dpbkRvbWFpbkZvckZpcnN0UGFydHkoZmlyc3RQYXJ0eURvbWFpbikpIHsK KyAgICAgICAgICAgIGlmICghUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpLmhhc0Nyb3Nz UGFnZVN0b3JhZ2VBY2Nlc3MoKmxvZ2luRG9tYWluLCBmaXJzdFBhcnR5RG9tYWluKSkgeworICAg ICAgICAgICAgICAgIG1fZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlUmVkaXJl Y3QoZG9jdW1lbnQsIDAsIFF1aXJrczo6bWljcm9zb2Z0VGVhbXNSZWRpcmVjdFVSTCgpKTsKKyAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisK ICAgICBMaW5rTG9hZGVyOjpsb2FkTGlua3NGcm9tSGVhZGVyKGRvY3VtZW50TG9hZGVyLnJlc3Bv bnNlKCkuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpMaW5rKSwgZG9jdW1lbnQudXJs KCksIGRvY3VtZW50LCBMaW5rTG9hZGVyOjpNZWRpYUF0dHJpYnV0ZUNoZWNrOjpNZWRpYUF0dHJp YnV0ZUVtcHR5KTsKIAogICAgIGRvdWJsZSBkZWxheTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcAppbmRl eCA2ZDRmNGQ0NTAwNWZmOWZjMmJjNDBmMDNmZWExMDYxMmZlMGViZDA0Li44OGQzZWFiYzVjOTFl YjA2ZDgzZDlmNmY2MDNlYzc4NWNjODYxMjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1F1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCkBAIC05 NzgsNiArOTc4LDE2IEBAIHN0YXRpYyBib29sIGlzTWljcm9zb2Z0RG9tYWluKGNvbnN0IFJlZ2lz dHJhYmxlRG9tYWluJiBkb21haW4pCiAKICAgICByZXR1cm4gZG9tYWluID09IG1pY3Jvc29mdERv dENvbSB8fCBkb21haW4gPT0gbGl2ZURvdENvbTsKIH0KKworYm9vbCBRdWlya3M6OmlzTWljcm9z b2Z0VGVhbXNSZWRpcmVjdENhc2UoY29uc3QgVVJMJiB1cmwpCit7CisgICAgcmV0dXJuIHVybC5z dHJpbmcoKS5jb250YWlucygidGVhbXMubWljcm9zb2Z0LmNvbSIpICYmIHVybC5xdWVyeSgpLnRv U3RyaW5nKCkuY29udGFpbnMoIlJldHJpZWQrMyt0aW1lcyt3aXRob3V0K3N1Y2Nlc3MiKTsKK30K KworVVJMIFF1aXJrczo6bWljcm9zb2Z0VGVhbXNSZWRpcmVjdFVSTCgpCit7CisgICAgcmV0dXJu IFVSTChVUkwoKSwgImh0dHBzOi8vd3d3Lm1pY3Jvc29mdC5jb20vZW4tdXMvbWljcm9zb2Z0LTM2 NS9taWNyb3NvZnQtdGVhbXMvIik7Cit9CiAjZW5kaWYKIAogUXVpcmtzOjpTdG9yYWdlQWNjZXNz UmVzdWx0IFF1aXJrczo6dHJpZ2dlck9wdGlvbmFsU3RvcmFnZUFjY2Vzc1F1aXJrKEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgcGxhdGZvcm1FdmVudCwgY29uc3Qg QXRvbVN0cmluZyYgZXZlbnRUeXBlLCBpbnQgZGV0YWlsLCBFbGVtZW50KiByZWxhdGVkVGFyZ2V0 KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKaW5kZXggNWE1ZjhjMTgyN2M5MDBlMmJlMzNlZjQ5Njgy OThjM2FiOWMzNDJmMy4uYzEzNzMwMTg5OGE2NjU5MWE2ZjZhMmM2ODRlNzg3MWMzOGY2OGM2YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1F1aXJrcy5oCkBAIC0xMjIsNiArMTIyLDExIEBAIHB1YmxpYzoKIAogICAgIGJv b2wgbmVlZHNCbGFja0Z1bGxzY3JlZW5CYWNrZ3JvdW5kUXVpcmsoKSBjb25zdDsKIAorI2lmIEVO QUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisgICAgc3RhdGljIGJvb2wgaXNNaWNyb3Nv ZnRUZWFtc1JlZGlyZWN0Q2FzZShjb25zdCBVUkwmKTsKKyAgICBzdGF0aWMgVVJMIG1pY3Jvc29m dFRlYW1zUmVkaXJlY3RVUkwoKTsKKyNlbmRpZgorCiBwcml2YXRlOgogICAgIGJvb2wgbmVlZHNR dWlya3MoKSBjb25zdDsKIAo= 415358 2020-12-03 15:32:41 -0800 2020-12-03 15:37:17 -0800 Patch bug-219505-20201203153240.patch text/plain 5478 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzEwMDAxYmM1YmM0MTVk MzY1YTA0ZTgwYjA0ZTUxZWNkNmIwNGFhOS4uZDc1YjVhYzEyYjQ5NGNiYzE3YWY0NzcyODkyNzk5 ZTBiZjM4ODMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTEyLTAzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIElzc3VlIGxv Z2dpbmcgaW4gdG8gTWljcm9zb2Z0IFRlYW1zIGlmIGxvZ2dlZCBpbnRvIG90aGVyIE1pY3Jvc29m dCBhY2NvdW50cyBhbmQgbmF2aWdhdGluZyBkaXJlY3RseSB0byB0ZWFtcy5taWNyb3NvZnQuY29t CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk1MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxMzkxNjU3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSB0ZW1wb3JhcnkgcXVpcmsgdG8g YXNzaXN0IGEgaGlnaC10cmFmZmljIHdlYnNpdGUgd2hpbGUgdGhleQorICAgICAgICBjb21wbGV0 ZSB0aGUgbGFyZ2UgdGFzayBvZiBtaWdyYXRpbmcgYXdheSBmcm9tIGxvZ2luIGZsb3dzIHRoYXQK KyAgICAgICAgcmVxdWlyZSB0aGlyZCBwYXJ0eSBjb29raWVzLiBUaGlzIHF1aXJrIHdpbGwgYmUg cmVtb3ZlZCB3aGVuIHRoZSBzaXRlCisgICAgICAgIGlzIHVwZGF0ZWQuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBzaXRlIHNwZWNpZmljIHF1aXJrLgorCisgICAgICAgIEluIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg3Nzggd2UgYWRkZWQgYSBxdWlyayB0bwor ICAgICAgICBjYWxsIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkgb24gYmVoYWxmIG9mIG1pY3Jvc29m dC5jb20gd2hlbiBsb2dnaW5nCisgICAgICAgIGludG8gTWljcm9zb2Z0IFRlYW1zLiBUaGlzIHBh dGNoIGNvdmVycyBhIGZpbmFsIGVkZ2UgY2FzZSB3aGVyZSBhIHVzZXIKKyAgICAgICAgd2FzIGxv Z2dlZCBpbnRvIG90aGVyIE1pY3Jvc29mdCBhY2NvdW50cyBwcmlvciB0byB0aGUgZml4LiBJbiB0 aGlzCisgICAgICAgIGNhc2UsIGlmIHRoZSB1c2VyIHRyaWVzIHRvIGdvIHN0cmFpZ2h0IHRvIHRl YW1zLm1pY3Jvc29mdC5jb20sIGFuIGVuZGxlc3MKKyAgICAgICAgcmVkaXJlY3QgbG9vcCB3aWxs IG9jY3VyIGJlY2F1c2UgdGhlIHNpdGUgaGFzIGxvZ2luIGNyZWRlbnRpYWxzIGZyb20gYSBwcmV2 aW91cworICAgICAgICBNaWNyb3NvZnQgbG9naW4gYnV0IGRvZXMgbm90IGhhdmUgM3JkIHBhcnR5 IGNvb2tpZSBhY2Nlc3MgdG8gYXV0aGVudGljYXRlIHRoZQorICAgICAgICBsb2dpbiBvbiB0ZWFt cy5taWNyb3NvZnQuY29tLiBUaGUgc29sdXRpb24gaXMgdG8gcmVkaXJlY3QgdGhlIHVzZXIgdG8K KyAgICAgICAgdGhlIGxvZ2luIHBhZ2UgZm9yIFRlYW1zIG9uIG1pY3Jvc29mdC5jb20gd2hlcmUg dGhlIHByZXZpb3VzIGZpeCBhZGRlZAorICAgICAgICBhIFN0b3JhZ2UgQWNjZXNzIHByb21wdC4K KworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjptaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpyZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpRdWlya3M6OmlzTWljcm9zb2Z0VGVhbXNSZWRpcmVjdFVSTCk6Cisg ICAgICAgICogcGFnZS9RdWlya3MuaDoKKwogMjAyMC0xMS0zMCAgQWRpdHlhIEtlZXJ0aGkgIDxh a2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIHJlYWwgZGF0ZXMgYW5kIHRpbWVzIGFz IHBsYWNlaG9sZGVycyBmb3IgZGF0ZS90aW1lIGlucHV0cyB3aXRoIGVkaXRhYmxlIGNvbXBvbmVu dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGZlYzUyNTQ3 YzAzOGUxOTA0MjgwYTVjNzIxNTgxNTgyNDc3NGZiZTkuLmE0Yzk5NWIwYTk2YTI1NmQ5NjdlMWU4 NmNiZTZmZmNmMGMzMGM4ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIkxvYWRlclN0cmF0ZWd5LmgiCiAjaW5j bHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1lbW9yeUNhY2hlLmgiCisjaW5jbHVkZSAiTmF2 aWdhdGlvblNjaGVkdWxlci5oIgogI2luY2x1ZGUgIk5ldHdvcmtMb2FkTWV0cmljcy5oIgogI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQaW5nTG9hZGVyLmgiCkBAIC03NjUsOSArNzY2LDMx IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0b3BMb2FkaW5nQWZ0ZXJYRnJhbWVPcHRpb25zT3JD b250ZW50U2VjdXJpdHlQb2xpY3lEZW5pZWQoCiAgICAgICAgIGNhbmNlbE1haW5SZXNvdXJjZUxv YWQoZnJhbWVMb2FkZXItPmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCkpOwogfQogCitzdGF0aWMg VVJMIG1pY3Jvc29mdFRlYW1zUmVkaXJlY3RVUkwoKQoreworICAgIHJldHVybiBVUkwoVVJMKCks ICJodHRwczovL3d3dy5taWNyb3NvZnQuY29tL2VuLXVzL21pY3Jvc29mdC0zNjUvbWljcm9zb2Z0 LXRlYW1zLyIpOworfQorCiB2b2lkIERvY3VtZW50TG9hZGVyOjpyZXNwb25zZVJlY2VpdmVkKENh Y2hlZFJlc291cmNlJiByZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2Us IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBB U1NFUlRfVU5VU0VEKHJlc291cmNlLCBtX21haW5SZXNvdXJjZSA9PSAmcmVzb3VyY2UpOworCisj aWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKKyAgICAvLyBGSVhNRSgyMTg3Nzkp OiBSZW1vdmUgdGhpcyBxdWlyayBvbmNlIG1pY3Jvc29mdC5jb20gY29tcGxldGVzIHRoZWlyIGxv Z2luIGZsb3cgcmVkZXNpZ24uCisgICAgaWYgKG1fZnJhbWUgJiYgbV9mcmFtZS0+ZG9jdW1lbnQo KSkgeworICAgICAgICBhdXRvJiBkb2N1bWVudCA9ICptX2ZyYW1lLT5kb2N1bWVudCgpOworICAg ICAgICBpZiAoUXVpcmtzOjppc01pY3Jvc29mdFRlYW1zUmVkaXJlY3RVUkwocmVzcG9uc2UudXJs KCkpKSB7CisgICAgICAgICAgICBhdXRvIGZpcnN0UGFydHlEb21haW4gPSBSZWdpc3RyYWJsZURv bWFpbihyZXNwb25zZS51cmwoKSk7CisgICAgICAgICAgICBpZiAoYXV0byBsb2dpbkRvbWFpbiA9 IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6bG9naW5Eb21haW5Gb3JGaXJzdFBhcnR5KGZpcnN0UGFy dHlEb21haW4pKSB7CisgICAgICAgICAgICAgICAgaWYgKCFSZXNvdXJjZUxvYWRPYnNlcnZlcjo6 c2hhcmVkKCkuaGFzQ3Jvc3NQYWdlU3RvcmFnZUFjY2VzcygqbG9naW5Eb21haW4sIGZpcnN0UGFy dHlEb21haW4pKSB7CisgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPm5hdmlnYXRpb25TY2hl ZHVsZXIoKS5zY2hlZHVsZVJlZGlyZWN0KGRvY3VtZW50LCAwLCBtaWNyb3NvZnRUZWFtc1JlZGly ZWN0VVJMKCkpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorI2VuZGlmCisKICNpZiBFTkFCTEUo U0VSVklDRV9XT1JLRVIpCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZl YXR1cmVzKCkuc2VydmljZVdvcmtlckVuYWJsZWQoKSAmJiByZXNwb25zZS5zb3VyY2UoKSA9PSBS ZXNvdXJjZVJlc3BvbnNlOjpTb3VyY2U6Ok1lbW9yeUNhY2hlKSB7CiAgICAgICAgIG1hdGNoUmVn aXN0cmF0aW9uKHJlc3BvbnNlLnVybCgpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCByZXNwb25zZSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKV0oYXV0byYmIHJlZ2lzdHJhdGlvbkRhdGEpIG11dGFibGUgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWly a3MuY3BwCmluZGV4IDZkNGY0ZDQ1MDA1ZmY5ZmMyYmM0MGYwM2ZlYTEwNjEyZmUwZWJkMDQuLjZj MDQ3YmZkZTJiZmUwZDQ0ZGJhNDVmZDFiZGMxMGFkNTUyNzgzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr cy5jcHAKQEAgLTk3OCw2ICs5NzgsMTEgQEAgc3RhdGljIGJvb2wgaXNNaWNyb3NvZnREb21haW4o Y29uc3QgUmVnaXN0cmFibGVEb21haW4mIGRvbWFpbikKIAogICAgIHJldHVybiBkb21haW4gPT0g bWljcm9zb2Z0RG90Q29tIHx8IGRvbWFpbiA9PSBsaXZlRG90Q29tOwogfQorCitib29sIFF1aXJr czo6aXNNaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKGNvbnN0IFVSTCYgdXJsKQoreworICAgIHJl dHVybiB1cmwuaG9zdCgpID09ICJ0ZWFtcy5taWNyb3NvZnQuY29tIl9zICYmIHVybC5xdWVyeSgp LnRvU3RyaW5nKCkuY29udGFpbnMoIlJldHJpZWQrMyt0aW1lcyt3aXRob3V0K3N1Y2Nlc3MiKTsK K30KICNlbmRpZgogCiBRdWlya3M6OlN0b3JhZ2VBY2Nlc3NSZXN1bHQgUXVpcmtzOjp0cmlnZ2Vy T3B0aW9uYWxTdG9yYWdlQWNjZXNzUXVpcmsoRWxlbWVudCYgZWxlbWVudCwgY29uc3QgUGxhdGZv cm1Nb3VzZUV2ZW50JiBwbGF0Zm9ybUV2ZW50LCBjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUs IGludCBkZXRhaWwsIEVsZW1lbnQqIHJlbGF0ZWRUYXJnZXQpIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3Mu aAppbmRleCA1YTVmOGMxODI3YzkwMGUyYmUzM2VmNDk2ODI5OGMzYWI5YzM0MmYzLi43YzVkMDZm NmVkY2M2YzYyOTMxZTQ5ZWQ4ZDU4YjI3MTk0MjhlMjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1F1aXJrcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKQEAg LTEyMiw2ICsxMjIsMTAgQEAgcHVibGljOgogCiAgICAgYm9vbCBuZWVkc0JsYWNrRnVsbHNjcmVl bkJhY2tncm91bmRRdWlyaygpIGNvbnN0OwogCisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RB VElTVElDUykKKyAgICBzdGF0aWMgYm9vbCBpc01pY3Jvc29mdFRlYW1zUmVkaXJlY3RVUkwoY29u c3QgVVJMJik7CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICBib29sIG5lZWRzUXVpcmtzKCkgY29u c3Q7CiAK 415362 2020-12-03 15:37:19 -0800 2020-12-03 17:32:49 -0800 Patch bug-219505-20201203153718.patch text/plain 5524 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzEwMDAxYmM1YmM0MTVk MzY1YTA0ZTgwYjA0ZTUxZWNkNmIwNGFhOS4uZDc1YjVhYzEyYjQ5NGNiYzE3YWY0NzcyODkyNzk5 ZTBiZjM4ODMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTEyLTAzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIElzc3VlIGxv Z2dpbmcgaW4gdG8gTWljcm9zb2Z0IFRlYW1zIGlmIGxvZ2dlZCBpbnRvIG90aGVyIE1pY3Jvc29m dCBhY2NvdW50cyBhbmQgbmF2aWdhdGluZyBkaXJlY3RseSB0byB0ZWFtcy5taWNyb3NvZnQuY29t CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk1MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxMzkxNjU3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSB0ZW1wb3JhcnkgcXVpcmsgdG8g YXNzaXN0IGEgaGlnaC10cmFmZmljIHdlYnNpdGUgd2hpbGUgdGhleQorICAgICAgICBjb21wbGV0 ZSB0aGUgbGFyZ2UgdGFzayBvZiBtaWdyYXRpbmcgYXdheSBmcm9tIGxvZ2luIGZsb3dzIHRoYXQK KyAgICAgICAgcmVxdWlyZSB0aGlyZCBwYXJ0eSBjb29raWVzLiBUaGlzIHF1aXJrIHdpbGwgYmUg cmVtb3ZlZCB3aGVuIHRoZSBzaXRlCisgICAgICAgIGlzIHVwZGF0ZWQuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBzaXRlIHNwZWNpZmljIHF1aXJrLgorCisgICAgICAgIEluIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg3Nzggd2UgYWRkZWQgYSBxdWlyayB0bwor ICAgICAgICBjYWxsIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkgb24gYmVoYWxmIG9mIG1pY3Jvc29m dC5jb20gd2hlbiBsb2dnaW5nCisgICAgICAgIGludG8gTWljcm9zb2Z0IFRlYW1zLiBUaGlzIHBh dGNoIGNvdmVycyBhIGZpbmFsIGVkZ2UgY2FzZSB3aGVyZSBhIHVzZXIKKyAgICAgICAgd2FzIGxv Z2dlZCBpbnRvIG90aGVyIE1pY3Jvc29mdCBhY2NvdW50cyBwcmlvciB0byB0aGUgZml4LiBJbiB0 aGlzCisgICAgICAgIGNhc2UsIGlmIHRoZSB1c2VyIHRyaWVzIHRvIGdvIHN0cmFpZ2h0IHRvIHRl YW1zLm1pY3Jvc29mdC5jb20sIGFuIGVuZGxlc3MKKyAgICAgICAgcmVkaXJlY3QgbG9vcCB3aWxs IG9jY3VyIGJlY2F1c2UgdGhlIHNpdGUgaGFzIGxvZ2luIGNyZWRlbnRpYWxzIGZyb20gYSBwcmV2 aW91cworICAgICAgICBNaWNyb3NvZnQgbG9naW4gYnV0IGRvZXMgbm90IGhhdmUgM3JkIHBhcnR5 IGNvb2tpZSBhY2Nlc3MgdG8gYXV0aGVudGljYXRlIHRoZQorICAgICAgICBsb2dpbiBvbiB0ZWFt cy5taWNyb3NvZnQuY29tLiBUaGUgc29sdXRpb24gaXMgdG8gcmVkaXJlY3QgdGhlIHVzZXIgdG8K KyAgICAgICAgdGhlIGxvZ2luIHBhZ2UgZm9yIFRlYW1zIG9uIG1pY3Jvc29mdC5jb20gd2hlcmUg dGhlIHByZXZpb3VzIGZpeCBhZGRlZAorICAgICAgICBhIFN0b3JhZ2UgQWNjZXNzIHByb21wdC4K KworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjptaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpyZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpRdWlya3M6OmlzTWljcm9zb2Z0VGVhbXNSZWRpcmVjdFVSTCk6Cisg ICAgICAgICogcGFnZS9RdWlya3MuaDoKKwogMjAyMC0xMS0zMCAgQWRpdHlhIEtlZXJ0aGkgIDxh a2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIHJlYWwgZGF0ZXMgYW5kIHRpbWVzIGFz IHBsYWNlaG9sZGVycyBmb3IgZGF0ZS90aW1lIGlucHV0cyB3aXRoIGVkaXRhYmxlIGNvbXBvbmVu dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGZlYzUyNTQ3 YzAzOGUxOTA0MjgwYTVjNzIxNTgxNTgyNDc3NGZiZTkuLmVmMzg2MTYyZGQwOTg4MDI2NmIyZTBh ZjZkYjc2MzQ1NGUzN2YwM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIkxvYWRlclN0cmF0ZWd5LmgiCiAjaW5j bHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1lbW9yeUNhY2hlLmgiCisjaW5jbHVkZSAiTmF2 aWdhdGlvblNjaGVkdWxlci5oIgogI2luY2x1ZGUgIk5ldHdvcmtMb2FkTWV0cmljcy5oIgogI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQaW5nTG9hZGVyLmgiCkBAIC03NjUsOSArNzY2LDMz IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0b3BMb2FkaW5nQWZ0ZXJYRnJhbWVPcHRpb25zT3JD b250ZW50U2VjdXJpdHlQb2xpY3lEZW5pZWQoCiAgICAgICAgIGNhbmNlbE1haW5SZXNvdXJjZUxv YWQoZnJhbWVMb2FkZXItPmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCkpOwogfQogCisjaWYgRU5B QkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKK3N0YXRpYyBVUkwgbWljcm9zb2Z0VGVhbXNS ZWRpcmVjdFVSTCgpCit7CisgICAgcmV0dXJuIFVSTChVUkwoKSwgImh0dHBzOi8vd3d3Lm1pY3Jv c29mdC5jb20vZW4tdXMvbWljcm9zb2Z0LTM2NS9taWNyb3NvZnQtdGVhbXMvIik7Cit9CisjZW5k aWYKKwogdm9pZCBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VSZWNlaXZlZChDYWNoZWRSZXNvdXJj ZSYgcmVzb3VyY2UsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUX1VOVVNF RChyZXNvdXJjZSwgbV9tYWluUmVzb3VyY2UgPT0gJnJlc291cmNlKTsKKworI2lmIEVOQUJMRShS RVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisgICAgLy8gRklYTUUoMjE4Nzc5KTogUmVtb3ZlIHRo aXMgcXVpcmsgb25jZSBtaWNyb3NvZnQuY29tIGNvbXBsZXRlcyB0aGVpciBsb2dpbiBmbG93IHJl ZGVzaWduLgorICAgIGlmIChtX2ZyYW1lICYmIG1fZnJhbWUtPmRvY3VtZW50KCkpIHsKKyAgICAg ICAgYXV0byYgZG9jdW1lbnQgPSAqbV9mcmFtZS0+ZG9jdW1lbnQoKTsKKyAgICAgICAgaWYgKFF1 aXJrczo6aXNNaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKHJlc3BvbnNlLnVybCgpKSkgeworICAg ICAgICAgICAgYXV0byBmaXJzdFBhcnR5RG9tYWluID0gUmVnaXN0cmFibGVEb21haW4ocmVzcG9u c2UudXJsKCkpOworICAgICAgICAgICAgaWYgKGF1dG8gbG9naW5Eb21haW4gPSBOZXR3b3JrU3Rv cmFnZVNlc3Npb246OmxvZ2luRG9tYWluRm9yRmlyc3RQYXJ0eShmaXJzdFBhcnR5RG9tYWluKSkg eworICAgICAgICAgICAgICAgIGlmICghUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpLmhh c0Nyb3NzUGFnZVN0b3JhZ2VBY2Nlc3MoKmxvZ2luRG9tYWluLCBmaXJzdFBhcnR5RG9tYWluKSkg eworICAgICAgICAgICAgICAgICAgICBtX2ZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuc2No ZWR1bGVSZWRpcmVjdChkb2N1bWVudCwgMCwgbWljcm9zb2Z0VGVhbXNSZWRpcmVjdFVSTCgpKTsK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgorCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09S S0VSKQogICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNl cnZpY2VXb3JrZXJFbmFibGVkKCkgJiYgcmVzcG9uc2Uuc291cmNlKCkgPT0gUmVzb3VyY2VSZXNw b25zZTo6U291cmNlOjpNZW1vcnlDYWNoZSkgewogICAgICAgICBtYXRjaFJlZ2lzdHJhdGlvbihy ZXNwb25zZS51cmwoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcmVz cG9uc2UsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKGF1 dG8mJiByZWdpc3RyYXRpb25EYXRhKSBtdXRhYmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcAppbmRl eCA2ZDRmNGQ0NTAwNWZmOWZjMmJjNDBmMDNmZWExMDYxMmZlMGViZDA0Li42YzA0N2JmZGUyYmZl MGQ0NGRiYTQ1ZmQxYmRjMTBhZDU1Mjc4MzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1F1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCkBAIC05 NzgsNiArOTc4LDExIEBAIHN0YXRpYyBib29sIGlzTWljcm9zb2Z0RG9tYWluKGNvbnN0IFJlZ2lz dHJhYmxlRG9tYWluJiBkb21haW4pCiAKICAgICByZXR1cm4gZG9tYWluID09IG1pY3Jvc29mdERv dENvbSB8fCBkb21haW4gPT0gbGl2ZURvdENvbTsKIH0KKworYm9vbCBRdWlya3M6OmlzTWljcm9z b2Z0VGVhbXNSZWRpcmVjdFVSTChjb25zdCBVUkwmIHVybCkKK3sKKyAgICByZXR1cm4gdXJsLmhv c3QoKSA9PSAidGVhbXMubWljcm9zb2Z0LmNvbSJfcyAmJiB1cmwucXVlcnkoKS50b1N0cmluZygp LmNvbnRhaW5zKCJSZXRyaWVkKzMrdGltZXMrd2l0aG91dCtzdWNjZXNzIik7Cit9CiAjZW5kaWYK IAogUXVpcmtzOjpTdG9yYWdlQWNjZXNzUmVzdWx0IFF1aXJrczo6dHJpZ2dlck9wdGlvbmFsU3Rv cmFnZUFjY2Vzc1F1aXJrKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVu dCYgcGxhdGZvcm1FdmVudCwgY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBpbnQgZGV0YWls LCBFbGVtZW50KiByZWxhdGVkVGFyZ2V0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9RdWlya3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKaW5kZXggNWE1 ZjhjMTgyN2M5MDBlMmJlMzNlZjQ5NjgyOThjM2FiOWMzNDJmMy4uN2M1ZDA2ZjZlZGNjNmM2Mjkz MWU0OWVkOGQ1OGIyNzE5NDI4ZTIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9R dWlya3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCkBAIC0xMjIsNiArMTIy LDEwIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgbmVlZHNCbGFja0Z1bGxzY3JlZW5CYWNrZ3JvdW5k UXVpcmsoKSBjb25zdDsKIAorI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisg ICAgc3RhdGljIGJvb2wgaXNNaWNyb3NvZnRUZWFtc1JlZGlyZWN0VVJMKGNvbnN0IFVSTCYpOwor I2VuZGlmCisKIHByaXZhdGU6CiAgICAgYm9vbCBuZWVkc1F1aXJrcygpIGNvbnN0OwogCg==