121118 2013-09-10 13:46:47 -0700 MapData has some issues 2013-09-12 10:57:42 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121074 1 mhahnenberg mhahnenberg commit-queue oldest_to_newest 927466 0 mhahnenberg 2013-09-10 13:46:47 -0700 In copyBackingStore, when we reassign the newly copied backing store, we set the capacity to the size in bytes of the backing store. This makes us think we're way bigger than we actually are. Additionally, in visitChildren, we pass the size of the MapData to copyLater(), when we should be passing capacity * sizeof(Entry). I'll add some ASSERTs that should catch this sort of thing in the future. 927535 1 211250 mhahnenberg 2013-09-10 15:08:17 -0700 Created attachment 211250 Patch 927540 2 211250 ggaren 2013-09-10 15:13:14 -0700 Comment on attachment 211250 Patch r=me Will the ASSERTs fire in our existing tests, or do we need a new test? 927541 3 mhahnenberg 2013-09-10 15:13:37 -0700 (In reply to comment #2) > (From update of attachment 211250 [details]) > r=me > > Will the ASSERTs fire in our existing tests, or do we need a new test? They fire in our existing tests. 927564 4 211250 commit-queue 2013-09-10 15:56:22 -0700 Comment on attachment 211250 Patch Clearing flags on attachment: 211250 Committed r155487: <http://trac.webkit.org/changeset/155487> 927565 5 commit-queue 2013-09-10 15:56:23 -0700 All reviewed patches have been landed. Closing bug. 211250 2013-09-10 15:08:17 -0700 2013-09-10 15:56:22 -0700 Patch bug-121118-20130910150810.patch text/plain 9416 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU1NDgxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBA CisyMDEzLTA5LTEwICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgTWFwRGF0YSBoYXMgc29tZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaGVhcC9Db3BpZWRCbG9jay5oOiBBZGRlZCBzb21l IGRlYnVnLW9ubHkgY29uc2lzdGVuY3kgY2hlY2tpbmcgbG9naWMuIFdlIG5vdyBtYWtlIHN1cmUg dGhhdCAKKyAgICAgICAgbV9saXZlQnl0ZXMgaXMgY29uc2lzdGVudCB3aXRoIGFub3RoZXIgZmll bGQsIG1fbGl2ZU9iamVjdHMuIG1fbGl2ZU9iamVjdHMgaXMgdGhlIG51bWJlciBvZiAKKyAgICAg ICAgIm9iamVjdHMiIHRoYXQgY3VycmVudGx5IHJlc2lkZSBpbiB0aGUgQ29waWVkQmxvY2suIElm IHdlIGhhdmUgemVybyBsaXZlIGJ5dGVzIHRoZW4gd2Ugc2hvdWxkIGhhdmUKKyAgICAgICAgemVy byBsaXZlIG9iamVjdHMuIFRoZSBjb252ZXJzZSBhbmQgdGhlIGludmVyc2Ugc2hvdWxkIGFsc28g YmUgdHJ1ZS4KKyAgICAgICAgKEpTQzo6Q29waWVkQmxvY2s6OkNvcGllZEJsb2NrKToKKyAgICAg ICAgKEpTQzo6Q29waWVkQmxvY2s6OmRpZFN1cnZpdmVHQyk6CisgICAgICAgIChKU0M6OkNvcGll ZEJsb2NrOjpkaWRFdmFjdWF0ZUJ5dGVzKToKKyAgICAgICAgKEpTQzo6Q29waWVkQmxvY2s6OmNh bkJlUmVjeWNsZWQpOgorICAgICAgICAoSlNDOjpDb3BpZWRCbG9jazo6c2hvdWxkRXZhY3VhdGUp OgorICAgICAgICAoSlNDOjpDb3BpZWRCbG9jazo6bGl2ZUJ5dGVzKToKKyAgICAgICAgKEpTQzo6 Q29waWVkQmxvY2s6OmNoZWNrQ29uc2lzdGVuY3kpOgorICAgICAgICAqIGhlYXAvQ29waWVkQmxv Y2tJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkNvcGllZEJsb2NrOjpyZXBvcnRMaXZlQnl0ZXMp OgorICAgICAgICAqIGhlYXAvQ29weVZpc2l0b3JJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkNv cHlWaXNpdG9yOjpkaWRDb3B5KToKKyAgICAgICAgKiBydW50aW1lL01hcERhdGEuY3BwOgorICAg ICAgICAoSlNDOjpNYXBEYXRhOjpyZXBsYWNlQW5kUGFja0JhY2tpbmdTdG9yZSk6IFJlbmFtZWQg cGFyYW1ldGVyIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBpdHMgbWVhbmluZy4KKyAgICAgICAgKEpT Qzo6TWFwRGF0YTo6cmVwbGFjZUJhY2tpbmdTdG9yZSk6IERpdHRvLiBBbHNvIHJlbW92ZWQgYW4g dW5uZWNlc3NhcnkgbG9jYWwgdmFyaWFibGUuCisgICAgICAgIChKU0M6Ok1hcERhdGE6OnZpc2l0 Q2hpbGRyZW4pOiBCZWZvcmUgd2UgcGFzc2VkIHRoZSBzaXplIG9mIHRoZSBNYXBEYXRhIHRvIGNv cHlMYXRlcigpLCB3aGljaCAKKyAgICAgICAgd2FzIHdyb25nLiBOb3cgd2UgcGFzcyBjYXBhY2l0 eSAqIHNpemVvZihFbnRyeSkuCisgICAgICAgIChKU0M6Ok1hcERhdGE6OmNvcHlCYWNraW5nU3Rv cmUpOiBCZWZvcmUgd2hlbiB3ZSByZWFzc2lnbmVkIHRoZSBuZXdseSBjb3BpZWQgYmFja2luZyBz dG9yZSwgd2UgCisgICAgICAgIHNldCB0aGUgY2FwYWNpdHkgKGluIGVsZW1lbnRzKSB0byB0aGUg c2l6ZSAoaW4gYnl0ZXMpIG9mIHRoZSBiYWNraW5nIHN0b3JlLiBUaGlzIG1hZGUgdXMgdGhpbmsg CisgICAgICAgIHdlJ3JlIHdheSBiaWdnZXIgdGhhbiB3ZSBhY3R1YWxseSBhcmUuIE5vdyB3ZSBq dXN0IHBhc3MgdGhlIG9sZCBjYXBhY2l0eSBpbi4KKyAgICAgICAgKiBydW50aW1lL01hcERhdGEu aDoKKyAgICAgICAgKEpTQzo6TWFwRGF0YTo6Y2FwYWNpdHlJbkJ5dGVzKTogSGVscGVyIGZ1bmN0 aW9uIHRvIGNhbGN1bGF0ZSB0aGUgc2l6ZSBvZiB0aGUgYmFja2luZyBzdG9yZS4KKwogMjAxMy0w OS0xMCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEludHJvZHVj ZSBhIFNwZWNJbnQ0OCB0eXBlIGFuZCBiZSBtb3JlIGNhcmVmdWwgYWJvdXQgd2hhdCB3ZSBtZWFu IGJ5ICJUb3AiCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db3BpZWRCbG9jay5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvcGllZEJsb2NrLmgJ KHJldmlzaW9uIDE1NTQ3MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvcGllZEJs b2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTg2LDYgKzg2LDggQEAgcHJpdmF0ZToKICAgICBDb3Bp ZWRCbG9jayhSZWdpb24qKTsKICAgICB2b2lkIHplcm9GaWxsV2lsZGVybmVzcygpOyAvLyBDYW4g YmUgY2FsbGVkIGF0IGFueSB0aW1lIHRvIHplcm8tZmlsbCB0byB0aGUgZW5kIG9mIHRoZSBibG9j ay4KIAorICAgIHZvaWQgY2hlY2tDb25zaXN0ZW5jeSgpOworCiAjaWYgRU5BQkxFKFBBUkFMTEVM X0dDKQogICAgIFNwaW5Mb2NrIG1fd29ya0xpc3RMb2NrOwogI2VuZGlmCkBAIC05NCw2ICs5Niw5 IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fcmVtYWluaW5nOwogICAgIHVpbnRwdHJfdCBtX2lz UGlubmVkOwogICAgIHVuc2lnbmVkIG1fbGl2ZUJ5dGVzOworI2lmbmRlZiBOREVCVUcKKyAgICB1 bnNpZ25lZCBtX2xpdmVPYmplY3RzOworI2VuZGlmCiB9OwogCiBpbmxpbmUgQ29waWVkQmxvY2sq IENvcGllZEJsb2NrOjpjcmVhdGVOb1plcm9GaWxsKERlYWRCbG9jayogYmxvY2spCkBAIC0xMjYs NiArMTMxLDkgQEAgaW5saW5lIENvcGllZEJsb2NrOjpDb3BpZWRCbG9jayhSZWdpb24qIAogICAg ICwgbV9yZW1haW5pbmcocGF5bG9hZENhcGFjaXR5KCkpCiAgICAgLCBtX2lzUGlubmVkKGZhbHNl KQogICAgICwgbV9saXZlQnl0ZXMoMCkKKyNpZm5kZWYgTkRFQlVHCisgICAgLCBtX2xpdmVPYmpl Y3RzKDApCisjZW5kaWYKIHsKICNpZiBFTkFCTEUoUEFSQUxMRUxfR0MpCiAgICAgbV93b3JrTGlz dExvY2suSW5pdCgpOwpAQCAtMTM1LDcgKzE0MywxMSBAQCBpbmxpbmUgQ29waWVkQmxvY2s6OkNv cGllZEJsb2NrKFJlZ2lvbiogCiAKIGlubGluZSB2b2lkIENvcGllZEJsb2NrOjpkaWRTdXJ2aXZl R0MoKQogeworICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKICAgICBtX2xpdmVCeXRlcyA9IDA7Cisj aWZuZGVmIE5ERUJVRworICAgIG1fbGl2ZU9iamVjdHMgPSAwOworI2VuZGlmCiAgICAgbV9pc1Bp bm5lZCA9IGZhbHNlOwogICAgIGlmIChtX3dvcmtMaXN0KQogICAgICAgICBtX3dvcmtMaXN0LmNs ZWFyKCk7CkBAIC0xNDQsMTYgKzE1NiwyMyBAQCBpbmxpbmUgdm9pZCBDb3BpZWRCbG9jazo6ZGlk U3Vydml2ZUdDKCkKIGlubGluZSB2b2lkIENvcGllZEJsb2NrOjpkaWRFdmFjdWF0ZUJ5dGVzKHVu c2lnbmVkIGJ5dGVzKQogewogICAgIEFTU0VSVChtX2xpdmVCeXRlcyA+PSBieXRlcyk7CisgICAg Y2hlY2tDb25zaXN0ZW5jeSgpOwogICAgIG1fbGl2ZUJ5dGVzIC09IGJ5dGVzOworI2lmbmRlZiBO REVCVUcKKyAgICBtX2xpdmVPYmplY3RzLS07CisjZW5kaWYKKyAgICBjaGVja0NvbnNpc3RlbmN5 KCk7CiB9CiAKIGlubGluZSBib29sIENvcGllZEJsb2NrOjpjYW5CZVJlY3ljbGVkKCkKIHsKKyAg ICBjaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgcmV0dXJuICFtX2xpdmVCeXRlczsKIH0KIAogaW5s aW5lIGJvb2wgQ29waWVkQmxvY2s6OnNob3VsZEV2YWN1YXRlKCkKIHsKKyAgICBjaGVja0NvbnNp c3RlbmN5KCk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4obV9saXZlQnl0ZXMpIC8g c3RhdGljX2Nhc3Q8ZG91YmxlPihwYXlsb2FkQ2FwYWNpdHkoKSkgPD0gT3B0aW9uczo6bWluQ29w aWVkQmxvY2tVdGlsaXphdGlvbigpOwogfQogCkBAIC0xNzYsNiArMTk1LDcgQEAgaW5saW5lIGJv b2wgQ29waWVkQmxvY2s6OmlzT3ZlcnNpemUoKQogCiBpbmxpbmUgdW5zaWduZWQgQ29waWVkQmxv Y2s6OmxpdmVCeXRlcygpCiB7CisgICAgY2hlY2tDb25zaXN0ZW5jeSgpOwogICAgIHJldHVybiBt X2xpdmVCeXRlczsKIH0KIApAQCAtMjQ0LDYgKzI2NCwxMSBAQCBpbmxpbmUgQ29weVdvcmtMaXN0 JiBDb3BpZWRCbG9jazo6d29ya0xpCiAgICAgcmV0dXJuICptX3dvcmtMaXN0OwogfQogCitpbmxp bmUgdm9pZCBDb3BpZWRCbG9jazo6Y2hlY2tDb25zaXN0ZW5jeSgpCit7CisgICAgQVNTRVJUKCEh bV9saXZlQnl0ZXMgPT0gISFtX2xpdmVPYmplY3RzKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSlND CiAKICNlbmRpZgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29waWVkQmxvY2tJ bmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29waWVk QmxvY2tJbmxpbmVzLmgJKHJldmlzaW9uIDE1NTQ3MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0NvcGllZEJsb2NrSW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiwx MCBAQCBpbmxpbmUgdm9pZCBDb3BpZWRCbG9jazo6cmVwb3J0TGl2ZUJ5dGVzCiAjaWYgRU5BQkxF KFBBUkFMTEVMX0dDKQogICAgIFNwaW5Mb2NrSG9sZGVyIGxvY2tlcigmbV93b3JrTGlzdExvY2sp OwogI2VuZGlmCisjaWZuZGVmIE5ERUJVRworICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKKyAgICBt X2xpdmVPYmplY3RzKys7CisjZW5kaWYKICAgICBtX2xpdmVCeXRlcyArPSBieXRlczsKIAogICAg IGlmICghc2hvdWxkRXZhY3VhdGUoKSkgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvQ29weVZpc2l0b3JJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvQ29weVZpc2l0b3JJbmxpbmVzLmgJKHJldmlzaW9uIDE1NTQ3MCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvcHlWaXNpdG9ySW5saW5lcy5oCSh3b3JraW5nIGNvcHkp CkBAIC05OCw3ICs5OCw2IEBAIGlubGluZSB2b2lkIENvcHlWaXNpdG9yOjpkaWRDb3B5KHZvaWQq IHAKICAgICBBU1NFUlQoIWJsb2NrLT5pc1Bpbm5lZCgpKTsKIAogICAgIGJsb2NrLT5kaWRFdmFj dWF0ZUJ5dGVzKGJ5dGVzKTsKLQogfQogCiB9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcERhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcERhdGEuY3BwCShyZXZpc2lvbiAxNTU0NzApCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXBEYXRhLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMwLDE2ICsxMzAsMTYgQEAgYm9vbCBNYXBEYXRhOjpyZW1vdmUoQ2FsbEZyYW1lKiBj YWxsRnJhbQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIE1hcERhdGE6OnJlcGxhY2VBbmRQ YWNrQmFja2luZ1N0b3JlKEVudHJ5KiBkZXN0aW5hdGlvbiwgaW50MzJfdCBuZXdTaXplKQordm9p ZCBNYXBEYXRhOjpyZXBsYWNlQW5kUGFja0JhY2tpbmdTdG9yZShFbnRyeSogZGVzdGluYXRpb24s IGludDMyX3QgbmV3Q2FwYWNpdHkpCiB7CiAgICAgQVNTRVJUKHNob3VsZFBhY2soKSk7CiAgICAg aW50MzJfdCBuZXdFbmQgPSAwOwotICAgIFJFTEVBU0VfQVNTRVJUKG5ld1NpemUgPiAwKTsKKyAg ICBSRUxFQVNFX0FTU0VSVChuZXdDYXBhY2l0eSA+IDApOwogICAgIGZvciAoaW50MzJfdCBpID0g MDsgaSA8IG1fc2l6ZTsgaSsrKSB7CiAgICAgICAgIEVudHJ5JiBlbnRyeSA9IG1fZW50cmllc1tp XTsKICAgICAgICAgaWYgKCFlbnRyeS5rZXkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgQVNTRVJUKG5ld0VuZCA8IG5ld1NpemUpOworICAgICAgICBBU1NFUlQobmV3RW5kIDwgbmV3 Q2FwYWNpdHkpOwogICAgICAgICBkZXN0aW5hdGlvbltuZXdFbmRdID0gZW50cnk7CiAKICAgICAg ICAgLy8gV2Ugb3ZlcndyaXRlIHRoZSBvbGQgZW50cnkgd2l0aCBhIGZvcndhcmRpbmcgaW5kZXgg Zm9yIHRoZSBuZXcgZW50cnksCkBAIC0xNTgsMjIgKzE1OCwxOSBAQCB2b2lkIE1hcERhdGE6OnJl cGxhY2VBbmRQYWNrQmFja2luZ1N0b3JlCiAgICAgQVNTRVJUKChtX3NpemUgLSBuZXdFbmQpID09 IG1fZGVsZXRlZENvdW50KTsKICAgICBtX2RlbGV0ZWRDb3VudCA9IDA7CiAKLSAgICBtX2NhcGFj aXR5ID0gbmV3U2l6ZTsKKyAgICBtX2NhcGFjaXR5ID0gbmV3Q2FwYWNpdHk7CiAgICAgbV9zaXpl ID0gbmV3RW5kOwogICAgIG1fZW50cmllcyA9IGRlc3RpbmF0aW9uOwogCiB9CiAKLXZvaWQgTWFw RGF0YTo6cmVwbGFjZUJhY2tpbmdTdG9yZShFbnRyeSogZGVzdGluYXRpb24sIGludDMyX3QgbmV3 U2l6ZSkKK3ZvaWQgTWFwRGF0YTo6cmVwbGFjZUJhY2tpbmdTdG9yZShFbnRyeSogZGVzdGluYXRp b24sIGludDMyX3QgbmV3Q2FwYWNpdHkpCiB7CiAgICAgQVNTRVJUKCFzaG91bGRQYWNrKCkpOwot ICAgIGludDMyX3QgbmV3RW5kID0gMDsKLSAgICBSRUxFQVNFX0FTU0VSVChuZXdTaXplID4gMCk7 Ci0gICAgQVNTRVJUKG5ld1NpemUgPj0gbV9jYXBhY2l0eSk7CisgICAgUkVMRUFTRV9BU1NFUlQo bmV3Q2FwYWNpdHkgPiAwKTsKKyAgICBBU1NFUlQobmV3Q2FwYWNpdHkgPj0gbV9jYXBhY2l0eSk7 CiAgICAgbWVtY3B5KGRlc3RpbmF0aW9uLCBtX2VudHJpZXMsIHNpemVvZihFbnRyeSkgKiBtX3Np emUpOwotICAgIG5ld0VuZCA9IG1fc2l6ZTsKLSAgICBtX2NhcGFjaXR5ID0gbmV3U2l6ZTsKLSAg ICBtX3NpemUgPSBuZXdFbmQ7CisgICAgbV9jYXBhY2l0eSA9IG5ld0NhcGFjaXR5OwogICAgIG1f ZW50cmllcyA9IGRlc3RpbmF0aW9uOwogfQogCkBAIC0yMTUsMjEgKzIxMiwyMCBAQCB2b2lkIE1h cERhdGE6OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWxsCiAgICAgfSBlbHNlCiAgICAgICAgIHZp c2l0b3IuYXBwZW5kVmFsdWVzKCZlbnRyaWVzWzBdLmtleSwgc2l6ZSAqIChzaXplb2YoRW50cnkp IC8gc2l6ZW9mKFdyaXRlQmFycmllcjxVbmtub3duPikpKTsKIAotICAgIHZpc2l0b3IuY29weUxh dGVyKHRoaXNPYmplY3QsIE1hcEJhY2tpbmdTdG9yZUNvcHlUb2tlbiwgZW50cmllcywgc2l6ZSk7 CisgICAgdmlzaXRvci5jb3B5TGF0ZXIodGhpc09iamVjdCwgTWFwQmFja2luZ1N0b3JlQ29weVRv a2VuLCBlbnRyaWVzLCB0aGlzT2JqZWN0LT5jYXBhY2l0eUluQnl0ZXMoKSk7CiB9CiAKIHZvaWQg TWFwRGF0YTo6Y29weUJhY2tpbmdTdG9yZShKU0NlbGwqIGNlbGwsIENvcHlWaXNpdG9yJiB2aXNp dG9yLCBDb3B5VG9rZW4gdG9rZW4pCiB7CiAgICAgTWFwRGF0YSogdGhpc09iamVjdCA9IGpzQ2Fz dDxNYXBEYXRhKj4oY2VsbCk7CiAgICAgaWYgKHRva2VuID09IE1hcEJhY2tpbmdTdG9yZUNvcHlU b2tlbiAmJiB2aXNpdG9yLmNoZWNrSWZTaG91bGRDb3B5KHRoaXNPYmplY3QtPm1fZW50cmllcykp IHsKLSAgICAgICAgc2l6ZV90IHJlcXVpcmVkU2l6ZSA9IHRoaXNPYmplY3QtPm1fY2FwYWNpdHkg KiBzaXplb2YoRW50cnkpOwogICAgICAgICBFbnRyeSogb2xkRW50cmllcyA9IHRoaXNPYmplY3Qt Pm1fZW50cmllczsKLSAgICAgICAgRW50cnkqIG5ld0VudHJpZXMgPSBzdGF0aWNfY2FzdDxFbnRy eSo+KHZpc2l0b3IuYWxsb2NhdGVOZXdTcGFjZSh0aGlzT2JqZWN0LT5tX2NhcGFjaXR5ICogc2l6 ZW9mKEVudHJ5KSkpOworICAgICAgICBFbnRyeSogbmV3RW50cmllcyA9IHN0YXRpY19jYXN0PEVu dHJ5Kj4odmlzaXRvci5hbGxvY2F0ZU5ld1NwYWNlKHRoaXNPYmplY3QtPmNhcGFjaXR5SW5CeXRl cygpKSk7CiAgICAgICAgIGlmICh0aGlzT2JqZWN0LT5zaG91bGRQYWNrKCkpCi0gICAgICAgICAg ICB0aGlzT2JqZWN0LT5yZXBsYWNlQW5kUGFja0JhY2tpbmdTdG9yZShuZXdFbnRyaWVzLCByZXF1 aXJlZFNpemUpOworICAgICAgICAgICAgdGhpc09iamVjdC0+cmVwbGFjZUFuZFBhY2tCYWNraW5n U3RvcmUobmV3RW50cmllcywgdGhpc09iamVjdC0+bV9jYXBhY2l0eSk7CiAgICAgICAgIGVsc2UK LSAgICAgICAgICAgIHRoaXNPYmplY3QtPnJlcGxhY2VCYWNraW5nU3RvcmUobmV3RW50cmllcywg cmVxdWlyZWRTaXplKTsKLSAgICAgICAgdmlzaXRvci5kaWRDb3B5KG9sZEVudHJpZXMsIHRoaXNP YmplY3QtPm1fY2FwYWNpdHkgKiBzaXplb2YoRW50cnkpKTsKKyAgICAgICAgICAgIHRoaXNPYmpl Y3QtPnJlcGxhY2VCYWNraW5nU3RvcmUobmV3RW50cmllcywgdGhpc09iamVjdC0+bV9jYXBhY2l0 eSk7CisgICAgICAgIHZpc2l0b3IuZGlkQ29weShvbGRFbnRyaWVzLCB0aGlzT2JqZWN0LT5jYXBh Y2l0eUluQnl0ZXMoKSk7CiAgICAgfQogICAgIEJhc2U6OmNvcHlCYWNraW5nU3RvcmUoY2VsbCwg dmlzaXRvciwgdG9rZW4pOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv TWFwRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01h cERhdGEuaAkocmV2aXNpb24gMTU1NDcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvTWFwRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsNiArMTA3LDggQEAgcHJpdmF0ZToK ICAgICB0eXBlZGVmIEhhc2hNYXA8RW5jb2RlZEpTVmFsdWUsIGludDMyX3QsIEVuY29kZWRKU1Zh bHVlSGFzaCwgRW5jb2RlZEpTVmFsdWVIYXNoVHJhaXRzLCBJbmRleFRyYWl0cz4gVmFsdWVLZXll ZE1hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nSW1wbCosIGludDMyX3QsIHR5cGVuYW1l IFdURjo6RGVmYXVsdEhhc2g8U3RyaW5nSW1wbCo+OjpIYXNoLCBXVEY6Okhhc2hUcmFpdHM8U3Ry aW5nSW1wbCo+LCBJbmRleFRyYWl0cz4gU3RyaW5nS2V5ZWRNYXA7CiAKKyAgICBzaXplX3QgY2Fw YWNpdHlJbkJ5dGVzKCkgeyByZXR1cm4gbV9jYXBhY2l0eSAqIHNpemVvZihFbnRyeSk7IH0KKwog ICAgIE1hcERhdGEoVk0mLCBKU0dsb2JhbE9iamVjdCopOwogICAgIHN0YXRpYyB2b2lkIGRlc3Ry b3koSlNDZWxsKik7CiAgICAgc3RhdGljIHZvaWQgdmlzaXRDaGlsZHJlbihKU0NlbGwqLCBTbG90 VmlzaXRvciYpOwo=