209919 2020-04-02 12:19:47 -0700 Don't call -[AVCapture startRunning] when interruption ends 2020-04-02 17:14:04 -0700 1 1 1 Unclassified WebKit WebRTC Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1637006 0 eric.carlson 2020-04-02 12:19:47 -0700 Don't call -[AVCapture startRunning] when interruption ends 1637007 1 eric.carlson 2020-04-02 12:20:19 -0700 <rdar://problem/61090625> 1637015 2 395288 eric.carlson 2020-04-02 12:44:52 -0700 Created attachment 395288 Patch 1637025 3 395288 youennf 2020-04-02 13:14:41 -0700 Comment on attachment 395288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395288&action=review > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:623 > m_interruption = InterruptionReason::None; Maybe we could switch m_interruption to "boolean m_interrupted"? > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:698 > + if (!willChange && m_callback->loggerPtr() && m_callback->logger().willLog(m_callback->logChannel(), WTFLogLevel::Always)) { Why !willChange? I would think could write it as if (willChange) or maybe if(isChanging). Should we return early if wilChange is true? 1637083 4 395305 eric.carlson 2020-04-02 14:52:29 -0700 Created attachment 395305 Patch for landing 1637102 5 395288 eric.carlson 2020-04-02 15:30:45 -0700 Comment on attachment 395288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395288&action=review >> Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:623 >> m_interruption = InterruptionReason::None; > > Maybe we could switch m_interruption to "boolean m_interrupted"? Good idea, fixed. >> Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:698 >> + if (!willChange && m_callback->loggerPtr() && m_callback->logger().willLog(m_callback->logChannel(), WTFLogLevel::Always)) { > > Why !willChange? > I would think could write it as if (willChange) or maybe if(isChanging). > > Should we return early if wilChange is true? Also a good idea, also fixed. 1637168 6 ews-feeder 2020-04-02 17:14:03 -0700 Committed r259430: <https://trac.webkit.org/changeset/259430> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395305. 395288 2020-04-02 12:44:52 -0700 2020-04-02 14:52:25 -0700 Patch bug-209919-20200402124451.patch text/plain 3093 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJiYjIxNzcyYTM2ZDUw ZWM4NjIwN2FjZWM1NTVkMjlhYTJkOTVhMC4uZGU5YjhiZTA2ZmU5Y2U1NmFlNTMxNThjODM5OTM1 YjgxNTdiZDdmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA0LTAyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNhbGwg LVtBVkNhcHR1cmUgc3RhcnRSdW5uaW5nXSB3aGVuIGludGVycnVwdGlvbiBlbmRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5MTkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzYxMDkwNjI1PgorCisgICAgICAgIENhbGxpbmcgLVtBVkNhcHR1cmVT ZXNzaW9uIHN0YXJ0UnVubmluZ10gYWZ0ZXIgYSBWaWRlb05vdEFsbG93ZWRJblNpZGVCeVNpZGUg aW50ZXJydXB0aW9uCisgICAgICAgIGVuZHMgdHJpZ2dlcnMgYSBidWcgaW4gQVZDYXB0dXJlIHRo YXQgaGFuZ3MgdGhlIGFwcCBmb3Igc2V2ZXJhbCBzZWNvbmRzLCBidXQgcmVzdGFydGluZyB0aGUK KyAgICAgICAgY2FwdHVyZSBzZXNzaW9uIGlzbid0IG5lY2Vzc2FyeSBiZWNhdXNlIGl0IHdpbGwg cmVzdGFydCBhdXRvbWF0aWNhbGx5IGluIHRoYXQgY2FzZS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW06CisgICAg ICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Npb25FbmRJbnRl cnJ1cHRpb24pOiBEb24ndCByZXN0YXJ0IHRoZSBzZXNzaW9uLgorICAgICAgICAoLVtXZWJDb3Jl QVZWaWRlb0NhcHR1cmVTb3VyY2VPYnNlcnZlciBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOm9mT2Jq ZWN0OmNoYW5nZTpjb250ZXh0Ol0pOgorICAgICAgICBEcml2ZS1ieSBmaXg6IGFsd2F5cyBsb2cg bm90aWZpY2F0aW9ucyB0byBoZWxwIHdpdGggZGVidWdnaW5nLgorCiAyMDIwLTA0LTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cC90ZXN0cy9uYXZpZ2F0 aW9uL3BhZ2UtY2FjaGUtZm9udGZhY2VzZXQuaHRtbCBpcyBmbGFreSBjcmFzaGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0 dXJlU291cmNlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FW VmlkZW9DYXB0dXJlU291cmNlLm1tCmluZGV4IDE1MjhkNGVjMTllOTQ0NTE3NjY2YjAwZDYxYzQ3 N2FiMzBhNmU0YjkuLmUwMWI3MTNiYTIxODFlNzM5YjYwZWVhOTk4OWUxOWYwYjhhMzI1NGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVv Q2FwdHVyZVNvdXJjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KQEAgLTYyMCwxNSArNjIwLDcgQEAgdm9pZCBB VlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Npb25CZWdpbkludGVycnVwdGlvbihSZXRh aW5QdHI8TlNOb3RpZmljYXQKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNz aW9uRW5kSW50ZXJydXB0aW9uKFJldGFpblB0cjxOU05vdGlmaWNhdGlvbj4pCiB7CiAgICAgQUxX QVlTX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUik7Ci0KLSAgICBJbnRlcnJ1cHRp b25SZWFzb24gcmVhc29uID0gbV9pbnRlcnJ1cHRpb247Ci0KICAgICBtX2ludGVycnVwdGlvbiA9 IEludGVycnVwdGlvblJlYXNvbjo6Tm9uZTsKLSAgICBpZiAocmVhc29uICE9IEludGVycnVwdGlv blJlYXNvbjo6VmlkZW9Ob3RBbGxvd2VkSW5TaWRlQnlTaWRlIHx8IG1faXNSdW5uaW5nIHx8ICFt X3Nlc3Npb24pCi0gICAgICAgIHJldHVybjsKLQotICAgIFttX3Nlc3Npb24gc3RhcnRSdW5uaW5n XTsKLSAgICBtX2lzUnVubmluZyA9IFttX3Nlc3Npb24gaXNSdW5uaW5nXTsKIH0KICNlbmRpZgog CkBAIC03MDMsOSArNjk1LDggQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6ZGV2aWNlRGlz Y29ubmVjdGVkKFJldGFpblB0cjxOU05vdGlmaWNhdGlvbj4gbm90aWZpY2EKICAgICBib29sIHdp bGxDaGFuZ2UgPSBbW2NoYW5nZSB2YWx1ZUZvcktleTpOU0tleVZhbHVlQ2hhbmdlTm90aWZpY2F0 aW9uSXNQcmlvcktleV0gYm9vbFZhbHVlXTsKIAogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAot ICAgIGlmIChtX2NhbGxiYWNrLT5sb2dnZXJQdHIoKSAmJiBtX2NhbGxiYWNrLT5sb2dnZXIoKS53 aWxsTG9nKG1fY2FsbGJhY2stPmxvZ0NoYW5uZWwoKSwgV1RGTG9nTGV2ZWw6OkRlYnVnKSkgewor ICAgIGlmICghd2lsbENoYW5nZSAmJiBtX2NhbGxiYWNrLT5sb2dnZXJQdHIoKSAmJiBtX2NhbGxi YWNrLT5sb2dnZXIoKS53aWxsTG9nKG1fY2FsbGJhY2stPmxvZ0NoYW5uZWwoKSwgV1RGTG9nTGV2 ZWw6OkFsd2F5cykpIHsKICAgICAgICAgYXV0byBpZGVudGlmaWVyID0gTG9nZ2VyOjpMb2dTaXRl SWRlbnRpZmllcigiQVZWaWRlb0NhcHR1cmVTb3VyY2UiLCAib2JzZXJ2ZVZhbHVlRm9yS2V5UGF0 aCIsIG1fY2FsbGJhY2stPmxvZ0lkZW50aWZpZXIoKSk7Ci0KICAgICAgICAgUmV0YWluUHRyPE5T U3RyaW5nPiB2YWx1ZVN0cmluZyA9IGFkb3B0TlMoW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhG b3JtYXQ6QCIlQCIsIG5ld1ZhbHVlXSk7CiAgICAgICAgIG1fY2FsbGJhY2stPmxvZ2dlcigpLmRl YnVnKG1fY2FsbGJhY2stPmxvZ0NoYW5uZWwoKSwgaWRlbnRpZmllciwgImRpZCBjaGFuZ2UgJyIs IFtrZXlQYXRoIFVURjhTdHJpbmddLCAiJyB0byAiLCBbdmFsdWVTdHJpbmcuZ2V0KCkgVVRGOFN0 cmluZ10pOwogICAgIH0K 395305 2020-04-02 14:52:29 -0700 2020-04-02 17:14:04 -0700 Patch for landing bug-209919-20200402145228.patch text/plain 7857 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJiYjIxNzcyYTM2ZDUw ZWM4NjIwN2FjZWM1NTVkMjlhYTJkOTVhMC4uYjQ0YTVkODU0NjM1MzU3MmJmZmI3NTNlNzRmZjI3 OTgwMDAzZDBkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA0LTAyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNhbGwg LVtBVkNhcHR1cmUgc3RhcnRSdW5uaW5nXSB3aGVuIGludGVycnVwdGlvbiBlbmRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5MTkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzYxMDkwNjI1PgorCisgICAgICAgIENhbGxpbmcgLVtBVkNhcHR1cmVT ZXNzaW9uIHN0YXJ0UnVubmluZ10gYWZ0ZXIgYSBWaWRlb05vdEFsbG93ZWRJblNpZGVCeVNpZGUg aW50ZXJydXB0aW9uCisgICAgICAgIGVuZHMgdHJpZ2dlcnMgYSBidWcgaW4gQVZDYXB0dXJlIHRo YXQgaGFuZ3MgdGhlIGFwcCBmb3Igc2V2ZXJhbCBzZWNvbmRzLCBidXQgcmVzdGFydGluZyB0aGUK KyAgICAgICAgY2FwdHVyZSBzZXNzaW9uIGlzbid0IG5lY2Vzc2FyeSBiZWNhdXNlIGl0IHdpbGwg cmVzdGFydCBhdXRvbWF0aWNhbGx5IGluIHRoYXQgY2FzZS4KKworICAgICAgICBSZXZpZXdlZCBi eSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseS4KKworICAgICAgICAq IHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oOiBSZW1vdmUg SW50ZXJydXB0aW9uUmVhc29uIGVudW0sIGNvbnZlcnQKKyAgICAgICAgbV9pbnRlcnJ1cHRpb24g dG8gbV9pbnRlcnJ1cHRlZCBib29sCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1 cmVTb3VyY2U6OkFWVmlkZW9DYXB0dXJlU291cmNlKTogUmVtb3ZlIEludGVycnVwdGlvblJlYXNv biBlbnVtIGNoZWNraW5nLgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6 OnN0b3BQcm9kdWNpbmdEYXRhKTogbV9pbnRlcnJ1cHRpb24gLT4gbV9pbnRlcnJ1cHRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjppbnRlcnJ1cHRlZCBjb25zdCk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVT ZXNzaW9uQmVnaW5JbnRlcnJ1cHRpb24pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkFWVmlk ZW9DYXB0dXJlU291cmNlOjpjYXB0dXJlU2Vzc2lvbkVuZEludGVycnVwdGlvbik6IERpdHRvLiBE b24ndCByZXN0YXJ0IHRoZSBzZXNzaW9uLgorICAgICAgICAoLVtXZWJDb3JlQVZWaWRlb0NhcHR1 cmVTb3VyY2VPYnNlcnZlciBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOm9mT2JqZWN0OmNoYW5nZTpj b250ZXh0Ol0pOgorICAgICAgICBEcml2ZS1ieSBmaXg6IGFsd2F5cyBsb2cgbm90aWZpY2F0aW9u cyB0byBoZWxwIHdpdGggZGVidWdnaW5nLgorCiAyMDIwLTA0LTAxICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3BhZ2UtY2Fj aGUtZm9udGZhY2VzZXQuaHRtbCBpcyBmbGFreSBjcmFzaGluZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVT b3VyY2UuaAppbmRleCAyYTg1YWQ0NDYwOWE5ZDM1NDY0Y2RlODEwODg4OTVlZTJhN2NkYjczLi4z ZmIwMTgzYWIzYTY5NTU2MDdmN2U0YmE4Y2EwYmIwN2U3NjIxZDRkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0Nh cHR1cmVTb3VyY2UuaApAQCAtNTcsNyArNTcsNiBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VY UE9SVCBzdGF0aWMgVmlkZW9DYXB0dXJlRmFjdG9yeSYgZmFjdG9yeSgpOwogCi0gICAgZW51bSBj bGFzcyBJbnRlcnJ1cHRpb25SZWFzb24geyBOb25lLCBWaWRlb05vdEFsbG93ZWRJbkJhY2tncm91 bmQsIEF1ZGlvSW5Vc2UsIFZpZGVvSW5Vc2UsIFZpZGVvTm90QWxsb3dlZEluU2lkZUJ5U2lkZSB9 OwogICAgIHZvaWQgY2FwdHVyZVNlc3Npb25CZWdpbkludGVycnVwdGlvbihSZXRhaW5QdHI8TlNO b3RpZmljYXRpb24+KTsKICAgICB2b2lkIGNhcHR1cmVTZXNzaW9uRW5kSW50ZXJydXB0aW9uKFJl dGFpblB0cjxOU05vdGlmaWNhdGlvbj4pOwogICAgIHZvaWQgZGV2aWNlRGlzY29ubmVjdGVkKFJl dGFpblB0cjxOU05vdGlmaWNhdGlvbj4pOwpAQCAtMTM0LDggKzEzMyw4IEBAIHByaXZhdGU6CiAg ICAgUmVmUHRyPEFWVmlkZW9QcmVzZXQ+IG1fY3VycmVudFByZXNldDsKICAgICBJbnRTaXplIG1f Y3VycmVudFNpemU7CiAgICAgZG91YmxlIG1fY3VycmVudEZyYW1lUmF0ZTsKLSAgICBJbnRlcnJ1 cHRpb25SZWFzb24gbV9pbnRlcnJ1cHRpb24geyBJbnRlcnJ1cHRpb25SZWFzb246Ok5vbmUgfTsK ICAgICBpbnQgbV9mcmFtZXNUb0Ryb3BBdFN0YXJ0dXAgeyAwIH07CisgICAgYm9vbCBtX2ludGVy cnVwdGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNSdW5uaW5nIHsgZmFsc2UgfTsKIH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZp ZGVvQ2FwdHVyZVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQppbmRleCAxNTI4ZDRlYzE5ZTk0NDUxNzY2NmIw MGQ2MWM0NzdhYjMwYTZlNGI5Li4wODU1ZjJiNDRiOGU2ZWI2ZjU5ZTJhOGNjMTEyNGJkYTBmNWIz NmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv QVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCkBAIC0xMzAsMTMgKzEzMCw2IEBA IEFWVmlkZW9DYXB0dXJlU291cmNlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZShBVkNhcHR1cmVEZXZp Y2UqIGRldmljZSwgU3RyaW5nJiYgaWQsCiAgICAgLCBtX29iamNPYnNlcnZlcihhZG9wdE5TKFtb V2ViQ29yZUFWVmlkZW9DYXB0dXJlU291cmNlT2JzZXJ2ZXIgYWxsb2NdIGluaXRXaXRoQ2FsbGJh Y2s6dGhpc10pKQogICAgICwgbV9kZXZpY2UoZGV2aWNlKQogewotI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCi0gICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxpbnQ+KEludGVycnVwdGlvblJl YXNvbjo6VmlkZW9Ob3RBbGxvd2VkSW5CYWNrZ3JvdW5kKSA9PSBzdGF0aWNfY2FzdDxpbnQ+KEFW Q2FwdHVyZVNlc3Npb25JbnRlcnJ1cHRpb25SZWFzb25WaWRlb0RldmljZU5vdEF2YWlsYWJsZUlu QmFja2dyb3VuZCksICJJbnRlcnJ1cHRpb25SZWFzb246OlZpZGVvTm90QWxsb3dlZEluQmFja2dy b3VuZCBpcyBub3QgQVZDYXB0dXJlU2Vzc2lvbkludGVycnVwdGlvblJlYXNvblZpZGVvRGV2aWNl Tm90QXZhaWxhYmxlSW5CYWNrZ3JvdW5kIGFzIGV4cGVjdGVkIik7Ci0gICAgc3RhdGljX2Fzc2Vy dChzdGF0aWNfY2FzdDxpbnQ+KEludGVycnVwdGlvblJlYXNvbjo6VmlkZW9Ob3RBbGxvd2VkSW5T aWRlQnlTaWRlKSA9PSBBVkNhcHR1cmVTZXNzaW9uSW50ZXJydXB0aW9uUmVhc29uVmlkZW9EZXZp Y2VOb3RBdmFpbGFibGVXaXRoTXVsdGlwbGVGb3JlZ3JvdW5kQXBwcywgIkludGVycnVwdGlvblJl YXNvbjo6VmlkZW9Ob3RBbGxvd2VkSW5TaWRlQnlTaWRlIGlzIG5vdCBBVkNhcHR1cmVTZXNzaW9u SW50ZXJydXB0aW9uUmVhc29uVmlkZW9EZXZpY2VOb3RBdmFpbGFibGVXaXRoTXVsdGlwbGVGb3Jl Z3JvdW5kQXBwcyBhcyBleHBlY3RlZCIpOwotICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8 aW50PihJbnRlcnJ1cHRpb25SZWFzb246OlZpZGVvSW5Vc2UpID09IEFWQ2FwdHVyZVNlc3Npb25J bnRlcnJ1cHRpb25SZWFzb25WaWRlb0RldmljZUluVXNlQnlBbm90aGVyQ2xpZW50LCAiSW50ZXJy dXB0aW9uUmVhc29uOjpWaWRlb0luVXNlIGlzIG5vdCBBVkNhcHR1cmVTZXNzaW9uSW50ZXJydXB0 aW9uUmVhc29uVmlkZW9EZXZpY2VJblVzZUJ5QW5vdGhlckNsaWVudCBhcyBleHBlY3RlZCIpOwot ICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8aW50PihJbnRlcnJ1cHRpb25SZWFzb246OkF1 ZGlvSW5Vc2UpID09IEFWQ2FwdHVyZVNlc3Npb25JbnRlcnJ1cHRpb25SZWFzb25BdWRpb0Rldmlj ZUluVXNlQnlBbm90aGVyQ2xpZW50LCAiSW50ZXJydXB0aW9uUmVhc29uOjpBdWRpb0luVXNlIGlz IG5vdCBBVkNhcHR1cmVTZXNzaW9uSW50ZXJydXB0aW9uUmVhc29uQXVkaW9EZXZpY2VJblVzZUJ5 QW5vdGhlckNsaWVudCBhcyBleHBlY3RlZCIpOwotI2VuZGlmCi0KICAgICBbbV9kZXZpY2UuZ2V0 KCkgYWRkT2JzZXJ2ZXI6bV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgZm9yS2V5UGF0aDpAInN1c3BlbmRl ZCIgb3B0aW9uczpOU0tleVZhbHVlT2JzZXJ2aW5nT3B0aW9uTmV3IGNvbnRleHQ6KHZvaWQgKilu aWxdOwogfQogCkBAIC0xOTEsNyArMTg0LDggQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6 c3RvcFByb2R1Y2luZ0RhdGEoKQogICAgIGlmIChbbV9zZXNzaW9uIGlzUnVubmluZ10pCiAgICAg ICAgIFttX3Nlc3Npb24gc3RvcFJ1bm5pbmddOwogCi0gICAgbV9pbnRlcnJ1cHRpb24gPSBJbnRl cnJ1cHRpb25SZWFzb246Ok5vbmU7CisgICAgbV9pbnRlcnJ1cHRlZCA9IGZhbHNlOworCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBjbGVhclNlc3Npb24oKTsKICNlbmRpZgpAQCAtNTY5 LDcgKzU2Myw3IEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVEZXZpY2VTdXNw ZW5kZWREaWRDaGFuZ2UoKQogCiBib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjppbnRlcnJ1cHRl ZCgpIGNvbnN0CiB7Ci0gICAgaWYgKG1faW50ZXJydXB0aW9uICE9IEludGVycnVwdGlvblJlYXNv bjo6Tm9uZSkKKyAgICBpZiAobV9pbnRlcnJ1cHRlZCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAK ICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6aW50ZXJydXB0ZWQoKTsKQEAgLTYxNCwy MSArNjA4LDEzIEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uUnVu dGltZUVycm9yKFJldGFpblB0cjxOU0Vycm9yPiBlcnJvcikKIHZvaWQgQVZWaWRlb0NhcHR1cmVT b3VyY2U6OmNhcHR1cmVTZXNzaW9uQmVnaW5JbnRlcnJ1cHRpb24oUmV0YWluUHRyPE5TTm90aWZp Y2F0aW9uPiBub3RpZmljYXRpb24pCiB7CiAgICAgQUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwg TE9HSURFTlRJRklFUiwgW25vdGlmaWNhdGlvbi5nZXQoKS51c2VySW5mb1tBVkNhcHR1cmVTZXNz aW9uSW50ZXJydXB0aW9uUmVhc29uS2V5XSBpbnRlZ2VyVmFsdWVdKTsKLSAgICBtX2ludGVycnVw dGlvbiA9IHN0YXRpY19jYXN0PEFWVmlkZW9DYXB0dXJlU291cmNlOjpJbnRlcnJ1cHRpb25SZWFz b24+KFtub3RpZmljYXRpb24uZ2V0KCkudXNlckluZm9bQVZDYXB0dXJlU2Vzc2lvbkludGVycnVw dGlvblJlYXNvbktleV0gaW50ZWdlclZhbHVlXSk7CisgICAgbV9pbnRlcnJ1cHRlZCA9IHRydWU7 CiB9CiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uRW5kSW50ZXJy dXB0aW9uKFJldGFpblB0cjxOU05vdGlmaWNhdGlvbj4pCiB7CiAgICAgQUxXQVlTX0xPR19JRihs b2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUik7Ci0KLSAgICBJbnRlcnJ1cHRpb25SZWFzb24gcmVh c29uID0gbV9pbnRlcnJ1cHRpb247Ci0KLSAgICBtX2ludGVycnVwdGlvbiA9IEludGVycnVwdGlv blJlYXNvbjo6Tm9uZTsKLSAgICBpZiAocmVhc29uICE9IEludGVycnVwdGlvblJlYXNvbjo6Vmlk ZW9Ob3RBbGxvd2VkSW5TaWRlQnlTaWRlIHx8IG1faXNSdW5uaW5nIHx8ICFtX3Nlc3Npb24pCi0g ICAgICAgIHJldHVybjsKLQotICAgIFttX3Nlc3Npb24gc3RhcnRSdW5uaW5nXTsKLSAgICBtX2lz UnVubmluZyA9IFttX3Nlc3Npb24gaXNSdW5uaW5nXTsKKyAgICBtX2ludGVycnVwdGVkID0gZmFs c2U7CiB9CiAjZW5kaWYKIApAQCAtNjk5LDIxICs2ODUsMjIgQEAgdm9pZCBBVlZpZGVvQ2FwdHVy ZVNvdXJjZTo6ZGV2aWNlRGlzY29ubmVjdGVkKFJldGFpblB0cjxOU05vdGlmaWNhdGlvbj4gbm90 aWZpY2EKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWQgbmV3VmFsdWUgPSBbY2hhbmdlIHZhbHVl Rm9yS2V5Ok5TS2V5VmFsdWVDaGFuZ2VOZXdLZXldOwotCiAgICAgYm9vbCB3aWxsQ2hhbmdlID0g W1tjaGFuZ2UgdmFsdWVGb3JLZXk6TlNLZXlWYWx1ZUNoYW5nZU5vdGlmaWNhdGlvbklzUHJpb3JL ZXldIGJvb2xWYWx1ZV07CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBpZiAobV9j YWxsYmFjay0+bG9nZ2VyUHRyKCkgJiYgbV9jYWxsYmFjay0+bG9nZ2VyKCkud2lsbExvZyhtX2Nh bGxiYWNrLT5sb2dDaGFubmVsKCksIFdURkxvZ0xldmVsOjpEZWJ1ZykpIHsKKyAgICBpZiAobV9j YWxsYmFjay0+bG9nZ2VyUHRyKCkpIHsKICAgICAgICAgYXV0byBpZGVudGlmaWVyID0gTG9nZ2Vy OjpMb2dTaXRlSWRlbnRpZmllcigiQVZWaWRlb0NhcHR1cmVTb3VyY2UiLCAib2JzZXJ2ZVZhbHVl Rm9yS2V5UGF0aCIsIG1fY2FsbGJhY2stPmxvZ0lkZW50aWZpZXIoKSk7Ci0KICAgICAgICAgUmV0 YWluUHRyPE5TU3RyaW5nPiB2YWx1ZVN0cmluZyA9IGFkb3B0TlMoW1tOU1N0cmluZyBhbGxvY10g aW5pdFdpdGhGb3JtYXQ6QCIlQCIsIG5ld1ZhbHVlXSk7Ci0gICAgICAgIG1fY2FsbGJhY2stPmxv Z2dlcigpLmRlYnVnKG1fY2FsbGJhY2stPmxvZ0NoYW5uZWwoKSwgaWRlbnRpZmllciwgImRpZCBj aGFuZ2UgJyIsIFtrZXlQYXRoIFVURjhTdHJpbmddLCAiJyB0byAiLCBbdmFsdWVTdHJpbmcuZ2V0 KCkgVVRGOFN0cmluZ10pOworICAgICAgICBtX2NhbGxiYWNrLT5sb2dnZXIoKS5sb2dBbHdheXMo bV9jYWxsYmFjay0+bG9nQ2hhbm5lbCgpLCBpZGVudGlmaWVyLCB3aWxsQ2hhbmdlID8gIndpbGwi IDogImRpZCIsICIgY2hhbmdlICciLCBba2V5UGF0aCBVVEY4U3RyaW5nXSwgIicgdG8gIiwgW3Zh bHVlU3RyaW5nLmdldCgpIFVURjhTdHJpbmddKTsKICAgICB9CiAjZW5kaWYKIAotICAgIGlmICgh d2lsbENoYW5nZSAmJiBba2V5UGF0aCBpc0VxdWFsVG9TdHJpbmc6QCJydW5uaW5nIl0pCisgICAg aWYgKHdpbGxDaGFuZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChba2V5UGF0aCBpc0Vx dWFsVG9TdHJpbmc6QCJydW5uaW5nIl0pCiAgICAgICAgIG1fY2FsbGJhY2stPmNhcHR1cmVTZXNz aW9uSXNSdW5uaW5nRGlkQ2hhbmdlKFtuZXdWYWx1ZSBib29sVmFsdWVdKTsKLSAgICBpZiAoIXdp bGxDaGFuZ2UgJiYgW2tleVBhdGggaXNFcXVhbFRvU3RyaW5nOkAic3VzcGVuZGVkIl0pCisgICAg aWYgKFtrZXlQYXRoIGlzRXF1YWxUb1N0cmluZzpAInN1c3BlbmRlZCJdKQogICAgICAgICBtX2Nh bGxiYWNrLT5jYXB0dXJlRGV2aWNlU3VzcGVuZGVkRGlkQ2hhbmdlKCk7CiB9CiAK