190295 2018-10-04 15:16:44 -0700 Move start/EndOfFixedExecutableMemoryPool pointers into the FixedVMPoolExecutableAllocator object. 2018-10-04 17:35:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1466546 0 mark.lam 2018-10-04 15:16:44 -0700 <rdar://problem/19197193> 1466547 1 351636 mark.lam 2018-10-04 15:21:14 -0700 Created attachment 351636 proposed patch. 1466556 2 351639 mark.lam 2018-10-04 15:58:19 -0700 Created attachment 351639 patch for landing. Thanks for the review. 1466582 3 mark.lam 2018-10-04 17:35:48 -0700 Landed in r236864: <http://trac.webkit.org/r236864>. 351636 2018-10-04 15:21:14 -0700 2018-10-04 15:58:19 -0700 proposed patch. bug-190295.patch text/plain 5713 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM2ODU0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE4LTEwLTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN b3ZlIHN0YXJ0L0VuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCBwb2ludGVycyBpbnRvIHRo ZSBGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3Igb2JqZWN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMjk1CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xOTE5NzE5Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byB1c2UgdGhlIHRhZ2dpbmcgbG9naWMgYWxyZWFk eSBiYWtlZCBpbnRvIE1hY3JvQXNzZW1ibGVyQ29kZVB0cgorICAgICAgICBpbnN0ZWFkIG9mIG5l ZWRpbmcgdG8gdXNlIG91ciBvd24gY3VzdG9tIHZlcnNpb24gaGVyZS4KKworICAgICAgICAqIGpp dC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Rml4ZWRWTVBvb2xFeGVj dXRhYmxlQWxsb2NhdG9yOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3IpOgorICAgICAg ICAoSlNDOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3I6Om1lbW9yeVN0YXJ0KToKKyAg ICAgICAgKEpTQzo6Rml4ZWRWTVBvb2xFeGVjdXRhYmxlQWxsb2NhdG9yOjptZW1vcnlFbmQpOgor ICAgICAgICAoSlNDOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3I6OmlzSklUUEMpOgor ICAgICAgICAoSlNDOjpFeGVjdXRhYmxlQWxsb2NhdG9yOjphbGxvY2F0ZSk6CisgICAgICAgIChK U0M6OnN0YXJ0T2ZGaXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sSW1wbCk6CisgICAgICAgIChKU0M6 OmVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbEltcGwpOgorICAgICAgICAoSlNDOjppc0pJ VFBDKToKKyAgICAgICAgKiBqaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5oOgorCiAyMDE4LTEwLTA0 ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIE9wdGlv bnM6OnVzZVdlYkFzc2VtYmx5RmFzdE1lbW9yeSgpIG9uIGxpbnV4IGlmIEFTQU4gc2lnbmFsIGhh bmRsaW5nIGlzIG5vdCBkaXNhYmxlZC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv RXhlY3V0YWJsZUFsbG9jYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcAkocmV2aXNpb24gMjM2ODM4KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTA0LDkgKzEwNCw2IEBAIHN0YXRpYyBjb25zdCBkb3VibGUgZXhlY3V0YWJsZVBv b2xSZXNlcnYKIHN0YXRpYyBjb25zdCBkb3VibGUgZXhlY3V0YWJsZVBvb2xSZXNlcnZhdGlvbkZy YWN0aW9uID0gMC4yNTsKICNlbmRpZgogCi1KU19FWFBPUlRfUFJJVkFURSB2b2lkKiB0YWdnZWRT dGFydE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbDsKLUpTX0VYUE9SVF9QUklWQVRFIHZvaWQq IHRhZ2dlZEVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbDsKLQogI2lmICFFTkFCTEUoRkFT VF9KSVRfUEVSTUlTU0lPTlMpIHx8ICFDUFUoQVJNNjRFKQogSlNfRVhQT1JUX1BSSVZBVEUgYm9v bCB1c2VGYXN0UGVybWlzaW9uc0pJVENvcHkgeyBmYWxzZSB9OwogSlNfRVhQT1JUX1BSSVZBVEUg SklUV3JpdGVTZXBhcmF0ZUhlYXBzRnVuY3Rpb24gaml0V3JpdGVTZXBhcmF0ZUhlYXBzRnVuY3Rp b247CkBAIC0xNjgsMTMgKzE2NSwxOCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBhZGRGcmVzaEZy ZWVTcGFjZShyZXNlcnZhdGlvbkJhc2UsIHJlc2VydmF0aW9uU2l6ZSk7CiAKICAgICAgICAgICAg IHZvaWQqIHJlc2VydmF0aW9uRW5kID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4ocmVzZXJ2 YXRpb25CYXNlKSArIHJlc2VydmF0aW9uU2l6ZTsKLSAgICAgICAgICAgIHRhZ2dlZFN0YXJ0T2ZG aXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sID0gdGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRy VGFnPihyZXNlcnZhdGlvbkJhc2UpOwotICAgICAgICAgICAgdGFnZ2VkRW5kT2ZGaXhlZEV4ZWN1 dGFibGVNZW1vcnlQb29sID0gdGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPihyZXNl cnZhdGlvbkVuZCk7CisKKyAgICAgICAgICAgIG1fbWVtb3J5U3RhcnQgPSBNYWNyb0Fzc2VtYmxl ckNvZGVQdHI8RXhlY3V0YWJsZU1lbW9yeVB0clRhZz4odGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVt b3J5UHRyVGFnPihyZXNlcnZhdGlvbkJhc2UpKTsKKyAgICAgICAgICAgIG1fbWVtb3J5RW5kID0g TWFjcm9Bc3NlbWJsZXJDb2RlUHRyPEV4ZWN1dGFibGVNZW1vcnlQdHJUYWc+KHRhZ0NvZGVQdHI8 RXhlY3V0YWJsZU1lbW9yeVB0clRhZz4ocmVzZXJ2YXRpb25FbmQpKTsKICAgICAgICAgfQogICAg IH0KIAogICAgIHZpcnR1YWwgfkZpeGVkVk1Qb29sRXhlY3V0YWJsZUFsbG9jYXRvcigpOwogCisg ICAgdm9pZCogbWVtb3J5U3RhcnQoKSB7IHJldHVybiBtX21lbW9yeVN0YXJ0LnVudGFnZ2VkRXhl Y3V0YWJsZUFkZHJlc3MoKTsgfQorICAgIHZvaWQqIG1lbW9yeUVuZCgpIHsgcmV0dXJuIG1fbWVt b3J5RW5kLnVudGFnZ2VkRXhlY3V0YWJsZUFkZHJlc3MoKTsgfQorICAgIGJvb2wgaXNKSVRQQyh2 b2lkKiBwYykgeyByZXR1cm4gbWVtb3J5U3RhcnQoKSA8PSBwYyAmJiBwYyA8IG1lbW9yeUVuZCgp OyB9CisKIHByb3RlY3RlZDoKICAgICBGcmVlU3BhY2VQdHIgYWxsb2NhdGVOZXdTcGFjZShzaXpl X3QmKSBvdmVycmlkZQogICAgIHsKQEAgLTM1OCw2ICszNjAsOCBAQCBwcml2YXRlOgogCiBwcml2 YXRlOgogICAgIFBhZ2VSZXNlcnZhdGlvbiBtX3Jlc2VydmF0aW9uOworICAgIE1hY3JvQXNzZW1i bGVyQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPiBtX21lbW9yeVN0YXJ0OworICAgIE1h Y3JvQXNzZW1ibGVyQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPiBtX21lbW9yeUVuZDsK IH07CiAKIHN0YXRpYyBGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3IqIGFsbG9jYXRvcjsK QEAgLTQ2MSwxMiArNDY1LDEwIEBAIFJlZlB0cjxFeGVjdXRhYmxlTWVtb3J5SGFuZGxlPiBFeGVj dXRhYmwKICAgICB9CiAKICNpZiBVU0UoUE9JTlRFUl9QUk9GSUxJTkcpCi0gICAgdm9pZCogc3Rh cnQgPSBzdGFydE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpOwotICAgIHZvaWQqIGVuZCA9 IGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpOworICAgIHZvaWQqIHN0YXJ0ID0gYWxs b2NhdG9yLT5tZW1vcnlTdGFydCgpOworICAgIHZvaWQqIGVuZCA9IGFsbG9jYXRvci0+bWVtb3J5 RW5kKCk7CiAgICAgdm9pZCogcmVzdWx0U3RhcnQgPSByZXN1bHQtPnN0YXJ0KCkudW50YWdnZWRQ dHIoKTsKICAgICB2b2lkKiByZXN1bHRFbmQgPSByZXN1bHQtPmVuZCgpLnVudGFnZ2VkUHRyKCk7 Ci0gICAgUkVMRUFTRV9BU1NFUlQoc3RhcnQgPT0gcmVtb3ZlQ29kZVB0clRhZyh0YWdnZWRTdGFy dE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCkpOwotICAgIFJFTEVBU0VfQVNTRVJUKGVuZCA9 PSByZW1vdmVDb2RlUHRyVGFnKHRhZ2dlZEVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCkp OwogICAgIFJFTEVBU0VfQVNTRVJUKHN0YXJ0IDw9IHJlc3VsdFN0YXJ0ICYmIHJlc3VsdFN0YXJ0 IDwgZW5kKTsKICAgICBSRUxFQVNFX0FTU0VSVChzdGFydCA8IHJlc3VsdEVuZCAmJiByZXN1bHRF bmQgPD0gZW5kKTsKICNlbmRpZgpAQCAtNDk1LDggKzQ5NywyMyBAQCB2b2lkIEV4ZWN1dGFibGVB bGxvY2F0b3I6OmR1bXBQcm9maWxlKCkKIH0KICNlbmRpZgogCit2b2lkKiBzdGFydE9mRml4ZWRF eGVjdXRhYmxlTWVtb3J5UG9vbEltcGwoKQoreworICAgIHJldHVybiBhbGxvY2F0b3ItPm1lbW9y eVN0YXJ0KCk7Cit9CisKK3ZvaWQqIGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbEltcGwo KQoreworICAgIHJldHVybiBhbGxvY2F0b3ItPm1lbW9yeUVuZCgpOworfQorCitib29sIGlzSklU UEModm9pZCogcGMpCit7CisgICAgcmV0dXJuIGFsbG9jYXRvci0+aXNKSVRQQyhwYyk7CiB9CiAK K30gLy8gbmFtZXNwYWNlIEpTQworCiAjZWxzZSAvLyAhRU5BQkxFKEpJVCkKIAogbmFtZXNwYWNl IEpTQyB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVBbGxvY2F0 b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVB bGxvY2F0b3IuaAkocmV2aXNpb24gMjM2ODM4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9FeGVjdXRhYmxlQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDI1ICs2MSwyMiBA QCB0eXBlZGVmIFdURjo6TWV0YUFsbG9jYXRvckhhbmRsZSBFeGVjdXRhCiAKICNpZiBFTkFCTEUo SklUKQogCi1leHRlcm4gSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCogdGFnZ2VkU3RhcnRPZkZpeGVk RXhlY3V0YWJsZU1lbW9yeVBvb2w7Ci1leHRlcm4gSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCogdGFn Z2VkRW5kT2ZGaXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sOwordm9pZCogc3RhcnRPZkZpeGVkRXhl Y3V0YWJsZU1lbW9yeVBvb2xJbXBsKCk7Cit2b2lkKiBlbmRPZkZpeGVkRXhlY3V0YWJsZU1lbW9y eVBvb2xJbXBsKCk7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQgPSB2b2lkKj4KIFQgc3RhcnRPZkZp eGVkRXhlY3V0YWJsZU1lbW9yeVBvb2woKQogewotICAgIHJldHVybiB1bnRhZ0NvZGVQdHI8VCwg RXhlY3V0YWJsZU1lbW9yeVB0clRhZz4odGFnZ2VkU3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9y eVBvb2wpOworICAgIHJldHVybiBiaXR3aXNlX2Nhc3Q8VD4oc3RhcnRPZkZpeGVkRXhlY3V0YWJs ZU1lbW9yeVBvb2xJbXBsKCkpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUID0gdm9pZCo+CiBU IGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpCiB7Ci0gICAgcmV0dXJuIHVudGFnQ29k ZVB0cjxULCBFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPih0YWdnZWRFbmRPZkZpeGVkRXhlY3V0YWJs ZU1lbW9yeVBvb2wpOworICAgIHJldHVybiBiaXR3aXNlX2Nhc3Q8VD4oZW5kT2ZGaXhlZEV4ZWN1 dGFibGVNZW1vcnlQb29sSW1wbCgpKTsKIH0KIAotaW5saW5lIGJvb2wgaXNKSVRQQyh2b2lkKiBw YykKLXsKLSAgICByZXR1cm4gc3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2woKSA8PSBw YyAmJiBwYyA8IGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpOwotfQorYm9vbCBpc0pJ VFBDKHZvaWQqIHBjKTsKIAogI2lmICFFTkFCTEUoRkFTVF9KSVRfUEVSTUlTU0lPTlMpIHx8ICFD UFUoQVJNNjRFKQogCg== 351639 2018-10-04 15:58:19 -0700 2018-10-04 15:58:19 -0700 patch for landing. bug-190295.patch text/plain 5746 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM2ODU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE4LTEwLTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN b3ZlIHN0YXJ0L0VuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCBwb2ludGVycyBpbnRvIHRo ZSBGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3Igb2JqZWN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMjk1CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xOTE5NzE5Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKwor ICAgICAgICBUaGlzIGFsbG93cyB1cyB0byB1c2UgdGhlIHRhZ2dpbmcgbG9naWMgYWxyZWFkeSBi YWtlZCBpbnRvIE1hY3JvQXNzZW1ibGVyQ29kZVB0cgorICAgICAgICBpbnN0ZWFkIG9mIG5lZWRp bmcgdG8gdXNlIG91ciBvd24gY3VzdG9tIHZlcnNpb24gaGVyZS4KKworICAgICAgICAqIGppdC9F eGVjdXRhYmxlQWxsb2NhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Rml4ZWRWTVBvb2xFeGVjdXRh YmxlQWxsb2NhdG9yOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3IpOgorICAgICAgICAo SlNDOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3I6Om1lbW9yeVN0YXJ0KToKKyAgICAg ICAgKEpTQzo6Rml4ZWRWTVBvb2xFeGVjdXRhYmxlQWxsb2NhdG9yOjptZW1vcnlFbmQpOgorICAg ICAgICAoSlNDOjpGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3I6OmlzSklUUEMpOgorICAg ICAgICAoSlNDOjpFeGVjdXRhYmxlQWxsb2NhdG9yOjphbGxvY2F0ZSk6CisgICAgICAgIChKU0M6 OnN0YXJ0T2ZGaXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sSW1wbCk6CisgICAgICAgIChKU0M6OmVu ZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbEltcGwpOgorICAgICAgICAoSlNDOjppc0pJVFBD KToKKyAgICAgICAgKiBqaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5oOgorCiAyMDE4LTEwLTA0ICBN YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIE9wdGlvbnM6 OnVzZVdlYkFzc2VtYmx5RmFzdE1lbW9yeSgpIG9uIGxpbnV4IGlmIEFTQU4gc2lnbmFsIGhhbmRs aW5nIGlzIG5vdCBkaXNhYmxlZC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvRXhl Y3V0YWJsZUFsbG9jYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcAkocmV2aXNpb24gMjM2ODU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDkgKzEwNCw2IEBAIHN0YXRpYyBjb25zdCBkb3VibGUgZXhlY3V0YWJsZVBvb2xS ZXNlcnYKIHN0YXRpYyBjb25zdCBkb3VibGUgZXhlY3V0YWJsZVBvb2xSZXNlcnZhdGlvbkZyYWN0 aW9uID0gMC4yNTsKICNlbmRpZgogCi1KU19FWFBPUlRfUFJJVkFURSB2b2lkKiB0YWdnZWRTdGFy dE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbDsKLUpTX0VYUE9SVF9QUklWQVRFIHZvaWQqIHRh Z2dlZEVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbDsKLQogI2lmICFFTkFCTEUoRkFTVF9K SVRfUEVSTUlTU0lPTlMpIHx8ICFDUFUoQVJNNjRFKQogSlNfRVhQT1JUX1BSSVZBVEUgYm9vbCB1 c2VGYXN0UGVybWlzaW9uc0pJVENvcHkgeyBmYWxzZSB9OwogSlNfRVhQT1JUX1BSSVZBVEUgSklU V3JpdGVTZXBhcmF0ZUhlYXBzRnVuY3Rpb24gaml0V3JpdGVTZXBhcmF0ZUhlYXBzRnVuY3Rpb247 CkBAIC0xNjgsMTMgKzE2NSwxOCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBhZGRGcmVzaEZyZWVT cGFjZShyZXNlcnZhdGlvbkJhc2UsIHJlc2VydmF0aW9uU2l6ZSk7CiAKICAgICAgICAgICAgIHZv aWQqIHJlc2VydmF0aW9uRW5kID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4ocmVzZXJ2YXRp b25CYXNlKSArIHJlc2VydmF0aW9uU2l6ZTsKLSAgICAgICAgICAgIHRhZ2dlZFN0YXJ0T2ZGaXhl ZEV4ZWN1dGFibGVNZW1vcnlQb29sID0gdGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFn PihyZXNlcnZhdGlvbkJhc2UpOwotICAgICAgICAgICAgdGFnZ2VkRW5kT2ZGaXhlZEV4ZWN1dGFi bGVNZW1vcnlQb29sID0gdGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPihyZXNlcnZh dGlvbkVuZCk7CisKKyAgICAgICAgICAgIG1fbWVtb3J5U3RhcnQgPSBNYWNyb0Fzc2VtYmxlckNv ZGVQdHI8RXhlY3V0YWJsZU1lbW9yeVB0clRhZz4odGFnQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5 UHRyVGFnPihyZXNlcnZhdGlvbkJhc2UpKTsKKyAgICAgICAgICAgIG1fbWVtb3J5RW5kID0gTWFj cm9Bc3NlbWJsZXJDb2RlUHRyPEV4ZWN1dGFibGVNZW1vcnlQdHJUYWc+KHRhZ0NvZGVQdHI8RXhl Y3V0YWJsZU1lbW9yeVB0clRhZz4ocmVzZXJ2YXRpb25FbmQpKTsKICAgICAgICAgfQogICAgIH0K IAogICAgIHZpcnR1YWwgfkZpeGVkVk1Qb29sRXhlY3V0YWJsZUFsbG9jYXRvcigpOwogCisgICAg dm9pZCogbWVtb3J5U3RhcnQoKSB7IHJldHVybiBtX21lbW9yeVN0YXJ0LnVudGFnZ2VkRXhlY3V0 YWJsZUFkZHJlc3MoKTsgfQorICAgIHZvaWQqIG1lbW9yeUVuZCgpIHsgcmV0dXJuIG1fbWVtb3J5 RW5kLnVudGFnZ2VkRXhlY3V0YWJsZUFkZHJlc3MoKTsgfQorICAgIGJvb2wgaXNKSVRQQyh2b2lk KiBwYykgeyByZXR1cm4gbWVtb3J5U3RhcnQoKSA8PSBwYyAmJiBwYyA8IG1lbW9yeUVuZCgpOyB9 CisKIHByb3RlY3RlZDoKICAgICBGcmVlU3BhY2VQdHIgYWxsb2NhdGVOZXdTcGFjZShzaXplX3Qm KSBvdmVycmlkZQogICAgIHsKQEAgLTM1OCw2ICszNjAsOCBAQCBwcml2YXRlOgogCiBwcml2YXRl OgogICAgIFBhZ2VSZXNlcnZhdGlvbiBtX3Jlc2VydmF0aW9uOworICAgIE1hY3JvQXNzZW1ibGVy Q29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPiBtX21lbW9yeVN0YXJ0OworICAgIE1hY3Jv QXNzZW1ibGVyQ29kZVB0cjxFeGVjdXRhYmxlTWVtb3J5UHRyVGFnPiBtX21lbW9yeUVuZDsKIH07 CiAKIHN0YXRpYyBGaXhlZFZNUG9vbEV4ZWN1dGFibGVBbGxvY2F0b3IqIGFsbG9jYXRvcjsKQEAg LTQ2MSwxMiArNDY1LDEwIEBAIFJlZlB0cjxFeGVjdXRhYmxlTWVtb3J5SGFuZGxlPiBFeGVjdXRh YmwKICAgICB9CiAKICNpZiBVU0UoUE9JTlRFUl9QUk9GSUxJTkcpCi0gICAgdm9pZCogc3RhcnQg PSBzdGFydE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpOwotICAgIHZvaWQqIGVuZCA9IGVu ZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCgpOworICAgIHZvaWQqIHN0YXJ0ID0gYWxsb2Nh dG9yLT5tZW1vcnlTdGFydCgpOworICAgIHZvaWQqIGVuZCA9IGFsbG9jYXRvci0+bWVtb3J5RW5k KCk7CiAgICAgdm9pZCogcmVzdWx0U3RhcnQgPSByZXN1bHQtPnN0YXJ0KCkudW50YWdnZWRQdHIo KTsKICAgICB2b2lkKiByZXN1bHRFbmQgPSByZXN1bHQtPmVuZCgpLnVudGFnZ2VkUHRyKCk7Ci0g ICAgUkVMRUFTRV9BU1NFUlQoc3RhcnQgPT0gcmVtb3ZlQ29kZVB0clRhZyh0YWdnZWRTdGFydE9m Rml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCkpOwotICAgIFJFTEVBU0VfQVNTRVJUKGVuZCA9PSBy ZW1vdmVDb2RlUHRyVGFnKHRhZ2dlZEVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbCkpOwog ICAgIFJFTEVBU0VfQVNTRVJUKHN0YXJ0IDw9IHJlc3VsdFN0YXJ0ICYmIHJlc3VsdFN0YXJ0IDwg ZW5kKTsKICAgICBSRUxFQVNFX0FTU0VSVChzdGFydCA8IHJlc3VsdEVuZCAmJiByZXN1bHRFbmQg PD0gZW5kKTsKICNlbmRpZgpAQCAtNDk1LDggKzQ5NywyMyBAQCB2b2lkIEV4ZWN1dGFibGVBbGxv Y2F0b3I6OmR1bXBQcm9maWxlKCkKIH0KICNlbmRpZgogCit2b2lkKiBzdGFydE9mRml4ZWRFeGVj dXRhYmxlTWVtb3J5UG9vbEltcGwoKQoreworICAgIHJldHVybiBhbGxvY2F0b3ItPm1lbW9yeVN0 YXJ0KCk7Cit9CisKK3ZvaWQqIGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVtb3J5UG9vbEltcGwoKQor eworICAgIHJldHVybiBhbGxvY2F0b3ItPm1lbW9yeUVuZCgpOworfQorCitib29sIGlzSklUUEMo dm9pZCogcGMpCit7CisgICAgcmV0dXJuIGFsbG9jYXRvci0+aXNKSVRQQyhwYyk7CiB9CiAKK30g Ly8gbmFtZXNwYWNlIEpTQworCiAjZWxzZSAvLyAhRU5BQkxFKEpJVCkKIAogbmFtZXNwYWNlIEpT QyB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVBbGxvY2F0b3Iu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1dGFibGVBbGxv Y2F0b3IuaAkocmV2aXNpb24gMjM2ODU1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9F eGVjdXRhYmxlQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDI1ICs2MSwyMiBAQCB0 eXBlZGVmIFdURjo6TWV0YUFsbG9jYXRvckhhbmRsZSBFeGVjdXRhCiAKICNpZiBFTkFCTEUoSklU KQogCi1leHRlcm4gSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCogdGFnZ2VkU3RhcnRPZkZpeGVkRXhl Y3V0YWJsZU1lbW9yeVBvb2w7Ci1leHRlcm4gSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCogdGFnZ2Vk RW5kT2ZGaXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sOworSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCog c3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2xJbXBsKCk7CitKU19FWFBPUlRfUFJJVkFU RSB2b2lkKiBlbmRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2xJbXBsKCk7CiAKIHRlbXBsYXRl PHR5cGVuYW1lIFQgPSB2b2lkKj4KIFQgc3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2wo KQogewotICAgIHJldHVybiB1bnRhZ0NvZGVQdHI8VCwgRXhlY3V0YWJsZU1lbW9yeVB0clRhZz4o dGFnZ2VkU3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2wpOworICAgIHJldHVybiBiaXR3 aXNlX2Nhc3Q8VD4oc3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2xJbXBsKCkpOwogfQog CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUID0gdm9pZCo+CiBUIGVuZE9mRml4ZWRFeGVjdXRhYmxlTWVt b3J5UG9vbCgpCiB7Ci0gICAgcmV0dXJuIHVudGFnQ29kZVB0cjxULCBFeGVjdXRhYmxlTWVtb3J5 UHRyVGFnPih0YWdnZWRFbmRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2wpOworICAgIHJldHVy biBiaXR3aXNlX2Nhc3Q8VD4oZW5kT2ZGaXhlZEV4ZWN1dGFibGVNZW1vcnlQb29sSW1wbCgpKTsK IH0KIAotaW5saW5lIGJvb2wgaXNKSVRQQyh2b2lkKiBwYykKLXsKLSAgICByZXR1cm4gc3RhcnRP ZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2woKSA8PSBwYyAmJiBwYyA8IGVuZE9mRml4ZWRFeGVj dXRhYmxlTWVtb3J5UG9vbCgpOwotfQorYm9vbCBpc0pJVFBDKHZvaWQqIHBjKTsKIAogI2lmICFF TkFCTEUoRkFTVF9KSVRfUEVSTUlTU0lPTlMpIHx8ICFDUFUoQVJNNjRFKQogCg==