201888 2019-09-17 15:45:48 -0700 Stop calling Page::setSessionID() from WebKit2 2019-09-17 19:25:45 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson dbates dino ews-watchlist fmalita ggaren gyuyoung.kim japhet mifenton pdr sabouhallawa schenney sergio webkit-bug-importer youennf oldest_to_newest 1571719 0 cdumez 2019-09-17 15:45:48 -0700 Stop calling Page::setSessionID() from WebKit2 since Page's sessionID can never change when using WebKit2 (We process-swap and create a new Page in a new process when changing data store). Instead, we now pass the sessionID ID when constructing the Page, as part of the PageConfiguration structure. 1571720 1 379000 cdumez 2019-09-17 15:48:47 -0700 Created attachment 379000 Patch 1571721 2 379001 cdumez 2019-09-17 15:52:32 -0700 Created attachment 379001 Patch 1571732 3 379005 cdumez 2019-09-17 16:23:55 -0700 Created attachment 379005 Patch 1571758 4 379005 achristensen 2019-09-17 17:39:07 -0700 Comment on attachment 379005 Patch http://trac.webkit.org/r250006 1571759 5 webkit-bug-importer 2019-09-17 17:40:29 -0700 <rdar://problem/55461391> 1571767 6 cdumez 2019-09-17 18:43:39 -0700 (In reply to Alex Christensen from comment #4) > Comment on attachment 379005 [details] > Patch > > http://trac.webkit.org/r250006 Come on Alex! <https://trac.webkit.org/changeset/250018> :P 1571773 7 achristensen 2019-09-17 19:25:45 -0700 :( Thanks for the build fix. 379000 2019-09-17 15:48:47 -0700 2019-09-17 15:52:31 -0700 Patch bug-201888-20190917154846.patch text/plain 17360 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODlmZGVhMjA2YWE3MTk2 NTRkNGVkZTlhMTFkYzVhZTUzMWNmM2MzOC4uODA1YTQ3ZjczODgzN2NkZmFhYzk3Y2IzMjY5ZTJm ZGI1MzMxMmVkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6 OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZy b20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgor ICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQ YWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4g SW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0 aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0 dXJlLgorCisgICAgICAgICogZWRpdGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KToKKyAgICAgICAgKiBsb2FkZXIvRW1w dHlDbGllbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhZ2VDb25maWd1cmF0aW9uV2l0aEVt cHR5Q2xpZW50cyk6CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAgICAq IHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2U6OnNldFNlc3Npb25JRCk6CisgICAgICAgICogcGFnZS9QYWdlQ29uZmln dXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uZmlndXJhdGlvbjo6UGFnZUNv bmZpZ3VyYXRpb24pOgorICAgICAgICAqIHBhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAg ICAgKiBzdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW1h Z2U6OmRhdGFDaGFuZ2VkKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlUGFnZUZv clNlcnZpY2VXb3JrZXIpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlclRocmVhZFBy b3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkpOgorCiAyMDE5LTA5LTE3ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCAzMmVkYjIzYmI2MWY0OTdmNTFjY2ExNTJiY2Q1M2UxYzY2 YTU1ZDQxLi44YTVkNmMxNTE3MWFhNjU3ZjRmMTI1NTdhMTlhMjRiMDliNzY2ZjU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20g V2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdl J3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQy IChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mg d2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3Mg dGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0 aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogU2hh cmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlUG9s aWNpZXNEYXRhOjphcHBseVRvRG9jdW1lbnRMb2FkZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv U3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxsU2VydmljZVdvcmtlcik6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2Vi S2l0OjptX3RleHRBdXRvU2l6aW5nQWRqdXN0bWVudFRpbWVyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6c2V0U2Vzc2lvbklEKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViUHJvY2VzcyBjbGFzcyBtZXRob2RzIHNob3VsZCBub3QgbmVl ZCB0byB0YWtlIGEgc2Vzc2lvbklECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggNGI3 YTI3ZjkyNTFhNjIyZTRhYzc5NGVjMTUxMzZiMzQ3YjlmZjU0ZC4uOGJlNGQ0NGUzYTg0NjY2OTU5 ZjcyYzFhOWRkNzdkMDQzODRlNTM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0 MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBj YWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vz c2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBw cm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBj aGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNl c3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAg ICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhG cmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorCiAyMDE5LTA5LTA5ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzYWJsZSBUTFMgMS4wIGFuZCAx LjEgaW4gV2ViU29ja2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJr dXAuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IDA4ODJmMWFk YzkwNzM1NTk5MTVjNDgxMjk4ZmRmZWMwM2U3NjgzNzAuLjEyNGE1YWIyZDZhNzIyMzY0MmYwNjI5 NjI4MWFjMTZjYjQ1MDE3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFy a3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTE3Niw3 ICsxNzYsNyBAQCB2b2lkIHJlbW92ZVN1YnJlc291cmNlVVJMQXR0cmlidXRlcyhSZWY8RG9jdW1l bnRGcmFnbWVudD4mJiBmcmFnbWVudCwgV1RGOjpGdW5jdAogCiBzdGQ6OnVuaXF1ZV9wdHI8UGFn ZT4gY3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KCkKIHsKLSAgICBhdXRvIHBhZ2VD b25maWd1cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAg YXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IHBhZ2VDb25maWd1cmF0aW9uV2l0aEVtcHR5Q2xpZW50 cyhQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKICAgICAKICAgICBhdXRvIHBh Z2UgPSBtYWtlVW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBw YWdlLT5zZXRJc0ZvclNhbml0aXppbmdXZWJDb250ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9F bXB0eUNsaWVudHMuY3BwCmluZGV4IDUxZjg0ZDVjYmQxNjY1N2ZkYWU3OTU0YTA3NTUwMGFkYzFj YTFmMjguLjJmNjYzODU4NzQwMDU5NzA0YTdmZTRmMjYyZjQ1OTE2MzVkOTg4NjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCkBAIC03MCw2ICs3MCw3IEBACiAjaW5jbHVk ZSAiVXNlckNvbnRlbnRQcm92aWRlci5oIgogI2luY2x1ZGUgIlZpc2l0ZWRMaW5rU3RvcmUuaCIK ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9IZWFwSW5saW5lcy5oPgorI2luY2x1ZGUgPHBhbC9T ZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIEVOQUJM RShDT05URU5UX0VYVEVOU0lPTlMpCkBAIC01NDcsOSArNTQ4LDEwIEBAIGNsYXNzIEVtcHR5U3Rv cmFnZVNlc3Npb25Qcm92aWRlciA6IHB1YmxpYyBTdG9yYWdlU2Vzc2lvblByb3ZpZGVyIHsKICAg ICBOZXR3b3JrU3RvcmFnZVNlc3Npb24qIHN0b3JhZ2VTZXNzaW9uKCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gbnVsbHB0cjsgfQogfTsKIAotUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRp b25XaXRoRW1wdHlDbGllbnRzKCkKK1BhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9u V2l0aEVtcHR5Q2xpZW50cyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiB7CiAgICAgUGFnZUNv bmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRpb24geworICAgICAgICBzZXNzaW9uSUQsCiAgICAg ICAgIG1ha2VVbmlxdWVSZWY8RW1wdHlFZGl0b3JDbGllbnQ+KCksCiAgICAgICAgIFNvY2tldFBy b3ZpZGVyOjpjcmVhdGUoKSwKICAgICAgICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCmluZGV4IGQ2MzkzOTY2OWVlZjVlYTU5ZjA4 ZDk4ZjQwOTU5ODQwZTg1Y2U4MmEuLjYxN2ExNjEyNjc0YzU0YzA0NDUwNDdmMDQyMmVkMGE5ZGMz NjdmZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKQEAgLTIwNCw2ICsyMDQs NiBAQCBjbGFzcyBFbXB0eUNocm9tZUNsaWVudCA6IHB1YmxpYyBDaHJvbWVDbGllbnQgewogfTsK IAogRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQmIGVtcHR5RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQo KTsKLVdFQkNPUkVfRVhQT1JUIFBhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uV2l0 aEVtcHR5Q2xpZW50cygpOworV0VCQ09SRV9FWFBPUlQgUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNv bmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFBBTDo6U2Vzc2lvbklEKTsKIAogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKaW5kZXggMWRjZTVkOGFiMjNhOWNiZTNhYTZjMGYwY2MxMWVhMmJmNTMyMjI1Ny4u NDUzODc3M2M0NzNkYzIzOTkxNGMwMDBkMzYwZGEwNThmODUzN2VkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCkBAIC0yNjMsNyArMjYzLDcgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBh Z2VDb25maWd1cmF0aW9uKQogICAgICwgbV9zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKldURk1v dmUocGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKSkKICAgICAsIG1f dXNlckNvbnRlbnRQcm92aWRlcigqV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVu dFByb3ZpZGVyKSkKICAgICAsIG1fdmlzaXRlZExpbmtTdG9yZSgqV1RGTW92ZShwYWdlQ29uZmln dXJhdGlvbi52aXNpdGVkTGlua1N0b3JlKSkKLSAgICAsIG1fc2Vzc2lvbklEKFBBTDo6U2Vzc2lv bklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpCisgICAgLCBtX3Nlc3Npb25JRChwYWdlQ29uZmlndXJh dGlvbi5zZXNzaW9uSUQpCiAjaWYgRU5BQkxFKFZJREVPKQogICAgICwgbV9wbGF5YmFja0NvbnRy b2xzTWFuYWdlclVwZGF0ZVRpbWVyKCp0aGlzLCAmUGFnZTo6cGxheWJhY2tDb250cm9sc01hbmFn ZXJVcGRhdGVUaW1lckZpcmVkKQogI2VuZGlmCkBAIC0yNDY2LDkgKzI0NjYsMTIgQEAgUEFMOjpT ZXNzaW9uSUQgUGFnZTo6c2Vzc2lvbklEKCkgY29uc3QKICAgICByZXR1cm4gbV9zZXNzaW9uSUQ7 CiB9CiAKKy8vIFRoaXMgaXMgb25seSBjYWxsZWQgYnkgV2ViS2l0TGVnYWN5Lgogdm9pZCBQYWdl OjpzZXRTZXNzaW9uSUQoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogewogICAgIEFTU0VSVChz ZXNzaW9uSUQuaXNWYWxpZCgpKTsKKyAgICBBU1NFUlQobV9zZXNzaW9uSUQgPT0gUEFMOjpTZXNz aW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKSB8fCBtX3Nlc3Npb25JRCA9PSBQQUw6OlNl c3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBBU1NFUlQoc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgfHwgc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpOwogCiAjaWYgRU5BQkxFKElOREVYRURf REFUQUJBU0UpCiAgICAgaWYgKHNlc3Npb25JRCAhPSBtX3Nlc3Npb25JRCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKaW5kZXggZGJiYWEyOTZjYjc1M2RhNjg0Mjc5 ZDM2ZjUyMjEzMmFhMjMyYTYwYi4uMmQzM2Q3NjMxOTNmNGYxNWYwODFkOWI0OWE4ZmFhOTZiNTJk MzliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKQEAgLTUx LDggKzUxLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYWdlQ29uZmlndXJhdGlvbjo6 UGFnZUNvbmZpZ3VyYXRpb24oVW5pcXVlUmVmPEVkaXRvckNsaWVudD4mJiBlZGl0b3JDbGllbnQs IFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5pcXVlUmVmPExpYldlYlJU Q1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVTdG9yYWdlUHJvdmlkZXI+ JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENsaWVudD4mJiBiYWNrRm9y d2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCi0gICAgOiBlZGl0b3JDbGll bnQoV1RGTW92ZShlZGl0b3JDbGllbnQpKQorUGFnZUNvbmZpZ3VyYXRpb246OlBhZ2VDb25maWd1 cmF0aW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVW5pcXVlUmVmPEVkaXRvckNsaWVudD4m JiBlZGl0b3JDbGllbnQsIFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5p cXVlUmVmPExpYldlYlJUQ1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVT dG9yYWdlUHJvdmlkZXI+JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENs aWVudD4mJiBiYWNrRm9yd2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCisg ICAgOiBzZXNzaW9uSUQoc2Vzc2lvbklEKQorICAgICwgZWRpdG9yQ2xpZW50KFdURk1vdmUoZWRp dG9yQ2xpZW50KSkKICAgICAsIHNvY2tldFByb3ZpZGVyKFdURk1vdmUoc29ja2V0UHJvdmlkZXIp KQogICAgICwgbGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShsaWJXZWJSVENQcm92aWRlcikpCiAg ICAgLCBiYWNrRm9yd2FyZENsaWVudChXVEZNb3ZlKGJhY2tGb3J3YXJkQ2xpZW50KSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaAppbmRleCAwN2Y1ZTE2YWYxZjgzMTU1Y2Jj YzdmY2JjYTMyN2Q5ODE4M2IxOGE2Li5lNWQ3YWFhYmQwYWViYzU5MTcxZTdhZWY5YzU2ZmQ5MTFk MDU4ZDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25maWd1cmF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCkBAIC0yNSw2 ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgog I2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgog I2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTY3LDEwICs2OCwxMSBAQCBjbGFzcyBTcGVlY2hT eW50aGVzaXNDbGllbnQ7CiBjbGFzcyBQYWdlQ29uZmlndXJhdGlvbiB7CiAgICAgV1RGX01BS0Vf Tk9OQ09QWUFCTEUoUGFnZUNvbmZpZ3VyYXRpb24pOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsK IHB1YmxpYzoKLSAgICBXRUJDT1JFX0VYUE9SVCBQYWdlQ29uZmlndXJhdGlvbihVbmlxdWVSZWY8 RWRpdG9yQ2xpZW50PiYmLCBSZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJS VENQcm92aWRlcj4mJiwgUmVmPENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0Zvcndh cmRDbGllbnQ+JiYsIFJlZjxDb29raWVKYXI+JiYpOworICAgIFdFQkNPUkVfRVhQT1JUIFBhZ2VD b25maWd1cmF0aW9uKFBBTDo6U2Vzc2lvbklELCBVbmlxdWVSZWY8RWRpdG9yQ2xpZW50PiYmLCBS ZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJSVENQcm92aWRlcj4mJiwgUmVm PENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0ZvcndhcmRDbGllbnQ+JiYsIFJlZjxD b29raWVKYXI+JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIH5QYWdlQ29uZmlndXJhdGlvbigpOwog ICAgIFBhZ2VDb25maWd1cmF0aW9uKFBhZ2VDb25maWd1cmF0aW9uJiYpOwogCisgICAgUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklEOwogICAgIEFsdGVybmF0aXZlVGV4dENsaWVudCogYWx0ZXJuYXRp dmVUZXh0Q2xpZW50IHsgbnVsbHB0ciB9OwogICAgIENocm9tZUNsaWVudCogY2hyb21lQ2xpZW50 IHsgbnVsbHB0ciB9OwogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKaW5kZXggZjZkZGYxYmMzOTU2MjRjNDQ4MDcwNTg4ZjA1 YWIyYjBiODA5YWEzOS4uNjkzY2IzNDZlYzJmNmQzY2YwMjdiZjhiYTY4ZTJlODYzNTczMTYwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCkBAIC00NjcsNyArNDY3 LDcgQEAgRW5jb2RlZERhdGFTdGF0dXMgU1ZHSW1hZ2U6OmRhdGFDaGFuZ2VkKGJvb2wgYWxsRGF0 YVJlY2VpdmVkKQogICAgICAgICByZXR1cm4gRW5jb2RlZERhdGFTdGF0dXM6OkNvbXBsZXRlOwog CiAgICAgaWYgKGFsbERhdGFSZWNlaXZlZCkgewotICAgICAgICBhdXRvIHBhZ2VDb25maWd1cmF0 aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAgICAgIGF1dG8g cGFnZUNvbmZpZ3VyYXRpb24gPSBwYWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoUEFM OjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSk7CiAgICAgICAgIG1fY2hyb21lQ2xpZW50 ID0gbWFrZVVuaXF1ZTxTVkdJbWFnZUNocm9tZUNsaWVudD4odGhpcyk7CiAgICAgICAgIHBhZ2VD b25maWd1cmF0aW9uLmNocm9tZUNsaWVudCA9IG1fY2hyb21lQ2xpZW50LmdldCgpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29y a2VyVGhyZWFkUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcAppbmRleCA5ZTcyOGMzYTdhZmE0NmM5NDlj ZGNiZTBkNmZlYjA0YTk1MzFjY2Y5Li42MTc0NWE3YTBmYTBiMjVjMWIzMjkyYTNjZWQyNDI0NzQ0 YWZiNzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4 dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5jcHAKQEAgLTU0LDEw ICs1NCw5IEBAIFVSTCBzdGF0aWMgaW5saW5lIHRvcE9yaWdpblVSTChjb25zdCBTZWN1cml0eU9y aWdpbiYgb3JpZ2luKQogICAgIHJldHVybiB1cmw7CiB9CiAKLXN0YXRpYyBpbmxpbmUgVW5pcXVl UmVmPFBhZ2U+IGNyZWF0ZVBhZ2VGb3JTZXJ2aWNlV29ya2VyKFBhZ2VDb25maWd1cmF0aW9uJiYg Y29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiBkYXRhLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSwg UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQorc3RhdGljIGlubGluZSBVbmlxdWVSZWY8UGFnZT4g Y3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoUGFnZUNvbmZpZ3VyYXRpb24mJiBjb25maWd1cmF0 aW9uLCBjb25zdCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmIGRhdGEsIFNlY3VyaXR5T3JpZ2lu OjpTdG9yYWdlQmxvY2tpbmdQb2xpY3kgc3RvcmFnZUJsb2NraW5nUG9saWN5KQogewogICAgIGF1 dG8gcGFnZSA9IG1ha2VVbmlxdWVSZWY8UGFnZT4oV1RGTW92ZShjb25maWd1cmF0aW9uKSk7Ci0g ICAgcGFnZS0+c2V0U2Vzc2lvbklEKHNlc3Npb25JRCk7CiAKICAgICBhdXRvJiBtYWluRnJhbWUg PSBwYWdlLT5tYWluRnJhbWUoKTsKICAgICBtYWluRnJhbWUubG9hZGVyKCkuaW5pdEZvclN5bnRo ZXNpemVkRG9jdW1lbnQoeyB9KTsKQEAgLTk3LDcgKzk2LDcgQEAgc3RhdGljIEhhc2hTZXQ8U2Vy dmljZVdvcmtlclRocmVhZFByb3h5Kj4mIGFsbFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94aWVzKCkK IH0KIAogU2VydmljZVdvcmtlclRocmVhZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHko UGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdlQ29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtl ckNvbnRleHREYXRhJiBkYXRhLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0cmluZyYmIHVz ZXJBZ2VudCwgQ2FjaGVTdG9yYWdlUHJvdmlkZXImIGNhY2hlU3RvcmFnZVByb3ZpZGVyLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkK LSAgICA6IG1fcGFnZShjcmVhdGVQYWdlRm9yU2VydmljZVdvcmtlcihXVEZNb3ZlKHBhZ2VDb25m aWd1cmF0aW9uKSwgZGF0YSwgc3RvcmFnZUJsb2NraW5nUG9saWN5LCBkYXRhLnNlc3Npb25JRCkp CisgICAgOiBtX3BhZ2UoY3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoV1RGTW92ZShwYWdlQ29u ZmlndXJhdGlvbiksIGRhdGEsIHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkpCiAgICAgLCBtX2RvY3Vt ZW50KCptX3BhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCiAgICAgLCBtX3NlcnZpY2VXb3Jr ZXJUaHJlYWQoU2VydmljZVdvcmtlclRocmVhZDo6Y3JlYXRlKGRhdGEsIHNlc3Npb25JRCwgV1RG TW92ZSh1c2VyQWdlbnQpLCAqdGhpcywgKnRoaXMsIGlkYkNvbm5lY3Rpb25Qcm94eShtX2RvY3Vt ZW50KSwgbV9kb2N1bWVudC0+c29ja2V0UHJvdmlkZXIoKSkpCiAgICAgLCBtX2NhY2hlU3RvcmFn ZVByb3ZpZGVyKGNhY2hlU3RvcmFnZVByb3ZpZGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJzaXRlUG9saWNpZXNEYXRhLmNwcAppbmRleCAzYTA2MDU2NGE3ZmY1Mjg3MTUwNTU2MzZmNTEx OWNmNDcyNjNhMmM1Li5hMjFjYzk1NTliMmUxMjcxZDY3OGQ1MDhkMWI4OTlhZWExMmM1MjNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcApAQCAtMjcw LDEzICsyNzAsNiBAQCB2b2lkIFdlYnNpdGVQb2xpY2llc0RhdGE6OmFwcGx5VG9Eb2N1bWVudExv YWRlcihXZWJzaXRlUG9saWNpZXNEYXRhJiYgd2Vic2l0ZVBvbAogICAgICAgICByZXR1cm47CiAK ICAgICBkb2N1bWVudExvYWRlci5hcHBseVBvbGljaWVzVG9TZXR0aW5ncygpOwotCi0gICAgYXV0 byogcGFnZSA9IGZyYW1lLT5wYWdlKCk7Ci0gICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBpZiAod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKQot ICAgICAgICBwYWdlLT5zZXRTZXNzaW9uSUQod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3Rv cmVQYXJhbWV0ZXJzLT5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc2Vzc2lvbklEKTsKIH0KIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IGU2MzNjNzdjNzFmMGIw ZWY3NTQ5NWQxMDQyNjYyMmQ5OTNkMjM2ZGIuLmQzZTk3MmMxNWNjMDllZjczOTM4ZWVmZTMxNDMz N2ExZjFhNzViZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdl L1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAgLTEy NSw3ICsxMjUsNyBAQCB2b2lkIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxs U2VydmljZVdvcmtlcihjb25zdCBTZXJ2aWNlV29ya2VyQ29udAogewogICAgIExPRyhTZXJ2aWNl V29ya2VyLCAiV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2aWNlV29y a2VyIGZvciB3b3JrZXIgJXMiLCBkYXRhLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLmxvZ2dpbmdT dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBw YWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoKTsKKyAgICBhdXRvIHBhZ2VDb25maWd1 cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnNlc3Npb25JRCgpKTsKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQog ICAgIHBhZ2VDb25maWd1cmF0aW9uLmRhdGFiYXNlUHJvdmlkZXIgPSBXZWJEYXRhYmFzZVByb3Zp ZGVyOjpnZXRPckNyZWF0ZShtX3BhZ2VHcm91cElEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZDQzMGQwOWQ5YTJiNzQxZjMyM2RkNTA5MGE1 YTBlYjBlZTQwOThhZS4uMDI5YjI0ZDQwOTE2ZWZkYjQwZDQ1MzE4OTg3MGQyYjQ5NDYwYjU0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ0 Myw2ICs0NDMsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAjZW5kaWYKIAogICAgIFBhZ2VD b25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uKAorICAgICAgICBXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZXNzaW9uSUQoKSwKICAgICAgICAgbWFrZVVuaXF1ZVJlZjxXZWJFZGl0b3JDbGll bnQ+KHRoaXMpLAogICAgICAgICBXZWJTb2NrZXRQcm92aWRlcjo6Y3JlYXRlKCksCiAgICAgICAg IG1ha2VVbmlxdWVSZWY8V2ViS2l0OjpMaWJXZWJSVENQcm92aWRlcj4oKSwKQEAgLTUwMyw4ICs1 MDQsNiBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAKICAgICBtX3BhZ2UgPSBtYWtlVW5pcXVl PFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIAotICAgIHNldFNlc3Npb25JRChX ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKSk7Ci0KICAgICB1cGRhdGVQcmVmZXJl bmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKIAogICAgIG1fYmFja2dyb3VuZENvbG9yID0gcGFyYW1l dGVycy5iYWNrZ3JvdW5kQ29sb3I7CkBAIC0zMjAwLDExICszMTk5LDYgQEAgdm9pZCBXZWJQYWdl OjpzZXRMYXllckhvc3RpbmdNb2RlKExheWVySG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5nTW9kZSkK ICAgICAgICAgcGx1Z2luVmlldy0+c2V0TGF5ZXJIb3N0aW5nTW9kZShtX2xheWVySG9zdGluZ01v ZGUpOwogfQogCi12b2lkIFdlYlBhZ2U6OnNldFNlc3Npb25JRChQQUw6OlNlc3Npb25JRCBzZXNz aW9uSUQpCi17Ci0gICAgbV9wYWdlLT5zZXRTZXNzaW9uSUQoc2Vzc2lvbklEKTsKLX0KLQogdm9p ZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oRnJhbWVJZGVudGlmaWVyIGZyYW1l SUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeUNoZWNrSWRlbnRpZmllciBpZGVudGlmaWVy LCBQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IERvd25sb2FkSUQmIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQogewogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCmluZGV4IDQ0MjhmM2E0YzU3Y2VhNzYyYWEwOTZhMTAzNGYxZTMzMDgw YmFjNWMuLjNhN2Q2ZTkzNWQ3NDgzMDU5NjIzNmJjZGJhZDk5YjBmMTIyODcwODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTI5Niw4ICsyOTYsNiBA QCBwdWJsaWM6CiAgICAgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29uc3QgeyByZXR1cm4g bV9wYWdlLT5zZXNzaW9uSUQoKTsgfQogICAgIGJvb2wgdXNlc0VwaGVtZXJhbFNlc3Npb24oKSBj b25zdCB7IHJldHVybiBtX3BhZ2UtPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7IH0KIAotICAgIHZv aWQgc2V0U2Vzc2lvbklEKFBBTDo6U2Vzc2lvbklEKTsKLQogICAgIHZvaWQgc2V0U2l6ZShjb25z dCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fdmlld1NpemU7IH0KICAgICBXZWJDb3JlOjpJbnRSZWN0IGJvdW5k cygpIGNvbnN0IHsgcmV0dXJuIFdlYkNvcmU6OkludFJlY3QoV2ViQ29yZTo6SW50UG9pbnQoKSwg c2l6ZSgpKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmlu ZGV4IDk2ZGE2YTQ5NWU2YzE0NzJhOTJjMTI0OTk1NmMxMzIyMTc5ZDBiNTkuLjNjNWE1YzI2Y2Nl ODU5YTRhZjg1Njg0NzgxZjgyOTg1M2MxMDdiY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE0MzIsNiArMTQzMiw3IEBAIC0gKHZvaWQpX2NvbW1v bkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBO YW1lOihOU1N0CiAKICAgICBhdXRvIHN0b3JhZ2VQcm92aWRlciA9IFBhZ2VTdG9yYWdlU2Vzc2lv blByb3ZpZGVyOjpjcmVhdGUoKTsKICAgICBQYWdlQ29uZmlndXJhdGlvbiBwYWdlQ29uZmlndXJh dGlvbigKKyAgICAgICAgW1tzZWxmIHByZWZlcmVuY2VzXSBwcml2YXRlQnJvd3NpbmdFbmFibGVk XSA/IFBBTDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLAogICAgICAgICBtYWtlVW5pcXVlUmVmPFdlYkVkaXRv ckNsaWVudD4oc2VsZiksCiAgICAgICAgIFNvY2tldFByb3ZpZGVyOjpjcmVhdGUoKSwKICAgICAg ICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLAo= 379001 2019-09-17 15:52:32 -0700 2019-09-17 16:23:53 -0700 Patch bug-201888-20190917155232.patch text/plain 17827 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODlmZGVhMjA2YWE3MTk2 NTRkNGVkZTlhMTFkYzVhZTUzMWNmM2MzOC4uODA1YTQ3ZjczODgzN2NkZmFhYzk3Y2IzMjY5ZTJm ZGI1MzMxMmVkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6 OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZy b20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgor ICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQ YWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4g SW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0 aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0 dXJlLgorCisgICAgICAgICogZWRpdGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KToKKyAgICAgICAgKiBsb2FkZXIvRW1w dHlDbGllbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhZ2VDb25maWd1cmF0aW9uV2l0aEVt cHR5Q2xpZW50cyk6CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAgICAq IHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2U6OnNldFNlc3Npb25JRCk6CisgICAgICAgICogcGFnZS9QYWdlQ29uZmln dXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uZmlndXJhdGlvbjo6UGFnZUNv bmZpZ3VyYXRpb24pOgorICAgICAgICAqIHBhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAg ICAgKiBzdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW1h Z2U6OmRhdGFDaGFuZ2VkKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlUGFnZUZv clNlcnZpY2VXb3JrZXIpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlclRocmVhZFBy b3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkpOgorCiAyMDE5LTA5LTE3ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCAzMmVkYjIzYmI2MWY0OTdmNTFjY2ExNTJiY2Q1M2UxYzY2 YTU1ZDQxLi44YTVkNmMxNTE3MWFhNjU3ZjRmMTI1NTdhMTlhMjRiMDliNzY2ZjU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20g V2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdl J3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQy IChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mg d2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3Mg dGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0 aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogU2hh cmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlUG9s aWNpZXNEYXRhOjphcHBseVRvRG9jdW1lbnRMb2FkZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv U3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxsU2VydmljZVdvcmtlcik6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2Vi S2l0OjptX3RleHRBdXRvU2l6aW5nQWRqdXN0bWVudFRpbWVyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6c2V0U2Vzc2lvbklEKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViUHJvY2VzcyBjbGFzcyBtZXRob2RzIHNob3VsZCBub3QgbmVl ZCB0byB0YWtlIGEgc2Vzc2lvbklECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggNGI3 YTI3ZjkyNTFhNjIyZTRhYzc5NGVjMTUxMzZiMzQ3YjlmZjU0ZC4uOGJlNGQ0NGUzYTg0NjY2OTU5 ZjcyYzFhOWRkNzdkMDQzODRlNTM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0 MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBj YWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vz c2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBw cm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBj aGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNl c3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAg ICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhG cmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorCiAyMDE5LTA5LTA5ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzYWJsZSBUTFMgMS4wIGFuZCAx LjEgaW4gV2ViU29ja2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJr dXAuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IDA4ODJmMWFk YzkwNzM1NTk5MTVjNDgxMjk4ZmRmZWMwM2U3NjgzNzAuLjEyNGE1YWIyZDZhNzIyMzY0MmYwNjI5 NjI4MWFjMTZjYjQ1MDE3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFy a3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTE3Niw3 ICsxNzYsNyBAQCB2b2lkIHJlbW92ZVN1YnJlc291cmNlVVJMQXR0cmlidXRlcyhSZWY8RG9jdW1l bnRGcmFnbWVudD4mJiBmcmFnbWVudCwgV1RGOjpGdW5jdAogCiBzdGQ6OnVuaXF1ZV9wdHI8UGFn ZT4gY3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KCkKIHsKLSAgICBhdXRvIHBhZ2VD b25maWd1cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAg YXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IHBhZ2VDb25maWd1cmF0aW9uV2l0aEVtcHR5Q2xpZW50 cyhQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKICAgICAKICAgICBhdXRvIHBh Z2UgPSBtYWtlVW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBw YWdlLT5zZXRJc0ZvclNhbml0aXppbmdXZWJDb250ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9F bXB0eUNsaWVudHMuY3BwCmluZGV4IDUxZjg0ZDVjYmQxNjY1N2ZkYWU3OTU0YTA3NTUwMGFkYzFj YTFmMjguLjJmNjYzODU4NzQwMDU5NzA0YTdmZTRmMjYyZjQ1OTE2MzVkOTg4NjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCkBAIC03MCw2ICs3MCw3IEBACiAjaW5jbHVk ZSAiVXNlckNvbnRlbnRQcm92aWRlci5oIgogI2luY2x1ZGUgIlZpc2l0ZWRMaW5rU3RvcmUuaCIK ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9IZWFwSW5saW5lcy5oPgorI2luY2x1ZGUgPHBhbC9T ZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIEVOQUJM RShDT05URU5UX0VYVEVOU0lPTlMpCkBAIC01NDcsOSArNTQ4LDEwIEBAIGNsYXNzIEVtcHR5U3Rv cmFnZVNlc3Npb25Qcm92aWRlciA6IHB1YmxpYyBTdG9yYWdlU2Vzc2lvblByb3ZpZGVyIHsKICAg ICBOZXR3b3JrU3RvcmFnZVNlc3Npb24qIHN0b3JhZ2VTZXNzaW9uKCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gbnVsbHB0cjsgfQogfTsKIAotUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRp b25XaXRoRW1wdHlDbGllbnRzKCkKK1BhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9u V2l0aEVtcHR5Q2xpZW50cyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiB7CiAgICAgUGFnZUNv bmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRpb24geworICAgICAgICBzZXNzaW9uSUQsCiAgICAg ICAgIG1ha2VVbmlxdWVSZWY8RW1wdHlFZGl0b3JDbGllbnQ+KCksCiAgICAgICAgIFNvY2tldFBy b3ZpZGVyOjpjcmVhdGUoKSwKICAgICAgICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCmluZGV4IGQ2MzkzOTY2OWVlZjVlYTU5ZjA4 ZDk4ZjQwOTU5ODQwZTg1Y2U4MmEuLjYxN2ExNjEyNjc0YzU0YzA0NDUwNDdmMDQyMmVkMGE5ZGMz NjdmZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKQEAgLTIwNCw2ICsyMDQs NiBAQCBjbGFzcyBFbXB0eUNocm9tZUNsaWVudCA6IHB1YmxpYyBDaHJvbWVDbGllbnQgewogfTsK IAogRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQmIGVtcHR5RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQo KTsKLVdFQkNPUkVfRVhQT1JUIFBhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uV2l0 aEVtcHR5Q2xpZW50cygpOworV0VCQ09SRV9FWFBPUlQgUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNv bmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFBBTDo6U2Vzc2lvbklEKTsKIAogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKaW5kZXggMWRjZTVkOGFiMjNhOWNiZTNhYTZjMGYwY2MxMWVhMmJmNTMyMjI1Ny4u NDUzODc3M2M0NzNkYzIzOTkxNGMwMDBkMzYwZGEwNThmODUzN2VkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCkBAIC0yNjMsNyArMjYzLDcgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBh Z2VDb25maWd1cmF0aW9uKQogICAgICwgbV9zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKldURk1v dmUocGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKSkKICAgICAsIG1f dXNlckNvbnRlbnRQcm92aWRlcigqV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVu dFByb3ZpZGVyKSkKICAgICAsIG1fdmlzaXRlZExpbmtTdG9yZSgqV1RGTW92ZShwYWdlQ29uZmln dXJhdGlvbi52aXNpdGVkTGlua1N0b3JlKSkKLSAgICAsIG1fc2Vzc2lvbklEKFBBTDo6U2Vzc2lv bklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpCisgICAgLCBtX3Nlc3Npb25JRChwYWdlQ29uZmlndXJh dGlvbi5zZXNzaW9uSUQpCiAjaWYgRU5BQkxFKFZJREVPKQogICAgICwgbV9wbGF5YmFja0NvbnRy b2xzTWFuYWdlclVwZGF0ZVRpbWVyKCp0aGlzLCAmUGFnZTo6cGxheWJhY2tDb250cm9sc01hbmFn ZXJVcGRhdGVUaW1lckZpcmVkKQogI2VuZGlmCkBAIC0yNDY2LDkgKzI0NjYsMTIgQEAgUEFMOjpT ZXNzaW9uSUQgUGFnZTo6c2Vzc2lvbklEKCkgY29uc3QKICAgICByZXR1cm4gbV9zZXNzaW9uSUQ7 CiB9CiAKKy8vIFRoaXMgaXMgb25seSBjYWxsZWQgYnkgV2ViS2l0TGVnYWN5Lgogdm9pZCBQYWdl OjpzZXRTZXNzaW9uSUQoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogewogICAgIEFTU0VSVChz ZXNzaW9uSUQuaXNWYWxpZCgpKTsKKyAgICBBU1NFUlQobV9zZXNzaW9uSUQgPT0gUEFMOjpTZXNz aW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKSB8fCBtX3Nlc3Npb25JRCA9PSBQQUw6OlNl c3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBBU1NFUlQoc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgfHwgc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpOwogCiAjaWYgRU5BQkxFKElOREVYRURf REFUQUJBU0UpCiAgICAgaWYgKHNlc3Npb25JRCAhPSBtX3Nlc3Npb25JRCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKaW5kZXggZGJiYWEyOTZjYjc1M2RhNjg0Mjc5 ZDM2ZjUyMjEzMmFhMjMyYTYwYi4uMmQzM2Q3NjMxOTNmNGYxNWYwODFkOWI0OWE4ZmFhOTZiNTJk MzliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKQEAgLTUx LDggKzUxLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYWdlQ29uZmlndXJhdGlvbjo6 UGFnZUNvbmZpZ3VyYXRpb24oVW5pcXVlUmVmPEVkaXRvckNsaWVudD4mJiBlZGl0b3JDbGllbnQs IFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5pcXVlUmVmPExpYldlYlJU Q1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVTdG9yYWdlUHJvdmlkZXI+ JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENsaWVudD4mJiBiYWNrRm9y d2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCi0gICAgOiBlZGl0b3JDbGll bnQoV1RGTW92ZShlZGl0b3JDbGllbnQpKQorUGFnZUNvbmZpZ3VyYXRpb246OlBhZ2VDb25maWd1 cmF0aW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVW5pcXVlUmVmPEVkaXRvckNsaWVudD4m JiBlZGl0b3JDbGllbnQsIFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5p cXVlUmVmPExpYldlYlJUQ1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVT dG9yYWdlUHJvdmlkZXI+JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENs aWVudD4mJiBiYWNrRm9yd2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCisg ICAgOiBzZXNzaW9uSUQoc2Vzc2lvbklEKQorICAgICwgZWRpdG9yQ2xpZW50KFdURk1vdmUoZWRp dG9yQ2xpZW50KSkKICAgICAsIHNvY2tldFByb3ZpZGVyKFdURk1vdmUoc29ja2V0UHJvdmlkZXIp KQogICAgICwgbGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShsaWJXZWJSVENQcm92aWRlcikpCiAg ICAgLCBiYWNrRm9yd2FyZENsaWVudChXVEZNb3ZlKGJhY2tGb3J3YXJkQ2xpZW50KSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaAppbmRleCAwN2Y1ZTE2YWYxZjgzMTU1Y2Jj YzdmY2JjYTMyN2Q5ODE4M2IxOGE2Li5lNWQ3YWFhYmQwYWViYzU5MTcxZTdhZWY5YzU2ZmQ5MTFk MDU4ZDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25maWd1cmF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCkBAIC0yNSw2 ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgog I2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgog I2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTY3LDEwICs2OCwxMSBAQCBjbGFzcyBTcGVlY2hT eW50aGVzaXNDbGllbnQ7CiBjbGFzcyBQYWdlQ29uZmlndXJhdGlvbiB7CiAgICAgV1RGX01BS0Vf Tk9OQ09QWUFCTEUoUGFnZUNvbmZpZ3VyYXRpb24pOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsK IHB1YmxpYzoKLSAgICBXRUJDT1JFX0VYUE9SVCBQYWdlQ29uZmlndXJhdGlvbihVbmlxdWVSZWY8 RWRpdG9yQ2xpZW50PiYmLCBSZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJS VENQcm92aWRlcj4mJiwgUmVmPENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0Zvcndh cmRDbGllbnQ+JiYsIFJlZjxDb29raWVKYXI+JiYpOworICAgIFdFQkNPUkVfRVhQT1JUIFBhZ2VD b25maWd1cmF0aW9uKFBBTDo6U2Vzc2lvbklELCBVbmlxdWVSZWY8RWRpdG9yQ2xpZW50PiYmLCBS ZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJSVENQcm92aWRlcj4mJiwgUmVm PENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0ZvcndhcmRDbGllbnQ+JiYsIFJlZjxD b29raWVKYXI+JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIH5QYWdlQ29uZmlndXJhdGlvbigpOwog ICAgIFBhZ2VDb25maWd1cmF0aW9uKFBhZ2VDb25maWd1cmF0aW9uJiYpOwogCisgICAgUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklEOwogICAgIEFsdGVybmF0aXZlVGV4dENsaWVudCogYWx0ZXJuYXRp dmVUZXh0Q2xpZW50IHsgbnVsbHB0ciB9OwogICAgIENocm9tZUNsaWVudCogY2hyb21lQ2xpZW50 IHsgbnVsbHB0ciB9OwogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKaW5kZXggZjZkZGYxYmMzOTU2MjRjNDQ4MDcwNTg4ZjA1 YWIyYjBiODA5YWEzOS4uNjkzY2IzNDZlYzJmNmQzY2YwMjdiZjhiYTY4ZTJlODYzNTczMTYwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCkBAIC00NjcsNyArNDY3 LDcgQEAgRW5jb2RlZERhdGFTdGF0dXMgU1ZHSW1hZ2U6OmRhdGFDaGFuZ2VkKGJvb2wgYWxsRGF0 YVJlY2VpdmVkKQogICAgICAgICByZXR1cm4gRW5jb2RlZERhdGFTdGF0dXM6OkNvbXBsZXRlOwog CiAgICAgaWYgKGFsbERhdGFSZWNlaXZlZCkgewotICAgICAgICBhdXRvIHBhZ2VDb25maWd1cmF0 aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAgICAgIGF1dG8g cGFnZUNvbmZpZ3VyYXRpb24gPSBwYWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoUEFM OjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSk7CiAgICAgICAgIG1fY2hyb21lQ2xpZW50 ID0gbWFrZVVuaXF1ZTxTVkdJbWFnZUNocm9tZUNsaWVudD4odGhpcyk7CiAgICAgICAgIHBhZ2VD b25maWd1cmF0aW9uLmNocm9tZUNsaWVudCA9IG1fY2hyb21lQ2xpZW50LmdldCgpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29y a2VyVGhyZWFkUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcAppbmRleCA5ZTcyOGMzYTdhZmE0NmM5NDlj ZGNiZTBkNmZlYjA0YTk1MzFjY2Y5Li42MTc0NWE3YTBmYTBiMjVjMWIzMjkyYTNjZWQyNDI0NzQ0 YWZiNzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4 dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5jcHAKQEAgLTU0LDEw ICs1NCw5IEBAIFVSTCBzdGF0aWMgaW5saW5lIHRvcE9yaWdpblVSTChjb25zdCBTZWN1cml0eU9y aWdpbiYgb3JpZ2luKQogICAgIHJldHVybiB1cmw7CiB9CiAKLXN0YXRpYyBpbmxpbmUgVW5pcXVl UmVmPFBhZ2U+IGNyZWF0ZVBhZ2VGb3JTZXJ2aWNlV29ya2VyKFBhZ2VDb25maWd1cmF0aW9uJiYg Y29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiBkYXRhLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSwg UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQorc3RhdGljIGlubGluZSBVbmlxdWVSZWY8UGFnZT4g Y3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoUGFnZUNvbmZpZ3VyYXRpb24mJiBjb25maWd1cmF0 aW9uLCBjb25zdCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmIGRhdGEsIFNlY3VyaXR5T3JpZ2lu OjpTdG9yYWdlQmxvY2tpbmdQb2xpY3kgc3RvcmFnZUJsb2NraW5nUG9saWN5KQogewogICAgIGF1 dG8gcGFnZSA9IG1ha2VVbmlxdWVSZWY8UGFnZT4oV1RGTW92ZShjb25maWd1cmF0aW9uKSk7Ci0g ICAgcGFnZS0+c2V0U2Vzc2lvbklEKHNlc3Npb25JRCk7CiAKICAgICBhdXRvJiBtYWluRnJhbWUg PSBwYWdlLT5tYWluRnJhbWUoKTsKICAgICBtYWluRnJhbWUubG9hZGVyKCkuaW5pdEZvclN5bnRo ZXNpemVkRG9jdW1lbnQoeyB9KTsKQEAgLTk3LDcgKzk2LDcgQEAgc3RhdGljIEhhc2hTZXQ8U2Vy dmljZVdvcmtlclRocmVhZFByb3h5Kj4mIGFsbFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94aWVzKCkK IH0KIAogU2VydmljZVdvcmtlclRocmVhZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHko UGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdlQ29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtl ckNvbnRleHREYXRhJiBkYXRhLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0cmluZyYmIHVz ZXJBZ2VudCwgQ2FjaGVTdG9yYWdlUHJvdmlkZXImIGNhY2hlU3RvcmFnZVByb3ZpZGVyLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkK LSAgICA6IG1fcGFnZShjcmVhdGVQYWdlRm9yU2VydmljZVdvcmtlcihXVEZNb3ZlKHBhZ2VDb25m aWd1cmF0aW9uKSwgZGF0YSwgc3RvcmFnZUJsb2NraW5nUG9saWN5LCBkYXRhLnNlc3Npb25JRCkp CisgICAgOiBtX3BhZ2UoY3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoV1RGTW92ZShwYWdlQ29u ZmlndXJhdGlvbiksIGRhdGEsIHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkpCiAgICAgLCBtX2RvY3Vt ZW50KCptX3BhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCiAgICAgLCBtX3NlcnZpY2VXb3Jr ZXJUaHJlYWQoU2VydmljZVdvcmtlclRocmVhZDo6Y3JlYXRlKGRhdGEsIHNlc3Npb25JRCwgV1RG TW92ZSh1c2VyQWdlbnQpLCAqdGhpcywgKnRoaXMsIGlkYkNvbm5lY3Rpb25Qcm94eShtX2RvY3Vt ZW50KSwgbV9kb2N1bWVudC0+c29ja2V0UHJvdmlkZXIoKSkpCiAgICAgLCBtX2NhY2hlU3RvcmFn ZVByb3ZpZGVyKGNhY2hlU3RvcmFnZVByb3ZpZGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJzaXRlUG9saWNpZXNEYXRhLmNwcAppbmRleCAzYTA2MDU2NGE3ZmY1Mjg3MTUwNTU2MzZmNTEx OWNmNDcyNjNhMmM1Li5hMjFjYzk1NTliMmUxMjcxZDY3OGQ1MDhkMWI4OTlhZWExMmM1MjNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcApAQCAtMjcw LDEzICsyNzAsNiBAQCB2b2lkIFdlYnNpdGVQb2xpY2llc0RhdGE6OmFwcGx5VG9Eb2N1bWVudExv YWRlcihXZWJzaXRlUG9saWNpZXNEYXRhJiYgd2Vic2l0ZVBvbAogICAgICAgICByZXR1cm47CiAK ICAgICBkb2N1bWVudExvYWRlci5hcHBseVBvbGljaWVzVG9TZXR0aW5ncygpOwotCi0gICAgYXV0 byogcGFnZSA9IGZyYW1lLT5wYWdlKCk7Ci0gICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBpZiAod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKQot ICAgICAgICBwYWdlLT5zZXRTZXNzaW9uSUQod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3Rv cmVQYXJhbWV0ZXJzLT5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc2Vzc2lvbklEKTsKIH0KIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IGU2MzNjNzdjNzFmMGIw ZWY3NTQ5NWQxMDQyNjYyMmQ5OTNkMjM2ZGIuLmQzZTk3MmMxNWNjMDllZjczOTM4ZWVmZTMxNDMz N2ExZjFhNzViZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdl L1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAgLTEy NSw3ICsxMjUsNyBAQCB2b2lkIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxs U2VydmljZVdvcmtlcihjb25zdCBTZXJ2aWNlV29ya2VyQ29udAogewogICAgIExPRyhTZXJ2aWNl V29ya2VyLCAiV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2aWNlV29y a2VyIGZvciB3b3JrZXIgJXMiLCBkYXRhLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLmxvZ2dpbmdT dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBw YWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoKTsKKyAgICBhdXRvIHBhZ2VDb25maWd1 cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnNlc3Npb25JRCgpKTsKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQog ICAgIHBhZ2VDb25maWd1cmF0aW9uLmRhdGFiYXNlUHJvdmlkZXIgPSBXZWJEYXRhYmFzZVByb3Zp ZGVyOjpnZXRPckNyZWF0ZShtX3BhZ2VHcm91cElEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZDQzMGQwOWQ5YTJiNzQxZjMyM2RkNTA5MGE1 YTBlYjBlZTQwOThhZS4uMDI5YjI0ZDQwOTE2ZWZkYjQwZDQ1MzE4OTg3MGQyYjQ5NDYwYjU0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ0 Myw2ICs0NDMsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAjZW5kaWYKIAogICAgIFBhZ2VD b25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uKAorICAgICAgICBXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZXNzaW9uSUQoKSwKICAgICAgICAgbWFrZVVuaXF1ZVJlZjxXZWJFZGl0b3JDbGll bnQ+KHRoaXMpLAogICAgICAgICBXZWJTb2NrZXRQcm92aWRlcjo6Y3JlYXRlKCksCiAgICAgICAg IG1ha2VVbmlxdWVSZWY8V2ViS2l0OjpMaWJXZWJSVENQcm92aWRlcj4oKSwKQEAgLTUwMyw4ICs1 MDQsNiBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAKICAgICBtX3BhZ2UgPSBtYWtlVW5pcXVl PFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIAotICAgIHNldFNlc3Npb25JRChX ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKSk7Ci0KICAgICB1cGRhdGVQcmVmZXJl bmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKIAogICAgIG1fYmFja2dyb3VuZENvbG9yID0gcGFyYW1l dGVycy5iYWNrZ3JvdW5kQ29sb3I7CkBAIC0zMjAwLDExICszMTk5LDYgQEAgdm9pZCBXZWJQYWdl OjpzZXRMYXllckhvc3RpbmdNb2RlKExheWVySG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5nTW9kZSkK ICAgICAgICAgcGx1Z2luVmlldy0+c2V0TGF5ZXJIb3N0aW5nTW9kZShtX2xheWVySG9zdGluZ01v ZGUpOwogfQogCi12b2lkIFdlYlBhZ2U6OnNldFNlc3Npb25JRChQQUw6OlNlc3Npb25JRCBzZXNz aW9uSUQpCi17Ci0gICAgbV9wYWdlLT5zZXRTZXNzaW9uSUQoc2Vzc2lvbklEKTsKLX0KLQogdm9p ZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oRnJhbWVJZGVudGlmaWVyIGZyYW1l SUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeUNoZWNrSWRlbnRpZmllciBpZGVudGlmaWVy LCBQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IERvd25sb2FkSUQmIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQogewogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCmluZGV4IDQ0MjhmM2E0YzU3Y2VhNzYyYWEwOTZhMTAzNGYxZTMzMDgw YmFjNWMuLjNhN2Q2ZTkzNWQ3NDgzMDU5NjIzNmJjZGJhZDk5YjBmMTIyODcwODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTI5Niw4ICsyOTYsNiBA QCBwdWJsaWM6CiAgICAgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29uc3QgeyByZXR1cm4g bV9wYWdlLT5zZXNzaW9uSUQoKTsgfQogICAgIGJvb2wgdXNlc0VwaGVtZXJhbFNlc3Npb24oKSBj b25zdCB7IHJldHVybiBtX3BhZ2UtPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7IH0KIAotICAgIHZv aWQgc2V0U2Vzc2lvbklEKFBBTDo6U2Vzc2lvbklEKTsKLQogICAgIHZvaWQgc2V0U2l6ZShjb25z dCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fdmlld1NpemU7IH0KICAgICBXZWJDb3JlOjpJbnRSZWN0IGJvdW5k cygpIGNvbnN0IHsgcmV0dXJuIFdlYkNvcmU6OkludFJlY3QoV2ViQ29yZTo6SW50UG9pbnQoKSwg c2l6ZSgpKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmlu ZGV4IDk2ZGE2YTQ5NWU2YzE0NzJhOTJjMTI0OTk1NmMxMzIyMTc5ZDBiNTkuLjVlN2Y3NzE3OTBm N2FkZWZiMzE1YjBlMzNmOGQ0MDg0NzNlMDY0NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE0MzIsNiArMTQzMiw3IEBAIC0gKHZvaWQpX2NvbW1v bkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBO YW1lOihOU1N0CiAKICAgICBhdXRvIHN0b3JhZ2VQcm92aWRlciA9IFBhZ2VTdG9yYWdlU2Vzc2lv blByb3ZpZGVyOjpjcmVhdGUoKTsKICAgICBQYWdlQ29uZmlndXJhdGlvbiBwYWdlQ29uZmlndXJh dGlvbigKKyAgICAgICAgW1tzZWxmIHByZWZlcmVuY2VzXSBwcml2YXRlQnJvd3NpbmdFbmFibGVk XSA/IFBBTDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLAogICAgICAgICBtYWtlVW5pcXVlUmVmPFdlYkVkaXRv ckNsaWVudD4oc2VsZiksCiAgICAgICAgIFNvY2tldFByb3ZpZGVyOjpjcmVhdGUoKSwKICAgICAg ICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLApAQCAtMTcwMCw2ICsxNzAxLDcgQEAgLSAo aWQpaW5pdFNpbXBsZUhUTUxEb2N1bWVudFdpdGhTdHlsZTooTlNTdHJpbmcgKilzdHlsZSBmcmFt ZTooQ0dSZWN0KWZyYW1lIHByZWYKIAogICAgIGF1dG8gc3RvcmFnZVByb3ZpZGVyID0gUGFnZVN0 b3JhZ2VTZXNzaW9uUHJvdmlkZXI6OmNyZWF0ZSgpOwogICAgIFBhZ2VDb25maWd1cmF0aW9uIHBh Z2VDb25maWd1cmF0aW9uKAorICAgICAgICBbW3NlbGYgcHJlZmVyZW5jZXNdIHByaXZhdGVCcm93 c2luZ0VuYWJsZWRdID8gUEFMOjpTZXNzaW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKSA6 IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCksCiAgICAgICAgIG1ha2VVbmlxdWVS ZWY8V2ViRWRpdG9yQ2xpZW50PihzZWxmKSwKICAgICAgICAgU29ja2V0UHJvdmlkZXI6OmNyZWF0 ZSgpLAogICAgICAgICBMaWJXZWJSVENQcm92aWRlcjo6Y3JlYXRlKCksCg== 379005 2019-09-17 16:23:55 -0700 2019-09-17 17:39:07 -0700 Patch bug-201888-20190917162354.patch text/plain 18475 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODlmZGVhMjA2YWE3MTk2 NTRkNGVkZTlhMTFkYzVhZTUzMWNmM2MzOC4uODA1YTQ3ZjczODgzN2NkZmFhYzk3Y2IzMjY5ZTJm ZGI1MzMxMmVkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6 OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZy b20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgor ICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQ YWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4g SW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0 aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0 dXJlLgorCisgICAgICAgICogZWRpdGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KToKKyAgICAgICAgKiBsb2FkZXIvRW1w dHlDbGllbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhZ2VDb25maWd1cmF0aW9uV2l0aEVt cHR5Q2xpZW50cyk6CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAgICAq IHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2U6OnNldFNlc3Npb25JRCk6CisgICAgICAgICogcGFnZS9QYWdlQ29uZmln dXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uZmlndXJhdGlvbjo6UGFnZUNv bmZpZ3VyYXRpb24pOgorICAgICAgICAqIHBhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAg ICAgKiBzdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW1h Z2U6OmRhdGFDaGFuZ2VkKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlUGFnZUZv clNlcnZpY2VXb3JrZXIpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlclRocmVhZFBy b3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkpOgorCiAyMDE5LTA5LTE3ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCAzMmVkYjIzYmI2MWY0OTdmNTFjY2ExNTJiY2Q1M2UxYzY2 YTU1ZDQxLi44YTVkNmMxNTE3MWFhNjU3ZjRmMTI1NTdhMTlhMjRiMDliNzY2ZjU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20g V2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAxODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdl J3Mgc2Vzc2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQy IChXZSBwcm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mg d2hlbiBjaGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3Mg dGhlIHNlc3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0 aGUKKyAgICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogU2hh cmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlUG9s aWNpZXNEYXRhOjphcHBseVRvRG9jdW1lbnRMb2FkZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv U3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxsU2VydmljZVdvcmtlcik6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2Vi S2l0OjptX3RleHRBdXRvU2l6aW5nQWRqdXN0bWVudFRpbWVyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6c2V0U2Vzc2lvbklEKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViUHJvY2VzcyBjbGFzcyBtZXRob2RzIHNob3VsZCBub3QgbmVl ZCB0byB0YWtlIGEgc2Vzc2lvbklECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggNGI3 YTI3ZjkyNTFhNjIyZTRhYzc5NGVjMTUxMzZiMzQ3YjlmZjU0ZC4uOGJlNGQ0NGUzYTg0NjY2OTU5 ZjcyYzFhOWRkNzdkMDQzODRlNTM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDE5LTA5LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CisKKyAgICAgICAgU3RvcCBjYWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0 MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODg4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBj YWxsaW5nIFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MiBzaW5jZSBQYWdlJ3Mgc2Vz c2lvbklEIGNhbiBuZXZlciBjaGFuZ2Ugd2hlbgorICAgICAgICB1c2luZyBXZWJLaXQyIChXZSBw cm9jZXNzLXN3YXAgYW5kIGNyZWF0ZSBhIG5ldyBQYWdlIGluIGEgbmV3IHByb2Nlc3Mgd2hlbiBj aGFuZ2luZyBkYXRhCisgICAgICAgIHN0b3JlKS4gSW5zdGVhZCwgd2Ugbm93IHBhc3MgdGhlIHNl c3Npb25JRCBJRCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgUGFnZSwgYXMgcGFydCBvZiB0aGUKKyAg ICAgICAgUGFnZUNvbmZpZ3VyYXRpb24gc3RydWN0dXJlLgorCisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhG cmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorCiAyMDE5LTA5LTA5ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzYWJsZSBUTFMgMS4wIGFuZCAx LjEgaW4gV2ViU29ja2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJr dXAuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IDA4ODJmMWFk YzkwNzM1NTk5MTVjNDgxMjk4ZmRmZWMwM2U3NjgzNzAuLjEyNGE1YWIyZDZhNzIyMzY0MmYwNjI5 NjI4MWFjMTZjYjQ1MDE3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFy a3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTE3Niw3 ICsxNzYsNyBAQCB2b2lkIHJlbW92ZVN1YnJlc291cmNlVVJMQXR0cmlidXRlcyhSZWY8RG9jdW1l bnRGcmFnbWVudD4mJiBmcmFnbWVudCwgV1RGOjpGdW5jdAogCiBzdGQ6OnVuaXF1ZV9wdHI8UGFn ZT4gY3JlYXRlUGFnZUZvclNhbml0aXppbmdXZWJDb250ZW50KCkKIHsKLSAgICBhdXRvIHBhZ2VD b25maWd1cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAg YXV0byBwYWdlQ29uZmlndXJhdGlvbiA9IHBhZ2VDb25maWd1cmF0aW9uV2l0aEVtcHR5Q2xpZW50 cyhQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKICAgICAKICAgICBhdXRvIHBh Z2UgPSBtYWtlVW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBw YWdlLT5zZXRJc0ZvclNhbml0aXppbmdXZWJDb250ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9F bXB0eUNsaWVudHMuY3BwCmluZGV4IDUxZjg0ZDVjYmQxNjY1N2ZkYWU3OTU0YTA3NTUwMGFkYzFj YTFmMjguLjJmNjYzODU4NzQwMDU5NzA0YTdmZTRmMjYyZjQ1OTE2MzVkOTg4NjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCkBAIC03MCw2ICs3MCw3IEBACiAjaW5jbHVk ZSAiVXNlckNvbnRlbnRQcm92aWRlci5oIgogI2luY2x1ZGUgIlZpc2l0ZWRMaW5rU3RvcmUuaCIK ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9IZWFwSW5saW5lcy5oPgorI2luY2x1ZGUgPHBhbC9T ZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIEVOQUJM RShDT05URU5UX0VYVEVOU0lPTlMpCkBAIC01NDcsOSArNTQ4LDEwIEBAIGNsYXNzIEVtcHR5U3Rv cmFnZVNlc3Npb25Qcm92aWRlciA6IHB1YmxpYyBTdG9yYWdlU2Vzc2lvblByb3ZpZGVyIHsKICAg ICBOZXR3b3JrU3RvcmFnZVNlc3Npb24qIHN0b3JhZ2VTZXNzaW9uKCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gbnVsbHB0cjsgfQogfTsKIAotUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRp b25XaXRoRW1wdHlDbGllbnRzKCkKK1BhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9u V2l0aEVtcHR5Q2xpZW50cyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiB7CiAgICAgUGFnZUNv bmZpZ3VyYXRpb24gcGFnZUNvbmZpZ3VyYXRpb24geworICAgICAgICBzZXNzaW9uSUQsCiAgICAg ICAgIG1ha2VVbmlxdWVSZWY8RW1wdHlFZGl0b3JDbGllbnQ+KCksCiAgICAgICAgIFNvY2tldFBy b3ZpZGVyOjpjcmVhdGUoKSwKICAgICAgICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCmluZGV4IGQ2MzkzOTY2OWVlZjVlYTU5ZjA4 ZDk4ZjQwOTU5ODQwZTg1Y2U4MmEuLjYxN2ExNjEyNjc0YzU0YzA0NDUwNDdmMDQyMmVkMGE5ZGMz NjdmZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKQEAgLTIwNCw2ICsyMDQs NiBAQCBjbGFzcyBFbXB0eUNocm9tZUNsaWVudCA6IHB1YmxpYyBDaHJvbWVDbGllbnQgewogfTsK IAogRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQmIGVtcHR5RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQo KTsKLVdFQkNPUkVfRVhQT1JUIFBhZ2VDb25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uV2l0 aEVtcHR5Q2xpZW50cygpOworV0VCQ09SRV9FWFBPUlQgUGFnZUNvbmZpZ3VyYXRpb24gcGFnZUNv bmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFBBTDo6U2Vzc2lvbklEKTsKIAogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKaW5kZXggMWRjZTVkOGFiMjNhOWNiZTNhYTZjMGYwY2MxMWVhMmJmNTMyMjI1Ny4u NDUzODc3M2M0NzNkYzIzOTkxNGMwMDBkMzYwZGEwNThmODUzN2VkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCkBAIC0yNjMsNyArMjYzLDcgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBh Z2VDb25maWd1cmF0aW9uKQogICAgICwgbV9zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKldURk1v dmUocGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKSkKICAgICAsIG1f dXNlckNvbnRlbnRQcm92aWRlcigqV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVu dFByb3ZpZGVyKSkKICAgICAsIG1fdmlzaXRlZExpbmtTdG9yZSgqV1RGTW92ZShwYWdlQ29uZmln dXJhdGlvbi52aXNpdGVkTGlua1N0b3JlKSkKLSAgICAsIG1fc2Vzc2lvbklEKFBBTDo6U2Vzc2lv bklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpCisgICAgLCBtX3Nlc3Npb25JRChwYWdlQ29uZmlndXJh dGlvbi5zZXNzaW9uSUQpCiAjaWYgRU5BQkxFKFZJREVPKQogICAgICwgbV9wbGF5YmFja0NvbnRy b2xzTWFuYWdlclVwZGF0ZVRpbWVyKCp0aGlzLCAmUGFnZTo6cGxheWJhY2tDb250cm9sc01hbmFn ZXJVcGRhdGVUaW1lckZpcmVkKQogI2VuZGlmCkBAIC0yNDY2LDkgKzI0NjYsMTIgQEAgUEFMOjpT ZXNzaW9uSUQgUGFnZTo6c2Vzc2lvbklEKCkgY29uc3QKICAgICByZXR1cm4gbV9zZXNzaW9uSUQ7 CiB9CiAKKy8vIFRoaXMgaXMgb25seSBjYWxsZWQgYnkgV2ViS2l0TGVnYWN5Lgogdm9pZCBQYWdl OjpzZXRTZXNzaW9uSUQoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogewogICAgIEFTU0VSVChz ZXNzaW9uSUQuaXNWYWxpZCgpKTsKKyAgICBBU1NFUlQobV9zZXNzaW9uSUQgPT0gUEFMOjpTZXNz aW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKSB8fCBtX3Nlc3Npb25JRCA9PSBQQUw6OlNl c3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBBU1NFUlQoc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgfHwgc2Vzc2lvbklEID09IFBB TDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpOwogCiAjaWYgRU5BQkxFKElOREVYRURf REFUQUJBU0UpCiAgICAgaWYgKHNlc3Npb25JRCAhPSBtX3Nlc3Npb25JRCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKaW5kZXggZGJiYWEyOTZjYjc1M2RhNjg0Mjc5 ZDM2ZjUyMjEzMmFhMjMyYTYwYi4uMmQzM2Q3NjMxOTNmNGYxNWYwODFkOWI0OWE4ZmFhOTZiNTJk MzliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5jcHAKQEAgLTUx LDggKzUxLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYWdlQ29uZmlndXJhdGlvbjo6 UGFnZUNvbmZpZ3VyYXRpb24oVW5pcXVlUmVmPEVkaXRvckNsaWVudD4mJiBlZGl0b3JDbGllbnQs IFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5pcXVlUmVmPExpYldlYlJU Q1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVTdG9yYWdlUHJvdmlkZXI+ JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENsaWVudD4mJiBiYWNrRm9y d2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCi0gICAgOiBlZGl0b3JDbGll bnQoV1RGTW92ZShlZGl0b3JDbGllbnQpKQorUGFnZUNvbmZpZ3VyYXRpb246OlBhZ2VDb25maWd1 cmF0aW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVW5pcXVlUmVmPEVkaXRvckNsaWVudD4m JiBlZGl0b3JDbGllbnQsIFJlZjxTb2NrZXRQcm92aWRlcj4mJiBzb2NrZXRQcm92aWRlciwgVW5p cXVlUmVmPExpYldlYlJUQ1Byb3ZpZGVyPiYmIGxpYldlYlJUQ1Byb3ZpZGVyLCBSZWY8Q2FjaGVT dG9yYWdlUHJvdmlkZXI+JiYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFJlZjxCYWNrRm9yd2FyZENs aWVudD4mJiBiYWNrRm9yd2FyZENsaWVudCwgUmVmPENvb2tpZUphcj4mJiBjb29raWVKYXIpCisg ICAgOiBzZXNzaW9uSUQoc2Vzc2lvbklEKQorICAgICwgZWRpdG9yQ2xpZW50KFdURk1vdmUoZWRp dG9yQ2xpZW50KSkKICAgICAsIHNvY2tldFByb3ZpZGVyKFdURk1vdmUoc29ja2V0UHJvdmlkZXIp KQogICAgICwgbGliV2ViUlRDUHJvdmlkZXIoV1RGTW92ZShsaWJXZWJSVENQcm92aWRlcikpCiAg ICAgLCBiYWNrRm9yd2FyZENsaWVudChXVEZNb3ZlKGJhY2tGb3J3YXJkQ2xpZW50KSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uaAppbmRleCAwN2Y1ZTE2YWYxZjgzMTU1Y2Jj YzdmY2JjYTMyN2Q5ODE4M2IxOGE2Li5lNWQ3YWFhYmQwYWViYzU5MTcxZTdhZWY5YzU2ZmQ5MTFk MDU4ZDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25maWd1cmF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCkBAIC0yNSw2 ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgog I2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgog I2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTY3LDEwICs2OCwxMSBAQCBjbGFzcyBTcGVlY2hT eW50aGVzaXNDbGllbnQ7CiBjbGFzcyBQYWdlQ29uZmlndXJhdGlvbiB7CiAgICAgV1RGX01BS0Vf Tk9OQ09QWUFCTEUoUGFnZUNvbmZpZ3VyYXRpb24pOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsK IHB1YmxpYzoKLSAgICBXRUJDT1JFX0VYUE9SVCBQYWdlQ29uZmlndXJhdGlvbihVbmlxdWVSZWY8 RWRpdG9yQ2xpZW50PiYmLCBSZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJS VENQcm92aWRlcj4mJiwgUmVmPENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0Zvcndh cmRDbGllbnQ+JiYsIFJlZjxDb29raWVKYXI+JiYpOworICAgIFdFQkNPUkVfRVhQT1JUIFBhZ2VD b25maWd1cmF0aW9uKFBBTDo6U2Vzc2lvbklELCBVbmlxdWVSZWY8RWRpdG9yQ2xpZW50PiYmLCBS ZWY8U29ja2V0UHJvdmlkZXI+JiYsIFVuaXF1ZVJlZjxMaWJXZWJSVENQcm92aWRlcj4mJiwgUmVm PENhY2hlU3RvcmFnZVByb3ZpZGVyPiYmLCBSZWY8QmFja0ZvcndhcmRDbGllbnQ+JiYsIFJlZjxD b29raWVKYXI+JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIH5QYWdlQ29uZmlndXJhdGlvbigpOwog ICAgIFBhZ2VDb25maWd1cmF0aW9uKFBhZ2VDb25maWd1cmF0aW9uJiYpOwogCisgICAgUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklEOwogICAgIEFsdGVybmF0aXZlVGV4dENsaWVudCogYWx0ZXJuYXRp dmVUZXh0Q2xpZW50IHsgbnVsbHB0ciB9OwogICAgIENocm9tZUNsaWVudCogY2hyb21lQ2xpZW50 IHsgbnVsbHB0ciB9OwogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKaW5kZXggZjZkZGYxYmMzOTU2MjRjNDQ4MDcwNTg4ZjA1 YWIyYjBiODA5YWEzOS4uNjkzY2IzNDZlYzJmNmQzY2YwMjdiZjhiYTY4ZTJlODYzNTczMTYwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCkBAIC00NjcsNyArNDY3 LDcgQEAgRW5jb2RlZERhdGFTdGF0dXMgU1ZHSW1hZ2U6OmRhdGFDaGFuZ2VkKGJvb2wgYWxsRGF0 YVJlY2VpdmVkKQogICAgICAgICByZXR1cm4gRW5jb2RlZERhdGFTdGF0dXM6OkNvbXBsZXRlOwog CiAgICAgaWYgKGFsbERhdGFSZWNlaXZlZCkgewotICAgICAgICBhdXRvIHBhZ2VDb25maWd1cmF0 aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKCk7CisgICAgICAgIGF1dG8g cGFnZUNvbmZpZ3VyYXRpb24gPSBwYWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoUEFM OjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSk7CiAgICAgICAgIG1fY2hyb21lQ2xpZW50 ID0gbWFrZVVuaXF1ZTxTVkdJbWFnZUNocm9tZUNsaWVudD4odGhpcyk7CiAgICAgICAgIHBhZ2VD b25maWd1cmF0aW9uLmNocm9tZUNsaWVudCA9IG1fY2hyb21lQ2xpZW50LmdldCgpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29y a2VyVGhyZWFkUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcAppbmRleCA5ZTcyOGMzYTdhZmE0NmM5NDlj ZGNiZTBkNmZlYjA0YTk1MzFjY2Y5Li42MTc0NWE3YTBmYTBiMjVjMWIzMjkyYTNjZWQyNDI0NzQ0 YWZiNzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4 dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5jcHAKQEAgLTU0LDEw ICs1NCw5IEBAIFVSTCBzdGF0aWMgaW5saW5lIHRvcE9yaWdpblVSTChjb25zdCBTZWN1cml0eU9y aWdpbiYgb3JpZ2luKQogICAgIHJldHVybiB1cmw7CiB9CiAKLXN0YXRpYyBpbmxpbmUgVW5pcXVl UmVmPFBhZ2U+IGNyZWF0ZVBhZ2VGb3JTZXJ2aWNlV29ya2VyKFBhZ2VDb25maWd1cmF0aW9uJiYg Y29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiBkYXRhLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSwg UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQorc3RhdGljIGlubGluZSBVbmlxdWVSZWY8UGFnZT4g Y3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoUGFnZUNvbmZpZ3VyYXRpb24mJiBjb25maWd1cmF0 aW9uLCBjb25zdCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmIGRhdGEsIFNlY3VyaXR5T3JpZ2lu OjpTdG9yYWdlQmxvY2tpbmdQb2xpY3kgc3RvcmFnZUJsb2NraW5nUG9saWN5KQogewogICAgIGF1 dG8gcGFnZSA9IG1ha2VVbmlxdWVSZWY8UGFnZT4oV1RGTW92ZShjb25maWd1cmF0aW9uKSk7Ci0g ICAgcGFnZS0+c2V0U2Vzc2lvbklEKHNlc3Npb25JRCk7CiAKICAgICBhdXRvJiBtYWluRnJhbWUg PSBwYWdlLT5tYWluRnJhbWUoKTsKICAgICBtYWluRnJhbWUubG9hZGVyKCkuaW5pdEZvclN5bnRo ZXNpemVkRG9jdW1lbnQoeyB9KTsKQEAgLTk3LDcgKzk2LDcgQEAgc3RhdGljIEhhc2hTZXQ8U2Vy dmljZVdvcmtlclRocmVhZFByb3h5Kj4mIGFsbFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94aWVzKCkK IH0KIAogU2VydmljZVdvcmtlclRocmVhZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHko UGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdlQ29uZmlndXJhdGlvbiwgY29uc3QgU2VydmljZVdvcmtl ckNvbnRleHREYXRhJiBkYXRhLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0cmluZyYmIHVz ZXJBZ2VudCwgQ2FjaGVTdG9yYWdlUHJvdmlkZXImIGNhY2hlU3RvcmFnZVByb3ZpZGVyLCBTZWN1 cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkK LSAgICA6IG1fcGFnZShjcmVhdGVQYWdlRm9yU2VydmljZVdvcmtlcihXVEZNb3ZlKHBhZ2VDb25m aWd1cmF0aW9uKSwgZGF0YSwgc3RvcmFnZUJsb2NraW5nUG9saWN5LCBkYXRhLnNlc3Npb25JRCkp CisgICAgOiBtX3BhZ2UoY3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoV1RGTW92ZShwYWdlQ29u ZmlndXJhdGlvbiksIGRhdGEsIHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkpCiAgICAgLCBtX2RvY3Vt ZW50KCptX3BhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCiAgICAgLCBtX3NlcnZpY2VXb3Jr ZXJUaHJlYWQoU2VydmljZVdvcmtlclRocmVhZDo6Y3JlYXRlKGRhdGEsIHNlc3Npb25JRCwgV1RG TW92ZSh1c2VyQWdlbnQpLCAqdGhpcywgKnRoaXMsIGlkYkNvbm5lY3Rpb25Qcm94eShtX2RvY3Vt ZW50KSwgbV9kb2N1bWVudC0+c29ja2V0UHJvdmlkZXIoKSkpCiAgICAgLCBtX2NhY2hlU3RvcmFn ZVByb3ZpZGVyKGNhY2hlU3RvcmFnZVByb3ZpZGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJzaXRlUG9saWNpZXNEYXRhLmNwcAppbmRleCAzYTA2MDU2NGE3ZmY1Mjg3MTUwNTU2MzZmNTEx OWNmNDcyNjNhMmM1Li5hMjFjYzk1NTliMmUxMjcxZDY3OGQ1MDhkMWI4OTlhZWExMmM1MjNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmNwcApAQCAtMjcw LDEzICsyNzAsNiBAQCB2b2lkIFdlYnNpdGVQb2xpY2llc0RhdGE6OmFwcGx5VG9Eb2N1bWVudExv YWRlcihXZWJzaXRlUG9saWNpZXNEYXRhJiYgd2Vic2l0ZVBvbAogICAgICAgICByZXR1cm47CiAK ICAgICBkb2N1bWVudExvYWRlci5hcHBseVBvbGljaWVzVG9TZXR0aW5ncygpOwotCi0gICAgYXV0 byogcGFnZSA9IGZyYW1lLT5wYWdlKCk7Ci0gICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBpZiAod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKQot ICAgICAgICBwYWdlLT5zZXRTZXNzaW9uSUQod2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3Rv cmVQYXJhbWV0ZXJzLT5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc2Vzc2lvbklEKTsKIH0KIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IGU2MzNjNzdjNzFmMGIw ZWY3NTQ5NWQxMDQyNjYyMmQ5OTNkMjM2ZGIuLmQzZTk3MmMxNWNjMDllZjczOTM4ZWVmZTMxNDMz N2ExZjFhNzViZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdl L1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAgLTEy NSw3ICsxMjUsNyBAQCB2b2lkIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjppbnN0YWxs U2VydmljZVdvcmtlcihjb25zdCBTZXJ2aWNlV29ya2VyQ29udAogewogICAgIExPRyhTZXJ2aWNl V29ya2VyLCAiV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2aWNlV29y a2VyIGZvciB3b3JrZXIgJXMiLCBkYXRhLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLmxvZ2dpbmdT dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBw YWdlQ29uZmlndXJhdGlvbldpdGhFbXB0eUNsaWVudHMoKTsKKyAgICBhdXRvIHBhZ2VDb25maWd1 cmF0aW9uID0gcGFnZUNvbmZpZ3VyYXRpb25XaXRoRW1wdHlDbGllbnRzKFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnNlc3Npb25JRCgpKTsKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQog ICAgIHBhZ2VDb25maWd1cmF0aW9uLmRhdGFiYXNlUHJvdmlkZXIgPSBXZWJEYXRhYmFzZVByb3Zp ZGVyOjpnZXRPckNyZWF0ZShtX3BhZ2VHcm91cElEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZDQzMGQwOWQ5YTJiNzQxZjMyM2RkNTA5MGE1 YTBlYjBlZTQwOThhZS4uMDI5YjI0ZDQwOTE2ZWZkYjQwZDQ1MzE4OTg3MGQyYjQ5NDYwYjU0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ0 Myw2ICs0NDMsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAjZW5kaWYKIAogICAgIFBhZ2VD b25maWd1cmF0aW9uIHBhZ2VDb25maWd1cmF0aW9uKAorICAgICAgICBXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZXNzaW9uSUQoKSwKICAgICAgICAgbWFrZVVuaXF1ZVJlZjxXZWJFZGl0b3JDbGll bnQ+KHRoaXMpLAogICAgICAgICBXZWJTb2NrZXRQcm92aWRlcjo6Y3JlYXRlKCksCiAgICAgICAg IG1ha2VVbmlxdWVSZWY8V2ViS2l0OjpMaWJXZWJSVENQcm92aWRlcj4oKSwKQEAgLTUwMyw4ICs1 MDQsNiBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAKICAgICBtX3BhZ2UgPSBtYWtlVW5pcXVl PFBhZ2U+KFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIAotICAgIHNldFNlc3Npb25JRChX ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKSk7Ci0KICAgICB1cGRhdGVQcmVmZXJl bmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKIAogICAgIG1fYmFja2dyb3VuZENvbG9yID0gcGFyYW1l dGVycy5iYWNrZ3JvdW5kQ29sb3I7CkBAIC0zMjAwLDExICszMTk5LDYgQEAgdm9pZCBXZWJQYWdl OjpzZXRMYXllckhvc3RpbmdNb2RlKExheWVySG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5nTW9kZSkK ICAgICAgICAgcGx1Z2luVmlldy0+c2V0TGF5ZXJIb3N0aW5nTW9kZShtX2xheWVySG9zdGluZ01v ZGUpOwogfQogCi12b2lkIFdlYlBhZ2U6OnNldFNlc3Npb25JRChQQUw6OlNlc3Npb25JRCBzZXNz aW9uSUQpCi17Ci0gICAgbV9wYWdlLT5zZXRTZXNzaW9uSUQoc2Vzc2lvbklEKTsKLX0KLQogdm9p ZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oRnJhbWVJZGVudGlmaWVyIGZyYW1l SUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeUNoZWNrSWRlbnRpZmllciBpZGVudGlmaWVy LCBQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IERvd25sb2FkSUQmIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQogewogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCmluZGV4IDQ0MjhmM2E0YzU3Y2VhNzYyYWEwOTZhMTAzNGYxZTMzMDgw YmFjNWMuLjNhN2Q2ZTkzNWQ3NDgzMDU5NjIzNmJjZGJhZDk5YjBmMTIyODcwODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTI5Niw4ICsyOTYsNiBA QCBwdWJsaWM6CiAgICAgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29uc3QgeyByZXR1cm4g bV9wYWdlLT5zZXNzaW9uSUQoKTsgfQogICAgIGJvb2wgdXNlc0VwaGVtZXJhbFNlc3Npb24oKSBj b25zdCB7IHJldHVybiBtX3BhZ2UtPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7IH0KIAotICAgIHZv aWQgc2V0U2Vzc2lvbklEKFBBTDo6U2Vzc2lvbklEKTsKLQogICAgIHZvaWQgc2V0U2l6ZShjb25z dCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fdmlld1NpemU7IH0KICAgICBXZWJDb3JlOjpJbnRSZWN0IGJvdW5k cygpIGNvbnN0IHsgcmV0dXJuIFdlYkNvcmU6OkludFJlY3QoV2ViQ29yZTo6SW50UG9pbnQoKSwg c2l6ZSgpKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmlu ZGV4IDk2ZGE2YTQ5NWU2YzE0NzJhOTJjMTI0OTk1NmMxMzIyMTc5ZDBiNTkuLjVlN2Y3NzE3OTBm N2FkZWZiMzE1YjBlMzNmOGQ0MDg0NzNlMDY0NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE0MzIsNiArMTQzMiw3IEBAIC0gKHZvaWQpX2NvbW1v bkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmFtZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBO YW1lOihOU1N0CiAKICAgICBhdXRvIHN0b3JhZ2VQcm92aWRlciA9IFBhZ2VTdG9yYWdlU2Vzc2lv blByb3ZpZGVyOjpjcmVhdGUoKTsKICAgICBQYWdlQ29uZmlndXJhdGlvbiBwYWdlQ29uZmlndXJh dGlvbigKKyAgICAgICAgW1tzZWxmIHByZWZlcmVuY2VzXSBwcml2YXRlQnJvd3NpbmdFbmFibGVk XSA/IFBBTDo6U2Vzc2lvbklEOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLAogICAgICAgICBtYWtlVW5pcXVlUmVmPFdlYkVkaXRv ckNsaWVudD4oc2VsZiksCiAgICAgICAgIFNvY2tldFByb3ZpZGVyOjpjcmVhdGUoKSwKICAgICAg ICAgTGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZSgpLApAQCAtMTcwMCw2ICsxNzAxLDcgQEAgLSAo aWQpaW5pdFNpbXBsZUhUTUxEb2N1bWVudFdpdGhTdHlsZTooTlNTdHJpbmcgKilzdHlsZSBmcmFt ZTooQ0dSZWN0KWZyYW1lIHByZWYKIAogICAgIGF1dG8gc3RvcmFnZVByb3ZpZGVyID0gUGFnZVN0 b3JhZ2VTZXNzaW9uUHJvdmlkZXI6OmNyZWF0ZSgpOwogICAgIFBhZ2VDb25maWd1cmF0aW9uIHBh Z2VDb25maWd1cmF0aW9uKAorICAgICAgICBbW3NlbGYgcHJlZmVyZW5jZXNdIHByaXZhdGVCcm93 c2luZ0VuYWJsZWRdID8gUEFMOjpTZXNzaW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKSA6 IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCksCiAgICAgICAgIG1ha2VVbmlxdWVS ZWY8V2ViRWRpdG9yQ2xpZW50PihzZWxmKSwKICAgICAgICAgU29ja2V0UHJvdmlkZXI6OmNyZWF0 ZSgpLAogICAgICAgICBMaWJXZWJSVENQcm92aWRlcjo6Y3JlYXRlKCksCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv d2luL1dlYlZpZXcuY3BwCmluZGV4IGYzZDhhZjQzY2M3ODBiZWRkMTZjYjllOTJmMWY1YjMzZmUy NTU0ZDIuLmQ5YTQyMTA0NjY5MWQ1YjlmMjkxMDdhNTE5MjVmOTQ3YmRhMmE5NDggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCkBAIC0zMTAxLDYgKzMxMDEsNyBAQCBIUkVTVUxUIFdl YlZpZXc6OmluaXRXaXRoRnJhbWUoUkVDVCBmcmFtZSwgX0luXyBCU1RSIGZyYW1lTmFtZSwgX0lu XyBCU1RSIGdyb3VwTgogCiAgICAgYXV0byBzdG9yYWdlUHJvdmlkZXIgPSBQYWdlU3RvcmFnZVNl c3Npb25Qcm92aWRlcjo6Y3JlYXRlKCk7CiAgICAgUGFnZUNvbmZpZ3VyYXRpb24gY29uZmlndXJh dGlvbigKKyAgICAgICAgUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwKICAgICAg ICAgbWFrZVVuaXF1ZVJlZjxXZWJFZGl0b3JDbGllbnQ+KHRoaXMpLAogICAgICAgICBTb2NrZXRQ cm92aWRlcjo6Y3JlYXRlKCksCiAgICAgICAgIG1ha2VVbmlxdWVSZWY8TGliV2ViUlRDUHJvdmlk ZXI+KCksCg==