198766 2019-06-11 13:44:18 -0700 Add assertions to help debug crash at WebKit::HistoryEntryDataEncoder::operator<< 2019-06-13 11:14:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez commit-queue darin ggaren sam webkit-bug-importer oldest_to_newest 1543818 0 sihui_liu 2019-06-11 13:44:18 -0700 ... 1543819 1 371874 sihui_liu 2019-06-11 13:46:03 -0700 Created attachment 371874 Patch 1543834 2 371879 sihui_liu 2019-06-11 14:25:44 -0700 Created attachment 371879 Patch 1544131 3 371968 sihui_liu 2019-06-12 09:18:55 -0700 Created attachment 371968 Patch 1544168 4 371968 ggaren 2019-06-12 11:15:58 -0700 Comment on attachment 371968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371968&action=review r=me > Source/WebKit/Shared/SessionState.h:116 > + bool isDestructed { false }; > + ~FrameState() { isDestructed = true; } This probably deserves a comment that it's only here to help debug an undiagnosed bug, with a Bugzilla or Radar link. 1544242 5 371990 sihui_liu 2019-06-12 14:54:17 -0700 Created attachment 371990 Patch for landing 1544261 6 371990 commit-queue 2019-06-12 15:36:37 -0700 Comment on attachment 371990 Patch for landing Clearing flags on attachment: 371990 Committed r246382: <https://trac.webkit.org/changeset/246382> 1544262 7 commit-queue 2019-06-12 15:36:38 -0700 All reviewed patches have been landed. Closing bug. 1544264 8 webkit-bug-importer 2019-06-12 15:39:17 -0700 <rdar://problem/51686085> 1544500 9 371990 darin 2019-06-13 09:22:34 -0700 Comment on attachment 371990 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=371990&action=review > Source/WebKit/UIProcess/API/C/WKPage.cpp:485 > + auto data = encodeLegacySessionState(sessionState); > if (shouldReturnData) > - return toAPI(encodeLegacySessionState(sessionState).leakRef()); > + return toAPI(data.leakRef()); This isn’t adding an assertion. This is refactoring that causes us to do additional work when shouldReturnData is false. Nothing in the change log makes it clear why this is a desirable change. 1544533 10 371990 sihui_liu 2019-06-13 11:14:41 -0700 Comment on attachment 371990 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=371990&action=review >> Source/WebKit/UIProcess/API/C/WKPage.cpp:485 >> + return toAPI(data.leakRef()); > > This isn’t adding an assertion. This is refactoring that causes us to do additional work when shouldReturnData is false. Nothing in the change log makes it clear why this is a desirable change. Right, add some explaining here for reference. Previously the crash traces tell us: WKPageCopySessionState returns WKSessionStateRef => Some pointer casts by user => WKSessionStateCopyData(WKSessionStateRef) -> encodeLegacySessionState(sessionState) [Crash] Now: WKPageCopySessionState [try encodeLegacySessionState(sessionState)] returns WKSessionStateRef => pointer casts => WKSessionStateCopyData(WKSessionStateRef) -> encodeLegacySessionState(sessionState) If we start to see crashes in WKPageCopySessionState after this change, we can confirm sessionState is bad before the casts. 371874 2019-06-11 13:46:03 -0700 2019-06-11 14:25:43 -0700 Patch bug-198766-20190611134602.patch text/plain 3182 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzMmExZTY3MGYwN2U0MzEy MmZkNDdiNmM4ZjVmZWRhNDA2YmU4YzIuLmZjYTVjNTkxMGJhMGJlY2Y1YzA0NjhiNDQxMmViOTFm ODRlOWY3MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDYtMTEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFzc2VydGlvbnMgdG8gaGVs cCBkZWJ1ZyBjcmFzaCBhdCBXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpvcGVyYXRv cjw8CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg3 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNo YXJlZC9TZXNzaW9uU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVTdGF0ZTo6fkZyYW1l U3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlQ29weVNlc3Npb25TdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRh RW5jb2Rlcjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6ZW5jb2Rl RnJhbWVTdGF0ZU5vZGUpOgorCiAyMDE5LTA2LTExICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChpT1MpOiBDYW4ndCBzY3JvbGwgbGl0dGVy LXJvYm90LmNvbSBjaGVja291dCBmb3JtJ3MgZHJvcGRvd24gbWVudXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv U2Vzc2lvblN0YXRlLmgKaW5kZXggNjliOTk1NWRlNzdlYzk4YjY0ZDRhNzUyZDE3ODYyZGYyYmE2 MDM4NC4uOTMzMzY4ODBkYTY4MzY5NmFhOTBhM2IyNDg0YjU1ZDk1OGM1YWZjNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKQEAgLTExMSw2ICsxMTEsOSBAQCBzdHJ1Y3QgRnJhbWVT dGF0ZSB7CiAjZW5kaWYKIAogICAgIFZlY3RvcjxGcmFtZVN0YXRlPiBjaGlsZHJlbjsKKworICAg IGJvb2wgaXNEZXN0cnVjdGVkIHsgZmFsc2UgfTsKKyAgICB+RnJhbWVTdGF0ZSgpIHsgaXNEZXN0 cnVjdGVkID0gdHJ1ZTsgfQogfTsKIAogc3RydWN0IFBhZ2VTdGF0ZSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCBlZDg2MzU4MjAxYjRjZWY1YjNmNmIxYTJm NzBmY2I5M2VmYjc2NGYyLi5lMzgxNjVkOGE0OGMxYmU5ZDI0N2UxMTQ1OThiYmNkZGE5MTZjMWE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQ4MCw4ICs0 ODAsOSBAQCBXS1R5cGVSZWYgV0tQYWdlQ29weVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZVJl Ziwgdm9pZCogY29udGV4dCwgV0tQYWdlU2Vzc2lvbgogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9KTsKIAorICAgIGF1dG8mIGRhdGEgPSBlbmNvZGVMZWdhY3lTZXNzaW9uU3RhdGUoc2Vzc2lv blN0YXRlKTsKICAgICBpZiAoc2hvdWxkUmV0dXJuRGF0YSkKLSAgICAgICAgcmV0dXJuIHRvQVBJ KGVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShzZXNzaW9uU3RhdGUpLmxlYWtSZWYoKSk7CisgICAg ICAgIHJldHVybiB0b0FQSShkYXRhLmxlYWtSZWYoKSk7CiAKICAgICByZXR1cm4gdG9BUEkoJkFQ STo6U2Vzc2lvblN0YXRlOjpjcmVhdGUoV1RGTW92ZShzZXNzaW9uU3RhdGUpKS5sZWFrUmVmKCkp OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Np b25TdGF0ZUNvZGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vz c2lvblN0YXRlQ29kaW5nLmNwcAppbmRleCBlYTZjMzc3N2U1MDEzNmNjYTU4NmMzNzQwYzdjYTRi Mjk2NmU5OTQzLi44YWQ2ZDdjZjg1YjM1MjA5YjZjMzIxOWY2ZDNkNzY4YWY1YjY4YzA3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29k aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0 YXRlQ29kaW5nLmNwcApAQCAtMjA4LDYgKzIwOCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGVu Y29kZUZpeGVkTGVuZ3RoRGF0YShjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSwgdW5z aWduZWQgYWxpZ25tZW50KQogICAgIHsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoZGF0YSk7CiAg ICAgICAgIEFTU0VSVCghKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihkYXRhKSAlIGFsaWdu bWVudCkpOwogCiAgICAgICAgIHVpbnQ4X3QqIGJ1ZmZlciA9IGdyb3coYWxpZ25tZW50LCBzaXpl KTsKQEAgLTMxOCw3ICszMTksOSBAQCBzdGF0aWMgdm9pZCBlbmNvZGVGcmFtZVN0YXRlTm9kZShI aXN0b3J5RW50cnlEYXRhRW5jb2RlciYgZW5jb2RlciwgY29uc3QgRnJhbWVTdAogewogICAgIGVu Y29kZXIgPDwgc3RhdGljX2Nhc3Q8dWludDY0X3Q+KGZyYW1lU3RhdGUuY2hpbGRyZW4uc2l6ZSgp KTsKIAorICAgIFJFTEVBU0VfQVNTRVJUKCFmcmFtZVN0YXRlLmlzRGVzdHJ1Y3RlZCk7CiAgICAg Zm9yIChjb25zdCBhdXRvJiBjaGlsZEZyYW1lU3RhdGUgOiBmcmFtZVN0YXRlLmNoaWxkcmVuKSB7 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjaGlsZEZyYW1lU3RhdGUuaXNEZXN0cnVjdGVkKTsK ICAgICAgICAgZW5jb2RlciA8PCBjaGlsZEZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmc7CiAg ICAgICAgIGVuY29kZXIgPDwgY2hpbGRGcmFtZVN0YXRlLnVybFN0cmluZzsKIAo= 371879 2019-06-11 14:25:44 -0700 2019-06-12 09:18:54 -0700 Patch bug-198766-20190611142543.patch text/plain 3181 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzMmExZTY3MGYwN2U0MzEy MmZkNDdiNmM4ZjVmZWRhNDA2YmU4YzIuLmZjYTVjNTkxMGJhMGJlY2Y1YzA0NjhiNDQxMmViOTFm ODRlOWY3MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDYtMTEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFzc2VydGlvbnMgdG8gaGVs cCBkZWJ1ZyBjcmFzaCBhdCBXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpvcGVyYXRv cjw8CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg3 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNo YXJlZC9TZXNzaW9uU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVTdGF0ZTo6fkZyYW1l U3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlQ29weVNlc3Npb25TdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRh RW5jb2Rlcjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6ZW5jb2Rl RnJhbWVTdGF0ZU5vZGUpOgorCiAyMDE5LTA2LTExICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChpT1MpOiBDYW4ndCBzY3JvbGwgbGl0dGVy LXJvYm90LmNvbSBjaGVja291dCBmb3JtJ3MgZHJvcGRvd24gbWVudXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv U2Vzc2lvblN0YXRlLmgKaW5kZXggNjliOTk1NWRlNzdlYzk4YjY0ZDRhNzUyZDE3ODYyZGYyYmE2 MDM4NC4uOTMzMzY4ODBkYTY4MzY5NmFhOTBhM2IyNDg0YjU1ZDk1OGM1YWZjNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKQEAgLTExMSw2ICsxMTEsOSBAQCBzdHJ1Y3QgRnJhbWVT dGF0ZSB7CiAjZW5kaWYKIAogICAgIFZlY3RvcjxGcmFtZVN0YXRlPiBjaGlsZHJlbjsKKworICAg IGJvb2wgaXNEZXN0cnVjdGVkIHsgZmFsc2UgfTsKKyAgICB+RnJhbWVTdGF0ZSgpIHsgaXNEZXN0 cnVjdGVkID0gdHJ1ZTsgfQogfTsKIAogc3RydWN0IFBhZ2VTdGF0ZSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCBlZDg2MzU4MjAxYjRjZWY1YjNmNmIxYTJm NzBmY2I5M2VmYjc2NGYyLi5jY2MzMzBmMzAyNDc2MWZlNzM5NzQ0NTYyMjMwNTI2Njc4Yjc5MDQw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQ4MCw4ICs0 ODAsOSBAQCBXS1R5cGVSZWYgV0tQYWdlQ29weVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZVJl Ziwgdm9pZCogY29udGV4dCwgV0tQYWdlU2Vzc2lvbgogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9KTsKIAorICAgIGF1dG8gZGF0YSA9IGVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShzZXNzaW9u U3RhdGUpOwogICAgIGlmIChzaG91bGRSZXR1cm5EYXRhKQotICAgICAgICByZXR1cm4gdG9BUEko ZW5jb2RlTGVnYWN5U2Vzc2lvblN0YXRlKHNlc3Npb25TdGF0ZSkubGVha1JlZigpKTsKKyAgICAg ICAgcmV0dXJuIHRvQVBJKGRhdGEubGVha1JlZigpKTsKIAogICAgIHJldHVybiB0b0FQSSgmQVBJ OjpTZXNzaW9uU3RhdGU6OmNyZWF0ZShXVEZNb3ZlKHNlc3Npb25TdGF0ZSkpLmxlYWtSZWYoKSk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lv blN0YXRlQ29kaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNz aW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IGVhNmMzNzc3ZTUwMTM2Y2NhNTg2YzM3NDBjN2NhNGIy OTY2ZTk5NDMuLjhhZDZkN2NmODViMzUyMDliNmMzMjE5ZjZkM2Q3NjhhZjViNjhjMDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2Rp bmcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3Rh dGVDb2RpbmcuY3BwCkBAIC0yMDgsNiArMjA4LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZW5j b2RlRml4ZWRMZW5ndGhEYXRhKGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBzaXplLCB1bnNp Z25lZCBhbGlnbm1lbnQpCiAgICAgeworICAgICAgICBSRUxFQVNFX0FTU0VSVChkYXRhKTsKICAg ICAgICAgQVNTRVJUKCEocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGRhdGEpICUgYWxpZ25t ZW50KSk7CiAKICAgICAgICAgdWludDhfdCogYnVmZmVyID0gZ3JvdyhhbGlnbm1lbnQsIHNpemUp OwpAQCAtMzE4LDcgKzMxOSw5IEBAIHN0YXRpYyB2b2lkIGVuY29kZUZyYW1lU3RhdGVOb2RlKEhp c3RvcnlFbnRyeURhdGFFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGcmFtZVN0CiB7CiAgICAgZW5j b2RlciA8PCBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZnJhbWVTdGF0ZS5jaGlsZHJlbi5zaXplKCkp OwogCisgICAgUkVMRUFTRV9BU1NFUlQoIWZyYW1lU3RhdGUuaXNEZXN0cnVjdGVkKTsKICAgICBm b3IgKGNvbnN0IGF1dG8mIGNoaWxkRnJhbWVTdGF0ZSA6IGZyYW1lU3RhdGUuY2hpbGRyZW4pIHsK KyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNoaWxkRnJhbWVTdGF0ZS5pc0Rlc3RydWN0ZWQpOwog ICAgICAgICBlbmNvZGVyIDw8IGNoaWxkRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZzsKICAg ICAgICAgZW5jb2RlciA8PCBjaGlsZEZyYW1lU3RhdGUudXJsU3RyaW5nOwogCg== 371968 2019-06-12 09:18:55 -0700 2019-06-12 14:54:15 -0700 Patch bug-198766-20190612091854.patch text/plain 3172 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ4YWEzNGM4ZjFkNzVhYWRj NDQxOTczNmQ2Mzg0YzM1ZjA0YTQ5ZTEuLjdiYzA3NGYzMjllYTA3MTMxZjZlNjE3ZTljNzVjMWUx MzI2NDgyNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDYtMTEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFzc2VydGlvbnMgdG8gaGVs cCBkZWJ1ZyBjcmFzaCBhdCBXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpvcGVyYXRv cjw8CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg3 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNo YXJlZC9TZXNzaW9uU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVTdGF0ZTo6fkZyYW1l U3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlQ29weVNlc3Npb25TdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRh RW5jb2Rlcjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6ZW5jb2Rl RnJhbWVTdGF0ZU5vZGUpOgorCiAyMDE5LTA2LTExICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICBTY3JvbGxiYXIgY2FuIHNob3cgYXMgd2hpdGUgb24gd2hp dGUgaW4gZGFyayBtb2RlIG9uIGlPUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1Nlc3Npb25TdGF0ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKaW5k ZXggNjliOTk1NWRlNzdlYzk4YjY0ZDRhNzUyZDE3ODYyZGYyYmE2MDM4NC4uOTMzMzY4ODBkYTY4 MzY5NmFhOTBhM2IyNDg0YjU1ZDk1OGM1YWZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvU2Vzc2lvblN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0 YXRlLmgKQEAgLTExMSw2ICsxMTEsOSBAQCBzdHJ1Y3QgRnJhbWVTdGF0ZSB7CiAjZW5kaWYKIAog ICAgIFZlY3RvcjxGcmFtZVN0YXRlPiBjaGlsZHJlbjsKKworICAgIGJvb2wgaXNEZXN0cnVjdGVk IHsgZmFsc2UgfTsKKyAgICB+RnJhbWVTdGF0ZSgpIHsgaXNEZXN0cnVjdGVkID0gdHJ1ZTsgfQog fTsKIAogc3RydWN0IFBhZ2VTdGF0ZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmNwcAppbmRleCBlZDg2MzU4MjAxYjRjZWY1YjNmNmIxYTJmNzBmY2I5M2VmYjc2NGYyLi5j Y2MzMzBmMzAyNDc2MWZlNzM5NzQ0NTYyMjMwNTI2Njc4Yjc5MDQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQ4MCw4ICs0ODAsOSBAQCBXS1R5cGVSZWYg V0tQYWdlQ29weVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZVJlZiwgdm9pZCogY29udGV4dCwg V0tQYWdlU2Vzc2lvbgogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9KTsKIAorICAgIGF1dG8g ZGF0YSA9IGVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShzZXNzaW9uU3RhdGUpOwogICAgIGlmIChz aG91bGRSZXR1cm5EYXRhKQotICAgICAgICByZXR1cm4gdG9BUEkoZW5jb2RlTGVnYWN5U2Vzc2lv blN0YXRlKHNlc3Npb25TdGF0ZSkubGVha1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHRvQVBJKGRh dGEubGVha1JlZigpKTsKIAogICAgIHJldHVybiB0b0FQSSgmQVBJOjpTZXNzaW9uU3RhdGU6OmNy ZWF0ZShXVEZNb3ZlKHNlc3Npb25TdGF0ZSkpLmxlYWtSZWYoKSk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3Bw CmluZGV4IGVhNmMzNzc3ZTUwMTM2Y2NhNTg2YzM3NDBjN2NhNGIyOTY2ZTk5NDMuLjkwNzJlZDY0 NzUyM2Q5MWM0YWE1MjhmZWU1MWM0NjkwNjJjODNhZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCkBAIC0y MDgsNiArMjA4LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZW5jb2RlRml4ZWRMZW5ndGhEYXRh KGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBzaXplLCB1bnNpZ25lZCBhbGlnbm1lbnQpCiAg ICAgeworICAgICAgICBSRUxFQVNFX0FTU0VSVChkYXRhIHx8ICFzaXplKTsKICAgICAgICAgQVNT RVJUKCEocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGRhdGEpICUgYWxpZ25tZW50KSk7CiAK ICAgICAgICAgdWludDhfdCogYnVmZmVyID0gZ3JvdyhhbGlnbm1lbnQsIHNpemUpOwpAQCAtMzE4 LDcgKzMxOSw5IEBAIHN0YXRpYyB2b2lkIGVuY29kZUZyYW1lU3RhdGVOb2RlKEhpc3RvcnlFbnRy eURhdGFFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGcmFtZVN0CiB7CiAgICAgZW5jb2RlciA8PCBz dGF0aWNfY2FzdDx1aW50NjRfdD4oZnJhbWVTdGF0ZS5jaGlsZHJlbi5zaXplKCkpOwogCisgICAg UkVMRUFTRV9BU1NFUlQoIWZyYW1lU3RhdGUuaXNEZXN0cnVjdGVkKTsKICAgICBmb3IgKGNvbnN0 IGF1dG8mIGNoaWxkRnJhbWVTdGF0ZSA6IGZyYW1lU3RhdGUuY2hpbGRyZW4pIHsKKyAgICAgICAg UkVMRUFTRV9BU1NFUlQoIWNoaWxkRnJhbWVTdGF0ZS5pc0Rlc3RydWN0ZWQpOwogICAgICAgICBl bmNvZGVyIDw8IGNoaWxkRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZzsKICAgICAgICAgZW5j b2RlciA8PCBjaGlsZEZyYW1lU3RhdGUudXJsU3RyaW5nOwogCg== 371990 2019-06-12 14:54:17 -0700 2019-06-12 15:36:37 -0700 Patch for landing bug-198766-20190612145416.patch text/plain 3259 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhZjJhZTkyYWVjOGRkY2I2 ZGIyZTQzMTUwNThkZjhkNjEwNGNmNTAuLjJiY2Y5ZDFjNGY3ZGIyZmE5OTI4YWExOGFkYmE2YmY1 YTM3NGI4NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDYtMTIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFzc2VydGlvbnMgdG8gaGVs cCBkZWJ1ZyBjcmFzaCBhdCBXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpvcGVyYXRv cjw8CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg3 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KKworICAgICAgICAqIFNo YXJlZC9TZXNzaW9uU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVTdGF0ZTo6fkZyYW1l U3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlQ29weVNlc3Npb25TdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRh RW5jb2Rlcjo6ZW5jb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6ZW5jb2Rl RnJhbWVTdGF0ZU5vZGUpOgorCiAyMDE5LTA2LTEyICBMdWRvdmljbyBkZSBOaXR0aXMgIDxsdWRv dmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgogCiAgICAgICAgIFtHVEtdIEdUS19TVE9DS18q IHR5cGVzIGhhdmUgYmVlbiBkZXByZWNhdGVkIHNpbmNlIEdUSyAzLjEwCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9TZXNzaW9uU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1Nlc3Npb25TdGF0ZS5oCmluZGV4IDY5Yjk5NTVkZTc3ZWM5OGI2NGQ0YTc1MmQxNzg2MmRmMmJh NjAzODQuLmEzMjlmOTUzMzEwNTYzZmNjYTVkZmM2YzM2MGRiNWYzMTBlYmUzN2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCkBAIC0xMTEsNiArMTExLDEwIEBAIHN0cnVjdCBGcmFt ZVN0YXRlIHsKICNlbmRpZgogCiAgICAgVmVjdG9yPEZyYW1lU3RhdGU+IGNoaWxkcmVuOworCisg ICAgLy8gVGhpcyBpcyBvbmx5IHVzZWQgdG8gaGVscCBkZWJ1ZyA8cmRhcjovL3Byb2JsZW0vNDg2 MzQ1NTM+LgorICAgIGJvb2wgaXNEZXN0cnVjdGVkIHsgZmFsc2UgfTsKKyAgICB+RnJhbWVTdGF0 ZSgpIHsgaXNEZXN0cnVjdGVkID0gdHJ1ZTsgfQogfTsKIAogc3RydWN0IFBhZ2VTdGF0ZSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCBlZDg2MzU4MjAxYjRj ZWY1YjNmNmIxYTJmNzBmY2I5M2VmYjc2NGYyLi5jY2MzMzBmMzAyNDc2MWZlNzM5NzQ0NTYyMjMw NTI2Njc4Yjc5MDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAK QEAgLTQ4MCw4ICs0ODAsOSBAQCBXS1R5cGVSZWYgV0tQYWdlQ29weVNlc3Npb25TdGF0ZShXS1Bh Z2VSZWYgcGFnZVJlZiwgdm9pZCogY29udGV4dCwgV0tQYWdlU2Vzc2lvbgogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9KTsKIAorICAgIGF1dG8gZGF0YSA9IGVuY29kZUxlZ2FjeVNlc3Npb25T dGF0ZShzZXNzaW9uU3RhdGUpOwogICAgIGlmIChzaG91bGRSZXR1cm5EYXRhKQotICAgICAgICBy ZXR1cm4gdG9BUEkoZW5jb2RlTGVnYWN5U2Vzc2lvblN0YXRlKHNlc3Npb25TdGF0ZSkubGVha1Jl ZigpKTsKKyAgICAgICAgcmV0dXJuIHRvQVBJKGRhdGEubGVha1JlZigpKTsKIAogICAgIHJldHVy biB0b0FQSSgmQVBJOjpTZXNzaW9uU3RhdGU6OmNyZWF0ZShXVEZNb3ZlKHNlc3Npb25TdGF0ZSkp LmxlYWtSZWYoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv TGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IGVhNmMzNzc3ZTUwMTM2Y2NhNTg2 YzM3NDBjN2NhNGIyOTY2ZTk5NDMuLjkwNzJlZDY0NzUyM2Q5MWM0YWE1MjhmZWU1MWM0NjkwNjJj ODNhZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNz aW9uU3RhdGVDb2RpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9MZWdh Y3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCkBAIC0yMDgsNiArMjA4LDcgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgZW5jb2RlRml4ZWRMZW5ndGhEYXRhKGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVf dCBzaXplLCB1bnNpZ25lZCBhbGlnbm1lbnQpCiAgICAgeworICAgICAgICBSRUxFQVNFX0FTU0VS VChkYXRhIHx8ICFzaXplKTsKICAgICAgICAgQVNTRVJUKCEocmVpbnRlcnByZXRfY2FzdDx1aW50 cHRyX3Q+KGRhdGEpICUgYWxpZ25tZW50KSk7CiAKICAgICAgICAgdWludDhfdCogYnVmZmVyID0g Z3JvdyhhbGlnbm1lbnQsIHNpemUpOwpAQCAtMzE4LDcgKzMxOSw5IEBAIHN0YXRpYyB2b2lkIGVu Y29kZUZyYW1lU3RhdGVOb2RlKEhpc3RvcnlFbnRyeURhdGFFbmNvZGVyJiBlbmNvZGVyLCBjb25z dCBGcmFtZVN0CiB7CiAgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZnJhbWVT dGF0ZS5jaGlsZHJlbi5zaXplKCkpOwogCisgICAgUkVMRUFTRV9BU1NFUlQoIWZyYW1lU3RhdGUu aXNEZXN0cnVjdGVkKTsKICAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkRnJhbWVTdGF0ZSA6IGZy YW1lU3RhdGUuY2hpbGRyZW4pIHsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNoaWxkRnJhbWVT dGF0ZS5pc0Rlc3RydWN0ZWQpOwogICAgICAgICBlbmNvZGVyIDw8IGNoaWxkRnJhbWVTdGF0ZS5v cmlnaW5hbFVSTFN0cmluZzsKICAgICAgICAgZW5jb2RlciA8PCBjaGlsZEZyYW1lU3RhdGUudXJs U3RyaW5nOwogCg==