217249 2020-10-02 14:02:52 -0700 Add maximum depth check to RedBlackTree 2020-10-07 11:05:15 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo benjamin cdumez cmarcelo darin ews-watchlist mark.lam saam webkit-bug-importer oldest_to_newest 1694228 0 tzagallo 2020-10-02 14:02:52 -0700 ... 1694231 1 410368 tzagallo 2020-10-02 14:09:20 -0700 Created attachment 410368 Patch 1694232 2 tzagallo 2020-10-02 14:10:16 -0700 <rdar://problem/69432957> 1694251 3 410377 tzagallo 2020-10-02 15:05:39 -0700 Created attachment 410377 Patch 1694266 4 410377 mark.lam 2020-10-02 15:39:24 -0700 Comment on attachment 410377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410377&action=review > Source/WTF/wtf/RedBlackTree.h:353 > + RELEASE_ASSERT(++depth <= s_maximumTreeDepth); I think this is wrong. This function iterates over the set of all nodes, not the depth of the tree. So, this check is incorrect. 1694764 5 410532 tzagallo 2020-10-05 11:15:27 -0700 Created attachment 410532 Patch 1694785 6 410537 tzagallo 2020-10-05 12:08:56 -0700 Created attachment 410537 Patch 1694961 7 410592 tzagallo 2020-10-05 17:05:44 -0700 Created attachment 410592 Patch 1695308 8 410592 saam 2020-10-06 14:15:18 -0700 Comment on attachment 410592 Patch LGTM, but let's fix iterate with your idea of making it simpler 1695418 9 410720 tzagallo 2020-10-06 17:52:20 -0700 Created attachment 410720 Patch 1695427 10 410720 darin 2020-10-06 18:18:27 -0700 Comment on attachment 410720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410720&action=review > Source/WTF/ChangeLog:9 > + We limit all tree traversals to 128 levels deep. That's a very conservative upper bound that Is this a security hardening measure? What motivated the change? 1695433 11 410720 saam 2020-10-06 18:53:30 -0700 Comment on attachment 410720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410720&action=review r=me > Source/WTF/wtf/RedBlackTree.h:353 > + RELEASE_ASSERT(++size < std::numeric_limits<unsigned>::max()); Just use Checked? 1695599 12 ews-feeder 2020-10-07 11:05:14 -0700 Committed r268135: <https://trac.webkit.org/changeset/268135> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410720. 410368 2020-10-02 14:09:20 -0700 2020-10-02 15:05:37 -0700 Patch bug-217249-20201002140920.patch text/plain 5521 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjg1YzhkYTI3MGU2NWRhYjJlMTYxOWVjYjcxNjE4ZThiNzY5NzY5 YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgR3VhcmQgYWdhaW5zdCBpbmZpbml0ZSBsb29wcyBp biBSZWRCbGFja1RyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNzI0OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjk0MzI5NTc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gZ3VhcmQgYWdhaW5z dCBpbmZpbml0ZSBsb29wcyB3ZSBsaW1pdCBhbGwgdHJlZSB0cmF2ZXJzYWxzIHRvIDEyOCBsZXZl bHMgZGVlcC4gVGhhdCdzIGEgdmVyeQorICAgICAgICBjb25zZXJ2YXRpdmUgdXBwZXIgYm91bmQg dGhhdCB3b3VsZCB3b3JrIGZvciBhIHRyZWUgdGhhdCB1c2VkIGFsbCBvZiB0aGUgYXZhaWxhYmxl IGFkZHJlc3Mgc3BhY2UuCisKKyAgICAgICAgKiB3dGYvUmVkQmxhY2tUcmVlLmg6CisKIDIwMjAt MDktMjUgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlND XSBJbnRyb2R1Y2UgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTiAvIEpTQ19ERUZJTkVfSE9TVF9G VU5DVElPTiB0byBtYWtlIGhvc3QgZnVuY3Rpb24gZGVmaW5pdGlvbiBlYXN5LXRvLXNjYW5uZWQg Zm9yIEpJVC1jYWdpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1JlZEJsYWNrVHJlZS5o IGIvU291cmNlL1dURi93dGYvUmVkQmxhY2tUcmVlLmgKaW5kZXggMjM2ODBmMjQ3N2M2YTEzMjRj ZjJiMzgyMDEwNjE3MWQ4Zjg5MGY5MC4uNTE2MTJkYTcwNGU0Y2UzYTQ3ZjIxYjUwNTk0MTVkN2E5 M2JmOTA4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUmVkQmxhY2tUcmVlLmgKKysrIGIv U291cmNlL1dURi93dGYvUmVkQmxhY2tUcmVlLmgKQEAgLTQ2LDYgKzQ2LDggQEAgY2xhc3MgUmVk QmxhY2tUcmVlIGZpbmFsIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSZWRCbGFja1RyZWUp OwogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHJpdmF0ZToKKyAgICBzdGF0aWMgY29u c3RleHByIHVuc2lnbmVkIHNfbWF4aW11bVRyZWVEZXB0aCA9IDEyODsKKwogICAgIGVudW0gQ29s b3IgewogICAgICAgICBSZWQgPSAxLAogICAgICAgICBCbGFjawpAQCAtNjIsNyArNjQsOSBAQCBw dWJsaWM6CiAgICAgICAgICAgICBpZiAoeC0+cmlnaHQoKSkKICAgICAgICAgICAgICAgICByZXR1 cm4gdHJlZU1pbmltdW0oeC0+cmlnaHQoKSk7CiAgICAgICAgICAgICBjb25zdCBOb2RlVHlwZSog eSA9IHgtPnBhcmVudCgpOworICAgICAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAg ICAgICAgd2hpbGUgKHkgJiYgeCA9PSB5LT5yaWdodCgpKSB7CisgICAgICAgICAgICAgICAgUkVM RUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAg ICAgIHggPSB5OwogICAgICAgICAgICAgICAgIHkgPSB5LT5wYXJlbnQoKTsKICAgICAgICAgICAg IH0KQEAgLTc1LDcgKzc5LDkgQEAgcHVibGljOgogICAgICAgICAgICAgaWYgKHgtPmxlZnQoKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gdHJlZU1heGltdW0oeC0+bGVmdCgpKTsKICAgICAgICAg ICAgIGNvbnN0IE5vZGVUeXBlKiB5ID0geC0+cGFyZW50KCk7CisgICAgICAgICAgICB1bnNpZ25l ZCBkZXB0aCA9IDA7CiAgICAgICAgICAgICB3aGlsZSAoeSAmJiB4ID09IHktPmxlZnQoKSkgewor ICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURl cHRoKTsKICAgICAgICAgICAgICAgICB4ID0geTsKICAgICAgICAgICAgICAgICB5ID0geS0+cGFy ZW50KCk7CiAgICAgICAgICAgICB9CkBAIC0yODMsNyArMjg5LDkgQEAgcHVibGljOgogICAgIAog ICAgIE5vZGVUeXBlKiBmaW5kRXhhY3QoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsK KyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICBmb3IgKE5vZGVUeXBlKiBjdXJy ZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytk ZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgaWYgKGN1cnJlbnQtPmtl eSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3VycmVudDsKICAgICAgICAgICAg IGlmIChrZXkgPCBjdXJyZW50LT5rZXkoKSkKQEAgLTI5Nyw3ICszMDUsOSBAQCBwdWJsaWM6CiAg ICAgTm9kZVR5cGUqIGZpbmRMZWFzdEdyZWF0ZXJUaGFuT3JFcXVhbChjb25zdCBLZXlUeXBlJiBr ZXkpIGNvbnN0CiAgICAgewogICAgICAgICBOb2RlVHlwZSogYmVzdCA9IG51bGxwdHI7CisgICAg ICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVudCA9 IG1fcm9vdDsgY3VycmVudDspIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGgg PD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA9 PSBrZXkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBpZiAo Y3VycmVudC0+a2V5KCkgPCBrZXkpCkBAIC0zMTMsNyArMzIzLDkgQEAgcHVibGljOgogICAgIE5v ZGVUeXBlKiBmaW5kR3JlYXRlc3RMZXNzVGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5KSBj b25zdAogICAgIHsKICAgICAgICAgTm9kZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAgICB1 bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAgICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBtX3Jv b3Q7IGN1cnJlbnQ7KSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNf bWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0ga2V5 KQogICAgICAgICAgICAgICAgIHJldHVybiBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1cnJl bnQtPmtleSgpID4ga2V5KQpAQCAtMzM0LDcgKzM0Niw5IEBAIHB1YmxpYzoKIAogICAgICAgICBW ZWN0b3I8Tm9kZVR5cGUqLCAxNj4gdG9JdGVyYXRlOwogICAgICAgICB0b0l0ZXJhdGUuYXBwZW5k KG1fcm9vdCk7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgd2hpbGUgKHRv SXRlcmF0ZS5zaXplKCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0g c19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIE5vZGVUeXBlJiBjdXJyZW50ID0gKnRv SXRlcmF0ZS50YWtlTGFzdCgpOwogICAgICAgICAgICAgYm9vbCBpdGVyYXRlTGVmdCA9IGZhbHNl OwogICAgICAgICAgICAgYm9vbCBpdGVyYXRlUmlnaHQgPSBmYWxzZTsKQEAgLTM4MCwyOSArMzk0 LDQxIEBAIHByaXZhdGU6CiAgICAgLy8gbm9kZS4KICAgICBzdGF0aWMgTm9kZVR5cGUqIHRyZWVN aW5pbXVtKE5vZGVUeXBlKiB4KQogICAgIHsKLSAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkKKyAg ICAgICAgdW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoeC0+bGVmdCgpKSB7Cisg ICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7 CiAgICAgICAgICAgICB4ID0geC0+bGVmdCgpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4 OwogICAgIH0KICAgICAKICAgICBzdGF0aWMgTm9kZVR5cGUqIHRyZWVNYXhpbXVtKE5vZGVUeXBl KiB4KQogICAgIHsKLSAgICAgICAgd2hpbGUgKHgtPnJpZ2h0KCkpCisgICAgICAgIHVuc2lnbmVk IGRlcHRoID0gMDsKKyAgICAgICAgd2hpbGUgKHgtPnJpZ2h0KCkpIHsKKyAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAg IHggPSB4LT5yaWdodCgpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KIAog ICAgIHN0YXRpYyBjb25zdCBOb2RlVHlwZSogdHJlZU1pbmltdW0oY29uc3QgTm9kZVR5cGUqIHgp CiAgICAgewotICAgICAgICB3aGlsZSAoeC0+bGVmdCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0 aCA9IDA7CisgICAgICAgIHdoaWxlICh4LT5sZWZ0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0Vf QVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4 LT5sZWZ0KCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHg7CiAgICAgfQogICAgIAogICAg IHN0YXRpYyBjb25zdCBOb2RlVHlwZSogdHJlZU1heGltdW0oY29uc3QgTm9kZVR5cGUqIHgpCiAg ICAgewotICAgICAgICB3aGlsZSAoeC0+cmlnaHQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGgg PSAwOworICAgICAgICB3aGlsZSAoeC0+cmlnaHQoKSkgeworICAgICAgICAgICAgUkVMRUFTRV9B U1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgeCA9IHgt PnJpZ2h0KCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHg7CiAgICAgfQogCkBAIC00MTUs NyArNDQxLDkgQEAgcHJpdmF0ZToKICAgICAgICAgCiAgICAgICAgIE5vZGVUeXBlKiB5ID0gbnVs bHB0cjsKICAgICAgICAgTm9kZVR5cGUqIHggPSBtX3Jvb3Q7CisgICAgICAgIHVuc2lnbmVkIGRl cHRoID0gMDsKICAgICAgICAgd2hpbGUgKHgpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJU KCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHkgPSB4OwogICAg ICAgICAgICAgaWYgKHotPmtleSgpIDwgeC0+a2V5KCkpCiAgICAgICAgICAgICAgICAgeCA9IHgt PmxlZnQoKTsKQEAgLTUwMiw3ICs1MzAsOSBAQCBwcml2YXRlOgogICAgIC8vIHN1cHBsaWVkLgog ICAgIHZvaWQgcmVtb3ZlRml4dXAoTm9kZVR5cGUqIHgsIE5vZGVUeXBlKiB4UGFyZW50KQogICAg IHsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAoeCAhPSBtX3Jv b3QgJiYgKCF4IHx8IHgtPmNvbG9yKCkgPT0gQmxhY2spKSB7CisgICAgICAgICAgICBSRUxFQVNF X0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICBpZiAo eCA9PSB4UGFyZW50LT5sZWZ0KCkpIHsKICAgICAgICAgICAgICAgICAvLyBOb3RlOiB0aGUgdGV4 dCBwb2ludHMgb3V0IHRoYXQgdyBjYW4gbm90IGJlIG51bGwuCiAgICAgICAgICAgICAgICAgLy8g VGhlIHJlYXNvbiBpcyBub3Qgb2J2aW91cyBmcm9tIHNpbXBseSBsb29raW5nIGF0Cg== 410377 2020-10-02 15:05:39 -0700 2020-10-05 11:15:26 -0700 Patch bug-217249-20201002150538.patch text/plain 5891 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjA5ZGU0NjJlYTNlY2MyOTk2MTZjMmM2YzhlZTlkYzNiMTA2Y2Vl ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1heGltdW0gZGVwdGggY2hlY2sgdG8gUmVk QmxhY2tUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTcyNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDMyOTU3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGxpbWl0IGFsbCB0cmVlIHRy YXZlcnNhbHMgdG8gMTI4IGxldmVscyBkZWVwLiBUaGF0J3MgYSB2ZXJ5IGNvbnNlcnZhdGl2ZSB1 cHBlciBib3VuZCB0aGF0CisgICAgICAgIHdvdWxkIHdvcmsgZm9yIGEgdHJlZSB0aGF0IHVzZWQg YWxsIG9mIHRoZSBhdmFpbGFibGUgYWRkcmVzcyBzcGFjZS4KKworICAgICAgICAqIHd0Zi9SZWRC bGFja1RyZWUuaDoKKwogMjAyMC0wOS0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O IC8gSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OIHRvIG1ha2UgaG9zdCBmdW5jdGlvbiBkZWZpbml0 aW9uIGVhc3ktdG8tc2Nhbm5lZCBmb3IgSklULWNhZ2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUmVkQmxhY2tUcmVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaAppbmRl eCAyMzY4MGYyNDc3YzZhMTMyNGNmMmIzODIwMTA2MTcxZDhmODkwZjkwLi5mZjYzOTk1ZDIwZjJk ODcwZGVkOTFmYTJkNWY5MjUxZGYwYjVlZWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9S ZWRCbGFja1RyZWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaApAQCAtNDYs NiArNDYsOCBAQCBjbGFzcyBSZWRCbGFja1RyZWUgZmluYWwgewogICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKFJlZEJsYWNrVHJlZSk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwcml2 YXRlOgorICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19tYXhpbXVtVHJlZURlcHRoID0g MTI4OworCiAgICAgZW51bSBDb2xvciB7CiAgICAgICAgIFJlZCA9IDEsCiAgICAgICAgIEJsYWNr CkBAIC02Miw3ICs2NCw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICh4LT5yaWdodCgpKQog ICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWluaW11bSh4LT5yaWdodCgpKTsKICAgICAgICAg ICAgIGNvbnN0IE5vZGVUeXBlKiB5ID0geC0+cGFyZW50KCk7CisgICAgICAgICAgICB1bnNpZ25l ZCBkZXB0aCA9IDA7CiAgICAgICAgICAgICB3aGlsZSAoeSAmJiB4ID09IHktPnJpZ2h0KCkpIHsK KyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVE ZXB0aCk7CiAgICAgICAgICAgICAgICAgeCA9IHk7CiAgICAgICAgICAgICAgICAgeSA9IHktPnBh cmVudCgpOwogICAgICAgICAgICAgfQpAQCAtNzUsNyArNzksOSBAQCBwdWJsaWM6CiAgICAgICAg ICAgICBpZiAoeC0+bGVmdCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWF4aW11bSh4 LT5sZWZ0KCkpOwogICAgICAgICAgICAgY29uc3QgTm9kZVR5cGUqIHkgPSB4LT5wYXJlbnQoKTsK KyAgICAgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgICAgIHdoaWxlICh5ICYm IHggPT0geS0+bGVmdCgpKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0 aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgICAgIHggPSB5OwogICAgICAg ICAgICAgICAgIHkgPSB5LT5wYXJlbnQoKTsKICAgICAgICAgICAgIH0KQEAgLTE2Myw3ICsxNjks OSBAQCBwdWJsaWM6CiAgICAgICAgIHRyZWVJbnNlcnQoeCk7CiAgICAgICAgIHgtPnNldENvbG9y KFJlZCk7CiAKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAoeCAh PSBtX3Jvb3QgJiYgeC0+cGFyZW50KCktPmNvbG9yKCkgPT0gUmVkKSB7CisgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAg ICBpZiAoeC0+cGFyZW50KCkgPT0geC0+cGFyZW50KCktPnBhcmVudCgpLT5sZWZ0KCkpIHsKICAg ICAgICAgICAgICAgICBOb2RlVHlwZSogeSA9IHgtPnBhcmVudCgpLT5wYXJlbnQoKS0+cmlnaHQo KTsKICAgICAgICAgICAgICAgICBpZiAoeSAmJiB5LT5jb2xvcigpID09IFJlZCkgewpAQCAtMjgz LDcgKzI5MSw5IEBAIHB1YmxpYzoKICAgICAKICAgICBOb2RlVHlwZSogZmluZEV4YWN0KGNvbnN0 IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsK ICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVudCA9IG1fcm9vdDsgY3VycmVudDspIHsKKyAg ICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsK ICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA9PSBrZXkpCiAgICAgICAgICAgICAgICAg cmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBpZiAoa2V5IDwgY3VycmVudC0+a2V5KCkpCkBA IC0yOTcsNyArMzA3LDkgQEAgcHVibGljOgogICAgIE5vZGVUeXBlKiBmaW5kTGVhc3RHcmVhdGVy VGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsKICAgICAgICAgTm9k ZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAg ICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBtX3Jvb3Q7IGN1cnJlbnQ7KSB7CisgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAg ICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0ga2V5KQogICAgICAgICAgICAgICAgIHJldHVy biBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1cnJlbnQtPmtleSgpIDwga2V5KQpAQCAtMzEz LDcgKzMyNSw5IEBAIHB1YmxpYzoKICAgICBOb2RlVHlwZSogZmluZEdyZWF0ZXN0TGVzc1RoYW5P ckVxdWFsKGNvbnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CiAgICAgICAgIE5vZGVUeXBl KiBiZXN0ID0gbnVsbHB0cjsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICBm b3IgKE5vZGVUeXBlKiBjdXJyZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAgICAg UkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAg ICAgaWYgKGN1cnJlbnQtPmtleSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3Vy cmVudDsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA+IGtleSkKQEAgLTMzNCw3ICsz NDgsOSBAQCBwdWJsaWM6CiAKICAgICAgICAgVmVjdG9yPE5vZGVUeXBlKiwgMTY+IHRvSXRlcmF0 ZTsKICAgICAgICAgdG9JdGVyYXRlLmFwcGVuZChtX3Jvb3QpOworICAgICAgICB1bnNpZ25lZCBk ZXB0aCA9IDA7CiAgICAgICAgIHdoaWxlICh0b0l0ZXJhdGUuc2l6ZSgpKSB7CisgICAgICAgICAg ICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAg ICAgICBOb2RlVHlwZSYgY3VycmVudCA9ICp0b0l0ZXJhdGUudGFrZUxhc3QoKTsKICAgICAgICAg ICAgIGJvb2wgaXRlcmF0ZUxlZnQgPSBmYWxzZTsKICAgICAgICAgICAgIGJvb2wgaXRlcmF0ZVJp Z2h0ID0gZmFsc2U7CkBAIC0zODAsMjkgKzM5Niw0MSBAQCBwcml2YXRlOgogICAgIC8vIG5vZGUu CiAgICAgc3RhdGljIE5vZGVUeXBlKiB0cmVlTWluaW11bShOb2RlVHlwZSogeCkKICAgICB7Ci0g ICAgICAgIHdoaWxlICh4LT5sZWZ0KCkpCisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKKyAg ICAgICAgd2hpbGUgKHgtPmxlZnQoKSkgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytk ZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgeCA9IHgtPmxlZnQoKTsK KyAgICAgICAgfQogICAgICAgICByZXR1cm4geDsKICAgICB9CiAgICAgCiAgICAgc3RhdGljIE5v ZGVUeXBlKiB0cmVlTWF4aW11bShOb2RlVHlwZSogeCkKICAgICB7Ci0gICAgICAgIHdoaWxlICh4 LT5yaWdodCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CisgICAgICAgIHdoaWxlICh4 LT5yaWdodCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4 aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+cmlnaHQoKTsKKyAgICAgICAgfQog ICAgICAgICByZXR1cm4geDsKICAgICB9CiAKICAgICBzdGF0aWMgY29uc3QgTm9kZVR5cGUqIHRy ZWVNaW5pbXVtKGNvbnN0IE5vZGVUeXBlKiB4KQogICAgIHsKLSAgICAgICAgd2hpbGUgKHgtPmxl ZnQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoeC0+bGVm dCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRy ZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+bGVmdCgpOworICAgICAgICB9CiAgICAgICAg IHJldHVybiB4OwogICAgIH0KICAgICAKICAgICBzdGF0aWMgY29uc3QgTm9kZVR5cGUqIHRyZWVN YXhpbXVtKGNvbnN0IE5vZGVUeXBlKiB4KQogICAgIHsKLSAgICAgICAgd2hpbGUgKHgtPnJpZ2h0 KCkpCisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKKyAgICAgICAgd2hpbGUgKHgtPnJpZ2h0 KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJl ZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5yaWdodCgpOworICAgICAgICB9CiAgICAgICAg IHJldHVybiB4OwogICAgIH0KIApAQCAtNDE1LDcgKzQ0Myw5IEBAIHByaXZhdGU6CiAgICAgICAg IAogICAgICAgICBOb2RlVHlwZSogeSA9IG51bGxwdHI7CiAgICAgICAgIE5vZGVUeXBlKiB4ID0g bV9yb290OworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAgICAgIHdoaWxlICh4KSB7 CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0 aCk7CiAgICAgICAgICAgICB5ID0geDsKICAgICAgICAgICAgIGlmICh6LT5rZXkoKSA8IHgtPmtl eSgpKQogICAgICAgICAgICAgICAgIHggPSB4LT5sZWZ0KCk7CkBAIC01MDIsNyArNTMyLDkgQEAg cHJpdmF0ZToKICAgICAvLyBzdXBwbGllZC4KICAgICB2b2lkIHJlbW92ZUZpeHVwKE5vZGVUeXBl KiB4LCBOb2RlVHlwZSogeFBhcmVudCkKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0g MDsKICAgICAgICAgd2hpbGUgKHggIT0gbV9yb290ICYmICgheCB8fCB4LT5jb2xvcigpID09IEJs YWNrKSkgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1U cmVlRGVwdGgpOwogICAgICAgICAgICAgaWYgKHggPT0geFBhcmVudC0+bGVmdCgpKSB7CiAgICAg ICAgICAgICAgICAgLy8gTm90ZTogdGhlIHRleHQgcG9pbnRzIG91dCB0aGF0IHcgY2FuIG5vdCBi ZSBudWxsLgogICAgICAgICAgICAgICAgIC8vIFRoZSByZWFzb24gaXMgbm90IG9idmlvdXMgZnJv bSBzaW1wbHkgbG9va2luZyBhdAo= 410532 2020-10-05 11:15:27 -0700 2020-10-05 12:26:23 -0700 Patch bug-217249-20201005111527.patch text/plain 7432 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjA5ZGU0NjJlYTNlY2MyOTk2MTZjMmM2YzhlZTlkYzNiMTA2Y2Vl ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1heGltdW0gZGVwdGggY2hlY2sgdG8gUmVk QmxhY2tUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTcyNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDMyOTU3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGxpbWl0IGFsbCB0cmVlIHRy YXZlcnNhbHMgdG8gMTI4IGxldmVscyBkZWVwLiBUaGF0J3MgYSB2ZXJ5IGNvbnNlcnZhdGl2ZSB1 cHBlciBib3VuZCB0aGF0CisgICAgICAgIHdvdWxkIHdvcmsgZm9yIGEgdHJlZSB0aGF0IHVzZWQg YWxsIG9mIHRoZSBhdmFpbGFibGUgYWRkcmVzcyBzcGFjZS4KKworICAgICAgICAqIHd0Zi9SZWRC bGFja1RyZWUuaDoKKwogMjAyMC0wOS0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O IC8gSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OIHRvIG1ha2UgaG9zdCBmdW5jdGlvbiBkZWZpbml0 aW9uIGVhc3ktdG8tc2Nhbm5lZCBmb3IgSklULWNhZ2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUmVkQmxhY2tUcmVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaAppbmRl eCAyMzY4MGYyNDc3YzZhMTMyNGNmMmIzODIwMTA2MTcxZDhmODkwZjkwLi44MjMyMDc4MDRjMjk1 NmM0NGMyMmIxMzBkYTMzZmQwYmM5MTBiYmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9S ZWRCbGFja1RyZWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaApAQCAtMjks OCArMjksOCBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgor I2luY2x1ZGUgPHd0Zi9Eb3VibHlMaW5rZWRMaXN0Lmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV1RGIHsKIApAQCAt NDYsNiArNDYsOCBAQCBjbGFzcyBSZWRCbGFja1RyZWUgZmluYWwgewogICAgIFdURl9NQUtFX05P TkNPUFlBQkxFKFJlZEJsYWNrVHJlZSk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBw cml2YXRlOgorICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19tYXhpbXVtVHJlZURlcHRo ID0gMTI4OworCiAgICAgZW51bSBDb2xvciB7CiAgICAgICAgIFJlZCA9IDEsCiAgICAgICAgIEJs YWNrCkBAIC02Miw3ICs2NCw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICh4LT5yaWdodCgp KQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWluaW11bSh4LT5yaWdodCgpKTsKICAgICAg ICAgICAgIGNvbnN0IE5vZGVUeXBlKiB5ID0geC0+cGFyZW50KCk7CisgICAgICAgICAgICB1bnNp Z25lZCBkZXB0aCA9IDA7CiAgICAgICAgICAgICB3aGlsZSAoeSAmJiB4ID09IHktPnJpZ2h0KCkp IHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRy ZWVEZXB0aCk7CiAgICAgICAgICAgICAgICAgeCA9IHk7CiAgICAgICAgICAgICAgICAgeSA9IHkt PnBhcmVudCgpOwogICAgICAgICAgICAgfQpAQCAtNzUsNyArNzksOSBAQCBwdWJsaWM6CiAgICAg ICAgICAgICBpZiAoeC0+bGVmdCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWF4aW11 bSh4LT5sZWZ0KCkpOwogICAgICAgICAgICAgY29uc3QgTm9kZVR5cGUqIHkgPSB4LT5wYXJlbnQo KTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgICAgIHdoaWxlICh5 ICYmIHggPT0geS0+bGVmdCgpKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytk ZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgICAgIHggPSB5OwogICAg ICAgICAgICAgICAgIHkgPSB5LT5wYXJlbnQoKTsKICAgICAgICAgICAgIH0KQEAgLTE2Myw3ICsx NjksOSBAQCBwdWJsaWM6CiAgICAgICAgIHRyZWVJbnNlcnQoeCk7CiAgICAgICAgIHgtPnNldENv bG9yKFJlZCk7CiAKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAo eCAhPSBtX3Jvb3QgJiYgeC0+cGFyZW50KCktPmNvbG9yKCkgPT0gUmVkKSB7CisgICAgICAgICAg ICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAg ICAgICBpZiAoeC0+cGFyZW50KCkgPT0geC0+cGFyZW50KCktPnBhcmVudCgpLT5sZWZ0KCkpIHsK ICAgICAgICAgICAgICAgICBOb2RlVHlwZSogeSA9IHgtPnBhcmVudCgpLT5wYXJlbnQoKS0+cmln aHQoKTsKICAgICAgICAgICAgICAgICBpZiAoeSAmJiB5LT5jb2xvcigpID09IFJlZCkgewpAQCAt MjgzLDcgKzI5MSw5IEBAIHB1YmxpYzoKICAgICAKICAgICBOb2RlVHlwZSogZmluZEV4YWN0KGNv bnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0g MDsKICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVudCA9IG1fcm9vdDsgY3VycmVudDspIHsK KyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRo KTsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA9PSBrZXkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBpZiAoa2V5IDwgY3VycmVudC0+a2V5KCkp CkBAIC0yOTcsNyArMzA3LDkgQEAgcHVibGljOgogICAgIE5vZGVUeXBlKiBmaW5kTGVhc3RHcmVh dGVyVGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsKICAgICAgICAg Tm9kZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAg ICAgICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBtX3Jvb3Q7IGN1cnJlbnQ7KSB7CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAg ICAgICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0ga2V5KQogICAgICAgICAgICAgICAgIHJl dHVybiBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1cnJlbnQtPmtleSgpIDwga2V5KQpAQCAt MzEzLDcgKzMyNSw5IEBAIHB1YmxpYzoKICAgICBOb2RlVHlwZSogZmluZEdyZWF0ZXN0TGVzc1Ro YW5PckVxdWFsKGNvbnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CiAgICAgICAgIE5vZGVU eXBlKiBiZXN0ID0gbnVsbHB0cjsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAg ICBmb3IgKE5vZGVUeXBlKiBjdXJyZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAg ICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAg ICAgICAgaWYgKGN1cnJlbnQtPmtleSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4g Y3VycmVudDsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA+IGtleSkKQEAgLTMzMiwx NyArMzQ2LDM2IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX3Jvb3QpCiAgICAgICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgVmVjdG9yPE5vZGVUeXBlKiwgMTY+IHRvSXRlcmF0ZTsKLSAgICAg ICAgdG9JdGVyYXRlLmFwcGVuZChtX3Jvb3QpOwotICAgICAgICB3aGlsZSAodG9JdGVyYXRlLnNp emUoKSkgewotICAgICAgICAgICAgTm9kZVR5cGUmIGN1cnJlbnQgPSAqdG9JdGVyYXRlLnRha2VM YXN0KCk7CisgICAgICAgIGNsYXNzIExpc3ROb2RlIDogRG91Ymx5TGlua2VkTGlzdE5vZGU8TGlz dE5vZGU+IHsKKyAgICAgICAgICAgIExpc3ROb2RlKE5vZGVUeXBlKiByYk5vZGUpCisgICAgICAg ICAgICAgICAgOiBtX25vZGUocmJOb2RlKQorICAgICAgICAgICAgeworICAgICAgICAgICAgfQor CisgICAgICAgICAgICBOb2RlVHlwZSogbV9ub2RlOworICAgICAgICAgICAgTGlzdE5vZGUqIG1f cHJldjsKKyAgICAgICAgICAgIExpc3ROb2RlKiBtX25leHQ7CisgICAgICAgIH07CisKKyAgICAg ICAgRG91Ymx5TGlua2VkTGlzdDxMaXN0Tm9kZSo+IHRvSXRlcmF0ZTsKKyAgICAgICAgTm9kZVR5 cGUqIG1hcmtlciA9IHJlaW50ZXJwcmV0X2Nhc3Q8Tm9kZVR5cGUqPihzdGQ6Om51bWVyaWNfbGlt aXRzPHVpbnRwdHJfdD46Om1heCgpKTsKKyAgICAgICAgdG9JdGVyYXRlLmFwcGVuZCh7IG1fcm9v dCB9KTsKKyAgICAgICAgdG9JdGVyYXRlLmFwcGVuZCh7IG1hcmtlciB9KTsKKyAgICAgICAgdW5z aWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoIXRvSXRlcmF0ZS5pc0VtcHR5KCkpIHsK KyAgICAgICAgICAgIExpc3ROb2RlJiBjdXJyZW50ID0gKnRvSXRlcmF0ZS5yZW1vdmVIZWFkKCk7 CisgICAgICAgICAgICBpZiAoY3VycmVudC5tX25vZGUgPT0gbWFya2VyKSB7CisgICAgICAgICAg ICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOworICAg ICAgICAgICAgICAgIHRvSXRlcmF0ZS5hcHBlbmQoeyBtYXJrZXIgfSk7CisgICAgICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBib29sIGl0ZXJhdGVMZWZ0 ID0gZmFsc2U7CiAgICAgICAgICAgICBib29sIGl0ZXJhdGVSaWdodCA9IGZhbHNlOwotICAgICAg ICAgICAgZnVuY3Rpb24oY3VycmVudCwgaXRlcmF0ZUxlZnQsIGl0ZXJhdGVSaWdodCk7Ci0gICAg ICAgICAgICBpZiAoaXRlcmF0ZUxlZnQgJiYgY3VycmVudC5sZWZ0KCkpCi0gICAgICAgICAgICAg ICAgdG9JdGVyYXRlLmFwcGVuZChjdXJyZW50LmxlZnQoKSk7Ci0gICAgICAgICAgICBpZiAoaXRl cmF0ZVJpZ2h0ICYmIGN1cnJlbnQucmlnaHQoKSkKLSAgICAgICAgICAgICAgICB0b0l0ZXJhdGUu YXBwZW5kKGN1cnJlbnQucmlnaHQoKSk7CisgICAgICAgICAgICBmdW5jdGlvbigqY3VycmVudC5t X25vZGUsIGl0ZXJhdGVMZWZ0LCBpdGVyYXRlUmlnaHQpOworICAgICAgICAgICAgaWYgKGl0ZXJh dGVMZWZ0ICYmIGN1cnJlbnQubV9ub2RlLT5sZWZ0KCkpCisgICAgICAgICAgICAgICAgdG9JdGVy YXRlLmFwcGVuZCh7IGN1cnJlbnQubV9ub2RlLT5sZWZ0KCkgfSk7CisgICAgICAgICAgICBpZiAo aXRlcmF0ZVJpZ2h0ICYmIGN1cnJlbnQubV9ub2RlLT5yaWdodCgpKQorICAgICAgICAgICAgICAg IHRvSXRlcmF0ZS5hcHBlbmQoeyBjdXJyZW50Lm1fbm9kZS0+cmlnaHQoKSB9KTsKICAgICAgICAg fQogICAgIH0KICAgICAKQEAgLTM4MCwyOSArNDEzLDQxIEBAIHByaXZhdGU6CiAgICAgLy8gbm9k ZS4KICAgICBzdGF0aWMgTm9kZVR5cGUqIHRyZWVNaW5pbXVtKE5vZGVUeXBlKiB4KQogICAgIHsK LSAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwor ICAgICAgICB3aGlsZSAoeC0+bGVmdCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgr K2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+bGVmdCgp OworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KICAgICAKICAgICBzdGF0aWMg Tm9kZVR5cGUqIHRyZWVNYXhpbXVtKE5vZGVUeXBlKiB4KQogICAgIHsKLSAgICAgICAgd2hpbGUg KHgtPnJpZ2h0KCkpCisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKKyAgICAgICAgd2hpbGUg KHgtPnJpZ2h0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19t YXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5yaWdodCgpOworICAgICAgICB9 CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KIAogICAgIHN0YXRpYyBjb25zdCBOb2RlVHlwZSog dHJlZU1pbmltdW0oY29uc3QgTm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGlsZSAoeC0+ bGVmdCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CisgICAgICAgIHdoaWxlICh4LT5s ZWZ0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVt VHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5sZWZ0KCk7CisgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIHg7CiAgICAgfQogICAgIAogICAgIHN0YXRpYyBjb25zdCBOb2RlVHlwZSogdHJl ZU1heGltdW0oY29uc3QgTm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGlsZSAoeC0+cmln aHQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoeC0+cmln aHQoKSkgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1U cmVlRGVwdGgpOwogICAgICAgICAgICAgeCA9IHgtPnJpZ2h0KCk7CisgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIHg7CiAgICAgfQogCkBAIC00MTUsNyArNDYwLDkgQEAgcHJpdmF0ZToKICAgICAg ICAgCiAgICAgICAgIE5vZGVUeXBlKiB5ID0gbnVsbHB0cjsKICAgICAgICAgTm9kZVR5cGUqIHgg PSBtX3Jvb3Q7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgd2hpbGUgKHgp IHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURl cHRoKTsKICAgICAgICAgICAgIHkgPSB4OwogICAgICAgICAgICAgaWYgKHotPmtleSgpIDwgeC0+ a2V5KCkpCiAgICAgICAgICAgICAgICAgeCA9IHgtPmxlZnQoKTsKQEAgLTUwMiw3ICs1NDksOSBA QCBwcml2YXRlOgogICAgIC8vIHN1cHBsaWVkLgogICAgIHZvaWQgcmVtb3ZlRml4dXAoTm9kZVR5 cGUqIHgsIE5vZGVUeXBlKiB4UGFyZW50KQogICAgIHsKKyAgICAgICAgdW5zaWduZWQgZGVwdGgg PSAwOwogICAgICAgICB3aGlsZSAoeCAhPSBtX3Jvb3QgJiYgKCF4IHx8IHgtPmNvbG9yKCkgPT0g QmxhY2spKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11 bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICBpZiAoeCA9PSB4UGFyZW50LT5sZWZ0KCkpIHsKICAg ICAgICAgICAgICAgICAvLyBOb3RlOiB0aGUgdGV4dCBwb2ludHMgb3V0IHRoYXQgdyBjYW4gbm90 IGJlIG51bGwuCiAgICAgICAgICAgICAgICAgLy8gVGhlIHJlYXNvbiBpcyBub3Qgb2J2aW91cyBm cm9tIHNpbXBseSBsb29raW5nIGF0Cg== 410537 2020-10-05 12:08:56 -0700 2020-10-05 12:22:59 -0700 Patch bug-217249-20201005120856.patch text/plain 7438 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjA5ZGU0NjJlYTNlY2MyOTk2MTZjMmM2YzhlZTlkYzNiMTA2Y2Vl ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1heGltdW0gZGVwdGggY2hlY2sgdG8gUmVk QmxhY2tUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTcyNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDMyOTU3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGxpbWl0IGFsbCB0cmVlIHRy YXZlcnNhbHMgdG8gMTI4IGxldmVscyBkZWVwLiBUaGF0J3MgYSB2ZXJ5IGNvbnNlcnZhdGl2ZSB1 cHBlciBib3VuZCB0aGF0CisgICAgICAgIHdvdWxkIHdvcmsgZm9yIGEgdHJlZSB0aGF0IHVzZWQg YWxsIG9mIHRoZSBhdmFpbGFibGUgYWRkcmVzcyBzcGFjZS4KKworICAgICAgICAqIHd0Zi9SZWRC bGFja1RyZWUuaDoKKwogMjAyMC0wOS0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O IC8gSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OIHRvIG1ha2UgaG9zdCBmdW5jdGlvbiBkZWZpbml0 aW9uIGVhc3ktdG8tc2Nhbm5lZCBmb3IgSklULWNhZ2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUmVkQmxhY2tUcmVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaAppbmRl eCAyMzY4MGYyNDc3YzZhMTMyNGNmMmIzODIwMTA2MTcxZDhmODkwZjkwLi5kYzUyN2ExNDEzODA3 ZDVhZWM3MTAzZTUzZWM0MWI3YTRiNTFkMzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9S ZWRCbGFja1RyZWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaApAQCAtMjks OCArMjksOCBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgor I2luY2x1ZGUgPHd0Zi9Eb3VibHlMaW5rZWRMaXN0Lmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV1RGIHsKIApAQCAt NDYsNiArNDYsOCBAQCBjbGFzcyBSZWRCbGFja1RyZWUgZmluYWwgewogICAgIFdURl9NQUtFX05P TkNPUFlBQkxFKFJlZEJsYWNrVHJlZSk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBw cml2YXRlOgorICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19tYXhpbXVtVHJlZURlcHRo ID0gMTI4OworCiAgICAgZW51bSBDb2xvciB7CiAgICAgICAgIFJlZCA9IDEsCiAgICAgICAgIEJs YWNrCkBAIC02Miw3ICs2NCw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICh4LT5yaWdodCgp KQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWluaW11bSh4LT5yaWdodCgpKTsKICAgICAg ICAgICAgIGNvbnN0IE5vZGVUeXBlKiB5ID0geC0+cGFyZW50KCk7CisgICAgICAgICAgICB1bnNp Z25lZCBkZXB0aCA9IDA7CiAgICAgICAgICAgICB3aGlsZSAoeSAmJiB4ID09IHktPnJpZ2h0KCkp IHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRy ZWVEZXB0aCk7CiAgICAgICAgICAgICAgICAgeCA9IHk7CiAgICAgICAgICAgICAgICAgeSA9IHkt PnBhcmVudCgpOwogICAgICAgICAgICAgfQpAQCAtNzUsNyArNzksOSBAQCBwdWJsaWM6CiAgICAg ICAgICAgICBpZiAoeC0+bGVmdCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWF4aW11 bSh4LT5sZWZ0KCkpOwogICAgICAgICAgICAgY29uc3QgTm9kZVR5cGUqIHkgPSB4LT5wYXJlbnQo KTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgICAgIHdoaWxlICh5 ICYmIHggPT0geS0+bGVmdCgpKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytk ZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgICAgIHggPSB5OwogICAg ICAgICAgICAgICAgIHkgPSB5LT5wYXJlbnQoKTsKICAgICAgICAgICAgIH0KQEAgLTE2Myw3ICsx NjksOSBAQCBwdWJsaWM6CiAgICAgICAgIHRyZWVJbnNlcnQoeCk7CiAgICAgICAgIHgtPnNldENv bG9yKFJlZCk7CiAKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAo eCAhPSBtX3Jvb3QgJiYgeC0+cGFyZW50KCktPmNvbG9yKCkgPT0gUmVkKSB7CisgICAgICAgICAg ICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAg ICAgICBpZiAoeC0+cGFyZW50KCkgPT0geC0+cGFyZW50KCktPnBhcmVudCgpLT5sZWZ0KCkpIHsK ICAgICAgICAgICAgICAgICBOb2RlVHlwZSogeSA9IHgtPnBhcmVudCgpLT5wYXJlbnQoKS0+cmln aHQoKTsKICAgICAgICAgICAgICAgICBpZiAoeSAmJiB5LT5jb2xvcigpID09IFJlZCkgewpAQCAt MjgzLDcgKzI5MSw5IEBAIHB1YmxpYzoKICAgICAKICAgICBOb2RlVHlwZSogZmluZEV4YWN0KGNv bnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0g MDsKICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVudCA9IG1fcm9vdDsgY3VycmVudDspIHsK KyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRo KTsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA9PSBrZXkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBpZiAoa2V5IDwgY3VycmVudC0+a2V5KCkp CkBAIC0yOTcsNyArMzA3LDkgQEAgcHVibGljOgogICAgIE5vZGVUeXBlKiBmaW5kTGVhc3RHcmVh dGVyVGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsKICAgICAgICAg Tm9kZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAg ICAgICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBtX3Jvb3Q7IGN1cnJlbnQ7KSB7CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAg ICAgICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0ga2V5KQogICAgICAgICAgICAgICAgIHJl dHVybiBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1cnJlbnQtPmtleSgpIDwga2V5KQpAQCAt MzEzLDcgKzMyNSw5IEBAIHB1YmxpYzoKICAgICBOb2RlVHlwZSogZmluZEdyZWF0ZXN0TGVzc1Ro YW5PckVxdWFsKGNvbnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CiAgICAgICAgIE5vZGVU eXBlKiBiZXN0ID0gbnVsbHB0cjsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAg ICBmb3IgKE5vZGVUeXBlKiBjdXJyZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAg ICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAg ICAgICAgaWYgKGN1cnJlbnQtPmtleSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4g Y3VycmVudDsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA+IGtleSkKQEAgLTMzMiwx NyArMzQ2LDM2IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX3Jvb3QpCiAgICAgICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgVmVjdG9yPE5vZGVUeXBlKiwgMTY+IHRvSXRlcmF0ZTsKLSAgICAg ICAgdG9JdGVyYXRlLmFwcGVuZChtX3Jvb3QpOwotICAgICAgICB3aGlsZSAodG9JdGVyYXRlLnNp emUoKSkgewotICAgICAgICAgICAgTm9kZVR5cGUmIGN1cnJlbnQgPSAqdG9JdGVyYXRlLnRha2VM YXN0KCk7CisgICAgICAgIGNsYXNzIExpc3ROb2RlIDogcHVibGljIERvdWJseUxpbmtlZExpc3RO b2RlPExpc3ROb2RlPiB7CisgICAgICAgICAgICBMaXN0Tm9kZShOb2RlVHlwZSogcmJOb2RlKQor ICAgICAgICAgICAgICAgIDogbV9ub2RlKHJiTm9kZSkKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgTm9kZVR5cGUqIG1fbm9kZTsKKyAgICAgICAgICAgIExpc3RO b2RlKiBtX3ByZXY7CisgICAgICAgICAgICBMaXN0Tm9kZSogbV9uZXh0OworICAgICAgICB9Owor CisgICAgICAgIERvdWJseUxpbmtlZExpc3Q8TGlzdE5vZGU+IHRvSXRlcmF0ZTsKKyAgICAgICAg Tm9kZVR5cGUqIG1hcmtlciA9IHJlaW50ZXJwcmV0X2Nhc3Q8Tm9kZVR5cGUqPihzdGQ6Om51bWVy aWNfbGltaXRzPHVpbnRwdHJfdD46Om1heCgpKTsKKyAgICAgICAgdG9JdGVyYXRlLmFwcGVuZCh7 IG1fcm9vdCB9KTsKKyAgICAgICAgdG9JdGVyYXRlLmFwcGVuZCh7IG1hcmtlciB9KTsKKyAgICAg ICAgdW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoIXRvSXRlcmF0ZS5pc0VtcHR5 KCkpIHsKKyAgICAgICAgICAgIExpc3ROb2RlJiBjdXJyZW50ID0gKnRvSXRlcmF0ZS5yZW1vdmVI ZWFkKCk7CisgICAgICAgICAgICBpZiAoY3VycmVudC5tX25vZGUgPT0gbWFya2VyKSB7CisgICAg ICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgp OworICAgICAgICAgICAgICAgIHRvSXRlcmF0ZS5hcHBlbmQoeyBtYXJrZXIgfSk7CisgICAgICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBib29sIGl0ZXJh dGVMZWZ0ID0gZmFsc2U7CiAgICAgICAgICAgICBib29sIGl0ZXJhdGVSaWdodCA9IGZhbHNlOwot ICAgICAgICAgICAgZnVuY3Rpb24oY3VycmVudCwgaXRlcmF0ZUxlZnQsIGl0ZXJhdGVSaWdodCk7 Ci0gICAgICAgICAgICBpZiAoaXRlcmF0ZUxlZnQgJiYgY3VycmVudC5sZWZ0KCkpCi0gICAgICAg ICAgICAgICAgdG9JdGVyYXRlLmFwcGVuZChjdXJyZW50LmxlZnQoKSk7Ci0gICAgICAgICAgICBp ZiAoaXRlcmF0ZVJpZ2h0ICYmIGN1cnJlbnQucmlnaHQoKSkKLSAgICAgICAgICAgICAgICB0b0l0 ZXJhdGUuYXBwZW5kKGN1cnJlbnQucmlnaHQoKSk7CisgICAgICAgICAgICBmdW5jdGlvbigqY3Vy cmVudC5tX25vZGUsIGl0ZXJhdGVMZWZ0LCBpdGVyYXRlUmlnaHQpOworICAgICAgICAgICAgaWYg KGl0ZXJhdGVMZWZ0ICYmIGN1cnJlbnQubV9ub2RlLT5sZWZ0KCkpCisgICAgICAgICAgICAgICAg dG9JdGVyYXRlLmFwcGVuZCh7IGN1cnJlbnQubV9ub2RlLT5sZWZ0KCkgfSk7CisgICAgICAgICAg ICBpZiAoaXRlcmF0ZVJpZ2h0ICYmIGN1cnJlbnQubV9ub2RlLT5yaWdodCgpKQorICAgICAgICAg ICAgICAgIHRvSXRlcmF0ZS5hcHBlbmQoeyBjdXJyZW50Lm1fbm9kZS0+cmlnaHQoKSB9KTsKICAg ICAgICAgfQogICAgIH0KICAgICAKQEAgLTM4MCwyOSArNDEzLDQxIEBAIHByaXZhdGU6CiAgICAg Ly8gbm9kZS4KICAgICBzdGF0aWMgTm9kZVR5cGUqIHRyZWVNaW5pbXVtKE5vZGVUeXBlKiB4KQog ICAgIHsKLSAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGgg PSAwOworICAgICAgICB3aGlsZSAoeC0+bGVmdCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FT U0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+ bGVmdCgpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KICAgICAKICAgICBz dGF0aWMgTm9kZVR5cGUqIHRyZWVNYXhpbXVtKE5vZGVUeXBlKiB4KQogICAgIHsKLSAgICAgICAg d2hpbGUgKHgtPnJpZ2h0KCkpCisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKKyAgICAgICAg d2hpbGUgKHgtPnJpZ2h0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGgg PD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5yaWdodCgpOworICAg ICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KIAogICAgIHN0YXRpYyBjb25zdCBOb2Rl VHlwZSogdHJlZU1pbmltdW0oY29uc3QgTm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGls ZSAoeC0+bGVmdCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CisgICAgICAgIHdoaWxl ICh4LT5sZWZ0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19t YXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5sZWZ0KCk7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuIHg7CiAgICAgfQogICAgIAogICAgIHN0YXRpYyBjb25zdCBOb2RlVHlw ZSogdHJlZU1heGltdW0oY29uc3QgTm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGlsZSAo eC0+cmlnaHQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAo eC0+cmlnaHQoKSkgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21h eGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgeCA9IHgtPnJpZ2h0KCk7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuIHg7CiAgICAgfQogCkBAIC00MTUsNyArNDYwLDkgQEAgcHJpdmF0ZToK ICAgICAgICAgCiAgICAgICAgIE5vZGVUeXBlKiB5ID0gbnVsbHB0cjsKICAgICAgICAgTm9kZVR5 cGUqIHggPSBtX3Jvb3Q7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgd2hp bGUgKHgpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVt VHJlZURlcHRoKTsKICAgICAgICAgICAgIHkgPSB4OwogICAgICAgICAgICAgaWYgKHotPmtleSgp IDwgeC0+a2V5KCkpCiAgICAgICAgICAgICAgICAgeCA9IHgtPmxlZnQoKTsKQEAgLTUwMiw3ICs1 NDksOSBAQCBwcml2YXRlOgogICAgIC8vIHN1cHBsaWVkLgogICAgIHZvaWQgcmVtb3ZlRml4dXAo Tm9kZVR5cGUqIHgsIE5vZGVUeXBlKiB4UGFyZW50KQogICAgIHsKKyAgICAgICAgdW5zaWduZWQg ZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAoeCAhPSBtX3Jvb3QgJiYgKCF4IHx8IHgtPmNvbG9y KCkgPT0gQmxhY2spKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNf bWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICBpZiAoeCA9PSB4UGFyZW50LT5sZWZ0KCkp IHsKICAgICAgICAgICAgICAgICAvLyBOb3RlOiB0aGUgdGV4dCBwb2ludHMgb3V0IHRoYXQgdyBj YW4gbm90IGJlIG51bGwuCiAgICAgICAgICAgICAgICAgLy8gVGhlIHJlYXNvbiBpcyBub3Qgb2J2 aW91cyBmcm9tIHNpbXBseSBsb29raW5nIGF0Cg== 410592 2020-10-05 17:05:44 -0700 2020-10-06 17:52:19 -0700 Patch bug-217249-20201005170543.patch text/plain 7736 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjA5ZGU0NjJlYTNlY2MyOTk2MTZjMmM2YzhlZTlkYzNiMTA2Y2Vl ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1heGltdW0gZGVwdGggY2hlY2sgdG8gUmVk QmxhY2tUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTcyNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDMyOTU3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGxpbWl0IGFsbCB0cmVlIHRy YXZlcnNhbHMgdG8gMTI4IGxldmVscyBkZWVwLiBUaGF0J3MgYSB2ZXJ5IGNvbnNlcnZhdGl2ZSB1 cHBlciBib3VuZCB0aGF0CisgICAgICAgIHdvdWxkIHdvcmsgZm9yIGEgdHJlZSB0aGF0IHVzZWQg YWxsIG9mIHRoZSBhdmFpbGFibGUgYWRkcmVzcyBzcGFjZS4KKworICAgICAgICAqIHd0Zi9SZWRC bGFja1RyZWUuaDoKKwogMjAyMC0wOS0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O IC8gSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OIHRvIG1ha2UgaG9zdCBmdW5jdGlvbiBkZWZpbml0 aW9uIGVhc3ktdG8tc2Nhbm5lZCBmb3IgSklULWNhZ2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUmVkQmxhY2tUcmVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaAppbmRl eCAyMzY4MGYyNDc3YzZhMTMyNGNmMmIzODIwMTA2MTcxZDhmODkwZjkwLi41MzI4YmIxZGJjMzhh NDJlMjI4NDM3YzU3ZWVmNTA4ODU2NmNmZjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9S ZWRCbGFja1RyZWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaApAQCAtMjks OCArMjksOSBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgor I2luY2x1ZGUgPHd0Zi9Eb3VibHlMaW5rZWRMaXN0Lmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC00Niw2ICs0Nyw4IEBAIGNsYXNzIFJlZEJsYWNr VHJlZSBmaW5hbCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUmVkQmxhY2tUcmVlKTsKICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHByaXZhdGU6CisgICAgc3RhdGljIGNvbnN0ZXhw ciB1bnNpZ25lZCBzX21heGltdW1UcmVlRGVwdGggPSAxMjg7CisKICAgICBlbnVtIENvbG9yIHsK ICAgICAgICAgUmVkID0gMSwKICAgICAgICAgQmxhY2sKQEAgLTYyLDcgKzY1LDkgQEAgcHVibGlj OgogICAgICAgICAgICAgaWYgKHgtPnJpZ2h0KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRy ZWVNaW5pbXVtKHgtPnJpZ2h0KCkpOwogICAgICAgICAgICAgY29uc3QgTm9kZVR5cGUqIHkgPSB4 LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgICAg IHdoaWxlICh5ICYmIHggPT0geS0+cmlnaHQoKSkgeworICAgICAgICAgICAgICAgIFJFTEVBU0Vf QVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgICAgICB4 ID0geTsKICAgICAgICAgICAgICAgICB5ID0geS0+cGFyZW50KCk7CiAgICAgICAgICAgICB9CkBA IC03NSw3ICs4MCw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICh4LT5sZWZ0KCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHRyZWVNYXhpbXVtKHgtPmxlZnQoKSk7CiAgICAgICAgICAgICBj b25zdCBOb2RlVHlwZSogeSA9IHgtPnBhcmVudCgpOworICAgICAgICAgICAgdW5zaWduZWQgZGVw dGggPSAwOwogICAgICAgICAgICAgd2hpbGUgKHkgJiYgeCA9PSB5LT5sZWZ0KCkpIHsKKyAgICAg ICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7 CiAgICAgICAgICAgICAgICAgeCA9IHk7CiAgICAgICAgICAgICAgICAgeSA9IHktPnBhcmVudCgp OwogICAgICAgICAgICAgfQpAQCAtMTYzLDcgKzE3MCw5IEBAIHB1YmxpYzoKICAgICAgICAgdHJl ZUluc2VydCh4KTsKICAgICAgICAgeC0+c2V0Q29sb3IoUmVkKTsKIAorICAgICAgICB1bnNpZ25l ZCBkZXB0aCA9IDA7CiAgICAgICAgIHdoaWxlICh4ICE9IG1fcm9vdCAmJiB4LT5wYXJlbnQoKS0+ Y29sb3IoKSA9PSBSZWQpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0g c19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIGlmICh4LT5wYXJlbnQoKSA9PSB4LT5w YXJlbnQoKS0+cGFyZW50KCktPmxlZnQoKSkgewogICAgICAgICAgICAgICAgIE5vZGVUeXBlKiB5 ID0geC0+cGFyZW50KCktPnBhcmVudCgpLT5yaWdodCgpOwogICAgICAgICAgICAgICAgIGlmICh5 ICYmIHktPmNvbG9yKCkgPT0gUmVkKSB7CkBAIC0yODMsNyArMjkyLDkgQEAgcHVibGljOgogICAg IAogICAgIE5vZGVUeXBlKiBmaW5kRXhhY3QoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAg IHsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICBmb3IgKE5vZGVUeXBlKiBj dXJyZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQo KytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgaWYgKGN1cnJlbnQt PmtleSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3VycmVudDsKICAgICAgICAg ICAgIGlmIChrZXkgPCBjdXJyZW50LT5rZXkoKSkKQEAgLTI5Nyw3ICszMDgsOSBAQCBwdWJsaWM6 CiAgICAgTm9kZVR5cGUqIGZpbmRMZWFzdEdyZWF0ZXJUaGFuT3JFcXVhbChjb25zdCBLZXlUeXBl JiBrZXkpIGNvbnN0CiAgICAgewogICAgICAgICBOb2RlVHlwZSogYmVzdCA9IG51bGxwdHI7Cisg ICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVu dCA9IG1fcm9vdDsgY3VycmVudDspIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVw dGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXko KSA9PSBrZXkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBp ZiAoY3VycmVudC0+a2V5KCkgPCBrZXkpCkBAIC0zMTMsNyArMzI2LDkgQEAgcHVibGljOgogICAg IE5vZGVUeXBlKiBmaW5kR3JlYXRlc3RMZXNzVGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5 KSBjb25zdAogICAgIHsKICAgICAgICAgTm9kZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAg ICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAgICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBt X3Jvb3Q7IGN1cnJlbnQ7KSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9 IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0g a2V5KQogICAgICAgICAgICAgICAgIHJldHVybiBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1 cnJlbnQtPmtleSgpID4ga2V5KQpAQCAtMzMyLDE3ICszNDcsNDYgQEAgcHVibGljOgogICAgICAg ICBpZiAoIW1fcm9vdCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBWZWN0b3I8Tm9k ZVR5cGUqLCAxNj4gdG9JdGVyYXRlOwotICAgICAgICB0b0l0ZXJhdGUuYXBwZW5kKG1fcm9vdCk7 Ci0gICAgICAgIHdoaWxlICh0b0l0ZXJhdGUuc2l6ZSgpKSB7Ci0gICAgICAgICAgICBOb2RlVHlw ZSYgY3VycmVudCA9ICp0b0l0ZXJhdGUudGFrZUxhc3QoKTsKKyAgICAgICAgY2xhc3MgTGlzdE5v ZGUgOiBwdWJsaWMgRG91Ymx5TGlua2VkTGlzdE5vZGU8TGlzdE5vZGU+LCBwdWJsaWMgUmVmQ291 bnRlZDxMaXN0Tm9kZT4geworICAgICAgICBwdWJsaWM6CisgICAgICAgICAgICBMaXN0Tm9kZShO b2RlVHlwZSogcmJOb2RlKQorICAgICAgICAgICAgICAgIDogbV9ub2RlKHJiTm9kZSkKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgTm9kZVR5cGUqIG1fbm9kZTsK KyAgICAgICAgICAgIExpc3ROb2RlKiBtX3ByZXY7CisgICAgICAgICAgICBMaXN0Tm9kZSogbV9u ZXh0OworICAgICAgICB9OworCisgICAgICAgIERvdWJseUxpbmtlZExpc3Q8TGlzdE5vZGU+IHRv SXRlcmF0ZTsKKyAgICAgICAgVmVjdG9yPFJlZjxMaXN0Tm9kZT4sIDE2PiBob2xkZXI7CisgICAg ICAgIE5vZGVUeXBlKiBtYXJrZXIgPSByZWludGVycHJldF9jYXN0PE5vZGVUeXBlKj4oc3RkOjpu dW1lcmljX2xpbWl0czx1aW50cHRyX3Q+OjptYXgoKSk7CisgICAgICAgIHVuc2lnbmVkIGRlcHRo ID0gMDsKKworICAgICAgICBhdXRvIGFwcGVuZCA9IFsmXShOb2RlVHlwZSogbm9kZSkgeworICAg ICAgICAgICAgYXV0byByZWYgPSBhZG9wdFJlZigqbmV3IExpc3ROb2RlIHsgbm9kZSB9KTsKKyAg ICAgICAgICAgIHRvSXRlcmF0ZS5hcHBlbmQocmVmLnB0cigpKTsKKyAgICAgICAgICAgIGhvbGRl ci5hcHBlbmQoV1RGTW92ZShyZWYpKTsKKyAgICAgICAgfTsKKworICAgICAgICBhcHBlbmQobV9y b290KTsKKyAgICAgICAgYXBwZW5kKG1hcmtlcik7CisgICAgICAgIHdoaWxlICghdG9JdGVyYXRl LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgTGlzdE5vZGUmIGN1cnJlbnQgPSAqdG9JdGVyYXRl LnJlbW92ZUhlYWQoKTsKKyAgICAgICAgICAgIGlmIChjdXJyZW50Lm1fbm9kZSA9PSBtYXJrZXIp IHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRy ZWVEZXB0aCk7CisgICAgICAgICAgICAgICAgaWYgKCF0b0l0ZXJhdGUuaXNFbXB0eSgpKQorICAg ICAgICAgICAgICAgICAgICBhcHBlbmQobWFya2VyKTsKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJvb2wgaXRlcmF0ZUxlZnQgPSBmYWxzZTsK ICAgICAgICAgICAgIGJvb2wgaXRlcmF0ZVJpZ2h0ID0gZmFsc2U7Ci0gICAgICAgICAgICBmdW5j dGlvbihjdXJyZW50LCBpdGVyYXRlTGVmdCwgaXRlcmF0ZVJpZ2h0KTsKLSAgICAgICAgICAgIGlm IChpdGVyYXRlTGVmdCAmJiBjdXJyZW50LmxlZnQoKSkKLSAgICAgICAgICAgICAgICB0b0l0ZXJh dGUuYXBwZW5kKGN1cnJlbnQubGVmdCgpKTsKLSAgICAgICAgICAgIGlmIChpdGVyYXRlUmlnaHQg JiYgY3VycmVudC5yaWdodCgpKQotICAgICAgICAgICAgICAgIHRvSXRlcmF0ZS5hcHBlbmQoY3Vy cmVudC5yaWdodCgpKTsKKyAgICAgICAgICAgIGZ1bmN0aW9uKCpjdXJyZW50Lm1fbm9kZSwgaXRl cmF0ZUxlZnQsIGl0ZXJhdGVSaWdodCk7CisgICAgICAgICAgICBpZiAoaXRlcmF0ZUxlZnQgJiYg Y3VycmVudC5tX25vZGUtPmxlZnQoKSkKKyAgICAgICAgICAgICAgICBhcHBlbmQoY3VycmVudC5t X25vZGUtPmxlZnQoKSk7CisgICAgICAgICAgICBpZiAoaXRlcmF0ZVJpZ2h0ICYmIGN1cnJlbnQu bV9ub2RlLT5yaWdodCgpKQorICAgICAgICAgICAgICAgIGFwcGVuZChjdXJyZW50Lm1fbm9kZS0+ cmlnaHQoKSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgCkBAIC0zODAsMjkgKzQyNCw0MSBAQCBw cml2YXRlOgogICAgIC8vIG5vZGUuCiAgICAgc3RhdGljIE5vZGVUeXBlKiB0cmVlTWluaW11bShO b2RlVHlwZSogeCkKICAgICB7Ci0gICAgICAgIHdoaWxlICh4LT5sZWZ0KCkpCisgICAgICAgIHVu c2lnbmVkIGRlcHRoID0gMDsKKyAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkgeworICAgICAgICAg ICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAg ICAgICAgeCA9IHgtPmxlZnQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4geDsKICAgICB9 CiAgICAgCiAgICAgc3RhdGljIE5vZGVUeXBlKiB0cmVlTWF4aW11bShOb2RlVHlwZSogeCkKICAg ICB7Ci0gICAgICAgIHdoaWxlICh4LT5yaWdodCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0aCA9 IDA7CisgICAgICAgIHdoaWxlICh4LT5yaWdodCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FT U0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+ cmlnaHQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4geDsKICAgICB9CiAKICAgICBzdGF0 aWMgY29uc3QgTm9kZVR5cGUqIHRyZWVNaW5pbXVtKGNvbnN0IE5vZGVUeXBlKiB4KQogICAgIHsK LSAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwor ICAgICAgICB3aGlsZSAoeC0+bGVmdCgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgr K2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB4ID0geC0+bGVmdCgp OworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KICAgICAKICAgICBzdGF0aWMg Y29uc3QgTm9kZVR5cGUqIHRyZWVNYXhpbXVtKGNvbnN0IE5vZGVUeXBlKiB4KQogICAgIHsKLSAg ICAgICAgd2hpbGUgKHgtPnJpZ2h0KCkpCisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKKyAg ICAgICAgd2hpbGUgKHgtPnJpZ2h0KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsr ZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5yaWdodCgp OworICAgICAgICB9CiAgICAgICAgIHJldHVybiB4OwogICAgIH0KIApAQCAtNDE1LDcgKzQ3MSw5 IEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAgICBOb2RlVHlwZSogeSA9IG51bGxwdHI7CiAg ICAgICAgIE5vZGVUeXBlKiB4ID0gbV9yb290OworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7 CiAgICAgICAgIHdoaWxlICh4KSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRo IDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAgICB5ID0geDsKICAgICAgICAgICAg IGlmICh6LT5rZXkoKSA8IHgtPmtleSgpKQogICAgICAgICAgICAgICAgIHggPSB4LT5sZWZ0KCk7 CkBAIC01MDIsNyArNTYwLDkgQEAgcHJpdmF0ZToKICAgICAvLyBzdXBwbGllZC4KICAgICB2b2lk IHJlbW92ZUZpeHVwKE5vZGVUeXBlKiB4LCBOb2RlVHlwZSogeFBhcmVudCkKICAgICB7CisgICAg ICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgd2hpbGUgKHggIT0gbV9yb290ICYmICgh eCB8fCB4LT5jb2xvcigpID09IEJsYWNrKSkgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQo KytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgaWYgKHggPT0geFBh cmVudC0+bGVmdCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gTm90ZTogdGhlIHRleHQgcG9pbnRz IG91dCB0aGF0IHcgY2FuIG5vdCBiZSBudWxsLgogICAgICAgICAgICAgICAgIC8vIFRoZSByZWFz b24gaXMgbm90IG9idmlvdXMgZnJvbSBzaW1wbHkgbG9va2luZyBhdAo= 410720 2020-10-06 17:52:20 -0700 2020-10-07 11:05:14 -0700 Patch bug-217249-20201006175219.patch text/plain 5928 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0NjhkNGFhMmI1ZTUxYTA4NTc0NGQ3 ZmRlODVkMDEzNzliY2I5MDAuLjA5ZGU0NjJlYTNlY2MyOTk2MTZjMmM2YzhlZTlkYzNiMTA2Y2Vl ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMDIgIFRhZGV1IFphZ2FsbG8gIDx0emFn YWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1heGltdW0gZGVwdGggY2hlY2sgdG8gUmVk QmxhY2tUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTcyNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5NDMyOTU3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGxpbWl0IGFsbCB0cmVlIHRy YXZlcnNhbHMgdG8gMTI4IGxldmVscyBkZWVwLiBUaGF0J3MgYSB2ZXJ5IGNvbnNlcnZhdGl2ZSB1 cHBlciBib3VuZCB0aGF0CisgICAgICAgIHdvdWxkIHdvcmsgZm9yIGEgdHJlZSB0aGF0IHVzZWQg YWxsIG9mIHRoZSBhdmFpbGFibGUgYWRkcmVzcyBzcGFjZS4KKworICAgICAgICAqIHd0Zi9SZWRC bGFja1RyZWUuaDoKKwogMjAyMC0wOS0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O IC8gSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OIHRvIG1ha2UgaG9zdCBmdW5jdGlvbiBkZWZpbml0 aW9uIGVhc3ktdG8tc2Nhbm5lZCBmb3IgSklULWNhZ2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUmVkQmxhY2tUcmVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaAppbmRl eCAyMzY4MGYyNDc3YzZhMTMyNGNmMmIzODIwMTA2MTcxZDhmODkwZjkwLi5jZjRhNDlkNTI4N2Fk Nzc4ZTJiZDUzMTIyYTgzMjkyY2Q4MmJmOWQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9S ZWRCbGFja1RyZWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9SZWRCbGFja1RyZWUuaApAQCAtNDYs NiArNDYsOCBAQCBjbGFzcyBSZWRCbGFja1RyZWUgZmluYWwgewogICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKFJlZEJsYWNrVHJlZSk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwcml2 YXRlOgorICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19tYXhpbXVtVHJlZURlcHRoID0g MTI4OworCiAgICAgZW51bSBDb2xvciB7CiAgICAgICAgIFJlZCA9IDEsCiAgICAgICAgIEJsYWNr CkBAIC02Miw3ICs2NCw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICh4LT5yaWdodCgpKQog ICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWluaW11bSh4LT5yaWdodCgpKTsKICAgICAgICAg ICAgIGNvbnN0IE5vZGVUeXBlKiB5ID0geC0+cGFyZW50KCk7CisgICAgICAgICAgICB1bnNpZ25l ZCBkZXB0aCA9IDA7CiAgICAgICAgICAgICB3aGlsZSAoeSAmJiB4ID09IHktPnJpZ2h0KCkpIHsK KyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVE ZXB0aCk7CiAgICAgICAgICAgICAgICAgeCA9IHk7CiAgICAgICAgICAgICAgICAgeSA9IHktPnBh cmVudCgpOwogICAgICAgICAgICAgfQpAQCAtNzUsNyArNzksOSBAQCBwdWJsaWM6CiAgICAgICAg ICAgICBpZiAoeC0+bGVmdCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cmVlTWF4aW11bSh4 LT5sZWZ0KCkpOwogICAgICAgICAgICAgY29uc3QgTm9kZVR5cGUqIHkgPSB4LT5wYXJlbnQoKTsK KyAgICAgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsKICAgICAgICAgICAgIHdoaWxlICh5ICYm IHggPT0geS0+bGVmdCgpKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0 aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgICAgIHggPSB5OwogICAgICAg ICAgICAgICAgIHkgPSB5LT5wYXJlbnQoKTsKICAgICAgICAgICAgIH0KQEAgLTE2Myw3ICsxNjks OSBAQCBwdWJsaWM6CiAgICAgICAgIHRyZWVJbnNlcnQoeCk7CiAgICAgICAgIHgtPnNldENvbG9y KFJlZCk7CiAKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAoeCAh PSBtX3Jvb3QgJiYgeC0+cGFyZW50KCktPmNvbG9yKCkgPT0gUmVkKSB7CisgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAg ICBpZiAoeC0+cGFyZW50KCkgPT0geC0+cGFyZW50KCktPnBhcmVudCgpLT5sZWZ0KCkpIHsKICAg ICAgICAgICAgICAgICBOb2RlVHlwZSogeSA9IHgtPnBhcmVudCgpLT5wYXJlbnQoKS0+cmlnaHQo KTsKICAgICAgICAgICAgICAgICBpZiAoeSAmJiB5LT5jb2xvcigpID09IFJlZCkgewpAQCAtMjgz LDcgKzI5MSw5IEBAIHB1YmxpYzoKICAgICAKICAgICBOb2RlVHlwZSogZmluZEV4YWN0KGNvbnN0 IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGRlcHRoID0gMDsK ICAgICAgICAgZm9yIChOb2RlVHlwZSogY3VycmVudCA9IG1fcm9vdDsgY3VycmVudDspIHsKKyAg ICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsK ICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA9PSBrZXkpCiAgICAgICAgICAgICAgICAg cmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgICAgICBpZiAoa2V5IDwgY3VycmVudC0+a2V5KCkpCkBA IC0yOTcsNyArMzA3LDkgQEAgcHVibGljOgogICAgIE5vZGVUeXBlKiBmaW5kTGVhc3RHcmVhdGVy VGhhbk9yRXF1YWwoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsKICAgICAgICAgTm9k ZVR5cGUqIGJlc3QgPSBudWxscHRyOworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAg ICAgIGZvciAoTm9kZVR5cGUqIGN1cnJlbnQgPSBtX3Jvb3Q7IGN1cnJlbnQ7KSB7CisgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAg ICAgICAgICBpZiAoY3VycmVudC0+a2V5KCkgPT0ga2V5KQogICAgICAgICAgICAgICAgIHJldHVy biBjdXJyZW50OwogICAgICAgICAgICAgaWYgKGN1cnJlbnQtPmtleSgpIDwga2V5KQpAQCAtMzEz LDcgKzMyNSw5IEBAIHB1YmxpYzoKICAgICBOb2RlVHlwZSogZmluZEdyZWF0ZXN0TGVzc1RoYW5P ckVxdWFsKGNvbnN0IEtleVR5cGUmIGtleSkgY29uc3QKICAgICB7CiAgICAgICAgIE5vZGVUeXBl KiBiZXN0ID0gbnVsbHB0cjsKKyAgICAgICAgdW5zaWduZWQgZGVwdGggPSAwOwogICAgICAgICBm b3IgKE5vZGVUeXBlKiBjdXJyZW50ID0gbV9yb290OyBjdXJyZW50OykgeworICAgICAgICAgICAg UkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAg ICAgaWYgKGN1cnJlbnQtPmtleSgpID09IGtleSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3Vy cmVudDsKICAgICAgICAgICAgIGlmIChjdXJyZW50LT5rZXkoKSA+IGtleSkKQEAgLTMzMyw4ICsz NDcsMTAgQEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIFZlY3RvcjxO b2RlVHlwZSosIDE2PiB0b0l0ZXJhdGU7CisgICAgICAgIHVuc2lnbmVkIHNpemUgPSAwOwogICAg ICAgICB0b0l0ZXJhdGUuYXBwZW5kKG1fcm9vdCk7CiAgICAgICAgIHdoaWxlICh0b0l0ZXJhdGUu c2l6ZSgpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgrK3NpemUgPCBzdGQ6Om51bWVy aWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpOwogICAgICAgICAgICAgTm9kZVR5cGUmIGN1cnJl bnQgPSAqdG9JdGVyYXRlLnRha2VMYXN0KCk7CiAgICAgICAgICAgICBib29sIGl0ZXJhdGVMZWZ0 ID0gZmFsc2U7CiAgICAgICAgICAgICBib29sIGl0ZXJhdGVSaWdodCA9IGZhbHNlOwpAQCAtMzgw LDI5ICszOTYsNDEgQEAgcHJpdmF0ZToKICAgICAvLyBub2RlLgogICAgIHN0YXRpYyBOb2RlVHlw ZSogdHJlZU1pbmltdW0oTm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGlsZSAoeC0+bGVm dCgpKQorICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CisgICAgICAgIHdoaWxlICh4LT5sZWZ0 KCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJl ZURlcHRoKTsKICAgICAgICAgICAgIHggPSB4LT5sZWZ0KCk7CisgICAgICAgIH0KICAgICAgICAg cmV0dXJuIHg7CiAgICAgfQogICAgIAogICAgIHN0YXRpYyBOb2RlVHlwZSogdHJlZU1heGltdW0o Tm9kZVR5cGUqIHgpCiAgICAgewotICAgICAgICB3aGlsZSAoeC0+cmlnaHQoKSkKKyAgICAgICAg dW5zaWduZWQgZGVwdGggPSAwOworICAgICAgICB3aGlsZSAoeC0+cmlnaHQoKSkgeworICAgICAg ICAgICAgUkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAg ICAgICAgICAgeCA9IHgtPnJpZ2h0KCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHg7CiAg ICAgfQogCiAgICAgc3RhdGljIGNvbnN0IE5vZGVUeXBlKiB0cmVlTWluaW11bShjb25zdCBOb2Rl VHlwZSogeCkKICAgICB7Ci0gICAgICAgIHdoaWxlICh4LT5sZWZ0KCkpCisgICAgICAgIHVuc2ln bmVkIGRlcHRoID0gMDsKKyAgICAgICAgd2hpbGUgKHgtPmxlZnQoKSkgeworICAgICAgICAgICAg UkVMRUFTRV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAg ICAgeCA9IHgtPmxlZnQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4geDsKICAgICB9CiAg ICAgCiAgICAgc3RhdGljIGNvbnN0IE5vZGVUeXBlKiB0cmVlTWF4aW11bShjb25zdCBOb2RlVHlw ZSogeCkKICAgICB7Ci0gICAgICAgIHdoaWxlICh4LT5yaWdodCgpKQorICAgICAgICB1bnNpZ25l ZCBkZXB0aCA9IDA7CisgICAgICAgIHdoaWxlICh4LT5yaWdodCgpKSB7CisgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVCgrK2RlcHRoIDw9IHNfbWF4aW11bVRyZWVEZXB0aCk7CiAgICAgICAgICAg ICB4ID0geC0+cmlnaHQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4geDsKICAgICB9CiAK QEAgLTQxNSw3ICs0NDMsOSBAQCBwcml2YXRlOgogICAgICAgICAKICAgICAgICAgTm9kZVR5cGUq IHkgPSBudWxscHRyOwogICAgICAgICBOb2RlVHlwZSogeCA9IG1fcm9vdDsKKyAgICAgICAgdW5z aWduZWQgZGVwdGggPSAwOwogICAgICAgICB3aGlsZSAoeCkgeworICAgICAgICAgICAgUkVMRUFT RV9BU1NFUlQoKytkZXB0aCA8PSBzX21heGltdW1UcmVlRGVwdGgpOwogICAgICAgICAgICAgeSA9 IHg7CiAgICAgICAgICAgICBpZiAoei0+a2V5KCkgPCB4LT5rZXkoKSkKICAgICAgICAgICAgICAg ICB4ID0geC0+bGVmdCgpOwpAQCAtNTAyLDcgKzUzMiw5IEBAIHByaXZhdGU6CiAgICAgLy8gc3Vw cGxpZWQuCiAgICAgdm9pZCByZW1vdmVGaXh1cChOb2RlVHlwZSogeCwgTm9kZVR5cGUqIHhQYXJl bnQpCiAgICAgeworICAgICAgICB1bnNpZ25lZCBkZXB0aCA9IDA7CiAgICAgICAgIHdoaWxlICh4 ICE9IG1fcm9vdCAmJiAoIXggfHwgeC0+Y29sb3IoKSA9PSBCbGFjaykpIHsKKyAgICAgICAgICAg IFJFTEVBU0VfQVNTRVJUKCsrZGVwdGggPD0gc19tYXhpbXVtVHJlZURlcHRoKTsKICAgICAgICAg ICAgIGlmICh4ID09IHhQYXJlbnQtPmxlZnQoKSkgewogICAgICAgICAgICAgICAgIC8vIE5vdGU6 IHRoZSB0ZXh0IHBvaW50cyBvdXQgdGhhdCB3IGNhbiBub3QgYmUgbnVsbC4KICAgICAgICAgICAg ICAgICAvLyBUaGUgcmVhc29uIGlzIG5vdCBvYnZpb3VzIGZyb20gc2ltcGx5IGxvb2tpbmcgYXQK