233293 2021-11-17 16:42:56 -0800 Web Inspector: Web Inspector^2 crashes after closing if Web Inspector^1 closed first 2022-03-01 02:24:23 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg ews-watchlist hi inspector-bugzilla-changes joepeck pangle webkit-bug-importer oldest_to_newest 1816208 0 bburg 2021-11-17 16:42:56 -0800 . 1816209 1 webkit-bug-importer 2021-11-17 16:43:21 -0800 <rdar://problem/85526508> 1816214 2 444606 bburg 2021-11-17 16:48:03 -0800 Created attachment 444606 Patch v1.0 1816223 3 444606 hi 2021-11-17 16:56:33 -0800 Comment on attachment 444606 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=444606&action=review > Source/WebKit/ChangeLog:12 > + Other operations using m_inspectedPage should be guarded in case it tha the inspected oops > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:421 > + m_inspectedPageIdentifier = m_inspectedPage->identifier(); Why are we only saving this here? Why not right after when `m_inspectedPage` is set (e.g. `WebInspectorUIProxy::updateForNewPageProcess`)? Also, when do we clear this? Maybe when we clear `m_inspectedPage` (e.g. `WebInspectorUIProxy::reset`)? > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:423 > + m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier, *this); Should we also do the same thing for the use in `WebInspectorUIProxy::openLocalInspectorFrontend`? > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.h:292 > + WebPageProxyIdentifier m_inspectedPageIdentifier { }; I don't think the `{ }` is needed. 1819915 4 bburg 2021-12-02 16:17:30 -0800 (In reply to Devin Rousso from comment #3) > Comment on attachment 444606 [details] > Patch v1.0 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=444606&action=review > > > Source/WebKit/ChangeLog:12 > > + Other operations using m_inspectedPage should be guarded in case it tha the inspected > > oops > > > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:421 > > + m_inspectedPageIdentifier = m_inspectedPage->identifier(); > > Why are we only saving this here? Why not right after when > `m_inspectedPage` is set (e.g. > `WebInspectorUIProxy::updateForNewPageProcess`)? > > Also, when do we clear this? Maybe when we clear `m_inspectedPage` (e.g. > `WebInspectorUIProxy::reset`)? Good suggestion, I fixed it. > > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:423 > > + m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier, *this); > > Should we also do the same thing for the use in > `WebInspectorUIProxy::openLocalInspectorFrontend`? I tried changing it to use the cached identifier, but it resulted in "Message not understood: EstablishConnection". We shouldn't change the cached identifier after setting it because the same destination is needed to add and remove the message receiver. So, I think it is fine to re-query here as the code currently does. 1819922 5 444606 hi 2021-12-02 16:26:48 -0800 Comment on attachment 444606 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=444606&action=review >>> Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:423 >>> + m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier, *this); >> >> Should we also do the same thing for the use in `WebInspectorUIProxy::openLocalInspectorFrontend`? > > I tried changing it to use the cached identifier, but it resulted in "Message not understood: EstablishConnection". We shouldn't change the cached identifier after setting it because the same destination is needed to add and remove the message receiver. > > So, I think it is fine to re-query here as the code currently does. Err, I meant more to use `m_inspectedPageIdentifier` instead of `m_inspectedPage->identifier()`. I would hope that the identifier doesn't change in between the call to `createFrontendPage` and sending `WebInspectorUI::EstablishConnection` 😅 1819925 6 445788 bburg 2021-12-02 16:29:56 -0800 Created attachment 445788 Patch v1.1 (for landing) 1819935 7 445788 hi 2021-12-02 16:36:29 -0800 Comment on attachment 445788 Patch v1.1 (for landing) View in context: https://bugs.webkit.org/attachment.cgi?id=445788&action=review r=me, nice! =D > Source/WebKit/UIProcess/Inspector/WebInspectorUIProxy.cpp:424 > + m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorUIProxy::messageReceiverName(), m_inspectedPageIdentifier, *this); please see comment #5 :) 1820187 8 bburg 2021-12-03 09:45:30 -0800 Committed r286498 (244837@main): <https://commits.webkit.org/244837@main> 444606 2021-11-17 16:48:03 -0800 2021-12-02 16:29:55 -0800 Patch v1.0 bug-233293-20211117164802.patch text/plain 5163 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhMTEzYzAxMmUzNDkyNDQ5 MmUwZGJlMDIyYjgwMDI5NTQ5NGFkMTkuLjhlZGQ4MGEyYjRmY2MzMDZmZjZhM2UxYzhmYmNiNGIy YWY3Y2Y1NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTEtMTcgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogV2ViIEluc3BlY3Rv cl4yIGNyYXNoZXMgYWZ0ZXIgY2xvc2luZyBpZiBXZWIgSW5zcGVjdG9yXjEgY2xvc2VkIGZpcnN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMyOTMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg1NTI2NTA4PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhY2hlIHRoZSBpbnNwZWN0ZWQgcGFnZSdzIGlk ZW50aWZpZXIuIER1cmluZyBmcm9udGVuZCB0ZWFyZG93biwgdXNlIHRoZSBjYWNoZWQgaW5kZW50 aWZpZXIKKyAgICAgICAgdG8gcmVtb3ZlIHRoZSBtZXNzYWdlIHJlY2VpdmVyIHRoYXQgd2FzIGFk ZGVkIHRvIHJlY2VpdmUgbWVzc2FnZXMgZnJvbSB0aGUgaW5zcGVjdGVkIHBhZ2UuCisKKyAgICAg ICAgT3RoZXIgb3BlcmF0aW9ucyB1c2luZyBtX2luc3BlY3RlZFBhZ2Ugc2hvdWxkIGJlIGd1YXJk ZWQgaW4gY2FzZSBpdCB0aGEgdGhlIGluc3BlY3RlZAorICAgICAgICBwYWdlIGFscmVhZHkgYmVl biBjbG9zZWQgYW5kIGRlc3Ryb3llZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3Iv V2ViSW5zcGVjdG9yVUlQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJ UHJveHk6OmNyZWF0ZUZyb250ZW5kUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rv clVJUHJveHk6OmNsb3NlRnJvbnRlbmRQYWdlQW5kV2luZG93KToKKyAgICAgICAgKiBVSVByb2Nl c3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuaDoKKwogMjAyMS0xMS0xNyAgQkogQnVy ZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXggSVBDIHJh Y2UgYmV0d2VlbiB1bnJlZ2lzdGVyaW5nIGFuIGV4dGVuc2lvbiBhbmQgV2ViIEluc3BlY3RvciBj bG9zaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2Vi SW5zcGVjdG9yVUlQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3Iv V2ViSW5zcGVjdG9yVUlQcm94eS5jcHAKaW5kZXggNTcyZDIzNWM2ZDFmMTRkY2UyMTIyODkxOTM1 M2I3MzQ0YTkwM2NlMi4uNzEzYWYxMzg1ZDE1YWI2ZDE4Mjk4MjhiNzFmNjk5OTFhY2NjM2Q3NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3Rv clVJUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJ bnNwZWN0b3JVSVByb3h5LmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTAtMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTAtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBQb3J0aW9u cyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC00MTgsOCArNDE4LDkgQEAgdm9pZCBXZWJJ bnNwZWN0b3JVSVByb3h5OjpjcmVhdGVGcm9udGVuZFBhZ2UoKQogCiAgICAgLy8gTWFrZSBzdXJl IHRoZSBpbnNwZWN0ZWQgcGFnZSBoYXMgYSBydW5uaW5nIFdlYlByb2Nlc3Mgc28gd2UgY2FuIGlu c3BlY3QgaXQuCiAgICAgbV9pbnNwZWN0ZWRQYWdlLT5sYXVuY2hJbml0aWFsUHJvY2Vzc0lmTmVj ZXNzYXJ5KCk7CisgICAgbV9pbnNwZWN0ZWRQYWdlSWRlbnRpZmllciA9IG1faW5zcGVjdGVkUGFn ZS0+aWRlbnRpZmllcigpOwogCi0gICAgbV9pbnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkuYWRkTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSVByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1faW5zcGVjdGVkUGFnZS0+aWRlbnRpZmllcigpLCAqdGhpcyk7CisgICAgbV9p bnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJ bnNwZWN0b3JVSVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVjdGVkUGFnZUlk ZW50aWZpZXIsICp0aGlzKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1JfRVhURU5TSU9OUykKICAg ICBtX2V4dGVuc2lvbkNvbnRyb2xsZXIgPSBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xs ZXJQcm94eTo6Y3JlYXRlKCptX2luc3BlY3RvclBhZ2UpOwpAQCAtNTI5LDcgKzUzMCw4IEBAIHZv aWQgV2ViSW5zcGVjdG9yVUlQcm94eTo6Y2xvc2VGcm9udGVuZFBhZ2VBbmRXaW5kb3coKQogICAg IFNldEZvclNjb3BlPGJvb2w+IHJlZW50cmFuY3lQcm90ZWN0b3IobV9jbG9zaW5nLCB0cnVlKTsK ICAgICAKICAgICAvLyBOb3RpZnkgV2ViS2l0IGNsaWVudCB3aGVuIGEgbG9jYWwgaW5zcGVjdG9y IGNsb3NlcyBzbyBpdCBjYW4gY2xlYXIgX1dLSW5zcGVjdG9yRGVsZWdhdGUgYW5kIHBlcmZvcm0g b3RoZXIgY2xlYW51cC4KLSAgICBtX2luc3BlY3RlZFBhZ2UtPnVpQ2xpZW50KCkud2lsbENsb3Nl TG9jYWxJbnNwZWN0b3IoKm1faW5zcGVjdGVkUGFnZSwgKnRoaXMpOworICAgIGlmIChtX2luc3Bl Y3RlZFBhZ2UpCisgICAgICAgIG1faW5zcGVjdGVkUGFnZS0+dWlDbGllbnQoKS53aWxsQ2xvc2VM b2NhbEluc3BlY3RvcigqbV9pbnNwZWN0ZWRQYWdlLCAqdGhpcyk7CiAKICAgICBtX2lzVmlzaWJs ZSA9IGZhbHNlOwogICAgIG1faXNQcm9maWxpbmdQYWdlID0gZmFsc2U7CkBAIC01MzksMTIgKzU0 MSwxMiBAQCB2b2lkIFdlYkluc3BlY3RvclVJUHJveHk6OmNsb3NlRnJvbnRlbmRQYWdlQW5kV2lu ZG93KCkKICAgICB1bnRyYWNrSW5zcGVjdG9yUGFnZShtX2luc3BlY3RvclBhZ2UpOwogCiAgICAg bV9pbnNwZWN0b3JQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSTo6U2V0SXNWaXNp YmxlKG1faXNWaXNpYmxlKSk7Ci0gICAgbV9pbnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkucmVtb3Zl TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1faW5zcGVjdGVkUGFnZS0+aWRlbnRpZmllcigpKTsKKyAgICBtX2luc3Bl Y3RvclBhZ2UtPnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYklu c3BlY3RvclVJUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdlSWRl bnRpZmllcik7CiAKLSAgICBpZiAobV9pc0FjdGl2ZUZyb250ZW5kKSB7Ci0gICAgICAgIG1faXNB Y3RpdmVGcm9udGVuZCA9IGZhbHNlOworICAgIGlmIChtX2luc3BlY3RlZFBhZ2UgJiYgbV9pc0Fj dGl2ZUZyb250ZW5kKQogICAgICAgICBtX2luc3BlY3RlZFBhZ2UtPmluc3BlY3RvckNvbnRyb2xs ZXIoKS5kaXNjb25uZWN0RnJvbnRlbmQoKnRoaXMpOwotICAgIH0KKworICAgIG1faXNBY3RpdmVG cm9udGVuZCA9IGZhbHNlOwogCiAgICAgaWYgKG1faXNBdHRhY2hlZCkKICAgICAgICAgcGxhdGZv cm1EZXRhY2goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rv ci9XZWJJbnNwZWN0b3JVSVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0 b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5oCmluZGV4IDI5MjE0ZDU2ZGZiNmZjYjkwMGY5OWUyNmRk OTVlODcxZGY2ZmJkM2QuLmVlOGExNGM0ZmM2MDgxYzBkNTQ4ZjIyMmY5MzdmY2I5ZjU2YTFjYTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0 b3JVSVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYklu c3BlY3RvclVJUHJveHkuaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MTAtMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTAtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBQb3J0aW9ucyBD b3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiRGVi dWdnYWJsZUluZm9EYXRhLmgiCiAjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVyLmgiCiAjaW5jbHVk ZSAiV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5SWRlbnRp Zmllci5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0luc3BlY3RvckZyb250ZW5kQ2hhbm5l bC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRSZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9J bnNwZWN0b3JDbGllbnQuaD4KQEAgLTI4OCw2ICsyODksNyBAQCBwcml2YXRlOgogICAgIFdlYlBh Z2VQcm94eSogbV9pbnNwZWN0ZWRQYWdlIHsgbnVsbHB0ciB9OwogICAgIFdlYlBhZ2VQcm94eSog bV9pbnNwZWN0b3JQYWdlIHsgbnVsbHB0ciB9OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6Oklu c3BlY3RvckNsaWVudD4gbV9pbnNwZWN0b3JDbGllbnQ7CisgICAgV2ViUGFnZVByb3h5SWRlbnRp ZmllciBtX2luc3BlY3RlZFBhZ2VJZGVudGlmaWVyIHsgfTsKIAogI2lmIEVOQUJMRShJTlNQRUNU T1JfRVhURU5TSU9OUykKICAgICBSZWZQdHI8V2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9s bGVyUHJveHk+IG1fZXh0ZW5zaW9uQ29udHJvbGxlcjsK 445788 2021-12-02 16:29:56 -0800 2022-03-01 02:24:23 -0800 Patch v1.1 (for landing) bug-233293-20211202162955.patch text/plain 5511 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM1OWZkZGNjM2JjODUyYTgz NGYxMzk5OTIxMTNjOWM2ZjVkMTE4MjQuLmNlOTQ1MmFiNmRkMzdlMGViODgzZjdkMTFkMjFlZDBh MzE1NDJmMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMTItMDIgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogV2ViIEluc3BlY3Rv cl4yIGNyYXNoZXMgYWZ0ZXIgY2xvc2luZyBpZiBXZWIgSW5zcGVjdG9yXjEgY2xvc2VkIGZpcnN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMyOTMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg1NTI2NTA4PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhY2hlIHRoZSBpbnNwZWN0ZWQgcGFnZSdzIGlk ZW50aWZpZXIuIER1cmluZyBmcm9udGVuZCB0ZWFyZG93biwgdXNlIHRoZSBjYWNoZWQgaW5kZW50 aWZpZXIKKyAgICAgICAgdG8gcmVtb3ZlIHRoZSBtZXNzYWdlIHJlY2VpdmVyIHRoYXQgd2FzIGFk ZGVkIHRvIHJlY2VpdmUgbWVzc2FnZXMgZnJvbSB0aGUgaW5zcGVjdGVkIHBhZ2UuCisKKyAgICAg ICAgT3RoZXIgb3BlcmF0aW9ucyB1c2luZyBtX2luc3BlY3RlZFBhZ2Ugc2hvdWxkIGJlIGd1YXJk ZWQgaW4gY2FzZSB0aGF0IHRoZSBpbnNwZWN0ZWQKKyAgICAgICAgcGFnZSBhbHJlYWR5IGJlZW4g Y2xvc2VkIGFuZCBkZXN0cm95ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dl Ykluc3BlY3RvclVJUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JVSVBy b3h5OjpjcmVhdGVGcm9udGVuZFBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JV SVByb3h5OjpjbG9zZUZyb250ZW5kUGFnZUFuZFdpbmRvdyk6CisgICAgICAgICogVUlQcm9jZXNz L0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSVByb3h5Lmg6CisKKwogMjAyMS0xMi0wMSAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV1c2UgbmF2aWdhdGlvbiBw cmVsb2FkIGlmIHNlcnZpY2Ugd29ya2VyIGlzIGZldGNoaW5nIHRoZSBjb3JyZXNwb25kaW5nIG5h dmlnYXRpb24gcmVxdWVzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5z cGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv SW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuY3BwCmluZGV4IDU3MmQyMzVjNmQxZjE0ZGNl MjEyMjg5MTkzNTNiNzM0NGE5MDNjZTIuLjYyYWFjOTkxZjYzMzk4ZDE2ZTNkNDA3NWVmYjM2M2I3 M2UzOGFiNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9X ZWJJbnNwZWN0b3JVSVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNw ZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDEwLTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICog Q29weXJpZ2h0IChDKSAyMDEwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICogUG9ydGlvbnMgQ29weXJpZ2h0IChjKSAyMDExIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMuICBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMjI1LDYgKzIyNSw4IEBA IHZvaWQgV2ViSW5zcGVjdG9yVUlQcm94eTo6dXBkYXRlRm9yTmV3UGFnZVByb2Nlc3MoV2ViUGFn ZVByb3h5JiBpbnNwZWN0ZWRQYWdlKQogICAgIEFTU0VSVCghbV9pbnNwZWN0ZWRQYWdlKTsKIAog ICAgIG1faW5zcGVjdGVkUGFnZSA9ICZpbnNwZWN0ZWRQYWdlOworICAgIG1faW5zcGVjdGVkUGFn ZUlkZW50aWZpZXIgPSBtX2luc3BlY3RlZFBhZ2UtPmlkZW50aWZpZXIoKTsKKwogICAgIG1faW5z cGVjdGVkUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5z cGVjdG9yVUlQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3BlY3RlZFBhZ2UtPndl YlBhZ2VJRCgpLCAqdGhpcyk7CiAKICAgICBpZiAobV9pbnNwZWN0b3JQYWdlKQpAQCAtNDE5LDcg KzQyMSw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yVUlQcm94eTo6Y3JlYXRlRnJvbnRlbmRQYWdlKCkK ICAgICAvLyBNYWtlIHN1cmUgdGhlIGluc3BlY3RlZCBwYWdlIGhhcyBhIHJ1bm5pbmcgV2ViUHJv Y2VzcyBzbyB3ZSBjYW4gaW5zcGVjdCBpdC4KICAgICBtX2luc3BlY3RlZFBhZ2UtPmxhdW5jaElu aXRpYWxQcm9jZXNzSWZOZWNlc3NhcnkoKTsKIAotICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2Vz cygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yVUlQcm94eTo6bWVz c2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3BlY3RlZFBhZ2UtPmlkZW50aWZpZXIoKSwgKnRoaXMp OworICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViSW5zcGVjdG9yVUlQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3Bl Y3RlZFBhZ2VJZGVudGlmaWVyLCAqdGhpcyk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SX0VYVEVO U0lPTlMpCiAgICAgbV9leHRlbnNpb25Db250cm9sbGVyID0gV2ViSW5zcGVjdG9yVUlFeHRlbnNp b25Db250cm9sbGVyUHJveHk6OmNyZWF0ZSgqbV9pbnNwZWN0b3JQYWdlKTsKQEAgLTUyOSw3ICs1 MzEsOCBAQCB2b2lkIFdlYkluc3BlY3RvclVJUHJveHk6OmNsb3NlRnJvbnRlbmRQYWdlQW5kV2lu ZG93KCkKICAgICBTZXRGb3JTY29wZTxib29sPiByZWVudHJhbmN5UHJvdGVjdG9yKG1fY2xvc2lu ZywgdHJ1ZSk7CiAgICAgCiAgICAgLy8gTm90aWZ5IFdlYktpdCBjbGllbnQgd2hlbiBhIGxvY2Fs IGluc3BlY3RvciBjbG9zZXMgc28gaXQgY2FuIGNsZWFyIF9XS0luc3BlY3RvckRlbGVnYXRlIGFu ZCBwZXJmb3JtIG90aGVyIGNsZWFudXAuCi0gICAgbV9pbnNwZWN0ZWRQYWdlLT51aUNsaWVudCgp LndpbGxDbG9zZUxvY2FsSW5zcGVjdG9yKCptX2luc3BlY3RlZFBhZ2UsICp0aGlzKTsKKyAgICBp ZiAobV9pbnNwZWN0ZWRQYWdlKQorICAgICAgICBtX2luc3BlY3RlZFBhZ2UtPnVpQ2xpZW50KCku d2lsbENsb3NlTG9jYWxJbnNwZWN0b3IoKm1faW5zcGVjdGVkUGFnZSwgKnRoaXMpOwogCiAgICAg bV9pc1Zpc2libGUgPSBmYWxzZTsKICAgICBtX2lzUHJvZmlsaW5nUGFnZSA9IGZhbHNlOwpAQCAt NTM5LDEyICs1NDIsMTIgQEAgdm9pZCBXZWJJbnNwZWN0b3JVSVByb3h5OjpjbG9zZUZyb250ZW5k UGFnZUFuZFdpbmRvdygpCiAgICAgdW50cmFja0luc3BlY3RvclBhZ2UobV9pbnNwZWN0b3JQYWdl KTsKIAogICAgIG1faW5zcGVjdG9yUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViSW5zcGVjdG9yVUk6 OlNldElzVmlzaWJsZShtX2lzVmlzaWJsZSkpOwotICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2Vz cygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yVUlQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3BlY3RlZFBhZ2UtPmlkZW50aWZpZXIoKSk7Cisg ICAgbV9pbnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3Nh Z2VzOjpXZWJJbnNwZWN0b3JVSVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVj dGVkUGFnZUlkZW50aWZpZXIpOwogCi0gICAgaWYgKG1faXNBY3RpdmVGcm9udGVuZCkgewotICAg ICAgICBtX2lzQWN0aXZlRnJvbnRlbmQgPSBmYWxzZTsKKyAgICBpZiAobV9pbnNwZWN0ZWRQYWdl ICYmIG1faXNBY3RpdmVGcm9udGVuZCkKICAgICAgICAgbV9pbnNwZWN0ZWRQYWdlLT5pbnNwZWN0 b3JDb250cm9sbGVyKCkuZGlzY29ubmVjdEZyb250ZW5kKCp0aGlzKTsKLSAgICB9CisKKyAgICBt X2lzQWN0aXZlRnJvbnRlbmQgPSBmYWxzZTsKIAogICAgIGlmIChtX2lzQXR0YWNoZWQpCiAgICAg ICAgIHBsYXRmb3JtRGV0YWNoKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuaAppbmRleCAyOTIxNGQ1NmRmYjZmY2I5 MDBmOTllMjZkZDk1ZTg3MWRmNmZiZDNkLi40ODBhYTNjYjliYmJhMWNiMmMyNDczYzRkOGNhNzAz YjAxMjAxNTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3Iv V2ViSW5zcGVjdG9yVUlQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3Bl Y3Rvci9XZWJJbnNwZWN0b3JVSVByb3h5LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDEwLTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDEwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICog UG9ydGlvbnMgQ29weXJpZ2h0IChjKSAyMDExIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMzEsNiArMzEsNyBAQAogI2lu Y2x1ZGUgIkRlYnVnZ2FibGVJbmZvRGF0YS5oIgogI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5o IgogI2luY2x1ZGUgIldlYkluc3BlY3RvclV0aWxpdGllcy5oIgorI2luY2x1ZGUgIldlYlBhZ2VQ cm94eUlkZW50aWZpZXIuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JGcm9u dGVuZENoYW5uZWwuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2luY2x1ZGUg PFdlYkNvcmUvSW5zcGVjdG9yQ2xpZW50Lmg+CkBAIC0yODgsNiArMjg5LDcgQEAgcHJpdmF0ZToK ICAgICBXZWJQYWdlUHJveHkqIG1faW5zcGVjdGVkUGFnZSB7IG51bGxwdHIgfTsKICAgICBXZWJQ YWdlUHJveHkqIG1faW5zcGVjdG9yUGFnZSB7IG51bGxwdHIgfTsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8QVBJOjpJbnNwZWN0b3JDbGllbnQ+IG1faW5zcGVjdG9yQ2xpZW50OworICAgIFdlYlBhZ2VQ cm94eUlkZW50aWZpZXIgbV9pbnNwZWN0ZWRQYWdlSWRlbnRpZmllcjsKIAogI2lmIEVOQUJMRShJ TlNQRUNUT1JfRVhURU5TSU9OUykKICAgICBSZWZQdHI8V2ViSW5zcGVjdG9yVUlFeHRlbnNpb25D b250cm9sbGVyUHJveHk+IG1fZXh0ZW5zaW9uQ29udHJvbGxlcjsK