179199 2017-11-02 14:16:24 -0700 [Curl] Fix cancellation process implementation 2017-11-15 12:20:49 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke buildbot commit-queue don.olmstead galpeter pvollan rniwa webkit-bug-importer oldest_to_newest 1367544 0 basuke 2017-11-02 14:16:24 -0700 A proper cleanup is required with some situation and that part was missing. 1367571 1 325772 basuke 2017-11-02 15:05:44 -0700 Created attachment 325772 patch 1367575 2 buildbot 2017-11-02 15:07:37 -0700 Attachment 325772 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1367576 3 325775 basuke 2017-11-02 15:08:35 -0700 Created attachment 325775 patch 1367814 4 325775 commit-queue 2017-11-02 23:05:36 -0700 Comment on attachment 325775 patch Clearing flags on attachment: 325775 Committed r224386: <https://trac.webkit.org/changeset/224386> 1367815 5 commit-queue 2017-11-02 23:05:38 -0700 All reviewed patches have been landed. Closing bug. 1372125 6 webkit-bug-importer 2017-11-15 12:20:49 -0800 <rdar://problem/35567356> 325772 2017-11-02 15:05:44 -0700 2017-11-02 15:08:35 -0700 patch bug-179199.diff text/plain 5951 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZDJhNmM5NjgyYy4uYWU3ZjUxMjIxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0xMS0wMiAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEZpeCBjYW5jZWxsYXRpb24gcHJvY2VzcyBpbXBsZW1l bnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc5MTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OmNhbmNlbCk6 CisgICAgICAgIChXZWJDb3JlOjpDdXJsUmVxdWVzdDo6d2lsbFNlbmREYXRhKToKKyAgICAgICAg KFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRSZWNlaXZlSGVhZGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkN1cmxSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDdXJs UmVxdWVzdDo6Y29tcGxldGVEaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6 Q3VybFJlcXVlc3Q6OnBhdXNlZFN0YXR1c0NoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsUmVxdWVzdC5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6 OmlzU3luY1JlcXVlc3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6Omlz Q29tcGxldGVkT3JDYW5jZWxsZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVl c3Q6Om5lZWRUb0ludm9rZURpZENhbmNlbFRyYW5zZmVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkN1cmxSZXF1ZXN0Ojppc1N5bmNSZXF1ZXN0KTogRGVsZXRlZC4KKwogMjAxNy0xMC0zMSAg TWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S10gQnVpbGQgbW9yZSBmaWxlcyB1bmRlciBXZWJDb3JlIGFzIHVuaWZpZWQgc291cmNlcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5j cHAKaW5kZXggMmVlMzQ3ZjQ3NjUuLmQ5YzAwZTE1NTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5jcHAKQEAgLTEwMywxMyAr MTAzLDI0IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmNhbmNlbCgpCiB7CiAgICAgQVNTRVJUKGlzTWFp blRocmVhZCgpKTsKIAotICAgIGlmIChtX2NhbmNlbGxlZCkKKyAgICBpZiAoaXNDb21wbGV0ZWRP ckNhbmNlbGxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBtX2NhbmNlbGxlZCA9IHRydWU7 CiAKLSAgICBpZiAoIW1faXNTeW5jUmVxdWVzdCkKLSAgICAgICAgQ3VybFJlcXVlc3RTY2hlZHVs ZXI6OnNpbmdsZXRvbigpLmNhbmNlbCh0aGlzKTsKKyAgICBpZiAoIW1faXNTeW5jUmVxdWVzdCkg eworICAgICAgICBhdXRvJiBzY2hlZHVsZXIgPSBDdXJsUmVxdWVzdFNjaGVkdWxlcjo6c2luZ2xl dG9uKCk7CisKKyAgICAgICAgaWYgKG5lZWRUb0ludm9rZURpZENhbmNlbFRyYW5zZmVyKCkpIHsK KyAgICAgICAgICAgIHNjaGVkdWxlci5jYWxsT25Xb3JrZXJUaHJlYWQoW3Byb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0oKSB7CisgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlk Q2FuY2VsVHJhbnNmZXIoKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UKKyAgICAg ICAgICAgIHNjaGVkdWxlci5jYW5jZWwodGhpcyk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYg KG5lZWRUb0ludm9rZURpZENhbmNlbFRyYW5zZmVyKCkpCisgICAgICAgICAgICBkaWRDYW5jZWxU cmFuc2ZlcigpOworICAgIH0KIAogICAgIHNldFJlcXVlc3RQYXVzZWQoZmFsc2UpOwogICAgIHNl dENhbGxiYWNrUGF1c2VkKGZhbHNlKTsKQEAgLTIyNiw3ICsyMzcsNyBAQCBDVVJMY29kZSBDdXJs UmVxdWVzdDo6d2lsbFNldHVwU3NsQ3R4KHZvaWQqIHNzbEN0eCkKIAogc2l6ZV90IEN1cmxSZXF1 ZXN0Ojp3aWxsU2VuZERhdGEoY2hhciogcHRyLCBzaXplX3QgYmxvY2tTaXplLCBzaXplX3QgbnVt YmVyT2ZCbG9ja3MpCiB7Ci0gICAgaWYgKG1fY2FuY2VsbGVkKQorICAgIGlmIChpc0NvbXBsZXRl ZE9yQ2FuY2VsbGVkKCkpCiAgICAgICAgIHJldHVybiBDVVJMX1JFQURGVU5DX0FCT1JUOwogCiAg ICAgaWYgKCFibG9ja1NpemUgfHwgIW51bWJlck9mQmxvY2tzKQpAQCAtMjUyLDcgKzI2Myw3IEBA IHNpemVfdCBDdXJsUmVxdWVzdDo6ZGlkUmVjZWl2ZUhlYWRlcihTdHJpbmcmJiBoZWFkZXIpCiAg ICAgc3RhdGljIGNvbnN0IGF1dG8gZW1wdHlMaW5lQ1JMRiA9ICJcclxuIjsKICAgICBzdGF0aWMg Y29uc3QgYXV0byBlbXB0eUxpbmVMRiA9ICJcbiI7CiAKLSAgICBpZiAobV9jYW5jZWxsZWQpCisg ICAgaWYgKGlzQ29tcGxldGVkT3JDYW5jZWxsZWQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAg ICAvLyBsaWJjdXJsIHNlbmRzIGFsbCBoZWFkZXJzIHRoYXQgbGliY3VybCByZWNlaXZlZCB0byBh cHBsaWNhdGlvbi4KQEAgLTMwOCw3ICszMTksNyBAQCBzaXplX3QgQ3VybFJlcXVlc3Q6OmRpZFJl Y2VpdmVIZWFkZXIoU3RyaW5nJiYgaGVhZGVyKQogCiBzaXplX3QgQ3VybFJlcXVlc3Q6OmRpZFJl Y2VpdmVEYXRhKFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVmZmVyKQogewotICAgIGlmIChtX2NhbmNl bGxlZCkKKyAgICBpZiAoaXNDb21wbGV0ZWRPckNhbmNlbGxlZCgpKQogICAgICAgICByZXR1cm4g MDsKIAogICAgIGlmIChuZWVkVG9JbnZva2VEaWRSZWNlaXZlUmVzcG9uc2UoKSkgewpAQCAtNTI1 LDcgKzUzNiw3IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmNvbXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNl KCkKICAgICBBU1NFUlQobV9kaWROb3RpZnlSZXNwb25zZSk7CiAgICAgQVNTRVJUKCFtX2RpZFJl dHVybkZyb21Ob3RpZnkpOwogCi0gICAgaWYgKG1fY2FuY2VsbGVkKQorICAgIGlmIChpc0NvbXBs ZXRlZE9yQ2FuY2VsbGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZGlkUmV0dXJuRnJv bU5vdGlmeSA9IHRydWU7CkBAIC01MzcsNyArNTQ4LDYgQEAgdm9pZCBDdXJsUmVxdWVzdDo6Y29t cGxldGVEaWRSZWNlaXZlUmVzcG9uc2UoKQogICAgICAgICAvLyBTdGFydCB0cmFuc2ZlciBmb3Ig ZmlsZSBzY2hlbWUKICAgICAgICAgc3RhcnRXaXRoSm9iTWFuYWdlcigpOwogICAgIH0gZWxzZSBp ZiAobV9hY3Rpb25BZnRlckludm9rZSA9PSBBY3Rpb246OkZpbmlzaFRyYW5zZmVyKSB7Ci0gICAg ICAgIC8vIEtlZXAgdGhlIGNhbGxpbmcgdGhyZWFkIG9mIGRpZENvbXBsZXRlVHJhbnNmZXIoKQog ICAgICAgICBpZiAoIW1faXNTeW5jUmVxdWVzdCkgewogICAgICAgICAgICAgQ3VybFJlcXVlc3RT Y2hlZHVsZXI6OnNpbmdsZXRvbigpLmNhbGxPbldvcmtlclRocmVhZChbcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBmaW5pc2hlZFJlc3VsdENvZGUgPSBtX2ZpbmlzaGVkUmVzdWx0Q29k ZV0oKSB7CiAgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkQ29tcGxldGVUcmFuc2Zl cihmaW5pc2hlZFJlc3VsdENvZGUpOwpAQCAtNTc3LDE4ICs1ODcsMjAgQEAgdm9pZCBDdXJsUmVx dWVzdDo6c2V0Q2FsbGJhY2tQYXVzZWQoYm9vbCBwYXVzZWQpCiAKIHZvaWQgQ3VybFJlcXVlc3Q6 OnBhdXNlZFN0YXR1c0NoYW5nZWQoKQogewotICAgIGlmIChtX2NhbmNlbGxlZCB8fCAhbV9jdXJs SGFuZGxlKQorICAgIGlmIChpc0NvbXBsZXRlZE9yQ2FuY2VsbGVkKCkpCiAgICAgICAgIHJldHVy bjsKIAogICAgIGlmICghbV9pc1N5bmNSZXF1ZXN0ICYmIGlzTWFpblRocmVhZCgpKSB7CiAgICAg ICAgIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpzaW5nbGV0b24oKS5jYWxsT25Xb3JrZXJUaHJlYWQo W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcGF1c2VkID0gaXNQYXVzZWQoKV0oKSB7 Ci0gICAgICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+bV9jYW5jZWxsZWQpCisgICAgICAgICAg ICBpZiAocHJvdGVjdGVkVGhpcy0+aXNDb21wbGV0ZWRPckNhbmNlbGxlZCgpKQogICAgICAgICAg ICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgYXV0byBlcnJvciA9IHByb3RlY3RlZFRoaXMt Pm1fY3VybEhhbmRsZS0+cGF1c2UocGF1c2VkID8gQ1VSTFBBVVNFX0FMTCA6IENVUkxQQVVTRV9D T05UKTsKICAgICAgICAgICAgIGlmICgoZXJyb3IgIT0gQ1VSTEVfT0spICYmICFwYXVzZWQpIHsK ICAgICAgICAgICAgICAgICAvLyBSZXN0YXJ0aW5nIHRoZSBoYW5kbGUgaGFzIGZhaWxlZCBzbyBq dXN0IGNhbmNlbCBpdC4KLSAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5jYW5jZWwoKTsK KyAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJl Zihwcm90ZWN0ZWRUaGlzLmdldCgpKV0oKSB7CisgICAgICAgICAgICAgICAgICAgIHByb3RlY3Rl ZFRoaXMtPmNhbmNlbCgpOworICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQogICAg ICAgICB9KTsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaAppbmRleCAyNWIxZTk2NzM1ZS4uYmRmYTZjZDIyMDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVx dWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVx dWVzdC5oCkBAIC01OSw3ICs1OSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHN1c3BlbmQoKTsKICAg ICB2b2lkIHJlc3VtZSgpOwogCi0gICAgYm9vbCBpc1N5bmNSZXF1ZXN0KCkgeyByZXR1cm4gbV9p c1N5bmNSZXF1ZXN0OyB9CisgICAgYm9vbCBpc1N5bmNSZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4g bV9pc1N5bmNSZXF1ZXN0OyB9CisgICAgYm9vbCBpc0NvbXBsZXRlZE9yQ2FuY2VsbGVkKCkgY29u c3QgeyByZXR1cm4gIW1fY3VybEhhbmRsZSB8fCBtX2NhbmNlbGxlZDsgfQorCiAKICAgICAvLyBQ cm9jZXNzaW5nIGZvciBEaWRSZWNlaXZlUmVzcG9uc2UKICAgICB2b2lkIGNvbXBsZXRlRGlkUmVj ZWl2ZVJlc3BvbnNlKCk7CkBAIC0xMDcsNiArMTA5LDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIFBy b2Nlc3NpbmcgZm9yIERpZFJlY2VpdmVSZXNwb25zZQogICAgIGJvb2wgbmVlZFRvSW52b2tlRGlk UmVjZWl2ZVJlc3BvbnNlKCkgY29uc3QgeyByZXR1cm4gIW1fZGlkTm90aWZ5UmVzcG9uc2UgfHwg IW1fZGlkUmV0dXJuRnJvbU5vdGlmeTsgfQorICAgIGJvb2wgbmVlZFRvSW52b2tlRGlkQ2FuY2Vs VHJhbnNmZXIoKSBjb25zdCB7IHJldHVybiBtX2RpZE5vdGlmeVJlc3BvbnNlICYmICFtX2RpZFJl dHVybkZyb21Ob3RpZnkgJiYgbV9hY3Rpb25BZnRlckludm9rZSA9PSBBY3Rpb246OkZpbmlzaFRy YW5zZmVyOyB9CiAgICAgdm9pZCBpbnZva2VEaWRSZWNlaXZlUmVzcG9uc2VGb3JGaWxlKFVSTCYp OwogICAgIHZvaWQgaW52b2tlRGlkUmVjZWl2ZVJlc3BvbnNlKEFjdGlvbik7CiAgICAgdm9pZCBz ZXRSZXF1ZXN0UGF1c2VkKGJvb2wpOwo= 325775 2017-11-02 15:08:35 -0700 2017-11-02 23:05:36 -0700 patch bug-179199.diff text/plain 5918 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZDJhNmM5NjgyYy4uOGNjNDViMDM3YmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNy0xMS0wMiAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEZpeCBjYW5jZWxsYXRpb24gcHJvY2VzcyBpbXBsZW1l bnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc5MTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q3VybFJlcXVlc3Q6OmNhbmNlbCk6CisgICAgICAgIChXZWJDb3JlOjpDdXJsUmVxdWVzdDo6 d2lsbFNlbmREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRSZWNlaXZl SGVhZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpDdXJsUmVxdWVzdDo6Y29tcGxldGVEaWRSZWNlaXZlUmVzcG9u c2UpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnBhdXNlZFN0YXR1c0NoYW5nZWQp OgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5oOgorICAgICAg ICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OmlzU3luY1JlcXVlc3QgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6Q3VybFJlcXVlc3Q6OmlzQ29tcGxldGVkT3JDYW5jZWxsZWQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6Om5lZWRUb0ludm9rZURpZENhbmNlbFRyYW5zZmVy IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0Ojppc1N5bmNSZXF1ZXN0KTog RGVsZXRlZC4KKwogMjAxNy0xMC0zMSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbGQgbW9yZSBmaWxlcyB1bmRlciBXZWJDb3Jl IGFzIHVuaWZpZWQgc291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsUmVxdWVzdC5jcHAKaW5kZXggMmVlMzQ3ZjQ3NjUuLmQ5YzAwZTE1NTcw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJl cXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJs UmVxdWVzdC5jcHAKQEAgLTEwMywxMyArMTAzLDI0IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmNhbmNl bCgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAotICAgIGlmIChtX2NhbmNlbGxl ZCkKKyAgICBpZiAoaXNDb21wbGV0ZWRPckNhbmNlbGxlZCgpKQogICAgICAgICByZXR1cm47CiAK ICAgICBtX2NhbmNlbGxlZCA9IHRydWU7CiAKLSAgICBpZiAoIW1faXNTeW5jUmVxdWVzdCkKLSAg ICAgICAgQ3VybFJlcXVlc3RTY2hlZHVsZXI6OnNpbmdsZXRvbigpLmNhbmNlbCh0aGlzKTsKKyAg ICBpZiAoIW1faXNTeW5jUmVxdWVzdCkgeworICAgICAgICBhdXRvJiBzY2hlZHVsZXIgPSBDdXJs UmVxdWVzdFNjaGVkdWxlcjo6c2luZ2xldG9uKCk7CisKKyAgICAgICAgaWYgKG5lZWRUb0ludm9r ZURpZENhbmNlbFRyYW5zZmVyKCkpIHsKKyAgICAgICAgICAgIHNjaGVkdWxlci5jYWxsT25Xb3Jr ZXJUaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0oKSB7CisgICAgICAgICAg ICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkQ2FuY2VsVHJhbnNmZXIoKTsKKyAgICAgICAgICAgIH0p OworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHNjaGVkdWxlci5jYW5jZWwodGhpcyk7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKG5lZWRUb0ludm9rZURpZENhbmNlbFRyYW5zZmVyKCkp CisgICAgICAgICAgICBkaWRDYW5jZWxUcmFuc2ZlcigpOworICAgIH0KIAogICAgIHNldFJlcXVl c3RQYXVzZWQoZmFsc2UpOwogICAgIHNldENhbGxiYWNrUGF1c2VkKGZhbHNlKTsKQEAgLTIyNiw3 ICsyMzcsNyBAQCBDVVJMY29kZSBDdXJsUmVxdWVzdDo6d2lsbFNldHVwU3NsQ3R4KHZvaWQqIHNz bEN0eCkKIAogc2l6ZV90IEN1cmxSZXF1ZXN0Ojp3aWxsU2VuZERhdGEoY2hhciogcHRyLCBzaXpl X3QgYmxvY2tTaXplLCBzaXplX3QgbnVtYmVyT2ZCbG9ja3MpCiB7Ci0gICAgaWYgKG1fY2FuY2Vs bGVkKQorICAgIGlmIChpc0NvbXBsZXRlZE9yQ2FuY2VsbGVkKCkpCiAgICAgICAgIHJldHVybiBD VVJMX1JFQURGVU5DX0FCT1JUOwogCiAgICAgaWYgKCFibG9ja1NpemUgfHwgIW51bWJlck9mQmxv Y2tzKQpAQCAtMjUyLDcgKzI2Myw3IEBAIHNpemVfdCBDdXJsUmVxdWVzdDo6ZGlkUmVjZWl2ZUhl YWRlcihTdHJpbmcmJiBoZWFkZXIpCiAgICAgc3RhdGljIGNvbnN0IGF1dG8gZW1wdHlMaW5lQ1JM RiA9ICJcclxuIjsKICAgICBzdGF0aWMgY29uc3QgYXV0byBlbXB0eUxpbmVMRiA9ICJcbiI7CiAK LSAgICBpZiAobV9jYW5jZWxsZWQpCisgICAgaWYgKGlzQ29tcGxldGVkT3JDYW5jZWxsZWQoKSkK ICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAvLyBsaWJjdXJsIHNlbmRzIGFsbCBoZWFkZXJzIHRo YXQgbGliY3VybCByZWNlaXZlZCB0byBhcHBsaWNhdGlvbi4KQEAgLTMwOCw3ICszMTksNyBAQCBz aXplX3QgQ3VybFJlcXVlc3Q6OmRpZFJlY2VpdmVIZWFkZXIoU3RyaW5nJiYgaGVhZGVyKQogCiBz aXplX3QgQ3VybFJlcXVlc3Q6OmRpZFJlY2VpdmVEYXRhKFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVm ZmVyKQogewotICAgIGlmIChtX2NhbmNlbGxlZCkKKyAgICBpZiAoaXNDb21wbGV0ZWRPckNhbmNl bGxlZCgpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmIChuZWVkVG9JbnZva2VEaWRSZWNl aXZlUmVzcG9uc2UoKSkgewpAQCAtNTI1LDcgKzUzNiw3IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmNv bXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNlKCkKICAgICBBU1NFUlQobV9kaWROb3RpZnlSZXNwb25z ZSk7CiAgICAgQVNTRVJUKCFtX2RpZFJldHVybkZyb21Ob3RpZnkpOwogCi0gICAgaWYgKG1fY2Fu Y2VsbGVkKQorICAgIGlmIChpc0NvbXBsZXRlZE9yQ2FuY2VsbGVkKCkpCiAgICAgICAgIHJldHVy bjsKIAogICAgIG1fZGlkUmV0dXJuRnJvbU5vdGlmeSA9IHRydWU7CkBAIC01MzcsNyArNTQ4LDYg QEAgdm9pZCBDdXJsUmVxdWVzdDo6Y29tcGxldGVEaWRSZWNlaXZlUmVzcG9uc2UoKQogICAgICAg ICAvLyBTdGFydCB0cmFuc2ZlciBmb3IgZmlsZSBzY2hlbWUKICAgICAgICAgc3RhcnRXaXRoSm9i TWFuYWdlcigpOwogICAgIH0gZWxzZSBpZiAobV9hY3Rpb25BZnRlckludm9rZSA9PSBBY3Rpb246 OkZpbmlzaFRyYW5zZmVyKSB7Ci0gICAgICAgIC8vIEtlZXAgdGhlIGNhbGxpbmcgdGhyZWFkIG9m IGRpZENvbXBsZXRlVHJhbnNmZXIoKQogICAgICAgICBpZiAoIW1faXNTeW5jUmVxdWVzdCkgewog ICAgICAgICAgICAgQ3VybFJlcXVlc3RTY2hlZHVsZXI6OnNpbmdsZXRvbigpLmNhbGxPbldvcmtl clRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmaW5pc2hlZFJlc3VsdENv ZGUgPSBtX2ZpbmlzaGVkUmVzdWx0Q29kZV0oKSB7CiAgICAgICAgICAgICAgICAgcHJvdGVjdGVk VGhpcy0+ZGlkQ29tcGxldGVUcmFuc2ZlcihmaW5pc2hlZFJlc3VsdENvZGUpOwpAQCAtNTc3LDE4 ICs1ODcsMjAgQEAgdm9pZCBDdXJsUmVxdWVzdDo6c2V0Q2FsbGJhY2tQYXVzZWQoYm9vbCBwYXVz ZWQpCiAKIHZvaWQgQ3VybFJlcXVlc3Q6OnBhdXNlZFN0YXR1c0NoYW5nZWQoKQogewotICAgIGlm IChtX2NhbmNlbGxlZCB8fCAhbV9jdXJsSGFuZGxlKQorICAgIGlmIChpc0NvbXBsZXRlZE9yQ2Fu Y2VsbGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICghbV9pc1N5bmNSZXF1ZXN0ICYm IGlzTWFpblRocmVhZCgpKSB7CiAgICAgICAgIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpzaW5nbGV0 b24oKS5jYWxsT25Xb3JrZXJUaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg cGF1c2VkID0gaXNQYXVzZWQoKV0oKSB7Ci0gICAgICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+ bV9jYW5jZWxsZWQpCisgICAgICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+aXNDb21wbGV0ZWRP ckNhbmNlbGxlZCgpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgYXV0 byBlcnJvciA9IHByb3RlY3RlZFRoaXMtPm1fY3VybEhhbmRsZS0+cGF1c2UocGF1c2VkID8gQ1VS TFBBVVNFX0FMTCA6IENVUkxQQVVTRV9DT05UKTsKICAgICAgICAgICAgIGlmICgoZXJyb3IgIT0g Q1VSTEVfT0spICYmICFwYXVzZWQpIHsKICAgICAgICAgICAgICAgICAvLyBSZXN0YXJ0aW5nIHRo ZSBoYW5kbGUgaGFzIGZhaWxlZCBzbyBqdXN0IGNhbmNlbCBpdC4KLSAgICAgICAgICAgICAgICBw cm90ZWN0ZWRUaGlzLT5jYW5jZWwoKTsKKyAgICAgICAgICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZihwcm90ZWN0ZWRUaGlzLmdldCgpKV0oKSB7CisgICAg ICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmNhbmNlbCgpOworICAgICAgICAgICAgICAg IH0pOwogICAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaAppbmRleCAy NWIxZTk2NzM1ZS4uYmRmYTZjZDIyMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5oCkBAIC01OSw3ICs1OSw5IEBAIHB1YmxpYzoK ICAgICB2b2lkIHN1c3BlbmQoKTsKICAgICB2b2lkIHJlc3VtZSgpOwogCi0gICAgYm9vbCBpc1N5 bmNSZXF1ZXN0KCkgeyByZXR1cm4gbV9pc1N5bmNSZXF1ZXN0OyB9CisgICAgYm9vbCBpc1N5bmNS ZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4gbV9pc1N5bmNSZXF1ZXN0OyB9CisgICAgYm9vbCBpc0Nv bXBsZXRlZE9yQ2FuY2VsbGVkKCkgY29uc3QgeyByZXR1cm4gIW1fY3VybEhhbmRsZSB8fCBtX2Nh bmNlbGxlZDsgfQorCiAKICAgICAvLyBQcm9jZXNzaW5nIGZvciBEaWRSZWNlaXZlUmVzcG9uc2UK ICAgICB2b2lkIGNvbXBsZXRlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7CkBAIC0xMDcsNiArMTA5LDcg QEAgcHJpdmF0ZToKIAogICAgIC8vIFByb2Nlc3NpbmcgZm9yIERpZFJlY2VpdmVSZXNwb25zZQog ICAgIGJvb2wgbmVlZFRvSW52b2tlRGlkUmVjZWl2ZVJlc3BvbnNlKCkgY29uc3QgeyByZXR1cm4g IW1fZGlkTm90aWZ5UmVzcG9uc2UgfHwgIW1fZGlkUmV0dXJuRnJvbU5vdGlmeTsgfQorICAgIGJv b2wgbmVlZFRvSW52b2tlRGlkQ2FuY2VsVHJhbnNmZXIoKSBjb25zdCB7IHJldHVybiBtX2RpZE5v dGlmeVJlc3BvbnNlICYmICFtX2RpZFJldHVybkZyb21Ob3RpZnkgJiYgbV9hY3Rpb25BZnRlcklu dm9rZSA9PSBBY3Rpb246OkZpbmlzaFRyYW5zZmVyOyB9CiAgICAgdm9pZCBpbnZva2VEaWRSZWNl aXZlUmVzcG9uc2VGb3JGaWxlKFVSTCYpOwogICAgIHZvaWQgaW52b2tlRGlkUmVjZWl2ZVJlc3Bv bnNlKEFjdGlvbik7CiAgICAgdm9pZCBzZXRSZXF1ZXN0UGF1c2VkKGJvb2wpOwo=