195563 2019-03-11 10:22:19 -0700 Crash under WebCore::IDBDatabase::connectionToServerLost 2019-03-11 13:07:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu benjamin cdumez cmarcelo commit-queue dbates ews-watchlist ggaren webkit-bug-importer oldest_to_newest 1514851 0 sihui_liu 2019-03-11 10:22:19 -0700 Thread[3] EXC_CRASH (SIGABRT) (0x0000000000000000, 0x0000000000000000) [ 0] 0x00000001c10c60dc libsystem_kernel.dylib`__pthread_kill + 8 0x00000001c10c60d4: mov x16, #0x148 0x00000001c10c60d8: svc #0x80 -> 0x00000001c10c60dc: b.lo 0x230f4 ; <+32> 0x00000001c10c60e0: stp x29, x30, [sp, #-0x10]! 0x00000001c10c60e4: mov x29, sp 0x00000001c10c60e8: bl 0x18a3c ; cerror_nocancel at errno.c:65 0x00000001c10c60ec: mov sp, x29 [ 1] 0x00000001c113f093 libsystem_pthread.dylib`pthread_kill$VARIANT$mp + 379 at pthread.c:1492:12 1488 if (th->wqthread != 0 && th->wqkillset == 0) { 1489 return ENOTSUP; 1490 } 1491 -> 1492 int ret = __pthread_kill(kport, sig); 1493 1494 if (ret == -1) { 1495 ret = errno; 1496 } Getting symbols for FE41653A-B56F-335A-B66A-F403B3203E61 /usr/lib/system/libsystem_c.dylib... ok [ 2] 0x00000001c101fe83 libsystem_c.dylib`abort + 139 at abort.c:94:8 90 /* <rdar://problem/8400096> Set the workqueue killable */ 91 __pthread_workqueue_setkill(1); 92 93 (void)pthread_sigmask(SIG_SETMASK, &act.sa_mask, NULL); -> 94 (void)pthread_kill(pthread_self(), SIGABRT); 95 96 usleep(TIMEOUT); /* give time for signal to happen */ 97 98 /* Getting symbols for 657809DE-074E-3BA3-8203-1CEB3DFA4966 /usr/lib/libc++abi.dylib... ok [ 3] 0x00000001c06f0787 libc++abi.dylib`::abort_message(const char *, ...) + 131 at abort_message.cpp:75:5 71 __assert2(__FILE__, __LINE__, __func__, buffer); 72 #endif // __ANDROID_API__ >= 21 73 #endif // __BIONIC__ 74 -> 75 abort(); 76 } [ 4] 0x00000001c06fda3f libc++abi.dylib`::__cxa_pure_virtual() + 19 at cxa_virtual.cpp:17:3 Getting symbols for B98F989B-7396-3D1C-AC26-730B711928A5 /System/Library/PrivateFrameworks/WebCore.framework/WebCore... ok [ 5] 0x00000001caf0b7b7 WebCore`WebCore::IDBDatabase::connectionToServerLost(WebCore::IDBError const&) [inlined] WebCore::EventTarget::ref() + 15 at EventTarget.h:55:18 [ 5] 0x00000001caf0b7a8 WebCore`WebCore::IDBDatabase::connectionToServerLost(WebCore::IDBError const&) [inlined] void WTF::refIfNotNull<WebCore::EventTarget>(WebCore::EventTarget*) + 4 at RefPtr.h:38 [ 5] 0x00000001caf0b7a4 WebCore`WebCore::IDBDatabase::connectionToServerLost(WebCore::IDBError const&) [inlined] WTF::RefPtr<WebCore::EventTarget, WTF::DumbPtrTraits<WebCore::EventTarget> >::RefPtr(WebCore::EventTarget*) + 4 at RefPtr.h:57 [ 5] 0x00000001caf0b7a0 WebCore`WebCore::IDBDatabase::connectionToServerLost(WebCore::IDBError const&) [inlined] WTF::RefPtr<WebCore::EventTarget, WTF::DumbPtrTraits<WebCore::EventTarget> >::RefPtr(WebCore::EventTarget*) at RefPtr.h:57 [ 5] 0x00000001caf0b7a0 WebCore`WebCore::IDBDatabase::connectionToServerLost(WebCore::IDBError const&) + 240 at IDBDatabase. IDBDatabase::connectionToServerLost a in CrossThreadTask is called after the callee IDBDatabase is freed. 1514852 1 sihui_liu 2019-03-11 10:23:06 -0700 <rdar://problem/37193655> 1514863 2 364267 sihui_liu 2019-03-11 10:40:37 -0700 Created attachment 364267 Patch 1514865 3 ews-watchlist 2019-03-11 10:42:14 -0700 Attachment 364267 did not pass style-queue: ERROR: Source/WTF/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1514867 4 364268 sihui_liu 2019-03-11 10:46:40 -0700 Created attachment 364268 Patch 1514903 5 364268 ggaren 2019-03-11 11:59:26 -0700 Comment on attachment 364268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364268&action=review r=me > Source/WTF/wtf/CrossThreadTask.h:92 > +CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments) > +{ > + return CrossThreadTask([callee = &callee, protectedCallee = makeRefPtr(&callee), method, arguments = std::make_tuple(crossThreadCopy<Arguments>(arguments)...)]() mutable { > + callMemberFunctionForCrossThreadTask(callee, method, WTFMove(arguments)); > + }); I think it would be slightly nicer to write this using only one value for callee. I think you can do that as return CrossThreadTask([callee = makeRefPtr(&callee)... callMemberFunctionForCrossThreadTask(callee.get()... 1514905 6 ggaren 2019-03-11 11:59:39 -0700 Is this crash associated with some test? 1514926 7 sihui_liu 2019-03-11 12:27:53 -0700 (In reply to Geoffrey Garen from comment #6) > Is this crash associated with some test? No, it's from crash reports. 1514938 8 364278 sihui_liu 2019-03-11 12:41:52 -0700 Created attachment 364278 Patch for landing 1514954 9 364278 commit-queue 2019-03-11 13:07:01 -0700 Comment on attachment 364278 Patch for landing Clearing flags on attachment: 364278 Committed r242732: <https://trac.webkit.org/changeset/242732> 1514955 10 commit-queue 2019-03-11 13:07:03 -0700 All reviewed patches have been landed. Closing bug. 364267 2019-03-11 10:40:37 -0700 2019-03-11 10:46:38 -0700 Patch bug-195563-20190311104036.patch text/plain 2490 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRmYzFmZDcyYzZkODQ2ODFmMjM1Yzky ZmIzMTFkMzNiYTcyMjM4MTAuLjVkOGMzNmZlZDFlMWUzNjA1OTkxYzg0OTVkZmI1MjE4ZWNiMWJi YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDMtMTEgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViQ29yZTo6SURCRGF0YWJhc2U6 OmNvbm5lY3Rpb25Ub1NlcnZlckxvc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NTU2MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzcxOTM2NTU+ CisKKyAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrIHNob3VsZCBwcm90ZWN0IGNhbGxlZSBpZiBpdCBp cyBUaHJlYWRTYWZlUmVmQ291bnRlZC4KKworCVJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogd3RmL0Nyb3NzVGhyZWFkVGFzay5oOgorICAgICAgICAoV1RGOjpjcmVhdGVD cm9zc1RocmVhZFRhc2spOgorCiAyMDE5LTAzLTExICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5v cmc+CiAKICAgICAgICAgQWRkIHV0aWxpdHkgZnVuY3Rpb24gdG8gYWxsb3cgZWFzeSByZXZlcnNl IHJhbmdlLWJhc2VkIGl0ZXJhdGlvbiBvZiBhIGNvbnRhaW5lcgpkaWZmIC0tZ2l0IGEvU291cmNl L1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRh c2suaAppbmRleCA1N2I3MTc5MzRlZmQyNDBkOWFiODIxMTlkOTNkNmE2MjdmNTZkOGYzLi41ZDg1 MzQxYzljMjgzN2U1NzFiMWVjYzFmZmZmZTlhYzdmNjIzNjg2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2suaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVh ZFRhc2suaApAQCAtMjcsNyArMjcsOSBAQAogCiAjaW5jbHVkZSA8d3RmL0Nyb3NzVGhyZWFkQ29w aWVyLmg+CiAjaW5jbHVkZSA8d3RmL0Z1bmN0aW9uLmg+CisjaW5jbHVkZSA8d3RmL1JlZlB0ci5o PgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KKyNpbmNsdWRlIDx3dGYvVGhyZWFkU2Fm ZVJlZkNvdW50ZWQuaD4KIAogbmFtZXNwYWNlIFdURiB7CiAKQEAgLTgyLDcgKzg0LDE1IEBAIHZv aWQgY2FsbE1lbWJlckZ1bmN0aW9uRm9yQ3Jvc3NUaHJlYWRUYXNrKEMqIG9iamVjdCwgTUYgZnVu Y3Rpb24sIEFyZ3NUdXBsZSYmIGFyCiAgICAgY2FsbE1lbWJlckZ1bmN0aW9uRm9yQ3Jvc3NUaHJl YWRUYXNrSW1wbChvYmplY3QsIGZ1bmN0aW9uLCBzdGQ6OmZvcndhcmQ8QXJnc1R1cGxlPihhcmdz KSwgQXJnc0luZGljaWVzKCkpOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZS4u LiBQYXJhbWV0ZXJzLCB0eXBlbmFtZS4uLiBBcmd1bWVudHM+Cit0ZW1wbGF0ZTx0eXBlbmFtZSBU LCB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxzdGQ6OmlzX2Jhc2Vfb2Y8VGhyZWFkU2FmZVJlZkNv dW50ZWQ8VD4sIFQ+Ojp2YWx1ZSwgaW50Pjo6dHlwZSA9IDAsIHR5cGVuYW1lLi4uIFBhcmFtZXRl cnMsIHR5cGVuYW1lLi4uIEFyZ3VtZW50cz4KK0Nyb3NzVGhyZWFkVGFzayBjcmVhdGVDcm9zc1Ro cmVhZFRhc2soVCYgY2FsbGVlLCB2b2lkIChUOjoqbWV0aG9kKShQYXJhbWV0ZXJzLi4uKSwgY29u c3QgQXJndW1lbnRzJi4uLiBhcmd1bWVudHMpCit7CisgICAgcmV0dXJuIENyb3NzVGhyZWFkVGFz ayhbY2FsbGVlID0gJmNhbGxlZSwgcHJvdGVjdGVkQ2FsbGVlID0gbWFrZVJlZlB0cigmY2FsbGVl KSwgbWV0aG9kLCBhcmd1bWVudHMgPSBzdGQ6Om1ha2VfdHVwbGUoY3Jvc3NUaHJlYWRDb3B5PEFy Z3VtZW50cz4oYXJndW1lbnRzKS4uLildKCkgbXV0YWJsZSB7CisgICAgICAgIGNhbGxNZW1iZXJG dW5jdGlvbkZvckNyb3NzVGhyZWFkVGFzayhjYWxsZWUsIG1ldGhvZCwgV1RGTW92ZShhcmd1bWVu dHMpKTsKKyAgICB9KTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgc3RkOjpl bmFibGVfaWY8IXN0ZDo6aXNfYmFzZV9vZjxUaHJlYWRTYWZlUmVmQ291bnRlZDxUPiwgVD46OnZh bHVlLCBpbnQ+Ojp0eXBlID0gMCwgdHlwZW5hbWUuLi4gUGFyYW1ldGVycywgdHlwZW5hbWUuLi4g QXJndW1lbnRzPgogQ3Jvc3NUaHJlYWRUYXNrIGNyZWF0ZUNyb3NzVGhyZWFkVGFzayhUJiBjYWxs ZWUsIHZvaWQgKFQ6OiptZXRob2QpKFBhcmFtZXRlcnMuLi4pLCBjb25zdCBBcmd1bWVudHMmLi4u IGFyZ3VtZW50cykKIHsKICAgICByZXR1cm4gQ3Jvc3NUaHJlYWRUYXNrKFtjYWxsZWUgPSAmY2Fs bGVlLCBtZXRob2QsIGFyZ3VtZW50cyA9IHN0ZDo6bWFrZV90dXBsZShjcm9zc1RocmVhZENvcHk8 QXJndW1lbnRzPihhcmd1bWVudHMpLi4uKV0oKSBtdXRhYmxlIHsK 364268 2019-03-11 10:46:40 -0700 2019-03-11 12:41:50 -0700 Patch bug-195563-20190311104639.patch text/plain 2497 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRmYzFmZDcyYzZkODQ2ODFmMjM1Yzky ZmIzMTFkMzNiYTcyMjM4MTAuLjM5MGJmOGRlMGZlN2M4YjAzMjEyMWJmNzNlZWZhYTg2N2EzZDBh N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDMtMTEgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViQ29yZTo6SURCRGF0YWJhc2U6 OmNvbm5lY3Rpb25Ub1NlcnZlckxvc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NTU2MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzcxOTM2NTU+ CisKKyAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrIHNob3VsZCBwcm90ZWN0IGNhbGxlZSBpZiBpdCBp cyBUaHJlYWRTYWZlUmVmQ291bnRlZC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9Dcm9zc1RocmVhZFRhc2suaDoKKyAgICAgICAgKFdURjo6 Y3JlYXRlQ3Jvc3NUaHJlYWRUYXNrKToKKwogMjAxOS0wMy0xMSAgU2FtIFdlaW5pZyAgPHNhbUB3 ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB1dGlsaXR5IGZ1bmN0aW9uIHRvIGFsbG93IGVhc3kg cmV2ZXJzZSByYW5nZS1iYXNlZCBpdGVyYXRpb24gb2YgYSBjb250YWluZXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFzay5oIGIvU291cmNlL1dURi93dGYvQ3Jvc3NU aHJlYWRUYXNrLmgKaW5kZXggNTdiNzE3OTM0ZWZkMjQwZDlhYjgyMTE5ZDkzZDZhNjI3ZjU2ZDhm My4uNWQ4NTM0MWM5YzI4MzdlNTcxYjFlY2MxZmZmZmU5YWM3ZjYyMzY4NiAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrLmgKKysrIGIvU291cmNlL1dURi93dGYvQ3Jv c3NUaHJlYWRUYXNrLmgKQEAgLTI3LDcgKzI3LDkgQEAKIAogI2luY2x1ZGUgPHd0Zi9Dcm9zc1Ro cmVhZENvcGllci5oPgogI2luY2x1ZGUgPHd0Zi9GdW5jdGlvbi5oPgorI2luY2x1ZGUgPHd0Zi9S ZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CisjaW5jbHVkZSA8d3RmL1Ro cmVhZFNhZmVSZWZDb3VudGVkLmg+CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC04Miw3ICs4NCwx NSBAQCB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbkZvckNyb3NzVGhyZWFkVGFzayhDKiBvYmplY3Qs IE1GIGZ1bmN0aW9uLCBBcmdzVHVwbGUmJiBhcgogICAgIGNhbGxNZW1iZXJGdW5jdGlvbkZvckNy b3NzVGhyZWFkVGFza0ltcGwob2JqZWN0LCBmdW5jdGlvbiwgc3RkOjpmb3J3YXJkPEFyZ3NUdXBs ZT4oYXJncyksIEFyZ3NJbmRpY2llcygpKTsKIH0KIAotdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlw ZW5hbWUuLi4gUGFyYW1ldGVycywgdHlwZW5hbWUuLi4gQXJndW1lbnRzPgordGVtcGxhdGU8dHlw ZW5hbWUgVCwgdHlwZW5hbWUgc3RkOjplbmFibGVfaWY8c3RkOjppc19iYXNlX29mPFRocmVhZFNh ZmVSZWZDb3VudGVkPFQ+LCBUPjo6dmFsdWUsIGludD46OnR5cGUgPSAwLCB0eXBlbmFtZS4uLiBQ YXJhbWV0ZXJzLCB0eXBlbmFtZS4uLiBBcmd1bWVudHM+CitDcm9zc1RocmVhZFRhc2sgY3JlYXRl Q3Jvc3NUaHJlYWRUYXNrKFQmIGNhbGxlZSwgdm9pZCAoVDo6Km1ldGhvZCkoUGFyYW1ldGVycy4u LiksIGNvbnN0IEFyZ3VtZW50cyYuLi4gYXJndW1lbnRzKQoreworICAgIHJldHVybiBDcm9zc1Ro cmVhZFRhc2soW2NhbGxlZSA9ICZjYWxsZWUsIHByb3RlY3RlZENhbGxlZSA9IG1ha2VSZWZQdHIo JmNhbGxlZSksIG1ldGhvZCwgYXJndW1lbnRzID0gc3RkOjptYWtlX3R1cGxlKGNyb3NzVGhyZWFk Q29weTxBcmd1bWVudHM+KGFyZ3VtZW50cykuLi4pXSgpIG11dGFibGUgeworICAgICAgICBjYWxs TWVtYmVyRnVuY3Rpb25Gb3JDcm9zc1RocmVhZFRhc2soY2FsbGVlLCBtZXRob2QsIFdURk1vdmUo YXJndW1lbnRzKSk7CisgICAgfSk7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1l IHN0ZDo6ZW5hYmxlX2lmPCFzdGQ6OmlzX2Jhc2Vfb2Y8VGhyZWFkU2FmZVJlZkNvdW50ZWQ8VD4s IFQ+Ojp2YWx1ZSwgaW50Pjo6dHlwZSA9IDAsIHR5cGVuYW1lLi4uIFBhcmFtZXRlcnMsIHR5cGVu YW1lLi4uIEFyZ3VtZW50cz4KIENyb3NzVGhyZWFkVGFzayBjcmVhdGVDcm9zc1RocmVhZFRhc2so VCYgY2FsbGVlLCB2b2lkIChUOjoqbWV0aG9kKShQYXJhbWV0ZXJzLi4uKSwgY29uc3QgQXJndW1l bnRzJi4uLiBhcmd1bWVudHMpCiB7CiAgICAgcmV0dXJuIENyb3NzVGhyZWFkVGFzayhbY2FsbGVl ID0gJmNhbGxlZSwgbWV0aG9kLCBhcmd1bWVudHMgPSBzdGQ6Om1ha2VfdHVwbGUoY3Jvc3NUaHJl YWRDb3B5PEFyZ3VtZW50cz4oYXJndW1lbnRzKS4uLildKCkgbXV0YWJsZSB7Cg== 364278 2019-03-11 12:41:52 -0700 2019-03-11 13:07:01 -0700 Patch for landing bug-195563-20190311124151.patch text/plain 2454 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIxNzRkM2VlZjU5ZDdjNDgwYzFmZjBi NjBlZGJiYzhmMTdkN2UyNzYuLjY0NjZjYmE3ZDRiODY5NDQ3Zjg2NDlhMGNmZmRhOTgwMmI2Mjg4 YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDMtMTEgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViQ29yZTo6SURCRGF0YWJhc2U6 OmNvbm5lY3Rpb25Ub1NlcnZlckxvc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NTU2MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzcxOTM2NTU+ CisKKyAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrIHNob3VsZCBwcm90ZWN0IGNhbGxlZSBpZiBpdCBp cyBUaHJlYWRTYWZlUmVmQ291bnRlZC4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBH YXJlbi4KKworICAgICAgICAqIHd0Zi9Dcm9zc1RocmVhZFRhc2suaDoKKyAgICAgICAgKFdURjo6 Y3JlYXRlQ3Jvc3NUaHJlYWRUYXNrKToKKwogMjAxOS0wMy0xMSAgUnlhbiBIYWRkYWQgIDxyeWFu aGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQy Njg4LCByMjQyNjQzLCByMjQyNjI0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQ3Jvc3NU aHJlYWRUYXNrLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2suaAppbmRleCA1N2I3 MTc5MzRlZmQyNDBkOWFiODIxMTlkOTNkNmE2MjdmNTZkOGYzLi5lYzQzNzc0OGU2NWQ2ZWI2ZGJj OGQzZTJlNDBkYWZkMmI1NGQ3MGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1Ro cmVhZFRhc2suaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2suaApAQCAtMjcs NyArMjcsOSBAQAogCiAjaW5jbHVkZSA8d3RmL0Nyb3NzVGhyZWFkQ29waWVyLmg+CiAjaW5jbHVk ZSA8d3RmL0Z1bmN0aW9uLmg+CisjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0 Zi9TdGRMaWJFeHRyYXMuaD4KKyNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4K IAogbmFtZXNwYWNlIFdURiB7CiAKQEAgLTgyLDcgKzg0LDE1IEBAIHZvaWQgY2FsbE1lbWJlckZ1 bmN0aW9uRm9yQ3Jvc3NUaHJlYWRUYXNrKEMqIG9iamVjdCwgTUYgZnVuY3Rpb24sIEFyZ3NUdXBs ZSYmIGFyCiAgICAgY2FsbE1lbWJlckZ1bmN0aW9uRm9yQ3Jvc3NUaHJlYWRUYXNrSW1wbChvYmpl Y3QsIGZ1bmN0aW9uLCBzdGQ6OmZvcndhcmQ8QXJnc1R1cGxlPihhcmdzKSwgQXJnc0luZGljaWVz KCkpOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZS4uLiBQYXJhbWV0ZXJzLCB0 eXBlbmFtZS4uLiBBcmd1bWVudHM+Cit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBzdGQ6 OmVuYWJsZV9pZjxzdGQ6OmlzX2Jhc2Vfb2Y8VGhyZWFkU2FmZVJlZkNvdW50ZWQ8VD4sIFQ+Ojp2 YWx1ZSwgaW50Pjo6dHlwZSA9IDAsIHR5cGVuYW1lLi4uIFBhcmFtZXRlcnMsIHR5cGVuYW1lLi4u IEFyZ3VtZW50cz4KK0Nyb3NzVGhyZWFkVGFzayBjcmVhdGVDcm9zc1RocmVhZFRhc2soVCYgY2Fs bGVlLCB2b2lkIChUOjoqbWV0aG9kKShQYXJhbWV0ZXJzLi4uKSwgY29uc3QgQXJndW1lbnRzJi4u LiBhcmd1bWVudHMpCit7CisgICAgcmV0dXJuIENyb3NzVGhyZWFkVGFzayhbY2FsbGVlID0gbWFr ZVJlZlB0cigmY2FsbGVlKSwgbWV0aG9kLCBhcmd1bWVudHMgPSBzdGQ6Om1ha2VfdHVwbGUoY3Jv c3NUaHJlYWRDb3B5PEFyZ3VtZW50cz4oYXJndW1lbnRzKS4uLildKCkgbXV0YWJsZSB7CisgICAg ICAgIGNhbGxNZW1iZXJGdW5jdGlvbkZvckNyb3NzVGhyZWFkVGFzayhjYWxsZWUuZ2V0KCksIG1l dGhvZCwgV1RGTW92ZShhcmd1bWVudHMpKTsKKyAgICB9KTsKK30KKwordGVtcGxhdGU8dHlwZW5h bWUgVCwgdHlwZW5hbWUgc3RkOjplbmFibGVfaWY8IXN0ZDo6aXNfYmFzZV9vZjxUaHJlYWRTYWZl UmVmQ291bnRlZDxUPiwgVD46OnZhbHVlLCBpbnQ+Ojp0eXBlID0gMCwgdHlwZW5hbWUuLi4gUGFy YW1ldGVycywgdHlwZW5hbWUuLi4gQXJndW1lbnRzPgogQ3Jvc3NUaHJlYWRUYXNrIGNyZWF0ZUNy b3NzVGhyZWFkVGFzayhUJiBjYWxsZWUsIHZvaWQgKFQ6OiptZXRob2QpKFBhcmFtZXRlcnMuLi4p LCBjb25zdCBBcmd1bWVudHMmLi4uIGFyZ3VtZW50cykKIHsKICAgICByZXR1cm4gQ3Jvc3NUaHJl YWRUYXNrKFtjYWxsZWUgPSAmY2FsbGVlLCBtZXRob2QsIGFyZ3VtZW50cyA9IHN0ZDo6bWFrZV90 dXBsZShjcm9zc1RocmVhZENvcHk8QXJndW1lbnRzPihhcmd1bWVudHMpLi4uKV0oKSBtdXRhYmxl IHsK