77488 2012-01-31 16:03:37 -0800 Replace JSArray destructor with finalizer 2012-02-01 14:15:58 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg dglazkov webkit.review.bot oldest_to_newest 546595 0 mhahnenberg 2012-01-31 16:03:37 -0800 We want JSArray to be in the imminent no-destructor heap, and the only thing preventing us from doing so is the SparseArrayValueMap pointer in JSArray. We can instead add a finalizer whenever we allocate one of these maps, which is very rarely so the performance hit should be negligible. There is also a void* subclassData, but any classes that use this should have destructors anyways. 546654 1 124854 mhahnenberg 2012-01-31 17:02:34 -0800 Created attachment 124854 Patch 546687 2 124854 ggaren 2012-01-31 17:36:35 -0800 Comment on attachment 124854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124854&action=review > Source/JavaScriptCore/runtime/JSArray.cpp:314 > + if (!map) { > map = m_sparseValueMap = new SparseArrayValueMap; > + globalData.heap.addFinalizer(this, finalize); m_sparseValueMap can oscillate between null and non-null. In such a case, this code will register one finalizer for each oscillation, which will result in a double delete. Please write a test case for this condition. You can fix this by setting thisObject->m_sparseValueMap to 0 after deleting it, adding a comment that the finalizer can run more than once, or by never setting m_sparseValueMap to 0, even if it becomes empty. 547317 3 125001 mhahnenberg 2012-02-01 13:17:57 -0800 Created attachment 125001 Patch 547339 4 125001 ggaren 2012-02-01 13:45:50 -0800 Comment on attachment 125001 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125001&action=review r=me > Source/JavaScriptCore/runtime/JSArray.cpp:203 > +void JSArray::finalize(JSCell* cell) Please add a comment here noting that this function can be called more than once, so a future developer doesn't add unsafe code. 547360 5 125001 webkit.review.bot 2012-02-01 14:12:26 -0800 Comment on attachment 125001 Patch Attachment 125001 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11393541 New failing tests: fast/js/sparse-array.html 547361 6 mhahnenberg 2012-02-01 14:15:58 -0800 Committed r106496: <http://trac.webkit.org/changeset/106496> 124854 2012-01-31 17:02:34 -0800 2012-02-01 13:17:54 -0800 Patch bug-77488-20120131170233.patch text/plain 3675 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx Y2Q2NzI4MjJiYzhiYWU2MmFlNGM5ZmNlN2FlODAyMmIwMDkxY2E2Li4zYzI2NmI0ODA2MzA3YWNh ZGQ1YzI4NTNjZDIzYjU3ZTRhYTJlYWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMi0wMS0zMSAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBw bGUuY29tPgorCisgICAgICAgIFJlcGxhY2UgSlNBcnJheSBkZXN0cnVjdG9yIHdpdGggZmluYWxp emVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzQ4 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSmF2 YVNjcmlwdENvcmUuZXhwOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheS5jcHA6CisgICAgICAg IChKU0M6OkpTQXJyYXk6OmZpbmFsaXplKTogQWRkZWQgZmluYWxpemVyLgorICAgICAgICAoSlND OjpKU0FycmF5OjplbnRlclNwYXJzZU1vZGUpOiBBZGQgZmluYWxpemVyIHdoZW4gd2UgZW50ZXIg c3BhcnNlIG1vZGUgZm9yIHRoZSBmaXJzdCB0aW1lLgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJh eS5oOgorICAgICAgICAoSlNBcnJheSk6CisKIDIwMTItMDEtMzEgIE9saXZlciBIdW50ICA8b2xp dmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgRXJyb3Iuc3RhY2sKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCmluZGV4IDlmMzFhZjcwN2FkNzQ3MjVhYjRl OTIwNDkzZTA4ZjExNzYyMmZhYzMuLjQ4NTM3YjFmY2Y4NjIxYzlmMDE0MjA4YTc5M2UwZGEwODNi ZDkzMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5l eHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cApAQCAtMjg4 LDEwICsyODgsOCBAQCBfX1pOM0pTQzdKU0FycmF5MTdkZWZpbmVPd25Qcm9wZXJ0eUVQTlNfOEpT T2JqZWN0RVBOU185RXhlY1N0YXRlRVJLTlNfMTBJZGVudGlmaQogX19aTjNKU0M3SlNBcnJheTI1 Z2V0T3duUHJvcGVydHlTbG90QnlJbmRleEVQTlNfNkpTQ2VsbEVQTlNfOUV4ZWNTdGF0ZUVqUk5T XzEyUHJvcGVydHlTbG90RQogX19aTjNKU0M3SlNBcnJheTMwdHJ5RmluaXNoQ3JlYXRpb25Vbmlu aXRpYWxpemVkRVJOU18xMkpTR2xvYmFsRGF0YUVqCiBfX1pOM0pTQzdKU0FycmF5NnNfaW5mb0UK LV9fWk4zSlNDN0pTQXJyYXk3ZGVzdHJveUVQTlNfNkpTQ2VsbEUKIF9fWk4zSlNDN0pTQXJyYXlD MUVSTlNfMTJKU0dsb2JhbERhdGFFUE5TXzlTdHJ1Y3R1cmVFCiBfX1pOM0pTQzdKU0FycmF5QzJF Uk5TXzEySlNHbG9iYWxEYXRhRVBOU185U3RydWN0dXJlRQotX19aTjNKU0M3SlNBcnJheUQyRXYK IF9fWk4zSlNDN0pTVmFsdWUxM2lzVmFsaWRDYWxsZWVFdgogX19aTjNKU0M3T3B0aW9uczE3bnVt YmVyT2ZHQ01hcmtlcnNFCiBfX1pOM0pTQzdPcHRpb25zMjRvcGFxdWVSb290TWVyZ2VUaHJlc2hv bGRFCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCmluZGV4IDJhZmI2 YTBmYjE2ZGZkYzc5Mjg0MjI0ZjNkZTk5YTM0MDQ5NThmNWYuLjNkYjZmNmQ4MzJhMmIwZmJiNjhi YzlmNDIwZjMxYTNjOTdkZWRmNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTQXJyYXkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT QXJyYXkuY3BwCkBAIC0yMDAsMTYgKzIwMCwxMSBAQCBKU0FycmF5KiBKU0FycmF5Ojp0cnlGaW5p c2hDcmVhdGlvblVuaW5pdGlhbGl6ZWQoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhLCB1bnNpZwog ICAgIHJldHVybiB0aGlzOwogfQogCi1KU0FycmF5Ojp+SlNBcnJheSgpCit2b2lkIEpTQXJyYXk6 OmZpbmFsaXplKEpTQ2VsbCogY2VsbCkKIHsKLSAgICBBU1NFUlQoanNDYXN0PEpTQXJyYXkqPih0 aGlzKSk7Ci0gICAgY2hlY2tDb25zaXN0ZW5jeShEZXN0cnVjdG9yQ29uc2lzdGVuY3lDaGVjayk7 Ci0gICAgZGVsZXRlIG1fc3BhcnNlVmFsdWVNYXA7Ci19Ci0KLXZvaWQgSlNBcnJheTo6ZGVzdHJv eShKU0NlbGwqIGNlbGwpCi17Ci0gICAganNDYXN0PEpTQXJyYXkqPihjZWxsKS0+SlNBcnJheTo6 fkpTQXJyYXkoKTsKKyAgICBKU0FycmF5KiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTQXJyYXkqPihj ZWxsKTsKKyAgICB0aGlzT2JqZWN0LT5jaGVja0NvbnNpc3RlbmN5KERlc3RydWN0b3JDb25zaXN0 ZW5jeUNoZWNrKTsKKyAgICBkZWxldGUgdGhpc09iamVjdC0+bV9zcGFyc2VWYWx1ZU1hcDsKIH0K IAogaW5saW5lIHN0ZDo6cGFpcjxTcGFyc2VBcnJheVZhbHVlTWFwOjppdGVyYXRvciwgYm9vbD4g U3BhcnNlQXJyYXlWYWx1ZU1hcDo6YWRkKEpTQXJyYXkqIGFycmF5LCB1bnNpZ25lZCBpKQpAQCAt MzE0LDggKzMwOSwxMCBAQCB2b2lkIEpTQXJyYXk6OmVudGVyU3BhcnNlTW9kZShKU0dsb2JhbERh dGEmIGdsb2JhbERhdGEpCiAgICAgQXJyYXlTdG9yYWdlKiBzdG9yYWdlID0gbV9zdG9yYWdlOwog ICAgIFNwYXJzZUFycmF5VmFsdWVNYXAqIG1hcCA9IG1fc3BhcnNlVmFsdWVNYXA7CiAKLSAgICBp ZiAoIW1hcCkKKyAgICBpZiAoIW1hcCkgewogICAgICAgICBtYXAgPSBtX3NwYXJzZVZhbHVlTWFw ID0gbmV3IFNwYXJzZUFycmF5VmFsdWVNYXA7CisgICAgICAgIGdsb2JhbERhdGEuaGVhcC5hZGRG aW5hbGl6ZXIodGhpcywgZmluYWxpemUpOworICAgIH0KIAogICAgIGlmIChtYXAtPnNwYXJzZU1v ZGUoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNBcnJheS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJh eS5oCmluZGV4IDVlNDc5NzdhOWMyYTUyMWUzMmNmM2ViZDA4N2QxZDI5ODFlYjVlZWEuLmRjNTZj NjEyMjgxOTdjYWY4Zjk2N2RjNmVmZWMwNmY4ODMyOTExM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0FycmF5LmgKQEAgLTEzMyw4ICsxMzMsNyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICBwdWJsaWM6CiAgICAgICAgIHR5cGVkZWYgSlNOb25GaW5hbE9iamVjdCBCYXNlOwogCi0g ICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIH5KU0FycmF5KCk7Ci0gICAgICAgIEpTX0VYUE9SVF9Q UklWQVRFIHN0YXRpYyB2b2lkIGRlc3Ryb3koSlNDZWxsKik7CisgICAgICAgIHN0YXRpYyB2b2lk IGZpbmFsaXplKEpTQ2VsbCopOwogCiAgICAgICAgIHN0YXRpYyBKU0FycmF5KiBjcmVhdGUoSlNH bG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgdW5zaWduZWQgaW5p dGlhbExlbmd0aCA9IDApCiAgICAgICAgIHsK 125001 2012-02-01 13:17:57 -0800 2012-02-01 14:12:26 -0800 Patch bug-77488-20120201131756.patch text/plain 10048 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OTc4NjE0ZjJhMDE2MDM1MTNhMjQzODFkZWI0YmFjZGM2YTY5YjQ1Li4xOWU4MDU0ZGE4YmE1NGRm ZjkzMGFlMDQ2MTY5NzlhZTU2MTIyZmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxMi0wMi0wMSAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBw bGUuY29tPgorCisgICAgICAgIFJlcGxhY2UgSlNBcnJheSBkZXN0cnVjdG9yIHdpdGggZmluYWxp emVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzQ4 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSmF2 YVNjcmlwdENvcmUuZXhwOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheS5jcHA6CisgICAgICAg IChKU0M6OkpTQXJyYXk6OmZpbmFsaXplKTogQWRkZWQgZmluYWxpemVyLgorICAgICAgICAoSlND OjpKU0FycmF5OjphbGxvY2F0ZVNwYXJzZU1hcCk6IEZhY3RvcmVkIG91dCBjb2RlIGZvciBhbGxv Y2F0aW5nIG5ldyBzcGFyc2UgbWFwcy4KKyAgICAgICAgKEpTQyk6CisgICAgICAgIChKU0M6OkpT QXJyYXk6OmRlYWxsb2NhdGVTcGFyc2VNYXApOiBGYWN0b3JlZCBvdXQgY29kZSBmb3IgZGVhbGxv Y2F0aW5nIHNwYXJzZSBtYXBzLgorICAgICAgICAoSlNDOjpKU0FycmF5OjplbnRlckRpY3Rpb25h cnlNb2RlKTogUmVuYW1lZCBlbnRlclNwYXJzZU1vZGUgdG8gZW50ZXJEaWN0aW9uYXJ5TW9kZSAK KyAgICAgICAgYmVjYXVzZSB0aGUgb2xkIG5hbWUgd2FzIGNvbmZ1c2luZyBiZWNhdXNlIHdlIGNv dWxkIGhhdmUgYSBzcGFyc2UgYXJyYXkgdGhhdCBuZXZlciAKKyAgICAgICAgY2FsbGVkIGVudGVy U3BhcnNlTW9kZS4KKyAgICAgICAgKEpTQzo6SlNBcnJheTo6ZGVmaW5lT3duTnVtZXJpY1Byb3Bl cnR5KToKKyAgICAgICAgKEpTQzo6SlNBcnJheTo6c2V0TGVuZ3RoV3JpdGFibGUpOgorICAgICAg ICAoSlNDOjpKU0FycmF5OjpwdXRCeUluZGV4QmV5b25kVmVjdG9yTGVuZ3RoKToKKyAgICAgICAg KEpTQzo6SlNBcnJheTo6c2V0TGVuZ3RoKToKKyAgICAgICAgKEpTQzo6SlNBcnJheTo6cG9wKToK KyAgICAgICAgKEpTQzo6SlNBcnJheTo6c29ydCk6CisgICAgICAgIChKU0M6OkpTQXJyYXk6OmNv bXBhY3RGb3JTb3J0aW5nKToKKyAgICAgICAgKiBydW50aW1lL0pTQXJyYXkuaDoKKyAgICAgICAg KEpTQXJyYXkpOgorCiAyMDEyLTAyLTAxICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtp dC5vcmc+CiAKICAgICAgICAgSW1wbGVtZW50IEVycm9yLnN0YWNrCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0phdmFTY3JpcHRDb3JlLmV4cAppbmRleCAyZjdiMzE1N2Y2ZGJiN2UwZDM1YjFhZTI0Yjc3 OGQ5M2EyNDU5ZTM3Li43MjY2YzRlMjcxMjgxZmNjYWQ4YTFmYWNmNzU3YTIwYjM1Njk0ZDYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKQEAgLTI4OCwxMCArMjg4 LDggQEAgX19aTjNKU0M3SlNBcnJheTE3ZGVmaW5lT3duUHJvcGVydHlFUE5TXzhKU09iamVjdEVQ TlNfOUV4ZWNTdGF0ZUVSS05TXzEwSWRlbnRpZmkKIF9fWk4zSlNDN0pTQXJyYXkyNWdldE93blBy b3BlcnR5U2xvdEJ5SW5kZXhFUE5TXzZKU0NlbGxFUE5TXzlFeGVjU3RhdGVFalJOU18xMlByb3Bl cnR5U2xvdEUKIF9fWk4zSlNDN0pTQXJyYXkzMHRyeUZpbmlzaENyZWF0aW9uVW5pbml0aWFsaXpl ZEVSTlNfMTJKU0dsb2JhbERhdGFFagogX19aTjNKU0M3SlNBcnJheTZzX2luZm9FCi1fX1pOM0pT QzdKU0FycmF5N2Rlc3Ryb3lFUE5TXzZKU0NlbGxFCiBfX1pOM0pTQzdKU0FycmF5QzFFUk5TXzEy SlNHbG9iYWxEYXRhRVBOU185U3RydWN0dXJlRQogX19aTjNKU0M3SlNBcnJheUMyRVJOU18xMkpT R2xvYmFsRGF0YUVQTlNfOVN0cnVjdHVyZUUKLV9fWk4zSlNDN0pTQXJyYXlEMkV2CiBfX1pOM0pT QzdKU1ZhbHVlMTNpc1ZhbGlkQ2FsbGVlRXYKIF9fWk4zSlNDN09wdGlvbnMxN251bWJlck9mR0NN YXJrZXJzRQogX19aTjNKU0M3T3B0aW9uczI0b3BhcXVlUm9vdE1lcmdlVGhyZXNob2xkRQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheS5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAppbmRleCAyYWZiNmEwZmIxNmRm ZGM3OTI4NDIyNGYzZGU5OWEzNDA0OTU4ZjVmLi44NGUyNzFmMTNlMzRmMmI1OTVkNzI2NDRhMDZm ZTEyZjdlN2QyYmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0FycmF5LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNw cApAQCAtMjAwLDE2ICsyMDAsMTEgQEAgSlNBcnJheSogSlNBcnJheTo6dHJ5RmluaXNoQ3JlYXRp b25VbmluaXRpYWxpemVkKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgdW5zaWcKICAgICByZXR1 cm4gdGhpczsKIH0KIAotSlNBcnJheTo6fkpTQXJyYXkoKQordm9pZCBKU0FycmF5OjpmaW5hbGl6 ZShKU0NlbGwqIGNlbGwpCiB7Ci0gICAgQVNTRVJUKGpzQ2FzdDxKU0FycmF5Kj4odGhpcykpOwot ICAgIGNoZWNrQ29uc2lzdGVuY3koRGVzdHJ1Y3RvckNvbnNpc3RlbmN5Q2hlY2spOwotICAgIGRl bGV0ZSBtX3NwYXJzZVZhbHVlTWFwOwotfQotCi12b2lkIEpTQXJyYXk6OmRlc3Ryb3koSlNDZWxs KiBjZWxsKQotewotICAgIGpzQ2FzdDxKU0FycmF5Kj4oY2VsbCktPkpTQXJyYXk6On5KU0FycmF5 KCk7CisgICAgSlNBcnJheSogdGhpc09iamVjdCA9IGpzQ2FzdDxKU0FycmF5Kj4oY2VsbCk7Cisg ICAgdGhpc09iamVjdC0+Y2hlY2tDb25zaXN0ZW5jeShEZXN0cnVjdG9yQ29uc2lzdGVuY3lDaGVj ayk7CisgICAgdGhpc09iamVjdC0+ZGVhbGxvY2F0ZVNwYXJzZU1hcCgpOwogfQogCiBpbmxpbmUg c3RkOjpwYWlyPFNwYXJzZUFycmF5VmFsdWVNYXA6Oml0ZXJhdG9yLCBib29sPiBTcGFyc2VBcnJh eVZhbHVlTWFwOjphZGQoSlNBcnJheSogYXJyYXksIHVuc2lnbmVkIGkpCkBAIC0zMDksMTMgKzMw NCwyNyBAQCBpbmxpbmUgdm9pZCBTcGFyc2VBcnJheVZhbHVlTWFwOjp2aXNpdENoaWxkcmVuKFNs b3RWaXNpdG9yJiB2aXNpdG9yKQogICAgICAgICB2aXNpdG9yLmFwcGVuZCgmaXQtPnNlY29uZCk7 CiB9CiAKLXZvaWQgSlNBcnJheTo6ZW50ZXJTcGFyc2VNb2RlKEpTR2xvYmFsRGF0YSYgZ2xvYmFs RGF0YSkKK3ZvaWQgSlNBcnJheTo6YWxsb2NhdGVTcGFyc2VNYXAoSlNHbG9iYWxEYXRhJiBnbG9i YWxEYXRhKQoreworICAgIG1fc3BhcnNlVmFsdWVNYXAgPSBuZXcgU3BhcnNlQXJyYXlWYWx1ZU1h cDsKKyAgICBnbG9iYWxEYXRhLmhlYXAuYWRkRmluYWxpemVyKHRoaXMsIGZpbmFsaXplKTsKK30K Kwordm9pZCBKU0FycmF5OjpkZWFsbG9jYXRlU3BhcnNlTWFwKCkKK3sKKyAgICBkZWxldGUgbV9z cGFyc2VWYWx1ZU1hcDsKKyAgICBtX3NwYXJzZVZhbHVlTWFwID0gMDsKK30KKwordm9pZCBKU0Fy cmF5OjplbnRlckRpY3Rpb25hcnlNb2RlKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSkKIHsKICAg ICBBcnJheVN0b3JhZ2UqIHN0b3JhZ2UgPSBtX3N0b3JhZ2U7CiAgICAgU3BhcnNlQXJyYXlWYWx1 ZU1hcCogbWFwID0gbV9zcGFyc2VWYWx1ZU1hcDsKIAotICAgIGlmICghbWFwKQotICAgICAgICBt YXAgPSBtX3NwYXJzZVZhbHVlTWFwID0gbmV3IFNwYXJzZUFycmF5VmFsdWVNYXA7CisgICAgaWYg KCFtYXApIHsKKyAgICAgICAgYWxsb2NhdGVTcGFyc2VNYXAoZ2xvYmFsRGF0YSk7CisgICAgICAg IG1hcCA9IG1fc3BhcnNlVmFsdWVNYXA7CisgICAgfQogCiAgICAgaWYgKG1hcC0+c3BhcnNlTW9k ZSgpKQogICAgICAgICByZXR1cm47CkBAIC00MDQsNyArNDEzLDcgQEAgYm9vbCBKU0FycmF5Ojpk ZWZpbmVPd25OdW1lcmljUHJvcGVydHkoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBpbmRleCwg UHJvcGVydHkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAKLSAgICAgICAg ZW50ZXJTcGFyc2VNb2RlKGV4ZWMtPmdsb2JhbERhdGEoKSk7CisgICAgICAgIGVudGVyRGljdGlv bmFyeU1vZGUoZXhlYy0+Z2xvYmFsRGF0YSgpKTsKICAgICB9CiAKICAgICBTcGFyc2VBcnJheVZh bHVlTWFwKiBtYXAgPSBtX3NwYXJzZVZhbHVlTWFwOwpAQCAtNTE0LDcgKzUyMyw3IEBAIHZvaWQg SlNBcnJheTo6c2V0TGVuZ3RoV3JpdGFibGUoRXhlY1N0YXRlKiBleGVjLCBib29sIHdyaXRhYmxl KQogICAgIGlmICghaXNMZW5ndGhXcml0YWJsZSgpIHx8IHdyaXRhYmxlKQogICAgICAgICByZXR1 cm47CiAKLSAgICBlbnRlclNwYXJzZU1vZGUoZXhlYy0+Z2xvYmFsRGF0YSgpKTsKKyAgICBlbnRl ckRpY3Rpb25hcnlNb2RlKGV4ZWMtPmdsb2JhbERhdGEoKSk7CiAKICAgICBTcGFyc2VBcnJheVZh bHVlTWFwKiBtYXAgPSBtX3NwYXJzZVZhbHVlTWFwOwogICAgIEFTU0VSVChtYXApOwpAQCAtNzg3 LDggKzc5Niw4IEBAIE5FVkVSX0lOTElORSB2b2lkIEpTQXJyYXk6OnB1dEJ5SW5kZXhCZXlvbmRW ZWN0b3JMZW5ndGgoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0bywgb3IgY2FuJ3QgdXNlIGEg dmVjdG9yIHRvIGhvbGQgdGhpcyBwcm9wZXJ0eSAtIGFsbG9jYXRlIGEgc3BhcnNlIG1hcCAmIGFk ZCB0aGUgdmFsdWUuCi0gICAgICAgIG1hcCA9IG5ldyBTcGFyc2VBcnJheVZhbHVlTWFwOwotICAg ICAgICBtX3NwYXJzZVZhbHVlTWFwID0gbWFwOworICAgICAgICBhbGxvY2F0ZVNwYXJzZU1hcChl eGVjLT5nbG9iYWxEYXRhKCkpOworICAgICAgICBtYXAgPSBtX3NwYXJzZVZhbHVlTWFwOwogICAg ICAgICBtYXAtPnB1dChleGVjLCB0aGlzLCBpLCB2YWx1ZSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CkBAIC04MjIsOCArODMxLDcgQEAgTkVWRVJfSU5MSU5FIHZvaWQgSlNBcnJheTo6cHV0QnlJ bmRleEJleW9uZFZlY3Rvckxlbmd0aChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmUKICAgICBTcGFy c2VBcnJheVZhbHVlTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBtYXAtPmVuZCgpOwogICAgIGZv ciAoU3BhcnNlQXJyYXlWYWx1ZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtYXAtPmJlZ2luKCk7 IGl0ICE9IGVuZDsgKytpdCkKICAgICAgICAgdmVjdG9yW2l0LT5maXJzdF0uc2V0KGdsb2JhbERh dGEsIHRoaXMsIGl0LT5zZWNvbmQuZ2V0Tm9uU3BhcnNlTW9kZSgpKTsKLSAgICBkZWxldGUgbWFw OwotICAgIG1fc3BhcnNlVmFsdWVNYXAgPSAwOworICAgIGRlYWxsb2NhdGVTcGFyc2VNYXAoKTsK IAogICAgIC8vIFN0b3JlIHRoZSBuZXcgcHJvcGVydHkgaW50byB0aGUgdmVjdG9yLgogICAgIFdy aXRlQmFycmllcjxVbmtub3duPiYgdmFsdWVTbG90ID0gdmVjdG9yW2ldOwpAQCAtMTEzNCwxMCAr MTE0Miw4IEBAIGJvb2wgSlNBcnJheTo6c2V0TGVuZ3RoKEV4ZWNTdGF0ZSogZXhlYywgdW5zaWdu ZWQgbmV3TGVuZ3RoLCBib29sIHRocm93RXhjZXB0aW9uCiAgICAgICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBrZXlzLnNpemUoKTsgKytp KQogICAgICAgICAgICAgICAgICAgICBtYXAtPnJlbW92ZShrZXlzW2ldKTsKLSAgICAgICAgICAg ICAgICBpZiAobWFwLT5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgZGVsZXRlIG1h cDsKLSAgICAgICAgICAgICAgICAgICAgbV9zcGFyc2VWYWx1ZU1hcCA9IDA7Ci0gICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChtYXAtPmlzRW1wdHkoKSkKKyAgICAgICAgICAg ICAgICAgICAgZGVhbGxvY2F0ZVNwYXJzZU1hcCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtMTIwMiwxMCArMTIwOCw4IEBAIEpTVmFsdWUgSlNBcnJheTo6cG9wKEV4ZWNT dGF0ZSogZXhlYykKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgCiAgICAgICAg ICAgICAgICAgbWFwLT5yZW1vdmUoaXQpOwotICAgICAgICAgICAgICAgIGlmIChtYXAtPmlzRW1w dHkoKSAmJiAhbWFwLT5zcGFyc2VNb2RlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgZGVsZXRl IG1hcDsKLSAgICAgICAgICAgICAgICAgICAgbV9zcGFyc2VWYWx1ZU1hcCA9IDA7Ci0gICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChtYXAtPmlzRW1wdHkoKSAmJiAhbWFwLT5z cGFyc2VNb2RlKCkpCisgICAgICAgICAgICAgICAgICAgIGRlYWxsb2NhdGVTcGFyc2VNYXAoKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAgLTE2NDAsOCArMTY0NCw3IEBAIHZv aWQgSlNBcnJheTo6c29ydChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgY29tcGFyZUZ1bmN0aW9u LCBDYWxsVHlwZSBjYWxsVHlwZSwKICAgICAgICAgICAgICsrbnVtRGVmaW5lZDsKICAgICAgICAg fQogCi0gICAgICAgIGRlbGV0ZSBtYXA7Ci0gICAgICAgIG1fc3BhcnNlVmFsdWVNYXAgPSAwOwor ICAgICAgICBkZWFsbG9jYXRlU3BhcnNlTWFwKCk7CiAgICAgfQogCiAgICAgQVNTRVJUKHRyZWUu YWJzdHJhY3RvcigpLm1fbm9kZXMuc2l6ZSgpID49IG51bURlZmluZWQpOwpAQCAtMTc1Myw4ICsx NzU2LDcgQEAgdW5zaWduZWQgSlNBcnJheTo6Y29tcGFjdEZvclNvcnRpbmcoSlNHbG9iYWxEYXRh JiBnbG9iYWxEYXRhKQogICAgICAgICBmb3IgKFNwYXJzZUFycmF5VmFsdWVNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gbWFwLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgICAgICBz dG9yYWdlLT5tX3ZlY3RvcltudW1EZWZpbmVkKytdLnNldFdpdGhvdXRXcml0ZUJhcnJpZXIoaXQt PnNlY29uZC5nZXROb25TcGFyc2VNb2RlKCkpOwogCi0gICAgICAgIGRlbGV0ZSBtYXA7Ci0gICAg ICAgIG1fc3BhcnNlVmFsdWVNYXAgPSAwOworICAgICAgICBkZWFsbG9jYXRlU3BhcnNlTWFwKCk7 CiAgICAgfQogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gbnVtRGVmaW5lZDsgaSA8IG5ld1VzZWRW ZWN0b3JMZW5ndGg7ICsraSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTQXJyYXkuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuaApp bmRleCA1ZTQ3OTc3YTljMmE1MjFlMzJjZjNlYmQwODdkMWQyOTgxZWI1ZWVhLi5hMzM1NGM2MDI0 YjA5NzNjOWZmMmEwZTdmZWFkNzNkMzBkZjVmZmYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0FycmF5LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNBcnJheS5oCkBAIC0xMzMsOCArMTMzLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg cHVibGljOgogICAgICAgICB0eXBlZGVmIEpTTm9uRmluYWxPYmplY3QgQmFzZTsKIAotICAgICAg ICBKU19FWFBPUlRfUFJJVkFURSB+SlNBcnJheSgpOwotICAgICAgICBKU19FWFBPUlRfUFJJVkFU RSBzdGF0aWMgdm9pZCBkZXN0cm95KEpTQ2VsbCopOworICAgICAgICBzdGF0aWMgdm9pZCBmaW5h bGl6ZShKU0NlbGwqKTsKIAogICAgICAgICBzdGF0aWMgSlNBcnJheSogY3JlYXRlKEpTR2xvYmFs RGF0YSYgZ2xvYmFsRGF0YSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHVuc2lnbmVkIGluaXRpYWxM ZW5ndGggPSAwKQogICAgICAgICB7CkBAIC0yNzUsNyArMjc0LDkgQEAgbmFtZXNwYWNlIEpTQyB7 CiAgICAgICAgIHZvaWQgc2V0TGVuZ3RoV3JpdGFibGUoRXhlY1N0YXRlKiwgYm9vbCB3cml0YWJs ZSk7CiAgICAgICAgIHZvaWQgcHV0RGVzY3JpcHRvcihFeGVjU3RhdGUqLCBTcGFyc2VBcnJheUVu dHJ5KiwgUHJvcGVydHlEZXNjcmlwdG9yJiwgUHJvcGVydHlEZXNjcmlwdG9yJiBvbGQpOwogICAg ICAgICBib29sIGRlZmluZU93bk51bWVyaWNQcm9wZXJ0eShFeGVjU3RhdGUqLCB1bnNpZ25lZCwg UHJvcGVydHlEZXNjcmlwdG9yJiwgYm9vbCB0aHJvd0V4Y2VwdGlvbik7Ci0gICAgICAgIHZvaWQg ZW50ZXJTcGFyc2VNb2RlKEpTR2xvYmFsRGF0YSYpOworICAgICAgICB2b2lkIGVudGVyRGljdGlv bmFyeU1vZGUoSlNHbG9iYWxEYXRhJik7CisgICAgICAgIHZvaWQgYWxsb2NhdGVTcGFyc2VNYXAo SlNHbG9iYWxEYXRhJik7CisgICAgICAgIHZvaWQgZGVhbGxvY2F0ZVNwYXJzZU1hcCgpOwogCiAg ICAgICAgIGJvb2wgZ2V0T3duUHJvcGVydHlTbG90U2xvd0Nhc2UoRXhlY1N0YXRlKiwgdW5zaWdu ZWQgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmKTsKICAgICAgICAgdm9pZCBwdXRCeUluZGV4 QmV5b25kVmVjdG9yTGVuZ3RoKEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSwgSlNW YWx1ZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggN2FkYWFmMGM2ZThjZmFhNTUyODJhMGEyODY1NzIwNTBjZWQ2YmY0Yy4u NmI1ZjU1NTI0YTBmMDg2ZDBmYWRmMjYxNjI0NGMxOWU3MDc5NmFkYyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDEyLTAyLTAxICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5j b20+CisKKyAgICAgICAgUmVwbGFjZSBKU0FycmF5IGRlc3RydWN0b3Igd2l0aCBmaW5hbGl6ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3NDg4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2pz L3NjcmlwdC10ZXN0cy9zcGFyc2UtYXJyYXkuanM6IEFkZGVkIGNvZGUgdG8gdGVzdCBvc2NpbGxh dGlvbiBiZXR3ZWVuIAorICAgICAgICBzcGFyc2UgYW5kIGRlbnNlIGFycmF5cy4KKwogMjAxMi0w Mi0wMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gZWRpdGluZy9pbnNlcnRpbmcvNDk2MDEyMC0yLmh0bWwgZmxha3kgY3Jhc2gKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3NwYXJzZS1hcnJheS5q cyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3NwYXJzZS1hcnJheS5qcwppbmRl eCA1ZjVlMzQ4YWFjMmZlNWI5ODM3ZTUxMDgxM2MzZjk2NDYwNWZhNzE0Li45NDQwODdlMGMyNmY3 N2FhMGYyMjgyNDUxNzEwMTAxNWVmNDgyOTcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L2pzL3NjcmlwdC10ZXN0cy9zcGFyc2UtYXJyYXkuanMKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9q cy9zY3JpcHQtdGVzdHMvc3BhcnNlLWFycmF5LmpzCkBAIC0xNSw1ICsxNSwxMyBAQCBzaG91bGRC ZSgnYXJyYXlbMF0nLCAnTmFOJyk7CiBzaG91bGRCZSgnYXJyYXlbNDk5OTldJywgJ3VuZGVmaW5l ZCcpOwogc2hvdWxkQmUoJ2FycmF5WzUwMDAwXScsICcxMDAnKTsKIHNob3VsZEJlKCdhcnJheVs1 MDAwMV0nLCAndW5kZWZpbmVkJyk7CisvLyBUaGlzIHRlc3RzIG9zY2lsbGF0aW9uIGJldHdlZW4g YmVpbmcgc3BhcnNlIGFuZCBkZW5zZS4KK2RlbGV0ZSBhcnJheVs1MDAwMF07CithcnJheS5sZW5n dGggPSA1OworYXJyYXlbNTAwMDBdID0gMTAwOworc2hvdWxkQmUoJ2FycmF5WzBdJywgJ05hTicp Oworc2hvdWxkQmUoJ2FycmF5WzQ5OTk5XScsICd1bmRlZmluZWQnKTsKK3Nob3VsZEJlKCdhcnJh eVs1MDAwMF0nLCAnMTAwJyk7CitzaG91bGRCZSgnYXJyYXlbNTAwMDFdJywgJ3VuZGVmaW5lZCcp OwogCiBkZWJ1ZygnJyk7Cg==