194690 2019-02-14 18:59:22 -0800 WebSocket should not fire events after being stopped 2019-02-15 11:21:42 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson commit-queue ggaren rniwa webkit-bug-importer oldest_to_newest 1506467 0 youennf 2019-02-14 18:59:22 -0800 WebSocket should not fire events after being stopped. See rdar://problem/47697857. 1506470 1 362093 youennf 2019-02-14 20:10:27 -0800 Created attachment 362093 Patch 1506474 2 362094 youennf 2019-02-14 20:38:14 -0800 Created attachment 362094 Patch 1506616 3 362094 ggaren 2019-02-15 10:19:43 -0800 Comment on attachment 362094 Patch r=me 1506665 4 362094 commit-queue 2019-02-15 11:08:12 -0800 Comment on attachment 362094 Patch Clearing flags on attachment: 362094 Committed r241599: <https://trac.webkit.org/changeset/241599> 1506666 5 commit-queue 2019-02-15 11:08:13 -0800 All reviewed patches have been landed. Closing bug. 1506677 6 webkit-bug-importer 2019-02-15 11:21:42 -0800 <rdar://problem/48117824> 362093 2019-02-14 20:10:27 -0800 2019-02-14 20:38:13 -0800 Patch bug-194690-20190214201026.patch text/plain 4606 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc5Nzc3NmUyYTUxNWU1 ZmYwNjkzNTk2NWJhNGRlNGU5MWQxNWE4Zi4uYWFhYmFlMTAzNTdkMDI1Y2VhYjc4NjJmZTFkY2Qy ZTZmNGI0YjJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAyLTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJTb2NrZXQgc2hvdWxk IG5vdCBmaXJlIGV2ZW50cyBhZnRlciBiZWluZyBzdG9wcGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ2OTAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkaXNwYXRjaE9yUXVldWVFcnJvckV2ZW50IGlz IHNjaGVkdWxlZCB1c2luZyBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2ggb3IgZGlzcGF0Y2hfYXN5 bmMuCisgICAgICAgIFRoaXMgbWFrZXMgaXQgcG9zc2libGUgdG8gZGlzcGF0Y2ggYW4gZXZlbnQg d2hpbGUgV2ViU29ja2V0IGlzIGFscmVhZHkgc3RvcHBlZC4KKyAgICAgICAgSW5zdGVhZCwgdXNl IERvY3VtZW50Ojpwb3N0VGFzayBzbyB0aGF0IHRoZSB0YXNrIGlzIG9ubHkgZXhlY3V0ZWQgaWYg V2ViU29ja2V0IGlzIG5vdCBzdG9wcGVkLgorCisgICAgICAgIEFzIGEgcmVmYWN0b3JpbmcsIG1h a2UgdXNlIG9mIFBlbmRpbmdBY3Rpdml0eSB0byBrZWVwIHRyYWNrIG9mIHNldFBlbmRpbmdBY3Rp dml0eS91bnNldFBlbmRpbmdBY3Rpdml0eSBtb3JlIGVhc2lseS4KKworICAgICAgICAqIE1vZHVs ZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0 OjpzdG9wKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldDo6Y29ubmVjdCk6CisgICAgICAg ICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oOgorCiAyMDE5LTAyLTE0ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBQZXJmb3JtYW5jZSBzaG91bGQg bm90IGZpcmUgZXZlbnRzIHdoZW4gaXRzIGNvbnRleHQgaXMgc3RvcHBlZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmNwcAppbmRleCA1ZTllYTUyNmY1 ZGEzYzc0YTkyMjliY2ZmMWM4OGY5MmMzZjk2NjdiLi4xNDUzOTc5ZWE0ZjZjZjgzZDg0NGMwN2I4 MzU3OGM5YjY0NjI5MjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tl dHMvV2ViU29ja2V0LmNwcApAQCAtMjg4LDI4ICsyODgsMTggQEAgRXhjZXB0aW9uT3I8dm9pZD4g V2ViU29ja2V0Ojpjb25uZWN0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgcHIKICAgICAgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1lbnQ+KGNv bnRleHQpOwogICAgICAgICBSZWZQdHI8RnJhbWU+IGZyYW1lID0gZG9jdW1lbnQuZnJhbWUoKTsK ICAgICAgICAgaWYgKCFmcmFtZSB8fCAhZnJhbWUtPmxvYWRlcigpLm1peGVkQ29udGVudENoZWNr ZXIoKS5jYW5SdW5JbnNlY3VyZUNvbnRlbnQoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgbV91 cmwpKSB7Ci0gICAgICAgICAgICAvLyBCYWxhbmNlZCBieSB0aGUgY2FsbCB0byB1bnNldFBlbmRp bmdBY3Rpdml0eSgpIGluIFdlYlNvY2tldDo6c3RvcCgpLgotICAgICAgICAgICAgc2V0UGVuZGlu Z0FjdGl2aXR5KCp0aGlzKTsKKyAgICAgICAgICAgIG1fcGVuZGluZ0FjdGl2aXR5ID0gbWFrZVBl bmRpbmdBY3Rpdml0eSgqdGhpcyk7CiAKICAgICAgICAgICAgIC8vIFdlIG11c3QgYmxvY2sgdGhp cyBjb25uZWN0aW9uLiBJbnN0ZWFkIG9mIHRocm93aW5nIGFuIGV4Y2VwdGlvbiwgd2UgaW5kaWNh dGUgdGhpcwogICAgICAgICAgICAgLy8gdXNpbmcgdGhlIGVycm9yIGV2ZW50LiBCdXQgc2luY2Ug dGhpcyBjb2RlIGV4ZWN1dGVzIGFzIHBhcnQgb2YgdGhlIFdlYlNvY2tldCdzCiAgICAgICAgICAg ICAvLyBjb25zdHJ1Y3Rvciwgd2UgaGF2ZSB0byB3YWl0IHVudGlsIHRoZSBjb25zdHJ1Y3RvciBo YXMgY29tcGxldGVkIGJlZm9yZSBmaXJpbmcgdGhlCiAgICAgICAgICAgICAvLyBldmVudDsgb3Ro ZXJ3aXNlLCB1c2VycyBjYW4ndCBjb25uZWN0IHRvIHRoZSBldmVudC4KLSNpZiBVU0UoV0VCX1RI UkVBRCkKLSAgICAgICAgICAgIHJlZigpOwotICAgICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgICAgICAgICBXZWJUaHJlYWRSdW4o XnsKLSAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hPclF1ZXVlRXJyb3JFdmVudCgpOwotICAg ICAgICAgICAgICAgICAgICBzdG9wKCk7Ci0gICAgICAgICAgICAgICAgICAgIGRlcmVmKCk7Ci0g ICAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICB9KTsKLSNlbHNlCi0gICAgICAgICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKV0oKSB7CisKKyAgICAgICAgICAgIGRvY3VtZW50LnBvc3RUYXNrKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKGF1dG8mKSB7CiAgICAgICAgICAgICAgICAgZGlzcGF0 Y2hPclF1ZXVlRXJyb3JFdmVudCgpOwogICAgICAgICAgICAgICAgIHN0b3AoKTsKICAgICAgICAg ICAgIH0pOwotI2VuZGlmCisKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIH0KICAg ICB9CkBAIC0zMTksNyArMzA5LDcgQEAgRXhjZXB0aW9uT3I8dm9pZD4gV2ViU29ja2V0Ojpjb25u ZWN0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcHIKICAgICAgICAg cHJvdG9jb2xTdHJpbmcgPSBqb2luU3RyaW5ncyhwcm90b2NvbHMsIHN1YnByb3RvY29sU2VwYXJh dG9yKCkpOwogCiAgICAgbV9jaGFubmVsLT5jb25uZWN0KG1fdXJsLCBwcm90b2NvbFN0cmluZyk7 Ci0gICAgc2V0UGVuZGluZ0FjdGl2aXR5KCp0aGlzKTsKKyAgICBtX3BlbmRpbmdBY3Rpdml0eSA9 IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpOwogCiAgICAgcmV0dXJuIHsgfTsKIH0KQEAgLTU0 MCwxNSArNTMwLDEzIEBAIHZvaWQgV2ViU29ja2V0OjpyZXN1bWVUaW1lckZpcmVkKCkKIAogdm9p ZCBXZWJTb2NrZXQ6OnN0b3AoKQogewotICAgIGJvb2wgcGVuZGluZyA9IGhhc1BlbmRpbmdBY3Rp dml0eSgpOwogICAgIGlmIChtX2NoYW5uZWwpCiAgICAgICAgIG1fY2hhbm5lbC0+ZGlzY29ubmVj dCgpOwogICAgIG1fY2hhbm5lbCA9IG51bGxwdHI7CiAgICAgbV9zdGF0ZSA9IENMT1NFRDsKICAg ICBtX3BlbmRpbmdFdmVudHMuY2xlYXIoKTsKICAgICBBY3RpdmVET01PYmplY3Q6OnN0b3AoKTsK LSAgICBpZiAocGVuZGluZykKLSAgICAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkoKnRoaXMpOwor ICAgIG1fcGVuZGluZ0FjdGl2aXR5ID0gbnVsbHB0cjsKIH0KIAogY29uc3QgY2hhciogV2ViU29j a2V0OjphY3RpdmVET01PYmplY3ROYW1lKCkgY29uc3QKQEAgLTYzMSw4ICs2MTksNyBAQCB2b2lk IFdlYlNvY2tldDo6ZGlkQ2xvc2UodW5zaWduZWQgdW5oYW5kbGVkQnVmZmVyZWRBbW91bnQsIENs b3NpbmdIYW5kc2hha2VDb21wbAogICAgICAgICBtX2NoYW5uZWwtPmRpc2Nvbm5lY3QoKTsKICAg ICAgICAgbV9jaGFubmVsID0gbnVsbHB0cjsKICAgICB9Ci0gICAgaWYgKGhhc1BlbmRpbmdBY3Rp dml0eSgpKQotICAgICAgICB1bnNldFBlbmRpbmdBY3Rpdml0eSgqdGhpcyk7CisgICAgbV9wZW5k aW5nQWN0aXZpdHkgPSBudWxscHRyOwogfQogCiB2b2lkIFdlYlNvY2tldDo6ZGlkVXBncmFkZVVS TCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29j a2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmgKaW5k ZXggY2E2NzkwYzMwNGY5NTlmMTJkMzNhMjMwZjM2ZjkwZDEyYjJjYmE3NS4uYjY2OTY2MGU3NWRl ZTZhZWQwNDk0ZmQ2ODAzNWJmZTQ3NTA5ZGNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuaApAQCAtMTQzLDYgKzE0Myw3IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX3Nob3VsZERlbGF5RXZlbnRGaXJpbmcgeyBmYWxzZSB9OwogICAgIERlcXVlPFJl ZjxFdmVudD4+IG1fcGVuZGluZ0V2ZW50czsKICAgICBib29sIG1fZGlzcGF0Y2hlZEVycm9yRXZl bnQgeyBmYWxzZSB9OworICAgIFJlZlB0cjxQZW5kaW5nQWN0aXZpdHk8V2ViU29ja2V0Pj4gbV9w ZW5kaW5nQWN0aXZpdHk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 362094 2019-02-14 20:38:14 -0800 2019-02-15 11:08:12 -0800 Patch bug-194690-20190214203814.patch text/plain 4689 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc5Nzc3NmUyYTUxNWU1 ZmYwNjkzNTk2NWJhNGRlNGU5MWQxNWE4Zi4uYWFhYmFlMTAzNTdkMDI1Y2VhYjc4NjJmZTFkY2Qy ZTZmNGI0YjJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAyLTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJTb2NrZXQgc2hvdWxk IG5vdCBmaXJlIGV2ZW50cyBhZnRlciBiZWluZyBzdG9wcGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ2OTAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkaXNwYXRjaE9yUXVldWVFcnJvckV2ZW50IGlz IHNjaGVkdWxlZCB1c2luZyBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2ggb3IgZGlzcGF0Y2hfYXN5 bmMuCisgICAgICAgIFRoaXMgbWFrZXMgaXQgcG9zc2libGUgdG8gZGlzcGF0Y2ggYW4gZXZlbnQg d2hpbGUgV2ViU29ja2V0IGlzIGFscmVhZHkgc3RvcHBlZC4KKyAgICAgICAgSW5zdGVhZCwgdXNl IERvY3VtZW50Ojpwb3N0VGFzayBzbyB0aGF0IHRoZSB0YXNrIGlzIG9ubHkgZXhlY3V0ZWQgaWYg V2ViU29ja2V0IGlzIG5vdCBzdG9wcGVkLgorCisgICAgICAgIEFzIGEgcmVmYWN0b3JpbmcsIG1h a2UgdXNlIG9mIFBlbmRpbmdBY3Rpdml0eSB0byBrZWVwIHRyYWNrIG9mIHNldFBlbmRpbmdBY3Rp dml0eS91bnNldFBlbmRpbmdBY3Rpdml0eSBtb3JlIGVhc2lseS4KKworICAgICAgICAqIE1vZHVs ZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0 OjpzdG9wKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldDo6Y29ubmVjdCk6CisgICAgICAg ICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oOgorCiAyMDE5LTAyLTE0ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBQZXJmb3JtYW5jZSBzaG91bGQg bm90IGZpcmUgZXZlbnRzIHdoZW4gaXRzIGNvbnRleHQgaXMgc3RvcHBlZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmNwcAppbmRleCA1ZTllYTUyNmY1 ZGEzYzc0YTkyMjliY2ZmMWM4OGY5MmMzZjk2NjdiLi4zNTFiZThiYzFlNjU1MDdhMmZhNzJhNzI3 NDcxOTI5ZGRiN2Q2ZWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tl dHMvV2ViU29ja2V0LmNwcApAQCAtMjg4LDI4ICsyODgsMTggQEAgRXhjZXB0aW9uT3I8dm9pZD4g V2ViU29ja2V0Ojpjb25uZWN0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgcHIKICAgICAgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1lbnQ+KGNv bnRleHQpOwogICAgICAgICBSZWZQdHI8RnJhbWU+IGZyYW1lID0gZG9jdW1lbnQuZnJhbWUoKTsK ICAgICAgICAgaWYgKCFmcmFtZSB8fCAhZnJhbWUtPmxvYWRlcigpLm1peGVkQ29udGVudENoZWNr ZXIoKS5jYW5SdW5JbnNlY3VyZUNvbnRlbnQoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgbV91 cmwpKSB7Ci0gICAgICAgICAgICAvLyBCYWxhbmNlZCBieSB0aGUgY2FsbCB0byB1bnNldFBlbmRp bmdBY3Rpdml0eSgpIGluIFdlYlNvY2tldDo6c3RvcCgpLgotICAgICAgICAgICAgc2V0UGVuZGlu Z0FjdGl2aXR5KCp0aGlzKTsKKyAgICAgICAgICAgIG1fcGVuZGluZ0FjdGl2aXR5ID0gbWFrZVBl bmRpbmdBY3Rpdml0eSgqdGhpcyk7CiAKICAgICAgICAgICAgIC8vIFdlIG11c3QgYmxvY2sgdGhp cyBjb25uZWN0aW9uLiBJbnN0ZWFkIG9mIHRocm93aW5nIGFuIGV4Y2VwdGlvbiwgd2UgaW5kaWNh dGUgdGhpcwogICAgICAgICAgICAgLy8gdXNpbmcgdGhlIGVycm9yIGV2ZW50LiBCdXQgc2luY2Ug dGhpcyBjb2RlIGV4ZWN1dGVzIGFzIHBhcnQgb2YgdGhlIFdlYlNvY2tldCdzCiAgICAgICAgICAg ICAvLyBjb25zdHJ1Y3Rvciwgd2UgaGF2ZSB0byB3YWl0IHVudGlsIHRoZSBjb25zdHJ1Y3RvciBo YXMgY29tcGxldGVkIGJlZm9yZSBmaXJpbmcgdGhlCiAgICAgICAgICAgICAvLyBldmVudDsgb3Ro ZXJ3aXNlLCB1c2VycyBjYW4ndCBjb25uZWN0IHRvIHRoZSBldmVudC4KLSNpZiBVU0UoV0VCX1RI UkVBRCkKLSAgICAgICAgICAgIHJlZigpOwotICAgICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgICAgICAgICBXZWJUaHJlYWRSdW4o XnsKLSAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hPclF1ZXVlRXJyb3JFdmVudCgpOwotICAg ICAgICAgICAgICAgICAgICBzdG9wKCk7Ci0gICAgICAgICAgICAgICAgICAgIGRlcmVmKCk7Ci0g ICAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICB9KTsKLSNlbHNlCi0gICAgICAgICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKV0oKSB7Ci0gICAgICAgICAgICAgICAgZGlzcGF0Y2hPclF1ZXVlRXJyb3JFdmVudCgpOwot ICAgICAgICAgICAgICAgIHN0b3AoKTsKKworICAgICAgICAgICAgZG9jdW1lbnQucG9zdFRhc2so W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0oYXV0byYpIHsKKyAgICAgICAg ICAgICAgICB0aGlzLT5kaXNwYXRjaE9yUXVldWVFcnJvckV2ZW50KCk7CisgICAgICAgICAgICAg ICAgdGhpcy0+c3RvcCgpOwogICAgICAgICAgICAgfSk7Ci0jZW5kaWYKKwogICAgICAgICAgICAg cmV0dXJuIHsgfTsKICAgICAgICAgfQogICAgIH0KQEAgLTMxOSw3ICszMDksNyBAQCBFeGNlcHRp b25Pcjx2b2lkPiBXZWJTb2NrZXQ6OmNvbm5lY3QoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBwcgogICAgICAgICBwcm90b2NvbFN0cmluZyA9IGpvaW5TdHJpbmdzKHBy b3RvY29scywgc3VicHJvdG9jb2xTZXBhcmF0b3IoKSk7CiAKICAgICBtX2NoYW5uZWwtPmNvbm5l Y3QobV91cmwsIHByb3RvY29sU3RyaW5nKTsKLSAgICBzZXRQZW5kaW5nQWN0aXZpdHkoKnRoaXMp OworICAgIG1fcGVuZGluZ0FjdGl2aXR5ID0gbWFrZVBlbmRpbmdBY3Rpdml0eSgqdGhpcyk7CiAK ICAgICByZXR1cm4geyB9OwogfQpAQCAtNTQwLDE1ICs1MzAsMTMgQEAgdm9pZCBXZWJTb2NrZXQ6 OnJlc3VtZVRpbWVyRmlyZWQoKQogCiB2b2lkIFdlYlNvY2tldDo6c3RvcCgpCiB7Ci0gICAgYm9v bCBwZW5kaW5nID0gaGFzUGVuZGluZ0FjdGl2aXR5KCk7CiAgICAgaWYgKG1fY2hhbm5lbCkKICAg ICAgICAgbV9jaGFubmVsLT5kaXNjb25uZWN0KCk7CiAgICAgbV9jaGFubmVsID0gbnVsbHB0cjsK ICAgICBtX3N0YXRlID0gQ0xPU0VEOwogICAgIG1fcGVuZGluZ0V2ZW50cy5jbGVhcigpOwogICAg IEFjdGl2ZURPTU9iamVjdDo6c3RvcCgpOwotICAgIGlmIChwZW5kaW5nKQotICAgICAgICB1bnNl dFBlbmRpbmdBY3Rpdml0eSgqdGhpcyk7CisgICAgbV9wZW5kaW5nQWN0aXZpdHkgPSBudWxscHRy OwogfQogCiBjb25zdCBjaGFyKiBXZWJTb2NrZXQ6OmFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25z dApAQCAtNjMxLDggKzYxOSw3IEBAIHZvaWQgV2ViU29ja2V0OjpkaWRDbG9zZSh1bnNpZ25lZCB1 bmhhbmRsZWRCdWZmZXJlZEFtb3VudCwgQ2xvc2luZ0hhbmRzaGFrZUNvbXBsCiAgICAgICAgIG1f Y2hhbm5lbC0+ZGlzY29ubmVjdCgpOwogICAgICAgICBtX2NoYW5uZWwgPSBudWxscHRyOwogICAg IH0KLSAgICBpZiAoaGFzUGVuZGluZ0FjdGl2aXR5KCkpCi0gICAgICAgIHVuc2V0UGVuZGluZ0Fj dGl2aXR5KCp0aGlzKTsKKyAgICBtX3BlbmRpbmdBY3Rpdml0eSA9IG51bGxwdHI7CiB9CiAKIHZv aWQgV2ViU29ja2V0OjpkaWRVcGdyYWRlVVJMKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2Vic29ja2V0cy9XZWJTb2NrZXQuaAppbmRleCBjYTY3OTBjMzA0Zjk1OWYxMmQzM2EyMzBmMzZm OTBkMTJiMmNiYTc1Li5iNjY5NjYwZTc1ZGVlNmFlZDA0OTRmZDY4MDM1YmZlNDc1MDlkY2JiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oCkBAIC0x NDMsNiArMTQzLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2hvdWxkRGVsYXlFdmVudEZpcmlu ZyB7IGZhbHNlIH07CiAgICAgRGVxdWU8UmVmPEV2ZW50Pj4gbV9wZW5kaW5nRXZlbnRzOwogICAg IGJvb2wgbV9kaXNwYXRjaGVkRXJyb3JFdmVudCB7IGZhbHNlIH07CisgICAgUmVmUHRyPFBlbmRp bmdBY3Rpdml0eTxXZWJTb2NrZXQ+PiBtX3BlbmRpbmdBY3Rpdml0eTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUK