141760 2015-02-18 11:03:06 -0800 Purge PassRefPtr from StorageNamespace. 2022-04-14 23:44:12 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 149091 P2 Normal --- 144092 1 kling kling andersca commit-queue gyuyoung.kim japhet mrobinson oldest_to_newest 1070148 0 kling 2015-02-18 11:03:06 -0800 More PassRefPtr nukage. 1070149 1 246827 kling 2015-02-18 11:10:31 -0800 Created attachment 246827 Patch 1074131 2 246827 commit-queue 2015-03-04 11:15:05 -0800 Comment on attachment 246827 Patch Rejecting attachment 246827 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 246827, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: hing file Source/WebKit2/WebProcess/Storage/StorageAreaImpl.h patching file Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp Hunk #2 FAILED at 67. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp.rej patching file Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Anders Carlsson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/6227033965199360 1094992 3 gyuyoung.kim 2015-05-14 18:58:11 -0700 Andreas, how about landing this patch after updating ? 1861741 4 mrobinson 2022-04-14 23:44:12 -0700 *** This bug has been marked as a duplicate of bug 149091 *** 246827 2015-02-18 11:10:31 -0800 2015-03-04 11:15:05 -0800 Patch bug-141760.diff text/plain 19206 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNmExN2U3Li5lMzZhNjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAg QEAKIDIwMTUtMDItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBTdG9yYWdlTmFtZXNwYWNlLgorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTQxNzYwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN3aXRjaCBmcm9tIHVzaW5nIFBhc3NSZWZQdHIgdG8gUmVmL1Jl ZlB0ciAod2l0aCBvY2Nhc2lvbmFsIHJ2YWx1ZSByZWZlcmVuY2VzKQorICAgICAgICBpbiBTdG9y YWdlTmFtZXNwYWNlLCBpdHMgZGVyaXZlZCBjbGFzc2VzLCBhbmQgc29tZSB0aGluZ3MgdGhhdCBn b3QgdXBkYXRlZCBhcworICAgICAgICBjb2xsYXRlcmFsIGRhbWFnZS4KKworICAgICAgICAqIHN0 b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5oOiBVcGRhdGVkIHJldHVybiB0eXBlIG9mIHR3byBmdW5j dGlvbnMgZnJvbSBQYXNzUmVmUHRyCisgICAgICAgIHRvIFJlZiBzaW5jZSB0aGV5IGFsd2F5cyBy ZXR1cm4gb2JqZWN0cy4KKworICAgICAgICAqIGxvYWRlci9FbXB0eUNsaWVudHMuY3BwOiBBZGp1 c3QgRW1wdHlTdG9yYWdlTmFtZXNwYWNlIGNsYXNzIGZvciB0aGUgbmV3IHNpZ25hdHVyZXMKKyAg ICAgICAgaW4gU3RvcmFnZU5hbWVzcGFjZSB0aGF0IHJldHVybiBSZWYuCisKKyAgICAgICAgKiBw YWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OnNlc3Npb25T dG9yYWdlKTogVXNlIFJlZjxTdG9yYWdlQXJlYT4gZm9yIGEgbG9jYWwuCisKKyAgICAgICAgKiBz dG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI6OmxvY2FsU3RvcmFnZUFyZWEpOiBVcGRhdGVkIGZvciBu ZXcgc2lnbmF0dXJlCisgICAgICAgIG9mIFN0b3JhZ2VOYW1lc3BhY2U6OnN0b3JhZ2VBcmVhKCku IE5vdGUgdGhhdCB0aGUgRG9jdW1lbnQgaXMga25vd24gdG8gaGF2ZSBhCisgICAgICAgIFNlY3Vy aXR5T3JpZ2luIGhlcmUsIGFuZCBpdCdzIGFscmVhZHkgYmVlbiBkZXJlZmVyZW5jZWQgb24gdGhl IGxpbmUgYWJvdmUuCisKKzIwMTUtMDItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUu Y29tPgorCiAgICAgICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkQuCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE3NDk+CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKaW5kZXggODlkNTQ4Ni4uMWMwMjAyZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKQEAgLTY3LDggKzY3LDggQEAgY2xhc3Mg RW1wdHlTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIgZmluYWwgOiBwdWJsaWMgU3RvcmFnZU5hbWVz cGFjZVByb3ZpZGVyIHsKICAgICB9OwogCiAgICAgc3RydWN0IEVtcHR5U3RvcmFnZU5hbWVzcGFj ZSBmaW5hbCA6IHB1YmxpYyBTdG9yYWdlTmFtZXNwYWNlIHsKLSAgICAgICAgdmlydHVhbCBQYXNz UmVmUHRyPFN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYShQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2lu Pikgb3ZlcnJpZGUgeyByZXR1cm4gYWRvcHRSZWYobmV3IEVtcHR5U3RvcmFnZUFyZWEpOyB9Ci0g ICAgICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBjb3B5KFBhZ2UqKSBv dmVycmlkZSB7IHJldHVybiBhZG9wdFJlZihuZXcgRW1wdHlTdG9yYWdlTmFtZXNwYWNlKTsgfQor ICAgICAgICB2aXJ0dWFsIFJlZjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEoUmVmPFNlY3VyaXR5 T3JpZ2luPiYmKSBvdmVycmlkZSB7IHJldHVybiBhZG9wdFJlZigqbmV3IEVtcHR5U3RvcmFnZUFy ZWEpOyB9CisgICAgICAgIHZpcnR1YWwgUmVmPFN0b3JhZ2VOYW1lc3BhY2U+IGNvcHkoUGFnZSop IG92ZXJyaWRlIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgRW1wdHlTdG9yYWdlTmFtZXNwYWNlKTsg fQogICAgIH07CiAKICAgICB2aXJ0dWFsIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBjcmVhdGVT ZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShQYWdlJiwgdW5zaWduZWQpIG92ZXJyaWRlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5jcHAKaW5kZXggZWExNjE1OC4uZTc4M2FiZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RE9NV2luZG93LmNwcApAQCAtODEwLDEzICs4MTAsMTMgQEAgU3RvcmFnZSogRE9NV2luZG93Ojpz ZXNzaW9uU3RvcmFnZShFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKICAgICBpZiAoIXBhZ2UpCiAg ICAgICAgIHJldHVybiAwOwogCi0gICAgUmVmUHRyPFN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYSA9 IHBhZ2UtPnNlc3Npb25TdG9yYWdlKCktPnN0b3JhZ2VBcmVhKGRvY3VtZW50LT5zZWN1cml0eU9y aWdpbigpKTsKKyAgICBSZWY8U3RvcmFnZUFyZWE+IHN0b3JhZ2VBcmVhID0gcGFnZS0+c2Vzc2lv blN0b3JhZ2UoKS0+c3RvcmFnZUFyZWEoKmRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpKTsKICAg ICBpZiAoIXN0b3JhZ2VBcmVhLT5jYW5BY2Nlc3NTdG9yYWdlKG1fZnJhbWUpKSB7CiAgICAgICAg IGVjID0gU0VDVVJJVFlfRVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICBtX3Nl c3Npb25TdG9yYWdlID0gU3RvcmFnZTo6Y3JlYXRlKG1fZnJhbWUsIHN0b3JhZ2VBcmVhLnJlbGVh c2UoKSk7CisgICAgbV9zZXNzaW9uU3RvcmFnZSA9IFN0b3JhZ2U6OmNyZWF0ZShtX2ZyYW1lLCBX VEY6Om1vdmUoc3RvcmFnZUFyZWEpKTsKICAgICByZXR1cm4gbV9zZXNzaW9uU3RvcmFnZS5nZXQo KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNw YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuaAppbmRleCAw OWNhM2RlLi42YzlhNmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VOYW1lc3BhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3Bh Y2UuaApAQCAtNDAsOCArNDAsOCBAQCBjbGFzcyBTdG9yYWdlQXJlYTsKIGNsYXNzIFN0b3JhZ2VO YW1lc3BhY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxTdG9yYWdlTmFtZXNwYWNlPiB7CiBwdWJsaWM6 CiAgICAgdmlydHVhbCB+U3RvcmFnZU5hbWVzcGFjZSgpIHsgfQotICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEoUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4p ID0gMDsKLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gY29weShQYWdl KiBuZXdQYWdlKSA9IDA7CisgICAgdmlydHVhbCBSZWY8U3RvcmFnZUFyZWE+IHN0b3JhZ2VBcmVh KFJlZjxTZWN1cml0eU9yaWdpbj4mJikgPSAwOworICAgIHZpcnR1YWwgUmVmPFN0b3JhZ2VOYW1l c3BhY2U+IGNvcHkoUGFnZSogbmV3UGFnZSkgPSAwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNl UHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlUHJv dmlkZXIuY3BwCmluZGV4IGFjZjM3M2YuLjgyM2NiNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5jcHAKQEAgLTYyLDcgKzYyLDcg QEAgUmVmUHRyPFN0b3JhZ2VBcmVhPiBTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI6OmxvY2FsU3Rv cmFnZUFyZWEoRG9jdW1lbnQmIGRvY3VtZW4KIHsKICAgICBhdXRvJiBzdG9yYWdlTmFtZXNwYWNl ID0gZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS0+Y2FuQWNjZXNzTG9jYWxTdG9yYWdlKGRvY3Vt ZW50LnRvcE9yaWdpbigpKSA/IGxvY2FsU3RvcmFnZU5hbWVzcGFjZSgpIDogdHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlKCpkb2N1bWVudC50b3BPcmlnaW4oKSk7CiAKLSAgICByZXR1cm4g c3RvcmFnZU5hbWVzcGFjZS5zdG9yYWdlQXJlYShkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpKTsK KyAgICByZXR1cm4gc3RvcmFnZU5hbWVzcGFjZS5zdG9yYWdlQXJlYSgqZG9jdW1lbnQuc2VjdXJp dHlPcmlnaW4oKSk7CiB9CiAKIFN0b3JhZ2VOYW1lc3BhY2UmIFN0b3JhZ2VOYW1lc3BhY2VQcm92 aWRlcjo6bG9jYWxTdG9yYWdlTmFtZXNwYWNlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYTgyNDNhOS4uOTdjNjky NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNS0wMi0xOCAgQW5kcmVhcyBLbGluZyAg PGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgUHVyZ2UgUGFzc1JlZlB0ciBmcm9tIFN0b3Jh Z2VOYW1lc3BhY2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE3NjA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIGZyb20g dXNpbmcgUGFzc1JlZlB0ciB0byBSZWYvUmVmUHRyICh3aXRoIG9jY2FzaW9uYWwgcnZhbHVlIHJl ZmVyZW5jZXMpCisgICAgICAgIGluIFN0b3JhZ2VOYW1lc3BhY2UsIGl0cyBkZXJpdmVkIGNsYXNz ZXMsIGFuZCBzb21lIHRoaW5ncyB0aGF0IGdvdCB1cGRhdGVkIGFzCisgICAgICAgIGNvbGxhdGVy YWwgZGFtYWdlLgorCisgICAgICAgICogU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5oOgor ICAgICAgICAqIFN0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNl KToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpnZXRPckNyZWF0ZUxv Y2FsU3RvcmFnZU5hbWVzcGFjZSk6IFVwZGF0ZWQgdGhlc2UKKyAgICAgICAgdG8gcmV0dXJuIFJl ZiBzaW5jZSB0aGV5IGFsd2F5cyBzdWNjZWVkLgorCisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y29weSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNl SW1wbDo6c3RvcmFnZUFyZWEpOiBVcGRhdGVkIHRoZXNlIHRvIHJldHVybiBSZWYsIHBlciB0aGUK KyAgICAgICAgbmV3IFN0b3JhZ2VOYW1lc3BhY2Ugc2lnbmF0dXJlcy4KKwogMjAxNS0wMi0xNyAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtDTUFL RV0gUmVtb3ZlIENNYWtlTGlzdHMudHh0IGluIFdLMSBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9T dG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcAppbmRleCAwNGRhNGQxLi40MjJjNDdiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKQEAg LTQyLDIxICs0MiwyMSBAQCBzdGF0aWMgSGFzaE1hcDxTdHJpbmcsIFN0b3JhZ2VOYW1lc3BhY2VJ bXBsKj4mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZU1hcCgpCiAgICAgcmV0dXJuIGxvY2FsU3RvcmFn ZU5hbWVzcGFjZU1hcDsKIH0KIAotUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UodW5zaWduZWQgcXVv dGEpCitSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVh dGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSkKIHsKLSAgICByZXR1cm4g YWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3BhY2VJbXBsKFNlc3Npb25TdG9yYWdlLCBTdHJpbmco KSwgcXVvdGEpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTdG9yYWdlTmFtZXNwYWNlSW1w bChTZXNzaW9uU3RvcmFnZSwgU3RyaW5nKCksIHF1b3RhKSk7CiB9CiAKLVJlZlB0cjxTdG9yYWdl TmFtZXNwYWNlSW1wbD4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OmdldE9yQ3JlYXRlTG9jYWxTdG9y YWdlTmFtZXNwYWNlKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoLCB1bnNpZ25lZCBxdW90YSkK K1JlZjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OmdldE9yQ3Jl YXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoLCB1bnNp Z25lZCBxdW90YSkKIHsKICAgICBBU1NFUlQoIWRhdGFiYXNlUGF0aC5pc051bGwoKSk7CiAKICAg ICBhdXRvJiBzbG90ID0gbG9jYWxTdG9yYWdlTmFtZXNwYWNlTWFwKCkuYWRkKGRhdGFiYXNlUGF0 aCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwogICAgIGlmIChzbG90KQotICAgICAgICByZXR1 cm4gc2xvdDsKKyAgICAgICAgcmV0dXJuICpzbG90OwogCi0gICAgUmVmUHRyPFN0b3JhZ2VOYW1l c3BhY2VJbXBsPiBzdG9yYWdlTmFtZXNwYWNlID0gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3Bh Y2VJbXBsKExvY2FsU3RvcmFnZSwgZGF0YWJhc2VQYXRoLCBxdW90YSkpOwotICAgIHNsb3QgPSBz dG9yYWdlTmFtZXNwYWNlLmdldCgpOworICAgIFJlZjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gc3Rv cmFnZU5hbWVzcGFjZSA9IGFkb3B0UmVmKCpuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwoTG9jYWxT dG9yYWdlLCBkYXRhYmFzZVBhdGgsIHF1b3RhKSk7CisgICAgc2xvdCA9IHN0b3JhZ2VOYW1lc3Bh Y2UucHRyKCk7CiAKICAgICByZXR1cm4gc3RvcmFnZU5hbWVzcGFjZTsKIH0KQEAgLTg1LDMzICs4 NSwzMSBAQCBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6flN0b3JhZ2VOYW1lc3BhY2VJbXBsKCkKICAg ICAgICAgY2xvc2UoKTsKIH0KIAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y29weShQYWdlKikKK1JlZjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y29weShQYWdlKikKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkp OwogICAgIEFTU0VSVCghbV9pc1NodXRkb3duKTsKICAgICBBU1NFUlQobV9zdG9yYWdlVHlwZSA9 PSBTZXNzaW9uU3RvcmFnZSk7CiAKLSAgICBSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+IG5l d05hbWVzcGFjZSA9IGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChtX3N0b3JhZ2VU eXBlLCBtX3BhdGgsIG1fcXVvdGEpKTsKKyAgICBSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+IG5l d05hbWVzcGFjZSA9IGFkb3B0UmVmKCpuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwobV9zdG9yYWdl VHlwZSwgbV9wYXRoLCBtX3F1b3RhKSk7CiAKICAgICBTdG9yYWdlQXJlYU1hcDo6aXRlcmF0b3Ig ZW5kID0gbV9zdG9yYWdlQXJlYU1hcC5lbmQoKTsKICAgICBmb3IgKFN0b3JhZ2VBcmVhTWFwOjpp dGVyYXRvciBpID0gbV9zdG9yYWdlQXJlYU1hcC5iZWdpbigpOyBpICE9IGVuZDsgKytpKQogICAg ICAgICBuZXdOYW1lc3BhY2UtPm1fc3RvcmFnZUFyZWFNYXAuc2V0KGktPmtleSwgaS0+dmFsdWUt PmNvcHkoKSk7Ci0gICAgcmV0dXJuIG5ld05hbWVzcGFjZS5yZWxlYXNlKCk7CisgICAgcmV0dXJu IFdURjo6bW92ZShuZXdOYW1lc3BhY2UpOwogfQogCi1QYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBT dG9yYWdlTmFtZXNwYWNlSW1wbDo6c3RvcmFnZUFyZWEoUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdp bj4gcHJwT3JpZ2luKQorUmVmPFN0b3JhZ2VBcmVhPiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6c3Rv cmFnZUFyZWEoUmVmPFNlY3VyaXR5T3JpZ2luPiYmIG9yaWdpbikKIHsKICAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOwogICAgIEFTU0VSVCghbV9pc1NodXRkb3duKTsKIAotICAgIFJlZlB0cjxT ZWN1cml0eU9yaWdpbj4gb3JpZ2luID0gcHJwT3JpZ2luOwotICAgIFJlZlB0cjxTdG9yYWdlQXJl YUltcGw+IHN0b3JhZ2VBcmVhOwotICAgIGlmICgoc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VBcmVh TWFwLmdldChvcmlnaW4pKSkKLSAgICAgICAgcmV0dXJuIHN0b3JhZ2VBcmVhLnJlbGVhc2UoKTsK KyAgICBpZiAoUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4gc3RvcmFnZUFyZWEgPSBtX3N0b3JhZ2VB cmVhTWFwLmdldChvcmlnaW4ucHRyKCkpKQorICAgICAgICByZXR1cm4gc3RvcmFnZUFyZWEucmVs ZWFzZU5vbk51bGwoKTsKIAotICAgIHN0b3JhZ2VBcmVhID0gU3RvcmFnZUFyZWFJbXBsOjpjcmVh dGUobV9zdG9yYWdlVHlwZSwgb3JpZ2luLCBtX3N5bmNNYW5hZ2VyLCBtX3F1b3RhKTsKLSAgICBt X3N0b3JhZ2VBcmVhTWFwLnNldChvcmlnaW4ucmVsZWFzZSgpLCBzdG9yYWdlQXJlYSk7Ci0gICAg cmV0dXJuIHN0b3JhZ2VBcmVhLnJlbGVhc2UoKTsKKyAgICBSZWY8U3RvcmFnZUFyZWFJbXBsPiBz dG9yYWdlQXJlYSA9IFN0b3JhZ2VBcmVhSW1wbDo6Y3JlYXRlKG1fc3RvcmFnZVR5cGUsIG9yaWdp bi5jb3B5UmVmKCksIG1fc3luY01hbmFnZXIsIG1fcXVvdGEpOworICAgIG1fc3RvcmFnZUFyZWFN YXAuc2V0KG9yaWdpbi5wdHIoKSwgc3RvcmFnZUFyZWEuY29weVJlZigpKTsKKyAgICByZXR1cm4g V1RGOjptb3ZlKHN0b3JhZ2VBcmVhKTsKIH0KIAogdm9pZCBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6 Y2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VOYW1lc3Bh Y2VJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaApp bmRleCA1MjU5OTcxLi4yOThjZTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2Uv U3RvcmFnZU5hbWVzcGFjZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2UvU3RvcmFn ZU5hbWVzcGFjZUltcGwuaApAQCAtMzcsMTAgKzM3LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgU3RvcmFnZUFyZWFJbXBsOwogCi1jbGFzcyBTdG9yYWdlTmFtZXNwYWNlSW1wbCA6 IHB1YmxpYyBTdG9yYWdlTmFtZXNwYWNlIHsKK2NsYXNzIFN0b3JhZ2VOYW1lc3BhY2VJbXBsIGZp bmFsIDogcHVibGljIFN0b3JhZ2VOYW1lc3BhY2UgewogcHVibGljOgotICAgIFdFQkNPUkVfRVhQ T1JUIHN0YXRpYyBSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+IGNyZWF0ZVNlc3Npb25TdG9y YWdlTmFtZXNwYWNlKHVuc2lnbmVkIHF1b3RhKTsKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg UmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVz cGFjZShjb25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCwgdW5zaWduZWQgcXVvdGEpOworICAgIFdF QkNPUkVfRVhQT1JUIHN0YXRpYyBSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+IGNyZWF0ZVNlc3Np b25TdG9yYWdlTmFtZXNwYWNlKHVuc2lnbmVkIHF1b3RhKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBz dGF0aWMgUmVmPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5h bWVzcGFjZShjb25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCwgdW5zaWduZWQgcXVvdGEpOwogICAg IHZpcnR1YWwgflN0b3JhZ2VOYW1lc3BhY2VJbXBsKCk7CiAKICAgICB2b2lkIGNsb3NlKCk7CkBA IC01Nyw4ICs1Nyw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgU3RvcmFnZU5hbWVzcGFjZUlt cGwoU3RvcmFnZVR5cGUsIGNvbnN0IFN0cmluZyYgcGF0aCwgdW5zaWduZWQgcXVvdGEpOwogCi0g ICAgdmlydHVhbCBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYShQYXNzUmVmUHRy PFNlY3VyaXR5T3JpZ2luPikgIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTdG9y YWdlTmFtZXNwYWNlPiBjb3B5KFBhZ2UqIG5ld1BhZ2UpIG92ZXJyaWRlOworICAgIHZpcnR1YWwg UmVmPFN0b3JhZ2VBcmVhPiBzdG9yYWdlQXJlYShSZWY8U2VjdXJpdHlPcmlnaW4+JiYpICBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIFJlZjxTdG9yYWdlTmFtZXNwYWNlPiBjb3B5KFBhZ2UqIG5ld1Bh Z2UpIG92ZXJyaWRlOwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxTZWN1cml0eU9yaWdp bj4sIFJlZlB0cjxTdG9yYWdlQXJlYUltcGw+PiBTdG9yYWdlQXJlYU1hcDsKICAgICBTdG9yYWdl QXJlYU1hcCBtX3N0b3JhZ2VBcmVhTWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDI0OGM0ZWEuLjdmNzcxZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxNS0wMi0xOCAgQW5kcmVhcyBLbGluZyAg PGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgUHVyZ2UgUGFzc1JlZlB0ciBmcm9tIFN0b3Jh Z2VOYW1lc3BhY2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE3NjA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIGZyb20g dXNpbmcgUGFzc1JlZlB0ciB0byBSZWYvUmVmUHRyICh3aXRoIG9jY2FzaW9uYWwgcnZhbHVlIHJl ZmVyZW5jZXMpCisgICAgICAgIGluIFN0b3JhZ2VOYW1lc3BhY2UsIGl0cyBkZXJpdmVkIGNsYXNz ZXMsIGFuZCBzb21lIHRoaW5ncyB0aGF0IGdvdCB1cGRhdGVkIGFzCisgICAgICAgIGNvbGxhdGVy YWwgZGFtYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhSW1wbDo6Y3JlYXRlKToKKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjpTdG9yYWdlQXJlYUltcGwpOiBVcGRhdGVkIFN0 b3JhZ2VBcmVhSW1wbCBjcmVhdGUoKSBoZWxwZXIKKyAgICAgICAgdG8gcmV0dXJuIGEgUmVmIHNp bmNlIGl0IGFsd2F5cyBzdWNjZWVkcy4gQWxzbyBtYWtlIGl0IHRha2UgdGhlIFN0b3JhZ2VBcmVh TWFwCisgICAgICAgIGJ5IFJlZiYmIGluc3RlYWQgb2YgUGFzc1JlZlB0ciwgYW5kIHN0b3JlIGl0 IGluIGEgUmVmIG1lbWJlci4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdl QXJlYUltcGwuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFj ZUltcGwuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUlt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlU2Vz c2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNl SW1wbDo6Y3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAgKFdlYktpdDo6U3Rv cmFnZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSk6 IFVwZGF0ZWQgdGhlc2UKKyAgICAgICAgdG8gcmV0dXJuIFJlZiBzaW5jZSB0aGV5IGFsd2F5cyBz dWNjZWVkLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpzdG9yYWdl QXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjb3B5KTogVXBk YXRlZCB0aGVzZSB0byByZXR1cm4gUmVmLCBwZXIgdGhlIG5ldworICAgICAgICBTdG9yYWdlTmFt ZXNwYWNlIHNpZ25hdHVyZXMuCisKIDIwMTUtMDItMTcgIFRpbW90aHkgSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNzg1OTUpOiBDbGlj a2luZyBvbiBERCBoaWdobGlnaHRzIHNvbWV0aW1lcyBkbyBub3Qgd29yawpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAppbmRl eCAxMDAyYzIxLi4wZjk5MWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcApAQCAtNDQsMTQgKzQ0LDE0IEBAIHN0YXRp YyB1aW50NjRfdCBnZW5lcmF0ZVN0b3JhZ2VBcmVhSUQoKQogICAgIHJldHVybiArK3N0b3JhZ2VB cmVhSUQ7CiB9CiAKLVBhc3NSZWZQdHI8U3RvcmFnZUFyZWFJbXBsPiBTdG9yYWdlQXJlYUltcGw6 OmNyZWF0ZShQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhTWFwPiBzdG9yYWdlQXJlYU1hcCkKK1JlZjxT dG9yYWdlQXJlYUltcGw+IFN0b3JhZ2VBcmVhSW1wbDo6Y3JlYXRlKFJlZjxTdG9yYWdlQXJlYU1h cD4mJiBzdG9yYWdlQXJlYU1hcCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VB cmVhSW1wbChzdG9yYWdlQXJlYU1hcCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFN0b3Jh Z2VBcmVhSW1wbChXVEY6Om1vdmUoc3RvcmFnZUFyZWFNYXApKSk7CiB9CiAKLVN0b3JhZ2VBcmVh SW1wbDo6U3RvcmFnZUFyZWFJbXBsKFBhc3NSZWZQdHI8U3RvcmFnZUFyZWFNYXA+IHN0b3JhZ2VB cmVhTWFwKQorU3RvcmFnZUFyZWFJbXBsOjpTdG9yYWdlQXJlYUltcGwoUmVmPFN0b3JhZ2VBcmVh TWFwPiYmIHN0b3JhZ2VBcmVhTWFwKQogICAgIDogbV9zdG9yYWdlQXJlYUlEKGdlbmVyYXRlU3Rv cmFnZUFyZWFJRCgpKQotICAgICwgbV9zdG9yYWdlQXJlYU1hcChzdG9yYWdlQXJlYU1hcCkKKyAg ICAsIG1fc3RvcmFnZUFyZWFNYXAoV1RGOjptb3ZlKHN0b3JhZ2VBcmVhTWFwKSkKIHsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh SW1wbC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5oCmluZGV4IGE0ZDU5OWEuLjRiMDFmYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAgLTM3LDEzICszNywxMyBAQCBj bGFzcyBTdG9yYWdlQXJlYU1hcDsKIAogY2xhc3MgU3RvcmFnZUFyZWFJbXBsIGZpbmFsIDogcHVi bGljIFdlYkNvcmU6OlN0b3JhZ2VBcmVhIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0 cjxTdG9yYWdlQXJlYUltcGw+IGNyZWF0ZShQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhTWFwPik7Cisg ICAgc3RhdGljIFJlZjxTdG9yYWdlQXJlYUltcGw+IGNyZWF0ZShSZWY8U3RvcmFnZUFyZWFNYXA+ JiYpOwogICAgIHZpcnR1YWwgflN0b3JhZ2VBcmVhSW1wbCgpOwogCiAgICAgdWludDY0X3Qgc3Rv cmFnZUFyZWFJRCgpIGNvbnN0IHsgcmV0dXJuIG1fc3RvcmFnZUFyZWFJRDsgfQogCiBwcml2YXRl OgotICAgIFN0b3JhZ2VBcmVhSW1wbChQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhTWFwPik7CisgICAg ZXhwbGljaXQgU3RvcmFnZUFyZWFJbXBsKFJlZjxTdG9yYWdlQXJlYU1hcD4mJik7CiAKICAgICAv LyBXZWJDb3JlOjpTdG9yYWdlQXJlYS4KICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgpIG92 ZXJyaWRlOwpAQCAtNjEsNyArNjEsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBjbG9z ZURhdGFiYXNlSWZJZGxlKCkgb3ZlcnJpZGU7CiAKICAgICB1aW50NjRfdCBtX3N0b3JhZ2VBcmVh SUQ7Ci0gICAgUmVmUHRyPFN0b3JhZ2VBcmVhTWFwPiBtX3N0b3JhZ2VBcmVhTWFwOworICAgIFJl ZjxTdG9yYWdlQXJlYU1hcD4gbV9zdG9yYWdlQXJlYU1hcDsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0 b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKaW5kZXggOWY3Yzg2OC4uYjI2ZTdhMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5h bWVzcGFjZUltcGwuY3BwCkBAIC00MCwxOSArNDAsMTkgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1SZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+ IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1aW50 NjRfdCBpZGVudGlmaWVyLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCitSZWY8U3RvcmFnZU5hbWVz cGFjZUltcGw+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVz cGFjZSh1aW50NjRfdCBpZGVudGlmaWVyLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCiB7Ci0gICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChTZXNzaW9uU3RvcmFnZSwg aWRlbnRpZmllciwgbnVsbHB0ciwgcXVvdGFJbkJ5dGVzKSk7CisgICAgcmV0dXJuIGFkb3B0UmVm KCpuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwoU2Vzc2lvblN0b3JhZ2UsIGlkZW50aWZpZXIsIG51 bGxwdHIsIHF1b3RhSW5CeXRlcykpOwogfQogCi1SZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+ IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0 X3QgaWRlbnRpZmllciwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKQorUmVmPFN0b3JhZ2VOYW1lc3Bh Y2VJbXBsPiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNl KHVpbnQ2NF90IGlkZW50aWZpZXIsIHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKIHsKLSAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3BhY2VJbXBsKExvY2FsU3RvcmFnZSwgaWRlbnRp ZmllciwgbnVsbHB0ciwgcXVvdGFJbkJ5dGVzKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg U3RvcmFnZU5hbWVzcGFjZUltcGwoTG9jYWxTdG9yYWdlLCBpZGVudGlmaWVyLCBudWxscHRyLCBx dW90YUluQnl0ZXMpKTsKIH0KIAotUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2 NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiB0b3BMZXZlbE9yaWdpbiwg dWludDY0X3QgcXVvdGFJbkJ5dGVzKQorUmVmPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2 NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiB0b3BMZXZlbE9yaWdpbiwg dWludDY0X3QgcXVvdGFJbkJ5dGVzKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU3RvcmFn ZU5hbWVzcGFjZUltcGwoTG9jYWxTdG9yYWdlLCBpZGVudGlmaWVyLCAmdG9wTGV2ZWxPcmlnaW4s IHF1b3RhSW5CeXRlcykpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFN0b3JhZ2VOYW1lc3Bh Y2VJbXBsKExvY2FsU3RvcmFnZSwgaWRlbnRpZmllciwgJnRvcExldmVsT3JpZ2luLCBxdW90YUlu Qnl0ZXMpKTsKIH0KIAogU3RvcmFnZU5hbWVzcGFjZUltcGw6OlN0b3JhZ2VOYW1lc3BhY2VJbXBs KFdlYkNvcmU6OlN0b3JhZ2VUeXBlIHN0b3JhZ2VUeXBlLCB1aW50NjRfdCBzdG9yYWdlTmFtZXNw YWNlSUQsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKiB0b3BMZXZlbE9yaWdpbiwgdW5zaWduZWQg cXVvdGFJbkJ5dGVzKQpAQCAtNjcsMTYgKzY3LDE2IEBAIFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjp+ U3RvcmFnZU5hbWVzcGFjZUltcGwoKQogewogfQogCi1QYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBT dG9yYWdlTmFtZXNwYWNlSW1wbDo6c3RvcmFnZUFyZWEoUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdp bj4gc2VjdXJpdHlPcmlnaW4pCitSZWY8U3RvcmFnZUFyZWE+IFN0b3JhZ2VOYW1lc3BhY2VJbXBs OjpzdG9yYWdlQXJlYShSZWY8U2VjdXJpdHlPcmlnaW4+JiYgc2VjdXJpdHlPcmlnaW4pCiB7Ci0g ICAgYXV0byYgc2xvdCA9IG1fc3RvcmFnZUFyZWFNYXBzLmFkZChzZWN1cml0eU9yaWdpbi5nZXQo KSwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAgIGF1dG8mIHNsb3QgPSBtX3N0b3JhZ2VB cmVhTWFwcy5hZGQoc2VjdXJpdHlPcmlnaW4ucHRyKCksIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1 ZTsKICAgICBpZiAoIXNsb3QpCi0gICAgICAgIHNsb3QgPSBTdG9yYWdlQXJlYU1hcDo6Y3JlYXRl KHRoaXMsIHNlY3VyaXR5T3JpZ2luKTsKKyAgICAgICAgc2xvdCA9IFN0b3JhZ2VBcmVhTWFwOjpj cmVhdGUodGhpcywgV1RGOjptb3ZlKHNlY3VyaXR5T3JpZ2luKSk7CiAKLSAgICByZXR1cm4gU3Rv cmFnZUFyZWFJbXBsOjpjcmVhdGUoc2xvdCk7CisgICAgcmV0dXJuIFN0b3JhZ2VBcmVhSW1wbDo6 Y3JlYXRlKCpzbG90KTsKIH0KIAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdl TmFtZXNwYWNlSW1wbDo6Y29weShQYWdlKiBuZXdQYWdlKQorUmVmPFN0b3JhZ2VOYW1lc3BhY2U+ IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjb3B5KFBhZ2UqIG5ld1BhZ2UpCiB7CiAgICAgQVNTRVJU KG1fc3RvcmFnZU5hbWVzcGFjZUlEKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaAppbmRleCAzMjc2NGQ3Li5m ZThkYThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU5hbWVzcGFjZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuaApAQCAtMzYsMTEgKzM2LDExIEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogY2xhc3MgU3RvcmFnZUFyZWFNYXA7CiBjbGFzcyBXZWJQYWdlOwogCi1jbGFzcyBT dG9yYWdlTmFtZXNwYWNlSW1wbCA6IHB1YmxpYyBXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlIHsK K2NsYXNzIFN0b3JhZ2VOYW1lc3BhY2VJbXBsIGZpbmFsIDogcHVibGljIFdlYkNvcmU6OlN0b3Jh Z2VOYW1lc3BhY2UgewogcHVibGljOgotICAgIHN0YXRpYyBSZWZQdHI8U3RvcmFnZU5hbWVzcGFj ZUltcGw+IGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IGlkZW50aWZpZXIs IHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7Ci0gICAgc3RhdGljIFJlZlB0cjxTdG9yYWdlTmFtZXNw YWNlSW1wbD4gY3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IGlkZW50aWZpZXIs IHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7Ci0gICAgc3RhdGljIFJlZlB0cjxTdG9yYWdlTmFtZXNw YWNlSW1wbD4gY3JlYXRlVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IGlk ZW50aWZpZXIsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJiB0b3BMZXZlbE9yaWdpbiwgdWludDY0 X3QgcXVvdGFJbkJ5dGVzKTsKKyAgICBzdGF0aWMgUmVmPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBj cmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBpZGVudGlmaWVyLCB1bnNpZ25l ZCBxdW90YUluQnl0ZXMpOworICAgIHN0YXRpYyBSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+IGNy ZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBpZGVudGlmaWVyLCB1bnNpZ25lZCBx dW90YUluQnl0ZXMpOworICAgIHN0YXRpYyBSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+IGNyZWF0 ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBpZGVudGlmaWVyLCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbiYgdG9wTGV2ZWxPcmlnaW4sIHVpbnQ2NF90IHF1b3RhSW5CeXRl cyk7CiAKICAgICB2aXJ0dWFsIH5TdG9yYWdlTmFtZXNwYWNlSW1wbCgpOwogCkBAIC01Miw4ICs1 Miw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU3RvcmFnZU5hbWVzcGFjZUlt cGwoV2ViQ29yZTo6U3RvcmFnZVR5cGUsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW4qIHRvcExldmVsT3JpZ2luLCB1bnNpZ25lZCBxdW90YUluQnl0 ZXMpOwogCi0gICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OlN0b3JhZ2VBcmVhPiBzdG9y YWdlQXJlYShQYXNzUmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPikgb3ZlcnJpZGU7Ci0g ICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OlN0b3JhZ2VOYW1lc3BhY2U+IGNvcHkoV2Vi Q29yZTo6UGFnZSopIG92ZXJyaWRlOworICAgIHZpcnR1YWwgUmVmPFdlYkNvcmU6OlN0b3JhZ2VB cmVhPiBzdG9yYWdlQXJlYShSZWY8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+JiYpIG92ZXJyaWRl OworICAgIHZpcnR1YWwgUmVmPFdlYkNvcmU6OlN0b3JhZ2VOYW1lc3BhY2U+IGNvcHkoV2ViQ29y ZTo6UGFnZSopIG92ZXJyaWRlOwogCiAgICAgY29uc3QgV2ViQ29yZTo6U3RvcmFnZVR5cGUgbV9z dG9yYWdlVHlwZTsKICAgICBjb25zdCB1aW50NjRfdCBtX3N0b3JhZ2VOYW1lc3BhY2VJRDsK