180443 2017-12-05 13:39:06 -0800 bmalloc IsoHeap needs to allow a thread to deallocate some size for the first time 2017-12-05 14:51:43 -0800 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo benjamin cdumez cmarcelo dbates ews-watchlist ggaren saam webkit-bug-importer oldest_to_newest 1378333 0 fpizlo 2017-12-05 13:39:06 -0800 It's true that we can expect a heap to already be initialized if we try to deallocate in it. But it may not have its deallocator initialized on this thread yet. 1378347 1 328495 fpizlo 2017-12-05 13:56:26 -0800 Created attachment 328495 the patch 1378384 2 fpizlo 2017-12-05 14:51:00 -0800 Landed in https://trac.webkit.org/changeset/225551/webkit 1378385 3 webkit-bug-importer 2017-12-05 14:51:43 -0800 <rdar://problem/35865700> 328495 2017-12-05 13:56:26 -0800 2017-12-05 13:59:33 -0800 the patch blah.patch text/plain 8022 fpizlo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMjU1MjUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE3LTEyLTA1ICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CisKKyAgICAgICAgYm1hbGxvYyBJc29IZWFwIG5lZWRzIHRvIGFsbG93IGEg dGhyZWFkIHRvIGRlYWxsb2NhdGUgc29tZSBzaXplIGZvciB0aGUgZmlyc3QgdGltZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwNDQzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBXaXRoIHRo aXMgY2hhbmdlIGl0J3MgcG9zc2libGUgdG8gcmVlbmFibGUgaXNvaGVhcHMgb24gaU9TLgorCisg ICAgICAgICogd3RmL0lzb01hbGxvYy5oOgorICAgICAgICAqIHd0Zi9Jc29NYWxsb2NJbmxpbmVz Lmg6CisKIDIwMTctMTItMDEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAg ICAgICBHQyBjb25zdHJhaW50IHNvbHZpbmcgc2hvdWxkIGJlIHBhcmFsbGVsCkluZGV4OiBTb3Vy Y2UvV1RGL3d0Zi9Jc29NYWxsb2MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Jc29N YWxsb2MuaAkocmV2aXNpb24gMjI1NTI1KQorKysgU291cmNlL1dURi93dGYvSXNvTWFsbG9jLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI1LDcgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiAo ZGVmaW5lZChVU0VfU1lTVEVNX01BTExPQykgJiYgVVNFX1NZU1RFTV9NQUxMT0MpIHx8IFBMQVRG T1JNKElPUykKKyNpZiAoZGVmaW5lZChVU0VfU1lTVEVNX01BTExPQykgJiYgVVNFX1NZU1RFTV9N QUxMT0MpCiAKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogCkluZGV4OiBTb3VyY2UvV1RG L3d0Zi9Jc29NYWxsb2NJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvSXNv TWFsbG9jSW5saW5lcy5oCShyZXZpc2lvbiAyMjU1MjUpCisrKyBTb3VyY2UvV1RGL3d0Zi9Jc29N YWxsb2NJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1LDcgKzI1LDcgQEAKIAogI3ByYWdt YSBvbmNlCiAKLSNpZiAoZGVmaW5lZChVU0VfU1lTVEVNX01BTExPQykgJiYgVVNFX1NZU1RFTV9N QUxMT0MpIHx8IFBMQVRGT1JNKElPUykKKyNpZiAoZGVmaW5lZChVU0VfU1lTVEVNX01BTExPQykg JiYgVVNFX1NZU1RFTV9NQUxMT0MpCiAKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogCklu ZGV4OiBTb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxs b2MvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjU1MzUpCisrKyBTb3VyY2UvYm1hbGxvYy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOCBAQAorMjAxNy0xMi0wNSAgRmlsaXAgUGl6 bG8gIDxmcGl6bG9AYXBwbGUuY29tPgorCisgICAgICAgIGJtYWxsb2MgSXNvSGVhcCBuZWVkcyB0 byBhbGxvdyBhIHRocmVhZCB0byBkZWFsbG9jYXRlIHNvbWUgc2l6ZSBmb3IgdGhlIGZpcnN0IHRp bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDQ0 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0J3Mg dHJ1ZSB0aGF0IHdlIGNhbiBleHBlY3QgYSBoZWFwIHRvIGFscmVhZHkgYmUgaW5pdGlhbGl6ZWQg aWYgd2UgdHJ5IHRvIGRlYWxsb2NhdGUgaW4gaXQuICBCdXQgaXQKKyAgICAgICAgbWF5IG5vdCBo YXZlIGl0cyBkZWFsbG9jYXRvciBpbml0aWFsaXplZCBvbiB0aGlzIHRocmVhZCB5ZXQuCisgICAg ICAgIAorICAgICAgICBUaGlzIGlzIGVhc2lseSBmaXhlZCBieSBhZGRpbmcgYSBudWxsIGNoZWNr IG9uIHRoZSBkZWFsbG9jYXRlIHBhdGguIFRoYXQncyBwcm9iYWJseSBub3QgZ29pbmcgdG8KKyAg ICAgICAgY2hhbmdlIHBlcmYgYXQgYWxsLiBCdXQgZG9pbmcgdGhhdCBhbGxvd3MgbWUgdG8gZ2V0 IHJpZCBvZiBhIGxvdCBvZiB3ZWlyZCBzdHVmZiBJIHByZXZpb3VzbHkgZGlkIHRvCisgICAgICAg IGF2b2lkIHRoYXQgbnVsbCBjaGVjaywgbGlrZSBjcmVhdGluZyBhIGR1bW15IFRMUyBpbiB0aGUg RGVidWdIZWFwIGNhc2UuCisKKyAgICAgICAgKiBibWFsbG9jL0lzb1RMUy5jcHA6CisgICAgICAg IChibWFsbG9jOjpJc29UTFM6OmRlYnVnRnJlZSk6CisgICAgICAgIChibWFsbG9jOjpJc29UTFM6 OmRlYWxsb2NhdGVTbG93KTogRGVsZXRlZC4KKyAgICAgICAgKiBibWFsbG9jL0lzb1RMUy5oOgor ICAgICAgICAqIGJtYWxsb2MvSXNvVExTSW5saW5lcy5oOgorICAgICAgICAoYm1hbGxvYzo6SXNv VExTOjphbGxvY2F0ZUltcGwpOgorICAgICAgICAoYm1hbGxvYzo6SXNvVExTOjphbGxvY2F0ZVNs b3cpOgorICAgICAgICAoYm1hbGxvYzo6SXNvVExTOjpkZWFsbG9jYXRlSW1wbCk6CisgICAgICAg IChibWFsbG9jOjpJc29UTFM6OmRlYWxsb2NhdGVTbG93KToKKyAgICAgICAgKGJtYWxsb2M6Oklz b1RMUzo6ZW5zdXJlSGVhcEFuZEVudHJpZXMpOgorCiAyMDE3LTEyLTAxICBNaWNoYWVsIFNhYm9m ZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIEdpZ2FjYWdlIHNob3VsZCBub3QgYmUg ZW5hYmxlZCBmb3IgQVJNNjRfMzIKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExT LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RMUy5jcHAJKHJl dmlzaW9uIDIyNTUyNSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTIsMTUgKzUyLDYgQEAgSXNvVExTOjpJc29UTFMoKQogewogfQogCi12 b2lkIElzb1RMUzo6ZGVhbGxvY2F0ZVNsb3codm9pZCogcCkKLXsKLSAgICAvLyBJZiB3ZSBnbyBk b3duIHRoaXMgcGF0aCBhbmQgd2UgYXJlbid0IGluIGRlYnVnIGhlYXAgbW9kZSwgdGhlbiB0aGlz IG1lYW5zIHdlIGhhdmUgc29tZSBjb3JydXB0aW9uLgotICAgIC8vIFRoaW5rIG9mIHRoaXMgYXMg cmVhbGx5IGJlaW5nIGFuIGFzc2VydGlvbiBhYm91dCBvZmZzZXQgPCB0bHMtPm1fZXh0ZW50Lgot ICAgIFJFTEVBU0VfQkFTU0VSVChQZXJQcm9jZXNzPEVudmlyb25tZW50Pjo6Z2V0KCktPmlzRGVi dWdIZWFwRW5hYmxlZCgpKTsKLSAgICAKLSAgICBQZXJQcm9jZXNzPERlYnVnSGVhcD46OmdldCgp LT5mcmVlKHApOwotfQotCiBJc29UTFMqIElzb1RMUzo6ZW5zdXJlRW50cmllcyh1bnNpZ25lZCBv ZmZzZXQpCiB7CiAgICAgUkVMRUFTRV9CQVNTRVJUKCFnZXQoKSB8fCBvZmZzZXQgPj0gZ2V0KCkt Pm1fZXh0ZW50KTsKQEAgLTE4OSw1ICsxODAsMTQgQEAgYXV0byBJc29UTFM6OmRlYnVnTWFsbG9j KHNpemVfdCBzaXplKSAtPgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK2Jvb2wgSXNvVExTOjpk ZWJ1Z0ZyZWUodm9pZCogcCkKK3sKKyAgICBpZiAoaXNVc2luZ0RlYnVnSGVhcCgpKSB7CisgICAg ICAgIFBlclByb2Nlc3M8RGVidWdIZWFwPjo6Z2V0KCktPmZyZWUocCk7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0gLy8gbmFtZXNwYWNlIGJt YWxsb2MKIApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFMuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RMUy5oCShyZXZpc2lvbiAyMjU1MjUpCisr KyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RMUy5oCSh3b3JraW5nIGNvcHkpCkBAIC03Miw3 ICs3Miw4IEBAIHByaXZhdGU6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgQ29uZmlnPgogICAgIHZv aWQgZGVhbGxvY2F0ZUZhc3QodW5zaWduZWQgb2Zmc2V0LCB2b2lkKiBwKTsKICAgICAKLSAgICBC RVhQT1JUIHN0YXRpYyB2b2lkIGRlYWxsb2NhdGVTbG93KHZvaWQqIHApOworICAgIHRlbXBsYXRl PHR5cGVuYW1lIENvbmZpZywgdHlwZW5hbWUgVHlwZT4KKyAgICBzdGF0aWMgdm9pZCBkZWFsbG9j YXRlU2xvdyhhcGk6Oklzb0hlYXA8VHlwZT4mLCB2b2lkKiBwKTsKICAgICAKICAgICBzdGF0aWMg SXNvVExTKiBnZXQoKTsKICAgICBzdGF0aWMgdm9pZCBzZXQoSXNvVExTKik7CkBAIC05Miw3ICs5 Myw3IEBAIHByaXZhdGU6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgRnVuYz4KICAgICB2b2lkIGZv ckVhY2hFbnRyeShjb25zdCBGdW5jJik7CiAgICAgCi0gICAgQkVYUE9SVCBzdGF0aWMgYm9vbCBp c1VzaW5nRGVidWdIZWFwKCk7CisgICAgc3RhdGljIGJvb2wgaXNVc2luZ0RlYnVnSGVhcCgpOwog ICAgIAogICAgIHN0cnVjdCBEZWJ1Z01hbGxvY1Jlc3VsdCB7CiAgICAgICAgIHZvaWQqIHB0ciB7 IG51bGxwdHIgfTsKQEAgLTEwMCw2ICsxMDEsNyBAQCBwcml2YXRlOgogICAgIH07CiAgICAgCiAg ICAgQkVYUE9SVCBzdGF0aWMgRGVidWdNYWxsb2NSZXN1bHQgZGVidWdNYWxsb2Moc2l6ZV90KTsK KyAgICBCRVhQT1JUIHN0YXRpYyBib29sIGRlYnVnRnJlZSh2b2lkKik7CiAgICAgCiAgICAgSXNv VExTRW50cnkqIG1fbGFzdEVudHJ5IHsgbnVsbHB0ciB9OwogICAgIHVuc2lnbmVkIG1fZXh0ZW50 IHsgMCB9OwpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFNJbmxpbmVzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFNJbmxpbmVzLmgJKHJldmlz aW9uIDIyNTUyNSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTSW5saW5lcy5oCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw3IEBAIHZvaWQqIElzb1RMUzo6YWxsb2NhdGVJbXBs KGFwaTo6SXNvSGVhcDwKICAgICB1bnNpZ25lZCBvZmZzZXQgPSBoYW5kbGUuYWxsb2NhdG9yT2Zm c2V0KCk7CiAgICAgSXNvVExTKiB0bHMgPSBnZXQoKTsKICAgICBpZiAoIXRscyB8fCBvZmZzZXQg Pj0gdGxzLT5tX2V4dGVudCkKLSAgICAgICAgcmV0dXJuIGFsbG9jYXRlU2xvdzx0eXBlbmFtZSBh cGk6Oklzb0hlYXA8VHlwZT46OkNvbmZpZz4oaGFuZGxlLCBhYm9ydE9uRmFpbHVyZSk7CisgICAg ICAgIHJldHVybiBhbGxvY2F0ZVNsb3c8Q29uZmlnPihoYW5kbGUsIGFib3J0T25GYWlsdXJlKTsK ICAgICByZXR1cm4gdGxzLT5hbGxvY2F0ZUZhc3Q8Q29uZmlnPihvZmZzZXQsIGFib3J0T25GYWls dXJlKTsKIH0KIApAQCAtODAsMTQgKzgwLDEzIEBAIHZvaWQqIElzb1RMUzo6YWxsb2NhdGVGYXN0 KHVuc2lnbmVkIG9mZnMKIHRlbXBsYXRlPHR5cGVuYW1lIENvbmZpZywgdHlwZW5hbWUgVHlwZT4K IEJOT19JTkxJTkUgdm9pZCogSXNvVExTOjphbGxvY2F0ZVNsb3coYXBpOjpJc29IZWFwPFR5cGU+ JiBoYW5kbGUsIGJvb2wgYWJvcnRPbkZhaWx1cmUpCiB7Ci0gICAgSXNvVExTKiB0bHMgPSBlbnN1 cmVIZWFwQW5kRW50cmllcyhoYW5kbGUpOwotICAgIAogICAgIGF1dG8gZGVidWdNYWxsb2NSZXN1 bHQgPSBkZWJ1Z01hbGxvYyhDb25maWc6Om9iamVjdFNpemUpOwogICAgIGlmIChkZWJ1Z01hbGxv Y1Jlc3VsdC51c2luZ0RlYnVnSGVhcCkKICAgICAgICAgcmV0dXJuIGRlYnVnTWFsbG9jUmVzdWx0 LnB0cjsKICAgICAKLSAgICB1bnNpZ25lZCBvZmZzZXQgPSBoYW5kbGUuYWxsb2NhdG9yT2Zmc2V0 KCk7Ci0gICAgcmV0dXJuIHRscy0+YWxsb2NhdGVGYXN0PENvbmZpZz4ob2Zmc2V0LCBhYm9ydE9u RmFpbHVyZSk7CisgICAgSXNvVExTKiB0bHMgPSBlbnN1cmVIZWFwQW5kRW50cmllcyhoYW5kbGUp OworICAgIAorICAgIHJldHVybiB0bHMtPmFsbG9jYXRlRmFzdDxDb25maWc+KGhhbmRsZS5hbGxv Y2F0b3JPZmZzZXQoKSwgYWJvcnRPbkZhaWx1cmUpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBD b25maWcsIHR5cGVuYW1lIFR5cGU+CkBAIC05Nyw4ICs5Niw4IEBAIHZvaWQgSXNvVExTOjpkZWFs bG9jYXRlSW1wbChhcGk6Oklzb0hlYXAKICAgICBJc29UTFMqIHRscyA9IGdldCgpOwogICAgIC8v IE5vdGUgdGhhdCB0aGlzIGJvdW5kcyBjaGVjayB3b3VsZCBiZSBoZXJlIGV2ZW4gaWYgd2UgZGlk bid0IGhhdmUgdG8gc3VwcG9ydCBEZWJ1Z0hlYXAsCiAgICAgLy8gc2luY2Ugd2UgZG9uJ3Qgd2Fu dCB1bnByZWRpY3RhYmxlIGJlaGF2aW9yIGlmIG9mZnNldCBvciBtX2V4dGVudCBldmVyIGdvdCBj b3JydXB0ZWQuCi0gICAgaWYgKG9mZnNldCA+PSB0bHMtPm1fZXh0ZW50KQotICAgICAgICBkZWFs bG9jYXRlU2xvdyhwKTsKKyAgICBpZiAoIXRscyB8fCBvZmZzZXQgPj0gdGxzLT5tX2V4dGVudCkK KyAgICAgICAgZGVhbGxvY2F0ZVNsb3c8Q29uZmlnPihoYW5kbGUsIHApOwogICAgIGVsc2UKICAg ICAgICAgdGxzLT5kZWFsbG9jYXRlRmFzdDxDb25maWc+KG9mZnNldCwgcCk7CiB9CkBAIC0xMDks NiArMTA4LDE5IEBAIHZvaWQgSXNvVExTOjpkZWFsbG9jYXRlRmFzdCh1bnNpZ25lZCBvZmYKICAg ICByZWludGVycHJldF9jYXN0PElzb0RlYWxsb2NhdG9yPENvbmZpZz4qPihtX2RhdGEgKyBvZmZz ZXQpLT5kZWFsbG9jYXRlKHApOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb25maWcsIHR5cGVu YW1lIFR5cGU+CitCTk9fSU5MSU5FIHZvaWQgSXNvVExTOjpkZWFsbG9jYXRlU2xvdyhhcGk6Oklz b0hlYXA8VHlwZT4mIGhhbmRsZSwgdm9pZCogcCkKK3sKKyAgICBpZiAoZGVidWdGcmVlKHApKQor ICAgICAgICByZXR1cm47CisgICAgCisgICAgUkVMRUFTRV9CQVNTRVJUKGhhbmRsZS5pc0luaXRp YWxpemVkKCkpOworICAgIAorICAgIElzb1RMUyogdGxzID0gZW5zdXJlRW50cmllcyhzdGQ6Om1h eChoYW5kbGUuYWxsb2NhdG9yT2Zmc2V0KCksIGhhbmRsZS5kZWFsbG9jYXRvck9mZnNldCgpKSk7 CisgICAgCisgICAgdGxzLT5kZWFsbG9jYXRlRmFzdDxDb25maWc+KGhhbmRsZS5kZWFsbG9jYXRv ck9mZnNldCgpLCBwKTsKK30KKwogaW5saW5lIElzb1RMUyogSXNvVExTOjpnZXQoKQogewogI2lm IEhBVkVfUFRIUkVBRF9NQUNIREVQX0gKQEAgLTE1MSwxNiArMTYzLDggQEAgQk5PX0lOTElORSBJ c29UTFMqIElzb1RMUzo6ZW5zdXJlSGVhcEFuZAogICAgICAgICAhZ2V0KCkKICAgICAgICAgfHwg aGFuZGxlLmFsbG9jYXRvck9mZnNldCgpID49IGdldCgpLT5tX2V4dGVudAogICAgICAgICB8fCBo YW5kbGUuZGVhbGxvY2F0b3JPZmZzZXQoKSA+PSBnZXQoKS0+bV9leHRlbnQpOwotICAgIHVuc2ln bmVkIG9mZnNldDsKLSAgICBpZiAoaXNVc2luZ0RlYnVnSGVhcCgpKSB7Ci0gICAgICAgIGlmIChJ c29UTFMqIHJlc3VsdCA9IGdldCgpKQotICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICAg ICAgb2Zmc2V0ID0gMDsKLSAgICB9IGVsc2UgewotICAgICAgICBlbnN1cmVIZWFwKGhhbmRsZSk7 Ci0gICAgICAgIG9mZnNldCA9IHN0ZDo6bWF4KGhhbmRsZS5hbGxvY2F0b3JPZmZzZXQoKSwgaGFu ZGxlLmRlYWxsb2NhdG9yT2Zmc2V0KCkpOwotICAgIH0KLSAgICByZXR1cm4gZW5zdXJlRW50cmll cyhvZmZzZXQpOworICAgIGVuc3VyZUhlYXAoaGFuZGxlKTsKKyAgICByZXR1cm4gZW5zdXJlRW50 cmllcyhzdGQ6Om1heChoYW5kbGUuYWxsb2NhdG9yT2Zmc2V0KCksIGhhbmRsZS5kZWFsbG9jYXRv ck9mZnNldCgpKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIGJtYWxsb2MK