191261 2018-11-05 06:59:49 -0800 Calling sender.replaceTrack() twice produces a new transceiver and its corresponding m= section 2018-11-06 19:43:46 -0800 1 1 1 Unclassified WebKit WebRTC Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Major --- 1 ibc youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1475070 0 353860 ibc 2018-11-05 06:59:49 -0800 Created attachment 353860 Script that reproduces the issue. Just run it in Safari 12.1 console with "Unified-Plan" enabled. Scenario: * Have a pc with an audio transceiver for just sending. * Do transceiver.sender.replaceTrack(null) and renegotiate. * Do transceiver.sender.replaceTrack(track) and renegotiate. After that, we have two audio transceivers so two m=audio sections. Of course this should not happen. It works fine in Chrome and Firefox. Script attached. 1475393 1 youennf 2018-11-05 19:46:21 -0800 This is a left over of plan B/unified plan migration. Will fix it 1475457 2 353952 youennf 2018-11-06 01:45:31 -0800 Created attachment 353952 Patch 1475522 3 353952 eric.carlson 2018-11-06 07:19:10 -0800 Comment on attachment 353952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353952&action=review > Source/WebCore/ChangeLog:11 > + Covered by updated test. Nit: you should mention that you updated webrtc/video-addTransceiver.html to test this. 1475810 4 354040 youennf 2018-11-06 18:17:50 -0800 Created attachment 354040 Patch for landing 1475838 5 354040 commit-queue 2018-11-06 19:24:07 -0800 Comment on attachment 354040 Patch for landing Clearing flags on attachment: 354040 Committed r237910: <https://trac.webkit.org/changeset/237910> 1475839 6 commit-queue 2018-11-06 19:24:08 -0800 All reviewed patches have been landed. Closing bug. 1475840 7 webkit-bug-importer 2018-11-06 19:25:26 -0800 <rdar://problem/45864192> 1475843 8 youennf 2018-11-06 19:43:46 -0800 (In reply to Eric Carlson from comment #3) > Comment on attachment 353952 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=353952&action=review > > > Source/WebCore/ChangeLog:11 > > + Covered by updated test. > > Nit: you should mention that you updated webrtc/video-addTransceiver.html to > test this. Thanks for the review. Done! 353860 2018-11-05 06:59:49 -0800 2018-11-05 06:59:49 -0800 Script that reproduces the issue. Just run it in Safari 12.1 console with "Unified-Plan" enabled. sender-replaceTrack-produces-new-transceiver.js text/javascript 3015 ibc bGV0IG1pY1RyYWNrOwpsZXQgcGMxOwpsZXQgcGMyOwpsZXQgbWljVHJhbnNjZWl2ZXI7CgpuYXZp Z2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IGF1ZGlvOiB0cnVlIH0pCgkudGhlbigo c3RyZWFtKSA9PgoJewoJCW1pY1RyYWNrID0gc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF07Cgl9 KQoJLnRoZW4oKCkgPT4KCXsKCQlwYzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oCgkJCXsKCQkJ CWljZVNlcnZlcnMgICAgOiBbXSwKCQkJCWJ1bmRsZVBvbGljeSAgOiAnbWF4LWJ1bmRsZScsCgkJ CQlydGNwTXV4UG9saWN5IDogJ3JlcXVpcmUnLAoJCQkJc2RwU2VtYW50aWNzICA6ICd1bmlmaWVk LXBsYW4nCgkJCX0pOwoKCQlwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oCgkJCXsKCQkJCWlj ZVNlcnZlcnMgICAgOiBbXSwKCQkJCWJ1bmRsZVBvbGljeSAgOiAnbWF4LWJ1bmRsZScsCgkJCQly dGNwTXV4UG9saWN5IDogJ3JlcXVpcmUnLAoJCQkJc2RwU2VtYW50aWNzICA6ICd1bmlmaWVkLXBs YW4nCgkJCX0pOwoKCQljb25zb2xlLndhcm4oJ3BjMTogYWRkaW5nIG1pYyB0cmFjaycpOwoKCQlt aWNUcmFuc2NlaXZlciA9CgkJCXBjMS5hZGRUcmFuc2NlaXZlcihtaWNUcmFjaywgeyBkaXJlY3Rp b246ICdzZW5kb25seScgfSk7Cgl9KQoJLnRoZW4oKCkgPT4gbmVnb3RpYXRlU2RwcygpKQoJLnRo ZW4oKCkgPT4KCXsKCQljb25zb2xlLndhcm4oJ3BjMTogcmVtb3ZpbmcgbWljIHRyYWNrIHVzaW5n IHJlcGxhY2VUcmFjayhudWxsKScpOwoKCQkvLyBOT1RFOiBUaGlzIGRvZXMgbm90IHdvcmsgaGVy ZS4gYT1kaXJlY3Rpb24gcmVtYWlucyAic2VuZG9ubHkiIGluCgkJLy8gdGhlIG5ldyBvZmZlci4K CQltaWNUcmFuc2NlaXZlci5kaXJlY3Rpb24gPSAnaW5hY3RpdmUnOwoKCQlyZXR1cm4gbWljVHJh bnNjZWl2ZXIuc2VuZGVyLnJlcGxhY2VUcmFjayhudWxsKTsKCX0pCgkudGhlbigoKSA9PgoJewoJ CS8vIE5PVEU6IFRoaXMgZG9lcyBub3Qgd29yayBuZWl0aGVyIGhlcmUuIGE9ZGlyZWN0aW9uIHJl bWFpbnMgInNlbmRvbmx5IiBpbgoJCS8vIHRoZSBuZXcgb2ZmZXIuCgkJbWljVHJhbnNjZWl2ZXIu ZGlyZWN0aW9uID0gJ2luYWN0aXZlJzsKCX0pCgkudGhlbigoKSA9PiBuZWdvdGlhdGVTZHBzKCkp CgkudGhlbigoKSA9PgoJewoJCWNvbnNvbGUud2FybigncGMxOiBhZGRpbmcgbWljIHRyYWNrIGFn YWluIHVzaW5nIHJlcGxhY2VUcmFjayh0cmFjayknKTsKCgkJLy8gTk9URTogVGhpcyBkb2VzIG5v dGhpbmcgYXMgaXQgd2FzIG5vICJpbmFjdGl2ZSIgZHVlIHRoaXMgYnVnOgoJCS8vICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTI2MAoJCW1pY1RyYW5zY2VpdmVy LmRpcmVjdGlvbiA9ICdzZW5kb25seSc7CgoJCXJldHVybiBtaWNUcmFuc2NlaXZlci5zZW5kZXIu cmVwbGFjZVRyYWNrKG1pY1RyYWNrKTsKCX0pCgkudGhlbigoKSA9PiBuZWdvdGlhdGVTZHBzKCkp CgkuY2F0Y2goKGVycm9yKSA9PgoJewoJCWNvbnNvbGUuZXJyb3IoZXJyb3IpOwoJfSk7CgpmdW5j dGlvbiBuZWdvdGlhdGVTZHBzKCkKewoJbGV0IGVycm9yZWQgPSBmYWxzZTsKCglyZXR1cm4gUHJv bWlzZS5yZXNvbHZlKCkKCQkudGhlbigoKSA9PiBwYzEuY3JlYXRlT2ZmZXIoKSkKCQkuY2F0Y2go KGVycm9yKSA9PgoJCXsKCQkJY29uc29sZS5lcnJvcigncGMxLmNyZWF0ZU9mZmVyKCkgZmFpbGVk Jyk7CgoJCQllcnJvcmVkID0gdHJ1ZTsKCQkJdGhyb3cgZXJyb3I7CgkJfSkKCQkudGhlbigob2Zm ZXIpID0+CgkJewoJCQljb25zb2xlLndhcm4oJ3BjMS5jcmVhdGVPZmZlcigpIHN1Y2NlZWRlZDpc biVzJywgb2ZmZXIuc2RwKTsKCgkJCXJldHVybiBwYzEuc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZl cik7CgkJfSkKCQkuY2F0Y2goKGVycm9yKSA9PgoJCXsKCQkJaWYgKGVycm9yZWQpCgkJCQl0aHJv dyBlcnJvcjsKCgkJCWNvbnNvbGUuZXJyb3IoJ3BjMS5zZXRMb2NhbERlc2NyaXB0aW9uKCkgZmFp bGVkJyk7CgoJCQllcnJvcmVkID0gdHJ1ZTsKCQkJdGhyb3cgZXJyb3I7CgkJfSkKCQkudGhlbigo KSA9PgoJCXsKCQkJY29uc3Qgb2ZmZXIgPSBwYzEubG9jYWxEZXNjcmlwdGlvbjsKCgkJCXJldHVy biBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpOwoJCX0pCgkJLmNhdGNoKChlcnJvcikg PT4KCQl7CgkJCWlmIChlcnJvcmVkKQoJCQkJdGhyb3cgZXJyb3I7CgoJCQljb25zb2xlLmVycm9y KCdwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oKSBmYWlsZWQnKTsKCgkJCWVycm9yZWQgPSB0cnVl OwoJCQl0aHJvdyBlcnJvcjsKCQl9KQoJCS50aGVuKCgpID0+IHBjMi5jcmVhdGVBbnN3ZXIoKSkK CQkuY2F0Y2goKGVycm9yKSA9PgoJCXsKCQkJaWYgKGVycm9yZWQpCgkJCQl0aHJvdyBlcnJvcjsK CgkJCWNvbnNvbGUuZXJyb3IoJ3BjMi5jcmVhdGVBbnN3ZXIoKSBmYWlsZWQnKTsKCgkJCWVycm9y ZWQgPSB0cnVlOwoJCQl0aHJvdyBlcnJvcjsKCQl9KQoJCS50aGVuKChhbnN3ZXIpID0+IHBjMi5z ZXRMb2NhbERlc2NyaXB0aW9uKGFuc3dlcikpCgkJLmNhdGNoKChlcnJvcikgPT4KCQl7CgkJCWlm IChlcnJvcmVkKQoJCQkJdGhyb3cgZXJyb3I7CgoJCQljb25zb2xlLmVycm9yKCdwYzIuc2V0TG9j YWxEZXNjcmlwdGlvbigpIGZhaWxlZCcpOwoKCQkJZXJyb3JlZCA9IHRydWU7CgkJCXRocm93IGVy cm9yOwoJCX0pCgkJLnRoZW4oKCkgPT4KCQl7CgkJCWNvbnN0IGFuc3dlciA9IHBjMi5sb2NhbERl c2NyaXB0aW9uOwoKCQkJcmV0dXJuIHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihhbnN3ZXIpOwoJ CX0pCgkJLnRoZW4oKCkgPT4KCQl7CgkJCWNvbnNvbGUud2FybigncGMxLnNldFJlbW90ZURlc2Ny aXB0aW9uKCkgc3VjY2VlZGVkJyk7CgkJfSkKCQkuY2F0Y2goKGVycm9yKSA9PgoJCXsKCQkJaWYg KGVycm9yZWQpCgkJCQl0aHJvdyBlcnJvcjsKCgkJCWNvbnNvbGUuZXJyb3IoJ3BjMi5zZXRSZW1v dGVEZXNjcmlwdGlvbigpIGZhaWxlZCcpOwoKCQkJdGhyb3cgZXJyb3I7CgkJfSk7Cn0K 353952 2018-11-06 01:45:31 -0800 2018-11-06 18:17:46 -0800 Patch bug-191261-20181106164535.patch text/plain 13688 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVmY2I5YjY2ZGIxZGUy MTI4M2ZkMDk5YjNkY2MwZDhhYTEzMThjYS4uMmE4NzBlYTYzNTc5Y2ZjMjEzYWQxMDU2MzUwYjRm MjRkZmI2MDQ5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTExLTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIHNlbmRlci5y ZXBsYWNlVHJhY2soKSB0d2ljZSBwcm9kdWNlcyBhIG5ldyB0cmFuc2NlaXZlciBhbmQgaXRzIGNv cnJlc3BvbmRpbmcgbT0gc2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkxMjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSGFuZGxlIHRoZSBjYXNlIG9mIHJlcGxhY2luZyBhIHRyYWNrIGluIGEg c2VuZGVyIHRoYXQgaGFzIG5vIHRyYWNrLgorICAgICAgICBJbiBwYXJ0aWN1bGFyLCBkbyBub3Qg Y3JlYXRlIGEgbmV3IG0tc2VjdGlvbiBhcyB3YXMgaW1wbGllZCBieSBwbGFuIEIgaW1wbGVtZW50 YXRpb24uCisgICAgICAgIEluc3RlYWQsIHNldCB0aGUgdHJhY2sgZGlyZWN0bHkgb24gdGhlIHJ0 YyBzZW5kZXIuCisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0LgorCisgICAgICAgICog TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpjcmVhdGVTb3VyY2VB bmRSVENUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojph ZGRUcmFuc2NlaXZlcik6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50 OjpzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2spOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJl YW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaDoKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpzZXRT ZW5kZXJTb3VyY2VGcm9tVHJhY2spOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNr KToKKwogMjAxOC0xMS0wNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg ICAgICAgTWFrZSBtRE5TIElDRSBDYW5kaWRhdGUgYW4gZXhwZXJpbWVudGFsIGZsYWcgYWdhaW4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2Vu ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVy LmNwcAppbmRleCBjN2NhMmI0ZjI3ZDk5NTlmYjMxMTU1NDQ3YjFhOWY2ZTU3NTM3NzdkLi5hMThj MDJmNTg5Y2FlMjNhZTM1ZTYzZTI5ZTQyZTRiMWVjMzMwY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuY3BwCkBAIC05Miw2ICs5 Miw3IEBAIHZvaWQgUlRDUnRwU2VuZGVyOjpyZXBsYWNlVHJhY2soU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCwgUmVmUHRyPE1lZGlhU3RyCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK KyAgICAvLyBGSVhNRTogVGhpcyB3aG9sZSBmdW5jdGlvbiBzaG91bGQgYmUgZXhlY3V0ZWQgYXMg cGFydCBvZiB0aGUgUlRDUGVlckNvbm5lY3Rpb24gb3BlcmF0aW9uIHF1ZXVlLgogICAgIG1fYmFj a2VuZC0+cmVwbGFjZVRyYWNrKGNvbnRleHQsICp0aGlzLCBXVEZNb3ZlKHdpdGhUcmFjayksIFdU Rk1vdmUocHJvbWlzZSkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5k cG9pbnQuY3BwCmluZGV4IDEzNzMwNThlMTM2YmZjZTM5NGE0YTkxNmQwOTM2N2M0ZTkwYTdlMDQu LmFkYTU0OTU0NGQzMjFmMjU2NDM2ZmFlNjYwNjcwNWVjMjFiOGQwNzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlh RW5kcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCkBAIC01MDcsMTMgKzUwNywxNCBAQCBz dGQ6Om9wdGlvbmFsPExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OkJhY2tlbmRzPiBMaWJXZWJSVENN ZWRpYUVuZHBvaW50OjphZGRUcmFucwogICAgIHJldHVybiBjcmVhdGVUcmFuc2NlaXZlckJhY2tl bmRzKHR5cGUsIGluaXQsIG51bGxwdHIpOwogfQogCi1zdGQ6Om9wdGlvbmFsPExpYldlYlJUQ01l ZGlhRW5kcG9pbnQ6OkJhY2tlbmRzPiBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRUcmFuc2Nl aXZlcihNZWRpYVN0cmVhbVRyYWNrJiB0cmFjaywgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0 JiBpbml0KQorc3RkOjpwYWlyPExpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ6OlNvdXJjZSwgcnRj OjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6TWVkaWFTdHJlYW1UcmFja0ludGVyZmFjZT4+IExpYldl YlJUQ01lZGlhRW5kcG9pbnQ6OmNyZWF0ZVNvdXJjZUFuZFJUQ1RyYWNrKE1lZGlhU3RyZWFtVHJh Y2smIHRyYWNrKQogewogICAgIExpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ6OlNvdXJjZSBzb3Vy Y2U7CiAgICAgcnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6TWVkaWFTdHJlYW1UcmFja0ludGVy ZmFjZT4gcnRjVHJhY2s7CiAgICAgc3dpdGNoICh0cmFjay5wcml2YXRlVHJhY2soKS50eXBlKCkp IHsKICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6Ok5vbmU6Ci0gICAgICAgIHJl dHVybiBzdGQ6Om51bGxvcHQ7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAg ICBicmVhazsKICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvOiB7CiAg ICAgICAgIGF1dG8gYXVkaW9Tb3VyY2UgPSBSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6OmNy ZWF0ZSh0cmFjay5wcml2YXRlVHJhY2soKSk7CiAgICAgICAgIHJ0Y1RyYWNrID0gbV9wZWVyQ29u bmVjdGlvbkZhY3RvcnkuQ3JlYXRlQXVkaW9UcmFjayh0cmFjay5pZCgpLnV0ZjgoKS5kYXRhKCks IGF1ZGlvU291cmNlLnB0cigpKTsKQEAgLTUyNyw4ICs1MjgsMjAgQEAgc3RkOjpvcHRpb25hbDxM aWJXZWJSVENNZWRpYUVuZHBvaW50OjpCYWNrZW5kcz4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6 YWRkVHJhbnMKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIH0KKyAgICByZXR1cm4gc3RkOjpt YWtlX3BhaXIoV1RGTW92ZShzb3VyY2UpLCBXVEZNb3ZlKHJ0Y1RyYWNrKSk7Cit9CiAKLSAgICBy ZXR1cm4gY3JlYXRlVHJhbnNjZWl2ZXJCYWNrZW5kcyhXVEZNb3ZlKHJ0Y1RyYWNrKSwgaW5pdCwg V1RGTW92ZShzb3VyY2UpKTsKK3N0ZDo6b3B0aW9uYWw8TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6 QmFja2VuZHM+IExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmFkZFRyYW5zY2VpdmVyKE1lZGlhU3Ry ZWFtVHJhY2smIHRyYWNrLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQmIGluaXQpCit7Cisg ICAgYXV0byBzb3VyY2VBbmRUcmFjayA9IGNyZWF0ZVNvdXJjZUFuZFJUQ1RyYWNrKHRyYWNrKTsK KyAgICByZXR1cm4gY3JlYXRlVHJhbnNjZWl2ZXJCYWNrZW5kcyhXVEZNb3ZlKHNvdXJjZUFuZFRy YWNrLnNlY29uZCksIGluaXQsIFdURk1vdmUoc291cmNlQW5kVHJhY2suZmlyc3QpKTsKK30KKwor dm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2soTGli V2ViUlRDUnRwU2VuZGVyQmFja2VuZCYgc2VuZGVyLCBNZWRpYVN0cmVhbVRyYWNrJiB0cmFjaykK K3sKKyAgICBhdXRvIHNvdXJjZUFuZFRyYWNrID0gY3JlYXRlU291cmNlQW5kUlRDVHJhY2sodHJh Y2spOworICAgIHNlbmRlci5zZXRTb3VyY2UoV1RGTW92ZShzb3VyY2VBbmRUcmFjay5maXJzdCkp OworICAgIHNlbmRlci5ydGNTZW5kZXIoKS0+U2V0VHJhY2soV1RGTW92ZShzb3VyY2VBbmRUcmFj ay5zZWNvbmQpKTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPExpYldlYlJUQ1J0cFRyYW5zY2VpdmVy QmFja2VuZD4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6dHJhbnNjZWl2ZXJCYWNrZW5kRnJvbVNl bmRlcihMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kJiBiYWNrZW5kKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFF bmRwb2ludC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCmluZGV4IGVmYjUxMTMxMjU4NGE1OWQ3MGE0NmNjY2Vl MDQ3N2IxMjViYTJhMGEuLmY1ZmUxOTExMzgzMzFmODRiMjQ4Mzg2ZmFjMjdjMGQ5YzIxNGI5NWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTExMCw2ICsx MTAsOCBAQCBwdWJsaWM6CiAgICAgc3RkOjpvcHRpb25hbDxCYWNrZW5kcz4gYWRkVHJhbnNjZWl2 ZXIoTWVkaWFTdHJlYW1UcmFjayYsIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYpOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQ+IHRyYW5zY2Vp dmVyQmFja2VuZEZyb21TZW5kZXIoTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZCYpOwogCisgICAg dm9pZCBzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2soTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZCYs IE1lZGlhU3RyZWFtVHJhY2smKTsKKwogcHJpdmF0ZToKICAgICBMaWJXZWJSVENNZWRpYUVuZHBv aW50KExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZCYsIExpYldlYlJUQ1Byb3ZpZGVyJik7 CiAKQEAgLTE2Myw2ICsxNjUsOCBAQCBwcml2YXRlOgogICAgICAgICA6IHJ0Yzo6UmVmQ291bnRS ZWxlYXNlU3RhdHVzOjprRHJvcHBlZExhc3RSZWY7CiAgICAgfQogCisgICAgc3RkOjpwYWlyPExp YldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ6OlNvdXJjZSwgcnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0 Yzo6TWVkaWFTdHJlYW1UcmFja0ludGVyZmFjZT4+IGNyZWF0ZVNvdXJjZUFuZFJUQ1RyYWNrKE1l ZGlhU3RyZWFtVHJhY2smKTsKKwogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIGNvbnN0 IExvZ2dlciYgbG9nZ2VyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9sb2dnZXIuZ2V0KCk7IH0K ICAgICBjb25zdCB2b2lkKiBsb2dJZGVudGlmaWVyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9s b2dJZGVudGlmaWVyOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNv bm5lY3Rpb25CYWNrZW5kLmNwcAppbmRleCAyY2Q5ZDM3MjIzM2NhYzI5MjFkNzUzZTM0MTRjMzNm MzJhNzdlY2Q5Li42OTc5Y2ViZDFjNTRjMmFhYzc5YjRkZDczNzk0MzVjZWE5YTZlMzg2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJX ZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5j cHAKQEAgLTQ3MSw2ICs0NzEsMTEgQEAgRXhjZXB0aW9uT3I8UmVmPFJUQ1J0cFRyYW5zY2VpdmVy Pj4gTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjphZGRUcmFuc2NlaXYKICAgICByZXR1 cm4gY29tcGxldGVBZGRUcmFuc2NlaXZlcihXVEZNb3ZlKHNlbmRlciksIGluaXQsIHRyYWNrLT5p ZCgpLCB0cmFjay0+a2luZCgpKTsKIH0KIAordm9pZCBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJh Y2tlbmQ6OnNldFNlbmRlclNvdXJjZUZyb21UcmFjayhMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5k JiBzZW5kZXIsIE1lZGlhU3RyZWFtVHJhY2smIHRyYWNrKQoreworICAgIG1fZW5kcG9pbnQtPnNl dFNlbmRlclNvdXJjZUZyb21UcmFjayhzZW5kZXIsIHRyYWNrKTsKK30KKwogc3RhdGljIGlubGlu ZSBMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQmIGJhY2tlbmRGcm9tUlRQVHJhbnNjZWl2 ZXIoUlRDUnRwVHJhbnNjZWl2ZXImIHRyYW5zY2VpdmVyKQogewogICAgIHJldHVybiBzdGF0aWNf Y2FzdDxMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQmPigqdHJhbnNjZWl2ZXIuYmFja2Vu ZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNr ZW5kLmgKaW5kZXggNWVjNzkxODA2MDIyNzgwNzFmM2Y3MzI4ZDUzZmE4Y2RlZjE2ODczMC4uNWU1 ZjI0M2NlY2NiZjgyZjNhZTQ5ZGI4OTA5OWVkY2I3MWE5MTc2MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmgKQEAgLTM3LDYgKzM3LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBMaWJXZWJSVENNZWRpYUVuZHBvaW50Owog Y2xhc3MgTGliV2ViUlRDUHJvdmlkZXI7CitjbGFzcyBMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5k OwogY2xhc3MgTGliV2ViUlRDUnRwVHJhbnNjZWl2ZXJCYWNrZW5kOwogY2xhc3MgUlRDUnRwUmVj ZWl2ZXI7CiBjbGFzcyBSVENSdHBSZWNlaXZlckJhY2tlbmQ7CkBAIC05Myw2ICs5NCw3IEBAIHBy aXZhdGU6CiAKICAgICBFeGNlcHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBhZGRUcmFu c2NlaXZlcihjb25zdCBTdHJpbmcmLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQmKSBmaW5h bDsKICAgICBFeGNlcHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBhZGRUcmFuc2NlaXZl cihSZWY8TWVkaWFTdHJlYW1UcmFjaz4mJiwgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0Jikg ZmluYWw7CisgICAgdm9pZCBzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2soTGliV2ViUlRDUnRwU2Vu ZGVyQmFja2VuZCYsIE1lZGlhU3RyZWFtVHJhY2smKTsKIAogICAgIFJUQ1J0cFRyYW5zY2VpdmVy KiBleGlzdGluZ1RyYW5zY2VpdmVyKFdURjo6RnVuY3Rpb248Ym9vbChMaWJXZWJSVENSdHBUcmFu c2NlaXZlckJhY2tlbmQmKT4mJik7CiAgICAgUlRDUnRwVHJhbnNjZWl2ZXImIG5ld1JlbW90ZVRy YW5zY2VpdmVyKHN0ZDo6dW5pcXVlX3B0cjxMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQ+ JiYsIFJlZjxSZWFsdGltZU1lZGlhU291cmNlPiYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tl bmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGli V2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKaW5kZXggODk5MDQ4OWQ0OWNkZGE5NjQ5ZWMyODhh NjU4YzRlNGI5OTNkYzQ4NS4uMGY3ZDJiNTk2Mzc3N2E0MGIwMzY2YjY3NmNhYmM1NzAzNmIzYTIz MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAK QEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJMaWJXZWJSVENVdGlscy5oIgogI2luY2x1ZGUg IlJUQ1BlZXJDb25uZWN0aW9uLmgiCiAjaW5jbHVkZSAiUlRDUnRwU2VuZGVyLmgiCisjaW5jbHVk ZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNv bnRleHQuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNzYsNiArNzcsNyBAQCB2b2lkIExp YldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ6OnJlcGxhY2VUcmFjayhTY3JpcHRFeGVjdXRpb25Db250 ZXh0JiBjb250ZXh0LCBSVAogICAgIH0KICAgICB9CiAKKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRo aXMgcG9zdFRhc2sgb25jZSB0aGlzIHdob2xlIGZ1bmN0aW9uIGlzIGV4ZWN1dGVkIGFzIHBhcnQg b2YgdGhlIFJUQ1BlZXJDb25uZWN0aW9uIG9wZXJhdGlvbiBxdWV1ZS4KICAgICBjb250ZXh0LnBv c3RUYXNrKFtwcm90ZWN0ZWRTZW5kZXIgPSBtYWtlUmVmKHNlbmRlciksIHByb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpLCB0cmFjayA9IFdURk1vdmUodHJhY2spLCB0aGlzXShTY3JpcHRFeGVjdXRp b25Db250ZXh0JikgbXV0YWJsZSB7CiAgICAgICAgIGlmIChwcm90ZWN0ZWRTZW5kZXItPmlzU3Rv cHBlZCgpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtODgsMTMgKzkwLDIzIEBAIHZvaWQgTGli V2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmIGNvbnRleHQsIFJUCiAKICAgICAgICAgYm9vbCBoYXNUcmFjayA9IHByb3RlY3RlZFNlbmRl ci0+dHJhY2soKTsKICAgICAgICAgcHJvdGVjdGVkU2VuZGVyLT5zZXRUcmFjayh0cmFjay5yZWxl YXNlTm9uTnVsbCgpKTsKLSAgICAgICAgaWYgKCFoYXNUcmFjaykgewotICAgICAgICAgICAgLy8g RklYTUU6IEluIGNhc2Ugb2YgdW5pZmllZCBwbGFuLCB3ZSBzaG91bGQgdXNlIG1fcnRjU2VuZGVy LT5TZXRUcmFjayBhbmQgbm8gbG9uZ2VyIG5lZWQgbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuCi0g ICAgICAgICAgICBhdXRvIHJlc3VsdCA9IG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLT5hZGRUcmFj aygqcHJvdGVjdGVkU2VuZGVyLT50cmFjaygpLCB7IH0pOwotICAgICAgICAgICAgaWYgKHJlc3Vs dC5oYXNFeGNlcHRpb24oKSkgewotICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KHJlc3Vs dC5yZWxlYXNlRXhjZXB0aW9uKCkpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg ICAgIH0KKworICAgICAgICBpZiAoaGFzVHJhY2spIHsKKyAgICAgICAgICAgIHByb21pc2UucmVz b2x2ZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKFJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkud2ViUlRDVW5pZmllZFBsYW5F bmFibGVkKCkpIHsKKyAgICAgICAgICAgIG1fc291cmNlID0gbnVsbHB0cjsKKyAgICAgICAgICAg IG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLT5zZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2soKnRoaXMs ICpwcm90ZWN0ZWRTZW5kZXItPnRyYWNrKCkpOworICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZl KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBhdXRvIHJlc3Vs dCA9IG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLT5hZGRUcmFjaygqcHJvdGVjdGVkU2VuZGVyLT50 cmFjaygpLCB7IH0pOworICAgICAgICBpZiAocmVzdWx0Lmhhc0V4Y2VwdGlvbigpKSB7CisgICAg ICAgICAgICBwcm9taXNlLnJlamVjdChyZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpKTsKKyAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBwcm9taXNlLnJlc29sdmUoKTsKICAg ICB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA2NzAzYWQ0OTAwYzNjYWI4ZmFlN2Y3MDdjNzcyOTZlMjk4Mzc3ODljLi4x YjU2M2NkYzk1OWJhYTQxYzBiMDYzODExMjFmYzliYTE3M2Q2OWExIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTgtMTEtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisg ICAgICAgIENhbGxpbmcgc2VuZGVyLnJlcGxhY2VUcmFjaygpIHR3aWNlIHByb2R1Y2VzIGEgbmV3 IHRyYW5zY2VpdmVyIGFuZCBpdHMgY29ycmVzcG9uZGluZyBtPSBzZWN0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEyNjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy92aWRlby1hZGRU cmFuc2NlaXZlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2VicnRjL3ZpZGVvLWFkZFRyYW5z Y2VpdmVyLmh0bWw6CisKIDIwMTgtMTEtMDUgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgogCiAgICAgICAgIE1ha2UgbUROUyBJQ0UgQ2FuZGlkYXRlIGFuIGV4cGVyaW1lbnRhbCBm bGFnIGFnYWluCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNj ZWl2ZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWFkZFRyYW5zY2Vp dmVyLWV4cGVjdGVkLnR4dAppbmRleCBjMmNlNTEwNTljYTZkYWExN2U1NjFjYzk0ZDg4M2MwMjVk YzMzNjAzLi41YmU3ZWFjZTA1OTM3NWIyNjM2Njk4NjdkMTlkMzI4YjE4MjRlMTRhIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNjZWl2ZXItZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFuc2NlaXZlci1leHBlY3RlZC50 eHQKQEAgLTIsNiArMiw3IEBACiAKIFBBU1MgU2V0dGluZyB1cCBjYWxscyB3aXRoIGFkZFRyYW5z Y2VpdmVyIGJ1dCB3aXRoIG5vIHRyYWNrIAogUEFTUyBTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRk VHJhbnNjZWl2ZXIgd2l0aCBhIHRyYWNrIAorUEFTUyBTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRk VHJhbnNjZWl2ZXIgd2l0aCBhIHRyYWNrIGFuZCB1c2UgcmVwbGFjZVRyYWNrIHNldmVyYWwgdGlt ZXMgCiBQQVNTIEJhc2ljIHZpZGVvIGV4Y2hhbmdlIHNldCB1cCB3aXRoIGFkZFRyYW5zY2VpdmVy IAogUEFTUyBUZXN0aW5nIHN5bmNocm9uaXphdGlvbiBzb3VyY2VzIAogCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNjZWl2ZXIuaHRtbCBiL0xheW91dFRlc3Rz L3dlYnJ0Yy92aWRlby1hZGRUcmFuc2NlaXZlci5odG1sCmluZGV4IGNjZmE3MmE4ZmQ5ZjgzMTVi YjBmN2VjODBhOTE4M2I5NjJjYjUxZDguLmUyMTA2MzgxY2EwM2IyYzY1OGM3MGI3ZmUzMmUwNWJk ZDVlNGIxNDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFuc2Nl aXZlci5odG1sCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFuc2NlaXZlci5o dG1sCkBAIC0zOSw2ICszOSwyNCBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKICAg ICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5kZXhPZigiYT1yZWN2b25seSIpICE9PSAtMSwgImE9 cmVjdm9ubHkiKTsKIH0sICJTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRkVHJhbnNjZWl2ZXIgd2l0 aCBhIHRyYWNrIik7CiAKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgIGlmICh3 aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNz aW9uKHRydWUpOworCisgICAgY29uc3Qgc3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2 aWNlcy5nZXRVc2VyTWVkaWEoeyB2aWRlbzogdHJ1ZSB9KTsKKyAgICB2YXIgcGMgPSBuZXcgUlRD UGVlckNvbm5lY3Rpb24oKTsKKyAgICBwYy5hZGRUcmFuc2NlaXZlcihzdHJlYW0uZ2V0VmlkZW9U cmFja3MoKVswXSk7CisgICAgYXdhaXQgcGMuZ2V0U2VuZGVycygpWzBdLnJlcGxhY2VUcmFjayhu dWxsKTsKKyAgICBhd2FpdCBwYy5nZXRTZW5kZXJzKClbMF0ucmVwbGFjZVRyYWNrKHN0cmVhbS5n ZXRWaWRlb1RyYWNrcygpWzBdKTsKKworICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMuY3JlYXRl T2ZmZXIoKTsKKworICAgIGNvbnN0IHNkcExpbmVzID0gb2ZmZXIuc2RwLnNwbGl0KCdcclxuJyku ZmlsdGVyKGxpbmUgPT4geworICAgICAgICByZXR1cm4gbGluZS5zdGFydHNXaXRoKCJtPXZpZGVv Iik7CisgICAgfSk7CisgICAgYXNzZXJ0X2VxdWFscyhzZHBMaW5lcy5sZW5ndGgsIDEsICJUaGVy ZSBzaG91bGQgYmUgMSB2aWRlbyBtIHNlY3Rpb24iKTsKK30sICJTZXR0aW5nIHVwIGNhbGxzIHdp dGggYWRkVHJhbnNjZWl2ZXIgd2l0aCBhIHRyYWNrIGFuZCB1c2UgcmVwbGFjZVRyYWNrIHNldmVy YWwgdGltZXMiKTsKKwogZnVuY3Rpb24gdGVzdEltYWdlKCkKIHsKICAgICBjYW52YXMud2lkdGgg PSB2aWRlby52aWRlb1dpZHRoOwpAQCAtNzksNiArOTcsMTMgQEAgcHJvbWlzZV90ZXN0KGFzeW5j ICh0ZXN0KSA9PiB7CiAgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9uLm9udHJhY2sgPSAodHJh Y2tFdmVudCkgPT4gewogICAgICAgICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC50cmFjayk7 CiAgICAgICAgICAgICB9OworICAgICAgICB9LCB7CisgICAgICAgICAgICBvYnNlcnZlT2ZmZXIg OiAoZGVzYykgPT4geworICAgICAgICAgICAgICAgIGNvbnN0IHNkcExpbmVzID0gZGVzYy5zZHAu c3BsaXQoJ1xyXG4nKS5maWx0ZXIobGluZSA9PiB7CisgICAgICAgICAgICAgICAgICAgIHJldHVy biBsaW5lLnN0YXJ0c1dpdGgoIm09dmlkZW8iKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHNkcExpbmVzLmxlbmd0aCwgMSwgIlRoZXJlIHNob3Vs ZCBiZSAxIHZpZGVvIG0gc2VjdGlvbiIpOworICAgICAgICAgICAgfQogICAgICAgICB9KTsKICAg ICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGltZWQgb3V0IiksIDUwMDApOwog ICAgIH0pOwo= 354040 2018-11-06 18:17:50 -0800 2018-11-06 19:24:07 -0800 Patch for landing bug-191261-20181107091758.patch text/plain 13752 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY2ZTg5Y2Y3OTRlODZm NzM5ZTNiMGNlOTRmYzEzZjhlODNjZmZlMy4uZTI1NmI2OTFlZmM4MWJkZDZhMGY3NDQxZGY2MDkw MjdlMDgzMjA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTExLTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIHNlbmRlci5y ZXBsYWNlVHJhY2soKSB0d2ljZSBwcm9kdWNlcyBhIG5ldyB0cmFuc2NlaXZlciBhbmQgaXRzIGNv cnJlc3BvbmRpbmcgbT0gc2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkxMjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29u LgorCisgICAgICAgIEhhbmRsZSB0aGUgY2FzZSBvZiByZXBsYWNpbmcgYSB0cmFjayBpbiBhIHNl bmRlciB0aGF0IGhhcyBubyB0cmFjay4KKyAgICAgICAgSW4gcGFydGljdWxhciwgZG8gbm90IGNy ZWF0ZSBhIG5ldyBtLXNlY3Rpb24gYXMgd2FzIGltcGxpZWQgYnkgcGxhbiBCIGltcGxlbWVudGF0 aW9uLgorICAgICAgICBJbnN0ZWFkLCBzZXQgdGhlIHRyYWNrIGRpcmVjdGx5IG9uIHRoZSBydGMg c2VuZGVyLgorICAgICAgICBDb3ZlcmVkIGJ5IHdlYnJ0Yy92aWRlby1hZGRUcmFuc2NlaXZlci5o dG1sLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD TWVkaWFFbmRwb2ludC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBv aW50OjpjcmVhdGVTb3VyY2VBbmRSVENUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJS VENNZWRpYUVuZHBvaW50OjphZGRUcmFuc2NlaXZlcik6CisgICAgICAgIChXZWJDb3JlOjpMaWJX ZWJSVENNZWRpYUVuZHBvaW50OjpzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2spOgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaDoK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29u bmVjdGlvbkJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kOjpzZXRTZW5kZXJTb3VyY2VGcm9tVHJhY2spOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5o OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNl bmRlckJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUnRwU2VuZGVyQmFj a2VuZDo6cmVwbGFjZVRyYWNrKToKKwogMjAxOC0xMS0wNiAgVGhpYmF1bHQgU2F1bmllciAgPHRz YXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl1bV2ViUlRDXSBEbyBub3Qg dHJ5IHRvIGhhbmRsZSBmcmFtZXJhdGUgbW9kdWxhdGlvbiBpbiB0aGUgZW5jb2RlcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuY3BwCmlu ZGV4IGM3Y2EyYjRmMjdkOTk1OWZiMzExNTU0NDdiMWE5ZjZlNTc1Mzc3N2QuLmExOGMwMmY1ODlj YWUyM2FlMzVlNjNlMjllNDJlNGIxZWMzMzBjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5jcHAKQEAgLTkyLDYgKzkyLDcgQEAg dm9pZCBSVENSdHBTZW5kZXI6OnJlcGxhY2VUcmFjayhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj b250ZXh0LCBSZWZQdHI8TWVkaWFTdHIKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIC8v IEZJWE1FOiBUaGlzIHdob2xlIGZ1bmN0aW9uIHNob3VsZCBiZSBleGVjdXRlZCBhcyBwYXJ0IG9m IHRoZSBSVENQZWVyQ29ubmVjdGlvbiBvcGVyYXRpb24gcXVldWUuCiAgICAgbV9iYWNrZW5kLT5y ZXBsYWNlVHJhY2soY29udGV4dCwgKnRoaXMsIFdURk1vdmUod2l0aFRyYWNrKSwgV1RGTW92ZShw cm9taXNlKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5j cHAKaW5kZXggMTM3MzA1OGUxMzZiZmNlMzk0YTRhOTE2ZDA5MzY3YzRlOTBhN2UwNC4uYWRhNTQ5 NTQ0ZDMyMWYyNTY0MzZmYWU2NjA2NzA1ZWMyMWI4ZDA3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2lu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAKQEAgLTUwNywxMyArNTA3LDE0IEBAIHN0ZDo6b3B0 aW9uYWw8TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6QmFja2VuZHM+IExpYldlYlJUQ01lZGlhRW5k cG9pbnQ6OmFkZFRyYW5zCiAgICAgcmV0dXJuIGNyZWF0ZVRyYW5zY2VpdmVyQmFja2VuZHModHlw ZSwgaW5pdCwgbnVsbHB0cik7CiB9CiAKLXN0ZDo6b3B0aW9uYWw8TGliV2ViUlRDTWVkaWFFbmRw b2ludDo6QmFja2VuZHM+IExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmFkZFRyYW5zY2VpdmVyKE1l ZGlhU3RyZWFtVHJhY2smIHRyYWNrLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQmIGluaXQp CitzdGQ6OnBhaXI8TGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6U291cmNlLCBydGM6OnNjb3Bl ZF9yZWZwdHI8d2VicnRjOjpNZWRpYVN0cmVhbVRyYWNrSW50ZXJmYWNlPj4gTGliV2ViUlRDTWVk aWFFbmRwb2ludDo6Y3JlYXRlU291cmNlQW5kUlRDVHJhY2soTWVkaWFTdHJlYW1UcmFjayYgdHJh Y2spCiB7CiAgICAgTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6U291cmNlIHNvdXJjZTsKICAg ICBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpNZWRpYVN0cmVhbVRyYWNrSW50ZXJmYWNlPiBy dGNUcmFjazsKICAgICBzd2l0Y2ggKHRyYWNrLnByaXZhdGVUcmFjaygpLnR5cGUoKSkgewogICAg IGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6Tm9uZToKLSAgICAgICAgcmV0dXJuIHN0 ZDo6bnVsbG9wdDsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFr OwogICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW86IHsKICAgICAgICAg YXV0byBhdWRpb1NvdXJjZSA9IFJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZTo6Y3JlYXRlKHRy YWNrLnByaXZhdGVUcmFjaygpKTsKICAgICAgICAgcnRjVHJhY2sgPSBtX3BlZXJDb25uZWN0aW9u RmFjdG9yeS5DcmVhdGVBdWRpb1RyYWNrKHRyYWNrLmlkKCkudXRmOCgpLmRhdGEoKSwgYXVkaW9T b3VyY2UucHRyKCkpOwpAQCAtNTI3LDggKzUyOCwyMCBAQCBzdGQ6Om9wdGlvbmFsPExpYldlYlJU Q01lZGlhRW5kcG9pbnQ6OkJhY2tlbmRzPiBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRUcmFu cwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgfQorICAgIHJldHVybiBzdGQ6Om1ha2VfcGFp cihXVEZNb3ZlKHNvdXJjZSksIFdURk1vdmUocnRjVHJhY2spKTsKK30KIAotICAgIHJldHVybiBj cmVhdGVUcmFuc2NlaXZlckJhY2tlbmRzKFdURk1vdmUocnRjVHJhY2spLCBpbml0LCBXVEZNb3Zl KHNvdXJjZSkpOworc3RkOjpvcHRpb25hbDxMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpCYWNrZW5k cz4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6YWRkVHJhbnNjZWl2ZXIoTWVkaWFTdHJlYW1UcmFj ayYgdHJhY2ssIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYgaW5pdCkKK3sKKyAgICBhdXRv IHNvdXJjZUFuZFRyYWNrID0gY3JlYXRlU291cmNlQW5kUlRDVHJhY2sodHJhY2spOworICAgIHJl dHVybiBjcmVhdGVUcmFuc2NlaXZlckJhY2tlbmRzKFdURk1vdmUoc291cmNlQW5kVHJhY2suc2Vj b25kKSwgaW5pdCwgV1RGTW92ZShzb3VyY2VBbmRUcmFjay5maXJzdCkpOworfQorCit2b2lkIExp YldlYlJUQ01lZGlhRW5kcG9pbnQ6OnNldFNlbmRlclNvdXJjZUZyb21UcmFjayhMaWJXZWJSVENS dHBTZW5kZXJCYWNrZW5kJiBzZW5kZXIsIE1lZGlhU3RyZWFtVHJhY2smIHRyYWNrKQoreworICAg IGF1dG8gc291cmNlQW5kVHJhY2sgPSBjcmVhdGVTb3VyY2VBbmRSVENUcmFjayh0cmFjayk7Cisg ICAgc2VuZGVyLnNldFNvdXJjZShXVEZNb3ZlKHNvdXJjZUFuZFRyYWNrLmZpcnN0KSk7CisgICAg c2VuZGVyLnJ0Y1NlbmRlcigpLT5TZXRUcmFjayhXVEZNb3ZlKHNvdXJjZUFuZFRyYWNrLnNlY29u ZCkpOwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8TGliV2ViUlRDUnRwVHJhbnNjZWl2ZXJCYWNrZW5k PiBMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojp0cmFuc2NlaXZlckJhY2tlbmRGcm9tU2VuZGVyKExp YldlYlJUQ1J0cFNlbmRlckJhY2tlbmQmIGJhY2tlbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENNZWRpYUVuZHBvaW50LmgKaW5kZXggZWZiNTExMzEyNTg0YTU5ZDcwYTQ2Y2NjZWUwNDc3YjEy NWJhMmEwYS4uZjVmZTE5MTEzODMzMWY4NGIyNDgzODZmYWMyN2MwZDljMjE0Yjk1YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2Vi UlRDTWVkaWFFbmRwb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaApAQCAtMTEwLDYgKzExMCw4IEBA IHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPEJhY2tlbmRzPiBhZGRUcmFuc2NlaXZlcihNZWRp YVN0cmVhbVRyYWNrJiwgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0Jik7CiAgICAgc3RkOjp1 bmlxdWVfcHRyPExpYldlYlJUQ1J0cFRyYW5zY2VpdmVyQmFja2VuZD4gdHJhbnNjZWl2ZXJCYWNr ZW5kRnJvbVNlbmRlcihMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kJik7CiAKKyAgICB2b2lkIHNl dFNlbmRlclNvdXJjZUZyb21UcmFjayhMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kJiwgTWVkaWFT dHJlYW1UcmFjayYpOworCiBwcml2YXRlOgogICAgIExpYldlYlJUQ01lZGlhRW5kcG9pbnQoTGli V2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kJiwgTGliV2ViUlRDUHJvdmlkZXImKTsKIApAQCAt MTYzLDYgKzE2NSw4IEBAIHByaXZhdGU6CiAgICAgICAgIDogcnRjOjpSZWZDb3VudFJlbGVhc2VT dGF0dXM6OmtEcm9wcGVkTGFzdFJlZjsKICAgICB9CiAKKyAgICBzdGQ6OnBhaXI8TGliV2ViUlRD UnRwU2VuZGVyQmFja2VuZDo6U291cmNlLCBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpNZWRp YVN0cmVhbVRyYWNrSW50ZXJmYWNlPj4gY3JlYXRlU291cmNlQW5kUlRDVHJhY2soTWVkaWFTdHJl YW1UcmFjayYpOworCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgY29uc3QgTG9nZ2Vy JiBsb2dnZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2xvZ2dlci5nZXQoKTsgfQogICAgIGNv bnN0IHZvaWQqIGxvZ0lkZW50aWZpZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2xvZ0lkZW50 aWZpZXI7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlv bkJhY2tlbmQuY3BwCmluZGV4IDJjZDlkMzcyMjMzY2FjMjkyMWQ3NTNlMzQxNGMzM2YzMmE3N2Vj ZDkuLjY5NzljZWJkMWM1NGMyYWFjNzliNGRkNzM3OTQzNWNlYTlhNmUzODYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1Bl ZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcApAQCAt NDcxLDYgKzQ3MSwxMSBAQCBFeGNlcHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBMaWJX ZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFkZFRyYW5zY2VpdgogICAgIHJldHVybiBjb21w bGV0ZUFkZFRyYW5zY2VpdmVyKFdURk1vdmUoc2VuZGVyKSwgaW5pdCwgdHJhY2stPmlkKCksIHRy YWNrLT5raW5kKCkpOwogfQogCit2b2lkIExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6 c2V0U2VuZGVyU291cmNlRnJvbVRyYWNrKExpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQmIHNlbmRl ciwgTWVkaWFTdHJlYW1UcmFjayYgdHJhY2spCit7CisgICAgbV9lbmRwb2ludC0+c2V0U2VuZGVy U291cmNlRnJvbVRyYWNrKHNlbmRlciwgdHJhY2spOworfQorCiBzdGF0aWMgaW5saW5lIExpYldl YlJUQ1J0cFRyYW5zY2VpdmVyQmFja2VuZCYgYmFja2VuZEZyb21SVFBUcmFuc2NlaXZlcihSVENS dHBUcmFuc2NlaXZlciYgdHJhbnNjZWl2ZXIpCiB7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PExp YldlYlJUQ1J0cFRyYW5zY2VpdmVyQmFja2VuZCY+KCp0cmFuc2NlaXZlci5iYWNrZW5kKCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaApp bmRleCA1ZWM3OTE4MDYwMjI3ODA3MWYzZjczMjhkNTNmYThjZGVmMTY4NzMwLi41ZTVmMjQzY2Vj Y2JmODJmM2FlNDlkYjg5MDk5ZWRjYjcxYTkxNzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJh Y2tlbmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaApAQCAtMzcsNiArMzcsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ7CiBjbGFzcyBM aWJXZWJSVENQcm92aWRlcjsKK2NsYXNzIExpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ7CiBjbGFz cyBMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQ7CiBjbGFzcyBSVENSdHBSZWNlaXZlcjsK IGNsYXNzIFJUQ1J0cFJlY2VpdmVyQmFja2VuZDsKQEAgLTkzLDYgKzk0LDcgQEAgcHJpdmF0ZToK IAogICAgIEV4Y2VwdGlvbk9yPFJlZjxSVENSdHBUcmFuc2NlaXZlcj4+IGFkZFRyYW5zY2VpdmVy KGNvbnN0IFN0cmluZyYsIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYpIGZpbmFsOwogICAg IEV4Y2VwdGlvbk9yPFJlZjxSVENSdHBUcmFuc2NlaXZlcj4+IGFkZFRyYW5zY2VpdmVyKFJlZjxN ZWRpYVN0cmVhbVRyYWNrPiYmLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQmKSBmaW5hbDsK KyAgICB2b2lkIHNldFNlbmRlclNvdXJjZUZyb21UcmFjayhMaWJXZWJSVENSdHBTZW5kZXJCYWNr ZW5kJiwgTWVkaWFTdHJlYW1UcmFjayYpOwogCiAgICAgUlRDUnRwVHJhbnNjZWl2ZXIqIGV4aXN0 aW5nVHJhbnNjZWl2ZXIoV1RGOjpGdW5jdGlvbjxib29sKExpYldlYlJUQ1J0cFRyYW5zY2VpdmVy QmFja2VuZCYpPiYmKTsKICAgICBSVENSdHBUcmFuc2NlaXZlciYgbmV3UmVtb3RlVHJhbnNjZWl2 ZXIoc3RkOjp1bmlxdWVfcHRyPExpYldlYlJUQ1J0cFRyYW5zY2VpdmVyQmFja2VuZD4mJiwgUmVm PFJlYWx0aW1lTWVkaWFTb3VyY2U+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENS dHBTZW5kZXJCYWNrZW5kLmNwcAppbmRleCA4OTkwNDg5ZDQ5Y2RkYTk2NDllYzI4OGE2NThjNGU0 Yjk5M2RjNDg1Li4wZjdkMmI1OTYzNzc3YTQwYjAzNjZiNjc2Y2FiYzU3MDM2YjNhMjMwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJX ZWJSVENSdHBTZW5kZXJCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kLmNwcApAQCAtMzEs NiArMzEsNyBAQAogI2luY2x1ZGUgIkxpYldlYlJUQ1V0aWxzLmgiCiAjaW5jbHVkZSAiUlRDUGVl ckNvbm5lY3Rpb24uaCIKICNpbmNsdWRlICJSVENSdHBTZW5kZXIuaCIKKyNpbmNsdWRlICJSdW50 aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC03Niw2ICs3Nyw3IEBAIHZvaWQgTGliV2ViUlRD UnRwU2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNv bnRleHQsIFJUCiAgICAgfQogICAgIH0KIAorICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBwb3N0 VGFzayBvbmNlIHRoaXMgd2hvbGUgZnVuY3Rpb24gaXMgZXhlY3V0ZWQgYXMgcGFydCBvZiB0aGUg UlRDUGVlckNvbm5lY3Rpb24gb3BlcmF0aW9uIHF1ZXVlLgogICAgIGNvbnRleHQucG9zdFRhc2so W3Byb3RlY3RlZFNlbmRlciA9IG1ha2VSZWYoc2VuZGVyKSwgcHJvbWlzZSA9IFdURk1vdmUocHJv bWlzZSksIHRyYWNrID0gV1RGTW92ZSh0cmFjayksIHRoaXNdKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKHByb3RlY3RlZFNlbmRlci0+aXNTdG9wcGVkKCkp CiAgICAgICAgICAgICByZXR1cm47CkBAIC04OCwxMyArOTAsMjMgQEAgdm9pZCBMaWJXZWJSVENS dHBTZW5kZXJCYWNrZW5kOjpyZXBsYWNlVHJhY2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29u dGV4dCwgUlQKIAogICAgICAgICBib29sIGhhc1RyYWNrID0gcHJvdGVjdGVkU2VuZGVyLT50cmFj aygpOwogICAgICAgICBwcm90ZWN0ZWRTZW5kZXItPnNldFRyYWNrKHRyYWNrLnJlbGVhc2VOb25O dWxsKCkpOwotICAgICAgICBpZiAoIWhhc1RyYWNrKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTog SW4gY2FzZSBvZiB1bmlmaWVkIHBsYW4sIHdlIHNob3VsZCB1c2UgbV9ydGNTZW5kZXItPlNldFRy YWNrIGFuZCBubyBsb25nZXIgbmVlZCBtX3BlZXJDb25uZWN0aW9uQmFja2VuZC4KLSAgICAgICAg ICAgIGF1dG8gcmVzdWx0ID0gbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQtPmFkZFRyYWNrKCpwcm90 ZWN0ZWRTZW5kZXItPnRyYWNrKCksIHsgfSk7Ci0gICAgICAgICAgICBpZiAocmVzdWx0Lmhhc0V4 Y2VwdGlvbigpKSB7Ci0gICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QocmVzdWx0LnJlbGVh c2VFeGNlcHRpb24oKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQor CisgICAgICAgIGlmIChoYXNUcmFjaykgeworICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBpZiAoUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS53ZWJSVENVbmlmaWVkUGxhbkVuYWJsZWQo KSkgeworICAgICAgICAgICAgbV9zb3VyY2UgPSBudWxscHRyOworICAgICAgICAgICAgbV9wZWVy Q29ubmVjdGlvbkJhY2tlbmQtPnNldFNlbmRlclNvdXJjZUZyb21UcmFjaygqdGhpcywgKnByb3Rl Y3RlZFNlbmRlci0+dHJhY2soKSk7CisgICAgICAgICAgICBwcm9taXNlLnJlc29sdmUoKTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGF1dG8gcmVzdWx0ID0gbV9w ZWVyQ29ubmVjdGlvbkJhY2tlbmQtPmFkZFRyYWNrKCpwcm90ZWN0ZWRTZW5kZXItPnRyYWNrKCks IHsgfSk7CisgICAgICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpIHsKKyAgICAgICAgICAg IHByb21pc2UucmVqZWN0KHJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCkpOworICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIHByb21pc2UucmVzb2x2ZSgpOwogICAgIH0pOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDFkOWM2ZTdkYmI0ZjY5YjUyY2E3OWQyNmQ4YTE1NWNhZjM1ZmU3NDYuLjA4YTQxYzY1 ODU4N2I2MjdlMThlYjAyMjhmNjAzZjFmMzEwZGQwODkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOC0xMS0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAg Q2FsbGluZyBzZW5kZXIucmVwbGFjZVRyYWNrKCkgdHdpY2UgcHJvZHVjZXMgYSBuZXcgdHJhbnNj ZWl2ZXIgYW5kIGl0cyBjb3JyZXNwb25kaW5nIG09IHNlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTI2MQorCisgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIHdlYnJ0Yy92aWRlby1hZGRUcmFuc2NlaXZl ci1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2VicnRjL3ZpZGVvLWFkZFRyYW5zY2VpdmVyLmh0 bWw6CisKIDIwMTgtMTEtMDYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAog ICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIFVwZGF0ZSBhbGwgdGVzdHMgdG8gbWF0Y2ggdGhlIGxh dGVzdCBBUEkgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWFk ZFRyYW5zY2VpdmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRU cmFuc2NlaXZlci1leHBlY3RlZC50eHQKaW5kZXggYzJjZTUxMDU5Y2E2ZGFhMTdlNTYxY2M5NGQ4 ODNjMDI1ZGMzMzYwMy4uNWJlN2VhY2UwNTkzNzViMjYzNjY5ODY3ZDE5ZDMyOGIxODI0ZTE0YSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWFkZFRyYW5zY2VpdmVyLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNjZWl2ZXItZXhw ZWN0ZWQudHh0CkBAIC0yLDYgKzIsNyBAQAogCiBQQVNTIFNldHRpbmcgdXAgY2FsbHMgd2l0aCBh ZGRUcmFuc2NlaXZlciBidXQgd2l0aCBubyB0cmFjayAKIFBBU1MgU2V0dGluZyB1cCBjYWxscyB3 aXRoIGFkZFRyYW5zY2VpdmVyIHdpdGggYSB0cmFjayAKK1BBU1MgU2V0dGluZyB1cCBjYWxscyB3 aXRoIGFkZFRyYW5zY2VpdmVyIHdpdGggYSB0cmFjayBhbmQgdXNlIHJlcGxhY2VUcmFjayBzZXZl cmFsIHRpbWVzIAogUEFTUyBCYXNpYyB2aWRlbyBleGNoYW5nZSBzZXQgdXAgd2l0aCBhZGRUcmFu c2NlaXZlciAKIFBBU1MgVGVzdGluZyBzeW5jaHJvbml6YXRpb24gc291cmNlcyAKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWFkZFRyYW5zY2VpdmVyLmh0bWwgYi9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNjZWl2ZXIuaHRtbAppbmRleCBjY2ZhNzJhOGZk OWY4MzE1YmIwZjdlYzgwYTkxODNiOTYyY2I1MWQ4Li5lMjEwNjM4MWNhMDNiMmM2NThjNzBiN2Zl MzJlMDViZGQ1ZTRiMTQ5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRk VHJhbnNjZWl2ZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNj ZWl2ZXIuaHRtbApAQCAtMzksNiArMzksMjQgQEAgcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9 PiB7CiAgICAgYXNzZXJ0X3RydWUob2ZmZXIuc2RwLmluZGV4T2YoImE9cmVjdm9ubHkiKSAhPT0g LTEsICJhPXJlY3Zvbmx5Iik7CiB9LCAiU2V0dGluZyB1cCBjYWxscyB3aXRoIGFkZFRyYW5zY2Vp dmVyIHdpdGggYSB0cmFjayIpOwogCitwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlh UGVybWlzc2lvbih0cnVlKTsKKworICAgIGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5t ZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86IHRydWUgfSk7CisgICAgdmFyIHBjID0g bmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgcGMuYWRkVHJhbnNjZWl2ZXIoc3RyZWFtLmdl dFZpZGVvVHJhY2tzKClbMF0pOworICAgIGF3YWl0IHBjLmdldFNlbmRlcnMoKVswXS5yZXBsYWNl VHJhY2sobnVsbCk7CisgICAgYXdhaXQgcGMuZ2V0U2VuZGVycygpWzBdLnJlcGxhY2VUcmFjayhz dHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSk7CisKKyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBj LmNyZWF0ZU9mZmVyKCk7CisKKyAgICBjb25zdCBzZHBMaW5lcyA9IG9mZmVyLnNkcC5zcGxpdCgn XHJcbicpLmZpbHRlcihsaW5lID0+IHsKKyAgICAgICAgcmV0dXJuIGxpbmUuc3RhcnRzV2l0aCgi bT12aWRlbyIpOworICAgIH0pOworICAgIGFzc2VydF9lcXVhbHMoc2RwTGluZXMubGVuZ3RoLCAx LCAiVGhlcmUgc2hvdWxkIGJlIDEgdmlkZW8gbSBzZWN0aW9uIik7Cit9LCAiU2V0dGluZyB1cCBj YWxscyB3aXRoIGFkZFRyYW5zY2VpdmVyIHdpdGggYSB0cmFjayBhbmQgdXNlIHJlcGxhY2VUcmFj ayBzZXZlcmFsIHRpbWVzIik7CisKIGZ1bmN0aW9uIHRlc3RJbWFnZSgpCiB7CiAgICAgY2FudmFz LndpZHRoID0gdmlkZW8udmlkZW9XaWR0aDsKQEAgLTc5LDYgKzk3LDEzIEBAIHByb21pc2VfdGVz dChhc3luYyAodGVzdCkgPT4gewogICAgICAgICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNr ID0gKHRyYWNrRXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICByZXNvbHZlKHRyYWNrRXZlbnQu dHJhY2spOwogICAgICAgICAgICAgfTsKKyAgICAgICAgfSwgeworICAgICAgICAgICAgb2JzZXJ2 ZU9mZmVyIDogKGRlc2MpID0+IHsKKyAgICAgICAgICAgICAgICBjb25zdCBzZHBMaW5lcyA9IGRl c2Muc2RwLnNwbGl0KCdcclxuJykuZmlsdGVyKGxpbmUgPT4geworICAgICAgICAgICAgICAgICAg ICByZXR1cm4gbGluZS5zdGFydHNXaXRoKCJtPXZpZGVvIik7CisgICAgICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhzZHBMaW5lcy5sZW5ndGgsIDEsICJUaGVy ZSBzaG91bGQgYmUgMSB2aWRlbyBtIHNlY3Rpb24iKTsKKyAgICAgICAgICAgIH0KICAgICAgICAg fSk7CiAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJUZXN0IHRpbWVkIG91dCIpLCA1 MDAwKTsKICAgICB9KTsK