210670 2020-04-17 13:53:48 -0700 [iOS] Refactor WebKit media playback process assertion logic to minimize chances of leaking them 2020-04-20 10:48:47 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210664 InRadar P2 Normal --- 1 cdumez cdumez eric.carlson ggaren jer.noble webkit-bug-importer oldest_to_newest 1642814 0 cdumez 2020-04-17 13:53:48 -0700 Refactor WebKit media playback process assertion logic to minimize chances of leaking them. 1642833 1 396798 cdumez 2020-04-17 14:21:34 -0700 Created attachment 396798 Patch 1642836 2 webkit-bug-importer 2020-04-17 14:24:40 -0700 <rdar://problem/61950339> 1643462 3 cdumez 2020-04-20 08:38:43 -0700 ping review? 1643517 4 396798 ggaren 2020-04-20 10:44:33 -0700 Comment on attachment 396798 Patch r=me 1643521 5 ews-feeder 2020-04-20 10:48:46 -0700 Committed r260373: <https://trac.webkit.org/changeset/260373> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396798. 396798 2020-04-17 14:21:34 -0700 2020-04-20 10:48:47 -0700 Patch bug-210670-20200417142133.patch text/plain 14794 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMwM2Y3NWE4MTU5MzYwMjlj ZDIwNzUwOWQ4MTA3ODAzYjMyZjJmY2QuLjBiOGEyNjJjYTI4NmZjNTJlN2EwN2MyODA4M2U0ZjVh ZWExODIwYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjAtMDQtMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBSZWZhY3RvciBXZWJLaXQg bWVkaWEgcGxheWJhY2sgcHJvY2VzcyBhc3NlcnRpb24gbG9naWMgdG8gbWluaW1pemUgY2hhbmNl cyBvZiBsZWFraW5nIHRoZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDY3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlZmFjdG9yIFdlYktpdCBtZWRpYSBwbGF5YmFjayBwcm9jZXNzIGFzc2VydGlv biBsb2dpYyB0byBtaW5pbWl6ZSBjaGFuY2VzIG9mIGxlYWtpbmcgdGhlbS4gSW4gcGFydGljdWxh ciwKKyAgICAgICAgdGhlIGZvbGxvd2luZyBjaGFuZ2VzIHdlcmUgbWFkZToKKyAgICAgICAgMS4g SW5zdGVhZCBvZiB0aGUgV2ViUHJvY2Vzc1Bvb2wgaGF2aW5nIGEgSGFzaE1hcCBvZiBtZWRpYSBw bGF5YmFjayBwcm9jZXNzIGFzc2VydGlvbnMgZm9yCisgICAgICAgICAgIHRoZSBXZWJQcm9jZXNz LCB3ZSBub3cgc3RvcmUgdGhlIGFzc2VydGlvbiBvbiB0aGUgV2ViUHJvY2Vzc1Byb3h5IG9iamVj dCBpdHNlbGYuIFRoaXMgaXMKKyAgICAgICAgICAgbGVzcyBsaWtlbHkgdG8gZ2V0IG91dCBvZiBz eW5jIGFuZCBsZWFrLgorICAgICAgICAyLiBBZGQgYSBSZWZDb3VudGVyIHRvIHRoZSBXZWJQcm9j ZXNzUG9vbCB0byBjb3VudCBXZWJQcm9jZXNzZXMgdGhhdCBoYXZlIGF1ZGlibGUgbWVkaWEuCisg ICAgICAgICAgIFdoZW5ldmVyIGEgV2ViUHJvY2VzcyBzdGFydHMgb3Igc3RvcHMgcGxheWluZyBh dWRpYmxlIG1lZGlhLCBpdCBtZXJlbHkgZ3JhYnMgYSBSZWZDb3VudGVyCisgICAgICAgICAgIHRv a2VuIG9yIHJlbGVhc2VzIGl0LiBUaGUgV2ViUHJvY2Vzc1Bvb2wgcmVsaWVzIG9uIHRoaXMgY291 bnRlciB0byBkZWNpZGUgd2hldGhlciBvciBub3QKKyAgICAgICAgICAgdG8gdGFrZSBhIG1lZGlh IHBsYXliYWNrIGFzc2VydGlvbiBvbiBiZWhhbGYgb2YgdGhlIFVJUHJvY2Vzcy4gU2luY2UgdGhp cyBpcyB0b2tlbi1iYXNlZAorICAgICAgICAgICBhbmQgdGhlIHRva2VuIGlzIHN0b3JlZCBvbiB0 aGUgV2ViUHJvY2Vzc1Byb3h5IG9iamVjdCwgaXQgbWFrZXMgaXQgbGVzcyBsaWtlbHkgdG8gbGVh aworICAgICAgICAgICB0aGUgYXNzZXJ0aW9uLgorICAgICAgICAzLiBUaGUgV2ViUHJvY2Vzc1By b3h5IG9iamVjdCBub3cgaGFzIGEgQXVkaWJsZU1lZGlhQWN0aXZpdHkgZGF0YSBzdHJ1Y3R1cmUg d3JhcHBpbmcgYm90aAorICAgICAgICAgICBpdHMgbWVkaWEgcGxheWJhY2sgYXNzZXJ0aW9uIGFu ZCBpdHMgV2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFUb2tlbiB0aGF0IGl0IGdvdCBmcm9tCisg ICAgICAgICAgIHRoZSBXZWJQcm9jZXNzUG9vbC4gV2hlbiB0aGUgV2ViUHJvY2VzcyBzaHV0cyBk b3duIChub3JtYWxseSBvciBkdWUgdG8gY3Jhc2gvdGVybWluYXRpb24pLAorICAgICAgICAgICB3 ZSBtYWtlIHN1cmUgdG8gY2xlYXIgdGhpcyBkYXRhIHN0cnVjdHVyZS4KKyAgICAgICAgNC4gTWFr ZSBzdXJlIHRoYXQgdGhlIFdlYlByb2Nlc3NQcm94eSB1cGRhdGVzIGl0cyBBdWRpYmxlTWVkaWFB Y3Rpdml0eSB3aGVuZXZlciBhIHBhZ2UgaXMKKyAgICAgICAgICAgcmVtb3ZlZCBmcm9tIHRoZSBX ZWJQcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bV93 ZWJQcm9jZXNzV2l0aEF1ZGlibGVNZWRpYUNvdW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzUG9vbDo6ZGlzY29ubmVjdFByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6d2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFUb2tlbiBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp1cGRhdGVBdWRpYmxlTWVkaWFBc3NlcnRpb25zKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpzaHV0RG93bik6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cmVtb3ZlV2Vi UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6dXBkYXRlQXVkaWJsZU1l ZGlhQXNzZXJ0aW9ucyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgor CiAyMDIwLTA0LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gUmVmYWN0b3IgV2ViS2l0IHVwbG9hZHMgcHJvY2VzcyBhc3NlcnRpb24gbG9naWMgdG8g bWluaW1pemUgY2hhbmNlcyBvZiBsZWFraW5nIHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IGM3OTA5MDU0NDM1OTA3ZTIyNzZlYTk4ZDAxNWE0NGNkZTc3 Njk3MjYuLjBjMTRiMzMzYjIzNzMwNmRmNmRhMjkzOWJhNGQ2ZTQxMTcyZjViODMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtODg5Miw3ICs4ODkyLDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZVBsYXlpbmdNZWRpYURpZENoYW5nZShNZWRpYVByb2R1 Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgbmUKICAgICBpZiAoKG9sZFN0YXRlICYgTWVkaWFQcm9kdWNl cjo6SGFzQXVkaW9PclZpZGVvKSAhPSAobV9tZWRpYVN0YXRlICYgTWVkaWFQcm9kdWNlcjo6SGFz QXVkaW9PclZpZGVvKSkKICAgICAgICAgdmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UoKTsK IAotICAgIG1fcHJvY2Vzcy0+d2ViUGFnZU1lZGlhU3RhdGVEaWRDaGFuZ2UoKnRoaXMpOworICAg IG1fcHJvY2Vzcy0+dXBkYXRlQXVkaWJsZU1lZGlhQXNzZXJ0aW9ucygpOwogfQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6dmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGNhNmEzZmNiODYyNjRiOWU4MmM0 MzUzYTQ3YzZlMjhkNzhjZjBlZWQuLjg0NDIzYzk1MjczODM4MmFkNTg3Nzk5N2U1N2Q1ZjNkMTJh MmRmNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAg LTI2MCw2ICsyNjAsNyBAQCBXZWJQcm9jZXNzUG9vbDo6V2ViUHJvY2Vzc1Bvb2woQVBJOjpQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb24mIGNvbmZpZ3VyYXRpb24pCiAgICAgLCBtX2JhY2tncm91bmRX ZWJQcm9jZXNzQ291bnRlcihbdGhpc10oUmVmQ291bnRlckV2ZW50KSB7IHVwZGF0ZVByb2Nlc3NB c3NlcnRpb25zKCk7IH0pCiAgICAgLCBtX2JhY2tGb3J3YXJkQ2FjaGUobWFrZVVuaXF1ZVJlZjxX ZWJCYWNrRm9yd2FyZENhY2hlPigqdGhpcykpCiAgICAgLCBtX3dlYlByb2Nlc3NDYWNoZShtYWtl VW5pcXVlUmVmPFdlYlByb2Nlc3NDYWNoZT4oKnRoaXMpKQorICAgICwgbV93ZWJQcm9jZXNzV2l0 aEF1ZGlibGVNZWRpYUNvdW50ZXIoW3RoaXNdKFJlZkNvdW50ZXJFdmVudCkgeyB1cGRhdGVBdWRp YmxlTWVkaWFBc3NlcnRpb25zKCk7IH0pCiB7CiAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9u Y2VGbGFnOwogICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7CkBAIC0xMTgyLDcgKzEx ODMsNiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKFdl YlByb2Nlc3NQcm94eSogcHJvY2VzcykKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmRpc2Nvbm5lY3RQ cm9jZXNzKFdlYlByb2Nlc3NQcm94eSogcHJvY2VzcykKIHsKICAgICBBU1NFUlQobV9wcm9jZXNz ZXMuY29udGFpbnMocHJvY2VzcykpOwotICAgIEFTU0VSVCghbV9wcm9jZXNzZXNQbGF5aW5nQXVk aWJsZU1lZGlhLmNvbnRhaW5zKHByb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigpKSk7CiAK ICAgICBpZiAobV9wcmV3YXJtZWRQcm9jZXNzID09IHByb2Nlc3MpIHsKICAgICAgICAgQVNTRVJU KG1fcHJld2FybWVkUHJvY2Vzcy0+aXNQcmV3YXJtZWQoKSk7CkBAIC0yMzUwLDQ2ICsyMzUwLDI5 IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNlZWRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRm9yVGVz dGluZyhjb25zdCBSZWdpc3RyYWJsZURvbWFpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJQcm9jZXNz UG9vbDo6c2V0V2ViUHJvY2Vzc0lzUGxheWluZ0F1ZGlibGVNZWRpYShXZWJDb3JlOjpQcm9jZXNz SWRlbnRpZmllciBwcm9jZXNzSUQpCitXZWJQcm9jZXNzV2l0aEF1ZGlibGVNZWRpYVRva2VuIFdl YlByb2Nlc3NQb29sOjp3ZWJQcm9jZXNzV2l0aEF1ZGlibGVNZWRpYVRva2VuKCkgY29uc3QKIHsK LSAgICBhdXRvKiBwcm9jZXNzID0gV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRm9ySWRlbnRpZmll cihwcm9jZXNzSUQpOwotICAgIEFTU0VSVChwcm9jZXNzKTsKLQotICAgIFdFQlBST0NFU1NQT09M X1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAic2V0V2ViUHJvY2Vzc0lzUGxheWluZ0F1 ZGlibGVNZWRpYTogV2ViIHByb2Nlc3MgaXMgbm93IHBsYXlpbmcgYXVkaWJsZSBtZWRpYSAocHJv Y2Vzcz0lcCwgUElEPSVpKSIsIHByb2Nlc3MsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkp OwotCi0gICAgaWYgKG1fcHJvY2Vzc2VzUGxheWluZ0F1ZGlibGVNZWRpYS5pc0VtcHR5KCkpIHsK LSAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJz ZXRXZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhOiBUaGUgbnVtYmVyIG9mIHByb2Nlc3Nl cyBwbGF5aW5nIGF1ZGlibGUgbWVkaWEgaXMgbm93IG9uZS4gVGFraW5nIFVJIHByb2Nlc3MgYXNz ZXJ0aW9uLiIpOwotCi0gICAgICAgIEFTU0VSVCghbV91aVByb2Nlc3NNZWRpYVBsYXliYWNrQXNz ZXJ0aW9uKTsKLSAgICAgICAgbV91aVByb2Nlc3NNZWRpYVBsYXliYWNrQXNzZXJ0aW9uID0gbWFr ZVVuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRDdXJyZW50UHJvY2Vzc0lEKCksICJXZWJLaXQg TWVkaWEgUGxheWJhY2siX3MsIFByb2Nlc3NBc3NlcnRpb25UeXBlOjpNZWRpYVBsYXliYWNrKTsK LSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgICAgIGlmIChHUFVQcm9jZXNzUHJveHk6OnNp bmdsZXRvbklmQ3JlYXRlZCgpKQotICAgICAgICAgICAgbV9ncHVQcm9jZXNzTWVkaWFQbGF5YmFj a0Fzc2VydGlvbiA9IG1ha2VVbmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4oR1BVUHJvY2Vzc1Byb3h5 OjpzaW5nbGV0b24oKS5wcm9jZXNzSWRlbnRpZmllcigpLCAiV2ViS2l0IE1lZGlhIFBsYXliYWNr Il9zLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6TWVkaWFQbGF5YmFjayk7Ci0jZW5kaWYKLSAgICB9 Ci0KLSAgICBhdXRvIHJlc3VsdCA9IG1fcHJvY2Vzc2VzUGxheWluZ0F1ZGlibGVNZWRpYS5hZGQo cHJvY2Vzc0lELCBudWxscHRyKTsKLSAgICBBU1NFUlQocmVzdWx0LmlzTmV3RW50cnkpOwotICAg IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSBtYWtlVW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KHBy b2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksICJXZWJLaXQgTWVkaWEgUGxheWJhY2siX3MsIFBy b2Nlc3NBc3NlcnRpb25UeXBlOjpNZWRpYVBsYXliYWNrKTsKKyAgICByZXR1cm4gbV93ZWJQcm9j ZXNzV2l0aEF1ZGlibGVNZWRpYUNvdW50ZXIuY291bnQoKTsKIH0KIAotdm9pZCBXZWJQcm9jZXNz UG9vbDo6Y2xlYXJXZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhKFdlYkNvcmU6OlByb2Nl c3NJZGVudGlmaWVyIHByb2Nlc3NJRCkKK3ZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnVwZGF0ZUF1ZGli bGVNZWRpYUFzc2VydGlvbnMoKQogewotICAgIGF1dG8gcmVzdWx0ID0gbV9wcm9jZXNzZXNQbGF5 aW5nQXVkaWJsZU1lZGlhLnRha2UocHJvY2Vzc0lEKTsKLSAgICBBU1NFUlRfVU5VU0VEKHJlc3Vs dCwgcmVzdWx0KTsKLQotICAgIGF1dG8qIHByb2Nlc3MgPSBXZWJQcm9jZXNzUHJveHk6OnByb2Nl c3NGb3JJZGVudGlmaWVyKHByb2Nlc3NJRCk7Ci0gICAgQVNTRVJUX1VOVVNFRChwcm9jZXNzLCBw cm9jZXNzKTsKLQotICAgIFdFQlBST0NFU1NQT09MX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5z aW9uLCAiY2xlYXJXZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhOiBXZWIgcHJvY2VzcyBp cyBubyBsb25nZXIgcGxheWluZyBhdWRpYmxlIG1lZGlhIChwcm9jZXNzPSVwLCBQSUQ9JWkpIiwg cHJvY2VzcywgcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgaWYgKCFtX3dlYlBy b2Nlc3NXaXRoQXVkaWJsZU1lZGlhQ291bnRlci52YWx1ZSgpKSB7CisgICAgICAgIFdFQlBST0NF U1NQT09MX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAidXBkYXRlQXVkaWJsZU1lZGlh QXNzZXJ0aW9uczogVGhlIG51bWJlciBvZiBwcm9jZXNzZXMgcGxheWluZyBhdWRpYmxlIG1lZGlh IG5vdyB6ZXJvLiBSZWxlYXNpbmcgVUkgcHJvY2VzcyBhc3NlcnRpb24uIik7CisgICAgICAgIG1f YXVkaWJsZU1lZGlhQWN0aXZpdHkgPSBXVEY6Om51bGxvcHQ7CisgICAgICAgIHJldHVybjsKKyAg ICB9CiAKLSAgICBpZiAobV9wcm9jZXNzZXNQbGF5aW5nQXVkaWJsZU1lZGlhLmlzRW1wdHkoKSkg ewotICAgICAgICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg ImNsZWFyV2ViUHJvY2Vzc0lzUGxheWluZ0F1ZGlibGVNZWRpYTogVGhlIG51bWJlciBvZiBwcm9j ZXNzZXMgcGxheWluZyBhdWRpYmxlIG1lZGlhIG5vdyB6ZXJvLiBSZWxlYXNpbmcgVUkgcHJvY2Vz cyBhc3NlcnRpb24uIik7CisgICAgaWYgKG1fYXVkaWJsZU1lZGlhQWN0aXZpdHkpCisgICAgICAg IHJldHVybjsKIAotICAgICAgICBBU1NFUlQobV91aVByb2Nlc3NNZWRpYVBsYXliYWNrQXNzZXJ0 aW9uKTsKLSAgICAgICAgbV91aVByb2Nlc3NNZWRpYVBsYXliYWNrQXNzZXJ0aW9uID0gbnVsbHB0 cjsKLSAgICAgICAgbV9ncHVQcm9jZXNzTWVkaWFQbGF5YmFja0Fzc2VydGlvbiA9IG51bGxwdHI7 Ci0gICAgfQorICAgIFdFQlBST0NFU1NQT09MX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9u LCAidXBkYXRlQXVkaWJsZU1lZGlhQXNzZXJ0aW9uczogVGhlIG51bWJlciBvZiBwcm9jZXNzZXMg cGxheWluZyBhdWRpYmxlIG1lZGlhIGlzIG5vdyBncmVhdGVyIHRoYW4gemVyby4gVGFraW5nIFVJ IHByb2Nlc3MgYXNzZXJ0aW9uLiIpOworICAgIG1fYXVkaWJsZU1lZGlhQWN0aXZpdHkgPSBBdWRp YmxlTWVkaWFBY3Rpdml0eSB7CisgICAgICAgIG1ha2VVbmlxdWVSZWY8UHJvY2Vzc0Fzc2VydGlv bj4oZ2V0Q3VycmVudFByb2Nlc3NJRCgpLCAiV2ViS2l0IE1lZGlhIFBsYXliYWNrIl9zLCBQcm9j ZXNzQXNzZXJ0aW9uVHlwZTo6TWVkaWFQbGF5YmFjaykKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1Mp CisgICAgICAgICwgR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGV0b25JZkNyZWF0ZWQoKSA/IG1ha2VV bmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4oR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGV0b24oKS5wcm9j ZXNzSWRlbnRpZmllcigpLCAiV2ViS2l0IE1lZGlhIFBsYXliYWNrIl9zLCBQcm9jZXNzQXNzZXJ0 aW9uVHlwZTo6TWVkaWFQbGF5YmFjaykgOiBudWxscHRyCisjZW5kaWYKKyAgICB9OwogfQogCiB2 b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRVc2VTZXBhcmF0ZVNlcnZpY2VXb3JrZXJQcm9jZXNzKGJv b2wgdXNlU2VwYXJhdGVTZXJ2aWNlV29ya2VyUHJvY2VzcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IDYzMjc4OWM0YWRjYjM3ODk4MmYzMGUyNjFlZDA5MjVi YzYyYjYyOTEuLjMxZGIwYzBkMDE0ODU0NDdkM2RjMjIyNmVkN2Y3ZDRkMWEyMWQwZTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAtNTE3LDggKzUxNyw3IEBA IHB1YmxpYzoKICAgICBjb25zdCBGdW5jdGlvbjx2b2lkKFVzZXJNZXNzYWdlJiYsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoVXNlck1lc3NhZ2UmJik+JiYpPiYgdXNlck1lc3NhZ2VIYW5kbGVyKCkg Y29uc3QgeyByZXR1cm4gbV91c2VyTWVzc2FnZUhhbmRsZXI7IH0KICNlbmRpZgogCi0gICAgdm9p ZCBzZXRXZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhKFdlYkNvcmU6OlByb2Nlc3NJZGVu dGlmaWVyKTsKLSAgICB2b2lkIGNsZWFyV2ViUHJvY2Vzc0lzUGxheWluZ0F1ZGlibGVNZWRpYShX ZWJDb3JlOjpQcm9jZXNzSWRlbnRpZmllcik7CisgICAgV2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVk aWFUb2tlbiB3ZWJQcm9jZXNzV2l0aEF1ZGlibGVNZWRpYVRva2VuKCkgY29uc3Q7CiAKICAgICB2 b2lkIGRpc2FibGVEZWxheWVkV2ViUHJvY2Vzc0xhdW5jaCgpIHsgbV9pc0RlbGF5ZWRXZWJQcm9j ZXNzTGF1bmNoRGlzYWJsZWQgPSB0cnVlOyB9CiAKQEAgLTU2Miw2ICs1NjEsNyBAQCBwcml2YXRl OgogI2VuZGlmCiAKICAgICB2b2lkIHVwZGF0ZVByb2Nlc3NBc3NlcnRpb25zKCk7CisgICAgdm9p ZCB1cGRhdGVBdWRpYmxlTWVkaWFBc3NlcnRpb25zKCk7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VS ZWNlaXZlci4KICAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUHJvY2Vzc1Bvb2xN ZXNzYWdlUmVjZWl2ZXIuY3BwCkBAIC03ODcsOSArNzg3LDE1IEBAIHByaXZhdGU6CiAgICAgRnVu Y3Rpb248dm9pZChVc2VyTWVzc2FnZSYmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFVzZXJNZXNz YWdlJiYpPiYmKT4gbV91c2VyTWVzc2FnZUhhbmRsZXI7CiAjZW5kaWYKIAotICAgIEhhc2hNYXA8 V2ViQ29yZTo6UHJvY2Vzc0lkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzQXNzZXJ0 aW9uPj4gbV9wcm9jZXNzZXNQbGF5aW5nQXVkaWJsZU1lZGlhOwotICAgIHN0ZDo6dW5pcXVlX3B0 cjxQcm9jZXNzQXNzZXJ0aW9uPiBtX3VpUHJvY2Vzc01lZGlhUGxheWJhY2tBc3NlcnRpb247Ci0g ICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRpb24+IG1fZ3B1UHJvY2Vzc01lZGlhUGxh eWJhY2tBc3NlcnRpb247CisgICAgV2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFDb3VudGVyIG1f d2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFDb3VudGVyOworCisgICAgc3RydWN0IEF1ZGlibGVN ZWRpYUFjdGl2aXR5IHsKKyAgICAgICAgVW5pcXVlUmVmPFByb2Nlc3NBc3NlcnRpb24+IHVpUHJv Y2Vzc01lZGlhUGxheWJhY2tBc3NlcnRpb247CisjaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQorICAg ICAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vzc0Fzc2VydGlvbj4gZ3B1UHJvY2Vzc01lZGlhUGxh eWJhY2tBc3NlcnRpb247CisjZW5kaWYKKyAgICB9OworICAgIE9wdGlvbmFsPEF1ZGlibGVNZWRp YUFjdGl2aXR5PiBtX2F1ZGlibGVNZWRpYUFjdGl2aXR5OwogCiAjaWYgUExBVEZPUk0oSU9TKQog ICAgIC8vIEZJWE1FOiBEZWxheWVkIHByb2Nlc3MgbGF1bmNoIGlzIGN1cnJlbnRseSBkaXNhYmxl ZCBvbiBpT1MgZm9yIHBlcmZvcm1hbmNlIHJlYXNvbnMgKHJkYXI6Ly9wcm9ibGVtLzQ5MDc0MTMx KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IDIy OGRiMTgyOGY1ODg3YmFmY2VlMjg2NjZlM2IxNzA4N2YzNGEyN2YuLmMyNTg4YThhMDkxZDRiMDg3 NTI4Y2MzMjU4OGQ3MGUzYjQ1MzFiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcApAQCAtNDE0LDYgKzQxNCw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5 OjpzaHV0RG93bigpCiAgICAgbV9yZXNwb25zaXZlbmVzc1RpbWVyLmludmFsaWRhdGUoKTsKICAg ICBtX2JhY2tncm91bmRSZXNwb25zaXZlbmVzc1RpbWVyLmludmFsaWRhdGUoKTsKICAgICBtX2Fj dGl2aXR5Rm9ySG9sZGluZ0xvY2tlZEZpbGVzID0gbnVsbHB0cjsKKyAgICBtX2F1ZGlibGVNZWRp YUFjdGl2aXR5ID0gV1RGOjpudWxsb3B0OwogCiAgICAgZm9yIChhdXRvJiBmcmFtZSA6IGNvcHlU b1ZlY3RvcihtX2ZyYW1lTWFwLnZhbHVlcygpKSkKICAgICAgICAgZnJhbWUtPndlYlByb2Nlc3NX aWxsU2h1dERvd24oKTsKQEAgLTUxMyw3ICs1MTQsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6 cmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmIHdlYlBhZ2UsIEVuZHNVc2luZ0RhdGFTdG9yZSBl bgogCiAgICAgcmVtb3ZlVmlzaXRlZExpbmtTdG9yZVVzZXIod2ViUGFnZS52aXNpdGVkTGlua1N0 b3JlKCksIHdlYlBhZ2UuaWRlbnRpZmllcigpKTsKICAgICB1cGRhdGVSZWdpc3RyYXRpb25XaXRo RGF0YVN0b3JlKCk7Ci0KKyAgICB1cGRhdGVBdWRpYmxlTWVkaWFBc3NlcnRpb25zKCk7CiAgICAg dXBkYXRlQmFja2dyb3VuZFJlc3BvbnNpdmVuZXNzVGltZXIoKTsKIAogICAgIG1heWJlU2h1dERv d24oKTsKQEAgLTEzODIsMTcgKzEzODMsMjQgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFNl dEFzc2VydGlvblR5cGUoUHJvY2Vzc0Fzc2VydGlvblR5cGUgdHlwZSkKICAgICBBU1NFUlQoIW1f YmFja2dyb3VuZFRva2VuIHx8ICFtX2ZvcmVncm91bmRUb2tlbik7CiB9CiAKLXZvaWQgV2ViUHJv Y2Vzc1Byb3h5Ojp3ZWJQYWdlTWVkaWFTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHkmKQordm9p ZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUF1ZGlibGVNZWRpYUFzc2VydGlvbnMoKQogewogICAg IGJvb2wgbmV3SGFzQXVkaWJsZVdlYlBhZ2UgPSBXVEY6OmFueU9mKG1fcGFnZU1hcC52YWx1ZXMo KSwgW10gKGF1dG8mIHBhZ2UpIHsgcmV0dXJuIHBhZ2UtPmlzUGxheWluZ0F1ZGlvKCk7IH0pOwot ICAgIGlmIChtX2hhc0F1ZGlibGVXZWJQYWdlID09IG5ld0hhc0F1ZGlibGVXZWJQYWdlKQorCisg ICAgYm9vbCBoYXNBdWRpYmxlTWVkaWFBY3Rpdml0eSA9ICEhbV9hdWRpYmxlTWVkaWFBY3Rpdml0 eTsKKyAgICBpZiAoaGFzQXVkaWJsZU1lZGlhQWN0aXZpdHkgPT0gbmV3SGFzQXVkaWJsZVdlYlBh Z2UpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2hhc0F1ZGlibGVXZWJQYWdlID0gbmV3SGFzQXVk aWJsZVdlYlBhZ2U7CiAKLSAgICBpZiAobV9oYXNBdWRpYmxlV2ViUGFnZSkKLSAgICAgICAgcHJv Y2Vzc1Bvb2woKS5zZXRXZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhKGNvcmVQcm9jZXNz SWRlbnRpZmllcigpKTsKLSAgICBlbHNlCi0gICAgICAgIHByb2Nlc3NQb29sKCkuY2xlYXJXZWJQ cm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhKGNvcmVQcm9jZXNzSWRlbnRpZmllcigpKTsKKyAg ICBpZiAobmV3SGFzQXVkaWJsZVdlYlBhZ2UpIHsKKyAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N1c3BlbnNpb24sICIlcCAtIFRha2luZyBNZWRpYVBsYXliYWNrIGFzc2VydGlvbiBmb3IgV2Vi UHJvY2VzcyB3aXRoIFBJRCAlZCIsIHRoaXMsIHByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgICAg ICBtX2F1ZGlibGVNZWRpYUFjdGl2aXR5ID0gQXVkaWJsZU1lZGlhQWN0aXZpdHkgeworICAgICAg ICAgICAgbWFrZVVuaXF1ZVJlZjxQcm9jZXNzQXNzZXJ0aW9uPihwcm9jZXNzSWRlbnRpZmllcigp LCAiV2ViS2l0IE1lZGlhIFBsYXliYWNrIl9zLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6TWVkaWFQ bGF5YmFjayksCisgICAgICAgICAgICBwcm9jZXNzUG9vbCgpLndlYlByb2Nlc3NXaXRoQXVkaWJs ZU1lZGlhVG9rZW4oKQorICAgICAgICB9OworICAgIH0gZWxzZSB7CisgICAgICAgIFJFTEVBU0Vf TE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBSZWxlYXNpbmcgTWVkaWFQbGF5YmFjayBhc3Nl cnRpb24gZm9yIFdlYlByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBwcm9jZXNzSWRlbnRpZmll cigpKTsKKyAgICAgICAgbV9hdWRpYmxlTWVkaWFBY3Rpdml0eSA9IFdURjo6bnVsbG9wdDsKKyAg ICB9CiB9CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpzZXRJc0hvbGRpbmdMb2NrZWRGaWxlcyhi b29sIGlzSG9sZGluZ0xvY2tlZEZpbGVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuaAppbmRleCA4NDMyODMyYWRlZWE3NzcwOWYyMjI3NTk2NjBmMjc5NGNjY2I0ZjI5 Li40MTY4Yzg1NmIyZTI5NjE5ZTIyMWY3MDU2NWRmZjgyMmI5YTVlMDg2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtMTA2LDYgKzEwNiw5IEBAIHR5cGVk ZWYgRm9yZWdyb3VuZFdlYlByb2Nlc3NDb3VudGVyOjpUb2tlbiBGb3JlZ3JvdW5kV2ViUHJvY2Vz c1Rva2VuOwogZW51bSBCYWNrZ3JvdW5kV2ViUHJvY2Vzc0NvdW50ZXJUeXBlIHsgfTsKIHR5cGVk ZWYgUmVmQ291bnRlcjxCYWNrZ3JvdW5kV2ViUHJvY2Vzc0NvdW50ZXJUeXBlPiBCYWNrZ3JvdW5k V2ViUHJvY2Vzc0NvdW50ZXI7CiB0eXBlZGVmIEJhY2tncm91bmRXZWJQcm9jZXNzQ291bnRlcjo6 VG9rZW4gQmFja2dyb3VuZFdlYlByb2Nlc3NUb2tlbjsKK2VudW0gV2ViUHJvY2Vzc1dpdGhBdWRp YmxlTWVkaWFDb3VudGVyVHlwZSB7IH07Cit1c2luZyBXZWJQcm9jZXNzV2l0aEF1ZGlibGVNZWRp YUNvdW50ZXIgPSBSZWZDb3VudGVyPFdlYlByb2Nlc3NXaXRoQXVkaWJsZU1lZGlhQ291bnRlclR5 cGU+OwordXNpbmcgV2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFUb2tlbiA9IFdlYlByb2Nlc3NX aXRoQXVkaWJsZU1lZGlhQ291bnRlcjo6VG9rZW47CiAKIGNsYXNzIFdlYlByb2Nlc3NQcm94eSA6 IHB1YmxpYyBBdXhpbGlhcnlQcm9jZXNzUHJveHksIHB1YmxpYyBSZXNwb25zaXZlbmVzc1RpbWVy OjpDbGllbnQsIHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxXZWJQcm9jZXNzUHJveHk+LCBw dWJsaWMgQ2FuTWFrZVdlYWtQdHI8V2ViUHJvY2Vzc1Byb3h5PiwgcHJpdmF0ZSBQcm9jZXNzVGhy b3R0bGVyQ2xpZW50IHsKIHB1YmxpYzoKQEAgLTM0NSw3ICszNDgsNyBAQCBwdWJsaWM6CiAjZW5k aWYKICNlbmRpZgogCi0gICAgdm9pZCB3ZWJQYWdlTWVkaWFTdGF0ZURpZENoYW5nZShXZWJQYWdl UHJveHkmKTsKKyAgICB2b2lkIHVwZGF0ZUF1ZGlibGVNZWRpYUFzc2VydGlvbnMoKTsKIAogICAg IHZvaWQgcmVmKCkgZmluYWwgeyBUaHJlYWRTYWZlUmVmQ291bnRlZDo6cmVmKCk7IH0KICAgICB2 b2lkIGRlcmVmKCkgZmluYWwgeyBUaHJlYWRTYWZlUmVmQ291bnRlZDo6ZGVyZWYoKTsgfQpAQCAt NTY4LDcgKzU3MSw2IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9zaHV0ZG93blByZXZlbnRp bmdTY29wZUNvdW50IHsgMCB9OwogICAgIGJvb2wgbV9oYXNDb21taXR0ZWRBbnlQcm92aXNpb25h bExvYWRzIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNQcmV3YXJtZWQ7Ci0gICAgYm9vbCBtX2hh c0F1ZGlibGVXZWJQYWdlIHsgZmFsc2UgfTsKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5U KSAmJiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGJvb2wgbV9oYXNJc3N1ZWRBdHRhY2htZW50 RWxlbWVudFJlbGF0ZWRTYW5kYm94RXh0ZW5zaW9ucyB7IGZhbHNlIH07CiAjZW5kaWYKQEAgLTU5 Myw2ICs1OTUsMTIgQEAgcHJpdmF0ZToKICAgICBPcHRpb25hbDxTZXJ2aWNlV29ya2VySW5mb3Jt YXRpb24+IG1fc2VydmljZVdvcmtlckluZm9ybWF0aW9uOwogCiAgICAgSGFzaE1hcDxXZWJDb3Jl OjpTbGVlcERpc2FibGVySWRlbnRpZmllciwgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNsZWVw RGlzYWJsZXI+PiBtX3NsZWVwRGlzYWJsZXJzOworCisgICAgc3RydWN0IEF1ZGlibGVNZWRpYUFj dGl2aXR5IHsKKyAgICAgICAgVW5pcXVlUmVmPFByb2Nlc3NBc3NlcnRpb24+IGFzc2VydGlvbjsK KyAgICAgICAgV2ViUHJvY2Vzc1dpdGhBdWRpYmxlTWVkaWFUb2tlbiB0b2tlbjsKKyAgICB9Owor ICAgIE9wdGlvbmFsPEF1ZGlibGVNZWRpYUFjdGl2aXR5PiBtX2F1ZGlibGVNZWRpYUFjdGl2aXR5 OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==