187302 2018-07-03 14:31:37 -0700 [libwebrtc] Allow IP mismatch for local connections on localhost 2018-09-21 08:31:57 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 186932 1 tsaunier tsaunier alex commit-queue eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1438987 0 tsaunier 2018-07-03 14:31:37 -0700 [libwebrtc] Allow IP mismatch for local connections on localhost 1438989 1 344219 tsaunier 2018-07-03 14:34:23 -0700 Created attachment 344219 Patch 1438992 2 344221 tsaunier 2018-07-03 14:37:15 -0700 Created attachment 344221 Patch 1439005 3 youennf 2018-07-03 14:58:23 -0700 Change makes sense, I guess it would make sense in the upstream repo as well. Should we also consider the IPIsAny check? 1439011 4 tsaunier 2018-07-03 15:05:39 -0700 (In reply to youenn fablet from comment #3) > Change makes sense, I guess it would make sense in the upstream repo as well. I guess so yes, I will look into that. > Should we also consider the IPIsAny check? It is a good question, in the failure I was seeing `desired_addresses` was "any" fwiw. Do you want me to add it or let it the way it is and add it only if required in the future? 1439020 5 344221 youennf 2018-07-03 15:28:35 -0700 Comment on attachment 344221 Patch LGTM, let's land it as is for now. If you have time to upstream this change, please also discuss the IPIsAny point at the same time. 1439227 6 344221 commit-queue 2018-07-04 08:47:28 -0700 Comment on attachment 344221 Patch Clearing flags on attachment: 344221 Committed r233506: <https://trac.webkit.org/changeset/233506> 1439228 7 commit-queue 2018-07-04 08:47:30 -0700 All reviewed patches have been landed. Closing bug. 1439230 8 webkit-bug-importer 2018-07-04 08:48:19 -0700 <rdar://problem/41821903> 1461800 9 tsaunier 2018-09-21 06:01:19 -0700 Reopening to attach new patch. 1461801 10 350350 tsaunier 2018-09-21 06:01:21 -0700 Created attachment 350350 Patch 1461802 11 tsaunier 2018-09-21 06:01:51 -0700 This patch was reverted during the last libwebrtc update. 1461809 12 350350 alex 2018-09-21 06:18:31 -0700 Comment on attachment 350350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350350&action=review > Source/ThirdParty/libwebrtc/Source/webrtc/p2p/base/tcpport.cc:-354 > - RTC_DCHECK(std::find_if(desired_addresses.begin(), desired_addresses.end(), I think we can use the webkit compilation define WEBRTC_WEBKIT_BUILD, that way we can try to avoid the patch is removed again in the next merge. At least until we can merge upstream. 1461811 13 350352 tsaunier 2018-09-21 06:26:34 -0700 Created attachment 350352 Patch 1461814 14 tsaunier 2018-09-21 06:29:42 -0700 New version of the patch has been proposed on https://bugs.webkit.org/show_bug.cgi?id=189828 as asked (so we are required to have 1 patch per bug) 1461856 15 youennf 2018-09-21 08:31:57 -0700 (In reply to Thibault Saunier from comment #11) > This patch was reverted during the last libwebrtc update. Yes, sorry. We will need to come up with a better way of keeping these changes in our trunk when resyncing libwebrtc. 344219 2018-07-03 14:34:23 -0700 2018-07-03 14:37:10 -0700 Patch bug-187302-20180703173422.patch text/plain 1798 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2NzllNGE1NzI4NWE0NzE2NmY2OGQ5OWJlNWEzOTkxNjAxN2FiMDZiLi5lOTZh YTFkMzRhODg5NDFhYWI1ZjNiOTZlOGVhZjEyYjAyZGU3Y2FiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNy0wMyAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2xpYndlYnJ0Y10gQWxs b3cgSVAgbWlzbWF0Y2ggZm9yIGxvY2FsIGNvbm5lY3Rpb25zIG9uIGxvY2FsaG9zdAorICAgICAg ICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlc3Qgb2YgdGhlIGNvZGUgYWxsb3dzIGl0LCBidXQg dGhlcmUgd2FzIGFuIHVuZWNlc3NhcnkgYXNzZXJ0CisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRj L3AycC9iYXNlL3RjcHBvcnQuY2M6CisKIDIwMTgtMDYtMjYgIFl1c3VrZSBTdXp1a2kgIDx1dGF0 YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBSZW1vdmUgZ2ZsYWdzIGZy b20gbGlid2VicnRjIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvU291cmNlL3dlYnJ0Yy9wMnAvYmFzZS90Y3Bwb3J0LmNjIGIvU291cmNlL1RoaXJkUGFydHkv bGlid2VicnRjL1NvdXJjZS93ZWJydGMvcDJwL2Jhc2UvdGNwcG9ydC5jYwppbmRleCBmNmNhZjNl OGM1YjZhMGFhNGFiMjBiYWQ2NGQ2NDdlMjMzNmI3YWZlLi44OWQ2MGQ4ZDFiMWYyMjEwZDdlOThm MmM0M2JlZDY4NDRjZjRkNmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvU291cmNlL3dlYnJ0Yy9wMnAvYmFzZS90Y3Bwb3J0LmNjCisrKyBiL1NvdXJjZS9UaGlyZFBh cnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3AycC9iYXNlL3RjcHBvcnQuY2MKQEAgLTM0Myw5 ICszNDMsOSBAQCBUQ1BDb25uZWN0aW9uOjpUQ1BDb25uZWN0aW9uKFRDUFBvcnQqIHBvcnQsCiAg ICAgICAgIDw8ICIsIHBvcnQoKSBOZXR3b3JrOiIgPDwgcG9ydC0+TmV0d29yaygpLT5Ub1N0cmlu ZygpOwogICAgIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6SW50ZXJmYWNlQWRkcmVzcz4mIGRlc2ly ZWRfYWRkcmVzc2VzID0KICAgICAgICAgcG9ydF8tPk5ldHdvcmsoKS0+R2V0SVBzKCk7Ci0gICAg UlRDX0RDSEVDSyhzdGQ6OmZpbmQoZGVzaXJlZF9hZGRyZXNzZXMuYmVnaW4oKSwgZGVzaXJlZF9h ZGRyZXNzZXMuZW5kKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgc29ja2V0Xy0+R2V0TG9j YWxBZGRyZXNzKCkuaXBhZGRyKCkpICE9Ci0gICAgICAgICAgICAgICBkZXNpcmVkX2FkZHJlc3Nl cy5lbmQoKSk7CisgICAgUlRDX0RDSEVDSyhzb2NrZXQtPkdldExvY2FsQWRkcmVzcygpLklzTG9v cGJhY2tJUCgpIHx8CisgICAgICAgIHN0ZDo6ZmluZChkZXNpcmVkX2FkZHJlc3Nlcy5iZWdpbigp LCBkZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSwKKyAgICAgICAgc29ja2V0Xy0+R2V0TG9jYWxBZGRy ZXNzKCkuaXBhZGRyKCkpICE9IGRlc2lyZWRfYWRkcmVzc2VzLmVuZCgpKTsKICAgICBDb25uZWN0 U29ja2V0U2lnbmFscyhzb2NrZXQpOwogICB9CiB9Cg== 344221 2018-07-03 14:37:15 -0700 2018-09-21 06:01:13 -0700 Patch bug-187302-20180703173713.patch text/plain 1819 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2NzllNGE1NzI4NWE0NzE2NmY2OGQ5OWJlNWEzOTkxNjAxN2FiMDZiLi45OTA3 MjkwNGE1YWVlYTBiZGM1YWQyMjFkNWM3ZTIxY2FmZTg2ZjdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNy0wMyAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2xpYndlYnJ0Y10gQWxs b3cgSVAgbWlzbWF0Y2ggZm9yIGxvY2FsIGNvbm5lY3Rpb25zIG9uIGxvY2FsaG9zdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MzAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlc3Qgb2YgdGhl IGNvZGUgYWxsb3dzIGl0LCBidXQgdGhlcmUgd2FzIGFuIHVuZWNlc3NhcnkgYXNzZXJ0CisKKyAg ICAgICAgKiBTb3VyY2Uvd2VicnRjL3AycC9iYXNlL3RjcHBvcnQuY2M6CisKIDIwMTgtMDYtMjYg IFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgW0dUS11b V1BFXSBSZW1vdmUgZ2ZsYWdzIGZyb20gbGlid2VicnRjIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9wMnAvYmFzZS90Y3Bwb3J0LmNj IGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvcDJwL2Jhc2UvdGNw cG9ydC5jYwppbmRleCBmNmNhZjNlOGM1YjZhMGFhNGFiMjBiYWQ2NGQ2NDdlMjMzNmI3YWZlLi44 OWQ2MGQ4ZDFiMWYyMjEwZDdlOThmMmM0M2JlZDY4NDRjZjRkNmQ5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9wMnAvYmFzZS90Y3Bwb3J0LmNj CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3AycC9iYXNl L3RjcHBvcnQuY2MKQEAgLTM0Myw5ICszNDMsOSBAQCBUQ1BDb25uZWN0aW9uOjpUQ1BDb25uZWN0 aW9uKFRDUFBvcnQqIHBvcnQsCiAgICAgICAgIDw8ICIsIHBvcnQoKSBOZXR3b3JrOiIgPDwgcG9y dC0+TmV0d29yaygpLT5Ub1N0cmluZygpOwogICAgIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6SW50 ZXJmYWNlQWRkcmVzcz4mIGRlc2lyZWRfYWRkcmVzc2VzID0KICAgICAgICAgcG9ydF8tPk5ldHdv cmsoKS0+R2V0SVBzKCk7Ci0gICAgUlRDX0RDSEVDSyhzdGQ6OmZpbmQoZGVzaXJlZF9hZGRyZXNz ZXMuYmVnaW4oKSwgZGVzaXJlZF9hZGRyZXNzZXMuZW5kKCksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgc29ja2V0Xy0+R2V0TG9jYWxBZGRyZXNzKCkuaXBhZGRyKCkpICE9Ci0gICAgICAgICAg ICAgICBkZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSk7CisgICAgUlRDX0RDSEVDSyhzb2NrZXQtPkdl dExvY2FsQWRkcmVzcygpLklzTG9vcGJhY2tJUCgpIHx8CisgICAgICAgIHN0ZDo6ZmluZChkZXNp cmVkX2FkZHJlc3Nlcy5iZWdpbigpLCBkZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSwKKyAgICAgICAg c29ja2V0Xy0+R2V0TG9jYWxBZGRyZXNzKCkuaXBhZGRyKCkpICE9IGRlc2lyZWRfYWRkcmVzc2Vz LmVuZCgpKTsKICAgICBDb25uZWN0U29ja2V0U2lnbmFscyhzb2NrZXQpOwogICB9CiB9Cg== 350350 2018-09-21 06:01:21 -0700 2018-09-21 06:26:30 -0700 Patch bug-187302-20180921100120.patch text/plain 2007 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2MDExNzZhNDU2NzUwNDA5NDNhMTc4NDIxYjdlMDg1M2U4NWRmYmYzLi4yNDhj NGE1NjYzZmQ4MThlMTVlZGQwNWQ5N2VhZGQ4NjcxMzY0NjE1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNy0wNCAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2xpYndlYnJ0Y10gQWxs b3cgSVAgbWlzbWF0Y2ggZm9yIGxvY2FsIGNvbm5lY3Rpb25zIG9uIGxvY2FsaG9zdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MzAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBUaGUgcmVzdCBvZiB0aGUg Y29kZSBhbGxvd3MgaXQsIGJ1dCB0aGVyZSB3YXMgYW4gdW5lY2Vzc2FyeSBhc3NlcnQKKworICAg ICAgICAqIFNvdXJjZS93ZWJydGMvcDJwL2Jhc2UvdGNwcG9ydC5jYzoKKwogMjAxOC0wOS0xOCAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IFJU Q1J0cFJlY2VpdmVyIGdldENvbnRyaWJ1dGluZ1NvdXJjZXMvZ2V0U3luY2hyb25pemF0aW9uU291 cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJy dGMvcDJwL2Jhc2UvdGNwcG9ydC5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3Vy Y2Uvd2VicnRjL3AycC9iYXNlL3RjcHBvcnQuY2MKaW5kZXggZDA3MGY2ZWNlZThkYTM0N2IwOTE2 YTkwMjlmMzk3NGQyOTY5ZmI4Ni4uYmY4ODJiZjhkNDVlMWMwZWY3ODBkNGU5N2ZlMDJmM2Y4NDc0 MTU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJy dGMvcDJwL2Jhc2UvdGNwcG9ydC5jYworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv U291cmNlL3dlYnJ0Yy9wMnAvYmFzZS90Y3Bwb3J0LmNjCkBAIC0zNTEsMTEgKzM1MSwxMiBAQCBU Q1BDb25uZWN0aW9uOjpUQ1BDb25uZWN0aW9uKFRDUFBvcnQqIHBvcnQsCiAgICAgICAgICAgICAg ICAgICAgICAgICA8PCAiLCBwb3J0KCkgTmV0d29yazoiIDw8IHBvcnQtPk5ldHdvcmsoKS0+VG9T dHJpbmcoKTsKICAgICBjb25zdCBzdGQ6OnZlY3RvcjxydGM6OkludGVyZmFjZUFkZHJlc3M+JiBk ZXNpcmVkX2FkZHJlc3NlcyA9CiAgICAgICAgIHBvcnRfLT5OZXR3b3JrKCktPkdldElQcygpOwot ICAgIFJUQ19EQ0hFQ0soc3RkOjpmaW5kX2lmKGRlc2lyZWRfYWRkcmVzc2VzLmJlZ2luKCksIGRl c2lyZWRfYWRkcmVzc2VzLmVuZCgpLAorICAgIFJUQ19EQ0hFQ0soc29ja2V0LT5HZXRMb2NhbEFk ZHJlc3MoKS5Jc0xvb3BiYWNrSVAoKSB8fAorICAgICAgICAgICAgICAgKHN0ZDo6ZmluZF9pZihk ZXNpcmVkX2FkZHJlc3Nlcy5iZWdpbigpLCBkZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBbdGhpc10oY29uc3QgcnRjOjpJbnRlcmZhY2VBZGRyZXNz JiBhZGRyKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gc29ja2V0Xy0+ R2V0TG9jYWxBZGRyZXNzKCkuaXBhZGRyKCkgPT0KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBhZGRyOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pICE9IGRlc2ly ZWRfYWRkcmVzc2VzLmVuZCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9KSAhPSBk ZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSkpOwogICAgIENvbm5lY3RTb2NrZXRTaWduYWxzKHNvY2tl dCk7CiAgIH0KIH0K 350352 2018-09-21 06:26:34 -0700 2018-09-21 06:30:12 -0700 Patch bug-187302-20180921102633.patch text/plain 2294 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2MDExNzZhNDU2NzUwNDA5NDNhMTc4NDIxYjdlMDg1M2U4NWRmYmYzLi41YzNm ZWEyZTFkMjE0YWQwNjkxZDA4NmU3NTAzZGVhNDkzMzUxOGY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNy0wNCAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2xpYndlYnJ0Y10gQWxs b3cgSVAgbWlzbWF0Y2ggZm9yIGxvY2FsIGNvbm5lY3Rpb25zIG9uIGxvY2FsaG9zdAorICAgICAg ICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlc3Qgb2YgdGhlIGNvZGUgYWxsb3dzIGl0LCBidXQg dGhlcmUgd2FzIGFuIHVuZWNlc3NhcnkgYXNzZXJ0CisKKyAgICAgICAgU2VlIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODczMDIKKworICAgICAgICAqIFNvdXJjZS93 ZWJydGMvcDJwL2Jhc2UvdGNwcG9ydC5jYzoKKwogMjAxOC0wOS0xOCAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IFJUQ1J0cFJlY2VpdmVyIGdl dENvbnRyaWJ1dGluZ1NvdXJjZXMvZ2V0U3luY2hyb25pemF0aW9uU291cmNlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvcDJwL2Jhc2UvdGNw cG9ydC5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3AycC9i YXNlL3RjcHBvcnQuY2MKaW5kZXggZDA3MGY2ZWNlZThkYTM0N2IwOTE2YTkwMjlmMzk3NGQyOTY5 ZmI4Ni4uMTFjZjEzNGE0ZjlkNzNmNTUzY2MxNDEwYzQyMWE1ZmZiMDZmMWI0YyAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvcDJwL2Jhc2UvdGNw cG9ydC5jYworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9w MnAvYmFzZS90Y3Bwb3J0LmNjCkBAIC0zNTEsMTEgKzM1MSwyMSBAQCBUQ1BDb25uZWN0aW9uOjpU Q1BDb25uZWN0aW9uKFRDUFBvcnQqIHBvcnQsCiAgICAgICAgICAgICAgICAgICAgICAgICA8PCAi LCBwb3J0KCkgTmV0d29yazoiIDw8IHBvcnQtPk5ldHdvcmsoKS0+VG9TdHJpbmcoKTsKICAgICBj b25zdCBzdGQ6OnZlY3RvcjxydGM6OkludGVyZmFjZUFkZHJlc3M+JiBkZXNpcmVkX2FkZHJlc3Nl cyA9CiAgICAgICAgIHBvcnRfLT5OZXR3b3JrKCktPkdldElQcygpOworCisjaWYgZGVmaW5lZChX RUJSVENfV0VCS0lUX0JVSUxEKQorICAgIFJUQ19EQ0hFQ0soc29ja2V0LT5HZXRMb2NhbEFkZHJl c3MoKS5Jc0xvb3BiYWNrSVAoKSB8fAorICAgICAgICAgICAgICAgKHN0ZDo6ZmluZF9pZihkZXNp cmVkX2FkZHJlc3Nlcy5iZWdpbigpLCBkZXNpcmVkX2FkZHJlc3Nlcy5lbmQoKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBbdGhpc10oY29uc3QgcnRjOjpJbnRlcmZhY2VBZGRyZXNzJiBh ZGRyKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gc29ja2V0Xy0+R2V0 TG9jYWxBZGRyZXNzKCkuaXBhZGRyKCkgPT0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhZGRyOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pICE9IGRlc2lyZWRf YWRkcmVzc2VzLmVuZCgpKSk7CisjZWxzZQogICAgIFJUQ19EQ0hFQ0soc3RkOjpmaW5kX2lmKGRl c2lyZWRfYWRkcmVzc2VzLmJlZ2luKCksIGRlc2lyZWRfYWRkcmVzc2VzLmVuZCgpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFt0aGlzXShjb25zdCBydGM6OkludGVyZmFjZUFkZHJlc3Mm IGFkZHIpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzb2NrZXRfLT5H ZXRMb2NhbEFkZHJlc3MoKS5pcGFkZHIoKSA9PQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFkZHI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSkgIT0gZGVzaXJl ZF9hZGRyZXNzZXMuZW5kKCkpOworI2VuZGlmCiAgICAgQ29ubmVjdFNvY2tldFNpZ25hbHMoc29j a2V0KTsKICAgfQogfQo=