205061 2019-12-10 07:34:36 -0800 Remove debug ASSERT in PeerConnectionBackend 2019-12-12 00:49:24 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1597172 0 youennf 2019-12-10 07:34:36 -0800 Now that we no longer stop the pc when closing it, we should remove debug ASSERT in PeerConnectionBackend 1597174 1 385259 youennf 2019-12-10 07:44:40 -0800 Created attachment 385259 Patch 1597530 2 385357 youennf 2019-12-10 23:11:04 -0800 Created attachment 385357 Patch 1597954 3 385357 commit-queue 2019-12-12 00:48:15 -0800 Comment on attachment 385357 Patch Clearing flags on attachment: 385357 Committed r253422: <https://trac.webkit.org/changeset/253422> 1597955 4 commit-queue 2019-12-12 00:48:16 -0800 All reviewed patches have been landed. Closing bug. 1597956 5 webkit-bug-importer 2019-12-12 00:49:24 -0800 <rdar://problem/57870071> 385259 2019-12-10 07:44:40 -0800 2019-12-10 23:11:00 -0800 Patch bug-205061-20191210164439.patch text/plain 8545 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNjNjIwZDdmZDllZGYw NTNhZDM3NjczMDk1NGIzMTMyN2I4NTg2MC4uYTc4ODFmNDkzNmJmNmFhMTI3ODFjNjNkMmYxYzg2 MmQ4Mzk3ZmUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTEyLTEwICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZGVidWcgQVNT RVJUIGluIFBlZXJDb25uZWN0aW9uQmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MDYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHR3byB3cm9uZyBkZWJ1ZyBhc3NlcnRzLgorICAg ICAgICBNb3ZlIHRoZSBpc0Nsb3NlZCBjaGVjayBqdXN0IGJlZm9yZSByZXNvbHZpbmcvcmVqZWN0 aW5nIHRoZSBwcm9taXNlIHNpbmNlIGF0IHJlc3VtZSB0aW1lLCBhIGxvdCBtaWdodCBoYXBwZW4s CisgICAgICAgIGluY2x1ZGluZyBjbG9zaW5nIHRoZSBwZWVyIGNvbm5lY3Rpb24uCisgICAgICAg IENvdmVyZWQgYnkgdGVzdHMgbm8gbG9uZ2VyIGNyYXNoaW5nLgorCisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpjcmVhdGVPZmZlclN1Y2NlZWRlZCk6CisgICAgICAg IChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmNyZWF0ZU9mZmVyRmFpbGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRlQW5zd2VyU3VjY2Vl ZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRlQW5z d2VyRmFpbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6c2V0 TG9jYWxEZXNjcmlwdGlvblN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVj dGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRpb25GYWlsZWQpOgorICAgICAgICAoV2ViQ29y ZTo6UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpzZXRSZW1vdGVEZXNjcmlwdGlvblN1Y2NlZWRlZCk6 CisgICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldFJlbW90ZURlc2Ny aXB0aW9uRmFpbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6 YWRkSWNlQ2FuZGlkYXRlU3VjY2VlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0 aW9uQmFja2VuZDo6YWRkSWNlQ2FuZGlkYXRlRmFpbGVkKToKKwogMjAxOS0xMi0xMCAgeW91ZW5u IGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSFRNTE1lZGlhRWxlbWVudCB0 aW1lci1iYXNlZCBlbnF1ZXVlaW5nIHNob3VsZCByZXNwZWN0IHBhZ2UgY2FjaGUgc3VzcGVuZC9y ZXN1bWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVl ckNvbm5lY3Rpb25CYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAppbmRleCAwNzM4ZGI0Yjc3NWQ3NWQyZDFlOTgy ZGEwMDVlOGU4N2JjMWFkY2IzLi4xNDdmYTgzMzZkYWFmNDMyYmY3NzA0ZjFhMzZlMDFmZWE0ZTYy Y2I5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJD b25uZWN0aW9uQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCkBAIC05OSwxMSArOTksMTEgQEAgdm9pZCBQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmNyZWF0ZU9mZmVyU3VjY2VlZGVkKFN0cmluZyYmIHNkcCkK ICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF UiwgIkNyZWF0ZSBvZmZlciBzdWNjZWVkZWQ6XG4iLCBzZHApOwogCi0gICAgaWYgKG1fcGVlckNv bm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNTRVJUKG1fb2Zm ZXJBbnN3ZXJQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9 IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBmaWx0ZXJTRFAoV1RGTW92ZShz ZHApKV0oKSBtdXRhYmxlIHsKKyAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbdGhpcywgcHJv bWlzZSA9IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBmaWx0ZXJTRFAoV1RG TW92ZShzZHApKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXND bG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNlLT5yZXNvbHZl KFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6SW5pdCB7IFJUQ1NkcFR5cGU6Ok9mZmVyLCBzZHAgfSk7 CiAgICAgfSk7CiB9CkBAIC0xMTMsMTEgKzExMywxMSBAQCB2b2lkIFBlZXJDb25uZWN0aW9uQmFj a2VuZDo6Y3JlYXRlT2ZmZXJGYWlsZWQoRXhjZXB0aW9uJiYgZXhjZXB0aW9uKQogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiQ3JlYXRl IG9mZmVyIGZhaWxlZDoiLCBleGNlcHRpb24ubWVzc2FnZSgpKTsKIAotICAgIGlmIChtX3BlZXJD b25uZWN0aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIEFTU0VSVChtX29m ZmVyQW5zd2VyUHJvbWlzZSk7Ci0gICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Byb21pc2Ug PSBXVEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNl cHRpb24pXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBw cm9taXNlID0gV1RGTW92ZShtX29mZmVyQW5zd2VyUHJvbWlzZSksIGV4Y2VwdGlvbiA9IFdURk1v dmUoZXhjZXB0aW9uKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5lY3Rpb24u aXNDbG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNlLT5yZWpl Y3QoV1RGTW92ZShleGNlcHRpb24pKTsKICAgICB9KTsKIH0KQEAgLTEzNiwxMSArMTM2LDExIEBA IHZvaWQgUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpjcmVhdGVBbnN3ZXJTdWNjZWVkZWQoU3RyaW5n JiYgc2RwKQogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJ REVOVElGSUVSLCAiQ3JlYXRlIGFuc3dlciBzdWNjZWVkZWQ6XG4iLCBzZHApOwogCi0gICAgaWYg KG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNT RVJUKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhb cHJvbWlzZSA9IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBXVEZNb3ZlKHNk cCldKCkgbXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3RoaXMsIHByb21p c2UgPSBXVEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgc2RwID0gV1RGTW92ZShzZHApXSgp IG11dGFibGUgeworICAgICAgICBpZiAobV9wZWVyQ29ubmVjdGlvbi5pc0Nsb3NlZCgpKQorICAg ICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHByb21pc2UtPnJlc29sdmUoUlRDU2Vzc2lvbkRl c2NyaXB0aW9uOjpJbml0IHsgUlRDU2RwVHlwZTo6QW5zd2VyLCBzZHAgfSk7CiAgICAgfSk7CiB9 CkBAIC0xNTAsMTEgKzE1MCwxMSBAQCB2b2lkIFBlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRl QW5zd2VyRmFpbGVkKEV4Y2VwdGlvbiYmIGV4Y2VwdGlvbikKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIkNyZWF0ZSBhbnN3ZXIgZmFp bGVkOiIsIGV4Y2VwdGlvbi5tZXNzYWdlKCkpOwogCi0gICAgaWYgKG1fcGVlckNvbm5lY3Rpb24u aXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNTRVJUKG1fb2ZmZXJBbnN3ZXJQ cm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUo bV9vZmZlckFuc3dlclByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkg bXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3RoaXMsIHByb21pc2UgPSBX VEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNlcHRp b24pXSgpIG11dGFibGUgeworICAgICAgICBpZiAobV9wZWVyQ29ubmVjdGlvbi5pc0Nsb3NlZCgp KQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHByb21pc2UtPnJlamVjdChXVEZNb3Zl KGV4Y2VwdGlvbikpOwogICAgIH0pOwogfQpAQCAtMTk2LDEyICsxOTYsMTEgQEAgdm9pZCBQZWVy Q29ubmVjdGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRpb25TdWNjZWVkZWQoKQogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKIAot ICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJldHVybjsKLQot CiAgICAgQVNTRVJUKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0 aW9uLmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUobV9zZXREZXNjcmlwdGlvblByb21pc2UpXSgp IG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBwcm9taXNlID0g V1RGTW92ZShtX3NldERlc2NyaXB0aW9uUHJvbWlzZSldKCkgbXV0YWJsZSB7CisgICAgICAgIGlm IChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAgICByZXR1cm47CisKICAg ICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOwogICAgIH0pOwogfQpAQCAtMjExLDExICsyMTAsMTEg QEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRpb25GYWlsZWQo RXhjZXB0aW9uJiYgZXhjZXB0aW9uKQogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAg QUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiU2V0IGxvY2FsIGRlc2NyaXB0aW9uIGZhaWxlZDoi LCBleGNlcHRpb24ubWVzc2FnZSgpKTsKIAotICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xv c2VkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIEFTU0VSVChtX3NldERlc2NyaXB0aW9uUHJv bWlzZSk7Ci0gICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Byb21pc2UgPSBXVEZNb3ZlKG1f c2V0RGVzY3JpcHRpb25Qcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNlcHRpb24pXSgp IG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBwcm9taXNlID0g V1RGTW92ZShtX3NldERlc2NyaXB0aW9uUHJvbWlzZSksIGV4Y2VwdGlvbiA9IFdURk1vdmUoZXhj ZXB0aW9uKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXNDbG9z ZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNlLT5yZWplY3QoV1RG TW92ZShleGNlcHRpb24pKTsKICAgICB9KTsKIH0KQEAgLTI1Nyw4ICsyNTYsNyBAQCB2b2lkIFBl ZXJDb25uZWN0aW9uQmFja2VuZDo6c2V0UmVtb3RlRGVzY3JpcHRpb25TdWNjZWVkZWQoKQogICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAi U2V0IHJlbW90ZSBkZXNjcmlwdGlvbiBzdWNjZWVkZWQiKTsKIAotICAgIEFTU0VSVCghbV9wZWVy Q29ubmVjdGlvbi5pc0Nsb3NlZCgpKTsKLQorICAgIGF1dG8gcHJvbWlzZSA9IFdURk1vdmUobV9z ZXREZXNjcmlwdGlvblByb21pc2UpOwogICAgIGF1dG8gZXZlbnRzID0gV1RGTW92ZShtX3BlbmRp bmdUcmFja0V2ZW50cyk7CiAgICAgZm9yIChhdXRvJiBldmVudCA6IGV2ZW50cykgewogICAgICAg ICBhdXRvJiB0cmFjayA9IGV2ZW50LnRyYWNrLmdldCgpOwpAQCAtMjcyLDEyICsyNzAsMTEgQEAg dm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldFJlbW90ZURlc2NyaXB0aW9uU3VjY2VlZGVk KCkKICAgICAgICAgdHJhY2suc291cmNlKCkuc2V0TXV0ZWQoZmFsc2UpOwogICAgIH0KIAotICAg IGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJldHVybjsKLQotCiAg ICAgQVNTRVJUKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9u LmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUobV9zZXREZXNjcmlwdGlvblByb21pc2UpXSgpIG11 dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBwcm9taXNlID0gV1RG TW92ZShwcm9taXNlKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5lY3Rpb24u aXNDbG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNlLT5yZXNv bHZlKCk7CiAgICAgfSk7CiB9CkBAIC0yOTAsOSArMjg3LDExIEBAIHZvaWQgUGVlckNvbm5lY3Rp b25CYWNrZW5kOjpzZXRSZW1vdGVEZXNjcmlwdGlvbkZhaWxlZChFeGNlcHRpb24mJiBleGNlcHRp b24pCiAgICAgQVNTRVJUKG1fcGVuZGluZ1RyYWNrRXZlbnRzLmlzRW1wdHkoKSk7CiAgICAgbV9w ZW5kaW5nVHJhY2tFdmVudHMuY2xlYXIoKTsKIAotICAgIEFTU0VSVCghbV9wZWVyQ29ubmVjdGlv bi5pc0Nsb3NlZCgpKTsKICAgICBBU1NFUlQobV9zZXREZXNjcmlwdGlvblByb21pc2UpOwotICAg IG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFtwcm9taXNlID0gV1RGTW92ZShtX3NldERlc2NyaXB0 aW9uUHJvbWlzZSksIGV4Y2VwdGlvbiA9IFdURk1vdmUoZXhjZXB0aW9uKV0oKSBtdXRhYmxlIHsK KyAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbdGhpcywgcHJvbWlzZSA9IFdURk1vdmUobV9z ZXREZXNjcmlwdGlvblByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkg bXV0YWJsZSB7CisgICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAg ICAgICAgICByZXR1cm47CisKICAgICAgICAgcHJvbWlzZS0+cmVqZWN0KFdURk1vdmUoZXhjZXB0 aW9uKSk7CiAgICAgfSk7CiB9CkBAIC0zMzcsMTEgKzMzNiwxMSBAQCB2b2lkIFBlZXJDb25uZWN0 aW9uQmFja2VuZDo6YWRkSWNlQ2FuZGlkYXRlU3VjY2VlZGVkKCkKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIkFkZGluZyBpY2UgY2Fu ZGlkYXRlIHN1Y2NlZWRlZCIpOwogCi0gICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQo KSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNTRVJUKG1fYWRkSWNlQ2FuZGlkYXRlUHJvbWlz ZSk7Ci0gICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Byb21pc2UgPSBXVEZNb3ZlKG1fYWRk SWNlQ2FuZGlkYXRlUHJvbWlzZSldKCkgbXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5k b1Rhc2soW3RoaXMsIHByb21pc2UgPSBXVEZNb3ZlKG1fYWRkSWNlQ2FuZGlkYXRlUHJvbWlzZSld KCkgbXV0YWJsZSB7CisgICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisg ICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOwogICAgIH0p OwogfQpAQCAtMzUxLDExICszNTAsMTEgQEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFk ZEljZUNhbmRpZGF0ZUZhaWxlZChFeGNlcHRpb24mJiBleGNlcHRpb24pCiAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJBZGRpbmcgaWNl IGNhbmRpZGF0ZSBmYWlsZWQ6IiwgZXhjZXB0aW9uLm1lc3NhZ2UoKSk7CiAKLSAgICBpZiAobV9w ZWVyQ29ubmVjdGlvbi5pc0Nsb3NlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBBU1NFUlQo bV9hZGRJY2VDYW5kaWRhdGVQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhb cHJvbWlzZSA9IFdURk1vdmUobV9hZGRJY2VDYW5kaWRhdGVQcm9taXNlKSwgZXhjZXB0aW9uID0g V1RGTW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9U YXNrKFt0aGlzLCBwcm9taXNlID0gV1RGTW92ZShtX2FkZEljZUNhbmRpZGF0ZVByb21pc2UpLCBl eGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkgbXV0YWJsZSB7CisgICAgICAgIGlmICht X3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAg ICAgcHJvbWlzZS0+cmVqZWN0KFdURk1vdmUoZXhjZXB0aW9uKSk7CiAgICAgfSk7CiB9Cg== 385357 2019-12-10 23:11:04 -0800 2019-12-12 00:48:15 -0800 Patch bug-205061-20191211081103.patch text/plain 8536 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmExNmI0NDBhZDQ5N2Fl NWE2ZjRhY2I4MTJhYzc5NjlkMTc0ZmM3My4uMTFhMzVmZmU1ODExZmNlZDA0NTgwNDk4ZmRiYjUz MWM2YjM0ZGU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTEyLTEwICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZGVidWcgQVNT RVJUIGluIFBlZXJDb25uZWN0aW9uQmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MDYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHR3byB3cm9uZyBkZWJ1ZyBhc3NlcnRzLgorICAg ICAgICBNb3ZlIHRoZSBpc0Nsb3NlZCBjaGVjayBqdXN0IGJlZm9yZSByZXNvbHZpbmcvcmVqZWN0 aW5nIHRoZSBwcm9taXNlIHNpbmNlIGF0IHJlc3VtZSB0aW1lLCBhIGxvdCBtaWdodCBoYXBwZW4s CisgICAgICAgIGluY2x1ZGluZyBjbG9zaW5nIHRoZSBwZWVyIGNvbm5lY3Rpb24uCisgICAgICAg IENvdmVyZWQgYnkgdGVzdHMgbm8gbG9uZ2VyIGNyYXNoaW5nLgorCisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpjcmVhdGVPZmZlclN1Y2NlZWRlZCk6CisgICAgICAg IChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmNyZWF0ZU9mZmVyRmFpbGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRlQW5zd2VyU3VjY2Vl ZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRlQW5z d2VyRmFpbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6c2V0 TG9jYWxEZXNjcmlwdGlvblN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVj dGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRpb25GYWlsZWQpOgorICAgICAgICAoV2ViQ29y ZTo6UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpzZXRSZW1vdGVEZXNjcmlwdGlvblN1Y2NlZWRlZCk6 CisgICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldFJlbW90ZURlc2Ny aXB0aW9uRmFpbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6 YWRkSWNlQ2FuZGlkYXRlU3VjY2VlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0 aW9uQmFja2VuZDo6YWRkSWNlQ2FuZGlkYXRlRmFpbGVkKToKKwogMjAxOS0xMi0xMCAgQ2F0aGll IENoZW4gIDxjYXRoaWVjaGVuQGlnYWxpYS5jb20+CiAKICAgICAgICAgRml4ZWQgUGF0dGVybi5o IGNvbXBpbGUgZXJyb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAppbmRleCAwNzM4ZGI0Yjc3NWQ3 NWQyZDFlOTgyZGEwMDVlOGU4N2JjMWFkY2IzLi5iZjJkMjgxOWM4MGFhNTMyNzU0MDk1N2UwZWMw MGJjOWY3OTVmNzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCkBAIC05OSwxMSArOTksMTEg QEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmNyZWF0ZU9mZmVyU3VjY2VlZGVkKFN0cmlu ZyYmIHNkcCkKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9H SURFTlRJRklFUiwgIkNyZWF0ZSBvZmZlciBzdWNjZWVkZWQ6XG4iLCBzZHApOwogCi0gICAgaWYg KG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNT RVJUKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhb cHJvbWlzZSA9IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBmaWx0ZXJTRFAo V1RGTW92ZShzZHApKV0oKSBtdXRhYmxlIHsKKyAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhb dGhpcywgcHJvbWlzZSA9IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBmaWx0 ZXJTRFAoV1RGTW92ZShzZHApKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5l Y3Rpb24uaXNDbG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNl LT5yZXNvbHZlKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6SW5pdCB7IFJUQ1NkcFR5cGU6Ok9mZmVy LCBzZHAgfSk7CiAgICAgfSk7CiB9CkBAIC0xMTMsMTEgKzExMywxMSBAQCB2b2lkIFBlZXJDb25u ZWN0aW9uQmFja2VuZDo6Y3JlYXRlT2ZmZXJGYWlsZWQoRXhjZXB0aW9uJiYgZXhjZXB0aW9uKQog ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVS LCAiQ3JlYXRlIG9mZmVyIGZhaWxlZDoiLCBleGNlcHRpb24ubWVzc2FnZSgpKTsKIAotICAgIGlm IChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIEFT U0VSVChtX29mZmVyQW5zd2VyUHJvbWlzZSk7Ci0gICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2so W3Byb21pc2UgPSBXVEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgZXhjZXB0aW9uID0gV1RG TW92ZShleGNlcHRpb24pXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNr KFt0aGlzLCBwcm9taXNlID0gV1RGTW92ZShtX29mZmVyQW5zd2VyUHJvbWlzZSksIGV4Y2VwdGlv biA9IFdURk1vdmUoZXhjZXB0aW9uKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNv bm5lY3Rpb24uaXNDbG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9t aXNlLT5yZWplY3QoV1RGTW92ZShleGNlcHRpb24pKTsKICAgICB9KTsKIH0KQEAgLTEzNiwxMSAr MTM2LDExIEBAIHZvaWQgUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpjcmVhdGVBbnN3ZXJTdWNjZWVk ZWQoU3RyaW5nJiYgc2RwKQogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlT X0xPRyhMT0dJREVOVElGSUVSLCAiQ3JlYXRlIGFuc3dlciBzdWNjZWVkZWQ6XG4iLCBzZHApOwog Ci0gICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwot CiAgICAgQVNTRVJUKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9u LmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBzZHAgPSBX VEZNb3ZlKHNkcCldKCkgbXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Ro aXMsIHByb21pc2UgPSBXVEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgc2RwID0gV1RGTW92 ZShzZHApXSgpIG11dGFibGUgeworICAgICAgICBpZiAobV9wZWVyQ29ubmVjdGlvbi5pc0Nsb3Nl ZCgpKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHByb21pc2UtPnJlc29sdmUoUlRD U2Vzc2lvbkRlc2NyaXB0aW9uOjpJbml0IHsgUlRDU2RwVHlwZTo6QW5zd2VyLCBzZHAgfSk7CiAg ICAgfSk7CiB9CkBAIC0xNTAsMTEgKzE1MCwxMSBAQCB2b2lkIFBlZXJDb25uZWN0aW9uQmFja2Vu ZDo6Y3JlYXRlQW5zd2VyRmFpbGVkKEV4Y2VwdGlvbiYmIGV4Y2VwdGlvbikKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIkNyZWF0ZSBh bnN3ZXIgZmFpbGVkOiIsIGV4Y2VwdGlvbi5tZXNzYWdlKCkpOwogCi0gICAgaWYgKG1fcGVlckNv bm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgQVNTRVJUKG1fb2Zm ZXJBbnN3ZXJQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9 IFdURk1vdmUobV9vZmZlckFuc3dlclByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2Vw dGlvbildKCkgbXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3RoaXMsIHBy b21pc2UgPSBXVEZNb3ZlKG1fb2ZmZXJBbnN3ZXJQcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92 ZShleGNlcHRpb24pXSgpIG11dGFibGUgeworICAgICAgICBpZiAobV9wZWVyQ29ubmVjdGlvbi5p c0Nsb3NlZCgpKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHByb21pc2UtPnJlamVj dChXVEZNb3ZlKGV4Y2VwdGlvbikpOwogICAgIH0pOwogfQpAQCAtMTk2LDEyICsxOTYsMTEgQEAg dm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRpb25TdWNjZWVkZWQo KQogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElG SUVSKTsKIAotICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJl dHVybjsKLQotCiAgICAgQVNTRVJUKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKTsKLSAgICBtX3Bl ZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUobV9zZXREZXNjcmlwdGlvblBy b21pc2UpXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBw cm9taXNlID0gV1RGTW92ZShtX3NldERlc2NyaXB0aW9uUHJvbWlzZSldKCkgbXV0YWJsZSB7Cisg ICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAgICByZXR1 cm47CisKICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOwogICAgIH0pOwogfQpAQCAtMjExLDEx ICsyMTAsMTEgQEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldExvY2FsRGVzY3JpcHRp b25GYWlsZWQoRXhjZXB0aW9uJiYgZXhjZXB0aW9uKQogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiU2V0IGxvY2FsIGRlc2NyaXB0aW9u IGZhaWxlZDoiLCBleGNlcHRpb24ubWVzc2FnZSgpKTsKIAotICAgIGlmIChtX3BlZXJDb25uZWN0 aW9uLmlzQ2xvc2VkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIEFTU0VSVChtX3NldERlc2Ny aXB0aW9uUHJvbWlzZSk7Ci0gICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Byb21pc2UgPSBX VEZNb3ZlKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShleGNl cHRpb24pXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlzLCBw cm9taXNlID0gV1RGTW92ZShtX3NldERlc2NyaXB0aW9uUHJvbWlzZSksIGV4Y2VwdGlvbiA9IFdU Rk1vdmUoZXhjZXB0aW9uKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKG1fcGVlckNvbm5lY3Rp b24uaXNDbG9zZWQoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBwcm9taXNlLT5y ZWplY3QoV1RGTW92ZShleGNlcHRpb24pKTsKICAgICB9KTsKIH0KQEAgLTI1Niw5ICsyNTUsOSBA QCB2b2lkIFBlZXJDb25uZWN0aW9uQmFja2VuZDo6c2V0UmVtb3RlRGVzY3JpcHRpb25TdWNjZWVk ZWQoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgQUxXQVlTX0xPRyhMT0dJ REVOVElGSUVSLCAiU2V0IHJlbW90ZSBkZXNjcmlwdGlvbiBzdWNjZWVkZWQiKTsKKyAgICBBU1NF UlQobV9zZXREZXNjcmlwdGlvblByb21pc2UpOwogCi0gICAgQVNTRVJUKCFtX3BlZXJDb25uZWN0 aW9uLmlzQ2xvc2VkKCkpOwotCisgICAgYXV0byBwcm9taXNlID0gV1RGTW92ZShtX3NldERlc2Ny aXB0aW9uUHJvbWlzZSk7CiAgICAgYXV0byBldmVudHMgPSBXVEZNb3ZlKG1fcGVuZGluZ1RyYWNr RXZlbnRzKTsKICAgICBmb3IgKGF1dG8mIGV2ZW50IDogZXZlbnRzKSB7CiAgICAgICAgIGF1dG8m IHRyYWNrID0gZXZlbnQudHJhY2suZ2V0KCk7CkBAIC0yNzIsMTIgKzI3MSwxMCBAQCB2b2lkIFBl ZXJDb25uZWN0aW9uQmFja2VuZDo6c2V0UmVtb3RlRGVzY3JpcHRpb25TdWNjZWVkZWQoKQogICAg ICAgICB0cmFjay5zb3VyY2UoKS5zZXRNdXRlZChmYWxzZSk7CiAgICAgfQogCi0gICAgaWYgKG1f cGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCisgICAgbV9wZWVy Q29ubmVjdGlvbi5kb1Rhc2soW3RoaXMsIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSgpIG11 dGFibGUgeworICAgICAgICBpZiAobV9wZWVyQ29ubmVjdGlvbi5pc0Nsb3NlZCgpKQorICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgQVNTRVJUKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKTsKLSAg ICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9IFdURk1vdmUobV9zZXREZXNjcmlw dGlvblByb21pc2UpXSgpIG11dGFibGUgewogICAgICAgICBwcm9taXNlLT5yZXNvbHZlKCk7CiAg ICAgfSk7CiB9CkBAIC0yOTAsOSArMjg3LDExIEBAIHZvaWQgUGVlckNvbm5lY3Rpb25CYWNrZW5k OjpzZXRSZW1vdGVEZXNjcmlwdGlvbkZhaWxlZChFeGNlcHRpb24mJiBleGNlcHRpb24pCiAgICAg QVNTRVJUKG1fcGVuZGluZ1RyYWNrRXZlbnRzLmlzRW1wdHkoKSk7CiAgICAgbV9wZW5kaW5nVHJh Y2tFdmVudHMuY2xlYXIoKTsKIAotICAgIEFTU0VSVCghbV9wZWVyQ29ubmVjdGlvbi5pc0Nsb3Nl ZCgpKTsKICAgICBBU1NFUlQobV9zZXREZXNjcmlwdGlvblByb21pc2UpOwotICAgIG1fcGVlckNv bm5lY3Rpb24uZG9UYXNrKFtwcm9taXNlID0gV1RGTW92ZShtX3NldERlc2NyaXB0aW9uUHJvbWlz ZSksIGV4Y2VwdGlvbiA9IFdURk1vdmUoZXhjZXB0aW9uKV0oKSBtdXRhYmxlIHsKKyAgICBtX3Bl ZXJDb25uZWN0aW9uLmRvVGFzayhbdGhpcywgcHJvbWlzZSA9IFdURk1vdmUobV9zZXREZXNjcmlw dGlvblByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkgbXV0YWJsZSB7 CisgICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAgICBy ZXR1cm47CisKICAgICAgICAgcHJvbWlzZS0+cmVqZWN0KFdURk1vdmUoZXhjZXB0aW9uKSk7CiAg ICAgfSk7CiB9CkBAIC0zMzcsMTEgKzMzNiwxMSBAQCB2b2lkIFBlZXJDb25uZWN0aW9uQmFja2Vu ZDo6YWRkSWNlQ2FuZGlkYXRlU3VjY2VlZGVkKCkKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkp OwogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIkFkZGluZyBpY2UgY2FuZGlkYXRlIHN1 Y2NlZWRlZCIpOwogCi0gICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAg ICAgcmV0dXJuOwotCiAgICAgQVNTRVJUKG1fYWRkSWNlQ2FuZGlkYXRlUHJvbWlzZSk7Ci0gICAg bV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Byb21pc2UgPSBXVEZNb3ZlKG1fYWRkSWNlQ2FuZGlk YXRlUHJvbWlzZSldKCkgbXV0YWJsZSB7CisgICAgbV9wZWVyQ29ubmVjdGlvbi5kb1Rhc2soW3Ro aXMsIHByb21pc2UgPSBXVEZNb3ZlKG1fYWRkSWNlQ2FuZGlkYXRlUHJvbWlzZSldKCkgbXV0YWJs ZSB7CisgICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAg ICByZXR1cm47CisKICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOwogICAgIH0pOwogfQpAQCAt MzUxLDExICszNTAsMTEgQEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFkZEljZUNhbmRp ZGF0ZUZhaWxlZChFeGNlcHRpb24mJiBleGNlcHRpb24pCiAgICAgQVNTRVJUKGlzTWFpblRocmVh ZCgpKTsKICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJBZGRpbmcgaWNlIGNhbmRpZGF0 ZSBmYWlsZWQ6IiwgZXhjZXB0aW9uLm1lc3NhZ2UoKSk7CiAKLSAgICBpZiAobV9wZWVyQ29ubmVj dGlvbi5pc0Nsb3NlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBBU1NFUlQobV9hZGRJY2VD YW5kaWRhdGVQcm9taXNlKTsKLSAgICBtX3BlZXJDb25uZWN0aW9uLmRvVGFzayhbcHJvbWlzZSA9 IFdURk1vdmUobV9hZGRJY2VDYW5kaWRhdGVQcm9taXNlKSwgZXhjZXB0aW9uID0gV1RGTW92ZShl eGNlcHRpb24pXSgpIG11dGFibGUgeworICAgIG1fcGVlckNvbm5lY3Rpb24uZG9UYXNrKFt0aGlz LCBwcm9taXNlID0gV1RGTW92ZShtX2FkZEljZUNhbmRpZGF0ZVByb21pc2UpLCBleGNlcHRpb24g PSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkgbXV0YWJsZSB7CisgICAgICAgIGlmIChtX3BlZXJDb25u ZWN0aW9uLmlzQ2xvc2VkKCkpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgcHJvbWlz ZS0+cmVqZWN0KFdURk1vdmUoZXhjZXB0aW9uKSk7CiAgICAgfSk7CiB9Cg==