195214 2019-03-01 09:43:59 -0800 Crash in com.apple.WebCore: WebCore::IDBTransaction::pendingOperationTimerFired + 72 2019-03-07 13:43:18 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu alecflett beidson commit-queue ews-watchlist ggaren jsbell ryanhaddad webkit-bug-importer oldest_to_newest 1511430 0 sihui_liu 2019-03-01 09:43:59 -0800 Thread 0 Crashed:: Dispatch queue: com.apple.main-thread => if (!m_transactionOperationsInProgressQueue.isEmpty() && !m_transactionOperationsInProgressQueue.last()->nextRequestCanGoToServer()) 0 com.apple.WebCore 0x000000010b642788 WebCore::IDBTransaction::pendingOperationTimerFired() + 72 1 com.apple.WebCore 0x000000010ab99bf8 WebCore::ThreadTimers::sharedTimerFiredInternal() + 168 2 com.apple.WebCore 0x000000010ab99b3f WebCore::timerFired(__CFRunLoopTimer*, void*) + 31 3 com.apple.CoreFoundation 0x7fff31d65fa5 __CFRUNLOOP_IS_CALLING_OUT_TO_A_TIMER_CALLBACK_FUNCTION__ + 20 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1638.11/CoreFoundation/RunLoop.subproj/CFRunLoop.c:1772) 4 com.apple.CoreFoundation 0x7fff31d65b51 __CFRunLoopDoTimer + 864 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1638.11/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2357) 5 com.apple.CoreFoundation 0x7fff31d6553e __CFRunLoopDoTimers + 320 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1638.11/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2512) 1511431 1 sihui_liu 2019-03-01 09:44:24 -0800 <rdar://problem/48461116> 1511461 2 363346 sihui_liu 2019-03-01 10:48:29 -0800 Created attachment 363346 Patch 1512648 3 ryanhaddad 2019-03-05 08:43:04 -0800 Looks like this passed EWS. Ping for reviewers. 1512739 4 363346 ggaren 2019-03-05 11:52:12 -0800 Comment on attachment 363346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363346&action=review > Source/WebCore/Modules/indexeddb/client/TransactionOperation.h:105 > + if (m_completeFunction) { > + m_completeFunction(data); > + // m_completeFunction might be holding the last ref to this TransactionOperation, > + // so we need to do this trick to null it out without first destroying it. > + Function<void(const IDBResultData&)> oldCompleteFunction; > + std::swap(m_completeFunction, oldCompleteFunction); > + } > m_transaction->operationCompletedOnClient(*this); It seems like a bug that you reference m_transaction after this may have been deleted (by destroying m_completeFunction, which holds the last ref to this TransactionOperation.) Probably the best solution is to use "auto protect = makeRef(this)" at the top of the function. 1512756 5 363346 sihui_liu 2019-03-05 12:18:20 -0800 Comment on attachment 363346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363346&action=review >> Source/WebCore/Modules/indexeddb/client/TransactionOperation.h:105 >> m_transaction->operationCompletedOnClient(*this); > > It seems like a bug that you reference m_transaction after this may have been deleted (by destroying m_completeFunction, which holds the last ref to this TransactionOperation.) > > Probably the best solution is to use "auto protect = makeRef(this)" at the top of the function. In an expected case, operationCompletedOnClient should clear the last ref of a TransactionOperation by removing it from m_transactionOperationMap. I think "the last ref" means if we don't clear the completeFunction here, completeFunction can hold the last ref of TransactionOperation after operationCompletedOnClient. 1512836 6 363346 ggaren 2019-03-05 14:28:01 -0800 Comment on attachment 363346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363346&action=review >>> Source/WebCore/Modules/indexeddb/client/TransactionOperation.h:105 >>> m_transaction->operationCompletedOnClient(*this); >> >> It seems like a bug that you reference m_transaction after this may have been deleted (by destroying m_completeFunction, which holds the last ref to this TransactionOperation.) >> >> Probably the best solution is to use "auto protect = makeRef(this)" at the top of the function. > > In an expected case, operationCompletedOnClient should clear the last ref of a TransactionOperation by removing it from m_transactionOperationMap. > > I think "the last ref" means if we don't clear the completeFunction here, completeFunction can hold the last ref of TransactionOperation after operationCompletedOnClient. Previously, this function deallocated m_completeFunction *after* loading and using this->m_transaction. This patch makes a change to deallocate m_completeFunction *before* loading and using this->m_transaction. If deallocating m_completeFunction might delete 'this', then this patch introduces a use of this->m_transaction after free. 1512924 7 363714 sihui_liu 2019-03-05 17:32:24 -0800 Created attachment 363714 Patch 1513288 8 363714 ggaren 2019-03-06 16:48:32 -0800 Comment on attachment 363714 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363714&action=review r=me > Source/WebCore/Modules/indexeddb/client/TransactionOperation.h:144 > + bool m_doneComplete { false }; We usually use 'did' instead of 'done'. So, I would name this 'm_didComplete'. 1513653 9 363912 sihui_liu 2019-03-07 12:53:27 -0800 Created attachment 363912 Patch for landing 1513673 10 commit-queue 2019-03-07 13:42:35 -0800 The commit-queue encountered the following flaky tests while processing attachment 363912: legacy-animation-engine/fast/layers/no-clipping-overflow-hidden-hardware-acceleration.html bug 195431 (authors: dino@apple.com and graouts@apple.com) The commit-queue is continuing to process your patch. 1513674 11 363912 commit-queue 2019-03-07 13:43:16 -0800 Comment on attachment 363912 Patch for landing Clearing flags on attachment: 363912 Committed r242608: <https://trac.webkit.org/changeset/242608> 1513675 12 commit-queue 2019-03-07 13:43:18 -0800 All reviewed patches have been landed. Closing bug. 363346 2019-03-01 10:48:29 -0800 2019-03-05 17:32:23 -0800 Patch bug-195214-20190301104828.patch text/plain 4249 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTI1ODk4YmNjN2YxMjE0 Zjc0YTMyZDU5MWZmMmFhY2E1ZDZhYmIzOS4uNmUyN2QyNDZjMDY2OWNkYzUxYThlZGU5MDU0ODIy NTdmMmFmMDQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTAxICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIGluIGNvbS5hcHBs ZS5XZWJDb3JlOiBXZWJDb3JlOjpJREJUcmFuc2FjdGlvbjo6cGVuZGluZ09wZXJhdGlvblRpbWVy RmlyZWQgKyA3MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1MjE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODQ2MTExNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIElEQlRyYW5zYWN0aW9u IGlzIHJlYWR5IHRvIGNvbW1pdCwgYSBjb21taXQgb3BlcmF0aW9uIHdvdWxkIGJlIHNjaGVkdWxl IHRvIAorICAgICAgICBtX3BlbmRpbmdUcmFuc2FjdGlvbk9wZXJhdGlvblF1ZXVlLiBJZiBjb25u ZWN0aW9uIHRvIElEQlNlcnZlciBpcyBsb3N0LCBwZW5kaW5nIG9wZXJhdGlvbnMgYXJlIG1vdmVk IHRvIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3BlcmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBhbmQg d2lsbCBiZSBjb21wbGV0ZWQgd2l0aCBUcmFuc2FjdGlvbk9wZXJhdGlvbjo6ZG9Db21wbGV0ZS4g ZG9Db21wbGV0ZSAKKyAgICAgICAgZXhlY3V0ZXMgY29tcGxldGUgZnVuY3Rpb24gb2YgdGhlIG9w ZXJhdGlvbiwgY2xlYXJzIHRoZSBjb21wbGV0ZSBmdW5jdGlvbiwgYW5kIHRoZW4gcmVtb3ZlcyB0 aGUgb3BlcmF0aW9uIGZyb20gCisgICAgICAgIG1fdHJhbnNhY3Rpb25PcGVyYXRpb25zSW5Qcm9n cmVzc1F1ZXVlLiBJbiBkb0NvbXBsZXRlLCB3ZSBkbyBlYXJseSByZXR1cm4gd2hlbiBjb21wbGV0 ZSBmdW5jdGlvbiBpcyBudWxsLCAKKyAgICAgICAgc2luY2UgdGhlIGRvQ29tcGxldGUgY291bGQg YmUgaW52b2tlZCB0d2ljZSBkdWUgdG8gdGhlIHJhY2UgY29uZGl0aW9ucyBiZXR3ZWVuIHJlY2Vp dmluZyAib3BlcmF0aW9uIGNvbXBsZXRlIiAKKyAgICAgICAgbWVzc2FnZSBmcm9tIHNlcnZlciBh bmQgY2xpZW50LXNpZGUgYWJvcnQuCisKKyAgICAgICAgSG93ZXZlciwgY29tbWl0IG9wZXJhdGlv biBkb2VzIG5vdCBoYXZlIGEgY29tcGxldGUgZnVuY3Rpb24gYmVjYXVzZSBpdCBzaG91bGQgYmUg dGhlIGxhc3Qgb3BlcmF0aW9uIG9mIAorICAgICAgICB0cmFuc2FjdGlvbiBhbmQgaXQgZ2V0cyBy ZW1vdmVkIGZyb20gcXVldWUgaW4gaXRzIHBlcmZvcm0gZnVuY3Rpb24uIEEgY29tbWl0IG9wZXJh dGlvbiB3b3VsZCBub3QgYmUgcmVtb3ZlZCBmcm9tIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBiZWNhdXNlIG9mIHRoZSBlYXJseSByZXR1cm4uIEl0IHdv dWxkIGJlIHJlbW92ZWQgZnJvbSAKKyAgICAgICAgbV90cmFuc2FjdGlvbk9wZXJhdGlvbk1hcCwg d2hpY2ggbWF5IGhvbGQgdGhlIGxhc3QgcmVmIHRvIHRoZSBjb21taXQgb3BlcmF0aW9uLCBpbiAK KyAgICAgICAgSURCVHJhbnNhY3Rpb246OmNvbm5lY3Rpb25DbG9zZWRGcm9tU2VydmVyLiBJbiB0 aGlzIGNhc2UsIHdoZW4gcGVuZGluZ09wZXJhdGlvblRpbWVyRmlyZWQgaXMgY2FsbGVkIGxhdGVy LCB0aGUgCisgICAgICAgIGNvbW1pdCBvcGVyYXRpb24gbGVmdCBpbiBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSB3b3VsZCBiZSB1c2VkIGFuZCBmb3VuZCB0byBiZSBmcmVl ZC4gV2Ugc2hvdWxkCisgICAgICAgIG5vdCB1c2UgbnVsbCBjaGVjayBvZiBjb21wbGV0ZSBmdW5j dGlvbiB0byBkZWNpZGUgd2hldGhlciBhbiBvcGVyYXRpb24gaXMgY29tcGxldGVkLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmg6Cisg ICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OlRyYW5zYWN0aW9uT3BlcmF0aW9uOjpkb0NvbXBs ZXRlKToKKwogMjAxOS0wMi0yOCAgSnVzdGluIEZhbiAgPGp1c3Rpbl9mYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtXZWIgR1BVXSBFbmFibGUgV2ViIEdQVSBvbmx5IG9uIDY0LWJpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9u T3BlcmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvVHJh bnNhY3Rpb25PcGVyYXRpb24uaAppbmRleCBhMzBhYmZiZTVjMTMzM2NmMDMxMWY1NDkwOGNmZGQ5 MGVhNTY4NjFkLi5hM2JiMTYxNTMzZmM1NGI4MGM3MDQ3OTQ4N2JlZDRhMDMxZTYwOTllIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvVHJhbnNhY3Rp b25PcGVyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvVHJhbnNhY3Rpb25PcGVyYXRpb24uaApAQCAtOTEsMTYgKzkxLDE4IEBAIHB1YmxpYzoKICAg ICAgICAgLy8gRHVlIHRvIHJhY2UgY29uZGl0aW9ucyBiZXR3ZWVuIHRoZSBzZXJ2ZXIgc2VuZGlu ZyBhbiAib3BlcmF0aW9uIGNvbXBsZXRlIiBtZXNzYWdlIGFuZCB0aGUgY2xpZW50CiAgICAgICAg IC8vIGZvcmNlZnVsbHkgYWJvcnRpbmcgYW4gb3BlcmF0aW9uLCBpdCdzIHVuYXZvaWRhYmxlIHRo YXQgdGhpcyBtZXRob2QgbWlnaHQgYmUgY2FsbGVkIHR3aWNlLgogICAgICAgICAvLyBJdCdzIG9r YXkgdG8gaGFuZGxlIHRoYXQgZ3JhY2VmdWxseSB3aXRoIGFuIGVhcmx5IHJldHVybi4KLSAgICAg ICAgaWYgKCFtX2NvbXBsZXRlRnVuY3Rpb24pCisgICAgICAgIGlmIChtX2RvbmVDb21wbGV0ZSkK ICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBtX2NvbXBsZXRlRnVuY3Rpb24oZGF0YSk7 CisgICAgICAgIG1fZG9uZUNvbXBsZXRlID0gdHJ1ZTsKKworICAgICAgICBpZiAobV9jb21wbGV0 ZUZ1bmN0aW9uKSB7CisgICAgICAgICAgICBtX2NvbXBsZXRlRnVuY3Rpb24oZGF0YSk7CisgICAg ICAgICAgICAvLyBtX2NvbXBsZXRlRnVuY3Rpb24gbWlnaHQgYmUgaG9sZGluZyB0aGUgbGFzdCBy ZWYgdG8gdGhpcyBUcmFuc2FjdGlvbk9wZXJhdGlvbiwKKyAgICAgICAgICAgIC8vIHNvIHdlIG5l ZWQgdG8gZG8gdGhpcyB0cmljayB0byBudWxsIGl0IG91dCB3aXRob3V0IGZpcnN0IGRlc3Ryb3lp bmcgaXQuCisgICAgICAgICAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IElEQlJlc3VsdERhdGEmKT4g b2xkQ29tcGxldGVGdW5jdGlvbjsKKyAgICAgICAgICAgIHN0ZDo6c3dhcChtX2NvbXBsZXRlRnVu Y3Rpb24sIG9sZENvbXBsZXRlRnVuY3Rpb24pOworICAgICAgICB9CiAgICAgICAgIG1fdHJhbnNh Y3Rpb24tPm9wZXJhdGlvbkNvbXBsZXRlZE9uQ2xpZW50KCp0aGlzKTsKLQotICAgICAgICAvLyBt X2NvbXBsZXRlRnVuY3Rpb24gbWlnaHQgYmUgaG9sZGluZyB0aGUgbGFzdCByZWYgdG8gdGhpcyBU cmFuc2FjdGlvbk9wZXJhdGlvbiwKLSAgICAgICAgLy8gc28gd2UgbmVlZCB0byBkbyB0aGlzIHRy aWNrIHRvIG51bGwgaXQgb3V0IHdpdGhvdXQgZmlyc3QgZGVzdHJveWluZyBpdC4KLSAgICAgICAg RnVuY3Rpb248dm9pZChjb25zdCBJREJSZXN1bHREYXRhJik+IG9sZENvbXBsZXRlRnVuY3Rpb247 Ci0gICAgICAgIHN0ZDo6c3dhcChtX2NvbXBsZXRlRnVuY3Rpb24sIG9sZENvbXBsZXRlRnVuY3Rp b24pOwogICAgIH0KIAogICAgIGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgaWRlbnRpZmll cigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQpAQCAtMTQxLDYgKzE0Myw3IEBAIHBy aXZhdGU6CiAgICAgUmVmPFRocmVhZD4gbV9vcmlnaW5UaHJlYWQgeyBUaHJlYWQ6OmN1cnJlbnQo KSB9OwogICAgIFJlZlB0cjxJREJSZXF1ZXN0PiBtX2lkYlJlcXVlc3Q7CiAgICAgYm9vbCBtX25l eHRSZXF1ZXN0Q2FuR29Ub1NlcnZlciB7IHRydWUgfTsKKyAgICBib29sIG1fZG9uZUNvbXBsZXRl IHsgZmFsc2UgfTsKIH07CiAKIGNsYXNzIFRyYW5zYWN0aW9uT3BlcmF0aW9uSW1wbCBmaW5hbCA6 IHB1YmxpYyBUcmFuc2FjdGlvbk9wZXJhdGlvbiB7Cg== 363714 2019-03-05 17:32:24 -0800 2019-03-07 12:53:26 -0800 Patch bug-195214-20190305173224.patch text/plain 4124 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjNlYmYyMzQ5NTdkY2Jl Yzg4YzYzM2FjZDE2ZDU4ZGU2ZGNmODcxYS4uZTdmY2MyNDlkNTk4NzhjNzllNTUxMDc2NTc3MjYz ZWFmMTAxYzJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTA1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIGluIGNvbS5hcHBs ZS5XZWJDb3JlOiBXZWJDb3JlOjpJREJUcmFuc2FjdGlvbjo6cGVuZGluZ09wZXJhdGlvblRpbWVy RmlyZWQgKyA3MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1MjE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODQ2MTExNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIElEQlRyYW5zYWN0aW9u IGlzIHJlYWR5IHRvIGNvbW1pdCwgYSBjb21taXQgb3BlcmF0aW9uIHdvdWxkIGJlIHNjaGVkdWxl IHRvIAorICAgICAgICBtX3BlbmRpbmdUcmFuc2FjdGlvbk9wZXJhdGlvblF1ZXVlLiBJZiBjb25u ZWN0aW9uIHRvIElEQlNlcnZlciBpcyBsb3N0LCBwZW5kaW5nIG9wZXJhdGlvbnMgYXJlIG1vdmVk IHRvIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3BlcmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBhbmQg d2lsbCBiZSBjb21wbGV0ZWQgd2l0aCBUcmFuc2FjdGlvbk9wZXJhdGlvbjo6ZG9Db21wbGV0ZS4g ZG9Db21wbGV0ZSAKKyAgICAgICAgZXhlY3V0ZXMgY29tcGxldGUgZnVuY3Rpb24gb2YgdGhlIG9w ZXJhdGlvbiwgY2xlYXJzIHRoZSBjb21wbGV0ZSBmdW5jdGlvbiwgYW5kIHRoZW4gcmVtb3ZlcyB0 aGUgb3BlcmF0aW9uIGZyb20gCisgICAgICAgIG1fdHJhbnNhY3Rpb25PcGVyYXRpb25zSW5Qcm9n cmVzc1F1ZXVlLiBJbiBkb0NvbXBsZXRlLCB3ZSBkbyBlYXJseSByZXR1cm4gd2hlbiBjb21wbGV0 ZSBmdW5jdGlvbiBpcyBudWxsLCAKKyAgICAgICAgc2luY2UgdGhlIGRvQ29tcGxldGUgY291bGQg YmUgaW52b2tlZCB0d2ljZSBkdWUgdG8gdGhlIHJhY2UgY29uZGl0aW9ucyBiZXR3ZWVuIHJlY2Vp dmluZyAib3BlcmF0aW9uIGNvbXBsZXRlIiAKKyAgICAgICAgbWVzc2FnZSBmcm9tIHNlcnZlciBh bmQgY2xpZW50LXNpZGUgYWJvcnQuCisKKyAgICAgICAgSG93ZXZlciwgY29tbWl0IG9wZXJhdGlv biBkb2VzIG5vdCBoYXZlIGEgY29tcGxldGUgZnVuY3Rpb24gYmVjYXVzZSBpdCBzaG91bGQgYmUg dGhlIGxhc3Qgb3BlcmF0aW9uIG9mIAorICAgICAgICB0cmFuc2FjdGlvbiBhbmQgaXQgZ2V0cyBy ZW1vdmVkIGZyb20gcXVldWUgaW4gaXRzIHBlcmZvcm0gZnVuY3Rpb24uIEEgY29tbWl0IG9wZXJh dGlvbiB3b3VsZCBub3QgYmUgcmVtb3ZlZCBmcm9tIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBiZWNhdXNlIG9mIHRoZSBlYXJseSByZXR1cm4uIEl0IHdv dWxkIGJlIHJlbW92ZWQgZnJvbSAKKyAgICAgICAgbV90cmFuc2FjdGlvbk9wZXJhdGlvbk1hcCwg d2hpY2ggbWF5IGhvbGQgdGhlIGxhc3QgcmVmIHRvIHRoZSBjb21taXQgb3BlcmF0aW9uLCBpbiAK KyAgICAgICAgSURCVHJhbnNhY3Rpb246OmNvbm5lY3Rpb25DbG9zZWRGcm9tU2VydmVyLiBJbiB0 aGlzIGNhc2UsIHdoZW4gcGVuZGluZ09wZXJhdGlvblRpbWVyRmlyZWQgaXMgY2FsbGVkIGxhdGVy LCB0aGUgCisgICAgICAgIGNvbW1pdCBvcGVyYXRpb24gbGVmdCBpbiBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSB3b3VsZCBiZSB1c2VkIGFuZCBmb3VuZCB0byBiZSBmcmVl ZC4gV2Ugc2hvdWxkCisgICAgICAgIG5vdCB1c2UgbnVsbCBjaGVjayBvZiBjb21wbGV0ZSBmdW5j dGlvbiB0byBkZWNpZGUgd2hldGhlciBhbiBvcGVyYXRpb24gaXMgY29tcGxldGVkLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmg6Cisg ICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OlRyYW5zYWN0aW9uT3BlcmF0aW9uOjpkb0NvbXBs ZXRlKToKKwogMjAxOS0wMy0wNSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10gU2hvdWxkIG5vdCBzY3JvbGwgd2hlbiBjaGVja2JveCwgcmFkaW8sIHN1 Ym1pdCwgcmVzZXQsIG9yIGJ1dHRvbiBpcyBzcGFjZWJhciBhY3RpdmF0ZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9UcmFuc2FjdGlvbk9wZXJh dGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0 aW9uT3BlcmF0aW9uLmgKaW5kZXggYTMwYWJmYmU1YzEzMzNjZjAzMTFmNTQ5MDhjZmRkOTBlYTU2 ODYxZC4uZTk4NzUxNGMzMzBmMDcxYThjZDFkYjViOTMwYWQ1Y2U4YzZjNDE3NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3Bl cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1Ry YW5zYWN0aW9uT3BlcmF0aW9uLmgKQEAgLTkxLDE2ICs5MSwxNiBAQCBwdWJsaWM6CiAgICAgICAg IC8vIER1ZSB0byByYWNlIGNvbmRpdGlvbnMgYmV0d2VlbiB0aGUgc2VydmVyIHNlbmRpbmcgYW4g Im9wZXJhdGlvbiBjb21wbGV0ZSIgbWVzc2FnZSBhbmQgdGhlIGNsaWVudAogICAgICAgICAvLyBm b3JjZWZ1bGx5IGFib3J0aW5nIGFuIG9wZXJhdGlvbiwgaXQncyB1bmF2b2lkYWJsZSB0aGF0IHRo aXMgbWV0aG9kIG1pZ2h0IGJlIGNhbGxlZCB0d2ljZS4KICAgICAgICAgLy8gSXQncyBva2F5IHRv IGhhbmRsZSB0aGF0IGdyYWNlZnVsbHkgd2l0aCBhbiBlYXJseSByZXR1cm4uCi0gICAgICAgIGlm ICghbV9jb21wbGV0ZUZ1bmN0aW9uKQorICAgICAgICBpZiAobV9kb25lQ29tcGxldGUpCiAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIG1fZG9uZUNvbXBsZXRlID0gdHJ1ZTsKIAotICAgICAg ICBtX2NvbXBsZXRlRnVuY3Rpb24oZGF0YSk7CisgICAgICAgIGlmIChtX2NvbXBsZXRlRnVuY3Rp b24pIHsKKyAgICAgICAgICAgIG1fY29tcGxldGVGdW5jdGlvbihkYXRhKTsKKyAgICAgICAgICAg IC8vIG1fY29tcGxldGVGdW5jdGlvbiBzaG91bGQgbm90IGhvbGQgcmVmIHRvIHRoaXMgVHJhbnNh Y3Rpb25PcGVyYXRpb24gYWZ0ZXIgaXRzIGV4ZWN1dGlvbi4KKyAgICAgICAgICAgIG1fY29tcGxl dGVGdW5jdGlvbiA9IHsgfTsKKyAgICAgICAgfQogICAgICAgICBtX3RyYW5zYWN0aW9uLT5vcGVy YXRpb25Db21wbGV0ZWRPbkNsaWVudCgqdGhpcyk7Ci0KLSAgICAgICAgLy8gbV9jb21wbGV0ZUZ1 bmN0aW9uIG1pZ2h0IGJlIGhvbGRpbmcgdGhlIGxhc3QgcmVmIHRvIHRoaXMgVHJhbnNhY3Rpb25P cGVyYXRpb24sCi0gICAgICAgIC8vIHNvIHdlIG5lZWQgdG8gZG8gdGhpcyB0cmljayB0byBudWxs IGl0IG91dCB3aXRob3V0IGZpcnN0IGRlc3Ryb3lpbmcgaXQuCi0gICAgICAgIEZ1bmN0aW9uPHZv aWQoY29uc3QgSURCUmVzdWx0RGF0YSYpPiBvbGRDb21wbGV0ZUZ1bmN0aW9uOwotICAgICAgICBz dGQ6OnN3YXAobV9jb21wbGV0ZUZ1bmN0aW9uLCBvbGRDb21wbGV0ZUZ1bmN0aW9uKTsKICAgICB9 CiAKICAgICBjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIGlkZW50aWZpZXIoKSBjb25zdCB7 IHJldHVybiBtX2lkZW50aWZpZXI7IH0KQEAgLTE0MSw2ICsxNDEsNyBAQCBwcml2YXRlOgogICAg IFJlZjxUaHJlYWQ+IG1fb3JpZ2luVGhyZWFkIHsgVGhyZWFkOjpjdXJyZW50KCkgfTsKICAgICBS ZWZQdHI8SURCUmVxdWVzdD4gbV9pZGJSZXF1ZXN0OwogICAgIGJvb2wgbV9uZXh0UmVxdWVzdENh bkdvVG9TZXJ2ZXIgeyB0cnVlIH07CisgICAgYm9vbCBtX2RvbmVDb21wbGV0ZSB7IGZhbHNlIH07 CiB9OwogCiBjbGFzcyBUcmFuc2FjdGlvbk9wZXJhdGlvbkltcGwgZmluYWwgOiBwdWJsaWMgVHJh bnNhY3Rpb25PcGVyYXRpb24gewo= 363912 2019-03-07 12:53:27 -0800 2019-03-07 13:43:16 -0800 Patch for landing bug-195214-20190307125327.patch text/plain 4151 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2YzJkYjFmNGFlMDQy ZWNhNDM0OTg4OTA0NTEwM2Y0N2JkMzU4NS4uMzJkYzY0ZjJjODRlYzIwNjY4MWVkOTYyY2ZiOGNm ODI3Nzg4OGYzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTA3ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIGluIGNvbS5hcHBs ZS5XZWJDb3JlOiBXZWJDb3JlOjpJREJUcmFuc2FjdGlvbjo6cGVuZGluZ09wZXJhdGlvblRpbWVy RmlyZWQgKyA3MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1MjE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODQ2MTExNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KKworICAgICAgICBXaGVuIElEQlRyYW5zYWN0aW9u IGlzIHJlYWR5IHRvIGNvbW1pdCwgYSBjb21taXQgb3BlcmF0aW9uIHdvdWxkIGJlIHNjaGVkdWxl IHRvIAorICAgICAgICBtX3BlbmRpbmdUcmFuc2FjdGlvbk9wZXJhdGlvblF1ZXVlLiBJZiBjb25u ZWN0aW9uIHRvIElEQlNlcnZlciBpcyBsb3N0LCBwZW5kaW5nIG9wZXJhdGlvbnMgYXJlIG1vdmVk IHRvIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3BlcmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBhbmQg d2lsbCBiZSBjb21wbGV0ZWQgd2l0aCBUcmFuc2FjdGlvbk9wZXJhdGlvbjo6ZG9Db21wbGV0ZS4g ZG9Db21wbGV0ZSAKKyAgICAgICAgZXhlY3V0ZXMgY29tcGxldGUgZnVuY3Rpb24gb2YgdGhlIG9w ZXJhdGlvbiwgY2xlYXJzIHRoZSBjb21wbGV0ZSBmdW5jdGlvbiwgYW5kIHRoZW4gcmVtb3ZlcyB0 aGUgb3BlcmF0aW9uIGZyb20gCisgICAgICAgIG1fdHJhbnNhY3Rpb25PcGVyYXRpb25zSW5Qcm9n cmVzc1F1ZXVlLiBJbiBkb0NvbXBsZXRlLCB3ZSBkbyBlYXJseSByZXR1cm4gd2hlbiBjb21wbGV0 ZSBmdW5jdGlvbiBpcyBudWxsLCAKKyAgICAgICAgc2luY2UgdGhlIGRvQ29tcGxldGUgY291bGQg YmUgaW52b2tlZCB0d2ljZSBkdWUgdG8gdGhlIHJhY2UgY29uZGl0aW9ucyBiZXR3ZWVuIHJlY2Vp dmluZyAib3BlcmF0aW9uIGNvbXBsZXRlIiAKKyAgICAgICAgbWVzc2FnZSBmcm9tIHNlcnZlciBh bmQgY2xpZW50LXNpZGUgYWJvcnQuCisKKyAgICAgICAgSG93ZXZlciwgY29tbWl0IG9wZXJhdGlv biBkb2VzIG5vdCBoYXZlIGEgY29tcGxldGUgZnVuY3Rpb24gYmVjYXVzZSBpdCBzaG91bGQgYmUg dGhlIGxhc3Qgb3BlcmF0aW9uIG9mIAorICAgICAgICB0cmFuc2FjdGlvbiBhbmQgaXQgZ2V0cyBy ZW1vdmVkIGZyb20gcXVldWUgaW4gaXRzIHBlcmZvcm0gZnVuY3Rpb24uIEEgY29tbWl0IG9wZXJh dGlvbiB3b3VsZCBub3QgYmUgcmVtb3ZlZCBmcm9tIAorICAgICAgICBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSBiZWNhdXNlIG9mIHRoZSBlYXJseSByZXR1cm4uIEl0IHdv dWxkIGJlIHJlbW92ZWQgZnJvbSAKKyAgICAgICAgbV90cmFuc2FjdGlvbk9wZXJhdGlvbk1hcCwg d2hpY2ggbWF5IGhvbGQgdGhlIGxhc3QgcmVmIHRvIHRoZSBjb21taXQgb3BlcmF0aW9uLCBpbiAK KyAgICAgICAgSURCVHJhbnNhY3Rpb246OmNvbm5lY3Rpb25DbG9zZWRGcm9tU2VydmVyLiBJbiB0 aGlzIGNhc2UsIHdoZW4gcGVuZGluZ09wZXJhdGlvblRpbWVyRmlyZWQgaXMgY2FsbGVkIGxhdGVy LCB0aGUgCisgICAgICAgIGNvbW1pdCBvcGVyYXRpb24gbGVmdCBpbiBtX3RyYW5zYWN0aW9uT3Bl cmF0aW9uc0luUHJvZ3Jlc3NRdWV1ZSB3b3VsZCBiZSB1c2VkIGFuZCBmb3VuZCB0byBiZSBmcmVl ZC4gV2Ugc2hvdWxkCisgICAgICAgIG5vdCB1c2UgbnVsbCBjaGVjayBvZiBjb21wbGV0ZSBmdW5j dGlvbiB0byBkZWNpZGUgd2hldGhlciBhbiBvcGVyYXRpb24gaXMgY29tcGxldGVkLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmg6Cisg ICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OlRyYW5zYWN0aW9uT3BlcmF0aW9uOjpkb0NvbXBs ZXRlKToKKwogMjAxOS0wMy0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TIFdLXSBSRUdSRVNTSU9OIChyMjQyMTMyKTogRml4ZWQgcG9zaXRp b24gYmFubmVycyBmbGlja2VyIGFuZCBtb3ZlIHdoZW4gc2Nyb2xsaW5nIChBcHBsZSwgVGVzbGEs IFlvdVR1YmUsIFJlZGRpdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9UcmFuc2FjdGlvbk9wZXJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmgKaW5kZXggYTMwYWJm YmU1YzEzMzNjZjAzMTFmNTQ5MDhjZmRkOTBlYTU2ODYxZC4uOWU3M2EwMTEyY2M4MTJmNjVjOTkz NDkyNzFkMjdhYTYwYzM4ZDYyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L1RyYW5zYWN0aW9uT3BlcmF0aW9uLmgKQEAgLTkx LDE2ICs5MSwxNiBAQCBwdWJsaWM6CiAgICAgICAgIC8vIER1ZSB0byByYWNlIGNvbmRpdGlvbnMg YmV0d2VlbiB0aGUgc2VydmVyIHNlbmRpbmcgYW4gIm9wZXJhdGlvbiBjb21wbGV0ZSIgbWVzc2Fn ZSBhbmQgdGhlIGNsaWVudAogICAgICAgICAvLyBmb3JjZWZ1bGx5IGFib3J0aW5nIGFuIG9wZXJh dGlvbiwgaXQncyB1bmF2b2lkYWJsZSB0aGF0IHRoaXMgbWV0aG9kIG1pZ2h0IGJlIGNhbGxlZCB0 d2ljZS4KICAgICAgICAgLy8gSXQncyBva2F5IHRvIGhhbmRsZSB0aGF0IGdyYWNlZnVsbHkgd2l0 aCBhbiBlYXJseSByZXR1cm4uCi0gICAgICAgIGlmICghbV9jb21wbGV0ZUZ1bmN0aW9uKQorICAg ICAgICBpZiAobV9kaWRDb21wbGV0ZSkKICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgbV9k aWRDb21wbGV0ZSA9IHRydWU7CiAKLSAgICAgICAgbV9jb21wbGV0ZUZ1bmN0aW9uKGRhdGEpOwor ICAgICAgICBpZiAobV9jb21wbGV0ZUZ1bmN0aW9uKSB7CisgICAgICAgICAgICBtX2NvbXBsZXRl RnVuY3Rpb24oZGF0YSk7CisgICAgICAgICAgICAvLyBtX2NvbXBsZXRlRnVuY3Rpb24gc2hvdWxk IG5vdCBob2xkIHJlZiB0byB0aGlzIFRyYW5zYWN0aW9uT3BlcmF0aW9uIGFmdGVyIGl0cyBleGVj dXRpb24uCisgICAgICAgICAgICBtX2NvbXBsZXRlRnVuY3Rpb24gPSB7IH07CisgICAgICAgIH0K ICAgICAgICAgbV90cmFuc2FjdGlvbi0+b3BlcmF0aW9uQ29tcGxldGVkT25DbGllbnQoKnRoaXMp OwotCi0gICAgICAgIC8vIG1fY29tcGxldGVGdW5jdGlvbiBtaWdodCBiZSBob2xkaW5nIHRoZSBs YXN0IHJlZiB0byB0aGlzIFRyYW5zYWN0aW9uT3BlcmF0aW9uLAotICAgICAgICAvLyBzbyB3ZSBu ZWVkIHRvIGRvIHRoaXMgdHJpY2sgdG8gbnVsbCBpdCBvdXQgd2l0aG91dCBmaXJzdCBkZXN0cm95 aW5nIGl0LgotICAgICAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IElEQlJlc3VsdERhdGEmKT4gb2xk Q29tcGxldGVGdW5jdGlvbjsKLSAgICAgICAgc3RkOjpzd2FwKG1fY29tcGxldGVGdW5jdGlvbiwg b2xkQ29tcGxldGVGdW5jdGlvbik7CiAgICAgfQogCiAgICAgY29uc3QgSURCUmVzb3VyY2VJZGVu dGlmaWVyJiBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CkBAIC0x NDEsNiArMTQxLDcgQEAgcHJpdmF0ZToKICAgICBSZWY8VGhyZWFkPiBtX29yaWdpblRocmVhZCB7 IFRocmVhZDo6Y3VycmVudCgpIH07CiAgICAgUmVmUHRyPElEQlJlcXVlc3Q+IG1faWRiUmVxdWVz dDsKICAgICBib29sIG1fbmV4dFJlcXVlc3RDYW5Hb1RvU2VydmVyIHsgdHJ1ZSB9OworICAgIGJv b2wgbV9kaWRDb21wbGV0ZSB7IGZhbHNlIH07CiB9OwogCiBjbGFzcyBUcmFuc2FjdGlvbk9wZXJh dGlvbkltcGwgZmluYWwgOiBwdWJsaWMgVHJhbnNhY3Rpb25PcGVyYXRpb24gewo=