136141 2014-08-21 17:50:02 -0700 r171362 accidentally increased the size of InlineCallFrame 2014-08-21 22:30:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue fpizlo oldest_to_newest 1030607 0 mark.lam 2014-08-21 17:50:02 -0700 r171362 increased the size of InlineCallFrame::kind to 2 bits. This increased the size of InlineCallFrame from 72 to 80 though not intentionally. The fix is to reduce the size of InlineCallFrame::stackOffset to 29 bits. 1030609 1 236948 mark.lam 2014-08-21 17:54:34 -0700 Created attachment 236948 The patch 1030611 2 236948 mark.lam 2014-08-21 17:57:10 -0700 Comment on attachment 236948 The patch View in context: https://bugs.webkit.org/attachment.cgi?id=236948&action=review > Source/JavaScriptCore/bytecode/CodeOrigin.h:164 > + static const int maxStackOffset = (1 << 29) - 1; > + static const int minStackOffset = (~0 << 29); Wrong limits. 1030612 3 236949 mark.lam 2014-08-21 17:58:21 -0700 Created attachment 236949 patch 2: with correct limits 1030620 4 236949 fpizlo 2014-08-21 18:17:46 -0700 Comment on attachment 236949 patch 2: with correct limits View in context: https://bugs.webkit.org/attachment.cgi?id=236949&action=review > Source/JavaScriptCore/bytecode/CodeOrigin.h:207 > + void setStackOffset(signed offset) > + { > + RELEASE_ASSERT(minStackOffset <= offset && offset <= maxStackOffset); > + stackOffset = offset; > + } Why can't this just be: void setStackOffset(signed offset) { stackOffset = offset; RELEASE_ASSERT(static_cast<signed>(stackOffset) == offset); } Then you can get rid of the minStackOffset/maxStackOffset constants. 1030662 5 mark.lam 2014-08-21 21:11:18 -0700 (In reply to comment #4) > Why can't this just be: > > void setStackOffset(signed offset) > { > stackOffset = offset; > RELEASE_ASSERT(static_cast<signed>(stackOffset) == offset); > } > > Then you can get rid of the minStackOffset/maxStackOffset constants. That is an excellent and superior solution. Will fix. 1030665 6 236964 mark.lam 2014-08-21 21:44:29 -0700 Created attachment 236964 patch 3: with better assertion. 1030671 7 236964 commit-queue 2014-08-21 22:30:14 -0700 Comment on attachment 236964 patch 3: with better assertion. Clearing flags on attachment: 236964 Committed r172853: <http://trac.webkit.org/changeset/172853> 1030672 8 commit-queue 2014-08-21 22:30:17 -0700 All reviewed patches have been landed. Closing bug. 236948 2014-08-21 17:54:34 -0700 2014-08-21 17:58:21 -0700 The patch bug-136141.patch text/plain 3475 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyODQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTA4LTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBy MTcxMzYyIGFjY2lkZW50YWxseSBpbmNyZWFzZWQgdGhlIHNpemUgb2YgSW5saW5lQ2FsbEZyYW1l LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM2MTQxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIxNzEzNjIgaW5jcmVhc2VkIHRoZSBz aXplIG9mIElubGluZUNhbGxGcmFtZTo6a2luZCB0byAyIGJpdHMuICBUaGlzIGluY3JlYXNlZAor ICAgICAgICB0aGUgc2l6ZSBvZiBJbmxpbmVDYWxsRnJhbWUgZnJvbSA3MiB0byA4MCB0aG91Z2gg bm90IGludGVudGlvbmFsbHkuICBUaGUgZml4CisgICAgICAgIGlzIHRvIHJlZHVjZSB0aGUgc2l6 ZSBvZiBJbmxpbmVDYWxsRnJhbWU6OnN0YWNrT2Zmc2V0IHRvIDI5IGJpdHMuCisKKyAgICAgICAg QWxzbyBhZGRlZCBhbiBhc3NlcnQgdG8gZW5zdXJlIHRoYXQgd2UgbmV2ZXIgc2V0IGEgdmFsdWUg dGhhdCBleGNlZWRzIHRoZSBzaXplCisgICAgICAgIG9mIElubGluZUNhbGxGcmFtZTo6c3RhY2tP ZmZzZXQuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlT3JpZ2luLmg6CisgICAgICAgIChKU0M6 OklubGluZUNhbGxGcmFtZTo6c2V0U3RhY2tPZmZzZXQpOgorICAgICAgICAqIGRmZy9ERkdCeXRl Q29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OklubGlu ZVN0YWNrRW50cnk6OklubGluZVN0YWNrRW50cnkpOgorCiAyMDE0LTA4LTIxICBNYXJrIExhbSAg PG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzI4MDgpOiBJdCBt YWRlIDYgZGlmZmVyZW50IHRlc3RzIGZhaWwgb24gMzIgYml0IHBsYXRmb3Jtcy4KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlT3JpZ2luLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkocmV2aXNpb24gMTcy ODMwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkod29y a2luZyBjb3B5KQpAQCAtMTU5LDcgKzE1OSwxMCBAQCBzdHJ1Y3QgSW5saW5lQ2FsbEZyYW1lIHsK ICAgICBWYWx1ZVJlY292ZXJ5IGNhbGxlZVJlY292ZXJ5OwogICAgIENvZGVPcmlnaW4gY2FsbGVy OwogICAgIEJpdFZlY3RvciBjYXB0dXJlZFZhcnM7IC8vIEluZGV4ZWQgYnkgdGhlIG1hY2hpbmUg Y2FsbCBmcmFtZSdzIHZhcmlhYmxlIG51bWJlcmluZy4KLSAgICBzaWduZWQgc3RhY2tPZmZzZXQg OiAzMDsKKworICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4U3RhY2tPZmZzZXQgPSAoMSA8PCAyOSkg LSAxOworICAgIHN0YXRpYyBjb25zdCBpbnQgbWluU3RhY2tPZmZzZXQgPSAofjAgPDwgMjkpOwor ICAgIHNpZ25lZCBzdGFja09mZnNldCA6IDI5OwogICAgIHVuc2lnbmVkIGtpbmQgOiAyOyAvLyBy ZWFsIHR5cGUgaXMgS2luZAogICAgIGJvb2wgaXNDbG9zdXJlQ2FsbCA6IDE7IC8vIElmIGZhbHNl IHRoZW4gd2Uga25vdyB0aGF0IGNhbGxlZS9zY29wZSBhcmUgY29uc3RhbnRzIGFuZCB0aGUgREZH IHdvbid0IHRyZWF0IHRoZW0gYXMgdmFyaWFibGVzLCBpLmUuIHRoZXkgaGF2ZSB0byBiZSByZWNv dmVyZWQgbWFudWFsbHkuCiAgICAgVmlydHVhbFJlZ2lzdGVyIGFyZ3VtZW50c1JlZ2lzdGVyOyAv LyBUaGlzIGlzIG9ubHkgc2V0IGlmIHRoZSBjb2RlIHVzZXMgYXJndW1lbnRzLiBUaGUgdW5tb2Rp ZmllZCBhcmd1bWVudHMgcmVnaXN0ZXIgZm9sbG93cyB0aGUgdW5tb2RpZmllZEFyZ3VtZW50c1Jl Z2lzdGVyKCkgY29udmVudGlvbiAoc2VlIENvZGVCbG9jay5oKS4KQEAgLTE5Nyw2ICsyMDAsMTIg QEAgc3RydWN0IElubGluZUNhbGxGcmFtZSB7CiAgICAgCiAgICAgQ29kZUJsb2NrKiBiYXNlbGlu ZUNvZGVCbG9jaygpIGNvbnN0OwogICAgIAorICAgIHZvaWQgc2V0U3RhY2tPZmZzZXQoc2lnbmVk IG9mZnNldCkKKyAgICB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1pblN0YWNrT2Zmc2V0IDw9 IG9mZnNldCAmJiBvZmZzZXQgPD0gbWF4U3RhY2tPZmZzZXQpOworICAgICAgICBzdGFja09mZnNl dCA9IG9mZnNldDsKKyAgICB9CisKICAgICBwdHJkaWZmX3QgY2FsbGVyRnJhbWVPZmZzZXQoKSBj b25zdCB7IHJldHVybiBzdGFja09mZnNldCAqIHNpemVvZihSZWdpc3RlcikgKyBDYWxsRnJhbWU6 OmNhbGxlckZyYW1lT2Zmc2V0KCk7IH0KICAgICBwdHJkaWZmX3QgcmV0dXJuUENPZmZzZXQoKSBj b25zdCB7IHJldHVybiBzdGFja09mZnNldCAqIHNpemVvZihSZWdpc3RlcikgKyBDYWxsRnJhbWU6 OnJldHVyblBDT2Zmc2V0KCk7IH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDE3MjgzMCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNDAzLDcgKzM0MDMsNyBAQCBCeXRlQ29kZVBhcnNlcjo6SW5saW5lU3RhY2tFbnRyeTo6SW5s aW5lCiAgICAgICAgICAgICBtX2lubGluZUNhbGxGcmFtZSwKICAgICAgICAgICAgIGJ5dGVDb2Rl UGFyc2VyLT5tX2NvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCksCiAgICAgICAgICAgICBjb2Rl QmxvY2stPm93bmVyRXhlY3V0YWJsZSgpKTsKLSAgICAgICAgbV9pbmxpbmVDYWxsRnJhbWUtPnN0 YWNrT2Zmc2V0ID0gaW5saW5lQ2FsbEZyYW1lU3RhcnQub2Zmc2V0KCkgLSBKU1N0YWNrOjpDYWxs RnJhbWVIZWFkZXJTaXplOworICAgICAgICBtX2lubGluZUNhbGxGcmFtZS0+c2V0U3RhY2tPZmZz ZXQoaW5saW5lQ2FsbEZyYW1lU3RhcnQub2Zmc2V0KCkgLSBKU1N0YWNrOjpDYWxsRnJhbWVIZWFk ZXJTaXplKTsKICAgICAgICAgaWYgKGNhbGxlZSkgewogICAgICAgICAgICAgbV9pbmxpbmVDYWxs RnJhbWUtPmNhbGxlZVJlY292ZXJ5ID0gVmFsdWVSZWNvdmVyeTo6Y29uc3RhbnQoY2FsbGVlKTsK ICAgICAgICAgICAgIG1faW5saW5lQ2FsbEZyYW1lLT5pc0Nsb3N1cmVDYWxsID0gZmFsc2U7Cg== 236949 2014-08-21 17:58:21 -0700 2014-08-21 21:44:29 -0700 patch 2: with correct limits bug-136141.patch text/plain 3487 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyODQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTA4LTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBy MTcxMzYyIGFjY2lkZW50YWxseSBpbmNyZWFzZWQgdGhlIHNpemUgb2YgSW5saW5lQ2FsbEZyYW1l LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM2MTQxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIxNzEzNjIgaW5jcmVhc2VkIHRoZSBz aXplIG9mIElubGluZUNhbGxGcmFtZTo6a2luZCB0byAyIGJpdHMuICBUaGlzIGluY3JlYXNlZAor ICAgICAgICB0aGUgc2l6ZSBvZiBJbmxpbmVDYWxsRnJhbWUgZnJvbSA3MiB0byA4MCB0aG91Z2gg bm90IGludGVudGlvbmFsbHkuICBUaGUgZml4CisgICAgICAgIGlzIHRvIHJlZHVjZSB0aGUgc2l6 ZSBvZiBJbmxpbmVDYWxsRnJhbWU6OnN0YWNrT2Zmc2V0IHRvIDI5IGJpdHMuCisKKyAgICAgICAg QWxzbyBhZGRlZCBhbiBhc3NlcnQgdG8gZW5zdXJlIHRoYXQgd2UgbmV2ZXIgc2V0IGEgdmFsdWUg dGhhdCBleGNlZWRzIHRoZSBzaXplCisgICAgICAgIG9mIElubGluZUNhbGxGcmFtZTo6c3RhY2tP ZmZzZXQuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlT3JpZ2luLmg6CisgICAgICAgIChKU0M6 OklubGluZUNhbGxGcmFtZTo6c2V0U3RhY2tPZmZzZXQpOgorICAgICAgICAqIGRmZy9ERkdCeXRl Q29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OklubGlu ZVN0YWNrRW50cnk6OklubGluZVN0YWNrRW50cnkpOgorCiAyMDE0LTA4LTIxICBNYXJrIExhbSAg PG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzI4MDgpOiBJdCBt YWRlIDYgZGlmZmVyZW50IHRlc3RzIGZhaWwgb24gMzIgYml0IHBsYXRmb3Jtcy4KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlT3JpZ2luLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkocmV2aXNpb24gMTcy ODMwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkod29y a2luZyBjb3B5KQpAQCAtMTU5LDcgKzE1OSwxMCBAQCBzdHJ1Y3QgSW5saW5lQ2FsbEZyYW1lIHsK ICAgICBWYWx1ZVJlY292ZXJ5IGNhbGxlZVJlY292ZXJ5OwogICAgIENvZGVPcmlnaW4gY2FsbGVy OwogICAgIEJpdFZlY3RvciBjYXB0dXJlZFZhcnM7IC8vIEluZGV4ZWQgYnkgdGhlIG1hY2hpbmUg Y2FsbCBmcmFtZSdzIHZhcmlhYmxlIG51bWJlcmluZy4KLSAgICBzaWduZWQgc3RhY2tPZmZzZXQg OiAzMDsKKworICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4U3RhY2tPZmZzZXQgPSAoMSA8PCAoMjkg LSAxKSkgLSAxOworICAgIHN0YXRpYyBjb25zdCBpbnQgbWluU3RhY2tPZmZzZXQgPSAofjAgPDwg KDI5IC0gMSkpOworICAgIHNpZ25lZCBzdGFja09mZnNldCA6IDI5OwogICAgIHVuc2lnbmVkIGtp bmQgOiAyOyAvLyByZWFsIHR5cGUgaXMgS2luZAogICAgIGJvb2wgaXNDbG9zdXJlQ2FsbCA6IDE7 IC8vIElmIGZhbHNlIHRoZW4gd2Uga25vdyB0aGF0IGNhbGxlZS9zY29wZSBhcmUgY29uc3RhbnRz IGFuZCB0aGUgREZHIHdvbid0IHRyZWF0IHRoZW0gYXMgdmFyaWFibGVzLCBpLmUuIHRoZXkgaGF2 ZSB0byBiZSByZWNvdmVyZWQgbWFudWFsbHkuCiAgICAgVmlydHVhbFJlZ2lzdGVyIGFyZ3VtZW50 c1JlZ2lzdGVyOyAvLyBUaGlzIGlzIG9ubHkgc2V0IGlmIHRoZSBjb2RlIHVzZXMgYXJndW1lbnRz LiBUaGUgdW5tb2RpZmllZCBhcmd1bWVudHMgcmVnaXN0ZXIgZm9sbG93cyB0aGUgdW5tb2RpZmll ZEFyZ3VtZW50c1JlZ2lzdGVyKCkgY29udmVudGlvbiAoc2VlIENvZGVCbG9jay5oKS4KQEAgLTE5 Nyw2ICsyMDAsMTIgQEAgc3RydWN0IElubGluZUNhbGxGcmFtZSB7CiAgICAgCiAgICAgQ29kZUJs b2NrKiBiYXNlbGluZUNvZGVCbG9jaygpIGNvbnN0OwogICAgIAorICAgIHZvaWQgc2V0U3RhY2tP ZmZzZXQoc2lnbmVkIG9mZnNldCkKKyAgICB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1pblN0 YWNrT2Zmc2V0IDw9IG9mZnNldCAmJiBvZmZzZXQgPD0gbWF4U3RhY2tPZmZzZXQpOworICAgICAg ICBzdGFja09mZnNldCA9IG9mZnNldDsKKyAgICB9CisKICAgICBwdHJkaWZmX3QgY2FsbGVyRnJh bWVPZmZzZXQoKSBjb25zdCB7IHJldHVybiBzdGFja09mZnNldCAqIHNpemVvZihSZWdpc3Rlcikg KyBDYWxsRnJhbWU6OmNhbGxlckZyYW1lT2Zmc2V0KCk7IH0KICAgICBwdHJkaWZmX3QgcmV0dXJu UENPZmZzZXQoKSBjb25zdCB7IHJldHVybiBzdGFja09mZnNldCAqIHNpemVvZihSZWdpc3Rlcikg KyBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCk7IH0KIApJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDE3MjgzMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDAzLDcgKzM0MDMsNyBAQCBCeXRlQ29kZVBhcnNlcjo6SW5saW5lU3Rh Y2tFbnRyeTo6SW5saW5lCiAgICAgICAgICAgICBtX2lubGluZUNhbGxGcmFtZSwKICAgICAgICAg ICAgIGJ5dGVDb2RlUGFyc2VyLT5tX2NvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCksCiAgICAg ICAgICAgICBjb2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpKTsKLSAgICAgICAgbV9pbmxpbmVD YWxsRnJhbWUtPnN0YWNrT2Zmc2V0ID0gaW5saW5lQ2FsbEZyYW1lU3RhcnQub2Zmc2V0KCkgLSBK U1N0YWNrOjpDYWxsRnJhbWVIZWFkZXJTaXplOworICAgICAgICBtX2lubGluZUNhbGxGcmFtZS0+ c2V0U3RhY2tPZmZzZXQoaW5saW5lQ2FsbEZyYW1lU3RhcnQub2Zmc2V0KCkgLSBKU1N0YWNrOjpD YWxsRnJhbWVIZWFkZXJTaXplKTsKICAgICAgICAgaWYgKGNhbGxlZSkgewogICAgICAgICAgICAg bV9pbmxpbmVDYWxsRnJhbWUtPmNhbGxlZVJlY292ZXJ5ID0gVmFsdWVSZWNvdmVyeTo6Y29uc3Rh bnQoY2FsbGVlKTsKICAgICAgICAgICAgIG1faW5saW5lQ2FsbEZyYW1lLT5pc0Nsb3N1cmVDYWxs ID0gZmFsc2U7Cg== 236964 2014-08-21 21:44:29 -0700 2014-08-21 22:30:14 -0700 patch 3: with better assertion. bug-136141.patch text/plain 3359 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyODQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTA4LTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBy MTcxMzYyIGFjY2lkZW50YWxseSBpbmNyZWFzZWQgdGhlIHNpemUgb2YgSW5saW5lQ2FsbEZyYW1l LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM2MTQxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIxNzEzNjIgaW5jcmVhc2VkIHRoZSBz aXplIG9mIElubGluZUNhbGxGcmFtZTo6a2luZCB0byAyIGJpdHMuICBUaGlzIGluY3JlYXNlZAor ICAgICAgICB0aGUgc2l6ZSBvZiBJbmxpbmVDYWxsRnJhbWUgZnJvbSA3MiB0byA4MCB0aG91Z2gg bm90IGludGVudGlvbmFsbHkuICBUaGUgZml4CisgICAgICAgIGlzIHRvIHJlZHVjZSB0aGUgc2l6 ZSBvZiBJbmxpbmVDYWxsRnJhbWU6OnN0YWNrT2Zmc2V0IHRvIDI5IGJpdHMuCisKKyAgICAgICAg QWxzbyBhZGRlZCBhbiBhc3NlcnQgdG8gZW5zdXJlIHRoYXQgd2UgbmV2ZXIgc2V0IGEgdmFsdWUg dGhhdCBleGNlZWRzIHRoZSBzaXplCisgICAgICAgIG9mIElubGluZUNhbGxGcmFtZTo6c3RhY2tP ZmZzZXQuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlT3JpZ2luLmg6CisgICAgICAgIChKU0M6 OklubGluZUNhbGxGcmFtZTo6c2V0U3RhY2tPZmZzZXQpOgorICAgICAgICAqIGRmZy9ERkdCeXRl Q29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OklubGlu ZVN0YWNrRW50cnk6OklubGluZVN0YWNrRW50cnkpOgorCiAyMDE0LTA4LTIxICBNYXJrIExhbSAg PG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzI4MDgpOiBJdCBt YWRlIDYgZGlmZmVyZW50IHRlc3RzIGZhaWwgb24gMzIgYml0IHBsYXRmb3Jtcy4KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlT3JpZ2luLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkocmV2aXNpb24gMTcy ODMwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaAkod29y a2luZyBjb3B5KQpAQCAtMTU5LDcgKzE1OSw4IEBAIHN0cnVjdCBJbmxpbmVDYWxsRnJhbWUgewog ICAgIFZhbHVlUmVjb3ZlcnkgY2FsbGVlUmVjb3Zlcnk7CiAgICAgQ29kZU9yaWdpbiBjYWxsZXI7 CiAgICAgQml0VmVjdG9yIGNhcHR1cmVkVmFyczsgLy8gSW5kZXhlZCBieSB0aGUgbWFjaGluZSBj YWxsIGZyYW1lJ3MgdmFyaWFibGUgbnVtYmVyaW5nLgotICAgIHNpZ25lZCBzdGFja09mZnNldCA6 IDMwOworCisgICAgc2lnbmVkIHN0YWNrT2Zmc2V0IDogMjk7CiAgICAgdW5zaWduZWQga2luZCA6 IDI7IC8vIHJlYWwgdHlwZSBpcyBLaW5kCiAgICAgYm9vbCBpc0Nsb3N1cmVDYWxsIDogMTsgLy8g SWYgZmFsc2UgdGhlbiB3ZSBrbm93IHRoYXQgY2FsbGVlL3Njb3BlIGFyZSBjb25zdGFudHMgYW5k IHRoZSBERkcgd29uJ3QgdHJlYXQgdGhlbSBhcyB2YXJpYWJsZXMsIGkuZS4gdGhleSBoYXZlIHRv IGJlIHJlY292ZXJlZCBtYW51YWxseS4KICAgICBWaXJ0dWFsUmVnaXN0ZXIgYXJndW1lbnRzUmVn aXN0ZXI7IC8vIFRoaXMgaXMgb25seSBzZXQgaWYgdGhlIGNvZGUgdXNlcyBhcmd1bWVudHMuIFRo ZSB1bm1vZGlmaWVkIGFyZ3VtZW50cyByZWdpc3RlciBmb2xsb3dzIHRoZSB1bm1vZGlmaWVkQXJn dW1lbnRzUmVnaXN0ZXIoKSBjb252ZW50aW9uIChzZWUgQ29kZUJsb2NrLmgpLgpAQCAtMTk3LDYg KzE5OCwxMiBAQCBzdHJ1Y3QgSW5saW5lQ2FsbEZyYW1lIHsKICAgICAKICAgICBDb2RlQmxvY2sq IGJhc2VsaW5lQ29kZUJsb2NrKCkgY29uc3Q7CiAgICAgCisgICAgdm9pZCBzZXRTdGFja09mZnNl dChzaWduZWQgb2Zmc2V0KQorICAgIHsKKyAgICAgICAgc3RhY2tPZmZzZXQgPSBvZmZzZXQ7Cisg ICAgICAgIFJFTEVBU0VfQVNTRVJUKHN0YXRpY19jYXN0PHNpZ25lZD4oc3RhY2tPZmZzZXQpID09 IG9mZnNldCk7CisgICAgfQorCiAgICAgcHRyZGlmZl90IGNhbGxlckZyYW1lT2Zmc2V0KCkgY29u c3QgeyByZXR1cm4gc3RhY2tPZmZzZXQgKiBzaXplb2YoUmVnaXN0ZXIpICsgQ2FsbEZyYW1lOjpj YWxsZXJGcmFtZU9mZnNldCgpOyB9CiAgICAgcHRyZGlmZl90IHJldHVyblBDT2Zmc2V0KCkgY29u c3QgeyByZXR1cm4gc3RhY2tPZmZzZXQgKiBzaXplb2YoUmVnaXN0ZXIpICsgQ2FsbEZyYW1lOjpy ZXR1cm5QQ09mZnNldCgpOyB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxNzI4MzApCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzQwMyw3ICszNDAzLDcgQEAgQnl0ZUNvZGVQYXJzZXI6OklubGluZVN0YWNrRW50cnk6OklubGlu ZQogICAgICAgICAgICAgbV9pbmxpbmVDYWxsRnJhbWUsCiAgICAgICAgICAgICBieXRlQ29kZVBh cnNlci0+bV9jb2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpLAogICAgICAgICAgICAgY29kZUJs b2NrLT5vd25lckV4ZWN1dGFibGUoKSk7Ci0gICAgICAgIG1faW5saW5lQ2FsbEZyYW1lLT5zdGFj a09mZnNldCA9IGlubGluZUNhbGxGcmFtZVN0YXJ0Lm9mZnNldCgpIC0gSlNTdGFjazo6Q2FsbEZy YW1lSGVhZGVyU2l6ZTsKKyAgICAgICAgbV9pbmxpbmVDYWxsRnJhbWUtPnNldFN0YWNrT2Zmc2V0 KGlubGluZUNhbGxGcmFtZVN0YXJ0Lm9mZnNldCgpIC0gSlNTdGFjazo6Q2FsbEZyYW1lSGVhZGVy U2l6ZSk7CiAgICAgICAgIGlmIChjYWxsZWUpIHsKICAgICAgICAgICAgIG1faW5saW5lQ2FsbEZy YW1lLT5jYWxsZWVSZWNvdmVyeSA9IFZhbHVlUmVjb3Zlcnk6OmNvbnN0YW50KGNhbGxlZSk7CiAg ICAgICAgICAgICBtX2lubGluZUNhbGxGcmFtZS0+aXNDbG9zdXJlQ2FsbCA9IGZhbHNlOwo=