193327 2019-01-10 11:03:43 -0800 Add WKBundlePage SPI to temporarily force light or dark appearance on a page 2019-01-11 12:37:55 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue jlewis3 ryanhaddad thorton timothy tsavell webkit-bug-importer wenson_hsieh oldest_to_newest 1493361 0 timothy 2019-01-10 11:03:43 -0800 Needed to let clients switch the appearance for DOM processing explicitly in light or dark mode. <rdar://problem/47093222> 1493362 1 358808 timothy 2019-01-10 11:08:09 -0800 Created attachment 358808 Patch 1493380 2 358813 timothy 2019-01-10 11:53:20 -0800 Created attachment 358813 Patch 1493394 3 358818 timothy 2019-01-10 12:20:02 -0800 Created attachment 358818 Patch 1493540 4 358818 commit-queue 2019-01-10 17:12:06 -0800 Comment on attachment 358818 Patch Clearing flags on attachment: 358818 Committed r239851: <https://trac.webkit.org/changeset/239851> 1493541 5 commit-queue 2019-01-10 17:12:08 -0800 All reviewed patches have been landed. Closing bug. 1493581 6 ryanhaddad 2019-01-10 20:33:08 -0800 The API test added with this change is timing out on Mojave bots: Timeout TestWebKitAPI.WebKit.ForceLightAppearanceInBundle _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. ERROR: InjectedBundle test not found - ForceLightAppearanceInBundleTest ERROR: InjectedBundle test not found - ForceLightAppearanceInBundleTest https://build.webkit.org/builders/Apple%20Mojave%20Release%20WK2%20%28Tests%29/builds/1738/steps/run-api-tests/logs/stdio 1493719 7 timothy 2019-01-11 11:28:03 -0800 Reopening to attach new patch. 1493720 8 358916 timothy 2019-01-11 11:28:03 -0800 Created attachment 358916 Patch 1493751 9 358916 commit-queue 2019-01-11 12:37:54 -0800 Comment on attachment 358916 Patch Clearing flags on attachment: 358916 Committed r239866: <https://trac.webkit.org/changeset/239866> 1493752 10 commit-queue 2019-01-11 12:37:55 -0800 All reviewed patches have been landed. Closing bug. 358808 2019-01-10 11:08:09 -0800 2019-01-10 11:53:19 -0800 Patch bug-193327-20190110110808.patch text/plain 21311 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNhZTU3MTA5NjI5Mzg4MWYx NDcwMDcyMzRkNTBjNjUzYjE3MjIxZGIuLmEwZTQ1Y2UzOTQ2NzRiNDA4MjgzNTI3ZjgzNzlhZjUw N2E0ZDEzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTAgIFRpbW90aHkg SGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXa0J1bmRsZVBhZ2Ug U1BJIHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBhIHBh Z2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz MjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czogV2ViS2l0LkZvcmNlTGlnaHRBcHBl YXJhbmNlSW5CdW5kbGUgQVBJIFRlc3QKKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlUGFnZVNldFVz ZURhcmtBcHBlYXJhbmNlKTogQWRkZWQuCisgICAgICAgIChXS0J1bmRsZVBhZ2VJc1VzaW5nRGFy a0FwcGVhcmFuY2UpOiBBZGRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDoKKwogMjAxOS0wMS0wNyAgRGF2aWQgS2lsemVy ICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIExlYWsgb2YgU2Nyb2xsQ29tcGxldGlv bkNhbGxiYWNrRGF0YSAoMTYgYnl0ZXMpIGluIGNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCBy dW5uaW5nIFdlYktpdCBsYXlvdXQgdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKaW5k ZXggZDMwMGRjMTYxYzZlMzdiNDFjN2MzMDAwNDZhYTNhOTk3MWQwMDNjYi4uNDAwZDEzOTU0ZDBk ZjdmMGY0MTcwZWFkZTYyMTExNDA4NzZiNGQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5j cHAKQEAgLTU4OSw2ICs1ODksMjEgQEAgdm9pZCBXS0J1bmRsZVBhZ2VDb25maXJtQ29tcG9zaXRp b25XaXRoVGV4dChXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tTdHJpbmdSZWYKICAgICBXZWJL aXQ6OnRvSW1wbChwYWdlUmVmKS0+Y29uZmlybUNvbXBvc2l0aW9uRm9yVGVzdGluZyhXZWJLaXQ6 OnRvV1RGU3RyaW5nKHRleHQpKTsKIH0KIAordm9pZCBXS0J1bmRsZVBhZ2VTZXRVc2VEYXJrQXBw ZWFyYW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgYm9vbCB1c2VEYXJrQXBwZWFyYW5jZSkK K3sKKyAgICBXZWJLaXQ6OldlYlBhZ2UqIHdlYlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChwYWdlUmVm KTsKKyAgICBpZiAoV2ViQ29yZTo6UGFnZSogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5jb3Jl UGFnZSgpIDogbnVsbHB0cikKKyAgICAgICAgcGFnZS0+c2V0VXNlRGFya0FwcGVhcmFuY2UodXNl RGFya0FwcGVhcmFuY2UpOworfQorCitib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFy YW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZikKK3sKKyAgICBXZWJLaXQ6OldlYlBhZ2UqIHdl YlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKTsKKyAgICBpZiAoV2ViQ29yZTo6UGFnZSog cGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5jb3JlUGFnZSgpIDogbnVsbHB0cikKKyAgICAgICAg cmV0dXJuIHBhZ2UtPnVzZURhcmtBcHBlYXJhbmNlKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQor CiBib29sIFdLQnVuZGxlUGFnZUNhblNob3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJl ZiwgV0tTdHJpbmdSZWYgbWltZVR5cGVSZWYpCiB7CiAgICAgcmV0dXJuIFdlYktpdDo6dG9JbXBs KHBhZ2VSZWYpLT5jYW5TaG93TUlNRVR5cGUoV2ViS2l0Ojp0b1dURlN0cmluZyhtaW1lVHlwZVJl ZikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9J bmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VQcml2YXRlLmgKaW5kZXggODQxNGJjZGIw M2MyNTZhZDM3NzRhNmQzMTRjZGQxN2UyODAwMDZlYy4uZDM4YzQxODA3ODliNDRjODg0N2M5Zjc3 OGYyOGVmMDA2ZjFjNTE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5o CkBAIC03Nyw2ICs3Nyw5IEBAIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUhhc0NvbXBvc2l0 aW9uKFdLQnVuZGxlUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZUNv bmZpcm1Db21wb3NpdGlvbihXS0J1bmRsZVBhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgdm9pZCBX S0J1bmRsZVBhZ2VDb25maXJtQ29tcG9zaXRpb25XaXRoVGV4dChXS0J1bmRsZVBhZ2VSZWYgcGFn ZSwgV0tTdHJpbmdSZWYgdGV4dCk7CiAKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZVNldFVz ZURhcmtBcHBlYXJhbmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBib29sIHVzZURhcmtBcHBlYXJh bmNlKTsKK1dLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFyYW5jZShX S0J1bmRsZVBhZ2VSZWYgcGFnZSk7CisKIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUNhblNo b3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIG1pbWVUeXBlKTsKIAogV0tf RVhQT1JUIHZvaWQqIFdLQWNjZXNzaWJpbGl0eVJvb3RPYmplY3QoV0tCdW5kbGVQYWdlUmVmKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZDNh NGI0YjkyMDk5NmU3ZTlkNzA0ZTM4NjJlMTc1YzU3MWRiNGZhLi5hYzhhMDE4ZGJiYTIyNWZmMDAz MjRmMWFjNzU0ZTJiOGU5NTIyYmRmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMTAgIFRpbW90aHkgSGF0 Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXa0J1bmRsZVBhZ2UgU1BJ IHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBhIHBhZ2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzMjcK KyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tOiBBZGRlZC4KKyAgICAg ICAgKFRlc3RXZWJLaXRBUEk6OmRpZEZpbmlzaE5hdmlnYXRpb24pOgorICAgICAgICAoVGVzdFdl YktpdEFQSTo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tOiBBZGRlZC4KKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OkZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVUZXN0OjpG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdDo6ZGlkQ3JlYXRlUGFnZSk6CisgICAg ICAgIChUZXN0V2ViS2l0QVBJOjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdDo6ZGlk UmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21h Yy9kYXJrLW1vZGUuaHRtbDogQWRkZWQuCisKIDIwMTktMDEtMDcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBMZWFrIG9mIFNjcm9sbENvbXBsZXRpb25DYWxs YmFja0RhdGEgKDE2IGJ5dGVzKSBpbiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQgcnVubmlu ZyBXZWJLaXQgbGF5b3V0IHRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDVjMzM3ODVh YjhlYjRmMTAyZTc5YTM4YzgzNGYyNzQ3NDJhNmJiYTMuLmIyYTIyNDA2NWMxYzFlYjVkMGIxZjE2 NTAwNDlkODM3Y2U2ZjEyOTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC03Miw2ICs3Miw5 IEBACiAJCTFDN0ZFQjIwMjA3QzBGMkUwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzdGRUIxRjIwN0Mw RjJEMDBEMjMyNzggLyogQmFja2dyb3VuZENvbG9yLm1tICovOyB9OwogCQkxQzlFQjg0MTFFMzgw REExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDOUVCODQwMUUzODBEQTEwMDVDNjQ0MiAv KiBDb21wbGV4VGV4dENvbnRyb2xsZXIuY3BwICovOyB9OwogCQkxQ0FEMUY4NjFFNUNFN0RBMDBB RjJDMkMgLyogRm9udENhY2hlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFDQUQxRjg1MUU1Q0U3REEwMEFGMkMyQyAvKiBGb250Q2FjaGUuY3BwICov OyB9OworCQkxQ0Y1OUFFMjIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJ bkJ1bmRsZV9CdW5kbGUubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQ0Y1OUFFMDIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJ bkJ1bmRsZV9CdW5kbGUubW0gKi87IH07CisJCTFDRjU5QUUzMjFFNjg5MzIwMDZFMzdFQyAvKiBG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUNGNTlBREYyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGln aHRBcHBlYXJhbmNlSW5CdW5kbGUubW0gKi87IH07CisJCTFDRjU5QUU1MjFFNjk3N0QwMDZFMzdF QyAvKiBkYXJrLW1vZGUuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQ0Y1OUFFNDIxRTY5NkZCMDA2RTM3RUMgLyogZGFyay1tb2RlLmh0 bWwgKi87IH07CiAJCTFGODM1NzFCMUQzRkZCMjMwMEUzOTY3QiAvKiBXS0JhY2tGb3J3YXJkTGlz dC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFGODM1 NzFBMUQzRkZCMEUwMEUzOTY3QiAvKiBXS0JhY2tGb3J3YXJkTGlzdC5tbSAqLzsgfTsKIAkJMjZE RjVBNjMxNUEyQTI3RTAwMzY4OUMyIC8qIENhbmNlbExvYWRGcm9tUmVzb3VyY2VMb2FkRGVsZWdh dGUuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyNkRGNUE2MTE1QTJBMjJCMDAzNjg5QzIgLyogQ2FuY2VsTG9hZEZyb21SZXNvdXJjZUxv YWREZWxlZ2F0ZS5odG1sICovOyB9OwogCQkyNkY1MkVBRDE4Mjg4MjdCMDAyM0Q0MTIgLyogZ2Vv bG9jYXRpb25HZXRDdXJyZW50UG9zaXRpb24uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyNkY1MkVBQzE4Mjg4MjBFMDAyM0Q0MTIgLyog Z2VvbG9jYXRpb25HZXRDdXJyZW50UG9zaXRpb24uaHRtbCAqLzsgfTsKQEAgLTk4Miw4ICs5ODUs NiBAQAogCQkJZHN0UGF0aCA9IFRlc3RXZWJLaXRBUEkucmVzb3VyY2VzOwogCQkJZHN0U3ViZm9s ZGVyU3BlYyA9IDc7CiAJCQlmaWxlcyA9ICgKLQkJCQlDOUM5QTkxRDIxREVEN0EwMDBGREU5NkUg LyogdmlkZW8td2l0aC1wbGF5LWJ1dHRvbi5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAotCQkJ CUM5QzlBOTFCMjFERUQyODcwMEZERTk2RSAvKiBhdWRpby13aXRoLXBsYXktYnV0dG9uLmh0bWwg aW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJNTVBODE3RkYyMTgxMDIxQTAwMDRBMzlBIC8qIDEw MHgxMDAtcmVkLnRnYSBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkxQTlFNTJDOTEzRTY1RUY0 MDA2OTE3RjUgLyogMTgtY2hhcmFjdGVycy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ CTU1QTgxODAwMjE4MTAyMjEwMDA0QTM5QSAvKiA0MDB4NDAwLWdyZWVuLnBuZyBpbiBDb3B5IFJl c291cmNlcyAqLywKQEAgLTEwMDMsNiArMTAwNCw3IEBACiAJCQkJMzcxMzdFNEIyMTEyNEQwMTAw MkJFRUE0IC8qIEF0dHJTdHlsZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUNEOUUy OTJFMUM5MEMzM0YwMDBCQjgwMCAvKiBhdWRpby1vbmx5Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJQzk0NDE2MDAyMTQzMEU4OTAwQjFFRERBIC8qIGF1ZGlvLXdpdGgtY29udHJvbHMu aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQlDOUM5QTkxQjIxREVEMjg3MDBGREU5NkUg LyogYXVkaW8td2l0aC1wbGF5LWJ1dHRvbi5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ CUNENTc3NzlDMjExQ0U5MUYwMDFCMzcxRSAvKiBhdWRpby13aXRoLXdlYi1hdWRpby5odG1sIGlu IENvcHkgUmVzb3VyY2VzICovLAogCQkJCTc2RTE4MkRGMTU0NzY3RTYwMEYxRkFERCAvKiBhdXRv LXN1Ym1pdHRpbmctZm9ybS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0MUFCOTlG MUVGNDY5NkIwMDgzRkEwOCAvKiBhdXRvZm9jdXMtY29udGVudGVkaXRhYmxlLmh0bWwgaW4gQ29w eSBSZXNvdXJjZXMgKi8sCkBAIC0xMDQxLDYgKzEwNDMsNyBAQAogCQkJCTdBRUFENDgxMUUyMDEy MjcwMDQxNkVGRSAvKiBDcm9zc1BhcnRpdGlvbkZpbGVTY2hlbWVBY2Nlc3MuaHRtbCBpbiBDb3B5 IFJlc291cmNlcyAqLywKIAkJCQlGNEFCNTc4QTFGNjUxNjU0MDBEQjBEQTEgLyogY3VzdG9tLWRy YWdnYWJsZS1kaXYuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkyOTBGNDI3NTE3MkEy MjFDMDA5MzlGRjAgLyogY3VzdG9tLXByb3RvY29sLXN5bmMteGhyLmh0bWwgaW4gQ29weSBSZXNv dXJjZXMgKi8sCisJCQkJMUNGNTlBRTUyMUU2OTc3RDAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0N0RGQjI2MjFBODc4REYwMDAyMUZCNiAvKiBk YXRhLWRldGVjdG9ycy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0ODZCMUQwMUY2 Nzk1MjMwMEYzNEJERCAvKiBEYXRhVHJhbnNmZXItc2V0RHJhZ0ltYWdlLmh0bWwgaW4gQ29weSBS ZXNvdXJjZXMgKi8sCiAJCQkJRjQ1N0E5RDYyMDJENjhBRjAwRjdFOUQ1IC8qIERhdGFUcmFuc2Zl ci5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMTI1OSw2ICsxMjYyLDcgQEAKIAkJCQlD RDMyMUIwNDFFM0E4NUZBMDBFQjIxQzggLyogdmlkZW8td2l0aC1tdXRlZC1hdWRpby1hbmQtd2Vi YXVkaW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDREI0MTE1QTFFMEIwMERCMDBF QUQzNTIgLyogdmlkZW8td2l0aC1tdXRlZC1hdWRpby5odG1sIGluIENvcHkgUmVzb3VyY2VzICov LAogCQkJCUNENzU4QTZGMjA1NzJFQTAwMDcxODM0QSAvKiB2aWRlby13aXRoLXBhdXNlZC1hdWRp by1hbmQtcGxheWluZy1tdXRlZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAorCQkJCUM5QzlB OTFEMjFERUQ3QTAwMEZERTk2RSAvKiB2aWRlby13aXRoLXBsYXktYnV0dG9uLmh0bWwgaW4gQ29w eSBSZXNvdXJjZXMgKi8sCiAJCQkJQ0RDOEU0OTYxQkM2RjEwODAwNTk0RkVDIC8qIHZpZGVvLXdp dGhvdXQtYXVkaW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDREM4RTQ5NzFCQzZG MTA4MDA1OTRGRUMgLyogdmlkZW8td2l0aG91dC1hdWRpby5tcDQgaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJMkVCRDlEMEEyMTM0NzMwRDAwMkRBNzU4IC8qIHZpZGVvLmh0bWwgaW4gQ29weSBS ZXNvdXJjZXMgKi8sCkBAIC0xMzUyLDYgKzEzNTYsOSBAQAogCQkxQ0FEMUY4NTFFNUNFN0RBMDBB RjJDMkMgLyogRm9udENhY2hlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IEZvbnRDYWNoZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDQjlCQzM3 MUE2NzQ4MjMwMEZFNTY3OCAvKiBXZWFrUHRyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFdlYWtQdHIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkx Q0YwRDM3ODFCQkYyRjNEMDBCNEVGNTQgLyogV0tSZXRhaW5QdHIuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV0tSZXRhaW5QdHIuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQkxQ0Y1OUFERjIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVh cmFuY2VJbkJ1bmRsZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9 IEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CisJCTFDRjU5QUUwMjFFNjg5MjUwMDZFMzdFQyAvKiBGb3JjZUxpZ2h0QXBwZWFyYW5jZUlu QnVuZGxlX0J1bmRsZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9 IEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQkxQ0Y1OUFFNDIxRTY5NkZCMDA2RTM3RUMgLyogZGFyay1tb2RlLmh0bWwg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAiZGFyay1tb2RlLmh0bWwiOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxRjgzNTcxQTFEM0ZGQjBFMDBFMzk2N0IgLyogV0tCYWNrRm9y d2FyZExpc3QubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBXS0Jh Y2tGb3J3YXJkTGlzdC5tbTsgcGF0aCA9IFRlc3RzL1dlYktpdC9XS0JhY2tGb3J3YXJkTGlzdC5t bTsgc291cmNlVHJlZSA9IFNPVVJDRV9ST09UOyB9OwogCQkyNjBCQTU3ODFCMUQyRTdCMDA0RkEw N0MgLyogREZBQ29tYmluZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo ID0gREZBQ29tYmluZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyNjBCQTU3 QTFCMUQyRUUyMDA0RkEwN0MgLyogREZBSGVscGVycy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBERkFIZWxwZXJzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0z MzE3LDggKzMzMjQsOCBAQAogCQkJCUM5NTk4NEY2MUUzNkJDRDcwMDJDMEQ0NSAvKiB0ZXN0LXdp dGhvdXQtYXVkaW8tdHJhY2subXA0ICovLAogCQkJCTUyNEJCQ0EwMTlFMzBDNjMwMDJGMUFGMSAv KiB0ZXN0Lm1wNCAqLywKIAkJCQk3QUU5RTUwODFBRTVBRThCMDBDRjg3NEIgLyogdGVzdC5wZGYg Ki8sCi0JCQkJMDdDRDMyRjcyMDY1QjcyQTAwNjRBNEJFIC8qIHZpZGVvLmh0bWwgKi8sCiAJCQkJ QzlDOUE5MUMyMURFRDc5NDAwRkRFOTZFIC8qIHZpZGVvLXdpdGgtcGxheS1idXR0b24uaHRtbCAq LywKKwkJCQkwN0NEMzJGNzIwNjVCNzJBMDA2NEE0QkUgLyogdmlkZW8uaHRtbCAqLywKIAkJCQkx QzJCODE4NDFDODkyNEEyMDBBNTUyOUYgLyogd2ViZm9udC5odG1sICovLAogCQkJKTsKIAkJCW5h bWUgPSBSZXNvdXJjZXM7CkBAIC0zNTIwLDcgKzM1MjcsMTAgQEAKIAkJCQk3QUM3QjU2RjIwRDlC QTVCMDAyQzA5QTAgLyogQ3VzdG9tQnVuZGxlT2JqZWN0Lm1tICovLAogCQkJCTdBQzdCNTZDMjBE OTc2OEYwMDJDMDlBMCAvKiBDdXN0b21CdW5kbGVQYXJhbWV0ZXIubW0gKi8sCiAJCQkJN0FDN0I1 NkIyMEQ5NzY4RTAwMkMwOUEwIC8qIEN1c3RvbUJ1bmRsZVBhcmFtZXRlcl9CdW5kbGUubW0gKi8s CisJCQkJMUNGNTlBRTQyMUU2OTZGQjAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1sICovLAogCQkJ CUJDQUE0ODU3MTRBMDQ0RDQwMDg4RkFDNCAvKiBFZGl0b3JDb21tYW5kcy5tbSAqLywKKwkJCQkx Q0Y1OUFERjIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5t bSAqLywKKwkJCQkxQ0Y1OUFFMDIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFu Y2VJbkJ1bmRsZV9CdW5kbGUubW0gKi8sCiAJCQkJQzBDNUQzQkMxNDU5OEI2RjAwQTgwMkE2IC8q IEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbSAqLywKIAkJCQlDMEM1RDNCRDE0NTk4QjZGMDBBODAy QTYgLyogR2V0QmFja2luZ1NjYWxlRmFjdG9yX0J1bmRsZS5tbSAqLywKIAkJCQkxQUVGOTk0ODE3 QTA5RjUzMDA5OThFRjAgLyogR2V0UElEQWZ0ZXJBYm9ydGVkUHJvY2Vzc0xhdW5jaC5jcHAgKi8s CkBAIC0zOTg3LDYgKzM5OTcsNyBAQAogCQkJCTJFOTJCOEZBMjE2NEEwQzEwMDVCNjRGMCAvKiBG b250QXR0cmlidXRlcy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFDQUQxRjg2MUU1Q0U3REEwMEFG MkMyQyAvKiBGb250Q2FjaGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJRjQ1NkFCMUMyMTNFREJB MzAwQ0IyQ0VGIC8qIEZvbnRNYW5hZ2VyVGVzdHMubW0gaW4gU291cmNlcyAqLywKKwkJCQkxQ0Y1 OUFFMzIxRTY4OTMyMDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbSBp biBTb3VyY2VzICovLAogCQkJCTdDQ0U3RUY1MUE0MTFBRTYwMDQ0N0M0QyAvKiBGb3JjZVJlcGFp bnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdFQzAxQTQxMUE3RTAwNDQ3QzRDIC8qIEZy YWdtZW50TmF2aWdhdGlvbi5tbSBpbiBTb3VyY2VzICovLAogCQkJCTM3NkM4QzA2MUQ2RTE5N0Mw MDdEMkJCOSAvKiBGcmFtZUhhbmRsZS5jcHAgaW4gU291cmNlcyAqLywKQEAgLTQzNTcsNiArNDM2 OCw3IEBACiAJCQkJNTEzOTNFMjIxNTIzOTUyRDAwNUYzOUM1IC8qIERPTVdpbmRvd0V4dGVuc2lv bkJhc2ljX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlGNkY0OUM2QjE1NTQ1Q0E3MDAw N0YzOUQgLyogRE9NV2luZG93RXh0ZW5zaW9uTm9DYWNoZV9CdW5kbGUuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJMTE3MUIyNEYyMTlGNDlDRDAwQ0I4OTdEIC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50 TWlsZXN0b25lX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkxQ0Y1OUFFMjIxRTY4OTI1 MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZV9CdW5kbGUubW0gaW4gU291 cmNlcyAqLywKIAkJCQlDMEM1RDNDNjE0NTk5MTI5MDBBODAyQTYgLyogR2V0QmFja2luZ1NjYWxl RmFjdG9yX0J1bmRsZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCUY2NjBBQTExMTVBNUY2MzEwMDNB MTI0MyAvKiBHZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGFDYWxsYmFja19C dW5kbGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNEJGREZGQTcxMzE0Nzc2QzAwNjFGMjRCIC8q IEhpdFRlc3RSZXN1bHROb2RlSGFuZGxlX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLywKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBw ZWFyYW5jZUluQnVuZGxlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbWFj L0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmQ5NWQzZTQzMmRi MTdlYzBkMTk5M2YwMzUxNzA1YWJlODU3ZWU1OAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxl Lm1tCkBAIC0wLDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisg KiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAq IEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBF WEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisK KyNpZiBXS19IQVZFX0NfU1BJCisKKyNpbmNsdWRlICJQbGF0Zm9ybVV0aWxpdGllcy5oIgorI2lu Y2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgorI2luY2x1ZGUgIlRlc3QuaCIKKyNpbmNsdWRlIDxX ZWJLaXQvV0tDb250ZXh0UHJpdmF0ZS5oPgorCituYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CisK K3N0YXRpYyBib29sIGRpZEZpbmlzaExvYWQ7CitzdGF0aWMgYm9vbCBtZXNzYWdlUmVjZWl2ZWQ7 CisKK3N0YXRpYyB2b2lkIGRpZEZpbmlzaE5hdmlnYXRpb24oV0tQYWdlUmVmLCBXS05hdmlnYXRp b25SZWYsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCopCit7CisgICAgZGlkRmluaXNoTG9hZCA9IHRy dWU7Cit9CisKK3N0YXRpYyB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxl KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVm IG1lc3NhZ2VCb2R5LCBjb25zdCB2b2lkKikKK3sKKyAgICBtZXNzYWdlUmVjZWl2ZWQgPSB0cnVl OworCisgICAgQVNTRVJUX05PVF9OVUxMKG1lc3NhZ2VCb2R5KTsKKyAgICBFWFBFQ1RfRVEoV0tT dHJpbmdHZXRUeXBlSUQoKSwgV0tHZXRUeXBlSUQobWVzc2FnZUJvZHkpKTsKKworICAgIFdLU3Ry aW5nUmVmIG1lc3NhZ2VCb2R5U3RyaW5nID0gc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KG1lc3Nh Z2VCb2R5KTsKKworICAgIEVYUEVDVF9XS19TVFJFUSgiVGVzdERvbmUiLCBtZXNzYWdlTmFtZSk7 CisgICAgRVhQRUNUX1dLX1NUUkVRKCJyZ2IoMCwgMCwgMCkiLCBtZXNzYWdlQm9keVN0cmluZyk7 Cit9CisKK1RFU1QoV2ViS2l0LCBGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlKQoreworICAg IFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dChBZG9wdFdLLCBVdGlsOjpjcmVhdGVD b250ZXh0Rm9ySW5qZWN0ZWRCdW5kbGVUZXN0KCJGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxl VGVzdCIpKTsKKworICAgIFBsYXRmb3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCkpOwor CisgICAgW3dlYlZpZXcucGxhdGZvcm1WaWV3KCkgc2V0QXBwZWFyYW5jZTpbTlNBcHBlYXJhbmNl IGFwcGVhcmFuY2VOYW1lZDpOU0FwcGVhcmFuY2VOYW1lRGFya0FxdWFdXTsKKworICAgIFdLUGFn ZU5hdmlnYXRpb25DbGllbnRWMCBsb2FkZXJDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkZXJDbGll bnQsIDAsIHNpemVvZihsb2FkZXJDbGllbnQpKTsKKworICAgIGxvYWRlckNsaWVudC5iYXNlLnZl cnNpb24gPSAwOworICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hOYXZpZ2F0aW9uID0gZGlkRmlu aXNoTmF2aWdhdGlvbjsKKworICAgIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KHdlYlZp ZXcucGFnZSgpLCAmbG9hZGVyQ2xpZW50LmJhc2UpOworCisgICAgV0tDb250ZXh0SW5qZWN0ZWRC dW5kbGVDbGllbnRWMCBpbmplY3RlZEJ1bmRsZUNsaWVudDsKKyAgICBtZW1zZXQoJmluamVjdGVk QnVuZGxlQ2xpZW50LCAwLCBzaXplb2YoaW5qZWN0ZWRCdW5kbGVDbGllbnQpKTsKKworICAgIGlu amVjdGVkQnVuZGxlQ2xpZW50LmJhc2UudmVyc2lvbiA9IDA7CisgICAgaW5qZWN0ZWRCdW5kbGVD bGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUgPSBkaWRSZWNlaXZlTWVz c2FnZUZyb21JbmplY3RlZEJ1bmRsZTsKKworICAgIFdLQ29udGV4dFNldEluamVjdGVkQnVuZGxl Q2xpZW50KGNvbnRleHQuZ2V0KCksICZpbmplY3RlZEJ1bmRsZUNsaWVudC5iYXNlKTsKKworICAg IFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIGFkb3B0V0soVXRpbDo6Y3JlYXRlVVJMRm9y UmVzb3VyY2UoImRhcmstbW9kZSIsICJodG1sIikpLmdldCgpKTsKKyAgICBVdGlsOjpydW4oJmRp ZEZpbmlzaExvYWQpOworCisgICAgV0tDb250ZXh0UG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxl KGNvbnRleHQuZ2V0KCksIFV0aWw6OnRvV0soIlJ1blRlc3QiKS5nZXQoKSwgbnVsbHB0cik7Cisg ICAgVXRpbDo6cnVuKCZtZXNzYWdlUmVjZWl2ZWQpOworICAgIG1lc3NhZ2VSZWNlaXZlZCA9IGZh bHNlOworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCisKKyNlbmRpZgpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbWFjL0ZvcmNlTGlnaHRBcHBl YXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmFlYmExYzM0OGZiYzY2YTE3MGU1MzllMGE3Mjg2YWVlOTE1M2U2MDQKLS0tIC9kZXYvbnVsbAor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9tYWMvRm9yY2VMaWdodEFwcGVh cmFuY2VJbkJ1bmRsZV9CdW5kbGUubW0KQEAgLTAsMCArMSw5MiBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJ QlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElU UyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNp bmNsdWRlICJjb25maWcuaCIKKworI2lmIFdLX0hBVkVfQ19TUEkKKworI2luY2x1ZGUgIkluamVj dGVkQnVuZGxlVGVzdC5oIgorCisjaW5jbHVkZSAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9KU1JldGFpblB0ci5oPgorI2luY2x1ZGUgPFdlYktpdC9XS0J1 bmRsZUZyYW1lLmg+CisjaW5jbHVkZSA8V2ViS2l0L1dLQnVuZGxlUGFnZS5oPgorI2luY2x1ZGUg PFdlYktpdC9XS0J1bmRsZVBhZ2VQcml2YXRlLmg+CisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJ IHsKKworY2xhc3MgRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZVRlc3QgOiBwdWJsaWMgSW5q ZWN0ZWRCdW5kbGVUZXN0IHsKK3B1YmxpYzoKKyAgICBGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVu ZGxlVGVzdChjb25zdCBzdGQ6OnN0cmluZyYgaWRlbnRpZmllcikKKyAgICAgICAgOiBJbmplY3Rl ZEJ1bmRsZVRlc3QoaWRlbnRpZmllcikKKyAgICB7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lk IGRpZENyZWF0ZVBhZ2UoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSkK KyAgICB7CisgICAgICAgIG1fcGFnZSA9IHBhZ2U7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lk IGRpZFJlY2VpdmVNZXNzYWdlKFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tTdHJpbmdSZWYgbWVzc2Fn ZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSkKKyAgICB7CisgICAgICAgIGlmICghV0tTdHJp bmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNzYWdlTmFtZSwgIlJ1blRlc3QiKSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBpZiAoIVdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFy YW5jZShtX3BhZ2UpKQorICAgICAgICAgICAgV0tCdW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0 aWw6OnRvV0soIlRlc3RGYWlsZWQiKS5nZXQoKSwgVXRpbDo6dG9XSygiUGFnZSBpc24ndCBpbiBk YXJrIG1vZGUgYXQgc3RhcnQgb2YgdGVzdC4iKS5nZXQoKSk7CisKKyAgICAgICAgV0tCdW5kbGVQ YWdlU2V0VXNlRGFya0FwcGVhcmFuY2UobV9wYWdlLCBmYWxzZSk7CisKKyAgICAgICAgaWYgKFdL QnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFyYW5jZShtX3BhZ2UpKQorICAgICAgICAgICAgV0tC dW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0aWw6OnRvV0soIlRlc3RGYWlsZWQiKS5nZXQoKSwg VXRpbDo6dG9XSygiU3dpdGNoaW5nIHRvIGxpZ2h0IG1vZGUgZmFpbGVkLiIpLmdldCgpKTsKKwor ICAgICAgICBhdXRvIG1haW5GcmFtZSA9IFdLQnVuZGxlUGFnZUdldE1haW5GcmFtZShtX3BhZ2Up OworICAgICAgICBhdXRvIHNjcmlwdENvbnRleHQgPSBXS0J1bmRsZUZyYW1lR2V0SmF2YVNjcmlw dENvbnRleHQobWFpbkZyYW1lKTsKKyAgICAgICAgYXV0byBzY3JpcHQgPSBhZG9wdChKU1N0cmlu Z0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQu Ym9keSkuZ2V0UHJvcGVydHlWYWx1ZSgnY29sb3InKSIpKTsKKworICAgICAgICBhdXRvIHJlc3Vs dCA9IEpTRXZhbHVhdGVTY3JpcHQoc2NyaXB0Q29udGV4dCwgc2NyaXB0LmdldCgpLCBudWxscHRy LCBudWxscHRyLCAwLCBudWxscHRyKTsKKyAgICAgICAgYXV0byByZXN1bHRTdHJpbmcgPSBhZG9w dChKU1ZhbHVlVG9TdHJpbmdDb3B5KHNjcmlwdENvbnRleHQsIHJlc3VsdCwgbnVsbHB0cikpOwor CisgICAgICAgIGF1dG8gYnVmZmVyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5n U2l6ZShyZXN1bHRTdHJpbmcuZ2V0KCkpOworICAgICAgICBhdXRvIGJ1ZmZlciA9IHN0ZDo6bWFr ZV91bmlxdWU8Y2hhcltdPihidWZmZXJTaXplKTsKKyAgICAgICAgSlNTdHJpbmdHZXRVVEY4Q1N0 cmluZyhyZXN1bHRTdHJpbmcuZ2V0KCksIGJ1ZmZlci5nZXQoKSwgYnVmZmVyU2l6ZSk7CisKKyAg ICAgICAgV0tCdW5kbGVQYWdlU2V0VXNlRGFya0FwcGVhcmFuY2UobV9wYWdlLCB0cnVlKTsKKwor ICAgICAgICBpZiAoIVdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFyYW5jZShtX3BhZ2UpKQor ICAgICAgICAgICAgV0tCdW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0aWw6OnRvV0soIlRlc3RG YWlsZWQiKS5nZXQoKSwgVXRpbDo6dG9XSygiU3dpdGNoaW5nIGJhY2sgdG8gZGFyayBtb2RlIGZh aWxlZC4iKS5nZXQoKSk7CisKKyAgICAgICAgV0tCdW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0 aWw6OnRvV0soIlRlc3REb25lIikuZ2V0KCksIFV0aWw6OnRvV0soYnVmZmVyLmdldCgpKS5nZXQo KSk7CisgICAgfQorCitwcml2YXRlOgorICAgIFdLQnVuZGxlUGFnZVJlZiBtX3BhZ2UgeyBudWxs cHRyIH07Cit9OworCitzdGF0aWMgSW5qZWN0ZWRCdW5kbGVUZXN0OjpSZWdpc3RlcjxGb3JjZUxp Z2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdD4gcmVnaXN0cmFyKCJGb3JjZUxpZ2h0QXBwZWFyYW5j ZUluQnVuZGxlVGVzdCIpOworCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCisKKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbWFjL2Rhcmst bW9kZS5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbWFjL2RhcmstbW9k ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjgzYzIzNTYxZTAxZWM2YWU1NzIxMTdjYzhhNDk5N2U1M2I1Yzhk Y2EKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9t YWMvZGFyay1tb2RlLmh0bWwKQEAgLTAsMCArMSw1IEBACis8c3R5bGU+Cis6cm9vdCB7CisgICAg c3VwcG9ydGVkLWNvbG9yLXNjaGVtZXM6IGxpZ2h0IGRhcms7Cit9Cis8L3N0eWxlPgo= 358813 2019-01-10 11:53:20 -0800 2019-01-10 12:20:01 -0800 Patch bug-193327-20190110115319.patch text/plain 19179 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmMDBhYmNkOGRjNTJkZWI2 YTdlZWIxNzY2ZThiMDE2MjEwNjU4ZTYuLjQ0MzVkZTYyZDE5NDc4ZmQ3Njc1Njg0M2Q0NGFmYzFj ZWUyYTkzMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTAgIFRpbW90aHkg SGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXS0J1bmRsZVBhZ2Ug U1BJIHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBhIHBh Z2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz MjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czogV2ViS2l0LkZvcmNlTGlnaHRBcHBl YXJhbmNlSW5CdW5kbGUgQVBJIFRlc3QKKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlUGFnZVNldFVz ZURhcmtBcHBlYXJhbmNlKTogQWRkZWQuCisgICAgICAgIChXS0J1bmRsZVBhZ2VJc1VzaW5nRGFy a0FwcGVhcmFuY2UpOiBBZGRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDoKKwogMjAxOS0wMS0xMCAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIz OTgxNSkgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJy b3dzaW5nLmh0dHBzLmh0bWwgdGVzdCB0aW1lcyBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5j cHAKaW5kZXggZDMwMGRjMTYxYzZlMzdiNDFjN2MzMDAwNDZhYTNhOTk3MWQwMDNjYi4uNDAwZDEz OTU0ZDBkZjdmMGY0MTcwZWFkZTYyMTExNDA4NzZiNGQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZS5jcHAKQEAgLTU4OSw2ICs1ODksMjEgQEAgdm9pZCBXS0J1bmRsZVBhZ2VDb25maXJtQ29t cG9zaXRpb25XaXRoVGV4dChXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tTdHJpbmdSZWYKICAg ICBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+Y29uZmlybUNvbXBvc2l0aW9uRm9yVGVzdGluZyhX ZWJLaXQ6OnRvV1RGU3RyaW5nKHRleHQpKTsKIH0KIAordm9pZCBXS0J1bmRsZVBhZ2VTZXRVc2VE YXJrQXBwZWFyYW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgYm9vbCB1c2VEYXJrQXBwZWFy YW5jZSkKK3sKKyAgICBXZWJLaXQ6OldlYlBhZ2UqIHdlYlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChw YWdlUmVmKTsKKyAgICBpZiAoV2ViQ29yZTo6UGFnZSogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdl LT5jb3JlUGFnZSgpIDogbnVsbHB0cikKKyAgICAgICAgcGFnZS0+c2V0VXNlRGFya0FwcGVhcmFu Y2UodXNlRGFya0FwcGVhcmFuY2UpOworfQorCitib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJr QXBwZWFyYW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZikKK3sKKyAgICBXZWJLaXQ6OldlYlBh Z2UqIHdlYlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKTsKKyAgICBpZiAoV2ViQ29yZTo6 UGFnZSogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5jb3JlUGFnZSgpIDogbnVsbHB0cikKKyAg ICAgICAgcmV0dXJuIHBhZ2UtPnVzZURhcmtBcHBlYXJhbmNlKCk7CisgICAgcmV0dXJuIGZhbHNl OworfQorCiBib29sIFdLQnVuZGxlUGFnZUNhblNob3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYg cGFnZVJlZiwgV0tTdHJpbmdSZWYgbWltZVR5cGVSZWYpCiB7CiAgICAgcmV0dXJuIFdlYktpdDo6 dG9JbXBsKHBhZ2VSZWYpLT5jYW5TaG93TUlNRVR5cGUoV2ViS2l0Ojp0b1dURlN0cmluZyhtaW1l VHlwZVJlZikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VQcml2YXRlLmgKaW5kZXggODQx NGJjZGIwM2MyNTZhZDM3NzRhNmQzMTRjZGQxN2UyODAwMDZlYy4uZDM4YzQxODA3ODliNDRjODg0 N2M5Zjc3OGYyOGVmMDA2ZjFjNTE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJp dmF0ZS5oCkBAIC03Nyw2ICs3Nyw5IEBAIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUhhc0Nv bXBvc2l0aW9uKFdLQnVuZGxlUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxl UGFnZUNvbmZpcm1Db21wb3NpdGlvbihXS0J1bmRsZVBhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQg dm9pZCBXS0J1bmRsZVBhZ2VDb25maXJtQ29tcG9zaXRpb25XaXRoVGV4dChXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGV4dCk7CiAKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFn ZVNldFVzZURhcmtBcHBlYXJhbmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBib29sIHVzZURhcmtB cHBlYXJhbmNlKTsKK1dLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFy YW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSk7CisKIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFn ZUNhblNob3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIG1pbWVUeXBlKTsK IAogV0tfRVhQT1JUIHZvaWQqIFdLQWNjZXNzaWJpbGl0eVJvb3RPYmplY3QoV0tCdW5kbGVQYWdl UmVmKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBmMGFkYzI1OWFiMGIxMWJmMTI4NzdjNjQwNmUzNjUzNGI5ODViMmY3Li5hNjEzYTU5NzU1YTE5 Yjc3NDNlNzM5YzY0Y2NmNjgzZDc5OGM4MmE4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMTAgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXS0J1bmRsZVBh Z2UgU1BJIHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBh IHBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTMzMjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktp dEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tOiBBZGRlZC4K KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OmRpZEZpbmlzaE5hdmlnYXRpb24pOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOgorICAg ICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tOiBBZGRl ZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVU ZXN0OjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdCk6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdDo6ZGlkQ3JlYXRlUGFnZSk6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVz dDo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0L21hYy9kYXJrLW1vZGUuaHRtbDogQWRkZWQuCisKIDIwMTktMDEtMTAgIFpoaWZlaSBGYW5n ICA8emhpZmVpX2ZhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgdGhlIHJ1bi1qc2Mt c3RyZXNzLXRlc3QgcmVtb3RlIGhvc3Qga2V5IGNoZWNrLgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCAxMmQyYTA0YWFiZWVjMTk0ODNjN2NhYmEzNWE3ZGJkYjc0N2Y5MzdhLi5mZTI3ZTQ5OTM3 MjU3ODI2MjFmZWY4MDRmYWQwNzZkOGMwYzU1ZTk3IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtNzIsNiArNzIsOSBAQAogCQkxQzdGRUIyMDIwN0MwRjJFMDBEMjMyNzggLyogQmFja2dyb3Vu ZENvbG9yLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUM3RkVCMUYyMDdDMEYyRDAwRDIzMjc4IC8qIEJhY2tncm91bmRDb2xvci5tbSAqLzsgfTsKIAkJ MUM5RUI4NDExRTM4MERBMTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzlFQjg0MDFFMzgw REExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCAqLzsgfTsKIAkJMUNBRDFG ODYxRTVDRTdEQTAwQUYyQzJDIC8qIEZvbnRDYWNoZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0FEMUY4NTFFNUNFN0RBMDBBRjJDMkMgLyogRm9u dENhY2hlLmNwcCAqLzsgfTsKKwkJMUNGNTlBRTIyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGln aHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUNGNTlBRTAyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGln aHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tICovOyB9OworCQkxQ0Y1OUFFMzIxRTY4OTMy MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbSBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDRjU5QURGMjFFNjg5MjUwMDZFMzdF QyAvKiBGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tICovOyB9OworCQkxQ0Y1OUFFNTIx RTY5NzdEMDA2RTM3RUMgLyogZGFyay1tb2RlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUNGNTlBRTQyMUU2OTZGQjAwNkUzN0VDIC8q IGRhcmstbW9kZS5odG1sICovOyB9OwogCQkxRjgzNTcxQjFEM0ZGQjIzMDBFMzk2N0IgLyogV0tC YWNrRm9yd2FyZExpc3QubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxRjgzNTcxQTFEM0ZGQjBFMDBFMzk2N0IgLyogV0tCYWNrRm9yd2FyZExpc3QubW0g Ki87IH07CiAJCTI2REY1QTYzMTVBMkEyN0UwMDM2ODlDMiAvKiBDYW5jZWxMb2FkRnJvbVJlc291 cmNlTG9hZERlbGVnYXRlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjZERjVBNjExNUEyQTIyQjAwMzY4OUMyIC8qIENhbmNlbExvYWRG cm9tUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAqLzsgfTsKIAkJMjZGNTJFQUQxODI4ODI3QjAw MjNENDEyIC8qIGdlb2xvY2F0aW9uR2V0Q3VycmVudFBvc2l0aW9uLmh0bWwgaW4gQ29weSBSZXNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjZGNTJFQUMxODI4ODIw RTAwMjNENDEyIC8qIGdlb2xvY2F0aW9uR2V0Q3VycmVudFBvc2l0aW9uLmh0bWwgKi87IH07CkBA IC0xMDQzLDYgKzEwNDYsNyBAQAogCQkJCTdBRUFENDgxMUUyMDEyMjcwMDQxNkVGRSAvKiBDcm9z c1BhcnRpdGlvbkZpbGVTY2hlbWVBY2Nlc3MuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJ CQlGNEFCNTc4QTFGNjUxNjU0MDBEQjBEQTEgLyogY3VzdG9tLWRyYWdnYWJsZS1kaXYuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkyOTBGNDI3NTE3MkEyMjFDMDA5MzlGRjAgLyogY3Vz dG9tLXByb3RvY29sLXN5bmMteGhyLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCisJCQkJMUNG NTlBRTUyMUU2OTc3RDAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1sIGluIENvcHkgUmVzb3VyY2Vz ICovLAogCQkJCUY0N0RGQjI2MjFBODc4REYwMDAyMUZCNiAvKiBkYXRhLWRldGVjdG9ycy5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0ODZCMUQwMUY2Nzk1MjMwMEYzNEJERCAvKiBE YXRhVHJhbnNmZXItc2V0RHJhZ0ltYWdlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJ RjQ1N0E5RDYyMDJENjhBRjAwRjdFOUQ1IC8qIERhdGFUcmFuc2Zlci5odG1sIGluIENvcHkgUmVz b3VyY2VzICovLApAQCAtMTM1Niw2ICsxMzYwLDkgQEAKIAkJMUNBRDFGODUxRTVDRTdEQTAwQUYy QzJDIC8qIEZvbnRDYWNoZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBGb250Q2FjaGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQ0I5QkMzNzFB Njc0ODIzMDBGRTU2NzggLyogV2Vha1B0ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBXZWFrUHRyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUNG MEQzNzgxQkJGMkYzRDAwQjRFRjU0IC8qIFdLUmV0YWluUHRyLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdLUmV0YWluUHRyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJMUNGNTlBREYyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRBcHBlYXJh bmNlSW5CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQkxQ0Y1OUFFMDIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1 bmRsZV9CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlX0J1bmRsZS5tbTsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJMUNGNTlBRTQyMUU2OTZGQjAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1sICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gImRhcmstbW9kZS5odG1sIjsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUY4MzU3MUExRDNGRkIwRTAwRTM5NjdCIC8qIFdLQmFja0Zvcndh cmRMaXN0Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gV0tCYWNr Rm9yd2FyZExpc3QubW07IHBhdGggPSBUZXN0cy9XZWJLaXQvV0tCYWNrRm9yd2FyZExpc3QubW07 IHNvdXJjZVRyZWUgPSBTT1VSQ0VfUk9PVDsgfTsKIAkJMjYwQkE1NzgxQjFEMkU3QjAwNEZBMDdD IC8qIERGQUNvbWJpbmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IERGQUNvbWJpbmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjYwQkE1N0Ex QjFEMkVFMjAwNEZBMDdDIC8qIERGQUhlbHBlcnMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gREZBSGVscGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMzUy OCw3ICszNTM1LDEwIEBACiAJCQkJN0FDN0I1NkYyMEQ5QkE1QjAwMkMwOUEwIC8qIEN1c3RvbUJ1 bmRsZU9iamVjdC5tbSAqLywKIAkJCQk3QUM3QjU2QzIwRDk3NjhGMDAyQzA5QTAgLyogQ3VzdG9t QnVuZGxlUGFyYW1ldGVyLm1tICovLAogCQkJCTdBQzdCNTZCMjBEOTc2OEUwMDJDMDlBMCAvKiBD dXN0b21CdW5kbGVQYXJhbWV0ZXJfQnVuZGxlLm1tICovLAorCQkJCTFDRjU5QUU0MjFFNjk2RkIw MDZFMzdFQyAvKiBkYXJrLW1vZGUuaHRtbCAqLywKIAkJCQlCQ0FBNDg1NzE0QTA0NEQ0MDA4OEZB QzQgLyogRWRpdG9yQ29tbWFuZHMubW0gKi8sCisJCQkJMUNGNTlBREYyMUU2ODkyNTAwNkUzN0VD IC8qIEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW0gKi8sCisJCQkJMUNGNTlBRTAyMUU2 ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tICov LAogCQkJCUMwQzVEM0JDMTQ1OThCNkYwMEE4MDJBNiAvKiBHZXRCYWNraW5nU2NhbGVGYWN0b3Iu bW0gKi8sCiAJCQkJQzBDNUQzQkQxNDU5OEI2RjAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZh Y3Rvcl9CdW5kbGUubW0gKi8sCiAJCQkJMUFFRjk5NDgxN0EwOUY1MzAwOTk4RUYwIC8qIEdldFBJ REFmdGVyQWJvcnRlZFByb2Nlc3NMYXVuY2guY3BwICovLApAQCAtMzk5NSw2ICs0MDA1LDcgQEAK IAkJCQkyRTkyQjhGQTIxNjRBMEMxMDA1QjY0RjAgLyogRm9udEF0dHJpYnV0ZXMubW0gaW4gU291 cmNlcyAqLywKIAkJCQkxQ0FEMUY4NjFFNUNFN0RBMDBBRjJDMkMgLyogRm9udENhY2hlLmNwcCBp biBTb3VyY2VzICovLAogCQkJCUY0NTZBQjFDMjEzRURCQTMwMENCMkNFRiAvKiBGb250TWFuYWdl clRlc3RzLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMUNGNTlBRTMyMUU2ODkzMjAwNkUzN0VDIC8q IEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW0gaW4gU291cmNlcyAqLywKIAkJCQk3Q0NF N0VGNTFBNDExQUU2MDA0NDdDNEMgLyogRm9yY2VSZXBhaW50LmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTdDQ0U3RUMwMUE0MTFBN0UwMDQ0N0M0QyAvKiBGcmFnbWVudE5hdmlnYXRpb24ubW0gaW4g U291cmNlcyAqLywKIAkJCQkzNzZDOEMwNjFENkUxOTdDMDA3RDJCQjkgLyogRnJhbWVIYW5kbGUu Y3BwIGluIFNvdXJjZXMgKi8sCkBAIC00MzY1LDYgKzQzNzYsNyBAQAogCQkJCTUxMzkzRTIyMTUy Mzk1MkQwMDVGMzlDNSAvKiBET01XaW5kb3dFeHRlbnNpb25CYXNpY19CdW5kbGUuY3BwIGluIFNv dXJjZXMgKi8sCiAJCQkJRjZGNDlDNkIxNTU0NUNBNzAwMDdGMzlEIC8qIERPTVdpbmRvd0V4dGVu c2lvbk5vQ2FjaGVfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTExNzFCMjRGMjE5RjQ5 Q0QwMENCODk3RCAvKiBGaXJzdE1lYW5pbmdmdWxQYWludE1pbGVzdG9uZV9CdW5kbGUuY3BwIGlu IFNvdXJjZXMgKi8sCisJCQkJMUNGNTlBRTIyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRB cHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQzBDNUQzQzYx NDU5OTEyOTAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gaW4gU291 cmNlcyAqLywKIAkJCQlGNjYwQUExMTE1QTVGNjMxMDAzQTEyNDMgLyogR2V0SW5qZWN0ZWRCdW5k bGVJbml0aWFsaXphdGlvblVzZXJEYXRhQ2FsbGJhY2tfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCTRCRkRGRkE3MTMxNDc3NkMwMDYxRjI0QiAvKiBIaXRUZXN0UmVzdWx0Tm9kZUhhbmRs ZV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9tYWMvRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbSBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUlu QnVuZGxlLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZkOTVkM2U0MzJkYjE3ZWMwZDE5OTNmMDM1MTcwNWFiZTg1 N2VlNTgKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9tYWMvRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbQpAQCAtMCwwICsxLDkyIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorCisjaWYgV0tfSEFWRV9DX1NQSQorCisj aW5jbHVkZSAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcu aCIKKyNpbmNsdWRlICJUZXN0LmgiCisjaW5jbHVkZSA8V2ViS2l0L1dLQ29udGV4dFByaXZhdGUu aD4KKworbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgeworCitzdGF0aWMgYm9vbCBkaWRGaW5pc2hM b2FkOworc3RhdGljIGJvb2wgbWVzc2FnZVJlY2VpdmVkOworCitzdGF0aWMgdm9pZCBkaWRGaW5p c2hOYXZpZ2F0aW9uKFdLUGFnZVJlZiwgV0tOYXZpZ2F0aW9uUmVmLCBXS1R5cGVSZWYsIGNvbnN0 IHZvaWQqKQoreworICAgIGRpZEZpbmlzaExvYWQgPSB0cnVlOworfQorCitzdGF0aWMgdm9pZCBk aWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShXS0NvbnRleHRSZWYgY29udGV4dCwg V0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgY29uc3Qgdm9p ZCopCit7CisgICAgbWVzc2FnZVJlY2VpdmVkID0gdHJ1ZTsKKworICAgIEFTU0VSVF9OT1RfTlVM TChtZXNzYWdlQm9keSk7CisgICAgRVhQRUNUX0VRKFdLU3RyaW5nR2V0VHlwZUlEKCksIFdLR2V0 VHlwZUlEKG1lc3NhZ2VCb2R5KSk7CisKKyAgICBXS1N0cmluZ1JlZiBtZXNzYWdlQm9keVN0cmlu ZyA9IHN0YXRpY19jYXN0PFdLU3RyaW5nUmVmPihtZXNzYWdlQm9keSk7CisKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoIlRlc3REb25lIiwgbWVzc2FnZU5hbWUpOworICAgIEVYUEVDVF9XS19TVFJFUSgi cmdiKDAsIDAsIDApIiwgbWVzc2FnZUJvZHlTdHJpbmcpOworfQorCitURVNUKFdlYktpdCwgRm9y Y2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZSkKK3sKKyAgICBXS1JldGFpblB0cjxXS0NvbnRleHRS ZWY+IGNvbnRleHQoQWRvcHRXSywgVXRpbDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxl VGVzdCgiRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZVRlc3QiKSk7CisKKyAgICBQbGF0Zm9y bVdlYlZpZXcgd2ViVmlldyhjb250ZXh0LmdldCgpKTsKKworICAgIFt3ZWJWaWV3LnBsYXRmb3Jt VmlldygpIHNldEFwcGVhcmFuY2U6W05TQXBwZWFyYW5jZSBhcHBlYXJhbmNlTmFtZWQ6TlNBcHBl YXJhbmNlTmFtZURhcmtBcXVhXV07CisKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50VjAgbG9h ZGVyQ2xpZW50OworICAgIG1lbXNldCgmbG9hZGVyQ2xpZW50LCAwLCBzaXplb2YobG9hZGVyQ2xp ZW50KSk7CisKKyAgICBsb2FkZXJDbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKKyAgICBsb2FkZXJD bGllbnQuZGlkRmluaXNoTmF2aWdhdGlvbiA9IGRpZEZpbmlzaE5hdmlnYXRpb247CisKKyAgICBX S1BhZ2VTZXRQYWdlTmF2aWdhdGlvbkNsaWVudCh3ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVu dC5iYXNlKTsKKworICAgIFdLQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50VjAgaW5qZWN0ZWRC dW5kbGVDbGllbnQ7CisgICAgbWVtc2V0KCZpbmplY3RlZEJ1bmRsZUNsaWVudCwgMCwgc2l6ZW9m KGluamVjdGVkQnVuZGxlQ2xpZW50KSk7CisKKyAgICBpbmplY3RlZEJ1bmRsZUNsaWVudC5iYXNl LnZlcnNpb24gPSAwOworICAgIGluamVjdGVkQnVuZGxlQ2xpZW50LmRpZFJlY2VpdmVNZXNzYWdl RnJvbUluamVjdGVkQnVuZGxlID0gZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGU7 CisKKyAgICBXS0NvbnRleHRTZXRJbmplY3RlZEJ1bmRsZUNsaWVudChjb250ZXh0LmdldCgpLCAm aW5qZWN0ZWRCdW5kbGVDbGllbnQuYmFzZSk7CisKKyAgICBXS1BhZ2VMb2FkVVJMKHdlYlZpZXcu cGFnZSgpLCBhZG9wdFdLKFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJkYXJrLW1vZGUiLCAi aHRtbCIpKS5nZXQoKSk7CisgICAgVXRpbDo6cnVuKCZkaWRGaW5pc2hMb2FkKTsKKworICAgIFdL Q29udGV4dFBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShjb250ZXh0LmdldCgpLCBVdGlsOjp0 b1dLKCJSdW5UZXN0IikuZ2V0KCksIG51bGxwdHIpOworICAgIFV0aWw6OnJ1bigmbWVzc2FnZVJl Y2VpdmVkKTsKKyAgICBtZXNzYWdlUmVjZWl2ZWQgPSBmYWxzZTsKK30KKworfSAvLyBuYW1lc3Bh Y2UgVGVzdFdlYktpdEFQSQorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlX0J1bmRsZS5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFy YW5jZUluQnVuZGxlX0J1bmRsZS5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZWJhMWMzNDhmYmM2NmExNzBlNTM5 ZTBhNzI4NmFlZTkxNTNlNjA0Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1t CkBAIC0wLDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBh cmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWlu IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVN UExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisKKyNp ZiBXS19IQVZFX0NfU1BJCisKKyNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZVRlc3QuaCIKKworI2lu Y2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNS ZXRhaW5QdHIuaD4KKyNpbmNsdWRlIDxXZWJLaXQvV0tCdW5kbGVGcmFtZS5oPgorI2luY2x1ZGUg PFdlYktpdC9XS0J1bmRsZVBhZ2UuaD4KKyNpbmNsdWRlIDxXZWJLaXQvV0tCdW5kbGVQYWdlUHJp dmF0ZS5oPgorCituYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CisKK2NsYXNzIEZvcmNlTGlnaHRB cHBlYXJhbmNlSW5CdW5kbGVUZXN0IDogcHVibGljIEluamVjdGVkQnVuZGxlVGVzdCB7CitwdWJs aWM6CisgICAgRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZVRlc3QoY29uc3Qgc3RkOjpzdHJp bmcmIGlkZW50aWZpZXIpCisgICAgICAgIDogSW5qZWN0ZWRCdW5kbGVUZXN0KGlkZW50aWZpZXIp CisgICAgeworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBkaWRDcmVhdGVQYWdlKFdLQnVuZGxl UmVmIGJ1bmRsZSwgV0tCdW5kbGVQYWdlUmVmIHBhZ2UpCisgICAgeworICAgICAgICBtX3BhZ2Ug PSBwYWdlOworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShXS0J1 bmRsZVJlZiBidW5kbGUsIFdLU3RyaW5nUmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVzc2Fn ZUJvZHkpCisgICAgeworICAgICAgICBpZiAoIVdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmco bWVzc2FnZU5hbWUsICJSdW5UZXN0IikpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg aWYgKCFXS0J1bmRsZVBhZ2VJc1VzaW5nRGFya0FwcGVhcmFuY2UobV9wYWdlKSkKKyAgICAgICAg ICAgIFdLQnVuZGxlUG9zdE1lc3NhZ2UoYnVuZGxlLCBVdGlsOjp0b1dLKCJUZXN0RmFpbGVkIiku Z2V0KCksIFV0aWw6OnRvV0soIlBhZ2UgaXNuJ3QgaW4gZGFyayBtb2RlIGF0IHN0YXJ0IG9mIHRl c3QuIikuZ2V0KCkpOworCisgICAgICAgIFdLQnVuZGxlUGFnZVNldFVzZURhcmtBcHBlYXJhbmNl KG1fcGFnZSwgZmFsc2UpOworCisgICAgICAgIGlmIChXS0J1bmRsZVBhZ2VJc1VzaW5nRGFya0Fw cGVhcmFuY2UobV9wYWdlKSkKKyAgICAgICAgICAgIFdLQnVuZGxlUG9zdE1lc3NhZ2UoYnVuZGxl LCBVdGlsOjp0b1dLKCJUZXN0RmFpbGVkIikuZ2V0KCksIFV0aWw6OnRvV0soIlN3aXRjaGluZyB0 byBsaWdodCBtb2RlIGZhaWxlZC4iKS5nZXQoKSk7CisKKyAgICAgICAgYXV0byBtYWluRnJhbWUg PSBXS0J1bmRsZVBhZ2VHZXRNYWluRnJhbWUobV9wYWdlKTsKKyAgICAgICAgYXV0byBzY3JpcHRD b250ZXh0ID0gV0tCdW5kbGVGcmFtZUdldEphdmFTY3JpcHRDb250ZXh0KG1haW5GcmFtZSk7Cisg ICAgICAgIGF1dG8gc2NyaXB0ID0gYWRvcHQoSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco IndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmJvZHkpLmdldFByb3BlcnR5VmFsdWUo J2NvbG9yJykiKSk7CisKKyAgICAgICAgYXV0byByZXN1bHQgPSBKU0V2YWx1YXRlU2NyaXB0KHNj cmlwdENvbnRleHQsIHNjcmlwdC5nZXQoKSwgbnVsbHB0ciwgbnVsbHB0ciwgMCwgbnVsbHB0cik7 CisgICAgICAgIGF1dG8gcmVzdWx0U3RyaW5nID0gYWRvcHQoSlNWYWx1ZVRvU3RyaW5nQ29weShz Y3JpcHRDb250ZXh0LCByZXN1bHQsIG51bGxwdHIpKTsKKworICAgICAgICBhdXRvIGJ1ZmZlclNp emUgPSBKU1N0cmluZ0dldE1heGltdW1VVEY4Q1N0cmluZ1NpemUocmVzdWx0U3RyaW5nLmdldCgp KTsKKyAgICAgICAgYXV0byBidWZmZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPGNoYXJbXT4oYnVmZmVy U2l6ZSk7CisgICAgICAgIEpTU3RyaW5nR2V0VVRGOENTdHJpbmcocmVzdWx0U3RyaW5nLmdldCgp LCBidWZmZXIuZ2V0KCksIGJ1ZmZlclNpemUpOworCisgICAgICAgIFdLQnVuZGxlUGFnZVNldFVz ZURhcmtBcHBlYXJhbmNlKG1fcGFnZSwgdHJ1ZSk7CisKKyAgICAgICAgaWYgKCFXS0J1bmRsZVBh Z2VJc1VzaW5nRGFya0FwcGVhcmFuY2UobV9wYWdlKSkKKyAgICAgICAgICAgIFdLQnVuZGxlUG9z dE1lc3NhZ2UoYnVuZGxlLCBVdGlsOjp0b1dLKCJUZXN0RmFpbGVkIikuZ2V0KCksIFV0aWw6OnRv V0soIlN3aXRjaGluZyBiYWNrIHRvIGRhcmsgbW9kZSBmYWlsZWQuIikuZ2V0KCkpOworCisgICAg ICAgIFdLQnVuZGxlUG9zdE1lc3NhZ2UoYnVuZGxlLCBVdGlsOjp0b1dLKCJUZXN0RG9uZSIpLmdl dCgpLCBVdGlsOjp0b1dLKGJ1ZmZlci5nZXQoKSkuZ2V0KCkpOworICAgIH0KKworcHJpdmF0ZToK KyAgICBXS0J1bmRsZVBhZ2VSZWYgbV9wYWdlIHsgbnVsbHB0ciB9OworfTsKKworc3RhdGljIElu amVjdGVkQnVuZGxlVGVzdDo6UmVnaXN0ZXI8Rm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZVRl c3Q+IHJlZ2lzdHJhcigiRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZVRlc3QiKTsKKworfSAv LyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9kYXJrLW1vZGUuaHRtbCBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9kYXJrLW1vZGUuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44M2My MzU2MWUwMWVjNmFlNTcyMTE3Y2M4YTQ5OTdlNTNiNWM4ZGNhCi0tLSAvZGV2L251bGwKKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbWFjL2RhcmstbW9kZS5odG1sCkBAIC0w LDAgKzEsNSBAQAorPHN0eWxlPgorOnJvb3QgeworICAgIHN1cHBvcnRlZC1jb2xvci1zY2hlbWVz OiBsaWdodCBkYXJrOworfQorPC9zdHlsZT4K 358818 2019-01-10 12:20:02 -0800 2019-01-11 11:28:22 -0800 Patch bug-193327-20190110122001.patch text/plain 19229 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmMDBhYmNkOGRjNTJkZWI2 YTdlZWIxNzY2ZThiMDE2MjEwNjU4ZTYuLjQ0MzVkZTYyZDE5NDc4ZmQ3Njc1Njg0M2Q0NGFmYzFj ZWUyYTkzMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTAgIFRpbW90aHkg SGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXS0J1bmRsZVBhZ2Ug U1BJIHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBhIHBh Z2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz MjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czogV2ViS2l0LkZvcmNlTGlnaHRBcHBl YXJhbmNlSW5CdW5kbGUgQVBJIFRlc3QKKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlUGFnZVNldFVz ZURhcmtBcHBlYXJhbmNlKTogQWRkZWQuCisgICAgICAgIChXS0J1bmRsZVBhZ2VJc1VzaW5nRGFy a0FwcGVhcmFuY2UpOiBBZGRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDoKKwogMjAxOS0wMS0xMCAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIz OTgxNSkgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJy b3dzaW5nLmh0dHBzLmh0bWwgdGVzdCB0aW1lcyBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5j cHAKaW5kZXggZDMwMGRjMTYxYzZlMzdiNDFjN2MzMDAwNDZhYTNhOTk3MWQwMDNjYi4uNDAwZDEz OTU0ZDBkZjdmMGY0MTcwZWFkZTYyMTExNDA4NzZiNGQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZS5jcHAKQEAgLTU4OSw2ICs1ODksMjEgQEAgdm9pZCBXS0J1bmRsZVBhZ2VDb25maXJtQ29t cG9zaXRpb25XaXRoVGV4dChXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tTdHJpbmdSZWYKICAg ICBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+Y29uZmlybUNvbXBvc2l0aW9uRm9yVGVzdGluZyhX ZWJLaXQ6OnRvV1RGU3RyaW5nKHRleHQpKTsKIH0KIAordm9pZCBXS0J1bmRsZVBhZ2VTZXRVc2VE YXJrQXBwZWFyYW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgYm9vbCB1c2VEYXJrQXBwZWFy YW5jZSkKK3sKKyAgICBXZWJLaXQ6OldlYlBhZ2UqIHdlYlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChw YWdlUmVmKTsKKyAgICBpZiAoV2ViQ29yZTo6UGFnZSogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdl LT5jb3JlUGFnZSgpIDogbnVsbHB0cikKKyAgICAgICAgcGFnZS0+c2V0VXNlRGFya0FwcGVhcmFu Y2UodXNlRGFya0FwcGVhcmFuY2UpOworfQorCitib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJr QXBwZWFyYW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZikKK3sKKyAgICBXZWJLaXQ6OldlYlBh Z2UqIHdlYlBhZ2UgPSBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKTsKKyAgICBpZiAoV2ViQ29yZTo6 UGFnZSogcGFnZSA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5jb3JlUGFnZSgpIDogbnVsbHB0cikKKyAg ICAgICAgcmV0dXJuIHBhZ2UtPnVzZURhcmtBcHBlYXJhbmNlKCk7CisgICAgcmV0dXJuIGZhbHNl OworfQorCiBib29sIFdLQnVuZGxlUGFnZUNhblNob3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYg cGFnZVJlZiwgV0tTdHJpbmdSZWYgbWltZVR5cGVSZWYpCiB7CiAgICAgcmV0dXJuIFdlYktpdDo6 dG9JbXBsKHBhZ2VSZWYpLT5jYW5TaG93TUlNRVR5cGUoV2ViS2l0Ojp0b1dURlN0cmluZyhtaW1l VHlwZVJlZikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VQcml2YXRlLmgKaW5kZXggODQx NGJjZGIwM2MyNTZhZDM3NzRhNmQzMTRjZGQxN2UyODAwMDZlYy4uZDM4YzQxODA3ODliNDRjODg0 N2M5Zjc3OGYyOGVmMDA2ZjFjNTE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJp dmF0ZS5oCkBAIC03Nyw2ICs3Nyw5IEBAIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUhhc0Nv bXBvc2l0aW9uKFdLQnVuZGxlUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxl UGFnZUNvbmZpcm1Db21wb3NpdGlvbihXS0J1bmRsZVBhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQg dm9pZCBXS0J1bmRsZVBhZ2VDb25maXJtQ29tcG9zaXRpb25XaXRoVGV4dChXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGV4dCk7CiAKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFn ZVNldFVzZURhcmtBcHBlYXJhbmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBib29sIHVzZURhcmtB cHBlYXJhbmNlKTsKK1dLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFy YW5jZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSk7CisKIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFn ZUNhblNob3dNSU1FVHlwZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIG1pbWVUeXBlKTsK IAogV0tfRVhQT1JUIHZvaWQqIFdLQWNjZXNzaWJpbGl0eVJvb3RPYmplY3QoV0tCdW5kbGVQYWdl UmVmKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBmMGFkYzI1OWFiMGIxMWJmMTI4NzdjNjQwNmUzNjUzNGI5ODViMmY3Li5hNjEzYTU5NzU1YTE5 Yjc3NDNlNzM5YzY0Y2NmNjgzZDc5OGM4MmE4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMTAgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXS0J1bmRsZVBh Z2UgU1BJIHRvIHRlbXBvcmFyaWx5IGZvcmNlIGxpZ2h0IG9yIGRhcmsgYXBwZWFyYW5jZSBvbiBh IHBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTMzMjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktp dEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tOiBBZGRlZC4K KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OmRpZEZpbmlzaE5hdmlnYXRpb24pOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOgorICAg ICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tOiBBZGRl ZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVU ZXN0OjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdCk6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdDo6ZGlkQ3JlYXRlUGFnZSk6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVz dDo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0L21hYy9kYXJrLW1vZGUuaHRtbDogQWRkZWQuCisKIDIwMTktMDEtMTAgIFpoaWZlaSBGYW5n ICA8emhpZmVpX2ZhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgdGhlIHJ1bi1qc2Mt c3RyZXNzLXRlc3QgcmVtb3RlIGhvc3Qga2V5IGNoZWNrLgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCAxMmQyYTA0YWFiZWVjMTk0ODNjN2NhYmEzNWE3ZGJkYjc0N2Y5MzdhLi5mZTI3ZTQ5OTM3 MjU3ODI2MjFmZWY4MDRmYWQwNzZkOGMwYzU1ZTk3IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtNzIsNiArNzIsOSBAQAogCQkxQzdGRUIyMDIwN0MwRjJFMDBEMjMyNzggLyogQmFja2dyb3Vu ZENvbG9yLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUM3RkVCMUYyMDdDMEYyRDAwRDIzMjc4IC8qIEJhY2tncm91bmRDb2xvci5tbSAqLzsgfTsKIAkJ MUM5RUI4NDExRTM4MERBMTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzlFQjg0MDFFMzgw REExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCAqLzsgfTsKIAkJMUNBRDFG ODYxRTVDRTdEQTAwQUYyQzJDIC8qIEZvbnRDYWNoZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0FEMUY4NTFFNUNFN0RBMDBBRjJDMkMgLyogRm9u dENhY2hlLmNwcCAqLzsgfTsKKwkJMUNGNTlBRTIyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGln aHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUNGNTlBRTAyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGln aHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tICovOyB9OworCQkxQ0Y1OUFFMzIxRTY4OTMy MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbSBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDRjU5QURGMjFFNjg5MjUwMDZFMzdF QyAvKiBGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tICovOyB9OworCQkxQ0Y1OUFFNTIx RTY5NzdEMDA2RTM3RUMgLyogZGFyay1tb2RlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUNGNTlBRTQyMUU2OTZGQjAwNkUzN0VDIC8q IGRhcmstbW9kZS5odG1sICovOyB9OwogCQkxRjgzNTcxQjFEM0ZGQjIzMDBFMzk2N0IgLyogV0tC YWNrRm9yd2FyZExpc3QubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxRjgzNTcxQTFEM0ZGQjBFMDBFMzk2N0IgLyogV0tCYWNrRm9yd2FyZExpc3QubW0g Ki87IH07CiAJCTI2REY1QTYzMTVBMkEyN0UwMDM2ODlDMiAvKiBDYW5jZWxMb2FkRnJvbVJlc291 cmNlTG9hZERlbGVnYXRlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjZERjVBNjExNUEyQTIyQjAwMzY4OUMyIC8qIENhbmNlbExvYWRG cm9tUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAqLzsgfTsKIAkJMjZGNTJFQUQxODI4ODI3QjAw MjNENDEyIC8qIGdlb2xvY2F0aW9uR2V0Q3VycmVudFBvc2l0aW9uLmh0bWwgaW4gQ29weSBSZXNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjZGNTJFQUMxODI4ODIw RTAwMjNENDEyIC8qIGdlb2xvY2F0aW9uR2V0Q3VycmVudFBvc2l0aW9uLmh0bWwgKi87IH07CkBA IC0xMDQzLDYgKzEwNDYsNyBAQAogCQkJCTdBRUFENDgxMUUyMDEyMjcwMDQxNkVGRSAvKiBDcm9z c1BhcnRpdGlvbkZpbGVTY2hlbWVBY2Nlc3MuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJ CQlGNEFCNTc4QTFGNjUxNjU0MDBEQjBEQTEgLyogY3VzdG9tLWRyYWdnYWJsZS1kaXYuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkyOTBGNDI3NTE3MkEyMjFDMDA5MzlGRjAgLyogY3Vz dG9tLXByb3RvY29sLXN5bmMteGhyLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCisJCQkJMUNG NTlBRTUyMUU2OTc3RDAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1sIGluIENvcHkgUmVzb3VyY2Vz ICovLAogCQkJCUY0N0RGQjI2MjFBODc4REYwMDAyMUZCNiAvKiBkYXRhLWRldGVjdG9ycy5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0ODZCMUQwMUY2Nzk1MjMwMEYzNEJERCAvKiBE YXRhVHJhbnNmZXItc2V0RHJhZ0ltYWdlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJ RjQ1N0E5RDYyMDJENjhBRjAwRjdFOUQ1IC8qIERhdGFUcmFuc2Zlci5odG1sIGluIENvcHkgUmVz b3VyY2VzICovLApAQCAtMTM1Niw2ICsxMzYwLDkgQEAKIAkJMUNBRDFGODUxRTVDRTdEQTAwQUYy QzJDIC8qIEZvbnRDYWNoZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBGb250Q2FjaGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQ0I5QkMzNzFB Njc0ODIzMDBGRTU2NzggLyogV2Vha1B0ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBXZWFrUHRyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUNG MEQzNzgxQkJGMkYzRDAwQjRFRjU0IC8qIFdLUmV0YWluUHRyLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdLUmV0YWluUHRyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJMUNGNTlBREYyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRBcHBlYXJh bmNlSW5CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQkxQ0Y1OUFFMDIxRTY4OTI1MDA2RTM3RUMgLyogRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1 bmRsZV9CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBG b3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlX0J1bmRsZS5tbTsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJMUNGNTlBRTQyMUU2OTZGQjAwNkUzN0VDIC8qIGRhcmstbW9kZS5odG1sICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gImRhcmstbW9kZS5odG1sIjsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUY4MzU3MUExRDNGRkIwRTAwRTM5NjdCIC8qIFdLQmFja0Zvcndh cmRMaXN0Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gV0tCYWNr Rm9yd2FyZExpc3QubW07IHBhdGggPSBUZXN0cy9XZWJLaXQvV0tCYWNrRm9yd2FyZExpc3QubW07 IHNvdXJjZVRyZWUgPSBTT1VSQ0VfUk9PVDsgfTsKIAkJMjYwQkE1NzgxQjFEMkU3QjAwNEZBMDdD IC8qIERGQUNvbWJpbmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IERGQUNvbWJpbmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjYwQkE1N0Ex QjFEMkVFMjAwNEZBMDdDIC8qIERGQUhlbHBlcnMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gREZBSGVscGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMzUy OCw3ICszNTM1LDEwIEBACiAJCQkJN0FDN0I1NkYyMEQ5QkE1QjAwMkMwOUEwIC8qIEN1c3RvbUJ1 bmRsZU9iamVjdC5tbSAqLywKIAkJCQk3QUM3QjU2QzIwRDk3NjhGMDAyQzA5QTAgLyogQ3VzdG9t QnVuZGxlUGFyYW1ldGVyLm1tICovLAogCQkJCTdBQzdCNTZCMjBEOTc2OEUwMDJDMDlBMCAvKiBD dXN0b21CdW5kbGVQYXJhbWV0ZXJfQnVuZGxlLm1tICovLAorCQkJCTFDRjU5QUU0MjFFNjk2RkIw MDZFMzdFQyAvKiBkYXJrLW1vZGUuaHRtbCAqLywKIAkJCQlCQ0FBNDg1NzE0QTA0NEQ0MDA4OEZB QzQgLyogRWRpdG9yQ29tbWFuZHMubW0gKi8sCisJCQkJMUNGNTlBREYyMUU2ODkyNTAwNkUzN0VD IC8qIEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW0gKi8sCisJCQkJMUNGNTlBRTAyMUU2 ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tICov LAogCQkJCUMwQzVEM0JDMTQ1OThCNkYwMEE4MDJBNiAvKiBHZXRCYWNraW5nU2NhbGVGYWN0b3Iu bW0gKi8sCiAJCQkJQzBDNUQzQkQxNDU5OEI2RjAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZh Y3Rvcl9CdW5kbGUubW0gKi8sCiAJCQkJMUFFRjk5NDgxN0EwOUY1MzAwOTk4RUYwIC8qIEdldFBJ REFmdGVyQWJvcnRlZFByb2Nlc3NMYXVuY2guY3BwICovLApAQCAtMzk5NSw2ICs0MDA1LDcgQEAK IAkJCQkyRTkyQjhGQTIxNjRBMEMxMDA1QjY0RjAgLyogRm9udEF0dHJpYnV0ZXMubW0gaW4gU291 cmNlcyAqLywKIAkJCQkxQ0FEMUY4NjFFNUNFN0RBMDBBRjJDMkMgLyogRm9udENhY2hlLmNwcCBp biBTb3VyY2VzICovLAogCQkJCUY0NTZBQjFDMjEzRURCQTMwMENCMkNFRiAvKiBGb250TWFuYWdl clRlc3RzLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMUNGNTlBRTMyMUU2ODkzMjAwNkUzN0VDIC8q IEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUubW0gaW4gU291cmNlcyAqLywKIAkJCQk3Q0NF N0VGNTFBNDExQUU2MDA0NDdDNEMgLyogRm9yY2VSZXBhaW50LmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTdDQ0U3RUMwMUE0MTFBN0UwMDQ0N0M0QyAvKiBGcmFnbWVudE5hdmlnYXRpb24ubW0gaW4g U291cmNlcyAqLywKIAkJCQkzNzZDOEMwNjFENkUxOTdDMDA3RDJCQjkgLyogRnJhbWVIYW5kbGUu Y3BwIGluIFNvdXJjZXMgKi8sCkBAIC00MzY1LDYgKzQzNzYsNyBAQAogCQkJCTUxMzkzRTIyMTUy Mzk1MkQwMDVGMzlDNSAvKiBET01XaW5kb3dFeHRlbnNpb25CYXNpY19CdW5kbGUuY3BwIGluIFNv dXJjZXMgKi8sCiAJCQkJRjZGNDlDNkIxNTU0NUNBNzAwMDdGMzlEIC8qIERPTVdpbmRvd0V4dGVu c2lvbk5vQ2FjaGVfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTExNzFCMjRGMjE5RjQ5 Q0QwMENCODk3RCAvKiBGaXJzdE1lYW5pbmdmdWxQYWludE1pbGVzdG9uZV9CdW5kbGUuY3BwIGlu IFNvdXJjZXMgKi8sCisJCQkJMUNGNTlBRTIyMUU2ODkyNTAwNkUzN0VDIC8qIEZvcmNlTGlnaHRB cHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQzBDNUQzQzYx NDU5OTEyOTAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gaW4gU291 cmNlcyAqLywKIAkJCQlGNjYwQUExMTE1QTVGNjMxMDAzQTEyNDMgLyogR2V0SW5qZWN0ZWRCdW5k bGVJbml0aWFsaXphdGlvblVzZXJEYXRhQ2FsbGJhY2tfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCTRCRkRGRkE3MTMxNDc3NkMwMDYxRjI0QiAvKiBIaXRUZXN0UmVzdWx0Tm9kZUhhbmRs ZV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9tYWMvRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbSBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUlu QnVuZGxlLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmIwMmJkNTY2OWZjNjRhOTBhOTM5M2YwYmRhYTU5NmFmZmVl NGYwYzMKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9tYWMvRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZS5tbQpAQCAtMCwwICsxLDkyIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorCisjaWYgRU5BQkxFKERBUktfTU9ERV9D U1MpICYmIFdLX0hBVkVfQ19TUEkKKworI2luY2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisj aW5jbHVkZSAiUGxhdGZvcm1XZWJWaWV3LmgiCisjaW5jbHVkZSAiVGVzdC5oIgorI2luY2x1ZGUg PFdlYktpdC9XS0NvbnRleHRQcml2YXRlLmg+CisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsK Kworc3RhdGljIGJvb2wgZGlkRmluaXNoTG9hZDsKK3N0YXRpYyBib29sIG1lc3NhZ2VSZWNlaXZl ZDsKKworc3RhdGljIHZvaWQgZGlkRmluaXNoTmF2aWdhdGlvbihXS1BhZ2VSZWYsIFdLTmF2aWdh dGlvblJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKikKK3sKKyAgICBkaWRGaW5pc2hMb2FkID0g dHJ1ZTsKK30KKworc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5k bGUoV0tDb250ZXh0UmVmIGNvbnRleHQsIFdLU3RyaW5nUmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVS ZWYgbWVzc2FnZUJvZHksIGNvbnN0IHZvaWQqKQoreworICAgIG1lc3NhZ2VSZWNlaXZlZCA9IHRy dWU7CisKKyAgICBBU1NFUlRfTk9UX05VTEwobWVzc2FnZUJvZHkpOworICAgIEVYUEVDVF9FUShX S1N0cmluZ0dldFR5cGVJRCgpLCBXS0dldFR5cGVJRChtZXNzYWdlQm9keSkpOworCisgICAgV0tT dHJpbmdSZWYgbWVzc2FnZUJvZHlTdHJpbmcgPSBzdGF0aWNfY2FzdDxXS1N0cmluZ1JlZj4obWVz c2FnZUJvZHkpOworCisgICAgRVhQRUNUX1dLX1NUUkVRKCJUZXN0RG9uZSIsIG1lc3NhZ2VOYW1l KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoInJnYigwLCAwLCAwKSIsIG1lc3NhZ2VCb2R5U3RyaW5n KTsKK30KKworVEVTVChXZWJLaXQsIEZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGUpCit7Cisg ICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFV0aWw6OmNyZWF0 ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5k bGVUZXN0IikpOworCisgICAgUGxhdGZvcm1XZWJWaWV3IHdlYlZpZXcoY29udGV4dC5nZXQoKSk7 CisKKyAgICBbd2ViVmlldy5wbGF0Zm9ybVZpZXcoKSBzZXRBcHBlYXJhbmNlOltOU0FwcGVhcmFu Y2UgYXBwZWFyYW5jZU5hbWVkOk5TQXBwZWFyYW5jZU5hbWVEYXJrQXF1YV1dOworCisgICAgV0tQ YWdlTmF2aWdhdGlvbkNsaWVudFYwIGxvYWRlckNsaWVudDsKKyAgICBtZW1zZXQoJmxvYWRlckNs aWVudCwgMCwgc2l6ZW9mKGxvYWRlckNsaWVudCkpOworCisgICAgbG9hZGVyQ2xpZW50LmJhc2Uu dmVyc2lvbiA9IDA7CisgICAgbG9hZGVyQ2xpZW50LmRpZEZpbmlzaE5hdmlnYXRpb24gPSBkaWRG aW5pc2hOYXZpZ2F0aW9uOworCisgICAgV0tQYWdlU2V0UGFnZU5hdmlnYXRpb25DbGllbnQod2Vi Vmlldy5wYWdlKCksICZsb2FkZXJDbGllbnQuYmFzZSk7CisKKyAgICBXS0NvbnRleHRJbmplY3Rl ZEJ1bmRsZUNsaWVudFYwIGluamVjdGVkQnVuZGxlQ2xpZW50OworICAgIG1lbXNldCgmaW5qZWN0 ZWRCdW5kbGVDbGllbnQsIDAsIHNpemVvZihpbmplY3RlZEJ1bmRsZUNsaWVudCkpOworCisgICAg aW5qZWN0ZWRCdW5kbGVDbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKKyAgICBpbmplY3RlZEJ1bmRs ZUNsaWVudC5kaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSA9IGRpZFJlY2VpdmVN ZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlOworCisgICAgV0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5k bGVDbGllbnQoY29udGV4dC5nZXQoKSwgJmluamVjdGVkQnVuZGxlQ2xpZW50LmJhc2UpOworCisg ICAgV0tQYWdlTG9hZFVSTCh3ZWJWaWV3LnBhZ2UoKSwgYWRvcHRXSyhVdGlsOjpjcmVhdGVVUkxG b3JSZXNvdXJjZSgiZGFyay1tb2RlIiwgImh0bWwiKSkuZ2V0KCkpOworICAgIFV0aWw6OnJ1bigm ZGlkRmluaXNoTG9hZCk7CisKKyAgICBXS0NvbnRleHRQb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5k bGUoY29udGV4dC5nZXQoKSwgVXRpbDo6dG9XSygiUnVuVGVzdCIpLmdldCgpLCBudWxscHRyKTsK KyAgICBVdGlsOjpydW4oJm1lc3NhZ2VSZWNlaXZlZCk7CisgICAgbWVzc2FnZVJlY2VpdmVkID0g ZmFsc2U7Cit9CisKK30gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKKworI2VuZGlmCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9tYWMvRm9yY2VMaWdodEFw cGVhcmFuY2VJbkJ1bmRsZV9CdW5kbGUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdC9tYWMvRm9yY2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZV9CdW5kbGUubW0KbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uZDE5OWYxNmY1NzBhNTRmODVhMjMzYTRjMmU5YzdiZjVhMTdiYTBhOQotLS0gL2Rldi9udWxs CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBw ZWFyYW5jZUluQnVuZGxlX0J1bmRsZS5tbQpAQCAtMCwwICsxLDkyIEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor I2luY2x1ZGUgImNvbmZpZy5oIgorCisjaWYgRU5BQkxFKERBUktfTU9ERV9DU1MpICYmIFdLX0hB VkVfQ19TUEkKKworI2luY2x1ZGUgIkluamVjdGVkQnVuZGxlVGVzdC5oIgorCisjaW5jbHVkZSAi UGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU1JldGFpblB0 ci5oPgorI2luY2x1ZGUgPFdlYktpdC9XS0J1bmRsZUZyYW1lLmg+CisjaW5jbHVkZSA8V2ViS2l0 L1dLQnVuZGxlUGFnZS5oPgorI2luY2x1ZGUgPFdlYktpdC9XS0J1bmRsZVBhZ2VQcml2YXRlLmg+ CisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworY2xhc3MgRm9yY2VMaWdodEFwcGVhcmFu Y2VJbkJ1bmRsZVRlc3QgOiBwdWJsaWMgSW5qZWN0ZWRCdW5kbGVUZXN0IHsKK3B1YmxpYzoKKyAg ICBGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdChjb25zdCBzdGQ6OnN0cmluZyYgaWRl bnRpZmllcikKKyAgICAgICAgOiBJbmplY3RlZEJ1bmRsZVRlc3QoaWRlbnRpZmllcikKKyAgICB7 CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZVBhZ2UoV0tCdW5kbGVSZWYgYnVu ZGxlLCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSkKKyAgICB7CisgICAgICAgIG1fcGFnZSA9IHBhZ2U7 CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKFdLQnVuZGxlUmVm IGJ1bmRsZSwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSkK KyAgICB7CisgICAgICAgIGlmICghV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNzYWdl TmFtZSwgIlJ1blRlc3QiKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAoIVdL QnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFyYW5jZShtX3BhZ2UpKQorICAgICAgICAgICAgV0tC dW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0aWw6OnRvV0soIlRlc3RGYWlsZWQiKS5nZXQoKSwg VXRpbDo6dG9XSygiUGFnZSBpc24ndCBpbiBkYXJrIG1vZGUgYXQgc3RhcnQgb2YgdGVzdC4iKS5n ZXQoKSk7CisKKyAgICAgICAgV0tCdW5kbGVQYWdlU2V0VXNlRGFya0FwcGVhcmFuY2UobV9wYWdl LCBmYWxzZSk7CisKKyAgICAgICAgaWYgKFdLQnVuZGxlUGFnZUlzVXNpbmdEYXJrQXBwZWFyYW5j ZShtX3BhZ2UpKQorICAgICAgICAgICAgV0tCdW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0aWw6 OnRvV0soIlRlc3RGYWlsZWQiKS5nZXQoKSwgVXRpbDo6dG9XSygiU3dpdGNoaW5nIHRvIGxpZ2h0 IG1vZGUgZmFpbGVkLiIpLmdldCgpKTsKKworICAgICAgICBhdXRvIG1haW5GcmFtZSA9IFdLQnVu ZGxlUGFnZUdldE1haW5GcmFtZShtX3BhZ2UpOworICAgICAgICBhdXRvIHNjcmlwdENvbnRleHQg PSBXS0J1bmRsZUZyYW1lR2V0SmF2YVNjcmlwdENvbnRleHQobWFpbkZyYW1lKTsKKyAgICAgICAg YXV0byBzY3JpcHQgPSBhZG9wdChKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygid2luZG93 LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuYm9keSkuZ2V0UHJvcGVydHlWYWx1ZSgnY29sb3In KSIpKTsKKworICAgICAgICBhdXRvIHJlc3VsdCA9IEpTRXZhbHVhdGVTY3JpcHQoc2NyaXB0Q29u dGV4dCwgc2NyaXB0LmdldCgpLCBudWxscHRyLCBudWxscHRyLCAwLCBudWxscHRyKTsKKyAgICAg ICAgYXV0byByZXN1bHRTdHJpbmcgPSBhZG9wdChKU1ZhbHVlVG9TdHJpbmdDb3B5KHNjcmlwdENv bnRleHQsIHJlc3VsdCwgbnVsbHB0cikpOworCisgICAgICAgIGF1dG8gYnVmZmVyU2l6ZSA9IEpT U3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShyZXN1bHRTdHJpbmcuZ2V0KCkpOworICAg ICAgICBhdXRvIGJ1ZmZlciA9IHN0ZDo6bWFrZV91bmlxdWU8Y2hhcltdPihidWZmZXJTaXplKTsK KyAgICAgICAgSlNTdHJpbmdHZXRVVEY4Q1N0cmluZyhyZXN1bHRTdHJpbmcuZ2V0KCksIGJ1ZmZl ci5nZXQoKSwgYnVmZmVyU2l6ZSk7CisKKyAgICAgICAgV0tCdW5kbGVQYWdlU2V0VXNlRGFya0Fw cGVhcmFuY2UobV9wYWdlLCB0cnVlKTsKKworICAgICAgICBpZiAoIVdLQnVuZGxlUGFnZUlzVXNp bmdEYXJrQXBwZWFyYW5jZShtX3BhZ2UpKQorICAgICAgICAgICAgV0tCdW5kbGVQb3N0TWVzc2Fn ZShidW5kbGUsIFV0aWw6OnRvV0soIlRlc3RGYWlsZWQiKS5nZXQoKSwgVXRpbDo6dG9XSygiU3dp dGNoaW5nIGJhY2sgdG8gZGFyayBtb2RlIGZhaWxlZC4iKS5nZXQoKSk7CisKKyAgICAgICAgV0tC dW5kbGVQb3N0TWVzc2FnZShidW5kbGUsIFV0aWw6OnRvV0soIlRlc3REb25lIikuZ2V0KCksIFV0 aWw6OnRvV0soYnVmZmVyLmdldCgpKS5nZXQoKSk7CisgICAgfQorCitwcml2YXRlOgorICAgIFdL QnVuZGxlUGFnZVJlZiBtX3BhZ2UgeyBudWxscHRyIH07Cit9OworCitzdGF0aWMgSW5qZWN0ZWRC dW5kbGVUZXN0OjpSZWdpc3RlcjxGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdD4gcmVn aXN0cmFyKCJGb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlVGVzdCIpOworCit9IC8vIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJCisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQvbWFjL2RhcmstbW9kZS5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvbWFjL2RhcmstbW9kZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjgzYzIzNTYxZTAx ZWM2YWU1NzIxMTdjYzhhNDk5N2U1M2I1YzhkY2EKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9tYWMvZGFyay1tb2RlLmh0bWwKQEAgLTAsMCArMSw1 IEBACis8c3R5bGU+Cis6cm9vdCB7CisgICAgc3VwcG9ydGVkLWNvbG9yLXNjaGVtZXM6IGxpZ2h0 IGRhcms7Cit9Cis8L3N0eWxlPgo= 358916 2019-01-11 11:28:03 -0800 2019-01-11 12:37:54 -0800 Patch bug-193327-20190111112803.patch text/plain 1230 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTYxM2E1OTc1NWExOWI3NzQzZTczOWM2NGNjZjY4M2Q3 OThjODJhOC4uNzdkODRkOWY2NTNiYzA0YWEzZWZlODhkYjNiYWZlYTBiNWZiZmM0NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEx IEBACisyMDE5LTAxLTExICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwor ICAgICAgICBVbnJldmlld2VkLCBmaXggI2lmZGVmIGluIEFQSSB0ZXN0IGFkZGVkIGluIHIyMzk4 NTEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz MjcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDcwOTMyMjIKKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlX0J1bmRs ZS5tbToKKwogMjAxOS0wMS0xMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIFdLQnVuZGxlUGFnZSBTUEkgdG8gdGVtcG9yYXJpbHkgZm9yY2UgbGln aHQgb3IgZGFyayBhcHBlYXJhbmNlIG9uIGEgcGFnZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0QXBwZWFyYW5jZUluQnVuZGxlX0J1 bmRsZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21hYy9Gb3JjZUxpZ2h0 QXBwZWFyYW5jZUluQnVuZGxlX0J1bmRsZS5tbQppbmRleCBkMTk5ZjE2ZjU3MGE1NGY4NWEyMzNh NGMyZTljN2JmNWExN2JhMGE5Li5hZWJhMWMzNDhmYmM2NmExNzBlNTM5ZTBhNzI4NmFlZTkxNTNl NjA0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9tYWMvRm9y Y2VMaWdodEFwcGVhcmFuY2VJbkJ1bmRsZV9CdW5kbGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQvbWFjL0ZvcmNlTGlnaHRBcHBlYXJhbmNlSW5CdW5kbGVfQnVuZGxl Lm1tCkBAIC0yNSw3ICsyNSw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAotI2lmIEVOQUJM RShEQVJLX01PREVfQ1NTKSAmJiBXS19IQVZFX0NfU1BJCisjaWYgV0tfSEFWRV9DX1NQSQogCiAj aW5jbHVkZSAiSW5qZWN0ZWRCdW5kbGVUZXN0LmgiCiAK