232797 2021-11-07 01:22:50 -0800 Use narrower types for style scope ordinal and cascade layer priority 2021-11-11 00:22:00 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232827 InRadar P2 Normal --- 232828 232930 1 koivisto koivisto commit-queue webkit-bug-importer zalan oldest_to_newest 1812467 0 koivisto 2021-11-07 01:22:50 -0800 Shrink some critical style related data structures. 1812468 1 443502 koivisto 2021-11-07 01:30:05 -0800 Created attachment 443502 Patch 1812477 2 443508 koivisto 2021-11-07 07:38:48 -0800 Created attachment 443508 Patch 1812478 3 443509 koivisto 2021-11-07 07:41:56 -0800 Created attachment 443509 Patch 1812496 4 ews-feeder 2021-11-07 10:58:19 -0800 Committed r285392 (243949@main): <https://commits.webkit.org/243949@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443509. 1812497 5 webkit-bug-importer 2021-11-07 10:59:20 -0800 <rdar://problem/85126679> 1812729 6 commit-queue 2021-11-08 11:42:14 -0800 Re-opened since this is blocked by bug 232828 1812739 7 ryanhaddad 2021-11-08 11:48:12 -0800 This change appears to have caused a layout test regression, would be good to investigate before re-landing: https://bugs.webkit.org/show_bug.cgi?id=232827 1813926 8 443915 koivisto 2021-11-10 23:07:30 -0800 Created attachment 443915 Patch for landing 1813927 9 ews-feeder 2021-11-10 23:08:31 -0800 ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. 1813928 10 443916 koivisto 2021-11-10 23:14:08 -0800 Created attachment 443916 Patch for landing 1813940 11 ews-feeder 2021-11-11 00:21:58 -0800 Committed r285622 (244123@main): <https://commits.webkit.org/244123@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443916. 443502 2021-11-07 01:30:05 -0800 2021-11-07 07:38:45 -0800 Patch bug-232797-20211107103003.patch text/plain 6234 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJjZTYzZjNiNmY1MmUz NjFlMDA1MmRlN2U2MWZiNzUwY2I3OTJmZi4uYmZlZjMxNjU4YjM5ZDg4MGY3Y2RkYzY1NzRmYTU1 MTExNWFjNmJjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgMTYgYml0IHR5cGVz IGZvciBzdHlsZSBzY29wZSBvcmRpbmFsIGFuZCBjYXNjYWRlIGxheWVyIHByaW9yaXR5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI3OTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHNocmlua3Mg Y3JpdGljYWwgRWxlbWVudFJ1bGVDb2xsZWN0b3IgZGF0YSBzdHJ1Y3R1cmVzIGxpa2UgTWF0Y2hl ZFJ1bGUuCisKKyAgICAgICAgNjRrIGxheWVycyBhbmQgc2NvcGVzIG91Z2h0IHRvIGJlIGVub3Vn aCBmb3IgYW55Ym9keS4KKworICAgICAgICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6 CisgICAgICAgICogc3R5bGUvUnVsZVNldC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1 bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IgY29uc3Qp OgorCisgICAgICAgIFVzZSB1aW50MTZfdC4KKworICAgICAgICAqIHN0eWxlL1J1bGVTZXRCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSdWxlU2V0QnVpbGRlcjo6dXBkYXRl Q2FzY2FkZUxheWVyUHJpb3JpdGllcyk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZU9yZGlu YWwuaDoKKworICAgICAgICBVc2UgaW50MTZfdC4KKwogMjAyMS0xMS0wNiAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGVlbEV2ZW50RGVsdGFGaWx0 ZXI6OnNob3VsZEFwcGx5RmlsdGVyaW5nRm9yRXZlbnQgY2FuIGJlIGEgc3RhdGljIGZ1bmN0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5o IGIvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaAppbmRleCBiODVm YzNhMzk5YjFhZGQzMDE0NzlmZjdkZTlkMjk4NGZkNDQ1OTkxLi4wOTkyODRkYjlmNGY3MDI1YTI5 YjdiNGE0OTUxZGRlNTYwOWI4NmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9F bGVtZW50UnVsZUNvbGxlY3Rvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRS dWxlQ29sbGVjdG9yLmgKQEAgLTYzLDcgKzYzLDcgQEAgc3RydWN0IE1hdGNoZWRSdWxlIHsKICAg ICBjb25zdCBSdWxlRGF0YSogcnVsZURhdGE7CiAgICAgdW5zaWduZWQgc3BlY2lmaWNpdHk7CiAg ICAgU2NvcGVPcmRpbmFsIHN0eWxlU2NvcGVPcmRpbmFsOwotICAgIHVuc2lnbmVkIGNhc2NhZGVM YXllclByaW9yaXR5OworICAgIHVpbnQxNl90IGNhc2NhZGVMYXllclByaW9yaXR5OwogfTsKIAog c3RydWN0IE1hdGNoZWRQcm9wZXJ0aWVzIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1J1bGVTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAppbmRleCBmMDRh NzIwMzAzNzY1MjFmOGIzNTY1MTA0MTBjNjJhNTA3MGYxZGYzLi5jYzFmNzE4NzBkZmM1Mzc3NTU1 M2JjMTI1MzljN2M0NGQ0YmE5NTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9S dWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCkBAIC0xMDMsOCAr MTAzLDggQEAgcHVibGljOgogICAgIGJvb2wgaGFzU2hhZG93UHNldWRvRWxlbWVudFJ1bGVzKCkg Y29uc3QgeyByZXR1cm4gIW1fc2hhZG93UHNldWRvRWxlbWVudFJ1bGVzLmlzRW1wdHkoKTsgfQog ICAgIGJvb2wgaGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hhZG93VHJlZSgpIGNv bnN0IHsgcmV0dXJuIG1faGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hhZG93VHJl ZTsgfQogCi0gICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclByaW9yaXR5Rm9y VW5sYXllcmVkID0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpOwotICAgIHVu c2lnbmVkIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yKGNvbnN0IFJ1bGVEYXRhJikgY29uc3Q7Cisg ICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVk ID0gc3RkOjpudW1lcmljX2xpbWl0czx1aW50MTZfdD46Om1heCgpOworICAgIHVpbnQxNl90IGNh c2NhZGVMYXllclByaW9yaXR5Rm9yKGNvbnN0IFJ1bGVEYXRhJikgY29uc3Q7CiAKIHByaXZhdGU6 CiAgICAgZnJpZW5kIGNsYXNzIFJ1bGVTZXRCdWlsZGVyOwpAQCAtMTMyLDExICsxMzIsMTEgQEAg cHJpdmF0ZToKICAgICBzdHJ1Y3QgQ2FzY2FkZUxheWVyIHsKICAgICAgICAgQ2FzY2FkZUxheWVy TmFtZSByZXNvbHZlZE5hbWU7CiAgICAgICAgIENhc2NhZGVMYXllcklkZW50aWZpZXIgcGFyZW50 SWRlbnRpZmllcjsKLSAgICAgICAgdW5zaWduZWQgcHJpb3JpdHkgeyAwIH07CisgICAgICAgIHVp bnQxNl90IHByaW9yaXR5IHsgMCB9OwogICAgIH07CiAgICAgQ2FzY2FkZUxheWVyJiBjYXNjYWRl TGF5ZXJGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIgaWRlbnRpZmllcikgeyBy ZXR1cm4gbV9jYXNjYWRlTGF5ZXJzW2lkZW50aWZpZXIgLSAxXTsgfQogICAgIGNvbnN0IENhc2Nh ZGVMYXllciYgY2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVy IGlkZW50aWZpZXIpIGNvbnN0IHsgcmV0dXJuIG1fY2FzY2FkZUxheWVyc1tpZGVudGlmaWVyIC0g MV07IH0KLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoQ2Fz Y2FkZUxheWVySWRlbnRpZmllcikgY29uc3Q7CisgICAgdWludDE2X3QgY2FzY2FkZUxheWVyUHJp b3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIpIGNvbnN0OwogCiAgICAg c3RydWN0IER5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMgewogICAgICAgICBWZWN0b3I8UmVmPGNvbnN0 IE1lZGlhUXVlcnlTZXQ+PiBtZWRpYVF1ZXJ5U2V0czsKQEAgLTE5MywxNCArMTkzLDE0IEBAIGlu bGluZSBjb25zdCBSdWxlU2V0OjpSdWxlRGF0YVZlY3RvciogUnVsZVNldDo6dGFnUnVsZXMoY29u c3QgQXRvbVN0cmluZyYga2V5LCBiCiAgICAgcmV0dXJuIHRhZ1J1bGVzLT5nZXQoa2V5KTsKIH0K IAotaW5saW5lIHVuc2lnbmVkIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRlbnRp ZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0CitpbmxpbmUgdWlu dDE2X3QgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVM YXllcklkZW50aWZpZXIgaWRlbnRpZmllcikgY29uc3QKIHsKICAgICBpZiAoIWlkZW50aWZpZXIp CiAgICAgICAgIHJldHVybiBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZDsKICAgICBy ZXR1cm4gY2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihpZGVudGlmaWVyKS5wcmlvcml0eTsKIH0K IAotaW5saW5lIHVuc2lnbmVkIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yKGNvbnN0 IFJ1bGVEYXRhJiBydWxlRGF0YSkgY29uc3QKK2lubGluZSB1aW50MTZfdCBSdWxlU2V0OjpjYXNj YWRlTGF5ZXJQcmlvcml0eUZvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEpIGNvbnN0CiB7CiAg ICAgaWYgKG1fY2FzY2FkZUxheWVySWRlbnRpZmllckZvclJ1bGVQb3NpdGlvbi5zaXplKCkgPD0g cnVsZURhdGEucG9zaXRpb24oKSkKICAgICAgICAgcmV0dXJuIGNhc2NhZGVMYXllclByaW9yaXR5 Rm9yVW5sYXllcmVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCmluZGV4 IDY3NTBkZGU3ZmQxZmExMWRiNmM2ZjQ0YjVlNzQwYzU3ZDZmZmI4MjQuLmY1NDkzZTdhZGNjODI2 NmQxNGY5MTg3OTFlYzFhMTRmZmQ4M2I5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1J1bGVTZXRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0 QnVpbGRlci5jcHAKQEAgLTI3MCw4ICsyNzAsMTAgQEAgdm9pZCBSdWxlU2V0QnVpbGRlcjo6dXBk YXRlQ2FzY2FkZUxheWVyUHJpb3JpdGllcygpCiAKICAgICBzdGQ6OnNvcnQobGF5ZXJzSW5Qcmlv cml0eU9yZGVyLmJlZ2luKCksIGxheWVyc0luUHJpb3JpdHlPcmRlci5lbmQoKSwgY29tcGFyZSk7 CiAKLSAgICBmb3IgKHVuc2lnbmVkIHByaW9yaXR5ID0gMDsgcHJpb3JpdHkgPCBsYXllckNvdW50 OyArK3ByaW9yaXR5KQotICAgICAgICBtX3J1bGVTZXQtPmNhc2NhZGVMYXllckZvcklkZW50aWZp ZXIobGF5ZXJzSW5Qcmlvcml0eU9yZGVyW3ByaW9yaXR5XSkucHJpb3JpdHkgPSBwcmlvcml0eTsK KyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGF5ZXJDb3VudDsgKytpKSB7CisgICAgICAg IHVpbnQxNl90IHByaW9yaXR5ID0gc3RkOjptaW48dW5zaWduZWQ+KGksIFJ1bGVTZXQ6OmNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkIC0gMSk7CisgICAgICAgIG1fcnVsZVNldC0+Y2Fz Y2FkZUxheWVyRm9ySWRlbnRpZmllcihsYXllcnNJblByaW9yaXR5T3JkZXJbaV0pLnByaW9yaXR5 ID0gcHJpb3JpdHk7CisgICAgfQogfQogCiB2b2lkIFJ1bGVTZXRCdWlsZGVyOjphZGRNdXRhdGlu Z1J1bGVzVG9SZXNvbHZlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls ZVNjb3BlT3JkaW5hbC5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZU9yZGluYWwu aAppbmRleCA5YWEzM2NjMTExNmMxMDcxNjlhYmU2OTgxNzViOTJlOGZiNDJiNDU4Li45MzRmOGUy MDA1OGIwY2Q0ZmIyZTJkNzhkZDk3M2YzYTYxOTdjMzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlU2NvcGVPcmRpbmFsLmgKQEAgLTI5LDExICsyOSwxMSBAQCBuYW1lc3BhY2UgU3R5bGUg ewogCiAvLyBUaGlzIGlzIHVzZWQgdG8gaWRlbnRpZnkgc3R5bGUgc2NvcGVzIHRoYXQgY2FuIGFm ZmVjdCBhbiBlbGVtZW50LgogLy8gU2NvcGVzIGFyZSBpbiB0cmVlLW9mLXRyZWVzIG9yZGVyLiBT dHlsZXMgZnJvbSBlYXJsaWVyIHNjb3BlcyB3aW4gb3ZlciBsYXRlciBvbmVzIChtb2R1bG8gIWlt cG9ydGFudCkuCi1lbnVtIGNsYXNzIFNjb3BlT3JkaW5hbCA6IGludCB7CitlbnVtIGNsYXNzIFNj b3BlT3JkaW5hbCA6IGludDE2X3QgewogICAgIENvbnRhaW5pbmdIb3N0ID0gLTEsIC8vIDo6cGFy dCBydWxlcyBhbmQgYXV0aG9yLWV4cG9zZWQgVUEgcHNldWRvIGNsYXNzZXMgZnJvbSB0aGUgaG9z dCB0cmVlIHNjb3BlLiBWYWx1ZXMgbGVzcyB0aGFuIENvbnRhaW5pbmdIb3N0IGluZGljYXRlIGVu Y2xvc2luZyBzY29wZXMuCiAgICAgRWxlbWVudCA9IDAsIC8vIE5vcm1hbCBydWxlcyBpbiB0aGUg c2FtZSB0cmVlIHdoZXJlIHRoZSBlbGVtZW50IGlzLgogICAgIEZpcnN0U2xvdCA9IDEsIC8vIDo6 c2xvdHRlZCBydWxlcyBpbiB0aGUgcGFyZW50J3Mgc2hhZG93IHRyZWUuIFZhbHVlcyBncmVhdGVy IHRoYW4gRmlyc3RTbG90IGluZGljYXRlIHN1YnNlcXVlbnQgc2xvdHMgaW4gdGhlIGNoYWluLgot ICAgIFNoYWRvdyA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCksIC8vIDpob3N0IHJ1 bGVzIGluIGVsZW1lbnQncyBvd24gc2hhZG93IHRyZWUuCisgICAgU2hhZG93ID0gc3RkOjpudW1l cmljX2xpbWl0czxpbnQxNl90Pjo6bWF4KCksIC8vIDpob3N0IHJ1bGVzIGluIGVsZW1lbnQncyBv d24gc2hhZG93IHRyZWUuCiB9OwogCiBpbmxpbmUgU2NvcGVPcmRpbmFsJiBvcGVyYXRvcisrKFNj b3BlT3JkaW5hbCYgb3JkaW5hbCkK 443508 2021-11-07 07:38:48 -0800 2021-11-07 07:41:52 -0800 Patch bug-232797-20211107173847.patch text/plain 8763 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJjZTYzZjNiNmY1MmUz NjFlMDA1MmRlN2U2MWZiNzUwY2I3OTJmZi4uNzllYThiMjlkNTFmNjkxZjgzYmE2OTRhMWRjOWIy MDBlMGQ5MGE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgbmFycm93ZXIgdHlw ZXMgZm9yIHN0eWxlIHNjb3BlIG9yZGluYWwgYW5kIGNhc2NhZGUgbGF5ZXIgcHJpb3JpdHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc5NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2hyaW5r cyBjcml0aWNhbCBFbGVtZW50UnVsZUNvbGxlY3RvciBkYXRhIHN0cnVjdHVyZXMgbGlrZSBNYXRj aGVkUnVsZS4KKworICAgICAgICA2NGsgbGF5ZXJzIG91Z2h0IHRvIGJlIGVub3VnaCBmb3IgYW55 Ym9keSAoYW5kIDI1NiBzY29wZXMpLgorCisgICAgICAgICogc3R5bGUvRWxlbWVudFJ1bGVDb2xs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9y OjptYXRjaFNsb3R0ZWRQc2V1ZG9FbGVtZW50UnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JT Y29wZSk6CisKKyAgICAgICAgQ2hlY2sgdGhlIHNjb3BlIGRlcHRoIGxpbWl0cy4KKworICAgICAg ICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvUnVsZVNl dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNl dDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IgY29uc3QpOgorCisgICAgICAgIEFkZCBhIHR5cGUg YWxpYXMgYW5kIG1ha2UgaXQgdWludDE2X3QuCisKKyAgICAgICAgKiBzdHlsZS9SdWxlU2V0QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldEJ1aWxkZXI6OnVwZGF0 ZUNhc2NhZGVMYXllclByaW9yaXRpZXMpOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVPcmRp bmFsLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3IrKyk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3ItLSk6CisKKyAgICAgICAgVXNlIGludDhfdC4gTm8gcmVh bGlzdGljIGNhc2UgcmVxdXJpZXMgbW9yZSB0aGFuIGEgaGFuZGZ1bC4KKwogMjAyMS0xMS0wNiAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGVlbEV2 ZW50RGVsdGFGaWx0ZXI6OnNob3VsZEFwcGx5RmlsdGVyaW5nRm9yRXZlbnQgY2FuIGJlIGEgc3Rh dGljIGZ1bmN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVs ZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rv ci5jcHAKaW5kZXggYmViODk2N2ZkYmNkZTQzMjg1NGQxNTNiYTljZTI2YzY3NzNlMzBmNi4uNjlj ZTBiYWZiMzQ3YTg0ZjUwNDdkNGRlM2I2MThiNWE2OTljMzFjYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtMjg2LDYgKzI4Niw5IEBAIHZv aWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoU2xvdHRlZFBzZXVkb0VsZW1lbnRSdWxlcygp CiAKICAgICAgICAgTWF0Y2hSZXF1ZXN0IHNjb3BlTWF0Y2hSZXF1ZXN0KCZzY29wZUF1dGhvclJ1 bGVzLCBzdHlsZVNjb3BlT3JkaW5hbCk7CiAgICAgICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9y TGlzdCgmc2NvcGVBdXRob3JSdWxlcy5zbG90dGVkUHNldWRvRWxlbWVudFJ1bGVzKCksIHNjb3Bl TWF0Y2hSZXF1ZXN0KTsKKworICAgICAgICBpZiAoc3R5bGVTY29wZU9yZGluYWwgPT0gU2NvcGVP cmRpbmFsOjpTbG90TGltaXQpCisgICAgICAgICAgICBicmVhazsKICAgICB9CiB9CiAKQEAgLTMy MCw2ICszMjMsOSBAQCB2b2lkIEVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9F bGVtZW50UnVsZXNGb3JTY29wZShjb25zdCBFbGVtZW50JiBwYQogICAgICAgICAvLyBFbGVtZW50 IG1heSBvbmx5IGJlIGV4cG9zZWQgdG8gc3R5bGluZyBmcm9tIGVuY2xvc2luZyBzY29wZXMgdmlh IGV4cG9ydHBhcnRzIGF0dHJpYnV0ZXMuCiAgICAgICAgIGlmIChlbGVtZW50ICE9ICZwYXJ0TWF0 Y2hpbmdFbGVtZW50ICYmIGVsZW1lbnQtPnNoYWRvd1Jvb3QoKS0+cGFydE1hcHBpbmdzKCkuaXNF bXB0eSgpKQogICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgaWYgKHN0eWxlU2NvcGVPcmRp bmFsID09IFNjb3BlT3JkaW5hbDo6Q29udGFpbmluZ0hvc3RMaW1pdCkKKyAgICAgICAgICAgIGJy ZWFrOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVj dG9yLmgKaW5kZXggYjg1ZmMzYTM5OWIxYWRkMzAxNDc5ZmY3ZGU5ZDI5ODRmZDQ0NTk5MS4uOTZl NDAyMGY5ODk2Mzg4YmMwNDNiYjMzZjc0MTE1MGE0ZjRiODcwNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCkBAIC02Myw3ICs2Myw3IEBAIHN0cnVjdCBN YXRjaGVkUnVsZSB7CiAgICAgY29uc3QgUnVsZURhdGEqIHJ1bGVEYXRhOwogICAgIHVuc2lnbmVk IHNwZWNpZmljaXR5OwogICAgIFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbDsKLSAgICB1 bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcnR5IGNh c2NhZGVMYXllclByaW9yaXR5OwogfTsKIAogc3RydWN0IE1hdGNoZWRQcm9wZXJ0aWVzIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaCBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1J1bGVTZXQuaAppbmRleCBmMDRhNzIwMzAzNzY1MjFmOGIzNTY1MTA0MTBjNjJhNTA3 MGYxZGYzLi40ZWRmNmMwM2I2MzdiZDc0MzRiYmE5MjQzYTliOGNmZWQ4MzJmNzYzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvUnVsZVNldC5oCkBAIC00Myw2ICs0Myw4IEBAIG5hbWVzcGFjZSBTdHlsZSB7CiBjbGFz cyBSZXNvbHZlcjsKIGNsYXNzIFJ1bGVTZXQ7CiAKK3VzaW5nIENhc2NhZGVMYXllclByaW9ydHkg PSB1aW50MTZfdDsKKwogdXNpbmcgSW52YWxpZGF0aW9uUnVsZVNldFZlY3RvciA9IFZlY3RvcjxS ZWZQdHI8Y29uc3QgUnVsZVNldD4sIDE+OwogCiBzdHJ1Y3QgRHluYW1pY01lZGlhUXVlcnlFdmFs dWF0aW9uQ2hhbmdlcyB7CkBAIC0xMDMsOCArMTA1LDggQEAgcHVibGljOgogICAgIGJvb2wgaGFz U2hhZG93UHNldWRvRWxlbWVudFJ1bGVzKCkgY29uc3QgeyByZXR1cm4gIW1fc2hhZG93UHNldWRv RWxlbWVudFJ1bGVzLmlzRW1wdHkoKTsgfQogICAgIGJvb2wgaGFzSG9zdFBzZXVkb0NsYXNzUnVs ZXNNYXRjaGluZ0luU2hhZG93VHJlZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSG9zdFBzZXVkb0Ns YXNzUnVsZXNNYXRjaGluZ0luU2hhZG93VHJlZTsgfQogCi0gICAgc3RhdGljIGNvbnN0ZXhwciBh dXRvIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkID0gc3RkOjpudW1lcmljX2xpbWl0 czx1bnNpZ25lZD46Om1heCgpOwotICAgIHVuc2lnbmVkIGNhc2NhZGVMYXllclByaW9yaXR5Rm9y KGNvbnN0IFJ1bGVEYXRhJikgY29uc3Q7CisgICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkID0gc3RkOjpudW1lcmljX2xpbWl0czxDYXNjYWRl TGF5ZXJQcmlvcnR5Pjo6bWF4KCk7CisgICAgQ2FzY2FkZUxheWVyUHJpb3J0eSBjYXNjYWRlTGF5 ZXJQcmlvcml0eUZvcihjb25zdCBSdWxlRGF0YSYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGZy aWVuZCBjbGFzcyBSdWxlU2V0QnVpbGRlcjsKQEAgLTEzMiwxMSArMTM0LDExIEBAIHByaXZhdGU6 CiAgICAgc3RydWN0IENhc2NhZGVMYXllciB7CiAgICAgICAgIENhc2NhZGVMYXllck5hbWUgcmVz b2x2ZWROYW1lOwogICAgICAgICBDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIHBhcmVudElkZW50aWZp ZXI7Ci0gICAgICAgIHVuc2lnbmVkIHByaW9yaXR5IHsgMCB9OworICAgICAgICBDYXNjYWRlTGF5 ZXJQcmlvcnR5IHByaW9yaXR5IHsgMCB9OwogICAgIH07CiAgICAgQ2FzY2FkZUxheWVyJiBjYXNj YWRlTGF5ZXJGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIgaWRlbnRpZmllcikg eyByZXR1cm4gbV9jYXNjYWRlTGF5ZXJzW2lkZW50aWZpZXIgLSAxXTsgfQogICAgIGNvbnN0IENh c2NhZGVMYXllciYgY2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlm aWVyIGlkZW50aWZpZXIpIGNvbnN0IHsgcmV0dXJuIG1fY2FzY2FkZUxheWVyc1tpZGVudGlmaWVy IC0gMV07IH0KLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIo Q2FzY2FkZUxheWVySWRlbnRpZmllcikgY29uc3Q7CisgICAgQ2FzY2FkZUxheWVyUHJpb3J0eSBj YXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllcikg Y29uc3Q7CiAKICAgICBzdHJ1Y3QgRHluYW1pY01lZGlhUXVlcnlSdWxlcyB7CiAgICAgICAgIFZl Y3RvcjxSZWY8Y29uc3QgTWVkaWFRdWVyeVNldD4+IG1lZGlhUXVlcnlTZXRzOwpAQCAtMTkzLDE0 ICsxOTUsMTQgQEAgaW5saW5lIGNvbnN0IFJ1bGVTZXQ6OlJ1bGVEYXRhVmVjdG9yKiBSdWxlU2V0 Ojp0YWdSdWxlcyhjb25zdCBBdG9tU3RyaW5nJiBrZXksIGIKICAgICByZXR1cm4gdGFnUnVsZXMt PmdldChrZXkpOwogfQogCi1pbmxpbmUgdW5zaWduZWQgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJp b3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIgaWRlbnRpZmllcikgY29u c3QKK2lubGluZSBDYXNjYWRlTGF5ZXJQcmlvcnR5IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0 CiB7CiAgICAgaWYgKCFpZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gY2FzY2FkZUxheWVyUHJp b3JpdHlGb3JVbmxheWVyZWQ7CiAgICAgcmV0dXJuIGNhc2NhZGVMYXllckZvcklkZW50aWZpZXIo aWRlbnRpZmllcikucHJpb3JpdHk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0OjpjYXNj YWRlTGF5ZXJQcmlvcml0eUZvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEpIGNvbnN0Citpbmxp bmUgQ2FzY2FkZUxheWVyUHJpb3J0eSBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcihj b25zdCBSdWxlRGF0YSYgcnVsZURhdGEpIGNvbnN0CiB7CiAgICAgaWYgKG1fY2FzY2FkZUxheWVy SWRlbnRpZmllckZvclJ1bGVQb3NpdGlvbi5zaXplKCkgPD0gcnVsZURhdGEucG9zaXRpb24oKSkK ICAgICAgICAgcmV0dXJuIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCmluZGV4IDY3NTBkZGU3ZmQxZmExMWRiNmM2 ZjQ0YjVlNzQwYzU3ZDZmZmI4MjQuLjY4NmIxYmQwOGNkYzNiMTY3MDUyOTUxNmVjNWExOGM3ZTFh OGY4NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXRCdWlsZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAKQEAgLTI3MCw4 ICsyNzAsMTAgQEAgdm9pZCBSdWxlU2V0QnVpbGRlcjo6dXBkYXRlQ2FzY2FkZUxheWVyUHJpb3Jp dGllcygpCiAKICAgICBzdGQ6OnNvcnQobGF5ZXJzSW5Qcmlvcml0eU9yZGVyLmJlZ2luKCksIGxh eWVyc0luUHJpb3JpdHlPcmRlci5lbmQoKSwgY29tcGFyZSk7CiAKLSAgICBmb3IgKHVuc2lnbmVk IHByaW9yaXR5ID0gMDsgcHJpb3JpdHkgPCBsYXllckNvdW50OyArK3ByaW9yaXR5KQotICAgICAg ICBtX3J1bGVTZXQtPmNhc2NhZGVMYXllckZvcklkZW50aWZpZXIobGF5ZXJzSW5Qcmlvcml0eU9y ZGVyW3ByaW9yaXR5XSkucHJpb3JpdHkgPSBwcmlvcml0eTsKKyAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgbGF5ZXJDb3VudDsgKytpKSB7CisgICAgICAgIENhc2NhZGVMYXllclByaW9ydHkg cHJpb3JpdHkgPSBzdGQ6Om1pbjx1bnNpZ25lZD4oaSwgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJp b3JpdHlGb3JVbmxheWVyZWQgLSAxKTsKKyAgICAgICAgbV9ydWxlU2V0LT5jYXNjYWRlTGF5ZXJG b3JJZGVudGlmaWVyKGxheWVyc0luUHJpb3JpdHlPcmRlcltpXSkucHJpb3JpdHkgPSBwcmlvcml0 eTsKKyAgICB9CiB9CiAKIHZvaWQgUnVsZVNldEJ1aWxkZXI6OmFkZE11dGF0aW5nUnVsZXNUb1Jl c29sdmVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVPcmRp bmFsLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oCmluZGV4IDlh YTMzY2MxMTE2YzEwNzE2OWFiZTY5ODE3NWI5MmU4ZmI0MmI0NTguLmIwNDVkNDdiMTcwMDUyMTA2 MGQ0ZTFkY2ZjYTA1YWNmMzRkNWVmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlU2NvcGVPcmRpbmFsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29w ZU9yZGluYWwuaApAQCAtMjksMjMgKzI5LDI1IEBAIG5hbWVzcGFjZSBTdHlsZSB7CiAKIC8vIFRo aXMgaXMgdXNlZCB0byBpZGVudGlmeSBzdHlsZSBzY29wZXMgdGhhdCBjYW4gYWZmZWN0IGFuIGVs ZW1lbnQuCiAvLyBTY29wZXMgYXJlIGluIHRyZWUtb2YtdHJlZXMgb3JkZXIuIFN0eWxlcyBmcm9t IGVhcmxpZXIgc2NvcGVzIHdpbiBvdmVyIGxhdGVyIG9uZXMgKG1vZHVsbyAhaW1wb3J0YW50KS4K LWVudW0gY2xhc3MgU2NvcGVPcmRpbmFsIDogaW50IHsKK2VudW0gY2xhc3MgU2NvcGVPcmRpbmFs IDogaW50OF90IHsKKyAgICBDb250YWluaW5nSG9zdExpbWl0ID0gc3RkOjpudW1lcmljX2xpbWl0 czxpbnQ4X3Q+OjptaW4oKSwKICAgICBDb250YWluaW5nSG9zdCA9IC0xLCAvLyA6OnBhcnQgcnVs ZXMgYW5kIGF1dGhvci1leHBvc2VkIFVBIHBzZXVkbyBjbGFzc2VzIGZyb20gdGhlIGhvc3QgdHJl ZSBzY29wZS4gVmFsdWVzIGxlc3MgdGhhbiBDb250YWluaW5nSG9zdCBpbmRpY2F0ZSBlbmNsb3Np bmcgc2NvcGVzLgogICAgIEVsZW1lbnQgPSAwLCAvLyBOb3JtYWwgcnVsZXMgaW4gdGhlIHNhbWUg dHJlZSB3aGVyZSB0aGUgZWxlbWVudCBpcy4KICAgICBGaXJzdFNsb3QgPSAxLCAvLyA6OnNsb3R0 ZWQgcnVsZXMgaW4gdGhlIHBhcmVudCdzIHNoYWRvdyB0cmVlLiBWYWx1ZXMgZ3JlYXRlciB0aGFu IEZpcnN0U2xvdCBpbmRpY2F0ZSBzdWJzZXF1ZW50IHNsb3RzIGluIHRoZSBjaGFpbi4KLSAgICBT aGFkb3cgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpLCAvLyA6aG9zdCBydWxlcyBp biBlbGVtZW50J3Mgb3duIHNoYWRvdyB0cmVlLgorICAgIFNsb3RMaW1pdCA9IHN0ZDo6bnVtZXJp Y19saW1pdHM8aW50OF90Pjo6bWF4KCkgLSAxLAorICAgIFNoYWRvdyA9IHN0ZDo6bnVtZXJpY19s aW1pdHM8aW50OF90Pjo6bWF4KCksIC8vIDpob3N0IHJ1bGVzIGluIGVsZW1lbnQncyBvd24gc2hh ZG93IHRyZWUuCiB9OwogCiBpbmxpbmUgU2NvcGVPcmRpbmFsJiBvcGVyYXRvcisrKFNjb3BlT3Jk aW5hbCYgb3JkaW5hbCkKIHsKLSAgICBBU1NFUlQob3JkaW5hbCA8IFNjb3BlT3JkaW5hbDo6U2hh ZG93KTsKLSAgICByZXR1cm4gb3JkaW5hbCA9IHN0YXRpY19jYXN0PFNjb3BlT3JkaW5hbD4oc3Rh dGljX2Nhc3Q8aW50PihvcmRpbmFsKSArIDEpOworICAgIEFTU0VSVChvcmRpbmFsIDwgU2NvcGVP cmRpbmFsOjpTbG90TGltaXQpOworICAgIHJldHVybiBvcmRpbmFsID0gc3RhdGljX2Nhc3Q8U2Nv cGVPcmRpbmFsPihzdGF0aWNfY2FzdDxpbnQ4X3Q+KG9yZGluYWwpICsgMSk7CiB9CiAKIGlubGlu ZSBTY29wZU9yZGluYWwmIG9wZXJhdG9yLS0oU2NvcGVPcmRpbmFsJiBvcmRpbmFsKQogewotICAg IEFTU0VSVChvcmRpbmFsIDwgU2NvcGVPcmRpbmFsOjpTaGFkb3cpOwotICAgIHJldHVybiBvcmRp bmFsID0gc3RhdGljX2Nhc3Q8U2NvcGVPcmRpbmFsPihzdGF0aWNfY2FzdDxpbnQ+KG9yZGluYWwp IC0gMSk7CisgICAgQVNTRVJUKG9yZGluYWwgPiBTY29wZU9yZGluYWw6OkNvbnRhaW5pbmdIb3N0 TGltaXQpOworICAgIHJldHVybiBvcmRpbmFsID0gc3RhdGljX2Nhc3Q8U2NvcGVPcmRpbmFsPihz dGF0aWNfY2FzdDxpbnQ4X3Q+KG9yZGluYWwpIC0gMSk7CiB9CiAKIH0K 443509 2021-11-07 07:41:56 -0800 2021-11-10 23:07:24 -0800 Patch bug-232797-20211107174154.patch text/plain 8756 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJjZTYzZjNiNmY1MmUz NjFlMDA1MmRlN2U2MWZiNzUwY2I3OTJmZi4uY2Y1NjJjNzI1OGEzMWYwMTU3ZGMyY2MxZDIyMDQ5 ZjIyMjEyNmIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgbmFycm93ZXIgdHlw ZXMgZm9yIHN0eWxlIHNjb3BlIG9yZGluYWwgYW5kIGNhc2NhZGUgbGF5ZXIgcHJpb3JpdHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc5NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2hyaW5r cyBjcml0aWNhbCBFbGVtZW50UnVsZUNvbGxlY3RvciBkYXRhIHN0cnVjdHVyZXMgbGlrZSBNYXRj aGVkUnVsZS4KKworICAgICAgICA2NGsgbGF5ZXJzIG91Z2h0IHRvIGJlIGVub3VnaCBmb3IgYW55 Ym9keSAoYW5kIDI1NiBzY29wZXMpLgorCisgICAgICAgICogc3R5bGUvRWxlbWVudFJ1bGVDb2xs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9y OjptYXRjaFNsb3R0ZWRQc2V1ZG9FbGVtZW50UnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JT Y29wZSk6CisKKyAgICAgICAgQ2hlY2sgdGhlIHNjb3BlIGRlcHRoIGxpbWl0cy4KKworICAgICAg ICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvUnVsZVNl dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNl dDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IgY29uc3QpOgorCisgICAgICAgIEFkZCBhIHR5cGUg YWxpYXMgYW5kIG1ha2UgaXQgdWludDE2X3QuCisKKyAgICAgICAgKiBzdHlsZS9SdWxlU2V0QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldEJ1aWxkZXI6OnVwZGF0 ZUNhc2NhZGVMYXllclByaW9yaXRpZXMpOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVPcmRp bmFsLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3IrKyk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3ItLSk6CisKKyAgICAgICAgVXNlIGludDhfdC4gTm8gcmVh bGlzdGljIGNhc2UgcmVxdWlyZXMgbW9yZSB0aGFuIGEgaGFuZGZ1bC4KKwogMjAyMS0xMS0wNiAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGVlbEV2 ZW50RGVsdGFGaWx0ZXI6OnNob3VsZEFwcGx5RmlsdGVyaW5nRm9yRXZlbnQgY2FuIGJlIGEgc3Rh dGljIGZ1bmN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVs ZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rv ci5jcHAKaW5kZXggYmViODk2N2ZkYmNkZTQzMjg1NGQxNTNiYTljZTI2YzY3NzNlMzBmNi4uNjlj ZTBiYWZiMzQ3YTg0ZjUwNDdkNGRlM2I2MThiNWE2OTljMzFjYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtMjg2LDYgKzI4Niw5IEBAIHZv aWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoU2xvdHRlZFBzZXVkb0VsZW1lbnRSdWxlcygp CiAKICAgICAgICAgTWF0Y2hSZXF1ZXN0IHNjb3BlTWF0Y2hSZXF1ZXN0KCZzY29wZUF1dGhvclJ1 bGVzLCBzdHlsZVNjb3BlT3JkaW5hbCk7CiAgICAgICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9y TGlzdCgmc2NvcGVBdXRob3JSdWxlcy5zbG90dGVkUHNldWRvRWxlbWVudFJ1bGVzKCksIHNjb3Bl TWF0Y2hSZXF1ZXN0KTsKKworICAgICAgICBpZiAoc3R5bGVTY29wZU9yZGluYWwgPT0gU2NvcGVP cmRpbmFsOjpTbG90TGltaXQpCisgICAgICAgICAgICBicmVhazsKICAgICB9CiB9CiAKQEAgLTMy MCw2ICszMjMsOSBAQCB2b2lkIEVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9F bGVtZW50UnVsZXNGb3JTY29wZShjb25zdCBFbGVtZW50JiBwYQogICAgICAgICAvLyBFbGVtZW50 IG1heSBvbmx5IGJlIGV4cG9zZWQgdG8gc3R5bGluZyBmcm9tIGVuY2xvc2luZyBzY29wZXMgdmlh IGV4cG9ydHBhcnRzIGF0dHJpYnV0ZXMuCiAgICAgICAgIGlmIChlbGVtZW50ICE9ICZwYXJ0TWF0 Y2hpbmdFbGVtZW50ICYmIGVsZW1lbnQtPnNoYWRvd1Jvb3QoKS0+cGFydE1hcHBpbmdzKCkuaXNF bXB0eSgpKQogICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgaWYgKHN0eWxlU2NvcGVPcmRp bmFsID09IFNjb3BlT3JkaW5hbDo6Q29udGFpbmluZ0hvc3RMaW1pdCkKKyAgICAgICAgICAgIGJy ZWFrOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVj dG9yLmgKaW5kZXggYjg1ZmMzYTM5OWIxYWRkMzAxNDc5ZmY3ZGU5ZDI5ODRmZDQ0NTk5MS4uYTJi MjI1NWEwM2FiNzNmZmFiNTU2ZmQ5NjAxMzViN2M5ZGFkN2NmMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCkBAIC02Myw3ICs2Myw3IEBAIHN0cnVjdCBN YXRjaGVkUnVsZSB7CiAgICAgY29uc3QgUnVsZURhdGEqIHJ1bGVEYXRhOwogICAgIHVuc2lnbmVk IHNwZWNpZmljaXR5OwogICAgIFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbDsKLSAgICB1 bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBj YXNjYWRlTGF5ZXJQcmlvcml0eTsKIH07CiAKIHN0cnVjdCBNYXRjaGVkUHJvcGVydGllcyB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmggYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9SdWxlU2V0LmgKaW5kZXggZjA0YTcyMDMwMzc2NTIxZjhiMzU2NTEwNDEwYzYyYTUw NzBmMWRmMy4uZjgxMjY3ZTllYWJlNDg4ZTliZDIwMDUzZTQ0NmJkOWM4NTIwY2VlYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1J1bGVTZXQuaApAQCAtNDMsNiArNDMsOCBAQCBuYW1lc3BhY2UgU3R5bGUgewogY2xh c3MgUmVzb2x2ZXI7CiBjbGFzcyBSdWxlU2V0OwogCit1c2luZyBDYXNjYWRlTGF5ZXJQcmlvcml0 eSA9IHVpbnQxNl90OworCiB1c2luZyBJbnZhbGlkYXRpb25SdWxlU2V0VmVjdG9yID0gVmVjdG9y PFJlZlB0cjxjb25zdCBSdWxlU2V0PiwgMT47CiAKIHN0cnVjdCBEeW5hbWljTWVkaWFRdWVyeUV2 YWx1YXRpb25DaGFuZ2VzIHsKQEAgLTEwMyw4ICsxMDUsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBo YXNTaGFkb3dQc2V1ZG9FbGVtZW50UnVsZXMoKSBjb25zdCB7IHJldHVybiAhbV9zaGFkb3dQc2V1 ZG9FbGVtZW50UnVsZXMuaXNFbXB0eSgpOyB9CiAgICAgYm9vbCBoYXNIb3N0UHNldWRvQ2xhc3NS dWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlKCkgY29uc3QgeyByZXR1cm4gbV9oYXNIb3N0UHNldWRv Q2xhc3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlOyB9CiAKLSAgICBzdGF0aWMgY29uc3RleHBy IGF1dG8gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQgPSBzdGQ6Om51bWVyaWNfbGlt aXRzPHVuc2lnbmVkPjo6bWF4KCk7Ci0gICAgdW5zaWduZWQgY2FzY2FkZUxheWVyUHJpb3JpdHlG b3IoY29uc3QgUnVsZURhdGEmKSBjb25zdDsKKyAgICBzdGF0aWMgY29uc3RleHByIGF1dG8gY2Fz Y2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPENhc2Nh ZGVMYXllclByaW9yaXR5Pjo6bWF4KCk7CisgICAgQ2FzY2FkZUxheWVyUHJpb3JpdHkgY2FzY2Fk ZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVsZURhdGEmKSBjb25zdDsKIAogcHJpdmF0ZToKICAg ICBmcmllbmQgY2xhc3MgUnVsZVNldEJ1aWxkZXI7CkBAIC0xMzIsMTEgKzEzNCwxMSBAQCBwcml2 YXRlOgogICAgIHN0cnVjdCBDYXNjYWRlTGF5ZXIgewogICAgICAgICBDYXNjYWRlTGF5ZXJOYW1l IHJlc29sdmVkTmFtZTsKICAgICAgICAgQ2FzY2FkZUxheWVySWRlbnRpZmllciBwYXJlbnRJZGVu dGlmaWVyOwotICAgICAgICB1bnNpZ25lZCBwcmlvcml0eSB7IDAgfTsKKyAgICAgICAgQ2FzY2Fk ZUxheWVyUHJpb3JpdHkgcHJpb3JpdHkgeyAwIH07CiAgICAgfTsKICAgICBDYXNjYWRlTGF5ZXIm IGNhc2NhZGVMYXllckZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlm aWVyKSB7IHJldHVybiBtX2Nhc2NhZGVMYXllcnNbaWRlbnRpZmllciAtIDFdOyB9CiAgICAgY29u c3QgQ2FzY2FkZUxheWVyJiBjYXNjYWRlTGF5ZXJGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklk ZW50aWZpZXIgaWRlbnRpZmllcikgY29uc3QgeyByZXR1cm4gbV9jYXNjYWRlTGF5ZXJzW2lkZW50 aWZpZXIgLSAxXTsgfQotICAgIHVuc2lnbmVkIGNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRlbnRp ZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyKSBjb25zdDsKKyAgICBDYXNjYWRlTGF5ZXJQcmlv cml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRp ZmllcikgY29uc3Q7CiAKICAgICBzdHJ1Y3QgRHluYW1pY01lZGlhUXVlcnlSdWxlcyB7CiAgICAg ICAgIFZlY3RvcjxSZWY8Y29uc3QgTWVkaWFRdWVyeVNldD4+IG1lZGlhUXVlcnlTZXRzOwpAQCAt MTkzLDE0ICsxOTUsMTQgQEAgaW5saW5lIGNvbnN0IFJ1bGVTZXQ6OlJ1bGVEYXRhVmVjdG9yKiBS dWxlU2V0Ojp0YWdSdWxlcyhjb25zdCBBdG9tU3RyaW5nJiBrZXksIGIKICAgICByZXR1cm4gdGFn UnVsZXMtPmdldChrZXkpOwogfQogCi1pbmxpbmUgdW5zaWduZWQgUnVsZVNldDo6Y2FzY2FkZUxh eWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIgaWRlbnRpZmll cikgY29uc3QKK2lubGluZSBDYXNjYWRlTGF5ZXJQcmlvcml0eSBSdWxlU2V0OjpjYXNjYWRlTGF5 ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlmaWVy KSBjb25zdAogewogICAgIGlmICghaWRlbnRpZmllcikKICAgICAgICAgcmV0dXJuIGNhc2NhZGVM YXllclByaW9yaXR5Rm9yVW5sYXllcmVkOwogICAgIHJldHVybiBjYXNjYWRlTGF5ZXJGb3JJZGVu dGlmaWVyKGlkZW50aWZpZXIpLnByaW9yaXR5OwogfQogCi1pbmxpbmUgdW5zaWduZWQgUnVsZVNl dDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRhKSBjb25z dAoraW5saW5lIENhc2NhZGVMYXllclByaW9yaXR5IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9yKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSkgY29uc3QKIHsKICAgICBpZiAobV9jYXNj YWRlTGF5ZXJJZGVudGlmaWVyRm9yUnVsZVBvc2l0aW9uLnNpemUoKSA8PSBydWxlRGF0YS5wb3Np dGlvbigpKQogICAgICAgICByZXR1cm4gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAKaW5kZXggNjc1MGRkZTdmZDFm YTExZGI2YzZmNDRiNWU3NDBjNTdkNmZmYjgyNC4uMzJiZjRmYTIyNzQyOTAyZjI5MmJkNjVmODNm YmRjN2RhNmNlZWRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXRCdWlsZGVyLmNwcApA QCAtMjcwLDggKzI3MCwxMCBAQCB2b2lkIFJ1bGVTZXRCdWlsZGVyOjp1cGRhdGVDYXNjYWRlTGF5 ZXJQcmlvcml0aWVzKCkKIAogICAgIHN0ZDo6c29ydChsYXllcnNJblByaW9yaXR5T3JkZXIuYmVn aW4oKSwgbGF5ZXJzSW5Qcmlvcml0eU9yZGVyLmVuZCgpLCBjb21wYXJlKTsKIAotICAgIGZvciAo dW5zaWduZWQgcHJpb3JpdHkgPSAwOyBwcmlvcml0eSA8IGxheWVyQ291bnQ7ICsrcHJpb3JpdHkp Ci0gICAgICAgIG1fcnVsZVNldC0+Y2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihsYXllcnNJblBy aW9yaXR5T3JkZXJbcHJpb3JpdHldKS5wcmlvcml0eSA9IHByaW9yaXR5OworICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBsYXllckNvdW50OyArK2kpIHsKKyAgICAgICAgYXV0byBwcmlvcml0 eSA9IHN0ZDo6bWluPHVuc2lnbmVkPihpLCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZv clVubGF5ZXJlZCAtIDEpOworICAgICAgICBtX3J1bGVTZXQtPmNhc2NhZGVMYXllckZvcklkZW50 aWZpZXIobGF5ZXJzSW5Qcmlvcml0eU9yZGVyW2ldKS5wcmlvcml0eSA9IHByaW9yaXR5OworICAg IH0KIH0KIAogdm9pZCBSdWxlU2V0QnVpbGRlcjo6YWRkTXV0YXRpbmdSdWxlc1RvUmVzb2x2ZXIo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZU9yZGluYWwuaCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVPcmRpbmFsLmgKaW5kZXggOWFhMzNjYzEx MTZjMTA3MTY5YWJlNjk4MTc1YjkyZThmYjQyYjQ1OC4uYjA0NWQ0N2IxNzAwNTIxMDYwZDRlMWRj ZmNhMDVhY2YzNGQ1ZWY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVT Y29wZU9yZGluYWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5h bC5oCkBAIC0yOSwyMyArMjksMjUgQEAgbmFtZXNwYWNlIFN0eWxlIHsKIAogLy8gVGhpcyBpcyB1 c2VkIHRvIGlkZW50aWZ5IHN0eWxlIHNjb3BlcyB0aGF0IGNhbiBhZmZlY3QgYW4gZWxlbWVudC4K IC8vIFNjb3BlcyBhcmUgaW4gdHJlZS1vZi10cmVlcyBvcmRlci4gU3R5bGVzIGZyb20gZWFybGll ciBzY29wZXMgd2luIG92ZXIgbGF0ZXIgb25lcyAobW9kdWxvICFpbXBvcnRhbnQpLgotZW51bSBj bGFzcyBTY29wZU9yZGluYWwgOiBpbnQgeworZW51bSBjbGFzcyBTY29wZU9yZGluYWwgOiBpbnQ4 X3QgeworICAgIENvbnRhaW5pbmdIb3N0TGltaXQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludDhf dD46Om1pbigpLAogICAgIENvbnRhaW5pbmdIb3N0ID0gLTEsIC8vIDo6cGFydCBydWxlcyBhbmQg YXV0aG9yLWV4cG9zZWQgVUEgcHNldWRvIGNsYXNzZXMgZnJvbSB0aGUgaG9zdCB0cmVlIHNjb3Bl LiBWYWx1ZXMgbGVzcyB0aGFuIENvbnRhaW5pbmdIb3N0IGluZGljYXRlIGVuY2xvc2luZyBzY29w ZXMuCiAgICAgRWxlbWVudCA9IDAsIC8vIE5vcm1hbCBydWxlcyBpbiB0aGUgc2FtZSB0cmVlIHdo ZXJlIHRoZSBlbGVtZW50IGlzLgogICAgIEZpcnN0U2xvdCA9IDEsIC8vIDo6c2xvdHRlZCBydWxl cyBpbiB0aGUgcGFyZW50J3Mgc2hhZG93IHRyZWUuIFZhbHVlcyBncmVhdGVyIHRoYW4gRmlyc3RT bG90IGluZGljYXRlIHN1YnNlcXVlbnQgc2xvdHMgaW4gdGhlIGNoYWluLgotICAgIFNoYWRvdyA9 IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCksIC8vIDpob3N0IHJ1bGVzIGluIGVsZW1l bnQncyBvd24gc2hhZG93IHRyZWUuCisgICAgU2xvdExpbWl0ID0gc3RkOjpudW1lcmljX2xpbWl0 czxpbnQ4X3Q+OjptYXgoKSAtIDEsCisgICAgU2hhZG93ID0gc3RkOjpudW1lcmljX2xpbWl0czxp bnQ4X3Q+OjptYXgoKSwgLy8gOmhvc3QgcnVsZXMgaW4gZWxlbWVudCdzIG93biBzaGFkb3cgdHJl ZS4KIH07CiAKIGlubGluZSBTY29wZU9yZGluYWwmIG9wZXJhdG9yKysoU2NvcGVPcmRpbmFsJiBv cmRpbmFsKQogewotICAgIEFTU0VSVChvcmRpbmFsIDwgU2NvcGVPcmRpbmFsOjpTaGFkb3cpOwot ICAgIHJldHVybiBvcmRpbmFsID0gc3RhdGljX2Nhc3Q8U2NvcGVPcmRpbmFsPihzdGF0aWNfY2Fz dDxpbnQ+KG9yZGluYWwpICsgMSk7CisgICAgQVNTRVJUKG9yZGluYWwgPCBTY29wZU9yZGluYWw6 OlNsb3RMaW1pdCk7CisgICAgcmV0dXJuIG9yZGluYWwgPSBzdGF0aWNfY2FzdDxTY29wZU9yZGlu YWw+KHN0YXRpY19jYXN0PGludDhfdD4ob3JkaW5hbCkgKyAxKTsKIH0KIAogaW5saW5lIFNjb3Bl T3JkaW5hbCYgb3BlcmF0b3ItLShTY29wZU9yZGluYWwmIG9yZGluYWwpCiB7Ci0gICAgQVNTRVJU KG9yZGluYWwgPCBTY29wZU9yZGluYWw6OlNoYWRvdyk7Ci0gICAgcmV0dXJuIG9yZGluYWwgPSBz dGF0aWNfY2FzdDxTY29wZU9yZGluYWw+KHN0YXRpY19jYXN0PGludD4ob3JkaW5hbCkgLSAxKTsK KyAgICBBU1NFUlQob3JkaW5hbCA+IFNjb3BlT3JkaW5hbDo6Q29udGFpbmluZ0hvc3RMaW1pdCk7 CisgICAgcmV0dXJuIG9yZGluYWwgPSBzdGF0aWNfY2FzdDxTY29wZU9yZGluYWw+KHN0YXRpY19j YXN0PGludDhfdD4ob3JkaW5hbCkgLSAxKTsKIH0KIAogfQo= 443915 2021-11-10 23:07:30 -0800 2021-11-10 23:14:03 -0800 Patch for landing bug-232797-20211111090728.patch text/plain 8740 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc5NDNmZjBmZjdiZGNl YWExMTViZjkzMmQxOTNiMmZlNTk5YjBlMy4uOTVmZWEwNzk1MzA3MTJlNzg5NTI5NzUxMDJmMjA0 ZjAwMGQxNDMwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgbmFycm93ZXIgdHlw ZXMgZm9yIHN0eWxlIHNjb3BlIG9yZGluYWwgYW5kIGNhc2NhZGUgbGF5ZXIgcHJpb3JpdHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc5NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2hyaW5r cyBjcml0aWNhbCBFbGVtZW50UnVsZUNvbGxlY3RvciBkYXRhIHN0cnVjdHVyZXMgbGlrZSBNYXRj aGVkUnVsZS4KKworICAgICAgICA2NGsgbGF5ZXJzIG91Z2h0IHRvIGJlIGVub3VnaCBmb3IgYW55 Ym9keSAoYW5kIDI1NiBzY29wZXMpLgorCisgICAgICAgICogc3R5bGUvRWxlbWVudFJ1bGVDb2xs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9y OjptYXRjaFNsb3R0ZWRQc2V1ZG9FbGVtZW50UnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JT Y29wZSk6CisKKyAgICAgICAgQ2hlY2sgdGhlIHNjb3BlIGRlcHRoIGxpbWl0cy4KKworICAgICAg ICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvUnVsZVNl dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNl dDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IgY29uc3QpOgorCisgICAgICAgIEFkZCBhIHR5cGUg YWxpYXMgYW5kIG1ha2UgaXQgdWludDE2X3QuCisKKyAgICAgICAgKiBzdHlsZS9SdWxlU2V0QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldEJ1aWxkZXI6OnVwZGF0 ZUNhc2NhZGVMYXllclByaW9yaXRpZXMpOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVPcmRp bmFsLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3IrKyk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3ItLSk6CisKKyAgICAgICAgVXNlIGludDhfdC4gTm8gcmVh bGlzdGljIGNhc2UgcmVxdWlyZXMgbW9yZSB0aGFuIGEgaGFuZGZ1bC4KKwogMjAyMS0xMS0xMCAg QW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIEhhc2hlciBm b3IgaGFzaGluZyBNYXRjaFJlc3VsdCBmb3IgTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKaW5kZXggYmViODk2 N2ZkYmNkZTQzMjg1NGQxNTNiYTljZTI2YzY3NzNlMzBmNi4uNjljZTBiYWZiMzQ3YTg0ZjUwNDdk NGRlM2I2MThiNWE2OTljMzFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxl bWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRS dWxlQ29sbGVjdG9yLmNwcApAQCAtMjg2LDYgKzI4Niw5IEBAIHZvaWQgRWxlbWVudFJ1bGVDb2xs ZWN0b3I6Om1hdGNoU2xvdHRlZFBzZXVkb0VsZW1lbnRSdWxlcygpCiAKICAgICAgICAgTWF0Y2hS ZXF1ZXN0IHNjb3BlTWF0Y2hSZXF1ZXN0KCZzY29wZUF1dGhvclJ1bGVzLCBzdHlsZVNjb3BlT3Jk aW5hbCk7CiAgICAgICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdCgmc2NvcGVBdXRob3JS dWxlcy5zbG90dGVkUHNldWRvRWxlbWVudFJ1bGVzKCksIHNjb3BlTWF0Y2hSZXF1ZXN0KTsKKwor ICAgICAgICBpZiAoc3R5bGVTY29wZU9yZGluYWwgPT0gU2NvcGVPcmRpbmFsOjpTbG90TGltaXQp CisgICAgICAgICAgICBicmVhazsKICAgICB9CiB9CiAKQEAgLTMyMCw2ICszMjMsOSBAQCB2b2lk IEVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JTY29w ZShjb25zdCBFbGVtZW50JiBwYQogICAgICAgICAvLyBFbGVtZW50IG1heSBvbmx5IGJlIGV4cG9z ZWQgdG8gc3R5bGluZyBmcm9tIGVuY2xvc2luZyBzY29wZXMgdmlhIGV4cG9ydHBhcnRzIGF0dHJp YnV0ZXMuCiAgICAgICAgIGlmIChlbGVtZW50ICE9ICZwYXJ0TWF0Y2hpbmdFbGVtZW50ICYmIGVs ZW1lbnQtPnNoYWRvd1Jvb3QoKS0+cGFydE1hcHBpbmdzKCkuaXNFbXB0eSgpKQogICAgICAgICAg ICAgYnJlYWs7CisKKyAgICAgICAgaWYgKHN0eWxlU2NvcGVPcmRpbmFsID09IFNjb3BlT3JkaW5h bDo6Q29udGFpbmluZ0hvc3RMaW1pdCkKKyAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKaW5kZXggNDE1MDhh MzkwNjQ2MTJiNTZiNDVhZGIxNGIwZGY5NmEzZDRmNTYwOS4uYzM1MzFkZDkwOThkZDExZjM2NTI1 NTY0Y2Y3NjI5MWVmZjVhNGRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxl bWVudFJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVs ZUNvbGxlY3Rvci5oCkBAIC02NCw3ICs2NCw3IEBAIHN0cnVjdCBNYXRjaGVkUnVsZSB7CiAgICAg Y29uc3QgUnVsZURhdGEqIHJ1bGVEYXRhOwogICAgIHVuc2lnbmVkIHNwZWNpZmljaXR5OwogICAg IFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbDsKLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5 ZXJQcmlvcml0eTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0 eTsKIH07CiAKIGNsYXNzIEVsZW1lbnRSdWxlQ29sbGVjdG9yIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQu aAppbmRleCBmMDRhNzIwMzAzNzY1MjFmOGIzNTY1MTA0MTBjNjJhNTA3MGYxZGYzLi5mODEyNjdl OWVhYmU0ODhlOWJkMjAwNTNlNDQ2YmQ5Yzg1MjBjZWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9SdWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5o CkBAIC00Myw2ICs0Myw4IEBAIG5hbWVzcGFjZSBTdHlsZSB7CiBjbGFzcyBSZXNvbHZlcjsKIGNs YXNzIFJ1bGVTZXQ7CiAKK3VzaW5nIENhc2NhZGVMYXllclByaW9yaXR5ID0gdWludDE2X3Q7CisK IHVzaW5nIEludmFsaWRhdGlvblJ1bGVTZXRWZWN0b3IgPSBWZWN0b3I8UmVmUHRyPGNvbnN0IFJ1 bGVTZXQ+LCAxPjsKIAogc3RydWN0IER5bmFtaWNNZWRpYVF1ZXJ5RXZhbHVhdGlvbkNoYW5nZXMg ewpAQCAtMTAzLDggKzEwNSw4IEBAIHB1YmxpYzoKICAgICBib29sIGhhc1NoYWRvd1BzZXVkb0Vs ZW1lbnRSdWxlcygpIGNvbnN0IHsgcmV0dXJuICFtX3NoYWRvd1BzZXVkb0VsZW1lbnRSdWxlcy5p c0VtcHR5KCk7IH0KICAgICBib29sIGhhc0hvc3RQc2V1ZG9DbGFzc1J1bGVzTWF0Y2hpbmdJblNo YWRvd1RyZWUoKSBjb25zdCB7IHJldHVybiBtX2hhc0hvc3RQc2V1ZG9DbGFzc1J1bGVzTWF0Y2hp bmdJblNoYWRvd1RyZWU7IH0KIAotICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byBjYXNjYWRlTGF5 ZXJQcmlvcml0eUZvclVubGF5ZXJlZCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+Ojpt YXgoKTsKLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcihjb25zdCBSdWxlRGF0 YSYpIGNvbnN0OworICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0 eUZvclVubGF5ZXJlZCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8Q2FzY2FkZUxheWVyUHJpb3JpdHk+ OjptYXgoKTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eUZv cihjb25zdCBSdWxlRGF0YSYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBS dWxlU2V0QnVpbGRlcjsKQEAgLTEzMiwxMSArMTM0LDExIEBAIHByaXZhdGU6CiAgICAgc3RydWN0 IENhc2NhZGVMYXllciB7CiAgICAgICAgIENhc2NhZGVMYXllck5hbWUgcmVzb2x2ZWROYW1lOwog ICAgICAgICBDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIHBhcmVudElkZW50aWZpZXI7Ci0gICAgICAg IHVuc2lnbmVkIHByaW9yaXR5IHsgMCB9OworICAgICAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBw cmlvcml0eSB7IDAgfTsKICAgICB9OwogICAgIENhc2NhZGVMYXllciYgY2FzY2FkZUxheWVyRm9y SWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIHsgcmV0dXJuIG1f Y2FzY2FkZUxheWVyc1tpZGVudGlmaWVyIC0gMV07IH0KICAgICBjb25zdCBDYXNjYWRlTGF5ZXIm IGNhc2NhZGVMYXllckZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlm aWVyKSBjb25zdCB7IHJldHVybiBtX2Nhc2NhZGVMYXllcnNbaWRlbnRpZmllciAtIDFdOyB9Ci0g ICAgdW5zaWduZWQgY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVMYXll cklkZW50aWZpZXIpIGNvbnN0OworICAgIENhc2NhZGVMYXllclByaW9yaXR5IGNhc2NhZGVMYXll clByaW9yaXR5Rm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyKSBjb25zdDsKIAog ICAgIHN0cnVjdCBEeW5hbWljTWVkaWFRdWVyeVJ1bGVzIHsKICAgICAgICAgVmVjdG9yPFJlZjxj b25zdCBNZWRpYVF1ZXJ5U2V0Pj4gbWVkaWFRdWVyeVNldHM7CkBAIC0xOTMsMTQgKzE5NSwxNCBA QCBpbmxpbmUgY29uc3QgUnVsZVNldDo6UnVsZURhdGFWZWN0b3IqIFJ1bGVTZXQ6OnRhZ1J1bGVz KGNvbnN0IEF0b21TdHJpbmcmIGtleSwgYgogICAgIHJldHVybiB0YWdSdWxlcy0+Z2V0KGtleSk7 CiB9CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklk ZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlmaWVyKSBjb25zdAoraW5saW5l IENhc2NhZGVMYXllclByaW9yaXR5IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRl bnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0CiB7CiAgICAg aWYgKCFpZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JV bmxheWVyZWQ7CiAgICAgcmV0dXJuIGNhc2NhZGVMYXllckZvcklkZW50aWZpZXIoaWRlbnRpZmll cikucHJpb3JpdHk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQ cmlvcml0eUZvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEpIGNvbnN0CitpbmxpbmUgQ2FzY2Fk ZUxheWVyUHJpb3JpdHkgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVs ZURhdGEmIHJ1bGVEYXRhKSBjb25zdAogewogICAgIGlmIChtX2Nhc2NhZGVMYXllcklkZW50aWZp ZXJGb3JSdWxlUG9zaXRpb24uc2l6ZSgpIDw9IHJ1bGVEYXRhLnBvc2l0aW9uKCkpCiAgICAgICAg IHJldHVybiBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1J1bGVTZXRCdWlsZGVyLmNwcAppbmRleCA2NzUwZGRlN2ZkMWZhMTFkYjZjNmY0NGI1ZTc0 MGM1N2Q2ZmZiODI0Li4zMmJmNGZhMjI3NDI5MDJmMjkyYmQ2NWY4M2ZiZGM3ZGE2Y2VlZGZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCkBAIC0yNzAsOCArMjcwLDEw IEBAIHZvaWQgUnVsZVNldEJ1aWxkZXI6OnVwZGF0ZUNhc2NhZGVMYXllclByaW9yaXRpZXMoKQog CiAgICAgc3RkOjpzb3J0KGxheWVyc0luUHJpb3JpdHlPcmRlci5iZWdpbigpLCBsYXllcnNJblBy aW9yaXR5T3JkZXIuZW5kKCksIGNvbXBhcmUpOwogCi0gICAgZm9yICh1bnNpZ25lZCBwcmlvcml0 eSA9IDA7IHByaW9yaXR5IDwgbGF5ZXJDb3VudDsgKytwcmlvcml0eSkKLSAgICAgICAgbV9ydWxl U2V0LT5jYXNjYWRlTGF5ZXJGb3JJZGVudGlmaWVyKGxheWVyc0luUHJpb3JpdHlPcmRlcltwcmlv cml0eV0pLnByaW9yaXR5ID0gcHJpb3JpdHk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGxheWVyQ291bnQ7ICsraSkgeworICAgICAgICBhdXRvIHByaW9yaXR5ID0gc3RkOjptaW48dW5z aWduZWQ+KGksIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkIC0gMSk7 CisgICAgICAgIG1fcnVsZVNldC0+Y2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihsYXllcnNJblBy aW9yaXR5T3JkZXJbaV0pLnByaW9yaXR5ID0gcHJpb3JpdHk7CisgICAgfQogfQogCiB2b2lkIFJ1 bGVTZXRCdWlsZGVyOjphZGRNdXRhdGluZ1J1bGVzVG9SZXNvbHZlcigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVTY29wZU9yZGluYWwuaAppbmRleCA5YWEzM2NjMTExNmMxMDcxNjlhYmU2OTgx NzViOTJlOGZiNDJiNDU4Li5iMDQ1ZDQ3YjE3MDA1MjEwNjBkNGUxZGNmY2EwNWFjZjM0ZDVlZjlm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVPcmRpbmFsLmgKQEAgLTI5LDIzICsy OSwyNSBAQCBuYW1lc3BhY2UgU3R5bGUgewogCiAvLyBUaGlzIGlzIHVzZWQgdG8gaWRlbnRpZnkg c3R5bGUgc2NvcGVzIHRoYXQgY2FuIGFmZmVjdCBhbiBlbGVtZW50LgogLy8gU2NvcGVzIGFyZSBp biB0cmVlLW9mLXRyZWVzIG9yZGVyLiBTdHlsZXMgZnJvbSBlYXJsaWVyIHNjb3BlcyB3aW4gb3Zl ciBsYXRlciBvbmVzIChtb2R1bG8gIWltcG9ydGFudCkuCi1lbnVtIGNsYXNzIFNjb3BlT3JkaW5h bCA6IGludCB7CitlbnVtIGNsYXNzIFNjb3BlT3JkaW5hbCA6IGludDhfdCB7CisgICAgQ29udGFp bmluZ0hvc3RMaW1pdCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50OF90Pjo6bWluKCksCiAgICAg Q29udGFpbmluZ0hvc3QgPSAtMSwgLy8gOjpwYXJ0IHJ1bGVzIGFuZCBhdXRob3ItZXhwb3NlZCBV QSBwc2V1ZG8gY2xhc3NlcyBmcm9tIHRoZSBob3N0IHRyZWUgc2NvcGUuIFZhbHVlcyBsZXNzIHRo YW4gQ29udGFpbmluZ0hvc3QgaW5kaWNhdGUgZW5jbG9zaW5nIHNjb3Blcy4KICAgICBFbGVtZW50 ID0gMCwgLy8gTm9ybWFsIHJ1bGVzIGluIHRoZSBzYW1lIHRyZWUgd2hlcmUgdGhlIGVsZW1lbnQg aXMuCiAgICAgRmlyc3RTbG90ID0gMSwgLy8gOjpzbG90dGVkIHJ1bGVzIGluIHRoZSBwYXJlbnQn cyBzaGFkb3cgdHJlZS4gVmFsdWVzIGdyZWF0ZXIgdGhhbiBGaXJzdFNsb3QgaW5kaWNhdGUgc3Vi c2VxdWVudCBzbG90cyBpbiB0aGUgY2hhaW4uCi0gICAgU2hhZG93ID0gc3RkOjpudW1lcmljX2xp bWl0czxpbnQ+OjptYXgoKSwgLy8gOmhvc3QgcnVsZXMgaW4gZWxlbWVudCdzIG93biBzaGFkb3cg dHJlZS4KKyAgICBTbG90TGltaXQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludDhfdD46Om1heCgp IC0gMSwKKyAgICBTaGFkb3cgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludDhfdD46Om1heCgpLCAv LyA6aG9zdCBydWxlcyBpbiBlbGVtZW50J3Mgb3duIHNoYWRvdyB0cmVlLgogfTsKIAogaW5saW5l IFNjb3BlT3JkaW5hbCYgb3BlcmF0b3IrKyhTY29wZU9yZGluYWwmIG9yZGluYWwpCiB7Ci0gICAg QVNTRVJUKG9yZGluYWwgPCBTY29wZU9yZGluYWw6OlNoYWRvdyk7Ci0gICAgcmV0dXJuIG9yZGlu YWwgPSBzdGF0aWNfY2FzdDxTY29wZU9yZGluYWw+KHN0YXRpY19jYXN0PGludD4ob3JkaW5hbCkg KyAxKTsKKyAgICBBU1NFUlQob3JkaW5hbCA8IFNjb3BlT3JkaW5hbDo6U2xvdExpbWl0KTsKKyAg ICByZXR1cm4gb3JkaW5hbCA9IHN0YXRpY19jYXN0PFNjb3BlT3JkaW5hbD4oc3RhdGljX2Nhc3Q8 aW50OF90PihvcmRpbmFsKSArIDEpOwogfQogCiBpbmxpbmUgU2NvcGVPcmRpbmFsJiBvcGVyYXRv ci0tKFNjb3BlT3JkaW5hbCYgb3JkaW5hbCkKIHsKLSAgICBBU1NFUlQob3JkaW5hbCA8IFNjb3Bl T3JkaW5hbDo6U2hhZG93KTsKLSAgICByZXR1cm4gb3JkaW5hbCA9IHN0YXRpY19jYXN0PFNjb3Bl T3JkaW5hbD4oc3RhdGljX2Nhc3Q8aW50PihvcmRpbmFsKSAtIDEpOworICAgIEFTU0VSVChvcmRp bmFsID4gU2NvcGVPcmRpbmFsOjpDb250YWluaW5nSG9zdExpbWl0KTsKKyAgICByZXR1cm4gb3Jk aW5hbCA9IHN0YXRpY19jYXN0PFNjb3BlT3JkaW5hbD4oc3RhdGljX2Nhc3Q8aW50OF90PihvcmRp bmFsKSAtIDEpOwogfQogCiB9Cg== 443916 2021-11-10 23:14:08 -0800 2021-11-11 00:21:59 -0800 Patch for landing bug-232797-20211111091407.patch text/plain 8737 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc5NDNmZjBmZjdiZGNl YWExMTViZjkzMmQxOTNiMmZlNTk5YjBlMy4uM2UxMDBmMzE2NDkzYzc0NmFmZjM0MGU3MjYyNGVh MDdiOGI0NTExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgbmFycm93ZXIgdHlw ZXMgZm9yIHN0eWxlIHNjb3BlIG9yZGluYWwgYW5kIGNhc2NhZGUgbGF5ZXIgcHJpb3JpdHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc5NworCisg ICAgICAgIFJldmlld2VkIGJ5IEFsYW4gQnVqdGFzLgorCisgICAgICAgIFRoaXMgc2hyaW5rcyBj cml0aWNhbCBFbGVtZW50UnVsZUNvbGxlY3RvciBkYXRhIHN0cnVjdHVyZXMgbGlrZSBNYXRjaGVk UnVsZS4KKworICAgICAgICA2NGsgbGF5ZXJzIG91Z2h0IHRvIGJlIGVub3VnaCBmb3IgYW55Ym9k eSAoYW5kIDI1NiBzY29wZXMpLgorCisgICAgICAgICogc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjpt YXRjaFNsb3R0ZWRQc2V1ZG9FbGVtZW50UnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JTY29w ZSk6CisKKyAgICAgICAgQ2hlY2sgdGhlIHNjb3BlIGRlcHRoIGxpbWl0cy4KKworICAgICAgICAq IHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvUnVsZVNldC5o OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5 Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldDo6 Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IgY29uc3QpOgorCisgICAgICAgIEFkZCBhIHR5cGUgYWxp YXMgYW5kIG1ha2UgaXQgdWludDE2X3QuCisKKyAgICAgICAgKiBzdHlsZS9SdWxlU2V0QnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldEJ1aWxkZXI6OnVwZGF0ZUNh c2NhZGVMYXllclByaW9yaXRpZXMpOgorICAgICAgICAqIHN0eWxlL1N0eWxlU2NvcGVPcmRpbmFs Lmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6b3BlcmF0b3IrKyk6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZTo6b3BlcmF0b3ItLSk6CisKKyAgICAgICAgVXNlIGludDhfdC4gTm8gcmVhbGlz dGljIGNhc2UgcmVxdWlyZXMgbW9yZSB0aGFuIGEgaGFuZGZ1bC4KKwogMjAyMS0xMS0xMCAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIEhhc2hlciBmb3Ig aGFzaGluZyBNYXRjaFJlc3VsdCBmb3IgTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKaW5kZXggYmViODk2N2Zk YmNkZTQzMjg1NGQxNTNiYTljZTI2YzY3NzNlMzBmNi4uNjljZTBiYWZiMzQ3YTg0ZjUwNDdkNGRl M2I2MThiNWE2OTljMzFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxl Q29sbGVjdG9yLmNwcApAQCAtMjg2LDYgKzI4Niw5IEBAIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0 b3I6Om1hdGNoU2xvdHRlZFBzZXVkb0VsZW1lbnRSdWxlcygpCiAKICAgICAgICAgTWF0Y2hSZXF1 ZXN0IHNjb3BlTWF0Y2hSZXF1ZXN0KCZzY29wZUF1dGhvclJ1bGVzLCBzdHlsZVNjb3BlT3JkaW5h bCk7CiAgICAgICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdCgmc2NvcGVBdXRob3JSdWxl cy5zbG90dGVkUHNldWRvRWxlbWVudFJ1bGVzKCksIHNjb3BlTWF0Y2hSZXF1ZXN0KTsKKworICAg ICAgICBpZiAoc3R5bGVTY29wZU9yZGluYWwgPT0gU2NvcGVPcmRpbmFsOjpTbG90TGltaXQpCisg ICAgICAgICAgICBicmVhazsKICAgICB9CiB9CiAKQEAgLTMyMCw2ICszMjMsOSBAQCB2b2lkIEVs ZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaFBhcnRQc2V1ZG9FbGVtZW50UnVsZXNGb3JTY29wZShj b25zdCBFbGVtZW50JiBwYQogICAgICAgICAvLyBFbGVtZW50IG1heSBvbmx5IGJlIGV4cG9zZWQg dG8gc3R5bGluZyBmcm9tIGVuY2xvc2luZyBzY29wZXMgdmlhIGV4cG9ydHBhcnRzIGF0dHJpYnV0 ZXMuCiAgICAgICAgIGlmIChlbGVtZW50ICE9ICZwYXJ0TWF0Y2hpbmdFbGVtZW50ICYmIGVsZW1l bnQtPnNoYWRvd1Jvb3QoKS0+cGFydE1hcHBpbmdzKCkuaXNFbXB0eSgpKQogICAgICAgICAgICAg YnJlYWs7CisKKyAgICAgICAgaWYgKHN0eWxlU2NvcGVPcmRpbmFsID09IFNjb3BlT3JkaW5hbDo6 Q29udGFpbmluZ0hvc3RMaW1pdCkKKyAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKaW5kZXggNDE1MDhhMzkw NjQ2MTJiNTZiNDVhZGIxNGIwZGY5NmEzZDRmNTYwOS4uYzM1MzFkZDkwOThkZDExZjM2NTI1NTY0 Y2Y3NjI5MWVmZjVhNGRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNv bGxlY3Rvci5oCkBAIC02NCw3ICs2NCw3IEBAIHN0cnVjdCBNYXRjaGVkUnVsZSB7CiAgICAgY29u c3QgUnVsZURhdGEqIHJ1bGVEYXRhOwogICAgIHVuc2lnbmVkIHNwZWNpZmljaXR5OwogICAgIFNj b3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbDsKLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQ cmlvcml0eTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eTsK IH07CiAKIGNsYXNzIEVsZW1lbnRSdWxlQ29sbGVjdG9yIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1J1bGVTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaApp bmRleCBmMDRhNzIwMzAzNzY1MjFmOGIzNTY1MTA0MTBjNjJhNTA3MGYxZGYzLi5mODEyNjdlOWVh YmU0ODhlOWJkMjAwNTNlNDQ2YmQ5Yzg1MjBjZWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9SdWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCkBA IC00Myw2ICs0Myw4IEBAIG5hbWVzcGFjZSBTdHlsZSB7CiBjbGFzcyBSZXNvbHZlcjsKIGNsYXNz IFJ1bGVTZXQ7CiAKK3VzaW5nIENhc2NhZGVMYXllclByaW9yaXR5ID0gdWludDE2X3Q7CisKIHVz aW5nIEludmFsaWRhdGlvblJ1bGVTZXRWZWN0b3IgPSBWZWN0b3I8UmVmUHRyPGNvbnN0IFJ1bGVT ZXQ+LCAxPjsKIAogc3RydWN0IER5bmFtaWNNZWRpYVF1ZXJ5RXZhbHVhdGlvbkNoYW5nZXMgewpA QCAtMTAzLDggKzEwNSw4IEBAIHB1YmxpYzoKICAgICBib29sIGhhc1NoYWRvd1BzZXVkb0VsZW1l bnRSdWxlcygpIGNvbnN0IHsgcmV0dXJuICFtX3NoYWRvd1BzZXVkb0VsZW1lbnRSdWxlcy5pc0Vt cHR5KCk7IH0KICAgICBib29sIGhhc0hvc3RQc2V1ZG9DbGFzc1J1bGVzTWF0Y2hpbmdJblNoYWRv d1RyZWUoKSBjb25zdCB7IHJldHVybiBtX2hhc0hvc3RQc2V1ZG9DbGFzc1J1bGVzTWF0Y2hpbmdJ blNoYWRvd1RyZWU7IH0KIAotICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byBjYXNjYWRlTGF5ZXJQ cmlvcml0eUZvclVubGF5ZXJlZCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgo KTsKLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcihjb25zdCBSdWxlRGF0YSYp IGNvbnN0OworICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0eUZv clVubGF5ZXJlZCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8Q2FzY2FkZUxheWVyUHJpb3JpdHk+Ojpt YXgoKTsKKyAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcihj b25zdCBSdWxlRGF0YSYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBSdWxl U2V0QnVpbGRlcjsKQEAgLTEzMiwxMSArMTM0LDExIEBAIHByaXZhdGU6CiAgICAgc3RydWN0IENh c2NhZGVMYXllciB7CiAgICAgICAgIENhc2NhZGVMYXllck5hbWUgcmVzb2x2ZWROYW1lOwogICAg ICAgICBDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIHBhcmVudElkZW50aWZpZXI7Ci0gICAgICAgIHVu c2lnbmVkIHByaW9yaXR5IHsgMCB9OworICAgICAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBwcmlv cml0eSB7IDAgfTsKICAgICB9OwogICAgIENhc2NhZGVMYXllciYgY2FzY2FkZUxheWVyRm9ySWRl bnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIHsgcmV0dXJuIG1fY2Fz Y2FkZUxheWVyc1tpZGVudGlmaWVyIC0gMV07IH0KICAgICBjb25zdCBDYXNjYWRlTGF5ZXImIGNh c2NhZGVMYXllckZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlmaWVy KSBjb25zdCB7IHJldHVybiBtX2Nhc2NhZGVMYXllcnNbaWRlbnRpZmllciAtIDFdOyB9Ci0gICAg dW5zaWduZWQgY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklk ZW50aWZpZXIpIGNvbnN0OworICAgIENhc2NhZGVMYXllclByaW9yaXR5IGNhc2NhZGVMYXllclBy aW9yaXR5Rm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyKSBjb25zdDsKIAogICAg IHN0cnVjdCBEeW5hbWljTWVkaWFRdWVyeVJ1bGVzIHsKICAgICAgICAgVmVjdG9yPFJlZjxjb25z dCBNZWRpYVF1ZXJ5U2V0Pj4gbWVkaWFRdWVyeVNldHM7CkBAIC0xOTMsMTQgKzE5NSwxNCBAQCBp bmxpbmUgY29uc3QgUnVsZVNldDo6UnVsZURhdGFWZWN0b3IqIFJ1bGVTZXQ6OnRhZ1J1bGVzKGNv bnN0IEF0b21TdHJpbmcmIGtleSwgYgogICAgIHJldHVybiB0YWdSdWxlcy0+Z2V0KGtleSk7CiB9 CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50 aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlmaWVyKSBjb25zdAoraW5saW5lIENh c2NhZGVMYXllclByaW9yaXR5IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRlbnRp ZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0CiB7CiAgICAgaWYg KCFpZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxh eWVyZWQ7CiAgICAgcmV0dXJuIGNhc2NhZGVMYXllckZvcklkZW50aWZpZXIoaWRlbnRpZmllciku cHJpb3JpdHk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlv cml0eUZvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEpIGNvbnN0CitpbmxpbmUgQ2FzY2FkZUxh eWVyUHJpb3JpdHkgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVsZURh dGEmIHJ1bGVEYXRhKSBjb25zdAogewogICAgIGlmIChtX2Nhc2NhZGVMYXllcklkZW50aWZpZXJG b3JSdWxlUG9zaXRpb24uc2l6ZSgpIDw9IHJ1bGVEYXRhLnBvc2l0aW9uKCkpCiAgICAgICAgIHJl dHVybiBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1J1bGVTZXRCdWlsZGVyLmNwcAppbmRleCA2NzUwZGRlN2ZkMWZhMTFkYjZjNmY0NGI1ZTc0MGM1 N2Q2ZmZiODI0Li4zMmJmNGZhMjI3NDI5MDJmMjkyYmQ2NWY4M2ZiZGM3ZGE2Y2VlZGZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCkBAIC0yNzAsOCArMjcwLDEwIEBA IHZvaWQgUnVsZVNldEJ1aWxkZXI6OnVwZGF0ZUNhc2NhZGVMYXllclByaW9yaXRpZXMoKQogCiAg ICAgc3RkOjpzb3J0KGxheWVyc0luUHJpb3JpdHlPcmRlci5iZWdpbigpLCBsYXllcnNJblByaW9y aXR5T3JkZXIuZW5kKCksIGNvbXBhcmUpOwogCi0gICAgZm9yICh1bnNpZ25lZCBwcmlvcml0eSA9 IDA7IHByaW9yaXR5IDwgbGF5ZXJDb3VudDsgKytwcmlvcml0eSkKLSAgICAgICAgbV9ydWxlU2V0 LT5jYXNjYWRlTGF5ZXJGb3JJZGVudGlmaWVyKGxheWVyc0luUHJpb3JpdHlPcmRlcltwcmlvcml0 eV0pLnByaW9yaXR5ID0gcHJpb3JpdHk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxh eWVyQ291bnQ7ICsraSkgeworICAgICAgICBhdXRvIHByaW9yaXR5ID0gc3RkOjptaW48dW5zaWdu ZWQ+KGksIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkIC0gMSk7Cisg ICAgICAgIG1fcnVsZVNldC0+Y2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihsYXllcnNJblByaW9y aXR5T3JkZXJbaV0pLnByaW9yaXR5ID0gcHJpb3JpdHk7CisgICAgfQogfQogCiB2b2lkIFJ1bGVT ZXRCdWlsZGVyOjphZGRNdXRhdGluZ1J1bGVzVG9SZXNvbHZlcigpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oIGIvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVTY29wZU9yZGluYWwuaAppbmRleCA5YWEzM2NjMTExNmMxMDcxNjlhYmU2OTgxNzVi OTJlOGZiNDJiNDU4Li5iMDQ1ZDQ3YjE3MDA1MjEwNjBkNGUxZGNmY2EwNWFjZjM0ZDVlZjlmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlT3JkaW5hbC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVPcmRpbmFsLmgKQEAgLTI5LDIzICsyOSwy NSBAQCBuYW1lc3BhY2UgU3R5bGUgewogCiAvLyBUaGlzIGlzIHVzZWQgdG8gaWRlbnRpZnkgc3R5 bGUgc2NvcGVzIHRoYXQgY2FuIGFmZmVjdCBhbiBlbGVtZW50LgogLy8gU2NvcGVzIGFyZSBpbiB0 cmVlLW9mLXRyZWVzIG9yZGVyLiBTdHlsZXMgZnJvbSBlYXJsaWVyIHNjb3BlcyB3aW4gb3ZlciBs YXRlciBvbmVzIChtb2R1bG8gIWltcG9ydGFudCkuCi1lbnVtIGNsYXNzIFNjb3BlT3JkaW5hbCA6 IGludCB7CitlbnVtIGNsYXNzIFNjb3BlT3JkaW5hbCA6IGludDhfdCB7CisgICAgQ29udGFpbmlu Z0hvc3RMaW1pdCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50OF90Pjo6bWluKCksCiAgICAgQ29u dGFpbmluZ0hvc3QgPSAtMSwgLy8gOjpwYXJ0IHJ1bGVzIGFuZCBhdXRob3ItZXhwb3NlZCBVQSBw c2V1ZG8gY2xhc3NlcyBmcm9tIHRoZSBob3N0IHRyZWUgc2NvcGUuIFZhbHVlcyBsZXNzIHRoYW4g Q29udGFpbmluZ0hvc3QgaW5kaWNhdGUgZW5jbG9zaW5nIHNjb3Blcy4KICAgICBFbGVtZW50ID0g MCwgLy8gTm9ybWFsIHJ1bGVzIGluIHRoZSBzYW1lIHRyZWUgd2hlcmUgdGhlIGVsZW1lbnQgaXMu CiAgICAgRmlyc3RTbG90ID0gMSwgLy8gOjpzbG90dGVkIHJ1bGVzIGluIHRoZSBwYXJlbnQncyBz aGFkb3cgdHJlZS4gVmFsdWVzIGdyZWF0ZXIgdGhhbiBGaXJzdFNsb3QgaW5kaWNhdGUgc3Vic2Vx dWVudCBzbG90cyBpbiB0aGUgY2hhaW4uCi0gICAgU2hhZG93ID0gc3RkOjpudW1lcmljX2xpbWl0 czxpbnQ+OjptYXgoKSwgLy8gOmhvc3QgcnVsZXMgaW4gZWxlbWVudCdzIG93biBzaGFkb3cgdHJl ZS4KKyAgICBTbG90TGltaXQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludDhfdD46Om1heCgpIC0g MSwKKyAgICBTaGFkb3cgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludDhfdD46Om1heCgpLCAvLyA6 aG9zdCBydWxlcyBpbiBlbGVtZW50J3Mgb3duIHNoYWRvdyB0cmVlLgogfTsKIAogaW5saW5lIFNj b3BlT3JkaW5hbCYgb3BlcmF0b3IrKyhTY29wZU9yZGluYWwmIG9yZGluYWwpCiB7Ci0gICAgQVNT RVJUKG9yZGluYWwgPCBTY29wZU9yZGluYWw6OlNoYWRvdyk7Ci0gICAgcmV0dXJuIG9yZGluYWwg PSBzdGF0aWNfY2FzdDxTY29wZU9yZGluYWw+KHN0YXRpY19jYXN0PGludD4ob3JkaW5hbCkgKyAx KTsKKyAgICBBU1NFUlQob3JkaW5hbCA8IFNjb3BlT3JkaW5hbDo6U2xvdExpbWl0KTsKKyAgICBy ZXR1cm4gb3JkaW5hbCA9IHN0YXRpY19jYXN0PFNjb3BlT3JkaW5hbD4oc3RhdGljX2Nhc3Q8aW50 OF90PihvcmRpbmFsKSArIDEpOwogfQogCiBpbmxpbmUgU2NvcGVPcmRpbmFsJiBvcGVyYXRvci0t KFNjb3BlT3JkaW5hbCYgb3JkaW5hbCkKIHsKLSAgICBBU1NFUlQob3JkaW5hbCA8IFNjb3BlT3Jk aW5hbDo6U2hhZG93KTsKLSAgICByZXR1cm4gb3JkaW5hbCA9IHN0YXRpY19jYXN0PFNjb3BlT3Jk aW5hbD4oc3RhdGljX2Nhc3Q8aW50PihvcmRpbmFsKSAtIDEpOworICAgIEFTU0VSVChvcmRpbmFs ID4gU2NvcGVPcmRpbmFsOjpDb250YWluaW5nSG9zdExpbWl0KTsKKyAgICByZXR1cm4gb3JkaW5h bCA9IHN0YXRpY19jYXN0PFNjb3BlT3JkaW5hbD4oc3RhdGljX2Nhc3Q8aW50OF90PihvcmRpbmFs KSAtIDEpOwogfQogCiB9Cg==