189881 2018-09-22 00:54:51 -0700 WebPageProxy::reattachToWebProcess cleanups 2018-10-02 09:16:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned achristensen cdumez commit-queue ggaren webkit-bug-importer oldest_to_newest 1462311 0 koivisto 2018-09-22 00:54:51 -0700 Change the factoring to separate swap and crash code paths into different functions. 1462316 1 350502 koivisto 2018-09-22 00:58:56 -0700 Created attachment 350502 patch 1462326 2 350506 koivisto 2018-09-22 01:49:44 -0700 Created attachment 350506 patch 1463188 3 350506 achristensen 2018-09-25 10:40:06 -0700 Comment on attachment 350506 patch The unexpected timeouts in the Mac-wk2 bot are concerning. 1463210 4 koivisto 2018-09-25 11:16:46 -0700 I suspect it was unrelated but I can re-EWS this. 1463211 5 350765 koivisto 2018-09-25 11:17:34 -0700 Created attachment 350765 patch 1465588 6 350765 commit-queue 2018-10-02 09:15:14 -0700 Comment on attachment 350765 patch Clearing flags on attachment: 350765 Committed r236746: <https://trac.webkit.org/changeset/236746> 1465589 7 commit-queue 2018-10-02 09:15:16 -0700 All reviewed patches have been landed. Closing bug. 1465590 8 webkit-bug-importer 2018-10-02 09:16:26 -0700 <rdar://problem/44940150> 350502 2018-09-22 00:58:56 -0700 2018-09-22 01:49:44 -0700 patch pageproxy-attach-refactor-2.patch text/plain 5861 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYzODIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTIyICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzIGNsZWFudXBzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODk4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGFuZ2UgdGhlIGZhY3RvcmluZyB0byBzZXBhcmF0ZSBzd2FwIGFuZCBj cmFzaCBjb2RlIHBhdGhzIGludG8gZGlmZmVyZW50IGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlYXR0YWNoVG9XZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpz d2FwVG9XZWJQcm9jZXNzKToKKworICAgICAgICBTZXBhcmF0ZSBmdW5jdGlvbiBmb3IgdGhlIHN3 YXAgY2FzZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGlu Z1RvV2ViUHJvY2Vzcyk6CisKKyAgICAgICAgRmFjdG9yIHRoZSBjb21tb24gcGFydHMgaGVyZS4K KworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3 UHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDE4LTA5 LTIxICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgUG9pbnRl ckV2ZW50LCBwbHVzIGZlYXR1cmUgZmxhZywgcGx1cyBXZWIgUGxhdGZvcm0gVGVzdHMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjM2Mzgy KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjkzLDggKzY5MywxOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlU3luY2hy b25vdXNNZXNzCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygpCiB7 Ci0gICAgYXV0byBwcm9jZXNzID0gbWFrZVJlZihtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY3Jl YXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRh U3RvcmUuZ2V0KCkpKTsKLSAgICByZWF0dGFjaFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3Mp LCBudWxscHRyKTsKKyAgICBBU1NFUlQoIW1faXNDbG9zZWQpOworICAgIEFTU0VSVCghaXNWYWxp ZCgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICIlcCBXZWJQYWdlUHJv eHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzXG4iLCB0aGlzKTsKKworICAgIG1fcHJvY2Vzcy0+cmVt b3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlSUQpOworCisgICAgYXV0byYgcHJvY2Vzc1Bvb2wgPSBtX3Byb2Nlc3MtPnByb2Nlc3NQ b29sKCkKKyAgICBtX3Byb2Nlc3MgPSBwcm9jZXNzUG9vbC5jcmVhdGVOZXdXZWJQcm9jZXNzUmVz cGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKSk7CisgICAg bV9pc1ZhbGlkID0gdHJ1ZTsKKworICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcygpOwog fQogCiBTdXNwZW5kZWRQYWdlUHJveHkqIFdlYlBhZ2VQcm94eTo6bWF5YmVDcmVhdGVTdXNwZW5k ZWRQYWdlKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uKQpAQCAtNzIwLDI3ICs3MzAsMTggQEAgdm9pZCBXZWJQYWdlUHJveHk6OnN1c3BlbmRlZFBh Z2VDbG9zZWQoUwogICAgIG1fc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CiB9CiAKLXZvaWQgV2Vi UGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHBy b2Nlc3MsIEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbikKK3ZvaWQgV2ViUGFnZVByb3h5Ojpz d2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7Ci0gICAgQVNT RVJUKCFpc1ZhbGlkKCkpOwotCi0gICAgbV9pc1ZhbGlkID0gdHJ1ZTsKKyAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3MsICIlcCBXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3Nc biIsIHRoaXMpOwogCiAgICAgLy8gSWYgdGhlIHByb2Nlc3Mgd2UncmUgYXR0YWNoaW5nIHRvIGlz IGtlcHQgYWxpdmUgc29sZWx5IGJ5IG91ciBjdXJyZW50IHN1c3BlbmRlZCBwYWdlLAogICAgIC8v IHdlIG5lZWQgdG8gbWFpbnRhaW4gdGhhdCBieSB0ZW1wb3JhcmlseSBrZWVwaW5nIHRoZSBzdXNw ZW5kZWQgcGFnZSBhbGl2ZS4KLSAgICBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5 PiBjdXJyZW50U3VzcGVuZGVkUGFnZTsKLSAgICBpZiAoIW5hdmlnYXRpb24pIHsKLSAgICAgICAg bV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJv Y2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGN1cnJl bnRTdXNwZW5kZWRQYWdlID0gV1RGTW92ZShtX3N1c3BlbmRlZFBhZ2UpOwotICAgICAgICBtX3By b2Nlc3MtPnN1c3BlbmRXZWJQYWdlUHJveHkoKnRoaXMsICpuYXZpZ2F0aW9uKTsKLSAgICB9Cisg ICAgYXV0byBjdXJyZW50U3VzcGVuZGVkUGFnZSA9IFdURk1vdmUobV9zdXNwZW5kZWRQYWdlKTsK KyAgICBtX3Byb2Nlc3MtPnN1c3BlbmRXZWJQYWdlUHJveHkoKnRoaXMsIG5hdmlnYXRpb24pOwog CiAgICAgbV9wcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKTsKLSAgICBpZiAobV9wcm9jZXNzLT5z dGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCi0gICAgICAgIG1fd2Vi UHJvY2Vzc0xpZmV0aW1lVHJhY2tlci53ZWJQYWdlRW50ZXJpbmdXZWJQcm9jZXNzKCk7CisgICAg bV9pc1ZhbGlkID0gdHJ1ZTsKIAogICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1 c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMg YW5kCiAgICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBi ZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaApAQCAtNzUzLDExICs3 NTQsMTggQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzKAogICAgICAg ICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZCgqbV9tYWluRnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsK ICAgICB9CiAKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICIlcCBXZWJQYWdl UHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzXG4iLCB0aGlzKTsKKyAgICBmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoKTsKK30KIAordm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGlu Z1RvV2ViUHJvY2VzcygpCit7CiAgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBDaGls ZFByb2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1pbmF0ZWQpOwotICAgIGlmIChtX3Byb2Nlc3MtPnN0 YXRlKCkgPT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorCisgICAgaWYgKG1f cHJvY2Vzcy0+c3RhdGUoKSA9PSBDaGlsZFByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpIHsK KyAgICAgICAgbV93ZWJQcm9jZXNzTGlmZXRpbWVUcmFja2VyLndlYlBhZ2VFbnRlcmluZ1dlYlBy b2Nlc3MoKTsKICAgICAgICAgcHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOworICAgIH0KKwog ICAgIG1fcHJvY2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCk7CiAgICAg bV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVz c2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwogCkBAIC0yNDk3LDkgKzI1MDUs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OCiAKICAgICBwcm9j ZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXAp OwogCi0gICAgLy8gRklYTUU6IHRoaXMgaXMgdG8gZml4IHRoZSBBU1NFUlQoaXNWYWxpZCgpKSBp bnNpZGUgcmVhdHRhY2hUb1dlYlByb2Nlc3MsIHNvbWUgb3RoZXIgd2F5IHRvIGZpeCB0aGlzIGlz IG5lZWRlZC4KLSAgICBtX2lzVmFsaWQgPSBmYWxzZTsKLSAgICByZWF0dGFjaFRvV2ViUHJvY2Vz cyhXVEZNb3ZlKHByb2Nlc3MpLCAmbmF2aWdhdGlvbik7CisgICAgc3dhcFRvV2ViUHJvY2VzcyhX VEZNb3ZlKHByb2Nlc3MpLCBuYXZpZ2F0aW9uKTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2 aWdhdGlvbi50YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJv eHkgJXAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMi LCB0aGlzLCBpdGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMzYzODIpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxMyw3ICsxNTEz LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVl bEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cykgeyBtX2Nh blNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9IGNhblNob3J0Q2lyY3VpdEhvcml6 b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwot ICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgQVBJ OjpOYXZpZ2F0aW9uKik7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNz UHJveHk+JiYsIEFQSTo6TmF2aWdhdGlvbiYpOworICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9X ZWJQcm9jZXNzKCk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2Vi UHJvY2Vzc0ZvclJlbG9hZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNo VG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwo= 350506 2018-09-22 01:49:44 -0700 2018-09-25 11:17:34 -0700 patch pageproxy-attach-refactor-3.patch text/plain 5862 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYzODIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTIyICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzIGNsZWFudXBzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODk4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGFuZ2UgdGhlIGZhY3RvcmluZyB0byBzZXBhcmF0ZSBzd2FwIGFuZCBj cmFzaCBjb2RlIHBhdGhzIGludG8gZGlmZmVyZW50IGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlYXR0YWNoVG9XZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpz d2FwVG9XZWJQcm9jZXNzKToKKworICAgICAgICBTZXBhcmF0ZSBmdW5jdGlvbiBmb3IgdGhlIHN3 YXAgY2FzZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGlu Z1RvV2ViUHJvY2Vzcyk6CisKKyAgICAgICAgRmFjdG9yIHRoZSBjb21tb24gcGFydHMgaGVyZS4K KworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3 UHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDE4LTA5 LTIxICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgUG9pbnRl ckV2ZW50LCBwbHVzIGZlYXR1cmUgZmxhZywgcGx1cyBXZWIgUGxhdGZvcm0gVGVzdHMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjM2Mzgy KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjkzLDggKzY5MywxOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlU3luY2hy b25vdXNNZXNzCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygpCiB7 Ci0gICAgYXV0byBwcm9jZXNzID0gbWFrZVJlZihtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY3Jl YXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRh U3RvcmUuZ2V0KCkpKTsKLSAgICByZWF0dGFjaFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3Mp LCBudWxscHRyKTsKKyAgICBBU1NFUlQoIW1faXNDbG9zZWQpOworICAgIEFTU0VSVCghaXNWYWxp ZCgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICIlcCBXZWJQYWdlUHJv eHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzXG4iLCB0aGlzKTsKKworICAgIG1fcHJvY2Vzcy0+cmVt b3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlSUQpOworCisgICAgYXV0byYgcHJvY2Vzc1Bvb2wgPSBtX3Byb2Nlc3MtPnByb2Nlc3NQ b29sKCk7CisgICAgbV9wcm9jZXNzID0gcHJvY2Vzc1Bvb2wuY3JlYXRlTmV3V2ViUHJvY2Vzc1Jl c3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCkpOworICAg IG1faXNWYWxpZCA9IHRydWU7CisKKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKTsK IH0KIAogU3VzcGVuZGVkUGFnZVByb3h5KiBXZWJQYWdlUHJveHk6Om1heWJlQ3JlYXRlU3VzcGVu ZGVkUGFnZShXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdh dGlvbikKQEAgLTcyMCwyNyArNzMwLDE4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzdXNwZW5kZWRQ YWdlQ2xvc2VkKFMKICAgICBtX3N1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwogfQogCi12b2lkIFdl YlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBw cm9jZXNzLCBBUEk6Ok5hdmlnYXRpb24qIG5hdmlnYXRpb24pCit2b2lkIFdlYlBhZ2VQcm94eTo6 c3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbikKIHsKICAgICBBU1NFUlQoIW1faXNDbG9zZWQpOwotICAgIEFT U0VSVCghaXNWYWxpZCgpKTsKLQotICAgIG1faXNWYWxpZCA9IHRydWU7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzLCAiJXAgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNz XG4iLCB0aGlzKTsKIAogICAgIC8vIElmIHRoZSBwcm9jZXNzIHdlJ3JlIGF0dGFjaGluZyB0byBp cyBrZXB0IGFsaXZlIHNvbGVseSBieSBvdXIgY3VycmVudCBzdXNwZW5kZWQgcGFnZSwKICAgICAv LyB3ZSBuZWVkIHRvIG1haW50YWluIHRoYXQgYnkgdGVtcG9yYXJpbHkga2VlcGluZyB0aGUgc3Vz cGVuZGVkIHBhZ2UgYWxpdmUuCi0gICAgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94 eT4gY3VycmVudFN1c3BlbmRlZFBhZ2U7Ci0gICAgaWYgKCFuYXZpZ2F0aW9uKSB7Ci0gICAgICAg IG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOwotICAgICAgICBtX3By b2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlEKTsKLSAgICB9IGVsc2UgewotICAgICAgICBjdXJy ZW50U3VzcGVuZGVkUGFnZSA9IFdURk1vdmUobV9zdXNwZW5kZWRQYWdlKTsKLSAgICAgICAgbV9w cm9jZXNzLT5zdXNwZW5kV2ViUGFnZVByb3h5KCp0aGlzLCAqbmF2aWdhdGlvbik7Ci0gICAgfQor ICAgIGF1dG8gY3VycmVudFN1c3BlbmRlZFBhZ2UgPSBXVEZNb3ZlKG1fc3VzcGVuZGVkUGFnZSk7 CisgICAgbV9wcm9jZXNzLT5zdXNwZW5kV2ViUGFnZVByb3h5KCp0aGlzLCBuYXZpZ2F0aW9uKTsK IAogICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7Ci0gICAgaWYgKG1fcHJvY2Vzcy0+ c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQotICAgICAgICBtX3dl YlByb2Nlc3NMaWZldGltZVRyYWNrZXIud2ViUGFnZUVudGVyaW5nV2ViUHJvY2VzcygpOworICAg IG1faXNWYWxpZCA9IHRydWU7CiAKICAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBT dXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3Rz IGFuZAogICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3Qg YmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKQEAgLTc1MywxMSAr NzU0LDE4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygKICAgICAg ICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoKm1fbWFpbkZyYW1lSUQsICptX21haW5GcmFtZSk7 CiAgICAgfQogCi0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzLCAiJXAgV2ViUGFn ZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc1xuIiwgdGhpcyk7CisgICAgZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKCk7Cit9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoKQorewogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgIT0gQ2hp bGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVkKTsKLSAgICBpZiAobV9wcm9jZXNzLT5z dGF0ZSgpID09IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZykKKworICAgIGlmICht X3Byb2Nlc3MtPnN0YXRlKCkgPT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKSB7 CisgICAgICAgIG1fd2ViUHJvY2Vzc0xpZmV0aW1lVHJhY2tlci53ZWJQYWdlRW50ZXJpbmdXZWJQ cm9jZXNzKCk7CiAgICAgICAgIHByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKKyAgICB9CisK ICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOwogICAg IG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQsICp0aGlzKTsKIApAQCAtMjQ5Nyw5ICsyNTA1 LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTgogCiAgICAgcHJv Y2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2Fw KTsKIAotICAgIC8vIEZJWE1FOiB0aGlzIGlzIHRvIGZpeCB0aGUgQVNTRVJUKGlzVmFsaWQoKSkg aW5zaWRlIHJlYXR0YWNoVG9XZWJQcm9jZXNzLCBzb21lIG90aGVyIHdheSB0byBmaXggdGhpcyBp cyBuZWVkZWQuCi0gICAgbV9pc1ZhbGlkID0gZmFsc2U7Ci0gICAgcmVhdHRhY2hUb1dlYlByb2Nl c3MoV1RGTW92ZShwcm9jZXNzKSwgJm5hdmlnYXRpb24pOworICAgIHN3YXBUb1dlYlByb2Nlc3Mo V1RGTW92ZShwcm9jZXNzKSwgbmF2aWdhdGlvbik7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5h dmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVBy b3h5ICVwIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVz IiwgdGhpcywgaXRlbS0+dXJsKCkudXRmOCgpLmRhdGEoKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjM2MzgyKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MTMsNyArMTUx Myw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hl ZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9j YW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jp em9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsK LSAgICB2b2lkIHJlYXR0YWNoVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIEFQ STo6TmF2aWdhdGlvbiopOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmLCBBUEk6Ok5hdmlnYXRpb24mKTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1Rv V2ViUHJvY2VzcygpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dl YlByb2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFj aFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsK 350765 2018-09-25 11:17:34 -0700 2018-10-02 09:15:14 -0700 patch pageproxy-attach-refactor-3.patch text/plain 5862 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYzODIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTIyICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzIGNsZWFudXBzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODk4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGFuZ2UgdGhlIGZhY3RvcmluZyB0byBzZXBhcmF0ZSBzd2FwIGFuZCBj cmFzaCBjb2RlIHBhdGhzIGludG8gZGlmZmVyZW50IGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlYXR0YWNoVG9XZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpz d2FwVG9XZWJQcm9jZXNzKToKKworICAgICAgICBTZXBhcmF0ZSBmdW5jdGlvbiBmb3IgdGhlIHN3 YXAgY2FzZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGlu Z1RvV2ViUHJvY2Vzcyk6CisKKyAgICAgICAgRmFjdG9yIHRoZSBjb21tb24gcGFydHMgaGVyZS4K KworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3 UHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDE4LTA5 LTIxICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgUG9pbnRl ckV2ZW50LCBwbHVzIGZlYXR1cmUgZmxhZywgcGx1cyBXZWIgUGxhdGZvcm0gVGVzdHMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjM2Mzgy KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjkzLDggKzY5MywxOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlU3luY2hy b25vdXNNZXNzCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygpCiB7 Ci0gICAgYXV0byBwcm9jZXNzID0gbWFrZVJlZihtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY3Jl YXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRh U3RvcmUuZ2V0KCkpKTsKLSAgICByZWF0dGFjaFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3Mp LCBudWxscHRyKTsKKyAgICBBU1NFUlQoIW1faXNDbG9zZWQpOworICAgIEFTU0VSVCghaXNWYWxp ZCgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICIlcCBXZWJQYWdlUHJv eHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzXG4iLCB0aGlzKTsKKworICAgIG1fcHJvY2Vzcy0+cmVt b3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlSUQpOworCisgICAgYXV0byYgcHJvY2Vzc1Bvb2wgPSBtX3Byb2Nlc3MtPnByb2Nlc3NQ b29sKCk7CisgICAgbV9wcm9jZXNzID0gcHJvY2Vzc1Bvb2wuY3JlYXRlTmV3V2ViUHJvY2Vzc1Jl c3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCkpOworICAg IG1faXNWYWxpZCA9IHRydWU7CisKKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKTsK IH0KIAogU3VzcGVuZGVkUGFnZVByb3h5KiBXZWJQYWdlUHJveHk6Om1heWJlQ3JlYXRlU3VzcGVu ZGVkUGFnZShXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdh dGlvbikKQEAgLTcyMCwyNyArNzMwLDE4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzdXNwZW5kZWRQ YWdlQ2xvc2VkKFMKICAgICBtX3N1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwogfQogCi12b2lkIFdl YlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBw cm9jZXNzLCBBUEk6Ok5hdmlnYXRpb24qIG5hdmlnYXRpb24pCit2b2lkIFdlYlBhZ2VQcm94eTo6 c3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbikKIHsKICAgICBBU1NFUlQoIW1faXNDbG9zZWQpOwotICAgIEFT U0VSVCghaXNWYWxpZCgpKTsKLQotICAgIG1faXNWYWxpZCA9IHRydWU7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzLCAiJXAgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNz XG4iLCB0aGlzKTsKIAogICAgIC8vIElmIHRoZSBwcm9jZXNzIHdlJ3JlIGF0dGFjaGluZyB0byBp cyBrZXB0IGFsaXZlIHNvbGVseSBieSBvdXIgY3VycmVudCBzdXNwZW5kZWQgcGFnZSwKICAgICAv LyB3ZSBuZWVkIHRvIG1haW50YWluIHRoYXQgYnkgdGVtcG9yYXJpbHkga2VlcGluZyB0aGUgc3Vz cGVuZGVkIHBhZ2UgYWxpdmUuCi0gICAgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94 eT4gY3VycmVudFN1c3BlbmRlZFBhZ2U7Ci0gICAgaWYgKCFuYXZpZ2F0aW9uKSB7Ci0gICAgICAg IG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOwotICAgICAgICBtX3By b2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlEKTsKLSAgICB9IGVsc2UgewotICAgICAgICBjdXJy ZW50U3VzcGVuZGVkUGFnZSA9IFdURk1vdmUobV9zdXNwZW5kZWRQYWdlKTsKLSAgICAgICAgbV9w cm9jZXNzLT5zdXNwZW5kV2ViUGFnZVByb3h5KCp0aGlzLCAqbmF2aWdhdGlvbik7Ci0gICAgfQor ICAgIGF1dG8gY3VycmVudFN1c3BlbmRlZFBhZ2UgPSBXVEZNb3ZlKG1fc3VzcGVuZGVkUGFnZSk7 CisgICAgbV9wcm9jZXNzLT5zdXNwZW5kV2ViUGFnZVByb3h5KCp0aGlzLCBuYXZpZ2F0aW9uKTsK IAogICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7Ci0gICAgaWYgKG1fcHJvY2Vzcy0+ c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQotICAgICAgICBtX3dl YlByb2Nlc3NMaWZldGltZVRyYWNrZXIud2ViUGFnZUVudGVyaW5nV2ViUHJvY2VzcygpOworICAg IG1faXNWYWxpZCA9IHRydWU7CiAKICAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBT dXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3Rz IGFuZAogICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3Qg YmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKQEAgLTc1MywxMSAr NzU0LDE4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygKICAgICAg ICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoKm1fbWFpbkZyYW1lSUQsICptX21haW5GcmFtZSk7 CiAgICAgfQogCi0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzLCAiJXAgV2ViUGFn ZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc1xuIiwgdGhpcyk7CisgICAgZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKCk7Cit9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoKQorewogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgIT0gQ2hp bGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVkKTsKLSAgICBpZiAobV9wcm9jZXNzLT5z dGF0ZSgpID09IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZykKKworICAgIGlmICht X3Byb2Nlc3MtPnN0YXRlKCkgPT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKSB7 CisgICAgICAgIG1fd2ViUHJvY2Vzc0xpZmV0aW1lVHJhY2tlci53ZWJQYWdlRW50ZXJpbmdXZWJQ cm9jZXNzKCk7CiAgICAgICAgIHByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKKyAgICB9CisK ICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOwogICAg IG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQsICp0aGlzKTsKIApAQCAtMjQ5Nyw5ICsyNTA1 LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTgogCiAgICAgcHJv Y2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2Fw KTsKIAotICAgIC8vIEZJWE1FOiB0aGlzIGlzIHRvIGZpeCB0aGUgQVNTRVJUKGlzVmFsaWQoKSkg aW5zaWRlIHJlYXR0YWNoVG9XZWJQcm9jZXNzLCBzb21lIG90aGVyIHdheSB0byBmaXggdGhpcyBp cyBuZWVkZWQuCi0gICAgbV9pc1ZhbGlkID0gZmFsc2U7Ci0gICAgcmVhdHRhY2hUb1dlYlByb2Nl c3MoV1RGTW92ZShwcm9jZXNzKSwgJm5hdmlnYXRpb24pOworICAgIHN3YXBUb1dlYlByb2Nlc3Mo V1RGTW92ZShwcm9jZXNzKSwgbmF2aWdhdGlvbik7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5h dmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVBy b3h5ICVwIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVz IiwgdGhpcywgaXRlbS0+dXJsKCkudXRmOCgpLmRhdGEoKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjM2MzgyKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MTMsNyArMTUx Myw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hl ZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9j YW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jp em9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsK LSAgICB2b2lkIHJlYXR0YWNoVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIEFQ STo6TmF2aWdhdGlvbiopOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmLCBBUEk6Ok5hdmlnYXRpb24mKTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1Rv V2ViUHJvY2VzcygpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dl YlByb2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFj aFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsK