240483 2022-05-16 15:21:03 -0700 Private relay should fail closed for third party loads if the main resource was loaded over private relay 2022-05-24 12:36:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 240740 1 achristensen achristensen cdumez cgarcia commit-queue ews-watchlist webkit-bug-importer oldest_to_newest 1869445 0 achristensen 2022-05-16 15:21:03 -0700 Private relay should fail closed for third party loads if the main resource was loaded over private relay 1869446 1 459458 achristensen 2022-05-16 15:25:37 -0700 Created attachment 459458 Patch 1869447 2 achristensen 2022-05-16 15:25:41 -0700 <rdar://problem/92697007> 1869826 3 459518 achristensen 2022-05-17 15:19:28 -0700 Created attachment 459518 Patch 1869883 4 ews-feeder 2022-05-17 17:56:41 -0700 Committed r294371 (250670@main): <https://commits.webkit.org/250670@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459518. 1870840 5 commit-queue 2022-05-20 15:13:14 -0700 Re-opened since this is blocked by bug 240740 1870850 6 459629 achristensen 2022-05-20 15:40:37 -0700 Created attachment 459629 reverting patch 1870911 7 459635 achristensen 2022-05-20 20:23:12 -0700 Created attachment 459635 Patch 1871216 8 achristensen 2022-05-23 09:38:56 -0700 I verified that, when opening several news sites, the patch from 5/17 had some differences between whether it calls _setPrivacyProxyFailClosedForUnreachableNonMainHosts on requests to the same hosts, which would cause different TCP connections to be made, which explains the performance regression. I verified that the patch from 5/20 does not do this. 1871217 9 459635 cdumez 2022-05-23 09:41:39 -0700 Comment on attachment 459635 Patch r=me 1871545 10 ews-feeder 2022-05-24 12:36:10 -0700 Committed r294757 (250925@main): <https://commits.webkit.org/250925@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459635. 459458 2022-05-16 15:25:37 -0700 2022-05-17 15:19:26 -0700 Patch bug-240483-20220516152536.patch text/plain 8621 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliMGQ3YWE4NDgxYzVjM2Y4 ZWFmZTliNmViM2U5MmVjOTE2NDUxZWUuLmM5ZjA5MDVhMWExMmJhZTZmNTQyY2U4YjFkNTBkYzBm NzdmMTYxMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDUtMTYgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBQcml2YXRlIHJl bGF5IHNob3VsZCBmYWlsIGNsb3NlZCBmb3IgdGhpcmQgcGFydHkgbG9hZHMgaWYgdGhlIG1haW4g cmVzb3VyY2Ugd2FzIGxvYWRlZCBvdmVyIHByaXZhdGUgcmVsYXkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDQ4MworICAgICAgICA8cmRhcjovLzky Njk3MDA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcmUtbGFuZHMgdGhlIGNoYW5nZSBmcm9tIHIyOTM4NjEgYWxvbmcgd2l0aCByMjkzNDgx IHdoaWNoIHNob3VsZCBmaXggcHJvYmxlbXMgcmVsYXRlZCB0byByZGFyOi8vOTIzMzYyNzAKKyAg ICAgICAgYWxvbmcgd2l0aCByMjkzNTkxIHdoaWNoIHNob3VsZCBmaXggcGVyZm9ybWFuY2UgcmVn cmVzc2lvbnMgcmVsYXRlZCB0byByZGFyOi8vOTI0NTg5OTUgYnV0IHdhcyBpbnN1ZmZpY2llbnQu CisgICAgICAgIER1cmluZyBhIGJhc2ljIGJyb3dzaW5nIHRlc3QsIEkgZm91bmQgdHdvIG1vcmUg cGxhY2VzIHdoZXJlIHdlIHdlcmUgbWFraW5nIGEgTmV0d29ya0RhdGFUYXNrIHdpdGhvdXQgc2V0 dGluZyB0aGUKKyAgICAgICAgcGFyYW1ldGVycycgdG9wIG9yaWdpbiwgb25lIGluIHRoZSBTcGVj dWxhdGl2ZUxvYWQgY29uc3RydWN0b3IgYW5kIGFub3RoZXIgaW4gV2ViTG9hZGVyU3RyYXRlZ3k6 OnByZWNvbm5lY3RUby4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtDT1JTUHJl ZmxpZ2h0Q2hlY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDT1JTUHJlZmxpZ2h0 Q2hlY2tlcjo6c3RhcnRQcmVmbGlnaHQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkOjpTcGVjdWxhdGl2ZUxvYWQpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAg ICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2Vp dmVSZXNwb25zZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Nlc3Npb25Db2NvYTo6Y3JlYXRlV2ViU29ja2V0VGFzayk6CisgICAgICAgICogV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTG9h ZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyk6CisKIDIwMjItMDUtMTIgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZlcnQgcjI5Mzg2MQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ09SU1ByZWZs aWdodENoZWNrZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ09S U1ByZWZsaWdodENoZWNrZXIuY3BwCmluZGV4IGVlMWYzNWY1MTQwYWUzYWNhODZmMjI1ZGM1NWVj ZjFmZjQ1ZmNmMTguLjFhMDNiOTNkMjhhNTMxYTZhNzVlYzFkZjYwZjYzNzVkYWEyNWZmYjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0NPUlNQcmVmbGln aHRDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtD T1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAKQEAgLTc1LDYgKzc1LDggQEAgdm9pZCBOZXR3b3JrQ09S U1ByZWZsaWdodENoZWNrZXI6OnN0YXJ0UHJlZmxpZ2h0KCkKICAgICAgICAgbV9sb2FkSW5mb3Jt YXRpb24gPSBOZXR3b3JrVHJhbnNhY3Rpb25JbmZvcm1hdGlvbiB7IE5ldHdvcmtUcmFuc2FjdGlv bkluZm9ybWF0aW9uOjpUeXBlOjpQcmVmbGlnaHQsIGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QsIHsg fSwgeyB9IH07CiAKICAgICBsb2FkUGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRCA9IG1fcGFyYW1l dGVycy53ZWJQYWdlUHJveHlJRDsKKyAgICBsb2FkUGFyYW1ldGVycy50b3BPcmlnaW4gPSBtX3Bh cmFtZXRlcnMudG9wT3JpZ2luOworICAgIGxvYWRQYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbiA9IG1f cGFyYW1ldGVycy5zb3VyY2VPcmlnaW4ucHRyKCk7CiAKICAgICBpZiAoYXV0byogbmV0d29ya1Nl c3Npb24gPSBtX25ldHdvcmtQcm9jZXNzLT5uZXR3b3JrU2Vzc2lvbihtX3BhcmFtZXRlcnMuc2Vz c2lvbklEKSkgewogICAgICAgICBtX3Rhc2sgPSBOZXR3b3JrRGF0YVRhc2s6OmNyZWF0ZSgqbmV0 d29ya1Nlc3Npb24sICp0aGlzLCBXVEZNb3ZlKGxvYWRQYXJhbWV0ZXJzKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0 aXZlTG9hZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAKaW5kZXggNjgxMzE1ZDk0NmNmYzRhMzA5Yzc5MjgwOWM3 MTQyYzc0ZDU1MmFhMC4uMzMxN2UwY2E5ZDEzOTA1MDNmMmU0MDM1NGNiOGFkNjdkZjZhMjllMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGVTcGVjdWxhdGl2ZUxvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcApAQCAtNjcsNiArNjcsNyBAQCBT cGVjdWxhdGl2ZUxvYWQ6OlNwZWN1bGF0aXZlTG9hZChDYWNoZSYgY2FjaGUsIGNvbnN0IEdsb2Jh bEZyYW1lSUQmIGdsb2JhbEZyYW1lSQogICAgIHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9s aWN5ID0gQ29udGVudFNuaWZmaW5nUG9saWN5OjpEb05vdFNuaWZmQ29udGVudDsKICAgICBwYXJh bWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5nUG9saWN5ID0gQ29udGVudEVuY29kaW5nU25p ZmZpbmdQb2xpY3k6OlNuaWZmOwogICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9IG1fb3JpZ2luYWxS ZXF1ZXN0OworICAgIHBhcmFtZXRlcnMudG9wT3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0 ZShtX29yaWdpbmFsUmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsKICAgICBwYXJhbWV0 ZXJzLmlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4gPSBpc05hdmlnYXRpbmdUb0FwcEJvdW5k RG9tYWluOwogICAgIG1fbmV0d29ya0xvYWQgPSBtYWtlVW5pcXVlPE5ldHdvcmtMb2FkPigqdGhp cywgbnVsbHB0ciwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgKm5ldHdvcmtTZXNzaW9uKTsKICAgICBt X25ldHdvcmtMb2FkLT5zdGFydFdpdGhTY2hlZHVsaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQpp bmRleCAxNzVmZjhhYjlkOGFjMzE0MDQ2NzMyYzFiMTgzNTNjZDJhYzM0MTRiLi42OWM1OTAwNTMy MTcxNWIzMTgwOTQ4MjgwYzdlZTc0YjVmYTc0N2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KQEAg LTM0MCw2ICszNDAsMTQgQEAgTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0Nv Y29hKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVQKICAgICBSZXRhaW5QdHI8 TlNVUkxSZXF1ZXN0PiBuc1JlcXVlc3QgPSByZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpI VFRQQm9keVVwZGF0ZVBvbGljeTo6VXBkYXRlSFRUUEJvZHkpOwogICAgIFJldGFpblB0cjxOU011 dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVzdC5nZXQo KSBtdXRhYmxlQ29weV0pOwogCisgICAgaWYgKHBhcmFtZXRlcnMuaXNNYWluRnJhbWVOYXZpZ2F0 aW9uCisgICAgICAgIHx8IHBhcmFtZXRlcnMuaGFkTWFpbkZyYW1lTWFpblJlc291cmNlUHJpdmF0 ZVJlbGF5ZWQKKyAgICAgICAgfHwgIXBhcmFtZXRlcnMudG9wT3JpZ2luCisgICAgICAgIHx8IHJl cXVlc3QudXJsKCkuaG9zdCgpID09IHBhcmFtZXRlcnMudG9wT3JpZ2luLT5ob3N0KCkpIHsKKyAg ICAgICAgaWYgKFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9z ZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0pCisg ICAgICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JV bnJlYWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOworICAgIH0KKwogI2lmIEVOQUJMRShBUFBfUFJJ VkFDWV9SRVBPUlQpCiAgICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPSByZXF1 ZXN0LmlzQXBwSW5pdGlhdGVkKCkgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3BlciA6 IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uVXNlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmlu ZGV4IGNkZWQzZDM2MDI0ODMwNTA1M2I1MTJjZDg4N2IxNTA0ZDk3MmY5ZTAuLmJhMzNiZTM3NWY5 MjZlMGY1ZDcxYTliYjZjYTg2NjNmMTNiYTU5YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTkz Niw3ICs5MzYsOSBAQCBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIAogICAgICAg ICBOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzICptZXRyaWNzID0gdGFza01ldHJp Y3MudHJhbnNhY3Rpb25NZXRyaWNzLmxhc3RPYmplY3Q7CiAjaWYgSEFWRShORVRXT1JLX0NPTk5F Q1RJT05fUFJJVkFDWV9TVEFOQ0UpCi0gICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRy aWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZGlyZWN0 ID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKKyAgICAgICAgYXV0 byBwcml2YXRlUmVsYXllZCA9IG1ldHJpY3MuX3ByaXZhY3lTdGFuY2UgPT0gbndfY29ubmVjdGlv bl9wcml2YWN5X3N0YW5jZV9kaXJlY3QKKyAgICAgICAgICAgIHx8IG1ldHJpY3MuX3ByaXZhY3lT dGFuY2UgPT0gbndfY29ubmVjdGlvbl9wcml2YWN5X3N0YW5jZV9ub3RfZWxpZ2libGUKKyAgICAg ICAgICAgID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNl CiAgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5k aWYKQEAgLTE3MTIsNiArMTcxNCwxNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViU29ja2V0VGFzaz4g TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3JlYXRlV2ViU29ja2V0VGFzayhXZWJQYWdlUAogICAgIGFw cFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1ZXN0KG5z UmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVs b3Blcik7CiAjZW5kaWYKIAorICAgIC8vIEZJWE1FOiBUaGlzIGZ1bmN0aW9uIGNhbiBtYWtlIHVw IHRvIDMgY29waWVzIG9mIGEgcmVxdWVzdC4KKyAgICAvLyBSZWR1Y2UgdGhhdCB0byBvbmUgaWYg dGhlIHByb3RvY29sIGlzIG51bGwsIHRoZSByZXF1ZXN0IGlzbid0IGFwcCBpbml0aWF0ZWQsCisg ICAgLy8gb3IgdGhlIG1haW4gZnJhbWUgbWFpbiByZXNvdXJjZSB3YXMgcHJpdmF0ZSByZWxheWVk LCB0aGVuIHNldCBhbGwgcHJvcGVydGllcworICAgIC8vIG9uIHRoZSBvbmUgY29weS4KKyAgICBp ZiAoaGFkTWFpbkZyYW1lTWFpblJlc291cmNlUHJpdmF0ZVJlbGF5ZWQgfHwgcmVxdWVzdC51cmwo KS5ob3N0KCkgPT0gY2xpZW50T3JpZ2luLnRvcE9yaWdpbi5ob3N0KSB7CisgICAgICAgIFJldGFp blB0cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVx dWVzdC5nZXQoKSBtdXRhYmxlQ29weV0pOworICAgICAgICBpZiAoW211dGFibGVSZXF1ZXN0IHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JV bnJlYWNoYWJsZU5vbk1haW5Ib3N0czopXSkKKyAgICAgICAgICAgIFttdXRhYmxlUmVxdWVzdCBf c2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOllFU107 CisgICAgICAgIG5zUmVxdWVzdCA9IFdURk1vdmUobXV0YWJsZVJlcXVlc3QpOworICAgIH0KKwog ICAgIGF1dG8mIHNlc3Npb25TZXQgPSBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCk7 CiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+IHRhc2sgPSBbc2Vzc2lv blNldC5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gd2ViU29ja2V0VGFza1dp dGhSZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggMDZiNjI3 YmFhYmU0NmFmOGU5N2RiODk3OThhM2ZhOWI0NDUzZTkwYy4uOTAyYzE2OGZhNWRhNmFjY2JlNmIy OWEwM2QzYTVlN2QzNTZiMzAyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtODI5LDYgKzgyOSw4IEBAIHZv aWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyhXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJiByZXF1ZXN0LCBXZWJQYWdlCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBOZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyBwYXJhbWV0ZXJzOworCiAgICAgaWYgKGF1dG8qIGRv Y3VtZW50ID0gd2ViUGFnZS5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkgewogICAgICAgICBpZiAo c2hvdWxkUHJlY29ubmVjdEFzRmlyc3RQYXJ0eSA9PSBTaG91bGRQcmVjb25uZWN0QXNGaXJzdFBh cnR5OjpZZXMpCiAgICAgICAgICAgICByZXF1ZXN0LnNldEZpcnN0UGFydHlGb3JDb29raWVzKHJl cXVlc3QudXJsKCkpOwpAQCAtODM2LDkgKzgzOCwxMCBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5 OjpwcmVjb25uZWN0VG8oV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViUGFn ZQogICAgICAgICAgICAgcmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhkb2N1bWVudC0+ Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSk7CiAgICAgICAgIGlmIChhdXRvKiBsb2FkZXIgPSBkb2N1 bWVudC0+bG9hZGVyKCkpCiAgICAgICAgICAgICByZXF1ZXN0LnNldElzQXBwSW5pdGlhdGVkKGxv YWRlci0+bGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQoKSk7CisgICAgICAgIHBhcmFtZXRl cnMudG9wT3JpZ2luID0gJmRvY3VtZW50LT50b3BPcmlnaW4oKTsKKyAgICAgICAgcGFyYW1ldGVy cy5zb3VyY2VPcmlnaW4gPSAmZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCk7CiAgICAgfQogCi0g ICAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgcGFyYW1ldGVyczsKICAgICBwYXJhbWV0 ZXJzLnJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpOwogICAgIGlmIChwYXJhbWV0ZXJzLnJlcXVl c3QuaHR0cFVzZXJBZ2VudCgpLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBGSVhNRTogd2UgYWRk IHVzZXItYWdlbnQgdG8gdGhlIHByZWNvbm5lY3QgcmVxdWVzdCBiZWNhdXNlIG90aGVyd2lzZSB0 aGUgcHJlY29ubmVjdAo= 459518 2022-05-17 15:19:28 -0700 2022-05-20 20:23:08 -0700 Patch bug-240483-20220517151927.patch text/plain 8453 achristensen RnJvbSBjNmNjZWY1OThlODdjM2RjOTI5ODk3YjI2NWU5MjJiZTZmZDQzMjA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KRGF0ZTogVHVlLCAxNyBNYXkgMjAyMiAxNToxNToxOCAtMDcwMApTdWJqZWN0OiBbUEFU Q0hdIFByaXZhdGUgcmVsYXkgc2hvdWxkIGZhaWwgY2xvc2VkIGZvciB0aGlyZCBwYXJ0eSBsb2Fk cyBpZiB0aGUKIG1haW4gcmVzb3VyY2Ugd2FzIGxvYWRlZCBvdmVyIHByaXZhdGUgcmVsYXkKIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDA0ODMgPHJkYXI6Ly85MjY5 NzAwNz4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyByZS1sYW5kcyB0aGUgY2hh bmdlIGZyb20gcjI5Mzg2MSBhbG9uZyB3aXRoIHIyOTM0ODEgd2hpY2ggc2hvdWxkIGZpeCBwcm9i bGVtcyByZWxhdGVkIHRvIHJkYXI6Ly85MjMzNjI3MAphbG9uZyB3aXRoIHIyOTM1OTEgd2hpY2gg c2hvdWxkIGZpeCBwZXJmb3JtYW5jZSByZWdyZXNzaW9ucyByZWxhdGVkIHRvIHJkYXI6Ly85MjQ1 ODk5NSBidXQgd2FzIGluc3VmZmljaWVudC4KRHVyaW5nIGEgYmFzaWMgYnJvd3NpbmcgdGVzdCwg SSBmb3VuZCB0d28gbW9yZSBwbGFjZXMgd2hlcmUgd2Ugd2VyZSBtYWtpbmcgYSBOZXR3b3JrRGF0 YVRhc2sgd2l0aG91dCBzZXR0aW5nIHRoZQpwYXJhbWV0ZXJzJyB0b3Agb3JpZ2luLCBvbmUgaW4g dGhlIFNwZWN1bGF0aXZlTG9hZCBjb25zdHJ1Y3RvciBhbmQgYW5vdGhlciBpbiBXZWJMb2FkZXJT dHJhdGVneTo6cHJlY29ubmVjdFRvLgoKKiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHA6CihXZWJLaXQ6Ok5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlcjo6c3RhcnRQcmVmbGlnaHQpOgoqIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcDoKKFdlYktpdDo6TmV0d29y a0NhY2hlOjpTcGVjdWxhdGl2ZUxvYWQ6OlNwZWN1bGF0aXZlTG9hZCk6CiogU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbToKKFdlYktpdDo6 TmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKToKKiBTb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CigtW1dLTmV0 d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2VpdmVSZXNwb25z ZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3Jl YXRlV2ViU29ja2V0VGFzayk6CiogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwOgooV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6cHJlY29ubmVj dFRvKToKLS0tCiAuLi4vTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcCAgICAgICAgICAg ICAgIHwgIDIgKysKIC4uLi9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwICAg ICAgICAgfCAgMSArCiAuLi4vTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EubW0gIHwgIDggKysrKysrKysKIC4uLi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLm1tICAgfCAxNSArKysrKysrKysrKysrKy0KIC4uLi9XZWJQcm9jZXNzL05ldHdv cmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwICAgICAgfCAgNSArKysrLQogNSBmaWxlcyBjaGFuZ2Vk LCAyOSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNw cAppbmRleCBlZTFmMzVmNTE0MGEuLjFhMDNiOTNkMjhhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2Vy LmNwcApAQCAtNzUsNiArNzUsOCBAQCB2b2lkIE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlcjo6 c3RhcnRQcmVmbGlnaHQoKQogICAgICAgICBtX2xvYWRJbmZvcm1hdGlvbiA9IE5ldHdvcmtUcmFu c2FjdGlvbkluZm9ybWF0aW9uIHsgTmV0d29ya1RyYW5zYWN0aW9uSW5mb3JtYXRpb246OlR5cGU6 OlByZWZsaWdodCwgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCwgeyB9LCB7IH0gfTsKIAogICAgIGxv YWRQYXJhbWV0ZXJzLndlYlBhZ2VQcm94eUlEID0gbV9wYXJhbWV0ZXJzLndlYlBhZ2VQcm94eUlE OworICAgIGxvYWRQYXJhbWV0ZXJzLnRvcE9yaWdpbiA9IG1fcGFyYW1ldGVycy50b3BPcmlnaW47 CisgICAgbG9hZFBhcmFtZXRlcnMuc291cmNlT3JpZ2luID0gbV9wYXJhbWV0ZXJzLnNvdXJjZU9y aWdpbi5wdHIoKTsKIAogICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IG1fbmV0d29ya1By b2Nlc3MtPm5ldHdvcmtTZXNzaW9uKG1fcGFyYW1ldGVycy5zZXNzaW9uSUQpKSB7CiAgICAgICAg IG1fdGFzayA9IE5ldHdvcmtEYXRhVGFzazo6Y3JlYXRlKCpuZXR3b3JrU2Vzc2lvbiwgKnRoaXMs IFdURk1vdmUobG9hZFBhcmFtZXRlcnMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2Fk LmNwcAppbmRleCA2ODEzMTVkOTQ2Y2YuLjMzMTdlMGNhOWQxMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3BlY3VsYXRpdmVMb2FkLmNwcApAQCAtNjcsNiArNjcsNyBAQCBTcGVjdWxhdGl2ZUxvYWQ6OlNw ZWN1bGF0aXZlTG9hZChDYWNoZSYgY2FjaGUsIGNvbnN0IEdsb2JhbEZyYW1lSUQmIGdsb2JhbEZy YW1lSQogICAgIHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gQ29udGVudFNuaWZm aW5nUG9saWN5OjpEb05vdFNuaWZmQ29udGVudDsKICAgICBwYXJhbWV0ZXJzLmNvbnRlbnRFbmNv ZGluZ1NuaWZmaW5nUG9saWN5ID0gQ29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3k6OlNuaWZm OwogICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9IG1fb3JpZ2luYWxSZXF1ZXN0OworICAgIHBhcmFt ZXRlcnMudG9wT3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShtX29yaWdpbmFsUmVxdWVz dC5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsKICAgICBwYXJhbWV0ZXJzLmlzTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW4gPSBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOwogICAgIG1fbmV0 d29ya0xvYWQgPSBtYWtlVW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgbnVsbHB0ciwgV1RGTW92 ZShwYXJhbWV0ZXJzKSwgKm5ldHdvcmtTZXNzaW9uKTsKICAgICBtX25ldHdvcmtMb2FkLT5zdGFy dFdpdGhTY2hlZHVsaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQppbmRleCAxNzVmZjhhYjlkOGEu LjY5YzU5MDA1MzIxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCkBAIC0zNDAsNiArMzQwLDE0IEBA IE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lv biYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAgICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNS ZXF1ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQb2xp Y3k6OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4g bXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsK IAorICAgIGlmIChwYXJhbWV0ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbgorICAgICAgICB8fCBw YXJhbWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkCisgICAgICAg IHx8ICFwYXJhbWV0ZXJzLnRvcE9yaWdpbgorICAgICAgICB8fCByZXF1ZXN0LnVybCgpLmhvc3Qo KSA9PSBwYXJhbWV0ZXJzLnRvcE9yaWdpbi0+aG9zdCgpKSB7CisgICAgICAgIGlmIChbbXV0YWJs ZVJlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2V0UHJpdmFjeVByb3h5RmFp bENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOildKQorICAgICAgICAgICAgW211dGFi bGVSZXF1ZXN0IF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWlu SG9zdHM6WUVTXTsKKyAgICB9CisKICNpZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQT1JUKQogICAg IG11dGFibGVSZXF1ZXN0LmdldCgpLmF0dHJpYnV0aW9uID0gcmVxdWVzdC5pc0FwcEluaXRpYXRl ZCgpID8gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9wZXIgOiBOU1VSTFJlcXVlc3RBdHRy aWJ1dGlvblVzZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCBjZGVkM2QzNjAyNDgu LmJhMzNiZTM3NWY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtOTM2LDcgKzkzNiw5IEBAIC0g KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkYXRhVGFzazooTlNVUkxT ZXNzaW9uRGF0YVRhc2sgKilkYXRhCiAKICAgICAgICAgTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0 aW9uTWV0cmljcyAqbWV0cmljcyA9IHRhc2tNZXRyaWNzLnRyYW5zYWN0aW9uTWV0cmljcy5sYXN0 T2JqZWN0OwogI2lmIEhBVkUoTkVUV09SS19DT05ORUNUSU9OX1BSSVZBQ1lfU1RBTkNFKQotICAg ICAgICBhdXRvIHByaXZhdGVSZWxheWVkID0gbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19j b25uZWN0aW9uX3ByaXZhY3lfc3RhbmNlX2RpcmVjdCA/IFByaXZhdGVSZWxheWVkOjpObyA6IFBy aXZhdGVSZWxheWVkOjpZZXM7CisgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRyaWNz Ll9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZGlyZWN0Cisg ICAgICAgICAgICB8fCBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJp dmFjeV9zdGFuY2Vfbm90X2VsaWdpYmxlCisgICAgICAgICAgICA/IFByaXZhdGVSZWxheWVkOjpO byA6IFByaXZhdGVSZWxheWVkOjpZZXM7CiAjZWxzZQogICAgICAgICBhdXRvIHByaXZhdGVSZWxh eWVkID0gUHJpdmF0ZVJlbGF5ZWQ6Ok5vOwogI2VuZGlmCkBAIC0xNzEyLDYgKzE3MTQsMTcgQEAg c3RkOjp1bmlxdWVfcHRyPFdlYlNvY2tldFRhc2s+IE5ldHdvcmtTZXNzaW9uQ29jb2E6OmNyZWF0 ZVdlYlNvY2tldFRhc2soV2ViUGFnZVAKICAgICBhcHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEo KS5kaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdChuc1JlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24g PT0gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9wZXIpOwogI2VuZGlmCiAKKyAgICAvLyBG SVhNRTogVGhpcyBmdW5jdGlvbiBjYW4gbWFrZSB1cCB0byAzIGNvcGllcyBvZiBhIHJlcXVlc3Qu CisgICAgLy8gUmVkdWNlIHRoYXQgdG8gb25lIGlmIHRoZSBwcm90b2NvbCBpcyBudWxsLCB0aGUg cmVxdWVzdCBpc24ndCBhcHAgaW5pdGlhdGVkLAorICAgIC8vIG9yIHRoZSBtYWluIGZyYW1lIG1h aW4gcmVzb3VyY2Ugd2FzIHByaXZhdGUgcmVsYXllZCwgdGhlbiBzZXQgYWxsIHByb3BlcnRpZXMK KyAgICAvLyBvbiB0aGUgb25lIGNvcHkuCisgICAgaWYgKGhhZE1haW5GcmFtZU1haW5SZXNvdXJj ZVByaXZhdGVSZWxheWVkIHx8IHJlcXVlc3QudXJsKCkuaG9zdCgpID09IGNsaWVudE9yaWdpbi50 b3BPcmlnaW4uaG9zdCkgeworICAgICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4g bXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsK KyAgICAgICAgaWYgKFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0p CisgICAgICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRG b3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOworICAgICAgICBuc1JlcXVlc3QgPSBXVEZN b3ZlKG11dGFibGVSZXF1ZXN0KTsKKyAgICB9CisKICAgICBhdXRvJiBzZXNzaW9uU2V0ID0gc2Vz c2lvblNldEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpOwogICAgIFJldGFpblB0cjxOU1VSTFNlc3Np b25XZWJTb2NrZXRUYXNrPiB0YXNrID0gW3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZS5zZXNzaW9uIHdlYlNvY2tldFRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3QuZ2V0KCld OwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDA2YjYyN2JhYWJlNC4uOTAyYzE2OGZhNWRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVn eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwCkBAIC04MjksNiArODI5LDggQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6cHJl Y29ubmVjdFRvKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYlBhZ2UKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz IHBhcmFtZXRlcnM7CisKICAgICBpZiAoYXV0byogZG9jdW1lbnQgPSB3ZWJQYWdlLm1haW5GcmFt ZSgpLT5kb2N1bWVudCgpKSB7CiAgICAgICAgIGlmIChzaG91bGRQcmVjb25uZWN0QXNGaXJzdFBh cnR5ID09IFNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHk6OlllcykKICAgICAgICAgICAgIHJl cXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMocmVxdWVzdC51cmwoKSk7CkBAIC04MzYsOSAr ODM4LDEwIEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyhXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJQYWdlCiAgICAgICAgICAgICByZXF1ZXN0LnNl dEZpcnN0UGFydHlGb3JDb29raWVzKGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsK ICAgICAgICAgaWYgKGF1dG8qIGxvYWRlciA9IGRvY3VtZW50LT5sb2FkZXIoKSkKICAgICAgICAg ICAgIHJlcXVlc3Quc2V0SXNBcHBJbml0aWF0ZWQobG9hZGVyLT5sYXN0TmF2aWdhdGlvbldhc0Fw cEluaXRpYXRlZCgpKTsKKyAgICAgICAgcGFyYW1ldGVycy50b3BPcmlnaW4gPSAmZG9jdW1lbnQt PnRvcE9yaWdpbigpOworICAgICAgICBwYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbiA9ICZkb2N1bWVu dC0+c2VjdXJpdHlPcmlnaW4oKTsKICAgICB9CiAKLSAgICBOZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVycyBwYXJhbWV0ZXJzOwogICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9IFdURk1vdmUocmVx dWVzdCk7CiAgICAgaWYgKHBhcmFtZXRlcnMucmVxdWVzdC5odHRwVXNlckFnZW50KCkuaXNFbXB0 eSgpKSB7CiAgICAgICAgIC8vIEZJWE1FOiB3ZSBhZGQgdXNlci1hZ2VudCB0byB0aGUgcHJlY29u bmVjdCByZXF1ZXN0IGJlY2F1c2Ugb3RoZXJ3aXNlIHRoZSBwcmVjb25uZWN0Ci0tIAoyLjMyLjAg KEFwcGxlIEdpdC0xMzIpCgo= 459629 2022-05-20 15:40:37 -0700 2022-05-20 20:23:10 -0700 reverting patch patch text/plain 7026 achristensen Y29tbWl0IDM5ZWUyZjI4Zjc5YjgyZDJhZjI5Y2Q2OGFmZjBkYWJiMjBkMjZlMjAKQXV0aG9yOiBB bGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KRGF0ZTogICBGcmkgTWF5 IDIwIDE1OjM5OjI1IDIwMjIgLTA3MDAKCiAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI5NDM3 MS4KICAgIAogICAgTWF5IGhhdmUgY2F1c2VkIGEgcGVyZm9ybWFuY2UgcmVncmVzc2lvbgogICAg CiAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6CiAgICAKICAgICJQcml2YXRlIHJlbGF5IHNob3VsZCBm YWlsIGNsb3NlZCBmb3IgdGhpcmQgcGFydHkgbG9hZHMgaWYgdGhlIG1haW4gcmVzb3VyY2Ugd2Fz IGxvYWRlZCBvdmVyIHByaXZhdGUgcmVsYXkiCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQwNDgzCiAgICBodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy9yMjk0 MzcxCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ09S U1ByZWZsaWdodENoZWNrZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwCmluZGV4IDFhMDNiOTNkMjhhNS4uZWUxZjM1ZjUx NDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDT1JT UHJlZmxpZ2h0Q2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwCkBAIC03NSw4ICs3NSw2IEBAIHZvaWQgTmV0 d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyOjpzdGFydFByZWZsaWdodCgpCiAgICAgICAgIG1fbG9h ZEluZm9ybWF0aW9uID0gTmV0d29ya1RyYW5zYWN0aW9uSW5mb3JtYXRpb24geyBOZXR3b3JrVHJh bnNhY3Rpb25JbmZvcm1hdGlvbjo6VHlwZTo6UHJlZmxpZ2h0LCBsb2FkUGFyYW1ldGVycy5yZXF1 ZXN0LCB7IH0sIHsgfSB9OwogCiAgICAgbG9hZFBhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQgPSBt X3BhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQ7Ci0gICAgbG9hZFBhcmFtZXRlcnMudG9wT3JpZ2lu ID0gbV9wYXJhbWV0ZXJzLnRvcE9yaWdpbjsKLSAgICBsb2FkUGFyYW1ldGVycy5zb3VyY2VPcmln aW4gPSBtX3BhcmFtZXRlcnMuc291cmNlT3JpZ2luLnB0cigpOwogCiAgICAgaWYgKGF1dG8qIG5l dHdvcmtTZXNzaW9uID0gbV9uZXR3b3JrUHJvY2Vzcy0+bmV0d29ya1Nlc3Npb24obV9wYXJhbWV0 ZXJzLnNlc3Npb25JRCkpIHsKICAgICAgICAgbV90YXNrID0gTmV0d29ya0RhdGFUYXNrOjpjcmVh dGUoKm5ldHdvcmtTZXNzaW9uLCAqdGhpcywgV1RGTW92ZShsb2FkUGFyYW1ldGVycykpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT cGVjdWxhdGl2ZUxvYWQuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwCmluZGV4IDMzMTdlMGNhOWQxMy4uNjgxMzE1 ZDk0NmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwCkBAIC02Nyw3ICs2 Nyw2IEBAIFNwZWN1bGF0aXZlTG9hZDo6U3BlY3VsYXRpdmVMb2FkKENhY2hlJiBjYWNoZSwgY29u c3QgR2xvYmFsRnJhbWVJRCYgZ2xvYmFsRnJhbWVJCiAgICAgcGFyYW1ldGVycy5jb250ZW50U25p ZmZpbmdQb2xpY3kgPSBDb250ZW50U25pZmZpbmdQb2xpY3k6OkRvTm90U25pZmZDb250ZW50Owog ICAgIHBhcmFtZXRlcnMuY29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgPSBDb250ZW50RW5j b2RpbmdTbmlmZmluZ1BvbGljeTo6U25pZmY7CiAgICAgcGFyYW1ldGVycy5yZXF1ZXN0ID0gbV9v cmlnaW5hbFJlcXVlc3Q7Ci0gICAgcGFyYW1ldGVycy50b3BPcmlnaW4gPSBTZWN1cml0eU9yaWdp bjo6Y3JlYXRlKG1fb3JpZ2luYWxSZXF1ZXN0LmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogICAg IHBhcmFtZXRlcnMuaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbiA9IGlzTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW47CiAgICAgbV9uZXR3b3JrTG9hZCA9IG1ha2VVbmlxdWU8TmV0d29ya0xv YWQ+KCp0aGlzLCBudWxscHRyLCBXVEZNb3ZlKHBhcmFtZXRlcnMpLCAqbmV0d29ya1Nlc3Npb24p OwogICAgIG1fbmV0d29ya0xvYWQtPnN0YXJ0V2l0aFNjaGVkdWxpbmcoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2Eu bW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tCmluZGV4IDY5YzU5MDA1MzIxNy4uMTc1ZmY4YWI5ZDhhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EubW0KQEAgLTM0MCwxNCArMzQwLDYgQEAgTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtE YXRhVGFza0NvY29hKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVQKICAgICBS ZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiBuc1JlcXVlc3QgPSByZXF1ZXN0Lm5zVVJMUmVxdWVzdChX ZWJDb3JlOjpIVFRQQm9keVVwZGF0ZVBvbGljeTo6VXBkYXRlSFRUUEJvZHkpOwogICAgIFJldGFp blB0cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVx dWVzdC5nZXQoKSBtdXRhYmxlQ29weV0pOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNNYWluRnJh bWVOYXZpZ2F0aW9uCi0gICAgICAgIHx8IHBhcmFtZXRlcnMuaGFkTWFpbkZyYW1lTWFpblJlc291 cmNlUHJpdmF0ZVJlbGF5ZWQKLSAgICAgICAgfHwgIXBhcmFtZXRlcnMudG9wT3JpZ2luCi0gICAg ICAgIHx8IHJlcXVlc3QudXJsKCkuaG9zdCgpID09IHBhcmFtZXRlcnMudG9wT3JpZ2luLT5ob3N0 KCkpIHsKLSAgICAgICAgaWYgKFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9z dHM6KV0pCi0gICAgICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxD bG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOwotICAgIH0KLQogI2lmIEVOQUJM RShBUFBfUFJJVkFDWV9SRVBPUlQpCiAgICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCkuYXR0cmlidXRp b24gPSByZXF1ZXN0LmlzQXBwSW5pdGlhdGVkKCkgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRl dmVsb3BlciA6IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uVXNlcjsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h Lm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNv Y29hLm1tCmluZGV4IGJhMzNiZTM3NWY5Mi4uY2RlZDNkMzYwMjQ4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h Lm1tCkBAIC05MzYsOSArOTM2LDcgQEAgLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24g KilzZXNzaW9uIGRhdGFUYXNrOihOU1VSTFNlc3Npb25EYXRhVGFzayAqKWRhdGEKIAogICAgICAg ICBOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzICptZXRyaWNzID0gdGFza01ldHJp Y3MudHJhbnNhY3Rpb25NZXRyaWNzLmxhc3RPYmplY3Q7CiAjaWYgSEFWRShORVRXT1JLX0NPTk5F Q1RJT05fUFJJVkFDWV9TVEFOQ0UpCi0gICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRy aWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZGlyZWN0 Ci0gICAgICAgICAgICB8fCBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25f cHJpdmFjeV9zdGFuY2Vfbm90X2VsaWdpYmxlCi0gICAgICAgICAgICA/IFByaXZhdGVSZWxheWVk OjpObyA6IFByaXZhdGVSZWxheWVkOjpZZXM7CisgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQg PSBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2Vf ZGlyZWN0ID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNl CiAgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5k aWYKQEAgLTE3MTQsMTcgKzE3MTIsNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViU29ja2V0VGFzaz4g TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3JlYXRlV2ViU29ja2V0VGFzayhXZWJQYWdlUAogICAgIGFw cFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1ZXN0KG5z UmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVs b3Blcik7CiAjZW5kaWYKIAotICAgIC8vIEZJWE1FOiBUaGlzIGZ1bmN0aW9uIGNhbiBtYWtlIHVw IHRvIDMgY29waWVzIG9mIGEgcmVxdWVzdC4KLSAgICAvLyBSZWR1Y2UgdGhhdCB0byBvbmUgaWYg dGhlIHByb3RvY29sIGlzIG51bGwsIHRoZSByZXF1ZXN0IGlzbid0IGFwcCBpbml0aWF0ZWQsCi0g ICAgLy8gb3IgdGhlIG1haW4gZnJhbWUgbWFpbiByZXNvdXJjZSB3YXMgcHJpdmF0ZSByZWxheWVk LCB0aGVuIHNldCBhbGwgcHJvcGVydGllcwotICAgIC8vIG9uIHRoZSBvbmUgY29weS4KLSAgICBp ZiAoaGFkTWFpbkZyYW1lTWFpblJlc291cmNlUHJpdmF0ZVJlbGF5ZWQgfHwgcmVxdWVzdC51cmwo KS5ob3N0KCkgPT0gY2xpZW50T3JpZ2luLnRvcE9yaWdpbi5ob3N0KSB7Ci0gICAgICAgIFJldGFp blB0cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVx dWVzdC5nZXQoKSBtdXRhYmxlQ29weV0pOwotICAgICAgICBpZiAoW211dGFibGVSZXF1ZXN0IHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JV bnJlYWNoYWJsZU5vbk1haW5Ib3N0czopXSkKLSAgICAgICAgICAgIFttdXRhYmxlUmVxdWVzdCBf c2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOllFU107 Ci0gICAgICAgIG5zUmVxdWVzdCA9IFdURk1vdmUobXV0YWJsZVJlcXVlc3QpOwotICAgIH0KLQog ICAgIGF1dG8mIHNlc3Npb25TZXQgPSBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCk7 CiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+IHRhc2sgPSBbc2Vzc2lv blNldC5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gd2ViU29ja2V0VGFza1dp dGhSZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggMzgwMzY4 MWFhNzNiLi44ZGRlYTdlYTE3OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTgzMCw4ICs4MzAsNiBAQCB2 b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8oV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiYgcmVxdWVzdCwgV2ViUGFnZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgcGFyYW1ldGVyczsKLQogICAgIGlmIChhdXRvKiBk b2N1bWVudCA9IHdlYlBhZ2UubWFpbkZyYW1lKCktPmRvY3VtZW50KCkpIHsKICAgICAgICAgaWYg KHNob3VsZFByZWNvbm5lY3RBc0ZpcnN0UGFydHkgPT0gU2hvdWxkUHJlY29ubmVjdEFzRmlyc3RQ YXJ0eTo6WWVzKQogICAgICAgICAgICAgcmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhy ZXF1ZXN0LnVybCgpKTsKQEAgLTgzOSwxMCArODM3LDkgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVn eTo6cHJlY29ubmVjdFRvKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYlBh Z2UKICAgICAgICAgICAgIHJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMoZG9jdW1lbnQt PmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogICAgICAgICBpZiAoYXV0byogbG9hZGVyID0gZG9j dW1lbnQtPmxvYWRlcigpKQogICAgICAgICAgICAgcmVxdWVzdC5zZXRJc0FwcEluaXRpYXRlZChs b2FkZXItPmxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKCkpOwotICAgICAgICBwYXJhbWV0 ZXJzLnRvcE9yaWdpbiA9ICZkb2N1bWVudC0+dG9wT3JpZ2luKCk7Ci0gICAgICAgIHBhcmFtZXRl cnMuc291cmNlT3JpZ2luID0gJmRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpOwogICAgIH0KIAor ICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAgICAgcGFyYW1l dGVycy5yZXF1ZXN0ID0gV1RGTW92ZShyZXF1ZXN0KTsKICAgICBpZiAocGFyYW1ldGVycy5yZXF1 ZXN0Lmh0dHBVc2VyQWdlbnQoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gRklYTUU6IHdlIGFk ZCB1c2VyLWFnZW50IHRvIHRoZSBwcmVjb25uZWN0IHJlcXVlc3QgYmVjYXVzZSBvdGhlcndpc2Ug dGhlIHByZWNvbm5lY3QK 459635 2022-05-20 20:23:12 -0700 2022-05-24 12:36:12 -0700 Patch bug-240483-20220520202311.patch text/plain 4544 achristensen RnJvbSAxYzVhZWUwNDg4YjY1YTA1NjllZjFhMzI4ZWM0YWVkMWYwMjk4ZGQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBGcmksIDIwIE1heSAyMDIyIDIwOjIwOjA0IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gUHJpdmF0ZSByZWxheSBzaG91bGQgZmFpbCBjbG9zZWQgZm9yIHRoaXJkIHBhcnR5IGxvYWRz IGlmIHRoZQogbWFpbiByZXNvdXJjZSB3YXMgbG9hZGVkIG92ZXIgcHJpdmF0ZSByZWxheQogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDQ4MwoKUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgpUaGlzIHJlLWxhbmRzIHRoZSBjaGFuZ2UgZnJvbSByMjkzODYxIGFs b25nIHdpdGggcjI5MzQ4MSBleGNlcHQgaXQgdXNlcyBSZXNvdXJjZVJlcXVlc3QuZmlyc3RQYXJ0 eUZvckNvb2tpZXMKaW5zdGVhZCBvZiBOZXR3b3JrTG9hZFBhcmFtZXRlcnMudG9wT3JpZ2luLCB3 aGljaCBvdWdodCB0byBiZSBlcXVpdmFsZW50IGJ1dCB0aGUgbGF0dGVyIHNlZW1zIGxlc3MgcmVs aWFibGUKYW5kIGhhcyBiZWVuIHRoZSBjYXVzZSBvZiBwZXJmb3JtYW5jZSByZWdyZXNzaW9ucyBh c3NvY2lhdGVkIHdpdGggYSBmZXcgcHJldmlvdXMgYXR0ZW1wdHMgYXQgdGhpcyBmaXguCgoqIFNv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW06 CihXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYSk6Ciog U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t OgooLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazpkaWRSZWNl aXZlUmVzcG9uc2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CihXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9u Q29jb2E6OmNyZWF0ZVdlYlNvY2tldFRhc2spOgotLS0KIC4uLi9OZXR3b3JrUHJvY2Vzcy9jb2Nv YS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbSAgfCAgNyArKysrKysrCiAuLi4vTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSAgIHwgMTUgKysrKysrKysrKysrKystCiAy IGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRh c2tDb2NvYS5tbQppbmRleCAxNzVmZjhhYjlkOGEuLjM3ZDA2YTkyM2FmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFz a0NvY29hLm1tCkBAIC0zNDAsNiArMzQwLDEzIEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3 b3JrRGF0YVRhc2tDb2NvYShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAg ICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNSZXF1ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVl c3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQb2xpY3k6OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBS ZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtu c1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsKIAorICAgIGlmIChwYXJhbWV0ZXJzLmlzTWFp bkZyYW1lTmF2aWdhdGlvbgorICAgICAgICB8fCBwYXJhbWV0ZXJzLmhhZE1haW5GcmFtZU1haW5S ZXNvdXJjZVByaXZhdGVSZWxheWVkCisgICAgICAgIHx8IHJlcXVlc3QudXJsKCkuaG9zdCgpID09 IHJlcXVlc3QuZmlyc3RQYXJ0eUZvckNvb2tpZXMoKS5ob3N0KCkpIHsKKyAgICAgICAgaWYgKFtt dXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5UHJv eHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0pCisgICAgICAgICAgICBb bXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5v bk1haW5Ib3N0czpZRVNdOworICAgIH0KKwogI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBPUlQp CiAgICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPSByZXF1ZXN0LmlzQXBwSW5p dGlhdGVkKCkgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3BlciA6IE5TVVJMUmVxdWVz dEF0dHJpYnV0aW9uVXNlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IGNkZWQzZDM2 MDI0OC4uYmEzM2JlMzc1ZjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC05MzYsNyArOTM2LDkg QEAgLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIGRhdGFUYXNrOihO U1VSTFNlc3Npb25EYXRhVGFzayAqKWRhdGEKIAogICAgICAgICBOU1VSTFNlc3Npb25UYXNrVHJh bnNhY3Rpb25NZXRyaWNzICptZXRyaWNzID0gdGFza01ldHJpY3MudHJhbnNhY3Rpb25NZXRyaWNz Lmxhc3RPYmplY3Q7CiAjaWYgSEFWRShORVRXT1JLX0NPTk5FQ1RJT05fUFJJVkFDWV9TVEFOQ0Up Ci0gICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09 IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZGlyZWN0ID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5v IDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKKyAgICAgICAgYXV0byBwcml2YXRlUmVsYXllZCA9IG1l dHJpY3MuX3ByaXZhY3lTdGFuY2UgPT0gbndfY29ubmVjdGlvbl9wcml2YWN5X3N0YW5jZV9kaXJl Y3QKKyAgICAgICAgICAgIHx8IG1ldHJpY3MuX3ByaXZhY3lTdGFuY2UgPT0gbndfY29ubmVjdGlv bl9wcml2YWN5X3N0YW5jZV9ub3RfZWxpZ2libGUKKyAgICAgICAgICAgID8gUHJpdmF0ZVJlbGF5 ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNlCiAgICAgICAgIGF1dG8gcHJpdmF0 ZVJlbGF5ZWQgPSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5kaWYKQEAgLTE3MTIsNiArMTcxNCwx NyBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViU29ja2V0VGFzaz4gTmV0d29ya1Nlc3Npb25Db2NvYTo6 Y3JlYXRlV2ViU29ja2V0VGFzayhXZWJQYWdlUAogICAgIGFwcFByaXZhY3lSZXBvcnRUZXN0aW5n RGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1ZXN0KG5zUmVxdWVzdC5nZXQoKS5hdHRyaWJ1 dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3Blcik7CiAjZW5kaWYKIAorICAg IC8vIEZJWE1FOiBUaGlzIGZ1bmN0aW9uIGNhbiBtYWtlIHVwIHRvIDMgY29waWVzIG9mIGEgcmVx dWVzdC4KKyAgICAvLyBSZWR1Y2UgdGhhdCB0byBvbmUgaWYgdGhlIHByb3RvY29sIGlzIG51bGws IHRoZSByZXF1ZXN0IGlzbid0IGFwcCBpbml0aWF0ZWQsCisgICAgLy8gb3IgdGhlIG1haW4gZnJh bWUgbWFpbiByZXNvdXJjZSB3YXMgcHJpdmF0ZSByZWxheWVkLCB0aGVuIHNldCBhbGwgcHJvcGVy dGllcworICAgIC8vIG9uIHRoZSBvbmUgY29weS4KKyAgICBpZiAoaGFkTWFpbkZyYW1lTWFpblJl c291cmNlUHJpdmF0ZVJlbGF5ZWQgfHwgcmVxdWVzdC51cmwoKS5ob3N0KCkgPT0gY2xpZW50T3Jp Z2luLnRvcE9yaWdpbi5ob3N0KSB7CisgICAgICAgIFJldGFpblB0cjxOU011dGFibGVVUkxSZXF1 ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVzdC5nZXQoKSBtdXRhYmxlQ29w eV0pOworICAgICAgICBpZiAoW211dGFibGVSZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IoX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0 czopXSkKKyAgICAgICAgICAgIFttdXRhYmxlUmVxdWVzdCBfc2V0UHJpdmFjeVByb3h5RmFpbENs b3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOllFU107CisgICAgICAgIG5zUmVxdWVzdCA9 IFdURk1vdmUobXV0YWJsZVJlcXVlc3QpOworICAgIH0KKwogICAgIGF1dG8mIHNlc3Npb25TZXQg PSBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCk7CiAgICAgUmV0YWluUHRyPE5TVVJM U2Vzc2lvbldlYlNvY2tldFRhc2s+IHRhc2sgPSBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aENyZWRl bnRpYWxTdG9yYWdlLnNlc3Npb24gd2ViU29ja2V0VGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdC5n ZXQoKV07CiAgICAgCi0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=