189763 2018-09-19 13:15:32 -0700 Crash under WebPageProxy::decidePolicyForNavigationAction() 2018-09-19 14:58:52 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue webkit-bug-importer oldest_to_newest 1461097 0 cdumez 2018-09-19 13:15:32 -0700 Crash under WebPageProxy::decidePolicyForNavigationAction(): Thread 0 Crashed ↩:: Dispatch queue: com.apple.main-thread 0 com.apple.WebKit 0x00007fff605a5abc API::Object::ref() + 4 1 com.apple.WebKit 0x00007fff608119e0 WebKit::WebPageProxy::decidePolicyForNavigationAction(unsigned long long, WebCore::SecurityOriginData const&, unsigned long long, WebKit::NavigationActionData&&, WebKit::FrameInfoData const&, unsigned long long, WebCore::ResourceRequest const&, WebCore::ResourceRequest&&, WebCore::ResourceResponse&&, unsigned long long, WebKit::UserData const&) + 274 2 com.apple.WebKit 0x00007fff608356f8 void IPC::callMemberFunctionImpl<WebKit::WebPageProxy, void (WebKit::WebPageProxy::*)(unsigned long long, WebCore::SecurityOriginData const&, unsigned long long, WebKit::NavigationActionData&&, WebKit::FrameInfoData const&, unsigned long long, WebCore::ResourceRequest const&, WebCore::ResourceRequest&&, WebCore::ResourceResponse&&, unsigned long long, WebKit::UserData const&), std::__1::tuple<unsigned long long, WebCore::SecurityOriginData, unsigned long long, WebKit::NavigationActionData, WebKit::FrameInfoData, unsigned long long, WebCore::ResourceRequest, WebCore::ResourceRequest, WebCore::ResourceResponse, unsigned long long, WebKit::UserData>, 0ul, 1ul, 2ul, 3ul, 4ul, 5ul, 6ul, 7ul, 8ul, 9ul, 10ul>(WebKit::WebPageProxy*, void (WebKit::WebPageProxy::*)(unsigned long long, WebCore::SecurityOriginData const&, unsigned long long, WebKit::NavigationActionData&&, WebKit::FrameInfoData const&, unsigned long long, WebCore::ResourceRequest const&, WebCore::ResourceRequest&&, WebCore::ResourceResponse&&, unsigned long long, WebKit::UserData const&), std::__1::tuple<unsigned long long, WebCore::SecurityOriginData, unsigned long long, WebKit::NavigationActionData, WebKit::FrameInfoData, unsigned long long, WebCore::ResourceRequest, WebCore::ResourceRequest, WebCore::ResourceResponse, unsigned long long, WebKit::UserData>&&, std::__1::integer_sequence<unsigned long, 0ul, 1ul, 2ul, 3ul, 4ul, 5ul, 6ul, 7ul, 8ul, 9ul, 10ul>) + 105 3 com.apple.WebKit 0x00007fff6082fb44 void IPC::handleMessage<Messages::WebPageProxy::DecidePolicyForNavigationAction, WebKit::WebPageProxy, void (WebKit::WebPageProxy::*)(unsigned long long, WebCore::SecurityOriginData const&, unsigned long long, WebKit::NavigationActionData&&, WebKit::FrameInfoData const&, unsigned long long, WebCore::ResourceRequest const&, WebCore::ResourceRequest&&, WebCore::ResourceResponse&&, unsigned long long, WebKit::UserData const&)>(IPC::Decoder&, WebKit::WebPageProxy*, void (WebKit::WebPageProxy::*)(unsigned long long, WebCore::SecurityOriginData const&, unsigned long long, WebKit::NavigationActionData&&, WebKit::FrameInfoData const&, unsigned long long, WebCore::ResourceRequest const&, WebCore::ResourceRequest&&, WebCore::ResourceResponse&&, unsigned long long, WebKit::UserData const&)) + 365 4 com.apple.WebKit 0x00007fff6060b55b IPC::MessageReceiverMap::dispatchMessage(IPC::Connection&, IPC::Decoder&) + 127 5 com.apple.WebKit 0x00007fff6088fcbc WebKit::WebProcessProxy::didReceiveMessage(IPC::Connection&, IPC::Decoder&) + 24 6 com.apple.WebKit 0x00007fff605d853e IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) + 130 7 com.apple.WebKit 0x00007fff605daddd IPC::Connection::dispatchIncomingMessages() + 731 8 com.apple.JavaScriptCore 0x00007fff55029117 WTF::RunLoop::performWork() + 231 9 com.apple.JavaScriptCore 0x00007fff550293a2 WTF::RunLoop::performWork(void*) + 34 10 com.apple.CoreFoundation 0x00007fff51a40405 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 17 11 com.apple.CoreFoundation 0x00007fff51a403ab __CFRunLoopDoSource0 + 108 12 com.apple.CoreFoundation 0x00007fff51a23e51 __CFRunLoopDoSources0 + 195 13 com.apple.CoreFoundation 0x00007fff51a233fa __CFRunLoopRun + 1219 14 com.apple.CoreFoundation 0x00007fff51a22ce4 CFRunLoopRunSpecific + 463 15 com.apple.HIToolbox 0x00007fff50cbc895 RunCurrentEventLoopInMode + 293 16 com.apple.HIToolbox 0x00007fff50cbc5cb ReceiveNextEventCommon + 618 17 com.apple.HIToolbox 0x00007fff50cbc348 _BlockUntilNextEventMatchingListInModeWithFilter + 64 18 com.apple.AppKit 0x00007fff4ef7995b _DPSNextEvent + 997 19 com.apple.AppKit 0x00007fff4ef786fa -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 1362 20 com.apple.Safari.framework 0x00007fff757b077b -[BrowserApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 273 21 com.apple.AppKit 0x00007fff4ef7275d -[NSApplication run] + 699 22 com.apple.AppKit 0x00007fff4ef61e97 NSApplicationMain + 780 23 libdyld.dylib 0x00007fff7ec47085 start + 1 1461098 1 cdumez 2018-09-19 13:15:57 -0700 <rdar://problem/44597111> 1461099 2 350145 cdumez 2018-09-19 13:19:37 -0700 Created attachment 350145 Patch 1461119 3 350145 achristensen 2018-09-19 14:08:58 -0700 Comment on attachment 350145 Patch You could WTFMove the navigations into the HashMap like I did in https://bugs.webkit.org/show_bug.cgi?id=189765 1461123 4 achristensen 2018-09-19 14:09:26 -0700 *** Bug 189765 has been marked as a duplicate of this bug. *** 1461135 5 350145 commit-queue 2018-09-19 14:58:51 -0700 Comment on attachment 350145 Patch Clearing flags on attachment: 350145 Committed r236227: <https://trac.webkit.org/changeset/236227> 1461136 6 commit-queue 2018-09-19 14:58:52 -0700 All reviewed patches have been landed. Closing bug. 350145 2018-09-19 13:19:37 -0700 2018-09-19 14:58:51 -0700 Patch bug-189763-20180919131936.patch text/plain 10004 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI1ODQ0NDI0OWMwNDRjYTlk Y2JlZjJmMGY0NjM0ZGFkNTgzYzJjMjQuLmM1NWFmNjQ5ZjlhOTMzN2I4OGI3ODVkMDcxNmVjZmVm NWQxYzkxZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTgtMDktMTkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NzYzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80NDU5NzExMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgV2ViTmF2aWdhdGlvblN0YXRlOjpuYXZpZ2F0aW9uKCkgLyBXZWJOYXZp Z2F0aW9uU3RhdGU6OnRha2VOYXZpZ2F0aW9uKCkKKyAgICAgICAgdG8gcmV0dXJuIGEgcG9pbnRl ciBpbnN0ZWFkIG9mIGEgcmVmZXJlbmNlIGFzIHdlIGhhdmUgZXZpZGVuY2UgdGhhdCB0aGV5IGNh bgorICAgICAgICByZXR1cm4gbnVsbC4gSSBrZXB0IHRoZSBkZWJ1ZyBhc3NlcnRpb25zIHRvIHRy eSBhbmQgY2F0Y2ggdGhlIGNhc2VzIHdoZXJlIHdlCisgICAgICAgIHJldHVybiBudWxsIGJ1dCBh dCBsZWFzdCB3ZSBzdG9wIGNyYXNoaW5nIGluIHJlbGVhc2UgYnVpbGRzLgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYk5hdmlnYXRpb25TdGF0ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk5h dmlnYXRpb25TdGF0ZTo6bmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYk5hdmlnYXRp b25TdGF0ZTo6dGFrZU5hdmlnYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJOYXZpZ2F0 aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKToKKwog MjAxOC0wOS0xOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXSBBbGxvdyBXZWJDb250ZW50IHByb2Nlc3MgdG8gY2hlY2sgdGhlICJQcm90b2NvbCBD aGFyYWN0ZXJpc3RpY3MiIG9mIGZpbGVzIHRvIHdoaWNoIGl0IGhhcyBhY2Nlc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYk5hdmlnYXRpb25TdGF0ZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJOYXZpZ2F0aW9uU3RhdGUuY3BwCmluZGV4IDlmZmFiYjJh ODQyYTA5ZDhlNmYyNzNjYzc2NmY0Y2EyMTIwZDBmZTguLjVlM2YyNDE0Y2ZmODljYzUyNThjMzVk NWYwZWY0MzMyMThlZTcxODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl Yk5hdmlnYXRpb25TdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2 aWdhdGlvblN0YXRlLmNwcApAQCAtNzcsMjAgKzc3LDIwIEBAIFJlZjxBUEk6Ok5hdmlnYXRpb24+ IFdlYk5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlTG9hZERhdGFOYXZpZ2F0aW9uKCkKICAgICByZXR1 cm4gbmF2aWdhdGlvbjsKIH0KIAotQVBJOjpOYXZpZ2F0aW9uJiBXZWJOYXZpZ2F0aW9uU3RhdGU6 Om5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQorQVBJOjpOYXZpZ2F0aW9uKiBXZWJO YXZpZ2F0aW9uU3RhdGU6Om5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQogewogICAg IEFTU0VSVChuYXZpZ2F0aW9uSUQpOwogICAgIEFTU0VSVChtX25hdmlnYXRpb25zLmNvbnRhaW5z KG5hdmlnYXRpb25JRCkpOwogCi0gICAgcmV0dXJuICptX25hdmlnYXRpb25zLmdldChuYXZpZ2F0 aW9uSUQpOworICAgIHJldHVybiBtX25hdmlnYXRpb25zLmdldChuYXZpZ2F0aW9uSUQpOwogfQog Ci1SZWY8QVBJOjpOYXZpZ2F0aW9uPiBXZWJOYXZpZ2F0aW9uU3RhdGU6OnRha2VOYXZpZ2F0aW9u KHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKK1JlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYk5hdmln YXRpb25TdGF0ZTo6dGFrZU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQogewogICAg IEFTU0VSVChuYXZpZ2F0aW9uSUQpOwogICAgIEFTU0VSVChtX25hdmlnYXRpb25zLmNvbnRhaW5z KG5hdmlnYXRpb25JRCkpOwogICAgIAotICAgIHJldHVybiBtX25hdmlnYXRpb25zLnRha2UobmF2 aWdhdGlvbklEKS5yZWxlYXNlTm9uTnVsbCgpOworICAgIHJldHVybiBtX25hdmlnYXRpb25zLnRh a2UobmF2aWdhdGlvbklEKTsKIH0KIAogdm9pZCBXZWJOYXZpZ2F0aW9uU3RhdGU6OmRpZERlc3Ry b3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYk5hdmlnYXRpb25TdGF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViTmF2aWdhdGlvblN0YXRlLmgKaW5kZXggMTM2NmUzY2M4ZGM0M2NkYzY5YjJhZmJh MTIwZmMwMTZiZjIwYWQ5Yy4uZGZmZTllMDMwYzA1NWQ5ZDBhMzgyMDJmOTgzYjg2OTQxNDBhM2U3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2aWdhdGlvblN0YXRl LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2aWdhdGlvblN0YXRlLmgKQEAg LTUzLDggKzUzLDggQEAgcHVibGljOgogICAgIFJlZjxBUEk6Ok5hdmlnYXRpb24+IGNyZWF0ZVJl bG9hZE5hdmlnYXRpb24oKTsKICAgICBSZWY8QVBJOjpOYXZpZ2F0aW9uPiBjcmVhdGVMb2FkRGF0 YU5hdmlnYXRpb24oKTsKIAotICAgIEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbih1aW50NjRf dCBuYXZpZ2F0aW9uSUQpOwotICAgIFJlZjxBUEk6Ok5hdmlnYXRpb24+IHRha2VOYXZpZ2F0aW9u KHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CisgICAgQVBJOjpOYXZpZ2F0aW9uKiBuYXZpZ2F0aW9u KHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CisgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gdGFr ZU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKTsKICAgICB2b2lkIGRpZERlc3Ryb3lO YXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CiAgICAgdm9pZCBjbGVhckFsbE5hdmln YXRpb25zKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4 IGU3NTBkODAxMzAzOTdmNWZkYWQ1MDdkN2VkM2ExNTc0ODEyMDhkYTYuLjFhZmQ1OGM5NjdmMzEz MjE2ZTVjYWIzYmI0Mjc3Y2MwNzQ0ZTAxNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcApAQCAtMzQ2MCw3ICszNDYwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmEKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9u SUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2 aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0 aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0 aW9uSUQpCi0gICAgICAgIG5hdmlnYXRpb24gPSAmbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlv bihuYXZpZ2F0aW9uSUQpOworICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCku bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCiAgICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3 IGxvYWQgaXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2 aW91cyBuYXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCiAgICAgLy8gdGhlbiB3ZSBpZ25vcmUg dGhpcyBub3RpZmljYXRpb24uCkBAIC0zNTA3LDcgKzM1MDcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWlu dDY0X3QgZgogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0IG5hdmln YXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBmb3Igc29t ZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5h dmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKG5hdmlnYXRpb25JRCkgewotICAgICAgICBu YXZpZ2F0aW9uID0gJm5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsK KyAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdh dGlvbklEKTsKICAgICAgICAgbmF2aWdhdGlvbi0+YXBwZW5kUmVkaXJlY3Rpb25VUkwocmVxdWVz dC51cmwoKSk7CiAgICAgfQogCkBAIC0zNjM0LDcgKzM2MzQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmln YXRpb25JRAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0IG5hdmln YXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBmb3Igc29t ZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5h dmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5h dmlnYXRpb25JRCkKLSAgICAgICAgbmF2aWdhdGlvbiA9ICZuYXZpZ2F0aW9uU3RhdGUoKS5uYXZp Z2F0aW9uKG5hdmlnYXRpb25JRCk7CisgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3Rh dGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKICAgICBtX2hhc0NvbW1pdHRlZEFueVBy b3Zpc2lvbmFsTG9hZHMgPSB0cnVlOwogICAgIG1fcHJvY2Vzcy0+ZGlkQ29tbWl0UHJvdmlzaW9u YWxMb2FkKCk7CkBAIC0zNzI2LDcgKzM3MjYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmlu aXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aQog ICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBp cyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0 aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+ IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25J RCkKLSAgICAgICAgbmF2aWdhdGlvbiA9ICZuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5h dmlnYXRpb25JRCk7CisgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZp Z2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAg ICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkRmluaXNoRG9jdW1lbnRMb2FkKCp0aGlzLCBu YXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNl ckRhdGEub2JqZWN0KCkpLmdldCgpKTsKQEAgLTM3NDQsNyArMzc0NCw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklECiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQg bmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZv ciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQ STo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkg JiYgbmF2aWdhdGlvbklEKQotICAgICAgICBuYXZpZ2F0aW9uID0gJm5hdmlnYXRpb25TdGF0ZSgp Lm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKKyAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRp b25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKIAogICAgIGF1dG8gdHJhbnNhY3Rp b24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIApAQCAtMzc4Nyw3ICszNzg3LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklELAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2Fn ZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJy ZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgog ICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5p c01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKLSAgICAgICAgbmF2aWdhdGlvbiA9ICZuYXZp Z2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CisgICAgICAgIG5hdmlnYXRp b24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKICAgICBj bGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKTsKIApAQCAtMzgyOCw3ICszODI4LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVj ayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkg emVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJl ZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5pc01haW5G cmFtZSgpICYmIG5hdmlnYXRpb25JRCkKLSAgICAgICAgbmF2aWdhdGlvbiA9ICZuYXZpZ2F0aW9u U3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CisgICAgICAgIG5hdmlnYXRpb24gPSBu YXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKICAgICBhdXRvIHRy YW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKQEAgLTQwMDIsNyAr NDAwMiw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvCiAKICAgICBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChuYXZpZ2F0aW9uSUQpCi0gICAgICAgIG5hdmln YXRpb24gPSBtYWtlUmVmKG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25J RCkpOworICAgICAgICBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24o bmF2aWdhdGlvbklEKTsKIAogICAgIGlmIChhdXRvIHRhcmdldEJhY2tGb3J3YXJkSXRlbUlkZW50 aWZpZXIgPSBuYXZpZ2F0aW9uQWN0aW9uRGF0YS50YXJnZXRCYWNrRm9yd2FyZEl0ZW1JZGVudGlm aWVyKSB7CiAgICAgICAgIGlmIChhdXRvKiBpdGVtID0gbV9iYWNrRm9yd2FyZExpc3QtPml0ZW1G b3JJRCgqbmF2aWdhdGlvbkFjdGlvbkRhdGEudGFyZ2V0QmFja0ZvcndhcmRJdGVtSWRlbnRpZmll cikpIHsKQEAgLTQwMzQsNyArNDAzNCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvCiAKICNp ZiBFTkFCTEUoQ09OVEVOVF9GSUxURVJJTkcpCiAgICAgaWYgKGZyYW1lLT5kaWRIYW5kbGVDb250 ZW50RmlsdGVyVW5ibG9ja05hdmlnYXRpb24ocmVxdWVzdCkpCi0gICAgICAgIHJldHVybiByZWNl aXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbjo6SWdub3JlLCAmbV9uYXZpZ2F0aW9uU3Rh dGUtPm5hdmlnYXRpb24obmV3TmF2aWdhdGlvbklEKSwgc3RkOjpudWxsb3B0LCBXVEZNb3ZlKHNl bmRlcikpOworICAgICAgICByZXR1cm4gcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rp b246Oklnbm9yZSwgbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmV3TmF2aWdhdGlvbklE KSwgc3RkOjpudWxsb3B0LCBXVEZNb3ZlKHNlbmRlcikpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0obmV3TmF2aWdhdGlvbklEKTsKICNlbmRpZgpAQCAtNDEyOCw3ICs0MTI4LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFNlY3VyaXR5T3JpZ2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXF1ZXN0LnVybCgpKTsK ICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7CiAKLSAgICBSZWZQdHI8QVBJ OjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gJm1fbmF2aWdhdGlvblN0 YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOworICAgIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25TdGF0 ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKICAgICBhdXRvIGxpc3RlbmVy ID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24g PSBXVEZNb3ZlKG5hdmlnYXRpb24pXSAoV2ViQ29yZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlv biwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFZlY3RvcjxSZWY8U2FmZUJyb3dzaW5nUmVzdWx0 Pj4mJiBzYWZlQnJvd3NpbmdSZXN1bHRzKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFz c2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVu dHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3YXkuCiAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwo=