191958 2018-11-25 20:36:36 -0800 Object allocation sinking phase needs to iterate each scope offset instead of just iterating the symbol table's hashmap when handling an activation 2018-11-27 13:46:08 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=192033 InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1481447 0 saam 2018-11-25 20:36:36 -0800 Otherwise, we may ignore duplicate entries in the map even though there was more than one scope offset created for them 1481448 1 saam 2018-11-25 20:37:17 -0800 <rdar://problem/46221877> 1481449 2 355617 saam 2018-11-25 20:42:52 -0800 Created attachment 355617 patch 1481450 3 355618 saam 2018-11-25 20:44:24 -0800 Created attachment 355618 patch 1481467 4 355618 ysuzuki 2018-11-25 23:24:49 -0800 Comment on attachment 355618 patch r=me 1481622 5 355618 commit-queue 2018-11-26 12:14:50 -0800 Comment on attachment 355618 patch Clearing flags on attachment: 355618 Committed r238510: <https://trac.webkit.org/changeset/238510> 1481623 6 commit-queue 2018-11-26 12:14:52 -0800 All reviewed patches have been landed. Closing bug. 355617 2018-11-25 20:42:52 -0800 2018-11-25 20:44:24 -0800 patch a-backup.diff text/plain 4538 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzg0ODYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDE4LTExLTI1ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIE9iamVjdCBhbGxvY2F0aW9uIHNpbmtpbmcgcGhhc2UgbmVlZHMgdG8g aXRlcmF0ZSBlYWNoIHNjb3BlIG9mZnNldCBpbnN0ZWFkIG9mIGp1c3QgaXRlcmF0aW5nIHRoZSBz eW1ib2wgdGFibGUncyBoYXNobWFwIHdoZW4gY3JlYXRpbmcgYW4gYWN0aXZhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxOTU4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NjIyMTg3Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9vYmplY3QtYWxsb2NhdGlvbi1zaW5raW5nLXBo YXNlLW5lZWRzLXRvLXdyaXRlLXRvLWVhY2gtc2NvcGUtb2Zmc2V0LmpzOiBBZGRlZC4KKyAgICAg ICAgKHgpOgorICAgICAgICAoZm9vKToKKwogMjAxOC0xMS0yMSAgU2FhbSBiYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBERkdTcGVjdWxhdGl2ZUpJVCBzaG91bGQgbm90ICY9 IGV4aXRPSyB3aXRoIG1heUV4aXQobm9kZSkKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL29iamVjdC1h bGxvY2F0aW9uLXNpbmtpbmctcGhhc2UtbmVlZHMtdG8td3JpdGUtdG8tZWFjaC1zY29wZS1vZmZz ZXQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3Mvb2JqZWN0LWFsbG9jYXRpb24tc2lu a2luZy1waGFzZS1uZWVkcy10by13cml0ZS10by1lYWNoLXNjb3BlLW9mZnNldC5qcwkobm9uZXhp c3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9vYmplY3QtYWxsb2NhdGlvbi1zaW5raW5nLXBoYXNl LW5lZWRzLXRvLXdyaXRlLXRvLWVhY2gtc2NvcGUtb2Zmc2V0LmpzCSh3b3JraW5nIGNvcHkpCkBA IC0wLDAgKzEsMTMgQEAKKy8vQCBydW5EZWZhdWx0KCItLWZvcmNlRWFnZXJDb21waWxhdGlvbj0x IiwgIi0tdXNlQ29uY3VycmVudEpJVD0wIikKKworZnVuY3Rpb24gZm9vKGEsIGEpIHsKKyAgICBm dW5jdGlvbiB4KCkgeworICAgICAgICBldmFsKCk7CisgICAgfQorfQorZm9vKCk7Citmb28oKTsK K2ZvbygpOworZm9vKCk7Citmb28oKTsKK2ZvbygwKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkocmV2aXNpb24gMjM4NDg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTExLTI1ICBTYWFtIGJhcmF0 aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIE9iamVjdCBhbGxvY2F0aW9uIHNpbmtp bmcgcGhhc2UgbmVlZHMgdG8gaXRlcmF0ZSBlYWNoIHNjb3BlIG9mZnNldCBpbnN0ZWFkIG9mIGp1 c3QgaXRlcmF0aW5nIHRoZSBzeW1ib2wgdGFibGUncyBoYXNobWFwIHdoZW4gY3JlYXRpbmcgYW4g YWN0aXZhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTkxOTU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjIyMTg3Nz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBtYXkgYmUgbW9yZSBl bnRyaWVzIGluIGFuIGFjdGl2YXRpb24gdGhhbiB1bmlxdWUgdmFyaWFibGVzCisgICAgICAgIGlu IGEgc3ltYm9sIHRhYmxlJ3MgaGFzaG1hcC4gRm9yIGV4YW1wbGUsIGlmIHlvdSBoYXZlIHR3byBw YXJhbWV0ZXJzCisgICAgICAgIHRvIGEgZnVuY3Rpb24sIGFuZCB0aGV5IGJvdGggYXJlIHRoZSBz YW1lIG5hbWUsIGFuZCB0aGUgZnVuY3Rpb24KKyAgICAgICAgdXNlcyBldmFsLCB3ZSdsbCBlbmQg dXAgd2l0aCB0d28gc2NvcGUgc2xvdHMsIGJ1dCBvbmx5IGEgc2luZ2xlCisgICAgICAgIGVudHJ5 IGluIHRoZSBoYXNobWFwIGluIHRoZSBzeW1ib2wgdGFibGUuIE9iamVjdCBhbGxvY2F0aW9uIHNp bmtpbmcKKyAgICAgICAgcGhhc2Ugd2FzIHByZXZpb3VzbHkgaXRlcmF0aW5nIG92ZXIgdGhlIGhh c2htYXAsIGFzc3VtaW5nIHRoZXNlCisgICAgICAgIHZhbHVlcyB3ZXJlIGVxdWl2YWxlbnQuIFRo aXMgaXMgd3JvbmcgaW4gdGhlIGFib3ZlIGNhc2UuIEluc3RlYWQsCisgICAgICAgIHdlIG5lZWQg dG8gaXRlcmF0ZSBvdmVyIGVhY2ggc2NvcGUgb2Zmc2V0LgorCisgICAgICAgICogZGZnL0RGR09i amVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvR2VuZXJp Y09mZnNldC5oOgorICAgICAgICAoSlNDOjpHZW5lcmljT2Zmc2V0OjpvcGVyYXRvcis9KToKKyAg ICAgICAgKEpTQzo6R2VuZXJpY09mZnNldDo6b3BlcmF0b3ItPSk6CisKIDIwMTgtMTEtMjMgIFdl bnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIGRy YWcgYW5kIGRyb3Agc3VwcG9ydCBmb3IgaU9TTWFjCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFz ZS5jcHAJKHJldmlzaW9uIDIzODQ4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3Nywx MSArODc3LDEwIEBAIHByaXZhdGU6CiAgICAgICAgICAgICB3cml0ZXMuYWRkKEFjdGl2YXRpb25T Y29wZVBMb2MsIExhenlOb2RlKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSkpOwogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IG5vZGUtPmNhc3RP cGVyYW5kPFN5bWJvbFRhYmxlKj4oKTsKLSAgICAgICAgICAgICAgICBDb25jdXJyZW50SlNMb2Nr ZXIgbG9ja2VyKHN5bWJvbFRhYmxlLT5tX2xvY2spOwogICAgICAgICAgICAgICAgIExhenlOb2Rl IGluaXRpYWxWYWx1ZShtX2dyYXBoLmZyZWV6ZShub2RlLT5pbml0aWFsaXphdGlvblZhbHVlRm9y QWN0aXZhdGlvbigpKSk7Ci0gICAgICAgICAgICAgICAgZm9yIChhdXRvIGl0ZXIgPSBzeW1ib2xU YWJsZS0+YmVnaW4obG9ja2VyKSwgZW5kID0gc3ltYm9sVGFibGUtPmVuZChsb2NrZXIpOyBpdGVy ICE9IGVuZDsgKytpdGVyKSB7CisgICAgICAgICAgICAgICAgZm9yIChTY29wZU9mZnNldCBvZmZz ZXQgeyAwIH07IG9mZnNldCA8PSBzeW1ib2xUYWJsZS0+bWF4U2NvcGVPZmZzZXQoKTsgb2Zmc2V0 ICs9IDEpIHsKICAgICAgICAgICAgICAgICAgICAgd3JpdGVzLmFkZCgKLSAgICAgICAgICAgICAg ICAgICAgICAgIFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yKENsb3N1cmVWYXJQTG9jLCBpdGVy LT52YWx1ZS5zY29wZU9mZnNldCgpLm9mZnNldCgpKSwKKyAgICAgICAgICAgICAgICAgICAgICAg IFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yKENsb3N1cmVWYXJQTG9jLCBvZmZzZXQub2Zmc2V0 KCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgaW5pdGlhbFZhbHVlKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9HZW5lcmljT2Zmc2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvR2VuZXJpY09mZnNldC5oCShyZXZpc2lvbiAyMzg0ODYpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9HZW5lcmljT2Zmc2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTk1LDEx ICs5NSwxMSBAQCBwdWJsaWM6CiAgICAgfQogICAgIFQmIG9wZXJhdG9yKz0oaW50IHZhbHVlKQog ICAgIHsKLSAgICAgICAgcmV0dXJuICp0aGlzID0gKnRoaXMgKyB2YWx1ZTsKKyAgICAgICAgcmV0 dXJuICpzdGF0aWNfY2FzdDxUKj4odGhpcykgPSAqdGhpcyArIHZhbHVlOwogICAgIH0KICAgICBU JiBvcGVyYXRvci09KGludCB2YWx1ZSkKICAgICB7Ci0gICAgICAgIHJldHVybiAqdGhpcyA9ICp0 aGlzIC0gdmFsdWU7CisgICAgICAgIHJldHVybiAqc3RhdGljX2Nhc3Q8VCo+KHRoaXMpID0gKnRo aXMgLSB2YWx1ZTsKICAgICB9CiAgICAgCiBwcml2YXRlOgo= 355618 2018-11-25 20:44:24 -0800 2018-11-26 12:14:50 -0800 patch a-backup.diff text/plain 4538 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzg0ODYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDE4LTExLTI1ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIE9iamVjdCBhbGxvY2F0aW9uIHNpbmtpbmcgcGhhc2UgbmVlZHMgdG8g aXRlcmF0ZSBlYWNoIHNjb3BlIG9mZnNldCBpbnN0ZWFkIG9mIGp1c3QgaXRlcmF0aW5nIHRoZSBz eW1ib2wgdGFibGUncyBoYXNobWFwIHdoZW4gaGFuZGxpbmcgYW4gYWN0aXZhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxOTU4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NjIyMTg3Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9vYmplY3QtYWxsb2NhdGlvbi1zaW5raW5nLXBo YXNlLW5lZWRzLXRvLXdyaXRlLXRvLWVhY2gtc2NvcGUtb2Zmc2V0LmpzOiBBZGRlZC4KKyAgICAg ICAgKHgpOgorICAgICAgICAoZm9vKToKKwogMjAxOC0xMS0yMSAgU2FhbSBiYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBERkdTcGVjdWxhdGl2ZUpJVCBzaG91bGQgbm90ICY9 IGV4aXRPSyB3aXRoIG1heUV4aXQobm9kZSkKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL29iamVjdC1h bGxvY2F0aW9uLXNpbmtpbmctcGhhc2UtbmVlZHMtdG8td3JpdGUtdG8tZWFjaC1zY29wZS1vZmZz ZXQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3Mvb2JqZWN0LWFsbG9jYXRpb24tc2lu a2luZy1waGFzZS1uZWVkcy10by13cml0ZS10by1lYWNoLXNjb3BlLW9mZnNldC5qcwkobm9uZXhp c3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9vYmplY3QtYWxsb2NhdGlvbi1zaW5raW5nLXBoYXNl LW5lZWRzLXRvLXdyaXRlLXRvLWVhY2gtc2NvcGUtb2Zmc2V0LmpzCSh3b3JraW5nIGNvcHkpCkBA IC0wLDAgKzEsMTMgQEAKKy8vQCBydW5EZWZhdWx0KCItLWZvcmNlRWFnZXJDb21waWxhdGlvbj0x IiwgIi0tdXNlQ29uY3VycmVudEpJVD0wIikKKworZnVuY3Rpb24gZm9vKGEsIGEpIHsKKyAgICBm dW5jdGlvbiB4KCkgeworICAgICAgICBldmFsKCk7CisgICAgfQorfQorZm9vKCk7Citmb28oKTsK K2ZvbygpOworZm9vKCk7Citmb28oKTsKK2ZvbygwKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkocmV2aXNpb24gMjM4NDg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTExLTI1ICBTYWFtIGJhcmF0 aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIE9iamVjdCBhbGxvY2F0aW9uIHNpbmtp bmcgcGhhc2UgbmVlZHMgdG8gaXRlcmF0ZSBlYWNoIHNjb3BlIG9mZnNldCBpbnN0ZWFkIG9mIGp1 c3QgaXRlcmF0aW5nIHRoZSBzeW1ib2wgdGFibGUncyBoYXNobWFwIHdoZW4gaGFuZGxpbmcgYW4g YWN0aXZhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTkxOTU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjIyMTg3Nz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBtYXkgYmUgbW9yZSBl bnRyaWVzIGluIGFuIGFjdGl2YXRpb24gdGhhbiB1bmlxdWUgdmFyaWFibGVzCisgICAgICAgIGlu IGEgc3ltYm9sIHRhYmxlJ3MgaGFzaG1hcC4gRm9yIGV4YW1wbGUsIGlmIHlvdSBoYXZlIHR3byBw YXJhbWV0ZXJzCisgICAgICAgIHRvIGEgZnVuY3Rpb24sIGFuZCB0aGV5IGJvdGggYXJlIHRoZSBz YW1lIG5hbWUsIGFuZCB0aGUgZnVuY3Rpb24KKyAgICAgICAgdXNlcyBldmFsLCB3ZSdsbCBlbmQg dXAgd2l0aCB0d28gc2NvcGUgc2xvdHMsIGJ1dCBvbmx5IGEgc2luZ2xlCisgICAgICAgIGVudHJ5 IGluIHRoZSBoYXNobWFwIGluIHRoZSBzeW1ib2wgdGFibGUuIE9iamVjdCBhbGxvY2F0aW9uIHNp bmtpbmcKKyAgICAgICAgcGhhc2Ugd2FzIHByZXZpb3VzbHkgaXRlcmF0aW5nIG92ZXIgdGhlIGhh c2htYXAsIGFzc3VtaW5nIHRoZXNlCisgICAgICAgIHZhbHVlcyB3ZXJlIGVxdWl2YWxlbnQuIFRo aXMgaXMgd3JvbmcgaW4gdGhlIGFib3ZlIGNhc2UuIEluc3RlYWQsCisgICAgICAgIHdlIG5lZWQg dG8gaXRlcmF0ZSBvdmVyIGVhY2ggc2NvcGUgb2Zmc2V0LgorCisgICAgICAgICogZGZnL0RGR09i amVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvR2VuZXJp Y09mZnNldC5oOgorICAgICAgICAoSlNDOjpHZW5lcmljT2Zmc2V0OjpvcGVyYXRvcis9KToKKyAg ICAgICAgKEpTQzo6R2VuZXJpY09mZnNldDo6b3BlcmF0b3ItPSk6CisKIDIwMTgtMTEtMjMgIFdl bnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIGRy YWcgYW5kIGRyb3Agc3VwcG9ydCBmb3IgaU9TTWFjCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFz ZS5jcHAJKHJldmlzaW9uIDIzODQ4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3Nywx MSArODc3LDEwIEBAIHByaXZhdGU6CiAgICAgICAgICAgICB3cml0ZXMuYWRkKEFjdGl2YXRpb25T Y29wZVBMb2MsIExhenlOb2RlKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSkpOwogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IG5vZGUtPmNhc3RP cGVyYW5kPFN5bWJvbFRhYmxlKj4oKTsKLSAgICAgICAgICAgICAgICBDb25jdXJyZW50SlNMb2Nr ZXIgbG9ja2VyKHN5bWJvbFRhYmxlLT5tX2xvY2spOwogICAgICAgICAgICAgICAgIExhenlOb2Rl IGluaXRpYWxWYWx1ZShtX2dyYXBoLmZyZWV6ZShub2RlLT5pbml0aWFsaXphdGlvblZhbHVlRm9y QWN0aXZhdGlvbigpKSk7Ci0gICAgICAgICAgICAgICAgZm9yIChhdXRvIGl0ZXIgPSBzeW1ib2xU YWJsZS0+YmVnaW4obG9ja2VyKSwgZW5kID0gc3ltYm9sVGFibGUtPmVuZChsb2NrZXIpOyBpdGVy ICE9IGVuZDsgKytpdGVyKSB7CisgICAgICAgICAgICAgICAgZm9yIChTY29wZU9mZnNldCBvZmZz ZXQgeyAwIH07IG9mZnNldCA8PSBzeW1ib2xUYWJsZS0+bWF4U2NvcGVPZmZzZXQoKTsgb2Zmc2V0 ICs9IDEpIHsKICAgICAgICAgICAgICAgICAgICAgd3JpdGVzLmFkZCgKLSAgICAgICAgICAgICAg ICAgICAgICAgIFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yKENsb3N1cmVWYXJQTG9jLCBpdGVy LT52YWx1ZS5zY29wZU9mZnNldCgpLm9mZnNldCgpKSwKKyAgICAgICAgICAgICAgICAgICAgICAg IFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yKENsb3N1cmVWYXJQTG9jLCBvZmZzZXQub2Zmc2V0 KCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgaW5pdGlhbFZhbHVlKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9HZW5lcmljT2Zmc2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvR2VuZXJpY09mZnNldC5oCShyZXZpc2lvbiAyMzg0ODYpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9HZW5lcmljT2Zmc2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTk1LDEx ICs5NSwxMSBAQCBwdWJsaWM6CiAgICAgfQogICAgIFQmIG9wZXJhdG9yKz0oaW50IHZhbHVlKQog ICAgIHsKLSAgICAgICAgcmV0dXJuICp0aGlzID0gKnRoaXMgKyB2YWx1ZTsKKyAgICAgICAgcmV0 dXJuICpzdGF0aWNfY2FzdDxUKj4odGhpcykgPSAqdGhpcyArIHZhbHVlOwogICAgIH0KICAgICBU JiBvcGVyYXRvci09KGludCB2YWx1ZSkKICAgICB7Ci0gICAgICAgIHJldHVybiAqdGhpcyA9ICp0 aGlzIC0gdmFsdWU7CisgICAgICAgIHJldHVybiAqc3RhdGljX2Nhc3Q8VCo+KHRoaXMpID0gKnRo aXMgLSB2YWx1ZTsKICAgICB9CiAgICAgCiBwcml2YXRlOgo=