187830 2018-07-19 17:07:56 -0700 Reduce getters/setters in WebFramePolicyListenerProxy 2018-07-24 10:28:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez dino webkit-bug-importer oldest_to_newest 1443603 0 achristensen 2018-07-19 17:07:56 -0700 Reduce getters/setters in WebFramePolicyListenerProxy 1443605 1 345404 achristensen 2018-07-19 17:11:14 -0700 Created attachment 345404 Patch 1444454 2 345404 dino 2018-07-23 16:00:30 -0700 Comment on attachment 345404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345404&action=review > Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h:54 > +enum class ShouldProcessSwapIfPossible { No, Yes }; Shouldn't this be ShouldProcessSwap { DoNotProcess, ProcessIfPossible } ? 1444457 3 cdumez 2018-07-23 16:03:59 -0700 (In reply to Dean Jackson from comment #2) > Comment on attachment 345404 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=345404&action=review > > > Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h:54 > > +enum class ShouldProcessSwapIfPossible { No, Yes }; > > Shouldn't this be ShouldProcessSwap { DoNotProcess, ProcessIfPossible } ? DoNotProcess / ProcessIfPossible do not make sense. This is not about processing about about process swapping. 1444731 4 achristensen 2018-07-24 10:27:28 -0700 http://trac.webkit.org/r234154 1444732 5 webkit-bug-importer 2018-07-24 10:28:24 -0700 <rdar://problem/42546369> 345404 2018-07-19 17:11:14 -0700 2018-07-23 16:00:30 -0700 Patch bug-187830-20180719171113.patch text/plain 19414 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQwMTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ3IEBACisyMDE4LTA3LTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVkdWNlIGdldHRl cnMvc2V0dGVycyBpbiBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzgzMAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBzdGVwIHRvd2FyZHMg bWFraW5nIGl0IGEgbGFtYmRhLCB3aGljaCBoYXMgbm8gZ2V0dGVycyBvciBzZXR0ZXJzLgorICAg ICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgc2V0QXBwbHlQb2xpY3lJbk5l d1Byb2Nlc3NJZlBvc3NpYmxlIGNhbiBiZSByZXBsYWNlZCBieSBwYXNzaW5nIGFub3RoZXIgcGFy YW1ldGVyLgorICAgICAgICBUaGlzIGJpdCB3YXMganVzdCBwaWdneS1iYWNraW5nIG9uIHRoZSBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuCisKKyAgICAgICAgaXNNYWluRnJhbWUgd2FzIG9u bHkgdXNlZCBpbiBhbiBhc3NlcnQsIHdoaWNoIGhhcyBhIGNvcnJlc3BvbmRpbmcgT2JqQyBleGNl cHRpb24gaW4KKyAgICAgICAgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uIGZvciB0aGUgb25lIHJlbGV2YW50IGNsaWVudC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lUG9saWN5TGlzdGVuZXIuY3BwOgor ICAgICAgICAoV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlSW5OZXdQcm9jZXNzKToKKyAgICAgICAg KHVzZVdpdGhQb2xpY2llcyk6CisgICAgICAgIChXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRo UG9saWNpZXMpOgorICAgICAgICAoV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlSW5OZXdQcm9jZXNz V2l0aFBvbGljaWVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRl Lm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6 OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6ZG93bmxvYWQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6Omlnbm9yZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5OjpzZXRBcHBseVBv bGljeUluTmV3UHJvY2Vzc0lmUG9zc2libGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OmFwcGx5UG9saWN5SW5OZXdQcm9jZXNzSWZQb3Nz aWJsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkZyYW1lUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lz aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlY2VpdmVkUG9saWN5RGVjaXNpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRl cm5hbCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisKIDIwMTgtMDct MTkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBNb3ZlIFdlYkZyYW1lTGlzdGVuZXJQcm94eSB0byBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJv eHksIGl0cyBvbmx5IHN1YmNsYXNzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAJKHJldmlzaW9uIDIzNDAw OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDEyICs0MCwxMiBAQCBXZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHk6OldlYkZyYW1lUG9sCiB7CiB9CiAKLXZvaWQgV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbiBh Y3Rpb24sIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiBkYXRhKQordm9pZCBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViQ29y ZTo6UG9saWN5QWN0aW9uIGFjdGlvbiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmIGRhdGEsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwKQogewogICAgIGlmICgh bV9mcmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIG1fZnJhbWUtPnJlY2VpdmVkUG9s aWN5RGVjaXNpb24oYWN0aW9uLCBtX2xpc3RlbmVySUQsIG1fbmF2aWdhdGlvbi5nZXQoKSwgV1RG TW92ZShkYXRhKSk7CisgICAgbV9mcmFtZS0+cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihhY3Rpb24s IG1fbGlzdGVuZXJJRCwgbV9uYXZpZ2F0aW9uLmdldCgpLCBXVEZNb3ZlKGRhdGEpLCBzd2FwKTsK ICAgICBtX2ZyYW1lID0gbnVsbHB0cjsKIH0KIApAQCAtNjIsMzIgKzYyLDI0IEBAIHZvaWQgV2Vi RnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5OjppbnZhbGkKICAgICBtX2ZyYW1lID0gbnVsbHB0cjsK IH0KIAotYm9vbCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OmlzTWFpbkZyYW1lKCkgY29u c3QKLXsKLSAgICBpZiAoIW1fZnJhbWUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAg ICByZXR1cm4gbV9mcmFtZS0+aXNNYWluRnJhbWUoKTsKLX0KLQogdm9pZCBXZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHk6OnNldE5hdmlnYXRpb24oUmVmPEFQSTo6TmF2aWdhdGlvbj4mJiBuYXZp Z2F0aW9uKQogewogICAgIG1fbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbik7CiB9CiAg ICAgCi12b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6dXNlKHN0ZDo6b3B0aW9uYWw8 V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiBkYXRhKQordm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHk6OnVzZShzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgZGF0YSwgU2hv dWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3YXApCiB7Ci0gICAgcmVjZWl2ZWRQb2xpY3lEZWNp c2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb246OlVzZSwgV1RGTW92ZShkYXRhKSk7CisgICAgcmVj ZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb246OlVzZSwgV1RGTW92ZShk YXRhKSwgc3dhcCk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5Ojpkb3du bG9hZCgpCiB7Ci0gICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rp b246OkRvd25sb2FkLCBzdGQ6Om51bGxvcHQpOworICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24o V2ViQ29yZTo6UG9saWN5QWN0aW9uOjpEb3dubG9hZCwgc3RkOjpudWxsb3B0LCBTaG91bGRQcm9j ZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKIH0KIAogdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHk6Omlnbm9yZSgpCiB7Ci0gICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQ b2xpY3lBY3Rpb246Oklnbm9yZSwgc3RkOjpudWxsb3B0KTsKKyAgICByZWNlaXZlZFBvbGljeURl Y2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlLCBzdGQ6Om51bGxvcHQsIFNob3Vs ZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94 eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eS5oCShyZXZpc2lvbiAyMzQwMDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTEs NiArNTEsOCBAQCBlbnVtIGNsYXNzIFBvbGljeUxpc3RlbmVyVHlwZSB7CiAgICAgUmVzcG9uc2Us CiB9OwogCitlbnVtIGNsYXNzIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSB7IE5vLCBZZXMg fTsKKwogY2xhc3MgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5IDogcHVibGljIEFQSTo6T2Jq ZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6RnJhbWVQb2xpY3lMaXN0ZW5lcj4gewogcHVibGlj OgogCkBAIC01OSw3ICs2MSw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KGZyYW1lLCBsaXN0ZW5lcklELCBwb2xpY3lU eXBlKSk7CiAgICAgfQogCi0gICAgdm9pZCB1c2Uoc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNp ZXNEYXRhPiYmKTsKKyAgICB2b2lkIHVzZShzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0Rh dGE+JiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSA9IFNob3VsZFByb2Nlc3NTd2FwSWZQ b3NzaWJsZTo6Tm8pOwogICAgIHZvaWQgZG93bmxvYWQoKTsKICAgICB2b2lkIGlnbm9yZSgpOwog CkBAIC03MSwyMSArNzMsMTYgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogICAg IAogICAgIHZvaWQgY2hhbmdlV2Vic2l0ZURhdGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlJik7Ci0g ICAgYm9vbCBpc01haW5GcmFtZSgpIGNvbnN0OwotCi0gICAgdm9pZCBzZXRBcHBseVBvbGljeUlu TmV3UHJvY2Vzc0lmUG9zc2libGUoYm9vbCBhcHBseVBvbGljeUluTmV3UHJvY2Vzc0lmUG9zc2li bGUpIHsgbV9hcHBseVBvbGljeUluTmV3UHJvY2Vzc0lmUG9zc2libGUgPSBhcHBseVBvbGljeUlu TmV3UHJvY2Vzc0lmUG9zc2libGU7IH0KLSAgICBib29sIGFwcGx5UG9saWN5SW5OZXdQcm9jZXNz SWZQb3NzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fYXBwbHlQb2xpY3lJbk5ld1Byb2Nlc3NJZlBv c3NpYmxlOyB9CiAKIHByaXZhdGU6CiAgICAgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFdl YkZyYW1lUHJveHkqLCB1aW50NjRfdCBsaXN0ZW5lcklELCBQb2xpY3lMaXN0ZW5lclR5cGUpOwog Ci0gICAgdm9pZCByZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwg c3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIHJlY2VpdmVk UG9saWN5RGVjaXNpb24oV2ViQ29yZTo6UG9saWN5QWN0aW9uLCBzdGQ6Om9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSk7CiAKICAgICBQ b2xpY3lMaXN0ZW5lclR5cGUgbV9wb2xpY3lUeXBlOwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5 PiBtX2ZyYW1lOwogICAgIHVpbnQ2NF90IG1fbGlzdGVuZXJJRCB7IDAgfTsKICAgICBSZWZQdHI8 QVBJOjpOYXZpZ2F0aW9uPiBtX25hdmlnYXRpb247Ci0gICAgYm9vbCBtX2FwcGx5UG9saWN5SW5O ZXdQcm9jZXNzSWZQb3NzaWJsZSB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCShyZXZp c2lvbiAyMzQwMDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTc4LDE0ICsxNzgsMTQgQEAgdm9pZCBXZWJGcmFtZVByb3h5 OjpkaWRDaGFuZ2VUaXRsZShjb25zdAogICAgIG1fdGl0bGUgPSB0aXRsZTsKIH0KIAotdm9pZCBX ZWJGcmFtZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBhY3Rpb24s IHVpbnQ2NF90IGxpc3RlbmVySUQsIEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgc3RkOjpv cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIGRhdGEpCit2b2lkIFdlYkZyYW1lUHJveHk6 OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0X3QgbGlz dGVuZXJJRCwgQVBJOjpOYXZpZ2F0aW9uKiBuYXZpZ2F0aW9uLCBzdGQ6Om9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgZGF0YSwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3YXAp CiB7CiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVChtX2Fj dGl2ZUxpc3RlbmVyKTsKICAgICBBU1NFUlQobV9hY3RpdmVMaXN0ZW5lci0+bGlzdGVuZXJJRCgp ID09IGxpc3RlbmVySUQpOwotICAgIG1fcGFnZS0+cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihhY3Rp b24sICp0aGlzLCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uLCBXVEZNb3ZlKGRhdGEpKTsKKyAgICBt X3BhZ2UtPnJlY2VpdmVkUG9saWN5RGVjaXNpb24oYWN0aW9uLCAqdGhpcywgbGlzdGVuZXJJRCwg bmF2aWdhdGlvbiwgV1RGTW92ZShkYXRhKSwgc3dhcCk7CiB9CiAKIFdlYkZyYW1lUG9saWN5TGlz dGVuZXJQcm94eSYgV2ViRnJhbWVQcm94eTo6c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KHVpbnQ2 NF90IGxpc3RlbmVySUQsIFBvbGljeUxpc3RlbmVyVHlwZSBwb2xpY3lMaXN0ZW5lclR5cGUpCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCShyZXZpc2lvbiAyMzQw MDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTUyLDYgKzUyLDcgQEAgY2xhc3MgV2ViQ2VydGlmaWNhdGVJbmZvOwogY2xhc3Mg V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5OwogY2xhc3MgV2ViUGFnZVByb3h5OwogY2xhc3Mg V2Vic2l0ZURhdGFTdG9yZTsKK2VudW0gY2xhc3MgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxl OwogZW51bSBjbGFzcyBQb2xpY3lMaXN0ZW5lclR5cGU7CiBzdHJ1Y3QgV2Vic2l0ZVBvbGljaWVz RGF0YTsKIApAQCAtMTE2LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZENoYW5nZVRp dGxlKGNvbnN0IFN0cmluZyYpOwogCiAgICAgLy8gUG9saWN5IG9wZXJhdGlvbnMuCi0gICAgdm9p ZCByZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgdWludDY0X3Qg bGlzdGVuZXJJRCwgQVBJOjpOYXZpZ2F0aW9uKiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNp ZXNEYXRhPiYmKTsKKyAgICB2b2lkIHJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViQ29yZTo6UG9s aWN5QWN0aW9uLCB1aW50NjRfdCBsaXN0ZW5lcklELCBBUEk6Ok5hdmlnYXRpb24qLCBzdGQ6Om9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJs ZSk7CiAKICAgICBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkmIHNldFVwUG9saWN5TGlzdGVu ZXJQcm94eSh1aW50NjRfdCBsaXN0ZW5lcklELCBQb2xpY3lMaXN0ZW5lclR5cGUpOwogICAgIFdl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSogYWN0aXZlUG9saWN5TGlzdGVuZXJQcm94eSgpOwpJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAy MzQwMDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNDA2LDcgKzI0MDYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2VudGVy U2VsZWN0aW9uSW5WaXNpCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpD ZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhKCksIG1fcGFnZUlEKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIGFjdGlvbiwgV2Vi RnJhbWVQcm94eSYgZnJhbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIEFQSTo6TmF2aWdhdGlvbiog bmF2aWdhdGlvbiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQ b2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGlj eUFjdGlvbiBhY3Rpb24sIFdlYkZyYW1lUHJveHkmIGZyYW1lLCB1aW50NjRfdCBsaXN0ZW5lcklE LCBBUEk6Ok5hdmlnYXRpb24qIG5hdmlnYXRpb24sIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGlj aWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBz aG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAg ICAgIHJldHVybjsKQEAgLTI0MzgsNyArMjQzOCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNl aXZlZFBvbGljeURlY2lzaW8KICAgICAgICAgQVNTRVJUKGFjdGl2ZVBvbGljeUxpc3RlbmVyLT5s aXN0ZW5lcklEKCkgPT0gbGlzdGVuZXJJRCk7CiAKICAgICAgICAgaWYgKGFjdGlvbiA9PSBQb2xp Y3lBY3Rpb246OlVzZSAmJiBuYXZpZ2F0aW9uICYmIGZyYW1lLmlzTWFpbkZyYW1lKCkpIHsKLSAg ICAgICAgICAgIGF1dG8gcHJvcG9zZWRQcm9jZXNzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCku cHJvY2Vzc0Zvck5hdmlnYXRpb24oKnRoaXMsICpuYXZpZ2F0aW9uLCBhY3RpdmVQb2xpY3lMaXN0 ZW5lci0+YXBwbHlQb2xpY3lJbk5ld1Byb2Nlc3NJZlBvc3NpYmxlKCksIGFjdGlvbik7CisgICAg ICAgICAgICBhdXRvIHByb3Bvc2VkUHJvY2VzcyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnBy b2Nlc3NGb3JOYXZpZ2F0aW9uKCp0aGlzLCAqbmF2aWdhdGlvbiwgc2hvdWxkUHJvY2Vzc1N3YXBJ ZlBvc3NpYmxlLCBhY3Rpb24pOwogCiAgICAgICAgICAgICBpZiAocHJvcG9zZWRQcm9jZXNzLnB0 cigpICE9ICZwcm9jZXNzKCkpIHsKICAgICAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5n LCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJv Y2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRp ZmllcigpLCBwcm9wb3NlZFByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG5hdmlnYXRpb24t Pm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwpAQCAtNDAyNiw3 ICs0MDI2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYQogCiAj aWYgRU5BQkxFKENPTlRFTlRfRklMVEVSSU5HKQogICAgIGlmIChmcmFtZS0+ZGlkSGFuZGxlQ29u dGVudEZpbHRlclVuYmxvY2tOYXZpZ2F0aW9uKHJlcXVlc3QpKQotICAgICAgICByZXR1cm4gcmVj ZWl2ZWRQb2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rpb246Oklnbm9yZSwgKmZyYW1lLCBsaXN0ZW5l cklELCAmbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmV3TmF2aWdhdGlvbklEKSwgeyB9 KTsKKyAgICAgICAgcmV0dXJuIHJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uOjpJ Z25vcmUsICpmcmFtZSwgbGlzdGVuZXJJRCwgJm1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9u KG5ld05hdmlnYXRpb25JRCksIHN0ZDo6bnVsbG9wdCwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3Np YmxlOjpObyk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShuZXdOYXZpZ2F0aW9uSUQpOwogI2Vu ZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24g MjM0MDA3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTI1OSw2ICsyNTksOCBAQCBzdHJ1Y3QgUHJpbnRJbmZvOwogc3RydWN0IFdl YlBvcHVwSXRlbTsKIHN0cnVjdCBVUkxTY2hlbWVUYXNrUGFyYW1ldGVyczsKIAorZW51bSBjbGFz cyBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGU7CisKICNpZiBVU0UoUVVJQ0tfTE9PSykKIGNs YXNzIFF1aWNrTG9va0RvY3VtZW50RGF0YTsKICNlbmRpZgpAQCAtOTA2LDcgKzkwOCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwT2ZDdXJyZW50U2VsZWN0aW9u KCk7CiAjZW5kaWYKIAotICAgIHZvaWQgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQ b2xpY3lBY3Rpb24sIFdlYkZyYW1lUHJveHkmLCB1aW50NjRfdCBsaXN0ZW5lcklELCBBUEk6Ok5h dmlnYXRpb24qIG5hdmlnYXRpb25JRCwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmKTsKKyAgICB2b2lkIHJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViQ29yZTo6UG9saWN5QWN0 aW9uLCBXZWJGcmFtZVByb3h5JiwgdWludDY0X3QgbGlzdGVuZXJJRCwgQVBJOjpOYXZpZ2F0aW9u Kiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmLCBTaG91bGRQcm9jZXNzU3dh cElmUG9zc2libGUpOwogCiAgICAgdm9pZCBiYWNrRm9yd2FyZFJlbW92ZWRJdGVtKGNvbnN0IFdl YkNvcmU6OkJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImKTsKIApJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkocmV2aXNpb24gMjM0MDA5KQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMTA3LDcgKzIxMDcsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpyZW1vdmVQcm9jZXNzRnJv bU9yCiAgICAgICAgIG1fc3dhcHBlZFByb2Nlc3Nlcy5yZW1vdmUob3JpZ2luKTsKIH0KIAotUmVm PFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdl YlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBib29s IHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgUG9saWN5QWN0aW9uJiBhY3Rpb24pCitSZWY8 V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb24oV2Vi UGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFNob3Vs ZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUsIFBvbGlj eUFjdGlvbiYgYWN0aW9uKQogewogICAgIGF1dG8gcHJvY2VzcyA9IHByb2Nlc3NGb3JOYXZpZ2F0 aW9uSW50ZXJuYWwocGFnZSwgbmF2aWdhdGlvbiwgc2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxl LCBhY3Rpb24pOwogCkBAIC0yMTI1LDkgKzIxMjUsOSBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBX ZWJQcm9jZXNzUG9vbDo6cHJvCiAgICAgcmV0dXJuIHByb2Nlc3M7CiB9CiAKLVJlZjxXZWJQcm9j ZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdl YlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBib29s IHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgUG9saWN5QWN0aW9uJiBhY3Rpb24pCitSZWY8 V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRl cm5hbChXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlv biwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJs ZSwgUG9saWN5QWN0aW9uJiBhY3Rpb24pCiB7Ci0gICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPnBy b2Nlc3NTd2Fwc09uTmF2aWdhdGlvbigpICYmICFzaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUp CisgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24tPnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbigpICYm IHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSA9PSBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGU6Ok5vKQogICAgICAgICByZXR1cm4gcGFnZS5wcm9jZXNzKCk7CiAKICAgICBpZiAocGFnZS5p bnNwZWN0b3JGcm9udGVuZENvdW50KCkgPiAwKQpAQCAtMjE3MSw3ICsyMTcxLDcgQEAgUmVmPFdl YlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnBybwogICAgIH0KIAogICAgIGF1dG8gdGFy Z2V0VVJMID0gbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLnVybCgpOwotICAgIGlmICghc2hv dWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlKSB7CisgICAgaWYgKHNob3VsZFByb2Nlc3NTd2FwSWZQ b3NzaWJsZSA9PSBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKSB7CiAgICAgICAgIGlm IChuYXZpZ2F0aW9uLnRyZWF0QXNTYW1lT3JpZ2luTmF2aWdhdGlvbigpKQogICAgICAgICAgICAg cmV0dXJuIHBhZ2UucHJvY2VzcygpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmgJKHJldmlzaW9uIDIzNDAwNykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmgJKHdvcmtpbmcgY29weSkKQEAgLTExMCw2ICsxMTAsOCBAQCBp bnQgd2ViUHJvY2Vzc0xhdGVuY3lRT1MoKTsKIGludCB3ZWJQcm9jZXNzVGhyb3VnaHB1dFFPUygp OwogI2VuZGlmCiAKK2VudW0gY2xhc3MgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOworCiBj bGFzcyBXZWJQcm9jZXNzUG9vbCBmaW5hbCA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpP YmplY3Q6OlR5cGU6OlByb2Nlc3NQb29sPiwgcHVibGljIENhbk1ha2VXZWFrUHRyPFdlYlByb2Nl c3NQb29sPiwgcHJpdmF0ZSBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiBwdWJsaWM6CiAgICAgc3Rh dGljIFJlZjxXZWJQcm9jZXNzUG9vbD4gY3JlYXRlKEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uJik7CkBAIC00NTIsNyArNDU0LDcgQEAgcHVibGljOgogICAgIEJhY2tncm91bmRXZWJQcm9j ZXNzVG9rZW4gYmFja2dyb3VuZFdlYlByb2Nlc3NUb2tlbigpIGNvbnN0IHsgcmV0dXJuIEJhY2tn cm91bmRXZWJQcm9jZXNzVG9rZW4obV9iYWNrZ3JvdW5kV2ViUHJvY2Vzc0NvdW50ZXIuY291bnQo KSk7IH0KICNlbmRpZgogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmln YXRpb24oV2ViUGFnZVByb3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgYm9vbCBzaG91bGRQ cm9jZXNzU3dhcElmUG9zc2libGUsIFdlYkNvcmU6OlBvbGljeUFjdGlvbiYpOworICAgIFJlZjxX ZWJQcm9jZXNzUHJveHk+IHByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYsIGNvbnN0 IEFQSTo6TmF2aWdhdGlvbiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgV2ViQ29yZTo6 UG9saWN5QWN0aW9uJik7CiAgICAgdm9pZCByZWdpc3RlclN1c3BlbmRlZFBhZ2VQcm94eShTdXNw ZW5kZWRQYWdlUHJveHkmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJTdXNwZW5kZWRQYWdlUHJveHko U3VzcGVuZGVkUGFnZVByb3h5Jik7CiAgICAgdm9pZCBkaWRSZWFjaEdvb2RUaW1lVG9QcmV3YXJt KCk7CkBAIC00NzAsNyArNDcyLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlh bGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYpOwogICAgIHZvaWQg cGxhdGZvcm1JbnZhbGlkYXRlQ29udGV4dCgpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4g cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5h dmlnYXRpb24mLCBib29sIHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgV2ViQ29yZTo6UG9s aWN5QWN0aW9uJik7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRp b25JbnRlcm5hbChXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mLCBTaG91bGRQ cm9jZXNzU3dhcElmUG9zc2libGUsIFdlYkNvcmU6OlBvbGljeUFjdGlvbiYpOwogCiAgICAgUmVm UHRyPFdlYlByb2Nlc3NQcm94eT4gdHJ5VGFrZVByZXdhcm1lZFByb2Nlc3MoV2Vic2l0ZURhdGFT dG9yZSYpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lUG9s aWN5TGlzdGVuZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9DL1dLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAJKHJldmlzaW9uIDIzNDAwNykKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNs dWRlICJXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJGcmFtZVBy b3h5LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlICJXZWJzaXRlUG9s aWNpZXNEYXRhLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC00NywyOSArNDgsMzEg QEAgdm9pZCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UoV0tGcmFtZVBvbAogCiB2b2lkIFdLRnJh bWVQb2xpY3lMaXN0ZW5lclVzZUluTmV3UHJvY2VzcyhXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYg cG9saWN5TGlzdGVuZXJSZWYpCiB7Ci0gICAgdG9JbXBsKHBvbGljeUxpc3RlbmVyUmVmKS0+c2V0 QXBwbHlQb2xpY3lJbk5ld1Byb2Nlc3NJZlBvc3NpYmxlKHRydWUpOwotICAgIHRvSW1wbChwb2xp Y3lMaXN0ZW5lclJlZiktPnVzZShzdGQ6Om51bGxvcHQpOworICAgIHRvSW1wbChwb2xpY3lMaXN0 ZW5lclJlZiktPnVzZShzdGQ6Om51bGxvcHQsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6 WWVzKTsKIH0KIAotdm9pZCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMoV0tG cmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3RlbmVyUmVmLCBXS1dlYnNpdGVQb2xpY2ll c1JlZiB3ZWJzaXRlUG9saWNpZXMpCitzdGF0aWMgdm9pZCB1c2VXaXRoUG9saWNpZXMoV0tGcmFt ZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3RlbmVyUmVmLCBXS1dlYnNpdGVQb2xpY2llc1Jl ZiB3ZWJzaXRlUG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzaG91bGRQcm9j ZXNzU3dhcElmUG9zc2libGUpCiB7CiAgICAgYXV0byBkYXRhID0gdG9JbXBsKHdlYnNpdGVQb2xp Y2llcyktPmRhdGEoKTsKIAogICAgIGlmIChkYXRhLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJz KSB7CiAgICAgICAgIGF1dG8mIHNlc3Npb25JRCA9IGRhdGEud2Vic2l0ZURhdGFTdG9yZVBhcmFt ZXRlcnMtPm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zZXNzaW9uSUQ7CiAgICAgICAgIFJFTEVB U0VfQVNTRVJUX1dJVEhfTUVTU0FHRShzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSB8fCBzZXNzaW9u SUQgPT0gUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwgIklmIFdlYnNpdGVQb2xp Y2llcyBzcGVjaWZpZXMgYSBXZWJzaXRlRGF0YVN0b3JlLCB0aGUgZGF0YSBzdG9yZSdzIHNlc3Np b24gbXVzdCBiZSBkZWZhdWx0IG9yIG5vbi1wZXJzaXN0ZW50LiIpOwotICAgICAgICBSRUxFQVNF X0FTU0VSVF9XSVRIX01FU1NBR0UodG9JbXBsKHBvbGljeUxpc3RlbmVyUmVmKS0+aXNNYWluRnJh bWUoKSwgIldlYnNpdGVQb2xpY2llcyBjYW5ub3Qgc3BlY2lmeSBhIFdlYnNpdGVEYXRhU3RvcmUg Zm9yIHN1YmZyYW1lIG5hdmlnYXRpb25zLiIpOwogCiAgICAgICAgIHRvSW1wbChwb2xpY3lMaXN0 ZW5lclJlZiktPmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUodG9JbXBsKHdlYnNpdGVQb2xpY2llcykt PndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKICAgICB9CiAKLSAgICB0 b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51c2UoV1RGTW92ZShkYXRhKSk7CisgICAgdG9JbXBs KHBvbGljeUxpc3RlbmVyUmVmKS0+dXNlKFdURk1vdmUoZGF0YSksIHNob3VsZFByb2Nlc3NTd2Fw SWZQb3NzaWJsZSk7Cit9CisKK3ZvaWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGlj aWVzKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJzaXRl UG9saWNpZXNSZWYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIHVzZVdpdGhQb2xpY2llcyhwb2xp Y3lMaXN0ZW5lclJlZiwgd2Vic2l0ZVBvbGljaWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGU6Ok5vKTsKIH0KIAogdm9pZCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VJbk5ld1Byb2Nlc3NX aXRoUG9saWNpZXMoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3RlbmVyUmVmLCBX S1dlYnNpdGVQb2xpY2llc1JlZiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAgdG9JbXBsKHBvbGlj eUxpc3RlbmVyUmVmKS0+c2V0QXBwbHlQb2xpY3lJbk5ld1Byb2Nlc3NJZlBvc3NpYmxlKHRydWUp OwotICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyhwb2xpY3lMaXN0ZW5l clJlZiwgd2Vic2l0ZVBvbGljaWVzKTsKKyAgICB1c2VXaXRoUG9saWNpZXMocG9saWN5TGlzdGVu ZXJSZWYsIHdlYnNpdGVQb2xpY2llcywgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpZZXMp OwogfQogCiB2b2lkIFdLRnJhbWVQb2xpY3lMaXN0ZW5lckRvd25sb2FkKFdLRnJhbWVQb2xpY3lM aXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHJldmlzaW9uIDIzNDAwNykKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNTUxLDEzICs1NTEsMTIgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmln YXRpb25DbGllbnQ6OgogICAgICAgICBjYXNlIF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxv d0luTmV3UHJvY2VzczoKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKICAgICAgICAgICAg IHRyeUFwcExpbmsoV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uKSwgbWFpbkZyYW1lVVJMU3RyaW5n LCBbYWN0aW9uUG9saWN5LCBsb2NhbExpc3RlbmVyID0gV1RGTW92ZShsb2NhbExpc3RlbmVyKSwg ZGF0YSA9IFdURk1vdmUoZGF0YSldKGJvb2wgZm9sbG93ZWRMaW5rVG9BcHApIG11dGFibGUgewot ICAgICAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPnNldEFwcGx5UG9saWN5SW5OZXdQcm9jZXNz SWZQb3NzaWJsZShhY3Rpb25Qb2xpY3kgPT0gX1dLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93 SW5OZXdQcm9jZXNzKTsKICAgICAgICAgICAgICAgICBpZiAoZm9sbG93ZWRMaW5rVG9BcHApIHsK ICAgICAgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+aWdub3JlKCk7CiAgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBs b2NhbExpc3RlbmVyLT51c2UoV1RGTW92ZShkYXRhKSk7CisgICAgICAgICAgICAgICAgbG9jYWxM aXN0ZW5lci0+dXNlKFdURk1vdmUoZGF0YSksIGFjdGlvblBvbGljeSA9PSBfV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5QWxsb3dJbk5ld1Byb2Nlc3MgPyBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGU6OlllcyA6IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogICAgICAgICAgICAg fSk7CiAgICAgICAgIAogICAgICAgICAgICAgYnJlYWs7Cg==