167334 2017-01-23 15:29:23 -0800 JSArray::tryCreateUninitialized should be called JSArray::tryCreateForInitializationPrivate 2017-01-24 13:56:19 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo msaboff fpizlo oldest_to_newest 1269228 0 fpizlo 2017-01-23 15:29:23 -0800 Or something that conveys: - It tries to create the array. - It's for initialization (doesn't require realloc to initialize up to the provided length) - It's private to JSArray. 1269229 1 fpizlo 2017-01-23 15:29:44 -0800 rs=me 1269492 2 299618 msaboff 2017-01-24 12:52:10 -0800 Created attachment 299618 Patch for Landing 1269537 3 msaboff 2017-01-24 13:56:19 -0800 Committed r211110: <http://trac.webkit.org/changeset/211110> 299618 2017-01-24 12:52:10 -0800 2017-01-24 12:52:10 -0800 Patch for Landing 167344.patch text/plain 11706 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjExMDkzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE3LTAxLTI0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIEpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQgc2hvdWxkIGJlIGNhbGxlZCBKU0Fy cmF5Ojp0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzMzNAorCisgICAgICAgIFJ1YmJlci1z dGFtcGVkIGJ5IEZpbGlwIFBpemxvLgorCisgICAgICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3Bw OgorICAgICAgICAqIGZ0bC9GVExPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpv cGVyYXRpb25NYXRlcmlhbGl6ZU9iamVjdEluT1NSKToKKyAgICAgICAgKiBydW50aW1lL0FycmF5 UHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6YXJyYXlQcm90b0Z1bmNTcGxpY2UpOgorICAg ICAgICAoSlNDOjphcnJheVByb3RvUHJpdmF0ZUZ1bmNDb25jYXRNZW1jcHkpOgorICAgICAgICAq IHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcDoKKyAgICAgICAgKEpTQzo6U0xPV19QQVRIX0RF Q0wpOgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheS5jcHA6CisgICAgICAgIChKU0M6OkpTQXJy YXk6OnRyeUNyZWF0ZUZvckluaXRpYWxpemF0aW9uUHJpdmF0ZSk6CisgICAgICAgIChKU0M6OkpT QXJyYXk6OmZhc3RTbGljZSk6CisgICAgICAgIChKU0M6OkpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5p dGlhbGl6ZWQpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheS5oOgorICAgICAg ICAoSlNDOjpKU0FycmF5Ojp0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUpOgorICAg ICAgICAoSlNDOjpjb25zdHJ1Y3RBcnJheSk6CisgICAgICAgIChKU0M6OmNvbnN0cnVjdEFycmF5 TmVnYXRpdmVJbmRleGVkKToKKyAgICAgICAgKEpTQzo6SlNBcnJheTo6dHJ5Q3JlYXRlVW5pbml0 aWFsaXplZCk6IERlbGV0ZWQuCisgICAgICAgICogcnVudGltZS9SZWdFeHBNYXRjaGVzQXJyYXku Y3BwOgorICAgICAgICAoSlNDOjpjcmVhdGVFbXB0eVJlZ0V4cE1hdGNoZXNBcnJheSk6CisgICAg ICAgICogcnVudGltZS9SZWdFeHBNYXRjaGVzQXJyYXkuaDoKKyAgICAgICAgKEpTQzo6Y3JlYXRl UmVnRXhwTWF0Y2hlc0FycmF5KToKKwogMjAxNy0wMS0yMyAgTWljaGFlbCBTYWJvZmYgIDxtc2Fi b2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmZlcnJlZFR5cGVUYWJsZSBlbnRyeSBtYW5pcHVs YXRpb24gaXMgbm90IFRPQ1RPVSByYWNlIHNhZmUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAkocmV2aXNpb24gMjExMDkzKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk1 Niw3ICsxOTU2LDcgQEAgSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0FycmF5Vwog ICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBleGVjLT5sZXhpY2FsR2xvYmFsT2Jq ZWN0KCk7CiAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBnbG9iYWxPYmplY3QtPmFycmF5U3Ry dWN0dXJlRm9ySW5kZXhpbmdUeXBlRHVyaW5nQWxsb2NhdGlvbihBcnJheVdpdGhDb250aWd1b3Vz KTsKIAotICAgIEpTQXJyYXkqIHJlc3VsdCA9IEpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6 ZWQodm0sIHN0cnVjdHVyZSwgbGVuZ3RoKTsKKyAgICBKU0FycmF5KiByZXN1bHQgPSBKU0FycmF5 Ojp0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUodm0sIHN0cnVjdHVyZSwgbGVuZ3Ro KTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKIAogICAgIHVuc2ln bmVkIGluZGV4ID0gMDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMT3BlcmF0 aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPcGVy YXRpb25zLmNwcAkocmV2aXNpb24gMjExMDkzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0 bC9GVExPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU1LDcgKzM1NSw3IEBAIGV4 dGVybiAiQyIgSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGkKICAgICAgICAgICAgIFN0cnVj dHVyZSogc3RydWN0dXJlID0gZ2xvYmFsT2JqZWN0LT5yZXN0UGFyYW1ldGVyU3RydWN0dXJlKCk7 CiAgICAgICAgICAgICBBU1NFUlQoYXJndW1lbnRDb3VudCA+IDApOwogICAgICAgICAgICAgdW5z aWduZWQgYXJyYXlTaXplID0gKGFyZ3VtZW50Q291bnQgLSAxKSA+IG51bWJlck9mQXJndW1lbnRz VG9Ta2lwID8gYXJndW1lbnRDb3VudCAtIDEgLSBudW1iZXJPZkFyZ3VtZW50c1RvU2tpcCA6IDA7 Ci0gICAgICAgICAgICBKU0FycmF5KiBhcnJheSA9IEpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlh bGl6ZWQodm0sIHN0cnVjdHVyZSwgYXJyYXlTaXplKTsKKyAgICAgICAgICAgIEpTQXJyYXkqIGFy cmF5ID0gSlNBcnJheTo6dHJ5Q3JlYXRlRm9ySW5pdGlhbGl6YXRpb25Qcml2YXRlKHZtLCBzdHJ1 Y3R1cmUsIGFycmF5U2l6ZSk7CiAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChhcnJheSk7CiAK ICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IG1hdGVyaWFsaXphdGlvbi0+cHJvcGVydGll cygpLnNpemUoKTsgaS0tOykgewpAQCAtNDQ0LDcgKzQ0NCw3IEBAIGV4dGVybiAiQyIgSlNDZWxs KiBKSVRfT1BFUkFUSU9OIG9wZXJhdGkKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAg ICAgIEpTQXJyYXkqIHJlc3VsdCA9IEpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQodm0s IHN0cnVjdHVyZSwgYXJyYXlTaXplKTsKKyAgICAgICAgSlNBcnJheSogcmVzdWx0ID0gSlNBcnJh eTo6dHJ5Q3JlYXRlRm9ySW5pdGlhbGl6YXRpb25Qcml2YXRlKHZtLCBzdHJ1Y3R1cmUsIGFycmF5 U2l6ZSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHJlc3VsdCk7CiAKICNpZiAhQVNTRVJUX0RJ U0FCTEVECkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlw ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJyYXlQ cm90b3R5cGUuY3BwCShyZXZpc2lvbiAyMTEwOTMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNDEsNyArMTA0 MSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgYXJyYXlQcm90b0YKICAgICAgICAg ICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHJlc3VsdCA9IEpTQXJy YXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQodm0sIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3Qo KS0+YXJyYXlTdHJ1Y3R1cmVGb3JJbmRleGluZ1R5cGVEdXJpbmdBbGxvY2F0aW9uKEFycmF5V2l0 aFVuZGVjaWRlZCksIGFjdHVhbERlbGV0ZUNvdW50KTsKKyAgICAgICAgICAgIHJlc3VsdCA9IEpT QXJyYXk6OnRyeUNyZWF0ZUZvckluaXRpYWxpemF0aW9uUHJpdmF0ZSh2bSwgZXhlYy0+bGV4aWNh bEdsb2JhbE9iamVjdCgpLT5hcnJheVN0cnVjdHVyZUZvckluZGV4aW5nVHlwZUR1cmluZ0FsbG9j YXRpb24oQXJyYXlXaXRoVW5kZWNpZGVkKSwgYWN0dWFsRGVsZXRlQ291bnQpOwogICAgICAgICAg ICAgaWYgKCFyZXN1bHQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0 aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYywgc2NvcGUpKTsKICAgICAgICAgICAgIApAQCAtMTI4 Myw3ICsxMjgzLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBhcnJheVByb3RvUAog ICAgIH0KIAogICAgIFN0cnVjdHVyZSogcmVzdWx0U3RydWN0dXJlID0gZXhlYy0+bGV4aWNhbEds b2JhbE9iamVjdCgpLT5hcnJheVN0cnVjdHVyZUZvckluZGV4aW5nVHlwZUR1cmluZ0FsbG9jYXRp b24odHlwZSk7Ci0gICAgSlNBcnJheSogcmVzdWx0ID0gSlNBcnJheTo6dHJ5Q3JlYXRlVW5pbml0 aWFsaXplZCh2bSwgcmVzdWx0U3RydWN0dXJlLCBmaXJzdEFycmF5U2l6ZSArIHNlY29uZEFycmF5 U2l6ZSk7CisgICAgSlNBcnJheSogcmVzdWx0ID0gSlNBcnJheTo6dHJ5Q3JlYXRlRm9ySW5pdGlh bGl6YXRpb25Qcml2YXRlKHZtLCByZXN1bHRTdHJ1Y3R1cmUsIGZpcnN0QXJyYXlTaXplICsgc2Vj b25kQXJyYXlTaXplKTsKICAgICBpZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZSh0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYywgc2NvcGUpKTsKICAgICAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNw cAkocmV2aXNpb24gMjExMDkzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29t bW9uU2xvd1BhdGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwNSw3ICsxMDA1LDcgQEAgU0xP V19QQVRIX0RFQ0woc2xvd19wYXRoX25ld19hcnJheV93aXRoXwogICAgIEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QgPSBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCk7CiAgICAgU3RydWN0 dXJlKiBzdHJ1Y3R1cmUgPSBnbG9iYWxPYmplY3QtPmFycmF5U3RydWN0dXJlRm9ySW5kZXhpbmdU eXBlRHVyaW5nQWxsb2NhdGlvbihBcnJheVdpdGhDb250aWd1b3VzKTsKIAotICAgIEpTQXJyYXkq IHJlc3VsdCA9IEpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQodm0sIHN0cnVjdHVyZSwg YXJyYXlTaXplKTsKKyAgICBKU0FycmF5KiByZXN1bHQgPSBKU0FycmF5Ojp0cnlDcmVhdGVGb3JJ bml0aWFsaXphdGlvblByaXZhdGUodm0sIHN0cnVjdHVyZSwgYXJyYXlTaXplKTsKICAgICBDSEVD S19FWENFUFRJT04oKTsKIAogICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCShyZXZpc2lvbiAyMTEwOTMpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTgsNyArNTgsNyBAQCBCdXR0ZXJmbHkqIGNyZWF0ZUFycmF5QnV0dGVyZmx5SW5EaWN0aW9u CiAgICAgcmV0dXJuIGJ1dHRlcmZseTsKIH0KIAotSlNBcnJheSogSlNBcnJheTo6dHJ5Q3JlYXRl VW5pbml0aWFsaXplZChWTSYgdm0sIEdDRGVmZXJyYWxDb250ZXh0KiBkZWZlcnJhbENvbnRleHQs IFN0cnVjdHVyZSogc3RydWN0dXJlLCB1bnNpZ25lZCBpbml0aWFsTGVuZ3RoKQorSlNBcnJheSog SlNBcnJheTo6dHJ5Q3JlYXRlRm9ySW5pdGlhbGl6YXRpb25Qcml2YXRlKFZNJiB2bSwgR0NEZWZl cnJhbENvbnRleHQqIGRlZmVycmFsQ29udGV4dCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHVuc2ln bmVkIGluaXRpYWxMZW5ndGgpCiB7CiAgICAgaWYgKGluaXRpYWxMZW5ndGggPiBNQVhfU1RPUkFH RV9WRUNUT1JfTEVOR1RIKQogICAgICAgICByZXR1cm4gMDsKQEAgLTg0Niw3ICs4NDYsNyBAQCBK U0FycmF5KiBKU0FycmF5OjpmYXN0U2xpY2UoRXhlY1N0YXRlJiBlCiAgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKIAogICAgICAgICBTdHJ1Y3R1cmUqIHJlc3VsdFN0cnVjdHVyZSA9IGV4ZWMu bGV4aWNhbEdsb2JhbE9iamVjdCgpLT5hcnJheVN0cnVjdHVyZUZvckluZGV4aW5nVHlwZUR1cmlu Z0FsbG9jYXRpb24oYXJyYXlUeXBlKTsKLSAgICAgICAgSlNBcnJheSogcmVzdWx0QXJyYXkgPSBK U0FycmF5Ojp0cnlDcmVhdGVVbmluaXRpYWxpemVkKHZtLCByZXN1bHRTdHJ1Y3R1cmUsIGNvdW50 KTsKKyAgICAgICAgSlNBcnJheSogcmVzdWx0QXJyYXkgPSBKU0FycmF5Ojp0cnlDcmVhdGVGb3JJ bml0aWFsaXphdGlvblByaXZhdGUodm0sIHJlc3VsdFN0cnVjdHVyZSwgY291bnQpOwogICAgICAg ICBpZiAoIXJlc3VsdEFycmF5KQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmgJKHJldmlzaW9uIDIxMTA5MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuaAkod29ya2luZyBjb3B5 KQpAQCAtNTYsNyArNTYsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIEpTQXJyYXkqIGNyZWF0ZShW TSYsIFN0cnVjdHVyZSosIHVuc2lnbmVkIGluaXRpYWxMZW5ndGggPSAwKTsKICAgICBzdGF0aWMg SlNBcnJheSogY3JlYXRlV2l0aEJ1dHRlcmZseShWTSYsIEdDRGVmZXJyYWxDb250ZXh0KiwgU3Ry dWN0dXJlKiwgQnV0dGVyZmx5Kik7CiAKLSAgICAvLyB0cnlDcmVhdGVVbmluaXRpYWxpemVkIGlz IHVzZWQgZm9yIGZhc3QgY29uc3RydWN0aW9uIG9mIGFycmF5cyB3aG9zZSBzaXplIGFuZAorICAg IC8vIHRyeUNyZWF0ZUZvckluaXRpYWxpemF0aW9uUHJpdmF0ZSBpcyB1c2VkIGZvciBmYXN0IGNv bnN0cnVjdGlvbiBvZiBhcnJheXMgd2hvc2Ugc2l6ZSBhbmQKICAgICAvLyBjb250ZW50cyBhcmUg a25vd24gYXQgdGltZSBvZiBjcmVhdGlvbi4gVGhpcyBzaG91bGQgYmUgY29uc2lkZXJlZCBhIHBy aXZhdGUgQVBJLgogICAgIC8vIENsaWVudHMgb2YgdGhpcyBpbnRlcmZhY2UgbXVzdDoKICAgICAv LyAgIC0gbnVsbC1jaGVjayB0aGUgcmVzdWx0IChpbmRpY2F0aW5nIG91dCBvZiBtZW1vcnksIG9y IG90aGVyd2lzZSB1bmFibGUgdG8gYWxsb2NhdGUgdmVjdG9yKS4KQEAgLTY0LDEwICs2NCwxMCBA QCBwdWJsaWM6CiAgICAgLy8gICAtIFByb3ZpZGUgYSB2YWxpZCBHQ0RlZmZlcmFsQ29udGV4dCog aWYgdGhleSBtaWdodCBnYXJiYWdlIGNvbGxlY3Qgd2hlbiBpbml0aWFsaXppbmcgcHJvcGVydGll cywKICAgICAvLyAgICAgb3RoZXJ3aXNlIHRoZSBjYWxsZXIgY2FuIHByb3ZpZGUgYSBudWxsIEdD RGVmZmVyYWxDb250ZXh0Ki4KICAgICAvLwotICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBK U0FycmF5KiB0cnlDcmVhdGVVbmluaXRpYWxpemVkKFZNJiwgR0NEZWZlcnJhbENvbnRleHQqLCBT dHJ1Y3R1cmUqLCB1bnNpZ25lZCBpbml0aWFsTGVuZ3RoKTsKLSAgICBzdGF0aWMgSlNBcnJheSog dHJ5Q3JlYXRlVW5pbml0aWFsaXplZChWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCB1bnNp Z25lZCBpbml0aWFsTGVuZ3RoKQorICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBKU0FycmF5 KiB0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUoVk0mLCBHQ0RlZmVycmFsQ29udGV4 dCosIFN0cnVjdHVyZSosIHVuc2lnbmVkIGluaXRpYWxMZW5ndGgpOworICAgIHN0YXRpYyBKU0Fy cmF5KiB0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUoVk0mIHZtLCBTdHJ1Y3R1cmUq IHN0cnVjdHVyZSwgdW5zaWduZWQgaW5pdGlhbExlbmd0aCkKICAgICB7Ci0gICAgICAgIHJldHVy biB0cnlDcmVhdGVVbmluaXRpYWxpemVkKHZtLCBudWxscHRyLCBzdHJ1Y3R1cmUsIGluaXRpYWxM ZW5ndGgpOworICAgICAgICByZXR1cm4gdHJ5Q3JlYXRlRm9ySW5pdGlhbGl6YXRpb25Qcml2YXRl KHZtLCBudWxscHRyLCBzdHJ1Y3R1cmUsIGluaXRpYWxMZW5ndGgpOwogICAgIH0KIAogICAgIEpT X0VYUE9SVF9QUklWQVRFIHN0YXRpYyBib29sIGRlZmluZU93blByb3BlcnR5KEpTT2JqZWN0Kiwg RXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lLCBjb25zdCBQcm9wZXJ0eURlc2NyaXB0b3ImLCBib29s IHRocm93RXhjZXB0aW9uKTsKQEAgLTI5NSw3ICsyOTUsNyBAQCBpbmxpbmUgSlNBcnJheSogY29u c3RydWN0QXJyYXkoRXhlY1N0YXRlCiB7CiAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICB1 bnNpZ25lZCBsZW5ndGggPSB2YWx1ZXMuc2l6ZSgpOwotICAgIEpTQXJyYXkqIGFycmF5ID0gSlNB cnJheTo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZCh2bSwgYXJyYXlTdHJ1Y3R1cmUsIGxlbmd0aCk7 CisgICAgSlNBcnJheSogYXJyYXkgPSBKU0FycmF5Ojp0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlv blByaXZhdGUodm0sIGFycmF5U3RydWN0dXJlLCBsZW5ndGgpOwogCiAgICAgLy8gRklYTUU6IHdl IHNob3VsZCBwcm9iYWJseSB0aHJvdyBhbiBvdXQgb2YgbWVtb3J5IGVycm9yIGhlcmUsIGJ1dAog ICAgIC8vIHdoZW4gbWFraW5nIHRoaXMgY2hhbmdlIHdlIHNob3VsZCBjaGVjayB0aGF0IGFsbCBj bGllbnRzIG9mIHRoaXMKQEAgLTMxMCw3ICszMTAsNyBAQCBpbmxpbmUgSlNBcnJheSogY29uc3Ry dWN0QXJyYXkoRXhlY1N0YXRlCiBpbmxpbmUgSlNBcnJheSogY29uc3RydWN0QXJyYXkoRXhlY1N0 YXRlKiBleGVjLCBTdHJ1Y3R1cmUqIGFycmF5U3RydWN0dXJlLCBjb25zdCBKU1ZhbHVlKiB2YWx1 ZXMsIHVuc2lnbmVkIGxlbmd0aCkKIHsKICAgICBWTSYgdm0gPSBleGVjLT52bSgpOwotICAgIEpT QXJyYXkqIGFycmF5ID0gSlNBcnJheTo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZCh2bSwgYXJyYXlT dHJ1Y3R1cmUsIGxlbmd0aCk7CisgICAgSlNBcnJheSogYXJyYXkgPSBKU0FycmF5Ojp0cnlDcmVh dGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUodm0sIGFycmF5U3RydWN0dXJlLCBsZW5ndGgpOwog CiAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBwcm9iYWJseSB0aHJvdyBhbiBvdXQgb2YgbWVtb3J5 IGVycm9yIGhlcmUsIGJ1dAogICAgIC8vIHdoZW4gbWFraW5nIHRoaXMgY2hhbmdlIHdlIHNob3Vs ZCBjaGVjayB0aGF0IGFsbCBjbGllbnRzIG9mIHRoaXMKQEAgLTMyNSw3ICszMjUsNyBAQCBpbmxp bmUgSlNBcnJheSogY29uc3RydWN0QXJyYXkoRXhlY1N0YXRlCiBpbmxpbmUgSlNBcnJheSogY29u c3RydWN0QXJyYXlOZWdhdGl2ZUluZGV4ZWQoRXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1cmUqIGFy cmF5U3RydWN0dXJlLCBjb25zdCBKU1ZhbHVlKiB2YWx1ZXMsIHVuc2lnbmVkIGxlbmd0aCkKIHsK ICAgICBWTSYgdm0gPSBleGVjLT52bSgpOwotICAgIEpTQXJyYXkqIGFycmF5ID0gSlNBcnJheTo6 dHJ5Q3JlYXRlVW5pbml0aWFsaXplZCh2bSwgYXJyYXlTdHJ1Y3R1cmUsIGxlbmd0aCk7CisgICAg SlNBcnJheSogYXJyYXkgPSBKU0FycmF5Ojp0cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZh dGUodm0sIGFycmF5U3RydWN0dXJlLCBsZW5ndGgpOwogCiAgICAgLy8gRklYTUU6IHdlIHNob3Vs ZCBwcm9iYWJseSB0aHJvdyBhbiBvdXQgb2YgbWVtb3J5IGVycm9yIGhlcmUsIGJ1dAogICAgIC8v IHdoZW4gbWFraW5nIHRoaXMgY2hhbmdlIHdlIHNob3VsZCBjaGVjayB0aGF0IGFsbCBjbGllbnRz IG9mIHRoaXMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cE1hdGNo ZXNBcnJheS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UmVnRXhwTWF0Y2hlc0FycmF5LmNwcAkocmV2aXNpb24gMjExMDkzKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwTWF0Y2hlc0FycmF5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzksNyArMzksNyBAQCBKU0FycmF5KiBjcmVhdGVFbXB0eVJlZ0V4cE1hdGNoZXNBcnJheShK CiAgICAgR0NEZWZlcnJhbENvbnRleHQgZGVmZXJyYWxDb250ZXh0KHZtLmhlYXApOwogICAgIAog ICAgIGlmIChVTkxJS0VMWShnbG9iYWxPYmplY3QtPmlzSGF2aW5nQUJhZFRpbWUoKSkpIHsKLSAg ICAgICAgYXJyYXkgPSBKU0FycmF5Ojp0cnlDcmVhdGVVbmluaXRpYWxpemVkKHZtLCAmZGVmZXJy YWxDb250ZXh0LCBnbG9iYWxPYmplY3QtPnJlZ0V4cE1hdGNoZXNBcnJheVN0cnVjdHVyZSgpLCBy ZWdFeHAtPm51bVN1YnBhdHRlcm5zKCkgKyAxKTsKKyAgICAgICAgYXJyYXkgPSBKU0FycmF5Ojp0 cnlDcmVhdGVGb3JJbml0aWFsaXphdGlvblByaXZhdGUodm0sICZkZWZlcnJhbENvbnRleHQsIGds b2JhbE9iamVjdC0+cmVnRXhwTWF0Y2hlc0FycmF5U3RydWN0dXJlKCksIHJlZ0V4cC0+bnVtU3Vi cGF0dGVybnMoKSArIDEpOwogICAgICAgICAKICAgICAgICAgYXJyYXktPmluaXRpYWxpemVJbmRl eFdpdGhvdXRCYXJyaWVyKDAsIGpzRW1wdHlTdHJpbmcoJnZtKSk7CiAgICAgICAgIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwTWF0Y2hlc0FycmF5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwTWF0Y2hlc0FycmF5 LmgJKHJldmlzaW9uIDIxMTA5MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Jl Z0V4cE1hdGNoZXNBcnJheS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIEFMV0FZ U19JTkxJTkUgSlNBcnJheSogY3JlYXRlUmVnRXhwTWF0Y2gKICAgICBHQ0RlZmVycmFsQ29udGV4 dCBkZWZlcnJhbENvbnRleHQodm0uaGVhcCk7CiAgICAgCiAgICAgaWYgKFVOTElLRUxZKGdsb2Jh bE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpKSkgewotICAgICAgICBhcnJheSA9IEpTQXJyYXk6 OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQodm0sICZkZWZlcnJhbENvbnRleHQsIGdsb2JhbE9iamVj dC0+cmVnRXhwTWF0Y2hlc0FycmF5U3RydWN0dXJlKCksIG51bVN1YnBhdHRlcm5zICsgMSk7Cisg ICAgICAgIGFycmF5ID0gSlNBcnJheTo6dHJ5Q3JlYXRlRm9ySW5pdGlhbGl6YXRpb25Qcml2YXRl KHZtLCAmZGVmZXJyYWxDb250ZXh0LCBnbG9iYWxPYmplY3QtPnJlZ0V4cE1hdGNoZXNBcnJheVN0 cnVjdHVyZSgpLCBudW1TdWJwYXR0ZXJucyArIDEpOwogICAgICAgICAKICAgICAgICAgc2V0UHJv cGVydGllcygpOwogICAgICAgICAK