167738 2017-02-02 09:21:34 -0800 [Crash] com.apple.WebKit.WebContent at WebKit: WebKit::WebPage::fromCorePage() 2017-02-04 18:22:24 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue kling koivisto rniwa webkit-bug-importer oldest_to_newest 1272486 0 cdumez 2017-02-02 09:21:34 -0800 com.apple.WebKit.WebContent at WebKit: WebKit::WebPage::fromCorePage(): Thread[0] [ 0] 0x00000001917fddc8 WebKit`WebKit::WebPage::fromCorePage(WebCore::Page*) [inlined] WebCore::Chrome::client() at Chrome.h:69:37 [ 0] 0x00000001917fddc8 WebKit`WebKit::WebPage::fromCorePage(WebCore::Page*) + 4 at WebPage.cpp:1363 [ 1] 0x00000001917cadef WebKit`WebKit::WebFrameLoaderClient::detachedFromParent2() + 27 at WebFrameLoaderClient.cpp:142:33 [ 2] 0x000000018c98c5c7 WebCore`WebCore::FrameLoader::detachViewsAndDocumentLoader() + 31 at FrameLoader.cpp:2552:14 [ 3] 0x000000018c986953 WebCore`WebCore::CachedFrame::destroy() + 59 at CachedFrame.cpp:243:34 [ 4] 0x000000018c98698b WebCore`WebCore::CachedFrame::destroy() + 115 at CachedFrame.cpp:248:27 [ 5] 0x000000018c9868eb WebCore`WebCore::CachedPage::~CachedPage() [inlined] WebCore::CachedPage::~CachedPage() + 11 at CachedPage.cpp:68:28 [ 5] 0x000000018c9868e0 WebCore`WebCore::CachedPage::~CachedPage() + 16 at CachedPage.cpp:62 [ 6] 0x000000018d48dc9b WebCore`WebCore::PageCache::prune(WebCore::PruningReason) [inlined] std::__1::default_delete<WebCore::CachedPage>::operator()(WebCore::CachedPage*) const + 7 at memory:2537:13 [ 6] 0x000000018d48dc94 WebCore`WebCore::PageCache::prune(WebCore::PruningReason) [inlined] std::__1::unique_ptr<WebCore::CachedPage, std::__1::default_delete<WebCore::CachedPage> >::reset(WebCore::CachedPage*) + 12 at memory:2736 [ 6] 0x000000018d48dc88 WebCore`WebCore::PageCache::prune(WebCore::PruningReason) [inlined] std::__1::unique_ptr<WebCore::CachedPage, std::__1::default_delete<WebCore::CachedPage> >::operator=(std::nullptr_t) at memory:2708 [ 6] 0x000000018d48dc88 WebCore`WebCore::PageCache::prune(WebCore::PruningReason) + 68 at PageCache.cpp:474 [ 7] 0x000000018d48dc33 WebCore`WebCore::PageCache::pruneToSizeNow(unsigned int, WebCore::PruningReason) + 31 at PageCache.cpp:295:5 [ 8] 0x000000018d45754f WebCore`WebCore::releaseMemory(WebCore::Critical, WebCore::Synchronous) [inlined] WebCore::releaseCriticalMemory(WebCore::Synchronous) + 43 at MemoryRelease.cpp:69:28 [ 8] 0x000000018d457524 WebCore`WebCore::releaseMemory(WebCore::Critical, WebCore::Synchronous) + 52 at MemoryRelease.cpp:108 [ 9] 0x000000018d456db7 WebCore`WebCore::MemoryPressureHandler::releaseMemory(WebCore::Critical, WebCore::Synchronous) [inlined] std::__1::function<void (WebCore::Critical, WebCore::Synchronous)>::operator()(WebCore::Critical, WebCore::Synchronous) const + 23 at functional:1817:12 [ 9] 0x000000018d456da0 WebCore`WebCore::MemoryPressureHandler::releaseMemory(WebCore::Critical, WebCore::Synchronous) + 76 at MemoryPressureHandler.cpp:65 [ 10] 0x0000000191886117 WebKit`WebKit::WebProcess::actualPrepareToSuspend(WebKit::WebProcess::ShouldAcknowledgeWhenReadyToSuspend) + 63 at WebProcess.cpp:1289:44 [ 11] 0x0000000191886603 WebKit`WebKit::WebProcess::prepareToSuspend() + 159 at WebProcess.cpp:1322:5 [ 12] 0x00000001916ba967 WebKit`IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) [inlined] IPC::Connection::dispatchMessage(IPC::Decoder&) + 19 at Connection.cpp:897:14 1272487 1 cdumez 2017-02-02 09:22:12 -0800 <rdar://problem/30229990> 1272488 2 300415 cdumez 2017-02-02 09:29:28 -0800 Created attachment 300415 Patch 1272492 3 300415 kling 2017-02-02 09:42:15 -0800 Comment on attachment 300415 Patch r=me Even if this isn't the thing that fixes the bug, it's a *really* nice cleanup. 1272497 4 cdumez 2017-02-02 09:56:11 -0800 (In reply to comment #3) > Comment on attachment 300415 [details] > Patch > > r=me > Even if this isn't the thing that fixes the bug, it's a *really* nice > cleanup. If it does not fix the crashes, then I guess it would mean that someone is adding HistoryItem to PageCache for a given Page, after the Page has died. Sounds unlikely but we'll see. 1272515 5 300415 commit-queue 2017-02-02 10:33:20 -0800 Comment on attachment 300415 Patch Clearing flags on attachment: 300415 Committed r211569: <http://trac.webkit.org/changeset/211569> 1272516 6 commit-queue 2017-02-02 10:33:25 -0800 All reviewed patches have been landed. Closing bug. 1273333 7 300415 darin 2017-02-04 18:17:26 -0800 Comment on attachment 300415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300415&action=review > Source/WebCore/history/PageCache.cpp:472 > + // Increment iterator first so it stays invalid after the removal. You meant to say "stays valid". 1273339 8 cdumez 2017-02-04 18:22:24 -0800 (In reply to comment #7) > Comment on attachment 300415 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300415&action=review > > > Source/WebCore/history/PageCache.cpp:472 > > + // Increment iterator first so it stays invalid after the removal. > > You meant to say "stays valid". Indeed. Fixed in <http://trac.webkit.org/changeset/211676>, thanks. 300415 2017-02-02 09:29:28 -0800 2017-02-02 10:33:20 -0800 Patch bug-167738-20170202092714.patch text/plain 11517 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM3ZmFhZGJmZDQxMzY1 MmM4ZDc2ZGJiNTAyNDAyYmE2MmVhMDNjYS4uYjQzNGJmYzU0Yjg1Mjg1N2E3NjRiMzViNTYwYzE0 NzU0MGJhNzA4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE3LTAyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NyYXNoXSBjb20uYXBwbGUu V2ViS2l0LldlYkNvbnRlbnQgYXQgV2ViS2l0OiBXZWJLaXQ6OldlYlBhZ2U6OmZyb21Db3JlUGFn ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3 MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwMjI5OTkwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwb24gZGVzdHJ1Y3Rpb24gb2YgYSBQYWdl LCB3ZSBkZXN0cm95IHRoZSBCYWNrRm9yd2FyZENsaWVudCwgd2hpY2ggaXMgc3VwcG9zZWQKKyAg ICAgICAgdG8ga2VlcCB0cmFjayBvZiBIaXN0b3J5SXRlbXMgYXNzb2NpYXRlZCB0byB0aGlzIHBh cnRpY3VsYXIgcGFnZSBhbmQgcmVtb3ZlIHRoZW0KKyAgICAgICAgZnJvbSB0aGUgUGFnZUNhY2hl LiBHaXZlbiB0aGUgY3Jhc2ggdHJhY2UsIHRoZSBpc3N1ZSBzZWVtcyB0byBiZSB0aGF0IHNvbWUK KyAgICAgICAgSGlzdG9yeUl0ZW1zIGFzc29jaWF0ZWQgd2l0aCB0aGUgUGFnZSBzb21ldGltZXMg bGluZ2VyIGluIHRoZSBQYWdlQ2FjaGUgKmFmdGVyKgorICAgICAgICB0aGUgUGFnZSBoYXMgYmVl biBkZXN0cm95ZWQsIHdoaWNoIGxlYWRzIHRvIGNyYXNoZXMgbGF0ZXIgb24gd2hlbiBwcnVuaW5n IHRoZQorICAgICAgICBQYWdlQ2FjaGUuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gbWFrZSB0aGUg cHJvY2VzcyBtb3JlIHJvYnVzdCwgdGhpcyBwYXRjaCByZWZhY3RvcnMgdGhlIGNvZGUgc28gdGhh dAorICAgICAgICB0aGUgUGFnZSBpcyBub3cgaW4gY2hhcmdlIG9mIHJlbW92aW5nIGFsbCBpdHMg YXNzb2NpYXRlZCBIaXN0b3J5SXRlbXMgZnJvbSB0aGUKKyAgICAgICAgUGFnZUNhY2hlIGluc3Rl YWQgb2YgcmVseWluZyBvbiB0aGUgQmFja0ZvcndhcmRDbGllbnQuIEFsc28sIGluc3RlYWQgb2Yg aGF2aW5nCisgICAgICAgIHRoZSBQYWdlIGtlZXAgdHJhY2sgb2Ygd2hpY2ggSGlzdG9yeUl0ZW1z IGFyZSBhc3NvY2lhdGVkIHdpdGggaXQgKHdoaWNoIGlzCisgICAgICAgIGVycm9yIHByb25lKSwg d2Ugbm93IHNjYW4gYWxsIFBhZ2VDYWNoZSBlbnRyaWVzIGluc3RlYWQgdG8gZmluZCB3aGljaCBv bmVzIGFyZQorICAgICAgICBhc3NvY2lhdGVkIHdpdGggdGhlIFBhZ2UuIFdoaWxlIHRoaXMgaXMg aW4gdGhlb3J5IHNsb3dlciwgdGhpcyBpcyBtdWNoIHNhZmVyCisgICAgICAgIGFuZCBpbiBwcmFj dGljZSBub3QgYW4gaXNzdWUgYmVjYXVzZSB0aGUgUGFnZUNhY2hlIHVzdWFsbHkgaGFzIDMtNSBl bnRyaWVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY291bGQgbm90IHJlcHJvZHVjZS4KKwor ICAgICAgICAqIGhpc3RvcnkvQ2FjaGVkUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRQYWdlOjpDYWNoZWRQYWdlKToKKyAgICAgICAgKiBoaXN0b3J5L0NhY2hlZFBhZ2UuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFBhZ2U6OnBhZ2UpOgorICAgICAgICAqIGhpc3RvcnkvUGFn ZUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDYWNoZTo6cmVtb3ZlQWxsSXRlbXNG b3JQYWdlKToKKyAgICAgICAgKiBoaXN0b3J5L1BhZ2VDYWNoZS5oOgorICAgICAgICAqIHBhZ2Uv UGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp+UGFnZSk6CisKIDIwMTctMDItMDEg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIy MDUxMzYpOiB7fS50b1N0cmluZy5jYWxsKGNyb3NzT3JpZ2luV2luZG93KSBzaG91bGQgbm90IHRo cm93CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNDNmOWJmMDQyMzYzZDNmNmExOWZkZWZjMjE1YzU0MGIx NWFkMTdhNi4uOTllYjliMzdmYjU2ZGI5NTE4YzQ2NmY2YmFmNzY1YjVlOTZmY2UzYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTAyLTAyICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NyYXNoXSBjb20uYXBwbGUuV2ViS2l0LldlYkNv bnRlbnQgYXQgV2ViS2l0OiBXZWJLaXQ6OldlYlBhZ2U6OmZyb21Db3JlUGFnZSgpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3MzgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzMwMjI5OTkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBCYWNrRm9yd2FyZENsaWVudCBubyBsb25nZXIgbmVlZHMg dG8gd29ycnkgYWJvdXQgcmVtb3ZpbmcgSGlzdG9yeUl0ZW1zCisgICAgICAgIGZyb20gdGhlIFBh Z2VDYWNoZSBub3cgdGhhdCBXZWJDb3JlIHRha2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiBI aXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5tbToKKyAgICAgICAgKEJhY2tGb3J3YXJkTGlzdDo6Y2xv c2UpOgorCiAyMDE3LTAyLTAxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFtXSzFdIEFsbG93IHRoZSBkcmFnIGNsaWVudCB0byBiZSBpbml0aWFsaXpl ZCBvbiBwbGF0Zm9ybXMgdGhhdCBkbyBub3Qgc3VwcG9ydCBkcmFnIGFuZCBkcm9wCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFu Z2VMb2cKaW5kZXggOGU4YTY1ZTBlYTFlZmI3MDJiNzc4M2Q4ZWE2MTFjMjY2M2NmMjJmMC4uZThh MzJiYTM5YTcwMmMzZjk5OGQzNGQ2ZjFjMWRiMDhhMjdiYWU4YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDE3LTAyLTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKKyAgICAgICAgW0NyYXNoXSBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQgYXQgV2Vi S2l0OiBXZWJLaXQ6OldlYlBhZ2U6OmZyb21Db3JlUGFnZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzMwMjI5OTkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBCYWNrRm9yd2FyZENsaWVudCBubyBsb25nZXIgbmVlZHMgdG8gd29ycnkgYWJv dXQgcmVtb3ZpbmcgSGlzdG9yeUl0ZW1zCisgICAgICAgIGZyb20gdGhlIFBhZ2VDYWNoZSBub3cg dGhhdCBXZWJDb3JlIHRha2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiBCYWNrRm9yd2FyZExp c3QuY3BwOgorICAgICAgICAoQmFja0ZvcndhcmRMaXN0OjpjbG9zZSk6CisKIDIwMTctMDEtMjgg IFlvYXYgV2Vpc3MgIDx5b2F2QHlvYXYud3M+CiAKICAgICAgICAgQWRkIExpbmsgUHJlbG9hZCBh cyBhbiBvZmYtYnktZGVmYXVsdCBleHBlcmltZW50YWwgZmVhdHVyZSBtZW51IGl0ZW0uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggNGRlNTVjMWZmZTMyYzc2N2M3ZGRkMTJhZTcyYmUzNDQyZTY1ODIzNS4uZDc4Mzgy MzJhOWE1MjA5YjY4MjM5NjAzMGI2NTI4ODFkMjZiNjMxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIwIEBACisyMDE3LTAyLTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAg ICAgICAgW0NyYXNoXSBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQgYXQgV2ViS2l0OiBXZWJL aXQ6OldlYlBhZ2U6OmZyb21Db3JlUGFnZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwMjI5 OTkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBCYWNrRm9yd2FyZENsaWVudCBubyBsb25nZXIgbmVlZHMgdG8gd29ycnkgYWJvdXQgcmVtb3Zp bmcgSGlzdG9yeUl0ZW1zCisgICAgICAgIGZyb20gdGhlIFBhZ2VDYWNoZSBub3cgdGhhdCBXZWJD b3JlIHRha2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi QmFja0ZvcndhcmRMaXN0UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2Fy ZExpc3RQcm94eTo6YWRkSXRlbUZyb21VSVByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJC YWNrRm9yd2FyZExpc3RQcm94eTo6YWRkSXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tG b3J3YXJkTGlzdFByb3h5OjpjbG9zZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YkJhY2tGb3J3YXJkTGlzdFByb3h5Lmg6CisKIDIwMTctMDItMDEgIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCB0aGUgYWx3YXlzUnVuc0F0QmFj a2dyb3VuZFByaW9yaXR5IFdLMiBzZXR0aW5nIHVzaW5nIHRocmVhZCBRb1MuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9DYWNoZWRQYWdlLmNwcAppbmRleCBiZDRiZDhlZjQ0YzFhZmNmN2QxZmVhNzc1MDAx YjhlMWQ3NDIwOTM4Li41NjUwYWJmM2ZmOWEwZWE4Njk5YjRkNTU0MGUwNTU5ZmE2ZjFmYjgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5jcHAKQEAgLTUwLDcgKzUwLDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogREVGSU5FX0RFQlVHX09OTFlfR0xPQkFMKFdURjo6UmVmQ291bnRl ZExlYWtDb3VudGVyLCBjYWNoZWRQYWdlQ291bnRlciwgKCJDYWNoZWRQYWdlIikpOwogCiBDYWNo ZWRQYWdlOjpDYWNoZWRQYWdlKFBhZ2UmIHBhZ2UpCi0gICAgOiBtX2V4cGlyYXRpb25UaW1lKG1v bm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpICsgcGFnZS5zZXR0aW5ncygpLmJhY2tGb3J3YXJk Q2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwoKSkKKyAgICA6IG1fcGFnZShwYWdlKQorICAgICwgbV9l eHBpcmF0aW9uVGltZShtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSArIHBhZ2Uuc2V0dGlu Z3MoKS5iYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKCkpCiAgICAgLCBtX2NhY2hl ZE1haW5GcmFtZShzdGQ6Om1ha2VfdW5pcXVlPENhY2hlZEZyYW1lPihwYWdlLm1haW5GcmFtZSgp KSkKIHsKICNpZm5kZWYgTkRFQlVHCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5 L0NhY2hlZFBhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5oCmluZGV4 IDAxNTc5ZDE0ODk2NDU2ZGU4NzRmY2Q0ZWFmMDA0MWMwNGMyOTgxZTcuLjczYmRkNWE5Y2UwYTUw YjA3YjdhNmNlYWZlODA1YTU5NzIxZjg4NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hp c3RvcnkvQ2FjaGVkUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFn ZS5oCkBAIC00Miw2ICs0Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc3RvcmUoUGFnZSYpOwog ICAgIHZvaWQgY2xlYXIoKTsKIAorICAgIFBhZ2UmIHBhZ2UoKSBjb25zdCB7IHJldHVybiBtX3Bh Z2U7IH0KICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZE1h aW5GcmFtZS0+ZG9jdW1lbnQoKTsgfQogICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRl cigpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkTWFpbkZyYW1lLT5kb2N1bWVudExvYWRlcigpOyB9 CiAKQEAgLTU4LDYgKzU5LDcgQEAgcHVibGljOgogICAgIHZvaWQgbWFya0ZvckNvbnRlbnRzU2l6 ZUNoYW5nZWQoKSB7IG1fbmVlZHNVcGRhdGVDb250ZW50c1NpemUgPSB0cnVlOyB9CiAKIHByaXZh dGU6CisgICAgUGFnZSYgbV9wYWdlOwogICAgIGRvdWJsZSBtX2V4cGlyYXRpb25UaW1lOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRGcmFtZT4gbV9jYWNoZWRNYWluRnJhbWU7CiAjaWYgRU5B QkxFKFZJREVPX1RSQUNLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdl Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCmluZGV4IDgy ZWUwZDgxZDlkOTM2ODkwNDkzMThlOGQ2OGNlZDI4YmY5NTYzYWUuLmVhNjdlYzNjZGIxMTQxNzA5 MjBjYjFkMzQ4NGU4NTE0MzJlNzU4MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rv cnkvUGFnZUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5j cHAKQEAgLTQ2Niw2ICs0NjYsMTkgQEAgc3RkOjp1bmlxdWVfcHRyPENhY2hlZFBhZ2U+IFBhZ2VD YWNoZTo6dGFrZShIaXN0b3J5SXRlbSYgaXRlbSwgUGFnZSogcGFnZSkKICAgICByZXR1cm4gY2Fj aGVkUGFnZTsKIH0KIAordm9pZCBQYWdlQ2FjaGU6OnJlbW92ZUFsbEl0ZW1zRm9yUGFnZShQYWdl JiBwYWdlKQoreworICAgIGZvciAoYXV0byBpdCA9IG1faXRlbXMuYmVnaW4oKTsgaXQgIT0gbV9p dGVtcy5lbmQoKTspIHsKKyAgICAgICAgLy8gSW5jcmVtZW50IGl0ZXJhdG9yIGZpcnN0IHNvIGl0 IHN0YXlzIGludmFsaWQgYWZ0ZXIgdGhlIHJlbW92YWwuCisgICAgICAgIGF1dG8gY3VycmVudCA9 IGl0OworICAgICAgICArK2l0OworICAgICAgICBpZiAoJigqY3VycmVudCktPm1fY2FjaGVkUGFn ZS0+cGFnZSgpID09ICZwYWdlKSB7CisgICAgICAgICAgICAoKmN1cnJlbnQpLT5tX2NhY2hlZFBh Z2UgPSBudWxscHRyOworICAgICAgICAgICAgbV9pdGVtcy5yZW1vdmUoY3VycmVudCk7CisgICAg ICAgIH0KKyAgICB9Cit9CisKIENhY2hlZFBhZ2UqIFBhZ2VDYWNoZTo6Z2V0KEhpc3RvcnlJdGVt JiBpdGVtLCBQYWdlKiBwYWdlKQogewogICAgIENhY2hlZFBhZ2UqIGNhY2hlZFBhZ2UgPSBpdGVt Lm1fY2FjaGVkUGFnZS5nZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv UGFnZUNhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5oCmluZGV4IDdm NWQwM2U0MzkwNDJlMmQxYmJkNmI2MzIzZGI2NzQyMjQzMjM2ZTkuLmVkZGE5ZTc1NThhMjEyMWVi MDQwZTgwYjUzNTJlM2QzOTdkZjVmNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rv cnkvUGFnZUNhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuaApA QCAtNTcsNiArNTcsOCBAQCBwdWJsaWM6CiAgICAgQ2FjaGVkUGFnZSogZ2V0KEhpc3RvcnlJdGVt JiwgUGFnZSopOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRQYWdlPiB0YWtlKEhpc3RvcnlJ dGVtJiwgUGFnZSopOwogCisgICAgdm9pZCByZW1vdmVBbGxJdGVtc0ZvclBhZ2UoUGFnZSYpOwor CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9pdGVtcy5zaXplKCk7 IH0KICAgICBXRUJDT1JFX0VYUE9SVCB1bnNpZ25lZCBmcmFtZUNvdW50KCkgY29uc3Q7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuY3BwCmluZGV4IGU2MGM4NzE0NGY4OGZkNWE4YmQxMzdjZTI0NThjNWQyZGQwN2My MDkuLjY4ODM1MzgxYTJhNmQzZmIzYzJkMDRhODEzZDRlYzBjMTYzZjVhNmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmNwcApAQCAtMzI1LDYgKzMyNSw3IEBAIFBhZ2U6On5QYWdlKCkKICAgICAgICAgbV9zY3Jv bGxpbmdDb29yZGluYXRvci0+cGFnZURlc3Ryb3llZCgpOwogCiAgICAgYmFja0ZvcndhcmQoKS5j bG9zZSgpOworICAgIFBhZ2VDYWNoZTo6c2luZ2xldG9uKCkucmVtb3ZlQWxsSXRlbXNGb3JQYWdl KCp0aGlzKTsKIAogI2lmbmRlZiBOREVCVUcKICAgICBwYWdlQ291bnRlci5kZWNyZW1lbnQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvQmFja0ZvcndhcmRMaXN0Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9CYWNrRm9yd2FyZExpc3QubW0KaW5kZXggNGEy NTUwZWVkNGUzYWIyODFlNTQzYjgwYTgyZjBjOWJmZTU0ZmVjNC4uZWM2MmUzYmQ0MjVlN2RlY2Vh MDA3YjJhMjdmNjBiNjUyOGVjZDJiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvSGlz dG9yeS9CYWNrRm9yd2FyZExpc3QubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9C YWNrRm9yd2FyZExpc3QubW0KQEAgLTIyNSw4ICsyMjUsNiBAQCB2b2lkIEJhY2tGb3J3YXJkTGlz dDo6c2V0Q3VycmVudCh1bnNpZ25lZCBuZXdDdXJyZW50KQogCiB2b2lkIEJhY2tGb3J3YXJkTGlz dDo6Y2xvc2UoKQogewotICAgIGZvciAoYXV0byYgaXRlbSA6IG1fZW50cmllcykKLSAgICAgICAg UGFnZUNhY2hlOjpzaW5nbGV0b24oKS5yZW1vdmUoaXRlbSk7CiAgICAgbV9lbnRyaWVzLmNsZWFy KCk7CiAgICAgbV9lbnRyeUhhc2guY2xlYXIoKTsKICAgICBtX3dlYlZpZXcgPSBudWxscHRyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQmFja0ZvcndhcmRMaXN0LmNwcCBiL1NvdXJj ZS9XZWJLaXQvd2luL0JhY2tGb3J3YXJkTGlzdC5jcHAKaW5kZXggNzg1NGMxNmZhMzQzNTNjNjdi MjQ5NjY0ZjNjOTJkMDgyNTkyYWJmMC4uNjIwNTdjYzg5NWI5ZWVhMDc5ZTBjZWU4YTM3YjJlMjhm ODI3YTZlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQmFja0ZvcndhcmRMaXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9CYWNrRm9yd2FyZExpc3QuY3BwCkBAIC0yMjUsOCAr MjI1LDYgQEAgVmVjdG9yPFJlZjxIaXN0b3J5SXRlbT4+JiBCYWNrRm9yd2FyZExpc3Q6OmVudHJp ZXMoKQogCiB2b2lkIEJhY2tGb3J3YXJkTGlzdDo6Y2xvc2UoKQogewotICAgIGZvciAoYXV0byYg aXRlbSA6IG1fZW50cmllcykKLSAgICAgICAgUGFnZUNhY2hlOjpzaW5nbGV0b24oKS5yZW1vdmUo aXRlbSk7CiAgICAgbV9lbnRyaWVzLmNsZWFyKCk7CiAgICAgbV9lbnRyeUhhc2guY2xlYXIoKTsK ICAgICBtX2Nsb3NlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcAppbmRleCBlN2Rj NGM0MzA0ZjAyMjI2YjY1MGQ1ZDBkZDU3OWM2ZmEwZmU5YjhkLi5mMmU4ZWNkNjAxOWMwZDA0YzRh NTQxNTQzZGU2YjU2MmQyNTdhYjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJCYWNrRm9yd2FyZExpc3RQcm94eS5jcHAKQEAgLTEw MCw4ICsxMDAsNiBAQCB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjphZGRJdGVtRnJvbVVJ UHJvY2Vzcyh1aW50NjRfdCBpdGVtSUQsIFJlZjxIaXN0b3J5SQogICAgIEFTU0VSVCghaGlzdG9y eUl0ZW1Ub0lETWFwKCkuY29udGFpbnMoaXRlbS5wdHIoKSkpOwogICAgIEFTU0VSVCghaWRUb0hp c3RvcnlJdGVtTWFwKCkuY29udGFpbnMoaXRlbUlEKSk7CiAKLSAgICBtX2Fzc29jaWF0ZWRJdGVt SURzLmFkZChpdGVtSUQpOwotCiAgICAgaGlzdG9yeUl0ZW1Ub0lETWFwKCkuc2V0PEl0ZW1BbmRQ YWdlSUQ+KGl0ZW0ucHRyKCksIHsgLml0ZW1JRCA9IGl0ZW1JRCwgLnBhZ2VJRCA9IHBhZ2VJRCB9 KTsKICAgICBpZFRvSGlzdG9yeUl0ZW1NYXAoKS5zZXQoaXRlbUlELCBpdGVtLnB0cigpKTsKIH0K QEAgLTE1NCw4ICsxNTIsNiBAQCB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjphZGRJdGVt KFJlZjxIaXN0b3J5SXRlbT4mJiBpdGVtKQogCiAgICAgQVNTRVJUKCFpZFRvSGlzdG9yeUl0ZW1N YXAoKS5jb250YWlucyhpdGVtSUQpKTsKIAotICAgIG1fYXNzb2NpYXRlZEl0ZW1JRHMuYWRkKGl0 ZW1JRCk7Ci0KICAgICBoaXN0b3J5SXRlbVRvSURNYXAoKS5zZXQ8SXRlbUFuZFBhZ2VJRD4oaXRl bS5wdHIoKSwgeyAuaXRlbUlEID0gaXRlbUlELCAucGFnZUlEID0gbV9wYWdlLT5wYWdlSUQoKSB9 KTsKICAgICBpZFRvSGlzdG9yeUl0ZW1NYXAoKS5zZXQoaXRlbUlELCBpdGVtLnB0cigpKTsKIApA QCAtMjE0LDEyICsyMTAsNiBAQCBpbnQgV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6OmZvcndhcmRM aXN0Q291bnQoKQogCiB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpjbG9zZSgpCiB7Ci0g ICAgZm9yIChhdXRvJiBpdGVtSUQgOiBtX2Fzc29jaWF0ZWRJdGVtSURzKSB7Ci0gICAgICAgIGlm IChIaXN0b3J5SXRlbSogaXRlbSA9IGl0ZW1Gb3JJRChpdGVtSUQpKQotICAgICAgICAgICAgV2Vi Q29yZTo6UGFnZUNhY2hlOjpzaW5nbGV0b24oKS5yZW1vdmUoKml0ZW0pOwotICAgIH0KLQotICAg IG1fYXNzb2NpYXRlZEl0ZW1JRHMuY2xlYXIoKTsKICAgICBtX3BhZ2UgPSBudWxscHRyOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViQmFja0Zv cndhcmRMaXN0UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJC YWNrRm9yd2FyZExpc3RQcm94eS5oCmluZGV4IGJiNzg2YmU4MjMxYmZjNjEzNzA5ZTJhYzc4OTIz OTRjMzFjNTBkMDAuLmQ0M2Y5NDhjYTAxYmMwMWRjNWMzZmRkYzMyMjJlNGQ1NzZiNTIxNGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJCYWNrRm9yd2Fy ZExpc3RQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJC YWNrRm9yd2FyZExpc3RQcm94eS5oCkBAIC02MCw3ICs2MCw2IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBjbG9zZSgpIG92ZXJyaWRlOwogCiAgICAgV2ViUGFnZSogbV9wYWdlOwotICAgIEhhc2hTZXQ8 dWludDY0X3Q+IG1fYXNzb2NpYXRlZEl0ZW1JRHM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQK