228873 2021-08-06 14:23:14 -0700 [Cocoa|GPU] platformLayer() not always added to remotedly hosted context; black video while playing 2021-08-09 08:16:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson ews-watchlist glenn philipj sergio webkit-bug-importer oldest_to_newest 1782564 0 jer.noble 2021-08-06 14:23:14 -0700 [Cocoa|GPU] platformLayer() not always added to remotedly hosted context; black video while playing 1782568 1 435088 jer.noble 2021-08-06 14:31:04 -0700 Created attachment 435088 Patch 1782574 2 435091 jer.noble 2021-08-06 14:48:42 -0700 Created attachment 435091 Patch 1782779 3 435154 jer.noble 2021-08-08 13:54:12 -0700 Created attachment 435154 Patch for landing 1782785 4 435158 jer.noble 2021-08-08 14:25:17 -0700 Created attachment 435158 Patch for landing 1782888 5 ews-feeder 2021-08-09 08:15:29 -0700 Committed r280776 (240360@main): <https://commits.webkit.org/240360@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435158. 1782889 6 webkit-bug-importer 2021-08-09 08:16:16 -0700 <rdar://problem/81695969> 435088 2021-08-06 14:31:04 -0700 2021-08-06 14:48:40 -0700 Patch bug-228873-20210806143104.patch text/plain 13187 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJhNDM3YmJkMjEzNWEx YTI0MzBkZDFlZjg0MWEyYTliNmVmMmUyZC4uNjc1NThmNTMyZDJlYWMyNjUwMGEzODRhZjIwMTY0 NjRhMmVhOGM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA4LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxHUFVdIHBsYXRm b3JtTGF5ZXIoKSBub3QgYWx3YXlzIGFkZGVkIHRvIHJlbW90ZWRseSBob3N0ZWQgY29udGV4dDsg YmxhY2sgdmlkZW8gd2hpbGUgcGxheWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4ODczCisgICAgICAgIDxyZGFyOi8vODEyNzExMDc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29hbGVzY2UgY2Fs bHMgdG8gcmVuZGVyaW5nTW9kZUNoYW5nZWQoKSBieSBzZXR0aW5nIGEgZmxhZyB0byBjYWxsIHJl bmRlcmluZ01vZGVDaGFuZ2VkKCkgaW4KKyAgICAgICAgdGhlIG5leHQgcnVuIGxvb3AsIGFuZCBj YWxsIGludG8gdGhpcyBjb2FsZXNjaW5nIG1ldGhvZCwgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hh bmdlZAorICAgICAgICAoKSwgd2hlbmV2ZXIgdGhlIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbiBzdWJjbGFzc2VzIGNyZWF0ZSBvciBkZXN0cm95IGEgdmlkZW8gbGF5ZXIKKyAgICAgICAg b3Igc29mdHdhcmUgcGFpbnRpbmcgY29udGV4dC4gVGhpcyBlbnN1cmVzIHRoYXQgdGhlIE1lZGlh UGxheWVyQ2xpZW50IGlzIGFsd2F5cyBub3RpZmllZCB3aGVuCisgICAgICAgIHRoZSByZW5kZXJp bmcgbW9kZSBjaGFuZ2VzLCByZWdhcmRsZXNzIG9mIHdoeSB0aGF0IGNoYW5nZSBvY2N1cnJlZC4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uOjpzZXRVcFZpZGVvUmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hh bmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246 OnJlbmRlcmluZ01vZGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbjo6cHJlcGFyZUZvclJlbmRlcmluZyk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25DRjo6ZGVzdHJveVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6QVZGV3JhcHBlcjo6Y3JlYXRlQVZDRlZpZGVvTGF5ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6QVZGV3JhcHBlcjo6Y3JlYXRlSW1hZ2VHZW5lcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6 QVZGV3JhcHBlcjo6ZGVzdHJveUltYWdlR2VuZXJhdG9yKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQzo6Y3JlYXRlVmlkZW9MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVlBsYXllckxheWVyKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRlc3Ryb3lWaWRlb0xh eWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OmNyZWF0ZVZpZGVvT3V0cHV0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OmRlc3Ryb3lWaWRlb091dHB1dCk6CisKIDIwMjEtMDgtMDUg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjog aHR0cC90ZXN0cy9wcmVsb2FkL29ubG9hZF9ldmVudC5odG1sIGlzIGEgZmxha3kgdGltZW91dCBv biBCaWcgU3VyIHdrMSBSZWxlYXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzMjlmMGNjZDExNGMwZWM2NzAyZTlh NjcxNTZlNDEzM2I1MTBhODkuLjY5NmQ2MWFlMWEyZjNjMDRlNjVkYjIxM2Q1ZWZiMjJkYTA3OTli NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDgtMDYgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hfEdQVV0gcGxhdGZvcm1MYXllcigp IG5vdCBhbHdheXMgYWRkZWQgdG8gcmVtb3RlZGx5IGhvc3RlZCBjb250ZXh0OyBibGFjayB2aWRl byB3aGlsZSBwbGF5aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjg4NzMKKyAgICAgICAgPHJkYXI6Ly84MTI3MTEwNz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHRoZSBSZW1vdGVN ZWRpYVBsYXllclByb3h5IHdpbGwgaW5zZXJ0IGl0cyBNZWRpYVBsYXllcidzIHBsYXRmb3JtTGF5 ZXIoKSBpbnRvIHRoZQorICAgICAgICByZW1vdGVseSBob3N0ZWQgY29udGV4dCB3aGVuIGl0IHJl Y2VpdmVzIGEgImZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpIiBub3RpZmljYXRpb24uCisgICAg ICAgIEhvd2V2ZXIgdGhpcyBpcyBwcm9ibGVtYXRpYyBmb3IgdHdvIHJlYXNvbnM6IEFWUGxheWVy TGF5ZXIgbWF5IG5vdCBiZWNvbWUgInJlYWR5IGZvcgorICAgICAgICBwbGF5YmFjayIgd2hlbiBp dCBpcyBub3QgaW4gYW4gYWN0aXZlIENBTGF5ZXIgaGVpcmFyY2h5LCBhbmQgZm9yCisgICAgICAg IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbiwgZmlyc3RWaWRlb0ZyYW1lQXZhaWxhYmxl KCkgaXMgb25seSBmaXJlZCBkdXJpbmcKKyAgICAgICAgdXBkYXRlU3RhdGVzKCksIHdoaWNoIGlz IG5vdCBndWFyYW50ZWVkIHRvIG9jY3VyIHVubGVzcyBhbm90aGVyIHN0YXRlIGNoYW5nZSBvY2N1 cnMuCisKKyAgICAgICAgSW5zdGVhZCwgcmVwYXJlbnQgdGhlIE1lZGlhUGxheWVyJ3MgcGxhdGZv cm1MYXllcigpIHdoZW4gd2UgcmVjZWl2ZSBhCisgICAgICAgIG1lZGlhUGxheWVyUmVuZGVyaW5n TW9kZUNoYW5nZWQoKSBub3RpZmljYXRpb24sIHdoaWNoIG5vdGlmaWVzIHRoZSBjbGllbnQgd2hl bmV2ZXIgYQorICAgICAgICBwbGF0Zm9ybUxheWVyKCkgaXMgY3JlYXRlZCBvciBkZXN0cm95ZWQu CisKKyAgICAgICAgKiBHUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3Bw OgorICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5ZXJQcm94 eUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRp YVBsYXllckZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVyUmVuZGVyaW5nTW9kZUNoYW5nZWQpOgorCiAy MDIxLTA4LTA0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtD b2NvYV0gUmVtb3ZlIHN1cHBvcnQgZm9yIEFWQXNzZXRJbWFnZUdlbmVyYXRvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAppbmRl eCA5NjMwZmEyNDZlZDkwY2MzZjE0OGRiMzAxNTExMTYwZjQyZjkzNzc3Li4yMTk4NDM5N2E1ZTUz ZTY1YzA3MDlhY2I2NDRhMjljYjhlM2RiOTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcApAQCAtMTQyLDcgKzE0MiwyNiBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0VXBWaWRlb1JlbmRlcmlu ZygpCiAKICAgICAvLyBJZiB1c2luZyBhIG1vdmllIGxheWVyLCBpbmZvcm0gdGhlIGNsaWVudCBz byB0aGUgY29tcG9zaXRpbmcgdHJlZSBpcyB1cGRhdGVkLgogICAgIGlmIChjdXJyZW50TW9kZSA9 PSBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIgfHwgcHJlZmVycmVkTW9kZSA9PSBNZWRpYVJlbmRlcmlu Z1RvTGF5ZXIpCi0gICAgICAgIG1fcGxheWVyLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworICAg ICAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCkKK3sK KyAgICBpZiAobV9uZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKQorICAgICAgICByZXR1cm47Cisg ICAgbV9uZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkID0gdHJ1ZTsKKworICAgIHF1ZXVlVGFza09u RXZlbnRMb29wKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAgICBpZiAo d2Vha1RoaXMpCisgICAgICAgICAgICB3ZWFrVGhpcy0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsK KyAgICB9KTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnJlbmRl cmluZ01vZGVDaGFuZ2VkKCkKK3sKKyAgICBBU1NFUlQobV9uZWVkc1JlbmRlcmluZ01vZGVDaGFu Z2VkKTsKKyAgICBtX25lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQgPSBmYWxzZTsKKyAgICBtX3Bs YXllci0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb246OnRlYXJEb3duVmlkZW9SZW5kZXJpbmcoKQpAQCAtNDQzLDcgKzQ2Miw3 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpwcmVwYXJlRm9yUmVuZGVy aW5nKCkKICAgICBzZXRVcFZpZGVvUmVuZGVyaW5nKCk7CiAKICAgICBpZiAoY3VycmVudFJlbmRl cmluZ01vZGUoKSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIgfHwgcHJlZmVycmVkUmVuZGVyaW5n TW9kZSgpID09IE1lZGlhUmVuZGVyaW5nVG9MYXllcikKLSAgICAgICAgbV9wbGF5ZXItPnJlbmRl cmluZ01vZGVDaGFuZ2VkKCk7CisgICAgICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQo KTsKIH0KIAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnN1cHBvcnRzRnVs bHNjcmVlbigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uLmgKaW5kZXggNDgyMjhiYWYzYjAyMmJmYTM0MGU0YTFmYzQwZmIxZTgy OTM0NjY2Yy4uZGVhZjRiYTU3NmQ4ODk4MDVjZmUyMzNiYzRlYWQxMGRhNzVhNWExMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaApA QCAtMzIwLDYgKzMyMCw5IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNldFJlc29sdmVkVVJMKFVS TCYmKTsKICAgICBjb25zdCBVUkwmIHJlc29sdmVkVVJMKCkgY29uc3QgeyByZXR1cm4gbV9yZXNv bHZlZFVSTDsgfQogCisgICAgdm9pZCBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7Cisg ICAgdm9pZCByZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworCiBwcml2YXRlOgogICAgIE1lZGlhUGxh eWVyKiBtX3BsYXllcjsKIApAQCAtMzY4LDYgKzM3MSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X2NoYXJhY3RlcmlzdGljc0NoYW5nZWQ7CiAgICAgYm9vbCBtX3Nob3VsZE1haW50YWluQXNwZWN0 UmF0aW87CiAgICAgYm9vbCBtX3NlZWtpbmc7CisgICAgYm9vbCBtX25lZWRzUmVuZGVyaW5nTW9k ZUNoYW5nZWQgeyBmYWxzZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRi5jcHAKaW5kZXggMTczOWY1MjczZGZjNDA4ODJjYTk5MTZjNTAwY2QzMzNiMjQ5ZTYyZS4u NzM5MWJmMTNkMWY1NzAwODU3Yjc4OWU4OGJlMDYxZDVjNzJlYWJiMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Yu Y3BwCkBAIC00NjgsNiArNDY4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRjo6ZGVzdHJveVZpZGVvTGF5ZXIoKQogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbkNGOjpkZXN0cm95VmlkZW9MYXllciglcCkgLSBkZXN0cm95aW5nICVw IiwgdGhpcywgdmlkZW9MYXllcihtX2F2ZldyYXBwZXIpKTsKICAgICBpZiAobV9hdmZXcmFwcGVy KQogICAgICAgICBtX2F2ZldyYXBwZXItPmRlc3Ryb3lWaWRlb0xheWVyKCk7CisgICAgc2V0TmVl ZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogfQogCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbkNGOjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkgY29uc3QKQEAgLTE5OTYsNiAr MTk5Nyw3IEBAIHZvaWQgQVZGV3JhcHBlcjo6Y3JlYXRlQVZDRlZpZGVvTGF5ZXIoKQogCiAgICAg Ly8gVGhlIGxheWVyIHdpbGwgZ2V0IGhvb2tlZCB1cCB2aWEgUmVuZGVyTGF5ZXJCYWNraW5nOjp1 cGRhdGVDb25maWd1cmF0aW9uKCkuCiAgICAgbV9hdkNGVmlkZW9MYXllciA9IGFkb3B0Q0YoQVZD RlBsYXllckxheWVyQ3JlYXRlV2l0aEFWQ0ZQbGF5ZXIoa0NGQWxsb2NhdG9yRGVmYXVsdCwgYXZQ bGF5ZXIoKSwgbV9ub3RpZmljYXRpb25RdWV1ZSkpOworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9k ZUNoYW5nZWQoKTsKICAgICBMT0coTWVkaWEsICJBVkZXcmFwcGVyOjpjcmVhdGVBVkNGVmlkZW9M YXllciglcCkgLSByZXR1cm5pbmcgJXAiLCB0aGlzLCB2aWRlb0xheWVyKCkpOwogfQogCkBAIC0y MDQxLDYgKzIwNDMsNyBAQCB2b2lkIEFWRldyYXBwZXI6OmNyZWF0ZUltYWdlR2VuZXJhdG9yKCkK ICAgICBBVkNGQXNzZXRJbWFnZUdlbmVyYXRvclNldEFwcGxpZXNQcmVmZXJyZWRUcmFja1RyYW5z Zm9ybShtX2ltYWdlR2VuZXJhdG9yLmdldCgpLCB0cnVlKTsKIAogICAgIExPRyhNZWRpYSwgIkFW RldyYXBwZXI6OmNyZWF0ZUltYWdlR2VuZXJhdG9yKCVwKSAtIHJldHVybmluZyAlcCIsIHRoaXMs IG1faW1hZ2VHZW5lcmF0b3IuZ2V0KCkpOworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5n ZWQoKTsKIH0KIAogdm9pZCBBVkZXcmFwcGVyOjpkZXN0cm95SW1hZ2VHZW5lcmF0b3IoKQpAQCAt MjA0OSw2ICsyMDUyLDcgQEAgdm9pZCBBVkZXcmFwcGVyOjpkZXN0cm95SW1hZ2VHZW5lcmF0b3Io KQogICAgIEFTU0VSVChkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpID09IGRpc3BhdGNoX2dldF9j dXJyZW50X3F1ZXVlKCkpOwogICAgIExPRyhNZWRpYSwgIkFWRldyYXBwZXI6OmRlc3Ryb3lJbWFn ZUdlbmVyYXRvciglcCkiLCB0aGlzKTsKICAgICBtX2ltYWdlR2VuZXJhdG9yID0gMDsKKyAgICBz ZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIFJldGFpblB0cjxDR0ltYWdlUmVm PiBBVkZXcmFwcGVyOjpjcmVhdGVJbWFnZUZvclRpbWVJblJlY3QoY29uc3QgTWVkaWFUaW1lJiB0 aW1lLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA3 ZjAwY2FiZDM0MWE1MTU0MzExN2Y1NmNkYzJhMjliYWUzZDliY2VhLi5mYjNlYzIwYjNlNzE1MzA5 ZTZlMjU5ZTQwNzExMTlkYTgyNTkwNDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTYw Niw3ICs2MDYsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNy ZWF0ZVZpZGVvTGF5ZXIoKQogICAgIGlmICghbV9hdlBsYXllciB8fCBtX2hhdmVCZWVuQXNrZWRU b0NyZWF0ZUxheWVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBjYWxsT25NYWluVGhyZWFkKFt0 aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgIGVuc3VyZU9uTWFpblRo cmVhZChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldIHsKICAgICAgICAgaWYg KCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNjE5LDggKzYxOSw2IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9MYXllcigp CiAKICAgICAgICAgaWYgKCFtX3ZpZGVvT3V0cHV0KQogICAgICAgICAgICAgY3JlYXRlVmlkZW9P dXRwdXQoKTsKLQotICAgICAgICBwbGF5ZXIoKS0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKICAg ICB9KTsKIH0KIApAQCAtNjQ1LDYgKzY0Myw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzo6Y3JlYXRlQVZQbGF5ZXJMYXllcigpCiAgICAgaWYgKFttX3ZpZGVvTGF5 ZXIgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRQSVBNb2RlRW5hYmxlZDopXSkKICAg ICAgICAgW21fdmlkZW9MYXllciBzZXRQSVBNb2RlRW5hYmxlZDoocGxheWVyKCktPmZ1bGxzY3Jl ZW5Nb2RlKCkgJiBNZWRpYVBsYXllcjo6VmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1 cmUpXTsKICNlbmRpZgorCisgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogfQog CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRlc3Ryb3lWaWRlb0xh eWVyKCkKQEAgLTY1OSw2ICs2NTksOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakM6OmRlc3Ryb3lWaWRlb0xheWVyKCkKICAgICBtX3ZpZGVvTGF5ZXJNYW5hZ2VyLT5k aWREZXN0cm95VmlkZW9MYXllcigpOwogCiAgICAgbV92aWRlb0xheWVyID0gbmlsOworCisgICAg c2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogfQogCiBNZWRpYVRpbWUgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Z2V0U3RhcnREYXRlKCkgY29uc3QKQEAgLTI0MzIs NiArMjQzNCw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3Jl YXRlVmlkZW9PdXRwdXQoKQogICAgIFttX3ZpZGVvT3V0cHV0IHNldERlbGVnYXRlOm1fdmlkZW9P dXRwdXREZWxlZ2F0ZS5nZXQoKSBxdWV1ZTpnbG9iYWxQdWxsRGVsZWdhdGVRdWV1ZSgpXTsKIAog ICAgIFttX2F2UGxheWVySXRlbS5nZXQoKSBhZGRPdXRwdXQ6bV92aWRlb091dHB1dC5nZXQoKV07 CisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvT3V0cHV0KCkKQEAgLTI0 NDUsNiArMjQ0OSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 ZGVzdHJveVZpZGVvT3V0cHV0KCkKICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSKTsKIAogICAg IG1fdmlkZW9PdXRwdXQgPSAwOworCisgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgp OwogfQogCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnVwZGF0ZUxh c3RQaXhlbEJ1ZmZlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVk aWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKaW5kZXggZGQ0YWNkZGRiNGZmNzc1YjRk MTJmY2Y1NjMxNDNkNTJkNGQxMDAzZi4uMGNlZDY3NTljMGRlN2E3Nzk3NzRiMjc0YjNhYzcyMDNi YmQzY2RkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90 ZU1lZGlhUGxheWVyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRp YS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcApAQCAtNTE4LDEwICs1MTgsMTIgQEAgYm9vbCBS ZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0 ZWQoKQogICAgIHJldHVybiBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CiB9CiAKKyNpZiAh UExBVEZPUk0oQ09DT0EpCiB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVy UmVuZGVyaW5nTW9kZUNoYW5nZWQoKQogewogICAgIG1fd2ViUHJvY2Vzc0Nvbm5lY3Rpb24tPnNl bmQoTWVzc2FnZXM6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6UmVuZGVyaW5nTW9kZUNoYW5n ZWQoKSwgbV9pZCk7CiB9CisjZW5kaWYKIAogVHJhY2tQcml2YXRlUmVtb3RlSWRlbnRpZmllciBS ZW1vdGVNZWRpYVBsYXllclByb3h5OjphZGRSZW1vdGVBdWRpb1RyYWNrUHJveHkoV2ViQ29yZTo6 QXVkaW9UcmFja1ByaXZhdGUmIHRyYWNrKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL21lZGlhL2NvY29hL1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb2NvYS5tbSBiL1Nv dXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5 Q29jb2EubW0KaW5kZXggNDgyODVhODBiYmQ3NTk0OWJhMTUzMTJhMDI4MWQ0MTlkN2RiNTg5NS4u MDUyNjQyNGVmMzlhMzJmN2JlMDY1YmJjMjc3MTRjNTY4MTQ3NGU2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL2NvY29hL1JlbW90ZU1lZGlhUGxheWVyUHJveHlD b2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3Rl TWVkaWFQbGF5ZXJQcm94eUNvY29hLm1tCkBAIC02NiwxMSArNjYsMTUgQEAgdm9pZCBSZW1vdGVN ZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUGxheWJhY2soYm9vbCBwcml2YXRlTW9kZSwgV2Vi Q29yZTo6TWVkaWEKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJGaXJz dFZpZGVvRnJhbWVBdmFpbGFibGUoKQogewogICAgIC8vIEluaXRpYWxseSB0aGUgc2l6ZSBvZiB0 aGUgcGxhdGZvcm1MYXllciBtYXkgYmUgMHgwIGJlY2F1c2Ugd2UgZG8gbm90IHByb3ZpZGUgbWVk aWFQbGF5ZXJDb250ZW50Qm94UmVjdCgpIGluIHRoaXMgY2xhc3MuCi0gICAgbV9pbmxpbmVMYXll ckhvc3RpbmdDb250ZXh0LT5zZXRSb290TGF5ZXIobV9wbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7 CiAgICAgc2V0VmlkZW9JbmxpbmVTaXplSWZQb3NzaWJsZSgqbV9pbmxpbmVMYXllckhvc3RpbmdD b250ZXh0LCBtX3ZpZGVvSW5saW5lU2l6ZSk7CiAgICAgbV93ZWJQcm9jZXNzQ29ubmVjdGlvbi0+ c2VuZChNZXNzYWdlczo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpGaXJzdFZpZGVvRnJhbWVB dmFpbGFibGUoKSwgbV9pZCk7CiB9CiAKK3ZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVk aWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpCit7CisgICAgbV9pbmxpbmVMYXllckhvc3Rp bmdDb250ZXh0LT5zZXRSb290TGF5ZXIobV9wbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7CisgICAg bV93ZWJQcm9jZXNzQ29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlOjpSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpLCBtX2lkKTsKK30KIHZvaWQgUmVtb3RlTWVk aWFQbGF5ZXJQcm94eTo6c2V0VmlkZW9JbmxpbmVTaXplRmVuY2VkKGNvbnN0IFdlYkNvcmU6OkZs b2F0U2l6ZSYgc2l6ZSwgY29uc3QgV1RGOjpNYWNoU2VuZFJpZ2h0JiBtYWNoU2VuZFJpZ2h0KQog ewogICAgIG1faW5saW5lTGF5ZXJIb3N0aW5nQ29udGV4dC0+c2V0RmVuY2VQb3J0KG1hY2hTZW5k UmlnaHQuc2VuZFJpZ2h0KCkpOwo= 435091 2021-08-06 14:48:42 -0700 2021-08-07 05:48:10 -0700 Patch bug-228873-20210806144841.patch text/plain 13504 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJhNDM3YmJkMjEzNWEx YTI0MzBkZDFlZjg0MWEyYTliNmVmMmUyZC4uM2Y4MjI1M2NhYTJmMzAzZjFhOTc4NDNjYTM4Nzlk NDE3NDY2ZmM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTA4LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxHUFVdIHBsYXRm b3JtTGF5ZXIoKSBub3QgYWx3YXlzIGFkZGVkIHRvIHJlbW90ZWRseSBob3N0ZWQgY29udGV4dDsg YmxhY2sgdmlkZW8gd2hpbGUgcGxheWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4ODczCisgICAgICAgIDxyZGFyOi8vODEyNzExMDc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29hbGVzY2UgY2Fs bHMgdG8gcmVuZGVyaW5nTW9kZUNoYW5nZWQoKSBieSBzZXR0aW5nIGEgZmxhZyB0byBjYWxsIHJl bmRlcmluZ01vZGVDaGFuZ2VkKCkgaW4KKyAgICAgICAgdGhlIG5leHQgcnVuIGxvb3AsIGFuZCBj YWxsIGludG8gdGhpcyBjb2FsZXNjaW5nIG1ldGhvZCwgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hh bmdlZCgpLAorICAgICAgICB3aGVuZXZlciB0aGUgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uIHN1YmNsYXNzZXMgY3JlYXRlIG9yIGRlc3Ryb3kgYSB2aWRlbyBsYXllcgorICAgICAgICBv ciBzb2Z0d2FyZSBwYWludGluZyBjb250ZXh0LiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgTWVkaWFQ bGF5ZXJDbGllbnQgaXMgYWx3YXlzIG5vdGlmaWVkCisgICAgICAgIHdoZW4gdGhlIHJlbmRlcmlu ZyBtb2RlIGNoYW5nZXMsIHJlZ2FyZGxlc3Mgb2Ygd2h5IHRoYXQgY2hhbmdlIG9jY3VycmVkLgor CisgICAgICAgIERyaXZlLWJ5IGZpeDogcmVwbGFjZSB0aGUgY2FsbCBpbiBjcmVhdGVWaWRlb0xh eWVyKCkgdG8gImNhbGxPbk1haW5UaHJlYWQoKSIKKyAgICAgICAgd2l0aCAiZW5zdXJlT25NYWlu VGhyZWFkKCkiLiBUaGUgY2FsbCB0byAiY2FsbE9uTWFpblRocmVhZCgpIiB3YXMgYWRkZWQgdG8g YXZvaWQgYQorICAgICAgICBkZWFkbG9jayBpbiBXZWJLaXRMZWdhY3ksIGFuZCAiZW5zdXJlT25N YWluVGhyZWFkKCkiIGhhcyB0aGUgY29ycmVjdCBiZWhhdmlvciB0aGVyZSwgYnV0CisgICAgICAg IHdpbGwgYmUgc3luY2hyb25vdXMgaW4gV2ViS2l0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNldFVwVmlk ZW9SZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uOjpzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6cmVuZGVyaW5nTW9kZUNoYW5nZWQpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpwcmVwYXJl Rm9yUmVuZGVyaW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpk ZXN0cm95VmlkZW9MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpBVkZXcmFwcGVyOjpjcmVhdGVB VkNGVmlkZW9MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpBVkZXcmFwcGVyOjpjcmVhdGVJbWFn ZUdlbmVyYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpBVkZXcmFwcGVyOjpkZXN0cm95SW1hZ2VH ZW5lcmF0b3IpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNy ZWF0ZUFWUGxheWVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9PdXRwdXQpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVz dHJveVZpZGVvT3V0cHV0KToKKwogMjAyMS0wOC0wNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBodHRwL3Rlc3RzL3ByZWxvYWQvb25sb2Fk X2V2ZW50Lmh0bWwgaXMgYSBmbGFreSB0aW1lb3V0IG9uIEJpZyBTdXIgd2sxIFJlbGVhc2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggZDMyOWYwY2NkMTE0YzBlYzY3MDJlOWE2NzE1NmU0MTMzYjUxMGE4OS4uNjk2ZDYx YWUxYTJmM2MwNGU2NWRiMjEzZDVlZmIyMmRhMDc5OWI0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NyBAQAorMjAyMS0wOC0wNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ29jb2F8R1BVXSBwbGF0Zm9ybUxheWVyKCkgbm90IGFsd2F5cyBhZGRlZCB0byByZW1v dGVkbHkgaG9zdGVkIGNvbnRleHQ7IGJsYWNrIHZpZGVvIHdoaWxlIHBsYXlpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODg3MworICAgICAgICA8 cmRhcjovLzgxMjcxMTA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEN1cnJlbnRseSwgdGhlIFJlbW90ZU1lZGlhUGxheWVyUHJveHkgd2lsbCBpbnNl cnQgaXRzIE1lZGlhUGxheWVyJ3MgcGxhdGZvcm1MYXllcigpIGludG8gdGhlCisgICAgICAgIHJl bW90ZWx5IGhvc3RlZCBjb250ZXh0IHdoZW4gaXQgcmVjZWl2ZXMgYSAiZmlyc3RWaWRlb0ZyYW1l QXZhaWxhYmxlKCkiIG5vdGlmaWNhdGlvbi4KKyAgICAgICAgSG93ZXZlciB0aGlzIGlzIHByb2Js ZW1hdGljIGZvciB0d28gcmVhc29uczogQVZQbGF5ZXJMYXllciBtYXkgbm90IGJlY29tZSAicmVh ZHkgZm9yCisgICAgICAgIHBsYXliYWNrIiB3aGVuIGl0IGlzIG5vdCBpbiBhbiBhY3RpdmUgQ0FM YXllciBoZWlyYXJjaHksIGFuZCBmb3IKKyAgICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uLCBmaXJzdFZpZGVvRnJhbWVBdmFpbGFibGUoKSBpcyBvbmx5IGZpcmVkIGR1cmluZwor ICAgICAgICB1cGRhdGVTdGF0ZXMoKSwgd2hpY2ggaXMgbm90IGd1YXJhbnRlZWQgdG8gb2NjdXIg dW5sZXNzIGFub3RoZXIgc3RhdGUgY2hhbmdlIG9jY3Vycy4KKworICAgICAgICBJbnN0ZWFkLCBy ZXBhcmVudCB0aGUgTWVkaWFQbGF5ZXIncyBwbGF0Zm9ybUxheWVyKCkgd2hlbiB3ZSByZWNlaXZl IGEKKyAgICAgICAgbWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpIG5vdGlmaWNhdGlv biwgd2hpY2ggbm90aWZpZXMgdGhlIGNsaWVudCB3aGVuZXZlciBhCisgICAgICAgIHBsYXRmb3Jt TGF5ZXIoKSBpcyBjcmVhdGVkIG9yIGRlc3Ryb3llZC4KKworICAgICAgICAqIEdQVVByb2Nlc3Mv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHA6CisgICAgICAgICogR1BVUHJvY2Vzcy9t ZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2EubW06CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVyRmlyc3RWaWRlb0ZyYW1lQXZh aWxhYmxlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQ bGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCk6CisKIDIwMjEtMDgtMDQgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBSZW1vdmUgc3VwcG9ydCBmb3Ig QVZBc3NldEltYWdlR2VuZXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCmluZGV4IDk2MzBmYTI0NmVkOTBjYzNmMTQ4ZGIz MDE1MTExNjBmNDJmOTM3NzcuLjIxOTg0Mzk3YTVlNTNlNjVjMDcwOWFjYjY0NGEyOWNiOGUzZGI5 ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb24uY3BwCkBAIC0xNDIsNyArMTQyLDI2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uOjpzZXRVcFZpZGVvUmVuZGVyaW5nKCkKIAogICAgIC8vIElmIHVzaW5nIGEg bW92aWUgbGF5ZXIsIGluZm9ybSB0aGUgY2xpZW50IHNvIHRoZSBjb21wb3NpdGluZyB0cmVlIGlz IHVwZGF0ZWQuCiAgICAgaWYgKGN1cnJlbnRNb2RlID09IE1lZGlhUmVuZGVyaW5nVG9MYXllciB8 fCBwcmVmZXJyZWRNb2RlID09IE1lZGlhUmVuZGVyaW5nVG9MYXllcikKLSAgICAgICAgbV9wbGF5 ZXItPnJlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CisgICAgICAgIHNldE5lZWRzUmVuZGVyaW5nTW9k ZUNoYW5nZWQoKTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNl dE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKQoreworICAgIGlmIChtX25lZWRzUmVuZGVyaW5n TW9kZUNoYW5nZWQpCisgICAgICAgIHJldHVybjsKKyAgICBtX25lZWRzUmVuZGVyaW5nTW9kZUNo YW5nZWQgPSB0cnVlOworCisgICAgcXVldWVUYXNrT25FdmVudExvb3AoW3dlYWtUaGlzID0gbWFr ZVdlYWtQdHIoKnRoaXMpXSB7CisgICAgICAgIGlmICh3ZWFrVGhpcykKKyAgICAgICAgICAgIHdl YWtUaGlzLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworICAgIH0pOworfQorCit2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6cmVuZGVyaW5nTW9kZUNoYW5nZWQoKQoreworICAg IEFTU0VSVChtX25lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQpOworICAgIG1fbmVlZHNSZW5kZXJp bmdNb2RlQ2hhbmdlZCA9IGZhbHNlOworICAgIG1fcGxheWVyLT5yZW5kZXJpbmdNb2RlQ2hhbmdl ZCgpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6dGVhckRvd25W aWRlb1JlbmRlcmluZygpCkBAIC00NDMsNyArNDYyLDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb246OnByZXBhcmVGb3JSZW5kZXJpbmcoKQogICAgIHNldFVwVmlkZW9SZW5k ZXJpbmcoKTsKIAogICAgIGlmIChjdXJyZW50UmVuZGVyaW5nTW9kZSgpID09IE1lZGlhUmVuZGVy aW5nVG9MYXllciB8fCBwcmVmZXJyZWRSZW5kZXJpbmdNb2RlKCkgPT0gTWVkaWFSZW5kZXJpbmdU b0xheWVyKQotICAgICAgICBtX3BsYXllci0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKKyAgICAg ICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogfQogCiBib29sIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbjo6c3VwcG9ydHNGdWxsc2NyZWVuKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAppbmRleCA0 ODIyOGJhZjNiMDIyYmZhMzQwZTRhMWZjNDBmYjFlODI5MzQ2NjZjLi5kZWFmNGJhNTc2ZDg4OTgw NWNmZTIzM2JjNGVhZDEwZGE3NWE1YTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCkBAIC0zMjAsNiArMzIwLDkgQEAgcHJvdGVj dGVkOgogICAgIHZvaWQgc2V0UmVzb2x2ZWRVUkwoVVJMJiYpOwogICAgIGNvbnN0IFVSTCYgcmVz b2x2ZWRVUkwoKSBjb25zdCB7IHJldHVybiBtX3Jlc29sdmVkVVJMOyB9CiAKKyAgICB2b2lkIHNl dE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKKyAgICB2b2lkIHJlbmRlcmluZ01vZGVDaGFu Z2VkKCk7CisKIHByaXZhdGU6CiAgICAgTWVkaWFQbGF5ZXIqIG1fcGxheWVyOwogCkBAIC0zNjgs NiArMzcxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fY2hhcmFjdGVyaXN0aWNzQ2hhbmdlZDsK ICAgICBib29sIG1fc2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbzsKICAgICBib29sIG1fc2Vla2lu ZzsKKyAgICBib29sIG1fbmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCB7IGZhbHNlIH07CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uQ0YuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAppbmRleCAxNzM5ZjUyNzNk ZmM0MDg4MmNhOTkxNmM1MDBjZDMzM2IyNDllNjJlLi43MzkxYmYxM2QxZjU3MDA4NTdiNzg5ZTg4 YmUwNjFkNWM3MmVhYmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHAKQEAgLTQ2OCw2ICs0NjgsNyBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpkZXN0cm95VmlkZW9MYXllcigp CiAgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OmRlc3Ry b3lWaWRlb0xheWVyKCVwKSAtIGRlc3Ryb3lpbmcgJXAiLCB0aGlzLCB2aWRlb0xheWVyKG1fYXZm V3JhcHBlcikpOwogICAgIGlmIChtX2F2ZldyYXBwZXIpCiAgICAgICAgIG1fYXZmV3JhcHBlci0+ ZGVzdHJveVZpZGVvTGF5ZXIoKTsKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7 CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6Omhhc0F2YWlsYWJs ZVZpZGVvRnJhbWUoKSBjb25zdApAQCAtMTk5Niw2ICsxOTk3LDcgQEAgdm9pZCBBVkZXcmFwcGVy OjpjcmVhdGVBVkNGVmlkZW9MYXllcigpCiAKICAgICAvLyBUaGUgbGF5ZXIgd2lsbCBnZXQgaG9v a2VkIHVwIHZpYSBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24oKS4KICAg ICBtX2F2Q0ZWaWRlb0xheWVyID0gYWRvcHRDRihBVkNGUGxheWVyTGF5ZXJDcmVhdGVXaXRoQVZD RlBsYXllcihrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBhdlBsYXllcigpLCBtX25vdGlmaWNhdGlvblF1 ZXVlKSk7CisgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogICAgIExPRyhNZWRp YSwgIkFWRldyYXBwZXI6OmNyZWF0ZUFWQ0ZWaWRlb0xheWVyKCVwKSAtIHJldHVybmluZyAlcCIs IHRoaXMsIHZpZGVvTGF5ZXIoKSk7CiB9CiAKQEAgLTIwNDEsNiArMjA0Myw3IEBAIHZvaWQgQVZG V3JhcHBlcjo6Y3JlYXRlSW1hZ2VHZW5lcmF0b3IoKQogICAgIEFWQ0ZBc3NldEltYWdlR2VuZXJh dG9yU2V0QXBwbGllc1ByZWZlcnJlZFRyYWNrVHJhbnNmb3JtKG1faW1hZ2VHZW5lcmF0b3IuZ2V0 KCksIHRydWUpOwogCiAgICAgTE9HKE1lZGlhLCAiQVZGV3JhcHBlcjo6Y3JlYXRlSW1hZ2VHZW5l cmF0b3IoJXApIC0gcmV0dXJuaW5nICVwIiwgdGhpcywgbV9pbWFnZUdlbmVyYXRvci5nZXQoKSk7 CisgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogfQogCiB2b2lkIEFWRldyYXBw ZXI6OmRlc3Ryb3lJbWFnZUdlbmVyYXRvcigpCkBAIC0yMDQ5LDYgKzIwNTIsNyBAQCB2b2lkIEFW RldyYXBwZXI6OmRlc3Ryb3lJbWFnZUdlbmVyYXRvcigpCiAgICAgQVNTRVJUKGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCkgPT0gZGlzcGF0Y2hfZ2V0X2N1cnJlbnRfcXVldWUoKSk7CiAgICAgTE9H KE1lZGlhLCAiQVZGV3JhcHBlcjo6ZGVzdHJveUltYWdlR2VuZXJhdG9yKCVwKSIsIHRoaXMpOwog ICAgIG1faW1hZ2VHZW5lcmF0b3IgPSAwOworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5n ZWQoKTsKIH0KIAogUmV0YWluUHRyPENHSW1hZ2VSZWY+IEFWRldyYXBwZXI6OmNyZWF0ZUltYWdl Rm9yVGltZUluUmVjdChjb25zdCBNZWRpYVRpbWUmIHRpbWUsIGNvbnN0IEZsb2F0UmVjdCYgcmVj dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IDdmMDBjYWJkMzQxYTUxNTQzMTE3ZjU2Y2Rj MmEyOWJhZTNkOWJjZWEuLmZiM2VjMjBiM2U3MTUzMDllNmUyNTllNDA3MTExOWRhODI1OTA0OTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtNjA2LDcgKzYwNiw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9MYXllcigpCiAgICAgaWYg KCFtX2F2UGxheWVyIHx8IG1faGF2ZUJlZW5Bc2tlZFRvQ3JlYXRlTGF5ZXIpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQ dHIoKnRoaXMpXSB7CisgICAgZW5zdXJlT25NYWluVGhyZWFkKFt0aGlzLCB3ZWFrVGhpcyA9IG1h a2VXZWFrUHRyKCp0aGlzKV0gewogICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAg cmV0dXJuOwogCkBAIC02MTksOCArNjE5LDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKCkKIAogICAgICAgICBpZiAoIW1fdmlkZW9P dXRwdXQpCiAgICAgICAgICAgICBjcmVhdGVWaWRlb091dHB1dCgpOwotCi0gICAgICAgIHBsYXll cigpLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwogICAgIH0pOwogfQogCkBAIC02NDUsNiArNjQz LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVlBs YXllckxheWVyKCkKICAgICBpZiAoW21fdmlkZW9MYXllciByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKHNldFBJUE1vZGVFbmFibGVkOildKQogICAgICAgICBbbV92aWRlb0xheWVyIHNldFBJ UE1vZGVFbmFibGVkOihwbGF5ZXIoKS0+ZnVsbHNjcmVlbk1vZGUoKSAmIE1lZGlhUGxheWVyOjpW aWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSldOwogI2VuZGlmCisKKyAgICBzZXRO ZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvTGF5ZXIoKQpAQCAtNjU5LDYgKzY1OSw4IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvTGF5 ZXIoKQogICAgIG1fdmlkZW9MYXllck1hbmFnZXItPmRpZERlc3Ryb3lWaWRlb0xheWVyKCk7CiAK ICAgICBtX3ZpZGVvTGF5ZXIgPSBuaWw7CisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFu Z2VkKCk7CiB9CiAKIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD OjpnZXRTdGFydERhdGUoKSBjb25zdApAQCAtMjQzMiw2ICsyNDM0LDggQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb091dHB1dCgpCiAgICAgW21f dmlkZW9PdXRwdXQgc2V0RGVsZWdhdGU6bV92aWRlb091dHB1dERlbGVnYXRlLmdldCgpIHF1ZXVl Omdsb2JhbFB1bGxEZWxlZ2F0ZVF1ZXVlKCldOwogCiAgICAgW21fYXZQbGF5ZXJJdGVtLmdldCgp IGFkZE91dHB1dDptX3ZpZGVvT3V0cHV0LmdldCgpXTsKKworICAgIHNldE5lZWRzUmVuZGVyaW5n TW9kZUNoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpkZXN0cm95VmlkZW9PdXRwdXQoKQpAQCAtMjQ0NSw2ICsyNDQ5LDggQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0cm95VmlkZW9PdXRwdXQoKQogICAg IElORk9fTE9HKExPR0lERU5USUZJRVIpOwogCiAgICAgbV92aWRlb091dHB1dCA9IDA7CisKKyAg ICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dXBkYXRlTGFzdFBpeGVsQnVmZmVyKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclBy b3h5LmNwcAppbmRleCBkZDRhY2RkZGI0ZmY3NzViNGQxMmZjZjU2MzE0M2Q1MmQ0ZDEwMDNmLi4w Y2VkNjc1OWMwZGU3YTc3OTc3NGIyNzRiM2FjNzIwM2JiZDNjZGQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHku Y3BwCkBAIC01MTgsMTAgKzUxOCwxMiBAQCBib29sIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1l ZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpCiAgICAgcmV0dXJuIG1fcmVuZGVy aW5nQ2FuQmVBY2NlbGVyYXRlZDsKIH0KIAorI2lmICFQTEFURk9STShDT0NPQSkKIHZvaWQgUmVt b3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpCiB7 CiAgICAgbV93ZWJQcm9jZXNzQ29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlOjpSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpLCBtX2lkKTsKIH0KKyNlbmRpZgog CiBUcmFja1ByaXZhdGVSZW1vdGVJZGVudGlmaWVyIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OmFk ZFJlbW90ZUF1ZGlvVHJhY2tQcm94eShXZWJDb3JlOjpBdWRpb1RyYWNrUHJpdmF0ZSYgdHJhY2sp CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVt b3RlTWVkaWFQbGF5ZXJQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21l ZGlhL2NvY29hL1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb2NvYS5tbQppbmRleCA0ODI4NWE4MGJi ZDc1OTQ5YmExNTMxMmEwMjgxZDQxOWQ3ZGI1ODk1Li4wNTI2NDI0ZWYzOWEzMmY3YmUwNjViYmMy NzcxNGM1NjgxNDc0ZTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVk aWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2EubW0K QEAgLTY2LDExICs2NiwxNSBAQCB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVG b3JQbGF5YmFjayhib29sIHByaXZhdGVNb2RlLCBXZWJDb3JlOjpNZWRpYQogdm9pZCBSZW1vdGVN ZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllckZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpCiB7 CiAgICAgLy8gSW5pdGlhbGx5IHRoZSBzaXplIG9mIHRoZSBwbGF0Zm9ybUxheWVyIG1heSBiZSAw eDAgYmVjYXVzZSB3ZSBkbyBub3QgcHJvdmlkZSBtZWRpYVBsYXllckNvbnRlbnRCb3hSZWN0KCkg aW4gdGhpcyBjbGFzcy4KLSAgICBtX2lubGluZUxheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RM YXllcihtX3BsYXllci0+cGxhdGZvcm1MYXllcigpKTsKICAgICBzZXRWaWRlb0lubGluZVNpemVJ ZlBvc3NpYmxlKCptX2lubGluZUxheWVySG9zdGluZ0NvbnRleHQsIG1fdmlkZW9JbmxpbmVTaXpl KTsKICAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXll clByaXZhdGVSZW1vdGU6OkZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpLCBtX2lkKTsKIH0KIAor dm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFu Z2VkKCkKK3sKKyAgICBtX2lubGluZUxheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllciht X3BsYXllci0+cGxhdGZvcm1MYXllcigpKTsKKyAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5z ZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OlJlbmRlcmluZ01vZGVDaGFu Z2VkKCksIG1faWQpOworfQogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpzZXRWaWRlb0lu bGluZVNpemVGZW5jZWQoY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBzaXplLCBjb25zdCBXVEY6 Ok1hY2hTZW5kUmlnaHQmIG1hY2hTZW5kUmlnaHQpCiB7CiAgICAgbV9pbmxpbmVMYXllckhvc3Rp bmdDb250ZXh0LT5zZXRGZW5jZVBvcnQobWFjaFNlbmRSaWdodC5zZW5kUmlnaHQoKSk7Cg== 435154 2021-08-08 13:54:12 -0700 2021-08-08 14:21:58 -0700 Patch for landing bug-228873-20210808135411.patch text/plain 29528 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMyYjI5ZmMzMjYwMWEz NDBkNGM3NWRjYmVmZjU2NGJiODU1MzMwOS4uYjI3NzFhY2RjZmY4Yjg3NDgyMzM0M2VmNGNmYzgx ODQ3MzJhZjBiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEwNyBAQAorMjAyMS0wOC0wNiAgSmVy IE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2F8R1BVXSBwbGF0 Zm9ybUxheWVyKCkgbm90IGFsd2F5cyBhZGRlZCB0byByZW1vdGVkbHkgaG9zdGVkIGNvbnRleHQ7 IGJsYWNrIHZpZGVvIHdoaWxlIHBsYXlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyODg3MworICAgICAgICA8cmRhcjovLzgxMjcxMTA3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBDb2FsZXNjZSBjYWxs cyB0byByZW5kZXJpbmdNb2RlQ2hhbmdlZCgpIGJ5IHNldHRpbmcgYSBmbGFnIHRvIGNhbGwgcmVu ZGVyaW5nTW9kZUNoYW5nZWQoKSBpbgorICAgICAgICB0aGUgbmV4dCBydW4gbG9vcCwgYW5kIGNh bGwgaW50byB0aGlzIGNvYWxlc2NpbmcgbWV0aG9kLCBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFu Z2VkKCksCisgICAgICAgIHdoZW5ldmVyIHRoZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24gc3ViY2xhc3NlcyBjcmVhdGUgb3IgZGVzdHJveSBhIHZpZGVvIGxheWVyCisgICAgICAgIG9y IHNvZnR3YXJlIHBhaW50aW5nIGNvbnRleHQuIFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBNZWRpYVBs YXllckNsaWVudCBpcyBhbHdheXMgbm90aWZpZWQKKyAgICAgICAgd2hlbiB0aGUgcmVuZGVyaW5n IG1vZGUgY2hhbmdlcywgcmVnYXJkbGVzcyBvZiB3aHkgdGhhdCBjaGFuZ2Ugb2NjdXJyZWQuCisK KyAgICAgICAgRHJpdmUtYnkgZml4OiByZXBsYWNlIHRoZSBjYWxsIGluIGNyZWF0ZVZpZGVvTGF5 ZXIoKSB0byAiY2FsbE9uTWFpblRocmVhZCgpIgorICAgICAgICB3aXRoICJlbnN1cmVPbk1haW5U aHJlYWQoKSIuIFRoZSBjYWxsIHRvICJjYWxsT25NYWluVGhyZWFkKCkiIHdhcyBhZGRlZCB0byBh dm9pZCBhCisgICAgICAgIGRlYWRsb2NrIGluIFdlYktpdExlZ2FjeSwgYW5kICJlbnN1cmVPbk1h aW5UaHJlYWQoKSIgaGFzIHRoZSBjb3JyZWN0IGJlaGF2aW9yIHRoZXJlLCBidXQKKyAgICAgICAg d2lsbCBiZSBzeW5jaHJvbm91cyBpbiBXZWJLaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0VXBWaWRl b1JlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb246OnNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpyZW5kZXJpbmdNb2RlQ2hhbmdlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnByZXBhcmVG b3JSZW5kZXJpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OmRl c3Ryb3lWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFWRldyYXBwZXI6OmNyZWF0ZUFW Q0ZWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFWRldyYXBwZXI6OmNyZWF0ZUltYWdl R2VuZXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkFWRldyYXBwZXI6OmRlc3Ryb3lJbWFnZUdl bmVyYXRvcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3Jl YXRlQVZQbGF5ZXJMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpkZXN0cm95VmlkZW9MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb091dHB1dCk6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0 cm95VmlkZW9PdXRwdXQpOgorCisyMDIxLTA4LTA1ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBw bGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IGh0dHAvdGVzdHMvcHJlbG9hZC9vbmxvYWRf ZXZlbnQuaHRtbCBpcyBhIGZsYWt5IHRpbWVvdXQgb24gQmlnIFN1ciB3azEgUmVsZWFzZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MzY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS83OTczMzI4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBRdWVyeWluZyBmb3IgYW55IHN0YXRlIG9uIGFuIEFWQXNz ZXQgYmVmb3JlIGl0cyBmdWxseSBsb2FkZWQgd2lsbCBjYXVzZSBBVkZvdW5kYXRpb24gdG8gYmxv Y2sKKyAgICAgICAgb24gbmV0d29ya2luZyB0byBmdWxmaWxsIHRoZSByZXF1ZXN0LCBhbmQgaW4g dGhlIGNhc2Ugd2hlcmUgV2ViS2l0IGhhbmRsZXMgbG9hZGluZywgd2lsbCBldmVudHVhbGx5Cisg ICAgICAgIGRpc3BhdGNoIHRvIHRoZSBtYWluIHRocmVhZCAod2hpY2ggaXMgYmxvY2tlZCkgaW4g V2ViQ29yZSBsb2FkZXIgY29kZSwgY2F1c2luZyBhIGRlYWRsb2NrLgorCisgICAgICAgIEFsd2F5 cyBndWFyZCBxdWVyaWVzIHRvIEFWQXNzZXQgd2l0aCBjaGVja3MgZm9yIHRoZSBsb2FkZWQgc3Rh dHVzIG9mIHRoZSBwcm9wZXJ0eSBiZWluZyBxdWVyaWVkLgorICAgICAgICBUbyBtYWtlIHRoaXMg ZWFzaWVyLCBhZGQgYSBuZXcgc2FmZUFWQXNzZXRUcmFja3NGb3JWaXN1YWxNZWRpYSgpIG1ldGhv ZCwgc2ltaWxhciB0byB0aGUgZXhpc3RpbmcKKyAgICAgICAgc2FmZUFWQXNzZXRUcmFja3NGb3JB dWRpYmxlTWVkaWEoKSwgd2hpY2ggY2hlY2tzIHRoZSAidHJhY2tzIiBwcm9wZXJ0eSBzdGF0dXMg YW5kIHJldHVybnMgYW4gZW1wdHkKKyAgICAgICAgYXJyYXkgaWYgdGhlIHRyYWNrcyBhcmUgbm90 IHlldCBsb2FkZWQuCisKKyAgICAgICAgR3VhcmQgYSBmZXcgbW9yZSBtZXRob2RzIGJ5IGJhaWxp bmcgZWFybHkgaWYgdGhlIEFWQXNzZXQgaXMgbm90IGZ1bGx5IGxvYWRlZC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dHJhY2tzQ2hhbmdl ZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD Ojp1cGRhdGVSb3RhdGlvblNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6cGFpbnRXaXRoVmlkZW9PdXRwdXQpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2FmZUFWQXNzZXRU cmFja3NGb3JWaXN1YWxNZWRpYSk6CisKKzIwMjEtMDgtMDQgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1vdmUgc3VwcG9ydCBmb3IgQVZBc3Nl dEltYWdlR2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjg1NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMzM2MjgwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBBIG11Y2ggbW9yZSBtaW5p bWFsIGFwcHJvYWNoIHRvIHJlbW92aW5nIHN1cHBvcnQgZm9yIEFWQXNzZXRJbWFnZUdlbmVyYXRv ci4KKworICAgICAgICBUaGUgb25seSB0aW1lIHdlIHVzZSBhbiBBVkFzc2V0SW1hZ2VHZW5lcmF0 b3IgKGFzIG9wcG9zZWQgdG8gYW4gQVZQbGF5ZXJJdGVtVmlkZW9PdXRwdXQpCisgICAgICAgIGlz IHdoZW4gdGhlIGxhdHRlciBkb2VzIG5vdCBjdXJyZW50bHkgaGF2ZSBhbiBhdmFpbGFibGUgaW1h Z2UgZW5xdWV1ZWQuIEJlY2F1c2UgcGFpbnRpbmcKKyAgICAgICAgaXMgYSBzeW5jaHJvbm91cyBv cGVyYXRpb24sIHdlIHVzZSBhIHN5bmNocm9ub3VzIEFQSSAodGhlIGdlbmVyYXRvcikgdG8gY3Jl YXRlIGFuIGltYWdlCisgICAgICAgIGZvciB0aGF0IG9wZXJhdGlvbi4gSG93ZXZlciwgdGhpcyBj YW4gY3JlYXRlIGRlYWRsb2NrcyBpZiAoZm9yIGV4YW1wbGUpIHRoZSByZXNvdXJjZSBuZWVkcwor ICAgICAgICB0byBsb2FkIGRhdGEgb24gdGhlIG1haW4gdGhyZWFkIGluIG9yZGVyIHRvIGNvbXBs ZXRlIHRoZSBwYWludGluZyBvcGVyYXRpb24uCisKKyAgICAgICAgSW5zdGVhZCwgYWxsb3cgdGhl IG1haW4gcnVubG9vcCB0byBzcGluIHdoaWxlIHdhaXRpbmcgKHVwIHRvIDFfcykgZm9yIHRoZSB2 aWRlbyBvdXRwdXQKKyAgICAgICAgdG8gcmVjZWl2ZSBhIGRlY29kZWQgZnJhbWUuCisKKyAgICAg ICAgRHJpdmUtYnkgZml4ZXM6CisgICAgICAgIC0gRG9uJ3QgY3JlYXRlIGFuIEFWUGxheWVyTGF5 ZXIgYXQgQVZQbGF5ZXItY3JlYXRpb247IHRoaXMgY2F1c2VzIHRoZSBBVlBsYXllckl0ZW1WaWRl b091dHB1dAorICAgICAgICAgIHRvIG5ldmVyIHJlY2VpdmUgYSBkZWNvZGVkIGZyYW1iZSAoYXMg dGhlIGxheWVyIGlzIG5vdCBpbiBhIENBTGF5ZXItaGVpcmFyY2h5KS4KKyAgICAgICAgLSBwcmVm ZXJyZWRSZW5kZXJpbmdNb2RlKCkgc2hvdWxkbid0IGJlICJub25lIiB3aGVuIHRoZSBwYWdlIGlz bid0IHZpc2libGUuIFdlIGFscmVhZHkKKyAgICAgICAgICBqdXN0IG1hcmsgdGhlIGxheWVyIGFz ICJoaWRkZW4iIGluIHRoYXQgY2FzZS4KKyAgICAgICAgLSBEb24ndCB0ZWFyIGRvd24gdGhlIEFW UGxheWVySXRlbVZpZGVvT3V0cHV0IHdoZW4gY3JlYXRpbmcgYW4gQVZQbGF5ZXJMYXllcjsgaXQn bGwganVzdAorICAgICAgICAgIGdldCByZS1jcmVhdGVkIGFueXdheS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u OjpwcmVmZXJyZWRSZW5kZXJpbmdNb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0VXBWaWRlb1JlbmRlcmluZyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVlBs YXllcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb091dHB1dCk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludFdp dGhWaWRlb091dHB1dCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjp3YWl0Rm9yVmlkZW9PdXRwdXRNZWRpYURhdGFXaWxsQ2hhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Om91dHB1 dE1lZGlhRGF0YVdpbGxDaGFuZ2UpOgorICAgICAgICAoLVtXZWJDb3JlQVZGUHVsbERlbGVnYXRl IG91dHB1dE1lZGlhRGF0YVdpbGxDaGFuZ2U6XSk6CisgICAgICAgICgtW1dlYkNvcmVBVkZQdWxs RGVsZWdhdGUgc2V0UGFyZW50Ol0pOgorCiAyMDIxLTA4LTAzICBSeWFuIEhhZGRhZCAgPHJ5YW5o YWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjgwNTMx IGFuZCByMjgwNTg5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwMGNiMWY1MjY4NjNmYWNkY2Q3OGE0Mjc0ODlhYzdl NGQ3ZmNjZDIzLi5mYjc4ODZkNDI5OTNjNDMzMDEyYzU3MTJiNDRmZGQ1ZjBjMTVlMTdlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIxLTA4LTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVA YXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxHUFVdIHBsYXRmb3JtTGF5ZXIoKSBub3QgYWx3 YXlzIGFkZGVkIHRvIHJlbW90ZWRseSBob3N0ZWQgY29udGV4dDsgYmxhY2sgdmlkZW8gd2hpbGUg cGxheWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI4ODczCisgICAgICAgIDxyZGFyOi8vODEyNzExMDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBDYXJsc29uLgorCisgICAgICAgIEN1cnJlbnRseSwgdGhlIFJlbW90ZU1lZGlhUGxheWVy UHJveHkgd2lsbCBpbnNlcnQgaXRzIE1lZGlhUGxheWVyJ3MgcGxhdGZvcm1MYXllcigpIGludG8g dGhlCisgICAgICAgIHJlbW90ZWx5IGhvc3RlZCBjb250ZXh0IHdoZW4gaXQgcmVjZWl2ZXMgYSAi Zmlyc3RWaWRlb0ZyYW1lQXZhaWxhYmxlKCkiIG5vdGlmaWNhdGlvbi4KKyAgICAgICAgSG93ZXZl ciB0aGlzIGlzIHByb2JsZW1hdGljIGZvciB0d28gcmVhc29uczogQVZQbGF5ZXJMYXllciBtYXkg bm90IGJlY29tZSAicmVhZHkgZm9yCisgICAgICAgIHBsYXliYWNrIiB3aGVuIGl0IGlzIG5vdCBp biBhbiBhY3RpdmUgQ0FMYXllciBoZWlyYXJjaHksIGFuZCBmb3IKKyAgICAgICAgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uLCBmaXJzdFZpZGVvRnJhbWVBdmFpbGFibGUoKSBpcyBvbmx5 IGZpcmVkIGR1cmluZworICAgICAgICB1cGRhdGVTdGF0ZXMoKSwgd2hpY2ggaXMgbm90IGd1YXJh bnRlZWQgdG8gb2NjdXIgdW5sZXNzIGFub3RoZXIgc3RhdGUgY2hhbmdlIG9jY3Vycy4KKworICAg ICAgICBJbnN0ZWFkLCByZXBhcmVudCB0aGUgTWVkaWFQbGF5ZXIncyBwbGF0Zm9ybUxheWVyKCkg d2hlbiB3ZSByZWNlaXZlIGEKKyAgICAgICAgbWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdl ZCgpIG5vdGlmaWNhdGlvbiwgd2hpY2ggbm90aWZpZXMgdGhlIGNsaWVudCB3aGVuZXZlciBhCisg ICAgICAgIHBsYXRmb3JtTGF5ZXIoKSBpcyBjcmVhdGVkIG9yIGRlc3Ryb3llZC4KKworICAgICAg ICAqIEdQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHA6CisgICAgICAg ICogR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2EubW06 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVyRmly c3RWaWRlb0ZyYW1lQXZhaWxhYmxlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5 ZXJQcm94eTo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCk6CisKKzIwMjEtMDgtMDQg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBSZW1v dmUgc3VwcG9ydCBmb3IgQVZBc3NldEltYWdlR2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzgxMzM2MjgwPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAg ICAgICBEcml2ZS1ieSBmaXg6IHdlJ3JlIHBhc3NpbmcgdGhlIHdyb25nIHZhbHVlIGludG8gYWNj ZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKSwgYW5kCisgICAgICAgIHdlJ3JlIG5vdCBz ZXR0aW5nIHRoZSBjb3JyZWN0IGluaXRpYWwgdmFsdWUgb24gTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlIGNyZWF0aW9uLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBs YXllclByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlOjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGUpOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBs YXllclByaXZhdGVSZW1vdGU6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKToKKwog MjAyMS0wOC0wMyAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI4MDUzMSBhbmQgcjI4MDU4OS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKaW5kZXgg YmJkNTYwYWQ0Y2EwMDA5MWFjMTliZDNmZWY5YWQyZmNiZWUwMDMxNi4uMjE5ODQzOTdhNWU1M2U2 NWMwNzA5YWNiNjQ0YTI5Y2I4ZTNkYjk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKQEAgLTEwNSw3ICsxMDUsNyBAQCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246Ok1lZGlhUmVuZGVyaW5nTW9kZSBNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpbwogCiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246 Ok1lZGlhUmVuZGVyaW5nTW9kZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnByZWZl cnJlZFJlbmRlcmluZ01vZGUoKSBjb25zdAogewotICAgIGlmICghbV92aXNpYmxlIHx8IGFzc2V0 U3RhdHVzKCkgPT0gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzVW5rbm93bikKKyAgICBpZiAoYXNz ZXRTdGF0dXMoKSA9PSBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNVbmtub3duKQogICAgICAgICBy ZXR1cm4gTWVkaWFSZW5kZXJpbmdOb25lOwogCiAgICAgaWYgKHN1cHBvcnRzQWNjZWxlcmF0ZWRS ZW5kZXJpbmcoKSAmJiBtX3BsYXllci0+cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpKQpAQCAt MTIyLDE4ICsxMjIsMTYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNl dFVwVmlkZW9SZW5kZXJpbmcoKQogICAgIE1lZGlhUmVuZGVyaW5nTW9kZSBjdXJyZW50TW9kZSA9 IGN1cnJlbnRSZW5kZXJpbmdNb2RlKCk7CiAgICAgTWVkaWFSZW5kZXJpbmdNb2RlIHByZWZlcnJl ZE1vZGUgPSBwcmVmZXJyZWRSZW5kZXJpbmdNb2RlKCk7CiAKLSAgICBpZiAocHJlZmVycmVkTW9k ZSA9PSBNZWRpYVJlbmRlcmluZ05vbmUpCi0gICAgICAgIHByZWZlcnJlZE1vZGUgPSBNZWRpYVJl bmRlcmluZ1RvQ29udGV4dDsKLQogICAgIGlmIChjdXJyZW50TW9kZSA9PSBwcmVmZXJyZWRNb2Rl ICYmIGN1cnJlbnRNb2RlICE9IE1lZGlhUmVuZGVyaW5nTm9uZSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgaWYgKGN1cnJlbnRNb2RlICE9IE1lZGlhUmVuZGVyaW5nTm9uZSkKLSAgICAgICAgdGVh ckRvd25WaWRlb1JlbmRlcmluZygpOwotCiAgICAgc3dpdGNoIChwcmVmZXJyZWRNb2RlKSB7CiAg ICAgY2FzZSBNZWRpYVJlbmRlcmluZ05vbmU6CisgICAgICAgIHRlYXJEb3duVmlkZW9SZW5kZXJp bmcoKTsKKyAgICAgICAgYnJlYWs7CisKICAgICBjYXNlIE1lZGlhUmVuZGVyaW5nVG9Db250ZXh0 OgorICAgICAgICBkZXN0cm95VmlkZW9MYXllcigpOwogICAgICAgICBjcmVhdGVDb250ZXh0Vmlk ZW9SZW5kZXJlcigpOwogICAgICAgICBicmVhazsKIApAQCAtMTQ0LDcgKzE0MiwyNiBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0VXBWaWRlb1JlbmRlcmluZygpCiAK ICAgICAvLyBJZiB1c2luZyBhIG1vdmllIGxheWVyLCBpbmZvcm0gdGhlIGNsaWVudCBzbyB0aGUg Y29tcG9zaXRpbmcgdHJlZSBpcyB1cGRhdGVkLgogICAgIGlmIChjdXJyZW50TW9kZSA9PSBNZWRp YVJlbmRlcmluZ1RvTGF5ZXIgfHwgcHJlZmVycmVkTW9kZSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5 ZXIpCi0gICAgICAgIG1fcGxheWVyLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworICAgICAgICBz ZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uOjpzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCkKK3sKKyAgICBp ZiAobV9uZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKQorICAgICAgICByZXR1cm47CisgICAgbV9u ZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkID0gdHJ1ZTsKKworICAgIHF1ZXVlVGFza09uRXZlbnRM b29wKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAgICBpZiAod2Vha1Ro aXMpCisgICAgICAgICAgICB3ZWFrVGhpcy0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKKyAgICB9 KTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnJlbmRlcmluZ01v ZGVDaGFuZ2VkKCkKK3sKKyAgICBBU1NFUlQobV9uZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKTsK KyAgICBtX25lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQgPSBmYWxzZTsKKyAgICBtX3BsYXllci0+ cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb246OnRlYXJEb3duVmlkZW9SZW5kZXJpbmcoKQpAQCAtNDQ1LDcgKzQ2Miw3IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpwcmVwYXJlRm9yUmVuZGVyaW5nKCkK ICAgICBzZXRVcFZpZGVvUmVuZGVyaW5nKCk7CiAKICAgICBpZiAoY3VycmVudFJlbmRlcmluZ01v ZGUoKSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIgfHwgcHJlZmVycmVkUmVuZGVyaW5nTW9kZSgp ID09IE1lZGlhUmVuZGVyaW5nVG9MYXllcikKLSAgICAgICAgbV9wbGF5ZXItPnJlbmRlcmluZ01v ZGVDaGFuZ2VkKCk7CisgICAgICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0K IAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnN1cHBvcnRzRnVsbHNjcmVl bigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uLmgKaW5kZXggNDgyMjhiYWYzYjAyMmJmYTM0MGU0YTFmYzQwZmIxZTgyOTM0NjY2 Yy4uZGVhZjRiYTU3NmQ4ODk4MDVjZmUyMzNiYzRlYWQxMGRhNzVhNWExMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaApAQCAtMzIw LDYgKzMyMCw5IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNldFJlc29sdmVkVVJMKFVSTCYmKTsK ICAgICBjb25zdCBVUkwmIHJlc29sdmVkVVJMKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvbHZlZFVS TDsgfQogCisgICAgdm9pZCBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CisgICAgdm9p ZCByZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworCiBwcml2YXRlOgogICAgIE1lZGlhUGxheWVyKiBt X3BsYXllcjsKIApAQCAtMzY4LDYgKzM3MSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2NoYXJh Y3RlcmlzdGljc0NoYW5nZWQ7CiAgICAgYm9vbCBtX3Nob3VsZE1haW50YWluQXNwZWN0UmF0aW87 CiAgICAgYm9vbCBtX3NlZWtpbmc7CisgICAgYm9vbCBtX25lZWRzUmVuZGVyaW5nTW9kZUNoYW5n ZWQgeyBmYWxzZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5j cHAKaW5kZXggMTczOWY1MjczZGZjNDA4ODJjYTk5MTZjNTAwY2QzMzNiMjQ5ZTYyZS4uYzkzNGJl NDhmNmI3MGRiZmM3Mzc0OTdmZDgzMjM0MmVhZjU0Mjg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCkBA IC00NDIsMTUgKzQ0MiwyMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNG OjpjcmVhdGVDb250ZXh0VmlkZW9SZW5kZXJlcigpCiAgICAgaWYgKGltYWdlR2VuZXJhdG9yKG1f YXZmV3JhcHBlcikpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2F2ZldyYXBwZXIpCi0g ICAgICAgIG1fYXZmV3JhcHBlci0+Y3JlYXRlSW1hZ2VHZW5lcmF0b3IoKTsKKyAgICBpZiAoIW1f YXZmV3JhcHBlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9hdmZXcmFwcGVyLT5jcmVhdGVJ bWFnZUdlbmVyYXRvcigpOworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0K IAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6ZGVzdHJveUNvbnRleHRW aWRlb1JlbmRlcmVyKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIGlmICht X2F2ZldyYXBwZXIpCi0gICAgICAgIG1fYXZmV3JhcHBlci0+ZGVzdHJveUltYWdlR2VuZXJhdG9y KCk7CisgICAgaWYgKCFtX2F2ZldyYXBwZXIpCisgICAgICAgIHJldHVybjsKKworICAgIG1fYXZm V3JhcHBlci0+ZGVzdHJveUltYWdlR2VuZXJhdG9yKCk7CisgICAgc2V0TmVlZHNSZW5kZXJpbmdN b2RlQ2hhbmdlZCgpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNG OjpjcmVhdGVWaWRlb0xheWVyKCkKQEAgLTQ1OCwxNiArNDY0LDIyIEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OmNyZWF0ZVZpZGVvTGF5ZXIoKQogICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7CiAgICAgQVNTRVJUKHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmco KSk7CiAKLSAgICBpZiAobV9hdmZXcmFwcGVyKQotICAgICAgICBtX2F2ZldyYXBwZXItPmNyZWF0 ZUFWQ0ZWaWRlb0xheWVyKCk7CisgICAgaWYgKCFtX2F2ZldyYXBwZXIpCisgICAgICAgIHJldHVy bjsKKworICAgIG1fYXZmV3JhcHBlci0+Y3JlYXRlQVZDRlZpZGVvTGF5ZXIoKTsKKyAgICBzZXRO ZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uQ0Y6OmRlc3Ryb3lWaWRlb0xheWVyKCkKIHsKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bkNGOjpkZXN0cm95VmlkZW9MYXllciglcCkgLSBkZXN0cm95aW5nICVwIiwgdGhpcywgdmlkZW9M YXllcihtX2F2ZldyYXBwZXIpKTsKLSAgICBpZiAobV9hdmZXcmFwcGVyKQotICAgICAgICBtX2F2 ZldyYXBwZXItPmRlc3Ryb3lWaWRlb0xheWVyKCk7CisgICAgaWYgKCFtX2F2ZldyYXBwZXIpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fYXZmV3JhcHBlci0+ZGVzdHJveVZpZGVvTGF5ZXIoKTsK KyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6Omhhc0F2YWlsYWJsZVZpZGVvRnJhbWUoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5oCmluZGV4IDZhODVjODQ5ZGVkMTkzMmQ1ZTZmODU2YzE4NTVhYjAx MTQ5ZmJkZWUuLjUzMmI1NDNhMjIyOThiOWM3YTNiNmJkZGM5NThmNGFlZWI3ZTJhMjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLmgKQEAgLTExNyw2ICsxMTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBv dXRwdXRPYnNjdXJlZER1ZVRvSW5zdWZmaWNpZW50RXh0ZXJuYWxQcm90ZWN0aW9uQ2hhbmdlZChi b29sKTsKIAogICAgIE1lZGlhVGltZSBjdXJyZW50TWVkaWFUaW1lKCkgY29uc3QgZmluYWw7Cisg ICAgdm9pZCBvdXRwdXRNZWRpYURhdGFXaWxsQ2hhbmdlKCk7CiAKIHByaXZhdGU6CiAjaWYgRU5B QkxFKEVOQ1JZUFRFRF9NRURJQSkKQEAgLTI3Miw2ICsyNzMsNyBAQCBwcml2YXRlOgogICAgIEFW TWVkaWFTZWxlY3Rpb25Hcm91cCAqc2FmZU1lZGlhU2VsZWN0aW9uR3JvdXBGb3JWaXN1YWxNZWRp YSgpOwogCiAgICAgTlNBcnJheSAqc2FmZUFWQXNzZXRUcmFja3NGb3JBdWRpYmxlTWVkaWEoKTsK KyAgICBOU0FycmF5ICpzYWZlQVZBc3NldFRyYWNrc0ZvclZpc3VhbE1lZGlhKCk7CiAKICNpZiBF TkFCTEUoREFUQUNVRV9WQUxVRSkKICAgICB2b2lkIHByb2Nlc3NNZXRhZGF0YVRyYWNrKCk7CkBA IC00MzUsNiArNDM3LDcgQEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIGJvb2wgbV9hbGxvd3NXaXJl bGVzc1ZpZGVvUGxheWJhY2sgeyB0cnVlIH07CiAgICAgYm9vbCBtX3Nob3VsZFBsYXlUb1BsYXli YWNrVGFyZ2V0IHsgZmFsc2UgfTsKICNlbmRpZgorICAgIGJvb2wgbV9ydW5uaW5nTW9kYWxQYWlu dCB7IGZhbHNlIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA0YTRhNmRj MjZiZWJmZWM1ZTJlNmFmZDJiMDhkMDc0NWIxODU0MTZjLi5mYjNlYzIwYjNlNzE1MzA5ZTZlMjU5 ZTQwNzExMTlkYTgyNTkwNDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTE5Niw2ICsx OTYsNyBAQCBAZW5kCiBAaW50ZXJmYWNlIFdlYkNvcmVBVkZQdWxsRGVsZWdhdGUgOiBOU09iamVj dDxBVlBsYXllckl0ZW1PdXRwdXRQdWxsRGVsZWdhdGU+IHsKICAgICBCaW5hcnlTZW1hcGhvcmUg bV9zZW1hcGhvcmU7CiB9CistIChpZClpbml0V2l0aFBsYXllcjooV2Vha1B0cjxNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDPiYmKXBsYXllcjsKIC0gKHZvaWQpb3V0cHV0TWVkaWFE YXRhV2lsbENoYW5nZTooQVZQbGF5ZXJJdGVtT3V0cHV0ICopc2VuZGVyOwogLSAodm9pZClvdXRw dXRTZXF1ZW5jZVdhc0ZsdXNoZWQ6KEFWUGxheWVySXRlbU91dHB1dCAqKW91dHB1dDsKIApAQCAt NjA1LDcgKzYwNiw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 Y3JlYXRlVmlkZW9MYXllcigpCiAgICAgaWYgKCFtX2F2UGxheWVyIHx8IG1faGF2ZUJlZW5Bc2tl ZFRvQ3JlYXRlTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQo W3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSB7CisgICAgZW5zdXJlT25NYWlu VGhyZWFkKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0gewogICAgICAgICBp ZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC02MTgsOCArNjE5LDYgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVy KCkKIAogICAgICAgICBpZiAoIW1fdmlkZW9PdXRwdXQpCiAgICAgICAgICAgICBjcmVhdGVWaWRl b091dHB1dCgpOwotCi0gICAgICAgIHBsYXllcigpLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOwog ICAgIH0pOwogfQogCkBAIC02NDQsNiArNjQzLDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVlBsYXllckxheWVyKCkKICAgICBpZiAoW21fdmlkZW9M YXllciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldFBJUE1vZGVFbmFibGVkOildKQog ICAgICAgICBbbV92aWRlb0xheWVyIHNldFBJUE1vZGVFbmFibGVkOihwbGF5ZXIoKS0+ZnVsbHNj cmVlbk1vZGUoKSAmIE1lZGlhUGxheWVyOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGlj dHVyZSldOwogI2VuZGlmCisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9 CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVv TGF5ZXIoKQpAQCAtNjU4LDYgKzY1OSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvTGF5ZXIoKQogICAgIG1fdmlkZW9MYXllck1hbmFnZXIt PmRpZERlc3Ryb3lWaWRlb0xheWVyKCk7CiAKICAgICBtX3ZpZGVvTGF5ZXIgPSBuaWw7CisKKyAg ICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIE1lZGlhVGltZSBNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpnZXRTdGFydERhdGUoKSBjb25zdApAQCAtMTA3 MCw5ICsxMDczLDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpj cmVhdGVBVlBsYXllcigpCiAjZW5kaWYKICAgICB9CiAKLSAgICBpZiAocGxheWVyKCktPmlzVmlk ZW9QbGF5ZXIoKSkKLSAgICAgICAgY3JlYXRlQVZQbGF5ZXJMYXllcigpOwotCiAgICAgaWYgKG1f YXZQbGF5ZXJJdGVtKQogICAgICAgICBzZXRBVlBsYXllckl0ZW0obV9hdlBsYXllckl0ZW0uZ2V0 KCkpOwogCkBAIC0xODAyLDE5ICsxODAyLDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dChHcmFwaGljc0NvbnQKICAg ICBzZXREZWxheUNhbGxiYWNrcyh0cnVlKTsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElP TlMKIAotICAgIC8vIENhbGxlcnMgb2YgdGhpcyB3aWxsIG9mdGVuIGNhbGwgY29weVZpZGVvVGV4 dHVyZVRvUGxhdGZvcm1UZXh0dXJlIGZpcnN0LAotICAgIC8vIHdoaWNoIGNhbGxzIHVwZGF0ZUxh c3RQaXhlbEJ1ZmZlciwgd2hpY2ggY2xlYXJzIG1fbGFzdEltYWdlIHdoZW5ldmVyIHRoZQotICAg IC8vIHZpZGVvIGRlbGl2ZXJzIGEgbmV3IGZyYW1lLiBUaGlzIGJyZWFrcyB2aWRlb091dHB1dEhh c0F2YWlsYWJsZUZyYW1lJ3MKLSAgICAvLyBzaG9ydC1jaXJjdWl0aW5nIHdoZW4gbV9sYXN0SW1h Z2UgaXMgbm9uLW51bGwsIGJ1dCB0aGUgdmlkZW8gb2Z0ZW4KLSAgICAvLyBkb2Vzbid0IGhhdmUg YSBuZXcgZnJhbWUgdG8gZGVsaXZlciBzaW5jZSB0aGUgbGFzdCB0aW1lCi0gICAgLy8gaGFzTmV3 UGl4ZWxCdWZmZXJGb3JJdGVtVGltZSB3YXMgY2FsbGVkIGFnYWluc3QgbV92aWRlb091dHB1dC4g VG8gYXZvaWQKLSAgICAvLyBjaGFuZ2luZyB0aGUgc2VtYW50aWNzIG9mIHZpZGVvT3V0cHV0SGFz QXZhaWxhYmxlRnJhbWUgaW4gd2F5cyB0aGF0IG1pZ2h0Ci0gICAgLy8gYnJlYWsgb3RoZXIgY2Fs bGVycywgbG9vayBmb3IgcHJvZHVjdGlvbiBvZiBhIHJlY2VudCBwaXhlbCBidWZmZXIgZnJvbQot ICAgIC8vIHRoZSB2aWRlbyBvdXRwdXQsIHRvby4KLSAgICBpZiAodmlkZW9PdXRwdXRIYXNBdmFp bGFibGVGcmFtZSgpIHx8IChtX3ZpZGVvT3V0cHV0ICYmIG1fbGFzdFBpeGVsQnVmZmVyKSkKLSAg ICAgICAgcGFpbnRXaXRoVmlkZW9PdXRwdXQoY29udGV4dCwgcmVjdCk7Ci0gICAgZWxzZQotICAg ICAgICBwYWludFdpdGhJbWFnZUdlbmVyYXRvcihjb250ZXh0LCByZWN0KTsKKyAgICBwYWludFdp dGhWaWRlb091dHB1dChjb250ZXh0LCByZWN0KTsKIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQ VElPTlMKICAgICBzZXREZWxheUNhbGxiYWNrcyhmYWxzZSk7CkBAIC0yMTA3LDkgKzIwOTUsOSBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnRyYWNrc0NoYW5nZWQo KQogICAgIGlmICghbV9hdlBsYXllckl0ZW0pIHsKICAgICAgICAgLy8gV2UgZG9uJ3QgaGF2ZSBh IHBsYXllciBpdGVtIHlldCwgc28gY2hlY2sgd2l0aCB0aGUgYXNzZXQgYmVjYXVzZSBzb21lIGFz c2V0cyBzdXBwb3J0IGluc3BlY3Rpb24KICAgICAgICAgLy8gcHJpb3IgdG8gYmVjb21pbmcgcmVh ZHkgdG8gcGxheS4KLSAgICAgICAgQVZBc3NldFRyYWNrKiBmaXJzdEVuYWJsZWRWaWRlb1RyYWNr ID0gZmlyc3RFbmFibGVkVHJhY2soW21fYXZBc3NldC5nZXQoKSB0cmFja3NXaXRoTWVkaWFDaGFy YWN0ZXJpc3RpYzpBVk1lZGlhQ2hhcmFjdGVyaXN0aWNWaXN1YWxdKTsKKyAgICAgICAgQVZBc3Nl dFRyYWNrKiBmaXJzdEVuYWJsZWRWaWRlb1RyYWNrID0gZmlyc3RFbmFibGVkVHJhY2soc2FmZUFW QXNzZXRUcmFja3NGb3JWaXN1YWxNZWRpYSgpKTsKICAgICAgICAgc2V0SGFzVmlkZW8oZmlyc3RF bmFibGVkVmlkZW9UcmFjayk7Ci0gICAgICAgIHNldEhhc0F1ZGlvKGZpcnN0RW5hYmxlZFRyYWNr KFttX2F2QXNzZXQuZ2V0KCkgdHJhY2tzV2l0aE1lZGlhQ2hhcmFjdGVyaXN0aWM6QVZNZWRpYUNo YXJhY3RlcmlzdGljQXVkaWJsZV0pKTsKKyAgICAgICAgc2V0SGFzQXVkaW8oZmlyc3RFbmFibGVk VHJhY2soc2FmZUFWQXNzZXRUcmFja3NGb3JBdWRpYmxlTWVkaWEoKSkpOwogICAgICAgICBhdXRv IHNpemUgPSBmaXJzdEVuYWJsZWRWaWRlb1RyYWNrID8gRmxvYXRTaXplKENHU2l6ZUFwcGx5QWZm aW5lVHJhbnNmb3JtKFtmaXJzdEVuYWJsZWRWaWRlb1RyYWNrIG5hdHVyYWxTaXplXSwgW2ZpcnN0 RW5hYmxlZFZpZGVvVHJhY2sgcHJlZmVycmVkVHJhbnNmb3JtXSkpIDogRmxvYXRTaXplKCk7CiAg ICAgICAgIC8vIEZvciB2aWRlb3Mgd2l0aCByb3RhdGlvbiB0YWcgc2V0LCB0aGUgdHJhbnNmb3Jt YXRpb24gYWJvdmUgbWlnaHQgcmV0dXJuIGEgQ0dTaXplIGluc3RhbmNlIHdpdGggbmVnYXRpdmUg d2lkdGggb3IgaGVpZ2h0LgogICAgICAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE3MjY0OC4KQEAgLTIxODgsOSArMjE3NiwxMiBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnRyYWNrc0NoYW5nZWQoKQogCiB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnVwZGF0ZVJvdGF0aW9uU2Vzc2lvbigp CiB7CisgICAgaWYgKCFtX2F2QXNzZXQgfHwgYXNzZXRTdGF0dXMoKSA8IE1lZGlhUGxheWVyQVZB c3NldFN0YXR1c0xvYWRlZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgQWZmaW5lVHJhbnNmb3Jt IGZpbmFsVHJhbnNmb3JtID0gbV9hdkFzc2V0LmdldCgpLnByZWZlcnJlZFRyYW5zZm9ybTsKICAg ICBGbG9hdFNpemUgbmF0dXJhbFNpemU7Ci0gICAgaWYgKGF1dG8qIGZpcnN0RW5hYmxlZFZpZGVv VHJhY2sgPSBmaXJzdEVuYWJsZWRUcmFjayhbbV9hdkFzc2V0LmdldCgpIHRyYWNrc1dpdGhNZWRp YUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY1Zpc3VhbF0pKSB7CisgICAgaWYg KGF1dG8qIGZpcnN0RW5hYmxlZFZpZGVvVHJhY2sgPSBmaXJzdEVuYWJsZWRUcmFjayhzYWZlQVZB c3NldFRyYWNrc0ZvclZpc3VhbE1lZGlhKCkpKSB7CiAgICAgICAgIG5hdHVyYWxTaXplID0gRmxv YXRTaXplKGZpcnN0RW5hYmxlZFZpZGVvVHJhY2submF0dXJhbFNpemUpOwogICAgICAgICBmaW5h bFRyYW5zZm9ybSAqPSBmaXJzdEVuYWJsZWRWaWRlb1RyYWNrLnByZWZlcnJlZFRyYW5zZm9ybTsK ICAgICB9CkBAIC0yNDM5LDEwICsyNDMwLDEyIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9PdXRwdXQoKQogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgbV92aWRlb091dHB1dERlbGVnYXRlID0gYWRvcHROUyhbW1dlYkNvcmVBVkZQdWxs RGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBtX3ZpZGVvT3V0cHV0RGVsZWdhdGUgPSBhZG9w dE5TKFtbV2ViQ29yZUFWRlB1bGxEZWxlZ2F0ZSBhbGxvY10gaW5pdFdpdGhQbGF5ZXI6bWFrZVdl YWtQdHIoKnRoaXMpXSk7CiAgICAgW21fdmlkZW9PdXRwdXQgc2V0RGVsZWdhdGU6bV92aWRlb091 dHB1dERlbGVnYXRlLmdldCgpIHF1ZXVlOmdsb2JhbFB1bGxEZWxlZ2F0ZVF1ZXVlKCldOwogCiAg ICAgW21fYXZQbGF5ZXJJdGVtLmdldCgpIGFkZE91dHB1dDptX3ZpZGVvT3V0cHV0LmdldCgpXTsK KworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0cm95VmlkZW9PdXRwdXQoKQpAQCAtMjQ1 Niw2ICsyNDQ5LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpk ZXN0cm95VmlkZW9PdXRwdXQoKQogICAgIElORk9fTE9HKExPR0lERU5USUZJRVIpOwogCiAgICAg bV92aWRlb091dHB1dCA9IDA7CisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7 CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dXBkYXRlTGFz dFBpeGVsQnVmZmVyKCkKQEAgLTI1MjMsMTUgKzI1MTgsMTEgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjp1cGRhdGVMYXN0SW1hZ2UoVXBkYXRlVHlwZSB0eXBlKQog CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnBhaW50V2l0aFZpZGVv T3V0cHV0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiBvdXRwdXRS ZWN0KQogewotICAgIC8vIEl0J3MgY3J1Y2lhbCB0byBub3Qgd2FpdCBzeW5jaHJvbm91c2x5IGZv ciB0aGUgbmV4dCBpbWFnZS4gVmlkZW9zIHRoYXQKLSAgICAvLyBjb21lIGRvd24gdGhpcyBwYXRo IGFyZSBwZXJmb3JtaW5nIHNsb3ctY2FzZSBzb2Z0d2FyZSB1cGxvYWRzLCBhbmQgc3VjaAotICAg IC8vIHZpZGVvcyBtYXkgbm90IHJldHVybiBtZXRhZGF0YSBpbiBhIHRpbWVseSBmYXNoaW9uLiBV c2UgdGhlIG1vc3QgcmVjZW50bHkKLSAgICAvLyBhdmFpbGFibGUgcGl4ZWwgYnVmZmVyLCBpZiBh bnkuCi0gICAgdXBkYXRlTGFzdEltYWdlKCk7CisgICAgdXBkYXRlTGFzdEltYWdlKFVwZGF0ZVR5 cGU6OlVwZGF0ZVN5bmNocm9ub3VzbHkpOwogICAgIGlmICghbV9sYXN0SW1hZ2UpCiAgICAgICAg IHJldHVybjsKIAotICAgIEFWQXNzZXRUcmFjayogZmlyc3RFbmFibGVkVmlkZW9UcmFjayA9IGZp cnN0RW5hYmxlZFRyYWNrKFttX2F2QXNzZXQuZ2V0KCkgdHJhY2tzV2l0aE1lZGlhQ2hhcmFjdGVy aXN0aWM6QVZNZWRpYUNoYXJhY3RlcmlzdGljVmlzdWFsXSk7CisgICAgQVZBc3NldFRyYWNrKiBm aXJzdEVuYWJsZWRWaWRlb1RyYWNrID0gZmlyc3RFbmFibGVkVHJhY2soc2FmZUFWQXNzZXRUcmFj a3NGb3JWaXN1YWxNZWRpYSgpKTsKICAgICBpZiAoIWZpcnN0RW5hYmxlZFZpZGVvVHJhY2spCiAg ICAgICAgIHJldHVybjsKIApAQCAtMjU2Nyw5ICsyNTU4LDI4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6d2FpdEZvclZpZGVvT3V0cHV0TWVkaWFEYXRhV2lsbENo YW5nZSgpCiAgICAgW21fdmlkZW9PdXRwdXQgcmVxdWVzdE5vdGlmaWNhdGlvbk9mTWVkaWFEYXRh Q2hhbmdlV2l0aEFkdmFuY2VJbnRlcnZhbDowXTsKIAogICAgIC8vIFdhaXQgZm9yIDEgc2Vjb25k LgotICAgIGJvb2wgc2F0aXNmaWVkID0gW21fdmlkZW9PdXRwdXREZWxlZ2F0ZSBzZW1hcGhvcmVd LndhaXRGb3IoMV9zKTsKKyAgICBNb25vdG9uaWNUaW1lIHN0YXJ0ID0gTW9ub3RvbmljVGltZTo6 bm93KCk7CisKKyAgICBSdW5Mb29wOjpUaW1lcjxNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDPiB0aW1lb3V0VGltZXIgeyBSdW5Mb29wOjptYWluKCksIFtdIHsKKyAgICAgICAgUnVu TG9vcDo6bWFpbigpLnN0b3AoKTsKKyAgICB9IH07CisgICAgdGltZW91dFRpbWVyLnN0YXJ0T25l U2hvdCgxX3MpOworCisgICAgbV9ydW5uaW5nTW9kYWxQYWludCA9IHRydWU7CisgICAgUnVuTG9v cDo6cnVuKCk7CisgICAgbV9ydW5uaW5nTW9kYWxQYWludCA9IGZhbHNlOworCisgICAgYm9vbCBz YXRpc2ZpZWQgPSB0aW1lb3V0VGltZXIuaXNBY3RpdmUoKTsKICAgICBpZiAoIXNhdGlzZmllZCkK ICAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICJ0aW1lZCBvdXQiKTsKKyAgICBlbHNl CisgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJ3YWl0aW5nIGZvciB2aWRlb091dHB1 dCB0b29rICIsIChNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0KS5zZWNvbmRzKCkpOworfQor Cit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Om91dHB1dE1lZGlhRGF0 YVdpbGxDaGFuZ2UoKQoreworICAgIGlmIChtX3J1bm5pbmdNb2RhbFBhaW50KQorICAgICAgICBS dW5Mb29wOjptYWluKCkuc3RvcCgpOwogfQogCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBURURf TUVESUEpCkBAIC0yNjk4LDYgKzI3MDgsMTcgQEAgTlNBcnJheSogTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzo6c2FmZUFWQXNzZXRUcmFja3NGb3JBdWRpYmxlTWVkaWEoKQogICAg IHJldHVybiBbbV9hdkFzc2V0IHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFD aGFyYWN0ZXJpc3RpY0F1ZGlibGVdOwogfQogCitOU0FycmF5KiBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpzYWZlQVZBc3NldFRyYWNrc0ZvclZpc3VhbE1lZGlhKCkKK3sKKyAg ICBpZiAoIW1fYXZBc3NldCkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIGlmIChbbV9hdkFz c2V0LmdldCgpIHN0YXR1c09mVmFsdWVGb3JLZXk6QCJ0cmFja3MiIGVycm9yOk5VTExdICE9IEFW S2V5VmFsdWVTdGF0dXNMb2FkZWQpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICByZXR1cm4g W21fYXZBc3NldCB0cmFja3NXaXRoTWVkaWFDaGFyYWN0ZXJpc3RpYzpBVk1lZGlhQ2hhcmFjdGVy aXN0aWNWaXN1YWxdOworfQorCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6Omhhc0xvYWRlZE1lZGlhU2VsZWN0aW9uR3JvdXBzKCkKIHsKICAgICBpZiAoIW1fYXZBc3Nl dCkKQEAgLTM4OTksMTQgKzM5MjAsMjkgQEAgLSAodm9pZClyZXNvdXJjZUxvYWRlcjooQVZBc3Nl dFJlc291cmNlTG9hZGVyICopcmVzb3VyY2VMb2FkZXIgZGlkQ2FuY2VsTG9hZGluZ1IKIAogQGVu ZAogCi1AaW1wbGVtZW50YXRpb24gV2ViQ29yZUFWRlB1bGxEZWxlZ2F0ZQorQGltcGxlbWVudGF0 aW9uIFdlYkNvcmVBVkZQdWxsRGVsZWdhdGUgeworICAgIFdlYWtQdHI8V2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQz4gX3BsYXllcjsKK30KIAogQHN5bnRoZXNpemUg c2VtYXBob3JlID0gbV9zZW1hcGhvcmU7CiAKKy0gKGlkKWluaXRXaXRoUGxheWVyOihXZWFrUHRy PE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM+JiYpcGxheWVyCit7CisgICAgc2Vs ZiA9IFtzdXBlciBpbml0XTsKKyAgICBpZiAoIXNlbGYpCisgICAgICAgIHJldHVybiBuaWw7Cisg ICAgX3BsYXllciA9IFdURk1vdmUocGxheWVyKTsKKyAgICByZXR1cm4gc2VsZjsKK30KKwogLSAo dm9pZClvdXRwdXRNZWRpYURhdGFXaWxsQ2hhbmdlOihBVlBsYXllckl0ZW1WaWRlb091dHB1dCAq KW91dHB1dAogewogICAgIFVOVVNFRF9QQVJBTShvdXRwdXQpOwogICAgIG1fc2VtYXBob3JlLnNp Z25hbCgpOworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcGxheWVyID0gX3BsYXllcl0g eworICAgICAgICBpZiAocGxheWVyKQorICAgICAgICAgICAgcGxheWVyLT5vdXRwdXRNZWRpYURh dGFXaWxsQ2hhbmdlKCk7CisgICAgfSk7CiB9CiAKIC0gKHZvaWQpb3V0cHV0U2VxdWVuY2VXYXNG bHVzaGVkOihBVlBsYXllckl0ZW1WaWRlb091dHB1dCAqKW91dHB1dApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwIGIv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3Bw CmluZGV4IGRkNGFjZGRkYjRmZjc3NWI0ZDEyZmNmNTYzMTQzZDUyZDRkMTAwM2YuLjBjZWQ2NzU5 YzBkZTdhNzc5Nzc0YjI3NGIzYWM3MjAzYmJkM2NkZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKQEAg LTUxOCwxMCArNTE4LDEyIEBAIGJvb2wgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5 ZXJSZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCkKICAgICByZXR1cm4gbV9yZW5kZXJpbmdDYW5C ZUFjY2VsZXJhdGVkOwogfQogCisjaWYgIVBMQVRGT1JNKENPQ09BKQogdm9pZCBSZW1vdGVNZWRp YVBsYXllclByb3h5OjptZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKCkKIHsKICAgICBt X3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclByaXZhdGVS ZW1vdGU6OlJlbmRlcmluZ01vZGVDaGFuZ2VkKCksIG1faWQpOwogfQorI2VuZGlmCiAKIFRyYWNr UHJpdmF0ZVJlbW90ZUlkZW50aWZpZXIgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6YWRkUmVtb3Rl QXVkaW9UcmFja1Byb3h5KFdlYkNvcmU6OkF1ZGlvVHJhY2tQcml2YXRlJiB0cmFjaykKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXll clByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5 ZXJQcm94eS5oCmluZGV4IGQyOTg1Yzc4YTE4ZGE0MDIwMzA2OTE3YTY2MGE4M2E1NjViYWVkNjcu LmNhYzRlYTUxNzAyM2U1ZTdjYmExOWFkNmNjYWEzZWRkNTgwYWU3NmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmgKKysr IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHku aApAQCAtMzUzLDcgKzM1Myw3IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV92aWRlb0NvbnRlbnRT Y2FsZSB7IDEuMCB9OwogCiAgICAgYm9vbCBtX2J1ZmZlcmVkQ2hhbmdlZCB7IHRydWUgfTsKLSAg ICBib29sIG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IHRydWUgfTsKKyAgICBib29sIG1f cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IGZhbHNlIH07CiAKICNpZiBFTkFCTEUoTEVHQUNZ X0VOQ1JZUFRFRF9NRURJQSkgJiYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKICAgICBib29sIG1f c2hvdWxkQ29udGludWVBZnRlcktleU5lZWRlZCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNv Y29hLm1tIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL2NvY29hL1JlbW90ZU1lZGlh UGxheWVyUHJveHlDb2NvYS5tbQppbmRleCA0ODI4NWE4MGJiZDc1OTQ5YmExNTMxMmEwMjgxZDQx OWQ3ZGI1ODk1Li4wNTI2NDI0ZWYzOWEzMmY3YmUwNjViYmMyNzcxNGM1NjgxNDc0ZTZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQ bGF5ZXJQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9j b2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2EubW0KQEAgLTY2LDExICs2NiwxNSBAQCB2 b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVGb3JQbGF5YmFjayhib29sIHByaXZh dGVNb2RlLCBXZWJDb3JlOjpNZWRpYQogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRp YVBsYXllckZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpCiB7CiAgICAgLy8gSW5pdGlhbGx5IHRo ZSBzaXplIG9mIHRoZSBwbGF0Zm9ybUxheWVyIG1heSBiZSAweDAgYmVjYXVzZSB3ZSBkbyBub3Qg cHJvdmlkZSBtZWRpYVBsYXllckNvbnRlbnRCb3hSZWN0KCkgaW4gdGhpcyBjbGFzcy4KLSAgICBt X2lubGluZUxheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3BsYXllci0+cGxhdGZv cm1MYXllcigpKTsKICAgICBzZXRWaWRlb0lubGluZVNpemVJZlBvc3NpYmxlKCptX2lubGluZUxh eWVySG9zdGluZ0NvbnRleHQsIG1fdmlkZW9JbmxpbmVTaXplKTsKICAgICBtX3dlYlByb2Nlc3ND b25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OkZpcnN0 VmlkZW9GcmFtZUF2YWlsYWJsZSgpLCBtX2lkKTsKIH0KIAordm9pZCBSZW1vdGVNZWRpYVBsYXll clByb3h5OjptZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKCkKK3sKKyAgICBtX2lubGlu ZUxheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3BsYXllci0+cGxhdGZvcm1MYXll cigpKTsKKyAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBs YXllclByaXZhdGVSZW1vdGU6OlJlbmRlcmluZ01vZGVDaGFuZ2VkKCksIG1faWQpOworfQogdm9p ZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpzZXRWaWRlb0lubGluZVNpemVGZW5jZWQoY29uc3Qg V2ViQ29yZTo6RmxvYXRTaXplJiBzaXplLCBjb25zdCBXVEY6Ok1hY2hTZW5kUmlnaHQmIG1hY2hT ZW5kUmlnaHQpCiB7CiAgICAgbV9pbmxpbmVMYXllckhvc3RpbmdDb250ZXh0LT5zZXRGZW5jZVBv cnQobWFjaFNlbmRSaWdodC5zZW5kUmlnaHQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5j cHAKaW5kZXggZDljNThkZThmNTdiMDRhOWJlNDYxNjNjNWQ2NTM5OGU5YjQ3NWU2My4uZTFjYzk4 Y2VkYTliNzBjZDIyZmNjYWRjMzRjYmQ4MzkwZjc3NDJhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlLmNwcApAQCAtMTE0LDYgKzExNCw4IEBAIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6 TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlKE1lZGlhUGxheWVyKiBwbGF5ZXIsIE1lZGlhUGxhCiAg ICAgLCBtX2RvY3VtZW50U2VjdXJpdHlPcmlnaW4ocGxheWVyLT5kb2N1bWVudFNlY3VyaXR5T3Jp Z2luKCkpCiB7CiAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CisKKyAgICBhY2NlbGVyYXRl ZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpOwogfQogI2VuZGlmCiAKQEAgLTQ1NSw3ICs0NTcsNyBA QCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6c3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRl cmluZygpIGNvbnN0CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6YWNjZWxlcmF0ZWRS ZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKQogewogICAgIGlmIChhdXRvIHBsYXllciA9IG1ha2VSZWZQ dHIobV9wbGF5ZXIuZ2V0KCkpKQotICAgICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6QWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQo cGxheWVyLT5zdXBwb3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkpLCBtX2lkKTsKKyAgICAgICAg Y29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6OkFjY2Vs ZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKHBsYXllci0+cmVuZGVyaW5nQ2FuQmVBY2NlbGVy YXRlZCgpKSwgbV9pZCk7CiB9CiAKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VU KQo= 435158 2021-08-08 14:25:17 -0700 2021-08-09 08:15:29 -0700 Patch for landing bug-228873-20210808142517.patch text/plain 13534 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ5N2FmOTVkYjExOTQ1 NTQxNGViNzFkMzMxMjIzNjE2MWVlYjgyYS4uYzNjMmM0NzY1M2ZiZTBmMTY3YmM0NjViYWYwMjNm NWFjYTk2NGJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTA4LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxHUFVdIHBsYXRm b3JtTGF5ZXIoKSBub3QgYWx3YXlzIGFkZGVkIHRvIHJlbW90ZWRseSBob3N0ZWQgY29udGV4dDsg YmxhY2sgdmlkZW8gd2hpbGUgcGxheWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4ODczCisgICAgICAgIDxyZGFyOi8vODEyNzExMDc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIENvYWxlc2NlIGNhbGxz IHRvIHJlbmRlcmluZ01vZGVDaGFuZ2VkKCkgYnkgc2V0dGluZyBhIGZsYWcgdG8gY2FsbCByZW5k ZXJpbmdNb2RlQ2hhbmdlZCgpIGluCisgICAgICAgIHRoZSBuZXh0IHJ1biBsb29wLCBhbmQgY2Fs bCBpbnRvIHRoaXMgY29hbGVzY2luZyBtZXRob2QsIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5n ZWQoKSwKKyAgICAgICAgd2hlbmV2ZXIgdGhlIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv biBzdWJjbGFzc2VzIGNyZWF0ZSBvciBkZXN0cm95IGEgdmlkZW8gbGF5ZXIKKyAgICAgICAgb3Ig c29mdHdhcmUgcGFpbnRpbmcgY29udGV4dC4gVGhpcyBlbnN1cmVzIHRoYXQgdGhlIE1lZGlhUGxh eWVyQ2xpZW50IGlzIGFsd2F5cyBub3RpZmllZAorICAgICAgICB3aGVuIHRoZSByZW5kZXJpbmcg bW9kZSBjaGFuZ2VzLCByZWdhcmRsZXNzIG9mIHdoeSB0aGF0IGNoYW5nZSBvY2N1cnJlZC4KKwor ICAgICAgICBEcml2ZS1ieSBmaXg6IHJlcGxhY2UgdGhlIGNhbGwgaW4gY3JlYXRlVmlkZW9MYXll cigpIHRvICJjYWxsT25NYWluVGhyZWFkKCkiCisgICAgICAgIHdpdGggImVuc3VyZU9uTWFpblRo cmVhZCgpIi4gVGhlIGNhbGwgdG8gImNhbGxPbk1haW5UaHJlYWQoKSIgd2FzIGFkZGVkIHRvIGF2 b2lkIGEKKyAgICAgICAgZGVhZGxvY2sgaW4gV2ViS2l0TGVnYWN5LCBhbmQgImVuc3VyZU9uTWFp blRocmVhZCgpIiBoYXMgdGhlIGNvcnJlY3QgYmVoYXZpb3IgdGhlcmUsIGJ1dAorICAgICAgICB3 aWxsIGJlIHN5bmNocm9ub3VzIGluIFdlYktpdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzZXRVcFZpZGVv UmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbjo6c2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnJlbmRlcmluZ01vZGVDaGFuZ2VkKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6cHJlcGFyZUZv clJlbmRlcmluZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6ZGVz dHJveVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6QVZGV3JhcHBlcjo6Y3JlYXRlQVZD RlZpZGVvTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6QVZGV3JhcHBlcjo6Y3JlYXRlSW1hZ2VH ZW5lcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6QVZGV3JhcHBlcjo6ZGVzdHJveUltYWdlR2Vu ZXJhdG9yKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9MYXllcik6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVh dGVBVlBsYXllckxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakM6OmRlc3Ryb3lWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvT3V0cHV0KToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRlc3Ry b3lWaWRlb091dHB1dCk6CisKIDIwMjEtMDgtMDUgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBs ZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogaHR0cC90ZXN0cy9wcmVsb2FkL29ubG9hZF9l dmVudC5odG1sIGlzIGEgZmxha3kgdGltZW91dCBvbiBCaWcgU3VyIHdrMSBSZWxlYXNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDQ0MWRiNDUyM2I3ZTQyODc4OTRmOTEzMTUzNmRlYWEyMGY1NDQ3NWQuLjQ5NTBlYjcw OTMyNjE1MDkxNTRhYzI2MTYxOTNhZjI4NzQ3ZjJmZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMjEtMDgtMDYgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAg ICAgW0NvY29hfEdQVV0gcGxhdGZvcm1MYXllcigpIG5vdCBhbHdheXMgYWRkZWQgdG8gcmVtb3Rl ZGx5IGhvc3RlZCBjb250ZXh0OyBibGFjayB2aWRlbyB3aGlsZSBwbGF5aW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg4NzMKKyAgICAgICAgPHJk YXI6Ly84MTI3MTEwNz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAg ICAgICAgQ3VycmVudGx5LCB0aGUgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eSB3aWxsIGluc2VydCBp dHMgTWVkaWFQbGF5ZXIncyBwbGF0Zm9ybUxheWVyKCkgaW50byB0aGUKKyAgICAgICAgcmVtb3Rl bHkgaG9zdGVkIGNvbnRleHQgd2hlbiBpdCByZWNlaXZlcyBhICJmaXJzdFZpZGVvRnJhbWVBdmFp bGFibGUoKSIgbm90aWZpY2F0aW9uLgorICAgICAgICBIb3dldmVyIHRoaXMgaXMgcHJvYmxlbWF0 aWMgZm9yIHR3byByZWFzb25zOiBBVlBsYXllckxheWVyIG1heSBub3QgYmVjb21lICJyZWFkeSBm b3IKKyAgICAgICAgcGxheWJhY2siIHdoZW4gaXQgaXMgbm90IGluIGFuIGFjdGl2ZSBDQUxheWVy IGhlaXJhcmNoeSwgYW5kIGZvcgorICAgICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24sIGZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpIGlzIG9ubHkgZmlyZWQgZHVyaW5nCisgICAg ICAgIHVwZGF0ZVN0YXRlcygpLCB3aGljaCBpcyBub3QgZ3VhcmFudGVlZCB0byBvY2N1ciB1bmxl c3MgYW5vdGhlciBzdGF0ZSBjaGFuZ2Ugb2NjdXJzLgorCisgICAgICAgIEluc3RlYWQsIHJlcGFy ZW50IHRoZSBNZWRpYVBsYXllcidzIHBsYXRmb3JtTGF5ZXIoKSB3aGVuIHdlIHJlY2VpdmUgYQor ICAgICAgICBtZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKCkgbm90aWZpY2F0aW9uLCB3 aGljaCBub3RpZmllcyB0aGUgY2xpZW50IHdoZW5ldmVyIGEKKyAgICAgICAgcGxhdGZvcm1MYXll cigpIGlzIGNyZWF0ZWQgb3IgZGVzdHJveWVkLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRp YS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcDoKKyAgICAgICAgKiBHUFVQcm9jZXNzL21lZGlh L2NvY29hL1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJGaXJzdFZpZGVvRnJhbWVBdmFpbGFi bGUpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXll clJlbmRlcmluZ01vZGVDaGFuZ2VkKToKKwogMjAyMS0wOC0wNCAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFJlbW92ZSBzdXBwb3J0IGZvciBBVkFz c2V0SW1hZ2VHZW5lcmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKaW5kZXggOTYzMGZhMjQ2ZWQ5MGNjM2YxNDhkYjMwMTUx MTE2MGY0MmY5Mzc3Ny4uMjE5ODQzOTdhNWU1M2U2NWMwNzA5YWNiNjQ0YTI5Y2I4ZTNkYjk4MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbi5jcHAKQEAgLTE0Miw3ICsxNDIsMjYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb246OnNldFVwVmlkZW9SZW5kZXJpbmcoKQogCiAgICAgLy8gSWYgdXNpbmcgYSBtb3Zp ZSBsYXllciwgaW5mb3JtIHRoZSBjbGllbnQgc28gdGhlIGNvbXBvc2l0aW5nIHRyZWUgaXMgdXBk YXRlZC4KICAgICBpZiAoY3VycmVudE1vZGUgPT0gTWVkaWFSZW5kZXJpbmdUb0xheWVyIHx8IHBy ZWZlcnJlZE1vZGUgPT0gTWVkaWFSZW5kZXJpbmdUb0xheWVyKQotICAgICAgICBtX3BsYXllci0+ cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKKyAgICAgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hh bmdlZCgpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0TmVl ZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpCit7CisgICAgaWYgKG1fbmVlZHNSZW5kZXJpbmdNb2Rl Q2hhbmdlZCkKKyAgICAgICAgcmV0dXJuOworICAgIG1fbmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdl ZCA9IHRydWU7CisKKyAgICBxdWV1ZVRhc2tPbkV2ZW50TG9vcChbd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cigqdGhpcyldIHsKKyAgICAgICAgaWYgKHdlYWtUaGlzKQorICAgICAgICAgICAgd2Vha1Ro aXMtPnJlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CisgICAgfSk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpyZW5kZXJpbmdNb2RlQ2hhbmdlZCgpCit7CisgICAgQVNT RVJUKG1fbmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCk7CisgICAgbV9uZWVkc1JlbmRlcmluZ01v ZGVDaGFuZ2VkID0gZmFsc2U7CisgICAgbV9wbGF5ZXItPnJlbmRlcmluZ01vZGVDaGFuZ2VkKCk7 CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjp0ZWFyRG93blZpZGVv UmVuZGVyaW5nKCkKQEAgLTQ0Myw3ICs0NjIsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbjo6cHJlcGFyZUZvclJlbmRlcmluZygpCiAgICAgc2V0VXBWaWRlb1JlbmRlcmlu ZygpOwogCiAgICAgaWYgKGN1cnJlbnRSZW5kZXJpbmdNb2RlKCkgPT0gTWVkaWFSZW5kZXJpbmdU b0xheWVyIHx8IHByZWZlcnJlZFJlbmRlcmluZ01vZGUoKSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5 ZXIpCi0gICAgICAgIG1fcGxheWVyLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworICAgICAgICBz ZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uOjpzdXBwb3J0c0Z1bGxzY3JlZW4oKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCmluZGV4IDQ4MjI4 YmFmM2IwMjJiZmEzNDBlNGExZmM0MGZiMWU4MjkzNDY2NmMuLmRlYWY0YmE1NzZkODg5ODA1Y2Zl MjMzYmM0ZWFkMTBkYTc1YTVhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgKQEAgLTMyMCw2ICszMjAsOSBAQCBwcm90ZWN0ZWQ6 CiAgICAgdm9pZCBzZXRSZXNvbHZlZFVSTChVUkwmJik7CiAgICAgY29uc3QgVVJMJiByZXNvbHZl ZFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRVUkw7IH0KIAorICAgIHZvaWQgc2V0TmVl ZHNSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpOworICAgIHZvaWQgcmVuZGVyaW5nTW9kZUNoYW5nZWQo KTsKKwogcHJpdmF0ZToKICAgICBNZWRpYVBsYXllciogbV9wbGF5ZXI7CiAKQEAgLTM2OCw2ICsz NzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9jaGFyYWN0ZXJpc3RpY3NDaGFuZ2VkOwogICAg IGJvb2wgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvOwogICAgIGJvb2wgbV9zZWVraW5nOwor ICAgIGJvb2wgbV9uZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkIHsgZmFsc2UgfTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25D Ri5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2Yv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCmluZGV4IDE3MzlmNTI3M2RmYzQw ODgyY2E5OTE2YzUwMGNkMzMzYjI0OWU2MmUuLmM5MzRiZTQ4ZjZiNzBkYmZjNzM3NDk3ZmQ4MzIz NDJlYWY1NDI4N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcApAQCAtNDQyLDE1ICs0NDIsMjEgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6Y3JlYXRlQ29udGV4dFZpZGVvUmVu ZGVyZXIoKQogICAgIGlmIChpbWFnZUdlbmVyYXRvcihtX2F2ZldyYXBwZXIpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBpZiAobV9hdmZXcmFwcGVyKQotICAgICAgICBtX2F2ZldyYXBwZXItPmNy ZWF0ZUltYWdlR2VuZXJhdG9yKCk7CisgICAgaWYgKCFtX2F2ZldyYXBwZXIpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fYXZmV3JhcHBlci0+Y3JlYXRlSW1hZ2VHZW5lcmF0b3IoKTsKKyAgICBz ZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uQ0Y6OmRlc3Ryb3lDb250ZXh0VmlkZW9SZW5kZXJlcigpCiB7CiAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBpZiAobV9hdmZXcmFwcGVyKQotICAgICAgICBt X2F2ZldyYXBwZXItPmRlc3Ryb3lJbWFnZUdlbmVyYXRvcigpOworICAgIGlmICghbV9hdmZXcmFw cGVyKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2F2ZldyYXBwZXItPmRlc3Ryb3lJbWFnZUdl bmVyYXRvcigpOworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0KIAogdm9p ZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6Y3JlYXRlVmlkZW9MYXllcigpCkBA IC00NTgsMTYgKzQ2NCwyMiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNG OjpjcmVhdGVWaWRlb0xheWVyKCkKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFT U0VSVChzdXBwb3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkpOwogCi0gICAgaWYgKG1fYXZmV3Jh cHBlcikKLSAgICAgICAgbV9hdmZXcmFwcGVyLT5jcmVhdGVBVkNGVmlkZW9MYXllcigpOworICAg IGlmICghbV9hdmZXcmFwcGVyKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2F2ZldyYXBwZXIt PmNyZWF0ZUFWQ0ZWaWRlb0xheWVyKCk7CisgICAgc2V0TmVlZHNSZW5kZXJpbmdNb2RlQ2hhbmdl ZCgpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpkZXN0cm95 VmlkZW9MYXllcigpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBMT0coTWVk aWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6ZGVzdHJveVZpZGVvTGF5ZXIo JXApIC0gZGVzdHJveWluZyAlcCIsIHRoaXMsIHZpZGVvTGF5ZXIobV9hdmZXcmFwcGVyKSk7Ci0g ICAgaWYgKG1fYXZmV3JhcHBlcikKLSAgICAgICAgbV9hdmZXcmFwcGVyLT5kZXN0cm95VmlkZW9M YXllcigpOworICAgIGlmICghbV9hdmZXcmFwcGVyKQorICAgICAgICByZXR1cm47CisKKyAgICBt X2F2ZldyYXBwZXItPmRlc3Ryb3lWaWRlb0xheWVyKCk7CisgICAgc2V0TmVlZHNSZW5kZXJpbmdN b2RlQ2hhbmdlZCgpOwogfQogCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNG OjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmlu ZGV4IDdmMDBjYWJkMzQxYTUxNTQzMTE3ZjU2Y2RjMmEyOWJhZTNkOWJjZWEuLmZiM2VjMjBiM2U3 MTUzMDllNmUyNTllNDA3MTExOWRhODI1OTA0OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpA QCAtNjA2LDcgKzYwNiw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6Y3JlYXRlVmlkZW9MYXllcigpCiAgICAgaWYgKCFtX2F2UGxheWVyIHx8IG1faGF2ZUJlZW5B c2tlZFRvQ3JlYXRlTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNhbGxPbk1haW5UaHJl YWQoW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSB7CisgICAgZW5zdXJlT25N YWluVGhyZWFkKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0gewogICAgICAg ICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC02MTksOCArNjE5LDYg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xh eWVyKCkKIAogICAgICAgICBpZiAoIW1fdmlkZW9PdXRwdXQpCiAgICAgICAgICAgICBjcmVhdGVW aWRlb091dHB1dCgpOwotCi0gICAgICAgIHBsYXllcigpLT5yZW5kZXJpbmdNb2RlQ2hhbmdlZCgp OwogICAgIH0pOwogfQogCkBAIC02NDUsNiArNjQzLDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVlBsYXllckxheWVyKCkKICAgICBpZiAoW21fdmlk ZW9MYXllciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldFBJUE1vZGVFbmFibGVkOild KQogICAgICAgICBbbV92aWRlb0xheWVyIHNldFBJUE1vZGVFbmFibGVkOihwbGF5ZXIoKS0+ZnVs bHNjcmVlbk1vZGUoKSAmIE1lZGlhUGxheWVyOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUlu UGljdHVyZSldOwogI2VuZGlmCisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7 CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZp ZGVvTGF5ZXIoKQpAQCAtNjU5LDYgKzY1OSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzo6ZGVzdHJveVZpZGVvTGF5ZXIoKQogICAgIG1fdmlkZW9MYXllck1hbmFn ZXItPmRpZERlc3Ryb3lWaWRlb0xheWVyKCk7CiAKICAgICBtX3ZpZGVvTGF5ZXIgPSBuaWw7CisK KyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFuZ2VkKCk7CiB9CiAKIE1lZGlhVGltZSBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpnZXRTdGFydERhdGUoKSBjb25zdApAQCAt MjQzMiw2ICsyNDM0LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD OjpjcmVhdGVWaWRlb091dHB1dCgpCiAgICAgW21fdmlkZW9PdXRwdXQgc2V0RGVsZWdhdGU6bV92 aWRlb091dHB1dERlbGVnYXRlLmdldCgpIHF1ZXVlOmdsb2JhbFB1bGxEZWxlZ2F0ZVF1ZXVlKCld OwogCiAgICAgW21fYXZQbGF5ZXJJdGVtLmdldCgpIGFkZE91dHB1dDptX3ZpZGVvT3V0cHV0Lmdl dCgpXTsKKworICAgIHNldE5lZWRzUmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0KIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0cm95VmlkZW9PdXRwdXQoKQpA QCAtMjQ0NSw2ICsyNDQ5LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpkZXN0cm95VmlkZW9PdXRwdXQoKQogICAgIElORk9fTE9HKExPR0lERU5USUZJRVIpOwog CiAgICAgbV92aWRlb091dHB1dCA9IDA7CisKKyAgICBzZXROZWVkc1JlbmRlcmluZ01vZGVDaGFu Z2VkKCk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dXBk YXRlTGFzdFBpeGVsQnVmZmVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vz cy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcAppbmRleCBkZDRhY2RkZGI0ZmY3 NzViNGQxMmZjZjU2MzE0M2Q1MmQ0ZDEwMDNmLi4wY2VkNjc1OWMwZGU3YTc3OTc3NGIyNzRiM2Fj NzIwM2JiZDNjZGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv UmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCkBAIC01MTgsMTAgKzUxOCwxMiBAQCBi b29sIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2Nl bGVyYXRlZCgpCiAgICAgcmV0dXJuIG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZDsKIH0KIAor I2lmICFQTEFURk9STShDT0NPQSkKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQ bGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZCgpCiB7CiAgICAgbV93ZWJQcm9jZXNzQ29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpSZW5kZXJpbmdNb2Rl Q2hhbmdlZCgpLCBtX2lkKTsKIH0KKyNlbmRpZgogCiBUcmFja1ByaXZhdGVSZW1vdGVJZGVudGlm aWVyIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OmFkZFJlbW90ZUF1ZGlvVHJhY2tQcm94eShXZWJD b3JlOjpBdWRpb1RyYWNrUHJpdmF0ZSYgdHJhY2spCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvY29hLm1t IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL2NvY29hL1JlbW90ZU1lZGlhUGxheWVy UHJveHlDb2NvYS5tbQppbmRleCA0ODI4NWE4MGJiZDc1OTQ5YmExNTMxMmEwMjgxZDQxOWQ3ZGI1 ODk1Li4wNTI2NDI0ZWYzOWEzMmY3YmUwNjViYmMyNzcxNGM1NjgxNDc0ZTZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5ZXJQ cm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9S ZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2EubW0KQEAgLTY2LDExICs2NiwxNSBAQCB2b2lkIFJl bW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVGb3JQbGF5YmFjayhib29sIHByaXZhdGVNb2Rl LCBXZWJDb3JlOjpNZWRpYQogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXll ckZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpCiB7CiAgICAgLy8gSW5pdGlhbGx5IHRoZSBzaXpl IG9mIHRoZSBwbGF0Zm9ybUxheWVyIG1heSBiZSAweDAgYmVjYXVzZSB3ZSBkbyBub3QgcHJvdmlk ZSBtZWRpYVBsYXllckNvbnRlbnRCb3hSZWN0KCkgaW4gdGhpcyBjbGFzcy4KLSAgICBtX2lubGlu ZUxheWVySG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3BsYXllci0+cGxhdGZvcm1MYXll cigpKTsKICAgICBzZXRWaWRlb0lubGluZVNpemVJZlBvc3NpYmxlKCptX2lubGluZUxheWVySG9z dGluZ0NvbnRleHQsIG1fdmlkZW9JbmxpbmVTaXplKTsKICAgICBtX3dlYlByb2Nlc3NDb25uZWN0 aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OkZpcnN0VmlkZW9G cmFtZUF2YWlsYWJsZSgpLCBtX2lkKTsKIH0KIAordm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5 OjptZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKCkKK3sKKyAgICBtX2lubGluZUxheWVy SG9zdGluZ0NvbnRleHQtPnNldFJvb3RMYXllcihtX3BsYXllci0+cGxhdGZvcm1MYXllcigpKTsK KyAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclBy aXZhdGVSZW1vdGU6OlJlbmRlcmluZ01vZGVDaGFuZ2VkKCksIG1faWQpOworfQogdm9pZCBSZW1v dGVNZWRpYVBsYXllclByb3h5OjpzZXRWaWRlb0lubGluZVNpemVGZW5jZWQoY29uc3QgV2ViQ29y ZTo6RmxvYXRTaXplJiBzaXplLCBjb25zdCBXVEY6Ok1hY2hTZW5kUmlnaHQmIG1hY2hTZW5kUmln aHQpCiB7CiAgICAgbV9pbmxpbmVMYXllckhvc3RpbmdDb250ZXh0LT5zZXRGZW5jZVBvcnQobWFj aFNlbmRSaWdodC5zZW5kUmlnaHQoKSk7Cg==