225080 2021-04-26 16:28:23 -0700 UnlinkedCodeBlock should have better accounting for extra memory 2021-04-26 18:11:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1754425 0 keith_miller 2021-04-26 16:28:23 -0700 UnlinkedCodeBlock should have better accounting for extra memory 1754428 1 427101 keith_miller 2021-04-26 16:30:30 -0700 Created attachment 427101 Patch 1754430 2 427101 mark.lam 2021-04-26 16:33:09 -0700 Comment on attachment 427101 Patch r=me 1754431 3 427101 ysuzuki 2021-04-26 16:34:05 -0700 Comment on attachment 427101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427101&action=review > Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp:119 > +size_t UnlinkedCodeBlock::RareData::sizeInBytes() const Let's take a locker parameter to ensure that this is accessed while taking a lock. 1754432 4 427101 ysuzuki 2021-04-26 16:35:29 -0700 Comment on attachment 427101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427101&action=review >> Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp:119 >> +size_t UnlinkedCodeBlock::RareData::sizeInBytes() const > > Let's take a locker parameter to ensure that this is accessed while taking a lock. And can you ensure that these fields are initialized while taking a lock? 1754441 5 427101 keith_miller 2021-04-26 16:49:48 -0700 Comment on attachment 427101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427101&action=review >>> Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp:119 >>> +size_t UnlinkedCodeBlock::RareData::sizeInBytes() const >> >> Let's take a locker parameter to ensure that this is accessed while taking a lock. > > And can you ensure that these fields are initialized while taking a lock? Done, and it did look like there were a few places where the initializer was not holding the lock... I fixed those. 1754442 6 427105 keith_miller 2021-04-26 16:50:16 -0700 Created attachment 427105 Patch for landing 1754465 7 ews-feeder 2021-04-26 18:10:07 -0700 Committed r276625 (237053@main): <https://commits.webkit.org/237053@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427105. 1754466 8 webkit-bug-importer 2021-04-26 18:11:20 -0700 <rdar://problem/77185832> 427101 2021-04-26 16:30:30 -0700 2021-04-26 16:50:13 -0700 Patch bug-225080-20210426193029.patch text/plain 3944 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx MzExZGE2YzczZWFlZGNmMThhNTFlOThkZjAzYzQ1MjgxYmY4NGI0Li42ZGIxMzNhOTk1YmQ0ZTU4 ZWFlNDQ1YzdmOWI3YWRiNzQwNGMyMzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wNC0yNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBVbmxpbmtlZENvZGVCbG9jayBzaG91bGQgaGF2ZSBiZXR0ZXIgYWNj b3VudGluZyBmb3IgZXh0cmEgbWVtb3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjUwODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSaWdodCBub3cgd2UgYXJlbid0IHRlbGxpbmcgdGhlIEpTIEdDIGFi b3V0IHRoZSBleHRyYSBtZW1vcnkKKyAgICAgICAgYXR0YWNoZWQgdG8gVW5saW5rZWRDb2RlQmxv Y2tzLiBJdCBsb29rcyBsaWtlIG9uIGF0IGxlYXN0IHNvbWUgc2l0ZXMgdGhpcworICAgICAgICBj YW4gYmUgYSBmYWlybHkgbGFyZ2UgcGVyY2VudGFnZSBvZiB0aGUgdG90YWwgbWVtb3J5IHJldGFp bmVkIGJ5CisgICAgICAgIHRoZSBKUyBvYmplY3QgZ3JhcGguIFRoaXMgaXMgdmVyeSBzaW1pbGFy IHRvIHRoZSBjaGFuZ2Ugd2UgbWFkZSBmb3IKKyAgICAgICAgQ29kZUJsb2NrcyBpbiByMjc2NjEw LgorCisgICAgICAgICogYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3BwOgorICAgICAgICAo SlNDOjpVbmxpbmtlZENvZGVCbG9jazo6dmlzaXRDaGlsZHJlbkltcGwpOgorICAgICAgICAoSlND OjpVbmxpbmtlZENvZGVCbG9jazo6UmFyZURhdGE6OnNpemVJbkJ5dGVzIGNvbnN0KToKKyAgICAg ICAgKiBieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oOgorCiAyMDIxLTA0LTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXBkYXRlIE1h Yy1zcGVjaWZpYyBDTWFrZSBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5jcHAKaW5kZXggYzEwNjExYzVjYzM3YmQyYzJjNDg2 MDEwZTlmZTVmMGY2ZmM4MTQzMy4uZDQ5ZjEyY2MyM2ZiMTg0NjgwNzUzYjY2ZGJkYzNiZjU3MTUz MGE2OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2Vk Q29kZUJsb2NrLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5r ZWRDb2RlQmxvY2suY3BwCkBAIC05Miw2ICs5MiwxNiBAQCB2b2lkIFVubGlua2VkQ29kZUJsb2Nr Ojp2aXNpdENoaWxkcmVuSW1wbChKU0NlbGwqIGNlbGwsIFZpc2l0b3ImIHZpc2l0b3IpCiAgICAg c2l6ZV90IGV4dHJhTWVtb3J5ID0gdGhpc09iamVjdC0+bV9tZXRhZGF0YS0+c2l6ZUluQnl0ZXMo KTsKICAgICBpZiAodGhpc09iamVjdC0+bV9pbnN0cnVjdGlvbnMpCiAgICAgICAgIGV4dHJhTWVt b3J5ICs9IHRoaXNPYmplY3QtPm1faW5zdHJ1Y3Rpb25zLT5zaXplSW5CeXRlcygpOworICAgIGlm ICh0aGlzT2JqZWN0LT5oYXNSYXJlRGF0YSgpKQorICAgICAgICBleHRyYU1lbW9yeSArPSB0aGlz T2JqZWN0LT5tX3JhcmVEYXRhLT5zaXplSW5CeXRlcygpOworCisgICAgZXh0cmFNZW1vcnkgKz0g dGhpc09iamVjdC0+bV9qdW1wVGFyZ2V0cy5ieXRlU2l6ZSgpOworICAgIGV4dHJhTWVtb3J5ICs9 IHRoaXNPYmplY3QtPm1faWRlbnRpZmllcnMuYnl0ZVNpemUoKTsKKyAgICBleHRyYU1lbW9yeSAr PSB0aGlzT2JqZWN0LT5tX2NvbnN0YW50UmVnaXN0ZXJzLmJ5dGVTaXplKCk7CisgICAgZXh0cmFN ZW1vcnkgKz0gdGhpc09iamVjdC0+bV9jb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24u Ynl0ZVNpemUoKTsKKyAgICBleHRyYU1lbW9yeSArPSB0aGlzT2JqZWN0LT5tX2Z1bmN0aW9uRGVj bHMuYnl0ZVNpemUoKTsKKyAgICBleHRyYU1lbW9yeSArPSB0aGlzT2JqZWN0LT5tX2Z1bmN0aW9u RXhwcnMuYnl0ZVNpemUoKTsKKwogICAgIHZpc2l0b3IucmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVk KGV4dHJhTWVtb3J5KTsKIH0KIApAQCAtMTA2LDYgKzExNiwyMyBAQCBzaXplX3QgVW5saW5rZWRD b2RlQmxvY2s6OmVzdGltYXRlZFNpemUoSlNDZWxsKiBjZWxsLCBWTSYgdm0pCiAgICAgcmV0dXJu IEJhc2U6OmVzdGltYXRlZFNpemUoY2VsbCwgdm0pICsgZXh0cmFTaXplOwogfQogCitzaXplX3Qg VW5saW5rZWRDb2RlQmxvY2s6OlJhcmVEYXRhOjpzaXplSW5CeXRlcygpIGNvbnN0Cit7CisgICAg c2l6ZV90IHNpemUgPSBzaXplb2YoUmFyZURhdGEpOworICAgIHNpemUgKz0gbV9leGNlcHRpb25I YW5kbGVycy5ieXRlU2l6ZSgpOworICAgIHNpemUgKz0gbV91bmxpbmtlZFN3aXRjaEp1bXBUYWJs ZXMuYnl0ZVNpemUoKTsKKyAgICBzaXplICs9IG1fdW5saW5rZWRTdHJpbmdTd2l0Y2hKdW1wVGFi bGVzLmJ5dGVTaXplKCk7CisgICAgc2l6ZSArPSBtX2V4cHJlc3Npb25JbmZvRmF0UG9zaXRpb25z LmJ5dGVTaXplKCk7CisgICAgc2l6ZSArPSBtX3R5cGVQcm9maWxlckluZm9NYXAuY2FwYWNpdHko KSAqIHNpemVvZihkZWNsdHlwZShtX3R5cGVQcm9maWxlckluZm9NYXApOjpLZXlWYWx1ZVBhaXJU eXBlKTsKKyAgICBzaXplICs9IG1fb3BQcm9maWxlQ29udHJvbEZsb3dCeXRlY29kZU9mZnNldHMu Ynl0ZVNpemUoKTsKKyAgICBzaXplICs9IG1fYml0VmVjdG9ycy5ieXRlU2l6ZSgpOworICAgIC8v IEZJWE1FOiBhY2NvdW50IGZvciBlYWNoIGJpdCB2ZWN0b3IuCisgICAgc2l6ZSArPSBtX2NvbnN0 YW50SWRlbnRpZmllclNldHMuYnl0ZVNpemUoKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGlkZW50 aWZpZXJTZXQgOiBtX2NvbnN0YW50SWRlbnRpZmllclNldHMpCisgICAgICAgIHNpemUgKz0gaWRl bnRpZmllclNldC5jYXBhY2l0eSgpICogc2l6ZW9mKHN0ZDo6cmVtb3ZlX3JlZmVyZW5jZV90PGRl Y2x0eXBlKGlkZW50aWZpZXJTZXQpPjo6VmFsdWVUeXBlKTsKKyAgICByZXR1cm4gc2l6ZTsKK30K KwogaW50IFVubGlua2VkQ29kZUJsb2NrOjpsaW5lTnVtYmVyRm9yQnl0ZWNvZGVJbmRleChCeXRl Y29kZUluZGV4IGJ5dGVjb2RlSW5kZXgpCiB7CiAgICAgQVNTRVJUKGJ5dGVjb2RlSW5kZXgub2Zm c2V0KCkgPCBpbnN0cnVjdGlvbnMoKS5zaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suaAppbmRleCAzMTZlYmNhODQyZTNjOWUy N2M1ZGY5YzI4MGU1ODdhODQyY2QzZjM4Li5mMGIwNWIxZmJlNzIyODNmOGYzNDI5N2U5OTg4YzA1 YWM3MzI2YjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5s aW5rZWRDb2RlQmxvY2suaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5s aW5rZWRDb2RlQmxvY2suaApAQCAtNDI1LDYgKzQyNSw4IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3Qg UmFyZURhdGEgewogICAgICAgICBXVEZfTUFLRV9TVFJVQ1RfRkFTVF9BTExPQ0FURUQ7CiAKKyAg ICAgICAgc2l6ZV90IHNpemVJbkJ5dGVzKCkgY29uc3Q7CisKICAgICAgICAgRml4ZWRWZWN0b3I8 VW5saW5rZWRIYW5kbGVySW5mbz4gbV9leGNlcHRpb25IYW5kbGVyczsKIAogICAgICAgICAvLyBK dW1wIFRhYmxlcwo= 427105 2021-04-26 16:50:16 -0700 2021-04-26 18:10:07 -0700 Patch for landing bug-225080-20210426195015.patch text/plain 4908 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx MzExZGE2YzczZWFlZGNmMThhNTFlOThkZjAzYzQ1MjgxYmY4NGI0Li41YzE4OTliNmQyM2RjYzFh ODA0YzczYmMyODdlZjZkZjkwNTkxOGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wNC0yNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBVbmxpbmtlZENvZGVCbG9jayBzaG91bGQgaGF2ZSBiZXR0ZXIgYWNj b3VudGluZyBmb3IgZXh0cmEgbWVtb3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjUwODAKKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4K KworICAgICAgICBSaWdodCBub3cgd2UgYXJlbid0IHRlbGxpbmcgdGhlIEpTIEdDIGFib3V0IHRo ZSBleHRyYSBtZW1vcnkKKyAgICAgICAgYXR0YWNoZWQgdG8gVW5saW5rZWRDb2RlQmxvY2tzLiBJ dCBsb29rcyBsaWtlIG9uIGF0IGxlYXN0IHNvbWUgc2l0ZXMgdGhpcworICAgICAgICBjYW4gYmUg YSBmYWlybHkgbGFyZ2UgcGVyY2VudGFnZSBvZiB0aGUgdG90YWwgbWVtb3J5IHJldGFpbmVkIGJ5 CisgICAgICAgIHRoZSBKUyBvYmplY3QgZ3JhcGguIFRoaXMgaXMgdmVyeSBzaW1pbGFyIHRvIHRo ZSBjaGFuZ2Ugd2UgbWFkZSBmb3IKKyAgICAgICAgQ29kZUJsb2NrcyBpbiByMjc2NjEwLgorCisg ICAgICAgICogYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpV bmxpbmtlZENvZGVCbG9jazo6dmlzaXRDaGlsZHJlbkltcGwpOgorICAgICAgICAoSlNDOjpVbmxp bmtlZENvZGVCbG9jazo6UmFyZURhdGE6OnNpemVJbkJ5dGVzIGNvbnN0KToKKyAgICAgICAgKiBi eXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5oOgorCiAyMDIxLTA0LTI2ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXBkYXRlIE1hYy1zcGVj aWZpYyBDTWFrZSBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL1VubGlua2VkQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9VbmxpbmtlZENvZGVCbG9jay5jcHAKaW5kZXggYzEwNjExYzVjYzM3YmQyYzJjNDg2MDEwZTlm ZTVmMGY2ZmM4MTQzMy4uNmExNjJiZmQzMTE0M2U3MjhlNjUzZTdiNWMwZTQyMmJkZGM5YjcxMiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJs b2NrLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2Rl QmxvY2suY3BwCkBAIC02NiwxMSArNjYsMTMgQEAgVW5saW5rZWRDb2RlQmxvY2s6OlVubGlua2Vk Q29kZUJsb2NrKFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIENvZGVUeXBlIGNvZGUKICAg ICBBU1NFUlQobV9jb2RlVHlwZSA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY29kZVR5cGUpKTsK ICAgICBBU1NFUlQobV9kaWRPcHRpbWl6ZSA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oVHJpU3Rh dGU6OkluZGV0ZXJtaW5hdGUpKTsKICAgICBpZiAoaW5mby5uZWVkc0NsYXNzRmllbGRJbml0aWFs aXplcigpID09IE5lZWRzQ2xhc3NGaWVsZEluaXRpYWxpemVyOjpZZXMpIHsKLSAgICAgICAgY3Jl YXRlUmFyZURhdGFJZk5lY2Vzc2FyeShob2xkTG9jayhjZWxsTG9jaygpKSk7CisgICAgICAgIGF1 dG8gbG9ja2VyID0gaG9sZExvY2soY2VsbExvY2soKSk7CisgICAgICAgIGNyZWF0ZVJhcmVEYXRh SWZOZWNlc3NhcnkobG9ja2VyKTsKICAgICAgICAgbV9yYXJlRGF0YS0+bV9uZWVkc0NsYXNzRmll bGRJbml0aWFsaXplciA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihOZWVkc0NsYXNzRmllbGRJbml0 aWFsaXplcjo6WWVzKTsKICAgICB9CiAgICAgaWYgKGluZm8ucHJpdmF0ZUJyYW5kUmVxdWlyZW1l bnQoKSA9PSBQcml2YXRlQnJhbmRSZXF1aXJlbWVudDo6TmVlZGVkKSB7Ci0gICAgICAgIGNyZWF0 ZVJhcmVEYXRhSWZOZWNlc3NhcnkoaG9sZExvY2soY2VsbExvY2soKSkpOworICAgICAgICBhdXRv IGxvY2tlciA9IGhvbGRMb2NrKGNlbGxMb2NrKCkpOworICAgICAgICBjcmVhdGVSYXJlRGF0YUlm TmVjZXNzYXJ5KGxvY2tlcik7CiAgICAgICAgIG1fcmFyZURhdGEtPm1fcHJpdmF0ZUJyYW5kUmVx dWlyZW1lbnQgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJpdmF0ZUJyYW5kUmVxdWlyZW1lbnQ6 Ok5lZWRlZCk7CiAgICAgfQogfQpAQCAtOTIsNiArOTQsMTYgQEAgdm9pZCBVbmxpbmtlZENvZGVC bG9jazo6dmlzaXRDaGlsZHJlbkltcGwoSlNDZWxsKiBjZWxsLCBWaXNpdG9yJiB2aXNpdG9yKQog ICAgIHNpemVfdCBleHRyYU1lbW9yeSA9IHRoaXNPYmplY3QtPm1fbWV0YWRhdGEtPnNpemVJbkJ5 dGVzKCk7CiAgICAgaWYgKHRoaXNPYmplY3QtPm1faW5zdHJ1Y3Rpb25zKQogICAgICAgICBleHRy YU1lbW9yeSArPSB0aGlzT2JqZWN0LT5tX2luc3RydWN0aW9ucy0+c2l6ZUluQnl0ZXMoKTsKKyAg ICBpZiAodGhpc09iamVjdC0+aGFzUmFyZURhdGEoKSkKKyAgICAgICAgZXh0cmFNZW1vcnkgKz0g dGhpc09iamVjdC0+bV9yYXJlRGF0YS0+c2l6ZUluQnl0ZXMobG9ja2VyKTsKKworICAgIGV4dHJh TWVtb3J5ICs9IHRoaXNPYmplY3QtPm1fanVtcFRhcmdldHMuYnl0ZVNpemUoKTsKKyAgICBleHRy YU1lbW9yeSArPSB0aGlzT2JqZWN0LT5tX2lkZW50aWZpZXJzLmJ5dGVTaXplKCk7CisgICAgZXh0 cmFNZW1vcnkgKz0gdGhpc09iamVjdC0+bV9jb25zdGFudFJlZ2lzdGVycy5ieXRlU2l6ZSgpOwor ICAgIGV4dHJhTWVtb3J5ICs9IHRoaXNPYmplY3QtPm1fY29uc3RhbnRzU291cmNlQ29kZVJlcHJl c2VudGF0aW9uLmJ5dGVTaXplKCk7CisgICAgZXh0cmFNZW1vcnkgKz0gdGhpc09iamVjdC0+bV9m dW5jdGlvbkRlY2xzLmJ5dGVTaXplKCk7CisgICAgZXh0cmFNZW1vcnkgKz0gdGhpc09iamVjdC0+ bV9mdW5jdGlvbkV4cHJzLmJ5dGVTaXplKCk7CisKICAgICB2aXNpdG9yLnJlcG9ydEV4dHJhTWVt b3J5VmlzaXRlZChleHRyYU1lbW9yeSk7CiB9CiAKQEAgLTEwNiw2ICsxMTgsMjMgQEAgc2l6ZV90 IFVubGlua2VkQ29kZUJsb2NrOjplc3RpbWF0ZWRTaXplKEpTQ2VsbCogY2VsbCwgVk0mIHZtKQog ICAgIHJldHVybiBCYXNlOjplc3RpbWF0ZWRTaXplKGNlbGwsIHZtKSArIGV4dHJhU2l6ZTsKIH0K IAorc2l6ZV90IFVubGlua2VkQ29kZUJsb2NrOjpSYXJlRGF0YTo6c2l6ZUluQnl0ZXMoY29uc3Qg QWJzdHJhY3RMb2NrZXImKSBjb25zdAoreworICAgIHNpemVfdCBzaXplID0gc2l6ZW9mKFJhcmVE YXRhKTsKKyAgICBzaXplICs9IG1fZXhjZXB0aW9uSGFuZGxlcnMuYnl0ZVNpemUoKTsKKyAgICBz aXplICs9IG1fdW5saW5rZWRTd2l0Y2hKdW1wVGFibGVzLmJ5dGVTaXplKCk7CisgICAgc2l6ZSAr PSBtX3VubGlua2VkU3RyaW5nU3dpdGNoSnVtcFRhYmxlcy5ieXRlU2l6ZSgpOworICAgIHNpemUg Kz0gbV9leHByZXNzaW9uSW5mb0ZhdFBvc2l0aW9ucy5ieXRlU2l6ZSgpOworICAgIHNpemUgKz0g bV90eXBlUHJvZmlsZXJJbmZvTWFwLmNhcGFjaXR5KCkgKiBzaXplb2YoZGVjbHR5cGUobV90eXBl UHJvZmlsZXJJbmZvTWFwKTo6S2V5VmFsdWVQYWlyVHlwZSk7CisgICAgc2l6ZSArPSBtX29wUHJv ZmlsZUNvbnRyb2xGbG93Qnl0ZWNvZGVPZmZzZXRzLmJ5dGVTaXplKCk7CisgICAgc2l6ZSArPSBt X2JpdFZlY3RvcnMuYnl0ZVNpemUoKTsKKyAgICAvLyBGSVhNRTogYWNjb3VudCBmb3IgZWFjaCBi aXQgdmVjdG9yLgorICAgIHNpemUgKz0gbV9jb25zdGFudElkZW50aWZpZXJTZXRzLmJ5dGVTaXpl KCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBpZGVudGlmaWVyU2V0IDogbV9jb25zdGFudElkZW50 aWZpZXJTZXRzKQorICAgICAgICBzaXplICs9IGlkZW50aWZpZXJTZXQuY2FwYWNpdHkoKSAqIHNp emVvZihzdGQ6OnJlbW92ZV9yZWZlcmVuY2VfdDxkZWNsdHlwZShpZGVudGlmaWVyU2V0KT46OlZh bHVlVHlwZSk7CisgICAgcmV0dXJuIHNpemU7Cit9CisKIGludCBVbmxpbmtlZENvZGVCbG9jazo6 bGluZU51bWJlckZvckJ5dGVjb2RlSW5kZXgoQnl0ZWNvZGVJbmRleCBieXRlY29kZUluZGV4KQog ewogICAgIEFTU0VSVChieXRlY29kZUluZGV4Lm9mZnNldCgpIDwgaW5zdHJ1Y3Rpb25zKCkuc2l6 ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Vbmxpbmtl ZENvZGVCbG9jay5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29k ZUJsb2NrLmgKaW5kZXggMzE2ZWJjYTg0MmUzYzllMjdjNWRmOWMyODBlNTg3YTg0MmNkM2YzOC4u MWVmZWJiMDM1ZmVhYmJlNDBkODM1NWQxMDM2ZjI3MDg5ZDZjZmJlNiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmgKQEAgLTQyNSw2 ICs0MjUsOCBAQCBwdWJsaWM6CiAgICAgc3RydWN0IFJhcmVEYXRhIHsKICAgICAgICAgV1RGX01B S0VfU1RSVUNUX0ZBU1RfQUxMT0NBVEVEOwogCisgICAgICAgIHNpemVfdCBzaXplSW5CeXRlcyhj b25zdCBBYnN0cmFjdExvY2tlciYpIGNvbnN0OworCiAgICAgICAgIEZpeGVkVmVjdG9yPFVubGlu a2VkSGFuZGxlckluZm8+IG1fZXhjZXB0aW9uSGFuZGxlcnM7CiAKICAgICAgICAgLy8gSnVtcCBU YWJsZXMK