232958 2021-11-10 11:36:28 -0800 Turn off various preferences when in captive portal mode 2021-11-11 09:18:35 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232737 1 cdumez cdumez bfulgham ggaren kkinnunen webkit-bug-importer oldest_to_newest 1813727 0 cdumez 2021-11-10 11:36:28 -0800 Turn off various preferences when in captive portal mode. 1813730 1 cdumez 2021-11-10 11:37:53 -0800 <rdar://84622396> 1813731 2 443841 cdumez 2021-11-10 11:39:28 -0800 Created attachment 443841 WIP Patch 1813742 3 443844 cdumez 2021-11-10 12:09:39 -0800 Created attachment 443844 WIP Patch 1813758 4 443850 cdumez 2021-11-10 12:35:27 -0800 Created attachment 443850 Patch 1813760 5 443852 cdumez 2021-11-10 12:46:07 -0800 Created attachment 443852 Patch 1814056 6 443852 bfulgham 2021-11-11 09:07:08 -0800 Comment on attachment 443852 Patch r=me 1814061 7 ews-feeder 2021-11-11 09:18:31 -0800 Committed r285634 (244135@main): <https://commits.webkit.org/244135@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443852. 443841 2021-11-10 11:39:28 -0800 2021-11-10 12:09:39 -0800 WIP Patch 232958_CaptivePortal_disable_preferences_wip.patch text/plain 7515 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycy5jcHAKaW5kZXggMDI5ZmYyMmUxYWJmLi42Yzk1NWQxZTAyYjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBA IC0xMjMsNiArMTIzLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgYXR0clN0eWxl RW5hYmxlZDsKICAgICBlbmNvZGVyIDw8IHNob3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29u c3RhbnRSZWRlY2xhcmF0aW9uOwogICAgIGVuY29kZXIgPDwgY3Jvc3NPcmlnaW5Nb2RlOworICAg IGVuY29kZXIgPDwgaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ7CiAKICNpZiBFTkFCTEUoU0VS VklDRV9DT05UUk9MUykKICAgICBlbmNvZGVyIDw8IGhhc0ltYWdlU2VydmljZXM7CkBAIC00MDAs NiArNDAxLDggQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jZXNzQ3JlYXQKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5jcm9zc09yaWdpbk1vZGUpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJz LmlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAj aWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJh bWV0ZXJzLmhhc0ltYWdlU2VydmljZXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGM4MWMzN2ZlMGVmNy4uYzEzMzUz MWZlYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5oCkBAIC0xMzMsNiArMTMzLDcgQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgYXR0clN0eWxlRW5hYmxlZCB7IGZhbHNlIH07CiAg ICAgYm9vbCBzaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50UmVkZWNsYXJhdGlv biB7IHRydWUgfTsKICAgICBXZWJDb3JlOjpDcm9zc09yaWdpbk1vZGUgY3Jvc3NPcmlnaW5Nb2Rl IHsgV2ViQ29yZTo6Q3Jvc3NPcmlnaW5Nb2RlOjpTaGFyZWQgfTsgLy8gQ3Jvc3Mtb3JpZ2luIGlz b2xhdGlvbiB2aWEgQ09PUCtDT0VQIGhlYWRlcnMuCisgICAgYm9vbCBpc0NhcHRpdmVQb3J0YWxN b2RlRW5hYmxlZCB7IGZhbHNlIH07CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAg ICBib29sIGhhc0ltYWdlU2VydmljZXMgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGEyZTcyMTJhMmU1ZC4uM2MzYmVmYzJhNjc0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC04MzAsNiAr ODMwLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlByb2Nlc3MoV2Vi UHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBXZWJzaXRlRGEKICAgICBwYXJhbWV0ZXJzLmF0dHJTdHls ZUVuYWJsZWQgPSBtX2NvbmZpZ3VyYXRpb24tPmF0dHJTdHlsZUVuYWJsZWQoKTsKICAgICBwYXJh bWV0ZXJzLnNob3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29uc3RhbnRSZWRlY2xhcmF0aW9u ID0gbV9jb25maWd1cmF0aW9uLT5zaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50 UmVkZWNsYXJhdGlvbigpOwogICAgIHBhcmFtZXRlcnMuY3Jvc3NPcmlnaW5Nb2RlID0gcHJvY2Vz cy5jcm9zc09yaWdpbk1vZGUoKTsKKyAgICBwYXJhbWV0ZXJzLmlzQ2FwdGl2ZVBvcnRhbE1vZGVF bmFibGVkID0gcHJvY2Vzcy5jYXB0aXZlUG9ydGFsTW9kZSgpID09IFdlYlByb2Nlc3NQcm94eTo6 Q2FwdGl2ZVBvcnRhbE1vZGU6OkVuYWJsZWQ7CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9M UykKICAgICBhdXRvJiBzZXJ2aWNlQ29udHJvbGxlciA9IFNlcnZpY2VzQ29udHJvbGxlcjo6c2lu Z2xldG9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CmluZGV4IGQ1NDA5YmVkY2U1Ni4uMTU3ZDEzNGRhMzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDA0MSw2ICs0MDQxLDIyIEBAIHZvaWQg V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3Rv cmUpCiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXRPcHVzRGVjb2RlckVuYWJs ZWQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5vcHVzRGVjb2RlckVu YWJsZWQoKSk7CiAjZW5kaWYKIAorICAgIGlmIChXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZCgpKSB7CisgICAgICAgIHNldHRpbmdzLnNldFdlYkdMRW5h YmxlZChmYWxzZSk7CisgICAgICAgIHNldHRpbmdzLnNldFdlYkdMMkVuYWJsZWQoZmFsc2UpOwor ICAgICAgICBzZXR0aW5ncy5zZXRHYW1lcGFkc0VuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0 aW5ncy5zZXRSZW1vdGVQbGF5YmFja0VuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5z ZXRGaWxlU3lzdGVtQWNjZXNzRW5hYmxlZChmYWxzZSk7CisgICAgICAgIHNldHRpbmdzLnNldEFs bG93c1BpY3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNrKGZhbHNlKTsKKyAgICAgICAgc2V0dGlu Z3Muc2V0UGljdHVyZUluUGljdHVyZUFQSUVuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5n cy5zZXRTcGVlY2hSZWNvZ25pdGlvbkVuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5z ZXROb3RpZmljYXRpb25zRW5hYmxlZChmYWxzZSk7CisgICAgICAgIHNldHRpbmdzLnNldFdlYlhS RW5hYmxlZChmYWxzZSk7CisgICAgICAgIHNldHRpbmdzLnNldFdlYlhSQXVnbWVudGVkUmVhbGl0 eU1vZHVsZUVuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5zZXRXZWJBdWRpb0VuYWJs ZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5zZXREb3dubG9hZGFibGVCaW5hcnlGb250c0Vu YWJsZWQoZmFsc2UpOworICAgIH0KKwogICAgIG1fcGFnZS0+c2V0dGluZ3NEaWRDaGFuZ2UoKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IGQ4NjI5ZTg3 MjkxNC4uMDIyNDJmYmVjZWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCkBAIC01MjQsNiArNTI0LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJv Y2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBjb21t b25WTSgpLnNldEdsb2JhbENvbnN0UmVkZWNsYXJhdGlvblNob3VsZFRocm93KHBhcmFtZXRlcnMu c2hvdWxkVGhyb3dFeGNlcHRpb25Gb3JHbG9iYWxDb25zdGFudFJlZGVjbGFyYXRpb24pOwogCiAg ICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c2V0Q3Jvc3NPcmlnaW5Nb2RlKHBhcmFtZXRlcnMu Y3Jvc3NPcmlnaW5Nb2RlKTsKKyAgICBtX2lzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkID0gcGFy YW1ldGVycy5pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDsKIAogI2lmIEVOQUJMRShTRVJWSUNF X0NPTlRST0xTKQogICAgIHNldEVuYWJsZWRTZXJ2aWNlcyhwYXJhbWV0ZXJzLmhhc0ltYWdlU2Vy dmljZXMsIHBhcmFtZXRlcnMuaGFzU2VsZWN0aW9uU2VydmljZXMsIHBhcmFtZXRlcnMuaGFzUmlj aENvbnRlbnRTZXJ2aWNlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAppbmRl eCAyMzUzNDI1MjZlZjcuLmY3MDFjOGUwY2U2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5oCkBAIC00MDMsNiArNDAzLDggQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlBdHNwaSYgYWNjZXNzaWJpbGl0eUF0c3BpKCkgY29uc3QgeyByZXR1cm4gKm1fYWNj ZXNzaWJpbGl0eTsgfQogI2VuZGlmCiAKKyAgICBib29sIGlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFi bGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDsgfQorCiBw cml2YXRlOgogICAgIFdlYlByb2Nlc3MoKTsKICAgICB+V2ViUHJvY2VzcygpOwpAQCAtNzMyLDYg KzczNCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1faGFzU3VzcGVuZGVkUGFnZVByb3h5IHsg ZmFsc2UgfTsKICAgICBib29sIG1faXNTdXNwZW5kaW5nIHsgZmFsc2UgfTsKKyAgICBib29sIG1f aXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQgeyBmYWxzZSB9OwogCiAjaWYgRU5BQkxFKE1FRElB X1NUUkVBTSkgJiYgRU5BQkxFKFNBTkRCT1hfRVhURU5TSU9OUykKICAgICBIYXNoTWFwPFN0cmlu ZywgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBtX21lZGlhQ2FwdHVyZVNhbmRib3hFeHRlbnNp b25zOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggYzhiZTEzNmFjODlhLi41 MjZmNmRlZmZjZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNzYzOCw2 ICs3NjM4LDIzIEBAIHN0YXRpYyBib29sIGlzSklURW5hYmxlZChXS1dlYlZpZXcgKndlYlZpZXcp CiAgICAgcmV0dXJuIGlzSklURW5hYmxlZFJlc3VsdDsKIH0KIAorZW51bSBjbGFzcyBTaG91bGRC ZUVuYWJsZWQgOiBib29sIHsgTm8sIFllcyB9Oworc3RhdGljIHZvaWQgY2hlY2tTZXR0aW5nc0Nv bnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKFdLV2ViVmlldyAqd2ViVmlldywgU2hvdWxkQmVF bmFibGVkIHNob3VsZEJlRW5hYmxlZCkKK3sKKyAgICAvLyBXZWIgQXVkaW8uCisgICAgYm9vbCBm aW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFT Y3JpcHQ6QCJ3aW5kb3cuQXVkaW9Db250ZXh0ID8gJ3dlYmF1ZGlvLWVuYWJsZWQnIDogJ3dlYmF1 ZGlvLWRpc2FibGVkJyIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9y ICplcnJvcikgeworICAgICAgICBFWFBFQ1RfTlVMTChlcnJvcik7CisgICAgICAgIE5TU3RyaW5n ICp3ZWJhdWRpb1N0YXRlID0gKE5TU3RyaW5nICopcmVzdWx0OworICAgICAgICBpZiAoc2hvdWxk QmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKQorICAgICAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAid2ViYXVkaW8tZW5hYmxlZCIsIHdlYmF1ZGlvU3RhdGUpOworICAgICAgICBlbHNl CisgICAgICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJ3ZWJhdWRpby1kaXNhYmxlZCIsIHdlYmF1 ZGlvU3RhdGUpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOworICAgIH1d OworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRSdW5uaW5nU2NyaXB0KTsK K30KKwogVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiB7 CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwpAQCAtNzY1OSw2 ICs3Njc2LDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1v ZGUpCiAgICAgRVhQRUNUX05FKHBpZDEsIDApOwogCiAgICAgRVhQRUNUX1RSVUUoaXNKSVRFbmFi bGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2 ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpZZXMpOwogCiAgICAg ZGVsZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJl bmNlcyA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIFdLV2VicGFnZVByZWZlcmVuY2Vz ICpwcmVmZXJlbmNlcywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rp b25Qb2xpY3ksIFdLV2VicGFnZVByZWZlcmVuY2VzICopKSB7CiAgICAgICAgIEVYUEVDVF9GQUxT RShwcmVmZXJlbmNlcy5jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwpAQCAtNzY3NCw2ICs3Njky LDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiAg ICAgLy8gV2Ugc2hvdWxkIGhhdmUgcHJvY2Vzcy1zd2FwIGZvciB0cmFuc2l0aW9uaW5nIHRvIGNh cHRpdmUgcG9ydGFsIG1vZGUuCiAgICAgRVhQRUNUX05FKHBpZDEsIFt3ZWJWaWV3IF93ZWJQcm9j ZXNzSWRlbnRpZmllcl0pOwogICAgIEVYUEVDVF9GQUxTRShpc0pJVEVuYWJsZWQod2ViVmlldy5n ZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3 ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6Ok5vKTsKIH0KIAogVEVTVChQcm9jZXNzU3dh cCwgQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkQnlEZWZhdWx0VGhlbk9wdE91dCkK 443844 2021-11-10 12:09:39 -0800 2021-11-10 12:35:25 -0800 WIP Patch 232958_CaptivePortal_disable_preferences_wip.patch text/plain 8528 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycy5jcHAKaW5kZXggMDI5ZmYyMmUxYWJmLi42Yzk1NWQxZTAyYjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBA IC0xMjMsNiArMTIzLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgYXR0clN0eWxl RW5hYmxlZDsKICAgICBlbmNvZGVyIDw8IHNob3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29u c3RhbnRSZWRlY2xhcmF0aW9uOwogICAgIGVuY29kZXIgPDwgY3Jvc3NPcmlnaW5Nb2RlOworICAg IGVuY29kZXIgPDwgaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ7CiAKICNpZiBFTkFCTEUoU0VS VklDRV9DT05UUk9MUykKICAgICBlbmNvZGVyIDw8IGhhc0ltYWdlU2VydmljZXM7CkBAIC00MDAs NiArNDAxLDggQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jZXNzQ3JlYXQKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5jcm9zc09yaWdpbk1vZGUpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJz LmlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAj aWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJh bWV0ZXJzLmhhc0ltYWdlU2VydmljZXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGM4MWMzN2ZlMGVmNy4uYzEzMzUz MWZlYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5oCkBAIC0xMzMsNiArMTMzLDcgQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgYXR0clN0eWxlRW5hYmxlZCB7IGZhbHNlIH07CiAg ICAgYm9vbCBzaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50UmVkZWNsYXJhdGlv biB7IHRydWUgfTsKICAgICBXZWJDb3JlOjpDcm9zc09yaWdpbk1vZGUgY3Jvc3NPcmlnaW5Nb2Rl IHsgV2ViQ29yZTo6Q3Jvc3NPcmlnaW5Nb2RlOjpTaGFyZWQgfTsgLy8gQ3Jvc3Mtb3JpZ2luIGlz b2xhdGlvbiB2aWEgQ09PUCtDT0VQIGhlYWRlcnMuCisgICAgYm9vbCBpc0NhcHRpdmVQb3J0YWxN b2RlRW5hYmxlZCB7IGZhbHNlIH07CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAg ICBib29sIGhhc0ltYWdlU2VydmljZXMgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGEyZTcyMTJhMmU1ZC4uM2MzYmVmYzJhNjc0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC04MzAsNiAr ODMwLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlByb2Nlc3MoV2Vi UHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBXZWJzaXRlRGEKICAgICBwYXJhbWV0ZXJzLmF0dHJTdHls ZUVuYWJsZWQgPSBtX2NvbmZpZ3VyYXRpb24tPmF0dHJTdHlsZUVuYWJsZWQoKTsKICAgICBwYXJh bWV0ZXJzLnNob3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29uc3RhbnRSZWRlY2xhcmF0aW9u ID0gbV9jb25maWd1cmF0aW9uLT5zaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50 UmVkZWNsYXJhdGlvbigpOwogICAgIHBhcmFtZXRlcnMuY3Jvc3NPcmlnaW5Nb2RlID0gcHJvY2Vz cy5jcm9zc09yaWdpbk1vZGUoKTsKKyAgICBwYXJhbWV0ZXJzLmlzQ2FwdGl2ZVBvcnRhbE1vZGVF bmFibGVkID0gcHJvY2Vzcy5jYXB0aXZlUG9ydGFsTW9kZSgpID09IFdlYlByb2Nlc3NQcm94eTo6 Q2FwdGl2ZVBvcnRhbE1vZGU6OkVuYWJsZWQ7CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9M UykKICAgICBhdXRvJiBzZXJ2aWNlQ29udHJvbGxlciA9IFNlcnZpY2VzQ29udHJvbGxlcjo6c2lu Z2xldG9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CmluZGV4IGQ1NDA5YmVkY2U1Ni4uZDdkYjRhOGQzYTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDA0MSw2ICs0MDQxLDM2IEBAIHZvaWQg V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3Rv cmUpCiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXRPcHVzRGVjb2RlckVuYWJs ZWQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5vcHVzRGVjb2RlckVu YWJsZWQoKSk7CiAjZW5kaWYKIAorICAgIGlmIChXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZCgpKSB7CisgICAgICAgIHNldHRpbmdzLnNldFdlYkdMRW5h YmxlZChmYWxzZSk7CisjaWYgRU5BQkxFKFdFQkdMMikKKyAgICAgICAgc2V0dGluZ3Muc2V0V2Vi R0wyRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyNpZiBFTkFCTEUoR0FNRVBBRCkKKyAgICAgICAg c2V0dGluZ3Muc2V0R2FtZXBhZHNFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgorI2lmIEVOQUJMRShX SVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCisgICAgICAgIHNldHRpbmdzLnNldFJlbW90ZVBsYXli YWNrRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyAgICAgICAgc2V0dGluZ3Muc2V0RmlsZVN5c3Rl bUFjY2Vzc0VuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5zZXRBbGxvd3NQaWN0dXJl SW5QaWN0dXJlTWVkaWFQbGF5YmFjayhmYWxzZSk7CisjaWYgRU5BQkxFKFBJQ1RVUkVfSU5fUElD VFVSRV9BUEkpCisgICAgICAgIHNldHRpbmdzLnNldFBpY3R1cmVJblBpY3R1cmVBUElFbmFibGVk KGZhbHNlKTsKKyNlbmRpZgorICAgICAgICBzZXR0aW5ncy5zZXRTcGVlY2hSZWNvZ25pdGlvbkVu YWJsZWQoZmFsc2UpOworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQorICAgICAgICBzZXR0aW5n cy5zZXROb3RpZmljYXRpb25zRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyNpZiBFTkFCTEUoV0VC WFIpCisgICAgICAgIHNldHRpbmdzLnNldFdlYlhSRW5hYmxlZChmYWxzZSk7CisgICAgICAgIHNl dHRpbmdzLnNldFdlYlhSQXVnbWVudGVkUmVhbGl0eU1vZHVsZUVuYWJsZWQoZmFsc2UpOworI2Vu ZGlmCisjaWYgRU5BQkxFKFdFQl9BVURJTykKKyAgICAgICAgc2V0dGluZ3Muc2V0V2ViQXVkaW9F bmFibGVkKGZhbHNlKTsKKyNlbmRpZgorICAgICAgICBzZXR0aW5ncy5zZXREb3dubG9hZGFibGVC aW5hcnlGb250c0VuYWJsZWQoZmFsc2UpOworICAgIH0KKwogICAgIG1fcGFnZS0+c2V0dGluZ3NE aWRDaGFuZ2UoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmlu ZGV4IGQ4NjI5ZTg3MjkxNC4uMDIyNDJmYmVjZWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwCkBAIC01MjQsNiArNTI0LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0 aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVy cykKICAgICBjb21tb25WTSgpLnNldEdsb2JhbENvbnN0UmVkZWNsYXJhdGlvblNob3VsZFRocm93 KHBhcmFtZXRlcnMuc2hvdWxkVGhyb3dFeGNlcHRpb25Gb3JHbG9iYWxDb25zdGFudFJlZGVjbGFy YXRpb24pOwogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c2V0Q3Jvc3NPcmlnaW5Nb2Rl KHBhcmFtZXRlcnMuY3Jvc3NPcmlnaW5Nb2RlKTsKKyAgICBtX2lzQ2FwdGl2ZVBvcnRhbE1vZGVF bmFibGVkID0gcGFyYW1ldGVycy5pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDsKIAogI2lmIEVO QUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIHNldEVuYWJsZWRTZXJ2aWNlcyhwYXJhbWV0ZXJz Lmhhc0ltYWdlU2VydmljZXMsIHBhcmFtZXRlcnMuaGFzU2VsZWN0aW9uU2VydmljZXMsIHBhcmFt ZXRlcnMuaGFzUmljaENvbnRlbnRTZXJ2aWNlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuaAppbmRleCAyMzUzNDI1MjZlZjcuLmY3MDFjOGUwY2U2MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUHJvY2Vzcy5oCkBAIC00MDMsNiArNDAzLDggQEAgcHVibGljOgogICAgIFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlBdHNwaSYgYWNjZXNzaWJpbGl0eUF0c3BpKCkgY29uc3QgeyBy ZXR1cm4gKm1fYWNjZXNzaWJpbGl0eTsgfQogI2VuZGlmCiAKKyAgICBib29sIGlzQ2FwdGl2ZVBv cnRhbE1vZGVFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0NhcHRpdmVQb3J0YWxNb2RlRW5h YmxlZDsgfQorCiBwcml2YXRlOgogICAgIFdlYlByb2Nlc3MoKTsKICAgICB+V2ViUHJvY2Vzcygp OwpAQCAtNzMyLDYgKzczNCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1faGFzU3VzcGVuZGVk UGFnZVByb3h5IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNTdXNwZW5kaW5nIHsgZmFsc2UgfTsK KyAgICBib29sIG1faXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQgeyBmYWxzZSB9OwogCiAjaWYg RU5BQkxFKE1FRElBX1NUUkVBTSkgJiYgRU5BQkxFKFNBTkRCT1hfRVhURU5TSU9OUykKICAgICBI YXNoTWFwPFN0cmluZywgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBtX21lZGlhQ2FwdHVyZVNh bmRib3hFeHRlbnNpb25zOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggYzhi ZTEzNmFjODlhLi44MWI3YjI3YTg2NTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bQpAQCAtNzYzOCw2ICs3NjM4LDMwIEBAIHN0YXRpYyBib29sIGlzSklURW5hYmxlZChXS1dlYlZp ZXcgKndlYlZpZXcpCiAgICAgcmV0dXJuIGlzSklURW5hYmxlZFJlc3VsdDsKIH0KIAorZW51bSBj bGFzcyBTaG91bGRCZUVuYWJsZWQgOiBib29sIHsgTm8sIFllcyB9Oworc3RhdGljIHZvaWQgY2hl Y2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKFdLV2ViVmlldyAqd2ViVmll dywgU2hvdWxkQmVFbmFibGVkIHNob3VsZEJlRW5hYmxlZCkKK3sKKyAgICBhdXRvIGNoZWNrV2lu ZG93UHJvcGVydHlFeGlzdHMgPSBbJl0oQVNDSUlMaXRlcmFsIHByb3BlcnR5KSAtPiBib29sIHsK KyAgICAgICAgYm9vbCBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICAgICAgYm9v bCBwcm9wZXJ0eUV4aXN0cyA9IGZhbHNlOworICAgICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFT Y3JpcHQ6bWFrZVN0cmluZygiISF3aW5kb3cuIiwgcHJvcGVydHkpIGNvbXBsZXRpb25IYW5kbGVy OlsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICAgICAgRVhQRUNUX05V TEwoZXJyb3IpOworICAgICAgICAgICAgcHJvcGVydHlFeGlzdHMgPSBbcmVzdWx0IGJvb2xWYWx1 ZV07CisgICAgICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOworICAgICAgICB9 XTsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZFJ1bm5pbmdTY3Jp cHQpOworICAgICAgICByZXR1cm4gcHJvcGVydHlFeGlzdHM7CisgICAgfTsKKworICAgIEVYUEVD VF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJXZWJHTDJSZW5kZXJpbmdDb250ZXh0Il9z KSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gV2ViR0wyLgor ICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJHYW1lcGFkIl9zKSwgc2hv dWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gR2FtZXBhZCBBUEkuCisg ICAgRVhQRUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIlJlbW90ZVBsYXliYWNrIl9z KSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gUmVtb3RlIFBs YXliYWNrLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJGaWxlU3lz dGVtSGFuZGxlIl9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsg Ly8gRmlsZSBTeXN0ZW0gQWNjZXNzLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5 RXhpc3RzKCJFbnRlclBpY3R1cmVJblBpY3R1cmVFdmVudCJfcyksIHNob3VsZEJlRW5hYmxlZCA9 PSBTaG91bGRCZUVuYWJsZWQ6Olllcyk7IC8vIFBpY3R1cmUgaW4gUGljdHVyZSBBUEkuCisgICAg RVhQRUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIldlYlhSU3lzdGVtIl9zKSwgZmFs c2UpOyAvLyBXZWJYUiAoY3VycmVudGx5IGFsd2F5cyBkaXNhYmxlZCkuCisgICAgRVhQRUNUX0VR KGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIkF1ZGlvQ29udGV4dCJfcyksIHNob3VsZEJlRW5h YmxlZCA9PSBTaG91bGRCZUVuYWJsZWQ6Olllcyk7IC8vIFdlYkF1ZGlvLgorfQorCiBURVNUKFBy b2Nlc3NTd2FwLCBOYXZpZ2F0aW5nVG9DYXB0aXZlUG9ydGFsTW9kZSkKIHsKICAgICBhdXRvIHdl YlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CkBAIC03NjU5LDYgKzc2ODMsNyBAQCBU RVNUKFByb2Nlc3NTd2FwLCBOYXZpZ2F0aW5nVG9DYXB0aXZlUG9ydGFsTW9kZSkKICAgICBFWFBF Q1RfTkUocGlkMSwgMCk7CiAKICAgICBFWFBFQ1RfVFJVRShpc0pJVEVuYWJsZWQod2ViVmlldy5n ZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3 ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6Olllcyk7CiAKICAgICBkZWxlZ2F0ZS5nZXQo KS5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVuY2VzID0gXihXS05h dmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgV0tXZWJwYWdlUHJlZmVyZW5jZXMgKnByZWZlcmVuY2Vz LCB2b2lkICheY29tcGxldGlvbkhhbmRsZXIpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgV0tX ZWJwYWdlUHJlZmVyZW5jZXMgKikpIHsKICAgICAgICAgRVhQRUNUX0ZBTFNFKHByZWZlcmVuY2Vz LmNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCk7CkBAIC03Njc0LDYgKzc2OTksNyBAQCBURVNUKFBy b2Nlc3NTd2FwLCBOYXZpZ2F0aW5nVG9DYXB0aXZlUG9ydGFsTW9kZSkKICAgICAvLyBXZSBzaG91 bGQgaGF2ZSBwcm9jZXNzLXN3YXAgZm9yIHRyYW5zaXRpb25pbmcgdG8gY2FwdGl2ZSBwb3J0YWwg bW9kZS4KICAgICBFWFBFQ1RfTkUocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVy XSk7CiAgICAgRVhQRUNUX0ZBTFNFKGlzSklURW5hYmxlZCh3ZWJWaWV3LmdldCgpKSk7CisgICAg Y2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCks IFNob3VsZEJlRW5hYmxlZDo6Tm8pOwogfQogCiBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9y dGFsTW9kZUVuYWJsZWRCeURlZmF1bHRUaGVuT3B0T3V0KQo= 443850 2021-11-10 12:35:27 -0800 2021-11-10 12:46:05 -0800 Patch bug-232958-20211110123526.patch text/plain 14824 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1MjZiZWI0YTI0MjlhMjk3 NzdmNGJkZGQ3NTA4ZDY1YWNhOGQ0MjMuLjIwMDE3MjAzZjFlZmY4ZWIzZjBiN2VkZjEwMjA0YjU3 NzdkMDcyYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjEtMTEtMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBUdXJuIG9mZiB2YXJpb3VzIHByZWZl cmVuY2VzIHdoZW4gaW4gY2FwdGl2ZSBwb3J0YWwgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTU4CisgICAgICAgIDxyZGFyOi8vODQ2MjIz OTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlz YWJsZSB0aGUgZm9sbG93aW5nIHNldHRpbmdzIHdoZW4gaW4gY2FwdGl2ZSBwb3J0YWwgbW9kZToK KyAgICAgICAgLSBXZWJHTAorICAgICAgICAtIFdlYkdMMgorICAgICAgICAtIEdhbWVwYWRzCisg ICAgICAgIC0gUmVtb3RlUGxheWJhY2sKKyAgICAgICAgLSBGaWxlU3lzdGVtQWNjZXNzCisgICAg ICAgIC0gQWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sKKyAgICAgICAgLSBQaWN0 dXJlSW5QaWN0dXJlQVBJCisgICAgICAgIC0gU3BlZWNoUmVjb2duaXRpb24KKyAgICAgICAgLSBO b3RpZmljYXRpb25zCisgICAgICAgIC0gV2ViWFIKKyAgICAgICAgLSBXZWJYUkF1Z21lbnRlZFJl YWxpdHlNb2R1bGUKKyAgICAgICAgLSBXZWJBdWRpbworICAgICAgICAtIERvd25sb2FkYWJsZUJp bmFyeUZvbnRzCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIEFQSSB0ZXN0cy4KKworICAg ICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAg ICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjppbml0aWFsaXplTmV3V2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVm ZXJlbmNlcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjppc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZCBjb25zdCk6CisKIDIwMjEtMTEtMTAgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYmFzaWMgc3VwcG9ydCBmb3IgbGF1 bmNoaW5nIENhcHRpdmVQb3J0YWxNb2RlIFdlYlByb2Nlc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCAwMjlm ZjIyZTFhYmY3ZWQxMmVhYjQ3YzRhOTRjY2RmYWQwNzJhODk4Li42Yzk1NWQxZTAyYjk4Y2MzOWEw NGE4Y2NjMjhlYmI0YTQ5MTQxOWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtMTIzLDYgKzEyMyw3IEBAIHZv aWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5j b2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IGF0dHJTdHlsZUVuYWJsZWQ7CiAgICAgZW5jb2Rl ciA8PCBzaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50UmVkZWNsYXJhdGlvbjsK ICAgICBlbmNvZGVyIDw8IGNyb3NzT3JpZ2luTW9kZTsKKyAgICBlbmNvZGVyIDw8IGlzQ2FwdGl2 ZVBvcnRhbE1vZGVFbmFibGVkOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAg ZW5jb2RlciA8PCBoYXNJbWFnZVNlcnZpY2VzOwpAQCAtNDAwLDYgKzQwMSw4IEBAIGJvb2wgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2Rlciwg V2ViUHJvY2Vzc0NyZWF0CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHBhcmFtZXRlcnMuY3Jvc3NPcmlnaW5Nb2RlKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc0NhcHRpdmVQb3J0YWxNb2Rl RW5hYmxlZCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NP TlRST0xTKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5oYXNJbWFnZVNlcnZp Y2VzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaAppbmRleCBjODFjMzdmZTBlZjdjZjMzYWZlOWNhZjExYTBmZWMwMzIxMjQzOTQ5 Li5jMTMzNTMxZmViMGI2OWRmYWVkM2Y5MGRlMDFhZDg2MzZhMWVlMTdlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKKysrIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0x MzMsNiArMTMzLDcgQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogICAg IGJvb2wgYXR0clN0eWxlRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBzaG91bGRUaHJvd0V4 Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50UmVkZWNsYXJhdGlvbiB7IHRydWUgfTsKICAgICBXZWJD b3JlOjpDcm9zc09yaWdpbk1vZGUgY3Jvc3NPcmlnaW5Nb2RlIHsgV2ViQ29yZTo6Q3Jvc3NPcmln aW5Nb2RlOjpTaGFyZWQgfTsgLy8gQ3Jvc3Mtb3JpZ2luIGlzb2xhdGlvbiB2aWEgQ09PUCtDT0VQ IGhlYWRlcnMuCisgICAgYm9vbCBpc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCB7IGZhbHNlIH07 CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAgICBib29sIGhhc0ltYWdlU2Vydmlj ZXMgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw CmluZGV4IGEyZTcyMTJhMmU1ZGFkYmM1NGI5OTlkMjM4NzA5Y2Q1M2RhNzQzZDEuLjNjM2JlZmMy YTY3NGMwZDgyYmVhNjRlYmUzNTQ5NDBhYzNjZmE5ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTgzMCw2ICs4MzAsNyBAQCB2b2lkIFdlYlByb2Nl c3NQb29sOjppbml0aWFsaXplTmV3V2ViUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Ms IFdlYnNpdGVEYQogICAgIHBhcmFtZXRlcnMuYXR0clN0eWxlRW5hYmxlZCA9IG1fY29uZmlndXJh dGlvbi0+YXR0clN0eWxlRW5hYmxlZCgpOwogICAgIHBhcmFtZXRlcnMuc2hvdWxkVGhyb3dFeGNl cHRpb25Gb3JHbG9iYWxDb25zdGFudFJlZGVjbGFyYXRpb24gPSBtX2NvbmZpZ3VyYXRpb24tPnNo b3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29uc3RhbnRSZWRlY2xhcmF0aW9uKCk7CiAgICAg cGFyYW1ldGVycy5jcm9zc09yaWdpbk1vZGUgPSBwcm9jZXNzLmNyb3NzT3JpZ2luTW9kZSgpOwor ICAgIHBhcmFtZXRlcnMuaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQgPSBwcm9jZXNzLmNhcHRp dmVQb3J0YWxNb2RlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpDYXB0aXZlUG9ydGFsTW9kZTo6RW5h YmxlZDsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIGF1dG8mIHNlcnZpY2VD b250cm9sbGVyID0gU2VydmljZXNDb250cm9sbGVyOjpzaW5nbGV0b24oKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZDU0MDliZWRjZTU2MTdh NGEwN2Y3MjEyYTg3ZmZkNjJkNmYwMDBmNy4uZDdkYjRhOGQzYTFhYWUxNjc3Y2EyOTIwNGVmYTMx NzljY2M2YmI0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKQEAgLTQwNDEsNiArNDA0MSwzNiBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVu Y2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogICAgIFBsYXRmb3JtTWVkaWFT ZXNzaW9uTWFuYWdlcjo6c2V0T3B1c0RlY29kZXJFbmFibGVkKFJ1bnRpbWVFbmFibGVkRmVhdHVy ZXM6OnNoYXJlZEZlYXR1cmVzKCkub3B1c0RlY29kZXJFbmFibGVkKCkpOwogI2VuZGlmCiAKKyAg ICBpZiAoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQo KSkgeworICAgICAgICBzZXR0aW5ncy5zZXRXZWJHTEVuYWJsZWQoZmFsc2UpOworI2lmIEVOQUJM RShXRUJHTDIpCisgICAgICAgIHNldHRpbmdzLnNldFdlYkdMMkVuYWJsZWQoZmFsc2UpOworI2Vu ZGlmCisjaWYgRU5BQkxFKEdBTUVQQUQpCisgICAgICAgIHNldHRpbmdzLnNldEdhbWVwYWRzRW5h YmxlZChmYWxzZSk7CisjZW5kaWYKKyNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VU KQorICAgICAgICBzZXR0aW5ncy5zZXRSZW1vdGVQbGF5YmFja0VuYWJsZWQoZmFsc2UpOworI2Vu ZGlmCisgICAgICAgIHNldHRpbmdzLnNldEZpbGVTeXN0ZW1BY2Nlc3NFbmFibGVkKGZhbHNlKTsK KyAgICAgICAgc2V0dGluZ3Muc2V0QWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2so ZmFsc2UpOworI2lmIEVOQUJMRShQSUNUVVJFX0lOX1BJQ1RVUkVfQVBJKQorICAgICAgICBzZXR0 aW5ncy5zZXRQaWN0dXJlSW5QaWN0dXJlQVBJRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyAgICAg ICAgc2V0dGluZ3Muc2V0U3BlZWNoUmVjb2duaXRpb25FbmFibGVkKGZhbHNlKTsKKyNpZiBFTkFC TEUoTk9USUZJQ0FUSU9OUykKKyAgICAgICAgc2V0dGluZ3Muc2V0Tm90aWZpY2F0aW9uc0VuYWJs ZWQoZmFsc2UpOworI2VuZGlmCisjaWYgRU5BQkxFKFdFQlhSKQorICAgICAgICBzZXR0aW5ncy5z ZXRXZWJYUkVuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5zZXRXZWJYUkF1Z21lbnRl ZFJlYWxpdHlNb2R1bGVFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgorI2lmIEVOQUJMRShXRUJfQVVE SU8pCisgICAgICAgIHNldHRpbmdzLnNldFdlYkF1ZGlvRW5hYmxlZChmYWxzZSk7CisjZW5kaWYK KyAgICAgICAgc2V0dGluZ3Muc2V0RG93bmxvYWRhYmxlQmluYXJ5Rm9udHNFbmFibGVkKGZhbHNl KTsKKyAgICB9CisKICAgICBtX3BhZ2UtPnNldHRpbmdzRGlkQ2hhbmdlKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCBkODYyOWU4NzI5MTRmMDc4MWM2 YzQxMmM3MjU0OWEyOGJiYWU3MGQwLi4wMjI0MmZiZWNlZjM5MjJkNjQ0ZDE1MmJhMjk5YzA5OGVj ODg1MWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC01MjQs NiArNTI0LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBjb21tb25WTSgpLnNldEds b2JhbENvbnN0UmVkZWNsYXJhdGlvblNob3VsZFRocm93KHBhcmFtZXRlcnMuc2hvdWxkVGhyb3dF eGNlcHRpb25Gb3JHbG9iYWxDb25zdGFudFJlZGVjbGFyYXRpb24pOwogCiAgICAgU2NyaXB0RXhl Y3V0aW9uQ29udGV4dDo6c2V0Q3Jvc3NPcmlnaW5Nb2RlKHBhcmFtZXRlcnMuY3Jvc3NPcmlnaW5N b2RlKTsKKyAgICBtX2lzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkID0gcGFyYW1ldGVycy5pc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZDsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQog ICAgIHNldEVuYWJsZWRTZXJ2aWNlcyhwYXJhbWV0ZXJzLmhhc0ltYWdlU2VydmljZXMsIHBhcmFt ZXRlcnMuaGFzU2VsZWN0aW9uU2VydmljZXMsIHBhcmFtZXRlcnMuaGFzUmljaENvbnRlbnRTZXJ2 aWNlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAppbmRleCAyMzUzNDI1MjZl ZjdhNzYxMGNiMjcyMzIwYjRkNjM4NjRkZWUwNjU3Li5mNzAxYzhlMGNlNjM4Yjc5ZjBhZWI5NGZl OGQ5OTY3MzRlZWZkMDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKQEAg LTQwMyw2ICs0MDMsOCBAQCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUF0c3Bp JiBhY2Nlc3NpYmlsaXR5QXRzcGkoKSBjb25zdCB7IHJldHVybiAqbV9hY2Nlc3NpYmlsaXR5OyB9 CiAjZW5kaWYKIAorICAgIGJvb2wgaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQoKSBjb25zdCB7 IHJldHVybiBtX2lzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOyB9CisKIHByaXZhdGU6CiAgICAg V2ViUHJvY2VzcygpOwogICAgIH5XZWJQcm9jZXNzKCk7CkBAIC03MzIsNiArNzM0LDcgQEAgcHJp dmF0ZToKIAogICAgIGJvb2wgbV9oYXNTdXNwZW5kZWRQYWdlUHJveHkgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9pc1N1c3BlbmRpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgbV9pc0NhcHRpdmVQb3J0 YWxNb2RlRW5hYmxlZCB7IGZhbHNlIH07CiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBF TkFCTEUoU0FOREJPWF9FWFRFTlNJT05TKQogICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8U2Fu ZGJveEV4dGVuc2lvbj4+IG1fbWVkaWFDYXB0dXJlU2FuZGJveEV4dGVuc2lvbnM7CmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGUxNWMxOTlhMDE3 NTg0ZjE2NDEyNWY2NWJjZTA3NGVkODM4YjU0Yy4uZjhiZTE2MjU3OTMzYjMyYWVlZDJjMDdjZmUw NDQ5MDBjZWU2YzU0YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTEwICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CisKKyAgICAgICAgVHVybiBvZmYgdmFyaW91cyBwcmVmZXJlbmNlcyB3aGVu IGluIGNhcHRpdmUgcG9ydGFsIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMjk1OAorICAgICAgICA8cmRhcjovLzg0NjIyMzk2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBj b3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJv Y2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisKIDIwMjEtMTEtMTAgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYmFzaWMgc3VwcG9ydCBmb3IgbGF1bmNoaW5n IENhcHRpdmVQb3J0YWxNb2RlIFdlYlByb2Nlc3NlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24ubW0KaW5kZXggYzhiZTEzNmFjODlhNjJhYzBiYjNlNWIxZWNiN2UwOGE3OGI5MTkyOS4uNGU0 ZTgxNTUxMDRjMDI3MzlhOGNjM2Q2ODNiMDVmZWQwYzUzZWU1NyAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2Fw T25OYXZpZ2F0aW9uLm1tCkBAIC03NjM4LDYgKzc2MzgsMzMgQEAgc3RhdGljIGJvb2wgaXNKSVRF bmFibGVkKFdLV2ViVmlldyAqd2ViVmlldykKICAgICByZXR1cm4gaXNKSVRFbmFibGVkUmVzdWx0 OwogfQogCitlbnVtIGNsYXNzIFNob3VsZEJlRW5hYmxlZCA6IGJvb2wgeyBObywgWWVzIH07Citl bnVtIGNsYXNzIElzU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50IDogYm9vbCB7IE5vLCBZZXMg fTsKK3N0YXRpYyB2b2lkIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9k ZShXS1dlYlZpZXcgKndlYlZpZXcsIFNob3VsZEJlRW5hYmxlZCBzaG91bGRCZUVuYWJsZWQsIElz U2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50IGlzU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50 ID0gSXNTaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQ6Ok5vKQoreworICAgIGF1dG8gY2hlY2tX aW5kb3dQcm9wZXJ0eUV4aXN0cyA9IFsmXShBU0NJSUxpdGVyYWwgcHJvcGVydHkpIC0+IGJvb2wg eworICAgICAgICBib29sIGZpbmlzaGVkUnVubmluZ1NjcmlwdCA9IGZhbHNlOworICAgICAgICBi b29sIHByb3BlcnR5RXhpc3RzID0gZmFsc2U7CisgICAgICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2 YVNjcmlwdDptYWtlU3RyaW5nKCIhIXdpbmRvdy4iLCBwcm9wZXJ0eSkgY29tcGxldGlvbkhhbmRs ZXI6WyZdIChpZCByZXN1bHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgICAgICBFWFBFQ1Rf TlVMTChlcnJvcik7CisgICAgICAgICAgICBwcm9wZXJ0eUV4aXN0cyA9IFtyZXN1bHQgYm9vbFZh bHVlXTsKKyAgICAgICAgICAgIGZpbmlzaGVkUnVubmluZ1NjcmlwdCA9IHRydWU7CisgICAgICAg IH1dOworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZpbmlzaGVkUnVubmluZ1Nj cmlwdCk7CisgICAgICAgIHJldHVybiBwcm9wZXJ0eUV4aXN0czsKKyAgICB9OworCisgICAgRVhQ RUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIldlYkdMMlJlbmRlcmluZ0NvbnRleHQi X3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZZXMpOyAvLyBXZWJHTDIu CisgICAgRVhQRUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIkdhbWVwYWQiX3MpLCBz aG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZZXMpOyAvLyBHYW1lcGFkIEFQSS4K KyAgICBFWFBFQ1RfRVEoY2hlY2tXaW5kb3dQcm9wZXJ0eUV4aXN0cygiUmVtb3RlUGxheWJhY2si X3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZZXMpOyAvLyBSZW1vdGUg UGxheWJhY2suCisgICAgRVhQRUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIkZpbGVT eXN0ZW1IYW5kbGUiX3MpLCBpc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCAhPSBJc1Nob3dp bmdJbml0aWFsRW1wdHlEb2N1bWVudDo6WWVzICYmIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRC ZUVuYWJsZWQ6Olllcyk7IC8vIEZpbGUgU3lzdGVtIEFjY2Vzcy4KKyAgICBFWFBFQ1RfRVEoY2hl Y2tXaW5kb3dQcm9wZXJ0eUV4aXN0cygiRW50ZXJQaWN0dXJlSW5QaWN0dXJlRXZlbnQiX3MpLCBz aG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZZXMpOyAvLyBQaWN0dXJlIGluIFBp Y3R1cmUgQVBJLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJTcGVl Y2hSZWNvZ25pdGlvbkV2ZW50Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxl ZDo6WWVzKTsgLy8gU3BlZWNoIHJlY29nbml0aW9uLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRv d1Byb3BlcnR5RXhpc3RzKCJOb3RpZmljYXRpb24iX3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hv dWxkQmVFbmFibGVkOjpZZXMpOyAvLyBOb3RpZmljYXRpb24gQVBJLgorICAgIEVYUEVDVF9FUShj aGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJXZWJYUlN5c3RlbSJfcyksIGZhbHNlKTsgLy8gV2Vi WFIgKGN1cnJlbnRseSBhbHdheXMgZGlzYWJsZWQpLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRv d1Byb3BlcnR5RXhpc3RzKCJBdWRpb0NvbnRleHQiX3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hv dWxkQmVFbmFibGVkOjpZZXMpOyAvLyBXZWJBdWRpby4KK30KKwogVEVTVChQcm9jZXNzU3dhcCwg TmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRv cHROUyhbV0tXZWJWaWV3IG5ld10pOwpAQCAtNzY0NSw2ICs3NjcyLDcgQEAgVEVTVChQcm9jZXNz U3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiAgICAgW3dlYlZpZXcgc2V0TmF2 aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKIAogICAgIEVYUEVDVF9UUlVFKGlzSklU RW5hYmxlZCh3ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNh cHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3VsZEJlRW5hYmxlZDo6WWVzLCBJc1No b3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudDo6WWVzKTsKIAogICAgIF9fYmxvY2sgYm9vbCBmaW5p c2hlZE5hdmlnYXRpb24gPSBmYWxzZTsKICAgICBkZWxlZ2F0ZS5nZXQoKS5kaWRGaW5pc2hOYXZp Z2F0aW9uID0gXihXS1dlYlZpZXcgKiwgV0tOYXZpZ2F0aW9uICopIHsKQEAgLTc2NTksNiArNzY4 Nyw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIE5hdmlnYXRpbmdUb0NhcHRpdmVQb3J0YWxNb2RlKQog ICAgIEVYUEVDVF9ORShwaWQxLCAwKTsKIAogICAgIEVYUEVDVF9UUlVFKGlzSklURW5hYmxlZCh3 ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0 YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3VsZEJlRW5hYmxlZDo6WWVzKTsKIAogICAgIGRlbGVn YXRlLmdldCgpLmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXMg PSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqcHJl ZmVyZW5jZXMsIHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5LCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqKSkgewogICAgICAgICBFWFBFQ1RfRkFMU0UocHJl ZmVyZW5jZXMuY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKQEAgLTc2NzQsNiArNzcwMyw3IEBA IFRFU1QoUHJvY2Vzc1N3YXAsIE5hdmlnYXRpbmdUb0NhcHRpdmVQb3J0YWxNb2RlKQogICAgIC8v IFdlIHNob3VsZCBoYXZlIHByb2Nlc3Mtc3dhcCBmb3IgdHJhbnNpdGlvbmluZyB0byBjYXB0aXZl IHBvcnRhbCBtb2RlLgogICAgIEVYUEVDVF9ORShwaWQxLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdKTsKICAgICBFWFBFQ1RfRkFMU0UoaXNKSVRFbmFibGVkKHdlYlZpZXcuZ2V0KCkp KTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUod2ViVmll dy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpObyk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIENh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5PcHRPdXQpCkBAIC03Njg3LDYgKzc3 MTcsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWRCeURlZmF1 bHRUaGVuT3B0T3V0KQogICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0 ZS5nZXQoKV07CiAKICAgICBFWFBFQ1RfRkFMU0UoaXNKSVRFbmFibGVkKHdlYlZpZXcuZ2V0KCkp KTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUod2ViVmll dy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpObywgSXNTaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1l bnQ6Olllcyk7CiAgICAgcGlkX3QgcGlkMSA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl07CiAKICAgICBfX2Jsb2NrIGJvb2wgZmluaXNoZWROYXZpZ2F0aW9uID0gZmFsc2U7CkBAIC03 NzA0LDYgKzc3MzUsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9ydGFsTW9kZUVuYWJs ZWRCeURlZmF1bHRUaGVuT3B0T3V0KQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmlu aXNoZWROYXZpZ2F0aW9uKTsKIAogICAgIEVYUEVDVF9GQUxTRShpc0pJVEVuYWJsZWQod2ViVmll dy5nZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9k ZSh3ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6Ok5vKTsKICAgICBFWFBFQ1RfRVEocGlk MSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CiAKICAgICBmaW5pc2hlZE5hdmln YXRpb24gPSBmYWxzZTsKQEAgLTc3MTMsNiArNzc0NSw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIENh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5PcHRPdXQpCiAKICAgICBFWFBFQ1Rf RVEocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7IC8vIFNob3VsZG4ndCBo YXZlIHByb2Nlc3Mtc3dhcHBlZCBzaW5jZSB3ZSdyZSBzdGF5aW5nIGluIGNhcHRpdmUgcG9ydGFs IG1vZGUuCiAgICAgRVhQRUNUX0ZBTFNFKGlzSklURW5hYmxlZCh3ZWJWaWV3LmdldCgpKSk7Cisg ICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0 KCksIFNob3VsZEJlRW5hYmxlZDo6Tm8pOwogCiAgICAgZGVsZWdhdGUuZ2V0KCkuZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlcyA9IF4oV0tOYXZpZ2F0aW9uQWN0 aW9uICphY3Rpb24sIFdLV2VicGFnZVByZWZlcmVuY2VzICpwcmVmZXJlbmNlcywgdm9pZCAoXmNv bXBsZXRpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ksIFdLV2VicGFnZVByZWZl cmVuY2VzICopKSB7CiAgICAgICAgIEVYUEVDVF9UUlVFKHByZWZlcmVuY2VzLmNhcHRpdmVQb3J0 YWxNb2RlRW5hYmxlZCk7CkBAIC03NzI4LDExICs3NzYxLDEzIEBAIFRFU1QoUHJvY2Vzc1N3YXAs IENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5PcHRPdXQpCiAgICAgLy8gV2Ug c2hvdWxkIGhhdmUgcHJvY2Vzcy1zd2FwcGVkIHRvIGdldCBvdXQgb2YgY2FwdGl2ZSBwb3J0YWwg bW9kZS4KICAgICBFWFBFQ1RfTkUocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVy XSk7CiAgICAgRVhQRUNUX1RSVUUoaXNKSVRFbmFibGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBj aGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwg U2hvdWxkQmVFbmFibGVkOjpZZXMpOwogCiAgICAgLy8gY2FwdGl2ZSBwb3J0YWwgbW9kZSBzaG91 bGQgYmUgZGlzYWJsZWQgaW4gbmV3IFdlYlZpZXdzIHNpbmNlIGl0IGlzIG5vdCBlbmFibGVkIGds b2JhbGx5LgogICAgIGF1dG8gd2ViVmlldzIgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CiAg ICAgW3dlYlZpZXcyIHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAgICAg RVhQRUNUX1RSVUUoaXNKSVRFbmFibGVkKHdlYlZpZXcyLmdldCgpKSk7CisgICAgY2hlY2tTZXR0 aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcyLmdldCgpLCBTaG91bGRC ZUVuYWJsZWQ6OlllcywgSXNTaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQ6Olllcyk7CiAgICAg cGlkX3QgcGlkMiA9IFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOwogCiAgICAgZGVs ZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNl cyA9IG5pbDsKQEAgLTc3NDIsNSArNzc3Nyw2IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQ b3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5PcHRPdXQpCiAgICAgW3dlYlZpZXcyIGxvYWRS ZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6dXJsXV07CiAgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZE5hdmlnYXRpb24pOwogICAgIEVYUEVDVF9UUlVFKGlz SklURW5hYmxlZCh3ZWJWaWV3Mi5nZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3NDb250cm9sbGVk QnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3Mi5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpZZXMp OwogICAgIEVYUEVDVF9FUShwaWQyLCBbd2ViVmlldzIgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7 CiB9Cg== 443852 2021-11-10 12:46:07 -0800 2021-11-11 09:18:33 -0800 Patch bug-232958-20211110124606.patch text/plain 15073 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1MjZiZWI0YTI0MjlhMjk3 NzdmNGJkZGQ3NTA4ZDY1YWNhOGQ0MjMuLjA2MGI1ODUzZjBmMjE2YzRlNThkM2VjOGVhYWViOGYx YzM1OTM3NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMjEtMTEtMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBUdXJuIG9mZiB2YXJpb3VzIHByZWZl cmVuY2VzIHdoZW4gaW4gY2FwdGl2ZSBwb3J0YWwgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTU4CisgICAgICAgIDxyZGFyOi8vODQ2MjIz OTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlz YWJsZSB0aGUgZm9sbG93aW5nIHNldHRpbmdzIHdoZW4gaW4gY2FwdGl2ZSBwb3J0YWwgbW9kZToK KyAgICAgICAgLSBXZWJHTAorICAgICAgICAtIFdlYkdMMgorICAgICAgICAtIEdhbWVwYWRzCisg ICAgICAgIC0gUmVtb3RlUGxheWJhY2sKKyAgICAgICAgLSBGaWxlU3lzdGVtQWNjZXNzCisgICAg ICAgIC0gQWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sKKyAgICAgICAgLSBQaWN0 dXJlSW5QaWN0dXJlQVBJCisgICAgICAgIC0gU3BlZWNoUmVjb2duaXRpb24KKyAgICAgICAgLSBO b3RpZmljYXRpb25zCisgICAgICAgIC0gV2ViWFIKKyAgICAgICAgLSBXZWJYUkF1Z21lbnRlZFJl YWxpdHlNb2R1bGUKKyAgICAgICAgLSBXZWJBdWRpbworICAgICAgICAtIERvd25sb2FkYWJsZUJp bmFyeUZvbnRzCisgICAgICAgIC0gUGVlckNvbm5lY3Rpb24gKFdlYlJUQykKKworICAgICAgICBD b3ZlcmVkIGJ5IHVwZGF0ZWQgQVBJIHRlc3RzLgorCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdX ZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpp bml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVk IGNvbnN0KToKKwogMjAyMS0xMS0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBiYXNpYyBzdXBwb3J0IGZvciBsYXVuY2hpbmcgQ2FwdGl2ZVBvcnRhbE1v ZGUgV2ViUHJvY2Vzc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IDAyOWZmMjJlMWFiZjdlZDEyZWFiNDdjNGE5 NGNjZGZhZDA3MmE4OTguLjZjOTU1ZDFlMDJiOThjYzM5YTA0YThjY2MyOGViYjRhNDkxNDE5ZGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuY3BwCkBAIC0xMjMsNiArMTIzLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29k ZXIgPDwgYXR0clN0eWxlRW5hYmxlZDsKICAgICBlbmNvZGVyIDw8IHNob3VsZFRocm93RXhjZXB0 aW9uRm9yR2xvYmFsQ29uc3RhbnRSZWRlY2xhcmF0aW9uOwogICAgIGVuY29kZXIgPDwgY3Jvc3NP cmlnaW5Nb2RlOworICAgIGVuY29kZXIgPDwgaXNDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ7CiAK ICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAgICBlbmNvZGVyIDw8IGhhc0ltYWdlU2Vy dmljZXM7CkBAIC00MDAsNiArNDAxLDggQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jZXNzQ3JlYXQKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5jcm9z c09yaWdpbk1vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShwYXJhbWV0ZXJzLmlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShwYXJhbWV0ZXJzLmhhc0ltYWdlU2VydmljZXMpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGM4MWMz N2ZlMGVmN2NmMzNhZmU5Y2FmMTFhMGZlYzAzMjEyNDM5NDkuLmMxMzM1MzFmZWIwYjY5ZGZhZWQz ZjkwZGUwMWFkODYzNmExZWUxN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTEzMyw2ICsxMzMsNyBAQCBzdHJ1Y3Qg V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgYm9vbCBhdHRyU3R5bGVFbmFibGVk IHsgZmFsc2UgfTsKICAgICBib29sIHNob3VsZFRocm93RXhjZXB0aW9uRm9yR2xvYmFsQ29uc3Rh bnRSZWRlY2xhcmF0aW9uIHsgdHJ1ZSB9OwogICAgIFdlYkNvcmU6OkNyb3NzT3JpZ2luTW9kZSBj cm9zc09yaWdpbk1vZGUgeyBXZWJDb3JlOjpDcm9zc09yaWdpbk1vZGU6OlNoYXJlZCB9OyAvLyBD cm9zcy1vcmlnaW4gaXNvbGF0aW9uIHZpYSBDT09QK0NPRVAgaGVhZGVycy4KKyAgICBib29sIGlz Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkIHsgZmFsc2UgfTsKIAogI2lmIEVOQUJMRShTRVJWSUNF X0NPTlRST0xTKQogICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcyB7IGZhbHNlIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggYTJlNzIxMmEyZTVkYWRi YzU0Yjk5OWQyMzg3MDljZDUzZGE3NDNkMS4uM2MzYmVmYzJhNjc0YzBkODJiZWE2NGViZTM1NDk0 MGFjM2NmYTk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cApAQCAtODMwLDYgKzgzMCw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdX ZWJQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgV2Vic2l0ZURhCiAgICAgcGFyYW1l dGVycy5hdHRyU3R5bGVFbmFibGVkID0gbV9jb25maWd1cmF0aW9uLT5hdHRyU3R5bGVFbmFibGVk KCk7CiAgICAgcGFyYW1ldGVycy5zaG91bGRUaHJvd0V4Y2VwdGlvbkZvckdsb2JhbENvbnN0YW50 UmVkZWNsYXJhdGlvbiA9IG1fY29uZmlndXJhdGlvbi0+c2hvdWxkVGhyb3dFeGNlcHRpb25Gb3JH bG9iYWxDb25zdGFudFJlZGVjbGFyYXRpb24oKTsKICAgICBwYXJhbWV0ZXJzLmNyb3NzT3JpZ2lu TW9kZSA9IHByb2Nlc3MuY3Jvc3NPcmlnaW5Nb2RlKCk7CisgICAgcGFyYW1ldGVycy5pc0NhcHRp dmVQb3J0YWxNb2RlRW5hYmxlZCA9IHByb2Nlc3MuY2FwdGl2ZVBvcnRhbE1vZGUoKSA9PSBXZWJQ cm9jZXNzUHJveHk6OkNhcHRpdmVQb3J0YWxNb2RlOjpFbmFibGVkOwogCiAjaWYgRU5BQkxFKFNF UlZJQ0VfQ09OVFJPTFMpCiAgICAgYXV0byYgc2VydmljZUNvbnRyb2xsZXIgPSBTZXJ2aWNlc0Nv bnRyb2xsZXI6OnNpbmdsZXRvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAppbmRleCBkNTQwOWJlZGNlNTYxN2E0YTA3ZjcyMTJhODdmZmQ2MmQ2ZjAw MGY3Li5jNDQxZTdhZjJkNmJhYTg5ZjZmZWY3YWUyZWZmN2FmMzc5ODE4MjMzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDA0MSw2ICs0MDQx LDM5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5j ZXNTdG9yZSYgc3RvcmUpCiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXRPcHVz RGVjb2RlckVuYWJsZWQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5v cHVzRGVjb2RlckVuYWJsZWQoKSk7CiAjZW5kaWYKIAorICAgIGlmIChXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCgpKSB7CisgICAgICAgIHNldHRpbmdz LnNldFdlYkdMRW5hYmxlZChmYWxzZSk7CisjaWYgRU5BQkxFKFdFQkdMMikKKyAgICAgICAgc2V0 dGluZ3Muc2V0V2ViR0wyRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyNpZiBFTkFCTEUoR0FNRVBB RCkKKyAgICAgICAgc2V0dGluZ3Muc2V0R2FtZXBhZHNFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgor I2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCisgICAgICAgIHNldHRpbmdzLnNl dFJlbW90ZVBsYXliYWNrRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyAgICAgICAgc2V0dGluZ3Mu c2V0RmlsZVN5c3RlbUFjY2Vzc0VuYWJsZWQoZmFsc2UpOworICAgICAgICBzZXR0aW5ncy5zZXRB bGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayhmYWxzZSk7CisjaWYgRU5BQkxFKFBJ Q1RVUkVfSU5fUElDVFVSRV9BUEkpCisgICAgICAgIHNldHRpbmdzLnNldFBpY3R1cmVJblBpY3R1 cmVBUElFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgorICAgICAgICBzZXR0aW5ncy5zZXRTcGVlY2hS ZWNvZ25pdGlvbkVuYWJsZWQoZmFsc2UpOworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQorICAg ICAgICBzZXR0aW5ncy5zZXROb3RpZmljYXRpb25zRW5hYmxlZChmYWxzZSk7CisjZW5kaWYKKyNp ZiBFTkFCTEUoV0VCWFIpCisgICAgICAgIHNldHRpbmdzLnNldFdlYlhSRW5hYmxlZChmYWxzZSk7 CisgICAgICAgIHNldHRpbmdzLnNldFdlYlhSQXVnbWVudGVkUmVhbGl0eU1vZHVsZUVuYWJsZWQo ZmFsc2UpOworI2VuZGlmCisjaWYgRU5BQkxFKFdFQl9BVURJTykKKyAgICAgICAgc2V0dGluZ3Mu c2V0V2ViQXVkaW9FbmFibGVkKGZhbHNlKTsKKyNlbmRpZgorICAgICAgICBzZXR0aW5ncy5zZXRE b3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQoZmFsc2UpOworI2lmIEVOQUJMRShXRUJfUlRD KQorICAgICAgICBzZXR0aW5ncy5zZXRQZWVyQ29ubmVjdGlvbkVuYWJsZWQoZmFsc2UpOworI2Vu ZGlmCisgICAgfQorCiAgICAgbV9wYWdlLT5zZXR0aW5nc0RpZENoYW5nZSgpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggZDg2MjllODcyOTE0ZjA3ODFj NmM0MTJjNzI1NDlhMjhiYmFlNzBkMC4uMDIyNDJmYmVjZWYzOTIyZDY0NGQxNTJiYTI5OWMwOThl Yzg4NTFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtNTI0 LDYgKzUyNCw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgY29tbW9uVk0oKS5zZXRH bG9iYWxDb25zdFJlZGVjbGFyYXRpb25TaG91bGRUaHJvdyhwYXJhbWV0ZXJzLnNob3VsZFRocm93 RXhjZXB0aW9uRm9yR2xvYmFsQ29uc3RhbnRSZWRlY2xhcmF0aW9uKTsKIAogICAgIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnNldENyb3NzT3JpZ2luTW9kZShwYXJhbWV0ZXJzLmNyb3NzT3JpZ2lu TW9kZSk7CisgICAgbV9pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCA9IHBhcmFtZXRlcnMuaXND YXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ7CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykK ICAgICBzZXRFbmFibGVkU2VydmljZXMocGFyYW1ldGVycy5oYXNJbWFnZVNlcnZpY2VzLCBwYXJh bWV0ZXJzLmhhc1NlbGVjdGlvblNlcnZpY2VzLCBwYXJhbWV0ZXJzLmhhc1JpY2hDb250ZW50U2Vy dmljZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKaW5kZXggMjM1MzQyNTI2 ZWY3YTc2MTBjYjI3MjMyMGI0ZDYzODY0ZGVlMDY1Ny4uZjcwMWM4ZTBjZTYzOGI3OWYwYWViOTRm ZThkOTk2NzM0ZWVmZDAxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCkBA IC00MDMsNiArNDAzLDggQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBdHNw aSYgYWNjZXNzaWJpbGl0eUF0c3BpKCkgY29uc3QgeyByZXR1cm4gKm1fYWNjZXNzaWJpbGl0eTsg fQogI2VuZGlmCiAKKyAgICBib29sIGlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKCkgY29uc3Qg eyByZXR1cm4gbV9pc0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDsgfQorCiBwcml2YXRlOgogICAg IFdlYlByb2Nlc3MoKTsKICAgICB+V2ViUHJvY2VzcygpOwpAQCAtNzMyLDYgKzczNCw3IEBAIHBy aXZhdGU6CiAKICAgICBib29sIG1faGFzU3VzcGVuZGVkUGFnZVByb3h5IHsgZmFsc2UgfTsKICAg ICBib29sIG1faXNTdXNwZW5kaW5nIHsgZmFsc2UgfTsKKyAgICBib29sIG1faXNDYXB0aXZlUG9y dGFsTW9kZUVuYWJsZWQgeyBmYWxzZSB9OwogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkgJiYg RU5BQkxFKFNBTkRCT1hfRVhURU5TSU9OUykKICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFNh bmRib3hFeHRlbnNpb24+PiBtX21lZGlhQ2FwdHVyZVNhbmRib3hFeHRlbnNpb25zOwpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRlMTVjMTk5YTAx NzU4NGYxNjQxMjVmNjViY2UwNzRlZDgzOGI1NGMuLmY4YmUxNjI1NzkzM2IzMmFlZWQyYzA3Y2Zl MDQ0OTAwY2VlNmM1NGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMS0xMCAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgorCisgICAgICAgIFR1cm4gb2ZmIHZhcmlvdXMgcHJlZmVyZW5jZXMgd2hl biBpbiBjYXB0aXZlIHBvcnRhbCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI5NTgKKyAgICAgICAgPHJkYXI6Ly84NDYyMjM5Nj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3Qg Y292ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By b2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorCiAyMDIxLTExLTEwICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGJhc2ljIHN1cHBvcnQgZm9yIGxhdW5jaGlu ZyBDYXB0aXZlUG9ydGFsTW9kZSBXZWJQcm9jZXNzZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0 aW9uLm1tCmluZGV4IGM4YmUxMzZhYzg5YTYyYWMwYmIzZTViMWVjYjdlMDhhNzhiOTE5MjkuLjM5 MTljZjk4MWRmMjFjZWM2Nzk5YWM5OGM2MmZiZjljNDUxYWJjYTAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24u bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbQpAQCAtNzYzOCw2ICs3NjM4LDM0IEBAIHN0YXRpYyBib29sIGlzSklU RW5hYmxlZChXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgcmV0dXJuIGlzSklURW5hYmxlZFJlc3Vs dDsKIH0KIAorZW51bSBjbGFzcyBTaG91bGRCZUVuYWJsZWQgOiBib29sIHsgTm8sIFllcyB9Owor ZW51bSBjbGFzcyBJc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCA6IGJvb2wgeyBObywgWWVz IH07CitzdGF0aWMgdm9pZCBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2ZVBvcnRhbE1v ZGUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBTaG91bGRCZUVuYWJsZWQgc2hvdWxkQmVFbmFibGVkLCBJ c1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCBpc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVu dCA9IElzU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50OjpObykKK3sKKyAgICBhdXRvIGNoZWNr V2luZG93UHJvcGVydHlFeGlzdHMgPSBbJl0oQVNDSUlMaXRlcmFsIHByb3BlcnR5KSAtPiBib29s IHsKKyAgICAgICAgYm9vbCBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICAgICAg Ym9vbCBwcm9wZXJ0eUV4aXN0cyA9IGZhbHNlOworICAgICAgICBbd2ViVmlldyBldmFsdWF0ZUph dmFTY3JpcHQ6bWFrZVN0cmluZygiISF3aW5kb3cuIiwgcHJvcGVydHkpIGNvbXBsZXRpb25IYW5k bGVyOlsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICAgICAgRVhQRUNU X05VTEwoZXJyb3IpOworICAgICAgICAgICAgcHJvcGVydHlFeGlzdHMgPSBbcmVzdWx0IGJvb2xW YWx1ZV07CisgICAgICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOworICAgICAg ICB9XTsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZFJ1bm5pbmdT Y3JpcHQpOworICAgICAgICByZXR1cm4gcHJvcGVydHlFeGlzdHM7CisgICAgfTsKKworICAgIEVY UEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJXZWJHTDJSZW5kZXJpbmdDb250ZXh0 Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gV2ViR0wy LgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJHYW1lcGFkIl9zKSwg c2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gR2FtZXBhZCBBUEku CisgICAgRVhQRUNUX0VRKGNoZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIlJlbW90ZVBsYXliYWNr Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gUmVtb3Rl IFBsYXliYWNrLgorICAgIEVYUEVDVF9FUShjaGVja1dpbmRvd1Byb3BlcnR5RXhpc3RzKCJGaWxl U3lzdGVtSGFuZGxlIl9zKSwgaXNTaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQgIT0gSXNTaG93 aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQ6OlllcyAmJiBzaG91bGRCZUVuYWJsZWQgPT0gU2hvdWxk QmVFbmFibGVkOjpZZXMpOyAvLyBGaWxlIFN5c3RlbSBBY2Nlc3MuCisgICAgRVhQRUNUX0VRKGNo ZWNrV2luZG93UHJvcGVydHlFeGlzdHMoIkVudGVyUGljdHVyZUluUGljdHVyZUV2ZW50Il9zKSwg c2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gUGljdHVyZSBpbiBQ aWN0dXJlIEFQSS4KKyAgICBFWFBFQ1RfRVEoY2hlY2tXaW5kb3dQcm9wZXJ0eUV4aXN0cygiU3Bl ZWNoUmVjb2duaXRpb25FdmVudCJfcyksIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRCZUVuYWJs ZWQ6Olllcyk7IC8vIFNwZWVjaCByZWNvZ25pdGlvbi4KKyAgICBFWFBFQ1RfRVEoY2hlY2tXaW5k b3dQcm9wZXJ0eUV4aXN0cygiTm90aWZpY2F0aW9uIl9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNo b3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gTm90aWZpY2F0aW9uIEFQSS4KKyAgICBFWFBFQ1RfRVEo Y2hlY2tXaW5kb3dQcm9wZXJ0eUV4aXN0cygiV2ViWFJTeXN0ZW0iX3MpLCBmYWxzZSk7IC8vIFdl YlhSIChjdXJyZW50bHkgYWx3YXlzIGRpc2FibGVkKS4KKyAgICBFWFBFQ1RfRVEoY2hlY2tXaW5k b3dQcm9wZXJ0eUV4aXN0cygiQXVkaW9Db250ZXh0Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNo b3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gV2ViQXVkaW8uCisgICAgRVhQRUNUX0VRKGNoZWNrV2lu ZG93UHJvcGVydHlFeGlzdHMoIlJUQ1BlZXJDb25uZWN0aW9uIl9zKSwgc2hvdWxkQmVFbmFibGVk ID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gV2ViUlRDIFBlZXIgQ29ubmVjdGlvbi4KK30K KwogVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiB7CiAg ICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwpAQCAtNzY0NSw2ICs3 NjczLDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUp CiAgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKIAog ICAgIEVYUEVDVF9UUlVFKGlzSklURW5hYmxlZCh3ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tT ZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3Vs ZEJlRW5hYmxlZDo6WWVzLCBJc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudDo6WWVzKTsKIAog ICAgIF9fYmxvY2sgYm9vbCBmaW5pc2hlZE5hdmlnYXRpb24gPSBmYWxzZTsKICAgICBkZWxlZ2F0 ZS5nZXQoKS5kaWRGaW5pc2hOYXZpZ2F0aW9uID0gXihXS1dlYlZpZXcgKiwgV0tOYXZpZ2F0aW9u ICopIHsKQEAgLTc2NTksNiArNzY4OCw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIE5hdmlnYXRpbmdU b0NhcHRpdmVQb3J0YWxNb2RlKQogICAgIEVYUEVDVF9ORShwaWQxLCAwKTsKIAogICAgIEVYUEVD VF9UUlVFKGlzSklURW5hYmxlZCh3ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0Nv bnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3VsZEJlRW5hYmxl ZDo6WWVzKTsKIAogICAgIGRlbGVnYXRlLmdldCgpLmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25XaXRoUHJlZmVyZW5jZXMgPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCBXS1dl YnBhZ2VQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMsIHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlciko V0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqKSkgewogICAg ICAgICBFWFBFQ1RfRkFMU0UocHJlZmVyZW5jZXMuY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsK QEAgLTc2NzQsNiArNzcwNCw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIE5hdmlnYXRpbmdUb0NhcHRp dmVQb3J0YWxNb2RlKQogICAgIC8vIFdlIHNob3VsZCBoYXZlIHByb2Nlc3Mtc3dhcCBmb3IgdHJh bnNpdGlvbmluZyB0byBjYXB0aXZlIHBvcnRhbCBtb2RlLgogICAgIEVYUEVDVF9ORShwaWQxLCBb d2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKICAgICBFWFBFQ1RfRkFMU0UoaXNKSVRF bmFibGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2Fw dGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpObyk7CiB9CiAK IFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5P cHRPdXQpCkBAIC03Njg3LDYgKzc3MTgsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9y dGFsTW9kZUVuYWJsZWRCeURlZmF1bHRUaGVuT3B0T3V0KQogICAgIFt3ZWJWaWV3IHNldE5hdmln YXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAKICAgICBFWFBFQ1RfRkFMU0UoaXNKSVRF bmFibGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2Fw dGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpObywgSXNTaG93 aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQ6Olllcyk7CiAgICAgcGlkX3QgcGlkMSA9IFt3ZWJWaWV3 IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CiAKICAgICBfX2Jsb2NrIGJvb2wgZmluaXNoZWROYXZp Z2F0aW9uID0gZmFsc2U7CkBAIC03NzA0LDYgKzc3MzYsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBD YXB0aXZlUG9ydGFsTW9kZUVuYWJsZWRCeURlZmF1bHRUaGVuT3B0T3V0KQogICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWROYXZpZ2F0aW9uKTsKIAogICAgIEVYUEVDVF9GQUxT RShpc0pJVEVuYWJsZWQod2ViVmlldy5nZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3NDb250cm9s bGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6Ok5v KTsKICAgICBFWFBFQ1RfRVEocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7 CiAKICAgICBmaW5pc2hlZE5hdmlnYXRpb24gPSBmYWxzZTsKQEAgLTc3MTMsNiArNzc0Niw3IEBA IFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5P cHRPdXQpCiAKICAgICBFWFBFQ1RfRVEocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlm aWVyXSk7IC8vIFNob3VsZG4ndCBoYXZlIHByb2Nlc3Mtc3dhcHBlZCBzaW5jZSB3ZSdyZSBzdGF5 aW5nIGluIGNhcHRpdmUgcG9ydGFsIG1vZGUuCiAgICAgRVhQRUNUX0ZBTFNFKGlzSklURW5hYmxl ZCh3ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQ b3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3VsZEJlRW5hYmxlZDo6Tm8pOwogCiAgICAgZGVs ZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNl cyA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIFdLV2VicGFnZVByZWZlcmVuY2VzICpw cmVmZXJlbmNlcywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Q b2xpY3ksIFdLV2VicGFnZVByZWZlcmVuY2VzICopKSB7CiAgICAgICAgIEVYUEVDVF9UUlVFKHBy ZWZlcmVuY2VzLmNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCk7CkBAIC03NzI4LDExICs3NzYyLDEz IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRo ZW5PcHRPdXQpCiAgICAgLy8gV2Ugc2hvdWxkIGhhdmUgcHJvY2Vzcy1zd2FwcGVkIHRvIGdldCBv dXQgb2YgY2FwdGl2ZSBwb3J0YWwgbW9kZS4KICAgICBFWFBFQ1RfTkUocGlkMSwgW3dlYlZpZXcg X3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CiAgICAgRVhQRUNUX1RSVUUoaXNKSVRFbmFibGVkKHdl YlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2FwdGl2ZVBvcnRh bE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpZZXMpOwogCiAgICAgLy8gY2Fw dGl2ZSBwb3J0YWwgbW9kZSBzaG91bGQgYmUgZGlzYWJsZWQgaW4gbmV3IFdlYlZpZXdzIHNpbmNl IGl0IGlzIG5vdCBlbmFibGVkIGdsb2JhbGx5LgogICAgIGF1dG8gd2ViVmlldzIgPSBhZG9wdE5T KFtXS1dlYlZpZXcgbmV3XSk7CiAgICAgW3dlYlZpZXcyIHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpk ZWxlZ2F0ZS5nZXQoKV07CiAgICAgRVhQRUNUX1RSVUUoaXNKSVRFbmFibGVkKHdlYlZpZXcyLmdl dCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRpdmVQb3J0YWxNb2RlKHdl YlZpZXcyLmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6OlllcywgSXNTaG93aW5nSW5pdGlhbEVtcHR5 RG9jdW1lbnQ6Olllcyk7CiAgICAgcGlkX3QgcGlkMiA9IFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdOwogCiAgICAgZGVsZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbldpdGhQcmVmZXJlbmNlcyA9IG5pbDsKQEAgLTc3NDIsNSArNzc3OCw2IEBAIFRFU1Qo UHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRoZW5PcHRPdXQp CiAgICAgW3dlYlZpZXcyIGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6 dXJsXV07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZE5hdmlnYXRpb24p OwogICAgIEVYUEVDVF9UUlVFKGlzSklURW5hYmxlZCh3ZWJWaWV3Mi5nZXQoKSkpOworICAgIGNo ZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3Mi5nZXQoKSwg U2hvdWxkQmVFbmFibGVkOjpZZXMpOwogICAgIEVYUEVDVF9FUShwaWQyLCBbd2ViVmlldzIgX3dl YlByb2Nlc3NJZGVudGlmaWVyXSk7CiB9Cg==