220647 2021-01-14 23:46:52 -0800 CRASH in MediaSourcePrivateAVFObjC::removeSourceBuffer() 2021-01-15 12:43:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble darin eric.carlson ews-watchlist glenn peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1719794 0 jer.noble 2021-01-14 23:46:52 -0800 CRASH in MediaSourcePrivateAVFObjC::removeSourceBuffer() 1719795 1 jer.noble 2021-01-14 23:47:29 -0800 <rdar://73173684> 1719796 2 417679 jer.noble 2021-01-14 23:51:20 -0800 Created attachment 417679 Patch 1719958 3 ews-feeder 2021-01-15 12:43:17 -0800 Committed r271530: <https://trac.webkit.org/changeset/271530> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417679. 417679 2021-01-14 23:51:20 -0800 2021-01-15 12:43:18 -0800 Patch bug-220647-20210114235119.patch text/plain 9365 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZmMWEzZGQwMDM1NDFk OGQ4ZDFkYmZkNzg1NDAxMDAyNTg2NDI0Ny4uMmE1NTE3N2Q4NmY4MDAwNDVlZWM5NDZkMWNkMjBj Y2RjMzIxMmVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTAxLTE0ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENSQVNIIGluIE1lZGlhU291 cmNlUHJpdmF0ZUFWRk9iakM6OnJlbW92ZVNvdXJjZUJ1ZmZlcigpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2NDcKKyAgICAgICAgPHJkYXI6Ly83 MzE3MzY4ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbiBleGNlcHRpb25hbCBjaXJjdW1zdGFuY2VzLCB0aGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTb3VyY2VBVkZPYmpDIGNhbiBiZSBkZXN0cm95ZWQgYmVmb3JlCisgICAgICAgIE1lZGlhU291 cmNlUHJpdmF0ZUFWRk9iakMsIHdoaWNoIGxlYXZlcyBiZWhpbmQgYSBudWxsIFdlYWtQdHIuIE51 bGwgY2hlY2sgbV9wbGF5ZXIgYmVmb3JlCisgICAgICAgIHVzaW5nIGV2ZXJ5d2hlcmUgaW4gTWVk aWFTb3VyY2VQcml2YXRlQVZGT2JqQy4KKworICAgICAgICBEcml2ZS1ieSBmaXg6IGl0IHdvdWxk IGJlIGludmFsaWQgdG8gcGFzcyBpbiBhIG51bGwgcGxheWVyIHRvIE1lZGlhU291cmNlUHJpdmF0 ZUFWRk9iakM6OmNyZWF0ZSgpLAorICAgICAgICBzbyBtb2RpZnkgdGhhdCBtZXRob2QgdG8gdGFr ZSBhIHJlZmVyZW5jZSByYXRoZXIgdGhhbiBhIHBvaW50ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJj ZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakM6OmxvYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6Ok1lZGlhU291cmNl UHJpdmF0ZUFWRk9iakMpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2VQcml2YXRlQVZG T2JqQzo6cmVtb3ZlU291cmNlQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNl UHJpdmF0ZUFWRk9iakM6OmR1cmF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVNvdXJjZVByaXZhdGVBVkZPYmpDOjptYXJrRW5kT2ZTdHJlYW0pOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6cmVhZHlTdGF0ZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpzZXRSZWFkeVN0YXRlKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OndhaXRGb3JTZWVrQ29t cGxldGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OnNl ZWtDb21wbGV0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2VQcml2YXRlQVZGT2Jq Qzo6Y3VycmVudE1lZGlhVGltZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNvdXJj ZVByaXZhdGVBVkZPYmpDOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkQ2hhbmdlQWN0aXZlU3RhdGUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6c291cmNlQnVm ZmVyS2V5TmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9i akM6OnNldFNvdXJjZUJ1ZmZlcldpdGhTZWxlY3RlZFZpZGVvKToKKwogMjAyMS0wMS0xNCAgamVy ICA8amVyQE1hYy0zMDg2NDEuaG9tZT4KIAogICAgICAgICBQbGF5YmFjayBmYWlscyBhdCBtYXJr ZXQgd2F0Y2guY29tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggMGJmMjA0OWMwMDcw MGU5NWJjMDk0N2ZmOGNhMzU4MTRiMzNkNzRlOS4uZGRlNzVkMWI1MTI3ODk4ZjZmZjg2NjYyNjlj OWU1ODM2OTc0NTI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpD Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtMjcwLDcgKzI3 MCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpsb2FkKGNv bnN0IFVSTCYsIGNvbnN0IENvbnRlbnRUeXBlJiwKIHsKICAgICBBTFdBWVNfTE9HKExPR0lERU5U SUZJRVIpOwogCi0gICAgbV9tZWRpYVNvdXJjZVByaXZhdGUgPSBNZWRpYVNvdXJjZVByaXZhdGVB VkZPYmpDOjpjcmVhdGUodGhpcywgY2xpZW50KTsKKyAgICBtX21lZGlhU291cmNlUHJpdmF0ZSA9 IE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OmNyZWF0ZSgqdGhpcywgY2xpZW50KTsKICAgICBt X21lZGlhU291cmNlUHJpdmF0ZS0+c2V0VmlkZW9MYXllcihtX3NhbXBsZUJ1ZmZlckRpc3BsYXlM YXllci5nZXQoKSk7CiAgICAgbV9tZWRpYVNvdXJjZVByaXZhdGUtPnNldERlY29tcHJlc3Npb25T ZXNzaW9uKG1fZGVjb21wcmVzc2lvblNlc3Npb24uZ2V0KCkpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNvdXJj ZVByaXZhdGVBVkZPYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLmgKaW5kZXggMGQ3NzhlMmFi MjE5MTZmYzEyYmM0NDQ3NjFkNGExOGRlMDg2YWJkOS4uNDAyOTczOTBhMjUxOGI2MmI2MDdmYjk2 MmJkNWY1YzdjMTg3YTFkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh U291cmNlUHJpdmF0ZUFWRk9iakMuaApAQCAtNTksNyArNTksNyBAQCBjbGFzcyBNZWRpYVNvdXJj ZVByaXZhdGVBVkZPYmpDIGZpbmFsCiAjZW5kaWYKIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVm PE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM+IGNyZWF0ZShNZWRpYVBsYXllclByaXZhdGVNZWRp YVNvdXJjZUFWRk9iakMqLCBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQqKTsKKyAgICBzdGF0aWMg UmVmPE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM+IGNyZWF0ZShNZWRpYVBsYXllclByaXZhdGVN ZWRpYVNvdXJjZUFWRk9iakMmLCBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQqKTsKICAgICB2aXJ0 dWFsIH5NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDKCk7CiAKICAgICBNZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakMqIHBsYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fcGxheWVyLmdl dCgpOyB9CkBAIC0xMTYsNyArMTE2LDcgQEAgcHVibGljOgogICAgIHZvaWQgZmFpbGVkVG9DcmVh dGVSZW5kZXJlcihSZW5kZXJlclR5cGUpOwogCiBwcml2YXRlOgotICAgIE1lZGlhU291cmNlUHJp dmF0ZUFWRk9iakMoTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDKiwgTWVkaWFT b3VyY2VQcml2YXRlQ2xpZW50Kik7CisgICAgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQyhNZWRp YVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMmLCBNZWRpYVNvdXJjZVByaXZhdGVDbGll bnQqKTsKIAogICAgIHZvaWQgc291cmNlQnVmZmVyUHJpdmF0ZURpZENoYW5nZUFjdGl2ZVN0YXRl KFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDKiwgYm9vbCBhY3RpdmUpOwogICAgIHZvaWQgc291 cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQoU291cmNlQnVm ZmVyUHJpdmF0ZUFWRk9iakMqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVNvdXJjZVByaXZhdGVBVkZPYmpDLm1tCmluZGV4IDcwNDY2YTcwMGZiY2JmMDM4NTY2YzFhM2Q3 YjAyMzI4OTBlNDg5YTQuLmUxMGMxMDY4NGRiMmJmYzNiOTVlYzVlYjk2NTk3YzFkZDk2YjQ1ZmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZG T2JqQy5tbQpAQCAtNDYsMTQgKzQ2LDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNwcmFnbWEg bWFyayAtCiAjcHJhZ21hIG1hcmsgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQwogCi1SZWY8TWVk aWFTb3VyY2VQcml2YXRlQVZGT2JqQz4gTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6Y3JlYXRl KE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQyogcGFyZW50LCBNZWRpYVNvdXJj ZVByaXZhdGVDbGllbnQqIGNsaWVudCkKK1JlZjxNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDPiBN ZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpjcmVhdGUoTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT b3VyY2VBVkZPYmpDJiBwYXJlbnQsIE1lZGlhU291cmNlUHJpdmF0ZUNsaWVudCogY2xpZW50KQog ewogICAgIGF1dG8gbWVkaWFTb3VyY2VQcml2YXRlID0gYWRvcHRSZWYoKm5ldyBNZWRpYVNvdXJj ZVByaXZhdGVBVkZPYmpDKHBhcmVudCwgY2xpZW50KSk7CiAgICAgY2xpZW50LT5zZXRQcml2YXRl QW5kT3BlbihtZWRpYVNvdXJjZVByaXZhdGUuY29weVJlZigpKTsKICAgICByZXR1cm4gbWVkaWFT b3VyY2VQcml2YXRlOwogfQogCi1NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpNZWRpYVNvdXJj ZVByaXZhdGVBVkZPYmpDKE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQyogcGFy ZW50LCBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQqIGNsaWVudCkKK01lZGlhU291cmNlUHJpdmF0 ZUFWRk9iakM6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMoTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTb3VyY2VBVkZPYmpDJiBwYXJlbnQsIE1lZGlhU291cmNlUHJpdmF0ZUNsaWVudCogY2xpZW50 KQogICAgIDogbV9wbGF5ZXIobWFrZVdlYWtQdHIocGFyZW50KSkKICAgICAsIG1fY2xpZW50KGNs aWVudCkKICAgICAsIG1faXNFbmRlZChmYWxzZSkKQEAgLTExMCw3ICsxMTAsOCBAQCB2b2lkIE1l ZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OnJlbW92ZVNvdXJjZUJ1ZmZlcihTb3VyY2VCdWZmZXJQ cml2YXRlKiBidWZmZXIpCiAgICAgc2l6ZV90IHBvcyA9IG1fYWN0aXZlU291cmNlQnVmZmVycy5m aW5kKGJ1ZmZlcik7CiAgICAgaWYgKHBvcyAhPSBub3RGb3VuZCkgewogICAgICAgICBtX2FjdGl2 ZVNvdXJjZUJ1ZmZlcnMucmVtb3ZlKHBvcyk7Ci0gICAgICAgIG1fcGxheWVyLT5ub3RpZnlBY3Rp dmVTb3VyY2VCdWZmZXJzQ2hhbmdlZCgpOworICAgICAgICBpZiAobV9wbGF5ZXIpCisgICAgICAg ICAgICBtX3BsYXllci0+bm90aWZ5QWN0aXZlU291cmNlQnVmZmVyc0NoYW5nZWQoKTsKICAgICB9 CiAKICAgICBwb3MgPSBtX3NvdXJjZUJ1ZmZlcnMuZmluZChidWZmZXIpOwpAQCAtMTMwLDEyICsx MzEsMTMgQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtVGltZVJhbmdlcz4gTWVkaWFTb3VyY2VQ cml2YXRlQVZGT2JqQzo6YnVmZmVyZWQoKQogCiB2b2lkIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9i akM6OmR1cmF0aW9uQ2hhbmdlZChjb25zdCBNZWRpYVRpbWUmKQogewotICAgIG1fcGxheWVyLT5k dXJhdGlvbkNoYW5nZWQoKTsKKyAgICBpZiAobV9wbGF5ZXIpCisgICAgICAgIG1fcGxheWVyLT5k dXJhdGlvbkNoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpt YXJrRW5kT2ZTdHJlYW0oRW5kT2ZTdHJlYW1TdGF0dXMgc3RhdHVzKQogewotICAgIGlmIChzdGF0 dXMgPT0gRW9zTm9FcnJvcikKKyAgICBpZiAoc3RhdHVzID09IEVvc05vRXJyb3IgJiYgbV9wbGF5 ZXIpCiAgICAgICAgIG1fcGxheWVyLT5zZXROZXR3b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5ldHdv cmtTdGF0ZTo6TG9hZGVkKTsKICAgICBtX2lzRW5kZWQgPSB0cnVlOwogfQpAQCAtMTQ4LDQxICsx NTAsNDYgQEAgdm9pZCBNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjp1bm1hcmtFbmRPZlN0cmVh bSgpCiAKIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6 OnJlYWR5U3RhdGUoKSBjb25zdAogewotICAgIHJldHVybiBtX3BsYXllci0+cmVhZHlTdGF0ZSgp OworICAgIHJldHVybiBtX3BsYXllciA/IG1fcGxheWVyLT5yZWFkeVN0YXRlKCkgOiBNZWRpYVBs YXllcjo6UmVhZHlTdGF0ZTo6SGF2ZU5vdGhpbmc7CiB9CiAKIHZvaWQgTWVkaWFTb3VyY2VQcml2 YXRlQVZGT2JqQzo6c2V0UmVhZHlTdGF0ZShNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSByZWFkeVN0 YXRlKQogewotICAgIG1fcGxheWVyLT5zZXRSZWFkeVN0YXRlKHJlYWR5U3RhdGUpOworICAgIGlm IChtX3BsYXllcikKKyAgICAgICAgbV9wbGF5ZXItPnNldFJlYWR5U3RhdGUocmVhZHlTdGF0ZSk7 CiB9CiAKIHZvaWQgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6d2FpdEZvclNlZWtDb21wbGV0 ZWQoKQogewotICAgIG1fcGxheWVyLT53YWl0Rm9yU2Vla0NvbXBsZXRlZCgpOworICAgIGlmICht X3BsYXllcikKKyAgICAgICAgbV9wbGF5ZXItPndhaXRGb3JTZWVrQ29tcGxldGVkKCk7CiB9CiAK IHZvaWQgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6c2Vla0NvbXBsZXRlZCgpCiB7Ci0gICAg bV9wbGF5ZXItPnNlZWtDb21wbGV0ZWQoKTsKKyAgICBpZiAobV9wbGF5ZXIpCisgICAgICAgIG1f cGxheWVyLT5zZWVrQ29tcGxldGVkKCk7CiB9CiAKIE1lZGlhVGltZSBNZWRpYVNvdXJjZVByaXZh dGVBVkZPYmpDOjpjdXJyZW50TWVkaWFUaW1lKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9wbGF5 ZXItPmN1cnJlbnRNZWRpYVRpbWUoKTsKKyAgICByZXR1cm4gbV9wbGF5ZXIgPyBtX3BsYXllci0+ Y3VycmVudE1lZGlhVGltZSgpIDogTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOwogfQogCiB2b2lk IE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRDaGFuZ2VB Y3RpdmVTdGF0ZShTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQyogYnVmZmVyLCBib29sIGFjdGl2 ZSkKIHsKICAgICBpZiAoYWN0aXZlICYmICFtX2FjdGl2ZVNvdXJjZUJ1ZmZlcnMuY29udGFpbnMo YnVmZmVyKSkgewogICAgICAgICBtX2FjdGl2ZVNvdXJjZUJ1ZmZlcnMuYXBwZW5kKGJ1ZmZlcik7 Ci0gICAgICAgIG1fcGxheWVyLT5ub3RpZnlBY3RpdmVTb3VyY2VCdWZmZXJzQ2hhbmdlZCgpOwor ICAgICAgICBpZiAobV9wbGF5ZXIpCisgICAgICAgICAgICBtX3BsYXllci0+bm90aWZ5QWN0aXZl U291cmNlQnVmZmVyc0NoYW5nZWQoKTsKICAgICB9CiAKICAgICBpZiAoIWFjdGl2ZSkgewogICAg ICAgICBzaXplX3QgcG9zaXRpb24gPSBtX2FjdGl2ZVNvdXJjZUJ1ZmZlcnMuZmluZChidWZmZXIp OwogICAgICAgICBpZiAocG9zaXRpb24gIT0gbm90Rm91bmQpIHsKICAgICAgICAgICAgIG1fYWN0 aXZlU291cmNlQnVmZmVycy5yZW1vdmUocG9zaXRpb24pOwotICAgICAgICAgICAgbV9wbGF5ZXIt Pm5vdGlmeUFjdGl2ZVNvdXJjZUJ1ZmZlcnNDaGFuZ2VkKCk7CisgICAgICAgICAgICBpZiAobV9w bGF5ZXIpCisgICAgICAgICAgICAgICAgbV9wbGF5ZXItPm5vdGlmeUFjdGl2ZVNvdXJjZUJ1ZmZl cnNDaGFuZ2VkKCk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0xOTEsNyArMTk4LDggQEAgdm9p ZCBNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkQ2hhbmdl QWN0aXZlU3RhdGUoU291cmNlQnUKIHZvaWQgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6c291 cmNlQnVmZmVyS2V5TmVlZGVkKFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDKiBidWZmZXIsIFVp bnQ4QXJyYXkqIGluaXREYXRhKQogewogICAgIG1fc291cmNlQnVmZmVyc05lZWRpbmdTZXNzaW9u cy5hcHBlbmQoYnVmZmVyKTsKLSAgICBwbGF5ZXIoKS0+a2V5TmVlZGVkKGluaXREYXRhKTsKKyAg ICBpZiAobV9wbGF5ZXIpCisgICAgICAgIG1fcGxheWVyLT5rZXlOZWVkZWQoaW5pdERhdGEpOwog fQogI2VuZGlmCiAKQEAgLTMyNSw3ICszMzMsNyBAQCB2b2lkIE1lZGlhU291cmNlUHJpdmF0ZUFW Rk9iakM6OnNldFNvdXJjZUJ1ZmZlcldpdGhTZWxlY3RlZFZpZGVvKFNvdXJjZUJ1ZmZlclByaQog CiAgICAgbV9zb3VyY2VCdWZmZXJXaXRoU2VsZWN0ZWRWaWRlbyA9IHNvdXJjZUJ1ZmZlcjsKIAot ICAgIGlmIChtX3NvdXJjZUJ1ZmZlcldpdGhTZWxlY3RlZFZpZGVvKSB7CisgICAgaWYgKG1fc291 cmNlQnVmZmVyV2l0aFNlbGVjdGVkVmlkZW8gJiYgbV9wbGF5ZXIpIHsKICAgICAgICAgbV9zb3Vy Y2VCdWZmZXJXaXRoU2VsZWN0ZWRWaWRlby0+c2V0VmlkZW9MYXllcihtX3BsYXllci0+c2FtcGxl QnVmZmVyRGlzcGxheUxheWVyKCkpOwogICAgICAgICBtX3NvdXJjZUJ1ZmZlcldpdGhTZWxlY3Rl ZFZpZGVvLT5zZXREZWNvbXByZXNzaW9uU2Vzc2lvbihtX3BsYXllci0+ZGVjb21wcmVzc2lvblNl c3Npb24oKSk7CiAgICAgfQo=