131480 2014-04-09 23:37:04 -0700 REGRESSION (r166860): ASSERTION FAILED: !isCalculated() on fast/css/image-set-value-not-removed-crash.html 2015-12-08 14:06:46 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ap darin bfulgham commit-queue darin esprehn+autocc glenn gyuyoung.kim kling macpherson menard rniwa oldest_to_newest 999451 0 ap 2014-04-09 23:37:04 -0700 Starting with <http://trac.webkit.org/r166860>, debug WK1 bots are hitting an assertion almost every time: ASSERTION FAILED: !isCalculated() /Volumes/Data/slave/mountainlion-debug/build/Source/WebCore/platform/Length.h(246) : float WebCore::Length::value() const 1 0x10bccc0c0 WTFCrash 2 0x10d71b619 WebCore::Length::value() const 3 0x10d9cae02 WebCore::valueForNinePieceImageSlice(WebCore::NinePieceImage const&) 4 0x10d9c37d6 WebCore::ComputedStyleExtractor::propertyValue(WebCore::CSSPropertyID, WebCore::EUpdateLayout) const 5 0x10d9cd7fe WebCore::ComputedStyleExtractor::copyPropertiesInSet(WebCore::CSSPropertyID const*, unsigned int) const 6 0x10d9c6ef8 WebCore::ComputedStyleExtractor::copyProperties() const 7 0x10dd3da81 WebCore::copyPropertiesFromComputedStyle(WebCore::ComputedStyleExtractor&, WebCore::EditingStyle::PropertiesToInclude) 8 0x10dd3d345 WebCore::EditingStyle::init(WebCore::Node*, WebCore::EditingStyle::PropertiesToInclude) 9 0x10dd3d23b WebCore::EditingStyle::EditingStyle(WebCore::Node*, WebCore::EditingStyle::PropertiesToInclude) 10 0x10dd3d1d3 WebCore::EditingStyle::EditingStyle(WebCore::Node*, WebCore::EditingStyle::PropertiesToInclude) 11 0x10d7cc8ff WebCore::EditingStyle::create(WebCore::Node*, WebCore::EditingStyle::PropertiesToInclude) 12 0x10dd3f135 WebCore::EditingStyle::styleAtSelectionStart(WebCore::VisibleSelection const&, bool) 13 0x10dd500c8 WebCore::Editor::selectionStartHasStyle(WebCore::CSSPropertyID, WTF::String const&) const 14 0x10dd69d6d WebCore::executeToggleStyle(WebCore::Frame&, WebCore::EditorCommandSource, WebCore::EditAction, WebCore::CSSPropertyID, char const*, char const*) 999453 1 ap 2014-04-09 23:40:38 -0700 Skipped the test in debug builds in <http://trac.webkit.org/r167070>. 999676 2 darin 2014-04-10 16:09:01 -0700 What’s new here is the assertion. The bug isn’t new. I’ll fix this. 999924 3 darin 2014-04-11 10:41:47 -0700 I wonder why it’s *almost* every time instead of every time. 999926 4 darin 2014-04-11 10:42:49 -0700 It’s bizarre; this test case does not involve calculated values. I wonder how a calculated value gets in there. 999931 5 ap 2014-04-11 10:49:20 -0700 FWIW, it's reproducible for me locally. 999932 6 ap 2014-04-11 10:50:56 -0700 Looking at the flakiness dashboard results more closely, I think that it's actually every time - some of the runs are shown as timeouts, but I'm pretty certain that it's a tools bug, and we just fail to detect a crash that happened. 1000194 7 darin 2014-04-12 10:07:37 -0700 The calculation here is created as part of animation. We are animating from the value 26829% to the value 2, so during the animation the current value of the property is a combination of both. The CSSComputedStyle code doesn’t know how to serialize something that is neither a percentage nor a number. I imagine there are a lot more cases like this in computed style. 1000195 8 darin 2014-04-12 10:08:04 -0700 Because the code depends on the timing of the animation, I imagine it won’t always crash the same way every time. 1000203 9 229209 darin 2014-04-12 12:02:42 -0700 Created attachment 229209 Patch 1000250 10 229209 kling 2014-04-12 22:05:08 -0700 Comment on attachment 229209 Patch r=me, but you should also unskip the test. 1000271 11 darin 2014-04-13 01:06:25 -0700 Committed r167192: <http://trac.webkit.org/changeset/167192> 1147462 12 bfulgham 2015-12-08 13:57:36 -0800 Part of the fix for CVE-2014-4410. 229209 2014-04-12 12:02:42 -0700 2014-04-12 22:05:08 -0700 Patch bug-131480-20140412120239.patch text/plain 10220 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRlZDU1ZTc3ZWM4YTNi MDU4NDk0MTZiZTZjMmYwOGEyZjUzYzVmMi4uZGY5MzU2N2E1M2FhZDNkYmJiZTlhMzcyNjE1ZTEw NmNhY2I0YmZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTY2ODYw KTogQVNTRVJUSU9OIEZBSUxFRDogIWlzQ2FsY3VsYXRlZCgpIG9uIGZhc3QvY3NzL2ltYWdlLXNl dC12YWx1ZS1ub3QtcmVtb3ZlZC1jcmFzaC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE0ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBpbnRlcm1pdHRlbnQgYXNzZXJ0aW9uIGZhaWx1 cmUgaW4gZmFzdC9jc3MvaW1hZ2Utc2V0LXZhbHVlLW5vdC1yZW1vdmVkLWNyYXNoLmh0bWwuCisK KyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnZhbHVlRm9ySW1hZ2VTbGljZVNpZGUpOiBBZGRlZC4gSGVscGVyIHVzZWQgYmVs b3cgaW4gdmFsdWVGb3JOaW5lUGllY2VJbWFnZVNsaWNlLgorICAgICAgICBIYW5kbGVzIGNhbGN1 bGF0ZWQgdmFsdWVzIGJ5IHJldHVybmluZyAwOyBpbmNvcnJlY3QgYnV0IHByZWRpY3RhYmxlLgor ICAgICAgICAoV2ViQ29yZTo6dmFsdWVGb3JOaW5lUGllY2VJbWFnZVNsaWNlKTogVXBkYXRlZCB0 byBjYWxsIHZhbHVlRm9ySW1hZ2VTbGljZVNpZGUuCisgICAgICAgIChXZWJDb3JlOjpwb3NpdGlv bk9mZnNldFZhbHVlKTogVXNlIG51bGxwdHIuCisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlZFN0 eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKTogVXBkYXRlZCB0byBjYWxsIHBvc2l0aW9uT2Zm c2V0VmFsdWUKKyAgICAgICAgYnkgaXRzIG5ldyBuYW1lLiBSZW1vdmVkICJnZXQiIGZyb20gdGhl IG5hbWUuCisgICAgICAgIChXZWJDb3JlOjpwb3NpdGlvbk9mZnNldFZhbHVlKTogUmVuYW1lZCBm cm9tIGdldFBvc2l0aW9uT2Zmc2V0VmFsdWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9MZW5ndGgu aDogTWFkZSBpc0NhbGN1bGF0ZWQgcHVibGljLgorCiAyMDE0LTA0LTExICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIE5vZGVMaXN0Lmxlbmd0aCBpbmxp bmUtY2FjaGVhYmxlIGJ5IEpTQy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggZWY1MGQ4MmJiOTFmZTRkNjU0M2FkOTNkNTU0 ZmQ1ZTdlZTljOTRiYy4uMTUzNWM2MDYxNTY5M2E4NmM0ZDdkNDIyMjYxNmQ2ZWMwYzdjYzdkMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHAKQEAgLTQ0Nyw2MiArNDQ3LDYzIEBAIHN0YXRpYyBDU1NWYWx1ZUlEIHZhbHVlRm9yUmVw ZWF0UnVsZShpbnQgcnVsZSkKICAgICB9CiB9CiAKK3N0YXRpYyBQYXNzUmVmUHRyPENTU1ByaW1p dGl2ZVZhbHVlPiB2YWx1ZUZvckltYWdlU2xpY2VTaWRlKGNvbnN0IExlbmd0aCYgbGVuZ3RoKQor eworICAgIC8vIFRoZXNlIHZhbHVlcyBjYW4gYmUgcGVyY2VudGFnZXMsIG51bWJlcnMsIG9yIHdo aWxlIGFuIGFuaW1hdGlvbiBvZiBtaXhlZCB0eXBlcyBpcyBpbiBwcm9ncmVzcywKKyAgICAvLyBh IGNhbGN1bGF0aW9uIHRoYXQgY29tYmluZXMgYSBwZXJjZW50YWdlIGFuZCBhIG51bWJlci4KKyAg ICBpZiAobGVuZ3RoLmlzUGVyY2VudE5vdENhbGN1bGF0ZWQoKSkKKyAgICAgICAgcmV0dXJuIGNz c1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGxlbmd0aC5wZXJjZW50KCksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUEVSQ0VOVEFHRSk7CisgICAgaWYgKGxlbmd0aC5pc0ZpeGVkKCkpCisgICAgICAg IHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShsZW5ndGgudmFsdWUoKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpOworCisgICAgLy8gQ2FsY3VsYXRpbmcgdGhlIGFjdHVh bCBsZW5ndGggY3VycmVudGx5IGluIHVzZSB3b3VsZCByZXF1aXJlIG1vc3Qgb2YgdGhlIGNvZGUg ZnJvbSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZS4KKyAgICAvLyBB bmQgZXZlbiBpZiB3ZSBjb3VsZCBkbyB0aGF0LCBpdCdzIG5vdCBjbGVhciBpZiB0aGF0J3MgZXhh Y3RseSB3aGF0IHdlJ2Qgd2FudCBkdXJpbmcgYW5pbWF0aW9uLgorICAgIC8vIEZJWE1FOiBGb3Ig bm93LCBqdXN0IHJldHVybiAwLgorICAgIEFTU0VSVChsZW5ndGguaXNDYWxjdWxhdGVkKCkpOwor ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSgwLCBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX05VTUJFUik7Cit9CisKIHN0YXRpYyBQYXNzUmVmUHRyPENTU0JvcmRlckltYWdlU2xp Y2VWYWx1ZT4gdmFsdWVGb3JOaW5lUGllY2VJbWFnZVNsaWNlKGNvbnN0IE5pbmVQaWVjZUltYWdl JiBpbWFnZSkKIHsKLSAgICAvLyBDcmVhdGUgdGhlIHNsaWNlcy4KLSAgICBSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IHRvcDsKKyAgICBhdXRvJiBzbGljZXMgPSBpbWFnZS5pbWFnZVNsaWNlcygp OworCisgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB0b3AgPSB2YWx1ZUZvckltYWdlU2xp Y2VTaWRlKHNsaWNlcy50b3AoKSk7CisKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHJp Z2h0OwogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gYm90dG9tOwogICAgIFJlZlB0cjxD U1NQcmltaXRpdmVWYWx1ZT4gbGVmdDsKIAotICAgIGlmIChpbWFnZS5pbWFnZVNsaWNlcygpLnRv cCgpLmlzUGVyY2VudCgpKQotICAgICAgICB0b3AgPSBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1 ZShpbWFnZS5pbWFnZVNsaWNlcygpLnRvcCgpLnZhbHVlKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpD U1NfUEVSQ0VOVEFHRSk7Ci0gICAgZWxzZQotICAgICAgICB0b3AgPSBjc3NWYWx1ZVBvb2woKS5j cmVhdGVWYWx1ZShpbWFnZS5pbWFnZVNsaWNlcygpLnRvcCgpLnZhbHVlKCksIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfTlVNQkVSKTsKLQotICAgIGlmIChpbWFnZS5pbWFnZVNsaWNlcygpLnJpZ2h0 KCkgPT0gaW1hZ2UuaW1hZ2VTbGljZXMoKS50b3AoKSAmJiBpbWFnZS5pbWFnZVNsaWNlcygpLmJv dHRvbSgpID09IGltYWdlLmltYWdlU2xpY2VzKCkudG9wKCkKLSAgICAgICAgJiYgaW1hZ2UuaW1h Z2VTbGljZXMoKS5sZWZ0KCkgPT0gaW1hZ2UuaW1hZ2VTbGljZXMoKS50b3AoKSkgeworICAgIGlm IChzbGljZXMucmlnaHQoKSA9PSBzbGljZXMudG9wKCkgJiYgc2xpY2VzLmJvdHRvbSgpID09IHNs aWNlcy50b3AoKSAmJiBzbGljZXMubGVmdCgpID09IHNsaWNlcy50b3AoKSkgewogICAgICAgICBy aWdodCA9IHRvcDsKICAgICAgICAgYm90dG9tID0gdG9wOwogICAgICAgICBsZWZ0ID0gdG9wOwog ICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChpbWFnZS5pbWFnZVNsaWNlcygpLnJpZ2h0KCkuaXNQ ZXJjZW50KCkpCi0gICAgICAgICAgICByaWdodCA9IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVl KGltYWdlLmltYWdlU2xpY2VzKCkucmlnaHQoKS52YWx1ZSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTX1BFUkNFTlRBR0UpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByaWdodCA9IGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGltYWdlLmltYWdlU2xpY2VzKCkucmlnaHQoKS52YWx1ZSgp LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUik7CisgICAgICAgIHJpZ2h0ID0gdmFsdWVG b3JJbWFnZVNsaWNlU2lkZShzbGljZXMucmlnaHQoKSk7CiAKLSAgICAgICAgaWYgKGltYWdlLmlt YWdlU2xpY2VzKCkuYm90dG9tKCkgPT0gaW1hZ2UuaW1hZ2VTbGljZXMoKS50b3AoKSAmJiBpbWFn ZS5pbWFnZVNsaWNlcygpLnJpZ2h0KCkgPT0gaW1hZ2UuaW1hZ2VTbGljZXMoKS5sZWZ0KCkpIHsK KyAgICAgICAgaWYgKHNsaWNlcy5ib3R0b20oKSA9PSBzbGljZXMudG9wKCkgJiYgc2xpY2VzLnJp Z2h0KCkgPT0gc2xpY2VzLmxlZnQoKSkgewogICAgICAgICAgICAgYm90dG9tID0gdG9wOwogICAg ICAgICAgICAgbGVmdCA9IHJpZ2h0OwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYg KGltYWdlLmltYWdlU2xpY2VzKCkuYm90dG9tKCkuaXNQZXJjZW50KCkpCi0gICAgICAgICAgICAg ICAgYm90dG9tID0gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoaW1hZ2UuaW1hZ2VTbGljZXMo KS5ib3R0b20oKS52YWx1ZSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwot ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGJvdHRvbSA9IGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZVZhbHVlKGltYWdlLmltYWdlU2xpY2VzKCkuYm90dG9tKCkudmFsdWUoKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpOworICAgICAgICAgICAgYm90dG9tID0gdmFsdWVGb3JJ bWFnZVNsaWNlU2lkZShzbGljZXMuYm90dG9tKCkpOwogCi0gICAgICAgICAgICBpZiAoaW1hZ2Uu aW1hZ2VTbGljZXMoKS5sZWZ0KCkgPT0gaW1hZ2UuaW1hZ2VTbGljZXMoKS5yaWdodCgpKQorICAg ICAgICAgICAgaWYgKHNsaWNlcy5sZWZ0KCkgPT0gc2xpY2VzLnJpZ2h0KCkpCiAgICAgICAgICAg ICAgICAgbGVmdCA9IHJpZ2h0OwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAg aWYgKGltYWdlLmltYWdlU2xpY2VzKCkubGVmdCgpLmlzUGVyY2VudCgpKQotICAgICAgICAgICAg ICAgICAgICBsZWZ0ID0gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoaW1hZ2UuaW1hZ2VTbGlj ZXMoKS5sZWZ0KCkudmFsdWUoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsK LSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGxlZnQgPSBjc3NWYWx1 ZVBvb2woKS5jcmVhdGVWYWx1ZShpbWFnZS5pbWFnZVNsaWNlcygpLmxlZnQoKS52YWx1ZSgpLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgbGVmdCA9IHZhbHVlRm9ySW1hZ2VTbGljZVNpZGUoc2xp Y2VzLmxlZnQoKSk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBSZWZQdHI8UXVhZD4gcXVhZCA9 IFF1YWQ6OmNyZWF0ZSgpOwotICAgIHF1YWQtPnNldFRvcCh0b3ApOwotICAgIHF1YWQtPnNldFJp Z2h0KHJpZ2h0KTsKLSAgICBxdWFkLT5zZXRCb3R0b20oYm90dG9tKTsKLSAgICBxdWFkLT5zZXRM ZWZ0KGxlZnQpOworICAgIHF1YWQtPnNldFRvcCh0b3AucmVsZWFzZSgpKTsKKyAgICBxdWFkLT5z ZXRSaWdodChyaWdodC5yZWxlYXNlKCkpOworICAgIHF1YWQtPnNldEJvdHRvbShib3R0b20ucmVs ZWFzZSgpKTsKKyAgICBxdWFkLT5zZXRMZWZ0KGxlZnQucmVsZWFzZSgpKTsKIAogICAgIHJldHVy biBDU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWU6OmNyZWF0ZShjc3NWYWx1ZVBvb2woKS5jcmVhdGVW YWx1ZShxdWFkLnJlbGVhc2UoKSksIGltYWdlLmZpbGwoKSk7CiB9CiAKIHN0YXRpYyBQYXNzUmVm UHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB2YWx1ZUZvck5pbmVQaWVjZUltYWdlUXVhZChjb25zdCBM ZW5ndGhCb3gmIGJveCkKIHsKLSAgICAvLyBDcmVhdGUgdGhlIHNsaWNlcy4KICAgICBSZWZQdHI8 Q1NTUHJpbWl0aXZlVmFsdWU+IHRvcDsKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHJp Z2h0OwogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gYm90dG9tOwpAQCAtNjUzLDEwICs2 NTQsMTAgQEAgc3RhdGljIFBhc3NSZWY8Q1NTVmFsdWVMaXN0PiBjcmVhdGVQb3NpdGlvbkxpc3RG b3JMYXllcihDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQKICAgICByZXR1cm4gcG9zaXRpb25MaXN0 OwogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gZ2V0UG9zaXRpb25PZmZzZXRWYWx1 ZShSZW5kZXJTdHlsZSogc3R5bGUsIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgUmVuZGVyVmll dyogcmVuZGVyVmlldykKK3N0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlPiBwb3NpdGlvbk9mZnNl dFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBSZW5k ZXJWaWV3KiByZW5kZXJWaWV3KQogewogICAgIGlmICghc3R5bGUpCi0gICAgICAgIHJldHVybiAw OworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIExlbmd0aCBsOwogICAgIHN3aXRjaCAo cHJvcGVydHlJRCkgewpAQCAtNjczLDcgKzY3NCw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1Zh bHVlPiBnZXRQb3NpdGlvbk9mZnNldFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgQ1NTUHJvcGVy CiAgICAgICAgICAgICBsID0gc3R5bGUtPmJvdHRvbSgpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIH0KIAogICAgIGlmIChzdHlsZS0+aGFzT3V0T2ZGbG93UG9zaXRpb24o KSkgewpAQCAtMTM3Nyw2ICsxMzc4LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGZp bGxTb3VyY2VUeXBlVG9DU1NWYWx1ZShFTWFza1NvdXJjZVR5cGUgdHlwZSkKIAogICAgIHJldHVy biAwOwogfQorCiBzdGF0aWMgUGFzc1JlZjxDU1NWYWx1ZT4gZmlsbFNpemVUb0NTU1ZhbHVlKGNv bnN0IEZpbGxTaXplJiBmaWxsU2l6ZSwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKQogewogICAg IGlmIChmaWxsU2l6ZS50eXBlID09IENvbnRhaW4pCkBAIC0xODc2LDcgKzE4NzgsNyBAQCBQYXNz UmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENT U1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyTGVmdFdp ZHRoOgogICAgICAgICAgICAgcmV0dXJuIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUoc3R5bGUtPmJv cmRlckxlZnRXaWR0aCgpLCBzdHlsZS5nZXQoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlC b3R0b206Ci0gICAgICAgICAgICByZXR1cm4gZ2V0UG9zaXRpb25PZmZzZXRWYWx1ZShzdHlsZS5n ZXQoKSwgQ1NTUHJvcGVydHlCb3R0b20sIG1fbm9kZS0+ZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkp OworICAgICAgICAgICAgcmV0dXJuIHBvc2l0aW9uT2Zmc2V0VmFsdWUoc3R5bGUuZ2V0KCksIENT U1Byb3BlcnR5Qm90dG9tLCBtX25vZGUtPmRvY3VtZW50KCkucmVuZGVyVmlldygpKTsKICAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJveEFsaWduOgogICAgICAgICAgICAgcmV0dXJuIGNz c1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5ib3hBbGlnbigpKTsKICNpZiBFTkFCTEUo Q1NTX0JPWF9ERUNPUkFUSU9OX0JSRUFLKQpAQCAtMjEzNSw3ICsyMTM3LDcgQEAgUGFzc1JlZlB0 cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9w ZXJ0eUlEIHByb3BlcnQKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVW YWx1ZShzdHlsZS0+aW1hZ2VSZXNvbHV0aW9uKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfRFBQ WCk7CiAjZW5kaWYKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUxlZnQ6Ci0gICAgICAgICAgICBy ZXR1cm4gZ2V0UG9zaXRpb25PZmZzZXRWYWx1ZShzdHlsZS5nZXQoKSwgQ1NTUHJvcGVydHlMZWZ0 LCBtX25vZGUtPmRvY3VtZW50KCkucmVuZGVyVmlldygpKTsKKyAgICAgICAgICAgIHJldHVybiBw b3NpdGlvbk9mZnNldFZhbHVlKHN0eWxlLmdldCgpLCBDU1NQcm9wZXJ0eUxlZnQsIG1fbm9kZS0+ ZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5TGV0dGVy U3BhY2luZzoKICAgICAgICAgICAgIGlmICghc3R5bGUtPmxldHRlclNwYWNpbmcoKSkKICAgICAg ICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT U1ZhbHVlTm9ybWFsKTsKQEAgLTIyNjAsNyArMjI2Miw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+ IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlQb3NpdGlvbjoKICAgICAgICAgICAgIHJldHVy biBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+cG9zaXRpb24oKSk7CiAgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlSaWdodDoKLSAgICAgICAgICAgIHJldHVybiBnZXRQb3NpdGlvbk9m ZnNldFZhbHVlKHN0eWxlLmdldCgpLCBDU1NQcm9wZXJ0eVJpZ2h0LCBtX25vZGUtPmRvY3VtZW50 KCkucmVuZGVyVmlldygpKTsKKyAgICAgICAgICAgIHJldHVybiBwb3NpdGlvbk9mZnNldFZhbHVl KHN0eWxlLmdldCgpLCBDU1NQcm9wZXJ0eVJpZ2h0LCBtX25vZGUtPmRvY3VtZW50KCkucmVuZGVy VmlldygpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJ1YnlQb3NpdGlvbjoKICAg ICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+cnVieVBv c2l0aW9uKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5VGFibGVMYXlvdXQ6CkBAIC0yMzYx LDcgKzIzNjMsNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9y Ojpwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICBjYXNlIENTU1By b3BlcnR5VGV4dFRyYW5zZm9ybToKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5j cmVhdGVWYWx1ZShzdHlsZS0+dGV4dFRyYW5zZm9ybSgpKTsKICAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eVRvcDoKLSAgICAgICAgICAgIHJldHVybiBnZXRQb3NpdGlvbk9mZnNldFZhbHVlKHN0eWxl LmdldCgpLCBDU1NQcm9wZXJ0eVRvcCwgbV9ub2RlLT5kb2N1bWVudCgpLnJlbmRlclZpZXcoKSk7 CisgICAgICAgICAgICByZXR1cm4gcG9zaXRpb25PZmZzZXRWYWx1ZShzdHlsZS5nZXQoKSwgQ1NT UHJvcGVydHlUb3AsIG1fbm9kZS0+ZG9jdW1lbnQoKS5yZW5kZXJWaWV3KCkpOwogICAgICAgICBj YXNlIENTU1Byb3BlcnR5VW5pY29kZUJpZGk6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQ b29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnVuaWNvZGVCaWRpKCkpOwogICAgICAgICBjYXNlIENT U1Byb3BlcnR5VmVydGljYWxBbGlnbjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0xlbmd0aC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgKaW5kZXggMDM2 Y2EzOTA4NWU4YmQxNTIzNjczNzMzZWY0MDgyOWFkYTI2NGNmYy4uZWJkZDY4ZDMyZmViMzI3Yjdi NmJlYjk3ZTU1Y2FkZDM0ODk0MDg1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vTGVuZ3RoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgKQEAgLTgx LDYgKzgxLDcgQEAgcHVibGljOgogICAgIExlbmd0aFR5cGUgdHlwZSgpIGNvbnN0OwogCiAgICAg Ym9vbCBpc0F1dG8oKSBjb25zdDsKKyAgICBib29sIGlzQ2FsY3VsYXRlZCgpIGNvbnN0OwogICAg IGJvb2wgaXNGaXhlZCgpIGNvbnN0OwogICAgIGJvb2wgaXNNYXhDb250ZW50KCkgY29uc3Q7CiAg ICAgYm9vbCBpc01pbkNvbnRlbnQoKSBjb25zdDsKQEAgLTExMyw3ICsxMTQsNiBAQCBwdWJsaWM6 CiAgICAgZmxvYXQgbm9uTmFuQ2FsY3VsYXRlZFZhbHVlKGludCBtYXhWYWx1ZSkgY29uc3Q7CiAK IHByaXZhdGU6Ci0gICAgYm9vbCBpc0NhbGN1bGF0ZWQoKSBjb25zdDsKICAgICBib29sIGlzTGVn YWN5SW50cmluc2ljKCkgY29uc3Q7CiAKICAgICBib29sIGlzQ2FsY3VsYXRlZEVxdWFsKGNvbnN0 IExlbmd0aCYpIGNvbnN0Owo=