179120 2017-11-01 09:26:21 -0700 REGRESSION(r224273): Some crashes under guard malloc (Requested by anttik on #webkit). 2017-11-15 12:28:44 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179014 179115 1 commit-queue commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1366866 0 commit-queue 2017-11-01 09:26:21 -0700 https://trac.webkit.org/changeset/224273 broke the build: Some crashes under guard malloc (Requested by anttik on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1366869 1 325577 commit-queue 2017-11-01 09:26:31 -0700 Created attachment 325577 ROLLOUT of r224273 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1366870 2 325577 commit-queue 2017-11-01 09:28:21 -0700 Comment on attachment 325577 ROLLOUT of r224273 Clearing flags on attachment: 325577 Committed r224279: <https://trac.webkit.org/changeset/224279> 1366871 3 commit-queue 2017-11-01 09:28:23 -0700 All reviewed patches have been landed. Closing bug. 1366873 4 koivisto 2017-11-01 09:29:20 -0700 https://build-safari.apple.com/results/Trunk-Gala-GuardMalloc-Production-WK2-Tests/r224274_3e17ca0985dbc7d79dc4e2ffe4e2fb5c44821335%20(248)/results.html 1372156 5 webkit-bug-importer 2017-11-15 12:28:44 -0800 <rdar://problem/35567616> 325577 2017-11-01 09:26:31 -0700 2017-11-01 09:28:21 -0700 ROLLOUT of r224273 bug-179120-20171101122631.patch text/plain 31317 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0Mjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDJlYWRkY2VlYjU1Y2I1 M2ZlYjM3M2FkM2MzYjZjMjgzMTk0YWQzYy4uNmJkY2EzMDk0ZTEwMzUwMjk1MWI5MjY4ZDhkNDNh NzgzMjRjODZmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTExLTAxICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjI0MjczIGFuZCByMjI0Mjc4LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTIwCisKKyAgICAgICAgU29tZSBjcmFzaGVz IHVuZGVyIGd1YXJkIG1hbGxvYyAoUmVxdWVzdGVkIGJ5IGFudHRpayBvbgorICAgICAgICAjd2Vi a2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXRzOgorCisgICAgICAgICJSZW1vdmUg ZW1wdHkgY29udGludWF0aW9ucyBpbgorICAgICAgICBSZW5kZXJPYmplY3Q6OnJlbW92ZUZyb21Q YXJlbnRBbmREZXN0cm95Q2xlYW5pbmdVcEFub255bW91c1dyYXBwZXJzIgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MDE0CisgICAgICAgIGh0dHBz Oi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yMjQyNzMKKworICAgICAgICAiRml4IENvbnRp bnVhdGlvbkNoYWluTm9kZTo6aW5zZXJ0QWZ0ZXIgYXNzZXJ0aW9uLiIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTExNQorICAgICAgICBodHRwczov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjI0Mjc4CisKIDIwMTctMTEtMDEgIEVtaWxpbyBD b2JvcyDDgWx2YXJleiAgPGVtaWxpb0BjcmlzYWwuaW8+CiAKICAgICAgICAgRml4IENvbnRpbnVh dGlvbkNoYWluTm9kZTo6aW5zZXJ0QWZ0ZXIgYXNzZXJ0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK aW5kZXggNjA5NmQ0YjNhNzRmMTg2M2JlYzcwMDk5NTViZTQ1OGY3ODQ3ZGI0OS4uNjE1OWVlMzgw YTU1NGFkODZmYzE5ZDczZDBjNjA1MTMzYzg1OWZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBA IC0xNjMsNyArMTYzLDcgQEAgc3RhdGljIGlubGluZSBib29sIGlzSW5saW5lV2l0aENvbnRpbnVh dGlvbihSZW5kZXJPYmplY3QmIG9iamVjdCkKIAogc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3Qq IGZpcnN0Q2hpbGRJbkNvbnRpbnVhdGlvbihSZW5kZXJJbmxpbmUmIHJlbmRlcmVyKQogewotICAg IGF1dG8qIGNvbnRpbnVhdGlvbiA9IHJlbmRlcmVyLmNvbnRpbnVhdGlvbigpOworICAgIGF1dG8g Y29udGludWF0aW9uID0gcmVuZGVyZXIuY29udGludWF0aW9uKCk7CiAKICAgICB3aGlsZSAoY29u dGludWF0aW9uKSB7CiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9jaz4oKmNvbnRpbnVhdGlvbikp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA2ODYzNWMzNGY0 YWQ0YzY4MmU5ZTUzYjAxZjFlZjYxNTdmMjcwZjViLi40N2VlNWQ4NjVjZDMxMzk3YjQ5ZDNiMGI2 MGQyOTE5ZTM0ZjNjMmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKQEAgLTQzNSwxMCArNDM1LDE0IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnN0eWxlRGlkQ2hhbmdl KFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5CiAgICAgICAg IGFkanVzdEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVk KCk7CiAKICAgICBhdXRvJiBuZXdTdHlsZSA9IHN0eWxlKCk7Ci0gICAgaWYgKCFpc0Fub255bW91 c0Jsb2NrKCkgJiYgIWlzQ29udGludWF0aW9uKCkpIHsKKyAgICBpZiAoIWlzQW5vbnltb3VzQmxv Y2soKSkgewogICAgICAgICAvLyBFbnN1cmUgdGhhdCBhbGwgb2Ygb3VyIGNvbnRpbnVhdGlvbiBi bG9ja3MgcGljayB1cCB0aGUgbmV3IHN0eWxlLgotICAgICAgICBmb3IgKFJlbmRlckJsb2NrKiBj dXJyQ29udCA9IGJsb2NrRWxlbWVudENvbnRpbnVhdGlvbigpOyBjdXJyQ29udDsgY3VyckNvbnQg PSBjdXJyQ29udC0+YmxvY2tFbGVtZW50Q29udGludWF0aW9uKCkpCisgICAgICAgIGZvciAoUmVu ZGVyQmxvY2sqIGN1cnJDb250ID0gYmxvY2tFbGVtZW50Q29udGludWF0aW9uKCk7IGN1cnJDb250 OyBjdXJyQ29udCA9IGN1cnJDb250LT5ibG9ja0VsZW1lbnRDb250aW51YXRpb24oKSkgeworICAg ICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIG5leHRDb250ID0gY3VyckNvbnQtPmNvbnRp bnVhdGlvbigpOworICAgICAgICAgICAgY3VyckNvbnQtPnNldENvbnRpbnVhdGlvbigwKTsKICAg ICAgICAgICAgIGN1cnJDb250LT5zZXRTdHlsZShSZW5kZXJTdHlsZTo6Y2xvbmUobmV3U3R5bGUp KTsKKyAgICAgICAgICAgIGN1cnJDb250LT5zZXRDb250aW51YXRpb24obmV4dENvbnQpOworICAg ICAgICB9CiAgICAgfQogCiAgICAgcHJvcGFnYXRlU3R5bGVUb0Fub255bW91c0NoaWxkcmVuKFBy b3BhZ2F0ZVRvQmxvY2tDaGlsZHJlbk9ubHkpOwpAQCAtODE0LDE0ICs4MTgsMTQgQEAgc3RhdGlj IGJvb2wgY2FuTWVyZ2VDb250aWd1b3VzQW5vbnltb3VzQmxvY2tzKFJlbmRlck9iamVjdCYgb2xk Q2hpbGQsIFJlbmRlck9iamUKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBSZW5kZXJCbG9j azo6ZHJvcEFub255bW91c0JveENoaWxkKFJlbmRlckJsb2NrJiBjaGlsZCkKK3ZvaWQgUmVuZGVy QmxvY2s6OmRyb3BBbm9ueW1vdXNCb3hDaGlsZChSZW5kZXJCbG9jayYgcGFyZW50LCBSZW5kZXJC bG9jayYgY2hpbGQpCiB7Ci0gICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7 Ci0gICAgc2V0Q2hpbGRyZW5JbmxpbmUoY2hpbGQuY2hpbGRyZW5JbmxpbmUoKSk7CisgICAgcGFy ZW50LnNldE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOworICAgIHBhcmVudC5zZXRD aGlsZHJlbklubGluZShjaGlsZC5jaGlsZHJlbklubGluZSgpKTsKICAgICBSZW5kZXJPYmplY3Qq IG5leHRTaWJsaW5nID0gY2hpbGQubmV4dFNpYmxpbmcoKTsKIAotICAgIGF1dG8gdG9CZURlbGV0 ZWQgPSB0YWtlQ2hpbGRJbnRlcm5hbChjaGlsZCwgY2hpbGQuaGFzTGF5ZXIoKSA/IE5vdGlmeUNo aWxkcmVuIDogRG9udE5vdGlmeUNoaWxkcmVuKTsKLSAgICBjaGlsZC5tb3ZlQWxsQ2hpbGRyZW5U byh0aGlzLCBuZXh0U2libGluZywgY2hpbGQuaGFzTGF5ZXIoKSk7CisgICAgYXV0byB0b0JlRGVs ZXRlZCA9IHBhcmVudC50YWtlQ2hpbGRJbnRlcm5hbChjaGlsZCwgY2hpbGQuaGFzTGF5ZXIoKSA/ IE5vdGlmeUNoaWxkcmVuIDogRG9udE5vdGlmeUNoaWxkcmVuKTsKKyAgICBjaGlsZC5tb3ZlQWxs Q2hpbGRyZW5UbygmcGFyZW50LCBuZXh0U2libGluZywgY2hpbGQuaGFzTGF5ZXIoKSk7CiAgICAg Ly8gRGVsZXRlIHRoZSBub3ctZW1wdHkgYmxvY2sncyBsaW5lcyBhbmQgbnVrZSBpdC4KICAgICBj aGlsZC5kZWxldGVMaW5lcygpOwogfQpAQCAtODg5LDcgKzg5Myw3IEBAIFJlbmRlclB0cjxSZW5k ZXJPYmplY3Q+IFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoUmVuZGVyT2JqZWN0JiBvbGRDaGlsZCkK ICAgICBpZiAoY2FuTWVyZ2VBbm9ueW1vdXNCbG9ja3MgJiYgY2hpbGQgJiYgIWNoaWxkLT5wcmV2 aW91c1NpYmxpbmcoKSAmJiAhY2hpbGQtPm5leHRTaWJsaW5nKCkgJiYgY2FuRHJvcEFub255bW91 c0Jsb2NrQ2hpbGQoKSkgewogICAgICAgICAvLyBUaGUgcmVtb3ZhbCBoYXMga25vY2tlZCB1cyBk b3duIHRvIGNvbnRhaW5pbmcgb25seSBhIHNpbmdsZSBhbm9ueW1vdXMKICAgICAgICAgLy8gYm94 LiBXZSBjYW4gcHVsbCB0aGUgY29udGVudCByaWdodCBiYWNrIHVwIGludG8gb3VyIGJveC4KLSAg ICAgICAgZHJvcEFub255bW91c0JveENoaWxkKGRvd25jYXN0PFJlbmRlckJsb2NrPigqY2hpbGQp KTsKKyAgICAgICAgZHJvcEFub255bW91c0JveENoaWxkKCp0aGlzLCBkb3duY2FzdDxSZW5kZXJC bG9jaz4oKmNoaWxkKSk7CiAgICAgfSBlbHNlIGlmICgoKHByZXYgJiYgcHJldi0+aXNBbm9ueW1v dXNCbG9jaygpKSB8fCAobmV4dCAmJiBuZXh0LT5pc0Fub255bW91c0Jsb2NrKCkpKSAmJiBjYW5E cm9wQW5vbnltb3VzQmxvY2tDaGlsZCgpKSB7CiAgICAgICAgIC8vIEl0J3MgcG9zc2libGUgdGhh dCB0aGUgcmVtb3ZhbCBoYXMga25vY2tlZCB1cyBkb3duIHRvIGEgc2luZ2xlIGFub255bW91cwog ICAgICAgICAvLyBibG9jayB3aXRoIGZsb2F0aW5nIHNpYmxpbmdzLgpAQCAtOTA1LDcgKzkwOSw3 IEBAIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoUmVuZGVy T2JqZWN0JiBvbGRDaGlsZCkKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBpZiAoZHJvcEFub255bW91c0Jsb2NrKQotICAgICAgICAgICAgICAgIGRyb3BBbm9u eW1vdXNCb3hDaGlsZChhbm9uQmxvY2spOworICAgICAgICAgICAgICAgIGRyb3BBbm9ueW1vdXNC b3hDaGlsZCgqdGhpcywgYW5vbkJsb2NrKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtOTEzLDYg KzkxNywzMSBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJCbG9jazo6dGFrZUNoaWxk KFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpCiAgICAgICAgIC8vIElmIHRoaXMgd2FzIG91ciBsYXN0 IGNoaWxkIGJlIHN1cmUgdG8gY2xlYXIgb3V0IG91ciBsaW5lIGJveGVzLgogICAgICAgICBpZiAo Y2hpbGRyZW5JbmxpbmUoKSkKICAgICAgICAgICAgIGRlbGV0ZUxpbmVzKCk7CisKKyAgICAgICAg Ly8gSWYgd2UgYXJlIGFuIGVtcHR5IGFub255bW91cyBibG9jayBpbiB0aGUgY29udGludWF0aW9u IGNoYWluLAorICAgICAgICAvLyB3ZSBuZWVkIHRvIHJlbW92ZSBvdXJzZWxmIGFuZCBmaXggdGhl IGNvbnRpbnVhdGlvbiBjaGFpbi4KKyAgICAgICAgaWYgKCFiZWluZ0Rlc3Ryb3llZCgpICYmIGlz QW5vbnltb3VzQmxvY2tDb250aW51YXRpb24oKSAmJiAhb2xkQ2hpbGQuaXNMaXN0TWFya2VyKCkp IHsKKyAgICAgICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrSWdub3JpbmdBbm9ueW1vdXMgPSBj b250YWluaW5nQmxvY2soKTsKKyAgICAgICAgICAgIHdoaWxlIChjb250YWluaW5nQmxvY2tJZ25v cmluZ0Fub255bW91cyAmJiBjb250YWluaW5nQmxvY2tJZ25vcmluZ0Fub255bW91cy0+aXNBbm9u eW1vdXNCbG9jaygpKQorICAgICAgICAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0lnbm9yaW5nQW5v bnltb3VzID0gY29udGFpbmluZ0Jsb2NrSWdub3JpbmdBbm9ueW1vdXMtPmNvbnRhaW5pbmdCbG9j aygpOworICAgICAgICAgICAgZm9yIChSZW5kZXJPYmplY3QqIGN1cnJlbnQgPSB0aGlzOyBjdXJy ZW50OyBjdXJyZW50ID0gY3VycmVudC0+cHJldmlvdXNJblByZU9yZGVyKGNvbnRhaW5pbmdCbG9j a0lnbm9yaW5nQW5vbnltb3VzKSkgeworICAgICAgICAgICAgICAgIGlmICghaXM8UmVuZGVyQm94 TW9kZWxPYmplY3Q+KGN1cnJlbnQpIHx8IGRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0Pigq Y3VycmVudCkuY29udGludWF0aW9uKCkgIT0gdGhpcykKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICAgICAgLy8gRm91bmQgb3VyIHByZXZpb3VzIGNvbnRpbnVhdGlv bi4gV2UganVzdCBuZWVkIHRvIHBvaW50IGl0IHRvCisgICAgICAgICAgICAgICAgLy8gfHRoaXN8 J3MgbmV4dCBjb250aW51YXRpb24uCisgICAgICAgICAgICAgICAgYXV0byogbmV4dENvbnRpbnVh dGlvbiA9IGNvbnRpbnVhdGlvbigpOworICAgICAgICAgICAgICAgIGlmIChpczxSZW5kZXJJbmxp bmU+KCpjdXJyZW50KSkKKyAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVySW5saW5l PigqY3VycmVudCkuc2V0Q29udGludWF0aW9uKG5leHRDb250aW51YXRpb24pOworICAgICAgICAg ICAgICAgIGVsc2UgaWYgKGlzPFJlbmRlckJsb2NrPigqY3VycmVudCkpCisgICAgICAgICAgICAg ICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigqY3VycmVudCkuc2V0Q29udGludWF0aW9uKG5l eHRDb250aW51YXRpb24pOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBzZXRDb250aW51YXRpb24obnVsbHB0cik7CisgICAgICAgICAg ICAvLyBGSVhNRTogVGhpcyBpcyBkYW5nZXJvdXMuCisgICAgICAgICAgICByZW1vdmVGcm9tUGFy ZW50QW5kRGVzdHJveSgpOworICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiB0YWtlbkNoaWxk OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCBjOGIzZTY1YzJk NDYzZjg0YThjNjJiZWU0NzQ4ZDMwN2NjMTMzYTE5Li44ODFlYTBjNjJiZTc5ZWZkNGRkMGQ2YmQ1 ZDkxNDIxZDQ3N2FiMDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApA QCAtMTkyLDkgKzE5MiwxMiBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgUmVuZGVySW5s aW5lKiBpbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkgY29uc3Q7CiAgICAgUmVuZGVyQmxvY2sq IGJsb2NrRWxlbWVudENvbnRpbnVhdGlvbigpIGNvbnN0OwogCisgICAgdXNpbmcgUmVuZGVyQm94 TW9kZWxPYmplY3Q6OmNvbnRpbnVhdGlvbjsKKyAgICB1c2luZyBSZW5kZXJCb3hNb2RlbE9iamVj dDo6c2V0Q29udGludWF0aW9uOworCiAgICAgc3RhdGljIFJlbmRlclB0cjxSZW5kZXJCbG9jaz4g Y3JlYXRlQW5vbnltb3VzV2l0aFBhcmVudFJlbmRlcmVyQW5kRGlzcGxheShjb25zdCBSZW5kZXJC b3gmIHBhcmVudCwgRURpc3BsYXkgPSBCTE9DSyk7CiAgICAgUmVuZGVyUHRyPFJlbmRlckJsb2Nr PiBjcmVhdGVBbm9ueW1vdXNCbG9jayhFRGlzcGxheSA9IEJMT0NLKSBjb25zdDsKLSAgICB2b2lk IGRyb3BBbm9ueW1vdXNCb3hDaGlsZChSZW5kZXJCbG9jayYgY2hpbGQpOworICAgIHN0YXRpYyB2 b2lkIGRyb3BBbm9ueW1vdXNCb3hDaGlsZChSZW5kZXJCbG9jayYgcGFyZW50LCBSZW5kZXJCbG9j ayYgY2hpbGQpOwogCiAgICAgUmVuZGVyUHRyPFJlbmRlckJveD4gY3JlYXRlQW5vbnltb3VzQm94 V2l0aFNhbWVUeXBlQXMoY29uc3QgUmVuZGVyQm94JikgY29uc3Qgb3ZlcnJpZGU7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCmluZGV4 IGM2YzZiZmQ1MjQ5MjY4ZDdmOTE1ZDNlM2NjMTA3OGVjM2ZjMTcyMDEuLmNjNjU3NTRkMGY3MjFk NmU3NGM5ZmIxN2JlMzVjZTU0MjUwNjE5YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtNzcsNTQgKzc3LDEwIEBAIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAvLyBhbiBhbm9ueW1vdXMgYmxvY2sgKHRoYXQgaG91c2Vz IG90aGVyIGJsb2Nrcykgb3IgaXQgd2lsbCBiZSBhbiBpbmxpbmUgZmxvdy4KIC8vIDxiPjxpPjxw PkhlbGxvPC9wPjwvaT48L2I+LiBJbiB0aGlzIGV4YW1wbGUgdGhlIDxpPiB3aWxsIGhhdmUgYSBi bG9jayBhcwogLy8gaXRzIGNvbnRpbnVhdGlvbiBidXQgdGhlIDxiPiB3aWxsIGp1c3QgaGF2ZSBh biBpbmxpbmUgYXMgaXRzIGNvbnRpbnVhdGlvbi4KLQotc3RydWN0IFJlbmRlckJveE1vZGVsT2Jq ZWN0OjpDb250aW51YXRpb25DaGFpbk5vZGUgewotICAgIFdlYWtQdHI8UmVuZGVyQm94TW9kZWxP YmplY3Q+IHJlbmRlcmVyOwotICAgIENvbnRpbnVhdGlvbkNoYWluTm9kZSogcHJldmlvdXMgeyBu dWxscHRyIH07Ci0gICAgQ29udGludWF0aW9uQ2hhaW5Ob2RlKiBuZXh0IHsgbnVsbHB0ciB9Owot Ci0gICAgQ29udGludWF0aW9uQ2hhaW5Ob2RlKFJlbmRlckJveE1vZGVsT2JqZWN0Jik7Ci0gICAg fkNvbnRpbnVhdGlvbkNoYWluTm9kZSgpOwotCi0gICAgdm9pZCBpbnNlcnRBZnRlcihDb250aW51 YXRpb25DaGFpbk5vZGUmKTsKLQotICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwotfTsKLQot UmVuZGVyQm94TW9kZWxPYmplY3Q6OkNvbnRpbnVhdGlvbkNoYWluTm9kZTo6Q29udGludWF0aW9u Q2hhaW5Ob2RlKFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlcikKLSAgICA6IHJlbmRlcmVy KG1ha2VXZWFrUHRyKHJlbmRlcmVyKSkKLXsKLX0KLQotUmVuZGVyQm94TW9kZWxPYmplY3Q6OkNv bnRpbnVhdGlvbkNoYWluTm9kZTo6fkNvbnRpbnVhdGlvbkNoYWluTm9kZSgpCit0eXBlZGVmIEhh c2hNYXA8Y29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QqLCBXZWFrUHRyPFJlbmRlckJveE1vZGVs T2JqZWN0Pj4gQ29udGludWF0aW9uTWFwOworc3RhdGljIENvbnRpbnVhdGlvbk1hcCYgY29udGlu dWF0aW9uTWFwKCkKIHsKLSAgICBpZiAobmV4dCkgewotICAgICAgICBBU1NFUlQocHJldmlvdXMp OwotICAgICAgICBBU1NFUlQobmV4dC0+cHJldmlvdXMgPT0gdGhpcyk7Ci0gICAgICAgIG5leHQt PnByZXZpb3VzID0gcHJldmlvdXM7Ci0gICAgfQotICAgIGlmIChwcmV2aW91cykgewotICAgICAg ICBBU1NFUlQocHJldmlvdXMtPm5leHQgPT0gdGhpcyk7Ci0gICAgICAgIHByZXZpb3VzLT5uZXh0 ID0gbmV4dDsKLSAgICB9Ci19Ci0KLXZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OkNvbnRpbnVh dGlvbkNoYWluTm9kZTo6aW5zZXJ0QWZ0ZXIoQ29udGludWF0aW9uQ2hhaW5Ob2RlJiBhZnRlcikK LXsKLSAgICBBU1NFUlQoIXByZXZpb3VzKTsKLSAgICBBU1NFUlQoIW5leHQpOwotICAgIGlmICgo bmV4dCA9IGFmdGVyLm5leHQpKSB7Ci0gICAgICAgIEFTU0VSVChuZXh0LT5wcmV2aW91cyA9PSAm YWZ0ZXIpOwotICAgICAgICBuZXh0LT5wcmV2aW91cyA9IHRoaXM7Ci0gICAgfQotICAgIHByZXZp b3VzID0gJmFmdGVyOwotICAgIGFmdGVyLm5leHQgPSB0aGlzOwotfQotCi10eXBlZGVmIEhhc2hN YXA8Y29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QqLCBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyQm94 TW9kZWxPYmplY3Q6OkNvbnRpbnVhdGlvbkNoYWluTm9kZT4+IENvbnRpbnVhdGlvbkNoYWluTm9k ZU1hcDsKLXN0YXRpYyBDb250aW51YXRpb25DaGFpbk5vZGVNYXAmIGNvbnRpbnVhdGlvbkNoYWlu Tm9kZU1hcCgpCi17Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPENvbnRpbnVhdGlvbkNoYWlu Tm9kZU1hcD4gbWFwOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxDb250aW51YXRpb25NYXA+ IG1hcDsKICAgICByZXR1cm4gbWFwOwogfQogCkBAIC0yMzEsMTIgKzE4NywxMCBAQCBSZW5kZXJC b3hNb2RlbE9iamVjdDo6flJlbmRlckJveE1vZGVsT2JqZWN0KCkKIAogdm9pZCBSZW5kZXJCb3hN b2RlbE9iamVjdDo6d2lsbEJlRGVzdHJveWVkKCkKIHsKLSAgICBpZiAoY29udGludWF0aW9uKCkg JiYgIWlzQ29udGludWF0aW9uKCkpIHsKLSAgICAgICAgcmVtb3ZlQW5kRGVzdHJveUFsbENvbnRp bnVhdGlvbnMoKTsKLSAgICAgICAgQVNTRVJUKCFjb250aW51YXRpb24oKSk7CisgICAgaWYgKGhh c0NvbnRpbnVhdGlvbigpKSB7CisgICAgICAgIGNvbnRpbnVhdGlvbigpLT5yZW1vdmVGcm9tUGFy ZW50QW5kRGVzdHJveSgpOworICAgICAgICBzZXRDb250aW51YXRpb24obnVsbHB0cik7CiAgICAg fQotICAgIGlmIChoYXNDb250aW51YXRpb25DaGFpbk5vZGUoKSkKLSAgICAgICAgcmVtb3ZlRnJv bUNvbnRpbnVhdGlvbkNoYWluKCk7CiAKICAgICAvLyBJZiB0aGlzIGlzIGEgZmlyc3QtbGV0dGVy IG9iamVjdCB3aXRoIGEgcmVtYWluaW5nIHRleHQgZnJhZ21lbnQgdGhlbiB0aGUKICAgICAvLyBl bnRyeSBuZWVkcyB0byBiZSBjbGVhcmVkIGZyb20gdGhlIG1hcC4KQEAgLTI0OTMsNDkgKzI0NDcs MTkgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29udGFpbmluZ0Jsb2NrTG9n aWNhbFdpZHRoRm9yQ29udGVudCgpIGNvbnN0CiAKIFJlbmRlckJveE1vZGVsT2JqZWN0KiBSZW5k ZXJCb3hNb2RlbE9iamVjdDo6Y29udGludWF0aW9uKCkgY29uc3QKIHsKLSAgICBpZiAoIWhhc0Nv bnRpbnVhdGlvbkNoYWluTm9kZSgpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgIGF1 dG8mIGNvbnRpbnVhdGlvbkNoYWluTm9kZSA9ICpjb250aW51YXRpb25DaGFpbk5vZGVNYXAoKS5n ZXQodGhpcyk7Ci0gICAgaWYgKCFjb250aW51YXRpb25DaGFpbk5vZGUubmV4dCkKKyAgICBpZiAo IWhhc0NvbnRpbnVhdGlvbigpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICByZXR1cm4g Y29udGludWF0aW9uQ2hhaW5Ob2RlLm5leHQtPnJlbmRlcmVyLmdldCgpOwotfQotCi12b2lkIFJl bmRlckJveE1vZGVsT2JqZWN0OjppbnNlcnRJbnRvQ29udGludWF0aW9uQ2hhaW5BZnRlcihSZW5k ZXJCb3hNb2RlbE9iamVjdCYgYWZ0ZXJSZW5kZXJlcikKLXsKLSAgICBBU1NFUlQoaXNDb250aW51 YXRpb24oKSk7Ci0gICAgQVNTRVJUKCFjb250aW51YXRpb25DaGFpbk5vZGVNYXAoKS5jb250YWlu cyh0aGlzKSk7Ci0KLSAgICBhdXRvJiBhZnRlciA9IGFmdGVyUmVuZGVyZXIuZW5zdXJlQ29udGlu dWF0aW9uQ2hhaW5Ob2RlKCk7Ci0gICAgZW5zdXJlQ29udGludWF0aW9uQ2hhaW5Ob2RlKCkuaW5z ZXJ0QWZ0ZXIoYWZ0ZXIpOwotfQotCi12b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpyZW1vdmVG cm9tQ29udGludWF0aW9uQ2hhaW4oKQotewotICAgIEFTU0VSVChoYXNDb250aW51YXRpb25DaGFp bk5vZGUoKSk7Ci0gICAgQVNTRVJUKGNvbnRpbnVhdGlvbkNoYWluTm9kZU1hcCgpLmNvbnRhaW5z KHRoaXMpKTsKLSAgICBzZXRIYXNDb250aW51YXRpb25DaGFpbk5vZGUoZmFsc2UpOwotICAgIGNv bnRpbnVhdGlvbkNoYWluTm9kZU1hcCgpLnJlbW92ZSh0aGlzKTsKLX0KLQotYXV0byBSZW5kZXJC b3hNb2RlbE9iamVjdDo6ZW5zdXJlQ29udGludWF0aW9uQ2hhaW5Ob2RlKCkgLT4gQ29udGludWF0 aW9uQ2hhaW5Ob2RlJgotewotICAgIHNldEhhc0NvbnRpbnVhdGlvbkNoYWluTm9kZSh0cnVlKTsK LSAgICByZXR1cm4gKmNvbnRpbnVhdGlvbkNoYWluTm9kZU1hcCgpLmVuc3VyZSh0aGlzLCBbJl0g ewotICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxDb250aW51YXRpb25DaGFpbk5vZGU+ KCp0aGlzKTsKLSAgICB9KS5pdGVyYXRvci0+dmFsdWU7CisgICAgcmV0dXJuIGNvbnRpbnVhdGlv bk1hcCgpLmdldCh0aGlzKS5nZXQoKTsKIH0KIAotdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6 cmVtb3ZlQW5kRGVzdHJveUFsbENvbnRpbnVhdGlvbnMoKQordm9pZCBSZW5kZXJCb3hNb2RlbE9i amVjdDo6c2V0Q29udGludWF0aW9uKFJlbmRlckJveE1vZGVsT2JqZWN0KiBjb250aW51YXRpb24p CiB7Ci0gICAgQVNTRVJUKCFpc0NvbnRpbnVhdGlvbigpKTsKLSAgICBBU1NFUlQoaGFzQ29udGlu dWF0aW9uQ2hhaW5Ob2RlKCkpOwotICAgIEFTU0VSVChjb250aW51YXRpb25DaGFpbk5vZGVNYXAo KS5jb250YWlucyh0aGlzKSk7Ci0gICAgYXV0byYgY29udGludWF0aW9uQ2hhaW5Ob2RlID0gKmNv bnRpbnVhdGlvbkNoYWluTm9kZU1hcCgpLmdldCh0aGlzKTsKLSAgICB3aGlsZSAoY29udGludWF0 aW9uQ2hhaW5Ob2RlLm5leHQpCi0gICAgICAgIGNvbnRpbnVhdGlvbkNoYWluTm9kZS5uZXh0LT5y ZW5kZXJlci0+cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3koKTsKLSAgICByZW1vdmVGcm9tQ29u dGludWF0aW9uQ2hhaW4oKTsKKyAgICBBU1NFUlQoIWNvbnRpbnVhdGlvbiB8fCBjb250aW51YXRp b24tPmlzQ29udGludWF0aW9uKCkpOworICAgIGlmIChjb250aW51YXRpb24pCisgICAgICAgIGNv bnRpbnVhdGlvbk1hcCgpLnNldCh0aGlzLCBtYWtlV2Vha1B0cihjb250aW51YXRpb24pKTsKKyAg ICBlbHNlIGlmIChoYXNDb250aW51YXRpb24oKSkKKyAgICAgICAgY29udGludWF0aW9uTWFwKCku cmVtb3ZlKHRoaXMpOworICAgIHNldEhhc0NvbnRpbnVhdGlvbighIWNvbnRpbnVhdGlvbik7CiB9 CiAKIFJlbmRlclRleHRGcmFnbWVudCogUmVuZGVyQm94TW9kZWxPYmplY3Q6OmZpcnN0TGV0dGVy UmVtYWluaW5nVGV4dCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3hNb2RlbE9iamVjdC5oCmluZGV4IDFiMDQ0Y2MzNDQwOWUzZWNiN2YyM2YxMDc2MGM4ZGRk Y2RlYmQxNzMuLmZmMDcyMTE2ZjU5NDgxNGJjYmQ3NTU3NjQ5ODlhODhhMDY5OWQ5YmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCkBAIC0y MzUsOSArMjM1LDYgQEAgcHVibGljOgogICAgIHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoZG91Ymxl IHRpbWUgPSAwKTsKIAogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBjb250aW51YXRpb24oKSBj b25zdDsKLSAgICAKLSAgICB2b2lkIGluc2VydEludG9Db250aW51YXRpb25DaGFpbkFmdGVyKFJl bmRlckJveE1vZGVsT2JqZWN0Jik7Ci0gICAgdm9pZCByZW1vdmVGcm9tQ29udGludWF0aW9uQ2hh aW4oKTsKIAogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBwYWludFJlY3RUb0NsaXBPdXRGcm9tQm9y ZGVyKGNvbnN0IExheW91dFJlY3QmKSB7IHJldHVybiBMYXlvdXRSZWN0KCk7IH07CiAgICAgCkBA IC0yNTksNiArMjU2LDggQEAgcHJvdGVjdGVkOgogCiAgICAgSW50ZXJwb2xhdGlvblF1YWxpdHkg Y2hvb3NlSW50ZXJwb2xhdGlvblF1YWxpdHkoR3JhcGhpY3NDb250ZXh0JiwgSW1hZ2UmLCBjb25z dCB2b2lkKiwgY29uc3QgTGF5b3V0U2l6ZSYpOwogCisgICAgdm9pZCBzZXRDb250aW51YXRpb24o UmVuZGVyQm94TW9kZWxPYmplY3QqKTsKKwogICAgIExheW91dFJlY3QgbG9jYWxDYXJldFJlY3RG b3JFbXB0eUVsZW1lbnQoTGF5b3V0VW5pdCB3aWR0aCwgTGF5b3V0VW5pdCB0ZXh0SW5kZW50T2Zm c2V0KTsKIAogICAgIHN0YXRpYyBib29sIHNob3VsZEFudGlhbGlhc0xpbmVzKEdyYXBoaWNzQ29u dGV4dCYpOwpAQCAtMzAyLDEyICszMDEsNyBAQCBwdWJsaWM6CiAKICAgICBSZW5kZXJCbG9jayog Y29udGFpbmluZ0Jsb2NrRm9yQXV0b0hlaWdodERldGVjdGlvbihMZW5ndGggbG9naWNhbEhlaWdo dCkgY29uc3Q7CiAKLSAgICBzdHJ1Y3QgQ29udGludWF0aW9uQ2hhaW5Ob2RlOwotCiBwcml2YXRl OgotICAgIENvbnRpbnVhdGlvbkNoYWluTm9kZSYgZW5zdXJlQ29udGludWF0aW9uQ2hhaW5Ob2Rl KCk7Ci0gICAgdm9pZCByZW1vdmVBbmREZXN0cm95QWxsQ29udGludWF0aW9ucygpOwotCiAgICAg TGF5b3V0VW5pdCBjb21wdXRlZENTU1BhZGRpbmcoY29uc3QgTGVuZ3RoJikgY29uc3Q7CiAgICAg CiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IGZyYW1lUmVjdEZvclN0aWNreVBvc2l0aW9uaW5nKCkg Y29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmlu ZGV4IDgzYjRjOTZiYzM5OThlNzg0YzFmN2YxOWFjZDk1NTAxNTUxNGE4NjMuLmRkOWNjMWI2N2I1 NzlkMmJmODQzZTk4Yzc3MGRkNDJhZjEwZGVhM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTEwMSw3ICsxMDEsNyBAQCBpbmxpbmUgUmVuZGVyRWxl bWVudDo6UmVuZGVyRWxlbWVudChDb250YWluZXJOb2RlJiBlbGVtZW50T3JEb2N1bWVudCwgUmVu ZGVyU3R5bAogICAgICwgbV9yZW5kZXJCb3hOZWVkc0xhenlSZXBhaW50KGZhbHNlKQogICAgICwg bV9oYXNQYXVzZWRJbWFnZUFuaW1hdGlvbnMoZmFsc2UpCiAgICAgLCBtX2hhc0NvdW50ZXJOb2Rl TWFwKGZhbHNlKQotICAgICwgbV9oYXNDb250aW51YXRpb25DaGFpbk5vZGUoZmFsc2UpCisgICAg LCBtX2hhc0NvbnRpbnVhdGlvbihmYWxzZSkKICAgICAsIG1faXNDb250aW51YXRpb24oZmFsc2Up CiAgICAgLCBtX2hhc1ZhbGlkQ2FjaGVkRmlyc3RMaW5lU3R5bGUoZmFsc2UpCiAgICAgLCBtX3Jl bmRlckJsb2NrSGFzTWFyZ2luQmVmb3JlUXVpcmsoZmFsc2UpCkBAIC05NjEsMTEgKzk2MSw4IEBA IHZvaWQgUmVuZGVyRWxlbWVudDo6aGFuZGxlRHluYW1pY0Zsb2F0UG9zaXRpb25DaGFuZ2UoKQog CiB2b2lkIFJlbmRlckVsZW1lbnQ6OnJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lm TmVjZXNzYXJ5KCkKIHsKLSAgICAvLyBGSVhNRTogTW92ZSB0byBSZW5kZXJCbG9jay4KLSAgICBp ZiAoIWlzPFJlbmRlckJsb2NrPigqdGhpcykpCi0gICAgICAgIHJldHVybjsKLSAgICBSZW5kZXJC bG9jayYgdGhpc0Jsb2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCp0aGlzKTsKLSAgICBpZiAo IXRoaXNCbG9jay5jYW5Ecm9wQW5vbnltb3VzQmxvY2tDaGlsZCgpKQorICAgIFJlbmRlckJsb2Nr JiBwYXJlbnRCbG9jayA9IGRvd25jYXN0PFJlbmRlckJsb2NrPigqcGFyZW50KCkpOworICAgIGlm ICghcGFyZW50QmxvY2suY2FuRHJvcEFub255bW91c0Jsb2NrQ2hpbGQoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gV2UgaGF2ZSBjaGFuZ2VkIHRvIGZsb2F0ZWQgb3Igb3V0LW9mLWZsb3cg cG9zaXRpb25pbmcgc28gbWF5YmUgYWxsIG91ciBwYXJlbnQncwpAQCAtOTczLDE4ICs5NzAsMTgg QEAgdm9pZCBSZW5kZXJFbGVtZW50OjpyZW1vdmVBbm9ueW1vdXNXcmFwcGVyc0ZvcklubGluZXNJ Zk5lY2Vzc2FyeSgpCiAgICAgLy8gb3RoZXJ3aXNlIHdlIGNhbiBwcm9jZWVkIHRvIHN0cmlwcGlu ZyBzb2xpdGFyeSBhbm9ueW1vdXMgd3JhcHBlcnMgZnJvbSB0aGUgaW5saW5lcy4KICAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIGFsc28gaGFuZGxlIHNwbGl0IGlubGluZXMgaGVyZSAtIHdlIGV4Y2x1 ZGUgdGhlbSBhdCB0aGUgbW9tZW50IGJ5IHJldHVybmluZwogICAgIC8vIGlmIHdlIGZpbmQgYSBj b250aW51YXRpb24uCi0gICAgUmVuZGVyT2JqZWN0KiBjdXJyZW50ID0gZmlyc3RDaGlsZCgpOwot ICAgIHdoaWxlIChjdXJyZW50ICYmICgoY3VycmVudC0+aXNBbm9ueW1vdXNCbG9jaygpICYmICFk b3duY2FzdDxSZW5kZXJCbG9jaz4oKmN1cnJlbnQpLmlzQ29udGludWF0aW9uKCkpIHx8IGN1cnJl bnQtPnN0eWxlKCkuaXNGbG9hdGluZygpIHx8IGN1cnJlbnQtPnN0eWxlKCkuaGFzT3V0T2ZGbG93 UG9zaXRpb24oKSkpCisgICAgUmVuZGVyT2JqZWN0KiBjdXJyZW50ID0gcGFyZW50KCktPmZpcnN0 Q2hpbGQoKTsKKyAgICB3aGlsZSAoY3VycmVudCAmJiAoKGN1cnJlbnQtPmlzQW5vbnltb3VzQmxv Y2soKSAmJiAhZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpjdXJyZW50KS5pc0Fub255bW91c0Jsb2Nr Q29udGludWF0aW9uKCkpIHx8IGN1cnJlbnQtPnN0eWxlKCkuaXNGbG9hdGluZygpIHx8IGN1cnJl bnQtPnN0eWxlKCkuaGFzT3V0T2ZGbG93UG9zaXRpb24oKSkpCiAgICAgICAgIGN1cnJlbnQgPSBj dXJyZW50LT5uZXh0U2libGluZygpOwogCiAgICAgaWYgKGN1cnJlbnQpCiAgICAgICAgIHJldHVy bjsKIAogICAgIFJlbmRlck9iamVjdCogbmV4dDsKLSAgICBmb3IgKGN1cnJlbnQgPSBmaXJzdENo aWxkKCk7IGN1cnJlbnQ7IGN1cnJlbnQgPSBuZXh0KSB7CisgICAgZm9yIChjdXJyZW50ID0gcGFy ZW50KCktPmZpcnN0Q2hpbGQoKTsgY3VycmVudDsgY3VycmVudCA9IG5leHQpIHsKICAgICAgICAg bmV4dCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7CiAgICAgICAgIGlmIChjdXJyZW50LT5pc0Fu b255bW91c0Jsb2NrKCkpCi0gICAgICAgICAgICB0aGlzQmxvY2suZHJvcEFub255bW91c0JveENo aWxkKGRvd25jYXN0PFJlbmRlckJsb2NrPigqY3VycmVudCkpOworICAgICAgICAgICAgcGFyZW50 QmxvY2suZHJvcEFub255bW91c0JveENoaWxkKHBhcmVudEJsb2NrLCBkb3duY2FzdDxSZW5kZXJC bG9jaz4oKmN1cnJlbnQpKTsKICAgICB9CiB9CiAKQEAgLTEwMTMsNyArMTAxMCw3IEBAIHZvaWQg UmVuZGVyRWxlbWVudDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0 IFJlbmRlclN0eWxlKiBvbGRTCiAgICAgICAgIGhhbmRsZUR5bmFtaWNGbG9hdFBvc2l0aW9uQ2hh bmdlKCk7CiAKICAgICBpZiAoc19ub0xvbmdlckFmZmVjdHNQYXJlbnRCbG9jaykKLSAgICAgICAg cGFyZW50KCktPnJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lmTmVjZXNzYXJ5KCk7 CisgICAgICAgIHJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lmTmVjZXNzYXJ5KCk7 CiAKICAgICBTVkdSZW5kZXJTdXBwb3J0OjpzdHlsZUNoYW5nZWQoKnRoaXMsIG9sZFN0eWxlKTsK IApAQCAtMjE1NSwxMCArMjE1Miw4IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6dXBkYXRlT3V0bGlu ZUF1dG9BbmNlc3Rvcihib29sIGhhc091dGxpbmVBdXRvKQogICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgIGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KGNoaWxkKS51cGRhdGVPdXRsaW5lQXV0 b0FuY2VzdG9yKGhhc091dGxpbmVBdXRvKTsKICAgICB9Ci0gICAgaWYgKGlzPFJlbmRlckJveE1v ZGVsT2JqZWN0PigqdGhpcykpIHsKLSAgICAgICAgaWYgKGF1dG8qIGNvbnRpbnVhdGlvbiA9IGRv d25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqdGhpcykuY29udGludWF0aW9uKCkpCi0gICAg ICAgICAgICBjb250aW51YXRpb24tPnVwZGF0ZU91dGxpbmVBdXRvQW5jZXN0b3IoaGFzT3V0bGlu ZUF1dG8pOwotICAgIH0KKyAgICBpZiAoaGFzQ29udGludWF0aW9uKCkpCisgICAgICAgIGRvd25j YXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqdGhpcykuY29udGludWF0aW9uKCktPnVwZGF0ZU91 dGxpbmVBdXRvQW5jZXN0b3IoaGFzT3V0bGluZUF1dG8pOwogfQogCiBib29sIFJlbmRlckVsZW1l bnQ6Omhhc091dGxpbmVBbm5vdGF0aW9uKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRWxlbWVudC5oCmluZGV4IGI5MmU3MGQ4OTQzMDI5MzJkMDIwM2MwZWE2ZDRmOTRkMWIw OTUzNDIuLmZlYTBlYjM4ZThlNzhkOGYxOTZhYzQxNGI5ZjdjNTg1YzBlYzcyZDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMjIxLDkgKzIyMSw3IEBAIHB1 YmxpYzoKICAgICAvLyB0aGUgY2hpbGQuCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFub255bW91 c0NoaWxkU3R5bGUoY29uc3QgUmVuZGVyT2JqZWN0JiwgUmVuZGVyU3R5bGUmKSBjb25zdCB7IH07 CiAKLSAgICB2b2lkIHJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lmTmVjZXNzYXJ5 KCk7Ci0KLSAgICBib29sIGhhc0NvbnRpbnVhdGlvbkNoYWluTm9kZSgpIGNvbnN0IHsgcmV0dXJu IG1faGFzQ29udGludWF0aW9uQ2hhaW5Ob2RlOyB9CisgICAgYm9vbCBoYXNDb250aW51YXRpb24o KSBjb25zdCB7IHJldHVybiBtX2hhc0NvbnRpbnVhdGlvbjsgfQogICAgIGJvb2wgaXNDb250aW51 YXRpb24oKSBjb25zdCB7IHJldHVybiBtX2lzQ29udGludWF0aW9uOyB9CiAgICAgdm9pZCBzZXRJ c0NvbnRpbnVhdGlvbigpIHsgbV9pc0NvbnRpbnVhdGlvbiA9IHRydWU7IH0KICAgICBib29sIGlz RWxlbWVudENvbnRpbnVhdGlvbigpIGNvbnN0IHsgcmV0dXJuIGlzQ29udGludWF0aW9uKCkgJiYg IWlzQW5vbnltb3VzKCk7IH0KQEAgLTI2Niw3ICsyNjQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9p ZCBzZXRSZW5kZXJJbmxpbmVBbHdheXNDcmVhdGVzTGluZUJveGVzKGJvb2wgYikgeyBtX3JlbmRl cklubGluZUFsd2F5c0NyZWF0ZXNMaW5lQm94ZXMgPSBiOyB9CiAgICAgYm9vbCByZW5kZXJJbmxp bmVBbHdheXNDcmVhdGVzTGluZUJveGVzKCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJJbmxpbmVB bHdheXNDcmVhdGVzTGluZUJveGVzOyB9CiAKLSAgICB2b2lkIHNldEhhc0NvbnRpbnVhdGlvbkNo YWluTm9kZShib29sIGIpIHsgbV9oYXNDb250aW51YXRpb25DaGFpbk5vZGUgPSBiOyB9CisgICAg dm9pZCBzZXRIYXNDb250aW51YXRpb24oYm9vbCBiKSB7IG1faGFzQ29udGludWF0aW9uID0gYjsg fQogCiAgICAgdm9pZCBzZXRSZW5kZXJCbG9ja0hhc01hcmdpbkJlZm9yZVF1aXJrKGJvb2wgYikg eyBtX3JlbmRlckJsb2NrSGFzTWFyZ2luQmVmb3JlUXVpcmsgPSBiOyB9CiAgICAgdm9pZCBzZXRS ZW5kZXJCbG9ja0hhc01hcmdpbkFmdGVyUXVpcmsoYm9vbCBiKSB7IG1fcmVuZGVyQmxvY2tIYXNN YXJnaW5BZnRlclF1aXJrID0gYjsgfQpAQCAtMzA1LDYgKzMwMyw3IEBAIHByaXZhdGU6CiAgICAg Ly8gYWdhaW4uICBXZSBoYXZlIHRvIG1ha2Ugc3VyZSB0aGUgcmVuZGVyIHRyZWUgdXBkYXRlcyBh cyBuZWVkZWQgdG8gYWNjb21tb2RhdGUgdGhlIG5ldwogICAgIC8vIG5vcm1hbCBmbG93IG9iamVj dC4KICAgICB2b2lkIGhhbmRsZUR5bmFtaWNGbG9hdFBvc2l0aW9uQ2hhbmdlKCk7CisgICAgdm9p ZCByZW1vdmVBbm9ueW1vdXNXcmFwcGVyc0ZvcklubGluZXNJZk5lY2Vzc2FyeSgpOwogCiAgICAg Ym9vbCBzaG91bGRSZXBhaW50Rm9yU3R5bGVEaWZmZXJlbmNlKFN0eWxlRGlmZmVyZW5jZSkgY29u c3Q7CiAgICAgYm9vbCBoYXNJbW1lZGlhdGVOb25XaGl0ZXNwYWNlVGV4dENoaWxkT3JCb3JkZXJP ck91dGxpbmUoKSBjb25zdDsKQEAgLTMzNyw3ICszMzYsNyBAQCBwcml2YXRlOgogICAgIHVuc2ln bmVkIG1fcmVuZGVyQm94TmVlZHNMYXp5UmVwYWludCA6IDE7CiAgICAgdW5zaWduZWQgbV9oYXNQ YXVzZWRJbWFnZUFuaW1hdGlvbnMgOiAxOwogICAgIHVuc2lnbmVkIG1faGFzQ291bnRlck5vZGVN YXAgOiAxOwotICAgIHVuc2lnbmVkIG1faGFzQ29udGludWF0aW9uQ2hhaW5Ob2RlIDogMTsKKyAg ICB1bnNpZ25lZCBtX2hhc0NvbnRpbnVhdGlvbiA6IDE7CiAgICAgdW5zaWduZWQgbV9pc0NvbnRp bnVhdGlvbiA6IDE7CiAgICAgbXV0YWJsZSB1bnNpZ25lZCBtX2hhc1ZhbGlkQ2FjaGVkRmlyc3RM aW5lU3R5bGUgOiAxOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3Bw CmluZGV4IGY1YzQ0NGQ0OWNkMzRhMzcyZGE0OTI3ZDViMWFkMzk2MTlhMzc0M2EuLjgyMDM5YzZk ZTA3ZTUxNTIzN2E3OGE5YTIzZjIzYmY2OTAwMWUwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC0xODksOSArMTg5LDEzIEBAIHZvaWQgUmVuZGVySW5s aW5lOjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0CiAgICAgLy8gbmVlZCB0byBwYXNzIGl0cyBzdHlsZSBvbiB0byBhbnlvbmUgZWxz ZS4KICAgICBhdXRvJiBuZXdTdHlsZSA9IHN0eWxlKCk7CiAgICAgUmVuZGVySW5saW5lKiBjb250 aW51YXRpb24gPSBpbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCk7Ci0gICAgaWYgKGNvbnRpbnVh dGlvbiAmJiAhaXNDb250aW51YXRpb24oKSkgewotICAgICAgICBmb3IgKFJlbmRlcklubGluZSog Y3VyckNvbnQgPSBjb250aW51YXRpb247IGN1cnJDb250OyBjdXJyQ29udCA9IGN1cnJDb250LT5p bmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkpCisgICAgaWYgKGNvbnRpbnVhdGlvbikgeworICAg ICAgICBmb3IgKFJlbmRlcklubGluZSogY3VyckNvbnQgPSBjb250aW51YXRpb247IGN1cnJDb250 OyBjdXJyQ29udCA9IGN1cnJDb250LT5pbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkpIHsKKyAg ICAgICAgICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBuZXh0Q29udCA9IGN1cnJDb250LT5jb250 aW51YXRpb24oKTsKKyAgICAgICAgICAgIGN1cnJDb250LT5zZXRDb250aW51YXRpb24obnVsbHB0 cik7CiAgICAgICAgICAgICBjdXJyQ29udC0+c2V0U3R5bGUoUmVuZGVyU3R5bGU6OmNsb25lKG5l d1N0eWxlKSk7CisgICAgICAgICAgICBjdXJyQ29udC0+c2V0Q29udGludWF0aW9uKG5leHRDb250 KTsKKyAgICAgICAgfQogICAgICAgICAvLyBJZiBhbiBpbmxpbmUncyBpbi1mbG93IHBvc2l0aW9u aW5nIGhhcyBjaGFuZ2VkIGFuZCBpdCBpcyBwYXJ0IG9mIGFuIGFjdGl2ZSBjb250aW51YXRpb24g YXMgYSBkZXNjZW5kYW50IG9mIGFuIGFub255bW91cyBjb250YWluaW5nIGJsb2NrLAogICAgICAg ICAvLyB0aGVuIGFueSBkZXNjZW5kYW50IGJsb2NrcyB3aWxsIG5lZWQgdG8gY2hhbmdlIHRoZWly IGluLWZsb3cgcG9zaXRpb25pbmcgYWNjb3JkaW5nbHkuCiAgICAgICAgIC8vIERvIHRoaXMgYnkg dXBkYXRpbmcgdGhlIHBvc2l0aW9uIG9mIHRoZSBkZXNjZW5kYW50IGJsb2NrcycgY29udGFpbmlu ZyBhbm9ueW1vdXMgYmxvY2tzIC0gdGhlcmUgbWF5IGJlIG1vcmUgdGhhbiBvbmUuCkBAIC0zNDAs OSArMzQ0LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OmFkZENoaWxkSWdub3JpbmdDb250aW51YXRp b24oUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQKICAgICAgICAgbmV3Qm94LT5pbml0 aWFsaXplU3R5bGUoKTsKICAgICAgICAgbmV3Qm94LT5zZXRJc0NvbnRpbnVhdGlvbigpOwogICAg ICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogb2xkQ29udGludWF0aW9uID0gY29udGludWF0aW9u KCk7Ci0gICAgICAgIGlmIChvbGRDb250aW51YXRpb24pCi0gICAgICAgICAgICBvbGRDb250aW51 YXRpb24tPnJlbW92ZUZyb21Db250aW51YXRpb25DaGFpbigpOwotICAgICAgICBuZXdCb3gtPmlu c2VydEludG9Db250aW51YXRpb25DaGFpbkFmdGVyKCp0aGlzKTsKKyAgICAgICAgc2V0Q29udGlu dWF0aW9uKG5ld0JveC5nZXQoKSk7CiAKICAgICAgICAgc3BsaXRGbG93KGJlZm9yZUNoaWxkLCBX VEZNb3ZlKG5ld0JveCksIFdURk1vdmUobmV3Q2hpbGQpLCBvbGRDb250aW51YXRpb24pOwogICAg ICAgICByZXR1cm47CkBAIC00MTUsMTAgKzQxNyw5IEBAIHZvaWQgUmVuZGVySW5saW5lOjpzcGxp dElubGluZXMoUmVuZGVyQmxvY2sqIGZyb21CbG9jaywgUmVuZGVyQmxvY2sqIHRvQmxvY2ssCiAg ICAgICAgIHJlbmRlcmVyVG9Nb3ZlLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMo KTsKICAgICAgICAgcmVuZGVyZXJUb01vdmUgPSBuZXh0U2libGluZzsKICAgICB9CisgICAgY2xv bmVJbmxpbmUtPnNldENvbnRpbnVhdGlvbihvbGRDb250KTsKICAgICAvLyBIb29rIHxjbG9uZXwg dXAgYXMgdGhlIGNvbnRpbnVhdGlvbiBvZiB0aGUgbWlkZGxlIGJsb2NrLgotICAgIGNsb25lSW5s aW5lLT5pbnNlcnRJbnRvQ29udGludWF0aW9uQ2hhaW5BZnRlcigqbWlkZGxlQmxvY2spOwotICAg IGlmIChvbGRDb250KQotICAgICAgICBvbGRDb250LT5pbnNlcnRJbnRvQ29udGludWF0aW9uQ2hh aW5BZnRlcigqY2xvbmVJbmxpbmUpOworICAgIG1pZGRsZUJsb2NrLT5zZXRDb250aW51YXRpb24o Y2xvbmVJbmxpbmUuZ2V0KCkpOwogCiAgICAgLy8gV2UgaGF2ZSBiZWVuIHJlcGFyZW50ZWQgYW5k IGFyZSBub3cgdW5kZXIgdGhlIGZyb21CbG9jay4gIFdlIG5lZWQKICAgICAvLyB0byB3YWxrIHVw IG91ciBpbmxpbmUgcGFyZW50IGNoYWluIHVudGlsIHdlIGhpdCB0aGUgY29udGFpbmluZyBibG9j ay4KQEAgLTQ0MiwxNiArNDQzLDE5IEBAIHZvaWQgUmVuZGVySW5saW5lOjpzcGxpdElubGluZXMo UmVuZGVyQmxvY2sqIGZyb21CbG9jaywgUmVuZGVyQmxvY2sqIHRvQmxvY2ssCiAgICAgICAgICAg ICBjbG9uZUlubGluZS0+YWRkQ2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbihXVEZNb3ZlKGNsb25l Q2hpbGQpKTsKIAogICAgICAgICAgICAgLy8gSG9vayB0aGUgY2xvbmUgdXAgYXMgYSBjb250aW51 YXRpb24gb2YgfGN1cnJ8LgotICAgICAgICAgICAgY2xvbmVJbmxpbmUtPmluc2VydEludG9Db250 aW51YXRpb25DaGFpbkFmdGVyKCpjdXJyZW50KTsKKyAgICAgICAgICAgIFJlbmRlcklubGluZSYg Y3VycmVudElubGluZSA9IGRvd25jYXN0PFJlbmRlcklubGluZT4oKmN1cnJlbnQpOworICAgICAg ICAgICAgb2xkQ29udCA9IGN1cnJlbnRJbmxpbmUuY29udGludWF0aW9uKCk7CisgICAgICAgICAg ICBjdXJyZW50SW5saW5lLnNldENvbnRpbnVhdGlvbihjbG9uZUlubGluZS5nZXQoKSk7CisgICAg ICAgICAgICBjbG9uZUlubGluZS0+c2V0Q29udGludWF0aW9uKG9sZENvbnQpOwogCiAgICAgICAg ICAgICAvLyBOb3cgd2UgbmVlZCB0byB0YWtlIGFsbCBvZiB0aGUgY2hpbGRyZW4gc3RhcnRpbmcg ZnJvbSB0aGUgZmlyc3QgY2hpbGQKICAgICAgICAgICAgIC8vICphZnRlciogY3VycmVudENoaWxk IGFuZCBhcHBlbmQgdGhlbSBhbGwgdG8gdGhlIGNsb25lLgotICAgICAgICAgICAgZm9yIChhdXRv KiBzaWJsaW5nID0gY3VycmVudENoaWxkLT5uZXh0U2libGluZygpOyBzaWJsaW5nOykgewotICAg ICAgICAgICAgICAgIGF1dG8qIG5leHQgPSBzaWJsaW5nLT5uZXh0U2libGluZygpOwotICAgICAg ICAgICAgICAgIGF1dG8gY2hpbGRUb01vdmUgPSBjdXJyZW50LT50YWtlQ2hpbGRJbnRlcm5hbCgq c2libGluZywgTm90aWZ5Q2hpbGRyZW4pOworICAgICAgICAgICAgZm9yIChhdXRvKiBjdXJyZW50 ID0gY3VycmVudENoaWxkLT5uZXh0U2libGluZygpOyBjdXJyZW50OykgeworICAgICAgICAgICAg ICAgIGF1dG8qIG5leHQgPSBjdXJyZW50LT5uZXh0U2libGluZygpOworICAgICAgICAgICAgICAg IGF1dG8gY2hpbGRUb01vdmUgPSBjdXJyZW50SW5saW5lLnRha2VDaGlsZEludGVybmFsKCpjdXJy ZW50LCBOb3RpZnlDaGlsZHJlbik7CiAgICAgICAgICAgICAgICAgY2xvbmVJbmxpbmUtPmFkZENo aWxkSWdub3JpbmdDb250aW51YXRpb24oV1RGTW92ZShjaGlsZFRvTW92ZSkpOwotICAgICAgICAg ICAgICAgIHNpYmxpbmctPnNldE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOwotICAg ICAgICAgICAgICAgIHNpYmxpbmcgPSBuZXh0OworICAgICAgICAgICAgICAgIGN1cnJlbnQtPnNl dE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOworICAgICAgICAgICAgICAgIGN1cnJl bnQgPSBuZXh0OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIApAQCAtNTcyLDcg KzU3Niw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjphZGRDaGlsZFRvQ29udGludWF0aW9uKFJlbmRl clB0cjxSZW5kZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kCiAgICAgICAgIGF1dG8qIHBhcmVudCA9 IGJlZm9yZUNoaWxkLT5wYXJlbnQoKTsKICAgICAgICAgd2hpbGUgKHBhcmVudCAmJiBwYXJlbnQt PnBhcmVudCgpICYmIHBhcmVudC0+cGFyZW50KCktPmlzQW5vbnltb3VzKCkpIHsKICAgICAgICAg ICAgIC8vIFRoZSBhbmNlc3RvciBjYW5kaWRhdGUgbmVlZHMgdG8gYmUgaW5zaWRlIHRoZSBjb250 aW51YXRpb24uCi0gICAgICAgICAgICBpZiAocGFyZW50LT5pc0NvbnRpbnVhdGlvbigpKQorICAg ICAgICAgICAgaWYgKHBhcmVudC0+aGFzQ29udGludWF0aW9uKCkpCiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudCgpOwogICAgICAgICB9 CkBAIC0xMzc1LDkgKzEzNzksNyBAQCB2b2lkIFJlbmRlcklubGluZTo6Y2hpbGRCZWNhbWVOb25J bmxpbmUoUmVuZGVyRWxlbWVudCYgY2hpbGQpCiAgICAgYXV0byBuZXdCb3ggPSBjb250YWluaW5n QmxvY2soKS0+Y3JlYXRlQW5vbnltb3VzQmxvY2soKTsKICAgICBuZXdCb3gtPnNldElzQ29udGlu dWF0aW9uKCk7CiAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIG9sZENvbnRpbnVhdGlvbiA9IGNv bnRpbnVhdGlvbigpOwotICAgIGlmIChvbGRDb250aW51YXRpb24pCi0gICAgICAgIG9sZENvbnRp bnVhdGlvbi0+cmVtb3ZlRnJvbUNvbnRpbnVhdGlvbkNoYWluKCk7Ci0gICAgbmV3Qm94LT5pbnNl cnRJbnRvQ29udGludWF0aW9uQ2hhaW5BZnRlcigqdGhpcyk7CisgICAgc2V0Q29udGludWF0aW9u KG5ld0JveC5nZXQoKSk7CiAgICAgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IGNoaWxkLm5l eHRTaWJsaW5nKCk7CiAgICAgYXV0byByZW1vdmVkQ2hpbGQgPSB0YWtlQ2hpbGRJbnRlcm5hbChj aGlsZCwgTm90aWZ5Q2hpbGRyZW4pOwogICAgIHNwbGl0RmxvdyhiZWZvcmVDaGlsZCwgV1RGTW92 ZShuZXdCb3gpLCBXVEZNb3ZlKHJlbW92ZWRDaGlsZCksIG9sZENvbnRpbnVhdGlvbik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKaW5kZXggNzA5MGY5NTdiNDFlNDdmZjIw NGQ5Y2Y5MzgxOWUwMmE1NDMwOWJiYy4uNTEzN2FhNWNiNTZkYjRhYjhkMjMxMmYyYTdkYzI1M2E1 Mjg2NTNmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaApAQCAtODcs NiArODcsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBhZGRGb2N1c1JpbmdSZWN0cyhWZWN0b3I8TGF5 b3V0UmVjdD4mLCBjb25zdCBMYXlvdXRQb2ludCYgYWRkaXRpb25hbE9mZnNldCwgY29uc3QgUmVu ZGVyTGF5ZXJNb2RlbE9iamVjdCogcGFpbnRDb250YWluZXIgPSAwKSBmaW5hbDsKICAgICB2b2lk IHBhaW50T3V0bGluZShQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogCisgICAgdXNp bmcgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbnRpbnVhdGlvbjsKKyAgICB1c2luZyBSZW5kZXJC b3hNb2RlbE9iamVjdDo6c2V0Q29udGludWF0aW9uOworCiAgICAgYm9vbCBhbHdheXNDcmVhdGVM aW5lQm94ZXMoKSBjb25zdCB7IHJldHVybiByZW5kZXJJbmxpbmVBbHdheXNDcmVhdGVzTGluZUJv eGVzKCk7IH0KICAgICB2b2lkIHNldEFsd2F5c0NyZWF0ZUxpbmVCb3hlcygpIHsgc2V0UmVuZGVy SW5saW5lQWx3YXlzQ3JlYXRlc0xpbmVCb3hlcyh0cnVlKTsgfQogICAgIHZvaWQgdXBkYXRlQWx3 YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wgZnVsbExheW91dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDJhMWNhNGFiYzM0MmE4OGU3MDVmN2RmZTVjYTRh ZDJkMGJiNTc2NTYuLmE2M2EwYmYxMmY5OTk3ZTA1MWE4ODVjZmJmMTJmMjdmZjczYmEzMzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC04MjQsNyArODI0 LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnByb3BhZ2F0ZVJlcGFpbnRUb1BhcmVudFdpdGhPdXRs aW5lQXV0b0lmTmVlZGVkKGNvbnN0IFJlbmRlckwKICAgICAgICAgYm9vbCByZW5kZXJlckhhc091 dGxpbmVBdXRvQW5jZXN0b3IgPSByZW5kZXJlci0+aGFzT3V0bGluZUF1dG9BbmNlc3RvcigpOwog ICAgICAgICBBU1NFUlQocmVuZGVyZXJIYXNPdXRsaW5lQXV0b0FuY2VzdG9yCiAgICAgICAgICAg ICB8fCByZW5kZXJlci0+b3V0bGluZVN0eWxlRm9yUmVwYWludCgpLm91dGxpbmVTdHlsZUlzQXV0 bygpCi0gICAgICAgICAgICB8fCAoaXM8UmVuZGVyQm94TW9kZWxPYmplY3Q+KCpyZW5kZXJlcikg JiYgZG93bmNhc3Q8UmVuZGVyQm94TW9kZWxPYmplY3Q+KCpyZW5kZXJlcikuaXNDb250aW51YXRp b24oKSkpOworICAgICAgICAgICAgfHwgKGlzPFJlbmRlckVsZW1lbnQ+KCpyZW5kZXJlcikgJiYg ZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4oKnJlbmRlcmVyKS5oYXNDb250aW51YXRpb24oKSkpOwog ICAgICAgICBpZiAocmVuZGVyZXIgPT0gJnJlcGFpbnRDb250YWluZXIgJiYgcmVuZGVyZXJIYXNP dXRsaW5lQXV0b0FuY2VzdG9yKQogICAgICAgICAgICAgcmVwYWludFJlY3ROZWVkc0NvbnZlcnRp bmcgPSB0cnVlOwogICAgICAgICBpZiAocmVuZGVyZXJIYXNPdXRsaW5lQXV0b0FuY2VzdG9yKQpA QCAtMTE3NSw3ICsxMTc1LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6Om91dHB1dFJlbmRlck9iamVj dChUZXh0U3RyZWFtJiBzdHJlYW0sIGJvb2wgbWFyaywgaW50IGRlcHRoKQogICAgIH0KICAgICBp ZiAoaXM8UmVuZGVyQm94TW9kZWxPYmplY3Q+KCp0aGlzKSkgewogICAgICAgICBhdXRvJiByZW5k ZXJlciA9IGRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqdGhpcyk7Ci0gICAgICAgIGlm IChyZW5kZXJlci5jb250aW51YXRpb24oKSkKKyAgICAgICAgaWYgKHJlbmRlcmVyLmhhc0NvbnRp bnVhdGlvbigpKQogICAgICAgICAgICAgc3RyZWFtIDw8ICIgY29udGludWF0aW9uLT4oIiA8PCBy ZW5kZXJlci5jb250aW51YXRpb24oKSA8PCAiKSI7CiAgICAgfQogICAgIG91dHB1dFJlZ2lvbnNJ bmZvcm1hdGlvbihzdHJlYW0pOwpAQCAtMTQ2Niw2ICsxNDY2LDkgQEAgc3RhdGljIFJlbmRlck9i amVjdCYgZmluZERlc3Ryb3lSb290SW5jbHVkaW5nQW5vbnltb3VzKFJlbmRlck9iamVjdCYgcmVu ZGVyZXIpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgaWYgKGRlc3Ryb3lSb290UGFyZW50 LT5pc1JlbmRlckZyYWdtZW50ZWRGbG93KCkpCiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg Ly8gRklYTUU6IERlc3Ryb3kgY29udGludWF0aW9ucyBoZXJlIHRvby4KKyAgICAgICAgaWYgKGRl c3Ryb3lSb290UGFyZW50LT5pc0NvbnRpbnVhdGlvbigpKQorICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGJvb2wgZGVzdHJveWluZ09ubHlDaGlsZCA9IGRlc3Ryb3lSb290UGFyZW50LT5maXJz dENoaWxkKCkgPT0gZGVzdHJveVJvb3QgJiYgZGVzdHJveVJvb3RQYXJlbnQtPmxhc3RDaGlsZCgp ID09IGRlc3Ryb3lSb290OwogICAgICAgICBpZiAoIWRlc3Ryb3lpbmdPbmx5Q2hpbGQpCiAgICAg ICAgICAgICBicmVhazsKQEAgLTE0ODcsOSArMTQ5MCw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpy ZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveUNsZWFuaW5nVXBBbm9ueW1vdXNXcmFwcGVycygpCiAg ICAgaWYgKGlzPFJlbmRlclRhYmxlUm93PihkZXN0cm95Um9vdCkpCiAgICAgICAgIGRvd25jYXN0 PFJlbmRlclRhYmxlUm93PihkZXN0cm95Um9vdCkuY29sbGFwc2VBbmREZXN0cm95QW5vbnltb3Vz U2libGluZ1Jvd3MoKTsKIAotICAgIGF1dG8mIGRlc3Ryb3lSb290UGFyZW50ID0gKmRlc3Ryb3lS b290LnBhcmVudCgpOwotICAgIGRlc3Ryb3lSb290UGFyZW50LnJlbW92ZUFuZERlc3Ryb3lDaGls ZChkZXN0cm95Um9vdCk7Ci0gICAgZGVzdHJveVJvb3RQYXJlbnQucmVtb3ZlQW5vbnltb3VzV3Jh cHBlcnNGb3JJbmxpbmVzSWZOZWNlc3NhcnkoKTsKKyAgICBkZXN0cm95Um9vdC5yZW1vdmVGcm9t UGFyZW50QW5kRGVzdHJveSgpOwogICAgIC8vIFdBUk5JTkc6IHx0aGlzfCBpcyBkZWxldGVkIGhl cmUuCiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAxYWM1YTYzYmQ5MDI5NzRiNmYwYTFhYWM0NTQ2M2RmZjY2ZDQyZDgx Li4yMDIxZTEyNTk5MTdiMzNhYjk5YzRlZmJjZjNkNTQxZjAwYmE3NWM1IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMTctMTEtMDEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMjQyNzMgYW5kIHIyMjQy NzguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzkx MjAKKworICAgICAgICBTb21lIGNyYXNoZXMgdW5kZXIgZ3VhcmQgbWFsbG9jIChSZXF1ZXN0ZWQg YnkgYW50dGlrIG9uCisgICAgICAgICN3ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5n ZXNldHM6CisKKyAgICAgICAgIlJlbW92ZSBlbXB0eSBjb250aW51YXRpb25zIGluCisgICAgICAg IFJlbmRlck9iamVjdDo6cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3lDbGVhbmluZ1VwQW5vbnlt b3VzV3JhcHBlcnMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzkwMTQKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIy NDI3MworCisgICAgICAgICJGaXggQ29udGludWF0aW9uQ2hhaW5Ob2RlOjppbnNlcnRBZnRlciBh c3NlcnRpb24uIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc5MTE1CisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yMjQy NzgKKwogMjAxNy0xMS0wMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIGVtcHR5IGNvbnRpbnVhdGlvbnMgaW4gUmVuZGVyT2JqZWN0OjpyZW1vdmVG cm9tUGFyZW50QW5kRGVzdHJveUNsZWFuaW5nVXBBbm9ueW1vdXNXcmFwcGVycwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9ydWJ5L2Zsb2F0LW92ZXJoYW5nLWZyb20tcnVieS10ZXh0LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvcnVieS9mbG9hdC1vdmVyaGFuZy1mcm9tLXJ1 YnktdGV4dC1leHBlY3RlZC50eHQKaW5kZXggMGU5YTJlN2MzODdhZDg1NzQyMTVkMTA3NTYwOWZk ZGY5YjQ3MGFhNS4uYmJmZjVmNWQ2NTA2ODQzMWY1YTRjNDliMzI4ZTNlMDFhN2M3NjEwNCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ydWJ5L2Zsb2F0LW92ZXJoYW5nLWZyb20tcnVieS10 ZXh0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3J1YnkvZmxvYXQtb3Zlcmhh bmctZnJvbS1ydWJ5LXRleHQtZXhwZWN0ZWQudHh0CkBAIC0xNyw2ICsxNyw3IEBAIGxheWVyIGF0 ICgwLDApIHNpemUgODAweDYwMAogICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNzUpIHNp emUgNzg0eDUwCiAgICAgICAgIFJlbmRlclJ1YnkgKGlubGluZSkge1JVQll9IGF0ICgwLDApIHNp emUgMTAweDUwCiAgICAgICAgICAgUmVuZGVyUnVieVJ1biAoYW5vbnltb3VzKSBhdCAoMCwwKSBz aXplIDEwMHg1MAotICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUg MTAweDUwCi0gICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDEwMDogImFhIgor ICAgICAgICAgICAgUmVuZGVyUnVieUJhc2UgKGFub255bW91cykgYXQgKDAsMCkgc2l6ZSAxMDB4 NTAKKyAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMTAweDUw CisgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTAwOiAiYWEiCiAgICAg ICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcnVieS9ydWJ5RE9NLXJlbW92ZS1ydDEtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcnVieS9ydWJ5RE9NLXJlbW92 ZS1ydDEtZXhwZWN0ZWQudHh0CmluZGV4IGFmOGMzNjU2NDZmNTJiOWIzYTJlYmI0ZjUxYWZkZDYz OWIzZmZkMmEuLjhjOWM2YWEwOWRkZTI5YWU0Nzc2OWI4NjdiZTJmYTI1MWI1ZDQ4NGIgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3J1YnkvcnVieURPTS1yZW1vdmUt cnQxLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9ydWJ5 L3J1YnlET00tcmVtb3ZlLXJ0MS1leHBlY3RlZC50eHQKQEAgLTI0LDggKzI0LDkgQEAgbGF5ZXIg YXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMzAsMCkgc2l6ZSA0N3gxOAogICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgzMCwwKSB3 aWR0aCA0NzogIkhUTUwiCiAgICAgICAgICAgUmVuZGVyUnVieVJ1biAoYW5vbnltb3VzKSBhdCAo MjU5LDEwKSBzaXplIDl4MTgKLSAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCww KSBzaXplIDh4MTgKLSAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggODogIjUi CisgICAgICAgICAgICBSZW5kZXJSdWJ5QmFzZSAoYW5vbnltb3VzKSBhdCAoMCwwKSBzaXplIDh4 MTgKKyAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgOHgxOAor ICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDg6ICI1IgogICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDI2NywxMCkgc2l6ZSAzOHgxOAogICAgICAgICAgIHRleHQg cnVuIGF0ICgyNjcsMTApIHdpZHRoIDM4OiAiIHNwZWMuIgogICAgICAgUmVuZGVyQmxvY2sge1B9 IGF0ICgwLDE2NCkgc2l6ZSA3ODR4MjgK