150123 2015-10-14 10:05:48 -0700 Change the bundle app cache APIs to take a page 2015-10-14 10:23:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1133150 0 andersca 2015-10-14 10:05:48 -0700 Change the bundle app cache APIs to take a page 1133152 1 263083 andersca 2015-10-14 10:08:12 -0700 Created attachment 263083 Patch 1133161 2 andersca 2015-10-14 10:23:45 -0700 Committed r191047: <http://trac.webkit.org/changeset/191047> 263083 2015-10-14 10:08:12 -0700 2015-10-14 10:17:57 -0700 Patch bug-150123-20151014100740.patch text/plain 18957 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzM5MzczZWRjNTlmMjUy YWRkODMzMzllNGE1ZTA3OWMzMmI4ODNiZC4uZDRjMTNmOTU2Zjg4NGRiZDI1NjhmNzljN2M1YzQ3 MmRkMjM1MjI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTEwLTE0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlIHRoZSBi dW5kbGUgYXBwIGNhY2hlIEFQSXMgdG8gdGFrZSBhIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDEyMworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYW5vdGhlciBzdGVwIHRvd2FyZHMg Z2V0dGluZyByaWQgb2YgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLgorICAg ICAgICBJZGVhbGx5IHRoZSBXS1RSIHRlc3RzIHRoYXQgdXNlIHRoaXMgc2hvdWxkIGJlIGNvbnZl cnRlZCB0byBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlQ2xlYXJBcHBsaWNhdGlvbkNh Y2hlKTogRGVsZXRlZC4KKyAgICAgICAgKFdLQnVuZGxlQ2xlYXJBcHBsaWNhdGlvbkNhY2hlRm9y T3JpZ2luKTogRGVsZXRlZC4KKyAgICAgICAgKFdLQnVuZGxlU2V0QXBwQ2FjaGVNYXhpbXVtU2l6 ZSk6IERlbGV0ZWQuCisgICAgICAgIChXS0J1bmRsZUdldEFwcENhY2hlVXNhZ2VGb3JPcmlnaW4p OiBEZWxldGVkLgorICAgICAgICAoV0tCdW5kbGVTZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVv dGEpOiBEZWxldGVkLgorICAgICAgICAoV0tCdW5kbGVSZXNldEFwcGxpY2F0aW9uQ2FjaGVPcmln aW5RdW90YSk6IERlbGV0ZWQuCisgICAgICAgIChXS0J1bmRsZUNvcHlPcmlnaW5zV2l0aEFwcGxp Y2F0aW9uQ2FjaGUpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlUGFnZUNsZWFyQXBw bGljYXRpb25DYWNoZSk6CisgICAgICAgIChXS0J1bmRsZVBhZ2VDbGVhckFwcGxpY2F0aW9uQ2Fj aGVGb3JPcmlnaW4pOgorICAgICAgICAoV0tCdW5kbGVQYWdlU2V0QXBwQ2FjaGVNYXhpbXVtU2l6 ZSk6CisgICAgICAgIChXS0J1bmRsZVBhZ2VHZXRBcHBDYWNoZVVzYWdlRm9yT3JpZ2luKToKKyAg ICAgICAgKFdLQnVuZGxlUGFnZVNldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YSk6CisgICAg ICAgIChXS0J1bmRsZVBhZ2VSZXNldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YSk6CisgICAg ICAgIChXS0J1bmRsZVBhZ2VDb3B5T3JpZ2luc1dpdGhBcHBsaWNhdGlvbkNhY2hlKToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUHJp dmF0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6Y2xlYXJBcHBsaWNhdGlv bkNhY2hlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OmNsZWFy QXBwbGljYXRpb25DYWNoZUZvck9yaWdpbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6Oklu amVjdGVkQnVuZGxlOjpzZXRBcHBDYWNoZU1heGltdW1TaXplKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OmFwcENhY2hlVXNhZ2VGb3JPcmlnaW4pOiBEZWxldGVk LgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6c2V0QXBwbGljYXRpb25DYWNoZU9y aWdpblF1b3RhKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OnJl c2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktp dDo6SW5qZWN0ZWRCdW5kbGU6Om9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNoZSk6IERlbGV0ZWQu CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oOgor CiAyMDE1LTEwLTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4K IAogICAgICAgICBGb3JtYXQgc3RyaW5nIGlzc3VlcyBpbiBOZXR3b3JrQ2FjaGUuY3BwCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dL QnVuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGUuY3BwCmluZGV4IDQzMmVkYzY4ODNkNTZiMzI1OWI5ZmQyYmZkNzkzNjc2ZmNi Y2I5YTUuLmRiZThjMTVlOGQ1ODBmODYwMjY3MDEzM2ExNmZmZGM5MDgxODU0N2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5k bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGUuY3BwCkBAIC0yMDgsNDIgKzIwOCw2IEBAIHZvaWQgV0tCdW5kbGVTZXREYXRh YmFzZVF1b3RhKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZiwgdWludDY0X3QgcXVvdGEpCiAgICAgdG9J bXBsKGJ1bmRsZVJlZiktPnNldERhdGFiYXNlUXVvdGEocXVvdGEpOwogfQogCi12b2lkIFdLQnVu ZGxlQ2xlYXJBcHBsaWNhdGlvbkNhY2hlKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZikKLXsKLSAgICB0 b0ltcGwoYnVuZGxlUmVmKS0+Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKCk7Ci19Ci0KLXZvaWQgV0tC dW5kbGVDbGVhckFwcGxpY2F0aW9uQ2FjaGVGb3JPcmlnaW4oV0tCdW5kbGVSZWYgYnVuZGxlUmVm LCBXS1N0cmluZ1JlZiBvcmlnaW4pCi17Ci0gICAgdG9JbXBsKGJ1bmRsZVJlZiktPmNsZWFyQXBw bGljYXRpb25DYWNoZUZvck9yaWdpbih0b1dURlN0cmluZyhvcmlnaW4pKTsKLX0KLQotdm9pZCBX S0J1bmRsZVNldEFwcENhY2hlTWF4aW11bVNpemUoV0tCdW5kbGVSZWYgYnVuZGxlUmVmLCB1aW50 NjRfdCBzaXplKQotewotICAgIHRvSW1wbChidW5kbGVSZWYpLT5zZXRBcHBDYWNoZU1heGltdW1T aXplKHNpemUpOwotfQotCi11aW50NjRfdCBXS0J1bmRsZUdldEFwcENhY2hlVXNhZ2VGb3JPcmln aW4oV0tCdW5kbGVSZWYgYnVuZGxlUmVmLCBXS1N0cmluZ1JlZiBvcmlnaW4pCi17Ci0gICAgcmV0 dXJuIHRvSW1wbChidW5kbGVSZWYpLT5hcHBDYWNoZVVzYWdlRm9yT3JpZ2luKHRvV1RGU3RyaW5n KG9yaWdpbikpOwotfQotCi12b2lkIFdLQnVuZGxlU2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1 b3RhKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZiwgV0tTdHJpbmdSZWYgb3JpZ2luLCB1aW50NjRfdCBi eXRlcykKLXsKLSAgICB0b0ltcGwoYnVuZGxlUmVmKS0+c2V0QXBwbGljYXRpb25DYWNoZU9yaWdp blF1b3RhKHRvV1RGU3RyaW5nKG9yaWdpbiksIGJ5dGVzKTsKLX0KLQotdm9pZCBXS0J1bmRsZVJl c2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZiwgV0tT dHJpbmdSZWYgb3JpZ2luKQotewotICAgIHRvSW1wbChidW5kbGVSZWYpLT5yZXNldEFwcGxpY2F0 aW9uQ2FjaGVPcmlnaW5RdW90YSh0b1dURlN0cmluZyhvcmlnaW4pKTsKLX0KLQotV0tBcnJheVJl ZiBXS0J1bmRsZUNvcHlPcmlnaW5zV2l0aEFwcGxpY2F0aW9uQ2FjaGUoV0tCdW5kbGVSZWYgYnVu ZGxlUmVmKQotewotICAgIFJlZlB0cjxBUEk6OkFycmF5PiBvcmlnaW5zID0gdG9JbXBsKGJ1bmRs ZVJlZiktPm9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNoZSgpOwotICAgIHJldHVybiB0b0FQSShv cmlnaW5zLnJlbGVhc2UoKS5sZWFrUmVmKCkpOwotfQotCiBXS0RhdGFSZWYgV0tCdW5kbGVDcmVh dGVXS0RhdGFGcm9tVUludDhBcnJheShXS0J1bmRsZVJlZiBidW5kbGUsIEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU1ZhbHVlUmVmIGRhdGEpCiB7CiAgICAgcmV0dXJuIHRvQVBJKHRvSW1wbChidW5k bGUpLT5jcmVhdGVXZWJEYXRhRnJvbVVpbnQ4QXJyYXkoY29udGV4dCwgZGF0YSkubGVha1JlZigp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2MvV0tCdW5kbGVQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcAppbmRleCBhODZlNTgyMzQ2ZjU2N2YyZjdk NDcyODA1ZmZlZjZkYTgzMDU4YjI1Li5jNmY1OGE4YzI5NTM1MTI1OGU0OTVlY2Q5Y2FiZGQyNGE2 ZjdjZDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCkBAIC01NCw2ICs1NCw3IEBA CiAjaW5jbHVkZSAiV2ViUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9BWE9iamVj dENhY2hlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg+CisjaW5j bHVkZSA8V2ViQ29yZS9BcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oPgogI2luY2x1ZGUgPFdlYkNv cmUvTWFpbkZyYW1lLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9QYWdlT3ZlcmxheS5oPgpAQCAtNjM1LDMgKzYzNiw0NyBAQCBXS1N0cmluZ1JlZiBXS0J1 bmRsZVBhZ2VDb3B5R3JvdXBJZGVudGlmaWVyKFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVmKQogewog ICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwocGFnZVJlZiktPnBhZ2VHcm91cCgpLT5pZGVu dGlmaWVyKCkpOwogfQorCit2b2lkIFdLQnVuZGxlUGFnZUNsZWFyQXBwbGljYXRpb25DYWNoZShX S0J1bmRsZVBhZ2VSZWYgcGFnZSkKK3sKKyAgICB0b0ltcGwocGFnZSktPmNvcmVQYWdlKCktPmFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuZGVsZXRlQWxsRW50cmllcygpOworfQorCit2b2lkIFdL QnVuZGxlUGFnZUNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbihXS0J1bmRsZVBhZ2VSZWYg cGFnZSwgV0tTdHJpbmdSZWYgb3JpZ2luKQoreworICAgIHRvSW1wbChwYWdlKS0+Y29yZVBhZ2Uo KS0+YXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5kZWxldGVDYWNoZUZvck9yaWdpbihXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyh0b0ltcGwob3JpZ2luKS0+c3RyaW5n KCkpKTsKK30KKwordm9pZCBXS0J1bmRsZVBhZ2VTZXRBcHBDYWNoZU1heGltdW1TaXplKFdLQnVu ZGxlUGFnZVJlZiBwYWdlLCB1aW50NjRfdCBzaXplKQoreworICAgIHRvSW1wbChwYWdlKS0+Y29y ZVBhZ2UoKS0+YXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5zZXRNYXhpbXVtU2l6ZShzaXplKTsK K30KKwordWludDY0X3QgV0tCdW5kbGVQYWdlR2V0QXBwQ2FjaGVVc2FnZUZvck9yaWdpbihXS0J1 bmRsZVBhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgb3JpZ2luKQoreworICAgIHJldHVybiB0b0lt cGwocGFnZSktPmNvcmVQYWdlKCktPmFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuZGlza1VzYWdl Rm9yT3JpZ2luKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tU3RyaW5nKHRvSW1w bChvcmlnaW4pLT5zdHJpbmcoKSkpOworfQorCit2b2lkIFdLQnVuZGxlUGFnZVNldEFwcGxpY2F0 aW9uQ2FjaGVPcmlnaW5RdW90YShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgb3Jp Z2luLCB1aW50NjRfdCBieXRlcykKK3sKKyAgICB0b0ltcGwocGFnZSktPmNvcmVQYWdlKCktPmFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuc3RvcmVVcGRhdGVkUXVvdGFGb3JPcmlnaW4oV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcodG9JbXBsKG9yaWdpbiktPnN0cmlu ZygpKS5wdHIoKSwgYnl0ZXMpOworfQorCit2b2lkIFdLQnVuZGxlUGFnZVJlc2V0QXBwbGljYXRp b25DYWNoZU9yaWdpblF1b3RhKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBvcmln aW4pCit7CisgICAgdG9JbXBsKHBhZ2UpLT5jb3JlUGFnZSgpLT5hcHBsaWNhdGlvbkNhY2hlU3Rv cmFnZSgpLnN0b3JlVXBkYXRlZFF1b3RhRm9yT3JpZ2luKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu OjpjcmVhdGVGcm9tU3RyaW5nKHRvSW1wbChvcmlnaW4pLT5zdHJpbmcoKSkucHRyKCksIHRvSW1w bChwYWdlKS0+Y29yZVBhZ2UoKS0+YXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5kZWZhdWx0T3Jp Z2luUXVvdGEoKSk7Cit9CisKK1dLQXJyYXlSZWYgV0tCdW5kbGVQYWdlQ29weU9yaWdpbnNXaXRo QXBwbGljYXRpb25DYWNoZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSkKK3sKKyAgICBIYXNoU2V0PFJl ZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnM7CisgICAgdG9JbXBsKHBhZ2Up LT5jb3JlUGFnZSgpLT5hcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLmdldE9yaWdpbnNXaXRoQ2Fj aGUob3JpZ2lucyk7CisKKyAgICBWZWN0b3I8UmVmUHRyPEFQSTo6T2JqZWN0Pj4gb3JpZ2luSWRl bnRpZmllcnM7CisgICAgb3JpZ2luSWRlbnRpZmllcnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShv cmlnaW5zLnNpemUoKSk7CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IG9yaWdpbnMp CisgICAgICAgIG9yaWdpbklkZW50aWZpZXJzLnVuY2hlY2tlZEFwcGVuZChBUEk6OlN0cmluZzo6 Y3JlYXRlKG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpKTsKKworICAgIHJldHVybiB0b0FQ SSgmQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShvcmlnaW5JZGVudGlmaWVycykpLmxlYWtS ZWYoKSk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oCmluZGV4IGNk Y2QxNTVkNTJhZDY2ZjRjNDExOTFiMGMxNGRlYjVlMzdjYjIzMTQuLjZlMDBhYmI1NDFkYzMyNDYw YjIxNTNiYzU3YzM4Yjc5MWU5MzMwMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl UHJpdmF0ZS5oCkBAIC0xMDAsNiArMTAwLDE1IEBAIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFn ZUFkZFVzZXJTY3JpcHQoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHNvdXJjCiBX S19FWFBPUlQgdm9pZCBXS0J1bmRsZVBhZ2VBZGRVc2VyU3R5bGVTaGVldChXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgc291cmNlLCBXS1VzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMg aW5qZWN0ZWRGcmFtZXMpOwogV0tfRVhQT1JUIHZvaWQgV0tCdW5kbGVQYWdlUmVtb3ZlQWxsVXNl ckNvbnRlbnQoV0tCdW5kbGVQYWdlUmVmIHBhZ2UpOwogCisvLyBBcHBsaWNhdGlvbiBDYWNoZSBB UEksIGZvciBXS1RSLgorV0tfRVhQT1JUIHZvaWQgV0tCdW5kbGVQYWdlQ2xlYXJBcHBsaWNhdGlv bkNhY2hlKFdLQnVuZGxlUGFnZVJlZiBwYWdlKTsKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFn ZUNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbihXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tT dHJpbmdSZWYgb3JpZ2luKTsKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZVNldEFwcENhY2hl TWF4aW11bVNpemUoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIHVpbnQ2NF90IHNpemUpOworV0tfRVhQ T1JUIHVpbnQ2NF90IFdLQnVuZGxlUGFnZUdldEFwcENhY2hlVXNhZ2VGb3JPcmlnaW4oV0tCdW5k bGVQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG9yaWdpbik7CitXS19FWFBPUlQgdm9pZCBXS0J1 bmRsZVBhZ2VTZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEoV0tCdW5kbGVQYWdlUmVmIHBh Z2UsIFdLU3RyaW5nUmVmIG9yaWdpbiwgdWludDY0X3QgYnl0ZXMpOworV0tfRVhQT1JUIHZvaWQg V0tCdW5kbGVQYWdlUmVzZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG9yaWdpbik7CitXS19FWFBPUlQgV0tBcnJheVJlZiBXS0J1 bmRsZVBhZ2VDb3B5T3JpZ2luc1dpdGhBcHBsaWNhdGlvbkNhY2hlKFdLQnVuZGxlUGFnZVJlZiBw YWdlKTsKKwogI2lmIFRBUkdFVF9PU19JUEhPTkUKIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFn ZVNldFVzZVRlc3RpbmdWaWV3cG9ydENvbmZpZ3VyYXRpb24oV0tCdW5kbGVQYWdlUmVmLCBib29s KTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQcml2YXRlLmgKaW5kZXggNTBmNzE4MDg3 MjZlZjRlMTVhYjY0OTM4ZjU0MGYyMDc1OGYyNDA0MS4uMjA1ZTcyYWI5NWE3YjlkNTVmOTU5Yjkx MjI1ODc2NzBhMWJlNTg1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9J bmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUHJpdmF0ZS5oCkBAIC04 MCwxNSArODAsNiBAQCBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVJlbW92ZUFsbFVzZXJDb250ZW50 KFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tCdW5kbGVQYWdlR3JvdQogV0tfRVhQT1JUIHZvaWQgV0tC dW5kbGVDbGVhckFsbERhdGFiYXNlcyhXS0J1bmRsZVJlZiBidW5kbGUpOwogV0tfRVhQT1JUIHZv aWQgV0tCdW5kbGVTZXREYXRhYmFzZVF1b3RhKFdLQnVuZGxlUmVmIGJ1bmRsZSwgdWludDY0X3Qp OwogCi0vLyBBcHBsaWNhdGlvbiBDYWNoZSBBUEkKLVdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlQ2xl YXJBcHBsaWNhdGlvbkNhY2hlKFdLQnVuZGxlUmVmIGJ1bmRsZSk7Ci1XS19FWFBPUlQgdm9pZCBX S0J1bmRsZUNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbihXS0J1bmRsZVJlZiBidW5kbGUs IFdLU3RyaW5nUmVmIG9yaWdpbik7Ci1XS19FWFBPUlQgdm9pZCBXS0J1bmRsZVNldEFwcENhY2hl TWF4aW11bVNpemUoV0tCdW5kbGVSZWYgYnVuZGxlLCB1aW50NjRfdCBzaXplKTsKLVdLX0VYUE9S VCB1aW50NjRfdCBXS0J1bmRsZUdldEFwcENhY2hlVXNhZ2VGb3JPcmlnaW4oV0tCdW5kbGVSZWYg YnVuZGxlLCBXS1N0cmluZ1JlZiBvcmlnaW4pOwotV0tfRVhQT1JUIHZvaWQgV0tCdW5kbGVTZXRB cHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0cmluZ1Jl ZiBvcmlnaW4sIHVpbnQ2NF90IGJ5dGVzKTsKLVdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUmVzZXRB cHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0cmluZ1Jl ZiBvcmlnaW4pOwotV0tfRVhQT1JUIFdLQXJyYXlSZWYgV0tCdW5kbGVDb3B5T3JpZ2luc1dpdGhB cHBsaWNhdGlvbkNhY2hlKFdLQnVuZGxlUmVmIGJ1bmRsZSk7Ci0KIC8vIEdhcmJhZ2UgY29sbGVj dGlvbiBBUEkKIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlR2FyYmFnZUNvbGxlY3RKYXZhU2NyaXB0 T2JqZWN0cyhXS0J1bmRsZVJlZiBidW5kbGUpOwogV0tfRVhQT1JUIHZvaWQgV0tCdW5kbGVHYXJi YWdlQ29sbGVjdEphdmFTY3JpcHRPYmplY3RzT25BbHRlcm5hdGVUaHJlYWRGb3JEZWJ1Z2dpbmco V0tCdW5kbGVSZWYgYnVuZGxlLCBib29sIHdhaXRVbnRpbERvbmUpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl LmNwcAppbmRleCAyNDQ0MDFiYWIzZDkzOTVhMWMzZjJjNTg1MGVmMjEyMWRjMWRlNmU0Li5kZWQ3 YWRiYWZmMTkxZTk4OTNiYmE4MWY2NWU1NjgyZGMwODk1ZGZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl LmNwcApAQCAtMzUwLDUzICszNTAsNiBAQCB2b2lkIEluamVjdGVkQnVuZGxlOjpzZXREYXRhYmFz ZVF1b3RhKHVpbnQ2NF90IHF1b3RhKQogICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBs ZW1lbnQ8V2ViRGF0YWJhc2VNYW5hZ2VyPigpLT5zZXRRdW90YUZvck9yaWdpbigiZmlsZV9fMCIs IHF1b3RhKTsKIH0KIAotdm9pZCBJbmplY3RlZEJ1bmRsZTo6Y2xlYXJBcHBsaWNhdGlvbkNhY2hl KCkKLXsKLSAgICBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuZGVsZXRlQWxs RW50cmllcygpOwotfQotCi12b2lkIEluamVjdGVkQnVuZGxlOjpjbGVhckFwcGxpY2F0aW9uQ2Fj aGVGb3JPcmlnaW4oY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcpCi17Ci0gICAgQXBwbGljYXRp b25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLmRlbGV0ZUNhY2hlRm9yT3JpZ2luKFNlY3VyaXR5 T3JpZ2luOjpjcmVhdGVGcm9tU3RyaW5nKG9yaWdpblN0cmluZykpOwotfQotCi12b2lkIEluamVj dGVkQnVuZGxlOjpzZXRBcHBDYWNoZU1heGltdW1TaXplKHVpbnQ2NF90IHNpemUpCi17Ci0gICAg QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLnNldE1heGltdW1TaXplKHNpemUp OwotfQotCi11aW50NjRfdCBJbmplY3RlZEJ1bmRsZTo6YXBwQ2FjaGVVc2FnZUZvck9yaWdpbihj b25zdCBTdHJpbmcmIG9yaWdpblN0cmluZykKLXsKLSAgICByZXR1cm4gQXBwbGljYXRpb25DYWNo ZVN0b3JhZ2U6OnNpbmdsZXRvbigpLmRpc2tVc2FnZUZvck9yaWdpbihTZWN1cml0eU9yaWdpbjo6 Y3JlYXRlRnJvbVN0cmluZyhvcmlnaW5TdHJpbmcpKTsKLX0KLQotdm9pZCBJbmplY3RlZEJ1bmRs ZTo6c2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKGNvbnN0IFN0cmluZyYgb3JpZ2luU3Ry aW5nLCB1aW50NjRfdCBieXRlcykKLXsKLSAgICBSZWY8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9 IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tU3RyaW5nKG9yaWdpblN0cmluZyk7Ci0gICAgQXBw bGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLnN0b3JlVXBkYXRlZFF1b3RhRm9yT3Jp Z2luKG9yaWdpbi5wdHIoKSwgYnl0ZXMpOwotfQotCi12b2lkIEluamVjdGVkQnVuZGxlOjpyZXNl dEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YShjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZykK LXsKLSAgICBSZWY8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVh dGVGcm9tU3RyaW5nKG9yaWdpblN0cmluZyk7Ci0gICAgYXV0byYgY2FjaGVTdG9yYWdlID0gQXBw bGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpOwotICAgIGNhY2hlU3RvcmFnZS5zdG9y ZVVwZGF0ZWRRdW90YUZvck9yaWdpbihvcmlnaW4ucHRyKCksIGNhY2hlU3RvcmFnZS5kZWZhdWx0 T3JpZ2luUXVvdGEoKSk7Ci19Ci0KLVBhc3NSZWZQdHI8QVBJOjpBcnJheT4gSW5qZWN0ZWRCdW5k bGU6Om9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNoZSgpCi17Ci0gICAgSGFzaFNldDxSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zOwotICAgIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpz aW5nbGV0b24oKS5nZXRPcmlnaW5zV2l0aENhY2hlKG9yaWdpbnMpOwotCi0gICAgVmVjdG9yPFJl ZlB0cjxBUEk6Ok9iamVjdD4+IG9yaWdpbklkZW50aWZpZXJzOwotICAgIG9yaWdpbklkZW50aWZp ZXJzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkob3JpZ2lucy5zaXplKCkpOwotCi0gICAgZm9yIChj b25zdCBhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKQotICAgICAgICBvcmlnaW5JZGVudGlmaWVycy51 bmNoZWNrZWRBcHBlbmQoQVBJOjpTdHJpbmc6OmNyZWF0ZShvcmlnaW4tPmRhdGFiYXNlSWRlbnRp ZmllcigpKSk7Ci0KLSAgICByZXR1cm4gQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShvcmln aW5JZGVudGlmaWVycykpOwotfQotCiBpbnQgSW5qZWN0ZWRCdW5kbGU6Om51bWJlck9mUGFnZXMo V2ViRnJhbWUqIGZyYW1lLCBkb3VibGUgcGFnZVdpZHRoSW5QaXhlbHMsIGRvdWJsZSBwYWdlSGVp Z2h0SW5QaXhlbHMpCiB7CiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGZyYW1lID8gZnJhbWUtPmNv cmVGcmFtZSgpIDogMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAppbmRleCBhMTI4YjhhMDVlYmQyMWVlMWNi NzA4OTE1NmU2MWUwNzM3ZTNiNjA1Li4xOWQ5YTYyZmI1NzI4YWQzYzI2MjFiMDU5MDJjNjgzYjRm NWNiYTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCkBAIC0xMzcsMTUgKzEzNyw2IEBAIHB1YmxpYzoK ICAgICB2b2lkIGNsZWFyQWxsRGF0YWJhc2VzKCk7CiAgICAgdm9pZCBzZXREYXRhYmFzZVF1b3Rh KHVpbnQ2NF90KTsKIAotICAgIC8vIEFwcGxpY2F0aW9uIENhY2hlIEFQSQotICAgIHZvaWQgY2xl YXJBcHBsaWNhdGlvbkNhY2hlKCk7Ci0gICAgdm9pZCBjbGVhckFwcGxpY2F0aW9uQ2FjaGVGb3JP cmlnaW4oY29uc3QgU3RyaW5nJiBvcmlnaW4pOwotICAgIHZvaWQgc2V0QXBwQ2FjaGVNYXhpbXVt U2l6ZSh1aW50NjRfdCk7Ci0gICAgdWludDY0X3QgYXBwQ2FjaGVVc2FnZUZvck9yaWdpbihjb25z dCBTdHJpbmcmIG9yaWdpbik7Ci0gICAgdm9pZCBzZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVv dGEoY29uc3QgU3RyaW5nJiBvcmlnaW4sIHVpbnQ2NF90KTsKLSAgICB2b2lkIHJlc2V0QXBwbGlj YXRpb25DYWNoZU9yaWdpblF1b3RhKGNvbnN0IFN0cmluZyYgb3JpZ2luKTsKLSAgICBQYXNzUmVm UHRyPEFQSTo6QXJyYXk+IG9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNoZSgpOwotCiAgICAgLy8g R2FyYmFnZSBjb2xsZWN0aW9uIEFQSQogICAgIHZvaWQgZ2FyYmFnZUNvbGxlY3RKYXZhU2NyaXB0 T2JqZWN0cygpOwogICAgIHZvaWQgZ2FyYmFnZUNvbGxlY3RKYXZhU2NyaXB0T2JqZWN0c09uQWx0 ZXJuYXRlVGhyZWFkRm9yRGVidWdnaW5nKGJvb2wgd2FpdFVudGlsRG9uZSk7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjU3ZjUxMzg0ZjdjYmU4 MmI0MzM0OGRkMWMwMDE2YTcyZjJmYTFjZC4uN2EzYWY5NGU4ZjQwYzFlMzZkN2I3NGUxOGYzNDQw OGQ0NDUyNTRkNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTEwLTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlIHRoZSBidW5kbGUgYXBwIGNhY2hlIEFQ SXMgdG8gdGFrZSBhIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MDEyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVwZGF0ZSBBUElzLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVu ZGxlOjpiZWdpblRlc3RpbmcpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5k bGVQYWdlOjpkaWRSZWFjaEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YSk6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0UnVubmVyLmNwcDoKKyAgICAgICAg KFdUUjo6VGVzdFJ1bm5lcjo6Y2xlYXJBbGxBcHBsaWNhdGlvbkNhY2hlcyk6CisgICAgICAgIChX VFI6OlRlc3RSdW5uZXI6OmNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbik6CisgICAgICAg IChXVFI6OlRlc3RSdW5uZXI6OnNldEFwcENhY2hlTWF4aW11bVNpemUpOgorICAgICAgICAoV1RS OjpUZXN0UnVubmVyOjphcHBsaWNhdGlvbkNhY2hlRGlza1VzYWdlRm9yT3JpZ2luKToKKyAgICAg ICAgKFdUUjo6VGVzdFJ1bm5lcjo6b3JpZ2luc1dpdGhBcHBsaWNhdGlvbkNhY2hlKToKKwogMjAx NS0xMC0wOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBD cmFzaC1vbmx5IHF1ZXVlcyBvbiBib3Qgd2F0Y2hlcidzIGRhc2hib2FyZCBzaG91bGQgbm90IGhh dmUgbm9uLWNyYXNoaW5nIHRlc3RzIGluIHBvcG92ZXJzCmRpZmYgLS1naXQgYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcCBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCmluZGV4IDJk OTU4M2VkMjVmNDgyYTA3YzIzMTJiMjY0Y2IwZjg4OTNlOTIzMjkuLmEzMjU4ODE5NDljZmNjYzdj ZWNjOTUxZjU0N2UyNTMzMWJlZTEzMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCkBAIC0zMTUsNyArMzE1 LDcgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6YmVnaW5UZXN0aW5nKFdLRGljdGlvbmFyeVJlZiBz ZXR0aW5ncykKICAgICBwYWdlKCktPnByZXBhcmUoKTsKIAogICAgIFdLQnVuZGxlQ2xlYXJBbGxE YXRhYmFzZXMobV9idW5kbGUpOwotICAgIFdLQnVuZGxlQ2xlYXJBcHBsaWNhdGlvbkNhY2hlKG1f YnVuZGxlKTsKKyAgICBXS0J1bmRsZVBhZ2VDbGVhckFwcGxpY2F0aW9uQ2FjaGUocGFnZSgpLT5w YWdlKCkpOwogICAgIFdLQnVuZGxlUmVzZXRPcmlnaW5BY2Nlc3NXaGl0ZWxpc3RzKG1fYnVuZGxl KTsKIAogICAgIC8vIFtXSzJdIFJFR1JFU1NJT04ocjEyODYyMyk6IEl0IG1hZGUgbGF5b3V0IHRl c3RzIGV4dHJlbWVseSBzbG93CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKaW5kZXggODYzMTY0ODdm ZThjMTJjNGI3ZDk5NGEyNTdlMWI4ZTQxMDNmYTY1Yi4uMTYzNjFiZGM0NGYyOWU3OTFhMTQ5MDI3 MGZjY2UzMzFiNmJjZTExMyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcApAQCAtMTUyNyw3ICsx NTI3LDcgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZFJlYWNoQXBwbGljYXRpb25DYWNo ZU9yaWdpblF1b3RhKFdLU2VjdXJpdHlPcmlnaW5SZWYKICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gUmVzZXQgZGVmYXVsdCBhcHBsaWNhdGlvbiBjYWNoZSBxdW90YS4KLSAgICBXS0J1bmRsZVJl c2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKGluamVjdGVkQnVuZGxlLmJ1bmRsZSgpLCBh ZG9wdFdLKFdLU2VjdXJpdHlPcmlnaW5Db3B5VG9TdHJpbmcob3JpZ2luKSkuZ2V0KCkpOworICAg IFdLQnVuZGxlUGFnZVJlc2V0QXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKGluamVjdGVkQnVu ZGxlLnBhZ2UoKS0+cGFnZSgpLCBhZG9wdFdLKFdLU2VjdXJpdHlPcmlnaW5Db3B5VG9TdHJpbmco b3JpZ2luKSkuZ2V0KCkpOwogfQogCiB1aW50NjRfdCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZEV4 Y2VlZERhdGFiYXNlUXVvdGEoV0tTZWN1cml0eU9yaWdpblJlZiBvcmlnaW4sIFdLU3RyaW5nUmVm IGRhdGFiYXNlTmFtZSwgV0tTdHJpbmdSZWYgZGF0YWJhc2VEaXNwbGF5TmFtZSwgdWludDY0X3Qg Y3VycmVudFF1b3RhQnl0ZXMsIHVpbnQ2NF90IGN1cnJlbnRPcmlnaW5Vc2FnZUJ5dGVzLCB1aW50 NjRfdCBjdXJyZW50RGF0YWJhc2VVc2FnZUJ5dGVzLCB1aW50NjRfdCBleHBlY3RlZFVzYWdlQnl0 ZXMpCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rl c3RSdW5uZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0 UnVubmVyLmNwcAppbmRleCAyYWE5YzYxZWU4YjA4YmM0OGYyNzJjYjY5ZmY1ZWIzNDdjYmZkNWM3 Li42MWMzMDJlOWYwMGFhZjk2OTAyZDliMjFkMmFkMmNmNWUxMDFkYzMwIDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuY3BwCisrKyBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvVGVzdFJ1bm5lci5jcHAKQEAg LTI0NywyMiArMjQ3LDIyIEBAIHZvaWQgVGVzdFJ1bm5lcjo6c2V0RGF0YWJhc2VRdW90YSh1aW50 NjRfdCBxdW90YSkKIAogdm9pZCBUZXN0UnVubmVyOjpjbGVhckFsbEFwcGxpY2F0aW9uQ2FjaGVz KCkKIHsKLSAgICBXS0J1bmRsZUNsZWFyQXBwbGljYXRpb25DYWNoZShJbmplY3RlZEJ1bmRsZTo6 c2luZ2xldG9uKCkuYnVuZGxlKCkpOworICAgIFdLQnVuZGxlUGFnZUNsZWFyQXBwbGljYXRpb25D YWNoZShJbmplY3RlZEJ1bmRsZTo6c2luZ2xldG9uKCkucGFnZSgpLT5wYWdlKCkpOwogfQogCiB2 b2lkIFRlc3RSdW5uZXI6OmNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbihKU1N0cmluZ1Jl ZiBvcmlnaW4pCiB7Ci0gICAgV0tCdW5kbGVDbGVhckFwcGxpY2F0aW9uQ2FjaGVGb3JPcmlnaW4o SW5qZWN0ZWRCdW5kbGU6OnNpbmdsZXRvbigpLmJ1bmRsZSgpLCB0b1dLKG9yaWdpbikuZ2V0KCkp OworICAgIFdLQnVuZGxlUGFnZUNsZWFyQXBwbGljYXRpb25DYWNoZUZvck9yaWdpbihJbmplY3Rl ZEJ1bmRsZTo6c2luZ2xldG9uKCkucGFnZSgpLT5wYWdlKCksIHRvV0sob3JpZ2luKS5nZXQoKSk7 CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6c2V0QXBwQ2FjaGVNYXhpbXVtU2l6ZSh1aW50NjRfdCBz aXplKQogewotICAgIFdLQnVuZGxlU2V0QXBwQ2FjaGVNYXhpbXVtU2l6ZShJbmplY3RlZEJ1bmRs ZTo6c2luZ2xldG9uKCkuYnVuZGxlKCksIHNpemUpOworICAgIFdLQnVuZGxlUGFnZVNldEFwcENh Y2hlTWF4aW11bVNpemUoSW5qZWN0ZWRCdW5kbGU6OnNpbmdsZXRvbigpLnBhZ2UoKS0+cGFnZSgp LCBzaXplKTsKIH0KIAogbG9uZyBsb25nIFRlc3RSdW5uZXI6OmFwcGxpY2F0aW9uQ2FjaGVEaXNr VXNhZ2VGb3JPcmlnaW4oSlNTdHJpbmdSZWYgb3JpZ2luKQogewotICAgIHJldHVybiBXS0J1bmRs ZUdldEFwcENhY2hlVXNhZ2VGb3JPcmlnaW4oSW5qZWN0ZWRCdW5kbGU6OnNpbmdsZXRvbigpLmJ1 bmRsZSgpLCB0b1dLKG9yaWdpbikuZ2V0KCkpOworICAgIHJldHVybiBXS0J1bmRsZVBhZ2VHZXRB cHBDYWNoZVVzYWdlRm9yT3JpZ2luKEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKS5wYWdlKCkt PnBhZ2UoKSwgdG9XSyhvcmlnaW4pLmdldCgpKTsKIH0KIAogdm9pZCBUZXN0UnVubmVyOjpkaXNh bGxvd0luY3JlYXNlRm9yQXBwbGljYXRpb25DYWNoZVF1b3RhKCkKQEAgLTI4NywxMCArMjg3LDEx IEBAIHN0YXRpYyBpbmxpbmUgSlNWYWx1ZVJlZiBzdHJpbmdBcnJheVRvSlMoSlNDb250ZXh0UmVm IGNvbnRleHQsIFdLQXJyYXlSZWYgc3RyaW5nCiAKIEpTVmFsdWVSZWYgVGVzdFJ1bm5lcjo6b3Jp Z2luc1dpdGhBcHBsaWNhdGlvbkNhY2hlKCkKIHsKLSAgICBhdXRvJiBpbmplY3RlZEJ1bmRsZSA9 IEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKTsKLSAgICBXS1JldGFpblB0cjxXS0FycmF5UmVm PiBvcmlnaW5zKEFkb3B0V0ssIFdLQnVuZGxlQ29weU9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNo ZShpbmplY3RlZEJ1bmRsZS5idW5kbGUoKSkpOworICAgIFdLQnVuZGxlUGFnZVJlZiBwYWdlID0g SW5qZWN0ZWRCdW5kbGU6OnNpbmdsZXRvbigpLnBhZ2UoKS0+cGFnZSgpOwogCi0gICAgV0tCdW5k bGVGcmFtZVJlZiBtYWluRnJhbWUgPSBXS0J1bmRsZVBhZ2VHZXRNYWluRnJhbWUoaW5qZWN0ZWRC dW5kbGUucGFnZSgpLT5wYWdlKCkpOworICAgIFdLUmV0YWluUHRyPFdLQXJyYXlSZWY+IG9yaWdp bnMoQWRvcHRXSywgV0tCdW5kbGVQYWdlQ29weU9yaWdpbnNXaXRoQXBwbGljYXRpb25DYWNoZShw YWdlKSk7CisKKyAgICBXS0J1bmRsZUZyYW1lUmVmIG1haW5GcmFtZSA9IFdLQnVuZGxlUGFnZUdl dE1haW5GcmFtZShwYWdlKTsKICAgICBKU0NvbnRleHRSZWYgY29udGV4dCA9IFdLQnVuZGxlRnJh bWVHZXRKYXZhU2NyaXB0Q29udGV4dChtYWluRnJhbWUpOwogCiAgICAgcmV0dXJuIHN0cmluZ0Fy cmF5VG9KUyhjb250ZXh0LCBvcmlnaW5zLmdldCgpKTsK