212129 2020-05-20 00:29:14 -0700 MediaPlayerPrivateMediaStreamAVFObjC::m_activeVideoTrack should be a VideoTrackPrivateMediaStream 2020-05-25 00:53:13 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1654351 0 youennf 2020-05-20 00:29:14 -0700 MediaPlayerPrivateMediaStreamAVFObjC::m_activeVideoTrack should be a VideoTrackPrivateMediaStream 1654353 1 399820 youennf 2020-05-20 00:31:21 -0700 Created attachment 399820 Patch 1655797 2 ews-feeder 2020-05-25 00:52:39 -0700 Committed r262114: <https://trac.webkit.org/changeset/262114> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399820. 1655798 3 webkit-bug-importer 2020-05-25 00:53:13 -0700 <rdar://problem/63590915> 399820 2020-05-20 00:31:21 -0700 2020-05-25 00:52:40 -0700 Patch bug-212129-20200520093120.patch text/plain 10867 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE4NjZkN2QxZGRjZThl MTJlNmNhOTA5NWY4ZDQ3NGM3MmJiNDllYS4uNWFmODVhYWFmOTVmZTE5ZTg4ZjAyYTQ3MGM5Mjdj YmQ2MmE3MzAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA1LTIwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVBsYXllclByaXZh dGVNZWRpYVN0cmVhbUFWRk9iakM6Om1fYWN0aXZlVmlkZW9UcmFjayBzaG91bGQgYmUgYSBWaWRl b1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTIxMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIGxvb2tpbmcgaW4gdGhlIG1hcCB3aGVuIHdhbnRp bmcgdG8gZ2V0IHRoZSBWaWRlb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtIGNvcnJlc3BvbmRpbmcg dG8gdGhlIGFjdGl2ZSB2aWRlbyB0cmFjaywKKyAgICAgICAgc3RvcmUgZGlyZWN0bHkgdGhlIFZp ZGVvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0gYXMgdGhlIGFjdGl2ZSB2aWRlbyB0cmFjayBhbmQg dXNlIHN0cmVhbVRyYWNrKCkgdG8gZ2V0IHRoZSBjb3JyZXNwb25kaW5nIE1lZGlhU3RyZWFtVHJh Y2suCisgICAgICAgIFNtYWxsIHJlZmFjdG9yaW5nIHRvIHVzZSBtb3JlIFJlZjw+LgorICAgICAg ICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjp+TWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQzo6dmlkZW9TYW1wbGVBdmFpbGFibGUpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzYW1wbGVCdWZmZXJEaXNw bGF5TGF5ZXJTdGF0dXNEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlVHJhY2tz T2ZUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFt QVZGT2JqQzo6Y2hlY2tTZWxlY3RlZFZpZGVvVHJhY2spOgorICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL0F1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0uaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9WaWRlb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtLmg6CisKIDIwMjAt MDUtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93 IGNhbGxpbmcgVmlkZW9TYW1wbGVPYnNlcnZlcjo6dmlkZW9TYW1wbGVBdmFpbGFibGUgZnJvbSBh IGJhY2tncm91bmQgdGhyZWFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFW Rk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCmluZGV4IGUwNmQ2YjNl MmQ0YTIyY2Y2MmMxNWIwN2VlNGQ3ZmUwZTYzMDMyYzEuLmFmN2U0OGIxNzFhODE0ZTQ2OWJmMzdk YmI4Y2YwY2EwMmIzNjZhNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCkBAIC0yMjQsNyAr MjI0LDcgQEAgcHJpdmF0ZToKIAogICAgIE1lZGlhUGxheWVyKiBtX3BsYXllciB7IG51bGxwdHIg fTsKICAgICBSZWZQdHI8TWVkaWFTdHJlYW1Qcml2YXRlPiBtX21lZGlhU3RyZWFtUHJpdmF0ZTsK LSAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU+IG1fYWN0aXZlVmlkZW9UcmFjazsK KyAgICBSZWZQdHI8VmlkZW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbT4gbV9hY3RpdmVWaWRlb1Ry YWNrOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxQQUw6OkNsb2NrPiBtX2Nsb2NrOwogCiAgICAgTWVk aWFUaW1lIG1fcGF1c2VkVGltZTsKQEAgLTIzOSw4ICsyMzksOCBAQCBwcml2YXRlOgogICAgIH07 CiAgICAgQ3VycmVudEZyYW1lUGFpbnRlciBtX2ltYWdlUGFpbnRlcjsKIAotICAgIEhhc2hNYXA8 U3RyaW5nLCBSZWZQdHI8QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbT4+IG1fYXVkaW9UcmFj a01hcDsKLSAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFZpZGVvVHJhY2tQcml2YXRlTWVkaWFT dHJlYW0+PiBtX3ZpZGVvVHJhY2tNYXA7CisgICAgSGFzaE1hcDxTdHJpbmcsIFJlZjxBdWRpb1Ry YWNrUHJpdmF0ZU1lZGlhU3RyZWFtPj4gbV9hdWRpb1RyYWNrTWFwOworICAgIEhhc2hNYXA8U3Ry aW5nLCBSZWY8VmlkZW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbT4+IG1fdmlkZW9UcmFja01hcDsK IAogICAgIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgbV9uZXR3b3JrU3RhdGUgeyBNZWRpYVBs YXllcjo6TmV0d29ya1N0YXRlOjpFbXB0eSB9OwogICAgIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRl IG1fcmVhZHlTdGF0ZSB7IE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlTm90aGluZyB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCmluZGV4IGJhNmQyNTMxZjQ5ZjEzYTA2NWYxM2I4NGY3 OTQ3YzExZDRhOTE1NGUuLjkwMTc0YzlmYjgwYTgwMjQ2MzIwMDhlNjE4Y2YzYTBiZDlkZDI4OTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KQEAgLTE2Niw3ICsxNjYsNyBAQCBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6On5NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakMoKQogICAgICAgICB0cmFjay0+c3RyZWFtVHJhY2soKS5yZW1vdmVPYnNlcnZl cigqdGhpcyk7CiAKICAgICBpZiAobV9hY3RpdmVWaWRlb1RyYWNrKQotICAgICAgICBtX2FjdGl2 ZVZpZGVvVHJhY2stPnNvdXJjZSgpLnJlbW92ZVZpZGVvU2FtcGxlT2JzZXJ2ZXIoKnRoaXMpOwor ICAgICAgICBtX2FjdGl2ZVZpZGVvVHJhY2stPnN0cmVhbVRyYWNrKCkuc291cmNlKCkucmVtb3Zl VmlkZW9TYW1wbGVPYnNlcnZlcigqdGhpcyk7CiAKICAgICBbbV9ib3VuZHNDaGFuZ2VMaXN0ZW5l ciBpbnZhbGlkYXRlXTsKIApAQCAtMzA1LDE0ICszMDUsMTIgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxl JiBzYW0KICAgICBpZiAobV9kaXNwbGF5TW9kZSAhPSBMaXZlUHJldmlldyAmJiAhbV93YWl0aW5n Rm9yRmlyc3RJbWFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IFdlIHNob3Vs ZCBub3QgcXVlcnkgdGhlIG1hcCBlYWNoIHRpbWUgd2UgZ2V0IGEgc2FtcGxlLgotICAgIGF1dG8g dmlkZW9UcmFjayA9IG1fdmlkZW9UcmFja01hcC5nZXQobV9hY3RpdmVWaWRlb1RyYWNrLT5pZCgp KTsKLSAgICBNZWRpYVRpbWUgdGltZWxpbmVPZmZzZXQgPSB2aWRlb1RyYWNrLT50aW1lbGluZU9m ZnNldCgpOworICAgIE1lZGlhVGltZSB0aW1lbGluZU9mZnNldCA9IG1fYWN0aXZlVmlkZW9UcmFj ay0+dGltZWxpbmVPZmZzZXQoKTsKICAgICBpZiAodGltZWxpbmVPZmZzZXQgPT0gTWVkaWFUaW1l OjppbnZhbGlkVGltZSgpKSB7CiAgICAgICAgIHRpbWVsaW5lT2Zmc2V0ID0gY2FsY3VsYXRlVGlt ZWxpbmVPZmZzZXQoc2FtcGxlLCByZW5kZXJlckxhdGVuY3kpOwotICAgICAgICB2aWRlb1RyYWNr LT5zZXRUaW1lbGluZU9mZnNldCh0aW1lbGluZU9mZnNldCk7CisgICAgICAgIG1fYWN0aXZlVmlk ZW9UcmFjay0+c2V0VGltZWxpbmVPZmZzZXQodGltZWxpbmVPZmZzZXQpOwogCi0gICAgICAgIElO Rk9fTE9HKExPR0lERU5USUZJRVIsICJ0aW1lbGluZSBvZmZzZXQgZm9yIHRyYWNrICIsIG1fYWN0 aXZlVmlkZW9UcmFjay0+aWQoKSwgIiBzZXQgdG8gIiwgdGltZWxpbmVPZmZzZXQpOworICAgICAg ICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAidGltZWxpbmUgb2Zmc2V0IGZvciB0cmFjayAiLCBt X2FjdGl2ZVZpZGVvVHJhY2stPnN0cmVhbVRyYWNrKCkuaWQoKSwgIiBzZXQgdG8gIiwgdGltZWxp bmVPZmZzZXQpOwogICAgIH0KIAogICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAib3JpZ2lu YWwgc2FtcGxlID0gIiwgc2FtcGxlKTsKQEAgLTM0NywxMSArMzQ1LDggQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllclN0 YXR1c0RpZENoYW4KIHsKICAgICBBU1NFUlQoJmxheWVyID09IG1fc2FtcGxlQnVmZmVyRGlzcGxh eUxheWVyLmdldCgpKTsKICAgICBVTlVTRURfUEFSQU0obGF5ZXIpOwotICAgIGlmICghbV9hY3Rp dmVWaWRlb1RyYWNrKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoYXV0byB0cmFjayA9IG1f dmlkZW9UcmFja01hcC5nZXQobV9hY3RpdmVWaWRlb1RyYWNrLT5pZCgpKSkKLSAgICAgICAgdHJh Y2stPnNldFRpbWVsaW5lT2Zmc2V0KE1lZGlhVGltZTo6aW52YWxpZFRpbWUoKSk7CisgICAgaWYg KG1fYWN0aXZlVmlkZW9UcmFjaykKKyAgICAgICAgbV9hY3RpdmVWaWRlb1RyYWNrLT5zZXRUaW1l bGluZU9mZnNldChNZWRpYVRpbWU6OmludmFsaWRUaW1lKCkpOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6YXBwbGljYXRpb25EaWRCZWNvbWVBY3RpdmUo KQpAQCAtNzgyLDI1ICs3NzcsMjUgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakM6OnNldFZpZGVvRnVsbHNjcmVlbkZyYW1lKEZsb2F0UmVjdCBmcmEKICAgICBtX3Zp ZGVvTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShmcmFtZSk7CiB9CiAKLXR5 cGVkZWYgZW51bSB7CitlbnVtIGNsYXNzIFRyYWNrU3RhdGUgewogICAgIEFkZCwKICAgICBSZW1v dmUsCiAgICAgQ29uZmlndXJlCi19IFRyYWNrU3RhdGU7Cit9OwogCiB0ZW1wbGF0ZSA8dHlwZW5h bWUgUmVmVD4KLXZvaWQgdXBkYXRlVHJhY2tzT2ZUeXBlKEhhc2hNYXA8U3RyaW5nLCBSZWZUPiYg dHJhY2tNYXAsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgdHJhY2tUeXBlLCBNZWRpYVN0cmVh bVRyYWNrUHJpdmF0ZVZlY3RvciYgY3VycmVudFRyYWNrcywgUmVmVCAoKml0ZW1GYWN0b3J5KShN ZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYpLCBjb25zdCBGdW5jdGlvbjx2b2lkKHR5cGVuYW1lIFJl ZlQ6OlZhbHVlVHlwZSYsIGludCwgVHJhY2tTdGF0ZSk+JiBjb25maWd1cmVUcmFjaykKK3ZvaWQg dXBkYXRlVHJhY2tzT2ZUeXBlKEhhc2hNYXA8U3RyaW5nLCBSZWZUPiYgdHJhY2tNYXAsIFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGUgdHJhY2tUeXBlLCBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZVZl Y3RvciYgY3VycmVudFRyYWNrcywgUmVmVCAoKml0ZW1GYWN0b3J5KShNZWRpYVN0cmVhbVRyYWNr UHJpdmF0ZSYpLCBjb25zdCBGdW5jdGlvbjx2b2lkKHN0ZDo6cmVmZXJlbmNlX3dyYXBwZXI8dHlw ZW5hbWUgc3RkOjpyZW1vdmVfcG9pbnRlcjx0eXBlbmFtZSBSZWZUOjpQdHJUcmFpdHM6OlN0b3Jh Z2VUeXBlPjo6dHlwZT4sIGludCwgVHJhY2tTdGF0ZSk+JiBjb25maWd1cmVUcmFjaykKIHsKICAg ICBWZWN0b3I8UmVmVD4gcmVtb3ZlZFRyYWNrczsKICAgICBWZWN0b3I8UmVmVD4gYWRkZWRUcmFj a3M7Ci0gICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZT4+IGFkZGVkUHJp dmF0ZVRyYWNrczsKKyAgICBWZWN0b3I8UmVmPE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPj4gYWRk ZWRQcml2YXRlVHJhY2tzOwogCiAgICAgZm9yIChjb25zdCBhdXRvJiB0cmFjayA6IGN1cnJlbnRU cmFja3MpIHsKICAgICAgICAgaWYgKHRyYWNrLT50eXBlKCkgIT0gdHJhY2tUeXBlKQogICAgICAg ICAgICAgY29udGludWU7CiAKICAgICAgICAgaWYgKCF0cmFja01hcC5jb250YWlucyh0cmFjay0+ aWQoKSkpCi0gICAgICAgICAgICBhZGRlZFByaXZhdGVUcmFja3MuYXBwZW5kKHRyYWNrKTsKKyAg ICAgICAgICAgIGFkZGVkUHJpdmF0ZVRyYWNrcy5hcHBlbmQoKnRyYWNrKTsKICAgICB9CiAKICAg ICBmb3IgKGNvbnN0IGF1dG8mIHRyYWNrIDogdHJhY2tNYXAudmFsdWVzKCkpIHsKQEAgLTgxNCwy MiArODA5LDIyIEBAIHZvaWQgdXBkYXRlVHJhY2tzT2ZUeXBlKEhhc2hNYXA8U3RyaW5nLCBSZWZU PiYgdHJhY2tNYXAsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5CiAgICAgICAgIHRyYWNrTWFwLnJl bW92ZSh0cmFjay0+c3RyZWFtVHJhY2soKS5pZCgpKTsKIAogICAgIGZvciAoYXV0byYgdHJhY2sg OiBhZGRlZFByaXZhdGVUcmFja3MpIHsKLSAgICAgICAgUmVmVCBuZXdUcmFjayA9IGl0ZW1GYWN0 b3J5KCp0cmFjay5nZXQoKSk7Ci0gICAgICAgIHRyYWNrTWFwLmFkZCh0cmFjay0+aWQoKSwgbmV3 VHJhY2spOwotICAgICAgICBhZGRlZFRyYWNrcy5hcHBlbmQobmV3VHJhY2spOworICAgICAgICBS ZWZUIG5ld1RyYWNrID0gaXRlbUZhY3RvcnkodHJhY2suZ2V0KCkpOworICAgICAgICB0cmFja01h cC5hZGQodHJhY2stPmlkKCksIG5ld1RyYWNrLmNvcHlSZWYoKSk7CisgICAgICAgIGFkZGVkVHJh Y2tzLmFwcGVuZChXVEZNb3ZlKG5ld1RyYWNrKSk7CiAgICAgfQogCiAgICAgaW50IGluZGV4ID0g MDsKICAgICBmb3IgKGF1dG8mIHRyYWNrIDogcmVtb3ZlZFRyYWNrcykKLSAgICAgICAgY29uZmln dXJlVHJhY2soKnRyYWNrLCBpbmRleCsrLCBUcmFja1N0YXRlOjpSZW1vdmUpOworICAgICAgICBj b25maWd1cmVUcmFjayh0cmFjay5nZXQoKSwgaW5kZXgrKywgVHJhY2tTdGF0ZTo6UmVtb3ZlKTsK IAogICAgIGluZGV4ID0gMDsKICAgICBmb3IgKGF1dG8mIHRyYWNrIDogYWRkZWRUcmFja3MpCi0g ICAgICAgIGNvbmZpZ3VyZVRyYWNrKCp0cmFjaywgaW5kZXgrKywgVHJhY2tTdGF0ZTo6QWRkKTsK KyAgICAgICAgY29uZmlndXJlVHJhY2sodHJhY2suZ2V0KCksIGluZGV4KyssIFRyYWNrU3RhdGU6 OkFkZCk7CiAKICAgICBpbmRleCA9IDA7CiAgICAgZm9yIChjb25zdCBhdXRvJiB0cmFjayA6IHRy YWNrTWFwLnZhbHVlcygpKQotICAgICAgICBjb25maWd1cmVUcmFjaygqdHJhY2ssIGluZGV4Kyss IFRyYWNrU3RhdGU6OkNvbmZpZ3VyZSk7CisgICAgICAgIGNvbmZpZ3VyZVRyYWNrKHRyYWNrLmdl dCgpLCBpbmRleCsrLCBUcmFja1N0YXRlOjpDb25maWd1cmUpOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y2hlY2tTZWxlY3RlZFZpZGVvVHJhY2soKQpA QCAtODQ2LDcgKzg0MSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZP YmpDOjpjaGVja1NlbGVjdGVkVmlkZW9UcmFjaygpCiAgICAgICAgIGlmIChhdXRvKiBhY3RpdmVW aWRlb1RyYWNrID0gdGhpcy0+YWN0aXZlVmlkZW9UcmFjaygpKSB7CiAgICAgICAgICAgICBmb3Ig KGNvbnN0IGF1dG8mIHRyYWNrIDogbV92aWRlb1RyYWNrTWFwLnZhbHVlcygpKSB7CiAgICAgICAg ICAgICAgICAgaWYgKCZ0cmFjay0+c3RyZWFtVHJhY2soKSA9PSBhY3RpdmVWaWRlb1RyYWNrKSB7 Ci0gICAgICAgICAgICAgICAgICAgIG1fYWN0aXZlVmlkZW9UcmFjayA9IGFjdGl2ZVZpZGVvVHJh Y2s7CisgICAgICAgICAgICAgICAgICAgIG1fYWN0aXZlVmlkZW9UcmFjayA9IHRyYWNrLnB0cigp OwogICAgICAgICAgICAgICAgICAgICBpZiAodHJhY2stPnNlbGVjdGVkKCkpCiAgICAgICAgICAg ICAgICAgICAgICAgICBoaWRlVmlkZW9MYXllciA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAg ICBicmVhazsKQEAgLTg3MSw5ICs4NjYsOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6Y2hlY2tTZWxlY3RlZFZpZGVvVHJhY2soKQogCiAgICAgICAgIGlmIChv bGRWaWRlb1RyYWNrICE9IG1fYWN0aXZlVmlkZW9UcmFjaykgewogICAgICAgICAgICAgaWYgKG9s ZFZpZGVvVHJhY2spCi0gICAgICAgICAgICAgICAgb2xkVmlkZW9UcmFjay0+c291cmNlKCkucmVt b3ZlVmlkZW9TYW1wbGVPYnNlcnZlcigqdGhpcyk7CisgICAgICAgICAgICAgICAgb2xkVmlkZW9U cmFjay0+c3RyZWFtVHJhY2soKS5zb3VyY2UoKS5yZW1vdmVWaWRlb1NhbXBsZU9ic2VydmVyKCp0 aGlzKTsKICAgICAgICAgICAgIGlmIChtX2FjdGl2ZVZpZGVvVHJhY2spCi0gICAgICAgICAgICAg ICAgbV9hY3RpdmVWaWRlb1RyYWNrLT5zb3VyY2UoKS5hZGRWaWRlb1NhbXBsZU9ic2VydmVyKCp0 aGlzKTsKKyAgICAgICAgICAgICAgICBtX2FjdGl2ZVZpZGVvVHJhY2stPnN0cmVhbVRyYWNrKCku c291cmNlKCkuYWRkVmlkZW9TYW1wbGVPYnNlcnZlcigqdGhpcyk7CiAgICAgICAgIH0KICAgICB9 KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0F1 ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL0F1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0uaAppbmRleCAwOTg0MjBiYTVh MjM1NWZjM2Y2NWYxZTM3NTJiNTM2OWQzM2VlMjQ5Li4xN2Q0MTE5YjA0Yjg2ZDc0OWNiNzcyOWNi ZWNiNzBlOGIzYzZlODhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbS5oCkBA IC00MCw3ICs0MCw3IEBAIGNsYXNzIEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0gZmluYWwK ICAgICAsIHByaXZhdGUgUmVhbHRpbWVNZWRpYVNvdXJjZTo6QXVkaW9TYW1wbGVPYnNlcnZlciB7 CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbSkK IHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmUHRyPEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0+ IGNyZWF0ZShNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYgc3RyZWFtVHJhY2spCisgICAgc3RhdGlj IFJlZjxBdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtPiBjcmVhdGUoTWVkaWFTdHJlYW1UcmFj a1ByaXZhdGUmIHN0cmVhbVRyYWNrKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbShzdHJlYW1UcmFjaykpOwogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1ZpZGVvVHJhY2tQ cml2YXRlTWVkaWFTdHJlYW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L1ZpZGVvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0uaAppbmRleCAxMDYzMWYwNjJlMzdkZDJkYzhl ZTkyOGVmMGVkZjRmNTU1Zjg3YjZkLi5kNGZkNDc1Njc3MWVkMzc0ODc1MTczYTg2MTcwODcwYWI3 Zjk4ZTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9W aWRlb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vVmlkZW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbS5oCkBAIC0zNSw3ICsz NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFZpZGVvVHJhY2tQcml2YXRlTWVkaWFT dHJlYW0gZmluYWwgOiBwdWJsaWMgVmlkZW9UcmFja1ByaXZhdGUgewogICAgIFdURl9NQUtFX05P TkNPUFlBQkxFKFZpZGVvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0pCiBwdWJsaWM6Ci0gICAgc3Rh dGljIFJlZlB0cjxWaWRlb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtPiBjcmVhdGUoTWVkaWFTdHJl YW1UcmFja1ByaXZhdGUmIHN0cmVhbVRyYWNrKQorICAgIHN0YXRpYyBSZWY8VmlkZW9UcmFja1By aXZhdGVNZWRpYVN0cmVhbT4gY3JlYXRlKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJiBzdHJlYW1U cmFjaykKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFZpZGVvVHJhY2tQcml2 YXRlTWVkaWFTdHJlYW0oc3RyZWFtVHJhY2spKTsKICAgICB9Cg==