218172 2020-10-26 03:53:03 -0700 [EME][GStreamer][Thunder] Make response parsing message more robust 2020-10-27 04:25:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 218171 1 calvaris calvaris cgarcia ews-watchlist gustavo menard pnormand vjaquez webkit-bug-importer oldest_to_newest 1701380 0 calvaris 2020-10-26 03:53:03 -0700 [EME][GStreamer][Thunder] Make response parsing message more robust 1701382 1 412301 calvaris 2020-10-26 04:01:02 -0700 Created attachment 412301 Patch 1701383 2 calvaris 2020-10-26 04:01:57 -0700 This patch will properly build when bug 218171 lands. 1701395 3 412301 pnormand 2020-10-26 04:49:36 -0700 Comment on attachment 412301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412301&action=review > Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp:342 > + explicit operator bool() const { return m_isValid; } > + bool operator!() const { return !m_isValid; } What is the difference between this and hasType()? Can hasType() be removed then? I'm not sure casting an Optional<> to a bool works as expected anyway. 1701424 4 calvaris 2020-10-26 06:18:03 -0700 (In reply to Philippe Normand from comment #3) > Comment on attachment 412301 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=412301&action=review > > > Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp:342 > > + explicit operator bool() const { return m_isValid; } > > + bool operator!() const { return !m_isValid; } > > What is the difference between this and hasType()? Can hasType() be removed > then? I'm not sure casting an Optional<> to a bool works as expected anyway. There is no difference. It is the same thing but it works similarly in Optional so I wanted to keep it parallel. 1701468 5 412320 calvaris 2020-10-26 09:21:17 -0700 Created attachment 412320 Patch 1701822 6 ews-feeder 2020-10-27 04:24:53 -0700 Committed r269030: <https://trac.webkit.org/changeset/269030> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412320. 1701823 7 webkit-bug-importer 2020-10-27 04:25:25 -0700 <rdar://problem/70717329> 412301 2020-10-26 04:01:02 -0700 2020-10-26 09:21:12 -0700 Patch bug-218172-20201026120101.patch text/plain 6469 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDVkNTc1ZDNiMDc5MDc2 MDRhY2RjM2ExNDRhMTkxOTg2ZmQwMDg0Yy4uMWE0NjQ0MmNjOTkwYzI2ZmNkY2UzMjJlNzAxZDI2 YmM1NWFmYWY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEwLTI2ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0VN RV1bR1N0cmVhbWVyXVtUaHVuZGVyXSBNYWtlIHJlc3BvbnNlIHBhcnNpbmcgbWVzc2FnZSBtb3Jl IHJvYnVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE4MTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UGFyc2VkUmVzcG9uc2VNZXNzYWdlIGNoZWNrcyBub3cgZm9yIGVtcHR5IGJ1ZmZlcnMgYW5kIHdl IGFzc2VydAorICAgICAgICBvbiB0aGF0IGluIHRoZSBjb2RlLiBXZSBhbHNvIGFkZCBzb21lIG90 aGVyIGNoZWNrcyB0aGF0IGNvdWxkCisgICAgICAgIHRyaWdnZXIgY3Jhc2hlcyBpZiBmYWlsZWQu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCwganVzdCBhIHJld29yay4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQYXJzZWRSZXNwb25zZU1lc3NhZ2U6OlBhcnNlZFJlc3BvbnNlTWVzc2Fn ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXJzZWRSZXNwb25zZU1lc3NhZ2U6OmlzVmFsaWQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6UGFyc2VkUmVzcG9uc2VNZXNzYWdlOjpvcGVyYXRvciBi b29sIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhcnNlZFJlc3BvbnNlTWVzc2FnZTo6b3Bl cmF0b3IhIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlU2Vzc2lvblRodW5k ZXI6OmNoYWxsZW5nZUdlbmVyYXRlZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkNETUlu c3RhbmNlU2Vzc2lvblRodW5kZXI6OnVwZGF0ZUxpY2Vuc2UpOgorICAgICAgICAoV2ViQ29yZTo6 Q0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6bG9hZFNlc3Npb24pOgorICAgICAgICAoV2ViQ29y ZTo6Q0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6cmVtb3ZlU2Vzc2lvbkRhdGEpOgorCiAyMDIw LTEwLTI0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkMgRGlzcGxheV0gSW1wbGVtZW50IGJhY2tncm91bmQgaW1hZ2UgcGFpbnRpbmcKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RN VGh1bmRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv ZW1lL0NETVRodW5kZXIuY3BwCmluZGV4IDE1MmFmNGY3YzM2OWIwZDg0YmIyN2I2OTVkMzNkZDYy NTZkZjA4YzYuLjE3MTE3MjFlZTg4ODZkYjFlMGUyNzU3NGFhNDlmMTg1ZWU0OWJkNmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RN VGh1bmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL2VtZS9DRE1UaHVuZGVyLmNwcApAQCAtMzA5LDExICszMDksMTUgQEAgY2xhc3MgUGFyc2Vk UmVzcG9uc2VNZXNzYWdlIHsKIHB1YmxpYzoKICAgICBQYXJzZWRSZXNwb25zZU1lc3NhZ2UoY29u c3QgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4mIGJ1ZmZlcikKICAgICB7Ci0gICAgICAgIGlmICghYnVm ZmVyKQorICAgICAgICBpZiAoIWJ1ZmZlciB8fCAhYnVmZmVyLT5zaXplKCkpCiAgICAgICAgICAg ICByZXR1cm47CiAKKyAgICAgICAgR1NUX0RFQlVHKCJwYXJzaW5nIGJ1ZmZlciBvZiBzaXplICV6 dSIsIGJ1ZmZlci0+c2l6ZSgpKTsKKyAgICAgICAgR1NUX01FTURVTVAoImJ1ZmZlciIsIGJ1ZmZl ci0+ZGF0YUFzVUludDhQdHIoKSwgYnVmZmVyLT5zaXplKCkpOworCiAgICAgICAgIFN0cmluZ1Zp ZXcgcGF5bG9hZChyZWludGVycHJldF9jYXN0PGNvbnN0IExDaGFyKj4oYnVmZmVyLT5kYXRhKCkp LCBidWZmZXItPnNpemUoKSk7Ci0gICAgICAgIHNpemVfdCB0eXBlUG9zaXRpb24gPSBwYXlsb2Fk LmZpbmQoIjpUeXBlOiIpOworICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nVmll dz4gdHlwZShyZWludGVycHJldF9jYXN0PGNvbnN0IExDaGFyKj4oIjpUeXBlOiIpLCA2KTsKKyAg ICAgICAgc2l6ZV90IHR5cGVQb3NpdGlvbiA9IHBheWxvYWQuZmluZCh0eXBlLCAwKTsKICAgICAg ICAgU3RyaW5nVmlldyByZXF1ZXN0VHlwZShwYXlsb2FkLmNoYXJhY3RlcnM4KCksIHR5cGVQb3Np dGlvbiAhPSBub3RGb3VuZCA/IHR5cGVQb3NpdGlvbiA6IDApOwogICAgICAgICB1bnNpZ25lZCBv ZmZzZXQgPSAwdTsKICAgICAgICAgaWYgKCFyZXF1ZXN0VHlwZS5pc0VtcHR5KCkgJiYgcmVxdWVz dFR5cGUubGVuZ3RoKCkgIT0gcGF5bG9hZC5sZW5ndGgoKSkKQEAgLTMyMywxNiArMzI3LDIyIEBA IHB1YmxpYzoKICAgICAgICAgICAgIG1fdHlwZSA9IG1ha2VPcHRpb25hbChzdGF0aWNfY2FzdDxX ZWJDb3JlOjpNZWRpYUtleU1lc3NhZ2VUeXBlPihyZXF1ZXN0VHlwZS50b0ludCgpKSk7CiAKICAg ICAgICAgbV9wYXlsb2FkID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocGF5bG9hZC5jaGFyYWN0ZXJz OCgpICsgb2Zmc2V0LCBwYXlsb2FkLmxlbmd0aCgpIC0gb2Zmc2V0KTsKKworICAgICAgICBtX2lz VmFsaWQgPSB0cnVlOwogICAgIH0KIAorICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJu IG1faXNWYWxpZDsgfQogICAgIGJvb2wgaGFzUGF5bG9hZCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRp Y19jYXN0PGJvb2w+KG1fcGF5bG9hZCk7IH0KICAgICBjb25zdCBSZWY8U2hhcmVkQnVmZmVyPiYg cGF5bG9hZCgpIGNvbnN0JiB7IEFTU0VSVChtX3BheWxvYWQpOyByZXR1cm4gbV9wYXlsb2FkLnZh bHVlKCk7IH0KICAgICBSZWY8U2hhcmVkQnVmZmVyPiYgcGF5bG9hZCgpICYgeyBBU1NFUlQobV9w YXlsb2FkKTsgcmV0dXJuIG1fcGF5bG9hZC52YWx1ZSgpOyB9CiAgICAgYm9vbCBoYXNUeXBlKCkg Y29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Ym9vbD4obV90eXBlKTsgfQogICAgIFdlYkNvcmU6 Ok1lZGlhS2V5TWVzc2FnZVR5cGUgdHlwZSgpIGNvbnN0IHsgQVNTRVJUKG1fdHlwZSk7IHJldHVy biBtX3R5cGUudmFsdWUoKTsgfQogICAgIFdlYkNvcmU6Ok1lZGlhS2V5TWVzc2FnZVR5cGUgdHlw ZU9yKFdlYkNvcmU6Ok1lZGlhS2V5TWVzc2FnZVR5cGUgYWx0ZXJuYXRlKSBjb25zdCB7IHJldHVy biBtX3R5cGUgPyBtX3R5cGUudmFsdWUoKSA6IGFsdGVybmF0ZTsgfQorICAgIGV4cGxpY2l0IG9w ZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX2lzVmFsaWQ7IH0KKyAgICBib29sIG9wZXJh dG9yISgpIGNvbnN0IHsgcmV0dXJuICFtX2lzVmFsaWQ7IH0KIAogcHJpdmF0ZToKKyAgICBib29s IG1faXNWYWxpZCB7IGZhbHNlIH07CiAgICAgT3B0aW9uYWw8UmVmPFNoYXJlZEJ1ZmZlcj4+IG1f cGF5bG9hZDsKICAgICBPcHRpb25hbDxXZWJDb3JlOjpNZWRpYUtleU1lc3NhZ2VUeXBlPiBtX3R5 cGU7CiB9OwpAQCAtMzQwLDEwICszNTAsMTIgQEAgcHJpdmF0ZToKIHZvaWQgQ0RNSW5zdGFuY2VT ZXNzaW9uVGh1bmRlcjo6Y2hhbGxlbmdlR2VuZXJhdGVkQ2FsbGJhY2soUmVmUHRyPFNoYXJlZEJ1 ZmZlcj4mJiBidWZmZXIpCiB7CiAgICAgUGFyc2VkUmVzcG9uc2VNZXNzYWdlIHBhcnNlZFJlc3Bv bnNlTWVzc2FnZShidWZmZXIpOworICAgIEFTU0VSVChwYXJzZWRSZXNwb25zZU1lc3NhZ2UpOwog CiAgICAgaWYgKCFtX2NoYWxsZW5nZUNhbGxiYWNrcy5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9t ZXNzYWdlID0gV1RGTW92ZShwYXJzZWRSZXNwb25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKLSAgICAg ICAgbV9uZWVkc0luZGl2aWR1YWxpemF0aW9uID0gcGFyc2VkUmVzcG9uc2VNZXNzYWdlLnR5cGUo KSA9PSBDRE1JbnN0YW5jZVNlc3Npb246Ok1lc3NhZ2VUeXBlOjpJbmRpdmlkdWFsaXphdGlvblJl cXVlc3Q7CisgICAgICAgIG1fbmVlZHNJbmRpdmlkdWFsaXphdGlvbiA9IHBhcnNlZFJlc3BvbnNl TWVzc2FnZS5oYXNUeXBlKCkKKyAgICAgICAgICAgICYmIHBhcnNlZFJlc3BvbnNlTWVzc2FnZS50 eXBlKCkgPT0gQ0RNSW5zdGFuY2VTZXNzaW9uOjpNZXNzYWdlVHlwZTo6SW5kaXZpZHVhbGl6YXRp b25SZXF1ZXN0OwogCiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgY2hhbGxlbmdlQ2FsbGJhY2sg OiBtX2NoYWxsZW5nZUNhbGxiYWNrcykKICAgICAgICAgICAgIGNoYWxsZW5nZUNhbGxiYWNrKCk7 CkBAIC01MjYsNiArNTM4LDcgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVuZGVyOjp1cGRh dGVMaWNlbnNlKGNvbnN0IFN0cmluZyYgc2Vzc2lvbklELCBMaWNlbnNlVHkKICAgICAgICAgICAg ICAgICAvLyBGSVhNRTogVXNpbmcgSlNPTiByZXBvbnNlIG1lc3NhZ2VzIGlzIG11Y2ggY2xlYW5l ciB0aGFuIHVzaW5nIHN0cmluZyBwcmVmaXhlcywgSSBiZWxpZXZlIHRoZXJlCiAgICAgICAgICAg ICAgICAgLy8gd2lsbCBldmVuIGJlIG90aGVyIHBhcnRzIG9mIHRoZSBzcGVjIHdoZXJlIG5vdCBo YXZpbmcgc3RydWN0dXJlZCBkYXRhIHdpbGwgYmUgYmFkLgogICAgICAgICAgICAgICAgIFBhcnNl ZFJlc3BvbnNlTWVzc2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UocmVzcG9uc2VNZXNzYWdlKTsK KyAgICAgICAgICAgICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsKICAgICAgICAg ICAgICAgICBpZiAocGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkgewogICAgICAg ICAgICAgICAgICAgICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92ZShwYXJzZWRS ZXNwb25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAgR1NUX0RFQlVH KCJnb3QgbWVzc2FnZSBvZiBzaXplICVsdSIsIG1lc3NhZ2UtPnNpemUoKSk7CkBAIC01NjAsNiAr NTczLDcgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVuZGVyOjpsb2FkU2Vzc2lvbihMaWNl bnNlVHlwZSwgY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQKICAgICAgICAgICAgICAgICAvLyBGSVhN RTogVXNpbmcgSlNPTiByZXBvbnNlIG1lc3NhZ2VzIGlzIG11Y2ggY2xlYW5lciB0aGFuIHVzaW5n IHN0cmluZyBwcmVmaXhlcywgSSBiZWxpZXZlIHRoZXJlCiAgICAgICAgICAgICAgICAgLy8gd2ls bCBldmVuIGJlIG90aGVyIHBhcnRzIG9mIHRoZSBzcGVjIHdoZXJlIG5vdCBoYXZpbmcgc3RydWN0 dXJlZCBkYXRhIHdpbGwgYmUgYmFkLgogICAgICAgICAgICAgICAgIFBhcnNlZFJlc3BvbnNlTWVz c2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UocmVzcG9uc2VNZXNzYWdlKTsKKyAgICAgICAgICAg ICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsKICAgICAgICAgICAgICAgICBpZiAo cGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkgewogICAgICAgICAgICAgICAgICAg ICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92ZShwYXJzZWRSZXNwb25zZU1lc3Nh Z2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJnb3QgbWVzc2Fn ZSBvZiBzaXplICVsdSIsIG1lc3NhZ2UtPnNpemUoKSk7CkBAIC02MDYsNiArNjIwLDcgQEAgdm9p ZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVuZGVyOjpyZW1vdmVTZXNzaW9uRGF0YShjb25zdCBTdHJp bmcmIHNlc3Npb25JRCwgTGljZW4KICAgICAgICAgICAgICAgICBjYWxsYmFjayhtX2tleVN0b3Jl LmFsbEtleXNBcyhNZWRpYUtleVN0YXR1czo6UmVsZWFzZWQpLCBXVEY6Om51bGxvcHQsIFN1Y2Nl c3NWYWx1ZTo6U3VjY2VlZGVkKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAg IFBhcnNlZFJlc3BvbnNlTWVzc2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UoYnVmZmVyKTsKKyAg ICAgICAgICAgICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsKICAgICAgICAgICAg ICAgICBpZiAocGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkgewogICAgICAgICAg ICAgICAgICAgICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92ZShwYXJzZWRSZXNw b25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJz ZXNzaW9uICVzIHJlbW92ZWQsIG1lc3NhZ2UgbGVuZ3RoICVsdSIsIG1fc2Vzc2lvbklELnV0Zjgo KS5kYXRhKCksIG1lc3NhZ2UtPnNpemUoKSk7Cg== 412320 2020-10-26 09:21:17 -0700 2020-10-27 04:24:54 -0700 Patch bug-218172-20201026172116.patch text/plain 6421 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBhN2M2MDQ5ZWJhZTYw ODU0OWJkNWFlMDVjZWI3ZTk0YzkzMjZiMS4uMWFjNzk2ZTU2ODQ4NGZlMGZjNmIzOWFlZDYyMDYz NjE0NjJjMTM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEwLTI2ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0VN RV1bR1N0cmVhbWVyXVtUaHVuZGVyXSBNYWtlIHJlc3BvbnNlIHBhcnNpbmcgbWVzc2FnZSBtb3Jl IHJvYnVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE4MTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UGFyc2VkUmVzcG9uc2VNZXNzYWdlIGNoZWNrcyBub3cgZm9yIGVtcHR5IGJ1ZmZlcnMgYW5kIHdl IGFzc2VydAorICAgICAgICBvbiB0aGF0IGluIHRoZSBjb2RlLiBXZSBhbHNvIGFkZCBzb21lIG90 aGVyIGNoZWNrcyB0aGF0IGNvdWxkCisgICAgICAgIHRyaWdnZXIgY3Jhc2hlcyBpZiBmYWlsZWQu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCwganVzdCBhIHJld29yay4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQYXJzZWRSZXNwb25zZU1lc3NhZ2U6OlBhcnNlZFJlc3BvbnNlTWVzc2Fn ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXJzZWRSZXNwb25zZU1lc3NhZ2U6OmlzVmFsaWQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6UGFyc2VkUmVzcG9uc2VNZXNzYWdlOjpvcGVyYXRvciBi b29sIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhcnNlZFJlc3BvbnNlTWVzc2FnZTo6b3Bl cmF0b3IhIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlU2Vzc2lvblRodW5k ZXI6OmNoYWxsZW5nZUdlbmVyYXRlZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkNETUlu c3RhbmNlU2Vzc2lvblRodW5kZXI6OnVwZGF0ZUxpY2Vuc2UpOgorICAgICAgICAoV2ViQ29yZTo6 Q0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6bG9hZFNlc3Npb24pOgorICAgICAgICAoV2ViQ29y ZTo6Q0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6cmVtb3ZlU2Vzc2lvbkRhdGEpOgorCiAyMDIw LTEwLTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtl IHVzZSBvZiBzaWduYWxsaW5nIHRocmVhZCB3aGVuIGNyZWF0aW5nIHRoZSBwZWVyIGNvbm5lY3Rp b24gZmFjdG9yeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5jcHAKaW5kZXggYWI2NzYwZmUxNjM1NGIz Y2FiN2NkNWIwNTM5MmMwMWIxNzQzYjgwNi4uMDVkYWVkN2Y4OWRhZmI4MWU3YjY4MGY4YmQ1ODFj NGVlZGY1ZTQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuY3BwCkBAIC0zMTAsMTEgKzMxMCwx NCBAQCBjbGFzcyBQYXJzZWRSZXNwb25zZU1lc3NhZ2UgewogcHVibGljOgogICAgIFBhcnNlZFJl c3BvbnNlTWVzc2FnZShjb25zdCBSZWZQdHI8U2hhcmVkQnVmZmVyPiYgYnVmZmVyKQogICAgIHsK LSAgICAgICAgaWYgKCFidWZmZXIpCisgICAgICAgIGlmICghYnVmZmVyIHx8ICFidWZmZXItPnNp emUoKSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBHU1RfREVCVUcoInBhcnNpbmcg YnVmZmVyIG9mIHNpemUgJXp1IiwgYnVmZmVyLT5zaXplKCkpOworICAgICAgICBHU1RfTUVNRFVN UCgiYnVmZmVyIiwgYnVmZmVyLT5kYXRhQXNVSW50OFB0cigpLCBidWZmZXItPnNpemUoKSk7CisK ICAgICAgICAgU3RyaW5nVmlldyBwYXlsb2FkKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgTENoYXIq PihidWZmZXItPmRhdGEoKSksIGJ1ZmZlci0+c2l6ZSgpKTsKLSAgICAgICAgU3RyaW5nVmlldyB0 eXBlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgTENoYXIqPigiOlR5cGU6IiksIDYpOworICAgICAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nVmlldz4gdHlwZShyZWludGVycHJldF9jYXN0 PGNvbnN0IExDaGFyKj4oIjpUeXBlOiIpLCA2KTsKICAgICAgICAgc2l6ZV90IHR5cGVQb3NpdGlv biA9IHBheWxvYWQuZmluZCh0eXBlLCAwKTsKICAgICAgICAgU3RyaW5nVmlldyByZXF1ZXN0VHlw ZShwYXlsb2FkLmNoYXJhY3RlcnM4KCksIHR5cGVQb3NpdGlvbiAhPSBub3RGb3VuZCA/IHR5cGVQ b3NpdGlvbiA6IDApOwogICAgICAgICB1bnNpZ25lZCBvZmZzZXQgPSAwdTsKQEAgLTMyNSwxNiAr MzI4LDIyIEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fdHlwZSA9IG1ha2VPcHRpb25hbChzdGF0 aWNfY2FzdDxXZWJDb3JlOjpNZWRpYUtleU1lc3NhZ2VUeXBlPihyZXF1ZXN0VHlwZS50b0ludCgp KSk7CiAKICAgICAgICAgbV9wYXlsb2FkID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocGF5bG9hZC5j aGFyYWN0ZXJzOCgpICsgb2Zmc2V0LCBwYXlsb2FkLmxlbmd0aCgpIC0gb2Zmc2V0KTsKKworICAg ICAgICBtX2lzVmFsaWQgPSB0cnVlOwogICAgIH0KIAorICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0 IHsgcmV0dXJuIG1faXNWYWxpZDsgfQogICAgIGJvb2wgaGFzUGF5bG9hZCgpIGNvbnN0IHsgcmV0 dXJuIHN0YXRpY19jYXN0PGJvb2w+KG1fcGF5bG9hZCk7IH0KICAgICBjb25zdCBSZWY8U2hhcmVk QnVmZmVyPiYgcGF5bG9hZCgpIGNvbnN0JiB7IEFTU0VSVChtX3BheWxvYWQpOyByZXR1cm4gbV9w YXlsb2FkLnZhbHVlKCk7IH0KICAgICBSZWY8U2hhcmVkQnVmZmVyPiYgcGF5bG9hZCgpICYgeyBB U1NFUlQobV9wYXlsb2FkKTsgcmV0dXJuIG1fcGF5bG9hZC52YWx1ZSgpOyB9CiAgICAgYm9vbCBo YXNUeXBlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Ym9vbD4obV90eXBlKTsgfQogICAg IFdlYkNvcmU6Ok1lZGlhS2V5TWVzc2FnZVR5cGUgdHlwZSgpIGNvbnN0IHsgQVNTRVJUKG1fdHlw ZSk7IHJldHVybiBtX3R5cGUudmFsdWUoKTsgfQogICAgIFdlYkNvcmU6Ok1lZGlhS2V5TWVzc2Fn ZVR5cGUgdHlwZU9yKFdlYkNvcmU6Ok1lZGlhS2V5TWVzc2FnZVR5cGUgYWx0ZXJuYXRlKSBjb25z dCB7IHJldHVybiBtX3R5cGUgPyBtX3R5cGUudmFsdWUoKSA6IGFsdGVybmF0ZTsgfQorICAgIGV4 cGxpY2l0IG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX2lzVmFsaWQ7IH0KKyAgICBi b29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuICFtX2lzVmFsaWQ7IH0KIAogcHJpdmF0ZToK KyAgICBib29sIG1faXNWYWxpZCB7IGZhbHNlIH07CiAgICAgT3B0aW9uYWw8UmVmPFNoYXJlZEJ1 ZmZlcj4+IG1fcGF5bG9hZDsKICAgICBPcHRpb25hbDxXZWJDb3JlOjpNZWRpYUtleU1lc3NhZ2VU eXBlPiBtX3R5cGU7CiB9OwpAQCAtMzQyLDEwICszNTEsMTIgQEAgcHJpdmF0ZToKIHZvaWQgQ0RN SW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6Y2hhbGxlbmdlR2VuZXJhdGVkQ2FsbGJhY2soUmVmUHRy PFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCiB7CiAgICAgUGFyc2VkUmVzcG9uc2VNZXNzYWdlIHBh cnNlZFJlc3BvbnNlTWVzc2FnZShidWZmZXIpOworICAgIEFTU0VSVChwYXJzZWRSZXNwb25zZU1l c3NhZ2UpOwogCiAgICAgaWYgKCFtX2NoYWxsZW5nZUNhbGxiYWNrcy5pc0VtcHR5KCkpIHsKICAg ICAgICAgbV9tZXNzYWdlID0gV1RGTW92ZShwYXJzZWRSZXNwb25zZU1lc3NhZ2UucGF5bG9hZCgp KTsKLSAgICAgICAgbV9uZWVkc0luZGl2aWR1YWxpemF0aW9uID0gcGFyc2VkUmVzcG9uc2VNZXNz YWdlLnR5cGUoKSA9PSBDRE1JbnN0YW5jZVNlc3Npb246Ok1lc3NhZ2VUeXBlOjpJbmRpdmlkdWFs aXphdGlvblJlcXVlc3Q7CisgICAgICAgIG1fbmVlZHNJbmRpdmlkdWFsaXphdGlvbiA9IHBhcnNl ZFJlc3BvbnNlTWVzc2FnZS5oYXNUeXBlKCkKKyAgICAgICAgICAgICYmIHBhcnNlZFJlc3BvbnNl TWVzc2FnZS50eXBlKCkgPT0gQ0RNSW5zdGFuY2VTZXNzaW9uOjpNZXNzYWdlVHlwZTo6SW5kaXZp ZHVhbGl6YXRpb25SZXF1ZXN0OwogCiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgY2hhbGxlbmdl Q2FsbGJhY2sgOiBtX2NoYWxsZW5nZUNhbGxiYWNrcykKICAgICAgICAgICAgIGNoYWxsZW5nZUNh bGxiYWNrKCk7CkBAIC01MjgsNiArNTM5LDcgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVu ZGVyOjp1cGRhdGVMaWNlbnNlKGNvbnN0IFN0cmluZyYgc2Vzc2lvbklELCBMaWNlbnNlVHkKICAg ICAgICAgICAgICAgICAvLyBGSVhNRTogVXNpbmcgSlNPTiByZXBvbnNlIG1lc3NhZ2VzIGlzIG11 Y2ggY2xlYW5lciB0aGFuIHVzaW5nIHN0cmluZyBwcmVmaXhlcywgSSBiZWxpZXZlIHRoZXJlCiAg ICAgICAgICAgICAgICAgLy8gd2lsbCBldmVuIGJlIG90aGVyIHBhcnRzIG9mIHRoZSBzcGVjIHdo ZXJlIG5vdCBoYXZpbmcgc3RydWN0dXJlZCBkYXRhIHdpbGwgYmUgYmFkLgogICAgICAgICAgICAg ICAgIFBhcnNlZFJlc3BvbnNlTWVzc2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UocmVzcG9uc2VN ZXNzYWdlKTsKKyAgICAgICAgICAgICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsK ICAgICAgICAgICAgICAgICBpZiAocGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkg ewogICAgICAgICAgICAgICAgICAgICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92 ZShwYXJzZWRSZXNwb25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAg R1NUX0RFQlVHKCJnb3QgbWVzc2FnZSBvZiBzaXplICV6dSIsIG1lc3NhZ2UtPnNpemUoKSk7CkBA IC01NjIsNiArNTc0LDcgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVuZGVyOjpsb2FkU2Vz c2lvbihMaWNlbnNlVHlwZSwgY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQKICAgICAgICAgICAgICAg ICAvLyBGSVhNRTogVXNpbmcgSlNPTiByZXBvbnNlIG1lc3NhZ2VzIGlzIG11Y2ggY2xlYW5lciB0 aGFuIHVzaW5nIHN0cmluZyBwcmVmaXhlcywgSSBiZWxpZXZlIHRoZXJlCiAgICAgICAgICAgICAg ICAgLy8gd2lsbCBldmVuIGJlIG90aGVyIHBhcnRzIG9mIHRoZSBzcGVjIHdoZXJlIG5vdCBoYXZp bmcgc3RydWN0dXJlZCBkYXRhIHdpbGwgYmUgYmFkLgogICAgICAgICAgICAgICAgIFBhcnNlZFJl c3BvbnNlTWVzc2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UocmVzcG9uc2VNZXNzYWdlKTsKKyAg ICAgICAgICAgICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsKICAgICAgICAgICAg ICAgICBpZiAocGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkgewogICAgICAgICAg ICAgICAgICAgICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92ZShwYXJzZWRSZXNw b25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJn b3QgbWVzc2FnZSBvZiBzaXplICV6dSIsIG1lc3NhZ2UtPnNpemUoKSk7CkBAIC02MDgsNiArNjIx LDcgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25UaHVuZGVyOjpyZW1vdmVTZXNzaW9uRGF0YShj b25zdCBTdHJpbmcmIHNlc3Npb25JRCwgTGljZW4KICAgICAgICAgICAgICAgICBjYWxsYmFjayht X2tleVN0b3JlLmFsbEtleXNBcyhNZWRpYUtleVN0YXR1czo6UmVsZWFzZWQpLCBXVEY6Om51bGxv cHQsIFN1Y2Nlc3NWYWx1ZTo6U3VjY2VlZGVkKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgICAgIFBhcnNlZFJlc3BvbnNlTWVzc2FnZSBwYXJzZWRSZXNwb25zZU1lc3NhZ2UoYnVm ZmVyKTsKKyAgICAgICAgICAgICAgICBBU1NFUlQocGFyc2VkUmVzcG9uc2VNZXNzYWdlKTsKICAg ICAgICAgICAgICAgICBpZiAocGFyc2VkUmVzcG9uc2VNZXNzYWdlLmhhc1BheWxvYWQoKSkgewog ICAgICAgICAgICAgICAgICAgICBSZWY8U2hhcmVkQnVmZmVyPiBtZXNzYWdlID0gV1RGTW92ZShw YXJzZWRSZXNwb25zZU1lc3NhZ2UucGF5bG9hZCgpKTsKICAgICAgICAgICAgICAgICAgICAgR1NU X0RFQlVHKCJzZXNzaW9uICVzIHJlbW92ZWQsIG1lc3NhZ2UgbGVuZ3RoICV6dSIsIG1fc2Vzc2lv bklELnV0ZjgoKS5kYXRhKCksIG1lc3NhZ2UtPnNpemUoKSk7Cg==