228095 2021-07-19 17:15:15 -0700 [curl][soup] NetworkSession::m_keptAliveLoads leaks NetworkResourceLoader 2021-08-26 00:51:16 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=214383 InRadar P2 Normal --- 1 fujii fujii ayumi_kojima basuke don.olmstead kkinnunen simon.fraser webkit-bug-importer youennf yurys oldest_to_newest 1778057 0 fujii 2021-07-19 17:15:15 -0700 [WinCairo] ASSERT(!m_networkLoad) fails in ~NetworkResourceLoader while shutting down WebKitNetworkProcess.exe 1. Start WinCairo WK2 MiniBrowser (Debug builds) 2. Visit some web sites 3. Close the MiniBrowser 4. The assertion fails Callstack: > WTF.dll!WTFCrash() Line 321 C++ > WebKit2.dll!WTFCrashWithInfo(int __formal, const char * __formal, const char * __formal, int __formal) Line 698 C++ > WebKit2.dll!WebKit::NetworkResourceLoader::() Line 137 C++ > WebKit2.dll!WebKit::NetworkResourceLoader::`scalar deleting destructor'(unsigned int) C++ > WebKit2.dll!std::default_delete<WebKit::NetworkResourceLoader>::operator()(WebKit::NetworkResourceLoader * _Ptr) Line 3120 C++ > WebKit2.dll!WTF::RefCounted<WebKit::NetworkResourceLoader,std::default_delete<WebKit::NetworkResourceLoader>>::deref() Line 191 C++ > WebKit2.dll!WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>::~Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>() Line 62 C++ > WebKit2.dll!WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>::`scalar deleting destructor'(unsigned int) C++ > WebKit2.dll!WTF::HashTable<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::IdentityExtractor,WTF::DefaultHash<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>>::deallocateTable(WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>> * table) Line 1228 C++ > WebKit2.dll!WTF::HashTable<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::IdentityExtractor,WTF::DefaultHash<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>>::~HashTable<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::IdentityExtractor,WTF::DefaultHash<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>>() Line 417 C++ > WebKit2.dll!WTF::HashSet<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::DefaultHash<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTableTraits>::~HashSet<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>,WTF::DefaultHash<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTraits<WTF::Ref<WebKit::NetworkResourceLoader,WTF::RawPtrTraits<WebKit::NetworkResourceLoader>>>,WTF::HashTableTraits>() C++ > WebKit2.dll!WebKit::NetworkSession::~NetworkSession() Line 140 C++ > WebKit2.dll!WebKit::NetworkSessionCurl::~NetworkSessionCurl() Line 59 C++ > WebKit2.dll!WebKit::NetworkSessionCurl::`scalar deleting destructor'(unsigned int) C++ > WebKit2.dll!std::default_delete<WebKit::NetworkSession>::operator()(WebKit::NetworkSession * _Ptr) Line 3120 C++ > WebKit2.dll!std::unique_ptr<WebKit::NetworkSession,std::default_delete<WebKit::NetworkSession>>::~unique_ptr<WebKit::NetworkSession,std::default_delete<WebKit::NetworkSession>>() Line 3232 C++ > WebKit2.dll!WebKit::NetworkProcess::destroySession(PAL::SessionID sessionID) Line 547 C++ > WebKit2.dll!WebKit::NetworkProcessMainCurl::platformFinalize() Line 39 C++ > WebKit2.dll!WebKit::AuxiliaryProcessMainBase<WebKit::NetworkProcess,0>::run(int argc, char * * argv) Line 73 C++ > WebKit2.dll!WebKit::AuxiliaryProcessMain<WebKit::NetworkProcessMainCurl>(int argc, char * * argv) Line 97 C++ > WebKit2.dll!WebKit::NetworkProcessMain(int argc, char * * argv) Line 45 C++ > WebKitNetworkProcess.exe!main(int argc, char * * argv) Line 35 C++ > [Inline Frame] WebKitNetworkProcess.exe!invoke_main() Line 78 C++ > WebKitNetworkProcess.exe!__scrt_common_main_seh() Line 288 C++ > kernel32.dll!00007ffd45127034() Unknown > ntdll.dll!00007ffd46f42651() Unknown 1778060 1 fujii 2021-07-19 17:27:04 -0700 > void NetworkProcess::destroySession(PAL::SessionID sessionID) > { > ASSERT(RunLoop::isMain()); > #if !USE(SOUP) && !USE(CURL) > // cURL and Soup based ports destroy the default session right before the process exits to avoid leaking > // network resources like the cookies database. > ASSERT(sessionID != PAL::SessionID::defaultSessionID()); > #endif > .... How should NetworkSession::m_keptAliveLoads be cleaned up? 1778075 2 fujii 2021-07-19 18:13:42 -0700 Can Cocoa ports fail this assertion? They don't destroy the default network session. How about non-default session? Can m_keptAliveLoads be non-empty for the non-default sessions? 1781181 3 webkit-bug-importer 2021-08-01 19:35:16 -0700 <rdar://problem/81393898> 1781191 4 fujii 2021-08-01 21:55:13 -0700 I don't know how to reproduce this assertion failure 100%. But, the following steps can often reproduce it. 1. Start WinCairo WK2 MiniBrowser (Debug builds) 2. Go to https://bugs.webkit.org/show_bug.cgi?id=228095 3. Go to https://www.yomiuri.co.jp/ 4. Go back 5. Close the MiniBrowser 6. The assertion fails https://www.yahoo.co.jp/ also can reproduce the assertion failure. I can't reproduce the assertion failure with http/wpt/fetch/fetch-in-pagehide.html test. 1781193 5 434737 fujii 2021-08-01 22:05:31 -0700 Created attachment 434737 WIP patch If the Fetch keepalive option is specified, and the page is navigated, the NetworkResourceLoader is transferred to the NetworkSession by NetworkConnectionToWebProcess::transferKeptAliveLoad. NetworkResourceLoader::didReceiveResponse replies PolicyAction::Ignore for the such kept alive loads. https://github.com/WebKit/WebKit/blob/66ab53513519a418038feff18f73c4f3f5b6b9be/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp#L674 NetworkDataTaskCurl should call NetworkLoad::didCompleteWithError for the kept alive load in such case. 1782424 6 fujii 2021-08-05 19:00:47 -0700 (In reply to Fujii Hironori from comment #2) > Can Cocoa ports fail this assertion? They don't destroy the default network > session. How about non-default session? Can m_keptAliveLoads be non-empty > for the non-default sessions? Yes, Mac port also fails the assertion. WinCairo has two problems, comment#5 problem and the same problem with Mac. I'm going to use this bug for curl port problem (comment#5). Filed a new bug ticket for common problem. Bug 228853 – ASSERTION FAILED: !m_networkLoad in NetworkResourceLoader::~NetworkResourceLoader() 1784721 7 fujii 2021-08-16 19:31:41 -0700 The assertion failure can't be reproduced after r280740 fixed Bug 228853. However, the WIP patch (attachment#434737) is still valid because curl port leaks kept alive NetworkResourceLoaders. 1784725 8 435658 fujii 2021-08-16 19:46:21 -0700 Created attachment 435658 Patch 1784726 9 435659 fujii 2021-08-16 19:55:11 -0700 Created attachment 435659 Patch 1784735 10 435662 fujii 2021-08-16 20:44:29 -0700 Created attachment 435662 Patch 1784754 11 435667 fujii 2021-08-16 23:56:19 -0700 Created attachment 435667 Patch 1784908 12 435667 fujii 2021-08-17 12:58:06 -0700 Comment on attachment 435667 Patch Clearing flags on attachment: 435667 Committed r281158 (240608@main): <https://commits.webkit.org/240608@main> 1784909 13 fujii 2021-08-17 12:58:10 -0700 All reviewed patches have been landed. Closing bug. 1785013 14 simon.fraser 2021-08-17 18:57:10 -0700 The test is failing in EWS: https://ews-build.s3-us-west-2.amazonaws.com/macOS-Catalina-Release-WK2-Tests-EWS/r435724-13625/results.html 1785023 15 fujii 2021-08-17 19:20:32 -0700 Committed r281177 (240623@main): <https://commits.webkit.org/240623@main> 1785173 16 ayumi_kojima 2021-08-18 10:58:01 -0700 It looks like http/tests/fetch/keepalive-fetch-2.html is still failing on Windows and (https://results.webkit.org/?suite=layout-tests&test=http%2Ftests%2Ffetch%2Fkeepalive-fetch-2.html)and Windows-EWS. 1785201 17 fujii 2021-08-18 13:13:00 -0700 Oh, sorry. I'm going to mark it as flaky and try to fix it in the following ticket. Bug 229247 – [Win] http/tests/fetch/keepalive-fetch-2.html is randomly failing 1787259 18 yurys 2021-08-25 12:48:17 -0700 (In reply to Fujii Hironori from comment #12) > Comment on attachment 435667 [details] > Patch > > Clearing flags on attachment: 435667 > > Committed r281158 (240608@main): <https://commits.webkit.org/240608@main> It looks like this change regressed inspector and console, previously on evaluating `fetch('http://localhost/')` in the context of about:blank page there would be a message: "Origin null is not allowed by Access-Control-Allow-Origin." which is now missing. Also the network failure is reported as just cancelled in this case: Inspector protocol message before: ◀ RECV {"method":"Target.dispatchMessageFromTarget","params":{"targetId":"page-7","message":"{\"method\":\"Network.loadingFailed\",\"params\":{\"requestId\":\"8.1\",\"timestamp\":0.1725471019744873,\"errorText\":\"Origin null is not allowed by Access-Control-Allow-Origin.\",\"canceled\":false}}"},"browserContextId":"8000000000000002","pageProxyId":"6"} Inspector protocol message after the change: ◀ RECV {"method":"Target.dispatchMessageFromTarget","params":{"targetId":"page-7","message":"{\"method\":\"Network.loadingFailed\",\"params\":{\"requestId\":\"8.1\",\"timestamp\":0.17682290077209473,\"errorText\":\"\",\"canceled\":true}}"},"browserContextId":"8000000000000002","pageProxyId":"6"} This playwright test demonstrates the issue (no console message anymore): https://github.com/microsoft/playwright/blob/de85d8bb83d0e36c994af938d7274853a462ccc9/tests/page/page-event-console.spec.ts#L95-L103 1787306 19 fujii 2021-08-25 14:07:33 -0700 (In reply to Yury Semikhatsky from comment #18) Thank you very much for the bug report. Filed: Bug 229515 – [curl] REGRESSION(r281158): fetch('http://localhost/') from about:blank doesn't emit the console error message 1787491 20 fujii 2021-08-26 00:28:27 -0700 r281614 reverted r281158. Reopened. 1787495 21 fujii 2021-08-26 00:45:29 -0700 This is not curl specific issue. As far as I tested, NetworkSession::removeKeptAliveLoad isn't called in GTK port for http/tests/fetch/keepalive-fetch-2.html. 1787498 22 fujii 2021-08-26 00:51:16 -0700 However, Mac port doesn't leak. It calls NetworkSession::removeKeptAliveLoad. Here is the callstack of that. #0 0x0000000115096b1c in WebKit::NetworkSession::removeKeptAliveLoad(WebKit::NetworkResourceLoader&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkSession.cpp:389 #1 0x0000000114fc2721 in WebKit::NetworkProcess::removeKeptAliveLoad(WebKit::NetworkResourceLoader&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkProcess.cpp:2672 #2 0x0000000114f4879e in WebKit::NetworkConnectionToWebProcess::didCleanupResourceLoader(WebKit::NetworkResourceLoader&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:173 #3 0x0000000114fcf680 in WebKit::NetworkResourceLoader::cleanup(WebKit::NetworkResourceLoader::LoadResult) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:475 #4 0x0000000114fcebe1 in WebKit::NetworkResourceLoader::didFailLoading(WebCore::ResourceError const&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:827 #5 0x0000000114f5904b in WebKit::NetworkLoad::didCompleteWithError(WebCore::ResourceError const&, WebCore::NetworkLoadMetrics const&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/NetworkLoad.cpp:255 #6 0x0000000114cf0375 in WebKit::NetworkDataTaskCocoa::didCompleteWithError(WebCore::ResourceError const&, WebCore::NetworkLoadMetrics const&) at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:449 #7 0x0000000114cf6fb5 in -[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:] at /Volumes/Data/webkit/gb/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:794 #8 0x00007fff248c67e3 in ___lldb_unnamed_symbol9274$$CFNetwork () #9 0x0000000108444032 in _dispatch_call_block_and_release () #10 0x0000000108445264 in _dispatch_client_callout () #11 0x000000010845533b in _dispatch_main_queue_callback_4CF () #12 0x00007fff204b25a8 in __CFRUNLOOP_IS_SERVICING_THE_MAIN_DISPATCH_QUEUE__ () #13 0x00007fff204747a2 in __CFRunLoopRun () #14 0x00007fff2047361c in CFRunLoopRunSpecific () #15 0x00007fff21203607 in -[NSRunLoop(NSRunLoop) runMode:beforeDate:] () #16 0x00007fff212914d1 in -[NSRunLoop(NSRunLoop) run] () #17 0x00007fff200cb38d in _xpc_objc_main () #18 0x00007fff200cacd3 in xpc_main () #19 0x00000001150cb055 in WebKit::XPCServiceMain(int, char const**) at /Volumes/Data/webkit/gb/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:243 #20 0x00000001168fb63b in WKXPCServiceMain at /Volumes/Data/webkit/gb/Source/WebKit/Shared/API/Cocoa/WKMain.mm:33 #21 0x000000010826cea2 in main at /Volumes/Data/webkit/gb/Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp:30 #22 0x00007fff20397f3d in start () #23 0x00007fff20397f3d in start () [WKNetworkSessionDelegate URLSession:task:didCompleteWithError:] calls didCompleteWithError. 434737 2021-08-01 22:05:31 -0700 2021-08-16 19:46:10 -0700 WIP patch a.diff text/plain 679 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0 YVRhc2tDdXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3Jr RGF0YVRhc2tDdXJsLmNwcAppbmRleCBlOWY5YjJjMjU3ODYuLjRkOWJkMjgwOTAxMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1 cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0 YVRhc2tDdXJsLmNwcApAQCAtMjM0LDYgKzIzNCw4IEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrQ3Vy bDo6aW52b2tlRGlkUmVjZWl2ZVJlc3BvbnNlKCkKICAgICAgICAgICAgICAgICBtX2N1cmxSZXF1 ZXN0LT5jb21wbGV0ZURpZFJlY2VpdmVSZXNwb25zZSgpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgUG9saWN5QWN0aW9uOjpJZ25vcmU6CisgICAgICAgICAgICBpZiAobV9jbGll bnQpCisgICAgICAgICAgICAgICAgbV9jbGllbnQtPmRpZENvbXBsZXRlV2l0aEVycm9yKFJlc291 cmNlRXJyb3JCYXNlOjpUeXBlOjpDYW5jZWxsYXRpb24pOwogICAgICAgICAgICAgaW52YWxpZGF0 ZUFuZENhbmNlbCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6Cg== 435658 2021-08-16 19:46:21 -0700 2021-08-16 19:55:01 -0700 Patch bug-228095-20210817114620.patch text/plain 6090 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0NWE4YWE4ODcwNjNmYzQ4 MjA5YWZiYjNmZmE3ZTBmYTgzZTBlNjEuLjkwNzUzZWVkNjYzNmZmNWQ0OWI5NDFkZjIxNmRjZjZm MDI0NzZhOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMTYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIEtlcHQg YWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVkIGJ5IE5ldHdv cmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Oklnbm9yZSBvZiBk aWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4OTg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBwYWdlIGRp c3BhdGNoZXMgYSBrZWVwYWxpdmUgZmV0Y2ggYW5kIHRoZSBwYWdlIGlzIG5hdmlnYXRlZAorICAg ICAgICBhd2F5LCB0aGUgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVyIGlzIHRyYW5zZmVycmVk IHRvIHRoZQorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBieSBOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6dHJhbnNmZXJLZXB0QWxpdmVMb2FkLgorICAgICAgICBBZnRlciB0aGUgTmV0d29y a1Jlc291cmNlTG9hZGVyIHJlY2VpdmVzIGEgcmVzcG9uc2UsIGl0IGlzIGNhbmNlbGVkCisgICAg ICAgIGJ5IFBvbGljeUFjdGlvbjo6SWdub3JlLgorCisgICAgICAgIEhvd2V2ZXIsIE5ldHdvcmtE YXRhVGFza0N1cmwgZGlkbid0IHByb3Blcmx5IGNhbmNlbCB0aGUga2VwdCBhbGl2ZQorICAgICAg ICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuIFRoZXkgcmVtYWluZWQgaW4gbV9rZXB0QWxpdmVMb2Fk cyBvZgorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBldmVuIGFmdGVyIHRoZSByZXF1ZXN0cyB3ZXJl IGNhbmNlbGVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZl dGNoLTIuaHRtbAorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrQ3VybDo6aW52b2tl RGlkUmVjZWl2ZVJlc3BvbnNlKTogQ2FsbCBkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lB Y3Rpb246Oklnbm9yZS4KKwogMjAyMS0wOC0xNSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEJ1ZyAyMjkxMTI6IFRocmVhZFNhbml0aXplcjogZGF0YSByYWNl cyBvZiBXVEY6OlN0cmluZyBpbiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tD dXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcAppbmRleCBlOWY5YjJjMjU3ODY2ZDkzMDBlNzk3ODFjYmVmM2FkZGM1OWNkOWRl Li40ZDliZDI4MDkwMTIxYmQ2MDljNjk3NjA1N2YwMWE5NjFiNjI0N2RiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1 cmwuY3BwCkBAIC0yMzQsNiArMjM0LDggQEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tDdXJsOjppbnZv a2VEaWRSZWNlaXZlUmVzcG9uc2UoKQogICAgICAgICAgICAgICAgIG1fY3VybFJlcXVlc3QtPmNv bXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBQb2xpY3lBY3Rpb246Oklnbm9yZToKKyAgICAgICAgICAgIGlmIChtX2NsaWVudCkKKyAg ICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VFcnJv ckJhc2U6OlR5cGU6OkNhbmNlbGxhdGlvbik7CiAgICAgICAgICAgICBpbnZhbGlkYXRlQW5kQ2Fu Y2VsKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZmVk MzMzNzdkMDAxYmE1MzE4MTFiODcwMmMwNGYyNWIzODI1MzNiLi41ZjBkMWI4NDQ0NDE5NzAyYjg3 YzdlODYxMGI0ZmFkZDIzNWUyMjQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDgtMTYg IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1 cmxdIEtlcHQgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVk IGJ5IE5ldHdvcmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Okln bm9yZSBvZiBkaWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4 OTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBodHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13 aW5kb3cuaHRtbDogQWRkZWQuCisKIDIwMjEtMDgtMTUgIEFyY2FkeSBHb2xkbWludHMtT3Jsb3Yg IDxhZ29sZG1pbnRzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dMSUJdIFVwZGF0ZSB0ZXN0IGV4 cGVjdGF0aW9ucyBhZnRlciByMjgwMDc3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjI0NzczNTU0NGZjNWU1MDcwNThhYzM3ODdiOGFiNThmMjA4ZGU3ZGMKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKworUEFTUyAxMCBrZWVwYWxpdmUgZmV0Y2hlcyBmb3Ig ZGVsYXllZCByZXNvdXJjZXMKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9m ZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRj aC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIxZWZkZjlmZGE0NmRkOGMzYmQ0 NzVmM2MyOGExZmNhNDcyMDhkZDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLmh0bWwKQEAgLTAsMCArMSwzMyBAQAorPCFE T0NUWVBFIGh0bWw+Cis8dGl0bGU+a2VlcGFsaXZlIGZldGNoZXM8L3RpdGxlPgorPHNjcmlwdCBz cmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9y ZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKyAgICBw cm9taXNlX3Rlc3QoYXN5bmMgZnVuY3Rpb24oKSB7CisgICAgICAgIC8vIENsZWFyCisgICAgICAg IHZhciBpZCA9IE1hdGgucmFuZG9tKCkudG9TdHJpbmcoKTsKKyAgICAgICAgbGV0IHN1ZmZpeGVz ID0gQXJyYXkuZnJvbShBcnJheSgxMCkua2V5cygpKTsKKyAgICAgICAgYXdhaXQgUHJvbWlzZS5h bGwoc3VmZml4ZXMubWFwKChpKSA9PiB7CisgICAgICAgICAgICB2YXIgZmlsZW5hbWUgPSAna2Vl cGFsaXZlLWZldGNoLTIuJyArIGlkICsgJy4nICsgaSArICcudHh0JzsKKyAgICAgICAgICAgIHJl dHVybiBmZXRjaCgncmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1jbGVhciZmaWxl bmFtZT0nICsgZmlsZW5hbWUpOworICAgICAgICB9KSk7CisgICAgICAgIC8vIFNldAorICAgICAg ICBsZXQgdzEgPSBvcGVuKCdyZXNvdXJjZXMva2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWwj JyArIGlkKTsKKyAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiB3MS5vbmxvYWQg PSByZXNvbHZlKTsKKyAgICAgICAgdzEubG9jYXRpb24gPSAnLyc7CisgICAgICAgIGF3YWl0IG5l dyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCAzMDAwKSk7CisgICAgICAg IC8vIEdldAorICAgICAgICBsZXQgdGV4dHMgPSBhd2FpdCBQcm9taXNlLmFsbChzdWZmaXhlcy5t YXAoYXN5bmMgKGkpID0+IHsKKyAgICAgICAgICAgIGxldCBmaWxlbmFtZSA9ICdrZWVwYWxpdmUt ZmV0Y2gtMi4nICsgaWQgKyAnLicgKyBpICsgJy50eHQnOworICAgICAgICAgICAgbGV0IHJlc3Bv bnNlID0gYXdhaXQgZmV0Y2goJ3Jlc291cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5weT9jbWQ9Z2V0 JmZpbGVuYW1lPScgKyBmaWxlbmFtZSk7CisgICAgICAgICAgICByZXR1cm4gYXdhaXQgcmVzcG9u c2UudGV4dCgpOworICAgICAgICB9KSk7CisgICAgICAgIC8vIENsZWFyCisgICAgICAgIGF3YWl0 IFByb21pc2UuYWxsKHN1ZmZpeGVzLm1hcCgoaSkgPT4geworICAgICAgICAgICAgdmFyIGZpbGVu YW1lID0gJ2tlZXBhbGl2ZS1mZXRjaC0yLicgKyBpZCArICcuJyArIGkgKyAnLnR4dCc7CisgICAg ICAgICAgICByZXR1cm4gZmV0Y2goJ3Jlc291cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5weT9jbWQ9 Y2xlYXImZmlsZW5hbWU9JyArIGZpbGVuYW1lKTsKKyAgICAgICAgfSkpOworICAgICAgICAvLyBU ZXN0CisgICAgICAgIHRleHRzLm1hcCgodGV4dCkgPT4gYXNzZXJ0X2VxdWFscyh0ZXh0LCBpZCkp OworICAgIH0sICIxMCBrZWVwYWxpdmUgZmV0Y2hlcyBmb3IgZGVsYXllZCByZXNvdXJjZXMiKTsK Kzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9yZXNv dXJjZXMva2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13aW5kb3cuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi44YTk5NTRkMzQ4NDY2NTIxNmE5YWI0N2IzYjA4ZWNhN2VkODc0NThkCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9yZXNvdXJjZXMva2VlcGFsaXZl LWZldGNoLTItd2luZG93Lmh0bWwKQEAgLTAsMCArMSw5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxz Y3JpcHQ+CisgICAgdmFyIGlkID0gbG9jYXRpb24uaGFzaC5zdWJzdHJpbmcoMSk7CisgICAgbGV0 IHN1ZmZpeGVzID0gQXJyYXkuZnJvbShBcnJheSgxMCkua2V5cygpKTsKKyAgICBzdWZmaXhlcy5t YXAoKGkpID0+IHsKKyAgICAgICAgdmFyIGZpbGVuYW1lID0gJ2tlZXBhbGl2ZS1mZXRjaC0yLicg KyBpZCArICcuJyArIGkgKyAnLnR4dCc7CisgICAgICAgIGZldGNoKCdnZXQtc2V0LXRlbXAtZmls ZS5weT9jbWQ9c2V0JmRlbGF5PTEwMDAmZmlsZW5hbWU9JyArIGZpbGVuYW1lICsgJyZkYXRhPScg KyBpZCwgeyBrZWVwYWxpdmU6IHRydWUgfSk7CisgICAgfSk7Cis8L3NjcmlwdD4K 435659 2021-08-16 19:55:11 -0700 2021-08-16 20:44:25 -0700 Patch bug-228095-20210817115510.patch text/plain 7547 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0NWE4YWE4ODcwNjNmYzQ4 MjA5YWZiYjNmZmE3ZTBmYTgzZTBlNjEuLjkwNzUzZWVkNjYzNmZmNWQ0OWI5NDFkZjIxNmRjZjZm MDI0NzZhOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMTYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIEtlcHQg YWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVkIGJ5IE5ldHdv cmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Oklnbm9yZSBvZiBk aWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4OTg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBwYWdlIGRp c3BhdGNoZXMgYSBrZWVwYWxpdmUgZmV0Y2ggYW5kIHRoZSBwYWdlIGlzIG5hdmlnYXRlZAorICAg ICAgICBhd2F5LCB0aGUgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVyIGlzIHRyYW5zZmVycmVk IHRvIHRoZQorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBieSBOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6dHJhbnNmZXJLZXB0QWxpdmVMb2FkLgorICAgICAgICBBZnRlciB0aGUgTmV0d29y a1Jlc291cmNlTG9hZGVyIHJlY2VpdmVzIGEgcmVzcG9uc2UsIGl0IGlzIGNhbmNlbGVkCisgICAg ICAgIGJ5IFBvbGljeUFjdGlvbjo6SWdub3JlLgorCisgICAgICAgIEhvd2V2ZXIsIE5ldHdvcmtE YXRhVGFza0N1cmwgZGlkbid0IHByb3Blcmx5IGNhbmNlbCB0aGUga2VwdCBhbGl2ZQorICAgICAg ICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuIFRoZXkgcmVtYWluZWQgaW4gbV9rZXB0QWxpdmVMb2Fk cyBvZgorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBldmVuIGFmdGVyIHRoZSByZXF1ZXN0cyB3ZXJl IGNhbmNlbGVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZl dGNoLTIuaHRtbAorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrQ3VybDo6aW52b2tl RGlkUmVjZWl2ZVJlc3BvbnNlKTogQ2FsbCBkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lB Y3Rpb246Oklnbm9yZS4KKwogMjAyMS0wOC0xNSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEJ1ZyAyMjkxMTI6IFRocmVhZFNhbml0aXplcjogZGF0YSByYWNl cyBvZiBXVEY6OlN0cmluZyBpbiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tD dXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcAppbmRleCBlOWY5YjJjMjU3ODY2ZDkzMDBlNzk3ODFjYmVmM2FkZGM1OWNkOWRl Li40ZDliZDI4MDkwMTIxYmQ2MDljNjk3NjA1N2YwMWE5NjFiNjI0N2RiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1 cmwuY3BwCkBAIC0yMzQsNiArMjM0LDggQEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tDdXJsOjppbnZv a2VEaWRSZWNlaXZlUmVzcG9uc2UoKQogICAgICAgICAgICAgICAgIG1fY3VybFJlcXVlc3QtPmNv bXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBQb2xpY3lBY3Rpb246Oklnbm9yZToKKyAgICAgICAgICAgIGlmIChtX2NsaWVudCkKKyAg ICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VFcnJv ckJhc2U6OlR5cGU6OkNhbmNlbGxhdGlvbik7CiAgICAgICAgICAgICBpbnZhbGlkYXRlQW5kQ2Fu Y2VsKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZmVk MzMzNzdkMDAxYmE1MzE4MTFiODcwMmMwNGYyNWIzODI1MzNiLi5jMTc1YzAzZTljMjRiOTViN2Iz ODYwODA1M2VkM2FlODY4YWRjMWE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDgtMTYg IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1 cmxdIEtlcHQgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVk IGJ5IE5ldHdvcmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Okln bm9yZSBvZiBkaWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4 OTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBodHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5w eTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9yZXNvdXJjZXMva2VlcGFsaXZl LWZldGNoLTItd2luZG93Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTA4LTE1ICBBcmNhZHkgR29sZG1p bnRzLU9ybG92ICA8YWdvbGRtaW50c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVcGRh dGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI4MDA3NwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi4yNDc3MzU1NDRmYzVlNTA3MDU4YWMzNzg3YjhhYjU4ZjIwOGRlN2RjCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0 Y2gtMi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACisKK1BBU1MgMTAga2VlcGFsaXZlIGZl dGNoZXMgZm9yIGRlbGF5ZWQgcmVzb3VyY2VzCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMWVmZGY5ZmRh NDZkZDhjM2JkNDc1ZjNjMjhhMWZjYTQ3MjA4ZGQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sCkBAIC0wLDAgKzEs MzMgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPmtlZXBhbGl2ZSBmZXRjaGVzPC90aXRsZT4K KzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQ+CisgICAgcHJvbWlzZV90ZXN0KGFzeW5jIGZ1bmN0aW9uKCkgeworICAgICAgICAvLyBDbGVh cgorICAgICAgICB2YXIgaWQgPSBNYXRoLnJhbmRvbSgpLnRvU3RyaW5nKCk7CisgICAgICAgIGxl dCBzdWZmaXhlcyA9IEFycmF5LmZyb20oQXJyYXkoMTApLmtleXMoKSk7CisgICAgICAgIGF3YWl0 IFByb21pc2UuYWxsKHN1ZmZpeGVzLm1hcCgoaSkgPT4geworICAgICAgICAgICAgdmFyIGZpbGVu YW1lID0gJ2tlZXBhbGl2ZS1mZXRjaC0yLicgKyBpZCArICcuJyArIGkgKyAnLnR4dCc7CisgICAg ICAgICAgICByZXR1cm4gZmV0Y2goJ3Jlc291cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5weT9jbWQ9 Y2xlYXImZmlsZW5hbWU9JyArIGZpbGVuYW1lKTsKKyAgICAgICAgfSkpOworICAgICAgICAvLyBT ZXQKKyAgICAgICAgbGV0IHcxID0gb3BlbigncmVzb3VyY2VzL2tlZXBhbGl2ZS1mZXRjaC0yLXdp bmRvdy5odG1sIycgKyBpZCk7CisgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4g dzEub25sb2FkID0gcmVzb2x2ZSk7CisgICAgICAgIHcxLmxvY2F0aW9uID0gJy8nOworICAgICAg ICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgMzAwMCkp OworICAgICAgICAvLyBHZXQKKyAgICAgICAgbGV0IHRleHRzID0gYXdhaXQgUHJvbWlzZS5hbGwo c3VmZml4ZXMubWFwKGFzeW5jIChpKSA9PiB7CisgICAgICAgICAgICBsZXQgZmlsZW5hbWUgPSAn a2VlcGFsaXZlLWZldGNoLTIuJyArIGlkICsgJy4nICsgaSArICcudHh0JzsKKyAgICAgICAgICAg IGxldCByZXNwb25zZSA9IGF3YWl0IGZldGNoKCdyZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZpbGUu cHk/Y21kPWdldCZmaWxlbmFtZT0nICsgZmlsZW5hbWUpOworICAgICAgICAgICAgcmV0dXJuIGF3 YWl0IHJlc3BvbnNlLnRleHQoKTsKKyAgICAgICAgfSkpOworICAgICAgICAvLyBDbGVhcgorICAg ICAgICBhd2FpdCBQcm9taXNlLmFsbChzdWZmaXhlcy5tYXAoKGkpID0+IHsKKyAgICAgICAgICAg IHZhciBmaWxlbmFtZSA9ICdrZWVwYWxpdmUtZmV0Y2gtMi4nICsgaWQgKyAnLicgKyBpICsgJy50 eHQnOworICAgICAgICAgICAgcmV0dXJuIGZldGNoKCdyZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZp bGUucHk/Y21kPWNsZWFyJmZpbGVuYW1lPScgKyBmaWxlbmFtZSk7CisgICAgICAgIH0pKTsKKyAg ICAgICAgLy8gVGVzdAorICAgICAgICB0ZXh0cy5tYXAoKHRleHQpID0+IGFzc2VydF9lcXVhbHMo dGV4dCwgaWQpKTsKKyAgICB9LCAiMTAga2VlcGFsaXZlIGZldGNoZXMgZm9yIGRlbGF5ZWQgcmVz b3VyY2VzIik7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv ZmV0Y2gvcmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5IGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9mZXRjaC9yZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZpbGUucHkKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjEy ZmNjNmU0ODJmZmU3OWVlZTNmOGNmNGE4MGI4NmNiYzNlNzAxOAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gvcmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxl LnB5CkBAIC0wLDAgKzEsMzUgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhvbjMKKworaW1wb3J0IG9z CitpbXBvcnQgc3lzCitpbXBvcnQgdGVtcGZpbGUKK2ltcG9ydCB0aW1lCitmcm9tIHVybGxpYi5w YXJzZSBpbXBvcnQgcGFyc2VfcXMKKworcXVlcnkgPSBwYXJzZV9xcyhvcy5lbnZpcm9uLmdldCgn UVVFUllfU1RSSU5HJywgJycpLCBrZWVwX2JsYW5rX3ZhbHVlcz1UcnVlKQorY21kID0gcXVlcnku Z2V0KCdjbWQnLCBbTm9uZV0pWzBdCitmaWxlbmFtZSA9IHF1ZXJ5LmdldCgnZmlsZW5hbWUnLCBb Tm9uZV0pWzBdCitkYXRhID0gcXVlcnkuZ2V0KCdkYXRhJywgWycnXSlbMF0KK2RlbGF5ID0gaW50 KHF1ZXJ5LmdldCgnZGVsYXknLCBbJzAnXSlbMF0pCisKK3RpbWUuc2xlZXAoZGVsYXkgLyAxMDAw LjApCisKK3RtcF9maWxlID0gb3MucGF0aC5qb2luKHRlbXBmaWxlLmdldHRlbXBkaXIoKSwgb3Mu cGF0aC5iYXNlbmFtZShmaWxlbmFtZSkpCisKK3N5cy5zdGRvdXQud3JpdGUoJ0NvbnRlbnQtVHlw ZTogdGV4dC9wbGFpblxyXG5cclxuJykKKworaWYgY21kID09ICdnZXQnOgorICAgIHdpdGggb3Bl bih0bXBfZmlsZSwgJ3InKSBhcyBvcGVuX2ZpbGU6CisgICAgICAgIHN5cy5zdGRvdXQud3JpdGUo b3Blbl9maWxlLnJlYWQoKSkKK2VsaWYgY21kID09ICdzZXQnOgorICAgIHdpdGggb3Blbih0bXBf ZmlsZSwgJ3cnKSBhcyBvcGVuX2ZpbGU6CisgICAgICAgIG9wZW5fZmlsZS53cml0ZShkYXRhKQor ICAgIHN5cy5zdGRvdXQud3JpdGUoJ1NldCB7fVxyXG4nLmZvcm1hdCh0bXBfZmlsZSkpCitlbGlm IGNtZCA9PSAnY2xlYXInOgorICAgIGlmIG9zLnBhdGguZXhpc3RzKHRtcF9maWxlKToKKyAgICAg ICAgb3MucmVtb3ZlKHRtcF9maWxlKQorICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdEZWxldGVk IHt9XHJcbicuZm9ybWF0KHRtcF9maWxlKSkKKyAgICBlbHNlOgorICAgICAgICBzeXMuc3Rkb3V0 LndyaXRlKCdObyBzdWNoIGZpbGU6IHt9XHJcbicuZm9ybWF0KHRtcF9maWxlKSkKK2Vsc2U6Cisg ICAgc3lzLnN0ZG91dC53cml0ZSgnVW5rbm93biBjb21tYW5kXHJcbicpCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13 aW5kb3cuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gvcmVzb3VyY2VzL2tlZXBh bGl2ZS1mZXRjaC0yLXdpbmRvdy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhhOTk1NGQzNDg0NjY1MjE2YTlh YjQ3YjNiMDhlY2E3ZWQ4NzQ1OGQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13aW5kb3cuaHRtbApAQCAt MCwwICsxLDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdD4KKyAgICB2YXIgaWQgPSBsb2Nh dGlvbi5oYXNoLnN1YnN0cmluZygxKTsKKyAgICBsZXQgc3VmZml4ZXMgPSBBcnJheS5mcm9tKEFy cmF5KDEwKS5rZXlzKCkpOworICAgIHN1ZmZpeGVzLm1hcCgoaSkgPT4geworICAgICAgICB2YXIg ZmlsZW5hbWUgPSAna2VlcGFsaXZlLWZldGNoLTIuJyArIGlkICsgJy4nICsgaSArICcudHh0JzsK KyAgICAgICAgZmV0Y2goJ2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1zZXQmZGVsYXk9MTAwMCZm aWxlbmFtZT0nICsgZmlsZW5hbWUgKyAnJmRhdGE9JyArIGlkLCB7IGtlZXBhbGl2ZTogdHJ1ZSB9 KTsKKyAgICB9KTsKKzwvc2NyaXB0Pgo= 435662 2021-08-16 20:44:29 -0700 2021-08-16 23:56:14 -0700 Patch bug-228095-20210816204428.patch text/plain 7536 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5NmE1ZTI0MDAxZmM0NjRm OTlmOWRiYTIyMTJmYWQ0ZjY4ZDczZTcuLjU4Y2Y1ODY4OTdmMGM1ZTNkZDdmYmIwYTdlZjIyYTBl ZTQwYjY5ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMTYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIEtlcHQg YWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVkIGJ5IE5ldHdv cmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Oklnbm9yZSBvZiBk aWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4OTg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBwYWdlIGRp c3BhdGNoZXMgYSBrZWVwYWxpdmUgZmV0Y2ggYW5kIHRoZSBwYWdlIGlzIG5hdmlnYXRlZAorICAg ICAgICBhd2F5LCB0aGUgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVyIGlzIHRyYW5zZmVycmVk IHRvIHRoZQorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBieSBOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6dHJhbnNmZXJLZXB0QWxpdmVMb2FkLgorICAgICAgICBBZnRlciB0aGUgTmV0d29y a1Jlc291cmNlTG9hZGVyIHJlY2VpdmVzIGEgcmVzcG9uc2UsIGl0IGlzIGNhbmNlbGVkCisgICAg ICAgIGJ5IFBvbGljeUFjdGlvbjo6SWdub3JlLgorCisgICAgICAgIEhvd2V2ZXIsIE5ldHdvcmtE YXRhVGFza0N1cmwgZGlkbid0IHByb3Blcmx5IGNhbmNlbCB0aGUga2VwdCBhbGl2ZQorICAgICAg ICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuIFRoZXkgcmVtYWluZWQgaW4gbV9rZXB0QWxpdmVMb2Fk cyBvZgorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBldmVuIGFmdGVyIHRoZSByZXF1ZXN0cyB3ZXJl IGNhbmNlbGVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZl dGNoLTIuaHRtbAorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrQ3VybDo6aW52b2tl RGlkUmVjZWl2ZVJlc3BvbnNlKTogQ2FsbCBkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lB Y3Rpb246Oklnbm9yZS4KKwogMjAyMS0wOC0xNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIERlbW90ZSB0aGUgcmVsZWFzZSBh c3NlcnRpb24gaW4gYFJlbW90ZVJlc291cmNlQ2FjaGU6OmVuc3VyZVJlc291cmNlVXNlQ291bnRl cmAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3Jr RGF0YVRhc2tDdXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3 b3JrRGF0YVRhc2tDdXJsLmNwcAppbmRleCBlOWY5YjJjMjU3ODY2ZDkzMDBlNzk3ODFjYmVmM2Fk ZGM1OWNkOWRlLi40ZDliZDI4MDkwMTIxYmQ2MDljNjk3NjA1N2YwMWE5NjFiNjI0N2RiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNr Q3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtE YXRhVGFza0N1cmwuY3BwCkBAIC0yMzQsNiArMjM0LDggQEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tD dXJsOjppbnZva2VEaWRSZWNlaXZlUmVzcG9uc2UoKQogICAgICAgICAgICAgICAgIG1fY3VybFJl cXVlc3QtPmNvbXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7CiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBQb2xpY3lBY3Rpb246Oklnbm9yZToKKyAgICAgICAgICAgIGlmIChtX2Ns aWVudCkKKyAgICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkQ29tcGxldGVXaXRoRXJyb3IoUmVz b3VyY2VFcnJvckJhc2U6OlR5cGU6OkNhbmNlbGxhdGlvbik7CiAgICAgICAgICAgICBpbnZhbGlk YXRlQW5kQ2FuY2VsKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAzMDk2NTUzZWFhYTQxODgxNzFlZmM4YzU3Zjk5MWMxOGE3YjljNTBkLi45OGUzMzlhZjMw Nzk5MmUwM2QzNmRjMGU5MzU5N2QwZGRiMGEwMmI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MjEtMDgtMTYgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAg ICAgICAgW2N1cmxdIEtlcHQgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUg Y2FuY2VsbGVkIGJ5IE5ldHdvcmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lB Y3Rpb246Oklnbm9yZSBvZiBkaWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODEzOTM4OTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9nZXQtc2V0LXRl bXAtZmlsZS5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9yZXNvdXJjZXMv a2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTA4LTE2ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJYUiBjb250ZXh0cyBoYXZl IHRvIHVzZSBoaWdoLXBvd2VyIEdQVXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u MjQ3NzM1NTQ0ZmM1ZTUwNzA1OGFjMzc4N2I4YWI1OGYyMDhkZTdkYwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTItZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIDEwIGtlZXBhbGl2ZSBmZXRjaGVzIGZvciBk ZWxheWVkIHJlc291cmNlcworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Zl dGNoL2tlZXBhbGl2ZS1mZXRjaC0yLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNo L2tlZXBhbGl2ZS1mZXRjaC0yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjFlZmRmOWZkYTQ2ZGQ4YzNiZDQ3 NWYzYzI4YTFmY2E0NzIwOGRkMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbApAQCAtMCwwICsxLDMzIEBACis8IURP Q1RZUEUgaHRtbD4KKzx0aXRsZT5rZWVwYWxpdmUgZmV0Y2hlczwvdGl0bGU+Cis8c2NyaXB0IHNy Yz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jl c291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorICAgIHBy b21pc2VfdGVzdChhc3luYyBmdW5jdGlvbigpIHsKKyAgICAgICAgLy8gQ2xlYXIKKyAgICAgICAg dmFyIGlkID0gTWF0aC5yYW5kb20oKS50b1N0cmluZygpOworICAgICAgICBsZXQgc3VmZml4ZXMg PSBBcnJheS5mcm9tKEFycmF5KDEwKS5rZXlzKCkpOworICAgICAgICBhd2FpdCBQcm9taXNlLmFs bChzdWZmaXhlcy5tYXAoKGkpID0+IHsKKyAgICAgICAgICAgIHZhciBmaWxlbmFtZSA9ICdrZWVw YWxpdmUtZmV0Y2gtMi4nICsgaWQgKyAnLicgKyBpICsgJy50eHQnOworICAgICAgICAgICAgcmV0 dXJuIGZldGNoKCdyZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZpbGUucHk/Y21kPWNsZWFyJmZpbGVu YW1lPScgKyBmaWxlbmFtZSk7CisgICAgICAgIH0pKTsKKyAgICAgICAgLy8gU2V0CisgICAgICAg IGxldCB3MSA9IG9wZW4oJ3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13aW5kb3cuaHRtbCMn ICsgaWQpOworICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHcxLm9ubG9hZCA9 IHJlc29sdmUpOworICAgICAgICB3MS5sb2NhdGlvbiA9ICcvJzsKKyAgICAgICAgYXdhaXQgbmV3 IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDMwMDApKTsKKyAgICAgICAg Ly8gR2V0CisgICAgICAgIGxldCB0ZXh0cyA9IGF3YWl0IFByb21pc2UuYWxsKHN1ZmZpeGVzLm1h cChhc3luYyAoaSkgPT4geworICAgICAgICAgICAgbGV0IGZpbGVuYW1lID0gJ2tlZXBhbGl2ZS1m ZXRjaC0yLicgKyBpZCArICcuJyArIGkgKyAnLnR4dCc7CisgICAgICAgICAgICBsZXQgcmVzcG9u c2UgPSBhd2FpdCBmZXRjaCgncmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1nZXQm ZmlsZW5hbWU9JyArIGZpbGVuYW1lKTsKKyAgICAgICAgICAgIHJldHVybiBhd2FpdCByZXNwb25z ZS50ZXh0KCk7CisgICAgICAgIH0pKTsKKyAgICAgICAgLy8gQ2xlYXIKKyAgICAgICAgYXdhaXQg UHJvbWlzZS5hbGwoc3VmZml4ZXMubWFwKChpKSA9PiB7CisgICAgICAgICAgICB2YXIgZmlsZW5h bWUgPSAna2VlcGFsaXZlLWZldGNoLTIuJyArIGlkICsgJy4nICsgaSArICcudHh0JzsKKyAgICAg ICAgICAgIHJldHVybiBmZXRjaCgncmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1j bGVhciZmaWxlbmFtZT0nICsgZmlsZW5hbWUpOworICAgICAgICB9KSk7CisgICAgICAgIC8vIFRl c3QKKyAgICAgICAgdGV4dHMubWFwKCh0ZXh0KSA9PiBhc3NlcnRfZXF1YWxzKHRleHQsIGlkKSk7 CisgICAgfSwgIjEwIGtlZXBhbGl2ZSBmZXRjaGVzIGZvciBkZWxheWVkIHJlc291cmNlcyIpOwor PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291 cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5weSBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gv cmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIxMmZjYzZlNDgyZmZl NzllZWUzZjhjZjRhODBiODZjYmMzZTcwMTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9nZXQtc2V0LXRlbXAtZmlsZS5weQpAQCAtMCww ICsxLDM1IEBACisjIS91c3IvYmluL2VudiBweXRob24zCisKK2ltcG9ydCBvcworaW1wb3J0IHN5 cworaW1wb3J0IHRlbXBmaWxlCitpbXBvcnQgdGltZQorZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0 IHBhcnNlX3FzCisKK3F1ZXJ5ID0gcGFyc2VfcXMob3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklO RycsICcnKSwga2VlcF9ibGFua192YWx1ZXM9VHJ1ZSkKK2NtZCA9IHF1ZXJ5LmdldCgnY21kJywg W05vbmVdKVswXQorZmlsZW5hbWUgPSBxdWVyeS5nZXQoJ2ZpbGVuYW1lJywgW05vbmVdKVswXQor ZGF0YSA9IHF1ZXJ5LmdldCgnZGF0YScsIFsnJ10pWzBdCitkZWxheSA9IGludChxdWVyeS5nZXQo J2RlbGF5JywgWycwJ10pWzBdKQorCit0aW1lLnNsZWVwKGRlbGF5IC8gMTAwMC4wKQorCit0bXBf ZmlsZSA9IG9zLnBhdGguam9pbih0ZW1wZmlsZS5nZXR0ZW1wZGlyKCksIG9zLnBhdGguYmFzZW5h bWUoZmlsZW5hbWUpKQorCitzeXMuc3Rkb3V0LndyaXRlKCdDb250ZW50LVR5cGU6IHRleHQvcGxh aW5cclxuXHJcbicpCisKK2lmIGNtZCA9PSAnZ2V0JzoKKyAgICB3aXRoIG9wZW4odG1wX2ZpbGUs ICdyJykgYXMgb3Blbl9maWxlOgorICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKG9wZW5fZmlsZS5y ZWFkKCkpCitlbGlmIGNtZCA9PSAnc2V0JzoKKyAgICB3aXRoIG9wZW4odG1wX2ZpbGUsICd3Jykg YXMgb3Blbl9maWxlOgorICAgICAgICBvcGVuX2ZpbGUud3JpdGUoZGF0YSkKKyAgICBzeXMuc3Rk b3V0LndyaXRlKCdTZXQge31cclxuJy5mb3JtYXQodG1wX2ZpbGUpKQorZWxpZiBjbWQgPT0gJ2Ns ZWFyJzoKKyAgICBpZiBvcy5wYXRoLmV4aXN0cyh0bXBfZmlsZSk6CisgICAgICAgIG9zLnJlbW92 ZSh0bXBfZmlsZSkKKyAgICAgICAgc3lzLnN0ZG91dC53cml0ZSgnRGVsZXRlZCB7fVxyXG4nLmZv cm1hdCh0bXBfZmlsZSkpCisgICAgZWxzZToKKyAgICAgICAgc3lzLnN0ZG91dC53cml0ZSgnTm8g c3VjaCBmaWxlOiB7fVxyXG4nLmZvcm1hdCh0bXBfZmlsZSkpCitlbHNlOgorICAgIHN5cy5zdGRv dXQud3JpdGUoJ1Vua25vd24gY29tbWFuZFxyXG4nKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9mZXRjaC9yZXNvdXJjZXMva2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWwg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUtZmV0Y2gt Mi13aW5kb3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YTk5NTRkMzQ4NDY2NTIxNmE5YWI0N2IzYjA4ZWNh N2VkODc0NThkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRj aC9yZXNvdXJjZXMva2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWwKQEAgLTAsMCArMSw5IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQ+CisgICAgdmFyIGlkID0gbG9jYXRpb24uaGFzaC5z dWJzdHJpbmcoMSk7CisgICAgbGV0IHN1ZmZpeGVzID0gQXJyYXkuZnJvbShBcnJheSgxMCkua2V5 cygpKTsKKyAgICBzdWZmaXhlcy5tYXAoKGkpID0+IHsKKyAgICAgICAgdmFyIGZpbGVuYW1lID0g J2tlZXBhbGl2ZS1mZXRjaC0yLicgKyBpZCArICcuJyArIGkgKyAnLnR4dCc7CisgICAgICAgIGZl dGNoKCdnZXQtc2V0LXRlbXAtZmlsZS5weT9jbWQ9c2V0JmRlbGF5PTEwMDAmZmlsZW5hbWU9JyAr IGZpbGVuYW1lICsgJyZkYXRhPScgKyBpZCwgeyBrZWVwYWxpdmU6IHRydWUgfSk7CisgICAgfSk7 Cis8L3NjcmlwdD4K 435667 2021-08-16 23:56:19 -0700 2021-08-17 12:58:06 -0700 Patch bug-228095-20210816235618.patch text/plain 7498 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI1MGUzMGE0MjZjY2FmZGE0 Mjk0ODM4NWU5ZjIxNTEwMGMwNzhiMzcuLmY2OWQwZmQzOWM1OTc5NGU2NjBjN2ZjMWU4NjMyMGFh NTY3MjVkODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMTYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIEtlcHQg YWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBzaG91bGQgYmUgY2FuY2VsbGVkIGJ5IE5ldHdv cmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lBY3Rpb246Oklnbm9yZSBvZiBk aWRSZWNlaXZlUmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODA5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEzOTM4OTg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBwYWdlIGRp c3BhdGNoZXMgYSBrZWVwYWxpdmUgZmV0Y2ggYW5kIHRoZSBwYWdlIGlzIG5hdmlnYXRlZAorICAg ICAgICBhd2F5LCB0aGUgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVyIGlzIHRyYW5zZmVycmVk IHRvIHRoZQorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBieSBOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6dHJhbnNmZXJLZXB0QWxpdmVMb2FkLgorICAgICAgICBBZnRlciB0aGUgTmV0d29y a1Jlc291cmNlTG9hZGVyIHJlY2VpdmVzIGEgcmVzcG9uc2UsIGl0IGlzIGNhbmNlbGVkCisgICAg ICAgIGJ5IFBvbGljeUFjdGlvbjo6SWdub3JlLgorCisgICAgICAgIEhvd2V2ZXIsIE5ldHdvcmtE YXRhVGFza0N1cmwgZGlkbid0IHByb3Blcmx5IGNhbmNlbCB0aGUga2VwdCBhbGl2ZQorICAgICAg ICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuIFRoZXkgcmVtYWluZWQgaW4gbV9rZXB0QWxpdmVMb2Fk cyBvZgorICAgICAgICBOZXR3b3JrU2Vzc2lvbiBldmVuIGFmdGVyIHRoZSByZXF1ZXN0cyB3ZXJl IGNhbmNlbGVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZl dGNoLTIuaHRtbAorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrQ3VybDo6aW52b2tl RGlkUmVjZWl2ZVJlc3BvbnNlKTogQ2FsbCBkaWRDb21wbGV0ZVdpdGhFcnJvciBvbiBQb2xpY3lB Y3Rpb246Oklnbm9yZS4KKwogMjAyMS0wOC0wNSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hl bmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBMb2FkV2ViQXJjaGl2ZS5GYWlsTmF2aWdhdGlvbjEg dGVzdCBpcyBhIGZhbHNlIHBvc2l0aXZlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHAKaW5kZXggZTlmOWIyYzI1 Nzg2NmQ5MzAwZTc5NzgxY2JlZjNhZGRjNTljZDlkZS4uNGQ5YmQyODA5MDEyMWJkNjA5YzY5NzYw NTdmMDFhOTYxYjYyNDdkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmNwcApAQCAtMjM0LDYgKzIzNCw4IEBA IHZvaWQgTmV0d29ya0RhdGFUYXNrQ3VybDo6aW52b2tlRGlkUmVjZWl2ZVJlc3BvbnNlKCkKICAg ICAgICAgICAgICAgICBtX2N1cmxSZXF1ZXN0LT5jb21wbGV0ZURpZFJlY2VpdmVSZXNwb25zZSgp OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUG9saWN5QWN0aW9uOjpJZ25vcmU6 CisgICAgICAgICAgICBpZiAobV9jbGllbnQpCisgICAgICAgICAgICAgICAgbV9jbGllbnQtPmRp ZENvbXBsZXRlV2l0aEVycm9yKFJlc291cmNlRXJyb3JCYXNlOjpUeXBlOjpDYW5jZWxsYXRpb24p OwogICAgICAgICAgICAgaW52YWxpZGF0ZUFuZENhbmNlbCgpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGRlZmF1bHQ6CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2I0MTRiZjBhZWE2MGNmM2YwMThmNDFkMzdmZTIz MGJkZDIxN2I1MS4uNzlhM2Y4YjQ0ZTVmZDFiNjFhNWYzZThkZTc3YjJmOTE0MzFlY2QyZSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA4LTE2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtjdXJsXSBLZXB0IGFsaXZlIE5ldHdvcmtSZXNv dXJjZUxvYWRlcnMgc2hvdWxkIGJlIGNhbmNlbGxlZCBieSBOZXR3b3JrTG9hZDo6ZGlkQ29tcGxl dGVXaXRoRXJyb3Igb24gUG9saWN5QWN0aW9uOjpJZ25vcmUgb2YgZGlkUmVjZWl2ZVJlc3BvbnNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgwOTUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMzkzODk4PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUt ZmV0Y2gtMi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvZmV0Y2gv a2VlcGFsaXZlLWZldGNoLTIuaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9mZXRj aC9yZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZpbGUucHk6IEFkZGVkLgorICAgICAgICAqIGh0dHAv dGVzdHMvZmV0Y2gvcmVzb3VyY2VzL2tlZXBhbGl2ZS1mZXRjaC0yLXdpbmRvdy5odG1sOiBBZGRl ZC4KKwogMjAyMS0wOC0wNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFJFR1JFU1NJT04gKHIyODA1NDEpOiBbIEJpZ1N1ciBEZWJ1ZyBdIGFjY2Vzc2liaWxpdHkv cm9sZXMtY29tcHV0ZWRSb2xlU3RyaW5nLmh0bWwgaXMgdGltaW5nIG91dApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL2tlZXBhbGl2ZS1mZXRjaC0yLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4yZjU1MTZhYjk1MjcyYTkwNDUwZDJhYWZhZjg3ZmUxZTQ1ZGYw OGFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVw YWxpdmUtZmV0Y2gtMi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACisKK1BBU1Mga2VlcGFs aXZlIGZldGNoZXMgZm9yIGRlbGF5ZWQgcmVzb3VyY2VzCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbCBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZjdh NDY3NzAzMjhiOWYyNTY4NGNhMWRhYjVmYTk2Njc3YzY1ZjVmCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9rZWVwYWxpdmUtZmV0Y2gtMi5odG1sCkBAIC0w LDAgKzEsMzMgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPmtlZXBhbGl2ZSBmZXRjaGVzPC90 aXRsZT4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4K KzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4K KzxzY3JpcHQ+CisgICAgcHJvbWlzZV90ZXN0KGFzeW5jICgpID0+IHsKKyAgICAgICAgLy8gQ2xl YXIKKyAgICAgICAgbGV0IGlkID0gTWF0aC5yYW5kb20oKS50b1N0cmluZygpOworICAgICAgICBs ZXQgc3VmZml4ZXMgPSBBcnJheS5mcm9tKEFycmF5KDUpLmtleXMoKSk7CisgICAgICAgIGF3YWl0 IFByb21pc2UuYWxsKHN1ZmZpeGVzLm1hcCgoaSkgPT4geworICAgICAgICAgICAgbGV0IGZpbGVu YW1lID0gYGtlZXBhbGl2ZS1mZXRjaC0yLiR7aWR9LiR7aX0udHh0YDsKKyAgICAgICAgICAgIHJl dHVybiBmZXRjaCgncmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1jbGVhciZmaWxl bmFtZT0nICsgZmlsZW5hbWUpOworICAgICAgICB9KSk7CisgICAgICAgIC8vIFNldAorICAgICAg ICBsZXQgdzEgPSBvcGVuKCdyZXNvdXJjZXMva2VlcGFsaXZlLWZldGNoLTItd2luZG93Lmh0bWwj JyArIGlkKTsKKyAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiB3MS5vbmxvYWQg PSByZXNvbHZlKTsKKyAgICAgICAgdzEubG9jYXRpb24gPSAnLyc7CisgICAgICAgIGF3YWl0IG5l dyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCAzMDAwKSk7CisgICAgICAg IC8vIEdldAorICAgICAgICBsZXQgdGV4dHMgPSBhd2FpdCBQcm9taXNlLmFsbChzdWZmaXhlcy5t YXAoYXN5bmMgKGkpID0+IHsKKyAgICAgICAgICAgIGxldCBmaWxlbmFtZSA9IGBrZWVwYWxpdmUt ZmV0Y2gtMi4ke2lkfS4ke2l9LnR4dGA7CisgICAgICAgICAgICBsZXQgcmVzcG9uc2UgPSBhd2Fp dCBmZXRjaCgncmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5P2NtZD1nZXQmZmlsZW5hbWU9 JyArIGZpbGVuYW1lKTsKKyAgICAgICAgICAgIHJldHVybiBhd2FpdCByZXNwb25zZS50ZXh0KCk7 CisgICAgICAgIH0pKTsKKyAgICAgICAgLy8gQ2xlYXIKKyAgICAgICAgYXdhaXQgUHJvbWlzZS5h bGwoc3VmZml4ZXMubWFwKChpKSA9PiB7CisgICAgICAgICAgICBsZXQgZmlsZW5hbWUgPSBga2Vl cGFsaXZlLWZldGNoLTIuJHtpZH0uJHtpfS50eHRgOworICAgICAgICAgICAgcmV0dXJuIGZldGNo KCdyZXNvdXJjZXMvZ2V0LXNldC10ZW1wLWZpbGUucHk/Y21kPWNsZWFyJmZpbGVuYW1lPScgKyBm aWxlbmFtZSk7CisgICAgICAgIH0pKTsKKyAgICAgICAgLy8gVGVzdAorICAgICAgICB0ZXh0cy5t YXAoKHRleHQpID0+IGFzc2VydF9lcXVhbHModGV4dCwgaWQpKTsKKyAgICB9LCAia2VlcGFsaXZl IGZldGNoZXMgZm9yIGRlbGF5ZWQgcmVzb3VyY2VzIik7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gvcmVzb3VyY2VzL2dldC1zZXQtdGVtcC1maWxl LnB5IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9mZXRjaC9yZXNvdXJjZXMvZ2V0LXNldC10ZW1w LWZpbGUucHkKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMjEyZmNjNmU0ODJmZmU3OWVlZTNmOGNmNGE4MGI4NmNiYzNl NzAxOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvZmV0Y2gvcmVz b3VyY2VzL2dldC1zZXQtdGVtcC1maWxlLnB5CkBAIC0wLDAgKzEsMzUgQEAKKyMhL3Vzci9iaW4v ZW52IHB5dGhvbjMKKworaW1wb3J0IG9zCitpbXBvcnQgc3lzCitpbXBvcnQgdGVtcGZpbGUKK2lt cG9ydCB0aW1lCitmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgcGFyc2VfcXMKKworcXVlcnkgPSBw YXJzZV9xcyhvcy5lbnZpcm9uLmdldCgnUVVFUllfU1RSSU5HJywgJycpLCBrZWVwX2JsYW5rX3Zh bHVlcz1UcnVlKQorY21kID0gcXVlcnkuZ2V0KCdjbWQnLCBbTm9uZV0pWzBdCitmaWxlbmFtZSA9 IHF1ZXJ5LmdldCgnZmlsZW5hbWUnLCBbTm9uZV0pWzBdCitkYXRhID0gcXVlcnkuZ2V0KCdkYXRh JywgWycnXSlbMF0KK2RlbGF5ID0gaW50KHF1ZXJ5LmdldCgnZGVsYXknLCBbJzAnXSlbMF0pCisK K3RpbWUuc2xlZXAoZGVsYXkgLyAxMDAwLjApCisKK3RtcF9maWxlID0gb3MucGF0aC5qb2luKHRl bXBmaWxlLmdldHRlbXBkaXIoKSwgb3MucGF0aC5iYXNlbmFtZShmaWxlbmFtZSkpCisKK3N5cy5z dGRvdXQud3JpdGUoJ0NvbnRlbnQtVHlwZTogdGV4dC9wbGFpblxyXG5cclxuJykKKworaWYgY21k ID09ICdnZXQnOgorICAgIHdpdGggb3Blbih0bXBfZmlsZSwgJ3InKSBhcyBvcGVuX2ZpbGU6Cisg ICAgICAgIHN5cy5zdGRvdXQud3JpdGUob3Blbl9maWxlLnJlYWQoKSkKK2VsaWYgY21kID09ICdz ZXQnOgorICAgIHdpdGggb3Blbih0bXBfZmlsZSwgJ3cnKSBhcyBvcGVuX2ZpbGU6CisgICAgICAg IG9wZW5fZmlsZS53cml0ZShkYXRhKQorICAgIHN5cy5zdGRvdXQud3JpdGUoJ1NldCB7fVxyXG4n LmZvcm1hdCh0bXBfZmlsZSkpCitlbGlmIGNtZCA9PSAnY2xlYXInOgorICAgIGlmIG9zLnBhdGgu ZXhpc3RzKHRtcF9maWxlKToKKyAgICAgICAgb3MucmVtb3ZlKHRtcF9maWxlKQorICAgICAgICBz eXMuc3Rkb3V0LndyaXRlKCdEZWxldGVkIHt9XHJcbicuZm9ybWF0KHRtcF9maWxlKSkKKyAgICBl bHNlOgorICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdObyBzdWNoIGZpbGU6IHt9XHJcbicuZm9y bWF0KHRtcF9maWxlKSkKK2Vsc2U6CisgICAgc3lzLnN0ZG91dC53cml0ZSgnVW5rbm93biBjb21t YW5kXHJcbicpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291 cmNlcy9rZWVwYWxpdmUtZmV0Y2gtMi13aW5kb3cuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvZmV0Y2gvcmVzb3VyY2VzL2tlZXBhbGl2ZS1mZXRjaC0yLXdpbmRvdy5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmU5Zjc3NTBhMjU5YTA1NDJjNDI2MjM3YWZkZmQ1OGU0YzUzNmFhYjcKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2ZldGNoL3Jlc291cmNlcy9rZWVwYWxpdmUt ZmV0Y2gtMi13aW5kb3cuaHRtbApAQCAtMCwwICsxLDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNj cmlwdD4KKyAgICB2YXIgaWQgPSBsb2NhdGlvbi5oYXNoLnN1YnN0cmluZygxKTsKKyAgICBsZXQg c3VmZml4ZXMgPSBBcnJheS5mcm9tKEFycmF5KDUpLmtleXMoKSk7CisgICAgc3VmZml4ZXMubWFw KChpKSA9PiB7CisgICAgICAgIGxldCBmaWxlbmFtZSA9IGBrZWVwYWxpdmUtZmV0Y2gtMi4ke2lk fS4ke2l9LnR4dGA7CisgICAgICAgIGZldGNoKGBnZXQtc2V0LXRlbXAtZmlsZS5weT9jbWQ9c2V0 JmRlbGF5PTEwMDAmZmlsZW5hbWU9JHtmaWxlbmFtZX0mZGF0YT0ke2lkfWAsIHsga2VlcGFsaXZl OiB0cnVlIH0pOworICAgIH0pOworPC9zY3JpcHQ+Cg==