225797 2021-05-13 20:27:46 -0700 Add ScriptDisallowedScope to MediaPlayerPrivateAVFoundation 2021-05-14 15:28:17 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225700 InRadar P2 Normal --- 1 rniwa rniwa darin eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1759983 0 rniwa 2021-05-13 20:27:46 -0700 As a follow up of https://commits.webkit.org/r277379, add ScriptDisallowedScope to a bunch of member functions of MediaPlayerPrivateAVFoundation. 1759985 1 428594 rniwa 2021-05-13 20:29:47 -0700 Created attachment 428594 Adds ScriptDisallowedScope 1760001 2 428594 eric.carlson 2021-05-13 21:19:10 -0700 Comment on attachment 428594 Adds ScriptDisallowedScope View in context: https://bugs.webkit.org/attachment.cgi?id=428594&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3623 > + ScriptDisallowedScope scriptDisallowedScope; Can't this use the less expensive `ScriptDisallowedScope::InMainThread`? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3722 > + ScriptDisallowedScope scriptDisallowedScope; Ditto. > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3755 > + ScriptDisallowedScope scriptDisallowedScope; Ditto > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3827 > + ScriptDisallowedScope scriptDisallowedScope; Ditto 1760028 3 rniwa 2021-05-14 00:40:34 -0700 (In reply to Eric Carlson from comment #2) > Comment on attachment 428594 [details] > Adds ScriptDisallowedScope > > View in context: > https://bugs.webkit.org/attachment.cgi?id=428594&action=review > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3623 > > + ScriptDisallowedScope scriptDisallowedScope; > > Can't this use the less expensive `ScriptDisallowedScope::InMainThread`? Is it guaranteed that all these code will always run in the main thread? > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3722 > > + ScriptDisallowedScope scriptDisallowedScope; > > Ditto. > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3755 > > + ScriptDisallowedScope scriptDisallowedScope; > > Ditto > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3827 > > + ScriptDisallowedScope scriptDisallowedScope; > > Ditto 1760076 4 428594 eric.carlson 2021-05-14 08:23:55 -0700 Comment on attachment 428594 Adds ScriptDisallowedScope View in context: https://bugs.webkit.org/attachment.cgi?id=428594&action=review >>> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3623 >>> + ScriptDisallowedScope scriptDisallowedScope; >> >> Can't this use the less expensive `ScriptDisallowedScope::InMainThread`? > > Is it guaranteed that all these code will always run in the main thread? Each of these tasks runs inside of an `ensureOnMainThread` block for the same reason you want to disallow script - because they may call up into HTMLMediaElement. 1760221 5 rniwa 2021-05-14 14:41:39 -0700 (In reply to Eric Carlson from comment #4) > Comment on attachment 428594 [details] > Adds ScriptDisallowedScope > > View in context: > https://bugs.webkit.org/attachment.cgi?id=428594&action=review > > >>> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:3623 > >>> + ScriptDisallowedScope scriptDisallowedScope; > >> > >> Can't this use the less expensive `ScriptDisallowedScope::InMainThread`? > > > > Is it guaranteed that all these code will always run in the main thread? > > Each of these tasks runs inside of an `ensureOnMainThread` block for the > same reason you want to disallow script - because they may call up into > HTMLMediaElement. Oh, right. Will change to use ScriptDisallowedScope::InMainThread. 1760222 6 428663 rniwa 2021-05-14 14:44:48 -0700 Created attachment 428663 Patch for landing 1760255 7 ews-feeder 2021-05-14 15:27:53 -0700 Committed r277512 (237742@main): <https://commits.webkit.org/237742@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428663. 1760256 8 webkit-bug-importer 2021-05-14 15:28:17 -0700 <rdar://problem/78035454> 428594 2021-05-13 20:29:47 -0700 2021-05-14 14:44:47 -0700 Adds ScriptDisallowedScope bug-225797-20210513202946.patch text/plain 4894 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFiZTFlN2E1ODNkZmFi YWQyMTc4ODk0ZDBlNDc0YjY5MzIzZDBmMi4uOTA0OTdlNWRmZGQwMjE0NWYxODJmOTU0Y2ZiYmU4 ZTllMTA5NGU2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA1LTEzICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBTY3JpcHREaXNhbGxv d2VkU2NvcGUgdG8gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3OTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZXBsb3llZCBTY3JpcHREaXNhbGxv d2VkU2NvcGUgdG8gYSBidW5jaCBvZiBmdW5jdGlvbnMgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnVwZGF0ZVN0YXRlcyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKC1bV2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIgb2JzZXJ2 ZVZhbHVlRm9yS2V5UGF0aDpvZk9iamVjdDpjaGFuZ2U6Y29udGV4dDpdKToKKyAgICAgICAgKC1b V2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIgbGVnaWJsZU91dHB1dDpkaWRPdXRwdXRBdHRyaWJ1dGVk U3RyaW5nczpuYXRpdmVTYW1wbGVCdWZmZXJzOmZvckl0ZW1UaW1lOl0pOgorICAgICAgICAoLVtX ZWJDb3JlQVZGTW92aWVPYnNlcnZlciBtZXRhZGF0YU91dHB1dDpkaWRPdXRwdXRUaW1lZE1ldGFk YXRhR3JvdXBzOmZyb21QbGF5ZXJJdGVtVHJhY2s6XSk6CisgICAgICAgICgtW1dlYkNvcmVBVkZM b2FkZXJEZWxlZ2F0ZSByZXNvdXJjZUxvYWRlcjpkaWRDYW5jZWxMb2FkaW5nUmVxdWVzdDpdKToK KwogMjAyMS0wNS0xMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K IAogICAgICAgICBTb21lIHdlYmdsLzIuMC4wL2NvbmZvcm1hbmNlL3RleHR1cmVzL2ltYWdlX2Jp dG1hcF9mcm9tX2ltYWdlX2RhdGEgdGVzdHMgYXJlIGZhaWxpbmcgYWZ0ZXIgcjI3NzM2OSBpZiAh VVNFKEFDQ0VMRVJBVEUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb24uY3BwCmluZGV4IDI1NzA1OGRmZDIwNmExMzkyMjA5YzY3MzY5OWFm Y2Y0Yzg2YzhhN2YuLmE5YTQxMzY0NGZlYTdhNzA3MmFmMDAwNzA1MWIxZjY3ZGU5OGFmOWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24uY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUg IlBsYXRmb3JtTGF5ZXIuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVRpbWVSYW5nZXMuaCIKKyNpbmNs dWRlICJTY3JpcHREaXNhbGxvd2VkU2NvcGUuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2lu Y2x1ZGUgPENvcmVNZWRpYS9Db3JlTWVkaWEuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9E YXRhVmlldy5oPgpAQCAtNDc3LDYgKzQ3OCw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uOjp1cGRhdGVTdGF0ZXMoKQogICAgIGlmIChtX2lnbm9yZUxvYWRTdGF0ZUNoYW5n ZXMpCiAgICAgICAgIHJldHVybjsKIAorICAgIFNjcmlwdERpc2FsbG93ZWRTY29wZSBzY3JpcHRE aXNhbGxvd2VkU2NvcGU7CisKICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIG5ld05ldHdv cmtTdGF0ZSA9IG1fbmV0d29ya1N0YXRlOwogICAgIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIG5l d1JlYWR5U3RhdGUgPSBtX3JlYWR5U3RhdGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4 IDVhYTE3ZGY3NDc5ZTU4ZGViMTM1ODM2MWRlZTM5NTc4MjlmOGE1YWIuLjVlNjBjNWNmMTg3MDQw NzlkM2EzNTk4ZGQ4ZDA0N2QxOTg3YmU3MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAt NTMsNiArNTMsNyBAQAogI2ltcG9ydCAiUGl4ZWxCdWZmZXJDb25mb3JtZXJDVi5oIgogI2ltcG9y dCAiUGxhdGZvcm1UaW1lUmFuZ2VzLmgiCiAjaW1wb3J0ICJSdW50aW1lQXBwbGljYXRpb25DaGVj a3MuaCIKKyNpbXBvcnQgIlNjcmlwdERpc2FsbG93ZWRTY29wZS5oIgogI2ltcG9ydCAiU2VjdXJp dHlPcmlnaW4uaCIKICNpbXBvcnQgIlNlcmlhbGl6ZWRQbGF0Zm9ybURhdGFDdWVNYWMuaCIKICNp bXBvcnQgIlNoYXJlZEJ1ZmZlci5oIgpAQCAtMzYxOCw2ICszNjE5LDkgQEAgTlNBcnJheSogcGxh eWVyS1ZPUHJvcGVydGllcygpCiAgICAgICAgIG1fdGFza1F1ZXVlLmVucXVldWVUYXNrKFtwbGF5 ZXIgPSBtX3BsYXllciwga2V5UGF0aCA9IFdURk1vdmUoa2V5UGF0aCksIGNoYW5nZSA9IFdURk1v dmUoY2hhbmdlKSwgb2JqZWN0ID0gV1RGTW92ZShvYmplY3QpLCBjb250ZXh0XSB7CiAgICAgICAg ICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAg IFNjcmlwdERpc2FsbG93ZWRTY29wZSBzY3JpcHREaXNhbGxvd2VkU2NvcGU7CisKICAgICAgICAg ICAgIGlkIG5ld1ZhbHVlID0gW2NoYW5nZSB2YWx1ZUZvcktleTpOU0tleVZhbHVlQ2hhbmdlTmV3 S2V5XTsKICAgICAgICAgICAgIGJvb2wgd2lsbENoYW5nZSA9IFtbY2hhbmdlIHZhbHVlRm9yS2V5 Ok5TS2V5VmFsdWVDaGFuZ2VOb3RpZmljYXRpb25Jc1ByaW9yS2V5XSBib29sVmFsdWVdOwogICAg ICAgICAgICAgYm9vbCBzaG91bGRMb2dWYWx1ZSA9ICF3aWxsQ2hhbmdlOwpAQCAtMzcxNCw2ICsz NzE4LDkgQEAgTlNBcnJheSogcGxheWVyS1ZPUHJvcGVydGllcygpCiAgICAgICAgIG1fdGFza1F1 ZXVlLmVucXVldWVUYXNrKFtwbGF5ZXIgPSBtX3BsYXllciwgc3RyaW5ncyA9IFdURk1vdmUoc3Ry aW5ncyksIG5hdGl2ZVNhbXBsZXMgPSBXVEZNb3ZlKG5hdGl2ZVNhbXBsZXMpLCBpdGVtVGltZV0g ewogICAgICAgICAgICAgaWYgKCFwbGF5ZXIpCiAgICAgICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgICAgICBTY3JpcHREaXNhbGxvd2VkU2NvcGUgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwor CiAgICAgICAgICAgICBNZWRpYVRpbWUgdGltZSA9IHN0ZDo6bWF4KFBBTDo6dG9NZWRpYVRpbWUo aXRlbVRpbWUpLCBNZWRpYVRpbWU6Onplcm9UaW1lKCkpOwogICAgICAgICAgICAgcGxheWVyLT5w cm9jZXNzQ3VlKHN0cmluZ3MuZ2V0KCksIG5hdGl2ZVNhbXBsZXMuZ2V0KCksIHRpbWUpOwogICAg ICAgICB9KTsKQEAgLTM3NDUsNiArMzc1Miw4IEBAIE5TQXJyYXkqIHBsYXllcktWT1Byb3BlcnRp ZXMoKQogICAgICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAg ICBTY3JpcHREaXNhbGxvd2VkU2NvcGUgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOworCiAgICAgICAg IGZvciAoQVZUaW1lZE1ldGFkYXRhR3JvdXAgKmdyb3VwIGluIG1ldGFkYXRhR3JvdXBzLmdldCgp KQogICAgICAgICAgICAgcGxheWVyLT5tZXRhZGF0YURpZEFycml2ZShyZXRhaW5QdHIoZ3JvdXAu aXRlbXMpLCBjdXJyZW50VGltZSk7CiAgICAgfSk7CkBAIC0zODE0LDYgKzM4MjMsOSBAQCBOU0Fy cmF5KiBwbGF5ZXJLVk9Qcm9wZXJ0aWVzKCkKICAgICBVTlVTRURfUEFSQU0ocmVzb3VyY2VMb2Fk ZXIpOwogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2VsZiwgc3Ryb25nU2VsZiA9IHJldGFpblB0 cihzZWxmKSwgbG9hZGluZ1JlcXVlc3QgPSByZXRhaW5QdHIobG9hZGluZ1JlcXVlc3QpXSgpIG11 dGFibGUgewogICAgICAgICBtX3Rhc2tRdWV1ZS5lbnF1ZXVlVGFzayhbcGxheWVyID0gbV9wbGF5 ZXIsIGxvYWRpbmdSZXF1ZXN0ID0gV1RGTW92ZShsb2FkaW5nUmVxdWVzdCldIHsKKworICAgICAg ICAgICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlIHNjcmlwdERpc2FsbG93ZWRTY29wZTsKKwogICAg ICAgICAgICAgaWYgKHBsYXllcikKICAgICAgICAgICAgICAgICBwbGF5ZXItPmRpZENhbmNlbExv YWRpbmdSZXF1ZXN0KGxvYWRpbmdSZXF1ZXN0LmdldCgpKTsKICAgICAgICAgfSk7Cg== 428663 2021-05-14 14:44:48 -0700 2021-05-14 15:27:54 -0700 Patch for landing bug-225797-20210514144448.patch text/plain 4962 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFiZTFlN2E1ODNkZmFi YWQyMTc4ODk0ZDBlNDc0YjY5MzIzZDBmMi4uNzUxNDhiYTNkYzQ4NWEyNTI0ZDYzZjI1NjYzZmRi OTMyNjljOWIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA1LTEzICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBTY3JpcHREaXNhbGxv d2VkU2NvcGUgdG8gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3OTcKKworICAgICAgICBSZXZp ZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgRGVwbG95ZWQgU2NyaXB0RGlzYWxsb3dl ZFNjb3BlIHRvIGEgYnVuY2ggb2YgZnVuY3Rpb25zIGluIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjp1cGRhdGVTdGF0ZXMpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakMubW06CisgICAgICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIG9ic2VydmVW YWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6Y2hhbmdlOmNvbnRleHQ6XSk6CisgICAgICAgICgtW1dl YkNvcmVBVkZNb3ZpZU9ic2VydmVyIGxlZ2libGVPdXRwdXQ6ZGlkT3V0cHV0QXR0cmlidXRlZFN0 cmluZ3M6bmF0aXZlU2FtcGxlQnVmZmVyczpmb3JJdGVtVGltZTpdKToKKyAgICAgICAgKC1bV2Vi Q29yZUFWRk1vdmllT2JzZXJ2ZXIgbWV0YWRhdGFPdXRwdXQ6ZGlkT3V0cHV0VGltZWRNZXRhZGF0 YUdyb3Vwczpmcm9tUGxheWVySXRlbVRyYWNrOl0pOgorICAgICAgICAoLVtXZWJDb3JlQVZGTG9h ZGVyRGVsZWdhdGUgcmVzb3VyY2VMb2FkZXI6ZGlkQ2FuY2VsTG9hZGluZ1JlcXVlc3Q6XSk6CisK IDIwMjEtMDUtMTIgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAK ICAgICAgICAgU29tZSB3ZWJnbC8yLjAuMC9jb25mb3JtYW5jZS90ZXh0dXJlcy9pbWFnZV9iaXRt YXBfZnJvbV9pbWFnZV9kYXRhIHRlc3RzIGFyZSBmYWlsaW5nIGFmdGVyIHIyNzczNjkgaWYgIVVT RShBQ0NFTEVSQVRFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uLmNwcAppbmRleCAyNTcwNThkZmQyMDZhMTM5MjIwOWM2NzM2OTlhZmNm NGM4NmM4YTdmLi4wZDE5ZGRiMzQxMWY0MTZmYzJlM2RiN2JmMjBlYWEyNTUzNTU1ZjI2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQ bGF0Zm9ybUxheWVyLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1UaW1lUmFuZ2VzLmgiCisjaW5jbHVk ZSAiU2NyaXB0RGlzYWxsb3dlZFNjb3BlLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNs dWRlIDxDb3JlTWVkaWEvQ29yZU1lZGlhLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvRGF0 YVZpZXcuaD4KQEAgLTQ3Nyw2ICs0NzgsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbjo6dXBkYXRlU3RhdGVzKCkKICAgICBpZiAobV9pZ25vcmVMb2FkU3RhdGVDaGFuZ2Vz KQogICAgICAgICByZXR1cm47CiAKKyAgICBTY3JpcHREaXNhbGxvd2VkU2NvcGU6OkluTWFpblRo cmVhZCBzY3JpcHREaXNhbGxvd2VkU2NvcGU7CisKICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0 YXRlIG5ld05ldHdvcmtTdGF0ZSA9IG1fbmV0d29ya1N0YXRlOwogICAgIE1lZGlhUGxheWVyOjpS ZWFkeVN0YXRlIG5ld1JlYWR5U3RhdGUgPSBtX3JlYWR5U3RhdGU7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCmluZGV4IDVhYTE3ZGY3NDc5ZTU4ZGViMTM1ODM2MWRlZTM5NTc4MjlmOGE1YWIuLjcz MTNjMjRlY2Y1NjgzOWE5YjI1ZTA5ZjUwNDc2ZmYxZThmYzRkM2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQy5tbQpAQCAtNTMsNiArNTMsNyBAQAogI2ltcG9ydCAiUGl4ZWxCdWZmZXJDb25mb3JtZXJD Vi5oIgogI2ltcG9ydCAiUGxhdGZvcm1UaW1lUmFuZ2VzLmgiCiAjaW1wb3J0ICJSdW50aW1lQXBw bGljYXRpb25DaGVja3MuaCIKKyNpbXBvcnQgIlNjcmlwdERpc2FsbG93ZWRTY29wZS5oIgogI2lt cG9ydCAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbXBvcnQgIlNlcmlhbGl6ZWRQbGF0Zm9ybURhdGFD dWVNYWMuaCIKICNpbXBvcnQgIlNoYXJlZEJ1ZmZlci5oIgpAQCAtMzYxOCw2ICszNjE5LDkgQEAg TlNBcnJheSogcGxheWVyS1ZPUHJvcGVydGllcygpCiAgICAgICAgIG1fdGFza1F1ZXVlLmVucXVl dWVUYXNrKFtwbGF5ZXIgPSBtX3BsYXllciwga2V5UGF0aCA9IFdURk1vdmUoa2V5UGF0aCksIGNo YW5nZSA9IFdURk1vdmUoY2hhbmdlKSwgb2JqZWN0ID0gV1RGTW92ZShvYmplY3QpLCBjb250ZXh0 XSB7CiAgICAgICAgICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgICAgIFNjcmlwdERpc2FsbG93ZWRTY29wZTo6SW5NYWluVGhyZWFkIHNjcmlwdERp c2FsbG93ZWRTY29wZTsKKwogICAgICAgICAgICAgaWQgbmV3VmFsdWUgPSBbY2hhbmdlIHZhbHVl Rm9yS2V5Ok5TS2V5VmFsdWVDaGFuZ2VOZXdLZXldOwogICAgICAgICAgICAgYm9vbCB3aWxsQ2hh bmdlID0gW1tjaGFuZ2UgdmFsdWVGb3JLZXk6TlNLZXlWYWx1ZUNoYW5nZU5vdGlmaWNhdGlvbklz UHJpb3JLZXldIGJvb2xWYWx1ZV07CiAgICAgICAgICAgICBib29sIHNob3VsZExvZ1ZhbHVlID0g IXdpbGxDaGFuZ2U7CkBAIC0zNzE0LDYgKzM3MTgsOSBAQCBOU0FycmF5KiBwbGF5ZXJLVk9Qcm9w ZXJ0aWVzKCkKICAgICAgICAgbV90YXNrUXVldWUuZW5xdWV1ZVRhc2soW3BsYXllciA9IG1fcGxh eWVyLCBzdHJpbmdzID0gV1RGTW92ZShzdHJpbmdzKSwgbmF0aXZlU2FtcGxlcyA9IFdURk1vdmUo bmF0aXZlU2FtcGxlcyksIGl0ZW1UaW1lXSB7CiAgICAgICAgICAgICBpZiAoIXBsYXllcikKICAg ICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIFNjcmlwdERpc2FsbG93ZWRTY29w ZTo6SW5NYWluVGhyZWFkIHNjcmlwdERpc2FsbG93ZWRTY29wZTsKKwogICAgICAgICAgICAgTWVk aWFUaW1lIHRpbWUgPSBzdGQ6Om1heChQQUw6OnRvTWVkaWFUaW1lKGl0ZW1UaW1lKSwgTWVkaWFU aW1lOjp6ZXJvVGltZSgpKTsKICAgICAgICAgICAgIHBsYXllci0+cHJvY2Vzc0N1ZShzdHJpbmdz LmdldCgpLCBuYXRpdmVTYW1wbGVzLmdldCgpLCB0aW1lKTsKICAgICAgICAgfSk7CkBAIC0zNzQ1 LDYgKzM3NTIsOCBAQCBOU0FycmF5KiBwbGF5ZXJLVk9Qcm9wZXJ0aWVzKCkKICAgICAgICAgaWYg KCFwbGF5ZXIpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgU2NyaXB0RGlzYWxsb3dl ZFNjb3BlOjpJbk1haW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOworCiAgICAgICAgIGZv ciAoQVZUaW1lZE1ldGFkYXRhR3JvdXAgKmdyb3VwIGluIG1ldGFkYXRhR3JvdXBzLmdldCgpKQog ICAgICAgICAgICAgcGxheWVyLT5tZXRhZGF0YURpZEFycml2ZShyZXRhaW5QdHIoZ3JvdXAuaXRl bXMpLCBjdXJyZW50VGltZSk7CiAgICAgfSk7CkBAIC0zODE0LDYgKzM4MjMsOSBAQCBOU0FycmF5 KiBwbGF5ZXJLVk9Qcm9wZXJ0aWVzKCkKICAgICBVTlVTRURfUEFSQU0ocmVzb3VyY2VMb2FkZXIp OwogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2VsZiwgc3Ryb25nU2VsZiA9IHJldGFpblB0cihz ZWxmKSwgbG9hZGluZ1JlcXVlc3QgPSByZXRhaW5QdHIobG9hZGluZ1JlcXVlc3QpXSgpIG11dGFi bGUgewogICAgICAgICBtX3Rhc2tRdWV1ZS5lbnF1ZXVlVGFzayhbcGxheWVyID0gbV9wbGF5ZXIs IGxvYWRpbmdSZXF1ZXN0ID0gV1RGTW92ZShsb2FkaW5nUmVxdWVzdCldIHsKKworICAgICAgICAg ICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJbk1haW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNj b3BlOworCiAgICAgICAgICAgICBpZiAocGxheWVyKQogICAgICAgICAgICAgICAgIHBsYXllci0+ ZGlkQ2FuY2VsTG9hZGluZ1JlcXVlc3QobG9hZGluZ1JlcXVlc3QuZ2V0KCkpOwogICAgICAgICB9 KTsK