211202 2020-04-29 13:31:36 -0700 [iOS][WK2] Add timeout for "Client navigation" foreground assertion 2020-04-30 14:20:14 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen ggaren webkit-bug-importer oldest_to_newest 1647134 0 cdumez 2020-04-29 13:31:36 -0700 Add timeout for "Client navigation" foreground assertion. Foreground assertions do not timeout at RunningBoard level and we thus need to make sure we release them to avoid power leaks. 1647138 1 397993 cdumez 2020-04-29 13:33:45 -0700 Created attachment 397993 Patch 1647519 2 397993 achristensen 2020-04-30 13:12:47 -0700 Comment on attachment 397993 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397993&action=review > Source/WebKit/UIProcess/API/APINavigation.cpp:70 > + , m_clientNavigationActivity(navigationActivityTimeout) I feel like this kind of initialization can be done with an initializer list in the header. 1647543 3 ews-feeder 2020-04-30 14:19:19 -0700 Committed r260966: <https://trac.webkit.org/changeset/260966> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397993. 1647545 4 webkit-bug-importer 2020-04-30 14:20:14 -0700 <rdar://problem/62673956> 397993 2020-04-29 13:33:45 -0700 2020-04-30 14:19:19 -0700 Patch bug-211202-20200429133344.patch text/plain 10853 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNiYzc2YzlkOTdlOWE4MDIx NWFlZjZiNmMxYThiNjAxYzBhMDg5MTYuLmZmZGRiYTJlMmI1OTExYzkzYjViYWM1MDkzZDNjNjRk YmU1NWFiYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDQtMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXSzJdIEFkZCB0aW1lb3V0 IGZvciAiQ2xpZW50IG5hdmlnYXRpb24iIGZvcmVncm91bmQgYXNzZXJ0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEyMDIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSAzMHMgdGltZW91dCBm b3IgIkNsaWVudCBuYXZpZ2F0aW9uIiBmb3JlZ3JvdW5kIGFzc2VydGlvbi4gRm9yZWdyb3VuZCBh c3NlcnRpb25zIGRvIG5vdCB0aW1lb3V0CisgICAgICAgIGF0IFJ1bm5pbmdCb2FyZCBsZXZlbCBh bmQgd2UgdGh1cyBuZWVkIHRvIG1ha2Ugc3VyZSB3ZSByZWxlYXNlIHRoZW0gdG8gYXZvaWQgcG93 ZXIgbGVha3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24uY3BwOgor ICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uOjpOYXZpZ2F0aW9uKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL0FQSU5hdmlnYXRpb24uaDoKKyAgICAgICAgKEFQSTo6TmF2aWdhdGlvbjo6c2V0Q2xp ZW50TmF2aWdhdGlvbkFjdGl2aXR5KToKKyAgICAgICAgKEFQSTo6TmF2aWdhdGlvbjo6c2V0Rm9y ZWdyb3VuZEFjdGl2aXR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvY2Vzc1Ro cm90dGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OlRpbWVkQWN0 aXZpdHk6OlRpbWVkQWN0aXZpdHkpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVy OjpUaW1lZEFjdGl2aXR5OjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhy b3R0bGVyOjpUaW1lZEFjdGl2aXR5OjphY3Rpdml0eVRpbWVkT3V0KToKKyAgICAgICAgKFdlYktp dDo6UHJvY2Vzc1Rocm90dGxlcjo6VGltZWRBY3Rpdml0eTo6dXBkYXRlVGltZXIpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVl c3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRGaWxlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUpOgorCiAyMDIwLTA0LTI5 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU11bV0syXSBU ZW1wb3JhcmlseSBzdG9wIHVzaW5nIFJ1bm5pbmdCb2FyZCBmb3IgdGhlIGZvcmVncm91bmQgcHJv Y2VzcyBhc3NlcnRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElOYXZpZ2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0 aW9uLmNwcAppbmRleCA2Y2ZlMDI0NGE0OTIxNTZhNDAxMGRiNTI4MDZlYmIzZWI1ZDVjYzYzLi43 M2QyMmRkYjcyNjc0ZWZiN2RlNzkyZTBhNjNmYzFkMDUwZWQwNTI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24uY3BwCkBAIC0zNSwxNCArMzUsMTggQEAg bmFtZXNwYWNlIEFQSSB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAKK3N0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBuYXZpZ2F0aW9uQWN0aXZpdHlU aW1lb3V0IHsgMzBfcyB9OworCiBOYXZpZ2F0aW9uOjpOYXZpZ2F0aW9uKFdlYk5hdmlnYXRpb25T dGF0ZSYgc3RhdGUpCiAgICAgOiBtX25hdmlnYXRpb25JRChzdGF0ZS5nZW5lcmF0ZU5hdmlnYXRp b25JRCgpKQorICAgICwgbV9jbGllbnROYXZpZ2F0aW9uQWN0aXZpdHkobmF2aWdhdGlvbkFjdGl2 aXR5VGltZW91dCkKIHsKIH0KIAogTmF2aWdhdGlvbjo6TmF2aWdhdGlvbihXZWJOYXZpZ2F0aW9u U3RhdGUmIHN0YXRlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBjdXJyZW50QW5kVGFyZ2V0SXRl bSkKICAgICA6IG1fbmF2aWdhdGlvbklEKHN0YXRlLmdlbmVyYXRlTmF2aWdhdGlvbklEKCkpCiAg ICAgLCBtX3JlbG9hZEl0ZW0oY3VycmVudEFuZFRhcmdldEl0ZW0pCisgICAgLCBtX2NsaWVudE5h dmlnYXRpb25BY3Rpdml0eShuYXZpZ2F0aW9uQWN0aXZpdHlUaW1lb3V0KQogewogfQogCkBAIC01 MSw2ICs1NSw3IEBAIE5hdmlnYXRpb246Ok5hdmlnYXRpb24oV2ViTmF2aWdhdGlvblN0YXRlJiBz dGF0ZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxCiAgICAgLCBtX29yaWdpbmFsUmVx dWVzdChXVEZNb3ZlKHJlcXVlc3QpKQogICAgICwgbV9jdXJyZW50UmVxdWVzdChtX29yaWdpbmFs UmVxdWVzdCkKICAgICAsIG1fZnJvbUl0ZW0oZnJvbUl0ZW0pCisgICAgLCBtX2NsaWVudE5hdmln YXRpb25BY3Rpdml0eShuYXZpZ2F0aW9uQWN0aXZpdHlUaW1lb3V0KQogewogICAgIG1fcmVkaXJl Y3RDaGFpbi5hcHBlbmQobV9vcmlnaW5hbFJlcXVlc3QudXJsKCkpOwogfQpAQCAtNjIsNiArNjcs NyBAQCBOYXZpZ2F0aW9uOjpOYXZpZ2F0aW9uKFdlYk5hdmlnYXRpb25TdGF0ZSYgc3RhdGUsIFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mIHRhcmdldAogICAgICwgbV90YXJnZXRJdGVtKCZ0YXJnZXRJ dGVtKQogICAgICwgbV9mcm9tSXRlbShmcm9tSXRlbSkKICAgICAsIG1fYmFja0ZvcndhcmRGcmFt ZUxvYWRUeXBlKGJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSkKKyAgICAsIG1fY2xpZW50TmF2aWdh dGlvbkFjdGl2aXR5KG5hdmlnYXRpb25BY3Rpdml0eVRpbWVvdXQpCiB7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oCmluZGV4IGUxYTRmMDg0NzcyZTZh M2YxZmE1NzU0MzVmMGVlOWUyNmQxNDZhZjAuLmQ4NjhmOGIyMzNlZTZmYTU1ODczNzE5MTM3ZjRj MzFjMTI4YzdlYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElO YXZpZ2F0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRp b24uaApAQCAtMTU1LDcgKzE1NSw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IE9wdGlvbmFsPFdl YkNvcmU6OkFkQ2xpY2tBdHRyaWJ1dGlvbj4mIGFkQ2xpY2tBdHRyaWJ1dGlvbigpIGNvbnN0IHsg cmV0dXJuIG1fbGFzdE5hdmlnYXRpb25BY3Rpb24uYWRDbGlja0F0dHJpYnV0aW9uOyB9CiAKLSAg ICB2b2lkIHNldEZvcmVncm91bmRBY3Rpdml0eShzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpQcm9j ZXNzVGhyb3R0bGVyOjpGb3JlZ3JvdW5kQWN0aXZpdHk+JiYgYWN0aXZpdHkpIHsgbV9mb3JlZ3Jv dW5kQWN0aXZpdHkgPSBXVEZNb3ZlKGFjdGl2aXR5KTsgfQorICAgIHZvaWQgc2V0Q2xpZW50TmF2 aWdhdGlvbkFjdGl2aXR5KFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6QWN0aXZpdHlWYXJpYW50 JiYgYWN0aXZpdHkpIHsgbV9jbGllbnROYXZpZ2F0aW9uQWN0aXZpdHkgPSBXVEZNb3ZlKGFjdGl2 aXR5KTsgfQogCiAgICAgdm9pZCBzZXRJc0xvYWRlZFdpdGhOYXZpZ2F0aW9uU2hhcmVkKGJvb2wg dmFsdWUpIHsgbV9pc0xvYWRlZFdpdGhOYXZpZ2F0aW9uU2hhcmVkID0gdmFsdWU7IH0KICAgICBi b29sIGlzTG9hZGVkV2l0aE5hdmlnYXRpb25TaGFyZWQoKSBjb25zdCB7IHJldHVybiBtX2lzTG9h ZGVkV2l0aE5hdmlnYXRpb25TaGFyZWQ7IH0KQEAgLTE4Myw3ICsxODMsNyBAQCBwcml2YXRlOgog ICAgIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSBtX2Rlc3RpbmF0aW9uRnJhbWVTZWN1cml0 eU9yaWdpbjsKICAgICBib29sIG1fdXNlckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCB7IHRydWUg fTsKICAgICBXZWJLaXQ6OldlYkNvbnRlbnRNb2RlIG1fZWZmZWN0aXZlQ29udGVudE1vZGUgeyBX ZWJLaXQ6OldlYkNvbnRlbnRNb2RlOjpSZWNvbW1lbmRlZCB9OwotICAgIHN0ZDo6dW5pcXVlX3B0 cjxXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91bmRBY3Rpdml0eT4gbV9mb3JlZ3Jv dW5kQWN0aXZpdHk7CisgICAgV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjpUaW1lZEFjdGl2aXR5 IG1fY2xpZW50TmF2aWdhdGlvbkFjdGl2aXR5OwogICAgIGJvb2wgbV9pc0xvYWRlZFdpdGhOYXZp Z2F0aW9uU2hhcmVkIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvY2Vzc1Rocm90dGxlci5jcHAKaW5kZXggMGRlY2NmNWRlYmMyYTUxM2UzYzdkMjM1MmI4MzE0 NGQyZDBhMjBiYy4uOThkNDAyMjg4Y2ZlZGU0NzlmNDUxM2Q3ZWEyZTRmNTc2OGYxODRhYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKQEAgLTIzOSw0 ICsyMzksMzMgQEAgYm9vbCBQcm9jZXNzVGhyb3R0bGVyOjppc1ZhbGlkRm9yZWdyb3VuZEFjdGl2 aXR5KGNvbnN0IFByb2Nlc3NUaHJvdHRsZXI6OkFjdGl2aXQKICAgICByZXR1cm4gV1RGOjpnZXQ8 VW5pcXVlUmVmPFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91bmRBY3Rpdml0eT4+KGFjdGl2aXR5 KS0+aXNWYWxpZCgpOwogfQogCitQcm9jZXNzVGhyb3R0bGVyOjpUaW1lZEFjdGl2aXR5OjpUaW1l ZEFjdGl2aXR5KFNlY29uZHMgdGltZW91dCwgUHJvY2Vzc1Rocm90dGxlcjo6QWN0aXZpdHlWYXJp YW50JiYgYWN0aXZpdHkpCisgICAgOiBtX3RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlRp bWVkQWN0aXZpdHk6OmFjdGl2aXR5VGltZWRPdXQpCisgICAgLCBtX3RpbWVvdXQodGltZW91dCkK KyAgICAsIG1fYWN0aXZpdHkoV1RGTW92ZShhY3Rpdml0eSkpCit7CisgICAgdXBkYXRlVGltZXIo KTsKK30KKworYXV0byBQcm9jZXNzVGhyb3R0bGVyOjpUaW1lZEFjdGl2aXR5OjpvcGVyYXRvcj0o UHJvY2Vzc1Rocm90dGxlcjo6QWN0aXZpdHlWYXJpYW50JiYgYWN0aXZpdHkpIC0+IFRpbWVkQWN0 aXZpdHkmCit7CisgICAgbV9hY3Rpdml0eSA9IFdURk1vdmUoYWN0aXZpdHkpOworICAgIHVwZGF0 ZVRpbWVyKCk7CisgICAgcmV0dXJuICp0aGlzOworfQorCit2b2lkIFByb2Nlc3NUaHJvdHRsZXI6 OlRpbWVkQWN0aXZpdHk6OmFjdGl2aXR5VGltZWRPdXQoKQoreworICAgIFJFTEVBU0VfTE9HX0VS Uk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBUaW1lZEFjdGl2aXR5OjphY3Rpdml0eVRpbWVk T3V0OiIsIHRoaXMpOworICAgIG1fYWN0aXZpdHkgPSBudWxscHRyOworfQorCit2b2lkIFByb2Nl c3NUaHJvdHRsZXI6OlRpbWVkQWN0aXZpdHk6OnVwZGF0ZVRpbWVyKCkKK3sKKyAgICBpZiAoV1RG Ojpob2xkc19hbHRlcm5hdGl2ZTxzdGQ6Om51bGxwdHJfdD4obV9hY3Rpdml0eSkpCisgICAgICAg IG1fdGltZXIuc3RvcCgpOworICAgIGVsc2UKKyAgICAgICAgbV90aW1lci5zdGFydE9uZVNob3Qo bV90aW1lb3V0KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgKaW5kZXggODQwYjQ1ZDU2NmQzMzU0ZDA4ZWE5ODQ0 YjQyNjBkZjFkMDRiOGFiMy4uOTZiZTUzNmZmOWEwZDM2YTgxYTRmYmQ0YWQyZGM5OTQ4ODBhMDYx OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaApAQCAtMTAy LDYgKzEwMiwyMCBAQCBwdWJsaWM6CiAgICAgdXNpbmcgQWN0aXZpdHlWYXJpYW50ID0gVmFyaWFu dDxzdGQ6Om51bGxwdHJfdCwgVW5pcXVlUmVmPEJhY2tncm91bmRBY3Rpdml0eT4sIFVuaXF1ZVJl ZjxGb3JlZ3JvdW5kQWN0aXZpdHk+PjsKICAgICBzdGF0aWMgYm9vbCBpc1ZhbGlkQmFja2dyb3Vu ZEFjdGl2aXR5KGNvbnN0IEFjdGl2aXR5VmFyaWFudCYpOwogICAgIHN0YXRpYyBib29sIGlzVmFs aWRGb3JlZ3JvdW5kQWN0aXZpdHkoY29uc3QgQWN0aXZpdHlWYXJpYW50Jik7CisKKyAgICBjbGFz cyBUaW1lZEFjdGl2aXR5IHsKKyAgICBwdWJsaWM6CisgICAgICAgIFRpbWVkQWN0aXZpdHkoU2Vj b25kcyB0aW1lb3V0LCBBY3Rpdml0eVZhcmlhbnQmJiA9IG51bGxwdHIpOworICAgICAgICBUaW1l ZEFjdGl2aXR5JiBvcGVyYXRvcj0oQWN0aXZpdHlWYXJpYW50JiYpOworCisgICAgcHJpdmF0ZToK KyAgICAgICAgdm9pZCBhY3Rpdml0eVRpbWVkT3V0KCk7CisgICAgICAgIHZvaWQgdXBkYXRlVGlt ZXIoKTsKKworICAgICAgICBSdW5Mb29wOjpUaW1lcjxUaW1lZEFjdGl2aXR5PiBtX3RpbWVyOwor ICAgICAgICBTZWNvbmRzIG1fdGltZW91dDsKKyAgICAgICAgQWN0aXZpdHlWYXJpYW50IG1fYWN0 aXZpdHk7CisgICAgfTsKICAgICAKICAgICB2b2lkIGRpZENvbm5lY3RUb1Byb2Nlc3MoUHJvY2Vz c0lEKTsKICAgICBib29sIHNob3VsZEJlUnVubmFibGUoKSBjb25zdCB7IHJldHVybiBtX2ZvcmVn cm91bmRBY3Rpdml0aWVzLnNpemUoKSB8fCBtX2JhY2tncm91bmRBY3Rpdml0aWVzLnNpemUoKTsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMGQzMDhlNmNi ZjY4Njc5MjZkNDE3NzkxYTAzNDJhZGZhZjc1YzEyOC4uYjNlYmJkMTFjNjJlMWNlZjJkMzIwZmY1 MWUzMDliMzJhYTdiNTlhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCkBAIC0xMzAwLDcgKzEzMDAsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdl UHJveHk6OmxvYWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFNobwogICAgIGF1 dG8gbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5jcmVhdGVMb2FkUmVxdWVzdE5hdmln YXRpb24oUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKSk7CiAKICAgICBpZiAoc2hvdWxkRm9yY2VGb3JlZ3JvdW5kUHJpb3JpdHlGb3JDbGll bnROYXZpZ2F0aW9uKCkpCi0gICAgICAgIG5hdmlnYXRpb24tPnNldEZvcmVncm91bmRBY3Rpdml0 eShwcm9jZXNzKCkudGhyb3R0bGVyKCkuZm9yZWdyb3VuZEFjdGl2aXR5KCJDbGllbnQgbmF2aWdh dGlvbiJfcykubW92ZVRvVW5pcXVlUHRyKCkpOworICAgICAgICBuYXZpZ2F0aW9uLT5zZXRDbGll bnROYXZpZ2F0aW9uQWN0aXZpdHkocHJvY2VzcygpLnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rp dml0eSgiQ2xpZW50IG5hdmlnYXRpb24iX3MpKTsKIAogICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmln YXRpb25TaGFyZWQobV9wcm9jZXNzLmNvcHlSZWYoKSwgbV93ZWJQYWdlSUQsIG5hdmlnYXRpb24u Z2V0KCksIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIHVz ZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vLCBpc05hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluKCksIGhhc05hdmlnYXRlZEF3YXlGcm9tQXBwQm91bmREb21haW4oKSk7CiAg ICAgcmV0dXJuIG5hdmlnYXRpb247CkBAIC0xMzgxLDcgKzEzODEsNyBAQCBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmluZyYgZmlsZVVSTFN0 cmluZywgY29ucwogICAgIGF1dG8gbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5jcmVh dGVMb2FkUmVxdWVzdE5hdmlnYXRpb24oUmVzb3VyY2VSZXF1ZXN0KGZpbGVVUkwpLCBtX2JhY2tG b3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSk7CiAKICAgICBpZiAoc2hvdWxkRm9yY2VGb3JlZ3Jv dW5kUHJpb3JpdHlGb3JDbGllbnROYXZpZ2F0aW9uKCkpCi0gICAgICAgIG5hdmlnYXRpb24tPnNl dEZvcmVncm91bmRBY3Rpdml0eShwcm9jZXNzKCkudGhyb3R0bGVyKCkuZm9yZWdyb3VuZEFjdGl2 aXR5KCJDbGllbnQgbmF2aWdhdGlvbiJfcykubW92ZVRvVW5pcXVlUHRyKCkpOworICAgICAgICBu YXZpZ2F0aW9uLT5zZXRDbGllbnROYXZpZ2F0aW9uQWN0aXZpdHkocHJvY2VzcygpLnRocm90dGxl cigpLmZvcmVncm91bmRBY3Rpdml0eSgiQ2xpZW50IG5hdmlnYXRpb24iX3MpKTsKIAogICAgIGF1 dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIApAQCAtMTQy NCw3ICsxNDI0LDcgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5Ojpsb2Fk RGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGMKICAgICBhdXRvIG5hdmlnYXRp b24gPSBtX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlTG9hZERhdGFOYXZpZ2F0aW9uKG1ha2VVbmlx dWU8QVBJOjpTdWJzdGl0dXRlRGF0YT4oZGF0YS52ZWN0b3IoKSwgTUlNRVR5cGUsIGVuY29kaW5n LCBiYXNlVVJMLCB1c2VyRGF0YSkpOwogCiAgICAgaWYgKHNob3VsZEZvcmNlRm9yZWdyb3VuZFBy aW9yaXR5Rm9yQ2xpZW50TmF2aWdhdGlvbigpKQotICAgICAgICBuYXZpZ2F0aW9uLT5zZXRGb3Jl Z3JvdW5kQWN0aXZpdHkocHJvY2VzcygpLnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rpdml0eSgi Q2xpZW50IG5hdmlnYXRpb24iX3MpLm1vdmVUb1VuaXF1ZVB0cigpKTsKKyAgICAgICAgbmF2aWdh dGlvbi0+c2V0Q2xpZW50TmF2aWdhdGlvbkFjdGl2aXR5KHByb2Nlc3MoKS50aHJvdHRsZXIoKS5m b3JlZ3JvdW5kQWN0aXZpdHkoIkNsaWVudCBuYXZpZ2F0aW9uIl9zKSk7CiAKICAgICBsb2FkRGF0 YVdpdGhOYXZpZ2F0aW9uU2hhcmVkKG1fcHJvY2Vzcy5jb3B5UmVmKCksIG1fd2ViUGFnZUlELCBu YXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vLCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9t YWluKCksIGhhc05hdmlnYXRlZEF3YXlGcm9tQXBwQm91bmREb21haW4oKSwgV1RGOjpudWxsb3B0 LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KTsKICAgICByZXR1cm4gbmF2aWdhdGlvbjsK QEAgLTQ2MDEsNyArNDYwMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWVTaGFyZWQoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwCiAgICAgICAgIG1f cGFnZUxvYWRTdGF0ZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkKHRyYW5zYWN0aW9uKTsKICAgICAg ICAgcGFnZUNsaWVudCgpLmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JNYWluRnJhbWUoKTsKICAg ICAgICAgaWYgKG5hdmlnYXRpb24pCi0gICAgICAgICAgICBuYXZpZ2F0aW9uLT5zZXRGb3JlZ3Jv dW5kQWN0aXZpdHkobnVsbHB0cik7CisgICAgICAgICAgICBuYXZpZ2F0aW9uLT5zZXRDbGllbnRO YXZpZ2F0aW9uQWN0aXZpdHkobnVsbHB0cik7CiAgICAgfQogCiAgICAgZnJhbWUtPmRpZEZhaWxQ cm92aXNpb25hbExvYWQoKTsKQEAgLTQ4MzgsNyArNDgzOCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIEZyYW1lSW5m b0RhdGEmCiAgICAgICAgIHBhZ2VDbGllbnQoKS5kaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lKCk7 CiAKICAgICAgICAgaWYgKG5hdmlnYXRpb24pCi0gICAgICAgICAgICBuYXZpZ2F0aW9uLT5zZXRG b3JlZ3JvdW5kQWN0aXZpdHkobnVsbHB0cik7CisgICAgICAgICAgICBuYXZpZ2F0aW9uLT5zZXRD bGllbnROYXZpZ2F0aW9uQWN0aXZpdHkobnVsbHB0cik7CiAKICAgICAgICAgcmVzZXRSZWNlbnRD cmFzaENvdW50U29vbigpOwogCkBAIC00ODkxLDcgKzQ4OTEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkRmFpbExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgRnJhbWVJbmZv RGF0YSYmCiAgICAgICAgIHJlcG9ydFBhZ2VMb2FkUmVzdWx0KGVycm9yKTsKICAgICAgICAgcGFn ZUNsaWVudCgpLmRpZEZhaWxMb2FkRm9yTWFpbkZyYW1lKCk7CiAgICAgICAgIGlmIChuYXZpZ2F0 aW9uKQotICAgICAgICAgICAgbmF2aWdhdGlvbi0+c2V0Rm9yZWdyb3VuZEFjdGl2aXR5KG51bGxw dHIpOworICAgICAgICAgICAgbmF2aWdhdGlvbi0+c2V0Q2xpZW50TmF2aWdhdGlvbkFjdGl2aXR5 KG51bGxwdHIpOwogICAgIH0KIH0KIAo=