222820 2021-03-05 13:37:13 -0800 Update HTMLMediaElement::originsInMediaCache() to return SecurityOriginData instead of SecurityOrigin objects 2021-03-05 16:11:20 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222828 https://bugs.webkit.org/show_bug.cgi?id=222832 InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson darin eric.carlson ggaren jer.noble kkinnunen webkit-bug-importer oldest_to_newest 1736512 0 cdumez 2021-03-05 13:37:13 -0800 Update HTMLMediaElement::originsInMediaCache() to return SecurityOriginData instead of SecurityOrigin objects. 1736521 1 422410 cdumez 2021-03-05 13:45:06 -0800 Created attachment 422410 Patch 1736612 2 cdumez 2021-03-05 15:47:47 -0800 Bubbles are green. Patch looks ready to review. 1736630 3 ews-feeder 2021-03-05 16:10:11 -0800 Committed r274019: <https://commits.webkit.org/r274019> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422410. 1736632 4 webkit-bug-importer 2021-03-05 16:11:20 -0800 <rdar://problem/75117327> 422410 2021-03-05 13:45:06 -0800 2021-03-05 16:10:12 -0800 Patch bug-222820-20210305134505.patch text/plain 21482 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJlYTFiOWE4OGVkMWMx NzBhNDQ1MWEzOTBiMDFjY2QyMDczYTllZi4uNjAwMDBhOGMyMmZiNmY3N2FiNDEwZDgxMWRhNmYz ZDFjOTM2M2ZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTA1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIEhUTUxNZWRpYUVs ZW1lbnQ6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoKSB0byByZXR1cm4gU2VjdXJpdHlPcmlnaW5EYXRh IGluc3RlYWQgb2YgU2VjdXJpdHlPcmlnaW4gb2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEhUTUxNZWRpYUVsZW1lbnQ6Om9yaWdp bnNJbk1lZGlhQ2FjaGUoKSB0byByZXR1cm4gU2VjdXJpdHlPcmlnaW5EYXRhIGluc3RlYWQgb2Yg U2VjdXJpdHlPcmlnaW4KKyAgICAgICAgb2JqZWN0cy4gVGhlIGNhbGxlciBvbmx5IG5lZWRzIFNl Y3VyaXR5T3JpZ2luRGF0YSBvYmplY3RzIGFuZCB0aGVyZSB3YXMgYSBGSVhNRSBjb21tZW50IGFi b3V0IHN3aXRjaGluZworICAgICAgICB0byBTZWN1cml0eU9yaWdpbkRhdGEuIFNlY3VyaXR5T3Jp Z2luRGF0YSBpcyBiZW5lZmljaWFsIGhlcmUgYmVjYXVzZSBpdCBpcyBhIHNtYWxsZXIgb2JqZWN0 IGFuZCBpdAorICAgICAgICBjYW4gYmUgZWFzaWx5IHBhc3NlZCBvdmVyIElQQy4KKworICAgICAg ICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50OjpvcmlnaW5zSW5NZWRpYUNhY2hlKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRp YUVsZW1lbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6b3JpZ2luc0luTWVkaWFDYWNoZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyRmFjdG9yeTo6b3JpZ2luc0luTWVkaWFDYWNoZSBjb25zdCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6Om9yaWdpbnNJbk1lZGlhQ2FjaGUp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 b3JpZ2luc0luTWVkaWFDYWNoZSk6CisKIDIwMjEtMDMtMDUgIExhdXJvIE1vdXJhICA8bG1vdXJh QGlnYWxpYS5jb20+CiAKICAgICAgICAgQ2FudmFzOiBkcmF3SW1hZ2Ugc2hvdWxkIG5vcm1hbGl6 ZSBzcmNSZWN0IGJlZm9yZSBjaGVja2luZyBpZiBpdCdzIGVtcHR5CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFkM2Ix ZGU5NGIxOTFjNDRmODYxYmUxNDAxMmQ3OTgyNTJmMGQ2ODMuLmUwYzRlYTIzMjVmYWE4Zjg4NjQx ODNlYjY3ZTQ0M2NhYTYzYzdkMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDMt MDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgSFRN TE1lZGlhRWxlbWVudDo6b3JpZ2luc0luTWVkaWFDYWNoZSgpIHRvIHJldHVybiBTZWN1cml0eU9y aWdpbkRhdGEgaW5zdGVhZCBvZiBTZWN1cml0eU9yaWdpbiBvYmplY3RzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4MjAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgSFRNTE1lZGlhRWxlbWVu dDo6b3JpZ2luc0luTWVkaWFDYWNoZSgpIHRvIHJldHVybiBTZWN1cml0eU9yaWdpbkRhdGEgaW5z dGVhZCBvZiBTZWN1cml0eU9yaWdpbgorICAgICAgICBvYmplY3RzLiBUaGUgY2FsbGVyIG9ubHkg bmVlZHMgU2VjdXJpdHlPcmlnaW5EYXRhIG9iamVjdHMgYW5kIHRoZXJlIHdhcyBhIEZJWE1FIGNv bW1lbnQgYWJvdXQgc3dpdGNoaW5nCisgICAgICAgIHRvIFNlY3VyaXR5T3JpZ2luRGF0YS4gU2Vj dXJpdHlPcmlnaW5EYXRhIGlzIGJlbmVmaWNpYWwgaGVyZSBiZWNhdXNlIGl0IGlzIGEgc21hbGxl ciBvYmplY3QgYW5kIGl0CisgICAgICAgIGNhbiBiZSBlYXNpbHkgcGFzc2VkIG92ZXIgSVBDLgor CisgICAgICAgIEFsc28gdXBkYXRlIHRoZSBjb2RlIGF0IFdlYnNpdGVEYXRhU3RvcmU6OmZldGNo RGF0YUFuZEFwcGx5KCkgdG8gY3Jvc3NUaHJlYWRDb3B5KCkgdGhlIG9yaWdpbkRhdGFzCisgICAg ICAgIGJlZm9yZSBzZW5kaW5nIHRoZW0gdG8gdGhlIG1haW4gdGhyZWFkLiBUaGUgcHJldmlvdXMg Y29kZSB3YXMgcGFzc2luZyBib3RoIHRoZSBTZWN1cml0eU9yaWdpbnMKKyAgICAgICAgYW5kIHRo ZSBXZWJzaXRlRGF0YXMgZnJvbSB0aGUgZGF0YSBzdG9yZSBxdWV1ZSB0byB0aGUgbWFpbiB0aHJl YWQgd2l0aG91dCBpc29sYXRlZCBjb3B5LCB3aGljaCB3YXMKKyAgICAgICAgZnJhZ2lsZS4gRm9y IGV4YW1wbGUsIGlmIEhUTUxNZWRpYUVsZW1lbnQ6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoKSB3YXMg Y2FjaGluZyB0aGUgc2VjdXJpdHkgb3JpZ2lucworICAgICAgICBpdCByZXR1cm5lZCwgdGhlIGNv ZGUgd291bGQgbm90IGhhdmUgYmVlbiB0aHJlYWQgc2FmZS4KKworICAgICAgICAqIEdQVVByb2Nl c3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eTo6b3JpZ2luc0luTWVkaWFDYWNoZSk6 CisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94 eS5oOgorICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2Vy UHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpmZXRj aERhdGFBbmRBcHBseSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVk aWFQbGF5ZXJNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJN YW5hZ2VyOjpvcmlnaW5zSW5NZWRpYUNhY2hlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9t ZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuaDoKKwogMjAyMS0wMy0wNSAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjI2ODA5Nyk6IFdL V2ViVmlldy5VUkwgaXMgbmlsIGluIHRoZSBwcm9jZXNzRGlkVGVybWluYXRlIGRlbGVnYXRlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA5NGJiMGFlNDVkZmQ5 MzFmY2Y4NWY4MjQ1OTJhMTE5N2Y2Y2E1M2Q5Li5iNGUyM2MzMzczNDc3NDhmNWNhZTk1MzU1YTdj NTJmZTMwYWM0MWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK QEAgLTY0MzQsNyArNjQzNCw3IEBAIGNvbnN0IFN0cmluZyYgSFRNTE1lZGlhRWxlbWVudDo6bWVk aWFDYWNoZURpcmVjdG9yeSgpCiAgICAgcmV0dXJuIHNoYXJlZE1lZGlhQ2FjaGVEaXJlY3Rvcnko KTsKIH0KIAotSGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBIVE1MTWVkaWFFbGVtZW50 OjpvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYgcGF0aCkKK0hhc2hTZXQ8U2VjdXJp dHlPcmlnaW5EYXRhPiBIVE1MTWVkaWFFbGVtZW50OjpvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0 IFN0cmluZyYgcGF0aCkKIHsKICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6Om9yaWdpbnNJbk1lZGlh Q2FjaGUocGF0aCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4 IGNjY2JiODMxZTNhMjZhOGMxOWNiYzc0ZDdlMWZjODdkZTVhMWJhOWYuLjE4MTNiZDQ4ZTBiYTU0 MzMzZjlmYTAzYmJlZmQwOTQwM2NhMzdiZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5oCkBAIC00NTIsNyArNDUyLDcgQEAgcHVibGljOgogICAgIC8vIE1lZGlhIGNhY2hl IG1hbmFnZW1lbnQuCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQgc2V0TWVkaWFDYWNo ZURpcmVjdG9yeShjb25zdCBTdHJpbmcmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgY29u c3QgU3RyaW5nJiBtZWRpYUNhY2hlRGlyZWN0b3J5KCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgc3Rh dGljIEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3JpZ2luc0luTWVkaWFDYWNoZShj b25zdCBTdHJpbmcmKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgSGFzaFNldDxTZWN1cml0 eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJik7CiAgICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIHZvaWQgY2xlYXJNZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYsIFdh bGxUaW1lIG1vZGlmaWVkU2luY2UgPSB7IH0pOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2 b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiwgY29uc3QgSGFzaFNl dDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiYpOwogICAgIHN0YXRpYyB2b2lkIHJlc2V0TWVkaWFF bmdpbmVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAKaW5kZXggYjQ4YzZmMzdlYjU2MTc5M2UwODgzNzljNzIwNzk5NWQzYmNkMGI2My4u YmQwYzViMGZmM2IwNjFmZWI4ZDI3Njc3YmRlODg2NTZlOGEyMzI5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtMTIxNSw5ICsx MjE1LDkgQEAgc3RhdGljIHZvaWQgYWRkVG9IYXNoKEhhc2hTZXQ8VD4mIHRvSGFzaCwgSGFzaFNl dDxUPiYmIGZyb21IYXNoKQogICAgICAgICB0b0hhc2guYWRkKGZyb21IYXNoLmJlZ2luKCksIGZy b21IYXNoLmVuZCgpKTsKIH0KICAgICAKLUhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4g TWVkaWFQbGF5ZXI6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBwYXRoKQorSGFz aFNldDxTZWN1cml0eU9yaWdpbkRhdGE+IE1lZGlhUGxheWVyOjpvcmlnaW5zSW5NZWRpYUNhY2hl KGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAgICBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdp bj4+IG9yaWdpbnM7CisgICAgSGFzaFNldDxTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnM7CiAg ICAgZm9yIChhdXRvJiBlbmdpbmUgOiBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKSkKICAgICAgICAg YWRkVG9IYXNoKG9yaWdpbnMsIGVuZ2luZS0+b3JpZ2luc0luTWVkaWFDYWNoZShwYXRoKSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCmluZGV4 IGY4MTEzMjZkMjVmYjFhYTJhMDk5Mjc5MzUzNmU4OTAyZDU4ZjI3NTkuLjNmMjk2YWIyYzYwMWE2 MWE4MGE1MmZmNjk2ZDYwNjZkMGY5ODQ0MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApAQCAtMzAyLDcgKzMwMiw3IEBAIHB1YmxpYzoKICAg ICBzdGF0aWMgU3VwcG9ydHNUeXBlIHN1cHBvcnRzVHlwZShjb25zdCBNZWRpYUVuZ2luZVN1cHBv cnRQYXJhbWV0ZXJzJik7CiAgICAgc3RhdGljIHZvaWQgZ2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNl dDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mKTsKICAgICBzdGF0aWMgYm9vbCBp c0F2YWlsYWJsZSgpOwotICAgIHN0YXRpYyBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+ IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBwYXRoKTsKKyAgICBzdGF0aWMgSGFz aFNldDxTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5n JiBwYXRoKTsKICAgICBzdGF0aWMgdm9pZCBjbGVhck1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBw YXRoLCBXYWxsVGltZSBtb2RpZmllZFNpbmNlKTsKICAgICBzdGF0aWMgdm9pZCBjbGVhck1lZGlh Q2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgSGFzaFNldDxSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+PiYpOwogICAgIHN0YXRpYyBib29sIHN1cHBvcnRzS2V5U3lzdGVtKGNv bnN0IFN0cmluZyYga2V5U3lzdGVtLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKQEAgLTcwOSw3 ICs3MDksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGdldFN1cHBvcnRlZFR5cGVzKEhh c2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+JikgY29uc3QgPSAwOwogICAg IHZpcnR1YWwgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGVBbmRDb2RlY3Mo Y29uc3QgTWVkaWFFbmdpbmVTdXBwb3J0UGFyYW1ldGVycyYpIGNvbnN0ID0gMDsKIAotICAgIHZp cnR1YWwgSGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zSW5NZWRpYUNhY2hl KGNvbnN0IFN0cmluZyYpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQorICAgIHZpcnR1YWwgSGFzaFNl dDxTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJikg Y29uc3QgeyByZXR1cm4geyB9OyB9CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyTWVkaWFDYWNoZShj b25zdCBTdHJpbmcmLCBXYWxsVGltZSkgY29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIGNsZWFy TWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiwgY29uc3QgSGFzaFNldDxSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+PiYpIGNvbnN0IHsgfQogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0tl eVN5c3RlbShjb25zdCBTdHJpbmcmIC8qIGtleVN5c3RlbSAqLywgY29uc3QgU3RyaW5nJiAvKiBt aW1lVHlwZSAqLykgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKaW5kZXggYmRkOTkw NmFkNjY1NzhmOGMwMjU3ZWU0NGVhZGYyNGQ1OTU4NGQ3MS4uNTQ3NzVkN2QyZmNlOWQwZjBkZDcw Njc5NjU4ZTRmYTVlNjRiNDRhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKQEAgLTIxNiw3ICsyMTYsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB1bnNpZ25lZCBhdWRpb0RlY29kZWRCeXRlQ291bnQoKSBjb25zdCB7 IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCB1bnNpZ25lZCB2aWRlb0RlY29kZWRCeXRlQ291bnQo KSBjb25zdCB7IHJldHVybiAwOyB9CiAKLSAgICBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdp bj4+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJikgeyByZXR1cm4geyB9OyB9Cisg ICAgSGFzaFNldDxTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3Qg U3RyaW5nJikgeyByZXR1cm4geyB9OyB9CiAgICAgdm9pZCBjbGVhck1lZGlhQ2FjaGUoY29uc3Qg U3RyaW5nJiwgV2FsbFRpbWUpIHsgfQogICAgIHZvaWQgY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lu cyhjb25zdCBTdHJpbmcmLCBjb25zdCBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+Jikg eyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAppbmRleCA5Nzg3M2ZhYWVkN2RmNjBiNmZjMjU3Y2Zj ZmQwYjI5ZTk1MjcxYzNmLi40ZDBlODU0MjkzMmQwN2IwNWM5YTg4YWVhZWNjN2YzOWMwYzZjNTkz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCkBAIC0xMzUsNyArMTM1LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgdm9pZCBnZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNl SW5zZW5zaXRpdmVIYXNoPiYgdHlwZXMpOwogICAgIHN0YXRpYyBNZWRpYVBsYXllcjo6U3VwcG9y dHNUeXBlIHN1cHBvcnRzVHlwZUFuZENvZGVjcyhjb25zdCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJh bWV0ZXJzJik7CiAgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNLZXlTeXN0ZW0oY29uc3QgU3RyaW5n JiBrZXlTeXN0ZW0sIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwotICAgIHN0YXRpYyBIYXNoU2V0 PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5n Jik7CisgICAgc3RhdGljIEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zSW5NZWRp YUNhY2hlKGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyB2b2lkIGNsZWFyTWVkaWFDYWNoZShj b25zdCBTdHJpbmcmLCBXYWxsVGltZSBtb2RpZmllZFNpbmNlKTsKICAgICBzdGF0aWMgdm9pZCBj bGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0IEhhc2hTZXQ8UmVm UHRyPFNlY3VyaXR5T3JpZ2luPj4mKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggZWU0 ZGVjZTdiMmM0OTJmZWM3NWI5OGQyYWJkMDJlMTBiN2E0OTdmZS4uNGZjZjQwZDIwNDA4MGNlZWY3 OTY5NWY1MDQ5ZGJkYThiZDE5ZGRhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0zMDEs NyArMzAxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakM6OnN1cHBvcnRzVHlwZUFuZENvZGVjcyhwYXJhbWV0ZXJzKTsKICAgICB9 CiAKLSAgICBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnNJbk1lZGlhQ2Fj aGUoY29uc3QgU3RyaW5nJiBwYXRoKSBjb25zdCBmaW5hbAorICAgIEhhc2hTZXQ8U2VjdXJpdHlP cmlnaW5EYXRhPiBvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0IFN0cmluZyYgcGF0aCkgY29uc3Qg ZmluYWwKICAgICB7CiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDOjpvcmlnaW5zSW5NZWRpYUNhY2hlKHBhdGgpOwogICAgIH0KQEAgLTM2Miw5ICszNjIs OSBAQCBzdGF0aWMgQVZBc3NldENhY2hlICplbnN1cmVBc3NldENhY2hlRXhpc3RzRm9yUGF0aChj b25zdCBTdHJpbmcmIHBhdGgpCiAgICAgcmV0dXJuIGFzc2V0Q2FjaGVGb3JQYXRoKHBhdGgpOwog fQogCi1IYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakM6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBwYXRoKQor SGFzaFNldDxTZWN1cml0eU9yaWdpbkRhdGE+IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoY29uc3QgU3RyaW5nJiBwYXRoKQogewotICAgIEhh c2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3JpZ2luczsKKyAgICBIYXNoU2V0PFNlY3Vy aXR5T3JpZ2luRGF0YT4gb3JpZ2luczsKICAgICBBVkFzc2V0Q2FjaGUqIGFzc2V0Q2FjaGUgPSBh c3NldENhY2hlRm9yUGF0aChwYXRoKTsKICAgICBpZiAoIWFzc2V0Q2FjaGUpCiAgICAgICAgIHJl dHVybiBvcmlnaW5zOwpAQCAtMzcyLDcgKzM3Miw3IEBAIEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5 T3JpZ2luPj4gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6b3JpZ2luc0luTWVk CiAgICAgZm9yIChOU1N0cmluZyAqa2V5IGluIFthc3NldENhY2hlIGFsbEtleXNdKSB7CiAgICAg ICAgIFVSTCBrZXlBc1VSTCA9IFVSTChVUkwoKSwga2V5KTsKICAgICAgICAgaWYgKGtleUFzVVJM LmlzVmFsaWQoKSkKLSAgICAgICAgICAgIG9yaWdpbnMuYWRkKFNlY3VyaXR5T3JpZ2luOjpjcmVh dGUoa2V5QXNVUkwpKTsKKyAgICAgICAgICAgIG9yaWdpbnMuYWRkKFNlY3VyaXR5T3JpZ2luRGF0 YTo6ZnJvbVVSTChrZXlBc1VSTCkpOwogICAgIH0KICAgICByZXR1cm4gb3JpZ2luczsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXll ck1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3Rl TWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkuY3BwCmluZGV4IDRkODRmNWNjMDk2NGFjYmE5Y2ZjYmRh ZmMwYjdkOGZiODYyZjFhYTYuLmIzZTg4MmU4OGRmY2JiNDgyZGE0MjRhYTEzNTc3OTY4ZjczZGMz MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRp YVBsYXllck1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21l ZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5LmNwcApAQCAtMTE0LDcgKzExNCw3IEBA IHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHk6OnN1cHBvcnRzVHlwZUFuZENvZGVj cyhNZWRpYVBsYXllckVudW1zOjpNZWRpCiAgICAgY29tcGxldGlvbkhhbmRsZXIocmVzdWx0KTsK IH0KIAotdm9pZCBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eTo6b3JpZ2luc0luTWVkaWFD YWNoZShNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIgZW5naW5lSWRlbnRp ZmllciwgY29uc3QgU3RyaW5nJiYgcGF0aCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8 V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3Zv aWQgUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHk6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoTWVk aWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIGVuZ2luZUlkZW50aWZpZXIsIGNv bnN0IFN0cmluZyYmIHBhdGgsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoSGFzaFNldDxXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGE+JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGF1 dG8gZW5naW5lID0gTWVkaWFQbGF5ZXI6Om1lZGlhRW5naW5lKGVuZ2luZUlkZW50aWZpZXIpOwog ICAgIGlmICghZW5naW5lKSB7CkBAIC0xMjMsMTMgKzEyMyw3IEBAIHZvaWQgUmVtb3RlTWVkaWFQ bGF5ZXJNYW5hZ2VyUHJveHk6Om9yaWdpbnNJbk1lZGlhQ2FjaGUoTWVkaWFQbGF5ZXJFbnVtczo6 TWVkaWFFCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBhdXRvIG9yaWdpbnMgPSBlbmdp bmUtPm9yaWdpbnNJbk1lZGlhQ2FjaGUocGF0aCk7Ci0KLSAgICBWZWN0b3I8V2ViQ29yZTo6U2Vj dXJpdHlPcmlnaW5EYXRhPiByZXN1bHQ7Ci0gICAgZm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5z KQotICAgICAgICByZXN1bHQuYXBwZW5kKG9yaWdpbi0+ZGF0YSgpKTsKLQotICAgIGNvbXBsZXRp b25IYW5kbGVyKFdURk1vdmUocmVzdWx0KSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIoZW5naW5l LT5vcmlnaW5zSW5NZWRpYUNhY2hlKHBhdGgpKTsKIH0KIAogdm9pZCBSZW1vdGVNZWRpYVBsYXll ck1hbmFnZXJQcm94eTo6Y2xlYXJNZWRpYUNhY2hlKE1lZGlhUGxheWVyRW51bXM6Ok1lZGlhRW5n aW5lSWRlbnRpZmllciBlbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmJnBhdGgsIFdhbGxU aW1lIG1vZGlmaWVkU2luY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oCmluZGV4IGZjZDY1 YjFmNTc2NmJmYTY3MDY2OWMxOTUzM2U5ZWNjM2NlMTNmNjUuLjY5NDNjOTA2MTgwYWY3ZWZiNjY1 MzU1NDEzOWU4OWY2MGFkMDMyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vz cy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQcm94eS5oCkBAIC03 OCw3ICs3OCw3IEBAIHByaXZhdGU6CiAgICAgLy8gTWVkaWEgcGxheWVyIGZhY3RvcnkKICAgICB2 b2lkIGdldFN1cHBvcnRlZFR5cGVzKFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6Ok1lZGlhRW5n aW5lSWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8U3RyaW5nPiYmKT4m Jik7CiAgICAgdm9pZCBzdXBwb3J0c1R5cGVBbmRDb2RlY3MoV2ViQ29yZTo6TWVkaWFQbGF5ZXJF bnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpNZWRpYUVuZ2luZVN1 cHBvcnRQYXJhbWV0ZXJzJiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViQ29yZTo6TWVkaWFQ bGF5ZXI6OlN1cHBvcnRzVHlwZSk+JiYpOwotICAgIHZvaWQgb3JpZ2luc0luTWVkaWFDYWNoZShX ZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0 cmluZyYmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGE+JiYpPiYmKTsKKyAgICB2b2lkIG9yaWdpbnNJbk1lZGlhQ2FjaGUoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmJiwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChIYXNoU2V0PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YT4mJik+JiYpOwogICAgIHZvaWQgY2xlYXJNZWRpYUNhY2hlKFdlYkNvcmU6Ok1lZGlhUGxheWVy RW51bXM6Ok1lZGlhRW5naW5lSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiYsIFdhbGxUaW1lKTsK ICAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoV2ViQ29yZTo6TWVkaWFQbGF5ZXJF bnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmJiwgVmVjdG9yPFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4mJik7CiAgICAgdm9pZCBzdXBwb3J0c0tleVN5c3RlbShX ZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0 cmluZyYmLCBjb25zdCBTdHJpbmcmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQ bGF5ZXJNYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KaW5kZXggOGZh ZjM4NWJjYjE3YmI2Y2M1YjY0OTJiMzBlNDE5MDFjNDkyNzNjZC4uMDE1Y2Q1MDJlYThjODczNzg5 OWVhM2M0MTFkOTI4ZGUyMDMyYTYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9j ZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluCisrKyBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXJQ cm94eS5tZXNzYWdlcy5pbgpAQCAtMjksNyArMjksNyBAQCBtZXNzYWdlcyAtPiBSZW1vdGVNZWRp YVBsYXllck1hbmFnZXJQcm94eSBOb3RSZWZDb3VudGVkIHsKIAogICAgIEdldFN1cHBvcnRlZFR5 cGVzKGVudW06dWludDhfdCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlk ZW50aWZpZXIgcmVtb3RlRW5naW5lSWRlbnRpZmllcikgLT4gKFZlY3RvcjxTdHJpbmc+IHR5cGVz KSBTeW5jaHJvbm91cwogICAgIFN1cHBvcnRzVHlwZUFuZENvZGVjcyhlbnVtOnVpbnQ4X3QgV2Vi Q29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJlbW90ZUVuZ2lu ZUlkZW50aWZpZXIsIHN0cnVjdCBXZWJDb3JlOjpNZWRpYUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJz IHR5cGUpIC0+IChlbnVtOnVpbnQ4X3QgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6U3VwcG9y dHNUeXBlIHN1cHBvcnQpIFN5bmNocm9ub3VzCi0gICAgT3JpZ2luc0luTWVkaWFDYWNoZShlbnVt OnVpbnQ4X3QgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVy IHJlbW90ZUVuZ2luZUlkZW50aWZpZXIsIFN0cmluZyBwYXRoKSAtPiAoVmVjdG9yPFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luRGF0YT4gb3JpZ2lucykgU3luY2hyb25vdXMKKyAgICBPcmlnaW5zSW5N ZWRpYUNhY2hlKGVudW06dWludDhfdCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVu Z2luZUlkZW50aWZpZXIgcmVtb3RlRW5naW5lSWRlbnRpZmllciwgU3RyaW5nIHBhdGgpIC0+IChI YXNoU2V0PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4gb3JpZ2lucykgU3luY2hyb25vdXMK ICAgICBDbGVhck1lZGlhQ2FjaGUoZW51bTp1aW50OF90IFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51 bXM6Ok1lZGlhRW5naW5lSWRlbnRpZmllciByZW1vdGVFbmdpbmVJZGVudGlmaWVyLCBTdHJpbmcg cGF0aCwgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSkKICAgICBDbGVhck1lZGlhQ2FjaGVGb3JPcmln aW5zKGVudW06dWludDhfdCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlk ZW50aWZpZXIgcmVtb3RlRW5naW5lSWRlbnRpZmllciwgU3RyaW5nIHBhdGgsIFZlY3RvcjxXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnMpCiAgICAgU3VwcG9ydHNLZXlTeXN0ZW0o ZW51bTp1aW50OF90IFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6Ok1lZGlhRW5naW5lSWRlbnRp ZmllciByZW1vdGVFbmdpbmVJZGVudGlmaWVyLCBTdHJpbmcga2V5U3lzdGVtLCBTdHJpbmcgbWlt ZVR5cGUpIC0+IChib29sIHN1cHBvcnRzKSBTeW5jaHJvbm91cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRl eCA2YWI5Nzg0OTk1MDliOTIwODVmNGIxOWUzODE3ZTMwMmIzYjJmYzM0Li42MzJhYmRlZDdlMjE1 OGY0ZmQxYTgxNmNlOTBkYzMxY2UzOWEzNGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtNDU1LDE2 ICs0NTUsMTAgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGFBbmRBcHBseShPcHRp b25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXMsIE8KICAgICBpZiAoZGF0YVR5cGVzLmNv bnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6RGlza0NhY2hlKSkgewogICAgICAgICBjYWxsYmFja0Fn Z3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxsYmFjaygpOwogICAgICAgICBtX3F1ZXVlLT5kaXNwYXRj aChbbWVkaWFDYWNoZURpcmVjdG9yeSA9IG1fY29uZmlndXJhdGlvbi0+bWVkaWFDYWNoZURpcmVj dG9yeSgpLmlzb2xhdGVkQ29weSgpLCBjYWxsYmFja0FnZ3JlZ2F0b3JdIHsKLSAgICAgICAgICAg IC8vIEZJWE1FOiBNYWtlIEhUTUxNZWRpYUVsZW1lbnQ6Om9yaWdpbnNJbk1lZGlhQ2FjaGUgcmV0 dXJuIGEgY29sbGVjdGlvbiBvZiBTZWN1cml0eU9yaWdpbkRhdGFzLgotICAgICAgICAgICAgSGFz aFNldDxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zID0gV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6b3JpZ2luc0luTWVkaWFDYWNoZShtZWRpYUNhY2hlRGlyZWN0b3J5 KTsKICAgICAgICAgICAgIFdlYnNpdGVEYXRhIHdlYnNpdGVEYXRhOwotICAgICAgICAgICAgCi0g ICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG9yaWdpbnMpIHsKLSAgICAgICAgICAgICAg ICBXZWJzaXRlRGF0YTo6RW50cnkgZW50cnkgeyBvcmlnaW4tPmRhdGEoKSwgV2Vic2l0ZURhdGFU eXBlOjpEaXNrQ2FjaGUsIDAgfTsKLSAgICAgICAgICAgICAgICB3ZWJzaXRlRGF0YS5lbnRyaWVz LmFwcGVuZChXVEZNb3ZlKGVudHJ5KSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAg ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJhY2tBZ2dyZWdhdG9yLCBv cmlnaW5zID0gV1RGTW92ZShvcmlnaW5zKSwgd2Vic2l0ZURhdGEgPSBXVEZNb3ZlKHdlYnNpdGVE YXRhKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGZvciAoYXV0byYgb3JpZ2luIDogV2ViQ29y ZTo6SFRNTE1lZGlhRWxlbWVudDo6b3JpZ2luc0luTWVkaWFDYWNoZShtZWRpYUNhY2hlRGlyZWN0 b3J5KSkKKyAgICAgICAgICAgICAgICB3ZWJzaXRlRGF0YS5lbnRyaWVzLmFwcGVuZChXZWJzaXRl RGF0YTo6RW50cnkgeyBjcm9zc1RocmVhZENvcHkob3JpZ2luKSwgV2Vic2l0ZURhdGFUeXBlOjpE aXNrQ2FjaGUsIDAgfSk7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2Nh bGxiYWNrQWdncmVnYXRvciwgd2Vic2l0ZURhdGEgPSBXVEZNb3ZlKHdlYnNpdGVEYXRhKV0oKSBt dXRhYmxlIHsKICAgICAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRp bmdDYWxsYmFjayhXVEZNb3ZlKHdlYnNpdGVEYXRhKSk7CiAgICAgICAgICAgICB9KTsKICAgICAg ICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1Jl bW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHAKaW5kZXggMTVkNTE3ODQ1YjAyYTZj YjM3YmZmNTdkODQ3MDY1M2Q4M2RmOWFkOS4uYzI1YWE4N2Y5ODVmY2MzYTZjOWJlOTFjMTIwMWJk M2FiMDdlMTAxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRp YS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcApAQCAtNzAsNyArNzAs NyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBtX21hbmFnZXIuc3VwcG9ydHNUeXBlQW5kQ29k ZWNzKG1fcmVtb3RlRW5naW5lSWRlbnRpZmllciwgcGFyYW1ldGVycyk7CiAgICAgfQogCi0gICAg SGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zSW5NZWRpYUNhY2hlKGNvbnN0 IFN0cmluZyYgcGF0aCkgY29uc3QgZmluYWwKKyAgICBIYXNoU2V0PFNlY3VyaXR5T3JpZ2luRGF0 YT4gb3JpZ2luc0luTWVkaWFDYWNoZShjb25zdCBTdHJpbmcmIHBhdGgpIGNvbnN0IGZpbmFsCiAg ICAgewogICAgICAgICByZXR1cm4gbV9tYW5hZ2VyLm9yaWdpbnNJbk1lZGlhQ2FjaGUobV9yZW1v dGVFbmdpbmVJZGVudGlmaWVyLCBwYXRoKTsKICAgICB9CkBAIC0yMTcsMTcgKzIxNywxMiBAQCBi b29sIFJlbW90ZU1lZGlhUGxheWVyTWFuYWdlcjo6c3VwcG9ydHNLZXlTeXN0ZW0oTWVkaWFQbGF5 ZXJFbnVtczo6TWVkaWFFbmdpbmVJZAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotSGFzaFNldDxS ZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6Om9yaWdpbnNJ bk1lZGlhQ2FjaGUoTWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJlbW90 ZUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgcGF0aCkKK0hhc2hTZXQ8U2VjdXJpdHlP cmlnaW5EYXRhPiBSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6Om9yaWdpbnNJbk1lZGlhQ2FjaGUo TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyIHJlbW90ZUVuZ2luZUlkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAgICBWZWN0b3I8U2VjdXJpdHlPcmlnaW5E YXRhPiBvcmlnaW5EYXRhOworICAgIEhhc2hTZXQ8U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5E YXRhOwogICAgIGlmICghZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZFN5 bmMoTWVzc2FnZXM6OlJlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5OjpPcmlnaW5zSW5NZWRp YUNhY2hlKHJlbW90ZUVuZ2luZUlkZW50aWZpZXIsIHBhdGgpLCBNZXNzYWdlczo6UmVtb3RlTWVk aWFQbGF5ZXJNYW5hZ2VyUHJveHk6Ok9yaWdpbnNJbk1lZGlhQ2FjaGU6OlJlcGx5KG9yaWdpbkRh dGEpLCAwKSkKICAgICAgICAgcmV0dXJuIHsgfTsKLQotICAgIEhhc2hTZXQ8UmVmUHRyPFNlY3Vy aXR5T3JpZ2luPj4gb3JpZ2luczsKLSAgICBmb3IgKGF1dG8mIGRhdGEgOiBvcmlnaW5EYXRhKQot ICAgICAgICBvcmlnaW5zLmFkZChkYXRhLnNlY3VyaXR5T3JpZ2luKCkpOwotCi0gICAgcmV0dXJu IG9yaWdpbnM7CisgICAgcmV0dXJuIG9yaWdpbkRhdGE7CiB9CiAKIHZvaWQgUmVtb3RlTWVkaWFQ bGF5ZXJNYW5hZ2VyOjpjbGVhck1lZGlhQ2FjaGUoTWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdp bmVJZGVudGlmaWVyIHJlbW90ZUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgcGF0aCwg V2FsbFRpbWUgbW9kaWZpZWRTaW5jZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5oCmluZGV4IGE0 MTY5ZDViMWE1Njg4Y2JkNjljNTlkOGI4YTlmYzJkYWQ1YjJjYzkuLjFiZjg1NzZhZGQ2MGFmZmIx NDk2ZDNkZjU5ODUyNTI2ZWExMTFlMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuaApAQCAt ODEsNyArODEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZ2V0U3VwcG9ydGVkVHlwZXMoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBIYXNoU2V0PFN0cmlu ZywgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPiYpOwogICAgIFdlYkNvcmU6Ok1lZGlhUGxheWVy OjpTdXBwb3J0c1R5cGUgc3VwcG9ydHNUeXBlQW5kQ29kZWNzKFdlYkNvcmU6Ok1lZGlhUGxheWVy RW51bXM6Ok1lZGlhRW5naW5lSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6TWVkaWFFbmdpbmVT dXBwb3J0UGFyYW1ldGVycyYpOwogICAgIGJvb2wgc3VwcG9ydHNLZXlTeXN0ZW0oV2ViQ29yZTo6 TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtl eVN5c3RlbSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7Ci0gICAgSGFzaFNldDxSZWZQdHI8V2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zSW5NZWRpYUNhY2hlKFdlYkNvcmU6Ok1lZGlh UGxheWVyRW51bXM6Ok1lZGlhRW5naW5lSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJik7CisgICAg SGFzaFNldDxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnNJbk1lZGlhQ2FjaGUo V2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6TWVkaWFFbmdpbmVJZGVudGlmaWVyLCBjb25zdCBT dHJpbmcmKTsKICAgICB2b2lkIGNsZWFyTWVkaWFDYWNoZShXZWJDb3JlOjpNZWRpYVBsYXllckVu dW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYsIFdhbGxUaW1lIG1vZGlm aWVkU2luY2UpOwogICAgIHZvaWQgY2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhXZWJDb3JlOjpN ZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYsIGNv bnN0IEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mKTsKIAo=