48994 2010-11-04 07:36:28 -0700 [Qt][WK2] Cleanup UpdateChunk and MappedMemoryPool 2010-11-05 04:38:29 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 1 kbalazs webkit-unassigned kling oldest_to_newest 304644 0 kbalazs 2010-11-04 07:36:28 -0700 I like spaghetti but not in C++ so let's improve those a little bit. There are some unused stuff as well and in a few places we should do more error checking. 304656 1 72943 kbalazs 2010-11-04 07:51:40 -0700 Created attachment 72943 Patch 304676 2 72943 kling 2010-11-04 08:34:14 -0700 Comment on attachment 72943 Patch Good stuff, r=me 304733 3 kling 2010-11-04 10:25:24 -0700 Committed r71344: <http://trac.webkit.org/changeset/71344> 305217 4 kbalazs 2010-11-05 04:38:04 -0700 Thank you for committing this. We had some network issues yesterday... 305218 5 72943 kbalazs 2010-11-05 04:38:29 -0700 Comment on attachment 72943 Patch Clearing flags 72943 2010-11-04 07:51:40 -0700 2010-11-05 04:38:29 -0700 Patch bug-48994-20101104155138.patch text/plain 10309 kbalazs ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MTQ4NDc4ZjRjN2ZlMGI5ZjU1MmVjNTJjOWU0ZWZlMmU4M2QwMDQ4Ny4uNmU0NmYwNGRkNTkxZTVi ODUwZjE3ODdkZjcwMGI1MGU0ZWJhMWY1OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0xMS0wNCAgQmFs YXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIENsZWFudXAgVXBkYXRlQ2h1bmsg YW5kIE1hcHBlZE1lbW9yeVBvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ4OTk0CisKKyAgICAgICAgKiBQbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQ b29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWFwcGVkTWVtb3J5UG9vbDo6bWFwTWVtb3J5KToK KyAgICAgICAgUmVtb3ZlZCBhcmd1bWVudCB3aXRoIGRlZmF1bHQgdmFsdWUgdGhhdCB3YXMgYWx3 YXlzCisgICAgICAgIHVzZWQgd2l0aCB0aGUgZGVmYXVsdCB2YWx1ZS4KKyAgICAgICAgKFdlYktp dDo6TWFwcGVkTWVtb3J5UG9vbDo6bWFwRmlsZSk6IERpdHRvIGFuZAorICAgICAgICBhZGQgc29t ZSBhc3NlcnRzLgorICAgICAgICAqIFBsYXRmb3JtL3F0L01hcHBlZE1lbW9yeVBvb2wuaDoKKyAg ICAgICAgRW5jYXBzdWxhdGluZyBNYXBwZWRNZW1vcnkgYW5kIHJlbW92ZSB0aGUgdW51c2VkCisg ICAgICAgIE1hcHBlZE1lbW9yeVBvb2w6OnNlYXJjaEZvck1hcHBlZE1lbW9yeSBtZXRob2QuCisg ICAgICAgIChXZWJLaXQ6Ok1hcHBlZE1lbW9yeTo6bWFwcGVkRmlsZSk6CisgICAgICAgIChXZWJL aXQ6Ok1hcHBlZE1lbW9yeTo6bWFya0ZyZWUpOgorICAgICAgICAoV2ViS2l0OjpNYXBwZWRNZW1v cnk6OmRhdGEpOgorICAgICAgICAoV2ViS2l0OjpNYXBwZWRNZW1vcnk6Ok1hcHBlZE1lbW9yeSk6 CisgICAgICAgIChXZWJLaXQ6Ok1hcHBlZE1lbW9yeTo6bWFya1VzZWQpOgorICAgICAgICAoV2Vi S2l0OjpNYXBwZWRNZW1vcnk6Om1hcFNpemUpOgorICAgICAgICAoV2ViS2l0OjpNYXBwZWRNZW1v cnk6OmlzRnJlZSk6CisgICAgICAgIChXZWJLaXQ6Ok1hcHBlZE1lbW9yeVBvb2w6Omluc3RhbmNl KToKKyAgICAgICAgKiBTaGFyZWQvcXQvVXBkYXRlQ2h1bmsuY3BwOgorICAgICAgICBSZW1vdmVk IHRoZSB1bnVzZWQgZGF0YSBtZXRob2QgYmVzaWRlcyBvdGhlciBjbGVhbnVwcy4KKyAgICAgICAg KFdlYktpdDo6VXBkYXRlQ2h1bms6OlVwZGF0ZUNodW5rKToKKyAgICAgICAgKFdlYktpdDo6VXBk YXRlQ2h1bms6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OlVwZGF0ZUNodW5rOjpkZWNvZGUp OgorICAgICAgICAoV2ViS2l0OjpVcGRhdGVDaHVuazo6Y3JlYXRlSW1hZ2UpOgorICAgICAgICAq IFNoYXJlZC9xdC9VcGRhdGVDaHVuay5oOgorCiAyMDEwLTExLTAzICBBbGljZSBMaXUgIDxhbGlj ZS5saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBjbGFuZysrIGJ1aWxkIApkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29sLmNwcCBiL1dlYktpdDIvUGxh dGZvcm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5jcHAKaW5kZXggYTU5YWVhMDQ3MzczNGU5NzEzYjE0 MDNhNDExNWZmNjVlMDNmODg2Ny4uNjQxMzEyYzhjM2ZjYjhkYWI1Njk0NDNkM2Q0MGFlZTgyYzA0 OTliOSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29sLmNw cAorKysgYi9XZWJLaXQyL1BsYXRmb3JtL3F0L01hcHBlZE1lbW9yeVBvb2wuY3BwCkBAIC0zNCwy MyArMzQsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotTWFwcGVkTWVtb3J5UG9vbCogTWFw cGVkTWVtb3J5UG9vbDo6aW5zdGFuY2UoKQotewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoTWFw cGVkTWVtb3J5UG9vbCwgc2luZ2xldG9uLCAoKSk7Ci0gICAgcmV0dXJuICZzaW5nbGV0b247Ci19 Ci0KLU1hcHBlZE1lbW9yeSogTWFwcGVkTWVtb3J5UG9vbDo6c2VhcmNoRm9yTWFwcGVkTWVtb3J5 KHVjaGFyKiBwKQotewotICAgIGZvciAodW5zaWduZWQgbiA9IDA7IG4gPCBtX3Bvb2wuc2l6ZSgp OyArK24pIHsKLSAgICAgICAgTWFwcGVkTWVtb3J5JiBjdXJyZW50ID0gbV9wb29sLmF0KG4pOwot ICAgICAgICBpZiAoY3VycmVudC5kYXRhKCkgPT0gcCkKLSAgICAgICAgICAgIHJldHVybiByZWlu dGVycHJldF9jYXN0PE1hcHBlZE1lbW9yeSo+KCZjdXJyZW50KTsKLSAgICB9Ci0gICAgcmV0dXJu IDA7Ci19Ci0KLU1hcHBlZE1lbW9yeSogTWFwcGVkTWVtb3J5UG9vbDo6bWFwTWVtb3J5KHNpemVf dCBzaXplLCBRSU9EZXZpY2U6Ok9wZW5Nb2RlIG9wZW5Nb2RlKQorTWFwcGVkTWVtb3J5KiBNYXBw ZWRNZW1vcnlQb29sOjptYXBNZW1vcnkoc2l6ZV90IHNpemUpCiB7CiAgICAgZm9yICh1bnNpZ25l ZCBuID0gMDsgbiA8IG1fcG9vbC5zaXplKCk7ICsrbikgewogICAgICAgICBNYXBwZWRNZW1vcnkm IGN1cnJlbnQgPSBtX3Bvb2wuYXQobik7CkBAIC01OSwxMCArNDMsMTEgQEAgTWFwcGVkTWVtb3J5 KiBNYXBwZWRNZW1vcnlQb29sOjptYXBNZW1vcnkoc2l6ZV90IHNpemUsIFFJT0RldmljZTo6T3Bl bk1vZGUgb3Blbk0KICAgICAgICAgICAgIHJldHVybiAmY3VycmVudDsKICAgICAgICAgfQogICAg IH0KKwogICAgIE1hcHBlZE1lbW9yeSBuZXdNYXA7CiAgICAgbmV3TWFwLmRhdGFTaXplID0gc2l6 ZTsKICAgICBuZXdNYXAuZmlsZSA9IG5ldyBRVGVtcG9yYXJ5RmlsZShRRGlyOjp0ZW1wUGF0aCgp ICsgIi9XZWJLaXQyVXBkYXRlQ2h1bmsiKTsKLSAgICBuZXdNYXAuZmlsZS0+b3BlbihvcGVuTW9k ZSk7CisgICAgbmV3TWFwLmZpbGUtPm9wZW4oUUlPRGV2aWNlOjpSZWFkV3JpdGUpOwogICAgIG5l d01hcC5maWxlLT5yZXNpemUobmV3TWFwLm1hcFNpemUoKSk7CiAgICAgbmV3TWFwLm1hcHBlZEJ5 dGVzID0gbmV3TWFwLmZpbGUtPm1hcCgwLCBuZXdNYXAubWFwU2l6ZSgpKTsKICAgICBuZXdNYXAu ZmlsZS0+Y2xvc2UoKTsKQEAgLTcxLDcgKzU2LDcgQEAgTWFwcGVkTWVtb3J5KiBNYXBwZWRNZW1v cnlQb29sOjptYXBNZW1vcnkoc2l6ZV90IHNpemUsIFFJT0RldmljZTo6T3Blbk1vZGUgb3Blbk0K ICAgICByZXR1cm4gJm1fcG9vbC5sYXN0KCk7CiB9CiAKLU1hcHBlZE1lbW9yeSogTWFwcGVkTWVt b3J5UG9vbDo6bWFwRmlsZShRU3RyaW5nIGZpbGVOYW1lLCBzaXplX3Qgc2l6ZSwgUUlPRGV2aWNl OjpPcGVuTW9kZSBvcGVuTW9kZSkKK01hcHBlZE1lbW9yeSogTWFwcGVkTWVtb3J5UG9vbDo6bWFw RmlsZShRU3RyaW5nIGZpbGVOYW1lLCBzaXplX3Qgc2l6ZSkKIHsKICAgICBmb3IgKHVuc2lnbmVk IG4gPSAwOyBuIDwgbV9wb29sLnNpemUoKTsgKytuKSB7CiAgICAgICAgIE1hcHBlZE1lbW9yeSYg Y3VycmVudCA9IG1fcG9vbC5hdChuKTsKQEAgLTgwLDEyICs2NSwxNSBAQCBNYXBwZWRNZW1vcnkq IE1hcHBlZE1lbW9yeVBvb2w6Om1hcEZpbGUoUVN0cmluZyBmaWxlTmFtZSwgc2l6ZV90IHNpemUs IFFJT0RldmljZQogICAgICAgICAgICAgcmV0dXJuICZjdXJyZW50OwogICAgICAgICB9CiAgICAg fQorCiAgICAgTWFwcGVkTWVtb3J5IG5ld01hcDsKICAgICBuZXdNYXAuZmlsZSA9IG5ldyBRRmls ZShmaWxlTmFtZSk7Ci0gICAgaWYgKCFuZXdNYXAuZmlsZS0+b3BlbihvcGVuTW9kZSkpCi0gICAg ICAgIHJldHVybiAwOwogICAgIG5ld01hcC5kYXRhU2l6ZSA9IHNpemU7CisgICAgQVNTRVJUKG5l d01hcC5maWxlLT5leGlzdHMoKSk7CisgICAgQVNTRVJUKG5ld01hcC5maWxlLT5zaXplKCkgPT0g bmV3TWFwLm1hcFNpemUoKSk7CisgICAgbmV3TWFwLmZpbGUtPm9wZW4oUUlPRGV2aWNlOjpSZWFk V3JpdGUpOwogICAgIG5ld01hcC5tYXBwZWRCeXRlcyA9IG5ld01hcC5maWxlLT5tYXAoMCwgbmV3 TWFwLm1hcFNpemUoKSk7CisgICAgQVNTRVJUKG5ld01hcC5tYXBwZWRCeXRlcyk7CiAgICAgQVNT RVJUKCFuZXdNYXAuaXNGcmVlKCkpOwogICAgIG5ld01hcC5maWxlLT5jbG9zZSgpOwogICAgIG5l d01hcC5maWxlLT5yZW1vdmUoKTsgLy8gVGhlIG1hcCBzdGF5cyBhbGl2ZSBldmVuIHdoZW4gdGhl IGZpbGUgaXMgdW5saW5rZWQuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsYXRmb3JtL3F0L01hcHBl ZE1lbW9yeVBvb2wuaCBiL1dlYktpdDIvUGxhdGZvcm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5oCmlu ZGV4IDE0Y2E1OTQzNzkwYmM4YzM5ODdiY2E1ZTIyOTZiZGFkNWI5NTY3YjIuLjUzMGU3ZDA0OGFl NjllNmNiNTg4NzE3NDBlOGVkNmRmODljMDI0ZTcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZv cm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5oCisrKyBiL1dlYktpdDIvUGxhdGZvcm0vcXQvTWFwcGVk TWVtb3J5UG9vbC5oCkBAIC0yOSwzNiArMjksNzAgQEAKICNkZWZpbmUgTWFwcGVkTWVtb3J5UG9v bF9oCiAKICNpbmNsdWRlIDxRRmlsZT4KKyNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAj aW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgTWFw cGVkTWVtb3J5UG9vbDsKKworc3RydWN0IE1hcHBlZE1lbW9yeSB7CisKKyAgICBRRmlsZSogbWFw cGVkRmlsZSgpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gZmlsZTsKKyAgICB9CisKKyAg ICB2b2lkIG1hcmtGcmVlKCkKKyAgICB7CisgICAgICAgIEFTU0VSVChtYXBwZWRCeXRlcyk7Cisg ICAgICAgIGRhdGFQdHItPmlzRnJlZSA9IHRydWU7CisgICAgfQorCisgICAgdWNoYXIqIGRhdGEo KSBjb25zdAorICAgIHsKKyAgICAgICAgQVNTRVJUKG1hcHBlZEJ5dGVzKTsKKyAgICAgICAgcmV0 dXJuIGRhdGFQdHItPmJ5dGVzOworICAgIH0KKworcHJpdmF0ZToKKyAgICBmcmllbmQgY2xhc3Mg TWFwcGVkTWVtb3J5UG9vbDsKKworICAgIE1hcHBlZE1lbW9yeSgpCisgICAgICAgIDogZmlsZSgw KQorICAgICAgICAsIG1hcHBlZEJ5dGVzKDApCisgICAgICAgICwgZGF0YVNpemUoMCkKKyAgICB7 CisgICAgfQorCisgICAgdm9pZCBtYXJrVXNlZCgpIHsgZGF0YVB0ci0+aXNGcmVlID0gZmFsc2U7 IH0KKworICAgIHNpemVfdCBtYXBTaXplKCkgY29uc3QgeyByZXR1cm4gZGF0YVNpemUgKyBzaXpl b2YoRGF0YSk7IH0KKyAgICBib29sIGlzRnJlZSgpIGNvbnN0IHsgcmV0dXJuIGRhdGFQdHItPmlz RnJlZTsgfQorCisgICAgc3RydWN0IERhdGEgeworICAgICAgICB1aW50MzJfdCBpc0ZyZWU7IC8v IGtlZXAgYnl0ZXMgYWxpZ25lZAorICAgICAgICB1Y2hhciBieXRlc1tdOworICAgIH07CisKKyAg ICBRRmlsZSogZmlsZTsKKyAgICB1bmlvbiB7CisgICAgICAgIHVjaGFyKiBtYXBwZWRCeXRlczsK KyAgICAgICAgRGF0YSogZGF0YVB0cjsKKyAgICB9OworICAgIHNpemVfdCBkYXRhU2l6ZTsKK307 CisKIGNsYXNzIE1hcHBlZE1lbW9yeVBvb2wgewogcHVibGljOgotICAgIHN0YXRpYyBNYXBwZWRN ZW1vcnlQb29sKiBpbnN0YW5jZSgpOwotCi0gICAgc3RydWN0IE1hcHBlZE1lbW9yeSB7Ci0gICAg ICAgIFFGaWxlKiBmaWxlOwotICAgICAgICBzdHJ1Y3QgRGF0YSB7Ci0gICAgICAgICAgICB1aW50 MzJfdCBpc0ZyZWU7IC8vIGtlZXAgYnl0ZXMgYWxpZ25lZAotICAgICAgICAgICAgdWNoYXIgYnl0 ZXM7Ci0gICAgICAgIH07Ci0gICAgICAgIHVuaW9uIHsKLSAgICAgICAgICAgIHVjaGFyKiBtYXBw ZWRCeXRlczsKLSAgICAgICAgICAgIERhdGEqIGRhdGFQdHI7Ci0gICAgICAgIH07Ci0gICAgICAg IHNpemVfdCBkYXRhU2l6ZTsKLQotICAgICAgICBzaXplX3QgbWFwU2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIGRhdGFTaXplICsgc2l6ZW9mKERhdGEpOyB9Ci0gICAgICAgIHZvaWQgbWFya1VzZWQoKSB7 IGRhdGFQdHItPmlzRnJlZSA9IGZhbHNlOyB9Ci0gICAgICAgIHZvaWQgbWFya0ZyZWUoKSB7IGRh dGFQdHItPmlzRnJlZSA9IHRydWU7IH0KLSAgICAgICAgYm9vbCBpc0ZyZWUoKSBjb25zdCB7IHJl dHVybiBkYXRhUHRyLT5pc0ZyZWU7IH0KLSAgICAgICAgdWNoYXIqIGRhdGEoKSBjb25zdCB7IHJl dHVybiAmZGF0YVB0ci0+Ynl0ZXM7IH0KLSAgICB9OworICAgIHN0YXRpYyBNYXBwZWRNZW1vcnlQ b29sKiBpbnN0YW5jZSgpCisgICAgeworICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKE1hcHBl ZE1lbW9yeVBvb2wsIHNpbmdsZXRvbiwgKCkpOworICAgICAgICByZXR1cm4gJnNpbmdsZXRvbjsK KyAgICB9CiAKLSAgICBNYXBwZWRNZW1vcnkqIG1hcE1lbW9yeShzaXplX3Qgc2l6ZSwgUUlPRGV2 aWNlOjpPcGVuTW9kZSBvcGVuTW9kZSA9IFFJT0RldmljZTo6UmVhZFdyaXRlKTsKLSAgICBNYXBw ZWRNZW1vcnkqIG1hcEZpbGUoUVN0cmluZyBmaWxlTmFtZSwgc2l6ZV90IHNpemUsIFFJT0Rldmlj ZTo6T3Blbk1vZGUgb3Blbk1vZGUgPSBRSU9EZXZpY2U6OlJlYWRXcml0ZSk7Ci0gICAgTWFwcGVk TWVtb3J5KiBzZWFyY2hGb3JNYXBwZWRNZW1vcnkodWNoYXIqIHApOworICAgIE1hcHBlZE1lbW9y eSogbWFwTWVtb3J5KHNpemVfdCBzaXplKTsKKyAgICBNYXBwZWRNZW1vcnkqIG1hcEZpbGUoUVN0 cmluZyBmaWxlTmFtZSwgc2l6ZV90IHNpemUpOwogCiBwcml2YXRlOgogICAgIE1hcHBlZE1lbW9y eVBvb2woKSB7IH07CkBAIC02Niw4ICsxMDAsNiBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxNYXBw ZWRNZW1vcnk+IG1fcG9vbDsKIH07CiAKLXR5cGVkZWYgTWFwcGVkTWVtb3J5UG9vbDo6TWFwcGVk TWVtb3J5IE1hcHBlZE1lbW9yeTsKLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAv LyBNYXBwZWRNZW1vcnlQb29sX2gKZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL3F0L1VwZGF0 ZUNodW5rLmNwcCBiL1dlYktpdDIvU2hhcmVkL3F0L1VwZGF0ZUNodW5rLmNwcAppbmRleCAzZDJj ZTMxNTY0YTY0YjRjYzM3NDQ5ZWNlMmZlZGZkY2IyMjQ4MTFjLi42MGU1NjQzMTY5ZGVlNGE0MTI3 ZTEwMDNlYTQwYjlkMTg2ZWM3YWU1IDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9xdC9VcGRh dGVDaHVuay5jcHAKKysrIGIvV2ViS2l0Mi9TaGFyZWQvcXQvVXBkYXRlQ2h1bmsuY3BwCkBAIC0y OSw2ICsyOSw3IEBACiAKICNpbmNsdWRlICJBcmd1bWVudERlY29kZXIuaCIKICNpbmNsdWRlICJB cmd1bWVudEVuY29kZXIuaCIKKyNpbmNsdWRlICJNYXBwZWRNZW1vcnlQb29sLmgiCiAjaW5jbHVk ZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAjaW5jbHVkZSA8UUlPRGV2aWNlPgogI2luY2x1 ZGUgPFFJbWFnZT4KQEAgLTQwLDcgKzQxLDYgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRpYyBNYXBwZWRNZW1vcnlQb29sKiBtYXBwZWRNZW1vcnlQ b29sID0gTWFwcGVkTWVtb3J5UG9vbDo6aW5zdGFuY2UoKTsKIAogVXBkYXRlQ2h1bms6OlVwZGF0 ZUNodW5rKCkKICAgICA6IG1fbWFwcGVkTWVtb3J5KDApCkBAIC00OSw3ICs0OSw3IEBAIFVwZGF0 ZUNodW5rOjpVcGRhdGVDaHVuaygpCiAKIFVwZGF0ZUNodW5rOjpVcGRhdGVDaHVuayhjb25zdCBJ bnRSZWN0JiByZWN0KQogICAgIDogbV9yZWN0KHJlY3QpCi0gICAgLCBtX21hcHBlZE1lbW9yeSht YXBwZWRNZW1vcnlQb29sLT5tYXBNZW1vcnkoc2l6ZSgpKSkKKyAgICAsIG1fbWFwcGVkTWVtb3J5 KE1hcHBlZE1lbW9yeVBvb2w6Omluc3RhbmNlKCktPm1hcE1lbW9yeShzaXplKCkpKQogewogfQog CkBAIC01OSw0MCArNTksMzggQEAgVXBkYXRlQ2h1bms6On5VcGRhdGVDaHVuaygpCiAgICAgICAg IG1fbWFwcGVkTWVtb3J5LT5tYXJrRnJlZSgpOwogfQogCi11aW50OF90KiBVcGRhdGVDaHVuazo6 ZGF0YSgpCi17Ci0gICAgQVNTRVJUKG1fbWFwcGVkTWVtb3J5KTsKLSAgICBBU1NFUlQobV9tYXBw ZWRNZW1vcnktPm1hcHBlZEJ5dGVzKTsKLSAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx1aW50 OF90Kj4obV9tYXBwZWRNZW1vcnktPmRhdGEoKSk7Ci19Ci0KIHZvaWQgVXBkYXRlQ2h1bms6OmVu Y29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5j b2Rlci0+ZW5jb2RlKG1fcmVjdCk7Ci0gICAgZW5jb2Rlci0+ZW5jb2RlKFN0cmluZyhtX21hcHBl ZE1lbW9yeS0+ZmlsZS0+ZmlsZU5hbWUoKSkpOworICAgIGVuY29kZXItPmVuY29kZShTdHJpbmco bV9tYXBwZWRNZW1vcnktPm1hcHBlZEZpbGUoKS0+ZmlsZU5hbWUoKSkpOwogCiAgICAgbV9tYXBw ZWRNZW1vcnkgPSAwOwogfQogCiBib29sIFVwZGF0ZUNodW5rOjpkZWNvZGUoQ29yZUlQQzo6QXJn dW1lbnREZWNvZGVyKiBkZWNvZGVyLCBVcGRhdGVDaHVuayYgY2h1bmspCiB7CisgICAgQVNTRVJU X0FSRyhjaHVuaywgY2h1bmsuaXNFbXB0eSgpKTsKKwogICAgIEludFJlY3QgcmVjdDsKICAgICBp ZiAoIWRlY29kZXItPmRlY29kZShyZWN0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNo dW5rLm1fcmVjdCA9IHJlY3Q7CiAKKyAgICBpZiAoY2h1bmsuaXNFbXB0eSgpKQorICAgICAgICBy ZXR1cm4gdHJ1ZTsgLy8gU3VjY2Vzc2Z1bGx5IGRlY29kZWQgZW1wdHkgY2h1bmsuCisKICAgICBT dHJpbmcgZmlsZU5hbWU7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoZmlsZU5hbWUpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBjaHVuay5tX21hcHBlZE1lbW9yeSA9IG1hcHBlZE1l bW9yeVBvb2wtPm1hcEZpbGUoZmlsZU5hbWUsIGNodW5rLnNpemUoKSk7Ci0KLSAgICByZXR1cm4g Y2h1bmsubV9tYXBwZWRNZW1vcnktPm1hcHBlZEJ5dGVzOworICAgIGNodW5rLm1fbWFwcGVkTWVt b3J5ID0gTWFwcGVkTWVtb3J5UG9vbDo6aW5zdGFuY2UoKS0+bWFwRmlsZShmaWxlTmFtZSwgY2h1 bmsuc2l6ZSgpKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAotUUltYWdlIFVwZGF0ZUNodW5rOjpj cmVhdGVJbWFnZSgpCitRSW1hZ2UgVXBkYXRlQ2h1bms6OmNyZWF0ZUltYWdlKCkgY29uc3QKIHsK LSAgICByZXR1cm4gUUltYWdlKGRhdGEoKSwgbV9yZWN0LndpZHRoKCksIG1fcmVjdC5oZWlnaHQo KSwgbV9yZWN0LndpZHRoKCkgKiA0LCBRSW1hZ2U6OkZvcm1hdF9SR0IzMik7CisgICAgQVNTRVJU KG1fbWFwcGVkTWVtb3J5KTsKKyAgICByZXR1cm4gUUltYWdlKG1fbWFwcGVkTWVtb3J5LT5kYXRh KCksIG1fcmVjdC53aWR0aCgpLCBtX3JlY3QuaGVpZ2h0KCksIG1fcmVjdC53aWR0aCgpICogNCwg UUltYWdlOjpGb3JtYXRfUkdCMzIpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1dlYktpdDIvU2hhcmVkL3F0L1VwZGF0ZUNodW5rLmggYi9XZWJLaXQyL1NoYXJlZC9x dC9VcGRhdGVDaHVuay5oCmluZGV4IGJkOGE3ZmEwM2IzN2RmYWM1ZDk2ZmFkOTMxZTVlN2QwMzIz MmIzYzcuLmJkZmQ5YzFiYWM1ODU0NjRjZTRlZmJlNmM4ZmFjYTQ1YTM5MGNkZjggMTAwNjQ0Ci0t LSBhL1dlYktpdDIvU2hhcmVkL3F0L1VwZGF0ZUNodW5rLmgKKysrIGIvV2ViS2l0Mi9TaGFyZWQv cXQvVXBkYXRlQ2h1bmsuaApAQCAtMjcsNyArMjcsNiBAQAogI2lmbmRlZiBVcGRhdGVDaHVua19o CiAjZGVmaW5lIFVwZGF0ZUNodW5rX2gKIAotI2luY2x1ZGUgIk1hcHBlZE1lbW9yeVBvb2wuaCIK ICNpbmNsdWRlIDxRSW1hZ2U+CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+CiAKQEAgLTM4 LDIxICszNywyMiBAQCBjbGFzcyBBcmd1bWVudERlY29kZXI7CiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCitjbGFzcyBNYXBwZWRNZW1vcnk7CisKIGNsYXNzIFVwZGF0ZUNodW5rIHsKIHB1YmxpYzoK ICAgICBVcGRhdGVDaHVuaygpOwogICAgIFVwZGF0ZUNodW5rKGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmKTsKICAgICB+VXBkYXRlQ2h1bmsoKTsKIAotICAgIHVpbnQ4X3QqIGRhdGEoKTsKICAgICBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0OyB9CiAg ICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LmlzRW1wdHkoKTsgfQogCiAg ICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CiAgICAgc3Rh dGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFVwZGF0ZUNodW5rJik7 Ci0gICAgCi0gICAgUUltYWdlIGNyZWF0ZUltYWdlKCk7Ci0gICAgCisKKyAgICBRSW1hZ2UgY3Jl YXRlSW1hZ2UoKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fcmVjdC53aWR0aCgpICogNCAqIG1fcmVjdC5oZWlnaHQoKTsgfQogCg==