214307 2020-07-14 10:27:36 -0700 [WK2] Make establishing a connection between the WebProcess and the Network process more robust 2020-07-15 11:23:26 -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 1671419 0 cdumez 2020-07-14 10:27:36 -0700 Make establishing a connection between the WebProcess in the Network process more robust. 1671420 1 cdumez 2020-07-14 10:27:51 -0700 <rdar://problem/64592340> 1671425 2 404251 cdumez 2020-07-14 10:32:55 -0700 Created attachment 404251 Patch 1671426 3 404252 cdumez 2020-07-14 10:33:59 -0700 Created attachment 404252 Patch 1671824 4 ews-feeder 2020-07-15 11:23:25 -0700 Committed r264408: <https://trac.webkit.org/changeset/264408> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404252. 404251 2020-07-14 10:32:55 -0700 2020-07-14 10:33:58 -0700 Patch bug-214307-20200714103254.patch text/plain 5083 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZmQyMTc2MDM3ZGFmZWU0 ODViM2ViOTI2MmI4YmRmYmNjY2UxNzAuLjgxN2JjMjUzNmYyNzE4YjM2OTdkMTY5NWI3MTRlODAz NmNmZDkxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDctMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBNYWtlIGVzdGFibGlzaGlu ZyBhIGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBpbiB0aGUgTmV0d29yayBwcm9j ZXNzIG1vcmUgcm9idXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTQzMDcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NTkyMzQwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgZXN0YWJsaXNo aW5nIGEgY29ubmVjdGlvbiBiZXR3ZWVuIHRoZSBXZWJQcm9jZXNzIGluIHRoZSBOZXR3b3JrIHBy b2Nlc3MgbW9yZSByb2J1c3QuCisgICAgICAgIFdoZW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBpcyBj cmFzaHksIGl0IGlzIG5vdCB1bmNvbW1vbiBmb3IgdGhlIFdlYlByb2Nlc3MgdG8gZmFpbCB0byBl c3RhYmxpc2gKKyAgICAgICAgYSBjb25uZWN0aW9uIHRvIHRoZSBuZXR3b3JrIHByb2Nlc3MuIFBy ZXZpb3VzbHksIHdlIHdvdWxkIHRyeSB0d2ljZSBhbmQgdGhlbiBnaXZlIHVwIGJ5IGNhbGxpbmcK KyAgICAgICAgQ1JBU0goKS4gSSBoYXZlIHR3ZWFrZWQgdGhlIGxvZ2ljIHNvIHRoYXQgd2Ugbm93 IHRyeSAxMCB0aW1lcyBhbmQgd2FpdCAxMDAgbXMgYmV0d2VlbiBlYWNoCisgICAgICAgIGF0dGVt cHQgdG8gbWFrZSBhIGJlc3QgZWZmb3J0IGF0IGVzdGFibGlzaGluZyB0aGUgY29ubmVjdGlvbi4g SSBhbHNvIHVwZGF0ZWQgdGhlIGxvZ2ljIHRvIGV4aXQKKyAgICAgICAgY2xlYW5seSBpbnN0ZWFk IG9mIGNyYXNoaW5nIGlmIHRoZSBJUEMgY29ubmVjdGlvbiB0byB0aGUgVUlQcm9jZXNzIGJlY29t ZXMgaW52YWxpZCAoaS5lLiB0aGUKKyAgICAgICAgVUlQcm9jZXNzIGhhcyBzZXZlcmVkIHRoZSBj b25uZWN0aW9uIGJlY2F1c2UgdGhpcyBXZWJQcm9jZXNzIGlzIG5vIGxvbmdlciBuZWVkZWQpLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz czo6ZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKwogMjAyMC0wNy0xNCAgRnVqaWkg SGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk IG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vz cy5jcHAKaW5kZXggNmYyZDhmYWQxNjVmNWFhNDlhOGYyYThlOTBkYTY2Nzg1NTY2ZGY0NS4uYzcz YzQzZTk4NTdjMzNhNGY4ZWZhNjY4M2FkMGNiYzRjMGUwZWY0MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMTEwMCwyMyArMTEwMCwyOCBAQCB2b2lkIFdlYlBy b2Nlc3M6OnNldEluamVjdGVkQnVuZGxlUGFyYW1ldGVycyhjb25zdCBJUEM6OkRhdGFSZWZlcmVu Y2UmIHZhbHVlKQogc3RhdGljIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkluZm8gZ2V0TmV0d29y a1Byb2Nlc3NDb25uZWN0aW9uKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHsKICAgICBO ZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb25JbmZvIGNvbm5lY3Rpb25JbmZvOwotICAgIGlmICghY29u bmVjdGlvbi5zZW5kU3luYyhNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb24oKSwgTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0TmV0d29ya1By b2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyksIDApKSB7Ci0gICAgICAgIC8v IElmIHdlIGZhaWxlZCB0aGUgZmlyc3QgdGltZSwgcmV0cnkgb25jZS4gVGhlIGF0dGFjaG1lbnQg bWF5IGhhdmUgYmVjb21lIGludmFsaWQKLSAgICAgICAgLy8gYmVmb3JlIGl0IHdhcyByZWNlaXZl ZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVkLgotICAg ICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6 R2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCksIE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6 OkdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6UmVwbHkoY29ubmVjdGlvbkluZm8pLCAwKSkg ewotI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQotICAgICAgICAgICAgLy8gR1RL KyBhbmQgV1BFIHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2UgZmFpbHVyZS4K LSAgICAgICAgICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBjYXNlLCB0aGUgbmV0d29yayBwcm9j ZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9jZXNzIHdoaWxlIHRoZQotICAgICAg ICAgICAgLy8gV2ViIHByb2Nlc3MgaXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3ZSBhbHdheXMg d2FudCB0byBleGl0IGluc3RlYWQgb2YgY3Jhc2hpbmcuIFRoaXMgY2FuCi0gICAgICAgICAgICAv LyBoYXBwZW4gd2hlbiB0aGUgV2ViVmlldyBpcyBjcmVhdGVkIGFuZCB0aGVuIGRlc3Ryb3llZCBx dWlja2x5LgotICAgICAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODMzNDguCisgICAgYXV0byByZXF1ZXN0Q29ubmVjdGlvbiA9IFsmXSB7Cisg ICAgICAgIGlmICghY29ubmVjdGlvbi5pc1ZhbGlkKCkpIHsKKyAgICAgICAgICAgIC8vIENvbm5l Y3Rpb24gdG8gVUlQcm9jZXNzIGhhcyBiZWVuIHNldmVyZWQsIGV4aXQgY2xlYW5seS4KICAgICAg ICAgICAgIGV4aXQoMCk7Ci0jZWxzZQotICAgICAgICAgICAgQ1JBU0goKTsKLSNlbmRpZgogICAg ICAgICB9Ci0gICAgfQorICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6 OldlYlByb2Nlc3NQcm94eTo6R2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCksIE1lc3NhZ2Vz OjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6UmVwbHkoY29u bmVjdGlvbkluZm8pLCAwKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0 dXJuIElQQzo6Q29ubmVjdGlvbjo6aWRlbnRpZmllcklzVmFsaWQoY29ubmVjdGlvbkluZm8uaWRl bnRpZmllcigpKTsKKyAgICB9OworCisgICAgc3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBtYXhG YWlsZWRBdHRlbXB0cyA9IDEwOworICAgIHVuc2lnbmVkIGZhaWxlZEF0dGVtcHRzID0gMDsKKyAg ICB3aGlsZSAoIXJlcXVlc3RDb25uZWN0aW9uKCkpIHsKKyAgICAgICAgaWYgKCsrZmFpbGVkQXR0 ZW1wdHMgPj0gbWF4RmFpbGVkQXR0ZW1wdHMpCisgICAgICAgICAgICBDUkFTSCgpOwogCisgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rp b246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0byBuZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmV0 cnkuLi4iKTsKKworICAgICAgICAvLyBJZiB3ZSBmYWlsZWQsIHJldHJ5IGFmdGVyIGEgZGVsYXku IFRoZSBhdHRhY2htZW50IG1heSBoYXZlIGJlY29tZSBpbnZhbGlkCisgICAgICAgIC8vIGJlZm9y ZSBpdCB3YXMgcmVjZWl2ZWQgYnkgdGhlIHdlYiBwcm9jZXNzIGlmIHRoZSBuZXR3b3JrIHByb2Nl c3MgY3Jhc2hlZC4KKyAgICAgICAgc2xlZXAoMTAwX21zKTsKKyAgICB9CiAgICAgcmV0dXJuIGNv bm5lY3Rpb25JbmZvOwogfQogCkBAIC0xMTI5LDE0ICsxMTM0LDYgQEAgTmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uJiBXZWJQcm9jZXNzOjplbnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKQog ICAgIGlmICghbV9uZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24pIHsKICAgICAgICAgYXV0byBjb25u ZWN0aW9uSW5mbyA9IGdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigqcGFyZW50UHJvY2Vzc0Nv bm5lY3Rpb24oKSk7CiAKLSAgICAgICAgLy8gUmV0cnkgb25jZSBpZiB0aGUgSVBDIHRvIGdldCB0 aGUgY29ubmVjdGlvbklkZW50aWZpZXIgc3VjY2VlZGVkIGJ1dCB0aGUgY29ubmVjdGlvbklkZW50 aWZpZXIgd2UgcmVjZWl2ZWQKLSAgICAgICAgLy8gaXMgaW52YWxpZC4gVGhpcyBtYXkgaW5kaWNh dGUgdGhhdCB0aGUgbmV0d29yayBwcm9jZXNzIGhhcyBjcmFzaGVkLgotICAgICAgICBpZiAoIUlQ Qzo6Q29ubmVjdGlvbjo6aWRlbnRpZmllcklzVmFsaWQoY29ubmVjdGlvbkluZm8uaWRlbnRpZmll cigpKSkKLSAgICAgICAgICAgIGNvbm5lY3Rpb25JbmZvID0gZ2V0TmV0d29ya1Byb2Nlc3NDb25u ZWN0aW9uKCpwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpKTsKLQotICAgICAgICBpZiAoIUlQQzo6 Q29ubmVjdGlvbjo6aWRlbnRpZmllcklzVmFsaWQoY29ubmVjdGlvbkluZm8uaWRlbnRpZmllcigp KSkKLSAgICAgICAgICAgIENSQVNIKCk7Ci0KICAgICAgICAgbV9uZXR3b3JrUHJvY2Vzc0Nvbm5l Y3Rpb24gPSBOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OmNyZWF0ZShjb25uZWN0aW9uSW5mby5y ZWxlYXNlSWRlbnRpZmllcigpLCBjb25uZWN0aW9uSW5mby5jb29raWVBY2NlcHRQb2xpY3kpOwog I2lmIEhBVkUoQVVESVRfVE9LRU4pCiAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3NDb25uZWN0aW9u LT5zZXROZXR3b3JrUHJvY2Vzc0F1ZGl0VG9rZW4oV1RGTW92ZShjb25uZWN0aW9uSW5mby5hdWRp dFRva2VuKSk7Cg== 404252 2020-07-14 10:33:59 -0700 2020-07-15 11:23:26 -0700 Patch bug-214307-20200714103358.patch text/plain 5085 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZmQyMTc2MDM3ZGFmZWU0 ODViM2ViOTI2MmI4YmRmYmNjY2UxNzAuLjgxZDQ3M2NkOGE0NjJkZTRlYzIxNmFhYmNkNDU1MTZm MWE2MDAxZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDctMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBNYWtlIGVzdGFibGlzaGlu ZyBhIGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsgcHJv Y2VzcyBtb3JlIHJvYnVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE0MzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDU5MjM0MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGVzdGFibGlz aGluZyBhIGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsg cHJvY2VzcyBtb3JlIHJvYnVzdC4KKyAgICAgICAgV2hlbiB0aGUgbmV0d29yayBwcm9jZXNzIGlz IGNyYXNoeSwgaXQgaXMgbm90IHVuY29tbW9uIGZvciB0aGUgV2ViUHJvY2VzcyB0byBmYWlsIHRv IGVzdGFibGlzaAorICAgICAgICBhIGNvbm5lY3Rpb24gdG8gdGhlIG5ldHdvcmsgcHJvY2Vzcy4g UHJldmlvdXNseSwgd2Ugd291bGQgdHJ5IHR3aWNlIGFuZCB0aGVuIGdpdmUgdXAgYnkgY2FsbGlu ZworICAgICAgICBDUkFTSCgpLiBJIGhhdmUgdHdlYWtlZCB0aGUgbG9naWMgc28gdGhhdCB3ZSBu b3cgdHJ5IDEwIHRpbWVzIGFuZCB3YWl0IDEwMCBtcyBiZXR3ZWVuIGVhY2gKKyAgICAgICAgYXR0 ZW1wdCB0byBtYWtlIGEgYmVzdCBlZmZvcnQgYXQgZXN0YWJsaXNoaW5nIHRoZSBjb25uZWN0aW9u LiBJIGFsc28gdXBkYXRlZCB0aGUgbG9naWMgdG8gZXhpdAorICAgICAgICBjbGVhbmx5IGluc3Rl YWQgb2YgY3Jhc2hpbmcgaWYgdGhlIElQQyBjb25uZWN0aW9uIHRvIHRoZSBVSVByb2Nlc3MgYmVj b21lcyBpbnZhbGlkIChpLmUuIHRoZQorICAgICAgICBVSVByb2Nlc3MgaGFzIHNldmVyZWQgdGhl IGNvbm5lY3Rpb24gYmVjYXVzZSB0aGlzIFdlYlByb2Nlc3MgaXMgbm8gbG9uZ2VyIG5lZWRlZCku CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjplbnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24pOgorCiAyMDIwLTA3LTE0ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQgbm9uLXVuaWZpZWQgYnVpbGQgZml4ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9j ZXNzLmNwcAppbmRleCA2ZjJkOGZhZDE2NWY1YWE0OWE4ZjJhOGU5MGRhNjY3ODU1NjZkZjQ1Li5j NzNjNDNlOTg1N2MzM2E0ZjhlZmE2NjgzYWQwY2JjNGMwZTBlZjQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC0xMTAwLDIzICsxMTAwLDI4IEBAIHZvaWQgV2Vi UHJvY2Vzczo6c2V0SW5qZWN0ZWRCdW5kbGVQYXJhbWV0ZXJzKGNvbnN0IElQQzo6RGF0YVJlZmVy ZW5jZSYgdmFsdWUpCiBzdGF0aWMgTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewogICAg IE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkluZm8gY29ubmVjdGlvbkluZm87Ci0gICAgaWYgKCFj b25uZWN0aW9uLnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQ cm9jZXNzQ29ubmVjdGlvbigpLCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXROZXR3b3Jr UHJvY2Vzc0Nvbm5lY3Rpb246OlJlcGx5KGNvbm5lY3Rpb25JbmZvKSwgMCkpIHsKLSAgICAgICAg Ly8gSWYgd2UgZmFpbGVkIHRoZSBmaXJzdCB0aW1lLCByZXRyeSBvbmNlLiBUaGUgYXR0YWNobWVu dCBtYXkgaGF2ZSBiZWNvbWUgaW52YWxpZAotICAgICAgICAvLyBiZWZvcmUgaXQgd2FzIHJlY2Vp dmVkIGJ5IHRoZSB3ZWIgcHJvY2VzcyBpZiB0aGUgbmV0d29yayBwcm9jZXNzIGNyYXNoZWQuCi0g ICAgICAgIGlmICghY29ubmVjdGlvbi5zZW5kU3luYyhNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5 OjpHZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKSwgTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94 eTo6R2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyksIDAp KSB7Ci0jaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShXUEUpCi0gICAgICAgICAgICAvLyBH VEsrIGFuZCBXUEUgcG9ydHMgZG9uJ3QgZXhpdCBvbiBzZW5kIHN5bmMgbWVzc2FnZSBmYWlsdXJl LgotICAgICAgICAgICAgLy8gSW4gdGhpcyBwYXJ0aWN1bGFyIGNhc2UsIHRoZSBuZXR3b3JrIHBy b2Nlc3MgY2FuIGJlIHRlcm1pbmF0ZWQgYnkgdGhlIFVJIHByb2Nlc3Mgd2hpbGUgdGhlCi0gICAg ICAgICAgICAvLyBXZWIgcHJvY2VzcyBpcyBzdGlsbCBpbml0aWFsaXppbmcsIHNvIHdlIGFsd2F5 cyB3YW50IHRvIGV4aXQgaW5zdGVhZCBvZiBjcmFzaGluZy4gVGhpcyBjYW4KLSAgICAgICAgICAg IC8vIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlzIGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJveWVk IHF1aWNrbHkuCi0gICAgICAgICAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4MzM0OC4KKyAgICBhdXRvIHJlcXVlc3RDb25uZWN0aW9uID0gWyZdIHsK KyAgICAgICAgaWYgKCFjb25uZWN0aW9uLmlzVmFsaWQoKSkgeworICAgICAgICAgICAgLy8gQ29u bmVjdGlvbiB0byBVSVByb2Nlc3MgaGFzIGJlZW4gc2V2ZXJlZCwgZXhpdCBjbGVhbmx5LgogICAg ICAgICAgICAgZXhpdCgwKTsKLSNlbHNlCi0gICAgICAgICAgICBDUkFTSCgpOwotI2VuZGlmCiAg ICAgICAgIH0KLSAgICB9CisgICAgICAgIGlmICghY29ubmVjdGlvbi5zZW5kU3luYyhNZXNzYWdl czo6V2ViUHJvY2Vzc1Byb3h5OjpHZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKSwgTWVzc2Fn ZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpSZXBseShj b25uZWN0aW9uSW5mbyksIDApKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBy ZXR1cm4gSVBDOjpDb25uZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChjb25uZWN0aW9uSW5mby5p ZGVudGlmaWVyKCkpOworICAgIH07CisKKyAgICBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1h eEZhaWxlZEF0dGVtcHRzID0gMTA7CisgICAgdW5zaWduZWQgZmFpbGVkQXR0ZW1wdHMgPSAwOwor ICAgIHdoaWxlICghcmVxdWVzdENvbm5lY3Rpb24oKSkgeworICAgICAgICBpZiAoKytmYWlsZWRB dHRlbXB0cyA+PSBtYXhGYWlsZWRBdHRlbXB0cykKKyAgICAgICAgICAgIENSQVNIKCk7CiAKKyAg ICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgImdldE5ldHdvcmtQcm9jZXNzQ29ubmVj dGlvbjogRmFpbGVkIHRvIGdldCBjb25uZWN0aW9uIHRvIG5ldHdvcmsgcHJvY2Vzcywgd2lsbCBy ZXRyeS4uLiIpOworCisgICAgICAgIC8vIElmIHdlIGZhaWxlZCwgcmV0cnkgYWZ0ZXIgYSBkZWxh eS4gVGhlIGF0dGFjaG1lbnQgbWF5IGhhdmUgYmVjb21lIGludmFsaWQKKyAgICAgICAgLy8gYmVm b3JlIGl0IHdhcyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJv Y2VzcyBjcmFzaGVkLgorICAgICAgICBzbGVlcCgxMDBfbXMpOworICAgIH0KICAgICByZXR1cm4g Y29ubmVjdGlvbkluZm87CiB9CiAKQEAgLTExMjksMTQgKzExMzQsNiBAQCBOZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb24mIFdlYlByb2Nlc3M6OmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigp CiAgICAgaWYgKCFtX25ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbikgewogICAgICAgICBhdXRvIGNv bm5lY3Rpb25JbmZvID0gZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCpwYXJlbnRQcm9jZXNz Q29ubmVjdGlvbigpKTsKIAotICAgICAgICAvLyBSZXRyeSBvbmNlIGlmIHRoZSBJUEMgdG8gZ2V0 IHRoZSBjb25uZWN0aW9uSWRlbnRpZmllciBzdWNjZWVkZWQgYnV0IHRoZSBjb25uZWN0aW9uSWRl bnRpZmllciB3ZSByZWNlaXZlZAotICAgICAgICAvLyBpcyBpbnZhbGlkLiBUaGlzIG1heSBpbmRp Y2F0ZSB0aGF0IHRoZSBuZXR3b3JrIHByb2Nlc3MgaGFzIGNyYXNoZWQuCi0gICAgICAgIGlmICgh SVBDOjpDb25uZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChjb25uZWN0aW9uSW5mby5pZGVudGlm aWVyKCkpKQotICAgICAgICAgICAgY29ubmVjdGlvbkluZm8gPSBnZXROZXR3b3JrUHJvY2Vzc0Nv bm5lY3Rpb24oKnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCkpOwotCi0gICAgICAgIGlmICghSVBD OjpDb25uZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChjb25uZWN0aW9uSW5mby5pZGVudGlmaWVy KCkpKQotICAgICAgICAgICAgQ1JBU0goKTsKLQogICAgICAgICBtX25ldHdvcmtQcm9jZXNzQ29u bmVjdGlvbiA9IE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6Y3JlYXRlKGNvbm5lY3Rpb25JbmZv LnJlbGVhc2VJZGVudGlmaWVyKCksIGNvbm5lY3Rpb25JbmZvLmNvb2tpZUFjY2VwdFBvbGljeSk7 CiAjaWYgSEFWRShBVURJVF9UT0tFTikKICAgICAgICAgbV9uZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rp b24tPnNldE5ldHdvcmtQcm9jZXNzQXVkaXRUb2tlbihXVEZNb3ZlKGNvbm5lY3Rpb25JbmZvLmF1 ZGl0VG9rZW4pKTsK