228932 2021-08-09 16:34:40 -0700 ThreadSanitizer: data race in WTF::StringImpl::deref() under WebKit::WebProcessPool::setMediaAccessibilityPreferences() 2021-08-10 08:20:47 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227617 1 ddkilzer ddkilzer cdumez cfleizach kkinnunen webkit-bug-importer oldest_to_newest 1783020 0 ddkilzer 2021-08-09 16:34:40 -0700 ThreadSanitizer: data race in WTF::StringImpl::deref() under WebKit::WebProcessPool::setMediaAccessibilityPreferences(). In Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm, the following code sends a Vector<WTF::String> object from a background thread to the main thread without an isolated copy of the WTF::String objects: #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) void WebProcessPool::setMediaAccessibilityPreferences(WebProcessProxy& process) { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [weakProcess = makeWeakPtr(process)] { auto captionDisplayMode = WebCore::CaptionUserPreferencesMediaAF::platformCaptionDisplayMode(); auto preferredLanguages = WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages(); callOnMainRunLoop([weakProcess, captionDisplayMode, preferredLanguages] { if (weakProcess) weakProcess->send(Messages::WebProcess::SetMediaAccessibilityPreferences(captionDisplayMode, preferredLanguages), 0); }); }); } #endif -- Thread sanitizer warning while running LayoutTests/crypto/crypto-random-values-types.html with WebKit r280760: WARNING: ThreadSanitizer: data race (pid=46345) Read of size 4 at 0x7b080000ea00 by main thread: #0 WTF::StringImpl::deref() <null> (WebKit:x86_64+0x7aca) #1 WTF::VectorDestructor<true, WTF::String>::destruct(WTF::String*, WTF::String*) <null> (WebKit:x86_64+0x9867) #2 WTF::VectorTypeOperations<WTF::String>::destruct(WTF::String*, WTF::String*) <null> (WebKit:x86_64+0x97b0) #3 WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>::~Vector() <null> (WebKit:x86_64+0x974f) #4 WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>::~Vector() <null> (WebKit:x86_64+0x6eb9) #5 WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const::'lambda'()::~() <null> (WebKit:x86_64+0x10cc72a) #6 WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const::'lambda'()::~() <null> (WebKit:x86_64+0x10cba49) #7 WTF::Detail::CallableWrapper<WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const::'lambda'(), void>::~CallableWrapper() <null> (WebKit:x86_64+0x10cbe00) #8 WTF::Detail::CallableWrapper<WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const::'lambda'(), void>::~CallableWrapper() <null> (WebKit:x86_64+0x10cbcc9) #9 WTF::Detail::CallableWrapper<WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const::'lambda'(), void>::~CallableWrapper() <null> (WebKit:x86_64+0x10cbcf9) #10 std::__1::default_delete<WTF::Detail::CallableWrapperBase<void> >::operator()(WTF::Detail::CallableWrapperBase<void>*) const <null> (JavaScriptCore:x86_64+0x149c7) #11 std::__1::unique_ptr<WTF::Detail::CallableWrapperBase<void>, std::__1::default_delete<WTF::Detail::CallableWrapperBase<void> > >::reset(WTF::Detail::CallableWrapperBase<void>*) <null> (JavaScriptCore:x86_64+0x1492d) #12 std::__1::unique_ptr<WTF::Detail::CallableWrapperBase<void>, std::__1::default_delete<WTF::Detail::CallableWrapperBase<void> > >::~unique_ptr() <null> (JavaScriptCore:x86_64+0x148bb) #13 std::__1::unique_ptr<WTF::Detail::CallableWrapperBase<void>, std::__1::default_delete<WTF::Detail::CallableWrapperBase<void> > >::~unique_ptr() <null> (JavaScriptCore:x86_64+0x14889) #14 WTF::Function<void ()>::~Function() <null> (JavaScriptCore:x86_64+0x14859) #15 WTF::Function<void ()>::~Function() <null> (JavaScriptCore:x86_64+0x134a9) #16 WTF::RunLoop::performWork() <null> (JavaScriptCore:x86_64+0x8d9aa) #17 WTF::RunLoop::performWork(void*) <null> (JavaScriptCore:x86_64+0x9072a) #18 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ <null> (CoreFoundation:x86_64+0x81354) #19 WTR::TestController::runUntil(bool&, WTF::Seconds) <null> (WebKitTestRunner:x86_64+0x100054a1b) #20 WTR::TestController::resetStateToConsistentValues(WTR::TestOptions const&, WTR::TestController::ResetStage)::$_4::operator()() const <null> (WebKitTestRunner:x86_64+0x10005a0b8) #21 WTR::TestController::resetStateToConsistentValues(WTR::TestOptions const&, WTR::TestController::ResetStage) <null> (WebKitTestRunner:x86_64+0x100059032) #22 WTR::TestController::ensureViewSupportsOptionsForTest(WTR::TestInvocation const&) <null> (WebKitTestRunner:x86_64+0x1000587ae) #23 WTR::TestController::configureViewForTest(WTR::TestInvocation const&) <null> (WebKitTestRunner:x86_64+0x10005b480) #24 WTR::TestInvocation::invoke() <null> (WebKitTestRunner:x86_64+0x10009784c) #25 WTR::TestController::runTest(char const*) <null> (WebKitTestRunner:x86_64+0x10005b66e) #26 WTR::TestController::runTestingServerLoop() <null> (WebKitTestRunner:x86_64+0x10005ba17) #27 WTR::TestController::run() <null> (WebKitTestRunner:x86_64+0x10005523d) #28 WTR::TestController::TestController(int, char const**) <null> (WebKitTestRunner:x86_64+0x100054d4b) #29 WTR::TestController::TestController(int, char const**) <null> (WebKitTestRunner:x86_64+0x1000552e9) #30 main <null> (WebKitTestRunner:x86_64+0x10000804a) Previous write of size 4 at 0x7b080000ea00 by thread T3: #0 WTF::StringImpl::deref() <null> (WebKit:x86_64+0x7ada) #1 WTF::VectorDestructor<true, WTF::String>::destruct(WTF::String*, WTF::String*) <null> (WebKit:x86_64+0x9867) #2 WTF::VectorTypeOperations<WTF::String>::destruct(WTF::String*, WTF::String*) <null> (WebKit:x86_64+0x97b0) #3 WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>::~Vector() <null> (WebKit:x86_64+0x974f) #4 WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>::~Vector() <null> (WebKit:x86_64+0x6eb9) #5 WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const <null> (WebKit:x86_64+0x10988c3) #6 invocation function for block in WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&) <null> (WebKit:x86_64+0x109882d) #7 __tsan::invoke_and_release_block(void*) <null> (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x7377b) #8 _dispatch_client_callout <null> (libdispatch.dylib:x86_64+0x34ff) Location is heap block of size 24 at 0x7b080000ea00 allocated by thread T3: #0 __sanitizer_mz_malloc <null> (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x5168a) #1 _malloc_zone_malloc <null> (libsystem_malloc.dylib:x86_64+0x1cf80) #2 bmalloc::Cache::allocateSlowCaseNullCache(bmalloc::HeapKind, unsigned long) <null> (JavaScriptCore:x86_64+0x11d240) #3 bmalloc::Cache::allocate(bmalloc::HeapKind, unsigned long) <null> (JavaScriptCore:x86_64+0x37629) #4 WTF::fastMalloc(unsigned long) <null> (JavaScriptCore:x86_64+0x36e5b) #5 WTF::StringImpl::operator new(unsigned long) <null> (JavaScriptCore:x86_64+0x34b69) #6 WTF::StringImpl::adopt(WTF::StringBuffer<unsigned char>&&) <null> (JavaScriptCore:x86_64+0xa6374) #7 WTF::String::String(__CFString const*) <null> (JavaScriptCore:x86_64+0x9ca9e) #8 WTF::String::String(__CFString const*) <null> (JavaScriptCore:x86_64+0x9cd20) #9 WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages() <null> (WebCore:x86_64+0x2de4689) #10 WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&)::$_3::operator()() const <null> (WebKit:x86_64+0x1098876) #11 invocation function for block in WebKit::WebProcessPool::setMediaAccessibilityPreferences(WebKit::WebProcessProxy&) <null> (WebKit:x86_64+0x109882d) #12 __tsan::invoke_and_release_block(void*) <null> (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x7377b) #13 _dispatch_client_callout <null> (libdispatch.dylib:x86_64+0x34ff) Thread T3 (tid=12850431, running) is a GCD worker thread SUMMARY: ThreadSanitizer: data race (WebKitBuild/WebKit.framework/Versions/A/WebKit:x86_64+0x7aca) in WTF::StringImpl::deref()+0x1a 1783023 1 435225 ddkilzer 2021-08-09 16:37:52 -0700 Created attachment 435225 Patch v1 1783024 2 435225 ddkilzer 2021-08-09 16:39:47 -0700 Comment on attachment 435225 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=435225&action=review > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:192 > - callOnMainRunLoop([weakProcess, captionDisplayMode, preferredLanguages] { > + callOnMainRunLoop([weakProcess, captionDisplayMode, preferredLanguages = preferredLanguages.isolatedCopy()] { I opted to make an isolatedCopy() here because the other use of WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages() in Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm didn't involve separate threads: #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) void WebProcessPool::mediaAccessibilityPreferencesChangedCallback(CFNotificationCenterRef, void *observer, CFStringRef name, const void *, CFDictionaryRef userInfo) { auto* pool = reinterpret_cast<WebProcessPool*>(observer); auto captionDisplayMode = WebCore::CaptionUserPreferencesMediaAF::platformCaptionDisplayMode(); auto preferredLanguages = WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages(); pool->sendToAllProcesses(Messages::WebProcess::SetMediaAccessibilityPreferences(captionDisplayMode, preferredLanguages)); } #endif 1783027 3 webkit-bug-importer 2021-08-09 16:47:58 -0700 <rdar://problem/81718915> 1783030 4 435225 cdumez 2021-08-09 16:50:41 -0700 Comment on attachment 435225 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=435225&action=review r=me >> Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:192 >> + callOnMainRunLoop([weakProcess, captionDisplayMode, preferredLanguages = preferredLanguages.isolatedCopy()] { > > I opted to make an isolatedCopy() here because the other use of WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages() in Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm didn't involve separate threads: > > #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) > void WebProcessPool::mediaAccessibilityPreferencesChangedCallback(CFNotificationCenterRef, void *observer, CFStringRef name, const void *, CFDictionaryRef userInfo) > { > auto* pool = reinterpret_cast<WebProcessPool*>(observer); > auto captionDisplayMode = WebCore::CaptionUserPreferencesMediaAF::platformCaptionDisplayMode(); > auto preferredLanguages = WebCore::CaptionUserPreferencesMediaAF::platformPreferredLanguages(); > pool->sendToAllProcesses(Messages::WebProcess::SetMediaAccessibilityPreferences(captionDisplayMode, preferredLanguages)); > } > #endif nit: WTFMove(preferredLanguages).isolatedCopy() may be more efficient in some cases because of this version of isolatedCopy(): template<typename U = T> Vector<U> isolatedCopy() &&; 1783040 5 435227 ddkilzer 2021-08-09 17:38:01 -0700 Created attachment 435227 Patch v2 for landing 1783046 6 ddkilzer 2021-08-09 18:06:19 -0700 Regressed in r279591: Collect Accessibility preferences on a background queue https://bugs.webkit.org/show_bug.cgi?id=227617 https://trac.webkit.org/changeset/279591/webkit 1783170 7 ews-feeder 2021-08-10 08:20:45 -0700 Committed r280841 (240392@main): <https://commits.webkit.org/240392@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435227. 435225 2021-08-09 16:37:52 -0700 2021-08-10 08:16:08 -0700 Patch v1 bug-228932-20210809163751.patch text/plain 2182 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczMDQ1ZmViMWMxYjZlMDE2 ZTAwZjhlMWI5M2VlZDliYTk1YTAyYjguLmRlN2E4YWEwNGE0YWY2YTU5NGJlMDBlZjM1YTcxZDcz MmI3MjVmMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDgtMDkgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBUaHJlYWRTYW5pdGl6ZXI6IGRh dGEgcmFjZSBpbiBXVEY6OlN0cmluZ0ltcGw6OmRlcmVmKCkgdW5kZXIgV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6c2V0TWVkaWFBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMoKQorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMjI4OTMyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgbnVtZXJvdXMgbGF5b3V0IHRlc3RzIHJ1bm5p bmcgd2l0aCBUU2FuIGluY2x1ZGluZzoKKyAgICAgICAgICAgIGNyeXB0by9jcnlwdG8tcmFuZG9t LXZhbHVlcy10eXBlcy5odG1sCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz c1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlh QWNjZXNzaWJpbGl0eVByZWZlcmVuY2VzKToKKyAgICAgICAgLSBNYWtlIGFuIGlzb2xhdGVkQ29w eSgpIG9mIFZlY3RvcjxTdHJpbmc+IG9iamVjdCBiZWZvcmUgcGFzc2luZworICAgICAgICAgIGl0 IHRvIHRoZSBtYWluIHRocmVhZC4KKwogMjAyMS0wNy0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBbQVhdIEtleWJvYXJkIHRleHQgY2Fu ZGlkYXRlcyBkb24ndCB1cGRhdGUgd2hlbiBjaGFuZ2luZyBzZWxlY3Rpb24gdXNpbmcgU3dpdGNo IENvbnRyb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBy b2Nlc3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCmluZGV4IDJlNmI0YzEzNzYxOTJhYTYxMDljNGE5MThmMzQzZjQ0MzNh MmIxYzMuLmJhMmE5MDhhZTU3ODI4MTI2MzQ0NTYxOTNmYTIyMDNhMTUzYmQ3YjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5t bQpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlhQWNjZXNz aWJpbGl0eVByZWZlcmVuY2VzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKICAgICBkaXNwYXRj aF9hc3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZ X0RFRkFVTFQsIDApLCBbd2Vha1Byb2Nlc3MgPSBtYWtlV2Vha1B0cihwcm9jZXNzKV0gewogICAg ICAgICBhdXRvIGNhcHRpb25EaXNwbGF5TW9kZSA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVy ZW5jZXNNZWRpYUFGOjpwbGF0Zm9ybUNhcHRpb25EaXNwbGF5TW9kZSgpOwogICAgICAgICBhdXRv IHByZWZlcnJlZExhbmd1YWdlcyA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRp YUFGOjpwbGF0Zm9ybVByZWZlcnJlZExhbmd1YWdlcygpOwotICAgICAgICBjYWxsT25NYWluUnVu TG9vcChbd2Vha1Byb2Nlc3MsIGNhcHRpb25EaXNwbGF5TW9kZSwgcHJlZmVycmVkTGFuZ3VhZ2Vz XSB7CisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFt3ZWFrUHJvY2VzcywgY2FwdGlvbkRpc3Bs YXlNb2RlLCBwcmVmZXJyZWRMYW5ndWFnZXMgPSBwcmVmZXJyZWRMYW5ndWFnZXMuaXNvbGF0ZWRD b3B5KCldIHsKICAgICAgICAgICAgIGlmICh3ZWFrUHJvY2VzcykKICAgICAgICAgICAgICAgICB3 ZWFrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0TWVkaWFBY2Nlc3NpYmls aXR5UHJlZmVyZW5jZXMoY2FwdGlvbkRpc3BsYXlNb2RlLCBwcmVmZXJyZWRMYW5ndWFnZXMpLCAw KTsKICAgICAgICAgfSk7Cg== 435227 2021-08-09 17:38:01 -0700 2021-08-10 08:20:46 -0700 Patch v2 for landing bug-228932-20210809173800.patch text/plain 2188 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczMDQ1ZmViMWMxYjZlMDE2 ZTAwZjhlMWI5M2VlZDliYTk1YTAyYjguLmQwNjA1Y2QzZGY0M2ViYmZkNTY4YzBmOTAzMzUzN2Fj ZmZkMjM3ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDgtMDkgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBUaHJlYWRTYW5pdGl6ZXI6IGRh dGEgcmFjZSBpbiBXVEY6OlN0cmluZ0ltcGw6OmRlcmVmKCkgdW5kZXIgV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6c2V0TWVkaWFBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXMoKQorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMjI4OTMyPgorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1 bWV6LgorCisgICAgICAgIENvdmVyZWQgYnkgbnVtZXJvdXMgbGF5b3V0IHRlc3RzIHJ1bm5pbmcg d2l0aCBUU2FuIGluY2x1ZGluZzoKKyAgICAgICAgICAgIGNyeXB0by9jcnlwdG8tcmFuZG9tLXZh bHVlcy10eXBlcy5odG1sCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bv b2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlhQWNj ZXNzaWJpbGl0eVByZWZlcmVuY2VzKToKKyAgICAgICAgLSBNYWtlIGFuIGlzb2xhdGVkQ29weSgp IG9mIFZlY3RvcjxTdHJpbmc+IG9iamVjdCBiZWZvcmUgcGFzc2luZworICAgICAgICAgIGl0IHRv IHRoZSBtYWluIHRocmVhZC4KKwogMjAyMS0wNy0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBbQVhdIEtleWJvYXJkIHRleHQgY2FuZGlk YXRlcyBkb24ndCB1cGRhdGUgd2hlbiBjaGFuZ2luZyBzZWxlY3Rpb24gdXNpbmcgU3dpdGNoIENv bnRyb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nl c3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNz UG9vbENvY29hLm1tCmluZGV4IDJlNmI0YzEzNzYxOTJhYTYxMDljNGE5MThmMzQzZjQ0MzNhMmIx YzMuLjBjMzBhODBhMjVmMDI4MDY4ZmNhZjEzMzYzMDVjZGJkMmIzYjQyMTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQpA QCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldE1lZGlhQWNjZXNzaWJp bGl0eVByZWZlcmVuY2VzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKICAgICBkaXNwYXRjaF9h c3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RF RkFVTFQsIDApLCBbd2Vha1Byb2Nlc3MgPSBtYWtlV2Vha1B0cihwcm9jZXNzKV0gewogICAgICAg ICBhdXRvIGNhcHRpb25EaXNwbGF5TW9kZSA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5j ZXNNZWRpYUFGOjpwbGF0Zm9ybUNhcHRpb25EaXNwbGF5TW9kZSgpOwogICAgICAgICBhdXRvIHBy ZWZlcnJlZExhbmd1YWdlcyA9IFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFG OjpwbGF0Zm9ybVByZWZlcnJlZExhbmd1YWdlcygpOwotICAgICAgICBjYWxsT25NYWluUnVuTG9v cChbd2Vha1Byb2Nlc3MsIGNhcHRpb25EaXNwbGF5TW9kZSwgcHJlZmVycmVkTGFuZ3VhZ2VzXSB7 CisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFt3ZWFrUHJvY2VzcywgY2FwdGlvbkRpc3BsYXlN b2RlLCBwcmVmZXJyZWRMYW5ndWFnZXMgPSBXVEZNb3ZlKHByZWZlcnJlZExhbmd1YWdlcykuaXNv bGF0ZWRDb3B5KCldIHsKICAgICAgICAgICAgIGlmICh3ZWFrUHJvY2VzcykKICAgICAgICAgICAg ICAgICB3ZWFrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0TWVkaWFBY2Nl c3NpYmlsaXR5UHJlZmVyZW5jZXMoY2FwdGlvbkRpc3BsYXlNb2RlLCBwcmVmZXJyZWRMYW5ndWFn ZXMpLCAwKTsKICAgICAgICAgfSk7Cg==