129548 2014-03-01 09:50:27 -0800 [Mac] Crash in MediaPlayer::rateChanged() 2014-03-03 12:43:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn philipj sergio oldest_to_newest 985934 0 jer.noble 2014-03-01 09:50:27 -0800 [Mac] Crash in MediaPlayer::rateChanged() 985935 1 225555 jer.noble 2014-03-01 09:59:54 -0800 Created attachment 225555 Patch 985936 2 commit-queue 2014-03-01 10:02:53 -0800 Attachment 225555 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:117: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:135: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 986007 3 225555 darin 2014-03-01 16:00:52 -0800 Comment on attachment 225555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225555&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2142 > + if (!weakThis) > + return; > + function(); This needs a comment. The technique of checking weakThis because we know that’s a precondition for function still being OK to call is subtle. Not the good kind of subtle for programming. 986452 4 jer.noble 2014-03-03 12:43:22 -0800 Committed r165000: <http://trac.webkit.org/changeset/165000> 225555 2014-03-01 09:59:54 -0800 2014-03-01 16:00:47 -0800 Patch bug-129548-20140301100005.patch text/plain 9522 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzUyZjQ4ODBjZmQ4NmJk YTMyYjkyMTg3ZTk2ZDRmOWMzODRmYTE4Yy4uMDk1NzQ4M2EzZmY3YjhjOGI5YWU3N2FmMDdmYzdh MGRhNzZjNGI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTAzLTAxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENyYXNoIGluIE1l ZGlhUGxheWVyOjpyYXRlQ2hhbmdlZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjk1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXVEY6OmJpbmQgd2lsbCBhdXRvbWF0aWNhbGx5IHJlZiB0aGUgcGFy YW1ldGVycyBhZGRlZCB0byBpdC4gQnV0IE1lZGlhUGxheWVyUHJpdmF0ZS0KKyAgICAgICAgQVZG b3VuZGF0aW9uIGFuZCAtTWVkaWFTT3VyY2VBVkZPYmpDIGFyZSBub3QgUmVmQ291bnRlZCwgc28g YnkgdGhlIHRpbWUgdGhlIGJvdW5kCisgICAgICAgIGZ1bmN0aW9uIGlzIGNhbGxlZCwgdGhlIHVu ZGVybHlpbmcgb2JqZWN0cyBtYXkgaGF2ZSBiZWVuIGZyZWVkLgorCisgICAgICAgIFJlcGxhY2Ug b3IgYXVnbWVudCBjYWxsT25NYWluVGhyZWFkIGFyZ3VtZW50cyB3aXRoIGxhbWJkYXMgYW5kIHdl YWtQdHJzIHNvIHRoYXQKKyAgICAgICAgaWYgdGhlIGFyZ3VtZW50IGhhcyBiZWVuIGRlc3Ryb3ll ZCwgaXRzIG1ldGhvZHMgd2lsbCBub3QgYmUgY2FsbGVkLgorCisgICAgICAgIE1ha2UgdGhlIE1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6Tm90aWZpY2F0aW9uIGZ1bmN0aW9uIHR5cGUg YSBzdGQ6OmZ1bmN0aW9uOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6Tm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24p OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpOb3Rp ZmljYXRpb246OmZ1bmN0aW9uKToKKworICAgICAgICBNYWtlIGNyZWF0ZVdlYWtQdHIoKSBwdWJs aWMgc28gdGhhdCBpdCBjYW4gYmUgY2FsbGVkIGZyb20gbm9uLWNsYXNzIG1ldGhvZHM6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlV2Vha1B0cik6IAorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNl QVZGT2JqQy5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3Vy Y2VBVkZPYmpDOjpjcmVhdGVXZWFrUHRyKTogCisKKyAgICAgICAgVXNlIGEgd2Vha1B0ciB0byBh Ym9ydCBjYWxsT25NYWluVGhyZWFkKCkgaWYgdGhlIG9iamVjdCBoYXMgYmVlbiBkZXN0cm95ZWQ6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKC1bV2ViQ29yZUFWRk1vdmll T2JzZXJ2ZXIgb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDpvZk9iamVjdDpjaGFuZ2U6Y29udGV4dDpd KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpDTVRp bWViYXNlRWZmZWN0aXZlUmF0ZUNoYW5nZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnBsYXkpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpwYXVzZSk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnNlZWtX aXRoVG9sZXJhbmNlKToKKwogMjAxNC0wMi0yOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KIAogICAgICAgICBbTVNFXSBZb3VUdWJlIHZpZGVvcyBmYWlsIHRvIHBsYXkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAppbmRl eCBkYTg1OTU1Zjc0OTRjYTM0MDgxOWFmY2JkYzhjNzAyY2ViYTNhODA4Li4wZGE0MjcyM2UwNmEx MjZiNzAzNjdiMzIxZTE1OTU4NGUxOTQwODQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCkBAIC0xMTAsNyArMTEwLDcgQEAgcHVi bGljOgogICAgICAgICB7CiAgICAgICAgIH0KIAotICAgICAgICBOb3RpZmljYXRpb24oV1RGOjpG dW5jdGlvbjx2b2lkICgpPiBmdW5jdGlvbikKKyAgICAgICAgTm90aWZpY2F0aW9uKHN0ZDo6ZnVu Y3Rpb248dm9pZCAoKT4gZnVuY3Rpb24pCiAgICAgICAgICAgICA6IG1fdHlwZShGdW5jdGlvblR5 cGUpCiAgICAgICAgICAgICAsIG1fdGltZSgwKQogICAgICAgICAgICAgLCBtX2ZpbmlzaGVkKGZh bHNlKQpAQCAtMTIyLDEzICsxMjIsMTMgQEAgcHVibGljOgogICAgICAgICBib29sIGlzVmFsaWQo KSB7IHJldHVybiBtX3R5cGUgIT0gTm9uZTsgfQogICAgICAgICBkb3VibGUgdGltZSgpIHsgcmV0 dXJuIG1fdGltZTsgfQogICAgICAgICBib29sIGZpbmlzaGVkKCkgeyByZXR1cm4gbV9maW5pc2hl ZDsgfQotICAgICAgICBGdW5jdGlvbjx2b2lkICgpPiYgZnVuY3Rpb24oKSB7IHJldHVybiBtX2Z1 bmN0aW9uOyB9CisgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4mIGZ1bmN0aW9uKCkgeyBy ZXR1cm4gbV9mdW5jdGlvbjsgfQogICAgICAgICAKICAgICBwcml2YXRlOgogICAgICAgICBUeXBl IG1fdHlwZTsKICAgICAgICAgZG91YmxlIG1fdGltZTsKICAgICAgICAgYm9vbCBtX2ZpbmlzaGVk OwotICAgICAgICBGdW5jdGlvbjx2b2lkICgpPiBtX2Z1bmN0aW9uOworICAgICAgICBzdGQ6OmZ1 bmN0aW9uPHZvaWQgKCk+IG1fZnVuY3Rpb247CiAgICAgfTsKIAogICAgIHZvaWQgc2NoZWR1bGVN YWluVGhyZWFkTm90aWZpY2F0aW9uKE5vdGlmaWNhdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgK aW5kZXggNjVjMjBkNTVkMmUyMjU1MThmZjc3ZGYyZWRiMTdhZmI0M2Y3Nzc1NS4uOTRjMTJjNzIw OTE5MzkwNmY0NGUwMDA4ZjRjZmQxMDQwYmE0NTdjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaApA QCAtMTEzLDExICsxMTMsMTEgQEAgcHVibGljOgogICAgIHZvaWQgb3V0cHV0TWVkaWFEYXRhV2ls bENoYW5nZShBVlBsYXllckl0ZW1WaWRlb091dHB1dCopOwogI2VuZGlmCiAKKyAgICBXZWFrUHRy PE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM+IGNyZWF0ZVdlYWtQdHIoKSB7IHJl dHVybiBtX3dlYWtQdHJGYWN0b3J5LmNyZWF0ZVdlYWtQdHIoKTsgfQorCiBwcml2YXRlOgogICAg IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMoTWVkaWFQbGF5ZXIqKTsKIAotICAg IFdlYWtQdHI8TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQz4gY3JlYXRlV2Vha1B0 cigpIHsgcmV0dXJuIG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigpOyB9Ci0KICAgICAv LyBlbmdpbmUgc3VwcG9ydAogICAgIHN0YXRpYyBQYXNzT3duUHRyPE1lZGlhUGxheWVyUHJpdmF0 ZUludGVyZmFjZT4gY3JlYXRlKE1lZGlhUGxheWVyKik7CiAgICAgc3RhdGljIHZvaWQgZ2V0U3Vw cG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+JiB0eXBlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5t bQppbmRleCAzYjI2OTZiNTQxN2ZmZWQ5MDcxMGRlNWJkYmU3NmZkNGEyYThiMjk2Li5lNWVjMGMy ZWFlNjQ1YjRkNTI0NzBjYmE2ODRiMmQyZGM0NzgyZWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW0KQEAgLTIxMzUsNyArMjEzNSwxMiBAQCBOU0FycmF5KiBpdGVtS1ZPUHJvcGVydGllcygpCiAg ICAgaWYgKGZ1bmN0aW9uLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NhbGxi YWNrLT5zY2hlZHVsZU1haW5UaHJlYWROb3RpZmljYXRpb24oTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uOjpOb3RpZmljYXRpb24oZnVuY3Rpb24pKTsKKyAgICBhdXRvIHdlYWtUaGlzID0g bV9jYWxsYmFjay0+Y3JlYXRlV2Vha1B0cigpOworICAgIG1fY2FsbGJhY2stPnNjaGVkdWxlTWFp blRocmVhZE5vdGlmaWNhdGlvbihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246Ok5vdGlm aWNhdGlvbihbd2Vha1RoaXMsIGZ1bmN0aW9uXXsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZnVuY3Rpb24oKTsKKyAgICB9KSk7CiB9CiAKICNp ZiBIQVZFKEFWRk9VTkRBVElPTl9NRURJQV9TRUxFQ1RJT05fR1JPVVApCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNl QVZGT2JqQy5oCmluZGV4IDc0ZTdiNTQwOTBmZTJiZmQ0NGY3MWFhODM5ZWFlOGM1MDdhNjdhZjgu LjM1NzYwMDcwYjM1NWYzMTE2NDE3OTBmZTYyN2VjODIyODIwY2RiNDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291 cmNlQVZGT2JqQy5oCkBAIC03Nyw2ICs3Nyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGtleU5lZWRl ZChVaW50OEFycmF5Kik7CiAjZW5kaWYKIAorICAgIFdlYWtQdHI8TWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTb3VyY2VBVkZPYmpDPiBjcmVhdGVXZWFrUHRyKCkgeyByZXR1cm4gbV93ZWFrUHRyRmFj dG9yeS5jcmVhdGVXZWFrUHRyKCk7IH0KKwogcHJpdmF0ZToKICAgICAvLyBNZWRpYVBsYXllclBy aXZhdGVJbnRlcmZhY2UKICAgICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBTdHJpbmcmIHVybCkg b3ZlcnJpZGU7CkBAIC0xNTMsOCArMTU1LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVuc3VyZUxh eWVyKCk7CiAgICAgdm9pZCBkZXN0cm95TGF5ZXIoKTsKIAotICAgIFdlYWtQdHI8TWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDPiBjcmVhdGVXZWFrUHRyKCkgeyByZXR1cm4gbV93 ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCk7IH0KLQogICAgIC8vIE1lZGlhUGxheWVyIEZh Y3RvcnkgTWV0aG9kcwogICAgIHN0YXRpYyBQYXNzT3duUHRyPE1lZGlhUGxheWVyUHJpdmF0ZUlu dGVyZmFjZT4gY3JlYXRlKE1lZGlhUGxheWVyKik7CiAgICAgc3RhdGljIGJvb2wgaXNBdmFpbGFi bGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQppbmRleCA5YWM1YzQ1YmYyMjEyODI0Y2Iz YWZiODMwM2ExZTNjZmEzMDU1ZjkyLi40MTczM2UwZDgzYzczNDY0YTdkMjg3ZTRlMDc3MjNiMTM5 YjRkZjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC0xMTksNyArMTE5LDEyIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyB2b2lkIENNVGltZWJhc2VFZmZlY3RpdmVSYXRl Q2hhbmdlZENhbGxiYWNrKENNTm90aWZpY2F0aW9uQ2VudGVyUmVmLCBjb25zdCB2b2lkICpsaXN0 ZW5lciwgQ0ZTdHJpbmdSZWYsIGNvbnN0IHZvaWQgKiwgQ0ZUeXBlUmVmKQogewogICAgIE1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQyogcGxheWVyID0gKE1lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU291cmNlQVZGT2JqQyopbGlzdGVuZXI7Ci0gICAgY2FsbE9uTWFpblRocmVhZChi aW5kKCZNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVmZmVjdGl2ZVJhdGVD aGFuZ2VkLCBwbGF5ZXIpKTsKKyAgICBhdXRvIHdlYWtUaGlzID0gcGxheWVyLT5jcmVhdGVXZWFr UHRyKCk7CisgICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1RoaXNdeworICAgICAgICBpZiAoIXdl YWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB3ZWFrVGhpcy5nZXQoKS0+ZWZm ZWN0aXZlUmF0ZUNoYW5nZWQoKTsKKyAgICB9KTsKIH0KIAogTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTb3VyY2VBVkZPYmpDOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMoTWVk aWFQbGF5ZXIqIHBsYXllcikKQEAgLTI5Nyw3ICszMDIsMTIgQEAgUGxhdGZvcm1MYXllciogTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpwbGF0Zm9ybUxheWVyKCkgY29uc3QK IAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnBsYXkoKQogewot ICAgIGNhbGxPbk1haW5UaHJlYWQoV1RGOjpiaW5kKCZNZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakM6OnBsYXlJbnRlcm5hbCwgdGhpcykpOworICAgIGF1dG8gd2Vha1RoaXMgPSBj cmVhdGVXZWFrUHRyKCk7CisgICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1RoaXNdeworICAgICAg ICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB3ZWFrVGhpcy5n ZXQoKS0+cGxheUludGVybmFsKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpwbGF5SW50ZXJuYWwoKQpAQCAtMzA4LDcgKzMxOCwxMiBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6cGxheUludGVybmFs KCkKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnBhdXNlKCkK IHsKLSAgICBjYWxsT25NYWluVGhyZWFkKFdURjo6YmluZCgmTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTb3VyY2VBVkZPYmpDOjpwYXVzZUludGVybmFsLCB0aGlzKSk7CisgICAgYXV0byB3ZWFrVGhp cyA9IGNyZWF0ZVdlYWtQdHIoKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFt3ZWFrVGhpc117Cisg ICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHdlYWtU aGlzLmdldCgpLT5wYXVzZUludGVybmFsKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpwYXVzZUludGVybmFsKCkKQEAgLTM4OCw3ICs0 MDMsMTIgQEAgZG91YmxlIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6aW5p dGlhbFRpbWUoKSBjb25zdAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9i akM6OnNlZWtXaXRoVG9sZXJhbmNlKGRvdWJsZSB0aW1lLCBkb3VibGUgbmVnYXRpdmVUaHJlc2hv bGQsIGRvdWJsZSBwb3NpdGl2ZVRocmVzaG9sZCkKIHsKICAgICBtX3NlZWtpbmcgPSB0cnVlOwot ICAgIGNhbGxPbk1haW5UaHJlYWQoV1RGOjpiaW5kKCZNZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakM6OnNlZWtJbnRlcm5hbCwgdGhpcywgdGltZSwgbmVnYXRpdmVUaHJlc2hvbGQs IHBvc2l0aXZlVGhyZXNob2xkKSk7CisgICAgYXV0byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHIo KTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFt3ZWFrVGhpcywgdGltZSwgbmVnYXRpdmVUaHJlc2hv bGQsIHBvc2l0aXZlVGhyZXNob2xkXXsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgd2Vha1RoaXMuZ2V0KCktPnNlZWtJbnRlcm5hbCh0aW1lLCBu ZWdhdGl2ZVRocmVzaG9sZCwgcG9zaXRpdmVUaHJlc2hvbGQpOworICAgIH0pOwogfQogCiB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c2Vla0ludGVybmFsKGRvdWJs ZSB0aW1lLCBkb3VibGUgbmVnYXRpdmVUaHJlc2hvbGQsIGRvdWJsZSBwb3NpdGl2ZVRocmVzaG9s ZCkK