196725 2019-04-08 21:08:19 -0700 Web Inspector: REGRESSION: lazy agents used outside of frontend/instrumentation can be accessed before being created 2019-04-10 16:15:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 195971 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1525556 0 hi 2019-04-08 21:08:19 -0700 `WebCore::InspectorFrontendClientLocal::showMainResourceForFrame` and `WebKit::WebInspector::showMainResourceForFrame` both access `WebCore::InspectorController::pageAgent`, even though the underlying `m_pageAgent` isn't instantiated until the first frontend connects. 1525557 1 hi 2019-04-08 21:08:40 -0700 <rdar://problem/49669810> 1525558 2 367025 hi 2019-04-08 21:13:59 -0700 Created attachment 367025 Patch 1525721 3 367064 hi 2019-04-09 12:51:04 -0700 Created attachment 367064 Patch 1526155 4 367064 timothy 2019-04-10 15:19:49 -0700 Comment on attachment 367064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367064&action=review > Source/WebCore/inspector/InspectorController.h:110 > - InspectorPageAgent* pageAgent() const { return m_pageAgent; } > + > + InspectorDOMAgent& ensureDOMAgent(); > + WEBCORE_EXPORT InspectorPageAgent& ensurePageAgent(); Why not just have pageAgent() and a domAgent() getter create the agents if needed and drop the need for the ensure functions? 1526162 5 367064 hi 2019-04-10 15:34:53 -0700 Comment on attachment 367064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367064&action=review >> Source/WebCore/inspector/InspectorController.h:110 >> + WEBCORE_EXPORT InspectorPageAgent& ensurePageAgent(); > > Why not just have pageAgent() and a domAgent() getter create the agents if needed and drop the need for the ensure functions? I vaguely remember there being a discussion about this style on one of the webkit-* mailing lists. I prefer the "ensure" as it makes it clearer to callers that this function might create an object, rather than just return whatever currently exists. 1526199 6 367064 commit-queue 2019-04-10 16:15:14 -0700 Comment on attachment 367064 Patch Clearing flags on attachment: 367064 Committed r244167: <https://trac.webkit.org/changeset/244167> 1526200 7 commit-queue 2019-04-10 16:15:15 -0700 All reviewed patches have been landed. Closing bug. 367025 2019-04-08 21:13:59 -0700 2019-04-09 12:51:04 -0700 Patch bug-196725-20190408211358.patch text/plain 8467 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhODRhMGExNTA2YWZkYWNjZDg5MzAxNjI4NmQ1ZTA3MmQyOWZkODM1Li4z NjEyNmM2ZTFhMDI0MmZmZjBiNmRiZDQ3NWFlNTM1YTE2NDk5M2ZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzAgQEAKKzIwMTktMDQtMDggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046IGxhenkgYWdlbnRzIHVzZWQg b3V0c2lkZSBvZiBmcm9udGVuZC9pbnN0cnVtZW50YXRpb24gY2FuIGJlIGFjY2Vzc2VkIGJlZm9y ZSBiZWluZyBjcmVhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTY3MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NjY5ODEwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIGxvZ2lj IGZvciBjcmVhdGluZyB0aGUgYEluc3BlY3RvclBhZ2VBZ2VudGAgYW5kIGBJbnNwZWN0b3JET01B Z2VudGAgaW50byBzZXBhcmF0ZQorICAgICAgICBmdW5jdGlvbnMgc28gdGhhdCBjYWxsZXJzIGlu dG8gYEluc3BlY3RvckNvbnRyb2xsZXJgIGNhbiBiZSBndWFyYW50ZWVkIHRvIGhhdmUgYSB2YWxp ZAorICAgICAgICBpbnN0YW5jZSBvZiB0aGUgYWdlbnQuCisKKyAgICAgICAgVGhpcyBkb2Vzbid0 IGludGVyZmVyZSB3aXRoIHRoZSBgUGFnZS5lbmFibGVgIGNvbW1hbmQsIGFzIGl0IGRvZXNuJ3Qg Y2xlYXIgYW55IHNhdmVkIHN0YXRlLgorICAgICAgICBUaGVyZSBpcyBubyBgRE9NLmVuYWJsZWAg Y29tbWFuZCwgc28gdGhlcmUncyBubyBpc3N1ZSB0aGVyZSBlaXRoZXIuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6cGFnZUFnZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250 cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNv bnRyb2xsZXI6Omluc3BlY3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6aGlkZUhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy OjplbnN1cmVET01BZ2VudCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6ZW5zdXJlUGFnZUFnZW50KTogQWRkZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzaG93TWFpblJlc291cmNlRm9yRnJhbWUpOgorCiAy MDE5LTA0LTA4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgaU9TTWFjIGFmdGVyIHIyNDM4OTMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDk1ZGY2MzdiYjZjZmVlZjhiMjE2NTU0YTYxMDY1MTYzYjVmOTJjMjUuLmQzZDA1Mzk1Y2Q4 NWVlMWU0NmY5ZjU5NjllZmY5MmI4YzI5MGQxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTktMDQtMDggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046IGxhenkgYWdlbnRzIHVzZWQgb3V0c2lkZSBvZiBm cm9udGVuZC9pbnN0cnVtZW50YXRpb24gY2FuIGJlIGFjY2Vzc2VkIGJlZm9yZSBiZWluZyBjcmVh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY3 MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NjY5ODEwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYklu c3BlY3Rvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6c2hvd01haW5SZXNv dXJjZUZvckZyYW1lKToKKwogMjAxOS0wNC0wOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBzZWxlY3RvciBuYW1lIGFmdGVyIHIyNDM4 MzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAppbmRleCAwMDdhMDljYzU5ODJkMjI0ZGMwZDU2MzU3YmEwZjE1MjA3ZmU3ZDQyLi42ODZiODhl MTQyM2YwZGY4OWFmMDdiNmRhYTFhMGJhNjQ0MjhhNDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xNTYsOSArMTU2LDcgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKCkKIAogICAgIGF1dG8g cGFnZUNvbnRleHQgPSBwYWdlQWdlbnRDb250ZXh0KCk7CiAKLSAgICBhdXRvIHBhZ2VBZ2VudFB0 ciA9IHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yUGFnZUFnZW50PihwYWdlQ29udGV4dCwgbV9p bnNwZWN0b3JDbGllbnQsIG1fb3ZlcmxheS5nZXQoKSk7Ci0gICAgbV9wYWdlQWdlbnQgPSBwYWdl QWdlbnRQdHIuZ2V0KCk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKFdURk1vdmUocGFnZUFnZW50UHRy KSk7CisgICAgZW5zdXJlUGFnZUFnZW50KCk7CiAKICAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjpt YWtlX3VuaXF1ZTxQYWdlUnVudGltZUFnZW50PihwYWdlQ29udGV4dCkpOwogCkBAIC0xNjgsNyAr MTY2LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKCkKIAog ICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VOZXR3b3JrQWdlbnQ+KHBh Z2VDb250ZXh0KSk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVj dG9yQ1NTQWdlbnQ+KHBhZ2VDb250ZXh0KSk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFr ZV91bmlxdWU8SW5zcGVjdG9yRE9NQWdlbnQ+KHBhZ2VDb250ZXh0LCBtX292ZXJsYXkuZ2V0KCkp KTsKKyAgICBlbnN1cmVET01BZ2VudCgpOwogICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2Vf dW5pcXVlPEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ+KHBhZ2VDb250ZXh0LCBkZWJ1Z2dlckFn ZW50UHRyKSk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9y QXBwbGljYXRpb25DYWNoZUFnZW50PihwYWdlQ29udGV4dCkpOwogICAgIG1fYWdlbnRzLmFwcGVu ZChzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvckxheWVyVHJlZUFnZW50PihwYWdlQ29udGV4dCkp OwpAQCAtMzgxLDggKzM3OSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdChO b2RlKiBub2RlKQogICAgIGlmICghaGFzUmVtb3RlRnJvbnRlbmQoKSkKICAgICAgICAgc2hvdygp OwogCi0gICAgaWYgKGF1dG8qIGRvbUFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNw ZWN0b3JET01BZ2VudCgpKQotICAgICAgICBkb21BZ2VudC0+aW5zcGVjdChub2RlKTsKKyAgICBl bnN1cmVET01BZ2VudCgpLmluc3BlY3Qobm9kZSk7CiB9CiAKIGJvb2wgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZW5hYmxlZCgpIGNvbnN0CkBAIC00MDIsMTAgKzM5OSw3IEBAIHZvaWQgSW5zcGVjdG9y Q29udHJvbGxlcjo6ZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVz c2FnZSkKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpoaWRlSGlnaGxpZ2h0KCkKIHsKLSAg ICBpZiAoYXV0byogZG9tQWdlbnQgPSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckRP TUFnZW50KCkpIHsKLSAgICAgICAgRXJyb3JTdHJpbmcgdW51c2VkOwotICAgICAgICBkb21BZ2Vu dC0+aGlkZUhpZ2hsaWdodCh1bnVzZWQpOwotICAgIH0KKyAgICBtX292ZXJsYXktPmhpZGVIaWdo bGlnaHQoKQogfQogCiBOb2RlKiBJbnNwZWN0b3JDb250cm9sbGVyOjpoaWdobGlnaHRlZE5vZGUo KSBjb25zdApAQCAtNDI1LDYgKzQxOSwyOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNl dEluZGljYXRpbmcoYm9vbCBpbmRpY2F0aW5nKQogI2VuZGlmCiB9CiAKK0luc3BlY3RvckRPTUFn ZW50JiBJbnNwZWN0b3JDb250cm9sbGVyOjplbnN1cmVET01BZ2VudCgpCit7CisgICAgaWYgKCFt X2luc3BlY3RvckRPTUFnZW50KSB7CisgICAgICAgIGF1dG8gcGFnZUNvbnRleHQgPSBwYWdlQWdl bnRDb250ZXh0KCk7CisgICAgICAgIGF1dG8gZG9tQWdlbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPElu c3BlY3RvckRPTUFnZW50PihwYWdlQ29udGV4dCwgbV9vdmVybGF5LmdldCgpKTsKKyAgICAgICAg bV9pbnNwZWN0b3JET01BZ2VudCA9IGRvbUFnZW50LmdldCgpOworICAgICAgICBtX2FnZW50cy5h cHBlbmQoV1RGTW92ZShkb21BZ2VudCkpOworICAgIH0KKyAgICByZXR1cm4gKm1faW5zcGVjdG9y RE9NQWdlbnQ7Cit9CisKK0luc3BlY3RvclBhZ2VBZ2VudCYgSW5zcGVjdG9yQ29udHJvbGxlcjo6 ZW5zdXJlUGFnZUFnZW50KCkKK3sKKyAgICBpZiAoIW1faW5zcGVjdG9yUGFnZUFnZW50KSB7Cisg ICAgICAgIGF1dG8gcGFnZUNvbnRleHQgPSBwYWdlQWdlbnRDb250ZXh0KCk7CisgICAgICAgIGF1 dG8gcGFnZUFnZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JQYWdlQWdlbnQ+KHBhZ2VD b250ZXh0LCBtX2luc3BlY3RvckNsaWVudCwgbV9vdmVybGF5LmdldCgpKTsKKyAgICAgICAgbV9p bnNwZWN0b3JQYWdlQWdlbnQgPSBwYWdlQWdlbnQuZ2V0KCk7CisgICAgICAgIG1fYWdlbnRzLmFw cGVuZChXVEZNb3ZlKHBhZ2VBZ2VudCkpOworICAgIH0KKyAgICByZXR1cm4gKm1faW5zcGVjdG9y UGFnZUFnZW50OworfQorCiBib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OmRldmVsb3BlckV4dHJh c0VuYWJsZWQoKSBjb25zdAogewogICAgIHJldHVybiBtX3BhZ2Uuc2V0dGluZ3MoKS5kZXZlbG9w ZXJFeHRyYXNFbmFibGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAppbmRleCBiNzdhNGQwNzQ4NTJhMGMzODg0N2I3MWIzYWExM2RjZWJkMjJm ZmU1Li43MWYyNjQyNjI2ODNlYzc0NDM0ZmU3NmEzMmQ3Nzg0NzA5OTNmZTVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTUyLDYgKzUy LDcgQEAgY2xhc3MgRE9NV3JhcHBlcldvcmxkOwogY2xhc3MgRnJhbWU7CiBjbGFzcyBHcmFwaGlj c0NvbnRleHQ7CiBjbGFzcyBJbnNwZWN0b3JDbGllbnQ7CitjbGFzcyBJbnNwZWN0b3JET01BZ2Vu dDsKIGNsYXNzIEluc3BlY3RvckZyb250ZW5kQ2xpZW50OwogY2xhc3MgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOwogY2xhc3MgSW5zcGVjdG9yUGFnZUFnZW50OwpAQCAtMTA0LDcgKzEwNSw5IEBA IHB1YmxpYzoKIAogICAgIEluc3BlY3RvckNsaWVudCogaW5zcGVjdG9yQ2xpZW50KCkgY29uc3Qg eyByZXR1cm4gbV9pbnNwZWN0b3JDbGllbnQ7IH0KICAgICBJbnNwZWN0b3JGcm9udGVuZENsaWVu dCogaW5zcGVjdG9yRnJvbnRlbmRDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2luc3BlY3RvckZy b250ZW5kQ2xpZW50OyB9Ci0gICAgSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQoKSBjb25z dCB7IHJldHVybiBtX3BhZ2VBZ2VudDsgfQorCisgICAgSW5zcGVjdG9yRE9NQWdlbnQmIGVuc3Vy ZURPTUFnZW50KCk7CisgICAgV0VCQ09SRV9FWFBPUlQgSW5zcGVjdG9yUGFnZUFnZW50JiBlbnN1 cmVQYWdlQWdlbnQoKTsKIAogICAgIC8vIEluc3BlY3RvckVudmlyb25tZW50CiAgICAgYm9vbCBk ZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkgY29uc3Qgb3ZlcnJpZGU7CkBAIC0xMzYsNyArMTM5LDEw IEBAIHByaXZhdGU6CiAgICAgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQqIG1faW5zcGVjdG9yRnJv bnRlbmRDbGllbnQgeyBudWxscHRyIH07CiAKICAgICBJbnNwZWN0b3I6Okluc3BlY3RvckFnZW50 KiBtX2luc3BlY3RvckFnZW50IHsgbnVsbHB0ciB9OwotICAgIEluc3BlY3RvclBhZ2VBZ2VudCog bV9wYWdlQWdlbnQgeyBudWxscHRyIH07CisKKyAgICAvLyBMYXp5LCBidXQgYWxzbyBvbi1kZW1h bmQgYWdlbnRzLgorICAgIEluc3BlY3RvckRPTUFnZW50KiBtX2luc3BlY3RvckRPTUFnZW50IHsg bnVsbHB0ciB9OworICAgIEluc3BlY3RvclBhZ2VBZ2VudCogbV9pbnNwZWN0b3JQYWdlQWdlbnQg eyBudWxscHRyIH07CiAKICAgICBib29sIG1faXNVbmRlclRlc3QgeyBmYWxzZSB9OwogICAgIGJv b2wgbV9pc0F1dG9tYXRpY0luc3BlY3Rpb24geyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCmlu ZGV4IDI0M2Q4NDljOWJmMWExZTU5ZDhmYTc0ODc0ODkyYjI2NTIyMjZlMDMuLjc0MTIwZDJiNDBl YjI5YzU2Njk5NGE4OGNmNzNmNTk3MTM2ZDkyNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKQEAgLTMz OCw3ICszMzgsNyBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OnNob3dSZXNv dXJjZXMoKQogCiB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OnNob3dNYWluUmVz b3VyY2VGb3JGcmFtZShGcmFtZSogZnJhbWUpCiB7Ci0gICAgU3RyaW5nIGZyYW1lSWQgPSBtX2lu c3BlY3RlZFBhZ2VDb250cm9sbGVyLT5wYWdlQWdlbnQoKS0+ZnJhbWVJZChmcmFtZSk7CisgICAg U3RyaW5nIGZyYW1lSWQgPSBtX2luc3BlY3RlZFBhZ2VDb250cm9sbGVyLT5lbnN1cmVQYWdlQWdl bnQoKS5mcmFtZUlkKGZyYW1lKTsKICAgICBldmFsdWF0ZU9uTG9hZChtYWtlU3RyaW5nKCJbXCJz aG93TWFpblJlc291cmNlRm9yRnJhbWVcIiwgXCIiLCBmcmFtZUlkLCAiXCJdIikpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3Iu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcApp bmRleCA4YTgzYjgwNmZhYzgwYzIwYTY0NGY4OWE1YTIwNWRhNmFmNjhjNzBjLi5kNzdlNjM3MGMx MTViZDZiOWI0NTU3MGMwNjZiMzdlYmRlMTEwYzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCB2 b2lkIFdlYkluc3BlY3Rvcjo6c2hvd01haW5SZXNvdXJjZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SWRlbnRpZmllcikKIAogICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLnNob3coKTsKIAotICAgIFN0cmluZyBpbnNwZWN0b3JGcmFtZUlkZW50aWZpZXIgPSBtX3Bh Z2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5wYWdlQWdlbnQoKS0+ZnJhbWVJ ZChmcmFtZS0+Y29yZUZyYW1lKCkpOworICAgIFN0cmluZyBpbnNwZWN0b3JGcmFtZUlkZW50aWZp ZXIgPSBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5lbnN1cmVQYWdl QWdlbnQoKS5mcmFtZUlkKGZyYW1lLT5jb3JlRnJhbWUoKSk7CiAKICAgICB3aGVuRnJvbnRlbmRD b25uZWN0aW9uRXN0YWJsaXNoZWQoWz1dIHsKICAgICAgICAgbV9mcm9udGVuZENvbm5lY3Rpb24t PnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3RvclVJOjpTaG93TWFpblJlc291cmNlRm9yRnJhbWUo aW5zcGVjdG9yRnJhbWVJZGVudGlmaWVyKSwgMCk7Cg== 367064 2019-04-09 12:51:04 -0700 2019-04-10 16:15:14 -0700 Patch bug-196725-20190408211358.patch text/plain 8468 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhODRhMGExNTA2YWZkYWNjZDg5MzAxNjI4NmQ1ZTA3MmQyOWZkODM1Li4z NjEyNmM2ZTFhMDI0MmZmZjBiNmRiZDQ3NWFlNTM1YTE2NDk5M2ZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzAgQEAKKzIwMTktMDQtMDggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046IGxhenkgYWdlbnRzIHVzZWQg b3V0c2lkZSBvZiBmcm9udGVuZC9pbnN0cnVtZW50YXRpb24gY2FuIGJlIGFjY2Vzc2VkIGJlZm9y ZSBiZWluZyBjcmVhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTY3MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NjY5ODEwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIGxvZ2lj IGZvciBjcmVhdGluZyB0aGUgYEluc3BlY3RvclBhZ2VBZ2VudGAgYW5kIGBJbnNwZWN0b3JET01B Z2VudGAgaW50byBzZXBhcmF0ZQorICAgICAgICBmdW5jdGlvbnMgc28gdGhhdCBjYWxsZXJzIGlu dG8gYEluc3BlY3RvckNvbnRyb2xsZXJgIGNhbiBiZSBndWFyYW50ZWVkIHRvIGhhdmUgYSB2YWxp ZAorICAgICAgICBpbnN0YW5jZSBvZiB0aGUgYWdlbnQuCisKKyAgICAgICAgVGhpcyBkb2Vzbid0 IGludGVyZmVyZSB3aXRoIHRoZSBgUGFnZS5lbmFibGVgIGNvbW1hbmQsIGFzIGl0IGRvZXNuJ3Qg Y2xlYXIgYW55IHNhdmVkIHN0YXRlLgorICAgICAgICBUaGVyZSBpcyBubyBgRE9NLmVuYWJsZWAg Y29tbWFuZCwgc28gdGhlcmUncyBubyBpc3N1ZSB0aGVyZSBlaXRoZXIuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6cGFnZUFnZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250 cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNv bnRyb2xsZXI6Omluc3BlY3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6aGlkZUhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy OjplbnN1cmVET01BZ2VudCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6ZW5zdXJlUGFnZUFnZW50KTogQWRkZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzaG93TWFpblJlc291cmNlRm9yRnJhbWUpOgorCiAy MDE5LTA0LTA4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgaU9TTWFjIGFmdGVyIHIyNDM4OTMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDk1ZGY2MzdiYjZjZmVlZjhiMjE2NTU0YTYxMDY1MTYzYjVmOTJjMjUuLmQzZDA1Mzk1Y2Q4 NWVlMWU0NmY5ZjU5NjllZmY5MmI4YzI5MGQxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTktMDQtMDggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046IGxhenkgYWdlbnRzIHVzZWQgb3V0c2lkZSBvZiBm cm9udGVuZC9pbnN0cnVtZW50YXRpb24gY2FuIGJlIGFjY2Vzc2VkIGJlZm9yZSBiZWluZyBjcmVh dGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY3 MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NjY5ODEwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYklu c3BlY3Rvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6c2hvd01haW5SZXNv dXJjZUZvckZyYW1lKToKKwogMjAxOS0wNC0wOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBzZWxlY3RvciBuYW1lIGFmdGVyIHIyNDM4 MzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAppbmRleCAwMDdhMDljYzU5ODJkMjI0ZGMwZDU2MzU3YmEwZjE1MjA3ZmU3ZDQyLi42ODZiODhl MTQyM2YwZGY4OWFmMDdiNmRhYTFhMGJhNjQ0MjhhNDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xNTYsOSArMTU2LDcgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKCkKIAogICAgIGF1dG8g cGFnZUNvbnRleHQgPSBwYWdlQWdlbnRDb250ZXh0KCk7CiAKLSAgICBhdXRvIHBhZ2VBZ2VudFB0 ciA9IHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yUGFnZUFnZW50PihwYWdlQ29udGV4dCwgbV9p bnNwZWN0b3JDbGllbnQsIG1fb3ZlcmxheS5nZXQoKSk7Ci0gICAgbV9wYWdlQWdlbnQgPSBwYWdl QWdlbnRQdHIuZ2V0KCk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKFdURk1vdmUocGFnZUFnZW50UHRy KSk7CisgICAgZW5zdXJlUGFnZUFnZW50KCk7CiAKICAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjpt YWtlX3VuaXF1ZTxQYWdlUnVudGltZUFnZW50PihwYWdlQ29udGV4dCkpOwogCkBAIC0xNjgsNyAr MTY2LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKCkKIAog ICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VOZXR3b3JrQWdlbnQ+KHBh Z2VDb250ZXh0KSk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVj dG9yQ1NTQWdlbnQ+KHBhZ2VDb250ZXh0KSk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFr ZV91bmlxdWU8SW5zcGVjdG9yRE9NQWdlbnQ+KHBhZ2VDb250ZXh0LCBtX292ZXJsYXkuZ2V0KCkp KTsKKyAgICBlbnN1cmVET01BZ2VudCgpOwogICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2Vf dW5pcXVlPEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ+KHBhZ2VDb250ZXh0LCBkZWJ1Z2dlckFn ZW50UHRyKSk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9y QXBwbGljYXRpb25DYWNoZUFnZW50PihwYWdlQ29udGV4dCkpOwogICAgIG1fYWdlbnRzLmFwcGVu ZChzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvckxheWVyVHJlZUFnZW50PihwYWdlQ29udGV4dCkp OwpAQCAtMzgxLDggKzM3OSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdChO b2RlKiBub2RlKQogICAgIGlmICghaGFzUmVtb3RlRnJvbnRlbmQoKSkKICAgICAgICAgc2hvdygp OwogCi0gICAgaWYgKGF1dG8qIGRvbUFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNw ZWN0b3JET01BZ2VudCgpKQotICAgICAgICBkb21BZ2VudC0+aW5zcGVjdChub2RlKTsKKyAgICBl bnN1cmVET01BZ2VudCgpLmluc3BlY3Qobm9kZSk7CiB9CiAKIGJvb2wgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZW5hYmxlZCgpIGNvbnN0CkBAIC00MDIsMTAgKzM5OSw3IEBAIHZvaWQgSW5zcGVjdG9y Q29udHJvbGxlcjo6ZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVz c2FnZSkKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpoaWRlSGlnaGxpZ2h0KCkKIHsKLSAg ICBpZiAoYXV0byogZG9tQWdlbnQgPSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckRP TUFnZW50KCkpIHsKLSAgICAgICAgRXJyb3JTdHJpbmcgdW51c2VkOwotICAgICAgICBkb21BZ2Vu dC0+aGlkZUhpZ2hsaWdodCh1bnVzZWQpOwotICAgIH0KKyAgICBtX292ZXJsYXktPmhpZGVIaWdo bGlnaHQoKTsKIH0KIAogTm9kZSogSW5zcGVjdG9yQ29udHJvbGxlcjo6aGlnaGxpZ2h0ZWROb2Rl KCkgY29uc3QKQEAgLTQyNSw2ICs0MTksMjggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpz ZXRJbmRpY2F0aW5nKGJvb2wgaW5kaWNhdGluZykKICNlbmRpZgogfQogCitJbnNwZWN0b3JET01B Z2VudCYgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5zdXJlRE9NQWdlbnQoKQoreworICAgIGlmICgh bV9pbnNwZWN0b3JET01BZ2VudCkgeworICAgICAgICBhdXRvIHBhZ2VDb250ZXh0ID0gcGFnZUFn ZW50Q29udGV4dCgpOworICAgICAgICBhdXRvIGRvbUFnZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxJ bnNwZWN0b3JET01BZ2VudD4ocGFnZUNvbnRleHQsIG1fb3ZlcmxheS5nZXQoKSk7CisgICAgICAg IG1faW5zcGVjdG9yRE9NQWdlbnQgPSBkb21BZ2VudC5nZXQoKTsKKyAgICAgICAgbV9hZ2VudHMu YXBwZW5kKFdURk1vdmUoZG9tQWdlbnQpKTsKKyAgICB9CisgICAgcmV0dXJuICptX2luc3BlY3Rv ckRPTUFnZW50OworfQorCitJbnNwZWN0b3JQYWdlQWdlbnQmIEluc3BlY3RvckNvbnRyb2xsZXI6 OmVuc3VyZVBhZ2VBZ2VudCgpCit7CisgICAgaWYgKCFtX2luc3BlY3RvclBhZ2VBZ2VudCkgewor ICAgICAgICBhdXRvIHBhZ2VDb250ZXh0ID0gcGFnZUFnZW50Q29udGV4dCgpOworICAgICAgICBh dXRvIHBhZ2VBZ2VudCA9IHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yUGFnZUFnZW50PihwYWdl Q29udGV4dCwgbV9pbnNwZWN0b3JDbGllbnQsIG1fb3ZlcmxheS5nZXQoKSk7CisgICAgICAgIG1f aW5zcGVjdG9yUGFnZUFnZW50ID0gcGFnZUFnZW50LmdldCgpOworICAgICAgICBtX2FnZW50cy5h cHBlbmQoV1RGTW92ZShwYWdlQWdlbnQpKTsKKyAgICB9CisgICAgcmV0dXJuICptX2luc3BlY3Rv clBhZ2VBZ2VudDsKK30KKwogYm9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjpkZXZlbG9wZXJFeHRy YXNFbmFibGVkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wYWdlLnNldHRpbmdzKCkuZGV2ZWxv cGVyRXh0cmFzRW5hYmxlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmgKaW5kZXggYjc3YTRkMDc0ODUyYTBjMzg4NDdiNzFiM2FhMTNkY2ViZDIy ZmZlNS4uNzFmMjY0MjYyNjgzZWM3NDQzNGZlNzZhMzJkNzc4NDcwOTkzZmU1ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC01Miw2ICs1 Miw3IEBAIGNsYXNzIERPTVdyYXBwZXJXb3JsZDsKIGNsYXNzIEZyYW1lOwogY2xhc3MgR3JhcGhp Y3NDb250ZXh0OwogY2xhc3MgSW5zcGVjdG9yQ2xpZW50OworY2xhc3MgSW5zcGVjdG9yRE9NQWdl bnQ7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZENsaWVudDsKIGNsYXNzIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjsKIGNsYXNzIEluc3BlY3RvclBhZ2VBZ2VudDsKQEAgLTEwNCw3ICsxMDUsOSBA QCBwdWJsaWM6CiAKICAgICBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1faW5zcGVjdG9yQ2xpZW50OyB9CiAgICAgSW5zcGVjdG9yRnJvbnRlbmRDbGll bnQqIGluc3BlY3RvckZyb250ZW5kQ2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9pbnNwZWN0b3JG cm9udGVuZENsaWVudDsgfQotICAgIEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50KCkgY29u c3QgeyByZXR1cm4gbV9wYWdlQWdlbnQ7IH0KKworICAgIEluc3BlY3RvckRPTUFnZW50JiBlbnN1 cmVET01BZ2VudCgpOworICAgIFdFQkNPUkVfRVhQT1JUIEluc3BlY3RvclBhZ2VBZ2VudCYgZW5z dXJlUGFnZUFnZW50KCk7CiAKICAgICAvLyBJbnNwZWN0b3JFbnZpcm9ubWVudAogICAgIGJvb2wg ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpIGNvbnN0IG92ZXJyaWRlOwpAQCAtMTM2LDcgKzEzOSwx MCBAQCBwcml2YXRlOgogICAgIEluc3BlY3RvckZyb250ZW5kQ2xpZW50KiBtX2luc3BlY3RvckZy b250ZW5kQ2xpZW50IHsgbnVsbHB0ciB9OwogCiAgICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JBZ2Vu dCogbV9pbnNwZWN0b3JBZ2VudCB7IG51bGxwdHIgfTsKLSAgICBJbnNwZWN0b3JQYWdlQWdlbnQq IG1fcGFnZUFnZW50IHsgbnVsbHB0ciB9OworCisgICAgLy8gTGF6eSwgYnV0IGFsc28gb24tZGVt YW5kIGFnZW50cy4KKyAgICBJbnNwZWN0b3JET01BZ2VudCogbV9pbnNwZWN0b3JET01BZ2VudCB7 IG51bGxwdHIgfTsKKyAgICBJbnNwZWN0b3JQYWdlQWdlbnQqIG1faW5zcGVjdG9yUGFnZUFnZW50 IHsgbnVsbHB0ciB9OwogCiAgICAgYm9vbCBtX2lzVW5kZXJUZXN0IHsgZmFsc2UgfTsKICAgICBi b29sIG1faXNBdXRvbWF0aWNJbnNwZWN0aW9uIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcApp bmRleCAyNDNkODQ5YzliZjFhMWU1OWQ4ZmE3NDg3NDg5MmIyNjUyMjI2ZTAzLi43NDEyMGQyYjQw ZWIyOWM1NjY5OTRhODhjZjczZjU5NzEzNmQ5MjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCkBAIC0z MzgsNyArMzM4LDcgQEAgdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzaG93UmVz b3VyY2VzKCkKIAogdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzaG93TWFpblJl c291cmNlRm9yRnJhbWUoRnJhbWUqIGZyYW1lKQogewotICAgIFN0cmluZyBmcmFtZUlkID0gbV9p bnNwZWN0ZWRQYWdlQ29udHJvbGxlci0+cGFnZUFnZW50KCktPmZyYW1lSWQoZnJhbWUpOworICAg IFN0cmluZyBmcmFtZUlkID0gbV9pbnNwZWN0ZWRQYWdlQ29udHJvbGxlci0+ZW5zdXJlUGFnZUFn ZW50KCkuZnJhbWVJZChmcmFtZSk7CiAgICAgZXZhbHVhdGVPbkxvYWQobWFrZVN0cmluZygiW1wi c2hvd01haW5SZXNvdXJjZUZvckZyYW1lXCIsIFwiIiwgZnJhbWVJZCwgIlwiXSIpKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9y LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAK aW5kZXggOGE4M2I4MDZmYWM4MGMyMGE2NDRmODlhNWEyMDVkYTZhZjY4YzcwYy4uZDc3ZTYzNzBj MTE1YmQ2YjliNDU1NzBjMDY2YjM3ZWJkZTExMGM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3IuY3BwCkBAIC0yMzIsNyArMjMyLDcgQEAg dm9pZCBXZWJJbnNwZWN0b3I6OnNob3dNYWluUmVzb3VyY2VGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlkZW50aWZpZXIpCiAKICAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xs ZXIoKS5zaG93KCk7CiAKLSAgICBTdHJpbmcgaW5zcGVjdG9yRnJhbWVJZGVudGlmaWVyID0gbV9w YWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkucGFnZUFnZW50KCktPmZyYW1l SWQoZnJhbWUtPmNvcmVGcmFtZSgpKTsKKyAgICBTdHJpbmcgaW5zcGVjdG9yRnJhbWVJZGVudGlm aWVyID0gbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkuZW5zdXJlUGFn ZUFnZW50KCkuZnJhbWVJZChmcmFtZS0+Y29yZUZyYW1lKCkpOwogCiAgICAgd2hlbkZyb250ZW5k Q29ubmVjdGlvbkVzdGFibGlzaGVkKFs9XSB7CiAgICAgICAgIG1fZnJvbnRlbmRDb25uZWN0aW9u LT5zZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSTo6U2hvd01haW5SZXNvdXJjZUZvckZyYW1l KGluc3BlY3RvckZyYW1lSWRlbnRpZmllciksIDApOwo=