181432 2018-01-09 05:07:17 -0800 [GStreamer] Missing notifications to player client 2018-01-10 02:12:35 -0800 1 1 1 Unclassified WebKit Platform Other PC Linux RESOLVED FIXED InRadar P2 Normal --- 180197 181471 1 pnormand pnormand bugs-noreply cgarcia mcatanzaro pnormand webkit-bug-importer youennf oldest_to_newest 1387203 0 pnormand 2018-01-09 05:07:17 -0800 +++ This bug was initially created as a clone of Bug #180197 +++ Notably when audio/video tracks change and when the pipeline state changes. 1387205 1 330813 pnormand 2018-01-09 05:11:42 -0800 Created attachment 330813 Patch 1387224 2 pnormand 2018-01-09 06:00:06 -0800 Committed r226629: <https://trac.webkit.org/changeset/226629> 1387225 3 webkit-bug-importer 2018-01-09 06:01:25 -0800 <rdar://problem/36374454> 330813 2018-01-09 05:11:42 -0800 2018-01-09 05:39:26 -0800 Patch bug-181432-20180109131141.patch text/plain 9999 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWMzMTQ5NzgzNTAxMDhl ZTg2OWFkZTc2YjcwMDM0YWYyNDgzY2I2NS4uN2M2OTViOGM0YzViMzYyMDIzYWMxMGIzYTUxMTRl ZWMxNTEzOGM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTAxLTA5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBNaXNzaW5nIG5vdGlmaWNhdGlvbnMgdG8gcGxheWVyIGNsaWVudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNDMyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugbm93IHByb3Blcmx5IGVtaXQgcGxh eWJhY2sgc3RhdGUgY2hhbmdlcyBhbmQgY2hhcmFjdGVyaXN0aWMKKyAgICAgICAgdXBkYXRlcyB0 byB0aGUgY2xpZW50IHdoZW4gdGhlIHBpcGVsaW5lIHN0YXRlIGNoYW5nZXMgYW5kIHdoZW4KKyAg ICAgICAgYXVkaW8vdmlkZW8gdHJhY2tzIGNoYW5nZXMgYXJlIGRldGVjdGVkLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBs YXliYWNrUG9zaXRpb24gY29uc3QpOgorICAgICAgICBUaGlzIGRlYnVnIG1lc3NhZ2UgYXBwZWFy cyB0b28gb2Z0ZW4gaW4gbG9ncy4gRGVtb3RlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpkdXJhdGlvbk1lZGlhVGltZSBjb25zdCk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJP ZlZpZGVvKTogRW1pdAorICAgICAgICBjaGFyYXN0ZXJpc3RpY0NoYW5nZWQgbm90aWZpY2F0aW9u LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQ bGF5ZXJPZkF1ZGlvKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcyk6IEtlZXAgdHJhY2sKKyAgICAgICAgb2Ygb2xkIGFu ZCBjdXJyZW50IHBpcGVsaW5lIHN0YXRlLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKworCiAyMDE4LTAxLTA5ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OKHIyMjQ0NjApOiBUZXh0IGZpZWxkcyBzb21ldGltZXMgZ2V0ICJtZXNzZWQgdXAiCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGM5 YWMxODdmMmNmNDMxNmZjYTlmN2U3YTkxOGJjMTdkZmU3MWM1NmIuLmMxZmZmYWM1ZDgyYWJiZTQy ZmE5ZWY4ODEwNzNiOGUzMDlhODY1NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0zMTcsNyArMzE3LDcgQEAgTWVkaWFUaW1lIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGxheWJhY2tQb3NpdGlvbigpIGNvbnN0CiAgICAgICAg IGdzdF9xdWVyeV9wYXJzZV9wb3NpdGlvbihxdWVyeSwgMCwgJnBvc2l0aW9uKTsKICAgICBnc3Rf cXVlcnlfdW5yZWYocXVlcnkpOwogCi0gICAgR1NUX0RFQlVHKCJQb3NpdGlvbiAlIiBHU1RfVElN RV9GT1JNQVQsIEdTVF9USU1FX0FSR1MocG9zaXRpb24pKTsKKyAgICBHU1RfTE9HKCJQb3NpdGlv biAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FSR1MocG9zaXRpb24pKTsKIAogICAgIE1l ZGlhVGltZSBwbGF5YmFja1Bvc2l0aW9uID0gTWVkaWFUaW1lOjp6ZXJvVGltZSgpOwogICAgIEdz dENsb2NrVGltZSBnc3RyZWFtZXJQb3NpdGlvbiA9IHN0YXRpY19jYXN0PEdzdENsb2NrVGltZT4o cG9zaXRpb24pOwpAQCAtNDMyLDcgKzQzMiw3IEBAIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmR1cmF0aW9uTWVkaWFUaW1lKCkgY29uc3QKICAgICAgICAgcmV0dXJuIE1l ZGlhVGltZTo6cG9zaXRpdmVJbmZpbml0ZVRpbWUoKTsKICAgICB9CiAKLSAgICBHU1RfREVCVUco IkR1cmF0aW9uOiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FSR1ModGltZUxlbmd0aCkp OworICAgIEdTVF9MT0coIkR1cmF0aW9uOiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FS R1ModGltZUxlbmd0aCkpOwogCiAgICAgcmV0dXJuIE1lZGlhVGltZSh0aW1lTGVuZ3RoLCBHU1Rf U0VDT05EKTsKICAgICAvLyBGSVhNRTogaGFuZGxlIDMuMTQuOS41IHByb3Blcmx5CkBAIC02MDks NyArNjA5LDExIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5 ZXJPZlZpZGVvKCkKICAgICBHc3RFbGVtZW50KiBlbGVtZW50ID0gdXNlTWVkaWFTb3VyY2UgPyBt X3NvdXJjZS5nZXQoKSA6IG1fcGlwZWxpbmUuZ2V0KCk7CiAgICAgZ19vYmplY3RfZ2V0KGVsZW1l bnQsICJuLXZpZGVvIiwgJm51bVRyYWNrcywgbnVsbHB0cik7CiAKKyAgICBib29sIG9sZEhhc1Zp ZGVvID0gbV9oYXNWaWRlbzsKICAgICBtX2hhc1ZpZGVvID0gbnVtVHJhY2tzID4gMDsKKyAgICBp ZiAob2xkSGFzVmlkZW8gIT0gbV9oYXNWaWRlbykKKyAgICAgICAgbV9wbGF5ZXItPmNoYXJhY3Rl cmlzdGljQ2hhbmdlZCgpOworCiAgICAgaWYgKG1faGFzVmlkZW8pCiAgICAgICAgIG1fcGxheWVy LT5zaXplQ2hhbmdlZCgpOwogCkBAIC02NzQsNyArNjc4LDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZkF1ZGlvKCkKICAgICBHc3RFbGVtZW50KiBl bGVtZW50ID0gdXNlTWVkaWFTb3VyY2UgPyBtX3NvdXJjZS5nZXQoKSA6IG1fcGlwZWxpbmUuZ2V0 KCk7CiAgICAgZ19vYmplY3RfZ2V0KGVsZW1lbnQsICJuLWF1ZGlvIiwgJm51bVRyYWNrcywgbnVs bHB0cik7CiAKKyAgICBib29sIG9sZEhhc0F1ZGlvID0gbV9oYXNBdWRpbzsKICAgICBtX2hhc0F1 ZGlvID0gbnVtVHJhY2tzID4gMDsKKyAgICBpZiAob2xkSGFzQXVkaW8gIT0gbV9oYXNBdWRpbykK KyAgICAgICAgbV9wbGF5ZXItPmNoYXJhY3RlcmlzdGljQ2hhbmdlZCgpOwogCiAgICAgaWYgKHVz ZU1lZGlhU291cmNlKSB7CiAgICAgICAgIEdTVF9ERUJVRygiVHJhY2tzIG1hbmFnZWQgYnkgc291 cmNlIGVsZW1lbnQuIEJhaWxpbmcgb3V0IG5vdy4iKTsKQEAgLTE0OTIsMjcgKzE0OTksMjcgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAKICAgICBN ZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIG9sZE5ldHdvcmtTdGF0ZSA9IG1fbmV0d29ya1N0YXRl OwogICAgIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIG9sZFJlYWR5U3RhdGUgPSBtX3JlYWR5U3Rh dGU7Ci0gICAgR3N0U3RhdGUgc3RhdGU7CiAgICAgR3N0U3RhdGUgcGVuZGluZzsKIAotICAgIEdz dFN0YXRlQ2hhbmdlUmV0dXJuIGdldFN0YXRlUmVzdWx0ID0gZ3N0X2VsZW1lbnRfZ2V0X3N0YXRl KG1fcGlwZWxpbmUuZ2V0KCksICZzdGF0ZSwgJnBlbmRpbmcsIDI1MCAqIEdTVF9OU0VDT05EKTsK KyAgICBtX29sZFN0YXRlID0gbV9jdXJyZW50U3RhdGU7CisgICAgR3N0U3RhdGVDaGFuZ2VSZXR1 cm4gZ2V0U3RhdGVSZXN1bHQgPSBnc3RfZWxlbWVudF9nZXRfc3RhdGUobV9waXBlbGluZS5nZXQo KSwgJm1fY3VycmVudFN0YXRlLCAmcGVuZGluZywgMjUwICogR1NUX05TRUNPTkQpOwogCiAgICAg Ym9vbCBzaG91bGRVcGRhdGVQbGF5YmFja1N0YXRlID0gZmFsc2U7CiAgICAgc3dpdGNoIChnZXRT dGF0ZVJlc3VsdCkgewogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9TVUNDRVNTOiB7Ci0gICAg ICAgIEdTVF9ERUJVRygiU3RhdGU6ICVzLCBwZW5kaW5nOiAlcyIsIGdzdF9lbGVtZW50X3N0YXRl X2dldF9uYW1lKHN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUocGVuZGluZykpOwor ICAgICAgICBHU1RfREVCVUcoIlN0YXRlOiAlcywgcGVuZGluZzogJXMiLCBnc3RfZWxlbWVudF9z dGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRTdGF0ZSksIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1l KHBlbmRpbmcpKTsKIAogICAgICAgICAvLyBEbyBub3RoaW5nIGlmIG9uIEVPUyBhbmQgc3RhdGUg Y2hhbmdlZCB0byBSRUFEWSB0byBhdm9pZCByZWNyZWF0aW5nIHRoZSBwbGF5ZXIKICAgICAgICAg Ly8gb24gSFRNTE1lZGlhRWxlbWVudCBhbmQgcHJvcGVybHkgZ2VuZXJhdGUgdGhlIHZpZGVvICdl bmRlZCcgZXZlbnQuCi0gICAgICAgIGlmIChtX2lzRW5kUmVhY2hlZCAmJiBzdGF0ZSA9PSBHU1Rf U1RBVEVfUkVBRFkpCisgICAgICAgIGlmIChtX2lzRW5kUmVhY2hlZCAmJiBtX2N1cnJlbnRTdGF0 ZSA9PSBHU1RfU1RBVEVfUkVBRFkpCiAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICBtX3Jl c2V0UGlwZWxpbmUgPSBzdGF0ZSA8PSBHU1RfU1RBVEVfUkVBRFk7CisgICAgICAgIG1fcmVzZXRQ aXBlbGluZSA9IG1fY3VycmVudFN0YXRlIDw9IEdTVF9TVEFURV9SRUFEWTsKIAogICAgICAgICBi b29sIGRpZEJ1ZmZlcmluZyA9IG1fYnVmZmVyaW5nOwogCiAgICAgICAgIC8vIFVwZGF0ZSByZWFk eSBhbmQgbmV0d29yayBzdGF0ZXMuCi0gICAgICAgIHN3aXRjaCAoc3RhdGUpIHsKKyAgICAgICAg c3dpdGNoIChtX2N1cnJlbnRTdGF0ZSkgewogICAgICAgICBjYXNlIEdTVF9TVEFURV9OVUxMOgog ICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nOwogICAg ICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6RW1wdHk7CkBAIC0xNTQ4LDcg KzE1NTUsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVz KCkKICAgICAgICAgfQogCiAgICAgICAgIC8vIFN5bmMgc3RhdGVzIHdoZXJlIG5lZWRlZC4KLSAg ICAgICAgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QQVVTRUQpIHsKKyAgICAgICAgaWYgKG1fY3Vy cmVudFN0YXRlID09IEdTVF9TVEFURV9QQVVTRUQpIHsKICAgICAgICAgICAgIGlmICghbV92b2x1 bWVBbmRNdXRlSW5pdGlhbGl6ZWQpIHsKICAgICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJPZlZv bHVtZUNoYW5nZSgpOwogICAgICAgICAgICAgICAgIG5vdGlmeVBsYXllck9mTXV0ZSgpOwpAQCAt MTU1OSw3ICsxNTY2LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0 ZVN0YXRlcygpCiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJbQnVmZmVyaW5nXSBSZXN0YXJ0 aW5nIHBsYXliYWNrLiIpOwogICAgICAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NU X1NUQVRFX1BMQVlJTkcpOwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKHN0YXRl ID09IEdTVF9TVEFURV9QTEFZSU5HKSB7CisgICAgICAgIH0gZWxzZSBpZiAobV9jdXJyZW50U3Rh dGUgPT0gR1NUX1NUQVRFX1BMQVlJTkcpIHsKICAgICAgICAgICAgIG1fcGF1c2VkID0gZmFsc2U7 CiAKICAgICAgICAgICAgIGlmICgobV9idWZmZXJpbmcgJiYgIWlzTGl2ZVN0cmVhbSgpKSB8fCAh bV9wbGF5YmFja1JhdGUpIHsKQEAgLTE1NjksMzQgKzE1NzYsNDAgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAgICAgICAgIH0gZWxzZQogICAgICAg ICAgICAgbV9wYXVzZWQgPSB0cnVlOwogCi0gICAgICAgIGlmIChtX3JlcXVlc3RlZFN0YXRlID09 IEdTVF9TVEFURV9QQVVTRUQgJiYgc3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRCkgeworICAgICAg ICBHU1RfREVCVUcoIk9sZCBzdGF0ZTogJXMsIG5ldyBzdGF0ZTogJXMgKHJlcXVlc3RlZDogJXMp IiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUobV9vbGRTdGF0ZSksIGdzdF9lbGVtZW50X3N0 YXRlX2dldF9uYW1lKG1fY3VycmVudFN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUo bV9yZXF1ZXN0ZWRTdGF0ZSkpOworICAgICAgICBpZiAobV9yZXF1ZXN0ZWRTdGF0ZSA9PSBHU1Rf U1RBVEVfUEFVU0VEICYmIG1fY3VycmVudFN0YXRlID09IEdTVF9TVEFURV9QQVVTRUQpIHsKKyAg ICAgICAgICAgIHNob3VsZFVwZGF0ZVBsYXliYWNrU3RhdGUgPSB0cnVlOworICAgICAgICAgICAg R1NUX0lORk8oIlJlcXVlc3RlZCBzdGF0ZSBjaGFuZ2UgdG8gJXMgd2FzIGNvbXBsZXRlZCIsIGdz dF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKG1fY3VycmVudFN0YXRlKSk7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKChtX29sZFN0YXRlICE9IG1fY3VycmVudFN0YXRlKSAmJiAoKG1fb2xkU3RhdGUg PiBHU1RfU1RBVEVfUkVBRFkgJiYgbV9jdXJyZW50U3RhdGUgPiBHU1RfU1RBVEVfUkVBRFkpCisg ICAgICAgICAgICB8fCAobV9jdXJyZW50U3RhdGUgPCBHU1RfU1RBVEVfUExBWUlORyAmJiBtX29s ZFN0YXRlID4gR1NUX1NUQVRFX1JFQURZKSkpIHsKKyAgICAgICAgICAgIEdTVF9JTkZPKCJQbGF5 YmFjayBzdGF0ZSBjaGFuZ2VkIGZyb20gJXMgdG8gJXMuIE5vdGlmeWluZyB0aGUgbWVkaWEgcGxh eWVyIGNsaWVudCIsIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKG1fb2xkU3RhdGUpLCBnc3Rf ZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRTdGF0ZSkpOwogICAgICAgICAgICAgc2hv dWxkVXBkYXRlUGxheWJhY2tTdGF0ZSA9IHRydWU7Ci0gICAgICAgICAgICBHU1RfREVCVUcoIlJl cXVlc3RlZCBzdGF0ZSBjaGFuZ2UgdG8gJXMgd2FzIGNvbXBsZXRlZCIsIGdzdF9lbGVtZW50X3N0 YXRlX2dldF9uYW1lKHN0YXRlKSk7CiAgICAgICAgIH0KIAogICAgICAgICBicmVhazsKICAgICB9 CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX0FTWU5DOgotICAgICAgICBHU1RfREVCVUcoIkFz eW5jOiBTdGF0ZTogJXMsIHBlbmRpbmc6ICVzIiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUo c3RhdGUpLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7CisgICAgICAgIEdT VF9ERUJVRygiQXN5bmM6IFN0YXRlOiAlcywgcGVuZGluZzogJXMiLCBnc3RfZWxlbWVudF9zdGF0 ZV9nZXRfbmFtZShtX2N1cnJlbnRTdGF0ZSksIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHBl bmRpbmcpKTsKICAgICAgICAgLy8gQ2hhbmdlIGluIHByb2dyZXNzLgogICAgICAgICBicmVhazsK ICAgICBjYXNlIEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRToKLSAgICAgICAgR1NUX0RFQlVHKCJG YWlsdXJlOiBTdGF0ZTogJXMsIHBlbmRpbmc6ICVzIiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25h bWUoc3RhdGUpLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7CisgICAgICAg IEdTVF9ERUJVRygiRmFpbHVyZTogU3RhdGU6ICVzLCBwZW5kaW5nOiAlcyIsIGdzdF9lbGVtZW50 X3N0YXRlX2dldF9uYW1lKG1fY3VycmVudFN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25h bWUocGVuZGluZykpOwogICAgICAgICAvLyBDaGFuZ2UgZmFpbGVkCiAgICAgICAgIHJldHVybjsK ICAgICBjYXNlIEdTVF9TVEFURV9DSEFOR0VfTk9fUFJFUk9MTDoKLSAgICAgICAgR1NUX0RFQlVH KCJObyBwcmVyb2xsOiBTdGF0ZTogJXMsIHBlbmRpbmc6ICVzIiwgZ3N0X2VsZW1lbnRfc3RhdGVf Z2V0X25hbWUoc3RhdGUpLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7Cisg ICAgICAgIEdTVF9ERUJVRygiTm8gcHJlcm9sbDogU3RhdGU6ICVzLCBwZW5kaW5nOiAlcyIsIGdz dF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKG1fY3VycmVudFN0YXRlKSwgZ3N0X2VsZW1lbnRfc3Rh dGVfZ2V0X25hbWUocGVuZGluZykpOwogCiAgICAgICAgIC8vIExpdmUgcGlwZWxpbmVzIGdvIGlu IFBBVVNFRCB3aXRob3V0IHByZXJvbGxpbmcuCiAgICAgICAgIG1faXNTdHJlYW1pbmcgPSB0cnVl OwogICAgICAgICBzZXREb3dubG9hZEJ1ZmZlcmluZygpOwogCi0gICAgICAgIGlmIChzdGF0ZSA9 PSBHU1RfU1RBVEVfUkVBRFkpCisgICAgICAgIGlmIChtX2N1cnJlbnRTdGF0ZSA9PSBHU1RfU1RB VEVfUkVBRFkpCiAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZU5v dGhpbmc7Ci0gICAgICAgIGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QQVVTRUQpIHsKKyAg ICAgICAgZWxzZSBpZiAobV9jdXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRCkgewogICAg ICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwogICAg ICAgICAgICAgbV9wYXVzZWQgPSB0cnVlOwotICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdT VF9TVEFURV9QTEFZSU5HKQorICAgICAgICB9IGVsc2UgaWYgKG1fY3VycmVudFN0YXRlID09IEdT VF9TVEFURV9QTEFZSU5HKQogICAgICAgICAgICAgbV9wYXVzZWQgPSBmYWxzZTsKIAogICAgICAg ICBpZiAoIW1fcGF1c2VkICYmIG1fcGxheWJhY2tSYXRlKQpAQCAtMTYyMyw3ICsxNjM2LDcgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAgICAgICAg IG1fcGxheWVyLT5yZWFkeVN0YXRlQ2hhbmdlZCgpOwogICAgIH0KIAotICAgIGlmIChnZXRTdGF0 ZVJlc3VsdCA9PSBHU1RfU1RBVEVfQ0hBTkdFX1NVQ0NFU1MgJiYgc3RhdGUgPj0gR1NUX1NUQVRF X1BBVVNFRCkgeworICAgIGlmIChnZXRTdGF0ZVJlc3VsdCA9PSBHU1RfU1RBVEVfQ0hBTkdFX1NV Q0NFU1MgJiYgbV9jdXJyZW50U3RhdGUgPj0gR1NUX1NUQVRFX1BBVVNFRCkgewogICAgICAgICB1 cGRhdGVQbGF5YmFja1JhdGUoKTsKICAgICAgICAgaWYgKG1fc2Vla0lzUGVuZGluZykgewogICAg ICAgICAgICAgR1NUX0RFQlVHKCJbU2Vla10gY29tbWl0dGluZyBwZW5kaW5nIHNlZWsgdG8gJXMi LCB0b1N0cmluZyhtX3NlZWtUaW1lKS51dGY4KCkuZGF0YSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCBhNzNhOTI0N2YzMTE1ZTlkYjVkMzgy OWE5NGJjNWZlNjMyOTQ5OTg3Li4zZDc3ZWExNDM4YTdlZGYzZDY5ZWVjM2NjOTNhNDk2NTQ1YzZl ZTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBA IC0xOTAsNiArMTkwLDggQEAgcHJvdGVjdGVkOgogICAgIG11dGFibGUgTWVkaWFUaW1lIG1fZHVy YXRpb25BdEVPUzsKICAgICBib29sIG1fcGF1c2VkOwogICAgIGZsb2F0IG1fcGxheWJhY2tSYXRl OworICAgIEdzdFN0YXRlIG1fY3VycmVudFN0YXRlOworICAgIEdzdFN0YXRlIG1fb2xkU3RhdGU7 CiAgICAgR3N0U3RhdGUgbV9yZXF1ZXN0ZWRTdGF0ZTsKICAgICBib29sIG1fcmVzZXRQaXBlbGlu ZTsKICAgICBib29sIG1fc2Vla2luZzsK