227014 2021-06-14 22:47:11 -0700 Reimplement JSC::CachePayload without FileSystem::unmapViewOfFile and FileSystem::MappedFileData::leakHandle 2021-06-17 14:14:34 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227011 1 fujii fujii benjamin cdumez chris.reid cmarcelo ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1769702 0 fujii 2021-06-14 22:47:11 -0700 Reimplement JSC::CachePayload without FileSystem::unmapViewOfFile and FileSystem::MappedFileData::leakHandle r247542 (Bug 199759) added FileSystem::unmapViewOfFile and FileSystem::MappedFileData::leakHandle for JSC::CachePayload to get the mapped address and to free the address. Bug 227011 is going to add a file mapping handle to FileSystem::MappedFileData for Windows port. Destruction of MappedFileData should be done only by MappedFileData dtor. 1769703 1 431405 fujii 2021-06-14 22:52:28 -0700 Created attachment 431405 Patch 1769712 2 431409 fujii 2021-06-15 00:24:26 -0700 Created attachment 431409 Patch 1770345 3 fujii 2021-06-16 12:57:34 -0700 Could anyone review? 1770346 4 ysuzuki 2021-06-16 12:58:03 -0700 I'll look soon after meeting :) 1770548 5 431409 ysuzuki 2021-06-17 01:36:32 -0700 Comment on attachment 431409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431409&action=review r=me > Source/JavaScriptCore/runtime/CachePayload.cpp:38 > + return CachePayload(std::make_pair(WTFMove(data), size)); I think we can use `std::pair { ... }` instead of `make_pair`. > Source/JavaScriptCore/runtime/CachePayload.cpp:43 > + return CachePayload(std::make_pair(nullptr, 0)); Ditto. > Source/JavaScriptCore/runtime/CachePayload.cpp:49 > + other.m_data = std::make_pair(nullptr, 0); Ditto. 1770788 6 431712 fujii 2021-06-17 13:07:14 -0700 Created attachment 431712 Patch for landing 1770811 7 431712 fujii 2021-06-17 14:12:59 -0700 Comment on attachment 431712 Patch for landing Clearing flags on attachment: 431712 Committed r279008 (238933@main): <https://commits.webkit.org/238933@main> 1770812 8 fujii 2021-06-17 14:13:04 -0700 All reviewed patches have been landed. Closing bug. 1770813 9 webkit-bug-importer 2021-06-17 14:14:34 -0700 <rdar://problem/79470135> 431405 2021-06-14 22:52:28 -0700 2021-06-15 00:24:16 -0700 Patch bug-227014-20210615145227.patch text/plain 7206 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl OWJjMzkyM2MyMjRiMWViMjkwMTM2MTBlZWYwZTM4YmI3MDUyMTM1Li42YTdlYzVhNDkxNWE0Y2Ey ZjAzYjk2NTMwNmFlYzVjZmQ5YjkzMWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMS0wNi0xNCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBSZWltcGxlbWVudCBKU0M6OkNhY2hlUGF5bG9hZCB3aXRob3V0 IEZpbGVTeXN0ZW06OnVubWFwVmlld09mRmlsZSBhbmQgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURh dGE6OmxlYWtIYW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIHIyNDc1NDIgKEJ1ZyAxOTk3NTkpIGFkZGVkIEZpbGVTeXN0ZW06OnVubWFwVmlld09m RmlsZSBhbmQKKyAgICAgICAgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGE6OmxlYWtIYW5kbGUg Zm9yIEpTQzo6Q2FjaGVQYXlsb2FkIHRvCisgICAgICAgIGdldCB0aGUgbWFwcGVkIGFkZHJlc3Mg YW5kIHRvIGZyZWUgdGhlIGFkZHJlc3MuCisKKyAgICAgICAgSG93ZXZlciwgQnVnIDIyNzAxMSBp cyBnb2luZyB0byBhZGQgYSBmaWxlIG1hcHBpbmcgaGFuZGxlIHRvCisgICAgICAgIEZpbGVTeXN0 ZW06Ok1hcHBlZEZpbGVEYXRhIGZvciBXaW5kb3dzIHBvcnQgdG8gY3JlYXRlIGEKKyAgICAgICAg U2hhcmVkTWVtb3J5IGZyb20gYSBNYXBwZWRGaWxlRGF0YS4gRGVzdHJ1Y3Rpb24gb2YgTWFwcGVk RmlsZURhdGEKKyAgICAgICAgc2hvdWxkIGJlIGRvbmUgb25seSBieSBNYXBwZWRGaWxlRGF0YSBk dG9yLgorCisgICAgICAgICogcnVudGltZS9DYWNoZVBheWxvYWQuY3BwOgorICAgICAgICAoSlND OjpDYWNoZVBheWxvYWQ6Om1ha2VNYXBwZWRQYXlsb2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQ YXlsb2FkOjptYWtlTWFsbG9jUGF5bG9hZCk6CisgICAgICAgIChKU0M6OkNhY2hlUGF5bG9hZDo6 bWFrZUVtcHR5UGF5bG9hZCk6CisgICAgICAgIChKU0M6OkNhY2hlUGF5bG9hZDo6Q2FjaGVQYXls b2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpkYXRhIGNvbnN0KToKKyAgICAgICAg KEpTQzo6Q2FjaGVQYXlsb2FkOjpzaXplIGNvbnN0KToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXls b2FkOjp+Q2FjaGVQYXlsb2FkKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2Fk OjpvcGVyYXRvcj0pOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OmZyZWVE YXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBydW50aW1lL0NhY2hlUGF5bG9hZC5oOiBVc2UgVmFy aWFudCBmb3IgZGF0YS4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpkYXRhIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpzaXplIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpDYWNoZVBheWxvYWQpOiBEZWxldGVkLgor CiAyMDIxLTA2LTE0ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0pTQ10gV29ya2Fyb3VuZCBJQ1UgdWxvY19hZGRMaWtlbHlTdWJ0YWdzIC8gdWxvY19taW5p bWl6ZVN1YnRhZ3MgYnVncwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwppbmRleCA3NGYzMDI5N2FiNjk0Zjg0ZjQ1ZGJhZWM0MDdkMTg0NGZj ODU1MGZhLi45OGU5YWM4ZWMyNDk5NjlmOWIwYTUzZTgxMzcxMTI0OTNlMmQxNDgyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDIxLTA2LTE0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlp QHNvbnkuY29tPgorCisgICAgICAgIFJlaW1wbGVtZW50IEpTQzo6Q2FjaGVQYXlsb2FkIHdpdGhv dXQgRmlsZVN5c3RlbTo6dW5tYXBWaWV3T2ZGaWxlIGFuZCBGaWxlU3lzdGVtOjpNYXBwZWRGaWxl RGF0YTo6bGVha0hhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI3MDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3dGYvRmlsZVN5c3RlbS5oOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1w bDo6TWFwcGVkRmlsZURhdGE6OmxlYWtIYW5kbGUpOiBEZWxldGVkLgorCiAyMDIxLTA2LTE0ICBQ ZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFN5bmMgQWNjZXNz aWJpbGl0eSBwcmVmZXJlbmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvQ2FjaGVQYXlsb2FkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nh Y2hlUGF5bG9hZC5jcHAKaW5kZXggMWEzODMyZWJmMWZmMzIzODRkNWE2NDQ0ZDVmMTZjNmJhY2Fl ZTI0NS4uYTQ4NDMxNzM2MTVjM2M3ZGFjM2I4MzU1MDlmZjZmMzMxOWFkMDc2YyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVQYXlsb2FkLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxvYWQuY3BwCkBAIC0zMCw0OSAr MzAsNTIgQEAgbmFtZXNwYWNlIEpTQyB7CiAKIENhY2hlUGF5bG9hZCBDYWNoZVBheWxvYWQ6Om1h a2VNYXBwZWRQYXlsb2FkKEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhJiYgZGF0YSkKIHsKLSAg ICByZXR1cm4gQ2FjaGVQYXlsb2FkKHRydWUsIGRhdGEubGVha0hhbmRsZSgpLCBkYXRhLnNpemUo KSk7CisgICAgcmV0dXJuIENhY2hlUGF5bG9hZChXVEZNb3ZlKGRhdGEpKTsKIH0KIAogQ2FjaGVQ YXlsb2FkIENhY2hlUGF5bG9hZDo6bWFrZU1hbGxvY1BheWxvYWQoTWFsbG9jUHRyPHVpbnQ4X3Qs IFZNTWFsbG9jPiYmIGRhdGEsIHNpemVfdCBzaXplKQogewotICAgIHJldHVybiBDYWNoZVBheWxv YWQoZmFsc2UsIGRhdGEubGVha1B0cigpLCBzaXplKTsKKyAgICByZXR1cm4gQ2FjaGVQYXlsb2Fk KHN0ZDo6bWFrZV9wYWlyKFdURk1vdmUoZGF0YSksIHNpemUpKTsKIH0KIAogQ2FjaGVQYXlsb2Fk IENhY2hlUGF5bG9hZDo6bWFrZUVtcHR5UGF5bG9hZCgpCiB7Ci0gICAgcmV0dXJuIENhY2hlUGF5 bG9hZCh0cnVlLCBudWxscHRyLCAwKTsKKyAgICByZXR1cm4gQ2FjaGVQYXlsb2FkKHN0ZDo6bWFr ZV9wYWlyKG51bGxwdHIsIDApKTsKIH0KIAogQ2FjaGVQYXlsb2FkOjpDYWNoZVBheWxvYWQoQ2Fj aGVQYXlsb2FkJiYgb3RoZXIpCiB7Ci0gICAgbV9tYXBwZWQgPSBvdGhlci5tX21hcHBlZDsKLSAg ICBtX3NpemUgPSBvdGhlci5tX3NpemU7Ci0gICAgbV9kYXRhID0gb3RoZXIubV9kYXRhOwotICAg IG90aGVyLm1fbWFwcGVkID0gZmFsc2U7Ci0gICAgb3RoZXIubV9kYXRhID0gbnVsbHB0cjsKLSAg ICBvdGhlci5tX3NpemUgPSAwOworICAgIG1fZGF0YSA9IFdURk1vdmUob3RoZXIubV9kYXRhKTsK KyAgICBvdGhlci5tX2RhdGEgPSBzdGQ6Om1ha2VfcGFpcihudWxscHRyLCAwKTsKIH0KIAotQ2Fj aGVQYXlsb2FkOjp+Q2FjaGVQYXlsb2FkKCkKK0NhY2hlUGF5bG9hZDo6Q2FjaGVQYXlsb2FkKFZh cmlhbnQ8RmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEsIHN0ZDo6cGFpcjxNYWxsb2NQdHI8dWlu dDhfdCwgVk1NYWxsb2M+LCBzaXplX3Q+PiYmIGRhdGEpCisgICAgOiBtX2RhdGEoV1RGTW92ZShk YXRhKSkKIHsKLSAgICBmcmVlRGF0YSgpOwogfQogCi1DYWNoZVBheWxvYWQmIENhY2hlUGF5bG9h ZDo6b3BlcmF0b3I9KENhY2hlUGF5bG9hZCYmIG90aGVyKQorQ2FjaGVQYXlsb2FkOjp+Q2FjaGVQ YXlsb2FkKCkgPSBkZWZhdWx0OworCitjb25zdCB1aW50OF90KiBDYWNoZVBheWxvYWQ6OmRhdGEo KSBjb25zdAogewotICAgIEFTU0VSVCgmb3RoZXIgIT0gdGhpcyk7Ci0gICAgZnJlZURhdGEoKTsK LSAgICByZXR1cm4gKm5ldyAodGhpcykgQ2FjaGVQYXlsb2FkKFdURk1vdmUob3RoZXIpKTsKKyAg ICByZXR1cm4gV1RGOjpzd2l0Y2hPbihtX2RhdGEsCisgICAgICAgIFtdKGNvbnN0IEZpbGVTeXN0 ZW06Ok1hcHBlZEZpbGVEYXRhJiBkYXRhKSB7CisgICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8Y29uc3QgdWludDhfdCo+KGRhdGEuZGF0YSgpKTsKKyAgICAgICAgfSwKKyAgICAgICAgW10o Y29uc3Qgc3RkOjpwYWlyPE1hbGxvY1B0cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4mIGRh dGEpIHsKKyAgICAgICAgICAgIHJldHVybiBkYXRhLmZpcnN0LmdldCgpOworICAgICAgICB9KTsK IH0KIAotdm9pZCBDYWNoZVBheWxvYWQ6OmZyZWVEYXRhKCkKK3NpemVfdCBDYWNoZVBheWxvYWQ6 OnNpemUoKSBjb25zdAogewotICAgIGlmICghbV9kYXRhKQotICAgICAgICByZXR1cm47Ci0gICAg aWYgKG1fbWFwcGVkKSB7Ci0gICAgICAgIEZpbGVTeXN0ZW06OnVubWFwVmlld09mRmlsZShtX2Rh dGEsIG1fc2l6ZSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGZhc3RGcmVlKG1fZGF0YSk7CisgICAg cmV0dXJuIFdURjo6c3dpdGNoT24obV9kYXRhLAorICAgICAgICBbXShjb25zdCBGaWxlU3lzdGVt OjpNYXBwZWRGaWxlRGF0YSYgZGF0YSkgeworICAgICAgICAgICAgcmV0dXJuIGRhdGEuc2l6ZSgp OworICAgICAgICB9LAorICAgICAgICBbXShjb25zdCBzdGQ6OnBhaXI8TWFsbG9jUHRyPHVpbnQ4 X3QsIFZNTWFsbG9jPiwgc2l6ZV90PiYgZGF0YSkgeworICAgICAgICAgICAgcmV0dXJuIGRhdGEu c2Vjb25kOworICAgICAgICB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxvYWQuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlUGF5bG9hZC5oCmluZGV4IDFkY2ExMTcyMjI1Yzk1 OTUyYzU1MjkxZGNjNmJhYmM3ODkxYjhlYmIuLmJlZjhkNzA2NTIyYWY2YWUwMjQ5ZTg2NWZlMzAz OTQ2MWU2MDk2ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nh Y2hlUGF5bG9hZC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlUGF5 bG9hZC5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiVk0uaCIKICNpbmNsdWRlIDx3dGYv RmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0Zi9NYWxsb2NQdHIuaD4KKyNpbmNsdWRlIDx3dGYv VmFyaWFudC5oPgogCiBuYW1lc3BhY2UgSlNDIHsKIApAQCAtNDEsMjIgKzQyLDEzIEBAIHB1Ymxp YzoKICAgICBKU19FWFBPUlRfUFJJVkFURSB+Q2FjaGVQYXlsb2FkKCk7CiAgICAgSlNfRVhQT1JU X1BSSVZBVEUgQ2FjaGVQYXlsb2FkJiBvcGVyYXRvcj0oQ2FjaGVQYXlsb2FkJiYgb3RoZXIpOwog Ci0gICAgY29uc3QgdWludDhfdCogZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YTsgfQotICAg IHNpemVfdCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaXplOyB9CisgICAgSlNfRVhQT1JUX1BS SVZBVEUgY29uc3QgdWludDhfdCogZGF0YSgpIGNvbnN0OworICAgIEpTX0VYUE9SVF9QUklWQVRF IHNpemVfdCBzaXplKCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgQ2FjaGVQYXlsb2FkKGJvb2wg bWFwcGVkLCB2b2lkKiBkYXRhLCBzaXplX3Qgc2l6ZSkKLSAgICAgICAgOiBtX21hcHBlZChtYXBw ZWQpCi0gICAgICAgICwgbV9zaXplKHNpemUpCi0gICAgICAgICwgbV9kYXRhKHN0YXRpY19jYXN0 PHVpbnQ4X3QqPihkYXRhKSkKLSAgICB7Ci0gICAgfQotCi0gICAgdm9pZCBmcmVlRGF0YSgpOwot Ci0gICAgYm9vbCBtX21hcHBlZDsKLSAgICBzaXplX3QgbV9zaXplOwotICAgIHVpbnQ4X3QqIG1f ZGF0YTsKKyAgICBDYWNoZVBheWxvYWQoVmFyaWFudDxGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0 YSwgc3RkOjpwYWlyPE1hbGxvY1B0cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4+JiYpOwor CisgICAgVmFyaWFudDxGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSwgc3RkOjpwYWlyPE1hbGxv Y1B0cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4+IG1fZGF0YTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIEpTQwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oIGIvU291 cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oCmluZGV4IGY3NTczYTg2NzNiNmIyMTJlYTc2NzY0NjRl MGJiMzU3YTg4ZWUxOTkuLjk2N2Q0NGJiNTY1YzQ4YWNiODcxZjFlZGJmNWE4NzE2N2Q4MGFmMzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9GaWxlU3lzdGVtLmgKQEAgLTIxMCw3ICsyMTAsNyBAQCBXVEZfRVhQT1JUX1BSSVZBVEUg U3RyaW5nIHJlYWxQYXRoKGNvbnN0IFN0cmluZyYpOwogV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wg aXNTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpOwogV1RGX0VYUE9SVF9Q UklWQVRFIHZvaWQgbWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJik7 CiAKLVdURl9FWFBPUlRfUFJJVkFURSBib29sIHVubWFwVmlld09mRmlsZSh2b2lkKiBidWZmZXIs IHNpemVfdCk7Citib29sIHVubWFwVmlld09mRmlsZSh2b2lkKiBidWZmZXIsIHNpemVfdCk7CiAK IGNsYXNzIE1hcHBlZEZpbGVEYXRhIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKQEAg LTIyNyw4ICsyMjcsNiBAQCBwdWJsaWM6CiAgICAgY29uc3Qgdm9pZCogZGF0YSgpIGNvbnN0IHsg cmV0dXJuIG1fZmlsZURhdGE7IH0KICAgICB1bnNpZ25lZCBzaXplKCkgY29uc3QgeyByZXR1cm4g bV9maWxlU2l6ZTsgfQogCi0gICAgdm9pZCogbGVha0hhbmRsZSgpIHsgcmV0dXJuIHN0ZDo6ZXhj aGFuZ2UobV9maWxlRGF0YSwgbnVsbHB0cik7IH0KLQogcHJpdmF0ZToKICAgICBXVEZfRVhQT1JU X1BSSVZBVEUgYm9vbCBtYXBGaWxlSGFuZGxlKFBsYXRmb3JtRmlsZUhhbmRsZSwgRmlsZU9wZW5N b2RlLCBNYXBwZWRGaWxlTW9kZSk7CiAK 431409 2021-06-15 00:24:26 -0700 2021-06-17 13:07:04 -0700 Patch bug-227014-20210615162425.patch text/plain 5594 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl OWJjMzkyM2MyMjRiMWViMjkwMTM2MTBlZWYwZTM4YmI3MDUyMTM1Li42YTdlYzVhNDkxNWE0Y2Ey ZjAzYjk2NTMwNmFlYzVjZmQ5YjkzMWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMS0wNi0xNCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBSZWltcGxlbWVudCBKU0M6OkNhY2hlUGF5bG9hZCB3aXRob3V0 IEZpbGVTeXN0ZW06OnVubWFwVmlld09mRmlsZSBhbmQgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURh dGE6OmxlYWtIYW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIHIyNDc1NDIgKEJ1ZyAxOTk3NTkpIGFkZGVkIEZpbGVTeXN0ZW06OnVubWFwVmlld09m RmlsZSBhbmQKKyAgICAgICAgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGE6OmxlYWtIYW5kbGUg Zm9yIEpTQzo6Q2FjaGVQYXlsb2FkIHRvCisgICAgICAgIGdldCB0aGUgbWFwcGVkIGFkZHJlc3Mg YW5kIHRvIGZyZWUgdGhlIGFkZHJlc3MuCisKKyAgICAgICAgSG93ZXZlciwgQnVnIDIyNzAxMSBp cyBnb2luZyB0byBhZGQgYSBmaWxlIG1hcHBpbmcgaGFuZGxlIHRvCisgICAgICAgIEZpbGVTeXN0 ZW06Ok1hcHBlZEZpbGVEYXRhIGZvciBXaW5kb3dzIHBvcnQgdG8gY3JlYXRlIGEKKyAgICAgICAg U2hhcmVkTWVtb3J5IGZyb20gYSBNYXBwZWRGaWxlRGF0YS4gRGVzdHJ1Y3Rpb24gb2YgTWFwcGVk RmlsZURhdGEKKyAgICAgICAgc2hvdWxkIGJlIGRvbmUgb25seSBieSBNYXBwZWRGaWxlRGF0YSBk dG9yLgorCisgICAgICAgICogcnVudGltZS9DYWNoZVBheWxvYWQuY3BwOgorICAgICAgICAoSlND OjpDYWNoZVBheWxvYWQ6Om1ha2VNYXBwZWRQYXlsb2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQ YXlsb2FkOjptYWtlTWFsbG9jUGF5bG9hZCk6CisgICAgICAgIChKU0M6OkNhY2hlUGF5bG9hZDo6 bWFrZUVtcHR5UGF5bG9hZCk6CisgICAgICAgIChKU0M6OkNhY2hlUGF5bG9hZDo6Q2FjaGVQYXls b2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpkYXRhIGNvbnN0KToKKyAgICAgICAg KEpTQzo6Q2FjaGVQYXlsb2FkOjpzaXplIGNvbnN0KToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXls b2FkOjp+Q2FjaGVQYXlsb2FkKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2Fk OjpvcGVyYXRvcj0pOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OmZyZWVE YXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBydW50aW1lL0NhY2hlUGF5bG9hZC5oOiBVc2UgVmFy aWFudCBmb3IgZGF0YS4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpkYXRhIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpzaXplIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpDYWNoZVBheWxvYWQpOiBEZWxldGVkLgor CiAyMDIxLTA2LTE0ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0pTQ10gV29ya2Fyb3VuZCBJQ1UgdWxvY19hZGRMaWtlbHlTdWJ0YWdzIC8gdWxvY19taW5p bWl6ZVN1YnRhZ3MgYnVncwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ2FjaGVQYXlsb2FkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hl UGF5bG9hZC5jcHAKaW5kZXggMWEzODMyZWJmMWZmMzIzODRkNWE2NDQ0ZDVmMTZjNmJhY2FlZTI0 NS4uYTQ4NDMxNzM2MTVjM2M3ZGFjM2I4MzU1MDlmZjZmMzMxOWFkMDc2YyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVQYXlsb2FkLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxvYWQuY3BwCkBAIC0zMCw0OSArMzAs NTIgQEAgbmFtZXNwYWNlIEpTQyB7CiAKIENhY2hlUGF5bG9hZCBDYWNoZVBheWxvYWQ6Om1ha2VN YXBwZWRQYXlsb2FkKEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhJiYgZGF0YSkKIHsKLSAgICBy ZXR1cm4gQ2FjaGVQYXlsb2FkKHRydWUsIGRhdGEubGVha0hhbmRsZSgpLCBkYXRhLnNpemUoKSk7 CisgICAgcmV0dXJuIENhY2hlUGF5bG9hZChXVEZNb3ZlKGRhdGEpKTsKIH0KIAogQ2FjaGVQYXls b2FkIENhY2hlUGF5bG9hZDo6bWFrZU1hbGxvY1BheWxvYWQoTWFsbG9jUHRyPHVpbnQ4X3QsIFZN TWFsbG9jPiYmIGRhdGEsIHNpemVfdCBzaXplKQogewotICAgIHJldHVybiBDYWNoZVBheWxvYWQo ZmFsc2UsIGRhdGEubGVha1B0cigpLCBzaXplKTsKKyAgICByZXR1cm4gQ2FjaGVQYXlsb2FkKHN0 ZDo6bWFrZV9wYWlyKFdURk1vdmUoZGF0YSksIHNpemUpKTsKIH0KIAogQ2FjaGVQYXlsb2FkIENh Y2hlUGF5bG9hZDo6bWFrZUVtcHR5UGF5bG9hZCgpCiB7Ci0gICAgcmV0dXJuIENhY2hlUGF5bG9h ZCh0cnVlLCBudWxscHRyLCAwKTsKKyAgICByZXR1cm4gQ2FjaGVQYXlsb2FkKHN0ZDo6bWFrZV9w YWlyKG51bGxwdHIsIDApKTsKIH0KIAogQ2FjaGVQYXlsb2FkOjpDYWNoZVBheWxvYWQoQ2FjaGVQ YXlsb2FkJiYgb3RoZXIpCiB7Ci0gICAgbV9tYXBwZWQgPSBvdGhlci5tX21hcHBlZDsKLSAgICBt X3NpemUgPSBvdGhlci5tX3NpemU7Ci0gICAgbV9kYXRhID0gb3RoZXIubV9kYXRhOwotICAgIG90 aGVyLm1fbWFwcGVkID0gZmFsc2U7Ci0gICAgb3RoZXIubV9kYXRhID0gbnVsbHB0cjsKLSAgICBv dGhlci5tX3NpemUgPSAwOworICAgIG1fZGF0YSA9IFdURk1vdmUob3RoZXIubV9kYXRhKTsKKyAg ICBvdGhlci5tX2RhdGEgPSBzdGQ6Om1ha2VfcGFpcihudWxscHRyLCAwKTsKIH0KIAotQ2FjaGVQ YXlsb2FkOjp+Q2FjaGVQYXlsb2FkKCkKK0NhY2hlUGF5bG9hZDo6Q2FjaGVQYXlsb2FkKFZhcmlh bnQ8RmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEsIHN0ZDo6cGFpcjxNYWxsb2NQdHI8dWludDhf dCwgVk1NYWxsb2M+LCBzaXplX3Q+PiYmIGRhdGEpCisgICAgOiBtX2RhdGEoV1RGTW92ZShkYXRh KSkKIHsKLSAgICBmcmVlRGF0YSgpOwogfQogCi1DYWNoZVBheWxvYWQmIENhY2hlUGF5bG9hZDo6 b3BlcmF0b3I9KENhY2hlUGF5bG9hZCYmIG90aGVyKQorQ2FjaGVQYXlsb2FkOjp+Q2FjaGVQYXls b2FkKCkgPSBkZWZhdWx0OworCitjb25zdCB1aW50OF90KiBDYWNoZVBheWxvYWQ6OmRhdGEoKSBj b25zdAogewotICAgIEFTU0VSVCgmb3RoZXIgIT0gdGhpcyk7Ci0gICAgZnJlZURhdGEoKTsKLSAg ICByZXR1cm4gKm5ldyAodGhpcykgQ2FjaGVQYXlsb2FkKFdURk1vdmUob3RoZXIpKTsKKyAgICBy ZXR1cm4gV1RGOjpzd2l0Y2hPbihtX2RhdGEsCisgICAgICAgIFtdKGNvbnN0IEZpbGVTeXN0ZW06 Ok1hcHBlZEZpbGVEYXRhJiBkYXRhKSB7CisgICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 Y29uc3QgdWludDhfdCo+KGRhdGEuZGF0YSgpKTsKKyAgICAgICAgfSwKKyAgICAgICAgW10oY29u c3Qgc3RkOjpwYWlyPE1hbGxvY1B0cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4mIGRhdGEp IHsKKyAgICAgICAgICAgIHJldHVybiBkYXRhLmZpcnN0LmdldCgpOworICAgICAgICB9KTsKIH0K IAotdm9pZCBDYWNoZVBheWxvYWQ6OmZyZWVEYXRhKCkKK3NpemVfdCBDYWNoZVBheWxvYWQ6OnNp emUoKSBjb25zdAogewotICAgIGlmICghbV9kYXRhKQotICAgICAgICByZXR1cm47Ci0gICAgaWYg KG1fbWFwcGVkKSB7Ci0gICAgICAgIEZpbGVTeXN0ZW06OnVubWFwVmlld09mRmlsZShtX2RhdGEs IG1fc2l6ZSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGZhc3RGcmVlKG1fZGF0YSk7CisgICAgcmV0 dXJuIFdURjo6c3dpdGNoT24obV9kYXRhLAorICAgICAgICBbXShjb25zdCBGaWxlU3lzdGVtOjpN YXBwZWRGaWxlRGF0YSYgZGF0YSkgeworICAgICAgICAgICAgcmV0dXJuIGRhdGEuc2l6ZSgpOwor ICAgICAgICB9LAorICAgICAgICBbXShjb25zdCBzdGQ6OnBhaXI8TWFsbG9jUHRyPHVpbnQ4X3Qs IFZNTWFsbG9jPiwgc2l6ZV90PiYgZGF0YSkgeworICAgICAgICAgICAgcmV0dXJuIGRhdGEuc2Vj b25kOworICAgICAgICB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxvYWQuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlUGF5bG9hZC5oCmluZGV4IDFkY2ExMTcyMjI1Yzk1OTUy YzU1MjkxZGNjNmJhYmM3ODkxYjhlYmIuLmJlZjhkNzA2NTIyYWY2YWUwMjQ5ZTg2NWZlMzAzOTQ2 MWU2MDk2ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hl UGF5bG9hZC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlUGF5bG9h ZC5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiVk0uaCIKICNpbmNsdWRlIDx3dGYvRmls ZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0Zi9NYWxsb2NQdHIuaD4KKyNpbmNsdWRlIDx3dGYvVmFy aWFudC5oPgogCiBuYW1lc3BhY2UgSlNDIHsKIApAQCAtNDEsMjIgKzQyLDEzIEBAIHB1YmxpYzoK ICAgICBKU19FWFBPUlRfUFJJVkFURSB+Q2FjaGVQYXlsb2FkKCk7CiAgICAgSlNfRVhQT1JUX1BS SVZBVEUgQ2FjaGVQYXlsb2FkJiBvcGVyYXRvcj0oQ2FjaGVQYXlsb2FkJiYgb3RoZXIpOwogCi0g ICAgY29uc3QgdWludDhfdCogZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YTsgfQotICAgIHNp emVfdCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaXplOyB9CisgICAgSlNfRVhQT1JUX1BSSVZB VEUgY29uc3QgdWludDhfdCogZGF0YSgpIGNvbnN0OworICAgIEpTX0VYUE9SVF9QUklWQVRFIHNp emVfdCBzaXplKCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgQ2FjaGVQYXlsb2FkKGJvb2wgbWFw cGVkLCB2b2lkKiBkYXRhLCBzaXplX3Qgc2l6ZSkKLSAgICAgICAgOiBtX21hcHBlZChtYXBwZWQp Ci0gICAgICAgICwgbV9zaXplKHNpemUpCi0gICAgICAgICwgbV9kYXRhKHN0YXRpY19jYXN0PHVp bnQ4X3QqPihkYXRhKSkKLSAgICB7Ci0gICAgfQotCi0gICAgdm9pZCBmcmVlRGF0YSgpOwotCi0g ICAgYm9vbCBtX21hcHBlZDsKLSAgICBzaXplX3QgbV9zaXplOwotICAgIHVpbnQ4X3QqIG1fZGF0 YTsKKyAgICBDYWNoZVBheWxvYWQoVmFyaWFudDxGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSwg c3RkOjpwYWlyPE1hbGxvY1B0cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4+JiYpOworCisg ICAgVmFyaWFudDxGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSwgc3RkOjpwYWlyPE1hbGxvY1B0 cjx1aW50OF90LCBWTU1hbGxvYz4sIHNpemVfdD4+IG1fZGF0YTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIEpTQwo= 431712 2021-06-17 13:07:14 -0700 2021-06-17 13:07:14 -0700 Patch for landing bug-227014-20210618050713.patch text/plain 5595 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi YmMyZGE3MDM4ODliNGY5ZDY2ODVjYmJiYjc5OTdmOGVmZTU0NjJjLi5lZTE5ZTFjZTQ1NGVhYjdh NDBkM2JjMTkzYjNhMmI4NWFhMjMzMDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMS0wNi0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBSZWltcGxlbWVudCBKU0M6OkNhY2hlUGF5bG9hZCB3aXRob3V0 IEZpbGVTeXN0ZW06OnVubWFwVmlld09mRmlsZSBhbmQgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURh dGE6OmxlYWtIYW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IFl1c3VrZSBTdXp1a2kuCisKKyAg ICAgICAgcjI0NzU0MiAoQnVnIDE5OTc1OSkgYWRkZWQgRmlsZVN5c3RlbTo6dW5tYXBWaWV3T2ZG aWxlIGFuZAorICAgICAgICBGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YTo6bGVha0hhbmRsZSBm b3IgSlNDOjpDYWNoZVBheWxvYWQgdG8KKyAgICAgICAgZ2V0IHRoZSBtYXBwZWQgYWRkcmVzcyBh bmQgdG8gZnJlZSB0aGUgYWRkcmVzcy4KKworICAgICAgICBIb3dldmVyLCBCdWcgMjI3MDExIGlz IGdvaW5nIHRvIGFkZCBhIGZpbGUgbWFwcGluZyBoYW5kbGUgdG8KKyAgICAgICAgRmlsZVN5c3Rl bTo6TWFwcGVkRmlsZURhdGEgZm9yIFdpbmRvd3MgcG9ydCB0byBjcmVhdGUgYQorICAgICAgICBT aGFyZWRNZW1vcnkgZnJvbSBhIE1hcHBlZEZpbGVEYXRhLiBEZXN0cnVjdGlvbiBvZiBNYXBwZWRG aWxlRGF0YQorICAgICAgICBzaG91bGQgYmUgZG9uZSBvbmx5IGJ5IE1hcHBlZEZpbGVEYXRhIGR0 b3IuCisKKyAgICAgICAgKiBydW50aW1lL0NhY2hlUGF5bG9hZC5jcHA6CisgICAgICAgIChKU0M6 OkNhY2hlUGF5bG9hZDo6bWFrZU1hcHBlZFBheWxvYWQpOgorICAgICAgICAoSlNDOjpDYWNoZVBh eWxvYWQ6Om1ha2VNYWxsb2NQYXlsb2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpt YWtlRW1wdHlQYXlsb2FkKToKKyAgICAgICAgKEpTQzo6Q2FjaGVQYXlsb2FkOjpDYWNoZVBheWxv YWQpOgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OmRhdGEgY29uc3QpOgorICAgICAgICAo SlNDOjpDYWNoZVBheWxvYWQ6OnNpemUgY29uc3QpOgorICAgICAgICAoSlNDOjpDYWNoZVBheWxv YWQ6On5DYWNoZVBheWxvYWQpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6 Om9wZXJhdG9yPSk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkNhY2hlUGF5bG9hZDo6ZnJlZURh dGEpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvQ2FjaGVQYXlsb2FkLmg6IFVzZSBWYXJp YW50IGZvciBkYXRhLgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OmRhdGEgY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OnNpemUgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoSlNDOjpDYWNoZVBheWxvYWQ6OkNhY2hlUGF5bG9hZCk6IERlbGV0ZWQuCisK IDIwMjEtMDYtMTcgIFlpamlhIEh1YW5nICA8eWlqaWFfaHVhbmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBhIG5ldyBwYXR0ZXJuIHRvIGluc3RydWN0aW9uIHNlbGVjdG9yIHRvIHV0aWxpemUg VUJGWCBzdXBwb3J0ZWQgYnkgQVJNNjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NhY2hlUGF5bG9hZC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9DYWNoZVBheWxvYWQuY3BwCmluZGV4IDFhMzgzMmViZjFmZjMyMzg0ZDVhNjQ0NGQ1ZjE2YzZi YWNhZWUyNDUuLjYxNjhmZWU5NjZjYjY1YzU2Y2Q2NjU1NTY2NmNmNTRiZmRiNzI5YmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlUGF5bG9hZC5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVQYXlsb2FkLmNwcApAQCAtMzAs NDkgKzMwLDUyIEBAIG5hbWVzcGFjZSBKU0MgewogCiBDYWNoZVBheWxvYWQgQ2FjaGVQYXlsb2Fk OjptYWtlTWFwcGVkUGF5bG9hZChGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSYmIGRhdGEpCiB7 Ci0gICAgcmV0dXJuIENhY2hlUGF5bG9hZCh0cnVlLCBkYXRhLmxlYWtIYW5kbGUoKSwgZGF0YS5z aXplKCkpOworICAgIHJldHVybiBDYWNoZVBheWxvYWQoV1RGTW92ZShkYXRhKSk7CiB9CiAKIENh Y2hlUGF5bG9hZCBDYWNoZVBheWxvYWQ6Om1ha2VNYWxsb2NQYXlsb2FkKE1hbGxvY1B0cjx1aW50 OF90LCBWTU1hbGxvYz4mJiBkYXRhLCBzaXplX3Qgc2l6ZSkKIHsKLSAgICByZXR1cm4gQ2FjaGVQ YXlsb2FkKGZhbHNlLCBkYXRhLmxlYWtQdHIoKSwgc2l6ZSk7CisgICAgcmV0dXJuIENhY2hlUGF5 bG9hZChzdGQ6OnBhaXIgeyBXVEZNb3ZlKGRhdGEpLCBzaXplIH0pOwogfQogCiBDYWNoZVBheWxv YWQgQ2FjaGVQYXlsb2FkOjptYWtlRW1wdHlQYXlsb2FkKCkKIHsKLSAgICByZXR1cm4gQ2FjaGVQ YXlsb2FkKHRydWUsIG51bGxwdHIsIDApOworICAgIHJldHVybiBDYWNoZVBheWxvYWQoc3RkOjpw YWlyIHsgbnVsbHB0ciwgMCB9KTsKIH0KIAogQ2FjaGVQYXlsb2FkOjpDYWNoZVBheWxvYWQoQ2Fj aGVQYXlsb2FkJiYgb3RoZXIpCiB7Ci0gICAgbV9tYXBwZWQgPSBvdGhlci5tX21hcHBlZDsKLSAg ICBtX3NpemUgPSBvdGhlci5tX3NpemU7Ci0gICAgbV9kYXRhID0gb3RoZXIubV9kYXRhOwotICAg IG90aGVyLm1fbWFwcGVkID0gZmFsc2U7Ci0gICAgb3RoZXIubV9kYXRhID0gbnVsbHB0cjsKLSAg ICBvdGhlci5tX3NpemUgPSAwOworICAgIG1fZGF0YSA9IFdURk1vdmUob3RoZXIubV9kYXRhKTsK KyAgICBvdGhlci5tX2RhdGEgPSBzdGQ6OnBhaXIgeyBudWxscHRyLCAwIH07CiB9CiAKLUNhY2hl UGF5bG9hZDo6fkNhY2hlUGF5bG9hZCgpCitDYWNoZVBheWxvYWQ6OkNhY2hlUGF5bG9hZChWYXJp YW50PEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhLCBzdGQ6OnBhaXI8TWFsbG9jUHRyPHVpbnQ4 X3QsIFZNTWFsbG9jPiwgc2l6ZV90Pj4mJiBkYXRhKQorICAgIDogbV9kYXRhKFdURk1vdmUoZGF0 YSkpCiB7Ci0gICAgZnJlZURhdGEoKTsKIH0KIAotQ2FjaGVQYXlsb2FkJiBDYWNoZVBheWxvYWQ6 Om9wZXJhdG9yPShDYWNoZVBheWxvYWQmJiBvdGhlcikKK0NhY2hlUGF5bG9hZDo6fkNhY2hlUGF5 bG9hZCgpID0gZGVmYXVsdDsKKworY29uc3QgdWludDhfdCogQ2FjaGVQYXlsb2FkOjpkYXRhKCkg Y29uc3QKIHsKLSAgICBBU1NFUlQoJm90aGVyICE9IHRoaXMpOwotICAgIGZyZWVEYXRhKCk7Ci0g ICAgcmV0dXJuICpuZXcgKHRoaXMpIENhY2hlUGF5bG9hZChXVEZNb3ZlKG90aGVyKSk7CisgICAg cmV0dXJuIFdURjo6c3dpdGNoT24obV9kYXRhLAorICAgICAgICBbXShjb25zdCBGaWxlU3lzdGVt OjpNYXBwZWRGaWxlRGF0YSYgZGF0YSkgeworICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0 PGNvbnN0IHVpbnQ4X3QqPihkYXRhLmRhdGEoKSk7CisgICAgICAgIH0sCisgICAgICAgIFtdKGNv bnN0IHN0ZDo6cGFpcjxNYWxsb2NQdHI8dWludDhfdCwgVk1NYWxsb2M+LCBzaXplX3Q+JiBkYXRh KSB7CisgICAgICAgICAgICByZXR1cm4gZGF0YS5maXJzdC5nZXQoKTsKKyAgICAgICAgfSk7CiB9 CiAKLXZvaWQgQ2FjaGVQYXlsb2FkOjpmcmVlRGF0YSgpCitzaXplX3QgQ2FjaGVQYXlsb2FkOjpz aXplKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fZGF0YSkKLSAgICAgICAgcmV0dXJuOwotICAgIGlm IChtX21hcHBlZCkgewotICAgICAgICBGaWxlU3lzdGVtOjp1bm1hcFZpZXdPZkZpbGUobV9kYXRh LCBtX3NpemUpOwotICAgIH0gZWxzZQotICAgICAgICBmYXN0RnJlZShtX2RhdGEpOworICAgIHJl dHVybiBXVEY6OnN3aXRjaE9uKG1fZGF0YSwKKyAgICAgICAgW10oY29uc3QgRmlsZVN5c3RlbTo6 TWFwcGVkRmlsZURhdGEmIGRhdGEpIHsKKyAgICAgICAgICAgIHJldHVybiBkYXRhLnNpemUoKTsK KyAgICAgICAgfSwKKyAgICAgICAgW10oY29uc3Qgc3RkOjpwYWlyPE1hbGxvY1B0cjx1aW50OF90 LCBWTU1hbGxvYz4sIHNpemVfdD4mIGRhdGEpIHsKKyAgICAgICAgICAgIHJldHVybiBkYXRhLnNl Y29uZDsKKyAgICAgICAgfSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVQYXlsb2FkLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxvYWQuaAppbmRleCAxZGNhMTE3MjIyNWM5NTk1 MmM1NTI5MWRjYzZiYWJjNzg5MWI4ZWJiLi5iZWY4ZDcwNjUyMmFmNmFlMDI0OWU4NjVmZTMwMzk0 NjFlNjA5NmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNo ZVBheWxvYWQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZVBheWxv YWQuaApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIlZNLmgiCiAjaW5jbHVkZSA8d3RmL0Zp bGVTeXN0ZW0uaD4KICNpbmNsdWRlIDx3dGYvTWFsbG9jUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Zh cmlhbnQuaD4KIAogbmFtZXNwYWNlIEpTQyB7CiAKQEAgLTQxLDIyICs0MiwxMyBAQCBwdWJsaWM6 CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgfkNhY2hlUGF5bG9hZCgpOwogICAgIEpTX0VYUE9SVF9Q UklWQVRFIENhY2hlUGF5bG9hZCYgb3BlcmF0b3I9KENhY2hlUGF5bG9hZCYmIG90aGVyKTsKIAot ICAgIGNvbnN0IHVpbnQ4X3QqIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2RhdGE7IH0KLSAgICBz aXplX3Qgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQorICAgIEpTX0VYUE9SVF9QUklW QVRFIGNvbnN0IHVpbnQ4X3QqIGRhdGEoKSBjb25zdDsKKyAgICBKU19FWFBPUlRfUFJJVkFURSBz aXplX3Qgc2l6ZSgpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIENhY2hlUGF5bG9hZChib29sIG1h cHBlZCwgdm9pZCogZGF0YSwgc2l6ZV90IHNpemUpCi0gICAgICAgIDogbV9tYXBwZWQobWFwcGVk KQotICAgICAgICAsIG1fc2l6ZShzaXplKQotICAgICAgICAsIG1fZGF0YShzdGF0aWNfY2FzdDx1 aW50OF90Kj4oZGF0YSkpCi0gICAgewotICAgIH0KLQotICAgIHZvaWQgZnJlZURhdGEoKTsKLQot ICAgIGJvb2wgbV9tYXBwZWQ7Ci0gICAgc2l6ZV90IG1fc2l6ZTsKLSAgICB1aW50OF90KiBtX2Rh dGE7CisgICAgQ2FjaGVQYXlsb2FkKFZhcmlhbnQ8RmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEs IHN0ZDo6cGFpcjxNYWxsb2NQdHI8dWludDhfdCwgVk1NYWxsb2M+LCBzaXplX3Q+PiYmKTsKKwor ICAgIFZhcmlhbnQ8RmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEsIHN0ZDo6cGFpcjxNYWxsb2NQ dHI8dWludDhfdCwgVk1NYWxsb2M+LCBzaXplX3Q+PiBtX2RhdGE7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBKU0MK