117288 2013-06-06 04:58:28 -0700 ResourceLoader::resourceData() should not return a PassRefPtr 2013-06-06 09:37:16 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117289 1 cgarcia webkit-unassigned beidson commit-queue darin esprehn+autocc japhet oldest_to_newest 897728 0 cgarcia 2013-06-06 04:58:28 -0700 ResourceLoader is the owner of the resource data and we don't really want to transfer the ownership in resourceData(). 897729 1 203924 cgarcia 2013-06-06 05:04:08 -0700 Created attachment 203924 Patch 897807 2 203924 darin 2013-06-06 09:22:20 -0700 Comment on attachment 203924 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203924&action=review > Source/WebCore/ChangeLog:10 > + Change ResourceLoader::resourceData() to return a raw pointer > + instead of a PassRefPtr since we don't want to transfer the > + ownership of the resource data. Also pass a raw pointer to Definitely a good change. > Source/WebCore/ChangeLog:14 > + CachedResource::data() so that the cached resource can decide > + whether to take a reference of the data or not, for example, > + CachedRawResource only takes a reference when buffering policy is > + BufferData. Not sure this change is as good, but it’s OK. 897818 3 cgarcia 2013-06-06 09:37:16 -0700 Committed r151277: <http://trac.webkit.org/changeset/151277> 203924 2013-06-06 05:04:08 -0700 2013-06-06 09:22:19 -0700 Patch wcore-resource-data.diff text/plain 17570 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNDBhMzJiLi5jOTRlY2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTcg QEAKKzIwMTMtMDYtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJlc291cmNlTG9hZGVyOjpyZXNvdXJjZURhdGEoKSBzaG91bGQgbm90IHJl dHVybiBhIFBhc3NSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExNzI4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENoYW5nZSBSZXNvdXJjZUxvYWRlcjo6cmVzb3VyY2VEYXRhKCkgdG8gcmV0dXJu IGEgcmF3IHBvaW50ZXIKKyAgICAgICAgaW5zdGVhZCBvZiBhIFBhc3NSZWZQdHIgc2luY2Ugd2Ug ZG9uJ3Qgd2FudCB0byB0cmFuc2ZlciB0aGUKKyAgICAgICAgb3duZXJzaGlwIG9mIHRoZSByZXNv dXJjZSBkYXRhLiBBbHNvIHBhc3MgYSByYXcgcG9pbnRlciB0bworICAgICAgICBDYWNoZWRSZXNv dXJjZTo6ZGF0YSgpIHNvIHRoYXQgdGhlIGNhY2hlZCByZXNvdXJjZSBjYW4gZGVjaWRlCisgICAg ICAgIHdoZXRoZXIgdG8gdGFrZSBhIHJlZmVyZW5jZSBvZiB0aGUgZGF0YSBvciBub3QsIGZvciBl eGFtcGxlLAorICAgICAgICBDYWNoZWRSYXdSZXNvdXJjZSBvbmx5IHRha2VzIGEgcmVmZXJlbmNl IHdoZW4gYnVmZmVyaW5nIHBvbGljeSBpcworICAgICAgICBCdWZmZXJEYXRhLgorCisgICAgICAg ICogaHRtbC9JbWFnZURvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1l bnRQYXJzZXI6OmFwcGVuZEJ5dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1lbnRQ YXJzZXI6OmZpbmlzaCk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlTG9hZGVyOjpyZXNvdXJjZURhdGEpOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6c2VuZERhdGFU b1Jlc291cmNlKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRDU1NTdHlsZVNoZWV0OjpkYXRhKToKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5oOgorICAgICAgICAqIGxvYWRl ci9jYWNoZS9DYWNoZWRGb250LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmRh dGEpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogbG9h ZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEltYWdl OjpkYXRhKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaDoKKyAgICAgICAg KiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q2FjaGVkUmF3UmVzb3VyY2U6OmRhdGEpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRS YXdSZXNvdXJjZS5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6ZGF0YSk6CisgICAgICAgICogbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hl ZFNWR0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFNWR0RvY3VtZW50Ojpk YXRhKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRG9jdW1lbnQuaDoKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkU2NyaXB0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNh Y2hlZFNjcmlwdDo6ZGF0YSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5o OgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRTaGFkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2FjaGVkU2hhZGVyOjpkYXRhKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVk U2hhZGVyLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFRleHRUcmFjay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDYWNoZWRUZXh0VHJhY2s6OmRhdGEpOgorICAgICAgICAqIGxvYWRl ci9jYWNoZS9DYWNoZWRUZXh0VHJhY2suaDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVk WFNMU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRYU0xTdHlsZVNoZWV0 OjpkYXRhKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5oOgor CiAyMDEzLTA2LTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmVydCB0aGUgc2Vjb25kIGhhbGYgb2YgcjE1MTI1Ny4gV2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpjcmVhdGUgY2FuIHJldHVybiBudWxsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9JbWFnZURvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5j cHAKaW5kZXggOGQ3MGNhZi4uMmI1OTJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9JbWFnZURvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9jdW1l bnQuY3BwCkBAIC0xMzUsNyArMTM1LDggQEAgdm9pZCBJbWFnZURvY3VtZW50UGFyc2VyOjphcHBl bmRCeXRlcyhEb2N1bWVudFdyaXRlciosIGNvbnN0IGNoYXIqLCBzaXplX3QpCiAgICAgICAgIHJl dHVybjsKIAogICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IGRvY3VtZW50KCktPmNhY2hl ZEltYWdlKCk7Ci0gICAgY2FjaGVkSW1hZ2UtPmRhdGEoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVu dExvYWRlcigpLT5tYWluUmVzb3VyY2VEYXRhKCksIGZhbHNlKTsKKyAgICBSZWZQdHI8UmVzb3Vy Y2VCdWZmZXI+IHJlc291cmNlRGF0YSA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIo KS0+bWFpblJlc291cmNlRGF0YSgpOworICAgIGNhY2hlZEltYWdlLT5kYXRhKHJlc291cmNlRGF0 YS5nZXQoKSwgZmFsc2UpOwogCiAgICAgZG9jdW1lbnQoKS0+aW1hZ2VVcGRhdGVkKCk7CiB9CkBA IC0xNTEsNyArMTUyLDcgQEAgdm9pZCBJbWFnZURvY3VtZW50UGFyc2VyOjpmaW5pc2goKQogICAg ICAgICBpZiAoZG9jdW1lbnQoKS0+ZnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkt PmlzTG9hZGluZ011bHRpcGFydENvbnRlbnQoKSkKICAgICAgICAgICAgIGRhdGEgPSBkYXRhLT5j b3B5KCk7CiAKLSAgICAgICAgY2FjaGVkSW1hZ2UtPmRhdGEoZGF0YS5yZWxlYXNlKCksIHRydWUp OworICAgICAgICBjYWNoZWRJbWFnZS0+ZGF0YShkYXRhLmdldCgpLCB0cnVlKTsKICAgICAgICAg Y2FjaGVkSW1hZ2UtPmZpbmlzaCgpOwogCiAgICAgICAgIGNhY2hlZEltYWdlLT5zZXRSZXNwb25z ZShkb2N1bWVudCgpLT5mcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9u c2UoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCA0NWIz YTMwLi44ZmM0YTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VM b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAK QEAgLTUyLDExICs1Miw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc1JlZlB0cjxS ZXNvdXJjZUJ1ZmZlcj4gUmVzb3VyY2VMb2FkZXI6OnJlc291cmNlRGF0YSgpCi17Ci0gICAgcmV0 dXJuIG1fcmVzb3VyY2VEYXRhOwotfQotCiBSZXNvdXJjZUxvYWRlcjo6UmVzb3VyY2VMb2FkZXIo RnJhbWUqIGZyYW1lLCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgb3B0aW9ucykKICAgICA6IG1fZnJh bWUoZnJhbWUpCiAgICAgLCBtX2RvY3VtZW50TG9hZGVyKGZyYW1lLT5sb2FkZXIoKS0+YWN0aXZl RG9jdW1lbnRMb2FkZXIoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmgKaW5k ZXggZjUzMGQwOC4uMGE1NDk5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVy LmgKQEAgLTczLDcgKzczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZWxlYXNlUmVz b3VyY2VzKCk7CiAgICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UoKSBjb25zdDsK IAotICAgIFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+IHJlc291cmNlRGF0YSgpOworICAgIFJl c291cmNlQnVmZmVyKiByZXNvdXJjZURhdGEoKSBjb25zdCB7IHJldHVybiBtX3Jlc291cmNlRGF0 YS5nZXQoKTsgfQogICAgIHZvaWQgY2xlYXJSZXNvdXJjZURhdGEoKTsKICAgICAKICAgICB2aXJ0 dWFsIGJvb2wgaXNTdWJyZXNvdXJjZUxvYWRlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9T dWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggOWU4NDFiYy4uOWMxZjBhMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0yNjYsNyArMjY2LDcgQEAg dm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6c2VuZERhdGFUb1Jlc291cmNlKGNvbnN0IGNoYXIqIGRh dGEsIGludCBsZW5ndGgpCiAgICAgLy8gICAgIHRoYXQgYWxsIGRhdGEgaGFzIGJlZW4gcmVjZWl2 ZWQgeWV0LiAKICAgICBpZiAobV9sb2FkaW5nTXVsdGlwYXJ0Q29udGVudCB8fCAhcmVzb3VyY2VE YXRhKCkpIHsgCiAgICAgICAgIFJlZlB0cjxSZXNvdXJjZUJ1ZmZlcj4gY29waWVkRGF0YSA9IFJl c291cmNlQnVmZmVyOjpjcmVhdGUoZGF0YSwgbGVuZ3RoKTsgCi0gICAgICAgIG1fcmVzb3VyY2Ut PmRhdGEoY29waWVkRGF0YS5yZWxlYXNlKCksIG1fbG9hZGluZ011bHRpcGFydENvbnRlbnQpOwor ICAgICAgICBtX3Jlc291cmNlLT5kYXRhKGNvcGllZERhdGEuZ2V0KCksIG1fbG9hZGluZ011bHRp cGFydENvbnRlbnQpOwogICAgIH0gZWxzZSAKICAgICAgICAgbV9yZXNvdXJjZS0+ZGF0YShyZXNv dXJjZURhdGEoKSwgZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwCmluZGV4IDE4NGU5MDQuLmMxYmM0MzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5j cHAKQEAgLTkzLDcgKzkzLDcgQEAgY29uc3QgU3RyaW5nIENhY2hlZENTU1N0eWxlU2hlZXQ6OnNo ZWV0VGV4dChib29sIGVuZm9yY2VNSU1FVHlwZSwgYm9vbCogaGFzVmFsaWQKICAgICByZXR1cm4g c2hlZXRUZXh0OwogfQogCi12b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OmRhdGEoUGFzc1JlZlB0 cjxSZXNvdXJjZUJ1ZmZlcj4gZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCit2b2lkIENhY2hl ZENTU1N0eWxlU2hlZXQ6OmRhdGEoUmVzb3VyY2VCdWZmZXIqIGRhdGEsIGJvb2wgYWxsRGF0YVJl Y2VpdmVkKQogewogICAgIGlmICghYWxsRGF0YVJlY2VpdmVkKQogICAgICAgICByZXR1cm47CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVl dC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuaApp bmRleCBlNGJiOTdlLi5jYTUxNzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmgKQEAgLTQ3LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICAKICAgICAgICAgdmlydHVhbCB2b2lkIHNldEVuY29kaW5nKGNvbnN0 IFN0cmluZyYpOwogICAgICAgICB2aXJ0dWFsIFN0cmluZyBlbmNvZGluZygpIGNvbnN0OwotICAg ICAgICB2aXJ0dWFsIHZvaWQgZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRhLCBi b29sIGFsbERhdGFSZWNlaXZlZCk7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkYXRhKFJlc291cmNl QnVmZmVyKiwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGVz dHJveURlY29kZWREYXRhKCkgT1ZFUlJJREU7CiAKICAgICAgICAgUGFzc1JlZlB0cjxTdHlsZVNo ZWV0Q29udGVudHM+IHJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KGNvbnN0IENTU1BhcnNlckNvbnRl eHQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcAppbmRleCBj Y2EwMmYyLi5mNmU0N2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkRm9udC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZv bnQuY3BwCkBAIC03NSw3ICs3NSw3IEBAIHZvaWQgQ2FjaGVkRm9udDo6ZGlkQWRkQ2xpZW50KENh Y2hlZFJlc291cmNlQ2xpZW50KiBjKQogICAgICAgICBzdGF0aWNfY2FzdDxDYWNoZWRGb250Q2xp ZW50Kj4oYyktPmZvbnRMb2FkZWQodGhpcyk7CiB9CiAKLXZvaWQgQ2FjaGVkRm9udDo6ZGF0YShQ YXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKK3Zv aWQgQ2FjaGVkRm9udDo6ZGF0YShSZXNvdXJjZUJ1ZmZlciogZGF0YSwgYm9vbCBhbGxEYXRhUmVj ZWl2ZWQpCiB7CiAgICAgaWYgKCFhbGxEYXRhUmVjZWl2ZWQpCiAgICAgICAgIHJldHVybjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5oCmluZGV4IGQyOTUyMWIuLmM1YmUz NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaApAQCAtNDgsNyAr NDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGxvYWQoQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIqLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKIAogICAgIHZpcnR1YWwgdm9pZCBk aWRBZGRDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQqKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGF0 YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCk7 CisgICAgdmlydHVhbCB2b2lkIGRhdGEoUmVzb3VyY2VCdWZmZXIqLCBib29sIGFsbERhdGFSZWNl aXZlZCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWxsQ2xpZW50c1JlbW92ZWQoKTsKICAgICB2b2lk IGJlZ2luTG9hZElmTmVlZGVkKENhY2hlZFJlc291cmNlTG9hZGVyKiBkbCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAppbmRleCAyNTc3YjI3Li42MzgyOWYz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKQEAgLTM1 Miw3ICszNTIsNyBAQCBzaXplX3QgQ2FjaGVkSW1hZ2U6Om1heGltdW1EZWNvZGVkSW1hZ2VTaXpl KCkKICAgICByZXR1cm4gc2V0dGluZ3MgPyBzZXR0aW5ncy0+bWF4aW11bURlY29kZWRJbWFnZVNp emUoKSA6IDA7CiB9CiAKLXZvaWQgQ2FjaGVkSW1hZ2U6OmRhdGEoUGFzc1JlZlB0cjxSZXNvdXJj ZUJ1ZmZlcj4gZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCit2b2lkIENhY2hlZEltYWdlOjpk YXRhKFJlc291cmNlQnVmZmVyKiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKIHsKICAgICBt X2RhdGEgPSBkYXRhOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5o CmluZGV4IDAwZjkwNjcuLjdkNTEwMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRJbWFnZS5oCkBAIC03Niw3ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg YWxsQ2xpZW50c1JlbW92ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVzdHJveURlY29kZWREYXRh KCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBk YXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCk7CisgICAgdmlydHVhbCB2b2lkIGRhdGEoUmVzb3Vy Y2VCdWZmZXIqLCBib29sIGFsbERhdGFSZWNlaXZlZCk7CiAgICAgdmlydHVhbCB2b2lkIGVycm9y KENhY2hlZFJlc291cmNlOjpTdGF0dXMpOwogICAgIHZpcnR1YWwgdm9pZCByZXNwb25zZVJlY2Vp dmVkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwCmluZGV4IDAwMTZkZTIuLmY4MDg2 YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNv dXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291 cmNlLmNwcApAQCAtNDEsNyArNDEsNyBAQCBDYWNoZWRSYXdSZXNvdXJjZTo6Q2FjaGVkUmF3UmVz b3VyY2UoUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIFR5cGUgdHlwZQogewogfQog Ci12b2lkIENhY2hlZFJhd1Jlc291cmNlOjpkYXRhKFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+ IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKQordm9pZCBDYWNoZWRSYXdSZXNvdXJjZTo6ZGF0 YShSZXNvdXJjZUJ1ZmZlciogZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCiB7CiAgICAgQ2Fj aGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmF3UmVzb3VyY2U+IHByb3RlY3QodGhpcyk7CiAgICAg Y29uc3QgY2hhciogaW5jcmVtZW50YWxEYXRhID0gMDsKQEAgLTY4LDcgKzY4LDcgQEAgdm9pZCBD YWNoZWRSYXdSZXNvdXJjZTo6ZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRhLCBi b29sIGFsbERhdGFSZWNlaXYKICAgICAgICAgd2hpbGUgKENhY2hlZFJhd1Jlc291cmNlQ2xpZW50 KiBjID0gdy5uZXh0KCkpCiAgICAgICAgICAgICBjLT5kYXRhUmVjZWl2ZWQodGhpcywgaW5jcmVt ZW50YWxEYXRhLCBpbmNyZW1lbnRhbERhdGFMZW5ndGgpOwogICAgIH0KLSAgICBDYWNoZWRSZXNv dXJjZTo6ZGF0YShtX2RhdGEsIGFsbERhdGFSZWNlaXZlZCk7CisgICAgQ2FjaGVkUmVzb3VyY2U6 OmRhdGEoZGF0YSwgYWxsRGF0YVJlY2VpdmVkKTsKIAogICAgIGlmIChkYXRhQnVmZmVyaW5nUG9s aWN5ID09IEJ1ZmZlckRhdGEgJiYgbV9vcHRpb25zLmRhdGFCdWZmZXJpbmdQb2xpY3kgPT0gRG9O b3RCdWZmZXJEYXRhKSB7CiAgICAgICAgIGlmIChtX2xvYWRlcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmgKaW5kZXggNjAxMzlhYS4uNWJmMDAx NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291 cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNl LmgKQEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBkaWRBZGRDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQqKTsKLSAgICB2aXJ0dWFsIHZvaWQg ZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZl ZCk7CisgICAgdmlydHVhbCB2b2lkIGRhdGEoUmVzb3VyY2VCdWZmZXIqLCBib29sIGFsbERhdGFS ZWNlaXZlZCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSWdub3JlSFRUUFN0YXR1c0NvZGVF cnJvcnMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIGFsbENsaWVu dHNSZW1vdmVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlLmNwcAppbmRleCBlZDM4ZGE4Li4yZWYyYmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKQEAgLTM2Miw3ICszNjIsNyBAQCB2b2lkIENh Y2hlZFJlc291cmNlOjpjaGVja05vdGlmeSgpCiAgICAgICAgIGMtPm5vdGlmeUZpbmlzaGVkKHRo aXMpOwogfQogCi12b2lkIENhY2hlZFJlc291cmNlOjpkYXRhKFBhc3NSZWZQdHI8UmVzb3VyY2VC dWZmZXI+LCBib29sIGFsbERhdGFSZWNlaXZlZCkKK3ZvaWQgQ2FjaGVkUmVzb3VyY2U6OmRhdGEo UmVzb3VyY2VCdWZmZXIqLCBib29sIGFsbERhdGFSZWNlaXZlZCkKIHsKICAgICBpZiAoIWFsbERh dGFSZWNlaXZlZCkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2UuaAppbmRleCAzMmE1ODhlLi45ZTllNjU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaApAQCAtMTAxLDcgKzEwMSw3IEBA IHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmKSB7 IH0KICAgICB2aXJ0dWFsIFN0cmluZyBlbmNvZGluZygpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygp OyB9Ci0gICAgdmlydHVhbCB2b2lkIGRhdGEoUGFzc1JlZlB0cjxSZXNvdXJjZUJ1ZmZlcj4gZGF0 YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpOworICAgIHZpcnR1YWwgdm9pZCBkYXRhKFJlc291cmNl QnVmZmVyKiwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpOwogICAgIHZpcnR1YWwgdm9pZCBlcnJvcihD YWNoZWRSZXNvdXJjZTo6U3RhdHVzKTsKIAogICAgIHZvaWQgc2V0UmVzb3VyY2VFcnJvcihjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikgeyBtX2Vycm9yID0gZXJyb3I7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTVkdEb2N1bWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRG9jdW1lbnQuY3BwCmluZGV4IGYyYjhl NWEuLjY3MjBiOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRTVkdEb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFNWR0RvY3VtZW50LmNwcApAQCAtNTMsNyArNTMsNyBAQCBTdHJpbmcgQ2FjaGVkU1ZHRG9jdW1l bnQ6OmVuY29kaW5nKCkgY29uc3QKICAgICByZXR1cm4gbV9kZWNvZGVyLT5lbmNvZGluZygpLm5h bWUoKTsKIH0KIAotdm9pZCBDYWNoZWRTVkdEb2N1bWVudDo6ZGF0YShQYXNzUmVmUHRyPFJlc291 cmNlQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKK3ZvaWQgQ2FjaGVkU1ZHRG9j dW1lbnQ6OmRhdGEoUmVzb3VyY2VCdWZmZXIqIGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKQog ewogICAgIGlmICghYWxsRGF0YVJlY2VpdmVkKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRG9jdW1lbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTVkdEb2N1bWVudC5oCmluZGV4IDk5ZmI4Y2Eu LmFiNzAwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRT VkdEb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTVkdE b2N1bWVudC5oCkBAIC00MCw3ICs0MCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBz ZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmKTsKICAgICB2aXJ0dWFsIFN0cmluZyBlbmNvZGluZygp IGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBkYXRhKFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+ IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGF0YShSZXNv dXJjZUJ1ZmZlciosIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKIAogcHJvdGVjdGVkOgogICAgIFJl ZlB0cjxTVkdEb2N1bWVudD4gbV9kb2N1bWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRTY3JpcHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFNjcmlwdC5jcHAKaW5kZXggMTk4ZGQ2NS4uNDJlMTIyOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKQEAgLTgyLDcgKzgyLDcgQEAg Y29uc3QgU3RyaW5nJiBDYWNoZWRTY3JpcHQ6OnNjcmlwdCgpCiAgICAgcmV0dXJuIG1fc2NyaXB0 OwogfQogCi12b2lkIENhY2hlZFNjcmlwdDo6ZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVy PiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKK3ZvaWQgQ2FjaGVkU2NyaXB0OjpkYXRhKFJl c291cmNlQnVmZmVyKiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKIHsKICAgICBpZiAoIWFs bERhdGFSZWNlaXZlZCkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFNjcmlwdC5oCmluZGV4IDVkOGIyN2UuLmQyZjc3Y2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTY3JpcHQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2NyaXB0LmgKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBzZXRFbmNvZGluZyhjb25zdCBT dHJpbmcmKTsKICAgICAgICAgdmlydHVhbCBTdHJpbmcgZW5jb2RpbmcoKSBjb25zdDsKLSAgICAg ICAgdmlydHVhbCB2b2lkIGRhdGEoUGFzc1JlZlB0cjxSZXNvdXJjZUJ1ZmZlcj4gZGF0YSwgYm9v bCBhbGxEYXRhUmVjZWl2ZWQpOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGF0YShSZXNvdXJjZUJ1 ZmZlciosIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKICAgICAgICAgU3RyaW5nIG1pbWVUeXBlKCkg Y29uc3Q7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGRlc3Ryb3lEZWNvZGVkRGF0YSgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNoYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2hhZGVyLmNwcAppbmRleCAyMjIyYzYw Li44Y2UzN2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk U2hhZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2hhZGVy LmNwcApAQCAtNjAsNyArNjAsNyBAQCBjb25zdCBTdHJpbmcmIENhY2hlZFNoYWRlcjo6c2hhZGVy U3RyaW5nKCkKICAgICByZXR1cm4gbV9zaGFkZXJTdHJpbmc7CiB9CiAKLXZvaWQgQ2FjaGVkU2hh ZGVyOjpkYXRhKFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+IGRhdGEsIGJvb2wgYWxsRGF0YVJl Y2VpdmVkKQordm9pZCBDYWNoZWRTaGFkZXI6OmRhdGEoUmVzb3VyY2VCdWZmZXIqIGRhdGEsIGJv b2wgYWxsRGF0YVJlY2VpdmVkKQogewogICAgIGlmIChhbGxEYXRhUmVjZWl2ZWQpCiAgICAgICAg IG1fZGF0YSA9IGRhdGE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkU2hhZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU2hhZGVy LmgKaW5kZXggMTFiOTE4MC4uYmNhNWZmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFNoYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRTaGFkZXIuaApAQCAtNDQsNyArNDQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+ Q2FjaGVkU2hhZGVyKCk7CiAgICAgCiAgICAgY29uc3QgU3RyaW5nJiBzaGFkZXJTdHJpbmcoKTsK LSAgICB2b2lkIGRhdGEoUGFzc1JlZlB0cjxSZXNvdXJjZUJ1ZmZlcj4sIGJvb2wgYWxsRGF0YVJl Y2VpdmVkKTsKKyAgICB2b2lkIGRhdGEoUmVzb3VyY2VCdWZmZXIqLCBib29sIGFsbERhdGFSZWNl aXZlZCk7CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIG1heVRyeVJlcGxhY2VFbmNvZGVk RGF0YSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRUZXh0VHJhY2suY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFRleHRUcmFjay5jcHAKaW5kZXggZjYxNDNkYy4uODYzNDE1 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFRleHRUcmFj ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFRleHRUcmFjay5j cHAKQEAgLTQ4LDcgKzQ4LDcgQEAgQ2FjaGVkVGV4dFRyYWNrOjp+Q2FjaGVkVGV4dFRyYWNrKCkK IHsKIH0KIAotdm9pZCBDYWNoZWRUZXh0VHJhY2s6OmRhdGEoUGFzc1JlZlB0cjxSZXNvdXJjZUJ1 ZmZlcj4gZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCit2b2lkIENhY2hlZFRleHRUcmFjazo6 ZGF0YShSZXNvdXJjZUJ1ZmZlciogZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCiB7CiAgICAg bV9kYXRhID0gZGF0YTsKICAgICBzZXRFbmNvZGVkU2l6ZShtX2RhdGEuZ2V0KCkgPyBtX2RhdGEt PnNpemUoKSA6IDApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFRleHRUcmFjay5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFRleHRU cmFjay5oCmluZGV4IDc4YzZjOTIuLjVjMDJlZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRUZXh0VHJhY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkVGV4dFRyYWNrLmgKQEAgLTM4LDcgKzM4LDcgQEAgcHVibGljOgogICAg IENhY2hlZFRleHRUcmFjayhjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAgICB2aXJ0dWFsIH5D YWNoZWRUZXh0VHJhY2soKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkYXRhKFBhc3NSZWZQdHI8UmVz b3VyY2VCdWZmZXI+IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKKyAgICB2aXJ0dWFsIHZv aWQgZGF0YShSZXNvdXJjZUJ1ZmZlciosIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKIAogcHJpdmF0 ZToKICAgICB2aXJ0dWFsIGJvb2wgbWF5VHJ5UmVwbGFjZUVuY29kZWREYXRhKCkgY29uc3QgT1ZF UlJJREUgeyByZXR1cm4gdHJ1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3BwCmluZGV4IDAwOGNkNTY4Li5lNWFlNDFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQu Y3BwCkBAIC02Myw3ICs2Myw3IEBAIFN0cmluZyBDYWNoZWRYU0xTdHlsZVNoZWV0OjplbmNvZGlu ZygpIGNvbnN0CiAgICAgcmV0dXJuIG1fZGVjb2Rlci0+ZW5jb2RpbmcoKS5uYW1lKCk7CiB9CiAK LXZvaWQgQ2FjaGVkWFNMU3R5bGVTaGVldDo6ZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVy PiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKK3ZvaWQgQ2FjaGVkWFNMU3R5bGVTaGVldDo6 ZGF0YShSZXNvdXJjZUJ1ZmZlciogZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCiB7CiAgICAg aWYgKCFhbGxEYXRhUmVjZWl2ZWQpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRYU0xTdHlsZVNoZWV0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5oCmluZGV4IGRmNmQ5MGYuLmY2 YzM1NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRYU0xT dHlsZVNoZWV0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0 eWxlU2hlZXQuaApAQCAtNDUsNyArNDUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg IAogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RW5jb2RpbmcoY29uc3QgU3RyaW5nJik7CiAgICAg ICAgIHZpcnR1YWwgU3RyaW5nIGVuY29kaW5nKCkgY29uc3Q7Ci0gICAgICAgIHZpcnR1YWwgdm9p ZCBkYXRhKFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2Vp dmVkKTsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRhdGEoUmVzb3VyY2VCdWZmZXIqLCBib29sIGFs bERhdGFSZWNlaXZlZCk7CiAKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIHZpcnR1YWwgdm9pZCBj aGVja05vdGlmeSgpOwo=