83749 2012-04-11 23:30:05 -0700 Leak in WebSocketChannel with workers/worker-reload.html (part 2) 2012-04-15 18:44:00 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yutak yutak levin levin+threading webkit.review.bot oldest_to_newest 600930 0 yutak 2012-04-11 23:30:05 -0700 Follow-up of bug 83345. See also http://code.google.com/p/chromium/issues/detail?id=122233 Even after a speculative fix at r113414, there are still some similar leaks reported. After some investigation I found: - A silly mistake in Chromium's WebWorkerClientImpl, and - Potential race condition that causes Peer objects to leak. 601051 1 136863 yutak 2012-04-12 03:02:49 -0700 Created attachment 136863 Patch 602842 2 136863 webkit.review.bot 2012-04-15 18:43:56 -0700 Comment on attachment 136863 Patch Clearing flags on attachment: 136863 Committed r114215: <http://trac.webkit.org/changeset/114215> 602843 3 webkit.review.bot 2012-04-15 18:44:00 -0700 All reviewed patches have been landed. Closing bug. 136863 2012-04-12 03:02:49 -0700 2012-04-15 18:43:56 -0700 Patch bug-83749-20120412190247.patch text/plain 11332 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDExOWUwNDEyNjlhMDEx Y2JmNGE1MTczOWI2ODA2Y2QxM2VhNDNlZi4uZDFjOGViNmYwYTQ4ZTBlMzI3MDY0YWNlOTViNmJi MGJiODEzNjIxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTEyICBZdXRh IEtpdGFtdXJhICA8eXV0YWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIExlYWsgaW4gV2ViU29j a2V0Q2hhbm5lbCB3aXRoIHdvcmtlcnMvd29ya2VyLXJlbG9hZC5odG1sIChwYXJ0IDIpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc0OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlY29uZCBhdHRlbXB0 IHRvIHJlbW92ZSBsZWFrcyBhcm91bmQgV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIHBhdGNoIGRvZXMgbm90IGltcG9zZSBh bnkgZnVuY3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYnNvY2tldHMvVGhy ZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6VGhyZWFkYWJsZVdl YlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFi bGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6ZmFpbGVkV2ViU29ja2V0Q2hhbm5lbENy ZWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xp ZW50V3JhcHBlcjo6c2V0RmFpbGVkV2ViU29ja2V0Q2hhbm5lbENyZWF0aW9uKToKKyAgICAgICAg KiBNb2R1bGVzL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFw cGVyLmg6CisgICAgICAgIEFkZCBhIGJvb2xlYW4gZmxhZyBpbmRpY2F0aW5nIHdoZXRoZXIgQnJp ZGdlOjppbml0aWFsaXplKCkgaGFzIGV4aXRlZCB3aXRob3V0IHJlY2VpdmluZworICAgICAgICBh IHBvaW50ZXIgdG8gdGhlIHBlZXIgb2JqZWN0LgorICAgICAgICAqIE1vZHVsZXMvd2Vic29ja2V0 cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6V29ya2VyQ29udGV4dERpZEluaXRp YWxpemVUYXNrOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkYWJsZVdl YlNvY2tldENoYW5uZWw6OldvcmtlckNvbnRleHREaWRJbml0aWFsaXplVGFzazo6V29ya2VyQ29u dGV4dERpZEluaXRpYWxpemVUYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZGFi bGVXZWJTb2NrZXRDaGFubmVsOjpXb3JrZXJDb250ZXh0RGlkSW5pdGlhbGl6ZVRhc2s6OnBlcmZv cm1UYXNrKToKKyAgICAgICAgS2ljayBtYWluVGhyZWFkRGVzdHJveSgpIHRvIGRlbGV0ZSB0aGUg cGVlciBpZiB0aGUgYnJpZGdlIGhhcyBmYWlsZWQgdG8gcmVjZWl2ZQorICAgICAgICBhIHBvaW50 ZXIgdG8gdGhlIHBlZXIgKHdhaXRGb3JNZXRob2RDb21wbGV0aW9uKCkgZXhpdGVkIGR1ZSB0byBt ZXNzYWdlIHF1ZXVlJ3MKKyAgICAgICAgdGVybWluYXRpb24pLgorICAgICAgICAoV2ViQ29yZTo6 V29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OkJyaWRnZTo6bWFpblRocmVhZEluaXRp YWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5u ZWw6OkJyaWRnZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dv cmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmg6CisgICAgICAgIChXb3JrZXJUaHJlYWRh YmxlV2ViU29ja2V0Q2hhbm5lbCk6CisgICAgICAgIE1ha2UgV29ya2VyQ29udGV4dERpZEluaXRp YWxpemVUYXNrIGFuIGlubmVyIGNsYXNzIG9mIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFu bmVsCisgICAgICAgIHNvIGl0IGNhbiByZWZlciBXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hh bm5lbCdzIHN0YXRpYyBtZW1iZXIgZnVuY3Rpb24gKG1haW5UaHJlYWREZXN0cm95KCkpLgorCiAy MDEyLTA0LTExICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgU2hhZG93IHRyZWUgVHJlZVNjb3BlIGRhdGEgaXMgbm90IHJlbW92ZWQgYnkgQ29udGFp bmVyTm9kZTo6cmVtb3ZlQWxsQ2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZmYyZWM2MzE5NjYwYjM3NDFiOGFiNmVhZmJhNmNlYzE5NjUzMmEzOC4uOWRjYjA3YjEzM2IyOGE2 ZTExY2Q4NzMzZTM3MDdjOWUwYjEwODc3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMi0wNC0xMiAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBMZWFrIGluIFdlYlNvY2tldENoYW5uZWwgd2l0aCB3b3JrZXJzL3dv cmtlci1yZWxvYWQuaHRtbCAocGFydCAyKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODM3NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHNyYy9XZWJXb3JrZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViV29ya2VyQ2xpZW50SW1wbDo6cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250 ZXh0KToKKyAgICAgICAgQ29ycmVjdGx5IHByb3BhZ2F0ZSB0aGUgcmV0dXJuIHZhbHVlIG9mIHBv c3RUYXNrRm9yTW9kZVRvV29ya2VyQ29udGV4dCgpLgorCiAyMDEyLTA0LTExICBTYWRydWwgSGFi aWIgQ2hvd2RodXJ5ICA8c2FkcnVsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1d IEFkZCBCYXR0ZXJ5IFN0YXR1cyBBUEkgc3VwcG9ydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdy YXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1RocmVhZGFibGVX ZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5jcHAKaW5kZXggNTBlN2RjMGU2MDc1Y2E2MGRm YTg0NTUxZjAzNGQ0YWNkMGJlMzNjMi4uOGVjODI1NzdjMWU0ZTY2ZGYxZTA3NDNhOTdmNTM1YjQz Mzk3MzQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1Ro cmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50 V3JhcHBlci5jcHAKQEAgLTQ1LDYgKzQ1LDcgQEAgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxD bGllbnRXcmFwcGVyOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIKICAg ICA6IG1fY29udGV4dChjb250ZXh0KQogICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9w ZWVyKDApCisgICAgLCBtX2ZhaWxlZFdlYlNvY2tldENoYW5uZWxDcmVhdGlvbihmYWxzZSkKICAg ICAsIG1fc3luY01ldGhvZERvbmUodHJ1ZSkKICAgICAsIG1fdXNlSGl4aWU3NlByb3RvY29sKHRy dWUpCiAgICAgLCBtX3NlbmRSZXF1ZXN0UmVzdWx0KFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVs OjpTZW5kRmFpbCkKQEAgLTkwLDYgKzkxLDE2IEBAIHZvaWQgVGhyZWFkYWJsZVdlYlNvY2tldENo YW5uZWxDbGllbnRXcmFwcGVyOjpjbGVhclBlZXIoKQogICAgIG1fcGVlciA9IDA7CiB9CiAKK2Jv b2wgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyOjpmYWlsZWRXZWJTb2Nr ZXRDaGFubmVsQ3JlYXRpb24oKSBjb25zdAoreworICAgIHJldHVybiBtX2ZhaWxlZFdlYlNvY2tl dENoYW5uZWxDcmVhdGlvbjsKK30KKwordm9pZCBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENs aWVudFdyYXBwZXI6OnNldEZhaWxlZFdlYlNvY2tldENoYW5uZWxDcmVhdGlvbigpCit7CisgICAg bV9mYWlsZWRXZWJTb2NrZXRDaGFubmVsQ3JlYXRpb24gPSB0cnVlOworfQorCiBib29sIFRocmVh ZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6dXNlSGl4aWU3NlByb3RvY29sKCkg Y29uc3QKIHsKICAgICByZXR1cm4gbV91c2VIaXhpZTc2UHJvdG9jb2w7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5u ZWxDbGllbnRXcmFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvVGhy ZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmgKaW5kZXggZDcxYTM4N2NjZDYw MWE4NjkxYzM0NDdkYzBjMWRiNGQ2MDNmMDlhZS4uZTdlNDg3NWNjMzQwMzNjNGVmNGM5MDA5Mjkw NmZkYjBhMDI4ZTk0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2Nr ZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENs aWVudFdyYXBwZXIuaApAQCAtNjEsNiArNjEsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRDcmVh dGVXZWJTb2NrZXRDaGFubmVsKFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpQZWVy KiwgYm9vbCB1c2VIaXhpZTc2UHJvdG9jb2wpOwogICAgIHZvaWQgY2xlYXJQZWVyKCk7CiAKKyAg ICBib29sIGZhaWxlZFdlYlNvY2tldENoYW5uZWxDcmVhdGlvbigpIGNvbnN0OworICAgIHZvaWQg c2V0RmFpbGVkV2ViU29ja2V0Q2hhbm5lbENyZWF0aW9uKCk7CisKICAgICAvLyBUaGUgdmFsdWUg b2YgdXNlSGl4aWU3NlByb3RvY29sIGZsYWcgaXMgY2FjaGFibGU7IHRoaXMgdmFsdWUgaXMgc2F2 ZWQgYWZ0ZXIgV2ViU29ja2V0Q2hhbm5lbCAob24gdGhlIG1haW4KICAgICAvLyB0aHJlYWQpIGlz IGNvbnN0cnVjdGVkLgogICAgIGJvb2wgdXNlSGl4aWU3NlByb3RvY29sKCkgY29uc3Q7CkBAIC0x MDUsNiArMTA4LDcgQEAgcHJpdmF0ZToKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBtX2Nv bnRleHQ7CiAgICAgV2ViU29ja2V0Q2hhbm5lbENsaWVudCogbV9jbGllbnQ7CiAgICAgV29ya2Vy VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OlBlZXIqIG1fcGVlcjsKKyAgICBib29sIG1fZmFp bGVkV2ViU29ja2V0Q2hhbm5lbENyZWF0aW9uOwogICAgIGJvb2wgbV9zeW5jTWV0aG9kRG9uZTsK ICAgICBib29sIG1fdXNlSGl4aWU3NlByb3RvY29sOwogICAgIC8vIFRocmVhZFNhZmVSZWZDb3Vu dGVkIG11c3Qgbm90IGhhdmUgU3RyaW5nIG1lbWJlciB2YXJpYWJsZXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tl dENoYW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dvcmtlclRo cmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmNwcAppbmRleCBkYzU0NzY0NzAzMzU0NmM0YjBhNjI0 YTBjM2U4ODRkNTk3N2FhMTFmLi41NzI1MWEzNTE3ZGVhMTYxNzhmNWYxZDFjMDNkZWM2ZmI1ODEx NGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV29ya2Vy VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2Vic29ja2V0cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTM2 MCwzNCArMzYwLDQ0IEBAIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpCcmlkZ2U6 On5CcmlkZ2UoKQogICAgIGRpc2Nvbm5lY3QoKTsKIH0KIAotY2xhc3MgV29ya2VyQ29udGV4dERp ZEluaXRpYWxpemVUYXNrIDogcHVibGljIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2sgewor Y2xhc3MgV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OldvcmtlckNvbnRleHREaWRJ bml0aWFsaXplVGFzayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrIHsKIHB1 YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNr PiBjcmVhdGUoV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OlBlZXIqIHBlZXIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdvcmtlckxvYWRlclByb3h5KiBsb2FkZXJQcm94eSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGFzc1JlZlB0cjxUaHJlYWRhYmxl V2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI+IHdvcmtlckNsaWVudFdyYXBwZXIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJv b2wgdXNlSGl4aWU3NlByb3RvY29sKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5l dyBXb3JrZXJDb250ZXh0RGlkSW5pdGlhbGl6ZVRhc2socGVlciwgd29ya2VyQ2xpZW50V3JhcHBl ciwgdXNlSGl4aWU3NlByb3RvY29sKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgV29y a2VyQ29udGV4dERpZEluaXRpYWxpemVUYXNrKHBlZXIsIGxvYWRlclByb3h5LCB3b3JrZXJDbGll bnRXcmFwcGVyLCB1c2VIaXhpZTc2UHJvdG9jb2wpKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIH5X b3JrZXJDb250ZXh0RGlkSW5pdGlhbGl6ZVRhc2soKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcGVy Zm9ybVRhc2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkgT1ZFUlJJREUKICAgICB7 CiAgICAgICAgIEFTU0VSVF9VTlVTRUQoY29udGV4dCwgY29udGV4dC0+aXNXb3JrZXJDb250ZXh0 KCkpOwotICAgICAgICBtX3dvcmtlckNsaWVudFdyYXBwZXItPmRpZENyZWF0ZVdlYlNvY2tldENo YW5uZWwobV9wZWVyLCBtX3VzZUhpeGllNzZQcm90b2NvbCk7CisgICAgICAgIGlmIChtX3dvcmtl ckNsaWVudFdyYXBwZXItPmZhaWxlZFdlYlNvY2tldENoYW5uZWxDcmVhdGlvbigpKSB7CisgICAg ICAgICAgICAvLyBJZiBCcmlkZ2U6OmluaXRpYWxpemUoKSBxdWl0dGVkIGVhcmxpZXIsIHdlIG5l ZWQgdG8ga2ljayBtYWluVGhyZWFkRGVzdHJveSgpIHRvIGRlbGV0ZSB0aGUgcGVlci4KKyAgICAg ICAgICAgIE93blB0cjxXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6UGVlcj4gcGVl ciA9IGFkb3B0UHRyKG1fcGVlcik7CisgICAgICAgICAgICBtX3BlZXIgPSAwOworICAgICAgICAg ICAgbV9sb2FkZXJQcm94eS0+cG9zdFRhc2tUb0xvYWRlcihjcmVhdGVDYWxsYmFja1Rhc2soJldv cmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjptYWluVGhyZWFkRGVzdHJveSwgcGVlci5y ZWxlYXNlKCkpKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBtX3dvcmtlckNsaWVudFdy YXBwZXItPmRpZENyZWF0ZVdlYlNvY2tldENoYW5uZWwobV9wZWVyLCBtX3VzZUhpeGllNzZQcm90 b2NvbCk7CiAgICAgfQogICAgIHZpcnR1YWwgYm9vbCBpc0NsZWFudXBUYXNrKCkgY29uc3QgT1ZF UlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiBwcml2YXRlOgogICAgIFdvcmtlckNvbnRleHREaWRJ bml0aWFsaXplVGFzayhXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6UGVlciogcGVl ciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV29ya2VyTG9hZGVyUHJveHkq IGxvYWRlclByb3h5LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQYXNzUmVm UHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcj4gd29ya2VyQ2xpZW50 V3JhcHBlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCB1c2VIaXhp ZTc2UHJvdG9jb2wpCiAgICAgICAgIDogbV9wZWVyKHBlZXIpCisgICAgICAgICwgbV9sb2FkZXJQ cm94eShsb2FkZXJQcm94eSkKICAgICAgICAgLCBtX3dvcmtlckNsaWVudFdyYXBwZXIod29ya2Vy Q2xpZW50V3JhcHBlcikKICAgICAgICAgLCBtX3VzZUhpeGllNzZQcm90b2NvbCh1c2VIaXhpZTc2 UHJvdG9jb2wpCiAgICAgewogICAgIH0KIAogICAgIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsOjpQZWVyKiBtX3BlZXI7CisgICAgV29ya2VyTG9hZGVyUHJveHkqIG1fbG9hZGVyUHJv eHk7CiAgICAgUmVmUHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcj4g bV93b3JrZXJDbGllbnRXcmFwcGVyOwogICAgIGJvb2wgbV91c2VIaXhpZTc2UHJvdG9jb2w7CiB9 OwpAQCAtNDAxLDcgKzQxMSw3IEBAIHZvaWQgV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5u ZWw6OkJyaWRnZTo6bWFpblRocmVhZEluaXRpYWxpemUoU2NyaXB0RXhlY3V0CiAKICAgICBQZWVy KiBwZWVyID0gUGVlcjo6Y3JlYXRlKGNsaWVudFdyYXBwZXIsICpsb2FkZXJQcm94eSwgY29udGV4 dCwgdGFza01vZGUpOwogICAgIGJvb2wgc2VudCA9IGxvYWRlclByb3h5LT5wb3N0VGFza0Zvck1v ZGVUb1dvcmtlckNvbnRleHQoCi0gICAgICAgIFdvcmtlckNvbnRleHREaWRJbml0aWFsaXplVGFz azo6Y3JlYXRlKHBlZXIsIGNsaWVudFdyYXBwZXIsIHBlZXItPnVzZUhpeGllNzZQcm90b2NvbCgp KSwgdGFza01vZGUpOworICAgICAgICBXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6 V29ya2VyQ29udGV4dERpZEluaXRpYWxpemVUYXNrOjpjcmVhdGUocGVlciwgbG9hZGVyUHJveHks IGNsaWVudFdyYXBwZXIsIHBlZXItPnVzZUhpeGllNzZQcm90b2NvbCgpKSwgdGFza01vZGUpOwog ICAgIGlmICghc2VudCkgewogICAgICAgICBjbGllbnRXcmFwcGVyLT5jbGVhclBlZXIoKTsKICAg ICAgICAgZGVsZXRlIHBlZXI7CkBAIC00MTksNiArNDI5LDggQEAgdm9pZCBXb3JrZXJUaHJlYWRh YmxlV2ViU29ja2V0Q2hhbm5lbDo6QnJpZGdlOjppbml0aWFsaXplKCkKICAgICB3YWl0Rm9yTWV0 aG9kQ29tcGxldGlvbigpOwogICAgIC8vIG1fcGVlciBtYXkgYmUgbnVsbCB3aGVuIHRoZSBuZXN0 ZWQgcnVubG9vcCBleGl0ZWQgYmVmb3JlIGEgcGVlciBoYXMgY3JlYXRlZC4KICAgICBtX3BlZXIg PSBtX3dvcmtlckNsaWVudFdyYXBwZXItPnBlZXIoKTsKKyAgICBpZiAoIW1fcGVlcikKKyAgICAg ICAgbV93b3JrZXJDbGllbnRXcmFwcGVyLT5zZXRGYWlsZWRXZWJTb2NrZXRDaGFubmVsQ3JlYXRp b24oKTsKIH0KIAogdm9pZCBXb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6bWFpblRo cmVhZENvbm5lY3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgUGVlciogcGVlciwg Y29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dvcmtlclRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV29ya2VyVGhyZWFk YWJsZVdlYlNvY2tldENoYW5uZWwuaAppbmRleCA3NTI5NDdhN2UzNGI2MjNlNTk3YTJkNWJjNjdm NzkzZGMwYmViMzk1Li4zYjgzNmMzOTAwNzUwNGI5MzM1ODY4ZWZiZTVkNGE3NjdhNmFkMjNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV29ya2VyVGhyZWFk YWJsZVdlYlNvY2tldENoYW5uZWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNv Y2tldHMvV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuaApAQCAtMTgxLDYgKzE4MSw4 IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgbWFpblRocmVhZFN1c3BlbmQoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCosIFBlZXIqKTsKICAgICBzdGF0aWMgdm9pZCBtYWluVGhyZWFkUmVzdW1l KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQZWVyKik7CiAKKyAgICBjbGFzcyBXb3JrZXJDb250 ZXh0RGlkSW5pdGlhbGl6ZVRhc2s7CisKICAgICBSZWZQdHI8V29ya2VyQ29udGV4dD4gbV93b3Jr ZXJDb250ZXh0OwogICAgIFJlZlB0cjxUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdy YXBwZXI+IG1fd29ya2VyQ2xpZW50V3JhcHBlcjsKICAgICBSZWZQdHI8QnJpZGdlPiBtX2JyaWRn ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1w bC5jcHAKaW5kZXggNDQ4MWFjOWQ4ZTRlYjk1NjI4ZGE5MWM4MzdjOTk5NjllZjBjYmZhOS4uN2Ri NTQ0NTFhMGMyN2QwNDAwNzYwYTVlMDVkNzA1YmY2NDQ1ODRjZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1wbC5jcHAKQEAgLTE1MSw4ICsx NTEsNyBAQCB2b2lkIFdlYldvcmtlckNsaWVudEltcGw6OnBvc3RUYXNrVG9Mb2FkZXIoUGFzc093 blB0cjxTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYQogCiBib29sIFdlYldvcmtlckNsaWVudElt cGw6OnBvc3RUYXNrRm9yTW9kZVRvV29ya2VyQ29udGV4dChQYXNzT3duUHRyPFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OlRhc2s+IHRhc2ssIGNvbnN0IFN0cmluZyYgbW9kZSkKIHsKLSAgICBtX3By b3h5LT5wb3N0VGFza0Zvck1vZGVUb1dvcmtlckNvbnRleHQodGFzaywgbW9kZSk7Ci0gICAgcmV0 dXJuIHRydWU7CisgICAgcmV0dXJuIG1fcHJveHktPnBvc3RUYXNrRm9yTW9kZVRvV29ya2VyQ29u dGV4dCh0YXNrLCBtb2RlKTsKIH0KIAogdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBsOjpwb3N0TWVz c2FnZVRvV29ya2VyT2JqZWN0KFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB2YWx1 ZSwgUGFzc093blB0cjxNZXNzYWdlUG9ydENoYW5uZWxBcnJheT4gcG9ydHMpCg==