148237 2015-08-20 12:34:27 -0700 HistoryItems with null CachedPages should never be left in the list of items; causes crash 2015-08-21 17:45:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin beidson commit-queue simon.fraser thorton zalan oldest_to_newest 1119317 0 bdakin 2015-08-20 12:34:27 -0700 WK1 can re-enter layout during FrameView destruction and crash Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebCore 0x00007fff91ab948a WebCore::PageCache::markPagesForContentsSizeChanged(WebCore::Page&) + 42 1 com.apple.WebCore 0x00007fff90fda0bd WebCore::FrameView::setContentsSize(WebCore::IntSize const&) + 221 2 com.apple.WebCore 0x00007fff9100de56 WebCore::FrameView::adjustViewSize() + 150 3 com.apple.WebCore 0x00007fff91003e90 WebCore::FrameView::layout(bool) + 3312 4 com.apple.WebKitLegacy 0x00007fff9e2508fc -[WebHTMLView layoutToMinimumPageWidth:height:originalPageWidth:originalPageHeight:maximumShrinkRatio:adjustingViewSize:] + 316 5 com.apple.WebKitLegacy 0x00007fff9e249f3e -[WebDynamicScrollBarsView(WebInternal) updateScrollers] + 158 6 com.apple.WebCore 0x00007fff91c6fb4d WebCore::ScrollView::platformSetScrollbarModes() + 45 7 com.apple.WebCore 0x00007fff90fcdf21 WebCore::ScrollView::setScrollbarModes(WebCore::ScrollbarMode, WebCore::ScrollbarMode, bool, bool) + 241 8 com.apple.WebCore 0x00007fff91003906 WebCore::FrameView::layout(bool) + 1894 9 com.apple.WebKitLegacy 0x00007fff9e2508fc -[WebHTMLView layoutToMinimumPageWidth:height:originalPageWidth:originalPageHeight:maximumShrinkRatio:adjustingViewSize:] + 316 10 com.apple.WebKitLegacy 0x00007fff9e24a4f9 -[WebDynamicScrollBarsView(WebInternal) updateScrollers] + 1625 11 com.apple.WebCore 0x00007fff91c6fb4d WebCore::ScrollView::platformSetScrollbarModes() + 45 12 com.apple.WebCore 0x00007fff90fcdf21 WebCore::ScrollView::setScrollbarModes(WebCore::ScrollbarMode, WebCore::ScrollbarMode, bool, bool) + 241 13 com.apple.WebCore 0x00007fff91034f50 WebCore::FrameView::~FrameView() + 224 14 com.apple.WebCore 0x00007fff91034e5e WebCore::FrameView::~FrameView() + 14 rdar://problem/22356782 1119319 1 259486 bdakin 2015-08-20 12:38:23 -0700 Created attachment 259486 Patch 1119393 2 259505 bdakin 2015-08-20 15:19:44 -0700 Created attachment 259505 Patch It turns out that fix did not work, so here is a new patch that does work. 1119397 3 259505 zalan 2015-08-20 15:24:08 -0700 Comment on attachment 259505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259505&action=review > Source/WebCore/page/FrameView.cpp:277 > I hope that none of the setHas*Scrollbar() calls (few lines below) trigger similar layout. 1119406 4 bdakin 2015-08-20 15:36:08 -0700 (In reply to comment #3) > Comment on attachment 259505 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=259505&action=review > > > Source/WebCore/page/FrameView.cpp:277 > > > > I hope that none of the setHas*Scrollbar() calls (few lines below) trigger > similar layout. From what I can tell, they do not, but this is a great example of why this fix is hack-ish. 1119409 5 bdakin 2015-08-20 15:37:50 -0700 http://trac.webkit.org/changeset/188712 Thanks Zalan! 1119507 6 commit-queue 2015-08-20 17:51:53 -0700 Re-opened since this is blocked by bug 148274 1119516 7 thorton 2015-08-20 18:03:59 -0700 Rolled out in http://trac.webkit.org/changeset/188723 1119666 8 bdakin 2015-08-20 22:27:18 -0700 Re-naming the bug to reflect my new approach for a crash fix, 1119673 9 259586 bdakin 2015-08-20 23:15:29 -0700 Created attachment 259586 Patch Here's another go. 1119674 10 259586 simon.fraser 2015-08-20 23:24:07 -0700 Comment on attachment 259586 Patch This seems pretty risky. 1119675 11 simon.fraser 2015-08-20 23:25:58 -0700 I wonder if the earlier patch broke everything because frame().view() is null normally, meaning frame().view() == this is never true? 1119797 12 bdakin 2015-08-21 10:36:38 -0700 (In reply to comment #10) > Comment on attachment 259586 [details] > Patch > > This seems pretty risky. Can you elaborate? I think it seems extremely safe. Safer than limiting calls to resetScrollbars() from the FrameView destructor now that I have a better understanding of those implications. 1119806 13 259586 beidson 2015-08-21 10:46:31 -0700 Comment on attachment 259586 Patch I think this is fine, as long as all the layout tests actually run and don't crash :) 1119859 14 bdakin 2015-08-21 12:24:02 -0700 Thanks Brady! I ran WK1 and WK2 tests locally, and everything seems good. http://trac.webkit.org/changeset/188765 1120016 15 simon.fraser 2015-08-21 17:45:32 -0700 I think it would be good to land a layout test for this, if we can make one. 259486 2015-08-20 12:38:23 -0700 2015-08-20 15:19:44 -0700 Patch for-review.txt text/plain 2268 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODY5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzEgY2FuIHJlLWVudGVyIGxheW91 dCBkdXJpbmcgRnJhbWVWaWV3IGRlc3RydWN0aW9uIGFuZCBjcmFzaAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MjM3CisgICAgICAgIC1hbmQgY29y cmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjIzNTY3ODIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Igbm93LCB3ZeKAmWxsIHN0 aWNrIHdpdGggdGhpcyBzdXBlci1zYWZlIGZpeCwgYnV0IHdlIG5lZWQgdG8gZml4IHRoaXMgd2l0 aCBsZXNzIAorICAgICAgICBvZiBhIGhhbW1lciBpbiB0aGUgZnV0dXJlLgorICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6fkZyYW1lVmll dyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKwogMjAxNS0wOC0yMCAgUGVyIEFybmUgVm9sbGFuICA8cGVhdm9Ab3V0 bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBMaW5rIGVycm9ycyB3aGVuIGJ1aWxkaW5n IHdpdGggVlMyMDE1LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24g MTg4NjkxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNjMsNiArMjYzLDggQEAgUmVmPEZyYW1lVmlldz4gRnJhbWVWaWV3OjpjcmVhdGUo RnJhbWUmIAogCiBGcmFtZVZpZXc6On5GcmFtZVZpZXcoKQogeworICAgIG1faXNCZWluZ0Rlc3Ry b3llZCA9IHRydWU7CisKICAgICBpZiAobV9wb3N0TGF5b3V0VGFza3NUaW1lci5pc0FjdGl2ZSgp KQogICAgICAgICBtX3Bvc3RMYXlvdXRUYXNrc1RpbWVyLnN0b3AoKTsKICAgICAKQEAgLTEyMDcs NiArMTIwOSwxMSBAQCBpbmxpbmUgdm9pZCBGcmFtZVZpZXc6OmZvcmNlTGF5b3V0UGFyZW50CiAK IHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiB7CisgICAgLy8gRklY TUU6IFRoaXMgaXMgYSBzYWZlIGZpeCBmb3IgcmRhcjovL3Byb2JsZW0vMjIzNTY3ODIgYnV0IHdl IHNob3VsZCBtYWtlIGl0IHNvIFdLMSBjYW4gbmV2ZXIKKyAgICAvLyByZS1lbnRlciBsYXlvdXQg ZHVyaW5nIEZyYW1lVmlldyBkZXN0cnVjdGlvbi4KKyAgICBpZiAobV9pc0JlaW5nRGVzdHJveWVk KQorICAgICAgICByZXR1cm47CisKICAgICBMT0coTGF5b3V0LCAiRnJhbWVWaWV3ICVwICglZHgl ZCkgbGF5b3V0LCBtYWluIGZyYW1ldmlldyAlZCwgYWxsb3dTdWJ0cmVlPSVkIiwgdGhpcywgc2l6 ZSgpLndpZHRoKCksIHNpemUoKS5oZWlnaHQoKSwgZnJhbWUoKS5pc01haW5GcmFtZSgpLCBhbGxv d1N1YnRyZWUpOwogICAgIGlmIChpc0luTGF5b3V0KCkpIHsKICAgICAgICAgTE9HKExheW91dCwg IiAgaW4gbGF5b3V0LCBiYWlsaW5nIik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHJl dmlzaW9uIDE4ODY5MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTgwOCw2ICs4MDgsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX3Zpc3Vh bFVwZGF0ZXNBbGxvd2VkQnlDbGllbnQ7CiAgICAgYm9vbCBtX2hhc0ZsaXBwZWRCbG9ja1JlbmRl cmVyczsKKyAgICBib29sIG1faXNCZWluZ0Rlc3Ryb3llZCB7IGZhbHNlIH07CiAKICAgICBTY3Jv bGxQaW5uaW5nQmVoYXZpb3IgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3I7CiAK 259505 2015-08-20 15:19:44 -0700 2015-08-20 23:15:29 -0700 Patch for-review-2.txt text/plain 2116 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODY5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzEgY2FuIHJlLWVudGVyIGxheW91 dCBkdXJpbmcgRnJhbWVWaWV3IGRlc3RydWN0aW9uIGFuZCBjcmFzaAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MjM3CisgICAgICAgIC1hbmQgY29y cmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjIzNTY3ODIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgc2FmZSBmaXgg Zm9yIHRoZSB0aW1lIGJlaW5nLiBXZSB3b24ndCByZXNldFNjcm9sbGJhcnMoKSBmb3IgYSBGcmFt ZVZpZXcgCisgICAgICAgIHRoYXQgaXMgaW4gdGhlIFBhZ2VDYWNoZSBiZWNhdXNlIHJlc2V0dGlu ZyBzY3JvbGxiYXJzIGNhbiByZS1lbnRlciBsYXlvdXQgZm9yIHRoZSAKKyAgICAgICAgRnJhbWUn cyBuZXcgRnJhbWVWaWV3LCB3aGljaCBsZWFkcyB0byB1cGRhdGluZyBwYWdlcyBpbiB0aGUgcGFn ZSBjYWNoZSwgd2hpY2ggCisgICAgICAgIGxlYWRzIHRvIGEgY3Jhc2ggYmVjYXVzZSB3ZSdyZSBp biB0aGUgcHJvY2VzcyBvZiBkZXN0cm95aW5nIHNvbWV0aGluZworICAgICAgICBpbiB0aGUgcGFn ZSBjYWNoZS4gV2Ugc2hvdWxkIG5vdCBiZSBhYmxlIHRvIGdldCBpbnRvIHRoaXMgbWVzcyBhdCBh bGwuCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3Ojp+RnJhbWVWaWV3KToKKwogMjAxNS0wOC0yMCAgUGVyIEFybmUgVm9sbGFuICA8cGVh dm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBMaW5rIGVycm9ycyB3aGVuIGJ1 aWxkaW5nIHdpdGggVlMyMDE1LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2 aXNpb24gMTg4NjkxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNjcsNyArMjY3LDEzIEBAIEZyYW1lVmlldzo6fkZyYW1lVmlldygpCiAg ICAgICAgIG1fcG9zdExheW91dFRhc2tzVGltZXIuc3RvcCgpOwogICAgIAogICAgIHJlbW92ZUZy b21BWE9iamVjdENhY2hlKCk7Ci0gICAgcmVzZXRTY3JvbGxiYXJzKCk7CisKKyAgICAvLyBGSVhN RTogVGhpcyBpcyBhIHNhZmUgZml4IGZvciByZGFyOi8vcHJvYmxlbS8yMjM1Njc4Mi4gV2Ugd29u J3QgcmVzZXRTY3JvbGxiYXJzKCkgZm9yIGEgRnJhbWVWaWV3IHRoYXQgaXMgaW4KKyAgICAvLyB0 aGUgUGFnZUNhY2hlIGJlY2F1c2UgcmVzZXR0aW5nIHNjcm9sbGJhcnMgY2FuIHJlLWVudGVyIGxh eW91dCBmb3IgdGhlIEZyYW1lJ3MgbmV3IEZyYW1lVmlldywgd2hpY2ggbGVhZHMgdG8KKyAgICAv LyB1cGRhdGluZyBwYWdlcyBpbiB0aGUgcGFnZSBjYWNoZSwgd2hpY2ggbGVhZHMgdG8gYSBjcmFz aCBiZWNhdXNlIHdlJ3JlIGluIHRoZSBwcm9jZXNzIG9mIGRlc3Ryb3lpbmcgc29tZXRoaW5nCisg ICAgLy8gaW4gdGhlIHBhZ2UgY2FjaGUuIFdlIHNob3VsZCBub3QgYmUgYWJsZSB0byBnZXQgaW50 byB0aGlzIG1lc3MgYXQgYWxsLgorICAgIGlmIChmcmFtZSgpLnZpZXcoKSA9PSB0aGlzKQorICAg ICAgICByZXNldFNjcm9sbGJhcnMoKTsKIAogICAgIC8vIEN1c3RvbSBzY3JvbGxiYXJzIHNob3Vs ZCBhbHJlYWR5IGJlIGRlc3Ryb3llZCBhdCB0aGlzIHBvaW50CiAgICAgQVNTRVJUKCFob3Jpem9u dGFsU2Nyb2xsYmFyKCkgfHwgIWhvcml6b250YWxTY3JvbGxiYXIoKS0+aXNDdXN0b21TY3JvbGxi YXIoKSk7Cg== 259586 2015-08-20 23:15:29 -0700 2015-08-21 10:46:31 -0700 Patch for-review-3.txt text/plain 2328 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODc1MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBIaXN0b3J5SXRlbXMgd2lsbCBudWxs IENhY2hlZFBhZ2VzIHNob3VsZCBuZXZlciBiZSBsZWZ0IGluIHRoZSBsaXN0IG9mIGl0ZW1zOyAK KyAgICAgICAgY2F1c2VzIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDgyMzcKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAg ICByZGFyOi8vcHJvYmxlbS8yMjM1Njc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNldHRpbmcgdGhlIENhY2hlZFBhZ2UgdG8gbnVsbHB0ciB3aWxs IGRlc3Ryb3kgdGhlIENhY2hlZFBhZ2UsIGRlc3Ryb3kgdGhlIAorICAgICAgICBGcmFtZVZpZXcs IHJlLWVudGVyIGxheW91dCwgYW5kIHBvdGVudGlhbGx5IHRyeSB0byBtb2RpZnkgaXRlbXMgaW4g dGhlIFBhZ2VDYWNoZSAKKyAgICAgICAgYmFzZWQgb24gdGhhdCBsYXlvdXQuIFNvLCB3ZSBzaG91 bGQgbm90IG1vZGlmeSBDYWNoZWRQYWdlIGluIHRoaXMgd2F5IHdoaWxlIHRoZSAKKyAgICAgICAg aXRlbSBpcyBzdGlsbCBpbiB0aGUgbGlzdCBvZiBIaXN0b3J5SXRlbXMuCisgICAgICAgICogaGlz dG9yeS9QYWdlQ2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNhY2hlOjp0YWtlKToK KyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDYWNoZTo6cmVtb3ZlKToKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VDYWNoZTo6cHJ1bmUpOgorCiAyMDE1LTA4LTIwICBZdXN1a2UgU3V6dWtpICA8dXRhdGFu ZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtFUzZdIHByb3RvdHlwaW5nIG1vZHVsZSBsb2Fk ZXIgaW4gSlNDIHNoZWxsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCShy ZXZpc2lvbiAxODg3NTIpCisrKyBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM5Niw4ICszOTYsOCBAQCBzdGQ6OnVuaXF1ZV9wdHI8Q2FjaGVk UGFnZT4gUGFnZUNhY2hlOjp0CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAg IHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRQYWdlPiBjYWNoZWRQYWdlID0gV1RGOjptb3ZlKGl0ZW0u bV9jYWNoZWRQYWdlKTsKICAgICBtX2l0ZW1zLnJlbW92ZSgmaXRlbSk7CisgICAgc3RkOjp1bmlx dWVfcHRyPENhY2hlZFBhZ2U+IGNhY2hlZFBhZ2UgPSBXVEY6Om1vdmUoaXRlbS5tX2NhY2hlZFBh Z2UpOwogCiAgICAgaWYgKGNhY2hlZFBhZ2UtPmhhc0V4cGlyZWQoKSkgewogICAgICAgICBMT0co UGFnZUNhY2hlLCAiTm90IHJlc3RvcmluZyBwYWdlIGZvciAlcyBmcm9tIGJhY2svZm9yd2FyZCBj YWNoZSBiZWNhdXNlIGNhY2hlIGVudHJ5IGhhcyBleHBpcmVkIiwgaXRlbS51cmwoKS5zdHJpbmco KS5hc2NpaSgpLmRhdGEoKSk7CkBAIC00MzIsMTcgKzQzMiwxNiBAQCB2b2lkIFBhZ2VDYWNoZTo6 cmVtb3ZlKEhpc3RvcnlJdGVtJiBpdGVtCiAgICAgaWYgKCFpdGVtLm1fY2FjaGVkUGFnZSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaXRlbS5tX2NhY2hlZFBhZ2UgPSBudWxscHRyOwogICAgIG1f aXRlbXMucmVtb3ZlKCZpdGVtKTsKKyAgICBpdGVtLm1fY2FjaGVkUGFnZSA9IG51bGxwdHI7CiB9 CiAKIHZvaWQgUGFnZUNhY2hlOjpwcnVuZShQcnVuaW5nUmVhc29uIHBydW5pbmdSZWFzb24pCiB7 CiAgICAgd2hpbGUgKHBhZ2VDb3VudCgpID4gbWF4U2l6ZSgpKSB7Ci0gICAgICAgIGF1dG8mIG9s ZGVzdEl0ZW0gPSBtX2l0ZW1zLmZpcnN0KCk7CisgICAgICAgIGF1dG8gb2xkZXN0SXRlbSA9IG1f aXRlbXMudGFrZUZpcnN0KCk7CiAgICAgICAgIG9sZGVzdEl0ZW0tPm1fY2FjaGVkUGFnZSA9IG51 bGxwdHI7CiAgICAgICAgIG9sZGVzdEl0ZW0tPm1fcHJ1bmluZ1JlYXNvbiA9IHBydW5pbmdSZWFz b247Ci0gICAgICAgIG1faXRlbXMucmVtb3ZlRmlyc3QoKTsKICAgICB9CiB9CiAK