233772 2021-12-02 10:36:29 -0800 MessageChannel::port1() / port2() should return references instead of pointers 2021-12-02 15:05:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 230382 1 cdumez cdumez achristensen darin eric.carlson esprehn+autocc ews-watchlist glenn jer.noble kangil.han philipj sergio webkit-bug-importer oldest_to_newest 1819770 0 cdumez 2021-12-02 10:36:29 -0800 MessageChannel::port1() / port2() should return references instead of pointers. 1819773 1 445738 cdumez 2021-12-02 10:38:17 -0800 Created attachment 445738 Patch 1819775 2 445740 cdumez 2021-12-02 10:39:51 -0800 Created attachment 445740 Patch 1819778 3 445742 cdumez 2021-12-02 10:43:09 -0800 Created attachment 445742 Patch 1819827 4 445760 cdumez 2021-12-02 12:27:13 -0800 Created attachment 445760 Patch 1819865 5 ews-feeder 2021-12-02 14:22:56 -0800 Committed r286453 (244795@main): <https://commits.webkit.org/244795@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445760. 1819866 6 webkit-bug-importer 2021-12-02 14:23:36 -0800 <rdar://problem/85989068> 1819873 7 445760 darin 2021-12-02 14:42:56 -0800 Comment on attachment 445760 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445760&action=review > Source/WebCore/dom/MessageChannel.h:43 > + MessagePort& port1() const { return m_ports.first.get(); } > + MessagePort& port2() const { return m_ports.second.get(); } I think the get() calls here are optional. Probably compiles and works without them. 1819885 8 cdumez 2021-12-02 15:05:33 -0800 (In reply to Darin Adler from comment #7) > Comment on attachment 445760 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=445760&action=review > > > Source/WebCore/dom/MessageChannel.h:43 > > + MessagePort& port1() const { return m_ports.first.get(); } > > + MessagePort& port2() const { return m_ports.second.get(); } > > I think the get() calls here are optional. Probably compiles and works > without them. Indeed, fixed it via <https://commits.webkit.org/r286456>. Thanks. 445738 2021-12-02 10:38:17 -0800 2021-12-02 10:39:49 -0800 Patch bug-233772-20211202103816.patch text/plain 5720 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwNmFkNGYyNGY1YmZl MTRlNmU2M2Y5OTVjMWNkNmUyNzRkYzdjMi4uOTdjOTA2ZTcyYjhjMGM4MThiNGM2YzQ4Mjc5Yjdm YzZmNTFhYjhlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWVzc2FnZUNoYW5uZWw6OnBv cnQxKCkgLyBwb3J0MigpIHNob3VsZCByZXR1cm4gcmVmZXJlbmNlcyBpbnN0ZWFkIG9mIHBvaW50 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM3 NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHdhcyBleHRyYWN0ZWQgZnJvbSBBbGV4IENocmlzdGVuc2VuJ3MgbGFyZ2UgcGF0Y2ggYXQgQnVn IDIzMDM4Mi4KKworICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1dvcmtsZXROb2RlOjpjcmVhdGUpOgorICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTTWVzc2FnZUNoYW5uZWxDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNNZXNzYWdlQ2hhbm5lbDo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4pOgorICAgICAg ICAqIGRvbS9NZXNzYWdlQ2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZU1l c3NhZ2VQb3J0cyk6CisgICAgICAgIChXZWJDb3JlOjpNZXNzYWdlQ2hhbm5lbDo6TWVzc2FnZUNo YW5uZWwpOgorICAgICAgICAqIGRvbS9NZXNzYWdlQ2hhbm5lbC5oOgorICAgICAgICAoV2ViQ29y ZTo6TWVzc2FnZUNoYW5uZWw6OnBvcnQxIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lc3Nh Z2VDaGFubmVsOjpwb3J0MiBjb25zdCk6CisKIDIwMjEtMTItMDIgIEFudHRpIEtvaXZpc3RvICA8 YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFs6aGFzKCkgcHNldWRvLWNsYXNzXSBJbnZhbGlk YXRpb24gaW4gbm9uLXN1YmplY3QgcG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmF1ZGlvL0F1ZGlvV29ya2xldE5vZGUuY3BwCmluZGV4IDhjZWViMzBkOTBlZTZi NDgzM2I0MmUwY2M0NDVkNjVmZGJjN2Q5MzMuLjA0M2QxYjE2ZjU5ZDI3ZTkyMTkzYzM4NzI4OWI2 YzRiZjAyYTVkNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v QXVkaW9Xb3JrbGV0Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9BdWRpb1dvcmtsZXROb2RlLmNwcApAQCAtOTUsNyArOTUsNyBAQCBFeGNlcHRpb25PcjxSZWY8 QXVkaW9Xb3JrbGV0Tm9kZT4+IEF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZShKU0M6OkpTR2xvYmFs T2JqZWN0JgogICAgIH0KIAogICAgIGF1dG8gcGFyYW1ldGVyRGF0YSA9IFdURk1vdmUob3B0aW9u cy5wYXJhbWV0ZXJEYXRhKTsKLSAgICBhdXRvIG5vZGUgPSBhZG9wdFJlZigqbmV3IEF1ZGlvV29y a2xldE5vZGUoY29udGV4dCwgbmFtZSwgV1RGTW92ZShvcHRpb25zKSwgKm5vZGVNZXNzYWdlUG9y dCkpOworICAgIGF1dG8gbm9kZSA9IGFkb3B0UmVmKCpuZXcgQXVkaW9Xb3JrbGV0Tm9kZShjb250 ZXh0LCBuYW1lLCBXVEZNb3ZlKG9wdGlvbnMpLCBub2RlTWVzc2FnZVBvcnQpKTsKICAgICBub2Rl LT5zdXNwZW5kSWZOZWVkZWQoKTsKIAogICAgIGF1dG8gcmVzdWx0ID0gbm9kZS0+aGFuZGxlQXVk aW9Ob2RlT3B0aW9ucyhvcHRpb25zLCB7IDIsIENoYW5uZWxDb3VudE1vZGU6Ok1heCwgQ2hhbm5l bEludGVycHJldGF0aW9uOjpTcGVha2VycyB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTTWVzc2FnZUNoYW5uZWxDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHAKaW5kZXggNzc1ZDgyY2Y0OTE2 YzQxZmJmMWRlMjVlYmIzNjZmYzA0NzQyZWNiNy4uYzU1OTUwN2IyMGZiYTQ2NDcwYjQ5MTM2MGVk YWZlZGFlYzg5Mjc1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNN ZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHAKQEAgLTM2LDExICszNiw4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIHRlbXBsYXRlPHR5cGVuYW1lIFZpc2l0b3I+CiB2b2lkIEpTTWVzc2FnZUNoYW5u ZWw6OnZpc2l0QWRkaXRpb25hbENoaWxkcmVuKFZpc2l0b3ImIHZpc2l0b3IpCiB7Ci0gICAgaWYg KE1lc3NhZ2VQb3J0KiBwb3J0ID0gd3JhcHBlZCgpLnBvcnQxKCkpCi0gICAgICAgIHZpc2l0b3Iu YWRkT3BhcXVlUm9vdChwb3J0KTsKLQotICAgIGlmIChNZXNzYWdlUG9ydCogcG9ydCA9IHdyYXBw ZWQoKS5wb3J0MigpKQotICAgICAgICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3QocG9ydCk7CisgICAg dmlzaXRvci5hZGRPcGFxdWVSb290KCZ3cmFwcGVkKCkucG9ydDEoKSk7CisgICAgdmlzaXRvci5h ZGRPcGFxdWVSb290KCZ3cmFwcGVkKCkucG9ydDIoKSk7CiB9CiAKIERFRklORV9WSVNJVF9BRERJ VElPTkFMX0NISUxEUkVOKEpTTWVzc2FnZUNoYW5uZWwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL01lc3NhZ2VDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdl Q2hhbm5lbC5jcHAKaW5kZXggNzgxNzYzYTk5OTBiMzFkZWUwMGM0ZDNmMTBkODE4NTAyOWMwYzcw Zi4uNGM1MjViY2ZlMjgyOWIzY2ZiZDg4MjY4NDIzMDYyYmVkMDNiZjhmNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VDaGFubmVsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vTWVzc2FnZUNoYW5uZWwuY3BwCkBAIC0zMywyNiArMzMsMjkgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCitzdGF0aWMgc3RkOjpwYWlyPHN0ZDo6cGFpcjxSZWY8TWVzc2FnZVBvcnQ+ LCBSZWY8TWVzc2FnZVBvcnQ+Pj4gZ2VuZXJhdGVNZXNzYWdlUG9ydHMoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCYgY29udGV4dCkKK3sKKyAgICBNZXNzYWdlUG9ydElkZW50aWZpZXIgaWQxID0geyBQ cm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZpZXI8TWVzc2FnZVBvcnRJZGVudGlm aWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgpIH07CisgICAgTWVzc2FnZVBvcnRJ ZGVudGlmaWVyIGlkMiA9IHsgUHJvY2Vzczo6aWRlbnRpZmllcigpLCBPYmplY3RJZGVudGlmaWVy PE1lc3NhZ2VQb3J0SWRlbnRpZmllcjo6UG9ydElkZW50aWZpZXJUeXBlPjo6Z2VuZXJhdGUoKSB9 OworCisgICAgcmV0dXJuIHsgTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDEsIGlkMiks IE1lc3NhZ2VQb3J0OjpjcmVhdGUoY29udGV4dCwgaWQyLCBpZDEpIH07Cit9CisKIFJlZjxNZXNz YWdlQ2hhbm5lbD4gTWVzc2FnZUNoYW5uZWw6OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiBjb250ZXh0KQogewogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE1lc3NhZ2VDaGFubmVsKGNv bnRleHQpKTsKIH0KIAogTWVzc2FnZUNoYW5uZWw6Ok1lc3NhZ2VDaGFubmVsKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmIGNvbnRleHQpCisgICAgOiBtX3BvcnRzKGdlbmVyYXRlTWVzc2FnZVBvcnRz KGNvbnRleHQpKQogewotICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDEgPSB7IFByb2Nlc3M6 OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElkZW50aWZpZXI6OlBv cnRJZGVudGlmaWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKLSAgICBNZXNzYWdlUG9ydElkZW50aWZp ZXIgaWQyID0geyBQcm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZpZXI8TWVzc2Fn ZVBvcnRJZGVudGlmaWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgpIH07Ci0KLSAg ICBtX3BvcnQxID0gTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDEsIGlkMik7Ci0gICAg bV9wb3J0MiA9IE1lc3NhZ2VQb3J0OjpjcmVhdGUoY29udGV4dCwgaWQyLCBpZDEpOwotCiAgICAg aWYgKCFjb250ZXh0LmFjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkKCkpIHsKLSAgICAgICAgQVNT RVJUKCFtX3BvcnQxLT5jbG9zZWQoKSk7Ci0gICAgICAgIEFTU0VSVCghbV9wb3J0Mi0+Y2xvc2Vk KCkpOwotICAgICAgICBNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlcjo6ZnJvbUNvbnRleHQoY29u dGV4dCkuY3JlYXRlTmV3TWVzc2FnZVBvcnRDaGFubmVsKGlkMSwgaWQyKTsKKyAgICAgICAgQVNT RVJUKCFwb3J0MSgpLmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJUKCFwb3J0MigpLmNsb3NlZCgp KTsKKyAgICAgICAgTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXI6OmZyb21Db250ZXh0KGNvbnRl eHQpLmNyZWF0ZU5ld01lc3NhZ2VQb3J0Q2hhbm5lbChwb3J0MSgpLmlkZW50aWZpZXIoKSwgcG9y dDIoKS5pZGVudGlmaWVyKCkpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIEFTU0VSVChtX3BvcnQx LT5jbG9zZWQoKSk7Ci0gICAgICAgIEFTU0VSVChtX3BvcnQyLT5jbG9zZWQoKSk7CisgICAgICAg IEFTU0VSVChwb3J0MSgpLmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJUKHBvcnQyKCkuY2xvc2Vk KCkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VD aGFubmVsLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuaAppbmRleCBlMDBk Yjk5MzhiYTlmZGRiNTU5NjhkZjA1NDA0MGFmN2ExMDc4MTE2Li5mODlhNjJiNjVjNzFjMGVhYWQ1 NWFjM2FkYWI5Yjk2OGI3NzgyMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVz c2FnZUNoYW5uZWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuaApA QCAtMzksMTQgKzM5LDEzIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPE1lc3NhZ2VDaGFubmVs PiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpOwogICAgIH5NZXNzYWdlQ2hhbm5lbCgp OwogCi0gICAgTWVzc2FnZVBvcnQqIHBvcnQxKCkgY29uc3QgeyByZXR1cm4gbV9wb3J0MS5nZXQo KTsgfQotICAgIE1lc3NhZ2VQb3J0KiBwb3J0MigpIGNvbnN0IHsgcmV0dXJuIG1fcG9ydDIuZ2V0 KCk7IH0KKyAgICBNZXNzYWdlUG9ydCYgcG9ydDEoKSBjb25zdCB7IHJldHVybiBtX3BvcnRzLmZp cnN0LmdldCgpOyB9CisgICAgTWVzc2FnZVBvcnQmIHBvcnQyKCkgY29uc3QgeyByZXR1cm4gbV9w b3J0cy5zZWNvbmQuZ2V0KCk7IH0KIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZXNzYWdlQ2hh bm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7CiAKLSAgICBSZWZQdHI8TWVzc2FnZVBvcnQ+ IG1fcG9ydDE7Ci0gICAgUmVmUHRyPE1lc3NhZ2VQb3J0PiBtX3BvcnQyOworICAgIHN0ZDo6cGFp cjxSZWY8TWVzc2FnZVBvcnQ+LCBSZWY8TWVzc2FnZVBvcnQ+PiBtX3BvcnRzOwogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQo= 445740 2021-12-02 10:39:51 -0800 2021-12-02 10:43:06 -0800 Patch bug-233772-20211202103950.patch text/plain 6853 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwNmFkNGYyNGY1YmZl MTRlNmU2M2Y5OTVjMWNkNmUyNzRkYzdjMi4uOTdjOTA2ZTcyYjhjMGM4MThiNGM2YzQ4Mjc5Yjdm YzZmNTFhYjhlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWVzc2FnZUNoYW5uZWw6OnBv cnQxKCkgLyBwb3J0MigpIHNob3VsZCByZXR1cm4gcmVmZXJlbmNlcyBpbnN0ZWFkIG9mIHBvaW50 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM3 NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHdhcyBleHRyYWN0ZWQgZnJvbSBBbGV4IENocmlzdGVuc2VuJ3MgbGFyZ2UgcGF0Y2ggYXQgQnVn IDIzMDM4Mi4KKworICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1dvcmtsZXROb2RlOjpjcmVhdGUpOgorICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTTWVzc2FnZUNoYW5uZWxDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNNZXNzYWdlQ2hhbm5lbDo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4pOgorICAgICAg ICAqIGRvbS9NZXNzYWdlQ2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZU1l c3NhZ2VQb3J0cyk6CisgICAgICAgIChXZWJDb3JlOjpNZXNzYWdlQ2hhbm5lbDo6TWVzc2FnZUNo YW5uZWwpOgorICAgICAgICAqIGRvbS9NZXNzYWdlQ2hhbm5lbC5oOgorICAgICAgICAoV2ViQ29y ZTo6TWVzc2FnZUNoYW5uZWw6OnBvcnQxIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lc3Nh Z2VDaGFubmVsOjpwb3J0MiBjb25zdCk6CisKIDIwMjEtMTItMDIgIEFudHRpIEtvaXZpc3RvICA8 YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFs6aGFzKCkgcHNldWRvLWNsYXNzXSBJbnZhbGlk YXRpb24gaW4gbm9uLXN1YmplY3QgcG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmF1ZGlvL0F1ZGlvV29ya2xldE5vZGUuY3BwCmluZGV4IDhjZWViMzBkOTBlZTZi NDgzM2I0MmUwY2M0NDVkNjVmZGJjN2Q5MzMuLmQzMTJmMWZmYjFkZmQzNzllNTUwNmUzOGVkZGFj MThjODE4NTE4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v QXVkaW9Xb3JrbGV0Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9BdWRpb1dvcmtsZXROb2RlLmNwcApAQCAtODIsOCArODIsOCBAQCBFeGNlcHRpb25PcjxSZWY8 QXVkaW9Xb3JrbGV0Tm9kZT4+IEF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZShKU0M6OkpTR2xvYmFs T2JqZWN0JgogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IsICJB dWRpbyBjb250ZXh0J3MgZnJhbWUgaXMgZGV0YWNoZWQiX3MgfTsKIAogICAgIGF1dG8gbWVzc2Fn ZUNoYW5uZWwgPSBNZXNzYWdlQ2hhbm5lbDo6Y3JlYXRlKCpjb250ZXh0LnNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKSk7Ci0gICAgYXV0byBub2RlTWVzc2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5lbC0+ cG9ydDEoKTsKLSAgICBhdXRvIHByb2Nlc3Nvck1lc3NhZ2VQb3J0ID0gbWVzc2FnZUNoYW5uZWwt PnBvcnQyKCk7CisgICAgYXV0byYgbm9kZU1lc3NhZ2VQb3J0ID0gbWVzc2FnZUNoYW5uZWwtPnBv cnQxKCk7CisgICAgYXV0byYgcHJvY2Vzc29yTWVzc2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5lbC0+ cG9ydDIoKTsKIAogICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHNlcmlhbGl6ZWRP cHRpb25zOwogICAgIHsKQEAgLTk1LDcgKzk1LDcgQEAgRXhjZXB0aW9uT3I8UmVmPEF1ZGlvV29y a2xldE5vZGU+PiBBdWRpb1dvcmtsZXROb2RlOjpjcmVhdGUoSlNDOjpKU0dsb2JhbE9iamVjdCYK ICAgICB9CiAKICAgICBhdXRvIHBhcmFtZXRlckRhdGEgPSBXVEZNb3ZlKG9wdGlvbnMucGFyYW1l dGVyRGF0YSk7Ci0gICAgYXV0byBub2RlID0gYWRvcHRSZWYoKm5ldyBBdWRpb1dvcmtsZXROb2Rl KGNvbnRleHQsIG5hbWUsIFdURk1vdmUob3B0aW9ucyksICpub2RlTWVzc2FnZVBvcnQpKTsKKyAg ICBhdXRvIG5vZGUgPSBhZG9wdFJlZigqbmV3IEF1ZGlvV29ya2xldE5vZGUoY29udGV4dCwgbmFt ZSwgV1RGTW92ZShvcHRpb25zKSwgbm9kZU1lc3NhZ2VQb3J0KSk7CiAgICAgbm9kZS0+c3VzcGVu ZElmTmVlZGVkKCk7CiAKICAgICBhdXRvIHJlc3VsdCA9IG5vZGUtPmhhbmRsZUF1ZGlvTm9kZU9w dGlvbnMob3B0aW9ucywgeyAyLCBDaGFubmVsQ291bnRNb2RlOjpNYXgsIENoYW5uZWxJbnRlcnBy ZXRhdGlvbjo6U3BlYWtlcnMgfSk7CkBAIC0xMDksNyArMTA5LDcgQEAgRXhjZXB0aW9uT3I8UmVm PEF1ZGlvV29ya2xldE5vZGU+PiBBdWRpb1dvcmtsZXROb2RlOjpjcmVhdGUoSlNDOjpKU0dsb2Jh bE9iamVjdCYKICAgICBpZiAobm9kZS0+bnVtYmVyT2ZPdXRwdXRzKCkgPiAwKQogICAgICAgICBj b250ZXh0LnNvdXJjZU5vZGVXaWxsQmVnaW5QbGF5YmFjayhub2RlKTsKIAotICAgIGNvbnRleHQu YXVkaW9Xb3JrbGV0KCkuY3JlYXRlUHJvY2Vzc29yKG5hbWUsIHByb2Nlc3Nvck1lc3NhZ2VQb3J0 LT5kaXNlbnRhbmdsZSgpLCBzZXJpYWxpemVkT3B0aW9ucy5yZWxlYXNlTm9uTnVsbCgpLCBub2Rl KTsKKyAgICBjb250ZXh0LmF1ZGlvV29ya2xldCgpLmNyZWF0ZVByb2Nlc3NvcihuYW1lLCBwcm9j ZXNzb3JNZXNzYWdlUG9ydC5kaXNlbnRhbmdsZSgpLCBzZXJpYWxpemVkT3B0aW9ucy5yZWxlYXNl Tm9uTnVsbCgpLCBub2RlKTsKIAogICAgIHsKICAgICAgICAgLy8gVGhlIG5vZGUgc2hvdWxkIGJl IG1hbnVhbGx5IGFkZGVkIHRvIHRoZSBhdXRvbWF0aWMgcHVsbCBub2RlIGxpc3QsIGV2ZW4gd2l0 aG91dCBhIGNvbm5lY3QoKSBjYWxsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcAppbmRleCA3NzVkODJjZjQ5MTZjNDFmYmYx ZGUyNWViYjM2NmZjMDQ3NDJlY2I3Li5jNTU5NTA3YjIwZmJhNDY0NzBiNDkxMzYwZWRhZmVkYWVj ODkyNzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VD aGFubmVsQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3Nh Z2VDaGFubmVsQ3VzdG9tLmNwcApAQCAtMzYsMTEgKzM2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogdGVtcGxhdGU8dHlwZW5hbWUgVmlzaXRvcj4KIHZvaWQgSlNNZXNzYWdlQ2hhbm5lbDo6dmlz aXRBZGRpdGlvbmFsQ2hpbGRyZW4oVmlzaXRvciYgdmlzaXRvcikKIHsKLSAgICBpZiAoTWVzc2Fn ZVBvcnQqIHBvcnQgPSB3cmFwcGVkKCkucG9ydDEoKSkKLSAgICAgICAgdmlzaXRvci5hZGRPcGFx dWVSb290KHBvcnQpOwotCi0gICAgaWYgKE1lc3NhZ2VQb3J0KiBwb3J0ID0gd3JhcHBlZCgpLnBv cnQyKCkpCi0gICAgICAgIHZpc2l0b3IuYWRkT3BhcXVlUm9vdChwb3J0KTsKKyAgICB2aXNpdG9y LmFkZE9wYXF1ZVJvb3QoJndyYXBwZWQoKS5wb3J0MSgpKTsKKyAgICB2aXNpdG9yLmFkZE9wYXF1 ZVJvb3QoJndyYXBwZWQoKS5wb3J0MigpKTsKIH0KIAogREVGSU5FX1ZJU0lUX0FERElUSU9OQUxf Q0hJTERSRU4oSlNNZXNzYWdlQ2hhbm5lbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vTWVzc2FnZUNoYW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VDaGFubmVs LmNwcAppbmRleCA3ODE3NjNhOTk5MGIzMWRlZTAwYzRkM2YxMGQ4MTg1MDI5YzBjNzBmLi40YzUy NWJjZmUyODI5YjNjZmJkODgyNjg0MjMwNjJiZWQwM2JmOGY0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9N ZXNzYWdlQ2hhbm5lbC5jcHAKQEAgLTMzLDI2ICszMywyOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKK3N0YXRpYyBzdGQ6OnBhaXI8c3RkOjpwYWlyPFJlZjxNZXNzYWdlUG9ydD4sIFJlZjxN ZXNzYWdlUG9ydD4+PiBnZW5lcmF0ZU1lc3NhZ2VQb3J0cyhTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiBjb250ZXh0KQoreworICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDEgPSB7IFByb2Nlc3M6 OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElkZW50aWZpZXI6OlBv cnRJZGVudGlmaWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKKyAgICBNZXNzYWdlUG9ydElkZW50aWZp ZXIgaWQyID0geyBQcm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZpZXI8TWVzc2Fn ZVBvcnRJZGVudGlmaWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgpIH07CisKKyAg ICByZXR1cm4geyBNZXNzYWdlUG9ydDo6Y3JlYXRlKGNvbnRleHQsIGlkMSwgaWQyKSwgTWVzc2Fn ZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDIsIGlkMSkgfTsKK30KKwogUmVmPE1lc3NhZ2VDaGFu bmVsPiBNZXNzYWdlQ2hhbm5lbDo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRl eHQpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTWVzc2FnZUNoYW5uZWwoY29udGV4dCkp OwogfQogCiBNZXNzYWdlQ2hhbm5lbDo6TWVzc2FnZUNoYW5uZWwoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCkKKyAgICA6IG1fcG9ydHMoZ2VuZXJhdGVNZXNzYWdlUG9ydHMoY29udGV4 dCkpCiB7Ci0gICAgTWVzc2FnZVBvcnRJZGVudGlmaWVyIGlkMSA9IHsgUHJvY2Vzczo6aWRlbnRp ZmllcigpLCBPYmplY3RJZGVudGlmaWVyPE1lc3NhZ2VQb3J0SWRlbnRpZmllcjo6UG9ydElkZW50 aWZpZXJUeXBlPjo6Z2VuZXJhdGUoKSB9OwotICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDIg PSB7IFByb2Nlc3M6OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElk ZW50aWZpZXI6OlBvcnRJZGVudGlmaWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKLQotICAgIG1fcG9y dDEgPSBNZXNzYWdlUG9ydDo6Y3JlYXRlKGNvbnRleHQsIGlkMSwgaWQyKTsKLSAgICBtX3BvcnQy ID0gTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDIsIGlkMSk7Ci0KICAgICBpZiAoIWNv bnRleHQuYWN0aXZlRE9NT2JqZWN0c0FyZVN0b3BwZWQoKSkgewotICAgICAgICBBU1NFUlQoIW1f cG9ydDEtPmNsb3NlZCgpKTsKLSAgICAgICAgQVNTRVJUKCFtX3BvcnQyLT5jbG9zZWQoKSk7Ci0g ICAgICAgIE1lc3NhZ2VQb3J0Q2hhbm5lbFByb3ZpZGVyOjpmcm9tQ29udGV4dChjb250ZXh0KS5j cmVhdGVOZXdNZXNzYWdlUG9ydENoYW5uZWwoaWQxLCBpZDIpOworICAgICAgICBBU1NFUlQoIXBv cnQxKCkuY2xvc2VkKCkpOworICAgICAgICBBU1NFUlQoIXBvcnQyKCkuY2xvc2VkKCkpOworICAg ICAgICBNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlcjo6ZnJvbUNvbnRleHQoY29udGV4dCkuY3Jl YXRlTmV3TWVzc2FnZVBvcnRDaGFubmVsKHBvcnQxKCkuaWRlbnRpZmllcigpLCBwb3J0MigpLmlk ZW50aWZpZXIoKSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgQVNTRVJUKG1fcG9ydDEtPmNsb3Nl ZCgpKTsKLSAgICAgICAgQVNTRVJUKG1fcG9ydDItPmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJU KHBvcnQxKCkuY2xvc2VkKCkpOworICAgICAgICBBU1NFUlQocG9ydDIoKS5jbG9zZWQoKSk7CiAg ICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwu aCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5oCmluZGV4IGUwMGRiOTkzOGJh OWZkZGI1NTk2OGRmMDU0MDQwYWY3YTEwNzgxMTYuLmY4OWE2MmI2NWM3MWMwZWFhZDU1YWMzYWRh YjliOTY4Yjc3ODIwNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hh bm5lbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5oCkBAIC0zOSwx NCArMzksMTMgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVzc2FnZUNoYW5uZWw+IGNyZWF0 ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7CiAgICAgfk1lc3NhZ2VDaGFubmVsKCk7CiAKLSAg ICBNZXNzYWdlUG9ydCogcG9ydDEoKSBjb25zdCB7IHJldHVybiBtX3BvcnQxLmdldCgpOyB9Ci0g ICAgTWVzc2FnZVBvcnQqIHBvcnQyKCkgY29uc3QgeyByZXR1cm4gbV9wb3J0Mi5nZXQoKTsgfQor ICAgIE1lc3NhZ2VQb3J0JiBwb3J0MSgpIGNvbnN0IHsgcmV0dXJuIG1fcG9ydHMuZmlyc3QuZ2V0 KCk7IH0KKyAgICBNZXNzYWdlUG9ydCYgcG9ydDIoKSBjb25zdCB7IHJldHVybiBtX3BvcnRzLnNl Y29uZC5nZXQoKTsgfQogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lc3NhZ2VDaGFubmVsKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQmKTsKIAotICAgIFJlZlB0cjxNZXNzYWdlUG9ydD4gbV9wb3J0 MTsKLSAgICBSZWZQdHI8TWVzc2FnZVBvcnQ+IG1fcG9ydDI7CisgICAgc3RkOjpwYWlyPFJlZjxN ZXNzYWdlUG9ydD4sIFJlZjxNZXNzYWdlUG9ydD4+IG1fcG9ydHM7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCg== 445742 2021-12-02 10:43:09 -0800 2021-12-02 12:27:10 -0800 Patch bug-233772-20211202104308.patch text/plain 6844 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwNmFkNGYyNGY1YmZl MTRlNmU2M2Y5OTVjMWNkNmUyNzRkYzdjMi4uODA0OTI5NGI4YTc3NjA2MGZmOGMzNjZjYzhiZmYz NzlmMjhlZTY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWVzc2FnZUNoYW5uZWw6OnBv cnQxKCkgLyBwb3J0MigpIHNob3VsZCByZXR1cm4gcmVmZXJlbmNlcyBpbnN0ZWFkIG9mIHBvaW50 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM3 NzIKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIFRo aXMgd2FzIGV4dHJhY3RlZCBmcm9tIEFsZXggQ2hyaXN0ZW5zZW4ncyBsYXJnZSBwYXRjaCBhdCBC dWcgMjMwMzgyLgorCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9BdWRpb1dvcmtsZXROb2Rl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZSk6CisgICAg ICAgICogYmluZGluZ3MvanMvSlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpKU01lc3NhZ2VDaGFubmVsOjp2aXNpdEFkZGl0aW9uYWxDaGlsZHJlbik6CisgICAg ICAgICogZG9tL01lc3NhZ2VDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdlbmVyYXRl TWVzc2FnZVBvcnRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lc3NhZ2VDaGFubmVsOjpNZXNzYWdl Q2hhbm5lbCk6CisgICAgICAgICogZG9tL01lc3NhZ2VDaGFubmVsLmg6CisgICAgICAgIChXZWJD b3JlOjpNZXNzYWdlQ2hhbm5lbDo6cG9ydDEgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVz c2FnZUNoYW5uZWw6OnBvcnQyIGNvbnN0KToKKwogMjAyMS0xMi0wMiAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgWzpoYXMoKSBwc2V1ZG8tY2xhc3NdIEludmFs aWRhdGlvbiBpbiBub24tc3ViamVjdCBwb3NpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb1dvcmtsZXROb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5jcHAKaW5kZXggOGNlZWIzMGQ5MGVl NmI0ODMzYjQyZTBjYzQ0NWQ2NWZkYmM3ZDkzMy4uZDMxMmYxZmZiMWRmZDM3OWU1NTA2ZTM4ZWRk YWMxOGM4MTg1MThiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9BdWRpb1dvcmtsZXROb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1 ZGlvL0F1ZGlvV29ya2xldE5vZGUuY3BwCkBAIC04Miw4ICs4Miw4IEBAIEV4Y2VwdGlvbk9yPFJl ZjxBdWRpb1dvcmtsZXROb2RlPj4gQXVkaW9Xb3JrbGV0Tm9kZTo6Y3JlYXRlKEpTQzo6SlNHbG9i YWxPYmplY3QmCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciwg IkF1ZGlvIGNvbnRleHQncyBmcmFtZSBpcyBkZXRhY2hlZCJfcyB9OwogCiAgICAgYXV0byBtZXNz YWdlQ2hhbm5lbCA9IE1lc3NhZ2VDaGFubmVsOjpjcmVhdGUoKmNvbnRleHQuc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpKTsKLSAgICBhdXRvIG5vZGVNZXNzYWdlUG9ydCA9IG1lc3NhZ2VDaGFubmVs LT5wb3J0MSgpOwotICAgIGF1dG8gcHJvY2Vzc29yTWVzc2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5l bC0+cG9ydDIoKTsKKyAgICBhdXRvJiBub2RlTWVzc2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5lbC0+ cG9ydDEoKTsKKyAgICBhdXRvJiBwcm9jZXNzb3JNZXNzYWdlUG9ydCA9IG1lc3NhZ2VDaGFubmVs LT5wb3J0MigpOwogCiAgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc2VyaWFsaXpl ZE9wdGlvbnM7CiAgICAgewpAQCAtOTUsNyArOTUsNyBAQCBFeGNlcHRpb25PcjxSZWY8QXVkaW9X b3JrbGV0Tm9kZT4+IEF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZShKU0M6OkpTR2xvYmFsT2JqZWN0 JgogICAgIH0KIAogICAgIGF1dG8gcGFyYW1ldGVyRGF0YSA9IFdURk1vdmUob3B0aW9ucy5wYXJh bWV0ZXJEYXRhKTsKLSAgICBhdXRvIG5vZGUgPSBhZG9wdFJlZigqbmV3IEF1ZGlvV29ya2xldE5v ZGUoY29udGV4dCwgbmFtZSwgV1RGTW92ZShvcHRpb25zKSwgKm5vZGVNZXNzYWdlUG9ydCkpOwor ICAgIGF1dG8gbm9kZSA9IGFkb3B0UmVmKCpuZXcgQXVkaW9Xb3JrbGV0Tm9kZShjb250ZXh0LCBu YW1lLCBXVEZNb3ZlKG9wdGlvbnMpLCBub2RlTWVzc2FnZVBvcnQpKTsKICAgICBub2RlLT5zdXNw ZW5kSWZOZWVkZWQoKTsKIAogICAgIGF1dG8gcmVzdWx0ID0gbm9kZS0+aGFuZGxlQXVkaW9Ob2Rl T3B0aW9ucyhvcHRpb25zLCB7IDIsIENoYW5uZWxDb3VudE1vZGU6Ok1heCwgQ2hhbm5lbEludGVy cHJldGF0aW9uOjpTcGVha2VycyB9KTsKQEAgLTEwOSw3ICsxMDksNyBAQCBFeGNlcHRpb25PcjxS ZWY8QXVkaW9Xb3JrbGV0Tm9kZT4+IEF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZShKU0M6OkpTR2xv YmFsT2JqZWN0JgogICAgIGlmIChub2RlLT5udW1iZXJPZk91dHB1dHMoKSA+IDApCiAgICAgICAg IGNvbnRleHQuc291cmNlTm9kZVdpbGxCZWdpblBsYXliYWNrKG5vZGUpOwogCi0gICAgY29udGV4 dC5hdWRpb1dvcmtsZXQoKS5jcmVhdGVQcm9jZXNzb3IobmFtZSwgcHJvY2Vzc29yTWVzc2FnZVBv cnQtPmRpc2VudGFuZ2xlKCksIHNlcmlhbGl6ZWRPcHRpb25zLnJlbGVhc2VOb25OdWxsKCksIG5v ZGUpOworICAgIGNvbnRleHQuYXVkaW9Xb3JrbGV0KCkuY3JlYXRlUHJvY2Vzc29yKG5hbWUsIHBy b2Nlc3Nvck1lc3NhZ2VQb3J0LmRpc2VudGFuZ2xlKCksIHNlcmlhbGl6ZWRPcHRpb25zLnJlbGVh c2VOb25OdWxsKCksIG5vZGUpOwogCiAgICAgewogICAgICAgICAvLyBUaGUgbm9kZSBzaG91bGQg YmUgbWFudWFsbHkgYWRkZWQgdG8gdGhlIGF1dG9tYXRpYyBwdWxsIG5vZGUgbGlzdCwgZXZlbiB3 aXRob3V0IGEgY29ubmVjdCgpIGNhbGwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTTWVzc2FnZUNoYW5uZWxDdXN0b20uY3BwCmluZGV4IDc3NWQ4MmNmNDkxNmM0MWZi ZjFkZTI1ZWJiMzY2ZmMwNDc0MmVjYjcuLmM1NTk1MDdiMjBmYmE0NjQ3MGI0OTEzNjBlZGFmZWRh ZWM4OTI3NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTWVzc2Fn ZUNoYW5uZWxDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTWVz c2FnZUNoYW5uZWxDdXN0b20uY3BwCkBAIC0zNiwxMSArMzYsOCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBWaXNpdG9yPgogdm9pZCBKU01lc3NhZ2VDaGFubmVsOjp2 aXNpdEFkZGl0aW9uYWxDaGlsZHJlbihWaXNpdG9yJiB2aXNpdG9yKQogewotICAgIGlmIChNZXNz YWdlUG9ydCogcG9ydCA9IHdyYXBwZWQoKS5wb3J0MSgpKQotICAgICAgICB2aXNpdG9yLmFkZE9w YXF1ZVJvb3QocG9ydCk7Ci0KLSAgICBpZiAoTWVzc2FnZVBvcnQqIHBvcnQgPSB3cmFwcGVkKCku cG9ydDIoKSkKLSAgICAgICAgdmlzaXRvci5hZGRPcGFxdWVSb290KHBvcnQpOworICAgIHZpc2l0 b3IuYWRkT3BhcXVlUm9vdCgmd3JhcHBlZCgpLnBvcnQxKCkpOworICAgIHZpc2l0b3IuYWRkT3Bh cXVlUm9vdCgmd3JhcHBlZCgpLnBvcnQyKCkpOwogfQogCiBERUZJTkVfVklTSVRfQURESVRJT05B TF9DSElMRFJFTihKU01lc3NhZ2VDaGFubmVsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9NZXNzYWdlQ2hhbm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5u ZWwuY3BwCmluZGV4IDc4MTc2M2E5OTkwYjMxZGVlMDBjNGQzZjEwZDgxODUwMjljMGM3MGYuLjdm N2ExMmMzZTJjYzVkM2YwNjJlYjJlMzllYmEwNWE2ZTJjMTM0MDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L01lc3NhZ2VDaGFubmVsLmNwcApAQCAtMzMsMjYgKzMzLDI5IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorc3RhdGljIHN0ZDo6cGFpcjxSZWY8TWVzc2FnZVBvcnQ+LCBSZWY8TWVzc2FnZVBv cnQ+PiBnZW5lcmF0ZU1lc3NhZ2VQb3J0cyhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0 KQoreworICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDEgPSB7IFByb2Nlc3M6OmlkZW50aWZp ZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElkZW50aWZpZXI6OlBvcnRJZGVudGlm aWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKKyAgICBNZXNzYWdlUG9ydElkZW50aWZpZXIgaWQyID0g eyBQcm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZpZXI8TWVzc2FnZVBvcnRJZGVu dGlmaWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgpIH07CisKKyAgICByZXR1cm4g eyBNZXNzYWdlUG9ydDo6Y3JlYXRlKGNvbnRleHQsIGlkMSwgaWQyKSwgTWVzc2FnZVBvcnQ6OmNy ZWF0ZShjb250ZXh0LCBpZDIsIGlkMSkgfTsKK30KKwogUmVmPE1lc3NhZ2VDaGFubmVsPiBNZXNz YWdlQ2hhbm5lbDo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpCiB7CiAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTWVzc2FnZUNoYW5uZWwoY29udGV4dCkpOwogfQogCiBN ZXNzYWdlQ2hhbm5lbDo6TWVzc2FnZUNoYW5uZWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29u dGV4dCkKKyAgICA6IG1fcG9ydHMoZ2VuZXJhdGVNZXNzYWdlUG9ydHMoY29udGV4dCkpCiB7Ci0g ICAgTWVzc2FnZVBvcnRJZGVudGlmaWVyIGlkMSA9IHsgUHJvY2Vzczo6aWRlbnRpZmllcigpLCBP YmplY3RJZGVudGlmaWVyPE1lc3NhZ2VQb3J0SWRlbnRpZmllcjo6UG9ydElkZW50aWZpZXJUeXBl Pjo6Z2VuZXJhdGUoKSB9OwotICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDIgPSB7IFByb2Nl c3M6OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElkZW50aWZpZXI6 OlBvcnRJZGVudGlmaWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKLQotICAgIG1fcG9ydDEgPSBNZXNz YWdlUG9ydDo6Y3JlYXRlKGNvbnRleHQsIGlkMSwgaWQyKTsKLSAgICBtX3BvcnQyID0gTWVzc2Fn ZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDIsIGlkMSk7Ci0KICAgICBpZiAoIWNvbnRleHQuYWN0 aXZlRE9NT2JqZWN0c0FyZVN0b3BwZWQoKSkgewotICAgICAgICBBU1NFUlQoIW1fcG9ydDEtPmNs b3NlZCgpKTsKLSAgICAgICAgQVNTRVJUKCFtX3BvcnQyLT5jbG9zZWQoKSk7Ci0gICAgICAgIE1l c3NhZ2VQb3J0Q2hhbm5lbFByb3ZpZGVyOjpmcm9tQ29udGV4dChjb250ZXh0KS5jcmVhdGVOZXdN ZXNzYWdlUG9ydENoYW5uZWwoaWQxLCBpZDIpOworICAgICAgICBBU1NFUlQoIXBvcnQxKCkuY2xv c2VkKCkpOworICAgICAgICBBU1NFUlQoIXBvcnQyKCkuY2xvc2VkKCkpOworICAgICAgICBNZXNz YWdlUG9ydENoYW5uZWxQcm92aWRlcjo6ZnJvbUNvbnRleHQoY29udGV4dCkuY3JlYXRlTmV3TWVz c2FnZVBvcnRDaGFubmVsKHBvcnQxKCkuaWRlbnRpZmllcigpLCBwb3J0MigpLmlkZW50aWZpZXIo KSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgQVNTRVJUKG1fcG9ydDEtPmNsb3NlZCgpKTsKLSAg ICAgICAgQVNTRVJUKG1fcG9ydDItPmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJUKHBvcnQxKCku Y2xvc2VkKCkpOworICAgICAgICBBU1NFUlQocG9ydDIoKS5jbG9zZWQoKSk7CiAgICAgfQogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuaCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5oCmluZGV4IGUwMGRiOTkzOGJhOWZkZGI1NTk2 OGRmMDU0MDQwYWY3YTEwNzgxMTYuLmY4OWE2MmI2NWM3MWMwZWFhZDU1YWMzYWRhYjliOTY4Yjc3 ODIwNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5oCkBAIC0zOSwxNCArMzksMTMg QEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVzc2FnZUNoYW5uZWw+IGNyZWF0ZShTY3JpcHRF eGVjdXRpb25Db250ZXh0Jik7CiAgICAgfk1lc3NhZ2VDaGFubmVsKCk7CiAKLSAgICBNZXNzYWdl UG9ydCogcG9ydDEoKSBjb25zdCB7IHJldHVybiBtX3BvcnQxLmdldCgpOyB9Ci0gICAgTWVzc2Fn ZVBvcnQqIHBvcnQyKCkgY29uc3QgeyByZXR1cm4gbV9wb3J0Mi5nZXQoKTsgfQorICAgIE1lc3Nh Z2VQb3J0JiBwb3J0MSgpIGNvbnN0IHsgcmV0dXJuIG1fcG9ydHMuZmlyc3QuZ2V0KCk7IH0KKyAg ICBNZXNzYWdlUG9ydCYgcG9ydDIoKSBjb25zdCB7IHJldHVybiBtX3BvcnRzLnNlY29uZC5nZXQo KTsgfQogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lc3NhZ2VDaGFubmVsKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmKTsKIAotICAgIFJlZlB0cjxNZXNzYWdlUG9ydD4gbV9wb3J0MTsKLSAgICBS ZWZQdHI8TWVzc2FnZVBvcnQ+IG1fcG9ydDI7CisgICAgc3RkOjpwYWlyPFJlZjxNZXNzYWdlUG9y dD4sIFJlZjxNZXNzYWdlUG9ydD4+IG1fcG9ydHM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCg== 445760 2021-12-02 12:27:13 -0800 2021-12-02 14:22:57 -0800 Patch bug-233772-20211202122712.patch text/plain 6869 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTg0YjY4ZjQ2N2E5ZTdk NjA1ZGM1NGNlOGZlYWY2Nzc4NWY3NzIyYi4uMDQzODU0ZDA3MmIyYmM4OTRkY2RkMmUzMmY1Mzc4 ZDZmZmM2OTMwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWVzc2FnZUNoYW5uZWw6OnBv cnQxKCkgLyBwb3J0MigpIHNob3VsZCByZXR1cm4gcmVmZXJlbmNlcyBpbnN0ZWFkIG9mIHBvaW50 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM3 NzIKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIFRo aXMgd2FzIGV4dHJhY3RlZCBmcm9tIEFsZXggQ2hyaXN0ZW5zZW4ncyBsYXJnZSBwYXRjaCBhdCBC dWcgMjMwMzgyLgorCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9BdWRpb1dvcmtsZXROb2Rl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvV29ya2xldE5vZGU6OmNyZWF0ZSk6CisgICAg ICAgICogYmluZGluZ3MvanMvSlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpKU01lc3NhZ2VDaGFubmVsOjp2aXNpdEFkZGl0aW9uYWxDaGlsZHJlbik6CisgICAg ICAgICogZG9tL01lc3NhZ2VDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdlbmVyYXRl TWVzc2FnZVBvcnRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lc3NhZ2VDaGFubmVsOjpNZXNzYWdl Q2hhbm5lbCk6CisgICAgICAgICogZG9tL01lc3NhZ2VDaGFubmVsLmg6CisgICAgICAgIChXZWJD b3JlOjpNZXNzYWdlQ2hhbm5lbDo6cG9ydDEgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVz c2FnZUNoYW5uZWw6OnBvcnQyIGNvbnN0KToKKwogMjAyMS0xMi0wMiAgQWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGlubGluZSBib3ggZ2Vv bWV0cnkgKEJveEdlb21ldHJ5KSB1cGRhdGUgbG9naWMgdG8gYSBkZWRpY2F0ZWQgZnVuY3Rpb24K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0 Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvV29ya2xldE5v ZGUuY3BwCmluZGV4IDhjZWViMzBkOTBlZTZiNDgzM2I0MmUwY2M0NDVkNjVmZGJjN2Q5MzMuLmQz MTJmMWZmYjFkZmQzNzllNTUwNmUzOGVkZGFjMThjODE4NTE4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Xb3JrbGV0Tm9kZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb1dvcmtsZXROb2RlLmNwcApAQCAtODIs OCArODIsOCBAQCBFeGNlcHRpb25PcjxSZWY8QXVkaW9Xb3JrbGV0Tm9kZT4+IEF1ZGlvV29ya2xl dE5vZGU6OmNyZWF0ZShKU0M6OkpTR2xvYmFsT2JqZWN0JgogICAgICAgICByZXR1cm4gRXhjZXB0 aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IsICJBdWRpbyBjb250ZXh0J3MgZnJhbWUgaXMgZGV0YWNo ZWQiX3MgfTsKIAogICAgIGF1dG8gbWVzc2FnZUNoYW5uZWwgPSBNZXNzYWdlQ2hhbm5lbDo6Y3Jl YXRlKCpjb250ZXh0LnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7Ci0gICAgYXV0byBub2RlTWVz c2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5lbC0+cG9ydDEoKTsKLSAgICBhdXRvIHByb2Nlc3Nvck1l c3NhZ2VQb3J0ID0gbWVzc2FnZUNoYW5uZWwtPnBvcnQyKCk7CisgICAgYXV0byYgbm9kZU1lc3Nh Z2VQb3J0ID0gbWVzc2FnZUNoYW5uZWwtPnBvcnQxKCk7CisgICAgYXV0byYgcHJvY2Vzc29yTWVz c2FnZVBvcnQgPSBtZXNzYWdlQ2hhbm5lbC0+cG9ydDIoKTsKIAogICAgIFJlZlB0cjxTZXJpYWxp emVkU2NyaXB0VmFsdWU+IHNlcmlhbGl6ZWRPcHRpb25zOwogICAgIHsKQEAgLTk1LDcgKzk1LDcg QEAgRXhjZXB0aW9uT3I8UmVmPEF1ZGlvV29ya2xldE5vZGU+PiBBdWRpb1dvcmtsZXROb2RlOjpj cmVhdGUoSlNDOjpKU0dsb2JhbE9iamVjdCYKICAgICB9CiAKICAgICBhdXRvIHBhcmFtZXRlckRh dGEgPSBXVEZNb3ZlKG9wdGlvbnMucGFyYW1ldGVyRGF0YSk7Ci0gICAgYXV0byBub2RlID0gYWRv cHRSZWYoKm5ldyBBdWRpb1dvcmtsZXROb2RlKGNvbnRleHQsIG5hbWUsIFdURk1vdmUob3B0aW9u cyksICpub2RlTWVzc2FnZVBvcnQpKTsKKyAgICBhdXRvIG5vZGUgPSBhZG9wdFJlZigqbmV3IEF1 ZGlvV29ya2xldE5vZGUoY29udGV4dCwgbmFtZSwgV1RGTW92ZShvcHRpb25zKSwgbm9kZU1lc3Nh Z2VQb3J0KSk7CiAgICAgbm9kZS0+c3VzcGVuZElmTmVlZGVkKCk7CiAKICAgICBhdXRvIHJlc3Vs dCA9IG5vZGUtPmhhbmRsZUF1ZGlvTm9kZU9wdGlvbnMob3B0aW9ucywgeyAyLCBDaGFubmVsQ291 bnRNb2RlOjpNYXgsIENoYW5uZWxJbnRlcnByZXRhdGlvbjo6U3BlYWtlcnMgfSk7CkBAIC0xMDks NyArMTA5LDcgQEAgRXhjZXB0aW9uT3I8UmVmPEF1ZGlvV29ya2xldE5vZGU+PiBBdWRpb1dvcmts ZXROb2RlOjpjcmVhdGUoSlNDOjpKU0dsb2JhbE9iamVjdCYKICAgICBpZiAobm9kZS0+bnVtYmVy T2ZPdXRwdXRzKCkgPiAwKQogICAgICAgICBjb250ZXh0LnNvdXJjZU5vZGVXaWxsQmVnaW5QbGF5 YmFjayhub2RlKTsKIAotICAgIGNvbnRleHQuYXVkaW9Xb3JrbGV0KCkuY3JlYXRlUHJvY2Vzc29y KG5hbWUsIHByb2Nlc3Nvck1lc3NhZ2VQb3J0LT5kaXNlbnRhbmdsZSgpLCBzZXJpYWxpemVkT3B0 aW9ucy5yZWxlYXNlTm9uTnVsbCgpLCBub2RlKTsKKyAgICBjb250ZXh0LmF1ZGlvV29ya2xldCgp LmNyZWF0ZVByb2Nlc3NvcihuYW1lLCBwcm9jZXNzb3JNZXNzYWdlUG9ydC5kaXNlbnRhbmdsZSgp LCBzZXJpYWxpemVkT3B0aW9ucy5yZWxlYXNlTm9uTnVsbCgpLCBub2RlKTsKIAogICAgIHsKICAg ICAgICAgLy8gVGhlIG5vZGUgc2hvdWxkIGJlIG1hbnVhbGx5IGFkZGVkIHRvIHRoZSBhdXRvbWF0 aWMgcHVsbCBub2RlIGxpc3QsIGV2ZW4gd2l0aG91dCBhIGNvbm5lY3QoKSBjYWxsLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNNZXNzYWdlQ2hhbm5lbEN1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNw cAppbmRleCA3NzVkODJjZjQ5MTZjNDFmYmYxZGUyNWViYjM2NmZjMDQ3NDJlY2I3Li5jNTU5NTA3 YjIwZmJhNDY0NzBiNDkxMzYwZWRhZmVkYWVjODkyNzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcApAQCAtMzYsMTEg KzM2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdGVtcGxhdGU8dHlwZW5hbWUgVmlzaXRvcj4K IHZvaWQgSlNNZXNzYWdlQ2hhbm5lbDo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4oVmlzaXRvciYg dmlzaXRvcikKIHsKLSAgICBpZiAoTWVzc2FnZVBvcnQqIHBvcnQgPSB3cmFwcGVkKCkucG9ydDEo KSkKLSAgICAgICAgdmlzaXRvci5hZGRPcGFxdWVSb290KHBvcnQpOwotCi0gICAgaWYgKE1lc3Nh Z2VQb3J0KiBwb3J0ID0gd3JhcHBlZCgpLnBvcnQyKCkpCi0gICAgICAgIHZpc2l0b3IuYWRkT3Bh cXVlUm9vdChwb3J0KTsKKyAgICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3QoJndyYXBwZWQoKS5wb3J0 MSgpKTsKKyAgICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3QoJndyYXBwZWQoKS5wb3J0MigpKTsKIH0K IAogREVGSU5FX1ZJU0lUX0FERElUSU9OQUxfQ0hJTERSRU4oSlNNZXNzYWdlQ2hhbm5lbCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL01lc3NhZ2VDaGFubmVsLmNwcAppbmRleCA3ODE3NjNhOTk5MGIzMWRlZTAw YzRkM2YxMGQ4MTg1MDI5YzBjNzBmLi43ZjdhMTJjM2UyY2M1ZDNmMDYyZWIyZTM5ZWJhMDVhNmUy YzEzNDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlQ2hhbm5lbC5jcHAKQEAgLTMzLDI2ICsz MywyOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBzdGQ6OnBhaXI8UmVmPE1l c3NhZ2VQb3J0PiwgUmVmPE1lc3NhZ2VQb3J0Pj4gZ2VuZXJhdGVNZXNzYWdlUG9ydHMoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkKK3sKKyAgICBNZXNzYWdlUG9ydElkZW50aWZpZXIg aWQxID0geyBQcm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZpZXI8TWVzc2FnZVBv cnRJZGVudGlmaWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgpIH07CisgICAgTWVz c2FnZVBvcnRJZGVudGlmaWVyIGlkMiA9IHsgUHJvY2Vzczo6aWRlbnRpZmllcigpLCBPYmplY3RJ ZGVudGlmaWVyPE1lc3NhZ2VQb3J0SWRlbnRpZmllcjo6UG9ydElkZW50aWZpZXJUeXBlPjo6Z2Vu ZXJhdGUoKSB9OworCisgICAgcmV0dXJuIHsgTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBp ZDEsIGlkMiksIE1lc3NhZ2VQb3J0OjpjcmVhdGUoY29udGV4dCwgaWQyLCBpZDEpIH07Cit9CisK IFJlZjxNZXNzYWdlQ2hhbm5lbD4gTWVzc2FnZUNoYW5uZWw6OmNyZWF0ZShTY3JpcHRFeGVjdXRp b25Db250ZXh0JiBjb250ZXh0KQogewogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE1lc3NhZ2VD aGFubmVsKGNvbnRleHQpKTsKIH0KIAogTWVzc2FnZUNoYW5uZWw6Ok1lc3NhZ2VDaGFubmVsKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpCisgICAgOiBtX3BvcnRzKGdlbmVyYXRlTWVz c2FnZVBvcnRzKGNvbnRleHQpKQogewotICAgIE1lc3NhZ2VQb3J0SWRlbnRpZmllciBpZDEgPSB7 IFByb2Nlc3M6OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxNZXNzYWdlUG9ydElkZW50 aWZpZXI6OlBvcnRJZGVudGlmaWVyVHlwZT46OmdlbmVyYXRlKCkgfTsKLSAgICBNZXNzYWdlUG9y dElkZW50aWZpZXIgaWQyID0geyBQcm9jZXNzOjppZGVudGlmaWVyKCksIE9iamVjdElkZW50aWZp ZXI8TWVzc2FnZVBvcnRJZGVudGlmaWVyOjpQb3J0SWRlbnRpZmllclR5cGU+OjpnZW5lcmF0ZSgp IH07Ci0KLSAgICBtX3BvcnQxID0gTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0LCBpZDEsIGlk Mik7Ci0gICAgbV9wb3J0MiA9IE1lc3NhZ2VQb3J0OjpjcmVhdGUoY29udGV4dCwgaWQyLCBpZDEp OwotCiAgICAgaWYgKCFjb250ZXh0LmFjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkKCkpIHsKLSAg ICAgICAgQVNTRVJUKCFtX3BvcnQxLT5jbG9zZWQoKSk7Ci0gICAgICAgIEFTU0VSVCghbV9wb3J0 Mi0+Y2xvc2VkKCkpOwotICAgICAgICBNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlcjo6ZnJvbUNv bnRleHQoY29udGV4dCkuY3JlYXRlTmV3TWVzc2FnZVBvcnRDaGFubmVsKGlkMSwgaWQyKTsKKyAg ICAgICAgQVNTRVJUKCFwb3J0MSgpLmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJUKCFwb3J0Migp LmNsb3NlZCgpKTsKKyAgICAgICAgTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXI6OmZyb21Db250 ZXh0KGNvbnRleHQpLmNyZWF0ZU5ld01lc3NhZ2VQb3J0Q2hhbm5lbChwb3J0MSgpLmlkZW50aWZp ZXIoKSwgcG9ydDIoKS5pZGVudGlmaWVyKCkpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIEFTU0VS VChtX3BvcnQxLT5jbG9zZWQoKSk7Ci0gICAgICAgIEFTU0VSVChtX3BvcnQyLT5jbG9zZWQoKSk7 CisgICAgICAgIEFTU0VSVChwb3J0MSgpLmNsb3NlZCgpKTsKKyAgICAgICAgQVNTRVJUKHBvcnQy KCkuY2xvc2VkKCkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L01lc3NhZ2VDaGFubmVsLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNoYW5uZWwuaApp bmRleCBlMDBkYjk5MzhiYTlmZGRiNTU5NjhkZjA1NDA0MGFmN2ExMDc4MTE2Li5mODlhNjJiNjVj NzFjMGVhYWQ1NWFjM2FkYWI5Yjk2OGI3NzgyMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vTWVzc2FnZUNoYW5uZWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUNo YW5uZWwuaApAQCAtMzksMTQgKzM5LDEzIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPE1lc3Nh Z2VDaGFubmVsPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpOwogICAgIH5NZXNzYWdl Q2hhbm5lbCgpOwogCi0gICAgTWVzc2FnZVBvcnQqIHBvcnQxKCkgY29uc3QgeyByZXR1cm4gbV9w b3J0MS5nZXQoKTsgfQotICAgIE1lc3NhZ2VQb3J0KiBwb3J0MigpIGNvbnN0IHsgcmV0dXJuIG1f cG9ydDIuZ2V0KCk7IH0KKyAgICBNZXNzYWdlUG9ydCYgcG9ydDEoKSBjb25zdCB7IHJldHVybiBt X3BvcnRzLmZpcnN0LmdldCgpOyB9CisgICAgTWVzc2FnZVBvcnQmIHBvcnQyKCkgY29uc3QgeyBy ZXR1cm4gbV9wb3J0cy5zZWNvbmQuZ2V0KCk7IH0KIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBN ZXNzYWdlQ2hhbm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7CiAKLSAgICBSZWZQdHI8TWVz c2FnZVBvcnQ+IG1fcG9ydDE7Ci0gICAgUmVmUHRyPE1lc3NhZ2VQb3J0PiBtX3BvcnQyOworICAg IHN0ZDo6cGFpcjxSZWY8TWVzc2FnZVBvcnQ+LCBSZWY8TWVzc2FnZVBvcnQ+PiBtX3BvcnRzOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=