210751 2020-04-20 10:10:09 -0700 Exit early in FrameLoader::loadURL when redirecting to another frame 2020-04-21 03:32:13 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez darin ews-watchlist ggaren japhet webkit-bug-importer oldest_to_newest 1643495 0 rbuis 2020-04-20 10:10:09 -0700 Exit early in FrameLoader::loadURL when redirecting to another frame, previously we were preparing request needlessly, doing it twice in case of frame redirecting. Also move some variables to where they are actually used. 1643496 1 396984 rbuis 2020-04-20 10:11:58 -0700 Created attachment 396984 Patch 1643554 2 396984 ggaren 2020-04-20 11:47:36 -0700 Comment on attachment 396984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396984&action=review r=me > Source/WebCore/loader/FrameLoader.cpp:1358 > + Frame* targetFrame = isFormSubmission ? nullptr : findFrameForNavigation(effectiveFrameName); This should be RefPtr. 1643592 3 396984 darin 2020-04-20 12:39:11 -0700 Comment on attachment 396984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396984&action=review >> Source/WebCore/loader/FrameLoader.cpp:1358 >> + Frame* targetFrame = isFormSubmission ? nullptr : findFrameForNavigation(effectiveFrameName); > > This should be RefPtr. I think our latest style would be: auto targetFrame = isFormSubmission ? nullptr : makeRefPtr(findFrameForNavigation(effectiveFrameName)); Or change findFrameForNavigation to return a RefPtr. Move the makeRefPtr outside the ? : if needed to make things compile. 1643795 4 397060 rbuis 2020-04-21 00:09:45 -0700 Created attachment 397060 Patch 1643802 5 397062 rbuis 2020-04-21 01:22:43 -0700 Created attachment 397062 Patch 1643824 6 ews-feeder 2020-04-21 03:31:13 -0700 Committed r260423: <https://trac.webkit.org/changeset/260423> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397062. 1643825 7 webkit-bug-importer 2020-04-21 03:32:13 -0700 <rdar://problem/62099510> 396984 2020-04-20 10:11:58 -0700 2020-04-21 00:09:41 -0700 Patch bug-210751-20200420191157.patch text/plain 4508 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzcyZDVlNjJjYzY4NWM3 ZGM4NzlkYmM2NDllZTVjNmI2MWQ5ZWI2OC4uZTlkMTA4MTk0ZWNjNDUyMzYzYzU0YTFjOWViZmVi NDVhNjcwZjNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTIwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRXhpdCBlYXJseSBpbiBGcmFtZUxv YWRlcjo6bG9hZFVSTCB3aGVuIHJlZGlyZWN0aW5nIHRvIGFub3RoZXIgZnJhbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4aXQgZWFybHkgaW4gRnJh bWVMb2FkZXI6OmxvYWRVUkwgd2hlbiByZWRpcmVjdGluZyB0byBhbm90aGVyIGZyYW1lLCBwcmV2 aW91c2x5IHdlIHdlcmUgcHJlcGFyaW5nCisgICAgICAgIHJlcXVlc3QgbmVlZGxlc3NseSwgZG9p bmcgaXQgdHdpY2UgaW4gY2FzZSBvZiBmcmFtZSByZWRpcmVjdGluZy4gQWxzbyBtb3ZlIHNvbWUg dmFyaWFibGVzIHRvCisgICAgICAgIHdoZXJlIHRoZXkgYXJlIGFjdHVhbGx5IHVzZWQuCisKKyAg ICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OmxvYWRVUkwpOgorCiAyMDIwLTA0LTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3IgYm9yZGVyLWNvbGxh cHNlOiBjb2xsYXBzZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDFj MTgzNWE5NzZmMWE0MmFiNDM4NmMwYmI1MDRhZWZhMmY1Yjk3ODQuLjBjNzEyN2I2Y2FmODdlZjU0 N2RiNDk3MzhlMzg4YzVhMDQ5OGE2NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtMTM1MiwxMSArMTM1MiwxNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKEZy YW1lTG9hZFJlcXVlc3QmJiBmcmFtZUxvYWRSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHJlZgogCiAg ICAgLy8gQW5jaG9yIHRhcmdldCBpcyBpZ25vcmVkIHdoZW4gdGhlIGRvd25sb2FkIGF0dHJpYnV0 ZSBpcyBzZXQgc2luY2UgaXQgd2lsbCBkb3dubG9hZCB0aGUgaHlwZXJsaW5rIHJhdGhlciB0aGFu IGZvbGxvdyBpdC4KICAgICBTdHJpbmcgZWZmZWN0aXZlRnJhbWVOYW1lID0gZnJhbWVMb2FkUmVx dWVzdC5kb3dubG9hZEF0dHJpYnV0ZSgpLmlzTnVsbCgpID8gZnJhbWVMb2FkUmVxdWVzdC5mcmFt ZU5hbWUoKSA6IFN0cmluZygpOwotICAgIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCBhbGxv d05hdmlnYXRpb25Ub0ludmFsaWRVUkwgPSBmcmFtZUxvYWRSZXF1ZXN0LmFsbG93TmF2aWdhdGlv blRvSW52YWxpZFVSTCgpOwotICAgIE5ld0ZyYW1lT3BlbmVyUG9saWN5IG9wZW5lclBvbGljeSA9 IGZyYW1lTG9hZFJlcXVlc3QubmV3RnJhbWVPcGVuZXJQb2xpY3koKTsKLSAgICBMb2NrSGlzdG9y eSBsb2NrSGlzdG9yeSA9IGZyYW1lTG9hZFJlcXVlc3QubG9ja0hpc3RvcnkoKTsKICAgICBib29s IGlzRm9ybVN1Ym1pc3Npb24gPSBmb3JtU3RhdGU7CiAKKyAgICAvLyBUaGUgc2VhcmNoIGZvciBh IHRhcmdldCBmcmFtZSBpcyBkb25lIGVhcmxpZXIgaW4gdGhlIGNhc2Ugb2YgZm9ybSBzdWJtaXNz aW9uLgorICAgIEZyYW1lKiB0YXJnZXRGcmFtZSA9IGlzRm9ybVN1Ym1pc3Npb24gPyBudWxscHRy IDogZmluZEZyYW1lRm9yTmF2aWdhdGlvbihlZmZlY3RpdmVGcmFtZU5hbWUpOworICAgIGlmICh0 YXJnZXRGcmFtZSAmJiB0YXJnZXRGcmFtZSAhPSAmbV9mcmFtZSkgeworICAgICAgICBmcmFtZUxv YWRSZXF1ZXN0LnNldEZyYW1lTmFtZSgiX3NlbGYiKTsKKyAgICAgICAgdGFyZ2V0RnJhbWUtPmxv YWRlcigpLmxvYWRVUkwoV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSwgcmVmZXJyZXIsIG5ld0xv YWRUeXBlLCBldmVudCwgV1RGTW92ZShmb3JtU3RhdGUpLCBXVEZNb3ZlKGFkQ2xpY2tBdHRyaWJ1 dGlvbiksIGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyLnJlbGVhc2UoKSk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKICAgICBjb25zdCBVUkwmIG5ld1VSTCA9IGZyYW1lTG9hZFJlcXVlc3QucmVz b3VyY2VSZXF1ZXN0KCkudXJsKCk7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobmV3VVJM KTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKQEAgLTEzNjYsMjMgKzEzNzEsMTcgQEAg dm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChGcmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVMb2FkUmVx dWVzdCwgY29uc3QgU3RyaW5nJiByZWYKIAogICAgIEFTU0VSVChuZXdMb2FkVHlwZSAhPSBGcmFt ZUxvYWRUeXBlOjpTYW1lKTsKIAotICAgIC8vIFRoZSBzZWFyY2ggZm9yIGEgdGFyZ2V0IGZyYW1l IGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBmb3JtIHN1Ym1pc3Npb24uCi0gICAgRnJh bWUqIHRhcmdldEZyYW1lID0gaXNGb3JtU3VibWlzc2lvbiA/IG51bGxwdHIgOiBmaW5kRnJhbWVG b3JOYXZpZ2F0aW9uKGVmZmVjdGl2ZUZyYW1lTmFtZSk7Ci0gICAgaWYgKHRhcmdldEZyYW1lICYm IHRhcmdldEZyYW1lICE9ICZtX2ZyYW1lKSB7Ci0gICAgICAgIGZyYW1lTG9hZFJlcXVlc3Quc2V0 RnJhbWVOYW1lKCJfc2VsZiIpOwotICAgICAgICB0YXJnZXRGcmFtZS0+bG9hZGVyKCkubG9hZFVS TChXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpLCByZWZlcnJlciwgbmV3TG9hZFR5cGUsIGV2ZW50 LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIFdURk1vdmUoYWRDbGlja0F0dHJpYnV0aW9uKSwgY29tcGxl dGlvbkhhbmRsZXJDYWxsZXIucmVsZWFzZSgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQog ICAgIGlmICghaXNOYXZpZ2F0aW9uQWxsb3dlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBO YXZpZ2F0aW9uQWN0aW9uIGFjdGlvbiB7IGZyYW1lTG9hZFJlcXVlc3QucmVxdWVzdGVyKCksIHJl cXVlc3QsIGZyYW1lTG9hZFJlcXVlc3QuaW5pdGlhdGVkQnlNYWluRnJhbWUoKSwgbmV3TG9hZFR5 cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50LCBmcmFtZUxvYWRSZXF1ZXN0LnNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3koKSwgZnJhbWVMb2FkUmVxdWVzdC5kb3dubG9hZEF0dHJpYnV0ZSgp IH07Ci0gICAgYWN0aW9uLnNldExvY2tIaXN0b3J5KGxvY2tIaXN0b3J5KTsKKyAgICBhY3Rpb24u c2V0TG9ja0hpc3RvcnkoZnJhbWVMb2FkUmVxdWVzdC5sb2NrSGlzdG9yeSgpKTsKICAgICBhY3Rp b24uc2V0TG9ja0JhY2tGb3J3YXJkTGlzdChmcmFtZUxvYWRSZXF1ZXN0LmxvY2tCYWNrRm9yd2Fy ZExpc3QoKSk7CiAgICAgaWYgKGFkQ2xpY2tBdHRyaWJ1dGlvbiAmJiBtX2ZyYW1lLmlzTWFpbkZy YW1lKCkpCiAgICAgICAgIGFjdGlvbi5zZXRBZENsaWNrQXR0cmlidXRpb24oV1RGTW92ZSgqYWRD bGlja0F0dHJpYnV0aW9uKSk7CiAKKyAgICBOZXdGcmFtZU9wZW5lclBvbGljeSBvcGVuZXJQb2xp Y3kgPSBmcmFtZUxvYWRSZXF1ZXN0Lm5ld0ZyYW1lT3BlbmVyUG9saWN5KCk7CisgICAgQWxsb3dO YXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCA9IGZyYW1l TG9hZFJlcXVlc3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKCk7CiAgICAgaWYgKCF0YXJn ZXRGcmFtZSAmJiAhZWZmZWN0aXZlRnJhbWVOYW1lLmlzRW1wdHkoKSkgewogICAgICAgICBhY3Rp b24gPSBhY3Rpb24uY29weVdpdGhTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KHNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3lUb0FwcGx5KG1fZnJhbWUsIGZyYW1lTG9hZFJlcXVlc3QpKTsK ICAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3V2luZG93UG9saWN5KFdURk1vdmUoYWN0 aW9uKSwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShmb3JtU3RhdGUpLCBlZmZlY3RpdmVGcmFt ZU5hbWUsIFt0aGlzLCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIG9wZW5lclBvbGljeSwg Y29tcGxldGlvbkhhbmRsZXIgPSBjb21wbGV0aW9uSGFuZGxlckNhbGxlci5yZWxlYXNlKCldIChj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYWtQdHI8Rm9ybVN0YXRlPiYmIGZvcm1T dGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFj dGlvbiwgUG9saWN5Q2hlY2tlcjo6U2hvdWxkQ29udGludWUgc2hvdWxkQ29udGludWUpIG11dGFi bGUgewo= 397060 2020-04-21 00:09:45 -0700 2020-04-21 01:22:38 -0700 Patch bug-210751-20200421090944.patch text/plain 4532 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIxYjU5MDdjODFiNDk1 NGQ5ZDZmMTUxOTE5ODQwZTFmOTFhMGZiOC4uNjkzNDI3NDFlMTcwZTQ0NTEzOWYxOWU5NDg2ZDRm YTE0YmU4MTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTIwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRXhpdCBlYXJseSBpbiBGcmFtZUxv YWRlcjo6bG9hZFVSTCB3aGVuIHJlZGlyZWN0aW5nIHRvIGFub3RoZXIgZnJhbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc1MQorCisgICAgICAg IFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIEV4aXQgZWFybHkgaW4gRnJh bWVMb2FkZXI6OmxvYWRVUkwgd2hlbiByZWRpcmVjdGluZyB0byBhbm90aGVyIGZyYW1lLCBwcmV2 aW91c2x5IHdlIHdlcmUgcHJlcGFyaW5nCisgICAgICAgIHJlcXVlc3QgbmVlZGxlc3NseSwgZG9p bmcgaXQgdHdpY2UgaW4gY2FzZSBvZiBmcmFtZSByZWRpcmVjdGluZy4gQWxzbyBtb3ZlIHNvbWUg dmFyaWFibGVzIHRvCisgICAgICAgIHdoZXJlIHRoZXkgYXJlIGFjdHVhbGx5IHVzZWQuCisKKyAg ICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OmxvYWRVUkwpOgorCiAyMDIwLTA0LTIwICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJz bGluZ0Bzb255LmNvbT4KIAogICAgICAgICBDbGFzc2VzIG1hcmtlZCBmaW5hbCBzaG91bGQgbm90 IHVzZSBwcm90ZWN0ZWQgYWNjZXNzIHNwZWNpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKaW5kZXggMWMxODM1YTk3NmYxYTQyYWI0Mzg2YzBiYjUwNGFlZmEyZjViOTc4NC4u NmEzMTNhN2RlNWJjODBmMmU2ZDA5ODU0MTQzMzI0MGQzMDYzNzEwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xMzUyLDExICsxMzUyLDE2IEBAIHZvaWQgRnJhbWVM b2FkZXI6OmxvYWRVUkwoRnJhbWVMb2FkUmVxdWVzdCYmIGZyYW1lTG9hZFJlcXVlc3QsIGNvbnN0 IFN0cmluZyYgcmVmCiAKICAgICAvLyBBbmNob3IgdGFyZ2V0IGlzIGlnbm9yZWQgd2hlbiB0aGUg ZG93bmxvYWQgYXR0cmlidXRlIGlzIHNldCBzaW5jZSBpdCB3aWxsIGRvd25sb2FkIHRoZSBoeXBl cmxpbmsgcmF0aGVyIHRoYW4gZm9sbG93IGl0LgogICAgIFN0cmluZyBlZmZlY3RpdmVGcmFtZU5h bWUgPSBmcmFtZUxvYWRSZXF1ZXN0LmRvd25sb2FkQXR0cmlidXRlKCkuaXNOdWxsKCkgPyBmcmFt ZUxvYWRSZXF1ZXN0LmZyYW1lTmFtZSgpIDogU3RyaW5nKCk7Ci0gICAgQWxsb3dOYXZpZ2F0aW9u VG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCA9IGZyYW1lTG9hZFJlcXVl c3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKCk7Ci0gICAgTmV3RnJhbWVPcGVuZXJQb2xp Y3kgb3BlbmVyUG9saWN5ID0gZnJhbWVMb2FkUmVxdWVzdC5uZXdGcmFtZU9wZW5lclBvbGljeSgp OwotICAgIExvY2tIaXN0b3J5IGxvY2tIaXN0b3J5ID0gZnJhbWVMb2FkUmVxdWVzdC5sb2NrSGlz dG9yeSgpOwogICAgIGJvb2wgaXNGb3JtU3VibWlzc2lvbiA9IGZvcm1TdGF0ZTsKIAorICAgIC8v IFRoZSBzZWFyY2ggZm9yIGEgdGFyZ2V0IGZyYW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2Fz ZSBvZiBmb3JtIHN1Ym1pc3Npb24uCisgICAgUmVmUHRyPEZyYW1lPiB0YXJnZXRGcmFtZSA9IGlz Rm9ybVN1Ym1pc3Npb24gPyBudWxscHRyIDogZmluZEZyYW1lRm9yTmF2aWdhdGlvbihlZmZlY3Rp dmVGcmFtZU5hbWUpOworICAgIGlmICh0YXJnZXRGcmFtZSAmJiB0YXJnZXRGcmFtZSAhPSAmbV9m cmFtZSkgeworICAgICAgICBmcmFtZUxvYWRSZXF1ZXN0LnNldEZyYW1lTmFtZSgiX3NlbGYiKTsK KyAgICAgICAgdGFyZ2V0RnJhbWUtPmxvYWRlcigpLmxvYWRVUkwoV1RGTW92ZShmcmFtZUxvYWRS ZXF1ZXN0KSwgcmVmZXJyZXIsIG5ld0xvYWRUeXBlLCBldmVudCwgV1RGTW92ZShmb3JtU3RhdGUp LCBXVEZNb3ZlKGFkQ2xpY2tBdHRyaWJ1dGlvbiksIGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyLnJl bGVhc2UoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBjb25zdCBVUkwmIG5ld1VS TCA9IGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkudXJsKCk7CiAgICAgUmVzb3Vy Y2VSZXF1ZXN0IHJlcXVlc3QobmV3VVJMKTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkK QEAgLTEzNjYsMjMgKzEzNzEsMTcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChGcmFtZUxv YWRSZXF1ZXN0JiYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWYKIAogICAgIEFT U0VSVChuZXdMb2FkVHlwZSAhPSBGcmFtZUxvYWRUeXBlOjpTYW1lKTsKIAotICAgIC8vIFRoZSBz ZWFyY2ggZm9yIGEgdGFyZ2V0IGZyYW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBm b3JtIHN1Ym1pc3Npb24uCi0gICAgRnJhbWUqIHRhcmdldEZyYW1lID0gaXNGb3JtU3VibWlzc2lv biA/IG51bGxwdHIgOiBmaW5kRnJhbWVGb3JOYXZpZ2F0aW9uKGVmZmVjdGl2ZUZyYW1lTmFtZSk7 Ci0gICAgaWYgKHRhcmdldEZyYW1lICYmIHRhcmdldEZyYW1lICE9ICZtX2ZyYW1lKSB7Ci0gICAg ICAgIGZyYW1lTG9hZFJlcXVlc3Quc2V0RnJhbWVOYW1lKCJfc2VsZiIpOwotICAgICAgICB0YXJn ZXRGcmFtZS0+bG9hZGVyKCkubG9hZFVSTChXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpLCByZWZl cnJlciwgbmV3TG9hZFR5cGUsIGV2ZW50LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIFdURk1vdmUoYWRD bGlja0F0dHJpYnV0aW9uKSwgY29tcGxldGlvbkhhbmRsZXJDYWxsZXIucmVsZWFzZSgpKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGlmICghaXNOYXZpZ2F0aW9uQWxsb3dlZCgpKQog ICAgICAgICByZXR1cm47CiAKICAgICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbiB7IGZyYW1lTG9h ZFJlcXVlc3QucmVxdWVzdGVyKCksIHJlcXVlc3QsIGZyYW1lTG9hZFJlcXVlc3QuaW5pdGlhdGVk QnlNYWluRnJhbWUoKSwgbmV3TG9hZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50LCBmcmFt ZUxvYWRSZXF1ZXN0LnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koKSwgZnJhbWVMb2FkUmVx dWVzdC5kb3dubG9hZEF0dHJpYnV0ZSgpIH07Ci0gICAgYWN0aW9uLnNldExvY2tIaXN0b3J5KGxv Y2tIaXN0b3J5KTsKKyAgICBhY3Rpb24uc2V0TG9ja0hpc3RvcnkoZnJhbWVMb2FkUmVxdWVzdC5s b2NrSGlzdG9yeSgpKTsKICAgICBhY3Rpb24uc2V0TG9ja0JhY2tGb3J3YXJkTGlzdChmcmFtZUxv YWRSZXF1ZXN0LmxvY2tCYWNrRm9yd2FyZExpc3QoKSk7CiAgICAgaWYgKGFkQ2xpY2tBdHRyaWJ1 dGlvbiAmJiBtX2ZyYW1lLmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIGFjdGlvbi5zZXRBZENsaWNr QXR0cmlidXRpb24oV1RGTW92ZSgqYWRDbGlja0F0dHJpYnV0aW9uKSk7CiAKKyAgICBOZXdGcmFt ZU9wZW5lclBvbGljeSBvcGVuZXJQb2xpY3kgPSBmcmFtZUxvYWRSZXF1ZXN0Lm5ld0ZyYW1lT3Bl bmVyUG9saWN5KCk7CisgICAgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdh dGlvblRvSW52YWxpZFVSTCA9IGZyYW1lTG9hZFJlcXVlc3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZh bGlkVVJMKCk7CiAgICAgaWYgKCF0YXJnZXRGcmFtZSAmJiAhZWZmZWN0aXZlRnJhbWVOYW1lLmlz RW1wdHkoKSkgewogICAgICAgICBhY3Rpb24gPSBhY3Rpb24uY29weVdpdGhTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5KHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb0FwcGx5KG1fZnJh bWUsIGZyYW1lTG9hZFJlcXVlc3QpKTsKICAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3 V2luZG93UG9saWN5KFdURk1vdmUoYWN0aW9uKSwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShm b3JtU3RhdGUpLCBlZmZlY3RpdmVGcmFtZU5hbWUsIFt0aGlzLCBhbGxvd05hdmlnYXRpb25Ub0lu dmFsaWRVUkwsIG9wZW5lclBvbGljeSwgY29tcGxldGlvbkhhbmRsZXIgPSBjb21wbGV0aW9uSGFu ZGxlckNhbGxlci5yZWxlYXNlKCldIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdl YWtQdHI8Rm9ybVN0YXRlPiYmIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNv bnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgUG9saWN5Q2hlY2tlcjo6U2hvdWxkQ29udGlu dWUgc2hvdWxkQ29udGludWUpIG11dGFibGUgewo= 397062 2020-04-21 01:22:43 -0700 2020-04-21 03:31:14 -0700 Patch bug-210751-20200421102241.patch text/plain 5141 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIxYjU5MDdjODFiNDk1 NGQ5ZDZmMTUxOTE5ODQwZTFmOTFhMGZiOC4uMGRhNzBkNzdkZjBkNWQzNDcxY2VjYjVkZDk3Yjk1 MWFiZGU1YjA3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0LTIxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRXhpdCBlYXJseSBpbiBGcmFtZUxv YWRlcjo6bG9hZFVSTCB3aGVuIHJlZGlyZWN0aW5nIHRvIGFub3RoZXIgZnJhbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc1MQorCisgICAgICAg IFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIEV4aXQgZWFybHkgaW4gRnJh bWVMb2FkZXI6OmxvYWRVUkwgd2hlbiByZWRpcmVjdGluZyB0byBhbm90aGVyIGZyYW1lLCBwcmV2 aW91c2x5IHdlIHdlcmUgcHJlcGFyaW5nCisgICAgICAgIHJlcXVlc3QgbmVlZGxlc3NseSwgZG9p bmcgaXQgdHdpY2UgaW4gY2FzZSBvZiBmcmFtZSByZWRpcmVjdGluZy4gQWxzbyBtb3ZlIHNvbWUg dmFyaWFibGVzIHRvCisgICAgICAgIHdoZXJlIHRoZXkgYXJlIGFjdHVhbGx5IHVzZWQuCisKKyAg ICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OmxvYWRVUkwpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDIw LTA0LTIwICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAg ICBDbGFzc2VzIG1hcmtlZCBmaW5hbCBzaG91bGQgbm90IHVzZSBwcm90ZWN0ZWQgYWNjZXNzIHNw ZWNpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMWMxODM1YTk3 NmYxYTQyYWI0Mzg2YzBiYjUwNGFlZmEyZjViOTc4NC4uNTZiYjNiYTJiMWYxNGJkOWY3MTY1Yjg1 MzZlMzM4ZjkwY2Y4MjAwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBA IC0xMzUyLDExICsxMzUyLDE2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkwoRnJhbWVMb2Fk UmVxdWVzdCYmIGZyYW1lTG9hZFJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcmVmCiAKICAgICAvLyBB bmNob3IgdGFyZ2V0IGlzIGlnbm9yZWQgd2hlbiB0aGUgZG93bmxvYWQgYXR0cmlidXRlIGlzIHNl dCBzaW5jZSBpdCB3aWxsIGRvd25sb2FkIHRoZSBoeXBlcmxpbmsgcmF0aGVyIHRoYW4gZm9sbG93 IGl0LgogICAgIFN0cmluZyBlZmZlY3RpdmVGcmFtZU5hbWUgPSBmcmFtZUxvYWRSZXF1ZXN0LmRv d25sb2FkQXR0cmlidXRlKCkuaXNOdWxsKCkgPyBmcmFtZUxvYWRSZXF1ZXN0LmZyYW1lTmFtZSgp IDogU3RyaW5nKCk7Ci0gICAgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdh dGlvblRvSW52YWxpZFVSTCA9IGZyYW1lTG9hZFJlcXVlc3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZh bGlkVVJMKCk7Ci0gICAgTmV3RnJhbWVPcGVuZXJQb2xpY3kgb3BlbmVyUG9saWN5ID0gZnJhbWVM b2FkUmVxdWVzdC5uZXdGcmFtZU9wZW5lclBvbGljeSgpOwotICAgIExvY2tIaXN0b3J5IGxvY2tI aXN0b3J5ID0gZnJhbWVMb2FkUmVxdWVzdC5sb2NrSGlzdG9yeSgpOwogICAgIGJvb2wgaXNGb3Jt U3VibWlzc2lvbiA9IGZvcm1TdGF0ZTsKIAorICAgIC8vIFRoZSBzZWFyY2ggZm9yIGEgdGFyZ2V0 IGZyYW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBmb3JtIHN1Ym1pc3Npb24uCisg ICAgYXV0byB0YXJnZXRGcmFtZSA9IGlzRm9ybVN1Ym1pc3Npb24gPyBudWxscHRyIDogbWFrZVJl ZlB0cihmaW5kRnJhbWVGb3JOYXZpZ2F0aW9uKGVmZmVjdGl2ZUZyYW1lTmFtZSkpOworICAgIGlm ICh0YXJnZXRGcmFtZSAmJiB0YXJnZXRGcmFtZSAhPSAmbV9mcmFtZSkgeworICAgICAgICBmcmFt ZUxvYWRSZXF1ZXN0LnNldEZyYW1lTmFtZSgiX3NlbGYiKTsKKyAgICAgICAgdGFyZ2V0RnJhbWUt PmxvYWRlcigpLmxvYWRVUkwoV1RGTW92ZShmcmFtZUxvYWRSZXF1ZXN0KSwgcmVmZXJyZXIsIG5l d0xvYWRUeXBlLCBldmVudCwgV1RGTW92ZShmb3JtU3RhdGUpLCBXVEZNb3ZlKGFkQ2xpY2tBdHRy aWJ1dGlvbiksIGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyLnJlbGVhc2UoKSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKICAgICBjb25zdCBVUkwmIG5ld1VSTCA9IGZyYW1lTG9hZFJlcXVlc3Qu cmVzb3VyY2VSZXF1ZXN0KCkudXJsKCk7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QobmV3 VVJMKTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKQEAgLTEzNjYsMjMgKzEzNzEsMTcg QEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChGcmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVMb2Fk UmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWYKIAogICAgIEFTU0VSVChuZXdMb2FkVHlwZSAhPSBG cmFtZUxvYWRUeXBlOjpTYW1lKTsKIAotICAgIC8vIFRoZSBzZWFyY2ggZm9yIGEgdGFyZ2V0IGZy YW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBmb3JtIHN1Ym1pc3Npb24uCi0gICAg RnJhbWUqIHRhcmdldEZyYW1lID0gaXNGb3JtU3VibWlzc2lvbiA/IG51bGxwdHIgOiBmaW5kRnJh bWVGb3JOYXZpZ2F0aW9uKGVmZmVjdGl2ZUZyYW1lTmFtZSk7Ci0gICAgaWYgKHRhcmdldEZyYW1l ICYmIHRhcmdldEZyYW1lICE9ICZtX2ZyYW1lKSB7Ci0gICAgICAgIGZyYW1lTG9hZFJlcXVlc3Qu c2V0RnJhbWVOYW1lKCJfc2VsZiIpOwotICAgICAgICB0YXJnZXRGcmFtZS0+bG9hZGVyKCkubG9h ZFVSTChXVEZNb3ZlKGZyYW1lTG9hZFJlcXVlc3QpLCByZWZlcnJlciwgbmV3TG9hZFR5cGUsIGV2 ZW50LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIFdURk1vdmUoYWRDbGlja0F0dHJpYnV0aW9uKSwgY29t cGxldGlvbkhhbmRsZXJDYWxsZXIucmVsZWFzZSgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQogICAgIGlmICghaXNOYXZpZ2F0aW9uQWxsb3dlZCgpKQogICAgICAgICByZXR1cm47CiAKICAg ICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbiB7IGZyYW1lTG9hZFJlcXVlc3QucmVxdWVzdGVyKCks IHJlcXVlc3QsIGZyYW1lTG9hZFJlcXVlc3QuaW5pdGlhdGVkQnlNYWluRnJhbWUoKSwgbmV3TG9h ZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50LCBmcmFtZUxvYWRSZXF1ZXN0LnNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3koKSwgZnJhbWVMb2FkUmVxdWVzdC5kb3dubG9hZEF0dHJpYnV0 ZSgpIH07Ci0gICAgYWN0aW9uLnNldExvY2tIaXN0b3J5KGxvY2tIaXN0b3J5KTsKKyAgICBhY3Rp b24uc2V0TG9ja0hpc3RvcnkoZnJhbWVMb2FkUmVxdWVzdC5sb2NrSGlzdG9yeSgpKTsKICAgICBh Y3Rpb24uc2V0TG9ja0JhY2tGb3J3YXJkTGlzdChmcmFtZUxvYWRSZXF1ZXN0LmxvY2tCYWNrRm9y d2FyZExpc3QoKSk7CiAgICAgaWYgKGFkQ2xpY2tBdHRyaWJ1dGlvbiAmJiBtX2ZyYW1lLmlzTWFp bkZyYW1lKCkpCiAgICAgICAgIGFjdGlvbi5zZXRBZENsaWNrQXR0cmlidXRpb24oV1RGTW92ZSgq YWRDbGlja0F0dHJpYnV0aW9uKSk7CiAKKyAgICBOZXdGcmFtZU9wZW5lclBvbGljeSBvcGVuZXJQ b2xpY3kgPSBmcmFtZUxvYWRSZXF1ZXN0Lm5ld0ZyYW1lT3BlbmVyUG9saWN5KCk7CisgICAgQWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCA9IGZy YW1lTG9hZFJlcXVlc3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKCk7CiAgICAgaWYgKCF0 YXJnZXRGcmFtZSAmJiAhZWZmZWN0aXZlRnJhbWVOYW1lLmlzRW1wdHkoKSkgewogICAgICAgICBh Y3Rpb24gPSBhY3Rpb24uY29weVdpdGhTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KHNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb0FwcGx5KG1fZnJhbWUsIGZyYW1lTG9hZFJlcXVlc3Qp KTsKICAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3V2luZG93UG9saWN5KFdURk1vdmUo YWN0aW9uKSwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShmb3JtU3RhdGUpLCBlZmZlY3RpdmVG cmFtZU5hbWUsIFt0aGlzLCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIG9wZW5lclBvbGlj eSwgY29tcGxldGlvbkhhbmRsZXIgPSBjb21wbGV0aW9uSGFuZGxlckNhbGxlci5yZWxlYXNlKCld IChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYWtQdHI8Rm9ybVN0YXRlPiYmIGZv cm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24m IGFjdGlvbiwgUG9saWN5Q2hlY2tlcjo6U2hvdWxkQ29udGludWUgc2hvdWxkQ29udGludWUpIG11 dGFibGUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCAyZGFmODNhZWZmMDMy OGMxNThiOTg2NzBkOTRiMWE2YWY4NTE0ZjIwLi45MjZjNmNhZDkyMTc0OWNhYmMyZTVjYmM5ZTNh MTcyMjQzNWZmMzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMjgxLDYg KzI4MSw3IEBAIHB1YmxpYzoKIAogICAgIEZyYW1lTG9hZGVyU3RhdGVNYWNoaW5lJiBzdGF0ZU1h Y2hpbmUoKSB7IHJldHVybiBtX3N0YXRlTWFjaGluZTsgfQogCisgICAgLy8gRklYTUU6IHNob3Vs ZCByZXR1cm4gUmVmUHRyLgogICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lKiBmaW5kRnJhbWVGb3JO YXZpZ2F0aW9uKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUsIERvY3VtZW50KiBhY3RpdmVEb2N1bWVu dCA9IG51bGxwdHIpOwogCiAgICAgdm9pZCBhcHBseVVzZXJBZ2VudElmTmVlZGVkKFJlc291cmNl UmVxdWVzdCYpOwo=