197033 2019-04-17 12:59:38 -0700 Make WebCompiledContentRuleListData non-default-constructible, move its nonserialized member to API::ContentRuleList 2019-04-17 15:11:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez thorton webkit-bug-importer oldest_to_newest 1528238 0 achristensen 2019-04-17 12:59:38 -0700 Make WebCompiledContentRuleListData non-default-constructible, move its nonserialized member to API::ContentRuleList 1528246 1 367670 achristensen 2019-04-17 13:18:14 -0700 Created attachment 367670 Patch 1528282 2 achristensen 2019-04-17 15:10:15 -0700 http://trac.webkit.org/r244403 1528283 3 webkit-bug-importer 2019-04-17 15:11:18 -0700 <rdar://problem/49994017> 367670 2019-04-17 13:18:14 -0700 2019-04-17 15:07:56 -0700 Patch bug-197033-20190417131813.patch text/plain 11822 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQzOTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA0LTE3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXZWJDb21w aWxlZENvbnRlbnRSdWxlTGlzdERhdGEgbm9uLWRlZmF1bHQtY29uc3RydWN0aWJsZSwgbW92ZSBp dHMgbm9uc2VyaWFsaXplZCBtZW1iZXIgdG8gQVBJOjpDb250ZW50UnVsZUxpc3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzAzMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMganVzdCBjbGVh bnVwIHRoYXQgbWFrZXMgdGhlIGNvZGUgbmljZXIgd2l0aG91dCBjaGFuZ2luZyBiZWhhdmlvci4K KworICAgICAgICAqIFNoYXJlZC9XZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGEuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGE6OmVuY29kZSBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YTo6 ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRh Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YTo6V2Vi Q29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQ SUNvbnRlbnRSdWxlTGlzdC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1 bGVMaXN0U3RvcmUuY3BwOgorICAgICAgICAoQVBJOjpjcmVhdGVFeHRlbnNpb24pOgorCiAyMDE5 LTA0LTE3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvbnRl bnRDaGFuZ2VPYnNlcnZlcl0gVXNlIGFyaWEgcm9sZSBhcyBhIGhpbnQgd2hldGhlciBhIHRhcCBz aG91bGQgcmVzdWx0IGluIGEgc3ludGhldGljIGNsaWNrCkluZGV4OiBTb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YS5jcHAJKHJl dmlzaW9uIDI0NDM1OSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVu dFJ1bGVMaXN0RGF0YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDkgKzYwLDYgQEAgdm9pZCBX ZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGE6OmVuYwogICAgICAgICBlbmNvZGVyIDw8IElQ Qzo6U2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZSB7ICpXVEY6OmdldDxSZWZQdHI8V2ViQ29yZTo6 U2hhcmVkQnVmZmVyPj4oZGF0YSkgfTsKICAgICB9CiAKLSAgICAvLyBmaWxlRGF0YSBuZWVkcyB0 byBiZSBrZXB0IGluIHRoZSBVSVByb2Nlc3MsIGJ1dCBpdCBkb2VzIG5vdCBuZWVkIHRvIGJlIHNl cmlhbGl6ZWQuCi0gICAgLy8gRklYTUU6IE1vdmUgaXQgdG8gQVBJOjpDb250ZW50UnVsZUxpc3QK LQogICAgIGVuY29kZXIgPDwgY29uZGl0aW9uc0FwcGx5T25seVRvRG9tYWluT2Zmc2V0OwogICAg IGVuY29kZXIgPDwgYWN0aW9uc09mZnNldDsKICAgICBlbmNvZGVyIDw8IGFjdGlvbnNTaXplOwpA QCAtNzYsNDQgKzczLDgyIEBAIHZvaWQgV2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhOjpl bmMKIAogT3B0aW9uYWw8V2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhPiBXZWJDb21waWxl ZENvbnRlbnRSdWxlTGlzdERhdGE6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgV2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhIGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0 RGF0YTsKKyAgICBWYXJpYW50PFJlZlB0cjxTaGFyZWRNZW1vcnk+LCBSZWZQdHI8V2ViQ29yZTo6 U2hhcmVkQnVmZmVyPj4gZGF0YTsKIAogICAgIE9wdGlvbmFsPGJvb2w+IGhhc1NoYXJlZE1lbW9y eTsKICAgICBkZWNvZGVyID4+IGhhc1NoYXJlZE1lbW9yeTsKICAgICBpZiAoIWhhc1NoYXJlZE1l bW9yeSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKwogICAgIGlmICgqaGFzU2hhcmVk TWVtb3J5KSB7CiAgICAgICAgIFNoYXJlZE1lbW9yeTo6SGFuZGxlIGhhbmRsZTsKICAgICAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShoYW5kbGUpKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKLSAgICAgICAgY29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhLmRhdGEgPSB7IFNoYXJl ZE1lbW9yeTo6bWFwKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpQcm90ZWN0aW9uOjpSZWFkT25seSkg fTsKKyAgICAgICAgZGF0YSA9IHsgU2hhcmVkTWVtb3J5OjptYXAoaGFuZGxlLCBTaGFyZWRNZW1v cnk6OlByb3RlY3Rpb246OlJlYWRPbmx5KSB9OwogICAgIH0gZWxzZSB7CiAgICAgICAgIElQQzo6 RGF0YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KGRhdGFSZWZlcmVuY2UpKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICAg ICAgY29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhLmRhdGEgPSB7IFJlZlB0cjxXZWJDb3JlOjpT aGFyZWRCdWZmZXI+KFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGFSZWZlcmVuY2Uu ZGF0YSgpLCBkYXRhUmVmZXJlbmNlLnNpemUoKSkpIH07CisgICAgICAgIGRhdGEgPSB7IFJlZlB0 cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+KFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRh dGFSZWZlcmVuY2UuZGF0YSgpLCBkYXRhUmVmZXJlbmNlLnNpemUoKSkpIH07CiAgICAgfQogCi0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGEuY29uZGl0 aW9uc0FwcGx5T25seVRvRG9tYWluT2Zmc2V0KSkKKyAgICBPcHRpb25hbDx1bnNpZ25lZD4gY29u ZGl0aW9uc0FwcGx5T25seVRvRG9tYWluT2Zmc2V0OworICAgIGRlY29kZXIgPj4gY29uZGl0aW9u c0FwcGx5T25seVRvRG9tYWluT2Zmc2V0OworICAgIGlmICghY29uZGl0aW9uc0FwcGx5T25seVRv RG9tYWluT2Zmc2V0KQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUoY29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhLmFjdGlvbnNPZmZzZXQpKQor CisgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGFjdGlvbnNPZmZzZXQ7CisgICAgZGVjb2RlciA+PiBh Y3Rpb25zT2Zmc2V0OworICAgIGlmICghYWN0aW9uc09mZnNldCkKICAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGNvbXBpbGVkQ29udGVudFJ1bGVM aXN0RGF0YS5hY3Rpb25zU2l6ZSkpCisKKyAgICBPcHRpb25hbDx1bnNpZ25lZD4gYWN0aW9uc1Np emU7CisgICAgZGVjb2RlciA+PiBhY3Rpb25zU2l6ZTsKKyAgICBpZiAoIWFjdGlvbnNTaXplKQog ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoY29t cGlsZWRDb250ZW50UnVsZUxpc3REYXRhLmZpbHRlcnNXaXRob3V0Q29uZGl0aW9uc0J5dGVjb2Rl T2Zmc2V0KSkKKworICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBmaWx0ZXJzV2l0aG91dENvbmRpdGlv bnNCeXRlY29kZU9mZnNldDsKKyAgICBkZWNvZGVyID4+IGZpbHRlcnNXaXRob3V0Q29uZGl0aW9u c0J5dGVjb2RlT2Zmc2V0OworICAgIGlmICghZmlsdGVyc1dpdGhvdXRDb25kaXRpb25zQnl0ZWNv ZGVPZmZzZXQpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKCFkZWNvZGVy LmRlY29kZShjb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGEuZmlsdGVyc1dpdGhvdXRDb25kaXRp b25zQnl0ZWNvZGVTaXplKSkKKworICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBmaWx0ZXJzV2l0aG91 dENvbmRpdGlvbnNCeXRlY29kZVNpemU7CisgICAgZGVjb2RlciA+PiBmaWx0ZXJzV2l0aG91dENv bmRpdGlvbnNCeXRlY29kZVNpemU7CisgICAgaWYgKCFmaWx0ZXJzV2l0aG91dENvbmRpdGlvbnNC eXRlY29kZVNpemUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShjb21waWxlZENvbnRlbnRSdWxlTGlzdERhdGEuZmlsdGVyc1dpdGhDb25kaXRp b25zQnl0ZWNvZGVPZmZzZXQpKQorCisgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGZpbHRlcnNXaXRo Q29uZGl0aW9uc0J5dGVjb2RlT2Zmc2V0OworICAgIGRlY29kZXIgPj4gZmlsdGVyc1dpdGhDb25k aXRpb25zQnl0ZWNvZGVPZmZzZXQ7CisgICAgaWYgKCFmaWx0ZXJzV2l0aENvbmRpdGlvbnNCeXRl Y29kZU9mZnNldCkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YS5maWx0ZXJzV2l0aENvbmRpdGlv bnNCeXRlY29kZVNpemUpKQorCisgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGZpbHRlcnNXaXRoQ29u ZGl0aW9uc0J5dGVjb2RlU2l6ZTsKKyAgICBkZWNvZGVyID4+IGZpbHRlcnNXaXRoQ29uZGl0aW9u c0J5dGVjb2RlU2l6ZTsKKyAgICBpZiAoIWZpbHRlcnNXaXRoQ29uZGl0aW9uc0J5dGVjb2RlU2l6 ZSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YS50b3BVUkxGaWx0ZXJzQnl0ZWNvZGVPZmZzZXQp KQorCisgICAgT3B0aW9uYWw8dW5zaWduZWQ+IHRvcFVSTEZpbHRlcnNCeXRlY29kZU9mZnNldDsK KyAgICBkZWNvZGVyID4+IHRvcFVSTEZpbHRlcnNCeXRlY29kZU9mZnNldDsKKyAgICBpZiAoIXRv cFVSTEZpbHRlcnNCeXRlY29kZU9mZnNldCkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsK LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YS50b3BV UkxGaWx0ZXJzQnl0ZWNvZGVTaXplKSkKKworICAgIE9wdGlvbmFsPHVuc2lnbmVkPiB0b3BVUkxG aWx0ZXJzQnl0ZWNvZGVTaXplOworICAgIGRlY29kZXIgPj4gdG9wVVJMRmlsdGVyc0J5dGVjb2Rl U2l6ZTsKKyAgICBpZiAoIXRvcFVSTEZpbHRlcnNCeXRlY29kZVNpemUpCiAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4gY29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRh OworICAgIHJldHVybiB7eworICAgICAgICBXVEZNb3ZlKGRhdGEpLAorICAgICAgICBXVEZNb3Zl KCpjb25kaXRpb25zQXBwbHlPbmx5VG9Eb21haW5PZmZzZXQpLAorICAgICAgICBXVEZNb3ZlKCph Y3Rpb25zT2Zmc2V0KSwKKyAgICAgICAgV1RGTW92ZSgqYWN0aW9uc1NpemUpLAorICAgICAgICBX VEZNb3ZlKCpmaWx0ZXJzV2l0aG91dENvbmRpdGlvbnNCeXRlY29kZU9mZnNldCksCisgICAgICAg IFdURk1vdmUoKmZpbHRlcnNXaXRob3V0Q29uZGl0aW9uc0J5dGVjb2RlU2l6ZSksCisgICAgICAg IFdURk1vdmUoKmZpbHRlcnNXaXRoQ29uZGl0aW9uc0J5dGVjb2RlT2Zmc2V0KSwKKyAgICAgICAg V1RGTW92ZSgqZmlsdGVyc1dpdGhDb25kaXRpb25zQnl0ZWNvZGVTaXplKSwKKyAgICAgICAgV1RG TW92ZSgqdG9wVVJMRmlsdGVyc0J5dGVjb2RlT2Zmc2V0KSwKKyAgICAgICAgV1RGTW92ZSgqdG9w VVJMRmlsdGVyc0J5dGVjb2RlU2l6ZSkKKyAgICB9fTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb21waWxlZENvbnRlbnRSdWxlTGlz dERhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb21waWxlZENv bnRlbnRSdWxlTGlzdERhdGEuaAkocmV2aXNpb24gMjQ0MzU5KQorKysgU291cmNlL1dlYktpdC9T aGFyZWQvV2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhLmgJKHdvcmtpbmcgY29weSkKQEAg LTI3LDcgKzI3LDYgQEAKIAogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAKLSNpbmNs dWRlICJOZXR3b3JrQ2FjaGVEYXRhLmgiCiAjaW5jbHVkZSAiU2hhcmVkTWVtb3J5LmgiCiAjaW5j bHVkZSA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CkBA IC00MiwxMSArNDEsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViQ29tcGlsZWRD b250ZW50UnVsZUxpc3REYXRhIHsKIHB1YmxpYzoKLSAgICBXZWJDb21waWxlZENvbnRlbnRSdWxl TGlzdERhdGEoKSA9IGRlZmF1bHQ7Ci0KLSAgICBXZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdERh dGEoVmFyaWFudDxSZWZQdHI8U2hhcmVkTWVtb3J5PiwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1 ZmZlcj4+JiYgZGF0YSwgTmV0d29ya0NhY2hlOjpEYXRhIGZpbGVEYXRhLCB1bnNpZ25lZCBjb25k aXRpb25zQXBwbHlPbmx5VG9Eb21haW5PZmZzZXQsIHVuc2lnbmVkIGFjdGlvbnNPZmZzZXQsIHVu c2lnbmVkIGFjdGlvbnNTaXplLCB1bnNpZ25lZCBmaWx0ZXJzV2l0aG91dENvbmRpdGlvbnNCeXRl Y29kZU9mZnNldCwgdW5zaWduZWQgZmlsdGVyc1dpdGhvdXRDb25kaXRpb25zQnl0ZWNvZGVTaXpl LCB1bnNpZ25lZCBmaWx0ZXJzV2l0aENvbmRpdGlvbnNCeXRlY29kZU9mZnNldCwgdW5zaWduZWQg ZmlsdGVyc1dpdGhDb25kaXRpb25zQnl0ZWNvZGVTaXplLCB1bnNpZ25lZCB0b3BVUkxGaWx0ZXJz Qnl0ZWNvZGVPZmZzZXQsIHVuc2lnbmVkIHRvcFVSTEZpbHRlcnNCeXRlY29kZVNpemUpCisgICAg V2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhKFZhcmlhbnQ8UmVmUHRyPFNoYXJlZE1lbW9y eT4sIFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+PiYmIGRhdGEsIHVuc2lnbmVkIGNvbmRp dGlvbnNBcHBseU9ubHlUb0RvbWFpbk9mZnNldCwgdW5zaWduZWQgYWN0aW9uc09mZnNldCwgdW5z aWduZWQgYWN0aW9uc1NpemUsIHVuc2lnbmVkIGZpbHRlcnNXaXRob3V0Q29uZGl0aW9uc0J5dGVj b2RlT2Zmc2V0LCB1bnNpZ25lZCBmaWx0ZXJzV2l0aG91dENvbmRpdGlvbnNCeXRlY29kZVNpemUs IHVuc2lnbmVkIGZpbHRlcnNXaXRoQ29uZGl0aW9uc0J5dGVjb2RlT2Zmc2V0LCB1bnNpZ25lZCBm aWx0ZXJzV2l0aENvbmRpdGlvbnNCeXRlY29kZVNpemUsIHVuc2lnbmVkIHRvcFVSTEZpbHRlcnNC eXRlY29kZU9mZnNldCwgdW5zaWduZWQgdG9wVVJMRmlsdGVyc0J5dGVjb2RlU2l6ZSkKICAgICAg ICAgOiBkYXRhKFdURk1vdmUoZGF0YSkpCi0gICAgICAgICwgZmlsZURhdGEoZmlsZURhdGEpCiAg ICAgICAgICwgY29uZGl0aW9uc0FwcGx5T25seVRvRG9tYWluT2Zmc2V0KGNvbmRpdGlvbnNBcHBs eU9ubHlUb0RvbWFpbk9mZnNldCkKICAgICAgICAgLCBhY3Rpb25zT2Zmc2V0KGFjdGlvbnNPZmZz ZXQpCiAgICAgICAgICwgYWN0aW9uc1NpemUoYWN0aW9uc1NpemUpCkBAIC02Niw3ICs2Miw2IEBA IHB1YmxpYzoKICAgICBjb25zdCB2b2lkKiBkYXRhUG9pbnRlcigpIGNvbnN0OwogICAgIAogICAg IFZhcmlhbnQ8UmVmUHRyPFNoYXJlZE1lbW9yeT4sIFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZm ZXI+PiBkYXRhOwotICAgIE5ldHdvcmtDYWNoZTo6RGF0YSBmaWxlRGF0YTsKICAgICB1bnNpZ25l ZCBjb25kaXRpb25zQXBwbHlPbmx5VG9Eb21haW5PZmZzZXQgeyAwIH07CiAgICAgdW5zaWduZWQg YWN0aW9uc09mZnNldCB7IDAgfTsKICAgICB1bnNpZ25lZCBhY3Rpb25zU2l6ZSB7IDAgfTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3QuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxp c3QuY3BwCShyZXZpc2lvbiAyNDQzNTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJQ29udGVudFJ1bGVMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsOSArMzIsMTAgQEAK IAogbmFtZXNwYWNlIEFQSSB7CiAKLUNvbnRlbnRSdWxlTGlzdDo6Q29udGVudFJ1bGVMaXN0KGNv bnN0IFdURjo6U3RyaW5nJiBuYW1lLCBSZWY8V2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRSdWxl TGlzdD4mJiBjb250ZW50UnVsZUxpc3QpCitDb250ZW50UnVsZUxpc3Q6OkNvbnRlbnRSdWxlTGlz dChjb25zdCBXVEY6OlN0cmluZyYgbmFtZSwgUmVmPFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50 UnVsZUxpc3Q+JiYgY29udGVudFJ1bGVMaXN0LCBXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RGF0YSYm IG1hcHBlZEZpbGUpCiAgICAgOiBtX25hbWUobmFtZSkKICAgICAsIG1fY29tcGlsZWRSdWxlTGlz dChXVEZNb3ZlKGNvbnRlbnRSdWxlTGlzdCkpCisgICAgLCBtX21hcHBlZEZpbGUoV1RGTW92ZSht YXBwZWRGaWxlKSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SUNvbnRlbnRSdWxlTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9BUElDb250ZW50UnVsZUxpc3QuaAkocmV2aXNpb24gMjQ0MzU5KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNiw2ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkFQSU9iamVjdC5oIgor I2luY2x1ZGUgIk5ldHdvcmtDYWNoZURhdGEuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJp bmcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0zNywxMiArMzgsMTIgQEAgbmFtZXNwYWNl IEFQSSB7CiBjbGFzcyBDb250ZW50UnVsZUxpc3QgZmluYWwgOiBwdWJsaWMgT2JqZWN0SW1wbDxP YmplY3Q6OlR5cGU6OkNvbnRlbnRSdWxlTGlzdD4gewogcHVibGljOgogI2lmIEVOQUJMRShDT05U RU5UX0VYVEVOU0lPTlMpCi0gICAgc3RhdGljIFJlZjxDb250ZW50UnVsZUxpc3Q+IGNyZWF0ZShj b25zdCBXVEY6OlN0cmluZyYgbmFtZSwgUmVmPFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50UnVs ZUxpc3Q+JiYgY29udGVudFJ1bGVMaXN0KQorICAgIHN0YXRpYyBSZWY8Q29udGVudFJ1bGVMaXN0 PiBjcmVhdGUoY29uc3QgV1RGOjpTdHJpbmcmIG5hbWUsIFJlZjxXZWJLaXQ6OldlYkNvbXBpbGVk Q29udGVudFJ1bGVMaXN0PiYmIGNvbnRlbnRSdWxlTGlzdCwgV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkRhdGEmJiBtYXBwZWRGaWxlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg Q29udGVudFJ1bGVMaXN0KG5hbWUsIFdURk1vdmUoY29udGVudFJ1bGVMaXN0KSkpOworICAgICAg ICByZXR1cm4gYWRvcHRSZWYoKm5ldyBDb250ZW50UnVsZUxpc3QobmFtZSwgV1RGTW92ZShjb250 ZW50UnVsZUxpc3QpLCBXVEZNb3ZlKG1hcHBlZEZpbGUpKSk7CiAgICAgfQogCi0gICAgQ29udGVu dFJ1bGVMaXN0KGNvbnN0IFdURjo6U3RyaW5nJiBuYW1lLCBSZWY8V2ViS2l0OjpXZWJDb21waWxl ZENvbnRlbnRSdWxlTGlzdD4mJik7CisgICAgQ29udGVudFJ1bGVMaXN0KGNvbnN0IFdURjo6U3Ry aW5nJiBuYW1lLCBSZWY8V2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdD4mJiwgV2Vi S2l0OjpOZXR3b3JrQ2FjaGU6OkRhdGEmJik7CiAgICAgdmlydHVhbCB+Q29udGVudFJ1bGVMaXN0 KCk7CiAKICAgICBjb25zdCBXVEY6OlN0cmluZyYgbmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbmFt ZTsgfQpAQCAtNTMsNiArNTQsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdURjo6U3RyaW5n IG1fbmFtZTsKICAgICBSZWY8V2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRSdWxlTGlzdD4gbV9j b21waWxlZFJ1bGVMaXN0OworICAgIFdlYktpdDo6TmV0d29ya0NhY2hlOjpEYXRhIG1fbWFwcGVk RmlsZTsKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQogfTsKIApJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVM aXN0U3RvcmUuY3BwCShyZXZpc2lvbiAyNDQzNTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Mzks NyArNDM5LDYgQEAgc3RhdGljIFJlZjxBUEk6OkNvbnRlbnRSdWxlTGlzdD4gY3JlYXRlRQogICAg IGNvbnN0IHNpemVfdCBoZWFkZXJBbmRTb3VyY2VTaXplID0gQ29udGVudFJ1bGVMaXN0RmlsZUhl YWRlclNpemUgKyBkYXRhLm1ldGFEYXRhLnNvdXJjZVNpemU7CiAgICAgYXV0byBjb21waWxlZENv bnRlbnRSdWxlTGlzdERhdGEgPSBXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0 YSgKICAgICAgICAgV1RGTW92ZShtYXBwZWRPckNvcGllZEZpbGVEYXRhKSwKLSAgICAgICAgV1RG Ojpob2xkc19hbHRlcm5hdGl2ZTxXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RGF0YT4oZGF0YS5kYXRh KSA/IFdURjo6Z2V0PFdlYktpdDo6TmV0d29ya0NhY2hlOjpEYXRhPihkYXRhLmRhdGEpIDogV2Vi S2l0OjpOZXR3b3JrQ2FjaGU6OkRhdGEgeyB9LAogICAgICAgICBDb25kaXRpb25zQXBwbHlPbmx5 VG9Eb21haW5PZmZzZXQsCiAgICAgICAgIGhlYWRlckFuZFNvdXJjZVNpemUsCiAgICAgICAgIGRh dGEubWV0YURhdGEuYWN0aW9uc1NpemUsCkBAIC00NTcsNyArNDU2LDcgQEAgc3RhdGljIFJlZjxB UEk6OkNvbnRlbnRSdWxlTGlzdD4gY3JlYXRlRQogICAgICAgICBkYXRhLm1ldGFEYXRhLmNvbmRp dGlvbmVkRmlsdGVyc0J5dGVjb2RlU2l6ZQogICAgICk7CiAgICAgYXV0byBjb21waWxlZENvbnRl bnRSdWxlTGlzdCA9IFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3Q6OmNyZWF0ZShX VEZNb3ZlKGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0RGF0YSkpOwotICAgIHJldHVybiBBUEk6OkNv bnRlbnRSdWxlTGlzdDo6Y3JlYXRlKGlkZW50aWZpZXIsIFdURk1vdmUoY29tcGlsZWRDb250ZW50 UnVsZUxpc3QpKTsKKyAgICByZXR1cm4gQVBJOjpDb250ZW50UnVsZUxpc3Q6OmNyZWF0ZShpZGVu dGlmaWVyLCBXVEZNb3ZlKGNvbXBpbGVkQ29udGVudFJ1bGVMaXN0KSwgV1RGOjpob2xkc19hbHRl cm5hdGl2ZTxXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RGF0YT4oZGF0YS5kYXRhKSA/IFdURjo6Z2V0 PFdlYktpdDo6TmV0d29ya0NhY2hlOjpEYXRhPihkYXRhLmRhdGEpIDogV2ViS2l0OjpOZXR3b3Jr Q2FjaGU6OkRhdGEgeyB9KTsKIH0KIAogdm9pZCBDb250ZW50UnVsZUxpc3RTdG9yZTo6bG9va3Vw Q29udGVudFJ1bGVMaXN0KGNvbnN0IFdURjo6U3RyaW5nJiBpZGVudGlmaWVyLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFJlZlB0cjxBUEk6OkNvbnRlbnRSdWxlTGlzdD4sIHN0ZDo6ZXJyb3JfY29k ZSk+IGNvbXBsZXRpb25IYW5kbGVyKQo=