140992 2015-01-28 00:49:49 -0800 Fix MediaPlayerEngine leaks 2019-01-15 17:11:00 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue eric.carlson jeremyj-wk jer.noble kling oldest_to_newest 1064840 0 darin 2015-01-28 00:49:49 -0800 Fix MediaPlayerEngine leaks 1064841 1 245523 darin 2015-01-28 00:51:38 -0800 Created attachment 245523 Patch 1064846 2 commit-queue 2015-01-28 00:58:10 -0800 Attachment 245523 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. 1064847 3 245523 jer.noble 2015-01-28 01:00:08 -0800 Comment on attachment 245523 Patch R=me, but CQ will fail with the "no new tests" line in the ChangeLog. 1064850 4 darin 2015-01-28 01:22:01 -0800 Committed r179246: <http://trac.webkit.org/changeset/179246> 245523 2015-01-28 00:51:38 -0800 2019-01-15 17:11:00 -0800 Patch bug-140992-20150128005143.patch text/plain 14211 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFiZWNhNTUyZWFhNDNi YTQ3NzJhMmRlNmQxOWVjOGU3ZTFjN2E1OS4uOTdjZjFmODVhOTZkZmZlOGMwMDIzOGU3MTRjZjZm MWQ0NDAzMDE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAxLTI4ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggTWVkaWFQbGF5ZXJFbmdp bmUgbGVha3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MDk5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bXV0YWJsZUluc3RhbGxlZE1lZGlhRW5n aW5lc1ZlY3Rvcik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRNZWRpYUVuZ2luZXNW ZWN0b3IpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6Omluc3RhbGxlZE1lZGlhRW5naW5lcyk6 IENoYW5nZWQgdGhpcyB0byBiZSBhIHZlY3RvciBvZiBmYWN0b3JpZXMKKyAgICAgICAgaW5zdGVh ZCBvZiBhIHZlY3RvciBvZiBoZWFwLWFsbG9jYXRlZCBmYWN0b3JpZXMuIFRoZSBvbGQgY29kZSB3 b3VsZCBsZWFrCisgICAgICAgIGFsbCB0aGUgZmFjdG9yaWVzIHdoZW4gdGhpcyB3YXMgY2FsbGVk IHdpdGggdGhlIFJlc2V0RW5naW5lcyBvcHRpb24uCisgICAgICAgIChXZWJDb3JlOjphZGRNZWRp YUVuZ2luZSk6IFVwZGF0ZWQgZm9yIGFib3ZlIGNoYW5nZS4KKyAgICAgICAgKFdlYkNvcmU6OmJl c3RNZWRpYUVuZ2luZUZvclN1cHBvcnRQYXJhbWV0ZXJzKTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpuZXh0TWVkaWFFbmdpbmUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpuZXh0QmVzdE1lZGlhRW5naW5lKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllcjo6bG9hZFdpdGhOZXh0TWVkaWFFbmdpbmUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyOjpnZXRTdXBwb3J0ZWRUeXBlcyk6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXI6OmdldFNpdGVzSW5NZWRpYUNhY2hlKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllcjo6Y2xlYXJNZWRpYUNhY2hlKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllcjo6Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OnN1cHBvcnRzS2V5U3lzdGVtKTogRGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6cmVzZXRNZWRpYUVuZ2luZXMpOiBEaXR0by4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oOiBEaXR0by4KKwogMjAx NS0wMS0yNyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBN b3JlIGJ1aWxkIGZpeGVzIGZvciBuZXdlciBjbGFuZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAppbmRleCBjMTQ0NzJlNmM2NTY5ZWYxYmVj Nzc3MTNiMWIxNDUwY2Q0ODY3YTJkLi4xZTk4NmE3YzdmOTNmZmU5MjVhNjc3MjBiM2E4ODJiMzlk YzkyMTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRp YVBsYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQ bGF5ZXIuY3BwCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRl LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1UaW1lUmFuZ2VzLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3Mu aCIKKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCkBAIC0xNTMsMjAgKzE1NCw2IEBA IHN0YXRpYyBQYXNzT3duUHRyPE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZT4gY3JlYXRlTnVs bE1lZGlhUGxheWVyKE1lZGlhUGxheWVyCiAvLyBlbmdpbmUgc3VwcG9ydAogCiBzdHJ1Y3QgTWVk aWFQbGF5ZXJGYWN0b3J5IHsKLSAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShNZWRpYVBsYXllckZh Y3RvcnkpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBNZWRpYVBsYXll ckZhY3RvcnkoQ3JlYXRlTWVkaWFFbmdpbmVQbGF5ZXIgY29uc3RydWN0b3IsIE1lZGlhRW5naW5l U3VwcG9ydGVkVHlwZXMgZ2V0U3VwcG9ydGVkVHlwZXMsIE1lZGlhRW5naW5lU3VwcG9ydHNUeXBl IHN1cHBvcnRzVHlwZUFuZENvZGVjcywKLSAgICAgICAgTWVkaWFFbmdpbmVHZXRTaXRlc0luTWVk aWFDYWNoZSBnZXRTaXRlc0luTWVkaWFDYWNoZSwgTWVkaWFFbmdpbmVDbGVhck1lZGlhQ2FjaGUg Y2xlYXJNZWRpYUNhY2hlLCBNZWRpYUVuZ2luZUNsZWFyTWVkaWFDYWNoZUZvclNpdGUgY2xlYXJN ZWRpYUNhY2hlRm9yU2l0ZSwgTWVkaWFFbmdpbmVTdXBwb3J0c0tleVN5c3RlbSBzdXBwb3J0c0tl eVN5c3RlbSkKLSAgICAgICAgOiBjb25zdHJ1Y3Rvcihjb25zdHJ1Y3RvcikKLSAgICAgICAgLCBn ZXRTdXBwb3J0ZWRUeXBlcyhnZXRTdXBwb3J0ZWRUeXBlcykKLSAgICAgICAgLCBzdXBwb3J0c1R5 cGVBbmRDb2RlY3Moc3VwcG9ydHNUeXBlQW5kQ29kZWNzKQotICAgICAgICAsIGdldFNpdGVzSW5N ZWRpYUNhY2hlKGdldFNpdGVzSW5NZWRpYUNhY2hlKQotICAgICAgICAsIGNsZWFyTWVkaWFDYWNo ZShjbGVhck1lZGlhQ2FjaGUpCi0gICAgICAgICwgY2xlYXJNZWRpYUNhY2hlRm9yU2l0ZShjbGVh ck1lZGlhQ2FjaGVGb3JTaXRlKQotICAgICAgICAsIHN1cHBvcnRzS2V5U3lzdGVtKHN1cHBvcnRz S2V5U3lzdGVtKQotICAgIHsKLSAgICB9Ci0KICAgICBDcmVhdGVNZWRpYUVuZ2luZVBsYXllciBj b25zdHJ1Y3RvcjsKICAgICBNZWRpYUVuZ2luZVN1cHBvcnRlZFR5cGVzIGdldFN1cHBvcnRlZFR5 cGVzOwogICAgIE1lZGlhRW5naW5lU3VwcG9ydHNUeXBlIHN1cHBvcnRzVHlwZUFuZENvZGVjczsK QEAgLTE3OCwyNiArMTY1LDE2IEBAIHB1YmxpYzoKIAogc3RhdGljIHZvaWQgYWRkTWVkaWFFbmdp bmUoQ3JlYXRlTWVkaWFFbmdpbmVQbGF5ZXIsIE1lZGlhRW5naW5lU3VwcG9ydGVkVHlwZXMsIE1l ZGlhRW5naW5lU3VwcG9ydHNUeXBlLCBNZWRpYUVuZ2luZUdldFNpdGVzSW5NZWRpYUNhY2hlLCBN ZWRpYUVuZ2luZUNsZWFyTWVkaWFDYWNoZSwgTWVkaWFFbmdpbmVDbGVhck1lZGlhQ2FjaGVGb3JT aXRlLCBNZWRpYUVuZ2luZVN1cHBvcnRzS2V5U3lzdGVtKTsKIAotc3RhdGljIE1lZGlhUGxheWVy RmFjdG9yeSogYmVzdE1lZGlhRW5naW5lRm9yU3VwcG9ydFBhcmFtZXRlcnMoY29uc3QgTWVkaWFF bmdpbmVTdXBwb3J0UGFyYW1ldGVycyYsIE1lZGlhUGxheWVyRmFjdG9yeSogY3VycmVudCA9IDAp Owotc3RhdGljIE1lZGlhUGxheWVyRmFjdG9yeSogbmV4dE1lZGlhRW5naW5lKE1lZGlhUGxheWVy RmFjdG9yeSogY3VycmVudCk7CitzdGF0aWMgYm9vbCBoYXZlTWVkaWFFbmdpbmVzVmVjdG9yOwog Ci1lbnVtIFJlcXVlcnlFbmdpbmVPcHRpb25zIHsgRG9Ob3RSZXNldEVuZ2luZXMsIFJlc2V0RW5n aW5lcyB9Owotc3RhdGljIFZlY3RvcjxNZWRpYVBsYXllckZhY3RvcnkqPiYgaW5zdGFsbGVkTWVk aWFFbmdpbmVzKFJlcXVlcnlFbmdpbmVPcHRpb25zIHJlcXVlcnlGbGFncyA9IERvTm90UmVzZXRF bmdpbmVzICkKK3N0YXRpYyBWZWN0b3I8TWVkaWFQbGF5ZXJGYWN0b3J5PiYgbXV0YWJsZUluc3Rh bGxlZE1lZGlhRW5naW5lc1ZlY3RvcigpCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElD X0xPQ0FMKFZlY3RvcjxNZWRpYVBsYXllckZhY3RvcnkqPiwgaW5zdGFsbGVkRW5naW5lcywgKCkp OwotICAgIHN0YXRpYyBib29sIGVuZ2luZXNRdWVyaWVkID0gZmFsc2U7Ci0KLSAgICBpZiAocmVx dWVyeUZsYWdzID09IFJlc2V0RW5naW5lcykgewotICAgICAgICBpbnN0YWxsZWRFbmdpbmVzLmNs ZWFyKCk7Ci0gICAgICAgIGVuZ2luZXNRdWVyaWVkID0gZmFsc2U7Ci0gICAgICAgIHJldHVybiBp bnN0YWxsZWRFbmdpbmVzOwotICAgIH0KLQotICAgIGlmIChlbmdpbmVzUXVlcmllZCkKLSAgICAg ICAgcmV0dXJuIGluc3RhbGxlZEVuZ2luZXM7Ci0KLSAgICBlbmdpbmVzUXVlcmllZCA9IHRydWU7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxNZWRpYVBsYXllckZhY3Rvcnk+PiBp bnN0YWxsZWRFbmdpbmVzOworICAgIHJldHVybiBpbnN0YWxsZWRFbmdpbmVzOworfQogCitzdGF0 aWMgdm9pZCBidWlsZE1lZGlhRW5naW5lc1ZlY3RvcigpCit7CiAjaWYgVVNFKEFWRk9VTkRBVElP TikKICAgICBpZiAoU2V0dGluZ3M6OmlzQVZGb3VuZGF0aW9uRW5hYmxlZCgpKSB7CiAjaWYgUExB VEZPUk0oQ09DT0EpCkBAIC0yMjAsNyArMTk3LDE0IEBAIHN0YXRpYyBWZWN0b3I8TWVkaWFQbGF5 ZXJGYWN0b3J5Kj4mIGluc3RhbGxlZE1lZGlhRW5naW5lcyhSZXF1ZXJ5RW5naW5lT3B0aW9ucyBy CiAgICAgUGxhdGZvcm1NZWRpYUVuZ2luZUNsYXNzTmFtZTo6cmVnaXN0ZXJNZWRpYUVuZ2luZShh ZGRNZWRpYUVuZ2luZSk7CiAjZW5kaWYKIAotICAgIHJldHVybiBpbnN0YWxsZWRFbmdpbmVzOwor ICAgIGhhdmVNZWRpYUVuZ2luZXNWZWN0b3IgPSB0cnVlOworfQorCitzdGF0aWMgY29uc3QgVmVj dG9yPE1lZGlhUGxheWVyRmFjdG9yeT4mIGluc3RhbGxlZE1lZGlhRW5naW5lcygpCit7CisgICAg aWYgKCFoYXZlTWVkaWFFbmdpbmVzVmVjdG9yKQorICAgICAgICBidWlsZE1lZGlhRW5naW5lc1Zl Y3RvcigpOworICAgIHJldHVybiBtdXRhYmxlSW5zdGFsbGVkTWVkaWFFbmdpbmVzVmVjdG9yKCk7 CiB9CiAKIHN0YXRpYyB2b2lkIGFkZE1lZGlhRW5naW5lKENyZWF0ZU1lZGlhRW5naW5lUGxheWVy IGNvbnN0cnVjdG9yLCBNZWRpYUVuZ2luZVN1cHBvcnRlZFR5cGVzIGdldFN1cHBvcnRlZFR5cGVz LCBNZWRpYUVuZ2luZVN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUsCkBAIC0yMzAsNyArMjE0LDcg QEAgc3RhdGljIHZvaWQgYWRkTWVkaWFFbmdpbmUoQ3JlYXRlTWVkaWFFbmdpbmVQbGF5ZXIgY29u c3RydWN0b3IsIE1lZGlhRW5naW5lU3VwcG8KICAgICBBU1NFUlQoZ2V0U3VwcG9ydGVkVHlwZXMp OwogICAgIEFTU0VSVChzdXBwb3J0c1R5cGUpOwogCi0gICAgaW5zdGFsbGVkTWVkaWFFbmdpbmVz KCkuYXBwZW5kKG5ldyBNZWRpYVBsYXllckZhY3RvcnkoY29uc3RydWN0b3IsIGdldFN1cHBvcnRl ZFR5cGVzLCBzdXBwb3J0c1R5cGUsIGdldFNpdGVzSW5NZWRpYUNhY2hlLCBjbGVhck1lZGlhQ2Fj aGUsIGNsZWFyTWVkaWFDYWNoZUZvclNpdGUsIHN1cHBvcnRzS2V5U3lzdGVtKSk7CisgICAgbXV0 YWJsZUluc3RhbGxlZE1lZGlhRW5naW5lc1ZlY3RvcigpLmFwcGVuZChNZWRpYVBsYXllckZhY3Rv cnkgeyBjb25zdHJ1Y3RvciwgZ2V0U3VwcG9ydGVkVHlwZXMsIHN1cHBvcnRzVHlwZSwgZ2V0U2l0 ZXNJbk1lZGlhQ2FjaGUsIGNsZWFyTWVkaWFDYWNoZSwgY2xlYXJNZWRpYUNhY2hlRm9yU2l0ZSwg c3VwcG9ydHNLZXlTeXN0ZW0gfSk7CiB9CiAKIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGFw cGxpY2F0aW9uT2N0ZXRTdHJlYW0oKQpAQCAtMjUxLDU2ICsyMzUsNTEgQEAgc3RhdGljIGNvbnN0 IEF0b21pY1N0cmluZyYgY29kZWNzKCkKICAgICByZXR1cm4gY29kZWNzOwogfQogCi1zdGF0aWMg TWVkaWFQbGF5ZXJGYWN0b3J5KiBiZXN0TWVkaWFFbmdpbmVGb3JTdXBwb3J0UGFyYW1ldGVycyhj b25zdCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBNZWRpYVBsYXll ckZhY3RvcnkqIGN1cnJlbnQpCitzdGF0aWMgY29uc3QgTWVkaWFQbGF5ZXJGYWN0b3J5KiBiZXN0 TWVkaWFFbmdpbmVGb3JTdXBwb3J0UGFyYW1ldGVycyhjb25zdCBNZWRpYUVuZ2luZVN1cHBvcnRQ YXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBjb25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQg PSBudWxscHRyKQogewogICAgIGlmIChwYXJhbWV0ZXJzLnR5cGUuaXNFbXB0eSgpKQotICAgICAg ICByZXR1cm4gMDsKLQotICAgIFZlY3RvcjxNZWRpYVBsYXllckZhY3RvcnkqPiYgZW5naW5lcyA9 IGluc3RhbGxlZE1lZGlhRW5naW5lcygpOwotICAgIGlmIChlbmdpbmVzLmlzRW1wdHkoKSkKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgLy8gNC44LjEw LjMgTUlNRSB0eXBlcyAtIEluIHRoZSBhYnNlbmNlIG9mIGEgc3BlY2lmaWNhdGlvbiB0byB0aGUg Y29udHJhcnksIHRoZSBNSU1FIHR5cGUgImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSIgCisgICAg Ly8gNC44LjEwLjMgTUlNRSB0eXBlcyAtIEluIHRoZSBhYnNlbmNlIG9mIGEgc3BlY2lmaWNhdGlv biB0byB0aGUgY29udHJhcnksIHRoZSBNSU1FIHR5cGUgImFwcGxpY2F0aW9uL29jdGV0LXN0cmVh bSIKICAgICAvLyB3aGVuIHVzZWQgd2l0aCBwYXJhbWV0ZXJzLCBlLmcuICJhcHBsaWNhdGlvbi9v Y3RldC1zdHJlYW07Y29kZWNzPXRoZW9yYSIsIGlzIGEgdHlwZSB0aGF0IHRoZSB1c2VyIGFnZW50 IGtub3dzIAogICAgIC8vIGl0IGNhbm5vdCByZW5kZXIuCiAgICAgaWYgKHBhcmFtZXRlcnMudHlw ZSA9PSBhcHBsaWNhdGlvbk9jdGV0U3RyZWFtKCkpIHsKICAgICAgICAgaWYgKCFwYXJhbWV0ZXJz LmNvZGVjcy5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIH0KIAotICAgIE1lZGlhUGxheWVyRmFjdG9yeSogZW5naW5lID0g MDsKKyAgICBjb25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGZvdW5kRW5naW5lID0gbnVsbHB0cjsK ICAgICBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIHN1cHBvcnRlZCA9IE1lZGlhUGxheWVyOjpJ c05vdFN1cHBvcnRlZDsKLSAgICB1bnNpZ25lZCBjb3VudCA9IGVuZ2luZXMuc2l6ZSgpOwotICAg IGZvciAodW5zaWduZWQgbmR4ID0gMDsgbmR4IDwgY291bnQ7IG5keCsrKSB7CisgICAgZm9yIChh dXRvJiBlbmdpbmUgOiBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKSkgewogICAgICAgICBpZiAoY3Vy cmVudCkgewotICAgICAgICAgICAgaWYgKGN1cnJlbnQgPT0gZW5naW5lc1tuZHhdKQotICAgICAg ICAgICAgICAgIGN1cnJlbnQgPSAwOworICAgICAgICAgICAgaWYgKGN1cnJlbnQgPT0gJmVuZ2lu ZSkKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbnVsbHB0cjsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9Ci0gICAgICAgIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgZW5naW5l U3VwcG9ydCA9IGVuZ2luZXNbbmR4XS0+c3VwcG9ydHNUeXBlQW5kQ29kZWNzKHBhcmFtZXRlcnMp OworICAgICAgICBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIGVuZ2luZVN1cHBvcnQgPSBlbmdp bmUuc3VwcG9ydHNUeXBlQW5kQ29kZWNzKHBhcmFtZXRlcnMpOwogICAgICAgICBpZiAoZW5naW5l U3VwcG9ydCA+IHN1cHBvcnRlZCkgewogICAgICAgICAgICAgc3VwcG9ydGVkID0gZW5naW5lU3Vw cG9ydDsKLSAgICAgICAgICAgIGVuZ2luZSA9IGVuZ2luZXNbbmR4XTsKKyAgICAgICAgICAgIGZv dW5kRW5naW5lID0gJmVuZ2luZTsKICAgICAgICAgfQogICAgIH0KIAotICAgIHJldHVybiBlbmdp bmU7CisgICAgcmV0dXJuIGZvdW5kRW5naW5lOwogfQogCi1zdGF0aWMgTWVkaWFQbGF5ZXJGYWN0 b3J5KiBuZXh0TWVkaWFFbmdpbmUoTWVkaWFQbGF5ZXJGYWN0b3J5KiBjdXJyZW50KQorc3RhdGlj IGNvbnN0IE1lZGlhUGxheWVyRmFjdG9yeSogbmV4dE1lZGlhRW5naW5lKGNvbnN0IE1lZGlhUGxh eWVyRmFjdG9yeSogY3VycmVudCkKIHsKLSAgICBWZWN0b3I8TWVkaWFQbGF5ZXJGYWN0b3J5Kj4m IGVuZ2luZXMgPSBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKTsKKyAgICBhdXRvJiBlbmdpbmVzID0g aW5zdGFsbGVkTWVkaWFFbmdpbmVzKCk7CiAgICAgaWYgKGVuZ2luZXMuaXNFbXB0eSgpKQotICAg ICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBpZiAoIWN1cnJl bnQpIAotICAgICAgICByZXR1cm4gZW5naW5lcy5maXJzdCgpOworICAgICAgICByZXR1cm4gJmVu Z2luZXMuZmlyc3QoKTsKIAotICAgIHNpemVfdCBjdXJyZW50SW5kZXggPSBlbmdpbmVzLmZpbmQo Y3VycmVudCk7Ci0gICAgaWYgKGN1cnJlbnRJbmRleCA9PSBXVEY6Om5vdEZvdW5kIHx8IGN1cnJl bnRJbmRleCArIDEgPj0gZW5naW5lcy5zaXplKCkpIAotICAgICAgICByZXR1cm4gMDsKKyAgICBz aXplX3QgY3VycmVudEluZGV4ID0gY3VycmVudCAtICZlbmdpbmVzLmZpcnN0KCk7CisgICAgaWYg KGN1cnJlbnRJbmRleCArIDEgPj0gZW5naW5lcy5zaXplKCkpCisgICAgICAgIHJldHVybiBudWxs cHRyOwogCi0gICAgcmV0dXJuIGVuZ2luZXNbY3VycmVudEluZGV4ICsgMV07CisgICAgcmV0dXJu ICZlbmdpbmVzW2N1cnJlbnRJbmRleCArIDFdOwogfQogCiAvLyBtZWRpYSBwbGF5ZXIKQEAgLTM3 NCw3ICszNTMsNyBAQCBib29sIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IFVSTCYgdXJsLCBjb25z dCBDb250ZW50VHlwZSYgY29udGVudFR5cGUsIE1lZGlhU291cgogfQogI2VuZGlmCiAKLU1lZGlh UGxheWVyRmFjdG9yeSogTWVkaWFQbGF5ZXI6Om5leHRCZXN0TWVkaWFFbmdpbmUoTWVkaWFQbGF5 ZXJGYWN0b3J5KiBjdXJyZW50KSBjb25zdAorY29uc3QgTWVkaWFQbGF5ZXJGYWN0b3J5KiBNZWRp YVBsYXllcjo6bmV4dEJlc3RNZWRpYUVuZ2luZShjb25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGN1 cnJlbnQpIGNvbnN0CiB7CiAgICAgTWVkaWFFbmdpbmVTdXBwb3J0UGFyYW1ldGVycyBwYXJhbWV0 ZXJzOwogICAgIHBhcmFtZXRlcnMudHlwZSA9IG1fY29udGVudE1JTUVUeXBlOwpAQCAtMzkwLDkg KzM2OSw5IEBAIE1lZGlhUGxheWVyRmFjdG9yeSogTWVkaWFQbGF5ZXI6Om5leHRCZXN0TWVkaWFF bmdpbmUoTWVkaWFQbGF5ZXJGYWN0b3J5KiBjdXJyZW50CiAgICAgcmV0dXJuIGJlc3RNZWRpYUVu Z2luZUZvclN1cHBvcnRQYXJhbWV0ZXJzKHBhcmFtZXRlcnMsIGN1cnJlbnQpOwogfQogCi12b2lk IE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZShNZWRpYVBsYXllckZhY3Rvcnkq IGN1cnJlbnQpCit2b2lkIE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZShjb25z dCBNZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQpCiB7Ci0gICAgTWVkaWFQbGF5ZXJGYWN0b3J5 KiBlbmdpbmUgPSAwOworICAgIGNvbnN0IE1lZGlhUGxheWVyRmFjdG9yeSogZW5naW5lID0gbnVs bHB0cjsKIAogICAgIGlmICghbV9jb250ZW50TUlNRVR5cGUuaXNFbXB0eSgpKQogICAgICAgICBl bmdpbmUgPSBuZXh0QmVzdE1lZGlhRW5naW5lKGN1cnJlbnQpOwpAQCAtNzgyLDcgKzc2MSw3IEBA IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1cHBvcnRzVHlwZShjb25z dCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJhCiAgICAgaWYgKHBhcmFtZXRlcnMudHlwZSA9PSBhcHBs aWNhdGlvbk9jdGV0U3RyZWFtKCkpCiAgICAgICAgIHJldHVybiBJc05vdFN1cHBvcnRlZDsKIAot ICAgIE1lZGlhUGxheWVyRmFjdG9yeSogZW5naW5lID0gYmVzdE1lZGlhRW5naW5lRm9yU3VwcG9y dFBhcmFtZXRlcnMocGFyYW1ldGVycyk7CisgICAgY29uc3QgTWVkaWFQbGF5ZXJGYWN0b3J5KiBl bmdpbmUgPSBiZXN0TWVkaWFFbmdpbmVGb3JTdXBwb3J0UGFyYW1ldGVycyhwYXJhbWV0ZXJzKTsK ICAgICBpZiAoIWVuZ2luZSkKICAgICAgICAgcmV0dXJuIElzTm90U3VwcG9ydGVkOwogCkBAIC04 MDgsMTMgKzc4Nyw4IEBAIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1 cHBvcnRzVHlwZShjb25zdCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJhCiAKIHZvaWQgTWVkaWFQbGF5 ZXI6OmdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3RyaW5nPiYgdHlwZXMpCiB7Ci0gICAgVmVj dG9yPE1lZGlhUGxheWVyRmFjdG9yeSo+JiBlbmdpbmVzID0gaW5zdGFsbGVkTWVkaWFFbmdpbmVz KCk7Ci0gICAgaWYgKGVuZ2luZXMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICB1 bnNpZ25lZCBjb3VudCA9IGVuZ2luZXMuc2l6ZSgpOwotICAgIGZvciAodW5zaWduZWQgbmR4ID0g MDsgbmR4IDwgY291bnQ7IG5keCsrKQotICAgICAgICBlbmdpbmVzW25keF0tPmdldFN1cHBvcnRl ZFR5cGVzKHR5cGVzKTsKKyAgICBmb3IgKGF1dG8mIGVuZ2luZSA6IGluc3RhbGxlZE1lZGlhRW5n aW5lcygpKQorICAgICAgICBlbmdpbmUuZ2V0U3VwcG9ydGVkVHlwZXModHlwZXMpOwogfSAKIAog Ym9vbCBNZWRpYVBsYXllcjo6aXNBdmFpbGFibGUoKQpAQCAtOTY2LDQxICs5NDAsMzUgQEAgdm9p ZCBNZWRpYVBsYXllcjo6cmVsb2FkVGltZXJGaXJlZCgpCiAKIHZvaWQgTWVkaWFQbGF5ZXI6Omdl dFNpdGVzSW5NZWRpYUNhY2hlKFZlY3RvcjxTdHJpbmc+JiBzaXRlcykKIHsKLSAgICBWZWN0b3I8 TWVkaWFQbGF5ZXJGYWN0b3J5Kj4mIGVuZ2luZXMgPSBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKTsK LSAgICB1bnNpZ25lZCBzaXplID0gZW5naW5lcy5zaXplKCk7Ci0gICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBpZiAoIWVuZ2luZXNbaV0tPmdldFNpdGVz SW5NZWRpYUNhY2hlKQorICAgIGZvciAoYXV0byYgZW5naW5lIDogaW5zdGFsbGVkTWVkaWFFbmdp bmVzKCkpIHsKKyAgICAgICAgaWYgKCFlbmdpbmUuZ2V0U2l0ZXNJbk1lZGlhQ2FjaGUpCiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgVmVjdG9yPFN0cmluZz4gZW5naW5lU2l0ZXM7Ci0g ICAgICAgIGVuZ2luZXNbaV0tPmdldFNpdGVzSW5NZWRpYUNhY2hlKGVuZ2luZVNpdGVzKTsKKyAg ICAgICAgZW5naW5lLmdldFNpdGVzSW5NZWRpYUNhY2hlKGVuZ2luZVNpdGVzKTsKICAgICAgICAg c2l0ZXMuYXBwZW5kVmVjdG9yKGVuZ2luZVNpdGVzKTsKICAgICB9CiB9CiAKIHZvaWQgTWVkaWFQ bGF5ZXI6OmNsZWFyTWVkaWFDYWNoZSgpCiB7Ci0gICAgVmVjdG9yPE1lZGlhUGxheWVyRmFjdG9y eSo+JiBlbmdpbmVzID0gaW5zdGFsbGVkTWVkaWFFbmdpbmVzKCk7Ci0gICAgdW5zaWduZWQgc2l6 ZSA9IGVuZ2luZXMuc2l6ZSgpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXplOyBp KyspIHsKLSAgICAgICAgaWYgKGVuZ2luZXNbaV0tPmNsZWFyTWVkaWFDYWNoZSkKLSAgICAgICAg ICAgIGVuZ2luZXNbaV0tPmNsZWFyTWVkaWFDYWNoZSgpOworICAgIGZvciAoYXV0byYgZW5naW5l IDogaW5zdGFsbGVkTWVkaWFFbmdpbmVzKCkpIHsKKyAgICAgICAgaWYgKGVuZ2luZS5jbGVhck1l ZGlhQ2FjaGUpCisgICAgICAgICAgICBlbmdpbmUuY2xlYXJNZWRpYUNhY2hlKCk7CiAgICAgfQog fQogCiB2b2lkIE1lZGlhUGxheWVyOjpjbGVhck1lZGlhQ2FjaGVGb3JTaXRlKGNvbnN0IFN0cmlu ZyYgc2l0ZSkKIHsKLSAgICBWZWN0b3I8TWVkaWFQbGF5ZXJGYWN0b3J5Kj4mIGVuZ2luZXMgPSBp bnN0YWxsZWRNZWRpYUVuZ2luZXMoKTsKLSAgICB1bnNpZ25lZCBzaXplID0gZW5naW5lcy5zaXpl KCk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBp ZiAoZW5naW5lc1tpXS0+Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZSkKLSAgICAgICAgICAgIGVuZ2lu ZXNbaV0tPmNsZWFyTWVkaWFDYWNoZUZvclNpdGUoc2l0ZSk7CisgICAgZm9yIChhdXRvJiBlbmdp bmUgOiBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKSkgeworICAgICAgICBpZiAoZW5naW5lLmNsZWFy TWVkaWFDYWNoZUZvclNpdGUpCisgICAgICAgICAgICBlbmdpbmUuY2xlYXJNZWRpYUNhY2hlRm9y U2l0ZShzaXRlKTsKICAgICB9CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXI6OnN1cHBvcnRzS2V5U3lz dGVtKGNvbnN0IFN0cmluZyYga2V5U3lzdGVtLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogewog ICAgIGZvciAoYXV0byYgZW5naW5lIDogaW5zdGFsbGVkTWVkaWFFbmdpbmVzKCkpIHsKLSAgICAg ICAgaWYgKGVuZ2luZS0+c3VwcG9ydHNLZXlTeXN0ZW0gJiYgZW5naW5lLT5zdXBwb3J0c0tleVN5 c3RlbShrZXlTeXN0ZW0sIG1pbWVUeXBlKSkKKyAgICAgICAgaWYgKGVuZ2luZS5zdXBwb3J0c0tl eVN5c3RlbSAmJiBlbmdpbmUuc3VwcG9ydHNLZXlTeXN0ZW0oa2V5U3lzdGVtLCBtaW1lVHlwZSkp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAt MTI0OCw3ICsxMjE2LDggQEAgUGFzc1JlZlB0cjxQbGF0Zm9ybVRleHRUcmFja01lbnVJbnRlcmZh Y2U+IE1lZGlhUGxheWVyOjp0ZXh0VHJhY2tNZW51KCkKIAogdm9pZCBNZWRpYVBsYXllcjo6cmVz ZXRNZWRpYUVuZ2luZXMoKQogewotICAgIGluc3RhbGxlZE1lZGlhRW5naW5lcyhSZXNldEVuZ2lu ZXMpOworICAgIG11dGFibGVJbnN0YWxsZWRNZWRpYUVuZ2luZXNWZWN0b3IoKS5jbGVhcigpOwor ICAgIGhhdmVNZWRpYUVuZ2luZXNWZWN0b3IgPSBmYWxzZTsKIH0KIAogI2lmIFVTRShHU1RSRUFN RVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApp bmRleCAzYjk0NjNlYzczNDZkMzViNTkwOTYzNDljNGRhYzdlODk5NTYxMmU5Li4yZjgzYWMyYjg0 YmNmMzA2YjQ4NzU2N2Y4ODE2Yzk1NWQwZmYwODQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKQEAgLTEzMSw5ICsxMzEsMTAgQEAgY2xhc3Mg R3JhcGhpY3NDb250ZXh0M0Q7CiBjbGFzcyBJbnRSZWN0OwogY2xhc3MgSW50U2l6ZTsKIGNsYXNz IE1lZGlhUGxheWVyOwotc3RydWN0IE1lZGlhUGxheWVyRmFjdG9yeTsKIGNsYXNzIFBsYXRmb3Jt VGltZVJhbmdlczsKIAorc3RydWN0IE1lZGlhUGxheWVyRmFjdG9yeTsKKwogI2lmIFBMQVRGT1JN KFdJTikgJiYgVVNFKEFWRk9VTkRBVElPTikKIHN0cnVjdCBHcmFwaGljc0RldmljZUFkYXB0ZXI7 CiAjZW5kaWYKQEAgLTU4MSw4ICs1ODIsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgTWVk aWFQbGF5ZXIoTWVkaWFQbGF5ZXJDbGllbnQmKTsKLSAgICBNZWRpYVBsYXllckZhY3RvcnkqIG5l eHRCZXN0TWVkaWFFbmdpbmUoTWVkaWFQbGF5ZXJGYWN0b3J5KikgY29uc3Q7Ci0gICAgdm9pZCBs b2FkV2l0aE5leHRNZWRpYUVuZ2luZShNZWRpYVBsYXllckZhY3RvcnkqKTsKKyAgICBjb25zdCBN ZWRpYVBsYXllckZhY3RvcnkqIG5leHRCZXN0TWVkaWFFbmdpbmUoY29uc3QgTWVkaWFQbGF5ZXJG YWN0b3J5KikgY29uc3Q7CisgICAgdm9pZCBsb2FkV2l0aE5leHRNZWRpYUVuZ2luZShjb25zdCBN ZWRpYVBsYXllckZhY3RvcnkqKTsKICAgICB2b2lkIHJlbG9hZFRpbWVyRmlyZWQoKTsKIAogICAg IHN0YXRpYyB2b2lkIGluaXRpYWxpemVNZWRpYUVuZ2luZXMoKTsKQEAgLTU5MCw3ICs1OTEsNyBA QCBwcml2YXRlOgogICAgIE1lZGlhUGxheWVyQ2xpZW50JiBtX2NsaWVudDsKICAgICBUaW1lciBt X3JlbG9hZFRpbWVyOwogICAgIE93blB0cjxNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U+IG1f cHJpdmF0ZTsKLSAgICBNZWRpYVBsYXllckZhY3RvcnkqIG1fY3VycmVudE1lZGlhRW5naW5lOwor ICAgIGNvbnN0IE1lZGlhUGxheWVyRmFjdG9yeSogbV9jdXJyZW50TWVkaWFFbmdpbmU7CiAgICAg VVJMIG1fdXJsOwogICAgIFN0cmluZyBtX2NvbnRlbnRNSU1FVHlwZTsKICAgICBTdHJpbmcgbV9j b250ZW50VHlwZUNvZGVjczsK