232517 2021-10-29 16:57:54 -0700 Crash under DisplayLink::displayLinkCallback() 2021-10-29 17:32:57 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 232101 P2 Normal --- 1 cdumez cdumez kkinnunen simon.fraser oldest_to_newest 1810323 0 cdumez 2021-10-29 16:57:54 -0700 Crash under DisplayLink::displayLinkCallback(): Crashed Thread: 21 CVDisplayLink Exception Type: EXC_ARITHMETIC (SIGFPE) Exception Codes: 0x0000000000000001, 0x0000000000000000 Exception Note: EXC_CORPSE_NOTIFY Termination Reason: Namespace SIGNAL, Code 8 Floating point exception: 8 Terminating Process: exc handler [40667] Thread 0 Dispatch queue: com.apple.main-thread 0 libsystem_kernel.dylib 0x7ff809d464c6 __psynch_mutexdrop + 10 1 libsystem_pthread.dylib 0x7ff809d7ee9c _pthread_mutex_firstfit_wake + 18 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/libpthread/src/pthread_mutex.c:1317) 2 libsystem_pthread.dylib 0x7ff809d7ce82 _pthread_mutex_firstfit_unlock_slow + 242 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/libpthread/src/pthread_mutex.c:1346) 3 com.apple.CoreVideo 0x7ff811770ba2 CVDisplayLink::start() + 262 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreVideo/CoreVideo/DisplayLink/CVDisplayLinkInternal.cpp:698) 4 com.apple.WebKit 0x7ff91027d0de WebKit::DisplayLink::addObserver(IPC::Connection&, WTF::ObjectIdentifier<WebKit::DisplayLinkObserverIDType>, unsigned int) + 592 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/WebKit/Source/WebKit/UIProcess/mac/DisplayLink.cpp:104) 5 com.apple.WebKit 0x7ff9104cb6ee WebKit::WebProcessProxy::didReceiveWebProcessProxyMessage(IPC::Connection&, IPC::Decoder&) + 1630 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/WebKit/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm:66) 6 com.apple.WebKit 0x7ff90fd701ca IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) + 634 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/WebKit/Source/WebKit/Platform/IPC/Connection.cpp:1058) 7 com.apple.WebKit 0x7ff90fd6fa40 IPC::Connection::dispatchIncomingMessages() + 572 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/WebKit/Source/WebKit/Platform/IPC/Connection.cpp:1217) 8 com.apple.JavaScriptCore 0x7ff90ac4200e WTF::RunLoop::performWork() + 286 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Binaries/WTF/install/TempContent/Root/usr/local/include/wtf/Function.h:82) 9 com.apple.JavaScriptCore 0x7ff90ac42f8a WTF::RunLoop::performWork(void*) + 26 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/WTF/Source/WTF/wtf/cf/RunLoopCF.cpp:46) 10 com.apple.CoreFoundation 0x7ff809e4b664 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 16 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreFoundation/CoreFoundation/RunLoop.subproj/CFRunLoop.c:1974) 11 com.apple.CoreFoundation 0x7ff809e4b5cc __CFRunLoopDoSource0 + 180 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreFoundation/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2018) 12 com.apple.CoreFoundation 0x7ff809e4b342 __CFRunLoopDoSources0 + 238 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreFoundation/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2055) 13 com.apple.CoreFoundation 0x7ff809e49d68 __CFRunLoopRun + 890 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreFoundation/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2953) 14 com.apple.CoreFoundation 0x7ff809e49328 CFRunLoopRunSpecific + 554 (/AppleInternal/Library/BuildRoots/8cea4b3b-2b9d-11ec-9728-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/CoreFoundation/CoreFoundation/RunLoop.subproj/CFRunLoop.c:3270) 15 com.apple.HIToolbox 0x7ff812d2c026 RunCurrentEventLoopInMode + 292 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/HIToolbox/./Events/EventsCore/EventLoop.c:455) 16 com.apple.HIToolbox 0x7ff812d2bd8a ReceiveNextEventCommon + 594 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/HIToolbox/./Events/EventsCore/EventBlocking.c:326) 17 com.apple.HIToolbox 0x7ff812d2bb24 _BlockUntilNextEventMatchingListInModeWithFilter + 68 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/HIToolbox/./Events/EventsCore/EventBlocking.c:170) 18 com.apple.AppKit 0x7ff80c9f5704 _DPSNextEvent + 926 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/AppKit/GraphicsContext.subproj/CGDPSReplacement.m:588) 19 com.apple.AppKit 0x7ff80c9f3dc2 -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 1394 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/AppKit/Events.subproj/appEventRouting.m:1449) 20 com.apple.Safari.framework 0x7ff91887f3a6 -[BrowserApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 230 (/AppleInternal/Library/BuildRoots/2a316a3e-2b05-11ec-8895-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/Safari/Mac/Safari/Basics/BrowserApplication.mm:248) 21 com.apple.AppKit 0x7ff80c9e631e -[NSApplication run] + 584 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/AppKit/AppKit.subproj/NSApplication.m:3384) 22 com.apple.AppKit 0x7ff80c9ba2a8 NSApplicationMain + 816 (/AppleInternal/Library/BuildRoots/f4aa0efc-2cdb-11ec-8d20-9658076854e7/Library/Caches/com.apple.xbs/Sources/AppKit/AppKit.subproj/NSApplication.m:9226) 23 com.apple.Safari.framework 0x7ff918869b7c SafariMain + 444 (/AppleInternal/Library/BuildRoots/2a316a3e-2b05-11ec-8895-4e3f4f355132/Library/Caches/com.apple.xbs/Sources/Safari/Mac/Safari/Basics/SafariMain.mm:61) 24 dyld Thread 21 Crashed ↩:: 0 com.apple.WebKit 0x7ff91027cde2 WebKit::DisplayLink::displayLinkCallback(__CVDisplayLink*, CVTimeStamp const*, CVTimeStamp const*, unsigned long long, unsigned long long*, void*) + 1228 (/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders/DisplayUpdate.h:44) 1 com.apple.CoreVideo 0x7ff811771ce2 CVDisplayLink::performIO(CVTimeStamp*) + 298 2 com.apple.CoreVideo 0x7ff811770fac CVDisplayLink::runIOThread() + 666 3 libsystem_pthread.dylib 0x7ff809d81500 _pthread_start + 120 4 libsystem_pthread.dylib 0x7ff809d7cefe thread_start + 14 1810325 1 442882 cdumez 2021-10-29 17:04:27 -0700 Created attachment 442882 Patch 1810333 2 cdumez 2021-10-29 17:32:57 -0700 Simon already made a fix in Bug 232101 which I didn't know about. Let's see if the other fix is sufficient. I'll dupe for now. We can reopen this bug if the crashes persist. So far, I have only seen these crashes on builds that didn't have Simon's fix. *** This bug has been marked as a duplicate of bug 232101 *** 442882 2021-10-29 17:04:27 -0700 2021-10-29 17:21:04 -0700 Patch bug-232517-20211029170426.patch text/plain 7327 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzNGVmMDExZTcyOGYyYzFj MmMxZTcwNWE2YmJkYjM0NTI5ZDY5ZGIuLmIwMjJjOGExZmQ5YjgzMGYxM2Y0ZjMxYTI4NDViMGFm M2M0MjA5ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMTAtMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEaXNwbGF5TGlu azo6ZGlzcGxheUxpbmtDYWxsYmFjaygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaXMgaGFwcGVuaW5nIHVuZGVyIERpc3BsYXlVcGRh dGU6Om5leHRVcGRhdGUoKSB3aGljaCBkb2VzOgorICAgICAgICBgcmV0dXJuIHsgKHVwZGF0ZUlu ZGV4ICsgMSkgJSB1cGRhdGVzUGVyU2Vjb25kLCB1cGRhdGVzUGVyU2Vjb25kIH07YAorCisgICAg ICAgIEdpdmVuIHRoYXQgdGhlIGNyYXNoIHNheXMgIkZsb2F0aW5nIHBvaW50IGV4Y2VwdGlvbiIs IEkgc3VzcGVjdCB0aGF0IHVwZGF0ZXNQZXJTZWNvbmQgaXMgMAorICAgICAgICBhbmQgJSAwIGlz IHVuZGVmaW5lZCBiZWhhdmlvci4KKworICAgICAgICBJIGJlbGlldmUgdGhpcyBjYW4gaGFwcGVu IGJlY2F1c2UgRGlzcGxheUxpbms6OmFkZE9ic2VydmVyKCkgaW5pdGlhbGl6ZXMgbV9jdXJyZW50 VXBkYXRlIG9uCisgICAgICAgIHRoZSBtYWluIHRocmVhZCBhbmQgdGhlbiBjYWxscyBDVkRpc3Bs YXlMaW5rU3RhcnQoKSB3aGljaCBjYXVzZXMgZGlzcGxheUxpbmtDYWxsYmFjaygpIHRvCisgICAg ICAgIGdldCBjYWxsZWQgb24gYSBiYWNrZ3JvdW5kIHRocmVhZCwgd2hpY2ggZG9lcyBtX2N1cnJl bnRVcGRhdGUubmV4dFVwZGF0ZSgpLiBUaGVyZSB3YXMgbm8KKyAgICAgICAgbG9ja2luZyBzbyBp dCB3YXMgcG9zc2libGUgZm9yIHRoZSB0aHJlYWQgdG8gbm90IHNlZSB0aGUgdmFsdWUgdGhhdCB3 YXMganVzdCBzZXQgYnkgdGhlCisgICAgICAgIG1haW4gdGhyZWFkLgorCisgICAgICAgIFRvIGFk ZHJlc3MgdGhlIGlzc3VlLCBJIHJlbmFtZWQgbV9vYnNlcnZlcnNMb2NrIHRvIG1fbG9jayBhbmQg aGF2ZSBpdCBndWFyZCB0aGUKKyAgICAgICAgbV9jdXJyZW50VXBkYXRlIHRvby4gVGhlcmUgc2hv dWxkIGJlIG5vIGltcGFjdCBvbiBwZXJmb3JtYW5jZSBzaW5jZSB3ZSB3ZXJlIGFscmVhZHkKKyAg ICAgICAgZ3JhYmJpbmcgdGhpcyBsb2NrIG9uIHRoZSBkaXNwbGF5IGxpbmsgdGhyZWFkLiBJIGFt IG1lcmVseSBleHRlbmRpbmcgYSBiaXQgdGhlIHNjb3BlCisgICAgICAgIG9mIHRoZSBsb2NrIHVu ZGVyIERpc3BsYXlMaW5rOjphZGRPYnNlcnZlcigpLgorCisgICAgICAgICogVUlQcm9jZXNzL21h Yy9EaXNwbGF5TGluay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjphZGRPYnNl cnZlcik6CisgICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjpyZW1vdmVPYnNlcnZlcik6Cisg ICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjpyZW1vdmVPYnNlcnZlcnMpOgorICAgICAgICAo V2ViS2l0OjpEaXNwbGF5TGluazo6aW5jcmVtZW50RnVsbFNwZWVkUmVxdWVzdENsaWVudENvdW50 KToKKyAgICAgICAgKFdlYktpdDo6RGlzcGxheUxpbms6OmRlY3JlbWVudEZ1bGxTcGVlZFJlcXVl c3RDbGllbnRDb3VudCk6CisgICAgICAgIChXZWJLaXQ6OkRpc3BsYXlMaW5rOjpzZXRQcmVmZXJy ZWRGcmFtZXNQZXJTZWNvbmQpOgorICAgICAgICAoV2ViS2l0OjpEaXNwbGF5TGluazo6bm90aWZ5 T2JzZXJ2ZXJzRGlzcGxheVdhc1JlZnJlc2hlZCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9E aXNwbGF5TGluay5oOgorCiAyMDIxLTEwLTI5ICBKb2huIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxl LmNvbT4KIAogICAgICAgICBBZGQgbGFzdCBtb2RpZmllZCBhbmQgY3JlYXRpb24gdGltZSB0byAr W19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVu dGlhbHNdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvRGlzcGxheUxp bmsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL0Rpc3BsYXlMaW5rLmNwcAppbmRl eCA4ZGE5ZGE0MGVjZTFlYmMxM2ZjYmI5NGI2N2EwMGMwMWYyZmY1ZTlhLi5hYzQzM2Q0NGEwYTY5 YmNhODViZWI0MTNhZDI2ZmFkYmQ0MzRmZTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvRGlzcGxheUxpbmsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L21hYy9EaXNwbGF5TGluay5jcHAKQEAgLTkyLDE2ICs5MiwxNSBAQCB2b2lkIERpc3BsYXlMaW5r OjphZGRPYnNlcnZlcihJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIERpc3BsYXlMaW5rT2Jz ZXJ2ZXJJRAogCiAgICAgTE9HX1dJVEhfU1RSRUFNKERpc3BsYXlMaW5rLCBzdHJlYW0gPDwgIltV SSBdIERpc3BsYXlMaW5rICIgPDwgdGhpcyA8PCAiIGZvciBkaXNwbGF5IGRpc3BsYXkgIiA8PCBt X2Rpc3BsYXlJRCA8PCAiIGFkZCBvYnNlcnZlciAiIDw8IG9ic2VydmVySUQgPDwgIiBmcHMgIiA8 PCBwcmVmZXJyZWRGcmFtZXNQZXJTZWNvbmQpOwogCi0gICAgewotICAgICAgICBMb2NrZXIgbG9j a2VyIHsgbV9vYnNlcnZlcnNMb2NrIH07Ci0gICAgICAgIG1fb2JzZXJ2ZXJzLmVuc3VyZShjb25u ZWN0aW9uLnVuaXF1ZUlEKCksIFtdIHsKLSAgICAgICAgICAgIHJldHVybiBDb25uZWN0aW9uQ2xp ZW50SW5mbyB7IH07Ci0gICAgICAgIH0pLml0ZXJhdG9yLT52YWx1ZS5vYnNlcnZlcnMuYXBwZW5k KHsgb2JzZXJ2ZXJJRCwgcHJlZmVycmVkRnJhbWVzUGVyU2Vjb25kIH0pOwotICAgIH0KKyAgICBM b2NrZXIgbG9ja2VyIHsgbV9sb2NrIH07CisgICAgbV9vYnNlcnZlcnMuZW5zdXJlKGNvbm5lY3Rp b24udW5pcXVlSUQoKSwgW10geworICAgICAgICByZXR1cm4gQ29ubmVjdGlvbkNsaWVudEluZm8g eyB9OworICAgIH0pLml0ZXJhdG9yLT52YWx1ZS5vYnNlcnZlcnMuYXBwZW5kKHsgb2JzZXJ2ZXJJ RCwgcHJlZmVycmVkRnJhbWVzUGVyU2Vjb25kIH0pOwogCiAgICAgaWYgKCFDVkRpc3BsYXlMaW5r SXNSdW5uaW5nKG1fZGlzcGxheUxpbmspKSB7CiAgICAgICAgIExPR19XSVRIX1NUUkVBTShEaXNw bGF5TGluaywgc3RyZWFtIDw8ICJbVUkgXSBEaXNwbGF5TGluayBmb3IgZGlzcGxheSAiIDw8IG1f ZGlzcGxheUlEIDw8ICIgc3RhcnRpbmcgQ1ZEaXNwbGF5TGluayB3aXRoIGZwcyAiIDw8IG1fZGlz cGxheU5vbWluYWxGcmFtZXNQZXJTZWNvbmQpOwogCisgICAgICAgIEFTU0VSVChtX2Rpc3BsYXlO b21pbmFsRnJhbWVzUGVyU2Vjb25kKTsKICAgICAgICAgbV9jdXJyZW50VXBkYXRlID0geyAwLCBt X2Rpc3BsYXlOb21pbmFsRnJhbWVzUGVyU2Vjb25kIH07CiAKICAgICAgICAgQ1ZSZXR1cm4gZXJy b3IgPSBDVkRpc3BsYXlMaW5rU3RhcnQobV9kaXNwbGF5TGluayk7CkBAIC0xMTQsNyArMTEzLDcg QEAgdm9pZCBEaXNwbGF5TGluazo6cmVtb3ZlT2JzZXJ2ZXIoSVBDOjpDb25uZWN0aW9uJiBjb25u ZWN0aW9uLCBEaXNwbGF5TGlua09ic2VydmUKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOwogCi0gICAgTG9ja2VyIGxvY2tlciB7IG1fb2JzZXJ2ZXJzTG9jayB9OworICAgIExvY2tl ciBsb2NrZXIgeyBtX2xvY2sgfTsKIAogICAgIGF1dG8gaXQgPSBtX29ic2VydmVycy5maW5kKGNv bm5lY3Rpb24udW5pcXVlSUQoKSk7CiAgICAgaWYgKGl0ID09IG1fb2JzZXJ2ZXJzLmVuZCgpKQpA QCAtMTQwLDcgKzEzOSw3IEBAIHZvaWQgRGlzcGxheUxpbms6OnJlbW92ZU9ic2VydmVycyhJUEM6 OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigp KTsKIAotICAgIExvY2tlciBsb2NrZXIgeyBtX29ic2VydmVyc0xvY2sgfTsKKyAgICBMb2NrZXIg bG9ja2VyIHsgbV9sb2NrIH07CiAgICAgbV9vYnNlcnZlcnMucmVtb3ZlKGNvbm5lY3Rpb24udW5p cXVlSUQoKSk7CiAKICAgICAvLyBXZSBkbyBub3Qgc3RvcCB0aGUgZGlzcGxheSBsaW5rIHJpZ2h0 IGF3YXkgd2hlbiB8bV9vYnNlcnZlcnN8IGJlY29tZXMgZW1wdHkuIEluc3RlYWQsIHdlCkBAIC0x NjEsNyArMTYwLDcgQEAgdm9pZCBEaXNwbGF5TGluazo6cmVtb3ZlSW5mb0ZvckNvbm5lY3Rpb25J ZlBvc3NpYmxlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIAogdm9pZCBEaXNwbGF5TGlu azo6aW5jcmVtZW50RnVsbFNwZWVkUmVxdWVzdENsaWVudENvdW50KElQQzo6Q29ubmVjdGlvbiYg Y29ubmVjdGlvbikKIHsKLSAgICBMb2NrZXIgbG9ja2VyIHsgbV9vYnNlcnZlcnNMb2NrIH07Cisg ICAgTG9ja2VyIGxvY2tlciB7IG1fbG9jayB9OwogCiAgICAgYXV0byYgY29ubmVjdGlvbkluZm8g PSBtX29ic2VydmVycy5lbnN1cmUoY29ubmVjdGlvbi51bmlxdWVJRCgpLCBbXSB7CiAgICAgICAg IHJldHVybiBDb25uZWN0aW9uQ2xpZW50SW5mbyB7IH07CkBAIC0xNzIsNyArMTcxLDcgQEAgdm9p ZCBEaXNwbGF5TGluazo6aW5jcmVtZW50RnVsbFNwZWVkUmVxdWVzdENsaWVudENvdW50KElQQzo6 Q29ubmVjdGlvbiYgY29ubmVjdGkKIAogdm9pZCBEaXNwbGF5TGluazo6ZGVjcmVtZW50RnVsbFNw ZWVkUmVxdWVzdENsaWVudENvdW50KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHsKLSAg ICBMb2NrZXIgbG9ja2VyIHsgbV9vYnNlcnZlcnNMb2NrIH07CisgICAgTG9ja2VyIGxvY2tlciB7 IG1fbG9jayB9OwogCiAgICAgYXV0byBpdCA9IG1fb2JzZXJ2ZXJzLmZpbmQoY29ubmVjdGlvbi51 bmlxdWVJRCgpKTsKICAgICBpZiAoaXQgPT0gbV9vYnNlcnZlcnMuZW5kKCkpCkBAIC0xODgsNyAr MTg3LDcgQEAgdm9pZCBEaXNwbGF5TGluazo6c2V0UHJlZmVycmVkRnJhbWVzUGVyU2Vjb25kKElQ Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgRGlzcGwKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0o RGlzcGxheUxpbmssIHN0cmVhbSA8PCAiW1VJIF0gRGlzcGxheUxpbmsgIiA8PCB0aGlzIDw8ICIg c2V0UHJlZmVycmVkRnJhbWVzUGVyU2Vjb25kIC0gZGlzcGxheSAiIDw8IG1fZGlzcGxheUlEIDw8 ICIgb2JzZXJ2ZXIgIiA8PCBvYnNlcnZlcklEIDw8ICIgZnBzICIgPDwgcHJlZmVycmVkRnJhbWVz UGVyU2Vjb25kKTsKIAotICAgIExvY2tlciBsb2NrZXIgeyBtX29ic2VydmVyc0xvY2sgfTsKKyAg ICBMb2NrZXIgbG9ja2VyIHsgbV9sb2NrIH07CiAKICAgICBhdXRvIGl0ID0gbV9vYnNlcnZlcnMu ZmluZChjb25uZWN0aW9uLnVuaXF1ZUlEKCkpOwogICAgIGlmIChpdCA9PSBtX29ic2VydmVycy5l bmQoKSkKQEAgLTIxMyw3ICsyMTIsNyBAQCB2b2lkIERpc3BsYXlMaW5rOjpub3RpZnlPYnNlcnZl cnNEaXNwbGF5V2FzUmVmcmVzaGVkKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigp KTsKIAotICAgIExvY2tlciBsb2NrZXIgeyBtX29ic2VydmVyc0xvY2sgfTsKKyAgICBMb2NrZXIg bG9ja2VyIHsgbV9sb2NrIH07CiAKICAgICBhdXRvIG1heEZyYW1lc1BlclNlY29uZCA9IFtdKGNv bnN0IFZlY3RvcjxPYnNlcnZlckluZm8+JiBvYnNlcnZlcnMpIHsKICAgICAgICAgc3RkOjpvcHRp b25hbDxXZWJDb3JlOjpGcmFtZXNQZXJTZWNvbmQ+IG9ic2VydmVyc01heEZyYW1lc1BlclNlY29u ZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9EaXNwbGF5TGluay5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL0Rpc3BsYXlMaW5rLmgKaW5kZXggZmZiODIz MzIxNTdiNmE4ZmE5OTc0Yjc0MWI5ZGVmNTIzODEyODI5Yi4uZjg5MmM2M2JlNjgwMjM3YzE4ZmMx MTEyN2IxOGI1ZjNlY2JiMGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv bWFjL0Rpc3BsYXlMaW5rLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL0Rpc3Bs YXlMaW5rLmgKQEAgLTY5LDcgKzY5LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgQ1ZSZXR1cm4g ZGlzcGxheUxpbmtDYWxsYmFjayhDVkRpc3BsYXlMaW5rUmVmLCBjb25zdCBDVlRpbWVTdGFtcCos IGNvbnN0IENWVGltZVN0YW1wKiwgQ1ZPcHRpb25GbGFncywgQ1ZPcHRpb25GbGFncyosIHZvaWQq IGRhdGEpOwogICAgIHZvaWQgbm90aWZ5T2JzZXJ2ZXJzRGlzcGxheVdhc1JlZnJlc2hlZCgpOwog Ci0gICAgdm9pZCByZW1vdmVJbmZvRm9yQ29ubmVjdGlvbklmUG9zc2libGUoSVBDOjpDb25uZWN0 aW9uJikgV1RGX1JFUVVJUkVTX0xPQ0sobV9vYnNlcnZlcnNMb2NrKTsKKyAgICB2b2lkIHJlbW92 ZUluZm9Gb3JDb25uZWN0aW9uSWZQb3NzaWJsZShJUEM6OkNvbm5lY3Rpb24mKSBXVEZfUkVRVUlS RVNfTE9DSyhtX2xvY2spOwogCiAgICAgc3RhdGljIFdlYkNvcmU6OkZyYW1lc1BlclNlY29uZCBu b21pbmFsRnJhbWVzUGVyU2Vjb25kRnJvbURpc3BsYXlMaW5rKENWRGlzcGxheUxpbmtSZWYpOwog CkBAIC04NCwxMSArODQsMTEgQEAgcHJpdmF0ZToKICAgICB9OwogCiAgICAgQ1ZEaXNwbGF5TGlu a1JlZiBtX2Rpc3BsYXlMaW5rIHsgbnVsbHB0ciB9OwotICAgIExvY2sgbV9vYnNlcnZlcnNMb2Nr OwotICAgIEhhc2hNYXA8SVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgQ29ubmVjdGlvbkNsaWVu dEluZm8+IG1fb2JzZXJ2ZXJzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9vYnNlcnZlcnNMb2NrKTsK KyAgICBMb2NrIG1fbG9jazsKKyAgICBIYXNoTWFwPElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQs IENvbm5lY3Rpb25DbGllbnRJbmZvPiBtX29ic2VydmVycyBXVEZfR1VBUkRFRF9CWV9MT0NLKG1f bG9jayk7CiAgICAgV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5SUQgbV9kaXNwbGF5SUQ7CiAgICAg V2ViQ29yZTo6RnJhbWVzUGVyU2Vjb25kIG1fZGlzcGxheU5vbWluYWxGcmFtZXNQZXJTZWNvbmQg eyBXZWJDb3JlOjpGdWxsU3BlZWRGcmFtZXNQZXJTZWNvbmQgfTsKLSAgICBXZWJDb3JlOjpEaXNw bGF5VXBkYXRlIG1fY3VycmVudFVwZGF0ZTsKKyAgICBXZWJDb3JlOjpEaXNwbGF5VXBkYXRlIG1f Y3VycmVudFVwZGF0ZSBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fbG9jayk7CiAgICAgdW5zaWduZWQg bV9maXJlQ291bnRXaXRob3V0T2JzZXJ2ZXJzIHsgMCB9OwogICAgIHN0YXRpYyBib29sIHNob3Vs ZFNlbmRJUENPbkJhY2tncm91bmRRdWV1ZTsKIH07Cg==