34504 2010-02-02 15:44:44 -0800 Crash in CollectorBitmap::get at nbcolympics.com 2010-02-02 17:17:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver webkit-unassigned oldest_to_newest 187178 0 oliver 2010-02-02 15:44:44 -0800 Crash in CollectorBitmap::get at nbcolympics.com 187183 1 47980 oliver 2010-02-02 15:52:46 -0800 Created attachment 47980 Patch 187186 2 47980 ggaren 2010-02-02 15:57:05 -0800 Comment on attachment 47980 Patch r=me Might be worth adding a comment that explains that m_offset does not include anonymous slots, and the true property offset requires adding the anonymous slot count. 187187 3 47980 darin 2010-02-02 15:57:38 -0800 Comment on attachment 47980 Patch > + the effected cases by incorporating the anonymous slot count. It effected -> affected > + also removes the duplicate copy of anonymous slot count fro the fro -> from 187212 4 oliver 2010-02-02 17:17:44 -0800 Committed r54265: <http://trac.webkit.org/changeset/54265> 47980 2010-02-02 15:52:46 -0800 2010-02-02 15:57:38 -0800 Patch bug-34504-20100202155245.patch text/plain 13055 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA5YjEzN2U0Li5kZTk5ODkxIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTAtMDItMDIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDcmFzaCBpbiBDb2xsZWN0 b3JCaXRtYXA6OmdldCBhdCBuYmNvbHltcGljcy5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NTA0CisKKyAgICAgICAgVGhpcyB3YXMgY2F1c2Vk IGJ5IHRoZSB1c2Ugb2YgbV9vZmZzZXQgdG8gZGV0ZXJtaW5lIHRoZSBvZmZzZXQgb2YKKyAgICAg ICAgYSBuZXcgcHJvcGVydHkgaW50byB0aGUgcHJvcGVydHkgc3RvcmFnZS4gIFRoaXMgcGF0Y2gg Y29ycmVjdHMKKyAgICAgICAgdGhlIGVmZmVjdGVkIGNhc2VzIGJ5IGluY29ycG9yYXRpbmcgdGhl IGFub255bW91cyBzbG90IGNvdW50LiBJdAorICAgICAgICBhbHNvIHJlbW92ZXMgdGhlIGR1cGxp Y2F0ZSBjb3B5IG9mIGFub255bW91cyBzbG90IGNvdW50IGZybyB0aGUKKyAgICAgICAgcHJvcGVy dHkgdGFibGUgYXMga2VlcGluZyB0aGlzIHVwIHRvIGRhdGUgbWVyZWx5IGluY3JlYXNlZCB0aGUK KyAgICAgICAgY2hhbmNlIG9mIGEgbWlzbWF0Y2guICBGaW5hbGx5IEkndmUgYWRkZWQgYSBsYXJn ZSBudW1iZXIgb2YKKyAgICAgICAgYXNzZXJ0aW9ucyBpbiBhbiBhdHRlbXB0IHRvIHByZXZlbnQg c3VjaCBhIGJ1ZyBmcm9tIGhhcHBlbmluZworICAgICAgICBhZ2Fpbi4KKworICAgICAgICBXaXRo IHRoZSBuZXcgYXNzZXJ0aW9ucyBpbiBwbGFjZSB0aGUgZXhpc3RpbmcgYW5vbnltb3VzIHNsb3Qg dGVzdHMKKyAgICAgICAgYWxsIGZhaWwgd2l0aG91dCB0aGUgbV9vZmZzZXQgZml4ZXMuCisKKyAg ICAgICAgKiBydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxlLmg6CisgICAgICAgICogcnVudGlt ZS9TdHJ1Y3R1cmUuY3BwOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6Om1hdGVyaWFsaXplUHJv cGVydHlNYXApOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmFkZFByb3BlcnR5VHJhbnNpdGlv blRvRXhpc3RpbmdTdHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmFkZFByb3Bl cnR5VHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6cmVtb3ZlUHJvcGVydHlU cmFuc2l0aW9uKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpmbGF0dGVuRGljdGlvbmFyeVN0 cnVjdHVyZSk6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6YWRkUHJvcGVydHlXaXRob3V0VHJh bnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6cmVtb3ZlUHJvcGVydHlXaXRob3V0 VHJhbnNpdGlvbik6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6Y29weVByb3BlcnR5VGFibGUp OgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmdldCk6CisgICAgICAgIChKU0M6OlN0cnVjdHVy ZTo6cHV0KToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpyZW1vdmUpOgorICAgICAgICAoSlND OjpTdHJ1Y3R1cmU6Omluc2VydEludG9Qcm9wZXJ0eU1hcEhhc2hUYWJsZSk6CisgICAgICAgIChK U0M6OlN0cnVjdHVyZTo6Y3JlYXRlUHJvcGVydHlNYXBIYXNoVGFibGUpOgorICAgICAgICAoSlND OjpTdHJ1Y3R1cmU6OnJlaGFzaFByb3BlcnR5TWFwSGFzaFRhYmxlKToKKyAgICAgICAgKEpTQzo6 U3RydWN0dXJlOjpjaGVja0NvbnNpc3RlbmN5KToKKwogMjAxMC0wMi0wMiAgS3dhbmcgWXVsIFNl byAgPHNreXVsQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hU YWJsZS5oIGIvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJsZS5oCmlu ZGV4IDViNjNmNzkuLjQ0ZGMyYjggMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UHJvcGVydHlNYXBIYXNoVGFibGUuaAorKysgYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3Bl cnR5TWFwSGFzaFRhYmxlLmgKQEAgLTYxLDcgKzYxLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg ICAgIHVuc2lnbmVkIHNpemU7CiAgICAgICAgIHVuc2lnbmVkIGtleUNvdW50OwogICAgICAgICB1 bnNpZ25lZCBkZWxldGVkU2VudGluZWxDb3VudDsKLSAgICAgICAgdW5zaWduZWQgYW5vbnltb3Vz U2xvdENvdW50OwogICAgICAgICB1bnNpZ25lZCBsYXN0SW5kZXhVc2VkOwogICAgICAgICBWZWN0 b3I8dW5zaWduZWQ+KiBkZWxldGVkT2Zmc2V0czsKICAgICAgICAgdW5zaWduZWQgZW50cnlJbmRp Y2VzWzFdOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3Bw IGIvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCmluZGV4IDg2ZWFlYmQuLjU0 NmUyYmYgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcAor KysgYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKQEAgLTI3MiwxMiArMjcy LDExIEBAIHZvaWQgU3RydWN0dXJlOjptYXRlcmlhbGl6ZVByb3BlcnR5TWFwKCkKICAgICAgICAg aWYgKHNpemVGb3JLZXlDb3VudChtX29mZnNldCArIDEpID4gbV9wcm9wZXJ0eVRhYmxlLT5zaXpl KQogICAgICAgICAgICAgcmVoYXNoUHJvcGVydHlNYXBIYXNoVGFibGUoc2l6ZUZvcktleUNvdW50 KG1fb2Zmc2V0ICsgMSkpOyAvLyBUaGlzIGNvdWxkIGJlIG1hZGUgbW9yZSBlZmZpY2llbnQgYnkg Y29tYmluaW5nIHdpdGggdGhlIGNvcHkgYWJvdmUuIAogICAgIH0KLSAgICAKLSAgICBtX3Byb3Bl cnR5VGFibGUtPmFub255bW91c1Nsb3RDb3VudCA9IG1fYW5vbnltb3VzU2xvdENvdW50OworCiAg ICAgZm9yIChwdHJkaWZmX3QgaSA9IHN0cnVjdHVyZXMuc2l6ZSgpIC0gMjsgaSA+PSAwOyAtLWkp IHsKICAgICAgICAgc3RydWN0dXJlID0gc3RydWN0dXJlc1tpXTsKICAgICAgICAgc3RydWN0dXJl LT5tX25hbWVJblByZXZpb3VzLT5yZWYoKTsKLSAgICAgICAgUHJvcGVydHlNYXBFbnRyeSBlbnRy eShzdHJ1Y3R1cmUtPm1fbmFtZUluUHJldmlvdXMuZ2V0KCksIHN0cnVjdHVyZS0+bV9vZmZzZXQs IHN0cnVjdHVyZS0+bV9hdHRyaWJ1dGVzSW5QcmV2aW91cywgc3RydWN0dXJlLT5tX3NwZWNpZmlj VmFsdWVJblByZXZpb3VzLCArK21fcHJvcGVydHlUYWJsZS0+bGFzdEluZGV4VXNlZCk7CisgICAg ICAgIFByb3BlcnR5TWFwRW50cnkgZW50cnkoc3RydWN0dXJlLT5tX25hbWVJblByZXZpb3VzLmdl dCgpLCBtX2Fub255bW91c1Nsb3RDb3VudCArIHN0cnVjdHVyZS0+bV9vZmZzZXQsIHN0cnVjdHVy ZS0+bV9hdHRyaWJ1dGVzSW5QcmV2aW91cywgc3RydWN0dXJlLT5tX3NwZWNpZmljVmFsdWVJblBy ZXZpb3VzLCArK21fcHJvcGVydHlUYWJsZS0+bGFzdEluZGV4VXNlZCk7CiAgICAgICAgIGluc2Vy dEludG9Qcm9wZXJ0eU1hcEhhc2hUYWJsZShlbnRyeSk7CiAgICAgfQogfQpAQCAtMzQzLDcgKzM0 Miw5IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlPiBTdHJ1Y3R1cmU6OmFkZFByb3BlcnR5VHJhbnNp dGlvblRvRXhpc3RpbmdTdHJ1Y3R1cmUoU3RydWN0CiAKICAgICBpZiAoU3RydWN0dXJlKiBleGlz dGluZ1RyYW5zaXRpb24gPSBzdHJ1Y3R1cmUtPnRhYmxlLmdldChtYWtlX3BhaXIocHJvcGVydHlO YW1lLnVzdHJpbmcoKS5yZXAoKSwgYXR0cmlidXRlcyksIHNwZWNpZmljVmFsdWUpKSB7CiAgICAg ICAgIEFTU0VSVChleGlzdGluZ1RyYW5zaXRpb24tPm1fb2Zmc2V0ICE9IG5vT2Zmc2V0KTsKLSAg ICAgICAgb2Zmc2V0ID0gZXhpc3RpbmdUcmFuc2l0aW9uLT5tX29mZnNldDsKKyAgICAgICAgb2Zm c2V0ID0gZXhpc3RpbmdUcmFuc2l0aW9uLT5tX29mZnNldCArIGV4aXN0aW5nVHJhbnNpdGlvbi0+ bV9hbm9ueW1vdXNTbG90Q291bnQ7CisgICAgICAgIEFTU0VSVChvZmZzZXQgPj0gc3RydWN0dXJl LT5tX2Fub255bW91c1Nsb3RDb3VudCk7CisgICAgICAgIEFTU0VSVChzdHJ1Y3R1cmUtPm1fYW5v bnltb3VzU2xvdENvdW50ID09IGV4aXN0aW5nVHJhbnNpdGlvbi0+bV9hbm9ueW1vdXNTbG90Q291 bnQpOwogICAgICAgICByZXR1cm4gZXhpc3RpbmdUcmFuc2l0aW9uOwogICAgIH0KIApAQCAtMzYz LDYgKzM2NCw4IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlPiBTdHJ1Y3R1cmU6OmFkZFByb3BlcnR5 VHJhbnNpdGlvbihTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgY29uCiAgICAgICAgIFJlZlB0cjxTdHJ1 Y3R1cmU+IHRyYW5zaXRpb24gPSB0b0NhY2hlYWJsZURpY3Rpb25hcnlUcmFuc2l0aW9uKHN0cnVj dHVyZSk7CiAgICAgICAgIEFTU0VSVChzdHJ1Y3R1cmUgIT0gdHJhbnNpdGlvbik7CiAgICAgICAg IG9mZnNldCA9IHRyYW5zaXRpb24tPnB1dChwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMsIHNwZWNp ZmljVmFsdWUpOworICAgICAgICBBU1NFUlQob2Zmc2V0ID49IHN0cnVjdHVyZS0+bV9hbm9ueW1v dXNTbG90Q291bnQpOworICAgICAgICBBU1NFUlQoc3RydWN0dXJlLT5tX2Fub255bW91c1Nsb3RD b3VudCA9PSB0cmFuc2l0aW9uLT5tX2Fub255bW91c1Nsb3RDb3VudCk7CiAgICAgICAgIGlmICh0 cmFuc2l0aW9uLT5wcm9wZXJ0eVN0b3JhZ2VTaXplKCkgPiB0cmFuc2l0aW9uLT5wcm9wZXJ0eVN0 b3JhZ2VDYXBhY2l0eSgpKQogICAgICAgICAgICAgdHJhbnNpdGlvbi0+Z3Jvd1Byb3BlcnR5U3Rv cmFnZUNhcGFjaXR5KCk7CiAgICAgICAgIHJldHVybiB0cmFuc2l0aW9uLnJlbGVhc2UoKTsKQEAg LTM4MSw3ICszODQsNiBAQCBQYXNzUmVmUHRyPFN0cnVjdHVyZT4gU3RydWN0dXJlOjphZGRQcm9w ZXJ0eVRyYW5zaXRpb24oU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIGNvbgogICAgIHRyYW5zaXRpb24t Pm1fc3BlY2lmaWNGdW5jdGlvblRocmFzaENvdW50ID0gc3RydWN0dXJlLT5tX3NwZWNpZmljRnVu Y3Rpb25UaHJhc2hDb3VudDsKIAogICAgIGlmIChzdHJ1Y3R1cmUtPm1fcHJvcGVydHlUYWJsZSkg ewotICAgICAgICBBU1NFUlQoc3RydWN0dXJlLT5tX3Byb3BlcnR5VGFibGUtPmFub255bW91c1Ns b3RDb3VudCA9PSBzdHJ1Y3R1cmUtPm1fYW5vbnltb3VzU2xvdENvdW50KTsKICAgICAgICAgaWYg KHN0cnVjdHVyZS0+bV9pc1Bpbm5lZFByb3BlcnR5VGFibGUpCiAgICAgICAgICAgICB0cmFuc2l0 aW9uLT5tX3Byb3BlcnR5VGFibGUgPSBzdHJ1Y3R1cmUtPmNvcHlQcm9wZXJ0eVRhYmxlKCk7CiAg ICAgICAgIGVsc2UgewpAQCAtMzk2LDEwICszOTgsMTIgQEAgUGFzc1JlZlB0cjxTdHJ1Y3R1cmU+ IFN0cnVjdHVyZTo6YWRkUHJvcGVydHlUcmFuc2l0aW9uKFN0cnVjdHVyZSogc3RydWN0dXJlLCBj b24KICAgICB9CiAKICAgICBvZmZzZXQgPSB0cmFuc2l0aW9uLT5wdXQocHJvcGVydHlOYW1lLCBh dHRyaWJ1dGVzLCBzcGVjaWZpY1ZhbHVlKTsKKyAgICBBU1NFUlQob2Zmc2V0ID49IHN0cnVjdHVy ZS0+bV9hbm9ueW1vdXNTbG90Q291bnQpOworICAgIEFTU0VSVChzdHJ1Y3R1cmUtPm1fYW5vbnlt b3VzU2xvdENvdW50ID09IHRyYW5zaXRpb24tPm1fYW5vbnltb3VzU2xvdENvdW50KTsKICAgICBp ZiAodHJhbnNpdGlvbi0+cHJvcGVydHlTdG9yYWdlU2l6ZSgpID4gdHJhbnNpdGlvbi0+cHJvcGVy dHlTdG9yYWdlQ2FwYWNpdHkoKSkKICAgICAgICAgdHJhbnNpdGlvbi0+Z3Jvd1Byb3BlcnR5U3Rv cmFnZUNhcGFjaXR5KCk7CiAKLSAgICB0cmFuc2l0aW9uLT5tX29mZnNldCA9IG9mZnNldDsKKyAg ICB0cmFuc2l0aW9uLT5tX29mZnNldCA9IG9mZnNldCAtIHN0cnVjdHVyZS0+bV9hbm9ueW1vdXNT bG90Q291bnQ7CiAgICAgQVNTRVJUKHN0cnVjdHVyZS0+YW5vbnltb3VzU2xvdENvdW50KCkgPT0g dHJhbnNpdGlvbi0+YW5vbnltb3VzU2xvdENvdW50KCkpOwogICAgIHN0cnVjdHVyZS0+dGFibGUu YWRkKG1ha2VfcGFpcihwcm9wZXJ0eU5hbWUudXN0cmluZygpLnJlcCgpLCBhdHRyaWJ1dGVzKSwg dHJhbnNpdGlvbi5nZXQoKSwgc3BlY2lmaWNWYWx1ZSk7CiAgICAgcmV0dXJuIHRyYW5zaXRpb24u cmVsZWFzZSgpOwpAQCAtNDEyLDYgKzQxNiw4IEBAIFBhc3NSZWZQdHI8U3RydWN0dXJlPiBTdHJ1 Y3R1cmU6OnJlbW92ZVByb3BlcnR5VHJhbnNpdGlvbihTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwKICAg ICBSZWZQdHI8U3RydWN0dXJlPiB0cmFuc2l0aW9uID0gdG9VbmNhY2hlYWJsZURpY3Rpb25hcnlU cmFuc2l0aW9uKHN0cnVjdHVyZSk7CiAKICAgICBvZmZzZXQgPSB0cmFuc2l0aW9uLT5yZW1vdmUo cHJvcGVydHlOYW1lKTsKKyAgICBBU1NFUlQob2Zmc2V0ID49IHN0cnVjdHVyZS0+bV9hbm9ueW1v dXNTbG90Q291bnQpOworICAgIEFTU0VSVChzdHJ1Y3R1cmUtPm1fYW5vbnltb3VzU2xvdENvdW50 ID09IHRyYW5zaXRpb24tPm1fYW5vbnltb3VzU2xvdENvdW50KTsKIAogICAgIHJldHVybiB0cmFu c2l0aW9uLnJlbGVhc2UoKTsKIH0KQEAgLTUyOSw4ICs1MzUsNyBAQCBQYXNzUmVmUHRyPFN0cnVj dHVyZT4gU3RydWN0dXJlOjpmbGF0dGVuRGljdGlvbmFyeVN0cnVjdHVyZShKU09iamVjdCogb2Jq ZWN0KQogICAgICAgICAvLyBpbiB0aGUgb3JkZXIgdGhhdCB0aGV5IGFyZSBleHBlY3RlZCB0byBi ZSBpbiwgYnV0IHdlIG5lZWQgdG8KICAgICAgICAgLy8gcmVvcmRlciB0aGUgc3RvcmFnZSwgc28g d2UgaGF2ZSB0byBjb3B5IHRoZSBjdXJyZW50IHZhbHVlcyBvdXQKICAgICAgICAgVmVjdG9yPEpT VmFsdWU+IHZhbHVlcyhwcm9wZXJ0eUNvdW50KTsKLSAgICAgICAgQVNTRVJUKG1fcHJvcGVydHlU YWJsZS0+YW5vbnltb3VzU2xvdENvdW50ID09IG1fYW5vbnltb3VzU2xvdENvdW50KTsKLSAgICAg ICAgdW5zaWduZWQgYW5vbnltb3VzU2xvdENvdW50ID0gbV9wcm9wZXJ0eVRhYmxlLT5hbm9ueW1v dXNTbG90Q291bnQ7CisgICAgICAgIHVuc2lnbmVkIGFub255bW91c1Nsb3RDb3VudCA9IG1fYW5v bnltb3VzU2xvdENvdW50OwogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcHJvcGVy dHlDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBQcm9wZXJ0eU1hcEVudHJ5KiBlbnRyeSA9IHNv cnRlZFByb3BlcnR5RW50cmllc1tpXTsKICAgICAgICAgICAgIHZhbHVlc1tpXSA9IG9iamVjdC0+ Z2V0RGlyZWN0T2Zmc2V0KGVudHJ5LT5vZmZzZXQpOwpAQCAtNTY1LDYgKzU3MCw3IEBAIHNpemVf dCBTdHJ1Y3R1cmU6OmFkZFByb3BlcnR5V2l0aG91dFRyYW5zaXRpb24oY29uc3QgSWRlbnRpZmll ciYgcHJvcGVydHlOYW1lLCB1CiAgICAgbV9pc1Bpbm5lZFByb3BlcnR5VGFibGUgPSB0cnVlOwog CiAgICAgc2l6ZV90IG9mZnNldCA9IHB1dChwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMsIHNwZWNp ZmljVmFsdWUpOworICAgIEFTU0VSVChvZmZzZXQgPj0gbV9hbm9ueW1vdXNTbG90Q291bnQpOwog ICAgIGlmIChwcm9wZXJ0eVN0b3JhZ2VTaXplKCkgPiBwcm9wZXJ0eVN0b3JhZ2VDYXBhY2l0eSgp KQogICAgICAgICBncm93UHJvcGVydHlTdG9yYWdlQ2FwYWNpdHkoKTsKICAgICByZXR1cm4gb2Zm c2V0OwpAQCAtNTc5LDYgKzU4NSw3IEBAIHNpemVfdCBTdHJ1Y3R1cmU6OnJlbW92ZVByb3BlcnR5 V2l0aG91dFRyYW5zaXRpb24oY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lCiAKICAgICBt X2lzUGlubmVkUHJvcGVydHlUYWJsZSA9IHRydWU7CiAgICAgc2l6ZV90IG9mZnNldCA9IHJlbW92 ZShwcm9wZXJ0eU5hbWUpOworICAgIEFTU0VSVChvZmZzZXQgPj0gbV9hbm9ueW1vdXNTbG90Q291 bnQpOwogICAgIHJldHVybiBvZmZzZXQ7CiB9CiAKQEAgLTYyMCw4ICs2MjcsNyBAQCBQcm9wZXJ0 eU1hcEhhc2hUYWJsZSogU3RydWN0dXJlOjpjb3B5UHJvcGVydHlUYWJsZSgpCiB7CiAgICAgaWYg KCFtX3Byb3BlcnR5VGFibGUpCiAgICAgICAgIHJldHVybiAwOwotICAgIAotICAgIEFTU0VSVCht X3Byb3BlcnR5VGFibGUtPmFub255bW91c1Nsb3RDb3VudCA9PSBtX2Fub255bW91c1Nsb3RDb3Vu dCk7CisKICAgICBzaXplX3QgdGFibGVTaXplID0gUHJvcGVydHlNYXBIYXNoVGFibGU6OmFsbG9j YXRpb25TaXplKG1fcHJvcGVydHlUYWJsZS0+c2l6ZSk7CiAgICAgUHJvcGVydHlNYXBIYXNoVGFi bGUqIG5ld1RhYmxlID0gc3RhdGljX2Nhc3Q8UHJvcGVydHlNYXBIYXNoVGFibGUqPihmYXN0TWFs bG9jKHRhYmxlU2l6ZSkpOwogICAgIG1lbWNweShuZXdUYWJsZSwgbV9wcm9wZXJ0eVRhYmxlLCB0 YWJsZVNpemUpOwpAQCAtNjM2LDcgKzY0Miw2IEBAIFByb3BlcnR5TWFwSGFzaFRhYmxlKiBTdHJ1 Y3R1cmU6OmNvcHlQcm9wZXJ0eVRhYmxlKCkKICAgICBpZiAobV9wcm9wZXJ0eVRhYmxlLT5kZWxl dGVkT2Zmc2V0cykKICAgICAgICAgbmV3VGFibGUtPmRlbGV0ZWRPZmZzZXRzID0gbmV3IFZlY3Rv cjx1bnNpZ25lZD4oKm1fcHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMpOwogCi0gICAgbmV3 VGFibGUtPmFub255bW91c1Nsb3RDb3VudCA9IG1fcHJvcGVydHlUYWJsZS0+YW5vbnltb3VzU2xv dENvdW50OwogICAgIHJldHVybiBuZXdUYWJsZTsKIH0KIApAQCAtNjU5LDYgKzY2NCw3IEBAIHNp emVfdCBTdHJ1Y3R1cmU6OmdldChjb25zdCBVU3RyaW5nOjpSZXAqIHJlcCwgdW5zaWduZWQmIGF0 dHJpYnV0ZXMsIEpTQ2VsbComIHNwCiAgICAgaWYgKHJlcCA9PSBtX3Byb3BlcnR5VGFibGUtPmVu dHJpZXMoKVtlbnRyeUluZGV4IC0gMV0ua2V5KSB7CiAgICAgICAgIGF0dHJpYnV0ZXMgPSBtX3By b3BlcnR5VGFibGUtPmVudHJpZXMoKVtlbnRyeUluZGV4IC0gMV0uYXR0cmlidXRlczsKICAgICAg ICAgc3BlY2lmaWNWYWx1ZSA9IG1fcHJvcGVydHlUYWJsZS0+ZW50cmllcygpW2VudHJ5SW5kZXgg LSAxXS5zcGVjaWZpY1ZhbHVlOworICAgICAgICBBU1NFUlQobV9wcm9wZXJ0eVRhYmxlLT5lbnRy aWVzKClbZW50cnlJbmRleCAtIDFdLm9mZnNldCA+PSBtX2Fub255bW91c1Nsb3RDb3VudCk7CiAg ICAgICAgIHJldHVybiBtX3Byb3BlcnR5VGFibGUtPmVudHJpZXMoKVtlbnRyeUluZGV4IC0gMV0u b2Zmc2V0OwogICAgIH0KIApAQCAtNjgyLDYgKzY4OCw3IEBAIHNpemVfdCBTdHJ1Y3R1cmU6Omdl dChjb25zdCBVU3RyaW5nOjpSZXAqIHJlcCwgdW5zaWduZWQmIGF0dHJpYnV0ZXMsIEpTQ2VsbCom IHNwCiAgICAgICAgIGlmIChyZXAgPT0gbV9wcm9wZXJ0eVRhYmxlLT5lbnRyaWVzKClbZW50cnlJ bmRleCAtIDFdLmtleSkgewogICAgICAgICAgICAgYXR0cmlidXRlcyA9IG1fcHJvcGVydHlUYWJs ZS0+ZW50cmllcygpW2VudHJ5SW5kZXggLSAxXS5hdHRyaWJ1dGVzOwogICAgICAgICAgICAgc3Bl Y2lmaWNWYWx1ZSA9IG1fcHJvcGVydHlUYWJsZS0+ZW50cmllcygpW2VudHJ5SW5kZXggLSAxXS5z cGVjaWZpY1ZhbHVlOworICAgICAgICAgICAgQVNTRVJUKG1fcHJvcGVydHlUYWJsZS0+ZW50cmll cygpW2VudHJ5SW5kZXggLSAxXS5vZmZzZXQgPj0gbV9hbm9ueW1vdXNTbG90Q291bnQpOwogICAg ICAgICAgICAgcmV0dXJuIG1fcHJvcGVydHlUYWJsZS0+ZW50cmllcygpW2VudHJ5SW5kZXggLSAx XS5vZmZzZXQ7CiAgICAgICAgIH0KICAgICB9CkBAIC03NjMsNyArNzcwLDYgQEAgc2l6ZV90IFN0 cnVjdHVyZTo6cHV0KGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgdW5zaWduZWQgYXR0 cmlidXRlcywgSlNDZWwKIAogICAgIGlmICghbV9wcm9wZXJ0eVRhYmxlKQogICAgICAgICBjcmVh dGVQcm9wZXJ0eU1hcEhhc2hUYWJsZSgpOwotICAgIEFTU0VSVChtX3Byb3BlcnR5VGFibGUtPmFu b255bW91c1Nsb3RDb3VudCA9PSBtX2Fub255bW91c1Nsb3RDb3VudCk7CiAKICAgICAvLyBGSVhN RTogQ29uc2lkZXIgYSBmYXN0IGNhc2UgZm9yIHRhYmxlcyB3aXRoIG5vIGRlbGV0ZWQgc2VudGlu ZWxzLgogCkBAIC04MzEsOSArODM3LDEwIEBAIHNpemVfdCBTdHJ1Y3R1cmU6OnB1dChjb25zdCBJ ZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIHVuc2lnbmVkIGF0dHJpYnV0ZXMsIEpTQ2VsCiAgICAg ICAgIG5ld09mZnNldCA9IG1fcHJvcGVydHlUYWJsZS0+ZGVsZXRlZE9mZnNldHMtPmxhc3QoKTsK ICAgICAgICAgbV9wcm9wZXJ0eVRhYmxlLT5kZWxldGVkT2Zmc2V0cy0+cmVtb3ZlTGFzdCgpOwog ICAgIH0gZWxzZQotICAgICAgICBuZXdPZmZzZXQgPSBtX3Byb3BlcnR5VGFibGUtPmtleUNvdW50 ICsgbV9wcm9wZXJ0eVRhYmxlLT5hbm9ueW1vdXNTbG90Q291bnQ7CisgICAgICAgIG5ld09mZnNl dCA9IG1fcHJvcGVydHlUYWJsZS0+a2V5Q291bnQgKyBtX2Fub255bW91c1Nsb3RDb3VudDsKICAg ICBtX3Byb3BlcnR5VGFibGUtPmVudHJpZXMoKVtlbnRyeUluZGV4IC0gMV0ub2Zmc2V0ID0gbmV3 T2Zmc2V0OwotCisgICAgCisgICAgQVNTRVJUKG5ld09mZnNldCA+PSBtX2Fub255bW91c1Nsb3RD b3VudCk7CiAgICAgKyttX3Byb3BlcnR5VGFibGUtPmtleUNvdW50OwogCiAgICAgaWYgKChtX3By b3BlcnR5VGFibGUtPmtleUNvdW50ICsgbV9wcm9wZXJ0eVRhYmxlLT5kZWxldGVkU2VudGluZWxD b3VudCkgKiAyID49IG1fcHJvcGVydHlUYWJsZS0+c2l6ZSkKQEAgLTg1OCw4ICs4NjUsNyBAQCBz aXplX3QgU3RydWN0dXJlOjpyZW1vdmUoY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKQog CiAgICAgaWYgKCFtX3Byb3BlcnR5VGFibGUpCiAgICAgICAgIHJldHVybiBub3RGb3VuZDsKLSAg ICAKLSAgICBBU1NFUlQobV9wcm9wZXJ0eVRhYmxlLT5hbm9ueW1vdXNTbG90Q291bnQgPT0gbV9h bm9ueW1vdXNTbG90Q291bnQpOworCiAjaWYgRFVNUF9QUk9QRVJUWU1BUF9TVEFUUwogICAgICsr bnVtUHJvYmVzOwogICAgICsrbnVtUmVtb3ZlczsKQEAgLTg5OCw2ICs5MDQsNyBAQCBzaXplX3Qg U3RydWN0dXJlOjpyZW1vdmUoY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKQogICAgIG1f cHJvcGVydHlUYWJsZS0+ZW50cnlJbmRpY2VzW2kgJiBtX3Byb3BlcnR5VGFibGUtPnNpemVNYXNr XSA9IGRlbGV0ZWRTZW50aW5lbEluZGV4OwogCiAgICAgc2l6ZV90IG9mZnNldCA9IG1fcHJvcGVy dHlUYWJsZS0+ZW50cmllcygpW2VudHJ5SW5kZXggLSAxXS5vZmZzZXQ7CisgICAgQVNTRVJUKG9m ZnNldCA+PSBtX2Fub255bW91c1Nsb3RDb3VudCk7CiAKICAgICBrZXktPmRlcmVmKCk7CiAgICAg bV9wcm9wZXJ0eVRhYmxlLT5lbnRyaWVzKClbZW50cnlJbmRleCAtIDFdLmtleSA9IDA7CkBAIC05 MjMsOCArOTMwLDcgQEAgc2l6ZV90IFN0cnVjdHVyZTo6cmVtb3ZlKGNvbnN0IElkZW50aWZpZXIm IHByb3BlcnR5TmFtZSkKIHZvaWQgU3RydWN0dXJlOjppbnNlcnRJbnRvUHJvcGVydHlNYXBIYXNo VGFibGUoY29uc3QgUHJvcGVydHlNYXBFbnRyeSYgZW50cnkpCiB7CiAgICAgQVNTRVJUKG1fcHJv cGVydHlUYWJsZSk7Ci0gICAgCi0gICAgQVNTRVJUKG1fcHJvcGVydHlUYWJsZS0+YW5vbnltb3Vz U2xvdENvdW50ID09IG1fYW5vbnltb3VzU2xvdENvdW50KTsKKyAgICBBU1NFUlQoZW50cnkub2Zm c2V0ID49IG1fYW5vbnltb3VzU2xvdENvdW50KTsKICAgICB1bnNpZ25lZCBpID0gZW50cnkua2V5 LT5leGlzdGluZ0hhc2goKTsKICAgICB1bnNpZ25lZCBrID0gMDsKIApAQCAtOTc0LDcgKzk4MCw2 IEBAIHZvaWQgU3RydWN0dXJlOjpjcmVhdGVQcm9wZXJ0eU1hcEhhc2hUYWJsZSh1bnNpZ25lZCBu ZXdUYWJsZVNpemUpCiAgICAgbV9wcm9wZXJ0eVRhYmxlID0gc3RhdGljX2Nhc3Q8UHJvcGVydHlN YXBIYXNoVGFibGUqPihmYXN0WmVyb2VkTWFsbG9jKFByb3BlcnR5TWFwSGFzaFRhYmxlOjphbGxv Y2F0aW9uU2l6ZShuZXdUYWJsZVNpemUpKSk7CiAgICAgbV9wcm9wZXJ0eVRhYmxlLT5zaXplID0g bmV3VGFibGVTaXplOwogICAgIG1fcHJvcGVydHlUYWJsZS0+c2l6ZU1hc2sgPSBuZXdUYWJsZVNp emUgLSAxOwotICAgIG1fcHJvcGVydHlUYWJsZS0+YW5vbnltb3VzU2xvdENvdW50ID0gbV9hbm9u eW1vdXNTbG90Q291bnQ7CiAKICAgICBjaGVja0NvbnNpc3RlbmN5KCk7CiB9CkBAIC0xMDA0LDcg KzEwMDksNiBAQCB2b2lkIFN0cnVjdHVyZTo6cmVoYXNoUHJvcGVydHlNYXBIYXNoVGFibGUodW5z aWduZWQgbmV3VGFibGVTaXplKQogICAgIG1fcHJvcGVydHlUYWJsZSA9IHN0YXRpY19jYXN0PFBy b3BlcnR5TWFwSGFzaFRhYmxlKj4oZmFzdFplcm9lZE1hbGxvYyhQcm9wZXJ0eU1hcEhhc2hUYWJs ZTo6YWxsb2NhdGlvblNpemUobmV3VGFibGVTaXplKSkpOwogICAgIG1fcHJvcGVydHlUYWJsZS0+ c2l6ZSA9IG5ld1RhYmxlU2l6ZTsKICAgICBtX3Byb3BlcnR5VGFibGUtPnNpemVNYXNrID0gbmV3 VGFibGVTaXplIC0gMTsKLSAgICBtX3Byb3BlcnR5VGFibGUtPmFub255bW91c1Nsb3RDb3VudCA9 IG9sZFRhYmxlLT5hbm9ueW1vdXNTbG90Q291bnQ7CiAKICAgICB1bnNpZ25lZCBsYXN0SW5kZXhV c2VkID0gMDsKICAgICB1bnNpZ25lZCBlbnRyeUNvdW50ID0gb2xkVGFibGUtPmtleUNvdW50ICsg b2xkVGFibGUtPmRlbGV0ZWRTZW50aW5lbENvdW50OwpAQCAtMTEzNCw2ICsxMTM4LDcgQEAgdm9p ZCBTdHJ1Y3R1cmU6OmNoZWNrQ29uc2lzdGVuY3koKQogICAgIGZvciAodW5zaWduZWQgYyA9IDE7 IGMgPD0gbV9wcm9wZXJ0eVRhYmxlLT5rZXlDb3VudCArIG1fcHJvcGVydHlUYWJsZS0+ZGVsZXRl ZFNlbnRpbmVsQ291bnQ7ICsrYykgewogICAgICAgICBBU1NFUlQobV9oYXNOb25FbnVtZXJhYmxl UHJvcGVydGllcyB8fCAhKG1fcHJvcGVydHlUYWJsZS0+ZW50cmllcygpW2NdLmF0dHJpYnV0ZXMg JiBEb250RW51bSkpOwogICAgICAgICBVU3RyaW5nOjpSZXAqIHJlcCA9IG1fcHJvcGVydHlUYWJs ZS0+ZW50cmllcygpW2NdLmtleTsKKyAgICAgICAgQVNTRVJUKG1fcHJvcGVydHlUYWJsZS0+ZW50 cmllcygpW2NdLm9mZnNldCA+PSBtX2Fub255bW91c1Nsb3RDb3VudCk7CiAgICAgICAgIGlmICgh cmVwKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICsrbm9uRW1wdHlFbnRyeUNvdW50 Owo=