222832 2021-03-05 15:04:30 -0800 Make HTMLMediaElement::clearMediaCacheForOrigins() take in SecurityOriginData objects 2021-03-05 17:04:39 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222820 InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson eric.carlson ggaren jer.noble kkinnunen webkit-bug-importer oldest_to_newest 1736574 0 cdumez 2021-03-05 15:04:30 -0800 Make HTMLMediaElement::clearMediaCacheForOrigins() take in SecurityOriginData instead of SecurityOrigin objects. 1736577 1 422429 cdumez 2021-03-05 15:09:52 -0800 Created attachment 422429 Patch 1736603 2 422429 ggaren 2021-03-05 15:32:29 -0800 Comment on attachment 422429 Patch r=me 1736663 3 ews-feeder 2021-03-05 17:03:30 -0800 Committed r274021: <https://commits.webkit.org/r274021> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422429. 1736666 4 webkit-bug-importer 2021-03-05 17:04:39 -0800 <rdar://problem/75119581> 422429 2021-03-05 15:09:52 -0800 2021-03-05 17:03:31 -0800 Patch bug-222832-20210305150951.patch text/plain 19786 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBiN2Q5NDIwYWExZGRi ZmU0MjNhMDJhNzRhNGIyMGM2NzI1ZGI2Ni4uMGViMTI5YTZjYTA5NDU0Y2YxZTM2NzMyYWExN2Ji ZTBhNzE1MTg2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAzLTA1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBIVE1MTWVkaWFFbGVt ZW50OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKCkgdGFrZSBpbiBTZWN1cml0eU9yaWdpbkRh dGEgb2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjIyODMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWFrZSBIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKCkgdGFr ZSBpbiBTZWN1cml0eU9yaWdpbkRhdGEgaW5zdGVhZCBvZgorICAgICAgICBTZWN1cml0eU9yaWdp biBvYmplY3RzLiBUaGUgY2FsbCBzaXRlIGhhcyBTZWN1cml0eU9yaWdpbkRhdGEgb2JqZWN0cyBh bmQgdGhlcmUgd2FzIGEgRklYTUUKKyAgICAgICAgY29tbWVudCBhYm91dCBzd2l0Y2hpbmcgY2xl YXJNZWRpYUNhY2hlRm9yT3JpZ2lucygpIHRvIFNlY3VyaXR5T3JpZ2luRGF0YS4KKworICAgICAg ICBTZWN1cml0eU9yaWdpbkRhdGEgYWxzbyBoYXMgdGhlIGJlbmVmaXRzIG9mIGJlaW5nIGxpZ2h0 ZXIgd2VpZ2h0LCBhbmQgaXQgY2FuIGJlIHNlbnQgb3ZlcgorICAgICAgICBJUEMsIHdoaWxlIGJl aW5nIHN1ZmZpY2llbnQgZm9yIG91ciB1c2UgY2FzZXMgaGVyZS4KKworICAgICAgICAqIGh0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50 OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVs ZW1lbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyRmFjdG9yeTo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyBjb25z dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OmNsZWFyTWVkaWFD YWNoZUZvck9yaWdpbnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyk6CisKIDIwMjEtMDMtMDUg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgQXBwbGlj YXRpb25DYWNoZVN0b3JhZ2U6Om9yaWdpbnNXaXRoQ2FjaGUoKSB0byByZXR1cm4gYSBIYXNoU2V0 PFNlY3VyaXR5T3JpZ2luRGF0YT4gaW5zdGVhZCBvZiBhIFZlY3RvcjxSZWY8U2VjdXJpdHlPcmln aW4+PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZwppbmRleCA1YzhjYTA5YTYwM2EyZDI3OGNlZjZhZWEyYjE1Y2FhODlmN2FmYmQx Li42N2U2MGFiYjAzYzdiNTI3MzIwMzc0NDk1Yjc0NzllNWEwYmE2MzJlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDI3IEBACisyMDIxLTAzLTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CisKKyAgICAgICAgTWFrZSBIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmln aW5zKCkgdGFrZSBpbiBTZWN1cml0eU9yaWdpbkRhdGEgb2JqZWN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODMyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBIVE1MTWVkaWFFbGVtZW50Ojpj bGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKCkgdGFrZSBpbiBTZWN1cml0eU9yaWdpbkRhdGEgaW5z dGVhZCBvZgorICAgICAgICBTZWN1cml0eU9yaWdpbiBvYmplY3RzLiBUaGUgY2FsbCBzaXRlIGhh cyBTZWN1cml0eU9yaWdpbkRhdGEgb2JqZWN0cyBhbmQgdGhlcmUgd2FzIGEgRklYTUUKKyAgICAg ICAgY29tbWVudCBhYm91dCBzd2l0Y2hpbmcgY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucygpIHRv IFNlY3VyaXR5T3JpZ2luRGF0YS4KKworICAgICAgICBTZWN1cml0eU9yaWdpbkRhdGEgYWxzbyBo YXMgdGhlIGJlbmVmaXRzIG9mIGJlaW5nIGxpZ2h0ZXIgd2VpZ2h0LCBhbmQgaXQgY2FuIGJlIHNl bnQgb3ZlcgorICAgICAgICBJUEMsIHdoaWxlIGJlaW5nIHN1ZmZpY2llbnQgZm9yIG91ciB1c2Ug Y2FzZXMgaGVyZS4KKworICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5 ZXJNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllck1h bmFnZXJQcm94eTo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyk6CisgICAgICAgICogR1BVUHJv Y2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oOgorICAgICAgICAqIEdQ VVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkubWVzc2FnZXMuaW46 CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6OmNsZWFyTWVkaWFDYWNoZUZv ck9yaWdpbnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxh eWVyTWFuYWdlci5oOgorCiAyMDIxLTAzLTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgVXNlIFdURjo6RGVzdHJ1Y3Rpb25UaHJlYWQ6Ok1haW5SdW5Mb29wIGZv ciBDYWxsYmFja0FnZ3JlZ2F0b3JzIGluIFdlYnNpdGVEYXRhU3RvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGI0ZTIzYzMzNzM0Nzc0OGY1Y2FlOTUzNTVh N2M1MmZlMzBhYzQxZjAuLmI3ZDk2ZWJiMzIyMmI2MGZmYTQ5MzFhZGFjNTcxOWExZGQ2M2E1NzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNjQ0NCw3ICs2 NDQ0LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGUoY29uc3QgU3Ry aW5nJiBwYXRoLCBXYWxsVGltZSBtb2RpZmllZFNpbmMKICAgICBNZWRpYVBsYXllcjo6Y2xlYXJN ZWRpYUNhY2hlKHBhdGgsIG1vZGlmaWVkU2luY2UpOwogfQogCi12b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OmNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBI YXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+JiBvcmlnaW5zKQordm9pZCBIVE1MTWVkaWFF bGVtZW50OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYgcGF0aCwgY29u c3QgSGFzaFNldDxTZWN1cml0eU9yaWdpbkRhdGE+JiBvcmlnaW5zKQogewogICAgIE1lZGlhUGxh eWVyOjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKHBhdGgsIG9yaWdpbnMpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCAxODEzYmQ0OGUwYmE1NDMzM2Y5ZmEw M2JiZWZkMDk0MDNjYTM3YmY1Li4xOGQ2OTFlMWY2MjkxMmJmOGQ3MGYyZGNmMmY0YmViNjZjMmQ4 ZTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtNDU0LDcgKzQ1 NCw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgY29uc3QgU3RyaW5nJiBt ZWRpYUNhY2hlRGlyZWN0b3J5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIEhhc2hTZXQ8 U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYpOwog ICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIGNsZWFyTWVkaWFDYWNoZShjb25zdCBTdHJp bmcmLCBXYWxsVGltZSBtb2RpZmllZFNpbmNlID0geyB9KTsKLSAgICBXRUJDT1JFX0VYUE9SVCBz dGF0aWMgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0 IEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4mKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBz dGF0aWMgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0 IEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiYpOwogICAgIHN0YXRpYyB2b2lkIHJlc2V0TWVk aWFFbmdpbmVzKCk7CiAKICAgICBib29sIGlzUGxheWluZygpIGNvbnN0IHsgcmV0dXJuIG1fcGxh eWluZzsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5 ZXIuY3BwCmluZGV4IGJkMGM1YjBmZjNiMDYxZmViOGQyNzY3N2JkZTg4NjU2ZThhMjMyOWYuLjQz MTczZDIwOWJhMmE4NWEwYjRmZjBkYmJhMzcyYzc4OTViYmE4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKQEAgLTEyMzAsNyArMTIz MCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXI6OmNsZWFyTWVkaWFDYWNoZShjb25zdCBTdHJpbmcmIHBh dGgsIFdhbGxUaW1lIG1vZGlmaWVkU2luY2UpCiAgICAgICAgIGVuZ2luZS0+Y2xlYXJNZWRpYUNh Y2hlKHBhdGgsIG1vZGlmaWVkU2luY2UpOwogfQogCi12b2lkIE1lZGlhUGxheWVyOjpjbGVhck1l ZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgSGFzaFNldDxSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+PiYgb3JpZ2lucykKK3ZvaWQgTWVkaWFQbGF5ZXI6OmNsZWFyTWVk aWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBIYXNoU2V0PFNlY3Vy aXR5T3JpZ2luRGF0YT4mIG9yaWdpbnMpCiB7CiAgICAgZm9yIChhdXRvJiBlbmdpbmUgOiBpbnN0 YWxsZWRNZWRpYUVuZ2luZXMoKSkKICAgICAgICAgZW5naW5lLT5jbGVhck1lZGlhQ2FjaGVGb3JP cmlnaW5zKHBhdGgsIG9yaWdpbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmgKaW5kZXggM2YyOTZhYjJjNjAxYTYxYTgwYTUyZmY2OTZkNjA2NmQw Zjk4NDQwNS4uZWIyMzFlNmM3ODJkMmYzMGM4Y2RlZGE4YjIyMTU0YjlkZmI2ZTdiMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCkBAIC0zMDQs NyArMzA0LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIGlzQXZhaWxhYmxlKCk7CiAgICAg c3RhdGljIEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zSW5NZWRpYUNhY2hlKGNv bnN0IFN0cmluZyYgcGF0aCk7CiAgICAgc3RhdGljIHZvaWQgY2xlYXJNZWRpYUNhY2hlKGNvbnN0 IFN0cmluZyYgcGF0aCwgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSk7Ci0gICAgc3RhdGljIHZvaWQg Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IEhhc2hT ZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4mKTsKKyAgICBzdGF0aWMgdm9pZCBjbGVhck1lZGlh Q2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgSGFzaFNldDxTZWN1cml0 eU9yaWdpbkRhdGE+Jik7CiAgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNLZXlTeXN0ZW0oY29uc3Qg U3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogCiAgICAgYm9vbCBz dXBwb3J0c1BpY3R1cmVJblBpY3R1cmUoKSBjb25zdDsKQEAgLTcxMSw3ICs3MTEsNyBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zSW5N ZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQogICAgIHZpcnR1 YWwgdm9pZCBjbGVhck1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiwgV2FsbFRpbWUpIGNvbnN0IHsg fQotICAgIHZpcnR1YWwgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmlu ZyYsIGNvbnN0IEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4mKSBjb25zdCB7IH0KKyAg ICB2aXJ0dWFsIHZvaWQgY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmLCBj b25zdCBIYXNoU2V0PFNlY3VyaXR5T3JpZ2luRGF0YT4mKSBjb25zdCB7IH0KICAgICB2aXJ0dWFs IGJvb2wgc3VwcG9ydHNLZXlTeXN0ZW0oY29uc3QgU3RyaW5nJiAvKiBrZXlTeXN0ZW0gKi8sIGNv bnN0IFN0cmluZyYgLyogbWltZVR5cGUgKi8pIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXll clByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy UHJpdmF0ZS5oCmluZGV4IDU0Nzc1ZDdkMmZjZTlkMGYwZGQ3MDY3OTY1OGU0ZmE1ZTY0YjQ0YWEu LmFmM2FiY2ZmMWE2Y2ZiNGFhZjUwZDhhYTI0NzY3NzA2NjE1NDQ0NGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCkBA IC0yMTgsNyArMjE4LDcgQEAgcHVibGljOgogCiAgICAgSGFzaFNldDxTZWN1cml0eU9yaWdpbkRh dGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJikgeyByZXR1cm4geyB9OyB9CiAg ICAgdm9pZCBjbGVhck1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiwgV2FsbFRpbWUpIHsgfQotICAg IHZvaWQgY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmLCBjb25zdCBIYXNo U2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+JikgeyB9CisgICAgdm9pZCBjbGVhck1lZGlhQ2Fj aGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0IEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5E YXRhPiYpIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNldFByaXZhdGVCcm93c2luZ01vZGUoYm9v bCkgeyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAppbmRleCA0ZDBlODU0MjkzMmQwN2IwNWM5YTg4 YWVhZWNjN2YzOWMwYzZjNTkzLi5kMDJjOTIzMTYyY2VmZWQxM2ZkZTllNTI1NDY4ZTc5MmYzMDY0 ZjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCkBAIC0xMzcsNyArMTM3LDcgQEAgcHJpdmF0ZToK ICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c0tleVN5c3RlbShjb25zdCBTdHJpbmcmIGtleVN5c3Rl bSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgc3RhdGljIEhhc2hTZXQ8U2VjdXJpdHlP cmlnaW5EYXRhPiBvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRp YyB2b2lkIGNsZWFyTWVkaWFDYWNoZShjb25zdCBTdHJpbmcmLCBXYWxsVGltZSBtb2RpZmllZFNp bmNlKTsKLSAgICBzdGF0aWMgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0 cmluZyYsIGNvbnN0IEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4mKTsKKyAgICBzdGF0 aWMgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0IEhh c2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiYpOwogCiAgICAgdm9pZCBzZXRCdWZmZXJpbmdQb2xp Y3koTWVkaWFQbGF5ZXI6OkJ1ZmZlcmluZ1BvbGljeSkgZmluYWw7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCmluZGV4IDRmY2Y0MGQyMDQwODBjZWVmNzk2OTVmNTA0OWRiZGE4YmQxOWRkYWQuLjcy MjQzOTEyMzUzMGNiZWZjZjZhYjAxYjE0MTYxMmVkYTgyNThhZDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQy5tbQpAQCAtMzExLDcgKzMxMSw3IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjbGVhck1lZGlhQ2FjaGUocGF0aCwgbW9k aWZpZWRTaW5jZSk7CiAgICAgfQogCi0gICAgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5z KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgSGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+ PiYgb3JpZ2lucykgY29uc3QgZmluYWwKKyAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdp bnMoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBIYXNoU2V0PFNlY3VyaXR5T3JpZ2luRGF0YT4m IG9yaWdpbnMpIGNvbnN0IGZpbmFsCiAgICAgewogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhwYXRoLCBv cmlnaW5zKTsKICAgICB9CkBAIC00MjcsNyArNDI3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDOjpjbGVhck1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBwYXRoLCBX YWwKICAgICAgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFVSTDpmaWxlVVJMIGVycm9yOm5p bF07CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y2xlYXJN ZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IEhhc2hTZXQ8UmVm UHRyPFNlY3VyaXR5T3JpZ2luPj4mIG9yaWdpbnMpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakM6OmNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiBw YXRoLCBjb25zdCBIYXNoU2V0PFNlY3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdpbnMpCiB7CiAgICAg QVZBc3NldENhY2hlKiBhc3NldENhY2hlID0gYXNzZXRDYWNoZUZvclBhdGgocGF0aCk7CiAgICAg aWYgKCFhc3NldENhY2hlKQpAQCAtNDM2LDcgKzQzNiw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJp bmcmCiAgICAgZm9yIChOU1N0cmluZyAqa2V5IGluIFthc3NldENhY2hlIGFsbEtleXNdKSB7CiAg ICAgICAgIFVSTCBrZXlBc1VSTCA9IFVSTChVUkwoKSwga2V5KTsKICAgICAgICAgaWYgKGtleUFz VVJMLmlzVmFsaWQoKSkgewotICAgICAgICAgICAgaWYgKG9yaWdpbnMuY29udGFpbnMoU2VjdXJp dHlPcmlnaW46OmNyZWF0ZShrZXlBc1VSTCkpKQorICAgICAgICAgICAgaWYgKG9yaWdpbnMuY29u dGFpbnMoU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tVVJMKGtleUFzVVJMKSkpCiAgICAgICAgICAg ICAgICAgW2Fzc2V0Q2FjaGUgcmVtb3ZlRW50cnlGb3JLZXk6a2V5XTsKICAgICAgICAgfQogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRp YVBsYXllck1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv UmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkuY3BwCmluZGV4IGIzZTg4MmU4OGRmY2JiNDgy ZGE0MjRhYTEzNTc3OTY4ZjczZGMzMzYuLmE4ZDFlZjUxYWQ3Zjg0ZmZmY2E0NjFjNzJmMzIwMjZl YjFjZTJlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1v dGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9j ZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5LmNwcApAQCAtMTM3LDE4ICsx MzcsMTMgQEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eTo6Y2xlYXJNZWRpYUNh Y2hlKE1lZGlhUGxheWVyRW51bXM6Ok1lZGlhRW5naW4KICAgICBlbmdpbmUtPmNsZWFyTWVkaWFD YWNoZShwYXRoLCBtb2RpZmllZFNpbmNlKTsKIH0KIAotdm9pZCBSZW1vdGVNZWRpYVBsYXllck1h bmFnZXJQcm94eTo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhNZWRpYVBsYXllckVudW1zOjpN ZWRpYUVuZ2luZUlkZW50aWZpZXIgZW5naW5lSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiYgcGF0 aCwgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4mJiBvcmlnaW5EYXRhKQordm9p ZCBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eTo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lu cyhNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIgZW5naW5lSWRlbnRpZmll ciwgY29uc3QgU3RyaW5nJiYgcGF0aCwgSGFzaFNldDxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRh dGE+JiYgb3JpZ2lucykKIHsKICAgICBhdXRvIGVuZ2luZSA9IE1lZGlhUGxheWVyOjptZWRpYUVu Z2luZShlbmdpbmVJZGVudGlmaWVyKTsKICAgICBpZiAoIWVuZ2luZSkgewogICAgICAgICBXVEZM b2dBbHdheXMoIkZhaWxlZCB0byBmaW5kIG1lZGlhIGVuZ2luZS4iKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KLQotICAgIEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3JpZ2luczsK LSAgICBmb3IgKGF1dG8mIGRhdGEgOiBvcmlnaW5EYXRhKQotICAgICAgICBvcmlnaW5zLmFkZChk YXRhLnNlY3VyaXR5T3JpZ2luKCkpOwotCiAgICAgZW5naW5lLT5jbGVhck1lZGlhQ2FjaGVGb3JP cmlnaW5zKHBhdGgsIG9yaWdpbnMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQ VVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oCmlu ZGV4IDY5NDNjOTA2MTgwYWY3ZWZiNjY1MzU1NDEzOWU4OWY2MGFkMDMyOTUuLjMyMzA5ZDA3NmQ0 OTk1ODY5Nzg0Y2U0MmYzZTg2MWNlOWNkMjNhMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94 eS5oCkBAIC04MCw3ICs4MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdXBwb3J0c1R5cGVBbmRD b2RlY3MoV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBj b25zdCBXZWJDb3JlOjpNZWRpYUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJzJiYsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSk+JiYpOwogICAg IHZvaWQgb3JpZ2luc0luTWVkaWFDYWNoZShXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRp YUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KEhhc2hTZXQ8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiYmKT4mJik7CiAgICAgdm9pZCBj bGVhck1lZGlhQ2FjaGUoV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVu dGlmaWVyLCBjb25zdCBTdHJpbmcmJiwgV2FsbFRpbWUpOwotICAgIHZvaWQgY2xlYXJNZWRpYUNh Y2hlRm9yT3JpZ2lucyhXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYmLCBWZWN0b3I8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRh PiYmKTsKKyAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmJiwgSGFzaFNl dDxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+JiYpOwogICAgIHZvaWQgc3VwcG9ydHNLZXlT eXN0ZW0oV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBj b25zdCBTdHJpbmcmJiwgY29uc3QgU3RyaW5nJiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9v bCk+JiYpOwogCiAgICAgTG9jayBtX3Byb3hpZXNMb2NrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5Lm1lc3Nh Z2VzLmluIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVy TWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDAxNWNkNTAyZWE4Yzg3Mzc4OTllYTNjNDEx ZDkyOGRlMjAzMmE2MWQuLmM5MTc1ZWE1YzRkYzVhYTk2OTVlOGIyOTlmYTY2ZTJlNGExZWY2MWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBs YXllck1hbmFnZXJQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nl c3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KQEAgLTMx LDcgKzMxLDcgQEAgbWVzc2FnZXMgLT4gUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkgTm90 UmVmQ291bnRlZCB7CiAgICAgU3VwcG9ydHNUeXBlQW5kQ29kZWNzKGVudW06dWludDhfdCBXZWJD b3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIgcmVtb3RlRW5naW5l SWRlbnRpZmllciwgc3RydWN0IFdlYkNvcmU6Ok1lZGlhRW5naW5lU3VwcG9ydFBhcmFtZXRlcnMg dHlwZSkgLT4gKGVudW06dWludDhfdCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpTdXBwb3J0 c1R5cGUgc3VwcG9ydCkgU3luY2hyb25vdXMKICAgICBPcmlnaW5zSW5NZWRpYUNhY2hlKGVudW06 dWludDhfdCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIg cmVtb3RlRW5naW5lSWRlbnRpZmllciwgU3RyaW5nIHBhdGgpIC0+IChIYXNoU2V0PFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luRGF0YT4gb3JpZ2lucykgU3luY2hyb25vdXMKICAgICBDbGVhck1lZGlh Q2FjaGUoZW51bTp1aW50OF90IFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6Ok1lZGlhRW5naW5l SWRlbnRpZmllciByZW1vdGVFbmdpbmVJZGVudGlmaWVyLCBTdHJpbmcgcGF0aCwgV2FsbFRpbWUg bW9kaWZpZWRTaW5jZSkKLSAgICBDbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGVudW06dWludDhf dCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIgcmVtb3Rl RW5naW5lSWRlbnRpZmllciwgU3RyaW5nIHBhdGgsIFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGE+IG9yaWdpbnMpCisgICAgQ2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhlbnVtOnVp bnQ4X3QgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJl bW90ZUVuZ2luZUlkZW50aWZpZXIsIFN0cmluZyBwYXRoLCBIYXNoU2V0PFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luRGF0YT4gb3JpZ2lucykKICAgICBTdXBwb3J0c0tleVN5c3RlbShlbnVtOnVpbnQ4 X3QgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJlbW90 ZUVuZ2luZUlkZW50aWZpZXIsIFN0cmluZyBrZXlTeXN0ZW0sIFN0cmluZyBtaW1lVHlwZSkgLT4g KGJvb2wgc3VwcG9ydHMpIFN5bmNocm9ub3VzCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggYTY2 ZGIxMWY0NDQ5ZDUwMTdiYWNhMjdmMGRmNjEwY2FkNmI4M2FiNC4uZmMwNjdiMzAyMjBjNTVlMTUx NWYyZWQ1YjVmYjM0M2ExMzllMmU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTk3MiwxNCArOTcy LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRl RGF0YVR5cGU+IGRhdGFUeXBlcywgY29uc3QgVmUKICNpZiBFTkFCTEUoVklERU8pCiAgICAgICAg IGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7CiAgICAgICAgIG1fcXVl dWUtPmRpc3BhdGNoKFtvcmlnaW5zID0gV1RGTW92ZShvcmlnaW5zKSwgbWVkaWFDYWNoZURpcmVj dG9yeSA9IG1fY29uZmlndXJhdGlvbi0+bWVkaWFDYWNoZURpcmVjdG9yeSgpLmlzb2xhdGVkQ29w eSgpLCBjYWxsYmFja0FnZ3JlZ2F0b3JdIHsKLQotICAgICAgICAgICAgLy8gRklYTUU6IE1vdmUg U2VjdXJpdHlPcmlnaW46OnRvUmF3U3RyaW5nIHRvIFNlY3VyaXR5T3JpZ2luRGF0YSBhbmQKLSAg ICAgICAgICAgIC8vIG1ha2UgSFRNTE1lZGlhRWxlbWVudDo6Y2xlYXJNZWRpYUNhY2hlRm9yT3Jp Z2lucyB0YWtlIFNlY3VyaXR5T3JpZ2luRGF0YS4KLSAgICAgICAgICAgIEhhc2hTZXQ8UmVmUHRy PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gc2VjdXJpdHlPcmlnaW5zOwotICAgICAgICAgICAg Zm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKQotICAgICAgICAgICAgICAgIHNlY3VyaXR5T3Jp Z2lucy5hZGQob3JpZ2luLnNlY3VyaXR5T3JpZ2luKCkpOwotICAgICAgICAgICAgV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhtZWRpYUNhY2hlRGly ZWN0b3J5LCBzZWN1cml0eU9yaWdpbnMpOwotICAgICAgICAgICAgCisgICAgICAgICAgICBXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKG1lZGlhQ2Fj aGVEaXJlY3RvcnksIG9yaWdpbnMpOwogICAgICAgICAgICAgV1RGOjpSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW2NhbGxiYWNrQWdncmVnYXRvcl0gewogICAgICAgICAgICAgICAgIGNhbGxiYWNr QWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCk7CiAgICAgICAgICAgICB9KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQ bGF5ZXJNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVt b3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcAppbmRleCBjMjVhYTg3Zjk4NWZjYzNhNmM5YmU5MWMx MjAxYmQzYWIwN2UxMDEyLi4xZTc3ZGM4ZDAxNzVmZDJmNDc3NTNhODRhNWE1NDljOGY2ZjI3ZjZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1l ZGlhUGxheWVyTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9t ZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwCkBAIC04MCw3ICs4MCw3IEBAIHB1Ymxp YzoKICAgICAgICAgcmV0dXJuIG1fbWFuYWdlci5jbGVhck1lZGlhQ2FjaGUobV9yZW1vdGVFbmdp bmVJZGVudGlmaWVyLCBwYXRoLCBtb2RpZmllZFNpbmNlKTsKICAgICB9CiAKLSAgICB2b2lkIGNs ZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBIYXNoU2V0 PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+JiBvcmlnaW5zKSBjb25zdCBmaW5hbAorICAgIHZvaWQg Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IEhhc2hT ZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucykgY29uc3QgZmluYWwKICAgICB7CiAgICAg ICAgIHJldHVybiBtX21hbmFnZXIuY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhtX3JlbW90ZUVu Z2luZUlkZW50aWZpZXIsIHBhdGgsIG9yaWdpbnMpOwogICAgIH0KQEAgLTIzMCwxMyArMjMwLDkg QEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6OmNsZWFyTWVkaWFDYWNoZShNZWRpYVBs YXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW4KICAgICBncHVQcm9jZXNzQ29ubmVjdGlvbigpLmNv bm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eTo6 Q2xlYXJNZWRpYUNhY2hlKHJlbW90ZUVuZ2luZUlkZW50aWZpZXIsIHBhdGgsIG1vZGlmaWVkU2lu Y2UpLCAwKTsKIH0KIAotdm9pZCBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6OmNsZWFyTWVkaWFD YWNoZUZvck9yaWdpbnMoTWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJl bW90ZUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgSGFzaFNldDxS ZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiYgb3JpZ2lucykKK3ZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJN YW5hZ2VyOjpjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKE1lZGlhUGxheWVyRW51bXM6Ok1lZGlh RW5naW5lSWRlbnRpZmllciByZW1vdGVFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHBh dGgsIGNvbnN0IEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucykKIHsKLSAgICBh dXRvIG9yaWdpbkRhdGEgPSBXVEY6Om1hcChvcmlnaW5zLCBbXSAoYXV0byYgb3JpZ2luKSB7Ci0g ICAgICAgIHJldHVybiBvcmlnaW4tPmRhdGEoKTsKLSAgICB9KTsKLQotICAgIGdwdVByb2Nlc3ND b25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OlJlbW90ZU1lZGlhUGxheWVy TWFuYWdlclByb3h5OjpDbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKHJlbW90ZUVuZ2luZUlkZW50 aWZpZXIsIHBhdGgsIG9yaWdpbkRhdGEpLCAwKTsKKyAgICBncHVQcm9jZXNzQ29ubmVjdGlvbigp LmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94 eTo6Q2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhyZW1vdGVFbmdpbmVJZGVudGlmaWVyLCBwYXRo LCBvcmlnaW5zKSwgMCk7CiB9CiAKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyOjpkaWRS ZWNlaXZlUGxheWVyTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVj b2RlciYgZGVjb2RlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5oCmluZGV4IDFiZjg1NzZhZGQ2 MGFmZmIxNDk2ZDNkZjU5ODUyNTI2ZWExMTFlMzUuLjBiYmYzMDkzMmFlODZiNTJlZGM0Mjk1Mzk1 MjYwNWQzMDgwZDE1MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuaApAQCAtODMsNyArODMs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgc3VwcG9ydHNLZXlTeXN0ZW0oV2ViQ29yZTo6TWVkaWFQ bGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVN5c3Rl bSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgSGFzaFNldDxXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVt czo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGNsZWFy TWVkaWFDYWNoZShXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZp ZXIsIGNvbnN0IFN0cmluZyYsIFdhbGxUaW1lIG1vZGlmaWVkU2luY2UpOwotICAgIHZvaWQgY2xl YXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVu Z2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEhhc2hTZXQ8UmVmUHRyPFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luPj4mKTsKKyAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdp bnMoV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25z dCBTdHJpbmcmLCBjb25zdCBIYXNoU2V0PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4mKTsK IAogICAgIEhhc2hNYXA8V2ViQ29yZTo6TWVkaWFQbGF5ZXJJZGVudGlmaWVyLCBXZWFrUHRyPE1l ZGlhUGxheWVyUHJpdmF0ZVJlbW90ZT4+IG1fcGxheWVyczsKICAgICBXZWJQcm9jZXNzJiBtX3By b2Nlc3M7Cg==