199948 2019-07-19 09:59:57 -0700 Make sure to unref captured lambda variables given to _strictTrustEvaluate in the main thread 2019-07-22 11:52:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1554236 0 youennf 2019-07-19 09:59:57 -0700 Make sure to unref captured lambda variables given to _strictTrustEvaluate in the main thread 1554237 1 374472 youennf 2019-07-19 10:03:49 -0700 Created attachment 374472 Patch 1554247 2 youennf 2019-07-19 10:50:24 -0700 *** Bug 199919 has been marked as a duplicate of this bug. *** 1554439 3 374533 youennf 2019-07-19 18:24:39 -0700 Created attachment 374533 Patch 1554720 4 374533 achristensen 2019-07-22 10:33:43 -0700 Comment on attachment 374533 Patch Sure. I think it would be a little more consistent with the rest of the code to check the weak pointer in the lambda, then pass a NetworkSessionCocoa& to processServerTrustEvaluation. 1554730 5 374606 youennf 2019-07-22 11:02:18 -0700 Created attachment 374606 Patch for landing 1554731 6 youennf 2019-07-22 11:04:31 -0700 (In reply to Alex Christensen from comment #4) > Comment on attachment 374533 [details] > Patch > > Sure. I think it would be a little more consistent with the rest of the > code to check the weak pointer in the lambda, then pass a > NetworkSessionCocoa& to processServerTrustEvaluation. Done. 1554771 7 374606 commit-queue 2019-07-22 11:51:37 -0700 Comment on attachment 374606 Patch for landing Clearing flags on attachment: 374606 Committed r247693: <https://trac.webkit.org/changeset/247693> 1554772 8 commit-queue 2019-07-22 11:51:38 -0700 All reviewed patches have been landed. Closing bug. 1554773 9 webkit-bug-importer 2019-07-22 11:52:20 -0700 <rdar://problem/53408892> 374472 2019-07-19 10:03:49 -0700 2019-07-19 18:24:38 -0700 Patch bug-199948-20190719100345.patch text/plain 3710 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0ZDU4ODQ4NGI5MTZkYmQ2 ZTRiYTQxNzA4ZmJiMzRkODA3YzM1YmMuLmRkNDFmZTcyYjMyNDVkZDAwYjAxNmQ3YzZkMWY5YTE3 NTRkMGY5NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDctMTkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byB1bnJlZiBj YXB0dXJlZCBsYW1iZGEgdmFyaWFibGVzIGdpdmVuIHRvIF9zdHJpY3RUcnVzdEV2YWx1YXRlIGlu IHRoZSBtYWluIHRocmVhZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk5OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNlIGEgd2VhayBwb2ludGVyIGluc3RlYWQgb2YgYSBSZWYgZm9yIHRoZSBOZXR3 b3JrU2Vzc2lvbi4KKyAgICAgICAgQWRkIGEgbnVsbCBjaGVjayBpbiBwcm9jZXNzU2VydmVyVHJ1 c3RFdmFsdWF0aW9uIGZvciBleHRyYSBzYWZldHkgaWYgd2UgZGVjaWRlIHRvIHJlbW92ZSB0aGUg ZGF0YSB0YXNrIE5ldHdvcmtTZXNzaW9uIHJlZi4KKyAgICAgICAgTWFrZSBzdXJlIHRvIG1vdmUg dGhlIE5ldHdvcmtEYXRhVGFzayByZWYgaW4gdGhlIGNvbXBsZXRpb24gaGFuZGxlciBzbyB0aGF0 IHRoZSB1bnJlZmluZyBpcyBkb25lIGluIHRoZSBtYWluIHRocmVhZC4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChwcm9j ZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRl bGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRSZWNlaXZlQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5k bGVyOl0pOgorCiAyMDE5LTA3LTE4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdGUgV2ViSW5zcGVjdG9yIHNob3VsZCBlbmFibGUgbW9jayBjYXB0dXJl IGRldmljZXMgaW4gVUlQcm9jZXNzIGlmIGRvaW5nIGl0IGluIFdlYlByb2Nlc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2Nv YS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQppbmRleCBmYjlkMTY1NTUxZTI4ODlmNzY5MzYyZDY1ZmUzMWQ0ZWE1ZjFkZGYxLi5j ZDk3ZWI2YWMzOWQ0NmZlMTdlOTUxMjRiZmU4N2U4OWY0MjI3MTE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h Lm1tCkBAIC01NTIsNyArNTUyLDcgQEAgc3RhdGljIGJvb2wgY2FuTlNVUkxTZXNzaW9uVHJ1c3RF dmFsdWF0ZSgpCiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0 aW9uKE5ldHdvcmtTZXNzaW9uQ29jb2EgKnNlc3Npb24sIE5TVVJMQXV0aGVudGljYXRpb25DaGFs bGVuZ2UgKmNoYWxsZW5nZSwgT1NTdGF0dXMgdHJ1c3RSZXN1bHQsIE5ldHdvcmtEYXRhVGFza0Nv Y29hOjpUYXNrSWRlbnRpZmllciB0YXNrSWRlbnRpZmllciwgTmV0d29ya0RhdGFUYXNrQ29jb2Eq IG5ldHdvcmtEYXRhVGFzaywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChOU1VSTFNlc3Npb25BdXRo Q2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqY3JlZGVu dGlhbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKHRydXN0UmVzdWx0ID09IG5v RXJyKSB7CisgICAgaWYgKHRydXN0UmVzdWx0ID09IG5vRXJyIHx8ICFzZXNzaW9uKSB7CiAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VQZXJmb3JtRGVm YXVsdEhhbmRsaW5nLCBuaWwpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTk0LDEwICs1 OTQsOSBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazoo TlNVUkxTZXNzaW9uVGFzayAqKXRhc2sgZGlkUmVjZQogI2lmIEhBVkUoQ0ZORVRXT1JLX05TVVJM U0VTU0lPTl9TVFJJQ1RSVVNURVZBTFVBVEUpCiAgICAgICAgICAgICBpZiAoY2FuTlNVUkxTZXNz aW9uVHJ1c3RFdmFsdWF0ZSgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byogbmV0d29ya0RhdGFU YXNrID0gW3NlbGYgZXhpc3RpbmdUYXNrOnRhc2tdOwotICAgICAgICAgICAgICAgIGF1dG8gZGVj aXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFtfc2Vzc2lvbiA9IF9zZXNzaW9uLmNvcHlSZWYo KSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpLCB0 YXNrSWRlbnRpZmllciwgX25ldHdvcmtEYXRhVGFzayA9IFJlZlB0cjxOZXR3b3JrRGF0YVRhc2tD b2NvYT4obmV0d29ya0RhdGFUYXNrKV0oTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqY2hh bGxlbmdlLCBPU1N0YXR1cyB0cnVzdFJlc3VsdCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAg ICAgIGF1dG8gc2Vzc2lvbiA9IFdURk1vdmUoX3Nlc3Npb24pOwotICAgICAgICAgICAgICAgICAg ICBhdXRvIG5ldHdvcmtEYXRhVGFzayA9IFdURk1vdmUoX25ldHdvcmtEYXRhVGFzayk7Ci0gICAg ICAgICAgICAgICAgICAgIHByb2Nlc3NTZXJ2ZXJUcnVzdEV2YWx1YXRpb24oc2Vzc2lvbi5nZXQo KSwgY2hhbGxlbmdlLCB0cnVzdFJlc3VsdCwgdGFza0lkZW50aWZpZXIsIG5ldHdvcmtEYXRhVGFz ay5nZXQoKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgICAgICAgICAgICAgIGF1 dG8gZGVjaXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFtfc2Vzc2lvbiA9IG1ha2VXZWFrUHRy KF9zZXNzaW9uLmdldCgpKSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxl dGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgbmV0d29ya0RhdGFUYXNrID0gUmVmUHRyPE5l dHdvcmtEYXRhVGFza0NvY29hPihuZXR3b3JrRGF0YVRhc2spXShOU1VSTEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlICpjaGFsbGVuZ2UsIE9TU3RhdHVzIHRydXN0UmVzdWx0KSBtdXRhYmxlIHsKKyAg ICAgICAgICAgICAgICAgICAgYXV0byB0YXNrID0gV1RGTW92ZShuZXR3b3JrRGF0YVRhc2spOwor ICAgICAgICAgICAgICAgICAgICBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKF9zZXNzaW9u LmdldCgpLCBjaGFsbGVuZ2UsIHRydXN0UmVzdWx0LCB0YXNrSWRlbnRpZmllciwgdGFzay5nZXQo KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICAgICAgICAgIH0pOwogICAg ICAgICAgICAgICAgIFtOU1VSTFNlc3Npb24gX3N0cmljdFRydXN0RXZhbHVhdGU6Y2hhbGxlbmdl IHF1ZXVlOltOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV0udW5kZXJseWluZ1F1ZXVlIGNvbXBs ZXRpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CiAgICAgICAgICAgICAgICAgcmV0 dXJuOwo= 374533 2019-07-19 18:24:39 -0700 2019-07-22 11:02:17 -0700 Patch bug-199948-20190719182438.patch text/plain 3542 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzZWU2YzczZGZlNzc3YTE4 NjdjOWY2YWQyNjAwMGUzMDM3OGVmNzQuLjM4NTY1OGY2MGUwMzhkYzZiNGY2OTcxNDYzMmIwYzBi MTY2ZTViMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDctMTkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byB1bnJlZiBj YXB0dXJlZCBsYW1iZGEgdmFyaWFibGVzIGdpdmVuIHRvIF9zdHJpY3RUcnVzdEV2YWx1YXRlIGlu IHRoZSBtYWluIHRocmVhZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk5OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNlIGEgd2VhayBwb2ludGVyIGluc3RlYWQgb2YgYSBSZWYgZm9yIHRoZSBOZXR3 b3JrU2Vzc2lvbi4KKyAgICAgICAgQWRkIGEgbnVsbCBjaGVjayBpbiBwcm9jZXNzU2VydmVyVHJ1 c3RFdmFsdWF0aW9uIGZvciBleHRyYSBzYWZldHkgaWYgd2UgZGVjaWRlIHRvIHJlbW92ZSB0aGUg ZGF0YSB0YXNrIE5ldHdvcmtTZXNzaW9uIHJlZi4KKyAgICAgICAgTWFrZSBzdXJlIHRvIG1vdmUg dGhlIE5ldHdvcmtEYXRhVGFzayByZWYgaW4gdGhlIGNvbXBsZXRpb24gaGFuZGxlciBzbyB0aGF0 IHRoZSB1bnJlZmluZyBpcyBkb25lIGluIHRoZSBtYWluIHRocmVhZC4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChwcm9j ZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRl bGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRSZWNlaXZlQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5k bGVyOl0pOgorCiAyMDE5LTA3LTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgRml4IHdhcm5pbmcgd2hlbiBpbXBvcnRpbmcgV2ViS2l0IGlu IFN3aWZ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggNGRjNGYyMjM0MzFjMzc4MzY5YzdjMmU3ODc5 MGI4Zjg4ZTlmYmRkZS4uYjdiNGQ4ZmU2ZTQ5MTI3ODk2Y2Q4NmRjYzMwZjAxZTVlNjc4MmU2YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtNTUyLDcgKzU1Miw3IEBAIHN0YXRpYyBib29sIGNhbk5T VVJMU2Vzc2lvblRydXN0RXZhbHVhdGUoKQogCiBzdGF0aWMgaW5saW5lIHZvaWQgcHJvY2Vzc1Nl cnZlclRydXN0RXZhbHVhdGlvbihOZXR3b3JrU2Vzc2lvbkNvY29hICpzZXNzaW9uLCBOU1VSTEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UsIE9TU3RhdHVzIHRydXN0UmVzdWx0LCBO ZXR3b3JrRGF0YVRhc2tDb2NvYTo6VGFza0lkZW50aWZpZXIgdGFza0lkZW50aWZpZXIsIE5ldHdv cmtEYXRhVGFza0NvY29hKiBuZXR3b3JrRGF0YVRhc2ssIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo TlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBOU1VSTENy ZWRlbnRpYWwgKmNyZWRlbnRpYWwpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICh0 cnVzdFJlc3VsdCA9PSBub0VycikgeworICAgIGlmICh0cnVzdFJlc3VsdCA9PSBub0VyciB8fCAh c2Vzc2lvbikgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihOU1VSTFNlc3Npb25BdXRoQ2hh bGxlbmdlUGVyZm9ybURlZmF1bHRIYW5kbGluZywgbmlsKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTU5NCw4ICs1OTQsOSBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAq KXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRhc2sgZGlkUmVjZQogI2lmIEhBVkUo Q0ZORVRXT1JLX05TVVJMU0VTU0lPTl9TVFJJQ1RSVVNURVZBTFVBVEUpCiAgICAgICAgICAgICBp ZiAoY2FuTlNVUkxTZXNzaW9uVHJ1c3RFdmFsdWF0ZSgpKSB7CiAgICAgICAgICAgICAgICAgYXV0 byogbmV0d29ya0RhdGFUYXNrID0gW3NlbGYgZXhpc3RpbmdUYXNrOnRhc2tdOwotICAgICAgICAg ICAgICAgIGF1dG8gZGVjaXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFtfc2Vzc2lvbiA9IF9z ZXNzaW9uLmNvcHlSZWYoKSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxl dGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgbmV0d29ya0RhdGFUYXNrID0gUmVmUHRyPE5l dHdvcmtEYXRhVGFza0NvY29hPihuZXR3b3JrRGF0YVRhc2spXShOU1VSTEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlICpjaGFsbGVuZ2UsIE9TU3RhdHVzIHRydXN0UmVzdWx0KSBtdXRhYmxlIHsKLSAg ICAgICAgICAgICAgICAgICAgcHJvY2Vzc1NlcnZlclRydXN0RXZhbHVhdGlvbihfc2Vzc2lvbi5n ZXQoKSwgY2hhbGxlbmdlLCB0cnVzdFJlc3VsdCwgdGFza0lkZW50aWZpZXIsIG5ldHdvcmtEYXRh VGFzay5nZXQoKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgICAgICAgICAgICAg IGF1dG8gZGVjaXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFtfc2Vzc2lvbiA9IG1ha2VXZWFr UHRyKF9zZXNzaW9uLmdldCgpKSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29t cGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgbmV0d29ya0RhdGFUYXNrID0gUmVmUHRy PE5ldHdvcmtEYXRhVGFza0NvY29hPihuZXR3b3JrRGF0YVRhc2spXShOU1VSTEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlICpjaGFsbGVuZ2UsIE9TU3RhdHVzIHRydXN0UmVzdWx0KSBtdXRhYmxlIHsK KyAgICAgICAgICAgICAgICAgICAgYXV0byB0YXNrID0gV1RGTW92ZShuZXR3b3JrRGF0YVRhc2sp OworICAgICAgICAgICAgICAgICAgICBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKF9zZXNz aW9uLmdldCgpLCBjaGFsbGVuZ2UsIHRydXN0UmVzdWx0LCB0YXNrSWRlbnRpZmllciwgdGFzay5n ZXQoKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICAgICAgICAgIH0pOwog ICAgICAgICAgICAgICAgIFtOU1VSTFNlc3Npb24gX3N0cmljdFRydXN0RXZhbHVhdGU6Y2hhbGxl bmdlIHF1ZXVlOltOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV0udW5kZXJseWluZ1F1ZXVlIGNv bXBsZXRpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CiAgICAgICAgICAgICAgICAg cmV0dXJuOwo= 374606 2019-07-22 11:02:18 -0700 2019-07-22 11:51:37 -0700 Patch for landing bug-199948-20190722110217.patch text/plain 4781 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzZWU2YzczZGZlNzc3YTE4 NjdjOWY2YWQyNjAwMGUzMDM3OGVmNzQuLjZiNWMwMmRjMzY0OWE2MGY2NDBjODRmODIwYTMxZjRi N2NkNzk1YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDctMjIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byB1bnJlZiBj YXB0dXJlZCBsYW1iZGEgdmFyaWFibGVzIGdpdmVuIHRvIF9zdHJpY3RUcnVzdEV2YWx1YXRlIGlu IHRoZSBtYWluIHRocmVhZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk5OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4K KworICAgICAgICBVc2UgYSB3ZWFrIHBvaW50ZXIgaW5zdGVhZCBvZiBhIFJlZiBmb3IgdGhlIE5l dHdvcmtTZXNzaW9uLgorICAgICAgICBBZGQgYSBudWxsIGNoZWNrIGluIHByb2Nlc3NTZXJ2ZXJU cnVzdEV2YWx1YXRpb24gZm9yIGV4dHJhIHNhZmV0eSBpZiB3ZSBkZWNpZGUgdG8gcmVtb3ZlIHRo ZSBkYXRhIHRhc2sgTmV0d29ya1Nlc3Npb24gcmVmLgorICAgICAgICBNYWtlIHN1cmUgdG8gbW92 ZSB0aGUgTmV0d29ya0RhdGFUYXNrIHJlZiBpbiB0aGUgY29tcGxldGlvbiBoYW5kbGVyIHNvIHRo YXQgdGhlIHVucmVmaW5nIGlzIGRvbmUgaW4gdGhlIG1haW4gdGhyZWFkLgorCisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKHBy b2Nlc3NTZXJ2ZXJUcnVzdEV2YWx1YXRpb24pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9u RGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZFJlY2VpdmVDaGFsbGVuZ2U6Y29tcGxldGlvbkhh bmRsZXI6XSk6CisKIDIwMTktMDctMTggIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggd2FybmluZyB3aGVuIGltcG9ydGluZyBXZWJLaXQg aW4gU3dpZnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA0ZGM0ZjIyMzQzMWMzNzgzNjljN2MyZTc4 NzkwYjhmODhlOWZiZGRlLi4wMGVkYTViYzg4YWU1MjIyZjdhMjIwNDVkNTg3NThiZWM0OWY3MzMy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT ZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC01NTAsMTMgKzU1MCw4IEBAIHN0YXRpYyBib29sIGNh bk5TVVJMU2Vzc2lvblRydXN0RXZhbHVhdGUoKQogICAgIHJldHVybiBbTlNVUkxTZXNzaW9uIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3N0cmljdFRydXN0RXZhbHVhdGU6IHF1ZXVlOiBj b21wbGV0aW9uSGFuZGxlcjopXTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIHByb2Nlc3NTZXJ2 ZXJUcnVzdEV2YWx1YXRpb24oTmV0d29ya1Nlc3Npb25Db2NvYSAqc2Vzc2lvbiwgTlNVUkxBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSAqY2hhbGxlbmdlLCBPU1N0YXR1cyB0cnVzdFJlc3VsdCwgTmV0 d29ya0RhdGFUYXNrQ29jb2E6OlRhc2tJZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyLCBOZXR3b3Jr RGF0YVRhc2tDb2NvYSogbmV0d29ya0RhdGFUYXNrLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKE5T VVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgTlNVUkxDcmVk ZW50aWFsICpjcmVkZW50aWFsKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3N0YXRpYyBpbmxpbmUg dm9pZCBwcm9jZXNzU2VydmVyVHJ1c3RFdmFsdWF0aW9uKE5ldHdvcmtTZXNzaW9uQ29jb2EgKnNl c3Npb24sIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgTmV0d29ya0Rh dGFUYXNrQ29jb2E6OlRhc2tJZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyLCBOZXR3b3JrRGF0YVRh c2tDb2NvYSogbmV0d29ya0RhdGFUYXNrLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKE5TVVJMU2Vz c2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFs ICpjcmVkZW50aWFsKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBpZiAodHJ1c3RSZXN1 bHQgPT0gbm9FcnIpIHsKLSAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoTlNVUkxTZXNzaW9uQXV0 aENoYWxsZW5nZVBlcmZvcm1EZWZhdWx0SGFuZGxpbmcsIG5pbCk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KICAgICBzZXNzaW9uLT5jb250aW51ZURpZFJlY2VpdmVDaGFsbGVuZ2UoY2hhbGxl bmdlLCB0YXNrSWRlbnRpZmllciwgbmV0d29ya0RhdGFUYXNrLCBbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgc2VjVHJ1c3QgPSByZXRhaW5QdHIoY2hhbGxl bmdlLnByb3RlY3Rpb25TcGFjZS5zZXJ2ZXJUcnVzdCldIChXZWJLaXQ6OkF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkNyZWRlbnRp YWwmIGNyZWRlbnRpYWwpIG11dGFibGUgewogICAgICAgICAvLyBGSVhNRTogVUlQcm9jZXNzIHNo b3VsZCBzZW5kIHVzIGJhY2sgbm9uIG5pbCBjcmVkZW50aWFscyBidXQgdGhlIGNyZWRlbnRpYWwg SVBDIGVuY29kZXIgY3VycmVudGx5IG9ubHkgc2VyaWFsaXplcyBucyBjcmVkZW50aWFscyBmb3Ig dXNlcm5hbWUvcGFzc3dvcmQuCiAgICAgICAgIGlmIChkaXNwb3NpdGlvbiA9PSBXZWJLaXQ6OkF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb246OlVzZUNyZWRlbnRpYWwgJiYgIWNyZWRl bnRpYWwubnNDcmVkZW50aWFsKCkpIHsKQEAgLTU5NCw4ICs1ODksMTQgQEAgLSAodm9pZClVUkxT ZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sgKil0 YXNrIGRpZFJlY2UKICNpZiBIQVZFKENGTkVUV09SS19OU1VSTFNFU1NJT05fU1RSSUNUUlVTVEVW QUxVQVRFKQogICAgICAgICAgICAgaWYgKGNhbk5TVVJMU2Vzc2lvblRydXN0RXZhbHVhdGUoKSkg ewogICAgICAgICAgICAgICAgIGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IFtzZWxmIGV4aXN0aW5n VGFzazp0YXNrXTsKLSAgICAgICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VC bG9ja1B0cihbX3Nlc3Npb24gPSBfc2Vzc2lvbi5jb3B5UmVmKCksIGNvbXBsZXRpb25IYW5kbGVy ID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKSwgdGFza0lkZW50aWZpZXIsIG5ldHdv cmtEYXRhVGFzayA9IFJlZlB0cjxOZXR3b3JrRGF0YVRhc2tDb2NvYT4obmV0d29ya0RhdGFUYXNr KV0oTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqY2hhbGxlbmdlLCBPU1N0YXR1cyB0cnVz dFJlc3VsdCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAgICAgIHByb2Nlc3NTZXJ2ZXJUcnVz dEV2YWx1YXRpb24oX3Nlc3Npb24uZ2V0KCksIGNoYWxsZW5nZSwgdHJ1c3RSZXN1bHQsIHRhc2tJ ZGVudGlmaWVyLCBuZXR3b3JrRGF0YVRhc2suZ2V0KCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpKTsKKyAgICAgICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0 cihbX3Nlc3Npb24gPSBtYWtlV2Vha1B0cihfc2Vzc2lvbi5nZXQoKSksIGNvbXBsZXRpb25IYW5k bGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKSwgdGFza0lkZW50aWZpZXIsIG5l dHdvcmtEYXRhVGFzayA9IFJlZlB0cjxOZXR3b3JrRGF0YVRhc2tDb2NvYT4obmV0d29ya0RhdGFU YXNrKV0oTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqY2hhbGxlbmdlLCBPU1N0YXR1cyB0 cnVzdFJlc3VsdCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdGFzayA9IFdU Rk1vdmUobmV0d29ya0RhdGFUYXNrKTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byogc2Vzc2lv biA9IF9zZXNzaW9uLmdldCgpOworICAgICAgICAgICAgICAgICAgICBpZiAodHJ1c3RSZXN1bHQg PT0gbm9FcnIgfHwgIXNlc3Npb24pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VQZXJmb3JtRGVmYXVsdEhhbmRsaW5n LCBuaWwpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgIHByb2Nlc3NTZXJ2ZXJUcnVzdEV2YWx1YXRpb24o c2Vzc2lvbiwgY2hhbGxlbmdlLCB0YXNrSWRlbnRpZmllciwgdGFzay5nZXQoKSwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAg IFtOU1VSTFNlc3Npb24gX3N0cmljdFRydXN0RXZhbHVhdGU6Y2hhbGxlbmdlIHF1ZXVlOltOU09w ZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV0udW5kZXJseWluZ1F1ZXVlIGNvbXBsZXRpb25IYW5kbGVy OmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CiAgICAgICAgICAgICAgICAgcmV0dXJuOwo=