241457 2022-06-09 02:54:44 -0700 [CSS Container Queries] Correctly resolve queries when container size is affected by a subsequent sibling 2022-06-09 06:16:18 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto cdumez cmarcelo esprehn+autocc ews-watchlist kangil.han webkit-bug-importer zalan oldest_to_newest 1874943 0 koivisto 2022-06-09 02:54:44 -0700 We currently only take style changes before the container into account. 1874946 1 460120 koivisto 2022-06-09 03:05:08 -0700 Created attachment 460120 Patch 1874947 2 460121 koivisto 2022-06-09 03:07:05 -0700 Created attachment 460121 Patch 1874948 3 460122 koivisto 2022-06-09 03:11:12 -0700 Created attachment 460122 Patch 1874950 4 460123 koivisto 2022-06-09 03:27:41 -0700 Created attachment 460123 Patch 1874976 5 ews-feeder 2022-06-09 06:15:36 -0700 Committed r295418 (251424@main): <https://commits.webkit.org/251424@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460123. 1874978 6 webkit-bug-importer 2022-06-09 06:16:18 -0700 <rdar://problem/94722411> 460120 2022-06-09 03:05:08 -0700 2022-06-09 03:07:00 -0700 Patch bug-241457-20220609130506.patch text/plain 13322 koivisto RnJvbSAyNGE4YmIwY2FkNDlhMDBhZDA2ZWVlOTliMmJmZTY4ZTM4ODVhNzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDkgSnVuIDIwMjIgMTI6NTU6MTUgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBDb3JyZWN0bHkgcmVzb2x2ZSBxdWVyaWVzIHdoZW4KIGNvbnRhaW5l ciBzaXplIGlzIGFmZmVjdGVkIGJ5IGEgc3Vic2VxdWVudCBzaWJsaW5nCiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCldlIGN1cnJlbnRseSBvbmx5IHRha2Ugc3R5bGUgY2hhbmdlcyBiZWZvcmUgdGhlIGNv bnRhaW5lciBpbnRvIGFjY291bnQuCgpUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHF1ZXJ5IGNvbnRh aW5lciByZXNvbHV0aW9uIHNvIHRoYXQgd2hlbmV2ZXIgd2UgZW5jb3VudGVyIGEgcXVlcnkgY29u dGFpbmVyCndlIHNraXAgdGhlIHN1YnRyZWUgYW5kIHJlc3RhcnQgdGhlIHJlc29sdXRpb24gZnJv bSB0aGUgbWFpbiByZXNvbHV0aW9uIGxvb3AuIFRoaXMgd2F5IHdlCmNhbiBvcHRpbWl6ZSBhd2F5 IHVubmVjZXNzYXJ5IGxheW91dHMgd2hpbGUgYWxzbyBoYW5kbGluZyBiYWNrd2FyZCBkZXBlbmRl bmNpZXMuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3kt ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHA6CihXZWJDb3Jl OjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKCkxvb3AgYWxzbyB3aGVuIHRoZXJlIGFyZSBubyBz dHlsZSBjaGFuZ2VzIHRvIGFwcGx5IGJ1dCB0aGVyZSBhcmUgdW5yZXNvbHZlZCBjb250YWluZXIu IEluIHRoaXMgY2FzZSB3ZSBqdXN0IHJlc3VtZQp0aGUgc3R5bGUgcmVzb2x1dGlvbiB3aGVyZSB3 ZSBsZWZ0IGl0LgoKKiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHA6CihXZWJDb3JlOjpF bGVtZW50OjppbnZhbGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UpOgoKSW52YWxpZGF0ZSBh bGwgZGVzY2VuZGFudHMgd2hlbiBhIHF1ZXJ5IGNvbnRhaW5lciBpcyByZXNpemVkLiBJbiBwcmFj dGljZSB3ZSBlbmRlZCB1cCBjb21wdXRpbmcgdGhlbSBhbGwgYW55d2F5LgoKKiBTb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZUNoYW5nZS5jcHA6CihXZWJDb3JlOjpTdHlsZTo6ZGV0ZXJtaW5lQ2hh bmdlKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oOgoKQWRkIG5ldyBEZXNj ZW5kYW50cyB2YWx1ZSBmb3Igd2hlbiBjb250YWluZXIgdHlwZSBvciBuYW1lIGNoYW5nZXMuCgoq IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoKKFdlYkNvcmU6OlN0 eWxlOjpUcmVlUmVzb2x2ZXI6OmNvbXB1dGVEZXNjZW5kYW50c1RvUmVzb2x2ZSk6CihXZWJDb3Jl OjpTdHlsZTo6VHJlZVJlc29sdmVyOjpwdXNoUGFyZW50KToKKFdlYkNvcmU6OlN0eWxlOjpUcmVl UmVzb2x2ZXI6OnBvcFBhcmVudCk6CihXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNv bHZlQ29tcG9zZWRUcmVlKToKKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OmRldGVybWlu ZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKToKClVzZSB0d28gYnVja2V0cyBmb3IgdW5yZXNvbHZlZCBh bmQgcmVzb2x2ZWQgY29udGFpbmVycy4gVXNlIHRoZSByZXNvbHZlZCBidWNrZXQgdG8gYXZvaWQK cmVjb21wdXRpbmcgY29udGFpbmVycyB3ZSBoYXZlIHJlc29sdmVkIGFscmVhZHkuCgooV2ViQ29y ZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CgpNb3ZlIHRoZSBjb250YWluZXJzIGZy b20gdGhlIHVucmVzb2x2ZWQgdG8gcmVzb2x2ZWQgYnVja2V0IGluIHRoZSBiZWdpbm5pbmcuCgoo V2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIpOiBEZWxl dGVkLgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmg6Ci0tLQogU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTYgKysrLS0tCiBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgICAgICAgICAgICAgICAgfCAgNCArLQogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwICAgICAgICAgIHwgIDYgKy0tCiBTb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oICAgICAgICAgICAgfCAgMSArCiBTb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgICAgfCA1NCArKysrKysrKysrKy0t LS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oICAgICAgfCAg NSArLQogLi4uL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0ICAgIHwgIDgg Ky0tCiA3IGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGVhNTAwZmQ5Y2E4My4uNGM1NWFiZWI5YWU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIwOTUsMTMgKzIwOTUsMTUgQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgU3R5bGU6 OlRyZWVSZXNvbHZlciByZXNvbHZlcigqdGhpcywgV1RGTW92ZShtX3BlbmRpbmdSZW5kZXJUcmVl VXBkYXRlKSk7CiAgICAgICAgIGF1dG8gc3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7 CiAKLSAgICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMo KSAmJiBzdHlsZVVwZGF0ZSkgewotICAgICAgICAgICAgU2V0Rm9yU2NvcGUgcmVzb2x2aW5nQ29u dGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzLCB0cnVlKTsK LQotICAgICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZShXVEZNb3ZlKHN0eWxlVXBkYXRlKSk7Ci0K LSAgICAgICAgICAgIGlmIChmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkp Ci0gICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAg ICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMoKSkgewor ICAgICAgICAgICAgaWYgKHN0eWxlVXBkYXRlKSB7CisgICAgICAgICAgICAgICAgU2V0Rm9yU2Nv cGUgcmVzb2x2aW5nQ29udGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJR dWVyaWVzLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB1cGRhdGVS ZW5kZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgICAgIGlmIChm cmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAg ICAgIGZyYW1lVmlldy5sYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggYmYzYWYyN2FkOGZlLi41MDlhODlhNjU2YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTIyNjcsOCArMjI2Nyw4IEBAIHZvaWQgRWxlbWVudDo6 aW52YWxpZGF0ZVN0eWxlRm9yU3VidHJlZUludGVybmFsKCkKIAogdm9pZCBFbGVtZW50OjppbnZh bGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UoKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGRv ZXNuJ3QgcmVhbGx5IG5lZWQgdG8gcmVjb21wdXRlIHRoZSBlbGVtZW50IHN0eWxlLgotICAgIE5v ZGU6OmludmFsaWRhdGVTdHlsZShTdHlsZTo6VmFsaWRpdHk6OkVsZW1lbnRJbnZhbGlkKTsKKyAg ICAvLyBGSVhNRTogSWRlYWxseSB3ZSB3b3VsZCBqdXN0IHJlY29tcHV0ZSB0aGluZ3MgdGhhdCBh cmUgYWN0dWFsbHkgYWZmZWN0ZWQgYnkgY29udGFpbmVycyBxdWVyaWVzIHdpdGhpbiB0aGUgc3Vi dHJlZS4KKyAgICBOb2RlOjppbnZhbGlkYXRlU3R5bGUoU3R5bGU6OlZhbGlkaXR5OjpTdWJ0cmVl SW52YWxpZCk7CiB9CiAKIHZvaWQgRWxlbWVudDo6aW52YWxpZGF0ZUV2ZW50TGlzdGVuZXJSZWdp b25zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcAppbmRleCBkNzY4YzY0MDU3NDAu LmY5NjFhODI2YjA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFu Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcApAQCAtNTcs MTEgKzU3LDExIEBAIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUmIHMx LCBjb25zdCBSZW5kZXJTdHlsZSYgczIpCiAgICAgaWYgKHMxLmhhc1RleHRDb21iaW5lKCkgIT0g czIuaGFzVGV4dENvbWJpbmUoKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6UmVuZGVyZXI7CiAK LSAgICBpZiAoIXMxLmRlc2NlbmRhbnRBZmZlY3RpbmdOb25Jbmhlcml0ZWRQcm9wZXJ0aWVzRXF1 YWwoczIpKQotICAgICAgICByZXR1cm4gQ2hhbmdlOjpJbmhlcml0ZWQ7Ci0KICAgICAvLyBRdWVy eSBjb250YWluZXIgY2hhbmdlcyBhZmZlY3QgZGVzY2VuZGFudCBzdHlsZS4KICAgICBpZiAoczEu Y29udGFpbmVyVHlwZSgpICE9IHMyLmNvbnRhaW5lclR5cGUoKSB8fCBzMS5jb250YWluZXJOYW1l cygpICE9IHMyLmNvbnRhaW5lck5hbWVzKCkpCisgICAgICAgIHJldHVybiBDaGFuZ2U6OkRlc2Nl bmRhbnRzOworCisgICAgaWYgKCFzMS5kZXNjZW5kYW50QWZmZWN0aW5nTm9uSW5oZXJpdGVkUHJv cGVydGllc0VxdWFsKHMyKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6SW5oZXJpdGVkOwogCiAg ICAgaWYgKCFzMS5ub25GYXN0UGF0aEluaGVyaXRlZEVxdWFsKHMyKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUNoYW5nZS5oCmluZGV4IDdiYmNhM2M4YTUzZC4uYzlmMmIzOTkxYTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQ2hhbmdlLmgKQEAgLTM2LDYgKzM2LDcgQEAgZW51bSBjbGFzcyBDaGFuZ2Ug OiB1aW50OF90IHsKICAgICBOb25Jbmhlcml0ZWQsCiAgICAgRmFzdFBhdGhJbmhlcml0ZWQsCiAg ICAgSW5oZXJpdGVkLAorICAgIERlc2NlbmRhbnRzLAogICAgIFJlbmRlcmVyCiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKaW5kZXggNGU5M2IxMGExNWRl Li40MjUwOTY0NGU2NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJl ZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZl ci5jcHAKQEAgLTE5OSw2ICsxOTksOCBAQCBhdXRvIFRyZWVSZXNvbHZlcjo6Y29tcHV0ZURlc2Nl bmRhbnRzVG9SZXNvbHZlKENoYW5nZSBjaGFuZ2UsIFZhbGlkaXR5IHZhbGlkaXR5LAogICAgIGNh c2UgQ2hhbmdlOjpGYXN0UGF0aEluaGVyaXRlZDoKICAgICBjYXNlIENoYW5nZTo6SW5oZXJpdGVk OgogICAgICAgICByZXR1cm4gRGVzY2VuZGFudHNUb1Jlc29sdmU6OkNoaWxkcmVuOworICAgIGNh c2UgQ2hhbmdlOjpEZXNjZW5kYW50czoKKyAgICAgICAgcmV0dXJuIERlc2NlbmRhbnRzVG9SZXNv bHZlOjpBbGw7CiAgICAgY2FzZSBDaGFuZ2U6OlJlbmRlcmVyOgogICAgICAgICByZXR1cm4gRGVz Y2VuZGFudHNUb1Jlc29sdmU6OkFsbDsKICAgICB9OwpAQCAtNjI1LDYgKzYyNyw4IEBAIEVsZW1l bnRVcGRhdGUgVHJlZVJlc29sdmVyOjpjcmVhdGVBbmltYXRlZEVsZW1lbnRVcGRhdGUoc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0CiB2b2lkIFRyZWVSZXNvbHZlcjo6cHVzaFBhcmVudChFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIENoYW5nZSBjaGFuZ2UsIERlc2Nl bmRhbnRzVG9SZXNvbHZlIGRlc2NlbmRhbnRzVG9SZXNvbHZlKQogewogICAgIHNjb3BlKCkuc2Vs ZWN0b3JNYXRjaGluZ1N0YXRlLnNlbGVjdG9yRmlsdGVyLnB1c2hQYXJlbnQoJmVsZW1lbnQpOwor ICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgIT0gQ29udGFpbmVyVHlwZTo6Tm9uZSkKKyAg ICAgICAgc2NvcGUoKS5zZWxlY3Rvck1hdGNoaW5nU3RhdGUucXVlcnlDb250YWluZXJzLmFwcGVu ZChlbGVtZW50KTsKIAogICAgIFBhcmVudCBwYXJlbnQoZWxlbWVudCwgc3R5bGUsIGNoYW5nZSwg ZGVzY2VuZGFudHNUb1Jlc29sdmUpOwogCkBAIC02NDUsNyArNjQ5LDkgQEAgdm9pZCBUcmVlUmVz b2x2ZXI6OnBvcFBhcmVudCgpCiAgICAgYXV0byYgcGFyZW50RWxlbWVudCA9ICpwYXJlbnQoKS5l bGVtZW50OwogCiAgICAgcGFyZW50RWxlbWVudC5zZXRIYXNWYWxpZFN0eWxlKCk7Ci0gICAgcGFy ZW50RWxlbWVudC5jbGVhckNoaWxkTmVlZHNTdHlsZVJlY2FsYygpOworICAgIC8vIERvbid0IGNs ZWFyIHRoZSBjaGlsZCBmbGFnIGlmIHRoZSBhcmUgdW5yZXNvbHZlZCBjb250YWluZXJzIGJlY2F1 c2Ugd2UgYXJlIGdvaW5nIHRvIHJlc3VtZSB0aGUgc3R5bGUgcmVzb2x1dGlvbi4KKyAgICBpZiAo bV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzLmlzRW1wdHkoKSkKKyAgICAgICAgcGFyZW50RWxl bWVudC5jbGVhckNoaWxkTmVlZHNTdHlsZVJlY2FsYygpOwogCiAgICAgaWYgKHBhcmVudCgpLmRp ZFB1c2hTY29wZSkKICAgICAgICAgcG9wU2NvcGUoKTsKQEAgLTgzNCwxMCArODQwLDIxIEBAIHZv aWQgVHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKCkKICAgICAgICAgaWYgKCFzdHls ZSkKICAgICAgICAgICAgIHJlc2V0U3R5bGVGb3JOb25SZW5kZXJlZERlc2NlbmRhbnRzKGVsZW1l bnQpOwogCi0gICAgICAgIGJvb2wgc2hvdWxkSXRlcmF0ZUNoaWxkcmVuID0gc3R5bGUgJiYgKGVs ZW1lbnQuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZGVzY2VuZGFudHNUb1Jlc29sdmUgIT0g RGVzY2VuZGFudHNUb1Jlc29sdmU6Ok5vbmUpOworICAgICAgICBhdXRvIHF1ZXJ5Q29udGFpbmVy QWN0aW9uID0gZGV0ZXJtaW5lUXVlcnlDb250YWluZXJBY3Rpb24oZWxlbWVudCwgc3R5bGUsIHBy ZXZpb3VzQ29udGFpbmVyVHlwZSk7CiAKLSAgICAgICAgaWYgKHN0eWxlICYmIHVwZGF0ZVF1ZXJ5 Q29udGFpbmVyKGVsZW1lbnQsICpzdHlsZSwgcHJldmlvdXNDb250YWluZXJUeXBlKSA9PSBRdWVy eUNvbnRhaW5lckFjdGlvbjo6TGF5b3V0KQotICAgICAgICAgICAgc2hvdWxkSXRlcmF0ZUNoaWxk cmVuID0gZmFsc2U7CisgICAgICAgIGJvb2wgc2hvdWxkSXRlcmF0ZUNoaWxkcmVuID0gWyZdIHsK KyAgICAgICAgICAgIC8vIGRpc3BsYXk6Om5vbmUsIG5vIG5lZWQgdG8gcmVzb2x2ZSBkZXNjZW5k YW50cy4KKyAgICAgICAgICAgIGlmICghc3R5bGUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICAgICAgLy8gU3R5bGUgcmVzb2x1dGlvbiB3aWxsIGJlIHJlc3VtZWQgYWZ0 ZXIgdGhlIGNvbnRhaW5lciBoYXMgYmVlbiByZXNvbHZlZC4KKyAgICAgICAgICAgIGlmIChxdWVy eUNvbnRhaW5lckFjdGlvbiA9PSBRdWVyeUNvbnRhaW5lckFjdGlvbjo6UmVzb2x2ZSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gZWxlbWVudC5jaGls ZE5lZWRzU3R5bGVSZWNhbGMoKSB8fCBkZXNjZW5kYW50c1RvUmVzb2x2ZSAhPSBEZXNjZW5kYW50 c1RvUmVzb2x2ZTo6Tm9uZTsKKyAgICAgICAgfSgpOworCisgICAgICAgIC8vIEVuc3VyZSB3ZSBy ZXNwZWN0IERlc2NlbmRhbnRzVG9SZXNvbHZlOjpBbGwgYWZ0ZXIgcmVzdW1pbmcgdGhlIHN0eWxl IHJlc29sdXRpb24uCisgICAgICAgIGlmIChxdWVyeUNvbnRhaW5lckFjdGlvbiA9PSBRdWVyeUNv bnRhaW5lckFjdGlvbjo6UmVzb2x2ZSAmJiBkZXNjZW5kYW50c1RvUmVzb2x2ZSA9PSBEZXNjZW5k YW50c1RvUmVzb2x2ZTo6QWxsKQorICAgICAgICAgICAgZWxlbWVudC5pbnZhbGlkYXRlU3R5bGVG b3JTdWJ0cmVlSW50ZXJuYWwoKTsKIAogICAgICAgICBpZiAoIW1fZGlkU2VlUGVuZGluZ1N0eWxl c2hlZXQpCiAgICAgICAgICAgICBtX2RpZFNlZVBlbmRpbmdTdHlsZXNoZWV0ID0gaGFzTG9hZGlu Z1N0eWxlc2hlZXQobV9kb2N1bWVudC5zdHlsZVNjb3BlKCksIGVsZW1lbnQsICFzaG91bGRJdGVy YXRlQ2hpbGRyZW4pOwpAQCAtODYwLDM5ICs4NzcsMzQgQEAgdm9pZCBUcmVlUmVzb2x2ZXI6OnJl c29sdmVDb21wb3NlZFRyZWUoKQogICAgIHBvcFBhcmVudHNUb0RlcHRoKDEpOwogfQogCi1hdXRv IFRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIoRWxlbWVudCYgZWxlbWVudCwgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBDb250YWluZXJUeXBlIHByZXZpb3VzQ29udGFpbmVyVHlw ZSkgLT4gUXVlcnlDb250YWluZXJBY3Rpb24KK2F1dG8gVHJlZVJlc29sdmVyOjpkZXRlcm1pbmVR dWVyeUNvbnRhaW5lckFjdGlvbihFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSog c3R5bGUsIENvbnRhaW5lclR5cGUgcHJldmlvdXNDb250YWluZXJUeXBlKSAtPiBRdWVyeUNvbnRh aW5lckFjdGlvbgogewotICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgIT0gQ29udGFpbmVy VHlwZTo6Tm9uZSkKLSAgICAgICAgc2NvcGUoKS5zZWxlY3Rvck1hdGNoaW5nU3RhdGUucXVlcnlD b250YWluZXJzLmFwcGVuZChlbGVtZW50KTsKLQotICAgIGlmIChtX3VucmVzb2x2ZWRRdWVyeUNv bnRhaW5lcnMucmVtb3ZlKCZlbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIFF1ZXJ5Q29udGFpbmVy QWN0aW9uOjpDb250aW51ZTsKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICByZXR1cm4gUXVlcnlD b250YWluZXJBY3Rpb246Ok5vbmU7CiAKLSAgICAvLyBSZW5kZXIgdHJlZSBuZWVkcyB0byBiZSB1 cGRhdGVkIGJlZm9yZSBwcm9jZWVkaW5nIHRvIGNoaWxkcmVuIGFsc28gaWYgd2UgaGF2ZSBhIGZv cm1lciBxdWVyeSBjb250YWluZXIKLSAgICAvLyBiZWNhdXNlIGNvbnRhaW5lciBxdWVyeSByZXNv bHV0aW9uIGZvciBkZXNjZW5kYW50cyByZWxpZXMgb24gaXQgYmVpbmcgdXAtdG8tZGF0ZS4KLSAg ICBpZiAoc3R5bGUuY29udGFpbmVyVHlwZSgpID09IENvbnRhaW5lclR5cGU6Ok5vbmUgJiYgcHJl dmlvdXNDb250YWluZXJUeXBlID09IENvbnRhaW5lclR5cGU6Ok5vbmUpCisgICAgLy8gRklYTUU6 IFJlbmRlciB0cmVlIG5lZWRzIHRvIGJlIHVwZGF0ZWQgYmVmb3JlIHByb2NlZWRpbmcgdG8gY2hp bGRyZW4gYWxzbyBpZiB3ZSBoYXZlIGEgZm9ybWVyIHF1ZXJ5IGNvbnRhaW5lcgorICAgIC8vIGJl Y2F1c2UgY29udGFpbmVyIHVuaXQgcmVzb2x1dGlvbiBmb3IgZGVzY2VuZGFudHMgcmVsaWVzIG9u IGl0IGJlaW5nIHVwLXRvLWRhdGUuCisgICAgaWYgKHN0eWxlLT5jb250YWluZXJUeXBlKCkgPT0g Q29udGFpbmVyVHlwZTo6Tm9uZSAmJiBwcmV2aW91c0NvbnRhaW5lclR5cGUgPT0gQ29udGFpbmVy VHlwZTo6Tm9uZSkKICAgICAgICAgcmV0dXJuIFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpOb25lOwog Ci0gICAgaWYgKG1fdXBkYXRlLT5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBRdWVyeUNvbnRh aW5lckFjdGlvbjo6Q29udGludWU7CisgICAgaWYgKG1fcmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMu Y29udGFpbnMoJmVsZW1lbnQpKQorICAgICAgICByZXR1cm4gUXVlcnlDb250YWluZXJBY3Rpb246 Ok5vbmU7CiAKLSAgICAvLyBCYWlsIG91dCBmcm9tIFRyZWVSZXNvbHZlciB0byBidWlsZCBhIHJl bmRlciB0cmVlIGFuZCBkbyBhIGxheW91dC4gUmVzb2x1dGlvbiBjb250aW51ZXMgYWZ0ZXIuCiAg ICAgbV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzLmFkZCgmZWxlbWVudCk7Ci0gICAgcmV0dXJu IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpMYXlvdXQ7CisgICAgcmV0dXJuIFF1ZXJ5Q29udGFpbmVy QWN0aW9uOjpSZXNvbHZlOwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBUcmVlUmVzb2x2 ZXI6OnJlc29sdmUoKQogeworICAgIG1fcmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuYWRkKG1fdW5y ZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5iZWdpbigpLCBtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5l cnMuZW5kKCkpOworICAgIG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5jbGVhcigpOworCiAg ICAgRWxlbWVudCogZG9jdW1lbnRFbGVtZW50ID0gbV9kb2N1bWVudC5kb2N1bWVudEVsZW1lbnQo KTsKICAgICBpZiAoIWRvY3VtZW50RWxlbWVudCkgewogICAgICAgICBtX2RvY3VtZW50LnN0eWxl U2NvcGUoKS5yZXNvbHZlcigpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAg ICAvLyBGSVhNRTogSnVzdCBuZWVkIHRvIHJlc3RvcmUgdGhlIGFuY2VzdG9yIG1hcmtpbmcuCi0g ICAgZm9yIChhdXRvJiBxdWVyeUNvbnRhaW5lciA6IG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVy cykKLSAgICAgICAgcXVlcnlDb250YWluZXItPmludmFsaWRhdGVTdHlsZUZvclN1YnRyZWVJbnRl cm5hbCgpOwotCiAgICAgaWYgKCFkb2N1bWVudEVsZW1lbnQtPmNoaWxkTmVlZHNTdHlsZVJlY2Fs YygpICYmICFkb2N1bWVudEVsZW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSkKICAgICAgICAgcmV0 dXJuIFdURk1vdmUobV91cGRhdGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVRyZWVSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVz b2x2ZXIuaAppbmRleCA0MmFkNTVkYTlkYmQuLjYwNDg4MDkyYWYzOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCkBAIC02Myw4ICs2Myw4IEBAIHByaXZhdGU6CiAK ICAgICB2b2lkIHJlc29sdmVDb21wb3NlZFRyZWUoKTsKIAotICAgIGVudW0gY2xhc3MgUXVlcnlD b250YWluZXJBY3Rpb24gOiB1aW50OF90IHsgTm9uZSwgQ29udGludWUsIExheW91dCB9OwotICAg IFF1ZXJ5Q29udGFpbmVyQWN0aW9uIHVwZGF0ZVF1ZXJ5Q29udGFpbmVyKEVsZW1lbnQmLCBjb25z dCBSZW5kZXJTdHlsZSYsIENvbnRhaW5lclR5cGUgcHJldmlvdXNDb250YWluZXJUeXBlKTsKKyAg ICBlbnVtIGNsYXNzIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIDogdWludDhfdCB7IE5vbmUsIFJlc29s dmUgfTsKKyAgICBRdWVyeUNvbnRhaW5lckFjdGlvbiBkZXRlcm1pbmVRdWVyeUNvbnRhaW5lckFj dGlvbihFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBDb250YWluZXJUeXBlIHByZXZpb3Vz Q29udGFpbmVyVHlwZSk7CiAKICAgICBlbnVtIGNsYXNzIERlc2NlbmRhbnRzVG9SZXNvbHZlIDog dWludDhfdCB7IE5vbmUsIENoaWxkcmVuV2l0aEV4cGxpY2l0SW5oZXJpdCwgQ2hpbGRyZW4sIEFs bCB9OwogICAgIHN0ZDo6cGFpcjxFbGVtZW50VXBkYXRlLCBEZXNjZW5kYW50c1RvUmVzb2x2ZT4g cmVzb2x2ZUVsZW1lbnQoRWxlbWVudCYsIFJlc29sdXRpb25UeXBlKTsKQEAgLTEzMCw2ICsxMzAs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9kaWRTZWVQZW5kaW5nU3R5bGVzaGVldCB7IGZhbHNl IH07CiAKICAgICBIYXNoU2V0PFJlZlB0cjxFbGVtZW50Pj4gbV91bnJlc29sdmVkUXVlcnlDb250 YWluZXJzOworICAgIEhhc2hTZXQ8UmVmUHRyPEVsZW1lbnQ+PiBtX3Jlc29sdmVkUXVlcnlDb250 YWluZXJzOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFVwZGF0ZT4gbV91cGRhdGU7CiB9OwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvc2libGluZy1sYXlvdXQtZGVwZW5kZW5jeS1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5nLWxheW91dC1kZXBlbmRl bmN5LWV4cGVjdGVkLnR4dAppbmRleCA4ODY5MjZlYmEzMzIuLjk1NWNlZjc5Nzg5OSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvc2libGluZy1sYXlvdXQtZGVwZW5kZW5jeS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvc2libGluZy1sYXlvdXQtZGVwZW5k ZW5jeS1leHBlY3RlZC50eHQKQEAgLTEsNyArMSw3IEBACiBYWFhYCiAKLUZBSUwgU2libGluZyBz dHlsZSBtdXRhdGlvbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgot RkFJTCBTaWJsaW5nIHN0eWxlIG11dGF0aW9uLCBwYXJlbnQgaXMgYWZmZWN0ZWQgYXNzZXJ0X2Vx dWFsczogZXhwZWN0ZWQgIjEwIiBidXQgZ290ICIyMCIKLUZBSUwgU2libGluZyBzdHlsZSBtdXRh dGlvbiwgYW5jZXN0b3IgaXMgYWZmZWN0ZWQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjEwIiBi dXQgZ290ICIyMCIKLUZBSUwgU2libGluZyB0ZXh0IG11dGF0aW9uIGFzc2VydF9lcXVhbHM6IGV4 cGVjdGVkICIxMCIgYnV0IGdvdCAiMjAiCitQQVNTIFNpYmxpbmcgc3R5bGUgbXV0YXRpb24KK1BB U1MgU2libGluZyBzdHlsZSBtdXRhdGlvbiwgcGFyZW50IGlzIGFmZmVjdGVkCitQQVNTIFNpYmxp bmcgc3R5bGUgbXV0YXRpb24sIGFuY2VzdG9yIGlzIGFmZmVjdGVkCitQQVNTIFNpYmxpbmcgdGV4 dCBtdXRhdGlvbgogCi0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo= 460121 2022-06-09 03:07:05 -0700 2022-06-09 03:11:08 -0700 Patch bug-241457-20220609130703.patch text/plain 13279 koivisto RnJvbSAxZjZhYzFjMDcxOTc3ZmU0Yjc4MzNlM2I5Y2M2ZWE4Y2NkMzZlZjE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDkgSnVuIDIwMjIgMTI6NTU6MTUgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBDb3JyZWN0bHkgcmVzb2x2ZSBxdWVyaWVzIHdoZW4KIGNvbnRhaW5l ciBzaXplIGlzIGFmZmVjdGVkIGJ5IGEgc3Vic2VxdWVudCBzaWJsaW5nCiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCldlIGN1cnJlbnRseSBvbmx5IHRha2Ugc3R5bGUgY2hhbmdlcyBiZWZvcmUgdGhlIGNv bnRhaW5lciBpbnRvIGFjY291bnQuCgpUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHF1ZXJ5IGNvbnRh aW5lciByZXNvbHV0aW9uIHNvIHRoYXQgd2hlbmV2ZXIgd2UgZW5jb3VudGVyIGEgcXVlcnkgY29u dGFpbmVyCndlIHNraXAgdGhlIHN1YnRyZWUgYW5kIHJlc3RhcnQgdGhlIHJlc29sdXRpb24gZnJv bSB0aGUgbWFpbiByZXNvbHV0aW9uIGxvb3AuIFRoaXMgd2F5IHdlCmNhbiBvcHRpbWl6ZSBhd2F5 IHVubmVjZXNzYXJ5IGxheW91dHMgd2hpbGUgYWxzbyBoYW5kbGluZyBiYWNrd2FyZCBkZXBlbmRl bmNpZXMuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3kt ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHA6CihXZWJDb3Jl OjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKCkxvb3AgYWxzbyB3aGVuIHRoZXJlIGFyZSBubyBz dHlsZSBjaGFuZ2VzIHRvIGFwcGx5IGJ1dCB0aGVyZSBhcmUgdW5yZXNvbHZlZCBjb250YWluZXIu IEluIHRoaXMgY2FzZSB3ZSBqdXN0IHJlc3VtZQp0aGUgc3R5bGUgcmVzb2x1dGlvbiB3aGVyZSB3 ZSBsZWZ0IGl0LgoKKiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHA6CihXZWJDb3JlOjpF bGVtZW50OjppbnZhbGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UpOgoKSW52YWxpZGF0ZSBh bGwgZGVzY2VuZGFudHMgd2hlbiBhIHF1ZXJ5IGNvbnRhaW5lciBpcyByZXNpemVkLiBJbiBwcmFj dGljZSB3ZSBlbmRlZCB1cCBjb21wdXRpbmcgdGhlbSBhbGwgYW55d2F5LgoKKiBTb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZUNoYW5nZS5jcHA6CihXZWJDb3JlOjpTdHlsZTo6ZGV0ZXJtaW5lQ2hh bmdlKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oOgoKQWRkIG5ldyBEZXNj ZW5kYW50cyB2YWx1ZSBmb3Igd2hlbiBjb250YWluZXIgdHlwZSBvciBuYW1lIGNoYW5nZXMuCgoq IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoKKFdlYkNvcmU6OlN0 eWxlOjpUcmVlUmVzb2x2ZXI6OmNvbXB1dGVEZXNjZW5kYW50c1RvUmVzb2x2ZSk6CihXZWJDb3Jl OjpTdHlsZTo6VHJlZVJlc29sdmVyOjpwdXNoUGFyZW50KToKKFdlYkNvcmU6OlN0eWxlOjpUcmVl UmVzb2x2ZXI6OnBvcFBhcmVudCk6CihXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNv bHZlQ29tcG9zZWRUcmVlKToKKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OmRldGVybWlu ZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKToKClVzZSB0d28gYnVja2V0cyBmb3IgdW5yZXNvbHZlZCBh bmQgcmVzb2x2ZWQgY29udGFpbmVycy4gVXNlIHRoZSByZXNvbHZlZCBidWNrZXQgdG8gYXZvaWQK cmVjb21wdXRpbmcgY29udGFpbmVycyB3ZSBoYXZlIHJlc29sdmVkIGFscmVhZHkuCgooV2ViQ29y ZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CgpNb3ZlIHRoZSBjb250YWluZXJzIGZy b20gdGhlIHVucmVzb2x2ZWQgdG8gcmVzb2x2ZWQgYnVja2V0IGluIHRoZSBiZWdpbm5pbmcuCgoo V2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIpOiBEZWxl dGVkLgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmg6Ci0tLQogU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTYgKysrLS0tCiBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgICAgICAgICAgICAgICAgfCAgNCArLQogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwICAgICAgICAgIHwgIDYgKy0tCiBTb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oICAgICAgICAgICAgfCAgMSArCiBTb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgICAgfCA1MyArKysrKysrKysrKy0t LS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oICAgICAgfCAg NSArLQogLi4uL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0ICAgIHwgIDgg Ky0tCiA3IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGVhNTAwZmQ5Y2E4My4uNGM1NWFiZWI5YWU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIwOTUsMTMgKzIwOTUsMTUgQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgU3R5bGU6 OlRyZWVSZXNvbHZlciByZXNvbHZlcigqdGhpcywgV1RGTW92ZShtX3BlbmRpbmdSZW5kZXJUcmVl VXBkYXRlKSk7CiAgICAgICAgIGF1dG8gc3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7 CiAKLSAgICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMo KSAmJiBzdHlsZVVwZGF0ZSkgewotICAgICAgICAgICAgU2V0Rm9yU2NvcGUgcmVzb2x2aW5nQ29u dGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzLCB0cnVlKTsK LQotICAgICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZShXVEZNb3ZlKHN0eWxlVXBkYXRlKSk7Ci0K LSAgICAgICAgICAgIGlmIChmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkp Ci0gICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAg ICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMoKSkgewor ICAgICAgICAgICAgaWYgKHN0eWxlVXBkYXRlKSB7CisgICAgICAgICAgICAgICAgU2V0Rm9yU2Nv cGUgcmVzb2x2aW5nQ29udGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJR dWVyaWVzLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB1cGRhdGVS ZW5kZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgICAgIGlmIChm cmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAg ICAgIGZyYW1lVmlldy5sYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggYmYzYWYyN2FkOGZlLi41MDlhODlhNjU2YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTIyNjcsOCArMjI2Nyw4IEBAIHZvaWQgRWxlbWVudDo6 aW52YWxpZGF0ZVN0eWxlRm9yU3VidHJlZUludGVybmFsKCkKIAogdm9pZCBFbGVtZW50OjppbnZh bGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UoKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGRv ZXNuJ3QgcmVhbGx5IG5lZWQgdG8gcmVjb21wdXRlIHRoZSBlbGVtZW50IHN0eWxlLgotICAgIE5v ZGU6OmludmFsaWRhdGVTdHlsZShTdHlsZTo6VmFsaWRpdHk6OkVsZW1lbnRJbnZhbGlkKTsKKyAg ICAvLyBGSVhNRTogSWRlYWxseSB3ZSB3b3VsZCBqdXN0IHJlY29tcHV0ZSB0aGluZ3MgdGhhdCBh cmUgYWN0dWFsbHkgYWZmZWN0ZWQgYnkgY29udGFpbmVycyBxdWVyaWVzIHdpdGhpbiB0aGUgc3Vi dHJlZS4KKyAgICBOb2RlOjppbnZhbGlkYXRlU3R5bGUoU3R5bGU6OlZhbGlkaXR5OjpTdWJ0cmVl SW52YWxpZCk7CiB9CiAKIHZvaWQgRWxlbWVudDo6aW52YWxpZGF0ZUV2ZW50TGlzdGVuZXJSZWdp b25zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcAppbmRleCBkNzY4YzY0MDU3NDAu LmY5NjFhODI2YjA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFu Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcApAQCAtNTcs MTEgKzU3LDExIEBAIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUmIHMx LCBjb25zdCBSZW5kZXJTdHlsZSYgczIpCiAgICAgaWYgKHMxLmhhc1RleHRDb21iaW5lKCkgIT0g czIuaGFzVGV4dENvbWJpbmUoKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6UmVuZGVyZXI7CiAK LSAgICBpZiAoIXMxLmRlc2NlbmRhbnRBZmZlY3RpbmdOb25Jbmhlcml0ZWRQcm9wZXJ0aWVzRXF1 YWwoczIpKQotICAgICAgICByZXR1cm4gQ2hhbmdlOjpJbmhlcml0ZWQ7Ci0KICAgICAvLyBRdWVy eSBjb250YWluZXIgY2hhbmdlcyBhZmZlY3QgZGVzY2VuZGFudCBzdHlsZS4KICAgICBpZiAoczEu Y29udGFpbmVyVHlwZSgpICE9IHMyLmNvbnRhaW5lclR5cGUoKSB8fCBzMS5jb250YWluZXJOYW1l cygpICE9IHMyLmNvbnRhaW5lck5hbWVzKCkpCisgICAgICAgIHJldHVybiBDaGFuZ2U6OkRlc2Nl bmRhbnRzOworCisgICAgaWYgKCFzMS5kZXNjZW5kYW50QWZmZWN0aW5nTm9uSW5oZXJpdGVkUHJv cGVydGllc0VxdWFsKHMyKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6SW5oZXJpdGVkOwogCiAg ICAgaWYgKCFzMS5ub25GYXN0UGF0aEluaGVyaXRlZEVxdWFsKHMyKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUNoYW5nZS5oCmluZGV4IDdiYmNhM2M4YTUzZC4uYzlmMmIzOTkxYTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQ2hhbmdlLmgKQEAgLTM2LDYgKzM2LDcgQEAgZW51bSBjbGFzcyBDaGFuZ2Ug OiB1aW50OF90IHsKICAgICBOb25Jbmhlcml0ZWQsCiAgICAgRmFzdFBhdGhJbmhlcml0ZWQsCiAg ICAgSW5oZXJpdGVkLAorICAgIERlc2NlbmRhbnRzLAogICAgIFJlbmRlcmVyCiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKaW5kZXggNGU5M2IxMGExNWRl Li4wN2RiMGM2YjFhNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJl ZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZl ci5jcHAKQEAgLTE5OSw2ICsxOTksNyBAQCBhdXRvIFRyZWVSZXNvbHZlcjo6Y29tcHV0ZURlc2Nl bmRhbnRzVG9SZXNvbHZlKENoYW5nZSBjaGFuZ2UsIFZhbGlkaXR5IHZhbGlkaXR5LAogICAgIGNh c2UgQ2hhbmdlOjpGYXN0UGF0aEluaGVyaXRlZDoKICAgICBjYXNlIENoYW5nZTo6SW5oZXJpdGVk OgogICAgICAgICByZXR1cm4gRGVzY2VuZGFudHNUb1Jlc29sdmU6OkNoaWxkcmVuOworICAgIGNh c2UgQ2hhbmdlOjpEZXNjZW5kYW50czoKICAgICBjYXNlIENoYW5nZTo6UmVuZGVyZXI6CiAgICAg ICAgIHJldHVybiBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6QWxsOwogICAgIH07CkBAIC02MjUsNiAr NjI2LDggQEAgRWxlbWVudFVwZGF0ZSBUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1hdGVkRWxlbWVu dFVwZGF0ZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3QKIHZvaWQgVHJlZVJlc29sdmVyOjpwdXNo UGFyZW50KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgQ2hhbmdl IGNoYW5nZSwgRGVzY2VuZGFudHNUb1Jlc29sdmUgZGVzY2VuZGFudHNUb1Jlc29sdmUpCiB7CiAg ICAgc2NvcGUoKS5zZWxlY3Rvck1hdGNoaW5nU3RhdGUuc2VsZWN0b3JGaWx0ZXIucHVzaFBhcmVu dCgmZWxlbWVudCk7CisgICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5cGUoKSAhPSBDb250YWluZXJU eXBlOjpOb25lKQorICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hpbmdTdGF0ZS5xdWVyeUNv bnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwogCiAgICAgUGFyZW50IHBhcmVudChlbGVtZW50LCBz dHlsZSwgY2hhbmdlLCBkZXNjZW5kYW50c1RvUmVzb2x2ZSk7CiAKQEAgLTY0NSw3ICs2NDgsOSBA QCB2b2lkIFRyZWVSZXNvbHZlcjo6cG9wUGFyZW50KCkKICAgICBhdXRvJiBwYXJlbnRFbGVtZW50 ID0gKnBhcmVudCgpLmVsZW1lbnQ7CiAKICAgICBwYXJlbnRFbGVtZW50LnNldEhhc1ZhbGlkU3R5 bGUoKTsKLSAgICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7Cisg ICAgLy8gRG9uJ3QgY2xlYXIgdGhlIGNoaWxkIGZsYWcgaWYgdGhlIGFyZSB1bnJlc29sdmVkIGNv bnRhaW5lcnMgYmVjYXVzZSB3ZSBhcmUgZ29pbmcgdG8gcmVzdW1lIHRoZSBzdHlsZSByZXNvbHV0 aW9uLgorICAgIGlmIChtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuaXNFbXB0eSgpKQorICAg ICAgICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CiAKICAgICBp ZiAocGFyZW50KCkuZGlkUHVzaFNjb3BlKQogICAgICAgICBwb3BTY29wZSgpOwpAQCAtODM0LDEw ICs4MzksMjEgQEAgdm9pZCBUcmVlUmVzb2x2ZXI6OnJlc29sdmVDb21wb3NlZFRyZWUoKQogICAg ICAgICBpZiAoIXN0eWxlKQogICAgICAgICAgICAgcmVzZXRTdHlsZUZvck5vblJlbmRlcmVkRGVz Y2VuZGFudHMoZWxlbWVudCk7CiAKLSAgICAgICAgYm9vbCBzaG91bGRJdGVyYXRlQ2hpbGRyZW4g PSBzdHlsZSAmJiAoZWxlbWVudC5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSB8fCBkZXNjZW5kYW50 c1RvUmVzb2x2ZSAhPSBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6Tm9uZSk7CisgICAgICAgIGF1dG8g cXVlcnlDb250YWluZXJBY3Rpb24gPSBkZXRlcm1pbmVRdWVyeUNvbnRhaW5lckFjdGlvbihlbGVt ZW50LCBzdHlsZSwgcHJldmlvdXNDb250YWluZXJUeXBlKTsKKworICAgICAgICBib29sIHNob3Vs ZEl0ZXJhdGVDaGlsZHJlbiA9IFsmXSB7CisgICAgICAgICAgICAvLyBkaXNwbGF5Ojpub25lLCBu byBuZWVkIHRvIHJlc29sdmUgZGVzY2VuZGFudHMuCisgICAgICAgICAgICBpZiAoIXN0eWxlKQor ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIFN0eWxlIHJlc29s dXRpb24gd2lsbCBiZSByZXN1bWVkIGFmdGVyIHRoZSBjb250YWluZXIgaGFzIGJlZW4gcmVzb2x2 ZWQuCisgICAgICAgICAgICBpZiAocXVlcnlDb250YWluZXJBY3Rpb24gPT0gUXVlcnlDb250YWlu ZXJBY3Rpb246OlJlc29sdmUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgcmV0dXJuIGVsZW1lbnQuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZGVzY2VuZGFu dHNUb1Jlc29sdmUgIT0gRGVzY2VuZGFudHNUb1Jlc29sdmU6Ok5vbmU7CisgICAgICAgIH0oKTsK IAotICAgICAgICBpZiAoc3R5bGUgJiYgdXBkYXRlUXVlcnlDb250YWluZXIoZWxlbWVudCwgKnN0 eWxlLCBwcmV2aW91c0NvbnRhaW5lclR5cGUpID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpMYXlv dXQpCi0gICAgICAgICAgICBzaG91bGRJdGVyYXRlQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAg Ly8gRW5zdXJlIHdlIHJlc3BlY3QgRGVzY2VuZGFudHNUb1Jlc29sdmU6OkFsbCBhZnRlciByZXN1 bWluZyB0aGUgc3R5bGUgcmVzb2x1dGlvbi4KKyAgICAgICAgaWYgKHF1ZXJ5Q29udGFpbmVyQWN0 aW9uID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpSZXNvbHZlICYmIGRlc2NlbmRhbnRzVG9SZXNv bHZlID09IERlc2NlbmRhbnRzVG9SZXNvbHZlOjpBbGwpCisgICAgICAgICAgICBlbGVtZW50Lmlu dmFsaWRhdGVTdHlsZUZvclN1YnRyZWVJbnRlcm5hbCgpOwogCiAgICAgICAgIGlmICghbV9kaWRT ZWVQZW5kaW5nU3R5bGVzaGVldCkKICAgICAgICAgICAgIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hl ZXQgPSBoYXNMb2FkaW5nU3R5bGVzaGVldChtX2RvY3VtZW50LnN0eWxlU2NvcGUoKSwgZWxlbWVu dCwgIXNob3VsZEl0ZXJhdGVDaGlsZHJlbik7CkBAIC04NjAsMzkgKzg3NiwzNCBAQCB2b2lkIFRy ZWVSZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2VkVHJlZSgpCiAgICAgcG9wUGFyZW50c1RvRGVwdGgo MSk7CiB9CiAKLWF1dG8gVHJlZVJlc29sdmVyOjp1cGRhdGVRdWVyeUNvbnRhaW5lcihFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIENvbnRhaW5lclR5cGUgcHJldmlv dXNDb250YWluZXJUeXBlKSAtPiBRdWVyeUNvbnRhaW5lckFjdGlvbgorYXV0byBUcmVlUmVzb2x2 ZXI6OmRldGVybWluZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0 IFJlbmRlclN0eWxlKiBzdHlsZSwgQ29udGFpbmVyVHlwZSBwcmV2aW91c0NvbnRhaW5lclR5cGUp IC0+IFF1ZXJ5Q29udGFpbmVyQWN0aW9uCiB7Ci0gICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5cGUo KSAhPSBDb250YWluZXJUeXBlOjpOb25lKQotICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hp bmdTdGF0ZS5xdWVyeUNvbnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwotCi0gICAgaWYgKG1fdW5y ZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5yZW1vdmUoJmVsZW1lbnQpKQotICAgICAgICByZXR1cm4g UXVlcnlDb250YWluZXJBY3Rpb246OkNvbnRpbnVlOworICAgIGlmICghc3R5bGUpCisgICAgICAg IHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6Tm9uZTsKIAotICAgIC8vIFJlbmRlciB0cmVl IG5lZWRzIHRvIGJlIHVwZGF0ZWQgYmVmb3JlIHByb2NlZWRpbmcgdG8gY2hpbGRyZW4gYWxzbyBp ZiB3ZSBoYXZlIGEgZm9ybWVyIHF1ZXJ5IGNvbnRhaW5lcgotICAgIC8vIGJlY2F1c2UgY29udGFp bmVyIHF1ZXJ5IHJlc29sdXRpb24gZm9yIGRlc2NlbmRhbnRzIHJlbGllcyBvbiBpdCBiZWluZyB1 cC10by1kYXRlLgotICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgPT0gQ29udGFpbmVyVHlw ZTo6Tm9uZSAmJiBwcmV2aW91c0NvbnRhaW5lclR5cGUgPT0gQ29udGFpbmVyVHlwZTo6Tm9uZSkK KyAgICAvLyBGSVhNRTogUmVuZGVyIHRyZWUgbmVlZHMgdG8gYmUgdXBkYXRlZCBiZWZvcmUgcHJv Y2VlZGluZyB0byBjaGlsZHJlbiBhbHNvIGlmIHdlIGhhdmUgYSBmb3JtZXIgcXVlcnkgY29udGFp bmVyCisgICAgLy8gYmVjYXVzZSBjb250YWluZXIgdW5pdCByZXNvbHV0aW9uIGZvciBkZXNjZW5k YW50cyByZWxpZXMgb24gaXQgYmVpbmcgdXAtdG8tZGF0ZS4KKyAgICBpZiAoc3R5bGUtPmNvbnRh aW5lclR5cGUoKSA9PSBDb250YWluZXJUeXBlOjpOb25lICYmIHByZXZpb3VzQ29udGFpbmVyVHlw ZSA9PSBDb250YWluZXJUeXBlOjpOb25lKQogICAgICAgICByZXR1cm4gUXVlcnlDb250YWluZXJB Y3Rpb246Ok5vbmU7CiAKLSAgICBpZiAobV91cGRhdGUtPmlzRW1wdHkoKSkKLSAgICAgICAgcmV0 dXJuIFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpDb250aW51ZTsKKyAgICBpZiAobV9yZXNvbHZlZFF1 ZXJ5Q29udGFpbmVycy5jb250YWlucygmZWxlbWVudCkpCisgICAgICAgIHJldHVybiBRdWVyeUNv bnRhaW5lckFjdGlvbjo6Tm9uZTsKIAotICAgIC8vIEJhaWwgb3V0IGZyb20gVHJlZVJlc29sdmVy IHRvIGJ1aWxkIGEgcmVuZGVyIHRyZWUgYW5kIGRvIGEgbGF5b3V0LiBSZXNvbHV0aW9uIGNvbnRp bnVlcyBhZnRlci4KICAgICBtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuYWRkKCZlbGVtZW50 KTsKLSAgICByZXR1cm4gUXVlcnlDb250YWluZXJBY3Rpb246OkxheW91dDsKKyAgICByZXR1cm4g UXVlcnlDb250YWluZXJBY3Rpb246OlJlc29sdmU7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxVcGRh dGU+IFRyZWVSZXNvbHZlcjo6cmVzb2x2ZSgpCiB7CisgICAgbV9yZXNvbHZlZFF1ZXJ5Q29udGFp bmVycy5hZGQobV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzLmJlZ2luKCksIG1fdW5yZXNvbHZl ZFF1ZXJ5Q29udGFpbmVycy5lbmQoKSk7CisgICAgbV91bnJlc29sdmVkUXVlcnlDb250YWluZXJz LmNsZWFyKCk7CisKICAgICBFbGVtZW50KiBkb2N1bWVudEVsZW1lbnQgPSBtX2RvY3VtZW50LmRv Y3VtZW50RWxlbWVudCgpOwogICAgIGlmICghZG9jdW1lbnRFbGVtZW50KSB7CiAgICAgICAgIG1f ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVyKCk7CiAgICAgICAgIHJldHVybiBudWxscHRy OwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBKdXN0IG5lZWQgdG8gcmVzdG9yZSB0aGUgYW5jZXN0 b3IgbWFya2luZy4KLSAgICBmb3IgKGF1dG8mIHF1ZXJ5Q29udGFpbmVyIDogbV91bnJlc29sdmVk UXVlcnlDb250YWluZXJzKQotICAgICAgICBxdWVyeUNvbnRhaW5lci0+aW52YWxpZGF0ZVN0eWxl Rm9yU3VidHJlZUludGVybmFsKCk7Ci0KICAgICBpZiAoIWRvY3VtZW50RWxlbWVudC0+Y2hpbGRO ZWVkc1N0eWxlUmVjYWxjKCkgJiYgIWRvY3VtZW50RWxlbWVudC0+bmVlZHNTdHlsZVJlY2FsYygp KQogICAgICAgICByZXR1cm4gV1RGTW92ZShtX3VwZGF0ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVRyZWVSZXNvbHZlci5oCmluZGV4IDQyYWQ1NWRhOWRiZC4uNjA0ODgwOTJhZjM5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmgKQEAgLTYzLDggKzYzLDgg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgcmVzb2x2ZUNvbXBvc2VkVHJlZSgpOwogCi0gICAgZW51 bSBjbGFzcyBRdWVyeUNvbnRhaW5lckFjdGlvbiA6IHVpbnQ4X3QgeyBOb25lLCBDb250aW51ZSwg TGF5b3V0IH07Ci0gICAgUXVlcnlDb250YWluZXJBY3Rpb24gdXBkYXRlUXVlcnlDb250YWluZXIo RWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlJiwgQ29udGFpbmVyVHlwZSBwcmV2aW91c0NvbnRh aW5lclR5cGUpOworICAgIGVudW0gY2xhc3MgUXVlcnlDb250YWluZXJBY3Rpb24gOiB1aW50OF90 IHsgTm9uZSwgUmVzb2x2ZSB9OworICAgIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIGRldGVybWluZVF1 ZXJ5Q29udGFpbmVyQWN0aW9uKEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSosIENvbnRhaW5l clR5cGUgcHJldmlvdXNDb250YWluZXJUeXBlKTsKIAogICAgIGVudW0gY2xhc3MgRGVzY2VuZGFu dHNUb1Jlc29sdmUgOiB1aW50OF90IHsgTm9uZSwgQ2hpbGRyZW5XaXRoRXhwbGljaXRJbmhlcml0 LCBDaGlsZHJlbiwgQWxsIH07CiAgICAgc3RkOjpwYWlyPEVsZW1lbnRVcGRhdGUsIERlc2NlbmRh bnRzVG9SZXNvbHZlPiByZXNvbHZlRWxlbWVudChFbGVtZW50JiwgUmVzb2x1dGlvblR5cGUpOwpA QCAtMTMwLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RpZFNlZVBlbmRpbmdTdHls ZXNoZWV0IHsgZmFsc2UgfTsKIAogICAgIEhhc2hTZXQ8UmVmUHRyPEVsZW1lbnQ+PiBtX3VucmVz b2x2ZWRRdWVyeUNvbnRhaW5lcnM7CisgICAgSGFzaFNldDxSZWZQdHI8RWxlbWVudD4+IG1fcmVz b2x2ZWRRdWVyeUNvbnRhaW5lcnM7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBtX3Vw ZGF0ZTsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5nLWxheW91 dC1kZXBlbmRlbmN5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmct bGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0CmluZGV4IDg4NjkyNmViYTMzMi4uOTU1Y2Vm Nzk3ODk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5nLWxheW91dC1k ZXBlbmRlbmN5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5n LWxheW91dC1kZXBlbmRlbmN5LWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDcgQEAKIFhYWFgKIAot RkFJTCBTaWJsaW5nIHN0eWxlIG11dGF0aW9uIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIxMCIg YnV0IGdvdCAiMjAiCi1GQUlMIFNpYmxpbmcgc3R5bGUgbXV0YXRpb24sIHBhcmVudCBpcyBhZmZl Y3RlZCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgotRkFJTCBTaWJs aW5nIHN0eWxlIG11dGF0aW9uLCBhbmNlc3RvciBpcyBhZmZlY3RlZCBhc3NlcnRfZXF1YWxzOiBl eHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgotRkFJTCBTaWJsaW5nIHRleHQgbXV0YXRpb24gYXNz ZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjEwIiBidXQgZ290ICIyMCIKK1BBU1MgU2libGluZyBzdHls ZSBtdXRhdGlvbgorUEFTUyBTaWJsaW5nIHN0eWxlIG11dGF0aW9uLCBwYXJlbnQgaXMgYWZmZWN0 ZWQKK1BBU1MgU2libGluZyBzdHlsZSBtdXRhdGlvbiwgYW5jZXN0b3IgaXMgYWZmZWN0ZWQKK1BB U1MgU2libGluZyB0ZXh0IG11dGF0aW9uCiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg== 460122 2022-06-09 03:11:12 -0700 2022-06-09 03:27:36 -0700 Patch bug-241457-20220609131111.patch text/plain 13279 koivisto RnJvbSAxZjZhYzFjMDcxOTc3ZmU0Yjc4MzNlM2I5Y2M2ZWE4Y2NkMzZlZjE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDkgSnVuIDIwMjIgMTI6NTU6MTUgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBDb3JyZWN0bHkgcmVzb2x2ZSBxdWVyaWVzIHdoZW4KIGNvbnRhaW5l ciBzaXplIGlzIGFmZmVjdGVkIGJ5IGEgc3Vic2VxdWVudCBzaWJsaW5nCiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCldlIGN1cnJlbnRseSBvbmx5IHRha2Ugc3R5bGUgY2hhbmdlcyBiZWZvcmUgdGhlIGNv bnRhaW5lciBpbnRvIGFjY291bnQuCgpUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHF1ZXJ5IGNvbnRh aW5lciByZXNvbHV0aW9uIHNvIHRoYXQgd2hlbmV2ZXIgd2UgZW5jb3VudGVyIGEgcXVlcnkgY29u dGFpbmVyCndlIHNraXAgdGhlIHN1YnRyZWUgYW5kIHJlc3RhcnQgdGhlIHJlc29sdXRpb24gZnJv bSB0aGUgbWFpbiByZXNvbHV0aW9uIGxvb3AuIFRoaXMgd2F5IHdlCmNhbiBvcHRpbWl6ZSBhd2F5 IHVubmVjZXNzYXJ5IGxheW91dHMgd2hpbGUgYWxzbyBoYW5kbGluZyBiYWNrd2FyZCBkZXBlbmRl bmNpZXMuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3kt ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHA6CihXZWJDb3Jl OjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKCkxvb3AgYWxzbyB3aGVuIHRoZXJlIGFyZSBubyBz dHlsZSBjaGFuZ2VzIHRvIGFwcGx5IGJ1dCB0aGVyZSBhcmUgdW5yZXNvbHZlZCBjb250YWluZXIu IEluIHRoaXMgY2FzZSB3ZSBqdXN0IHJlc3VtZQp0aGUgc3R5bGUgcmVzb2x1dGlvbiB3aGVyZSB3 ZSBsZWZ0IGl0LgoKKiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHA6CihXZWJDb3JlOjpF bGVtZW50OjppbnZhbGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UpOgoKSW52YWxpZGF0ZSBh bGwgZGVzY2VuZGFudHMgd2hlbiBhIHF1ZXJ5IGNvbnRhaW5lciBpcyByZXNpemVkLiBJbiBwcmFj dGljZSB3ZSBlbmRlZCB1cCBjb21wdXRpbmcgdGhlbSBhbGwgYW55d2F5LgoKKiBTb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZUNoYW5nZS5jcHA6CihXZWJDb3JlOjpTdHlsZTo6ZGV0ZXJtaW5lQ2hh bmdlKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oOgoKQWRkIG5ldyBEZXNj ZW5kYW50cyB2YWx1ZSBmb3Igd2hlbiBjb250YWluZXIgdHlwZSBvciBuYW1lIGNoYW5nZXMuCgoq IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoKKFdlYkNvcmU6OlN0 eWxlOjpUcmVlUmVzb2x2ZXI6OmNvbXB1dGVEZXNjZW5kYW50c1RvUmVzb2x2ZSk6CihXZWJDb3Jl OjpTdHlsZTo6VHJlZVJlc29sdmVyOjpwdXNoUGFyZW50KToKKFdlYkNvcmU6OlN0eWxlOjpUcmVl UmVzb2x2ZXI6OnBvcFBhcmVudCk6CihXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNv bHZlQ29tcG9zZWRUcmVlKToKKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OmRldGVybWlu ZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKToKClVzZSB0d28gYnVja2V0cyBmb3IgdW5yZXNvbHZlZCBh bmQgcmVzb2x2ZWQgY29udGFpbmVycy4gVXNlIHRoZSByZXNvbHZlZCBidWNrZXQgdG8gYXZvaWQK cmVjb21wdXRpbmcgY29udGFpbmVycyB3ZSBoYXZlIHJlc29sdmVkIGFscmVhZHkuCgooV2ViQ29y ZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CgpNb3ZlIHRoZSBjb250YWluZXJzIGZy b20gdGhlIHVucmVzb2x2ZWQgdG8gcmVzb2x2ZWQgYnVja2V0IGluIHRoZSBiZWdpbm5pbmcuCgoo V2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIpOiBEZWxl dGVkLgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmg6Ci0tLQogU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTYgKysrLS0tCiBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgICAgICAgICAgICAgICAgfCAgNCArLQogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwICAgICAgICAgIHwgIDYgKy0tCiBTb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oICAgICAgICAgICAgfCAgMSArCiBTb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgICAgfCA1MyArKysrKysrKysrKy0t LS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oICAgICAgfCAg NSArLQogLi4uL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0ICAgIHwgIDgg Ky0tCiA3IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGVhNTAwZmQ5Y2E4My4uNGM1NWFiZWI5YWU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIwOTUsMTMgKzIwOTUsMTUgQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgU3R5bGU6 OlRyZWVSZXNvbHZlciByZXNvbHZlcigqdGhpcywgV1RGTW92ZShtX3BlbmRpbmdSZW5kZXJUcmVl VXBkYXRlKSk7CiAgICAgICAgIGF1dG8gc3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7 CiAKLSAgICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMo KSAmJiBzdHlsZVVwZGF0ZSkgewotICAgICAgICAgICAgU2V0Rm9yU2NvcGUgcmVzb2x2aW5nQ29u dGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzLCB0cnVlKTsK LQotICAgICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZShXVEZNb3ZlKHN0eWxlVXBkYXRlKSk7Ci0K LSAgICAgICAgICAgIGlmIChmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkp Ci0gICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAg ICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMoKSkgewor ICAgICAgICAgICAgaWYgKHN0eWxlVXBkYXRlKSB7CisgICAgICAgICAgICAgICAgU2V0Rm9yU2Nv cGUgcmVzb2x2aW5nQ29udGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJR dWVyaWVzLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB1cGRhdGVS ZW5kZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgICAgIGlmIChm cmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAg ICAgIGZyYW1lVmlldy5sYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggYmYzYWYyN2FkOGZlLi41MDlhODlhNjU2YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTIyNjcsOCArMjI2Nyw4IEBAIHZvaWQgRWxlbWVudDo6 aW52YWxpZGF0ZVN0eWxlRm9yU3VidHJlZUludGVybmFsKCkKIAogdm9pZCBFbGVtZW50OjppbnZh bGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UoKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGRv ZXNuJ3QgcmVhbGx5IG5lZWQgdG8gcmVjb21wdXRlIHRoZSBlbGVtZW50IHN0eWxlLgotICAgIE5v ZGU6OmludmFsaWRhdGVTdHlsZShTdHlsZTo6VmFsaWRpdHk6OkVsZW1lbnRJbnZhbGlkKTsKKyAg ICAvLyBGSVhNRTogSWRlYWxseSB3ZSB3b3VsZCBqdXN0IHJlY29tcHV0ZSB0aGluZ3MgdGhhdCBh cmUgYWN0dWFsbHkgYWZmZWN0ZWQgYnkgY29udGFpbmVycyBxdWVyaWVzIHdpdGhpbiB0aGUgc3Vi dHJlZS4KKyAgICBOb2RlOjppbnZhbGlkYXRlU3R5bGUoU3R5bGU6OlZhbGlkaXR5OjpTdWJ0cmVl SW52YWxpZCk7CiB9CiAKIHZvaWQgRWxlbWVudDo6aW52YWxpZGF0ZUV2ZW50TGlzdGVuZXJSZWdp b25zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcAppbmRleCBkNzY4YzY0MDU3NDAu LmY5NjFhODI2YjA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFu Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcApAQCAtNTcs MTEgKzU3LDExIEBAIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUmIHMx LCBjb25zdCBSZW5kZXJTdHlsZSYgczIpCiAgICAgaWYgKHMxLmhhc1RleHRDb21iaW5lKCkgIT0g czIuaGFzVGV4dENvbWJpbmUoKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6UmVuZGVyZXI7CiAK LSAgICBpZiAoIXMxLmRlc2NlbmRhbnRBZmZlY3RpbmdOb25Jbmhlcml0ZWRQcm9wZXJ0aWVzRXF1 YWwoczIpKQotICAgICAgICByZXR1cm4gQ2hhbmdlOjpJbmhlcml0ZWQ7Ci0KICAgICAvLyBRdWVy eSBjb250YWluZXIgY2hhbmdlcyBhZmZlY3QgZGVzY2VuZGFudCBzdHlsZS4KICAgICBpZiAoczEu Y29udGFpbmVyVHlwZSgpICE9IHMyLmNvbnRhaW5lclR5cGUoKSB8fCBzMS5jb250YWluZXJOYW1l cygpICE9IHMyLmNvbnRhaW5lck5hbWVzKCkpCisgICAgICAgIHJldHVybiBDaGFuZ2U6OkRlc2Nl bmRhbnRzOworCisgICAgaWYgKCFzMS5kZXNjZW5kYW50QWZmZWN0aW5nTm9uSW5oZXJpdGVkUHJv cGVydGllc0VxdWFsKHMyKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6SW5oZXJpdGVkOwogCiAg ICAgaWYgKCFzMS5ub25GYXN0UGF0aEluaGVyaXRlZEVxdWFsKHMyKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUNoYW5nZS5oCmluZGV4IDdiYmNhM2M4YTUzZC4uYzlmMmIzOTkxYTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQ2hhbmdlLmgKQEAgLTM2LDYgKzM2LDcgQEAgZW51bSBjbGFzcyBDaGFuZ2Ug OiB1aW50OF90IHsKICAgICBOb25Jbmhlcml0ZWQsCiAgICAgRmFzdFBhdGhJbmhlcml0ZWQsCiAg ICAgSW5oZXJpdGVkLAorICAgIERlc2NlbmRhbnRzLAogICAgIFJlbmRlcmVyCiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKaW5kZXggNGU5M2IxMGExNWRl Li4wN2RiMGM2YjFhNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJl ZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZl ci5jcHAKQEAgLTE5OSw2ICsxOTksNyBAQCBhdXRvIFRyZWVSZXNvbHZlcjo6Y29tcHV0ZURlc2Nl bmRhbnRzVG9SZXNvbHZlKENoYW5nZSBjaGFuZ2UsIFZhbGlkaXR5IHZhbGlkaXR5LAogICAgIGNh c2UgQ2hhbmdlOjpGYXN0UGF0aEluaGVyaXRlZDoKICAgICBjYXNlIENoYW5nZTo6SW5oZXJpdGVk OgogICAgICAgICByZXR1cm4gRGVzY2VuZGFudHNUb1Jlc29sdmU6OkNoaWxkcmVuOworICAgIGNh c2UgQ2hhbmdlOjpEZXNjZW5kYW50czoKICAgICBjYXNlIENoYW5nZTo6UmVuZGVyZXI6CiAgICAg ICAgIHJldHVybiBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6QWxsOwogICAgIH07CkBAIC02MjUsNiAr NjI2LDggQEAgRWxlbWVudFVwZGF0ZSBUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1hdGVkRWxlbWVu dFVwZGF0ZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3QKIHZvaWQgVHJlZVJlc29sdmVyOjpwdXNo UGFyZW50KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgQ2hhbmdl IGNoYW5nZSwgRGVzY2VuZGFudHNUb1Jlc29sdmUgZGVzY2VuZGFudHNUb1Jlc29sdmUpCiB7CiAg ICAgc2NvcGUoKS5zZWxlY3Rvck1hdGNoaW5nU3RhdGUuc2VsZWN0b3JGaWx0ZXIucHVzaFBhcmVu dCgmZWxlbWVudCk7CisgICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5cGUoKSAhPSBDb250YWluZXJU eXBlOjpOb25lKQorICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hpbmdTdGF0ZS5xdWVyeUNv bnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwogCiAgICAgUGFyZW50IHBhcmVudChlbGVtZW50LCBz dHlsZSwgY2hhbmdlLCBkZXNjZW5kYW50c1RvUmVzb2x2ZSk7CiAKQEAgLTY0NSw3ICs2NDgsOSBA QCB2b2lkIFRyZWVSZXNvbHZlcjo6cG9wUGFyZW50KCkKICAgICBhdXRvJiBwYXJlbnRFbGVtZW50 ID0gKnBhcmVudCgpLmVsZW1lbnQ7CiAKICAgICBwYXJlbnRFbGVtZW50LnNldEhhc1ZhbGlkU3R5 bGUoKTsKLSAgICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7Cisg ICAgLy8gRG9uJ3QgY2xlYXIgdGhlIGNoaWxkIGZsYWcgaWYgdGhlIGFyZSB1bnJlc29sdmVkIGNv bnRhaW5lcnMgYmVjYXVzZSB3ZSBhcmUgZ29pbmcgdG8gcmVzdW1lIHRoZSBzdHlsZSByZXNvbHV0 aW9uLgorICAgIGlmIChtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuaXNFbXB0eSgpKQorICAg ICAgICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CiAKICAgICBp ZiAocGFyZW50KCkuZGlkUHVzaFNjb3BlKQogICAgICAgICBwb3BTY29wZSgpOwpAQCAtODM0LDEw ICs4MzksMjEgQEAgdm9pZCBUcmVlUmVzb2x2ZXI6OnJlc29sdmVDb21wb3NlZFRyZWUoKQogICAg ICAgICBpZiAoIXN0eWxlKQogICAgICAgICAgICAgcmVzZXRTdHlsZUZvck5vblJlbmRlcmVkRGVz Y2VuZGFudHMoZWxlbWVudCk7CiAKLSAgICAgICAgYm9vbCBzaG91bGRJdGVyYXRlQ2hpbGRyZW4g PSBzdHlsZSAmJiAoZWxlbWVudC5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSB8fCBkZXNjZW5kYW50 c1RvUmVzb2x2ZSAhPSBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6Tm9uZSk7CisgICAgICAgIGF1dG8g cXVlcnlDb250YWluZXJBY3Rpb24gPSBkZXRlcm1pbmVRdWVyeUNvbnRhaW5lckFjdGlvbihlbGVt ZW50LCBzdHlsZSwgcHJldmlvdXNDb250YWluZXJUeXBlKTsKKworICAgICAgICBib29sIHNob3Vs ZEl0ZXJhdGVDaGlsZHJlbiA9IFsmXSB7CisgICAgICAgICAgICAvLyBkaXNwbGF5Ojpub25lLCBu byBuZWVkIHRvIHJlc29sdmUgZGVzY2VuZGFudHMuCisgICAgICAgICAgICBpZiAoIXN0eWxlKQor ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIFN0eWxlIHJlc29s dXRpb24gd2lsbCBiZSByZXN1bWVkIGFmdGVyIHRoZSBjb250YWluZXIgaGFzIGJlZW4gcmVzb2x2 ZWQuCisgICAgICAgICAgICBpZiAocXVlcnlDb250YWluZXJBY3Rpb24gPT0gUXVlcnlDb250YWlu ZXJBY3Rpb246OlJlc29sdmUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgcmV0dXJuIGVsZW1lbnQuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZGVzY2VuZGFu dHNUb1Jlc29sdmUgIT0gRGVzY2VuZGFudHNUb1Jlc29sdmU6Ok5vbmU7CisgICAgICAgIH0oKTsK IAotICAgICAgICBpZiAoc3R5bGUgJiYgdXBkYXRlUXVlcnlDb250YWluZXIoZWxlbWVudCwgKnN0 eWxlLCBwcmV2aW91c0NvbnRhaW5lclR5cGUpID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpMYXlv dXQpCi0gICAgICAgICAgICBzaG91bGRJdGVyYXRlQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAg Ly8gRW5zdXJlIHdlIHJlc3BlY3QgRGVzY2VuZGFudHNUb1Jlc29sdmU6OkFsbCBhZnRlciByZXN1 bWluZyB0aGUgc3R5bGUgcmVzb2x1dGlvbi4KKyAgICAgICAgaWYgKHF1ZXJ5Q29udGFpbmVyQWN0 aW9uID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpSZXNvbHZlICYmIGRlc2NlbmRhbnRzVG9SZXNv bHZlID09IERlc2NlbmRhbnRzVG9SZXNvbHZlOjpBbGwpCisgICAgICAgICAgICBlbGVtZW50Lmlu dmFsaWRhdGVTdHlsZUZvclN1YnRyZWVJbnRlcm5hbCgpOwogCiAgICAgICAgIGlmICghbV9kaWRT ZWVQZW5kaW5nU3R5bGVzaGVldCkKICAgICAgICAgICAgIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hl ZXQgPSBoYXNMb2FkaW5nU3R5bGVzaGVldChtX2RvY3VtZW50LnN0eWxlU2NvcGUoKSwgZWxlbWVu dCwgIXNob3VsZEl0ZXJhdGVDaGlsZHJlbik7CkBAIC04NjAsMzkgKzg3NiwzNCBAQCB2b2lkIFRy ZWVSZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2VkVHJlZSgpCiAgICAgcG9wUGFyZW50c1RvRGVwdGgo MSk7CiB9CiAKLWF1dG8gVHJlZVJlc29sdmVyOjp1cGRhdGVRdWVyeUNvbnRhaW5lcihFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIENvbnRhaW5lclR5cGUgcHJldmlv dXNDb250YWluZXJUeXBlKSAtPiBRdWVyeUNvbnRhaW5lckFjdGlvbgorYXV0byBUcmVlUmVzb2x2 ZXI6OmRldGVybWluZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0 IFJlbmRlclN0eWxlKiBzdHlsZSwgQ29udGFpbmVyVHlwZSBwcmV2aW91c0NvbnRhaW5lclR5cGUp IC0+IFF1ZXJ5Q29udGFpbmVyQWN0aW9uCiB7Ci0gICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5cGUo KSAhPSBDb250YWluZXJUeXBlOjpOb25lKQotICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hp bmdTdGF0ZS5xdWVyeUNvbnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwotCi0gICAgaWYgKG1fdW5y ZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5yZW1vdmUoJmVsZW1lbnQpKQotICAgICAgICByZXR1cm4g UXVlcnlDb250YWluZXJBY3Rpb246OkNvbnRpbnVlOworICAgIGlmICghc3R5bGUpCisgICAgICAg IHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6Tm9uZTsKIAotICAgIC8vIFJlbmRlciB0cmVl IG5lZWRzIHRvIGJlIHVwZGF0ZWQgYmVmb3JlIHByb2NlZWRpbmcgdG8gY2hpbGRyZW4gYWxzbyBp ZiB3ZSBoYXZlIGEgZm9ybWVyIHF1ZXJ5IGNvbnRhaW5lcgotICAgIC8vIGJlY2F1c2UgY29udGFp bmVyIHF1ZXJ5IHJlc29sdXRpb24gZm9yIGRlc2NlbmRhbnRzIHJlbGllcyBvbiBpdCBiZWluZyB1 cC10by1kYXRlLgotICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgPT0gQ29udGFpbmVyVHlw ZTo6Tm9uZSAmJiBwcmV2aW91c0NvbnRhaW5lclR5cGUgPT0gQ29udGFpbmVyVHlwZTo6Tm9uZSkK KyAgICAvLyBGSVhNRTogUmVuZGVyIHRyZWUgbmVlZHMgdG8gYmUgdXBkYXRlZCBiZWZvcmUgcHJv Y2VlZGluZyB0byBjaGlsZHJlbiBhbHNvIGlmIHdlIGhhdmUgYSBmb3JtZXIgcXVlcnkgY29udGFp bmVyCisgICAgLy8gYmVjYXVzZSBjb250YWluZXIgdW5pdCByZXNvbHV0aW9uIGZvciBkZXNjZW5k YW50cyByZWxpZXMgb24gaXQgYmVpbmcgdXAtdG8tZGF0ZS4KKyAgICBpZiAoc3R5bGUtPmNvbnRh aW5lclR5cGUoKSA9PSBDb250YWluZXJUeXBlOjpOb25lICYmIHByZXZpb3VzQ29udGFpbmVyVHlw ZSA9PSBDb250YWluZXJUeXBlOjpOb25lKQogICAgICAgICByZXR1cm4gUXVlcnlDb250YWluZXJB Y3Rpb246Ok5vbmU7CiAKLSAgICBpZiAobV91cGRhdGUtPmlzRW1wdHkoKSkKLSAgICAgICAgcmV0 dXJuIFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpDb250aW51ZTsKKyAgICBpZiAobV9yZXNvbHZlZFF1 ZXJ5Q29udGFpbmVycy5jb250YWlucygmZWxlbWVudCkpCisgICAgICAgIHJldHVybiBRdWVyeUNv bnRhaW5lckFjdGlvbjo6Tm9uZTsKIAotICAgIC8vIEJhaWwgb3V0IGZyb20gVHJlZVJlc29sdmVy IHRvIGJ1aWxkIGEgcmVuZGVyIHRyZWUgYW5kIGRvIGEgbGF5b3V0LiBSZXNvbHV0aW9uIGNvbnRp bnVlcyBhZnRlci4KICAgICBtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuYWRkKCZlbGVtZW50 KTsKLSAgICByZXR1cm4gUXVlcnlDb250YWluZXJBY3Rpb246OkxheW91dDsKKyAgICByZXR1cm4g UXVlcnlDb250YWluZXJBY3Rpb246OlJlc29sdmU7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxVcGRh dGU+IFRyZWVSZXNvbHZlcjo6cmVzb2x2ZSgpCiB7CisgICAgbV9yZXNvbHZlZFF1ZXJ5Q29udGFp bmVycy5hZGQobV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzLmJlZ2luKCksIG1fdW5yZXNvbHZl ZFF1ZXJ5Q29udGFpbmVycy5lbmQoKSk7CisgICAgbV91bnJlc29sdmVkUXVlcnlDb250YWluZXJz LmNsZWFyKCk7CisKICAgICBFbGVtZW50KiBkb2N1bWVudEVsZW1lbnQgPSBtX2RvY3VtZW50LmRv Y3VtZW50RWxlbWVudCgpOwogICAgIGlmICghZG9jdW1lbnRFbGVtZW50KSB7CiAgICAgICAgIG1f ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVyKCk7CiAgICAgICAgIHJldHVybiBudWxscHRy OwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBKdXN0IG5lZWQgdG8gcmVzdG9yZSB0aGUgYW5jZXN0 b3IgbWFya2luZy4KLSAgICBmb3IgKGF1dG8mIHF1ZXJ5Q29udGFpbmVyIDogbV91bnJlc29sdmVk UXVlcnlDb250YWluZXJzKQotICAgICAgICBxdWVyeUNvbnRhaW5lci0+aW52YWxpZGF0ZVN0eWxl Rm9yU3VidHJlZUludGVybmFsKCk7Ci0KICAgICBpZiAoIWRvY3VtZW50RWxlbWVudC0+Y2hpbGRO ZWVkc1N0eWxlUmVjYWxjKCkgJiYgIWRvY3VtZW50RWxlbWVudC0+bmVlZHNTdHlsZVJlY2FsYygp KQogICAgICAgICByZXR1cm4gV1RGTW92ZShtX3VwZGF0ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVRyZWVSZXNvbHZlci5oCmluZGV4IDQyYWQ1NWRhOWRiZC4uNjA0ODgwOTJhZjM5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmgKQEAgLTYzLDggKzYzLDgg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgcmVzb2x2ZUNvbXBvc2VkVHJlZSgpOwogCi0gICAgZW51 bSBjbGFzcyBRdWVyeUNvbnRhaW5lckFjdGlvbiA6IHVpbnQ4X3QgeyBOb25lLCBDb250aW51ZSwg TGF5b3V0IH07Ci0gICAgUXVlcnlDb250YWluZXJBY3Rpb24gdXBkYXRlUXVlcnlDb250YWluZXIo RWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlJiwgQ29udGFpbmVyVHlwZSBwcmV2aW91c0NvbnRh aW5lclR5cGUpOworICAgIGVudW0gY2xhc3MgUXVlcnlDb250YWluZXJBY3Rpb24gOiB1aW50OF90 IHsgTm9uZSwgUmVzb2x2ZSB9OworICAgIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIGRldGVybWluZVF1 ZXJ5Q29udGFpbmVyQWN0aW9uKEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSosIENvbnRhaW5l clR5cGUgcHJldmlvdXNDb250YWluZXJUeXBlKTsKIAogICAgIGVudW0gY2xhc3MgRGVzY2VuZGFu dHNUb1Jlc29sdmUgOiB1aW50OF90IHsgTm9uZSwgQ2hpbGRyZW5XaXRoRXhwbGljaXRJbmhlcml0 LCBDaGlsZHJlbiwgQWxsIH07CiAgICAgc3RkOjpwYWlyPEVsZW1lbnRVcGRhdGUsIERlc2NlbmRh bnRzVG9SZXNvbHZlPiByZXNvbHZlRWxlbWVudChFbGVtZW50JiwgUmVzb2x1dGlvblR5cGUpOwpA QCAtMTMwLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RpZFNlZVBlbmRpbmdTdHls ZXNoZWV0IHsgZmFsc2UgfTsKIAogICAgIEhhc2hTZXQ8UmVmUHRyPEVsZW1lbnQ+PiBtX3VucmVz b2x2ZWRRdWVyeUNvbnRhaW5lcnM7CisgICAgSGFzaFNldDxSZWZQdHI8RWxlbWVudD4+IG1fcmVz b2x2ZWRRdWVyeUNvbnRhaW5lcnM7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBtX3Vw ZGF0ZTsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5nLWxheW91 dC1kZXBlbmRlbmN5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmct bGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0CmluZGV4IDg4NjkyNmViYTMzMi4uOTU1Y2Vm Nzk3ODk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5nLWxheW91dC1k ZXBlbmRlbmN5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zaWJsaW5n LWxheW91dC1kZXBlbmRlbmN5LWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDcgQEAKIFhYWFgKIAot RkFJTCBTaWJsaW5nIHN0eWxlIG11dGF0aW9uIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIxMCIg YnV0IGdvdCAiMjAiCi1GQUlMIFNpYmxpbmcgc3R5bGUgbXV0YXRpb24sIHBhcmVudCBpcyBhZmZl Y3RlZCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgotRkFJTCBTaWJs aW5nIHN0eWxlIG11dGF0aW9uLCBhbmNlc3RvciBpcyBhZmZlY3RlZCBhc3NlcnRfZXF1YWxzOiBl eHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgotRkFJTCBTaWJsaW5nIHRleHQgbXV0YXRpb24gYXNz ZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjEwIiBidXQgZ290ICIyMCIKK1BBU1MgU2libGluZyBzdHls ZSBtdXRhdGlvbgorUEFTUyBTaWJsaW5nIHN0eWxlIG11dGF0aW9uLCBwYXJlbnQgaXMgYWZmZWN0 ZWQKK1BBU1MgU2libGluZyBzdHlsZSBtdXRhdGlvbiwgYW5jZXN0b3IgaXMgYWZmZWN0ZWQKK1BB U1MgU2libGluZyB0ZXh0IG11dGF0aW9uCiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg== 460123 2022-06-09 03:27:41 -0700 2022-06-09 06:15:45 -0700 Patch bug-241457-20220609132739.patch text/plain 13440 koivisto RnJvbSA2M2FhYzVkZmI5ZDlkMzJiZjg3NWQ4MDgwOWNhMWY0MzNiNGZjMzEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDkgSnVuIDIwMjIgMTI6NTU6MTUgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBDb3JyZWN0bHkgcmVzb2x2ZSBxdWVyaWVzIHdoZW4KIGNvbnRhaW5l ciBzaXplIGlzIGFmZmVjdGVkIGJ5IGEgc3Vic2VxdWVudCBzaWJsaW5nCiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCldlIGN1cnJlbnRseSBvbmx5IHRha2Ugc3R5bGUgY2hhbmdlcyBiZWZvcmUgdGhlIGNv bnRhaW5lciBpbnRvIGFjY291bnQuCgpUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHF1ZXJ5IGNvbnRh aW5lciByZXNvbHV0aW9uIHNvIHRoYXQgd2hlbmV2ZXIgd2UgZW5jb3VudGVyIGEgcXVlcnkgY29u dGFpbmVyCndlIHNraXAgdGhlIHN1YnRyZWUgYW5kIHJlc3RhcnQgdGhlIHJlc29sdXRpb24gZnJv bSB0aGUgbWFpbiByZXNvbHV0aW9uIGxvb3AuIFRoaXMgd2F5IHdlCmNhbiBvcHRpbWl6ZSBhd2F5 IHVubmVjZXNzYXJ5IGxheW91dHMgd2hpbGUgYWxzbyBoYW5kbGluZyBiYWNrd2FyZCBkZXBlbmRl bmNpZXMuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3kt ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHA6CihXZWJDb3Jl OjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKCkxvb3AgYWxzbyB3aGVuIHRoZXJlIGFyZSBubyBz dHlsZSBjaGFuZ2VzIHRvIGFwcGx5IGJ1dCB0aGVyZSBhcmUgdW5yZXNvbHZlZCBjb250YWluZXIu IEluIHRoaXMgY2FzZSB3ZSBqdXN0IHJlc3VtZQp0aGUgc3R5bGUgcmVzb2x1dGlvbiB3aGVyZSB3 ZSBsZWZ0IGl0LgoKKiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHA6CihXZWJDb3JlOjpF bGVtZW50OjppbnZhbGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UpOgoKSW52YWxpZGF0ZSBh bGwgZGVzY2VuZGFudHMgd2hlbiBhIHF1ZXJ5IGNvbnRhaW5lciBpcyByZXNpemVkLiBJbiBwcmFj dGljZSB3ZSBlbmRlZCB1cCBjb21wdXRpbmcgdGhlbSBhbGwgYW55d2F5LgoKKiBTb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZUNoYW5nZS5jcHA6CihXZWJDb3JlOjpTdHlsZTo6ZGV0ZXJtaW5lQ2hh bmdlKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oOgoKQWRkIG5ldyBEZXNj ZW5kYW50cyB2YWx1ZSBmb3Igd2hlbiBjb250YWluZXIgdHlwZSBvciBuYW1lIGNoYW5nZXMuCgoq IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcDoKKFdlYkNvcmU6OlN0 eWxlOjpUcmVlUmVzb2x2ZXI6OmNvbXB1dGVEZXNjZW5kYW50c1RvUmVzb2x2ZSk6CihXZWJDb3Jl OjpTdHlsZTo6VHJlZVJlc29sdmVyOjpwdXNoUGFyZW50KToKKFdlYkNvcmU6OlN0eWxlOjpUcmVl UmVzb2x2ZXI6OnBvcFBhcmVudCk6CihXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNv bHZlQ29tcG9zZWRUcmVlKToKKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OmRldGVybWlu ZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKToKClVzZSB0d28gYnVja2V0cyBmb3IgdW5yZXNvbHZlZCBh bmQgcmVzb2x2ZWQgY29udGFpbmVycy4gVXNlIHRoZSByZXNvbHZlZCBidWNrZXQgdG8gYXZvaWQK cmVjb21wdXRpbmcgY29udGFpbmVycyB3ZSBoYXZlIHJlc29sdmVkIGFscmVhZHkuCgooV2ViQ29y ZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CgpNb3ZlIHRoZSBjb250YWluZXJzIGZy b20gdGhlIHVucmVzb2x2ZWQgdG8gcmVzb2x2ZWQgYnVja2V0IGluIHRoZSBiZWdpbm5pbmcuCgoo V2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIpOiBEZWxl dGVkLgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmg6Ci0tLQogU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTYgKysrLS0tCiBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgICAgICAgICAgICAgICAgfCAgNCArLQogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwICAgICAgICAgIHwgIDYgKy0KIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmggICAgICAgICAgICB8ICAxICsKIFNvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcCAgICB8IDU1ICsrKysrKysrKysrLS0t LS0tLS0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmggICAgICB8ICA3 ICsrLQogLi4uL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3ktZXhwZWN0ZWQudHh0ICAgIHwgIDgg Ky0tCiA3IGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGVhNTAwZmQ5Y2E4My4uNGM1NWFiZWI5YWU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIwOTUsMTMgKzIwOTUsMTUgQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgU3R5bGU6 OlRyZWVSZXNvbHZlciByZXNvbHZlcigqdGhpcywgV1RGTW92ZShtX3BlbmRpbmdSZW5kZXJUcmVl VXBkYXRlKSk7CiAgICAgICAgIGF1dG8gc3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7 CiAKLSAgICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMo KSAmJiBzdHlsZVVwZGF0ZSkgewotICAgICAgICAgICAgU2V0Rm9yU2NvcGUgcmVzb2x2aW5nQ29u dGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzLCB0cnVlKTsK LQotICAgICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZShXVEZNb3ZlKHN0eWxlVXBkYXRlKSk7Ci0K LSAgICAgICAgICAgIGlmIChmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkp Ci0gICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAg ICAgICAgd2hpbGUgKHJlc29sdmVyLmhhc1VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMoKSkgewor ICAgICAgICAgICAgaWYgKHN0eWxlVXBkYXRlKSB7CisgICAgICAgICAgICAgICAgU2V0Rm9yU2Nv cGUgcmVzb2x2aW5nQ29udGFpbmVyUXVlcmllc1Njb3BlKG1faXNSZXNvbHZpbmdDb250YWluZXJR dWVyaWVzLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB1cGRhdGVS ZW5kZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgICAgIGlmIChm cmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICAgICAg ICAgIGZyYW1lVmlldy5sYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggYmYzYWYyN2FkOGZlLi41MDlhODlhNjU2YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTIyNjcsOCArMjI2Nyw4IEBAIHZvaWQgRWxlbWVudDo6 aW52YWxpZGF0ZVN0eWxlRm9yU3VidHJlZUludGVybmFsKCkKIAogdm9pZCBFbGVtZW50OjppbnZh bGlkYXRlRm9yUXVlcnlDb250YWluZXJDaGFuZ2UoKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGRv ZXNuJ3QgcmVhbGx5IG5lZWQgdG8gcmVjb21wdXRlIHRoZSBlbGVtZW50IHN0eWxlLgotICAgIE5v ZGU6OmludmFsaWRhdGVTdHlsZShTdHlsZTo6VmFsaWRpdHk6OkVsZW1lbnRJbnZhbGlkKTsKKyAg ICAvLyBGSVhNRTogSWRlYWxseSB3ZSB3b3VsZCBqdXN0IHJlY29tcHV0ZSB0aGluZ3MgdGhhdCBh cmUgYWN0dWFsbHkgYWZmZWN0ZWQgYnkgY29udGFpbmVycyBxdWVyaWVzIHdpdGhpbiB0aGUgc3Vi dHJlZS4KKyAgICBOb2RlOjppbnZhbGlkYXRlU3R5bGUoU3R5bGU6OlZhbGlkaXR5OjpTdWJ0cmVl SW52YWxpZCk7CiB9CiAKIHZvaWQgRWxlbWVudDo6aW52YWxpZGF0ZUV2ZW50TGlzdGVuZXJSZWdp b25zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcAppbmRleCBkNzY4YzY0MDU3NDAu LmY5NjFhODI2YjA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFu Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcApAQCAtNTcs MTEgKzU3LDExIEBAIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUmIHMx LCBjb25zdCBSZW5kZXJTdHlsZSYgczIpCiAgICAgaWYgKHMxLmhhc1RleHRDb21iaW5lKCkgIT0g czIuaGFzVGV4dENvbWJpbmUoKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6UmVuZGVyZXI7CiAK LSAgICBpZiAoIXMxLmRlc2NlbmRhbnRBZmZlY3RpbmdOb25Jbmhlcml0ZWRQcm9wZXJ0aWVzRXF1 YWwoczIpKQotICAgICAgICByZXR1cm4gQ2hhbmdlOjpJbmhlcml0ZWQ7Ci0KICAgICAvLyBRdWVy eSBjb250YWluZXIgY2hhbmdlcyBhZmZlY3QgZGVzY2VuZGFudCBzdHlsZS4KICAgICBpZiAoczEu Y29udGFpbmVyVHlwZSgpICE9IHMyLmNvbnRhaW5lclR5cGUoKSB8fCBzMS5jb250YWluZXJOYW1l cygpICE9IHMyLmNvbnRhaW5lck5hbWVzKCkpCisgICAgICAgIHJldHVybiBDaGFuZ2U6OkRlc2Nl bmRhbnRzOworCisgICAgaWYgKCFzMS5kZXNjZW5kYW50QWZmZWN0aW5nTm9uSW5oZXJpdGVkUHJv cGVydGllc0VxdWFsKHMyKSkKICAgICAgICAgcmV0dXJuIENoYW5nZTo6SW5oZXJpdGVkOwogCiAg ICAgaWYgKCFzMS5ub25GYXN0UGF0aEluaGVyaXRlZEVxdWFsKHMyKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUNoYW5nZS5oCmluZGV4IDdiYmNhM2M4YTUzZC4uYzlmMmIzOTkxYTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQ2hhbmdlLmgKQEAgLTM2LDYgKzM2LDcgQEAgZW51bSBjbGFzcyBDaGFuZ2Ug OiB1aW50OF90IHsKICAgICBOb25Jbmhlcml0ZWQsCiAgICAgRmFzdFBhdGhJbmhlcml0ZWQsCiAg ICAgSW5oZXJpdGVkLAorICAgIERlc2NlbmRhbnRzLAogICAgIFJlbmRlcmVyCiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKaW5kZXggNGU5M2IxMGExNWRl Li5iYjdiYjZiMzk1MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJl ZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZl ci5jcHAKQEAgLTE5OSw2ICsxOTksNyBAQCBhdXRvIFRyZWVSZXNvbHZlcjo6Y29tcHV0ZURlc2Nl bmRhbnRzVG9SZXNvbHZlKENoYW5nZSBjaGFuZ2UsIFZhbGlkaXR5IHZhbGlkaXR5LAogICAgIGNh c2UgQ2hhbmdlOjpGYXN0UGF0aEluaGVyaXRlZDoKICAgICBjYXNlIENoYW5nZTo6SW5oZXJpdGVk OgogICAgICAgICByZXR1cm4gRGVzY2VuZGFudHNUb1Jlc29sdmU6OkNoaWxkcmVuOworICAgIGNh c2UgQ2hhbmdlOjpEZXNjZW5kYW50czoKICAgICBjYXNlIENoYW5nZTo6UmVuZGVyZXI6CiAgICAg ICAgIHJldHVybiBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6QWxsOwogICAgIH07CkBAIC02MjUsNiAr NjI2LDggQEAgRWxlbWVudFVwZGF0ZSBUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1hdGVkRWxlbWVu dFVwZGF0ZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3QKIHZvaWQgVHJlZVJlc29sdmVyOjpwdXNo UGFyZW50KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgQ2hhbmdl IGNoYW5nZSwgRGVzY2VuZGFudHNUb1Jlc29sdmUgZGVzY2VuZGFudHNUb1Jlc29sdmUpCiB7CiAg ICAgc2NvcGUoKS5zZWxlY3Rvck1hdGNoaW5nU3RhdGUuc2VsZWN0b3JGaWx0ZXIucHVzaFBhcmVu dCgmZWxlbWVudCk7CisgICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5cGUoKSAhPSBDb250YWluZXJU eXBlOjpOb25lKQorICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hpbmdTdGF0ZS5xdWVyeUNv bnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwogCiAgICAgUGFyZW50IHBhcmVudChlbGVtZW50LCBz dHlsZSwgY2hhbmdlLCBkZXNjZW5kYW50c1RvUmVzb2x2ZSk7CiAKQEAgLTY0NSw3ICs2NDgsOSBA QCB2b2lkIFRyZWVSZXNvbHZlcjo6cG9wUGFyZW50KCkKICAgICBhdXRvJiBwYXJlbnRFbGVtZW50 ID0gKnBhcmVudCgpLmVsZW1lbnQ7CiAKICAgICBwYXJlbnRFbGVtZW50LnNldEhhc1ZhbGlkU3R5 bGUoKTsKLSAgICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7Cisg ICAgLy8gRG9uJ3QgY2xlYXIgdGhlIGNoaWxkIGZsYWdzIGlmIHRoZXJlIGFyZSB1bnJlc29sdmVk IGNvbnRhaW5lcnMgYmVjYXVzZSB3ZSBhcmUgZ29pbmcgdG8gcmVzdW1lIHRoZSBzdHlsZSByZXNv bHV0aW9uLgorICAgIGlmICghaGFzVW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycygpKQorICAgICAg ICBwYXJlbnRFbGVtZW50LmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CiAKICAgICBpZiAo cGFyZW50KCkuZGlkUHVzaFNjb3BlKQogICAgICAgICBwb3BTY29wZSgpOwpAQCAtODM0LDEwICs4 MzksMjEgQEAgdm9pZCBUcmVlUmVzb2x2ZXI6OnJlc29sdmVDb21wb3NlZFRyZWUoKQogICAgICAg ICBpZiAoIXN0eWxlKQogICAgICAgICAgICAgcmVzZXRTdHlsZUZvck5vblJlbmRlcmVkRGVzY2Vu ZGFudHMoZWxlbWVudCk7CiAKLSAgICAgICAgYm9vbCBzaG91bGRJdGVyYXRlQ2hpbGRyZW4gPSBz dHlsZSAmJiAoZWxlbWVudC5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSB8fCBkZXNjZW5kYW50c1Rv UmVzb2x2ZSAhPSBEZXNjZW5kYW50c1RvUmVzb2x2ZTo6Tm9uZSk7CisgICAgICAgIGF1dG8gcXVl cnlDb250YWluZXJBY3Rpb24gPSBkZXRlcm1pbmVRdWVyeUNvbnRhaW5lckFjdGlvbihlbGVtZW50 LCBzdHlsZSwgcHJldmlvdXNDb250YWluZXJUeXBlKTsKKworICAgICAgICBib29sIHNob3VsZEl0 ZXJhdGVDaGlsZHJlbiA9IFsmXSB7CisgICAgICAgICAgICAvLyBkaXNwbGF5Ojpub25lLCBubyBu ZWVkIHRvIHJlc29sdmUgZGVzY2VuZGFudHMuCisgICAgICAgICAgICBpZiAoIXN0eWxlKQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIFN0eWxlIHJlc29sdXRp b24gd2lsbCBiZSByZXN1bWVkIGFmdGVyIHRoZSBjb250YWluZXIgaGFzIGJlZW4gcmVzb2x2ZWQu CisgICAgICAgICAgICBpZiAocXVlcnlDb250YWluZXJBY3Rpb24gPT0gUXVlcnlDb250YWluZXJB Y3Rpb246OlJlc29sdmUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgcmV0dXJuIGVsZW1lbnQuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgZGVzY2VuZGFudHNU b1Jlc29sdmUgIT0gRGVzY2VuZGFudHNUb1Jlc29sdmU6Ok5vbmU7CisgICAgICAgIH0oKTsKIAot ICAgICAgICBpZiAoc3R5bGUgJiYgdXBkYXRlUXVlcnlDb250YWluZXIoZWxlbWVudCwgKnN0eWxl LCBwcmV2aW91c0NvbnRhaW5lclR5cGUpID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpMYXlvdXQp Ci0gICAgICAgICAgICBzaG91bGRJdGVyYXRlQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAgLy8g RW5zdXJlIHdlIHJlc3BlY3QgRGVzY2VuZGFudHNUb1Jlc29sdmU6OkFsbCBhZnRlciByZXN1bWlu ZyB0aGUgc3R5bGUgcmVzb2x1dGlvbi4KKyAgICAgICAgaWYgKHF1ZXJ5Q29udGFpbmVyQWN0aW9u ID09IFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpSZXNvbHZlICYmIGRlc2NlbmRhbnRzVG9SZXNvbHZl ID09IERlc2NlbmRhbnRzVG9SZXNvbHZlOjpBbGwpCisgICAgICAgICAgICBlbGVtZW50LmludmFs aWRhdGVTdHlsZUZvclN1YnRyZWVJbnRlcm5hbCgpOwogCiAgICAgICAgIGlmICghbV9kaWRTZWVQ ZW5kaW5nU3R5bGVzaGVldCkKICAgICAgICAgICAgIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hlZXQg PSBoYXNMb2FkaW5nU3R5bGVzaGVldChtX2RvY3VtZW50LnN0eWxlU2NvcGUoKSwgZWxlbWVudCwg IXNob3VsZEl0ZXJhdGVDaGlsZHJlbik7CkBAIC04NjAsMzkgKzg3NiwzNCBAQCB2b2lkIFRyZWVS ZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2VkVHJlZSgpCiAgICAgcG9wUGFyZW50c1RvRGVwdGgoMSk7 CiB9CiAKLWF1dG8gVHJlZVJlc29sdmVyOjp1cGRhdGVRdWVyeUNvbnRhaW5lcihFbGVtZW50JiBl bGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIENvbnRhaW5lclR5cGUgcHJldmlvdXND b250YWluZXJUeXBlKSAtPiBRdWVyeUNvbnRhaW5lckFjdGlvbgorYXV0byBUcmVlUmVzb2x2ZXI6 OmRldGVybWluZVF1ZXJ5Q29udGFpbmVyQWN0aW9uKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNv bnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgQ29udGFpbmVyVHlwZSBwcmV2aW91c0NvbnRhaW5lclR5 cGUpIC0+IFF1ZXJ5Q29udGFpbmVyQWN0aW9uCiB7Ci0gICAgaWYgKHN0eWxlLmNvbnRhaW5lclR5 cGUoKSAhPSBDb250YWluZXJUeXBlOjpOb25lKQotICAgICAgICBzY29wZSgpLnNlbGVjdG9yTWF0 Y2hpbmdTdGF0ZS5xdWVyeUNvbnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwotCi0gICAgaWYgKG1f dW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5yZW1vdmUoJmVsZW1lbnQpKQotICAgICAgICByZXR1 cm4gUXVlcnlDb250YWluZXJBY3Rpb246OkNvbnRpbnVlOworICAgIGlmICghc3R5bGUpCisgICAg ICAgIHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6Tm9uZTsKIAotICAgIC8vIFJlbmRlciB0 cmVlIG5lZWRzIHRvIGJlIHVwZGF0ZWQgYmVmb3JlIHByb2NlZWRpbmcgdG8gY2hpbGRyZW4gYWxz byBpZiB3ZSBoYXZlIGEgZm9ybWVyIHF1ZXJ5IGNvbnRhaW5lcgotICAgIC8vIGJlY2F1c2UgY29u dGFpbmVyIHF1ZXJ5IHJlc29sdXRpb24gZm9yIGRlc2NlbmRhbnRzIHJlbGllcyBvbiBpdCBiZWlu ZyB1cC10by1kYXRlLgotICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgPT0gQ29udGFpbmVy VHlwZTo6Tm9uZSAmJiBwcmV2aW91c0NvbnRhaW5lclR5cGUgPT0gQ29udGFpbmVyVHlwZTo6Tm9u ZSkKKyAgICAvLyBGSVhNRTogUmVuZGVyIHRyZWUgbmVlZHMgdG8gYmUgdXBkYXRlZCBiZWZvcmUg cHJvY2VlZGluZyB0byBjaGlsZHJlbiBhbHNvIGlmIHdlIGhhdmUgYSBmb3JtZXIgcXVlcnkgY29u dGFpbmVyCisgICAgLy8gYmVjYXVzZSBjb250YWluZXIgdW5pdCByZXNvbHV0aW9uIGZvciBkZXNj ZW5kYW50cyByZWxpZXMgb24gaXQgYmVpbmcgdXAtdG8tZGF0ZS4KKyAgICBpZiAoc3R5bGUtPmNv bnRhaW5lclR5cGUoKSA9PSBDb250YWluZXJUeXBlOjpOb25lICYmIHByZXZpb3VzQ29udGFpbmVy VHlwZSA9PSBDb250YWluZXJUeXBlOjpOb25lKQogICAgICAgICByZXR1cm4gUXVlcnlDb250YWlu ZXJBY3Rpb246Ok5vbmU7CiAKLSAgICBpZiAobV91cGRhdGUtPmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuIFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpDb250aW51ZTsKKyAgICBpZiAobV9yZXNvbHZl ZFF1ZXJ5Q29udGFpbmVycy5jb250YWlucyhlbGVtZW50KSkKKyAgICAgICAgcmV0dXJuIFF1ZXJ5 Q29udGFpbmVyQWN0aW9uOjpOb25lOwogCi0gICAgLy8gQmFpbCBvdXQgZnJvbSBUcmVlUmVzb2x2 ZXIgdG8gYnVpbGQgYSByZW5kZXIgdHJlZSBhbmQgZG8gYSBsYXlvdXQuIFJlc29sdXRpb24gY29u dGludWVzIGFmdGVyLgotICAgIG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5hZGQoJmVsZW1l bnQpOwotICAgIHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6TGF5b3V0OworICAgIG1fdW5y ZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5hcHBlbmQoZWxlbWVudCk7CisgICAgcmV0dXJuIFF1ZXJ5 Q29udGFpbmVyQWN0aW9uOjpSZXNvbHZlOwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBU cmVlUmVzb2x2ZXI6OnJlc29sdmUoKQogeworICAgIG1fcmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMu YWRkKG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5iZWdpbigpLCBtX3VucmVzb2x2ZWRRdWVy eUNvbnRhaW5lcnMuZW5kKCkpOworICAgIG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5jbGVh cigpOworCiAgICAgRWxlbWVudCogZG9jdW1lbnRFbGVtZW50ID0gbV9kb2N1bWVudC5kb2N1bWVu dEVsZW1lbnQoKTsKICAgICBpZiAoIWRvY3VtZW50RWxlbWVudCkgewogICAgICAgICBtX2RvY3Vt ZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcigpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICB9CiAKLSAgICAvLyBGSVhNRTogSnVzdCBuZWVkIHRvIHJlc3RvcmUgdGhlIGFuY2VzdG9yIG1h cmtpbmcuCi0gICAgZm9yIChhdXRvJiBxdWVyeUNvbnRhaW5lciA6IG1fdW5yZXNvbHZlZFF1ZXJ5 Q29udGFpbmVycykKLSAgICAgICAgcXVlcnlDb250YWluZXItPmludmFsaWRhdGVTdHlsZUZvclN1 YnRyZWVJbnRlcm5hbCgpOwotCiAgICAgaWYgKCFkb2N1bWVudEVsZW1lbnQtPmNoaWxkTmVlZHNT dHlsZVJlY2FsYygpICYmICFkb2N1bWVudEVsZW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSkKICAg ICAgICAgcmV0dXJuIFdURk1vdmUobV91cGRhdGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVUcmVlUmVzb2x2ZXIuaAppbmRleCA0MmFkNTVkYTlkYmQuLjVhZjlmYmY5MjcwZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCkBAIC02Myw4ICs2Myw4IEBAIHBy aXZhdGU6CiAKICAgICB2b2lkIHJlc29sdmVDb21wb3NlZFRyZWUoKTsKIAotICAgIGVudW0gY2xh c3MgUXVlcnlDb250YWluZXJBY3Rpb24gOiB1aW50OF90IHsgTm9uZSwgQ29udGludWUsIExheW91 dCB9OwotICAgIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIHVwZGF0ZVF1ZXJ5Q29udGFpbmVyKEVsZW1l bnQmLCBjb25zdCBSZW5kZXJTdHlsZSYsIENvbnRhaW5lclR5cGUgcHJldmlvdXNDb250YWluZXJU eXBlKTsKKyAgICBlbnVtIGNsYXNzIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIDogdWludDhfdCB7IE5v bmUsIFJlc29sdmUgfTsKKyAgICBRdWVyeUNvbnRhaW5lckFjdGlvbiBkZXRlcm1pbmVRdWVyeUNv bnRhaW5lckFjdGlvbihjb25zdCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBDb250YWlu ZXJUeXBlIHByZXZpb3VzQ29udGFpbmVyVHlwZSk7CiAKICAgICBlbnVtIGNsYXNzIERlc2NlbmRh bnRzVG9SZXNvbHZlIDogdWludDhfdCB7IE5vbmUsIENoaWxkcmVuV2l0aEV4cGxpY2l0SW5oZXJp dCwgQ2hpbGRyZW4sIEFsbCB9OwogICAgIHN0ZDo6cGFpcjxFbGVtZW50VXBkYXRlLCBEZXNjZW5k YW50c1RvUmVzb2x2ZT4gcmVzb2x2ZUVsZW1lbnQoRWxlbWVudCYsIFJlc29sdXRpb25UeXBlKTsK QEAgLTEyOSw3ICsxMjksOCBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxQYXJlbnQsIDMyPiBtX3Bh cmVudFN0YWNrOwogICAgIGJvb2wgbV9kaWRTZWVQZW5kaW5nU3R5bGVzaGVldCB7IGZhbHNlIH07 CiAKLSAgICBIYXNoU2V0PFJlZlB0cjxFbGVtZW50Pj4gbV91bnJlc29sdmVkUXVlcnlDb250YWlu ZXJzOworICAgIFZlY3RvcjxSZWY8Y29uc3QgRWxlbWVudD4+IG1fdW5yZXNvbHZlZFF1ZXJ5Q29u dGFpbmVyczsKKyAgICBIYXNoU2V0PFJlZjxjb25zdCBFbGVtZW50Pj4gbV9yZXNvbHZlZFF1ZXJ5 Q29udGFpbmVyczsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IG1fdXBkYXRlOwogfTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVu Y3ktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvc2libGluZy1sYXlvdXQtZGVw ZW5kZW5jeS1leHBlY3RlZC50eHQKaW5kZXggODg2OTI2ZWJhMzMyLi45NTVjZWY3OTc4OTkgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRlcGVuZGVuY3kt ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3NpYmxpbmctbGF5b3V0LWRl cGVuZGVuY3ktZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsNyBAQAogWFhYWAogCi1GQUlMIFNpYmxp bmcgc3R5bGUgbXV0YXRpb24gYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjEwIiBidXQgZ290ICIy MCIKLUZBSUwgU2libGluZyBzdHlsZSBtdXRhdGlvbiwgcGFyZW50IGlzIGFmZmVjdGVkIGFzc2Vy dF9lcXVhbHM6IGV4cGVjdGVkICIxMCIgYnV0IGdvdCAiMjAiCi1GQUlMIFNpYmxpbmcgc3R5bGUg bXV0YXRpb24sIGFuY2VzdG9yIGlzIGFmZmVjdGVkIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIx MCIgYnV0IGdvdCAiMjAiCi1GQUlMIFNpYmxpbmcgdGV4dCBtdXRhdGlvbiBhc3NlcnRfZXF1YWxz OiBleHBlY3RlZCAiMTAiIGJ1dCBnb3QgIjIwIgorUEFTUyBTaWJsaW5nIHN0eWxlIG11dGF0aW9u CitQQVNTIFNpYmxpbmcgc3R5bGUgbXV0YXRpb24sIHBhcmVudCBpcyBhZmZlY3RlZAorUEFTUyBT aWJsaW5nIHN0eWxlIG11dGF0aW9uLCBhbmNlc3RvciBpcyBhZmZlY3RlZAorUEFTUyBTaWJsaW5n IHRleHQgbXV0YXRpb24KIAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK