226784 2021-06-08 14:50:01 -0700 [Cocoa] Remote video layer should respect video gravity when resizing 2021-06-10 16:51:49 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn jer.noble philipj sergio oldest_to_newest 1767915 0 eric.carlson 2021-06-08 14:50:01 -0700 Remote video layer should respect video gravity when resizing 1767960 1 430910 eric.carlson 2021-06-08 16:53:01 -0700 Created attachment 430910 Patch 1768369 2 430910 jer.noble 2021-06-09 15:36:15 -0700 Comment on attachment 430910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430910&action=review > Source/WebKit/WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm:90 > +- (void) setVideoGravity:(WebCore::MediaPlayerEnums::VideoGravity)videoGravity Nit: the spacing between (void) and setVideoGravity: is weird. > Source/WebKit/WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm:95 > +- (bool) resizePreservingGravity Ditto. 1768376 3 431020 eric.carlson 2021-06-09 15:47:07 -0700 Created attachment 431020 Patch 1768665 4 431107 eric.carlson 2021-06-10 12:21:09 -0700 Created attachment 431107 Patch 1768709 5 431121 eric.carlson 2021-06-10 13:48:43 -0700 Created attachment 431121 Patch 1768815 6 ews-feeder 2021-06-10 16:51:46 -0700 Committed r278740 (238702@main): <https://commits.webkit.org/238702@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431121. 430910 2021-06-08 16:53:01 -0700 2021-06-09 15:47:05 -0700 Patch bug-226784-20210608165300.patch text/plain 8194 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE5YjllZGExZTAxZjEzZmIw MDhiOWYzMWNiM2EyMDUyNWJhYjIzZGQuLmZkMzkyMjgzYTAwOTY4MGQzMGE4NzU3NDJhYTZlZTM1 OGFjMjZmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMDggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdGUg dmlkZW8gbGF5ZXIgc2hvdWxkIHJlc3BlY3QgdmlkZW8gZ3Jhdml0eSB3aGVuIHJlc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3ODQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgbWFu dWFsbHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZh dGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6 OnByZXBhcmVGb3JQbGF5YmFjayk6IFBhc3Mgc3BlY2lmeSB2aWRlbyBncmF2aXR5CisgICAgICAg IHdoZW4gY3JlYXRpbmcgcmVtb3RlIGxheWVyLgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXll clByaXZhdGVSZW1vdGU6OnNldFZpZGVvRnVsbHNjcmVlbkdyYXZpdHkpOiBSZW1lbWJlciBncmF2 aXR5LgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJl bW90ZS5oOgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9MYXllclJlbW90 ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1v dGVDb2NvYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5 ZXJSZW1vdGVDb2NvYS5tbToKKyAgICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHZpZGVvR3Jh dml0eV0pOgorICAgICAgICAoLVtXS1ZpZGVvTGF5ZXJSZW1vdGUgc2V0VmlkZW9HcmF2aXR5Ol0p OgorICAgICAgICAoLVtXS1ZpZGVvTGF5ZXJSZW1vdGUgcmVzaXplUHJlc2VydmluZ0dyYXZpdHld KTogUmV0dXJuIHRydWUgd2hlbiBpbiBQaVAsIGZ1bGxzY3JlZW4sCisgICAgICAgIG9yIHdoZW4g dmlkZW8gZ3Jhdml0eSBpcyBub3QgInJlc2l6ZSIuCisgICAgICAgICgtW1dLVmlkZW9MYXllclJl bW90ZSBsYXlvdXRTdWJsYXllcnNdKTogUHJlc2VydmUgYXNwZWN0IHJhdGlvbiB3aGVuIGFwcHJv cHJpYXRlLgorICAgICAgICAoV2ViS2l0OjpjcmVhdGVWaWRlb0xheWVyUmVtb3RlKToKKwogMjAy MS0wNi0wOCAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJldmVydGluZyByMjc4NjA5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3Bw CmluZGV4IDNhMTlmYTkwNzc0OTFjN2JiNjBhYWUxZTQwZDYyNGFlOWJlZGEwZTcuLmYwODQwMzM0 MzFlZmNhYWQ4YjY0MDk2NjA4NmE5ZGM2MTk0N2M3MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJl bW90ZS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZTo6cHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIE1lZGlhUGxheWVyOgogICAg ICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBtX3ZpZGVv TGF5ZXIgPSBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKHRoaXMsIGlubGluZUxheWVySG9zdGluZ0Nv bnRleHRJZC52YWx1ZSgpKTsKKyAgICAgICAgbV92aWRlb0xheWVyID0gY3JlYXRlVmlkZW9MYXll clJlbW90ZSh0aGlzLCBpbmxpbmVMYXllckhvc3RpbmdDb250ZXh0SWQudmFsdWUoKSwgbV92aWRl b0Z1bGxzY3JlZW5HcmF2aXR5KTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAgbV92aWRl b0xheWVyTWFuYWdlci0+c2V0VmlkZW9MYXllcihtX3ZpZGVvTGF5ZXIuZ2V0KCksIHNuYXBwZWRJ bnRSZWN0KHBsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSkuc2l6ZSgpKTsKICNlbmRpZgpA QCAtODExLDYgKzgxMSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpzZXRWaWRl b0Z1bGxzY3JlZW5GcmFtZShXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkKIAogdm9pZCBNZWRpYVBs YXllclByaXZhdGVSZW1vdGU6OnNldFZpZGVvRnVsbHNjcmVlbkdyYXZpdHkoV2ViQ29yZTo6TWVk aWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IGdyYXZpdHkpCiB7CisgICAgbV92aWRlb0Z1bGxz Y3JlZW5HcmF2aXR5ID0gZ3Jhdml0eTsKICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0VmlkZW9GdWxsc2NyZWVuR3Jhdml0eShncmF2aXR5 KSwgbV9pZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDcxYmU0ZTIzNDUw OTFmZGY2MzI2ZThkNTM0NDliYWIyOTE1NWEyODEuLmU0ZGI1ZGE1YmQ4YzU0Mjg0MWNkZDYyNjdh ZTZlZDNhNzBhNWM5OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDI1LDYgKzQy NSw3IEBAIHByaXZhdGU6CiAgICAgTWVkaWFUaW1lIG1fY2FjaGVkTWVkaWFUaW1lOwogICAgIE1v bm90b25pY1RpbWUgbV9jYWNoZWRNZWRpYVRpbWVRdWVyeVRpbWU7CiAKKyAgICBXZWJDb3JlOjpN ZWRpYVBsYXllcjo6VmlkZW9HcmF2aXR5IG1fdmlkZW9GdWxsc2NyZWVuR3Jhdml0eSB7IFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZUFzcGVjdCB9OwogICAgIE1vbm90 b25pY1RpbWUgbV9sYXN0UGxheWJhY2tRdWFsaXR5TWV0cmljc1F1ZXJ5VGltZTsKICAgICBTZWNv bmRzIG1fdmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbDsKICAgICBkb3VibGUgbV92 b2x1bWUgeyAxIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21l ZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVk aWEvVmlkZW9MYXllclJlbW90ZS5oCmluZGV4IDk5NmIzZjU2MDQzYTU5OWQ3MzZmZDQwOTQzYjlh YTliYjJkMGE3YTkuLjg0OGE0MTdlZmFiZTZkNmYxNDZlOTc1YzE0NzhmY2RlMDVhMzVjOWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9MYXllclJl bW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9MYXll clJlbW90ZS5oCkBAIC0zNCw3ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CiAKLVBsYXRmb3JtTGF5ZXJDb250YWluZXIgY3JlYXRl VmlkZW9MYXllclJlbW90ZShNZWRpYVBsYXllclByaXZhdGVSZW1vdGUqLCBMYXllckhvc3RpbmdD b250ZXh0SUQpOworUGxhdGZvcm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3Rl KE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSosIExheWVySG9zdGluZ0NvbnRleHRJRCwgV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5KTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29j b2EvVmlkZW9MYXllclJlbW90ZUNvY29hLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVDb2NvYS5oCmluZGV4IDE5MmIwNjNlZGRlMGVl MmU3MDlhZmFiNjRkMGU4MTkyNmNkZDFkYzAuLjMyODdkMjlkMDU4NWU0ZjJkMThjNDYwZTgxMjNk MWQ4YmY0ZTM0NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVk aWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVtb3RlQ29jb2EuaApAQCAtMjYsNiAr MjYsNyBAQAogI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykgJiYgUExBVEZPUk0oQ09DT0EpCiAKICNp bXBvcnQgPFF1YXJ0ekNvcmUvQ0FMYXllci5oPgorI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXll ckVudW1zLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlOwpAQCAtMzQsNiArMzUsNyBAQCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7 CiBAaW50ZXJmYWNlIFdLVmlkZW9MYXllclJlbW90ZSA6IENBTGF5ZXIKIEBwcm9wZXJ0eSAobm9u YXRvbWljKSBXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlOwogQHByb3BlcnR5IChub25hdG9taWMpIENHUmVjdCB2aWRlb0xheWVyRnJhbWU7 CitAcHJvcGVydHkgKG5vbmF0b21pYykgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9H cmF2aXR5IHZpZGVvR3Jhdml0eTsKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJl bW90ZUNvY29hLm1tCmluZGV4IDdhNGMwODUxNTJhY2YzMTY4MmQ2OTljZWRmNDAwYjU5OWIxZTA2 ZWUuLjRkMjBiZGVkZjNhMWRmM2U0MTU2MzNlMTNhNTk3YzM5MTZjNzVhM2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90 ZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2Ev VmlkZW9MYXllclJlbW90ZUNvY29hLm1tCkBAIC00NSw2ICs0NSw4IEBAIHN0YXRpYyBjb25zdCBT ZWNvbmRzIFBvc3RBbmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogQGltcGxlbWVudGF0aW9uIFdL VmlkZW9MYXllclJlbW90ZSB7CiAgICAgV2Vha1B0cjxXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZT4gX21lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTsKICAgICBSZXRhaW5QdHI8Q0FDb250 ZXh0PiBfY29udGV4dDsKKyAgICBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRlb0dyYXZp dHkgX3ZpZGVvR3Jhdml0eTsKKwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlRpbWVy PiBfcmVzb2x2ZUJvdW5kc1RpbWVyOwogICAgIGJvb2wgX3Nob3VsZFJlc3RhcnRXaGVuVGltZXJG aXJlczsKQEAgLTgwLDYgKzgyLDI1IEBAIHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RBbmltYXRp b25EZWxheSB7IDEwMF9tcyB9OwogICAgIF9tZWRpYVBsYXllclByaXZhdGVSZW1vdGUgPSBtYWtl V2Vha1B0cigqbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlKTsKIH0KIAorLSAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5KXZpZGVvR3Jhdml0eQoreworICAgIHJldHVybiBf dmlkZW9HcmF2aXR5OworfQorCistICh2b2lkKSBzZXRWaWRlb0dyYXZpdHk6KFdlYkNvcmU6Ok1l ZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0eSl2aWRlb0dyYXZpdHkKK3sKKyAgICBfdmlkZW9H cmF2aXR5ID0gdmlkZW9HcmF2aXR5OworfQorCistIChib29sKSByZXNpemVQcmVzZXJ2aW5nR3Jh dml0eQoreworICAgIGF1dG8qIHBsYXllciA9IHNlbGYubWVkaWFQbGF5ZXJQcml2YXRlUmVtb3Rl OworICAgIGlmIChwbGF5ZXIgJiYgcGxheWVyLT5pblZpZGVvRnVsbHNjcmVlbk9yUGljdHVyZUlu UGljdHVyZSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKKyAgICByZXR1cm4gX3ZpZGVv R3Jhdml0eSAhPSBXZWJDb3JlOjpNZWRpYVBsYXllcjo6VmlkZW9HcmF2aXR5OjpSZXNpemU7Cit9 CisKIC0gKHZvaWQpbGF5b3V0U3VibGF5ZXJzCiB7CiAgICAgYXV0byogc3VibGF5ZXJzID0gW3Nl bGYgc3VibGF5ZXJzXTsKQEAgLTkzLDcgKzExNCw3IEBAIHN0YXRpYyBjb25zdCBTZWNvbmRzIFBv c3RBbmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCB0YXJn ZXRWaWRlb0ZyYW1lID0gc2VsZi5ib3VuZHM7CiAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNm b3JtID0gQ0dBZmZpbmVUcmFuc2Zvcm1JZGVudGl0eTsKICAgICBpZiAoIXNvdXJjZVZpZGVvRnJh bWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBtZWRpYVBsYXllclByaXZhdGVSZW1v dGUgPSBzZWxmLm1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTsgbWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlICYmIG1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS0+aW5WaWRlb0Z1bGxzY3JlZW5PclBpY3R1 cmVJblBpY3R1cmUoKSkgeworICAgICAgICBpZiAoW3NlbGYgcmVzaXplUHJlc2VydmluZ0dyYXZp dHldKSB7CiAgICAgICAgICAgICBhdXRvIHNjYWxlID0gc3RkOjpmbWF4KHRhcmdldFZpZGVvRnJh bWUud2lkdGgoKSAvIHNvdXJjZVZpZGVvRnJhbWUud2lkdGgoKSwgdGFyZ2V0VmlkZW9GcmFtZS5o ZWlnaHQoKSAvIHNvdXJjZVZpZGVvRnJhbWUuaGVpZ2h0KCkpOwogICAgICAgICAgICAgdHJhbnNm b3JtID0gQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUoc2NhbGUsIHNjYWxlKTsKICAgICAgICAg fSBlbHNlCkBAIC0xNTgsMTIgKzE3OSwxMyBAQCBzdGF0aWMgY29uc3QgU2Vjb25kcyBQb3N0QW5p bWF0aW9uRGVsYXkgeyAxMDBfbXMgfTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBsYXRmb3Jt TGF5ZXJDb250YWluZXIgY3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBsYXllclByaXZhdGVS ZW1vdGUqIG1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSwgTGF5ZXJIb3N0aW5nQ29udGV4dElEIGNv bnRleHRJZCkKK1BsYXRmb3JtTGF5ZXJDb250YWluZXIgY3JlYXRlVmlkZW9MYXllclJlbW90ZShN ZWRpYVBsYXllclByaXZhdGVSZW1vdGUqIG1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSwgTGF5ZXJI b3N0aW5nQ29udGV4dElEIGNvbnRleHRJZCwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6Vmlk ZW9HcmF2aXR5IHZpZGVvR3Jhdml0eSkKIHsKICAgICAvLyBJbml0aWFsbHksIGFsbCB0aGUgbGF5 ZXJzIHdpbGwgYmUgZW1wdHkgKGJvdGggd2lkdGggYW5kIGhlaWdodCBhcmUgMCkgYW5kIGludmlz aWJsZS4KICAgICAvLyBUaGUgcmVuZGVyZXIgd2lsbCBjaGFuZ2UgdGhlIHNpemVzIG9mIFdLVmlk ZW9MYXllclJlbW90ZSB0byB0cmlnZ2VyIGxheW91dCBvZiBzdWJsYXllcnMgYW5kIG1ha2UgdGhl bSB2aXNpYmxlLgogICAgIGF1dG8gdmlkZW9MYXllclJlbW90ZSA9IGFkb3B0TlMoW1tXS1ZpZGVv TGF5ZXJSZW1vdGUgYWxsb2NdIGluaXRdKTsKICAgICBbdmlkZW9MYXllclJlbW90ZSBzZXROYW1l OkAiV0tWaWRlb0xheWVyUmVtb3RlIl07CisgICAgW3ZpZGVvTGF5ZXJSZW1vdGUgc2V0VmlkZW9H cmF2aXR5OnZpZGVvR3Jhdml0eV07CiAgICAgW3ZpZGVvTGF5ZXJSZW1vdGUgc2V0TWVkaWFQbGF5 ZXJQcml2YXRlUmVtb3RlOm1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZV07CiAgICAgW3ZpZGVvTGF5 ZXJSZW1vdGUgYWRkU3VibGF5ZXI6TGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3JlYXRlUGxhdGZvcm1M YXllckZvckhvc3RpbmdDb250ZXh0KGNvbnRleHRJZCkuZ2V0KCldOwogCg== 431020 2021-06-09 15:47:07 -0700 2021-06-10 12:21:08 -0700 Patch bug-226784-20210609154706.patch text/plain 8253 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGFhOTM5M2Q1ZjYxNmZm Yzk2ZTExYWY3OTRjZDAzYjRiZGFiNzkuLjZlZmJmMGYyMjFlMjdiNGExZDJkMjJmMzUyYTYxZmZi ZWQ5NmY1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMDggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdGUg dmlkZW8gbGF5ZXIgc2hvdWxkIHJlc3BlY3QgdmlkZW8gZ3Jhdml0eSB3aGVuIHJlc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3ODQKKwor ICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5 LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpwcmVw YXJlRm9yUGxheWJhY2spOiBQYXNzIHNwZWNpZnkgdmlkZW8gZ3Jhdml0eQorICAgICAgICB3aGVu IGNyZWF0aW5nIHJlbW90ZSBsYXllci4KKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlOjpzZXRWaWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTogUmVtZW1iZXIgZ3Jhdml0eS4K KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUu aDoKKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVtb3RlQ29j b2EuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVt b3RlQ29jb2EubW06CisgICAgICAgICgtW1dLVmlkZW9MYXllclJlbW90ZSB2aWRlb0dyYXZpdHld KToKKyAgICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHNldFZpZGVvR3Jhdml0eTpdKToKKyAg ICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHJlc2l6ZVByZXNlcnZpbmdHcmF2aXR5XSk6IFJl dHVybiB0cnVlIHdoZW4gaW4gUGlQLCBmdWxsc2NyZWVuLAorICAgICAgICBvciB3aGVuIHZpZGVv IGdyYXZpdHkgaXMgbm90ICJyZXNpemUiLgorICAgICAgICAoLVtXS1ZpZGVvTGF5ZXJSZW1vdGUg bGF5b3V0U3VibGF5ZXJzXSk6IFByZXNlcnZlIGFzcGVjdCByYXRpb24gd2hlbiBhcHByb3ByaWF0 ZS4KKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlVmlkZW9MYXllclJlbW90ZSk6CisKIDIwMjEtMDYt MDkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVSURl bGVnYXRlOjpVSUNsaWVudDo6ZnVsbHNjcmVlbk1heVJldHVyblRvSW5saW5lKCkgaXMgbm90IGNh bGxlZCB3aGVuIGEgdmlkZW8gZXhpdHMgZnVsbHNjcmVlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1v dGUuY3BwCmluZGV4IGMzNzUyOWM4ZTAyN2ZkZDRkYTg5YjBlNDQ4ODdlN2U0NTBkMGY5YjguLjVj ZDZiODZiZTg1ZTQ1NTQ5NWIzOWJmYTY2MDU4ZTg3OGM3ZGFjZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZTo6cHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIE1lZGlhUGxheWVy OgogICAgICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBt X3ZpZGVvTGF5ZXIgPSBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKHRoaXMsIGlubGluZUxheWVySG9z dGluZ0NvbnRleHRJZC52YWx1ZSgpKTsKKyAgICAgICAgbV92aWRlb0xheWVyID0gY3JlYXRlVmlk ZW9MYXllclJlbW90ZSh0aGlzLCBpbmxpbmVMYXllckhvc3RpbmdDb250ZXh0SWQudmFsdWUoKSwg bV92aWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAg bV92aWRlb0xheWVyTWFuYWdlci0+c2V0VmlkZW9MYXllcihtX3ZpZGVvTGF5ZXIuZ2V0KCksIHNu YXBwZWRJbnRSZWN0KHBsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSkuc2l6ZSgpKTsKICNl bmRpZgpAQCAtODE1LDYgKzgxNSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpz ZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkKIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFZpZGVvRnVsbHNjcmVlbkdyYXZpdHkoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IGdyYXZpdHkpCiB7CisgICAgbV92aWRl b0Z1bGxzY3JlZW5HcmF2aXR5ID0gZ3Jhdml0eTsKICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNz YWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0VmlkZW9GdWxsc2NyZWVuR3Jhdml0eShn cmF2aXR5KSwgbV9pZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDEzYzRm MWRmODMzNTY3ODczM2I3OGViYzZiZTlhNmQzMDEwNGMwNDMuLmMzMDMyMTIwNTk4Y2JhNjkyNjQ4 MTEyODUzYTUyOTdhMzFlNWVkYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDI2 LDYgKzQyNiw3IEBAIHByaXZhdGU6CiAgICAgTWVkaWFUaW1lIG1fY2FjaGVkTWVkaWFUaW1lOwog ICAgIE1vbm90b25pY1RpbWUgbV9jYWNoZWRNZWRpYVRpbWVRdWVyeVRpbWU7CiAKKyAgICBXZWJD b3JlOjpNZWRpYVBsYXllcjo6VmlkZW9HcmF2aXR5IG1fdmlkZW9GdWxsc2NyZWVuR3Jhdml0eSB7 IFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZUFzcGVjdCB9OwogICAg IE1vbm90b25pY1RpbWUgbV9sYXN0UGxheWJhY2tRdWFsaXR5TWV0cmljc1F1ZXJ5VGltZTsKICAg ICBTZWNvbmRzIG1fdmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbDsKICAgICBkb3Vi bGUgbV92b2x1bWUgeyAxIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvbWVkaWEvVmlkZW9MYXllclJlbW90ZS5oCmluZGV4IDk5NmIzZjU2MDQzYTU5OWQ3MzZmZDQw OTQzYjlhYTliYjJkMGE3YTkuLjg0OGE0MTdlZmFiZTZkNmYxNDZlOTc1YzE0NzhmY2RlMDVhMzVj OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9M YXllclJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlk ZW9MYXllclJlbW90ZS5oCkBAIC0zNCw3ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBj bGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CiAKLVBsYXRmb3JtTGF5ZXJDb250YWluZXIg Y3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBsYXllclByaXZhdGVSZW1vdGUqLCBMYXllckhv c3RpbmdDb250ZXh0SUQpOworUGxhdGZvcm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVy UmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSosIExheWVySG9zdGluZ0NvbnRleHRJRCwg V2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5KTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVk aWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVDb2NvYS5oCmluZGV4IDE5MmIwNjNl ZGRlMGVlMmU3MDlhZmFiNjRkMGU4MTkyNmNkZDFkYzAuLjMyODdkMjlkMDU4NWU0ZjJkMThjNDYw ZTgxMjNkMWQ4YmY0ZTM0NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVtb3RlQ29jb2EuaApAQCAt MjYsNiArMjYsNyBAQAogI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykgJiYgUExBVEZPUk0oQ09DT0Ep CiAKICNpbXBvcnQgPFF1YXJ0ekNvcmUvQ0FMYXllci5oPgorI2ltcG9ydCA8V2ViQ29yZS9NZWRp YVBsYXllckVudW1zLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlOwpAQCAtMzQsNiArMzUsNyBAQCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVS ZW1vdGU7CiBAaW50ZXJmYWNlIFdLVmlkZW9MYXllclJlbW90ZSA6IENBTGF5ZXIKIEBwcm9wZXJ0 eSAobm9uYXRvbWljKSBXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5 ZXJQcml2YXRlUmVtb3RlOwogQHByb3BlcnR5IChub25hdG9taWMpIENHUmVjdCB2aWRlb0xheWVy RnJhbWU7CitAcHJvcGVydHkgKG5vbmF0b21pYykgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6 VmlkZW9HcmF2aXR5IHZpZGVvR3Jhdml0eTsKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVD b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9M YXllclJlbW90ZUNvY29hLm1tCmluZGV4IDdhNGMwODUxNTJhY2YzMTY4MmQ2OTljZWRmNDAwYjU5 OWIxZTA2ZWUuLjNhZTY1ZTExZTBiZDRmNTUzNjBhZmRiODM2ODNkYjAwYWFlMTljNGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXll clJlbW90ZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEv Y29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1tCkBAIC00NSw2ICs0NSw3IEBAIHN0YXRpYyBj b25zdCBTZWNvbmRzIFBvc3RBbmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogQGltcGxlbWVudGF0 aW9uIFdLVmlkZW9MYXllclJlbW90ZSB7CiAgICAgV2Vha1B0cjxXZWJLaXQ6Ok1lZGlhUGxheWVy UHJpdmF0ZVJlbW90ZT4gX21lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTsKICAgICBSZXRhaW5QdHI8 Q0FDb250ZXh0PiBfY29udGV4dDsKKyAgICBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRl b0dyYXZpdHkgX3ZpZGVvR3Jhdml0eTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpU aW1lcj4gX3Jlc29sdmVCb3VuZHNUaW1lcjsKICAgICBib29sIF9zaG91bGRSZXN0YXJ0V2hlblRp bWVyRmlyZXM7CkBAIC04MCw2ICs4MSwyNSBAQCBzdGF0aWMgY29uc3QgU2Vjb25kcyBQb3N0QW5p bWF0aW9uRGVsYXkgeyAxMDBfbXMgfTsKICAgICBfbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlID0g bWFrZVdlYWtQdHIoKm1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSk7CiB9CiAKKy0gKFdlYkNvcmU6 Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0eSl2aWRlb0dyYXZpdHkKK3sKKyAgICByZXR1 cm4gX3ZpZGVvR3Jhdml0eTsKK30KKworLSAodm9pZClzZXRWaWRlb0dyYXZpdHk6KFdlYkNvcmU6 Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0eSl2aWRlb0dyYXZpdHkKK3sKKyAgICBfdmlk ZW9HcmF2aXR5ID0gdmlkZW9HcmF2aXR5OworfQorCistIChib29sKXJlc2l6ZVByZXNlcnZpbmdH cmF2aXR5Cit7CisgICAgYXV0byogcGxheWVyID0gc2VsZi5tZWRpYVBsYXllclByaXZhdGVSZW1v dGU7CisgICAgaWYgKHBsYXllciAmJiBwbGF5ZXItPmluVmlkZW9GdWxsc2NyZWVuT3JQaWN0dXJl SW5QaWN0dXJlKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIAorICAgIHJldHVybiBfdmlk ZW9HcmF2aXR5ICE9IFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZTsK K30KKwogLSAodm9pZClsYXlvdXRTdWJsYXllcnMKIHsKICAgICBhdXRvKiBzdWJsYXllcnMgPSBb c2VsZiBzdWJsYXllcnNdOwpAQCAtOTMsNyArMTEzLDcgQEAgc3RhdGljIGNvbnN0IFNlY29uZHMg UG9zdEFuaW1hdGlvbkRlbGF5IHsgMTAwX21zIH07CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHRh cmdldFZpZGVvRnJhbWUgPSBzZWxmLmJvdW5kczsKICAgICBDR0FmZmluZVRyYW5zZm9ybSB0cmFu c2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybUlkZW50aXR5OwogICAgIGlmICghc291cmNlVmlkZW9G cmFtZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYgKGF1dG8qIG1lZGlhUGxheWVyUHJpdmF0ZVJl bW90ZSA9IHNlbGYubWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOyBtZWRpYVBsYXllclByaXZhdGVS ZW1vdGUgJiYgbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLT5pblZpZGVvRnVsbHNjcmVlbk9yUGlj dHVyZUluUGljdHVyZSgpKSB7CisgICAgICAgIGlmIChbc2VsZiByZXNpemVQcmVzZXJ2aW5nR3Jh dml0eV0pIHsKICAgICAgICAgICAgIGF1dG8gc2NhbGUgPSBzdGQ6OmZtYXgodGFyZ2V0VmlkZW9G cmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFtZS53aWR0aCgpLCB0YXJnZXRWaWRlb0ZyYW1l LmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5oZWlnaHQoKSk7CiAgICAgICAgICAgICB0cmFu c2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybU1ha2VTY2FsZShzY2FsZSwgc2NhbGUpOwogICAgICAg ICB9IGVsc2UKQEAgLTE1OCwxMiArMTc4LDEzIEBAIHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RB bmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUGxhdGZv cm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLCBMYXllckhvc3RpbmdDb250ZXh0SUQg Y29udGV4dElkKQorUGxhdGZvcm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3Rl KE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLCBMYXll ckhvc3RpbmdDb250ZXh0SUQgY29udGV4dElkLCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpW aWRlb0dyYXZpdHkgdmlkZW9HcmF2aXR5KQogewogICAgIC8vIEluaXRpYWxseSwgYWxsIHRoZSBs YXllcnMgd2lsbCBiZSBlbXB0eSAoYm90aCB3aWR0aCBhbmQgaGVpZ2h0IGFyZSAwKSBhbmQgaW52 aXNpYmxlLgogICAgIC8vIFRoZSByZW5kZXJlciB3aWxsIGNoYW5nZSB0aGUgc2l6ZXMgb2YgV0tW aWRlb0xheWVyUmVtb3RlIHRvIHRyaWdnZXIgbGF5b3V0IG9mIHN1YmxheWVycyBhbmQgbWFrZSB0 aGVtIHZpc2libGUuCiAgICAgYXV0byB2aWRlb0xheWVyUmVtb3RlID0gYWRvcHROUyhbW1dLVmlk ZW9MYXllclJlbW90ZSBhbGxvY10gaW5pdF0pOwogICAgIFt2aWRlb0xheWVyUmVtb3RlIHNldE5h bWU6QCJXS1ZpZGVvTGF5ZXJSZW1vdGUiXTsKKyAgICBbdmlkZW9MYXllclJlbW90ZSBzZXRWaWRl b0dyYXZpdHk6dmlkZW9HcmF2aXR5XTsKICAgICBbdmlkZW9MYXllclJlbW90ZSBzZXRNZWRpYVBs YXllclByaXZhdGVSZW1vdGU6bWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlXTsKICAgICBbdmlkZW9M YXllclJlbW90ZSBhZGRTdWJsYXllcjpMYXllckhvc3RpbmdDb250ZXh0OjpjcmVhdGVQbGF0Zm9y bUxheWVyRm9ySG9zdGluZ0NvbnRleHQoY29udGV4dElkKS5nZXQoKV07CiAK 431107 2021-06-10 12:21:09 -0700 2021-06-10 14:07:34 -0700 Patch bug-226784-20210610122108.patch text/plain 8394 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGFhOTM5M2Q1ZjYxNmZm Yzk2ZTExYWY3OTRjZDAzYjRiZGFiNzkuLjZlZmJmMGYyMjFlMjdiNGExZDJkMjJmMzUyYTYxZmZi ZWQ5NmY1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMDggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdGUg dmlkZW8gbGF5ZXIgc2hvdWxkIHJlc3BlY3QgdmlkZW8gZ3Jhdml0eSB3aGVuIHJlc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3ODQKKwor ICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5 LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpwcmVw YXJlRm9yUGxheWJhY2spOiBQYXNzIHNwZWNpZnkgdmlkZW8gZ3Jhdml0eQorICAgICAgICB3aGVu IGNyZWF0aW5nIHJlbW90ZSBsYXllci4KKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlOjpzZXRWaWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTogUmVtZW1iZXIgZ3Jhdml0eS4K KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUu aDoKKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVtb3RlQ29j b2EuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVt b3RlQ29jb2EubW06CisgICAgICAgICgtW1dLVmlkZW9MYXllclJlbW90ZSB2aWRlb0dyYXZpdHld KToKKyAgICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHNldFZpZGVvR3Jhdml0eTpdKToKKyAg ICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHJlc2l6ZVByZXNlcnZpbmdHcmF2aXR5XSk6IFJl dHVybiB0cnVlIHdoZW4gaW4gUGlQLCBmdWxsc2NyZWVuLAorICAgICAgICBvciB3aGVuIHZpZGVv IGdyYXZpdHkgaXMgbm90ICJyZXNpemUiLgorICAgICAgICAoLVtXS1ZpZGVvTGF5ZXJSZW1vdGUg bGF5b3V0U3VibGF5ZXJzXSk6IFByZXNlcnZlIGFzcGVjdCByYXRpb24gd2hlbiBhcHByb3ByaWF0 ZS4KKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlVmlkZW9MYXllclJlbW90ZSk6CisKIDIwMjEtMDYt MDkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVSURl bGVnYXRlOjpVSUNsaWVudDo6ZnVsbHNjcmVlbk1heVJldHVyblRvSW5saW5lKCkgaXMgbm90IGNh bGxlZCB3aGVuIGEgdmlkZW8gZXhpdHMgZnVsbHNjcmVlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1v dGUuY3BwCmluZGV4IGMzNzUyOWM4ZTAyN2ZkZDRkYTg5YjBlNDQ4ODdlN2U0NTBkMGY5YjguLjVj ZDZiODZiZTg1ZTQ1NTQ5NWIzOWJmYTY2MDU4ZTg3OGM3ZGFjZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZTo6cHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIE1lZGlhUGxheWVy OgogICAgICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBt X3ZpZGVvTGF5ZXIgPSBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKHRoaXMsIGlubGluZUxheWVySG9z dGluZ0NvbnRleHRJZC52YWx1ZSgpKTsKKyAgICAgICAgbV92aWRlb0xheWVyID0gY3JlYXRlVmlk ZW9MYXllclJlbW90ZSh0aGlzLCBpbmxpbmVMYXllckhvc3RpbmdDb250ZXh0SWQudmFsdWUoKSwg bV92aWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAg bV92aWRlb0xheWVyTWFuYWdlci0+c2V0VmlkZW9MYXllcihtX3ZpZGVvTGF5ZXIuZ2V0KCksIHNu YXBwZWRJbnRSZWN0KHBsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSkuc2l6ZSgpKTsKICNl bmRpZgpAQCAtODE1LDYgKzgxNSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpz ZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkKIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFZpZGVvRnVsbHNjcmVlbkdyYXZpdHkoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IGdyYXZpdHkpCiB7CisgICAgbV92aWRl b0Z1bGxzY3JlZW5HcmF2aXR5ID0gZ3Jhdml0eTsKICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNz YWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0VmlkZW9GdWxsc2NyZWVuR3Jhdml0eShn cmF2aXR5KSwgbV9pZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDEzYzRm MWRmODMzNTY3ODczM2I3OGViYzZiZTlhNmQzMDEwNGMwNDMuLmMzMDMyMTIwNTk4Y2JhNjkyNjQ4 MTEyODUzYTUyOTdhMzFlNWVkYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDI2 LDYgKzQyNiw3IEBAIHByaXZhdGU6CiAgICAgTWVkaWFUaW1lIG1fY2FjaGVkTWVkaWFUaW1lOwog ICAgIE1vbm90b25pY1RpbWUgbV9jYWNoZWRNZWRpYVRpbWVRdWVyeVRpbWU7CiAKKyAgICBXZWJD b3JlOjpNZWRpYVBsYXllcjo6VmlkZW9HcmF2aXR5IG1fdmlkZW9GdWxsc2NyZWVuR3Jhdml0eSB7 IFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZUFzcGVjdCB9OwogICAg IE1vbm90b25pY1RpbWUgbV9sYXN0UGxheWJhY2tRdWFsaXR5TWV0cmljc1F1ZXJ5VGltZTsKICAg ICBTZWNvbmRzIG1fdmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbDsKICAgICBkb3Vi bGUgbV92b2x1bWUgeyAxIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvbWVkaWEvVmlkZW9MYXllclJlbW90ZS5oCmluZGV4IDk5NmIzZjU2MDQzYTU5OWQ3MzZmZDQw OTQzYjlhYTliYjJkMGE3YTkuLmQwN2M0OWM0ZmFhYjhmNTU4MWIyM2Q2NTRiZDc3M2FhZDExMTQy OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9M YXllclJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlk ZW9MYXllclJlbW90ZS5oCkBAIC0yOCwxMyArMjgsMTQgQEAKICNpZiBFTkFCTEUoR1BVX1BST0NF U1MpCiAKICNpbmNsdWRlICJMYXllckhvc3RpbmdDb250ZXh0LmgiCisjaW5jbHVkZSA8V2ViQ29y ZS9NZWRpYVBsYXllckVudW1zLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUxheWVyLmg+ CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7 CiAKLVBsYXRmb3JtTGF5ZXJDb250YWluZXIgY3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBs YXllclByaXZhdGVSZW1vdGUqLCBMYXllckhvc3RpbmdDb250ZXh0SUQpOworUGxhdGZvcm1MYXll ckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZSosIExheWVySG9zdGluZ0NvbnRleHRJRCwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6Vmlk ZW9HcmF2aXR5KTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29h LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJS ZW1vdGVDb2NvYS5oCmluZGV4IDE5MmIwNjNlZGRlMGVlMmU3MDlhZmFiNjRkMGU4MTkyNmNkZDFk YzAuLjMyODdkMjlkMDU4NWU0ZjJkMThjNDYwZTgxMjNkMWQ4YmY0ZTM0NDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90 ZUNvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9W aWRlb0xheWVyUmVtb3RlQ29jb2EuaApAQCAtMjYsNiArMjYsNyBAQAogI2lmIEVOQUJMRShHUFVf UFJPQ0VTUykgJiYgUExBVEZPUk0oQ09DT0EpCiAKICNpbXBvcnQgPFF1YXJ0ekNvcmUvQ0FMYXll ci5oPgorI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXllckVudW1zLmg+CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOwpAQCAtMzQsNiArMzUsNyBA QCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CiBAaW50ZXJmYWNlIFdLVmlkZW9MYXll clJlbW90ZSA6IENBTGF5ZXIKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBXZWJLaXQ6Ok1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOwogQHByb3BlcnR5IChu b25hdG9taWMpIENHUmVjdCB2aWRlb0xheWVyRnJhbWU7CitAcHJvcGVydHkgKG5vbmF0b21pYykg V2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IHZpZGVvR3Jhdml0eTsKIEBl bmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21l ZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1tCmluZGV4IDdhNGMw ODUxNTJhY2YzMTY4MmQ2OTljZWRmNDAwYjU5OWIxZTA2ZWUuLjNhZTY1ZTExZTBiZDRmNTUzNjBh ZmRiODM2ODNkYjAwYWFlMTljNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1t CkBAIC00NSw2ICs0NSw3IEBAIHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RBbmltYXRpb25EZWxh eSB7IDEwMF9tcyB9OwogQGltcGxlbWVudGF0aW9uIFdLVmlkZW9MYXllclJlbW90ZSB7CiAgICAg V2Vha1B0cjxXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZT4gX21lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZTsKICAgICBSZXRhaW5QdHI8Q0FDb250ZXh0PiBfY29udGV4dDsKKyAgICBXZWJD b3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRlb0dyYXZpdHkgX3ZpZGVvR3Jhdml0eTsKIAogICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpUaW1lcj4gX3Jlc29sdmVCb3VuZHNUaW1lcjsKICAg ICBib29sIF9zaG91bGRSZXN0YXJ0V2hlblRpbWVyRmlyZXM7CkBAIC04MCw2ICs4MSwyNSBAQCBz dGF0aWMgY29uc3QgU2Vjb25kcyBQb3N0QW5pbWF0aW9uRGVsYXkgeyAxMDBfbXMgfTsKICAgICBf bWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlID0gbWFrZVdlYWtQdHIoKm1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZSk7CiB9CiAKKy0gKFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0 eSl2aWRlb0dyYXZpdHkKK3sKKyAgICByZXR1cm4gX3ZpZGVvR3Jhdml0eTsKK30KKworLSAodm9p ZClzZXRWaWRlb0dyYXZpdHk6KFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0 eSl2aWRlb0dyYXZpdHkKK3sKKyAgICBfdmlkZW9HcmF2aXR5ID0gdmlkZW9HcmF2aXR5OworfQor CistIChib29sKXJlc2l6ZVByZXNlcnZpbmdHcmF2aXR5Cit7CisgICAgYXV0byogcGxheWVyID0g c2VsZi5tZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CisgICAgaWYgKHBsYXllciAmJiBwbGF5ZXIt PmluVmlkZW9GdWxsc2NyZWVuT3JQaWN0dXJlSW5QaWN0dXJlKCkpCisgICAgICAgIHJldHVybiB0 cnVlOworICAgIAorICAgIHJldHVybiBfdmlkZW9HcmF2aXR5ICE9IFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZTsKK30KKwogLSAodm9pZClsYXlvdXRTdWJsYXllcnMK IHsKICAgICBhdXRvKiBzdWJsYXllcnMgPSBbc2VsZiBzdWJsYXllcnNdOwpAQCAtOTMsNyArMTEz LDcgQEAgc3RhdGljIGNvbnN0IFNlY29uZHMgUG9zdEFuaW1hdGlvbkRlbGF5IHsgMTAwX21zIH07 CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHRhcmdldFZpZGVvRnJhbWUgPSBzZWxmLmJvdW5kczsK ICAgICBDR0FmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybUlkZW50 aXR5OwogICAgIGlmICghc291cmNlVmlkZW9GcmFtZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYg KGF1dG8qIG1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSA9IHNlbGYubWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlOyBtZWRpYVBsYXllclByaXZhdGVSZW1vdGUgJiYgbWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLT5pblZpZGVvRnVsbHNjcmVlbk9yUGljdHVyZUluUGljdHVyZSgpKSB7CisgICAgICAgIGlm IChbc2VsZiByZXNpemVQcmVzZXJ2aW5nR3Jhdml0eV0pIHsKICAgICAgICAgICAgIGF1dG8gc2Nh bGUgPSBzdGQ6OmZtYXgodGFyZ2V0VmlkZW9GcmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFt ZS53aWR0aCgpLCB0YXJnZXRWaWRlb0ZyYW1lLmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5o ZWlnaHQoKSk7CiAgICAgICAgICAgICB0cmFuc2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybU1ha2VT Y2FsZShzY2FsZSwgc2NhbGUpOwogICAgICAgICB9IGVsc2UKQEAgLTE1OCwxMiArMTc4LDEzIEBA IHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RBbmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotUGxhdGZvcm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xh eWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLCBMYXllckhvc3RpbmdDb250ZXh0SUQgY29udGV4dElkKQorUGxhdGZvcm1MYXllckNvbnRh aW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVk aWFQbGF5ZXJQcml2YXRlUmVtb3RlLCBMYXllckhvc3RpbmdDb250ZXh0SUQgY29udGV4dElkLCBX ZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRlb0dyYXZpdHkgdmlkZW9HcmF2aXR5KQogewog ICAgIC8vIEluaXRpYWxseSwgYWxsIHRoZSBsYXllcnMgd2lsbCBiZSBlbXB0eSAoYm90aCB3aWR0 aCBhbmQgaGVpZ2h0IGFyZSAwKSBhbmQgaW52aXNpYmxlLgogICAgIC8vIFRoZSByZW5kZXJlciB3 aWxsIGNoYW5nZSB0aGUgc2l6ZXMgb2YgV0tWaWRlb0xheWVyUmVtb3RlIHRvIHRyaWdnZXIgbGF5 b3V0IG9mIHN1YmxheWVycyBhbmQgbWFrZSB0aGVtIHZpc2libGUuCiAgICAgYXV0byB2aWRlb0xh eWVyUmVtb3RlID0gYWRvcHROUyhbW1dLVmlkZW9MYXllclJlbW90ZSBhbGxvY10gaW5pdF0pOwog ICAgIFt2aWRlb0xheWVyUmVtb3RlIHNldE5hbWU6QCJXS1ZpZGVvTGF5ZXJSZW1vdGUiXTsKKyAg ICBbdmlkZW9MYXllclJlbW90ZSBzZXRWaWRlb0dyYXZpdHk6dmlkZW9HcmF2aXR5XTsKICAgICBb dmlkZW9MYXllclJlbW90ZSBzZXRNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6bWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlXTsKICAgICBbdmlkZW9MYXllclJlbW90ZSBhZGRTdWJsYXllcjpMYXllckhv c3RpbmdDb250ZXh0OjpjcmVhdGVQbGF0Zm9ybUxheWVyRm9ySG9zdGluZ0NvbnRleHQoY29udGV4 dElkKS5nZXQoKV07CiAK 431121 2021-06-10 13:48:43 -0700 2021-06-10 16:51:48 -0700 Patch bug-226784-20210610134843.patch text/plain 9128 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGFhOTM5M2Q1ZjYxNmZm Yzk2ZTExYWY3OTRjZDAzYjRiZGFiNzkuLjZlZmJmMGYyMjFlMjdiNGExZDJkMjJmMzUyYTYxZmZi ZWQ5NmY1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMDggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdGUg dmlkZW8gbGF5ZXIgc2hvdWxkIHJlc3BlY3QgdmlkZW8gZ3Jhdml0eSB3aGVuIHJlc2l6aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3ODQKKwor ICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5 LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpwcmVw YXJlRm9yUGxheWJhY2spOiBQYXNzIHNwZWNpZnkgdmlkZW8gZ3Jhdml0eQorICAgICAgICB3aGVu IGNyZWF0aW5nIHJlbW90ZSBsYXllci4KKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlOjpzZXRWaWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTogUmVtZW1iZXIgZ3Jhdml0eS4K KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUu aDoKKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVtb3RlQ29j b2EuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9WaWRlb0xheWVyUmVt b3RlQ29jb2EubW06CisgICAgICAgICgtW1dLVmlkZW9MYXllclJlbW90ZSB2aWRlb0dyYXZpdHld KToKKyAgICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHNldFZpZGVvR3Jhdml0eTpdKToKKyAg ICAgICAgKC1bV0tWaWRlb0xheWVyUmVtb3RlIHJlc2l6ZVByZXNlcnZpbmdHcmF2aXR5XSk6IFJl dHVybiB0cnVlIHdoZW4gaW4gUGlQLCBmdWxsc2NyZWVuLAorICAgICAgICBvciB3aGVuIHZpZGVv IGdyYXZpdHkgaXMgbm90ICJyZXNpemUiLgorICAgICAgICAoLVtXS1ZpZGVvTGF5ZXJSZW1vdGUg bGF5b3V0U3VibGF5ZXJzXSk6IFByZXNlcnZlIGFzcGVjdCByYXRpb24gd2hlbiBhcHByb3ByaWF0 ZS4KKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlVmlkZW9MYXllclJlbW90ZSk6CisKIDIwMjEtMDYt MDkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVSURl bGVnYXRlOjpVSUNsaWVudDo6ZnVsbHNjcmVlbk1heVJldHVyblRvSW5saW5lKCkgaXMgbm90IGNh bGxlZCB3aGVuIGEgdmlkZW8gZXhpdHMgZnVsbHNjcmVlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1v dGUuY3BwCmluZGV4IGMzNzUyOWM4ZTAyN2ZkZDRkYTg5YjBlNDQ4ODdlN2U0NTBkMGY5YjguLjVj ZDZiODZiZTg1ZTQ1NTQ5NWIzOWJmYTY2MDU4ZTg3OGM3ZGFjZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZTo6cHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIE1lZGlhUGxheWVy OgogICAgICAgICBpZiAoIXBsYXllcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBt X3ZpZGVvTGF5ZXIgPSBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKHRoaXMsIGlubGluZUxheWVySG9z dGluZ0NvbnRleHRJZC52YWx1ZSgpKTsKKyAgICAgICAgbV92aWRlb0xheWVyID0gY3JlYXRlVmlk ZW9MYXllclJlbW90ZSh0aGlzLCBpbmxpbmVMYXllckhvc3RpbmdDb250ZXh0SWQudmFsdWUoKSwg bV92aWRlb0Z1bGxzY3JlZW5HcmF2aXR5KTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAg bV92aWRlb0xheWVyTWFuYWdlci0+c2V0VmlkZW9MYXllcihtX3ZpZGVvTGF5ZXIuZ2V0KCksIHNu YXBwZWRJbnRSZWN0KHBsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSkuc2l6ZSgpKTsKICNl bmRpZgpAQCAtODE1LDYgKzgxNSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpz ZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkKIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFZpZGVvRnVsbHNjcmVlbkdyYXZpdHkoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IGdyYXZpdHkpCiB7CisgICAgbV92aWRl b0Z1bGxzY3JlZW5HcmF2aXR5ID0gZ3Jhdml0eTsKICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNz YWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0VmlkZW9GdWxsc2NyZWVuR3Jhdml0eShn cmF2aXR5KSwgbV9pZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDEzYzRm MWRmODMzNTY3ODczM2I3OGViYzZiZTlhNmQzMDEwNGMwNDMuLmMzMDMyMTIwNTk4Y2JhNjkyNjQ4 MTEyODUzYTUyOTdhMzFlNWVkYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDI2 LDYgKzQyNiw3IEBAIHByaXZhdGU6CiAgICAgTWVkaWFUaW1lIG1fY2FjaGVkTWVkaWFUaW1lOwog ICAgIE1vbm90b25pY1RpbWUgbV9jYWNoZWRNZWRpYVRpbWVRdWVyeVRpbWU7CiAKKyAgICBXZWJD b3JlOjpNZWRpYVBsYXllcjo6VmlkZW9HcmF2aXR5IG1fdmlkZW9GdWxsc2NyZWVuR3Jhdml0eSB7 IFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZUFzcGVjdCB9OwogICAg IE1vbm90b25pY1RpbWUgbV9sYXN0UGxheWJhY2tRdWFsaXR5TWV0cmljc1F1ZXJ5VGltZTsKICAg ICBTZWNvbmRzIG1fdmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbDsKICAgICBkb3Vi bGUgbV92b2x1bWUgeyAxIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL21lZGlhL1ZpZGVvTGF5ZXJSZW1vdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvbWVkaWEvVmlkZW9MYXllclJlbW90ZS5oCmluZGV4IDk5NmIzZjU2MDQzYTU5OWQ3MzZmZDQw OTQzYjlhYTliYjJkMGE3YTkuLmQwN2M0OWM0ZmFhYjhmNTU4MWIyM2Q2NTRiZDc3M2FhZDExMTQy OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlkZW9M YXllclJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVmlk ZW9MYXllclJlbW90ZS5oCkBAIC0yOCwxMyArMjgsMTQgQEAKICNpZiBFTkFCTEUoR1BVX1BST0NF U1MpCiAKICNpbmNsdWRlICJMYXllckhvc3RpbmdDb250ZXh0LmgiCisjaW5jbHVkZSA8V2ViQ29y ZS9NZWRpYVBsYXllckVudW1zLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUxheWVyLmg+ CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7 CiAKLVBsYXRmb3JtTGF5ZXJDb250YWluZXIgY3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBs YXllclByaXZhdGVSZW1vdGUqLCBMYXllckhvc3RpbmdDb250ZXh0SUQpOworUGxhdGZvcm1MYXll ckNvbnRhaW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZSosIExheWVySG9zdGluZ0NvbnRleHRJRCwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6Vmlk ZW9HcmF2aXR5KTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29h LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL2NvY29hL1ZpZGVvTGF5ZXJS ZW1vdGVDb2NvYS5oCmluZGV4IDE5MmIwNjNlZGRlMGVlMmU3MDlhZmFiNjRkMGU4MTkyNmNkZDFk YzAuLjMyODdkMjlkMDU4NWU0ZjJkMThjNDYwZTgxMjNkMWQ4YmY0ZTM0NDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90 ZUNvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9jb2NvYS9W aWRlb0xheWVyUmVtb3RlQ29jb2EuaApAQCAtMjYsNiArMjYsNyBAQAogI2lmIEVOQUJMRShHUFVf UFJPQ0VTUykgJiYgUExBVEZPUk0oQ09DT0EpCiAKICNpbXBvcnQgPFF1YXJ0ekNvcmUvQ0FMYXll ci5oPgorI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXllckVudW1zLmg+CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOwpAQCAtMzQsNiArMzUsNyBA QCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CiBAaW50ZXJmYWNlIFdLVmlkZW9MYXll clJlbW90ZSA6IENBTGF5ZXIKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBXZWJLaXQ6Ok1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOwogQHByb3BlcnR5IChu b25hdG9taWMpIENHUmVjdCB2aWRlb0xheWVyRnJhbWU7CitAcHJvcGVydHkgKG5vbmF0b21pYykg V2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9HcmF2aXR5IHZpZGVvR3Jhdml0eTsKIEBl bmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21l ZGlhL2NvY29hL1ZpZGVvTGF5ZXJSZW1vdGVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1tCmluZGV4IDdhNGMw ODUxNTJhY2YzMTY4MmQ2OTljZWRmNDAwYjU5OWIxZTA2ZWUuLjNhZTY1ZTExZTBiZDRmNTUzNjBh ZmRiODM2ODNkYjAwYWFlMTljNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvY29jb2EvVmlkZW9MYXllclJlbW90ZUNvY29hLm1t CkBAIC00NSw2ICs0NSw3IEBAIHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RBbmltYXRpb25EZWxh eSB7IDEwMF9tcyB9OwogQGltcGxlbWVudGF0aW9uIFdLVmlkZW9MYXllclJlbW90ZSB7CiAgICAg V2Vha1B0cjxXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZT4gX21lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZTsKICAgICBSZXRhaW5QdHI8Q0FDb250ZXh0PiBfY29udGV4dDsKKyAgICBXZWJD b3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRlb0dyYXZpdHkgX3ZpZGVvR3Jhdml0eTsKIAogICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpUaW1lcj4gX3Jlc29sdmVCb3VuZHNUaW1lcjsKICAg ICBib29sIF9zaG91bGRSZXN0YXJ0V2hlblRpbWVyRmlyZXM7CkBAIC04MCw2ICs4MSwyNSBAQCBz dGF0aWMgY29uc3QgU2Vjb25kcyBQb3N0QW5pbWF0aW9uRGVsYXkgeyAxMDBfbXMgfTsKICAgICBf bWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlID0gbWFrZVdlYWtQdHIoKm1lZGlhUGxheWVyUHJpdmF0 ZVJlbW90ZSk7CiB9CiAKKy0gKFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0 eSl2aWRlb0dyYXZpdHkKK3sKKyAgICByZXR1cm4gX3ZpZGVvR3Jhdml0eTsKK30KKworLSAodm9p ZClzZXRWaWRlb0dyYXZpdHk6KFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlZpZGVvR3Jhdml0 eSl2aWRlb0dyYXZpdHkKK3sKKyAgICBfdmlkZW9HcmF2aXR5ID0gdmlkZW9HcmF2aXR5OworfQor CistIChib29sKXJlc2l6ZVByZXNlcnZpbmdHcmF2aXR5Cit7CisgICAgYXV0byogcGxheWVyID0g c2VsZi5tZWRpYVBsYXllclByaXZhdGVSZW1vdGU7CisgICAgaWYgKHBsYXllciAmJiBwbGF5ZXIt PmluVmlkZW9GdWxsc2NyZWVuT3JQaWN0dXJlSW5QaWN0dXJlKCkpCisgICAgICAgIHJldHVybiB0 cnVlOworICAgIAorICAgIHJldHVybiBfdmlkZW9HcmF2aXR5ICE9IFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpWaWRlb0dyYXZpdHk6OlJlc2l6ZTsKK30KKwogLSAodm9pZClsYXlvdXRTdWJsYXllcnMK IHsKICAgICBhdXRvKiBzdWJsYXllcnMgPSBbc2VsZiBzdWJsYXllcnNdOwpAQCAtOTMsNyArMTEz LDcgQEAgc3RhdGljIGNvbnN0IFNlY29uZHMgUG9zdEFuaW1hdGlvbkRlbGF5IHsgMTAwX21zIH07 CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHRhcmdldFZpZGVvRnJhbWUgPSBzZWxmLmJvdW5kczsK ICAgICBDR0FmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybUlkZW50 aXR5OwogICAgIGlmICghc291cmNlVmlkZW9GcmFtZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYg KGF1dG8qIG1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSA9IHNlbGYubWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlOyBtZWRpYVBsYXllclByaXZhdGVSZW1vdGUgJiYgbWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLT5pblZpZGVvRnVsbHNjcmVlbk9yUGljdHVyZUluUGljdHVyZSgpKSB7CisgICAgICAgIGlm IChbc2VsZiByZXNpemVQcmVzZXJ2aW5nR3Jhdml0eV0pIHsKICAgICAgICAgICAgIGF1dG8gc2Nh bGUgPSBzdGQ6OmZtYXgodGFyZ2V0VmlkZW9GcmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFt ZS53aWR0aCgpLCB0YXJnZXRWaWRlb0ZyYW1lLmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5o ZWlnaHQoKSk7CiAgICAgICAgICAgICB0cmFuc2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybU1ha2VT Y2FsZShzY2FsZSwgc2NhbGUpOwogICAgICAgICB9IGVsc2UKQEAgLTE1OCwxMiArMTc4LDEzIEBA IHN0YXRpYyBjb25zdCBTZWNvbmRzIFBvc3RBbmltYXRpb25EZWxheSB7IDEwMF9tcyB9OwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotUGxhdGZvcm1MYXllckNvbnRhaW5lciBjcmVhdGVWaWRlb0xh eWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLCBMYXllckhvc3RpbmdDb250ZXh0SUQgY29udGV4dElkKQorUGxhdGZvcm1MYXllckNvbnRh aW5lciBjcmVhdGVWaWRlb0xheWVyUmVtb3RlKE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSogbWVk aWFQbGF5ZXJQcml2YXRlUmVtb3RlLCBMYXllckhvc3RpbmdDb250ZXh0SUQgY29udGV4dElkLCBX ZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpWaWRlb0dyYXZpdHkgdmlkZW9HcmF2aXR5KQogewog ICAgIC8vIEluaXRpYWxseSwgYWxsIHRoZSBsYXllcnMgd2lsbCBiZSBlbXB0eSAoYm90aCB3aWR0 aCBhbmQgaGVpZ2h0IGFyZSAwKSBhbmQgaW52aXNpYmxlLgogICAgIC8vIFRoZSByZW5kZXJlciB3 aWxsIGNoYW5nZSB0aGUgc2l6ZXMgb2YgV0tWaWRlb0xheWVyUmVtb3RlIHRvIHRyaWdnZXIgbGF5 b3V0IG9mIHN1YmxheWVycyBhbmQgbWFrZSB0aGVtIHZpc2libGUuCiAgICAgYXV0byB2aWRlb0xh eWVyUmVtb3RlID0gYWRvcHROUyhbW1dLVmlkZW9MYXllclJlbW90ZSBhbGxvY10gaW5pdF0pOwog ICAgIFt2aWRlb0xheWVyUmVtb3RlIHNldE5hbWU6QCJXS1ZpZGVvTGF5ZXJSZW1vdGUiXTsKKyAg ICBbdmlkZW9MYXllclJlbW90ZSBzZXRWaWRlb0dyYXZpdHk6dmlkZW9HcmF2aXR5XTsKICAgICBb dmlkZW9MYXllclJlbW90ZSBzZXRNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6bWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlXTsKICAgICBbdmlkZW9MYXllclJlbW90ZSBhZGRTdWJsYXllcjpMYXllckhv c3RpbmdDb250ZXh0OjpjcmVhdGVQbGF0Zm9ybUxheWVyRm9ySG9zdGluZ0NvbnRleHQoY29udGV4 dElkKS5nZXQoKV07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvd2luL1ZpZGVvTGF5ZXJSZW1vdGVXaW4uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS9tZWRpYS93aW4vVmlkZW9MYXllclJlbW90ZVdpbi5jcHAKaW5kZXggYjcyNGUxN2Mz NTg0ZDcxNWE3MDY1ZjIzZTI1MDM3YzkyYjA3ZDdkNC4uOGFkYzRkMWQ4ZWRhZmQxYWY2YTdhNzlh MjFkODIwZmM1MDEyOWE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS9tZWRpYS93aW4vVmlkZW9MYXllclJlbW90ZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0dQVS9tZWRpYS93aW4vVmlkZW9MYXllclJlbW90ZVdpbi5jcHAKQEAgLTMzLDcg KzMzLDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBsYXRmb3JtTGF5ZXJDb250YWluZXIg Y3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBsYXllclByaXZhdGVSZW1vdGUqIG1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZSwgTGF5ZXJIb3N0aW5nQ29udGV4dElEIGNvbnRleHRJZCkKK1BsYXRm b3JtTGF5ZXJDb250YWluZXIgY3JlYXRlVmlkZW9MYXllclJlbW90ZShNZWRpYVBsYXllclByaXZh dGVSZW1vdGUqLCBMYXllckhvc3RpbmdDb250ZXh0SUQsIFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51 bXM6OlZpZGVvR3Jhdml0eSkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIHJldHVybiBu dWxscHRyOwo=