230135 2021-09-09 16:50:36 -0700 WebCore memory cache does not participate in eager cache revalidation 2021-09-09 21:42:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 nham nham cdumez cgarcia ews-watchlist koivisto webkit-bug-importer oldest_to_newest 1792157 0 nham 2021-09-09 16:50:36 -0700 WebCore memory cache does not participate in eager cache revalidation 1792159 1 437807 nham 2021-09-09 16:51:08 -0700 Created attachment 437807 Patch 1792161 2 nham 2021-09-09 16:52:23 -0700 <rdar://57197404> 1792202 3 437821 nham 2021-09-09 18:52:20 -0700 Created attachment 437821 Patch 437807 2021-09-09 16:51:08 -0700 2021-09-09 18:52:41 -0700 Patch bug-230135-20210909165107.patch text/plain 9515 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYxZjdhZDFjYTg4N2Q1YmZk MjEyZjQzOTNkMGM1MmFlYWFjMGI1N2IuLmQxM2IzYmYwOWM2MDc1NjYwYTg1NzAwYmYwODE2Njhj MjdhZDA2YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDktMDkgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZSBtZW1vcnkgY2FjaGUgZG9lcyBu b3QgcGFydGljaXBhdGUgaW4gZWFnZXIgY2FjaGUgcmV2YWxpZGF0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxMzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZXNjcmlwdGlvbiB0byBmb2xsb3cu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmNhblJlcXVlc3RVc2VTcGVjdWxhdGl2ZVJldmFs aWRhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OnJldHJpZXZl KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RW50cnk6Om1hcmtBc0xvYWRlZEZyb21O ZXR3b3JrKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRy eS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0 aXZlTG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVM b2FkOjpkaWRDb21wbGV0ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6cmVxdWVz dHNIZWFkZXJzTWF0Y2hJbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 cmVxdWVzdHNIZWFkZXJzTWF0Y2gpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OmNvbnN0cnVjdFJldmFsaWRhdGlvblJlcXVlc3QpOgorCiAyMDIxLTA4LTI2 ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBDdXQgZG93biBvbiB1 c2Ugb2YgQ0ZHZXRUeXBlSUQsIHVzaW5nIGR5bmFtaWNfY2ZfY2FzdCBpbnN0ZWFkOyByZWxhdGVk IHN0cmVhbWxpbmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IGQ5MDYwNWYxODEzZTkwYmYzNWFhMDFiNzAxMTI3ZDVh OWRhNDlkYmQuLmEzNThkZjk3YWYwNzE1NmZlMmZhNjYwZjgzMzRkNjU3ZWJjODdlM2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5j cHAKQEAgLTMxNiwxNyArMzE2LDIwIEBAIHN0YXRpYyBTdG9yZURlY2lzaW9uIG1ha2VTdG9yZURl Y2lzaW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSCiAjaWYgRU5B QkxFKE5FVFdPUktfQ0FDSEVfU1BFQ1VMQVRJVkVfUkVWQUxJREFUSU9OKQogc3RhdGljIGJvb2wg aW5saW5lIGNhblJlcXVlc3RVc2VTcGVjdWxhdGl2ZVJldmFsaWRhdGlvbihjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgaWYgKHJlcXVlc3QuaXNDb25kaXRp b25hbCgpKQorICAgIC8vIFhIUnMgY2FuIGhhdmUgaGF2ZSBkeW5hbWljIGhlYWRlcnMgd2hpY2gg Y2F1c2UgdGhlIHNwZWN1bGF0aXZlIHJldmFsaWRhdG9yL2xvYWRlciBpc3N1ZSBhCisgICAgLy8g c3BlY3VsYXRpdmUgcmVxdWVzdCB3aXRoIG91dGRhdGVkIGhlYWRlcnMuIElnbm9yZSB0aG9zZS4K KyAgICBpZiAocmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6 OlJlcXVlc3Rlcjo6WEhSIHx8IHJlcXVlc3QucmVxdWVzdGVyKCkgPT0gV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6OkZldGNoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBpZiAocmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJl cXVlc3Rlcjo6WEhSIHx8IHJlcXVlc3QucmVxdWVzdGVyKCkgPT0gV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0OjpSZXF1ZXN0ZXI6OkZldGNoKQorICAgIC8vIExvd2VyIHByaW9yaXR5IGl0ZW1zIGFy ZSBsaWtlbHkgbm90IHJlbmRlciBibG9ja2luZzsgbG9hZCB0aGVtIGxhdGVyLgorICAgIGlmIChy ZXF1ZXN0LnByaW9yaXR5KCkgPD0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHk6OkxvdykK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgc3dpdGNoIChyZXF1ZXN0LmNhY2hlUG9saWN5 KCkpIHsKICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZXR1 cm5DYWNoZURhdGFFbHNlTG9hZDoKICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdENh Y2hlUG9saWN5OjpSZXR1cm5DYWNoZURhdGFEb250TG9hZDoKLSAgICBjYXNlIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YToKICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGNhc2UgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Q2FjaGVQ b2xpY3k6OlJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhOgogICAgIGNhc2UgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0Q2FjaGVQb2xpY3k6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3k6CiAgICAgY2FzZSBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVmcmVzaEFueUNhY2hlRGF0YToK ICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zOTQsNyArMzk3LDkgQEAgdm9pZCBDYWNoZTo6cmV0 cmlldmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBHbG9i YWxGcmFtZUkKICAgICBpZiAoY2FuVXNlU3BlY3VsYXRpdmVSZXZhbGlkYXRpb24gJiYgbV9zcGVj dWxhdGl2ZUxvYWRNYW5hZ2VyLT5jYW5SZXRyaWV2ZShzdG9yYWdlS2V5LCByZXF1ZXN0LCBmcmFt ZUlEKSkgewogICAgICAgICBtX3NwZWN1bGF0aXZlTG9hZE1hbmFnZXItPnJldHJpZXZlKHN0b3Jh Z2VLZXksIFtuZXR3b3JrUHJvY2VzcyA9IG1ha2VSZWYobmV0d29ya1Byb2Nlc3MoKSksIHJlcXVl c3QsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGluZm8g PSBXVEZNb3ZlKGluZm8pLCBzZXNzaW9uSUQgPSBtX3Nlc3Npb25JRF0oc3RkOjp1bmlxdWVfcHRy PEVudHJ5PiBlbnRyeSkgbXV0YWJsZSB7CiAgICAgICAgICAgICBpbmZvLndhc1NwZWN1bGF0aXZl TG9hZCA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoZW50cnkgJiYgV2ViQ29yZTo6dmVyaWZ5VmFy eWluZ1JlcXVlc3RIZWFkZXJzKG5ldHdvcmtQcm9jZXNzLT5zdG9yYWdlU2Vzc2lvbihzZXNzaW9u SUQpLCBlbnRyeS0+dmFyeWluZ1JlcXVlc3RIZWFkZXJzKCksIHJlcXVlc3QpKQorICAgICAgICAg ICAgaWYgKGVudHJ5ICYmIHJlcXVlc3QuY2FjaGVQb2xpY3koKSA9PSBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVsb2FkSWdub3JpbmdDYWNoZURhdGEgJiYgZW50cnktPnJl c3BvbnNlKCkuc291cmNlKCkgIT0gV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpO ZXR3b3JrKQorICAgICAgICAgICAgICAgIGNvbXBsZXRlUmV0cmlldmUoV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlciksIG51bGxwdHIsIGluZm8pOworICAgICAgICAgICAgZWxzZSBpZiAoZW50cnkg JiYgV2ViQ29yZTo6dmVyaWZ5VmFyeWluZ1JlcXVlc3RIZWFkZXJzKG5ldHdvcmtQcm9jZXNzLT5z dG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpLCBlbnRyeS0+dmFyeWluZ1JlcXVlc3RIZWFkZXJzKCks IHJlcXVlc3QpKQogICAgICAgICAgICAgICAgIGNvbXBsZXRlUmV0cmlldmUoV1RGTW92ZShjb21w bGV0aW9uSGFuZGxlciksIFdURk1vdmUoZW50cnkpLCBpbmZvKTsKICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICBjb21wbGV0ZVJldHJpZXZlKFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpLCBudWxscHRyLCBpbmZvKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKaW5kZXggMmNkYTRmZjY4YjE5M2U0 ZDljZWQ2M2QyZmNjMTI5ZGEyNzBhZDlkNS4uOGRkYzgwZmExNmVjM2M1NWI0NTRlYTVmMTkzNGY4 NzlhZTFiZTNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKQEAgLTIyMiw2ICsyMjIsMTEgQEAgdm9pZCBF bnRyeTo6c2V0TmVlZHNWYWxpZGF0aW9uKGJvb2wgdmFsdWUpCiAgICAgbV9yZXNwb25zZS5zZXRT b3VyY2UodmFsdWUgPyBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpTb3VyY2U6OkRpc2tDYWNo ZUFmdGVyVmFsaWRhdGlvbiA6IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlz a0NhY2hlKTsKIH0KIAordm9pZCBFbnRyeTo6bWFya0FzTG9hZGVkRnJvbU5ldHdvcmsoKQorewor ICAgIG1fcmVzcG9uc2Uuc2V0U291cmNlKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJj ZTo6TmV0d29yayk7Cit9CisKIHZvaWQgRW50cnk6OmFzSlNPTihTdHJpbmdCdWlsZGVyJiBqc29u LCBjb25zdCBTdG9yYWdlOjpSZWNvcmRJbmZvJiBpbmZvKSBjb25zdAogewogICAgIGpzb24uYXBw ZW5kKCJ7XG4iCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVudHJ5LmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVudHJ5LmgKaW5kZXggZGVkYTg2YTQ0YjYxODQ5ZDZkYmIzZDAxZDM0MjAx OTJlNzcyOTk2NS4uYmNhZDdjMzk2ZTMxN2E4YWI0ZjZkYjUyYjk0MDExMGJmZWRmM2E3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVF bnRyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRW50cnkuaApAQCAtNjcsNiArNjcsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBuZWVkc1ZhbGlk YXRpb24oKSBjb25zdDsKICAgICB2b2lkIHNldE5lZWRzVmFsaWRhdGlvbihib29sKTsKIAorICAg IHZvaWQgbWFya0FzTG9hZGVkRnJvbU5ldHdvcmsoKTsKKwogICAgIGNvbnN0IFN0b3JhZ2U6OlJl Y29yZCYgc291cmNlU3RvcmFnZVJlY29yZCgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlU3RvcmFn ZVJlY29yZDsgfQogCiAgICAgdm9pZCBhc0pTT04oU3RyaW5nQnVpbGRlciYsIGNvbnN0IFN0b3Jh Z2U6OlJlY29yZEluZm8mKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNw cAppbmRleCA0MDM3NGJhMDhmZTUxZGI0ZTQ2ZDNkZDRhODkzOTk4OTUzMGQ3NjI0Li4xMzk2ZmUx NzA2YWVhOTk5MjRkN2Y5OTY3M2QyZDcwZjI4NjJkYmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVj dWxhdGl2ZUxvYWQuY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUxvYWQ6 OmRpZENvbXBsZXRlKCkKIAogICAgIC8vIE1ha2Ugc3VyZSBzcGVjdWxhdGl2ZWx5IHJldmFsaWRh dGVkIHJlc291cmNlcyBkbyBub3QgZ2V0IHZhbGlkYXRlZCBieSB0aGUgTmV0d29ya1Jlc291cmNl TG9hZGVyIGFnYWluLgogICAgIGlmIChtX2NhY2hlRW50cnkpCi0gICAgICAgIG1fY2FjaGVFbnRy eS0+c2V0TmVlZHNWYWxpZGF0aW9uKGZhbHNlKTsKKyAgICAgICAgbV9jYWNoZUVudHJ5LT5tYXJr QXNMb2FkZWRGcm9tTmV0d29yaygpOwogCiAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihXVEZNb3Zl KG1fY2FjaGVFbnRyeSkpOwogfQpAQCAtMTk0LDEzICsxOTQsOSBAQCBzdGF0aWMgdm9pZCBkdW1w SFRUUEhlYWRlcnNEaWZmKGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnNBLCBjb25zdCBIVFRQ SGVhZGVyTQogCiAjZW5kaWYKIAotYm9vbCByZXF1ZXN0c0hlYWRlcnNNYXRjaChjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHNwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3QsIGNvbnN0IFJlc291cmNl UmVxdWVzdCYgYWN0dWFsUmVxdWVzdCkKK3N0YXRpYyBib29sIHJlcXVlc3RzSGVhZGVyc01hdGNo SW50ZXJuYWwoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1 ZXN0LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIGFjdHVhbFJlcXVlc3QpCiB7Ci0gICAgQVNTRVJU KCFhY3R1YWxSZXF1ZXN0LmlzQ29uZGl0aW9uYWwoKSk7Ci0gICAgUmVzb3VyY2VSZXF1ZXN0IHNw ZWN1bGF0aXZlUmVxdWVzdCA9IHNwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3Q7Ci0gICAgc3Bl Y3VsYXRpdmVSZXF1ZXN0Lm1ha2VVbmNvbmRpdGlvbmFsKCk7Ci0KLSAgICBpZiAoc3BlY3VsYXRp dmVSZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKSAhPSBhY3R1YWxSZXF1ZXN0Lmh0dHBIZWFkZXJG aWVsZHMoKSkgeworICAgIGlmIChzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1ZXN0Lmh0dHBIZWFk ZXJGaWVsZHMoKSAhPSBhY3R1YWxSZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKSkgewogICAgICAg ICBMT0coTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVQcmVsb2FkaW5nLCAiQ2Fubm90IHJldXNlIHNw ZWN1bGF0aXZlbHkgdmFsaWRhdGVkIGVudHJ5IGJlY2F1c2UgSFRUUCBoZWFkZXJzIHVzZWQgZm9y IHZhbGlkYXRpb24gZG8gbm90IG1hdGNoIik7CiAjaWYgIUxPR19ESVNBQkxFRAogICAgICAgICBk dW1wSFRUUEhlYWRlcnNEaWZmKHNwZWN1bGF0aXZlUmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCks IGFjdHVhbFJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygpKTsKQEAgLTIxMCw2ICsyMDYsMTcgQEAg Ym9vbCByZXF1ZXN0c0hlYWRlcnNNYXRjaChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHNwZWN1bGF0 aXZlVmFsaWRhdGlvblJlcXVlc3QsIGMKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCByZXF1 ZXN0c0hlYWRlcnNNYXRjaChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHNwZWN1bGF0aXZlVmFsaWRh dGlvblJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgYWN0dWFsUmVxdWVzdCkKK3sKKyAg ICBpZiAoIWFjdHVhbFJlcXVlc3QuaXNDb25kaXRpb25hbCgpKSB7CisgICAgICAgIFJlc291cmNl UmVxdWVzdCBzcGVjdWxhdGl2ZVJlcXVlc3QgPSBzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1ZXN0 OworICAgICAgICBzcGVjdWxhdGl2ZVJlcXVlc3QubWFrZVVuY29uZGl0aW9uYWwoKTsKKyAgICAg ICAgcmV0dXJuIHJlcXVlc3RzSGVhZGVyc01hdGNoSW50ZXJuYWwoc3BlY3VsYXRpdmVSZXF1ZXN0 LCBhY3R1YWxSZXF1ZXN0KTsKKyAgICB9CisKKyAgICByZXR1cm4gcmVxdWVzdHNIZWFkZXJzTWF0 Y2hJbnRlcm5hbChzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1ZXN0LCBhY3R1YWxSZXF1ZXN0KTsK K30KKwogfSAvLyBuYW1lc3BhY2UgTmV0d29ya0NhY2hlCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHAKaW5kZXgg NjI3NzM3MGQ4NTY4NWY0Yzg0MDFiMGIxOGVjZGY5ODkzNTQ2ODQ4YS4uODE2MDg3ZTk2NmEyNmZj ZDQ4NGMzYjU0NjRlM2JmYWRlZTQwN2IwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1 bGF0aXZlTG9hZE1hbmFnZXIuY3BwCkBAIC0xMDIsMTMgKzEwMiwxMyBAQCBzdGF0aWMgaW5saW5l IFJlc291cmNlUmVxdWVzdCBjb25zdHJ1Y3RSZXZhbGlkYXRpb25SZXF1ZXN0KGNvbnN0IEtleSYg a2V5LCBjb25zdAogICAgIAogICAgIHJldmFsaWRhdGlvblJlcXVlc3QubWFrZVVuY29uZGl0aW9u YWwoKTsKICAgICBpZiAoZW50cnkpIHsKLSAgICAgICAgU3RyaW5nIGVUYWcgPSBlbnRyeS0+cmVz cG9uc2UoKS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkVUYWcpOwotICAgICAgICBp ZiAoIWVUYWcuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5zZXRI VFRQSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OklmTm9uZU1hdGNoLCBlVGFnKTsKLQogICAg ICAgICBTdHJpbmcgbGFzdE1vZGlmaWVkID0gZW50cnktPnJlc3BvbnNlKCkuaHR0cEhlYWRlckZp ZWxkKEhUVFBIZWFkZXJOYW1lOjpMYXN0TW9kaWZpZWQpOwogICAgICAgICBpZiAoIWxhc3RNb2Rp ZmllZC5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXZhbGlkYXRpb25SZXF1ZXN0LnNldEhUVFBI ZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6SWZNb2RpZmllZFNpbmNlLCBsYXN0TW9kaWZpZWQp OworCisgICAgICAgIFN0cmluZyBlVGFnID0gZW50cnktPnJlc3BvbnNlKCkuaHR0cEhlYWRlckZp ZWxkKEhUVFBIZWFkZXJOYW1lOjpFVGFnKTsKKyAgICAgICAgaWYgKCFlVGFnLmlzRW1wdHkoKSkK KyAgICAgICAgICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKEhUVFBI ZWFkZXJOYW1lOjpJZk5vbmVNYXRjaCwgZVRhZyk7CiAgICAgfQogICAgIAogICAgIHJldmFsaWRh dGlvblJlcXVlc3Quc2V0UHJpb3JpdHkoc3ViUmVzb3VyY2VJbmZvLnByaW9yaXR5KCkpOwo= 437821 2021-09-09 18:52:20 -0700 2021-09-09 18:52:20 -0700 Patch bug-230135-20210909185220.patch text/plain 9565 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYxZjdhZDFjYTg4N2Q1YmZk MjEyZjQzOTNkMGM1MmFlYWFjMGI1N2IuLmQxM2IzYmYwOWM2MDc1NjYwYTg1NzAwYmYwODE2Njhj MjdhZDA2YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDktMDkgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZSBtZW1vcnkgY2FjaGUgZG9lcyBu b3QgcGFydGljaXBhdGUgaW4gZWFnZXIgY2FjaGUgcmV2YWxpZGF0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxMzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZXNjcmlwdGlvbiB0byBmb2xsb3cu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmNhblJlcXVlc3RVc2VTcGVjdWxhdGl2ZVJldmFs aWRhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OnJldHJpZXZl KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RW50cnk6Om1hcmtBc0xvYWRlZEZyb21O ZXR3b3JrKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRy eS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0 aXZlTG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVM b2FkOjpkaWRDb21wbGV0ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6cmVxdWVz dHNIZWFkZXJzTWF0Y2hJbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 cmVxdWVzdHNIZWFkZXJzTWF0Y2gpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OmNvbnN0cnVjdFJldmFsaWRhdGlvblJlcXVlc3QpOgorCiAyMDIxLTA4LTI2 ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBDdXQgZG93biBvbiB1 c2Ugb2YgQ0ZHZXRUeXBlSUQsIHVzaW5nIGR5bmFtaWNfY2ZfY2FzdCBpbnN0ZWFkOyByZWxhdGVk IHN0cmVhbWxpbmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IGQ5MDYwNWYxODEzZTkwYmYzNWFhMDFiNzAxMTI3ZDVh OWRhNDlkYmQuLmEzNThkZjk3YWYwNzE1NmZlMmZhNjYwZjgzMzRkNjU3ZWJjODdlM2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5j cHAKQEAgLTMxNiwxNyArMzE2LDIwIEBAIHN0YXRpYyBTdG9yZURlY2lzaW9uIG1ha2VTdG9yZURl Y2lzaW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSCiAjaWYgRU5B QkxFKE5FVFdPUktfQ0FDSEVfU1BFQ1VMQVRJVkVfUkVWQUxJREFUSU9OKQogc3RhdGljIGJvb2wg aW5saW5lIGNhblJlcXVlc3RVc2VTcGVjdWxhdGl2ZVJldmFsaWRhdGlvbihjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgaWYgKHJlcXVlc3QuaXNDb25kaXRp b25hbCgpKQorICAgIC8vIFhIUnMgY2FuIGhhdmUgaGF2ZSBkeW5hbWljIGhlYWRlcnMgd2hpY2gg Y2F1c2UgdGhlIHNwZWN1bGF0aXZlIHJldmFsaWRhdG9yL2xvYWRlciBpc3N1ZSBhCisgICAgLy8g c3BlY3VsYXRpdmUgcmVxdWVzdCB3aXRoIG91dGRhdGVkIGhlYWRlcnMuIElnbm9yZSB0aG9zZS4K KyAgICBpZiAocmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6 OlJlcXVlc3Rlcjo6WEhSIHx8IHJlcXVlc3QucmVxdWVzdGVyKCkgPT0gV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6OkZldGNoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBpZiAocmVxdWVzdC5yZXF1ZXN0ZXIoKSA9PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJl cXVlc3Rlcjo6WEhSIHx8IHJlcXVlc3QucmVxdWVzdGVyKCkgPT0gV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0OjpSZXF1ZXN0ZXI6OkZldGNoKQorICAgIC8vIExvd2VyIHByaW9yaXR5IGl0ZW1zIGFy ZSBsaWtlbHkgbm90IHJlbmRlciBibG9ja2luZzsgbG9hZCB0aGVtIGxhdGVyLgorICAgIGlmIChy ZXF1ZXN0LnByaW9yaXR5KCkgPD0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHk6OkxvdykK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgc3dpdGNoIChyZXF1ZXN0LmNhY2hlUG9saWN5 KCkpIHsKICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZXR1 cm5DYWNoZURhdGFFbHNlTG9hZDoKICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdENh Y2hlUG9saWN5OjpSZXR1cm5DYWNoZURhdGFEb250TG9hZDoKLSAgICBjYXNlIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdENhY2hlUG9saWN5OjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YToKICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGNhc2UgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Q2FjaGVQ b2xpY3k6OlJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhOgogICAgIGNhc2UgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0Q2FjaGVQb2xpY3k6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3k6CiAgICAgY2FzZSBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVmcmVzaEFueUNhY2hlRGF0YToK ICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zOTQsNyArMzk3LDkgQEAgdm9pZCBDYWNoZTo6cmV0 cmlldmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBHbG9i YWxGcmFtZUkKICAgICBpZiAoY2FuVXNlU3BlY3VsYXRpdmVSZXZhbGlkYXRpb24gJiYgbV9zcGVj dWxhdGl2ZUxvYWRNYW5hZ2VyLT5jYW5SZXRyaWV2ZShzdG9yYWdlS2V5LCByZXF1ZXN0LCBmcmFt ZUlEKSkgewogICAgICAgICBtX3NwZWN1bGF0aXZlTG9hZE1hbmFnZXItPnJldHJpZXZlKHN0b3Jh Z2VLZXksIFtuZXR3b3JrUHJvY2VzcyA9IG1ha2VSZWYobmV0d29ya1Byb2Nlc3MoKSksIHJlcXVl c3QsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGluZm8g PSBXVEZNb3ZlKGluZm8pLCBzZXNzaW9uSUQgPSBtX3Nlc3Npb25JRF0oc3RkOjp1bmlxdWVfcHRy PEVudHJ5PiBlbnRyeSkgbXV0YWJsZSB7CiAgICAgICAgICAgICBpbmZvLndhc1NwZWN1bGF0aXZl TG9hZCA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoZW50cnkgJiYgV2ViQ29yZTo6dmVyaWZ5VmFy eWluZ1JlcXVlc3RIZWFkZXJzKG5ldHdvcmtQcm9jZXNzLT5zdG9yYWdlU2Vzc2lvbihzZXNzaW9u SUQpLCBlbnRyeS0+dmFyeWluZ1JlcXVlc3RIZWFkZXJzKCksIHJlcXVlc3QpKQorICAgICAgICAg ICAgaWYgKGVudHJ5ICYmIHJlcXVlc3QuY2FjaGVQb2xpY3koKSA9PSBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3RDYWNoZVBvbGljeTo6UmVsb2FkSWdub3JpbmdDYWNoZURhdGEgJiYgZW50cnktPnJl c3BvbnNlKCkuc291cmNlKCkgIT0gV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpO ZXR3b3JrKQorICAgICAgICAgICAgICAgIGNvbXBsZXRlUmV0cmlldmUoV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlciksIG51bGxwdHIsIGluZm8pOworICAgICAgICAgICAgZWxzZSBpZiAoZW50cnkg JiYgV2ViQ29yZTo6dmVyaWZ5VmFyeWluZ1JlcXVlc3RIZWFkZXJzKG5ldHdvcmtQcm9jZXNzLT5z dG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpLCBlbnRyeS0+dmFyeWluZ1JlcXVlc3RIZWFkZXJzKCks IHJlcXVlc3QpKQogICAgICAgICAgICAgICAgIGNvbXBsZXRlUmV0cmlldmUoV1RGTW92ZShjb21w bGV0aW9uSGFuZGxlciksIFdURk1vdmUoZW50cnkpLCBpbmZvKTsKICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICBjb21wbGV0ZVJldHJpZXZlKFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpLCBudWxscHRyLCBpbmZvKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKaW5kZXggMmNkYTRmZjY4YjE5M2U0 ZDljZWQ2M2QyZmNjMTI5ZGEyNzBhZDlkNS4uOGRkYzgwZmExNmVjM2M1NWI0NTRlYTVmMTkzNGY4 NzlhZTFiZTNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKQEAgLTIyMiw2ICsyMjIsMTEgQEAgdm9pZCBF bnRyeTo6c2V0TmVlZHNWYWxpZGF0aW9uKGJvb2wgdmFsdWUpCiAgICAgbV9yZXNwb25zZS5zZXRT b3VyY2UodmFsdWUgPyBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpTb3VyY2U6OkRpc2tDYWNo ZUFmdGVyVmFsaWRhdGlvbiA6IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlz a0NhY2hlKTsKIH0KIAordm9pZCBFbnRyeTo6bWFya0FzTG9hZGVkRnJvbU5ldHdvcmsoKQorewor ICAgIG1fcmVzcG9uc2Uuc2V0U291cmNlKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJj ZTo6TmV0d29yayk7Cit9CisKIHZvaWQgRW50cnk6OmFzSlNPTihTdHJpbmdCdWlsZGVyJiBqc29u LCBjb25zdCBTdG9yYWdlOjpSZWNvcmRJbmZvJiBpbmZvKSBjb25zdAogewogICAgIGpzb24uYXBw ZW5kKCJ7XG4iCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVudHJ5LmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVudHJ5LmgKaW5kZXggZGVkYTg2YTQ0YjYxODQ5ZDZkYmIzZDAxZDM0MjAx OTJlNzcyOTk2NS4uYmNhZDdjMzk2ZTMxN2E4YWI0ZjZkYjUyYjk0MDExMGJmZWRmM2E3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVF bnRyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRW50cnkuaApAQCAtNjcsNiArNjcsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBuZWVkc1ZhbGlk YXRpb24oKSBjb25zdDsKICAgICB2b2lkIHNldE5lZWRzVmFsaWRhdGlvbihib29sKTsKIAorICAg IHZvaWQgbWFya0FzTG9hZGVkRnJvbU5ldHdvcmsoKTsKKwogICAgIGNvbnN0IFN0b3JhZ2U6OlJl Y29yZCYgc291cmNlU3RvcmFnZVJlY29yZCgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlU3RvcmFn ZVJlY29yZDsgfQogCiAgICAgdm9pZCBhc0pTT04oU3RyaW5nQnVpbGRlciYsIGNvbnN0IFN0b3Jh Z2U6OlJlY29yZEluZm8mKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNw cAppbmRleCA0MDM3NGJhMDhmZTUxZGI0ZTQ2ZDNkZDRhODkzOTk4OTUzMGQ3NjI0Li4xNWJiMWRk MTU4MjhhY2ZiNDYxMDdlMWQ2NGIyOWRmMDg4ODAyMGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVj dWxhdGl2ZUxvYWQuY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUxvYWQ6 OmRpZENvbXBsZXRlKCkKIAogICAgIC8vIE1ha2Ugc3VyZSBzcGVjdWxhdGl2ZWx5IHJldmFsaWRh dGVkIHJlc291cmNlcyBkbyBub3QgZ2V0IHZhbGlkYXRlZCBieSB0aGUgTmV0d29ya1Jlc291cmNl TG9hZGVyIGFnYWluLgogICAgIGlmIChtX2NhY2hlRW50cnkpCi0gICAgICAgIG1fY2FjaGVFbnRy eS0+c2V0TmVlZHNWYWxpZGF0aW9uKGZhbHNlKTsKKyAgICAgICAgbV9jYWNoZUVudHJ5LT5tYXJr QXNMb2FkZWRGcm9tTmV0d29yaygpOwogCiAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihXVEZNb3Zl KG1fY2FjaGVFbnRyeSkpOwogfQpAQCAtMTk0LDIyICsxOTQsMjkgQEAgc3RhdGljIHZvaWQgZHVt cEhUVFBIZWFkZXJzRGlmZihjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJzQSwgY29uc3QgSFRU UEhlYWRlck0KIAogI2VuZGlmCiAKLWJvb2wgcmVxdWVzdHNIZWFkZXJzTWF0Y2goY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiBzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1ZXN0LCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIGFjdHVhbFJlcXVlc3QpCitzdGF0aWMgYm9vbCByZXF1ZXN0c0hlYWRlcnNNYXRj aEludGVybmFsKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVx dWVzdCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBhY3R1YWxSZXF1ZXN0KQogewotICAgIEFTU0VS VCghYWN0dWFsUmVxdWVzdC5pc0NvbmRpdGlvbmFsKCkpOwotICAgIFJlc291cmNlUmVxdWVzdCBz cGVjdWxhdGl2ZVJlcXVlc3QgPSBzcGVjdWxhdGl2ZVZhbGlkYXRpb25SZXF1ZXN0OwotICAgIHNw ZWN1bGF0aXZlUmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwotCi0gICAgaWYgKHNwZWN1bGF0 aXZlUmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCkgIT0gYWN0dWFsUmVxdWVzdC5odHRwSGVhZGVy RmllbGRzKCkpIHsKKyAgICBpZiAoc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVxdWVzdC5odHRwSGVh ZGVyRmllbGRzKCkgIT0gYWN0dWFsUmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCkpIHsKICAgICAg ICAgTE9HKE5ldHdvcmtDYWNoZVNwZWN1bGF0aXZlUHJlbG9hZGluZywgIkNhbm5vdCByZXVzZSBz cGVjdWxhdGl2ZWx5IHZhbGlkYXRlZCBlbnRyeSBiZWNhdXNlIEhUVFAgaGVhZGVycyB1c2VkIGZv ciB2YWxpZGF0aW9uIGRvIG5vdCBtYXRjaCIpOwogI2lmICFMT0dfRElTQUJMRUQKLSAgICAgICAg ZHVtcEhUVFBIZWFkZXJzRGlmZihzcGVjdWxhdGl2ZVJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygp LCBhY3R1YWxSZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKSk7CisgICAgICAgIGR1bXBIVFRQSGVh ZGVyc0RpZmYoc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCks IGFjdHVhbFJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygpKTsKICNlbmRpZgogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwogfQogCitib29sIHJlcXVlc3RzSGVh ZGVyc01hdGNoKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVx dWVzdCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBhY3R1YWxSZXF1ZXN0KQoreworICAgIGlmICgh YWN0dWFsUmVxdWVzdC5pc0NvbmRpdGlvbmFsKCkpIHsKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0 IHNwZWN1bGF0aXZlUmVxdWVzdCA9IHNwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3Q7CisgICAg ICAgIHNwZWN1bGF0aXZlUmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOworICAgICAgICByZXR1 cm4gcmVxdWVzdHNIZWFkZXJzTWF0Y2hJbnRlcm5hbChzcGVjdWxhdGl2ZVJlcXVlc3QsIGFjdHVh bFJlcXVlc3QpOworICAgIH0KKworICAgIHJldHVybiByZXF1ZXN0c0hlYWRlcnNNYXRjaEludGVy bmFsKHNwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3QsIGFjdHVhbFJlcXVlc3QpOworfQorCiB9 IC8vIG5hbWVzcGFjZSBOZXR3b3JrQ2FjaGUKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNw ZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcAppbmRleCA2Mjc3Mzcw ZDg1Njg1ZjRjODQwMWIwYjE4ZWNkZjk4OTM1NDY4NDhhLi44MTYwODdlOTY2YTI2ZmNkNDg0YzNi NTQ2NGUzYmZhZGVlNDA3YjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVM b2FkTWFuYWdlci5jcHAKQEAgLTEwMiwxMyArMTAyLDEzIEBAIHN0YXRpYyBpbmxpbmUgUmVzb3Vy Y2VSZXF1ZXN0IGNvbnN0cnVjdFJldmFsaWRhdGlvblJlcXVlc3QoY29uc3QgS2V5JiBrZXksIGNv bnN0CiAgICAgCiAgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwog ICAgIGlmIChlbnRyeSkgewotICAgICAgICBTdHJpbmcgZVRhZyA9IGVudHJ5LT5yZXNwb25zZSgp Lmh0dHBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6RVRhZyk7Ci0gICAgICAgIGlmICghZVRh Zy5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXZhbGlkYXRpb25SZXF1ZXN0LnNldEhUVFBIZWFk ZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6SWZOb25lTWF0Y2gsIGVUYWcpOwotCiAgICAgICAgIFN0 cmluZyBsYXN0TW9kaWZpZWQgPSBlbnRyeS0+cmVzcG9uc2UoKS5odHRwSGVhZGVyRmllbGQoSFRU UEhlYWRlck5hbWU6Okxhc3RNb2RpZmllZCk7CiAgICAgICAgIGlmICghbGFzdE1vZGlmaWVkLmlz RW1wdHkoKSkKICAgICAgICAgICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0SFRUUEhlYWRlckZp ZWxkKEhUVFBIZWFkZXJOYW1lOjpJZk1vZGlmaWVkU2luY2UsIGxhc3RNb2RpZmllZCk7CisKKyAg ICAgICAgU3RyaW5nIGVUYWcgPSBlbnRyeS0+cmVzcG9uc2UoKS5odHRwSGVhZGVyRmllbGQoSFRU UEhlYWRlck5hbWU6OkVUYWcpOworICAgICAgICBpZiAoIWVUYWcuaXNFbXB0eSgpKQorICAgICAg ICAgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoSFRUUEhlYWRlck5h bWU6OklmTm9uZU1hdGNoLCBlVGFnKTsKICAgICB9CiAgICAgCiAgICAgcmV2YWxpZGF0aW9uUmVx dWVzdC5zZXRQcmlvcml0eShzdWJSZXNvdXJjZUluZm8ucHJpb3JpdHkoKSk7Cg==