198496 2019-06-03 14:02:44 -0700 NetworkHTTPSUpgradeChecker should construct and destruct database on the background thread 2019-06-06 12:16:04 -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 oldest_to_newest 1541321 0 sihui_liu 2019-06-03 14:02:44 -0700 We are seeing crashes: Thread 1 name: Dispatch queue: HTTPS Upgrade Checker Thread Thread 1 Crashed ↩: 0 libsqlite3.dylib 0x1ba202ac sqlite3MutexMisuseAssert + 136 1 libsqlite3.dylib 0x1ba202a0 sqlite3MutexMisuseAssert + 124 2 libsqlite3.dylib 0x1ba200dc checkMutexEnter + 56 3 libsqlite3.dylib 0x1b97469c sqlite3_overload_function + 140 4 libsqlite3.dylib 0x1b96e288 openDatabase + 3288 5 WebCore 0x23f8d69c WebCore::SQLiteDatabase::open(WTF::String const&, WebCore::SQLiteDatabase::OpenMode) + 344 (SQLiteDatabase.cpp:116) 6 WebKit 0x02ebae70 WTF::Detail::CallableWrapper<WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker()::$_18, void>::call() + 80 (NetworkHTTPSUpgradeChecker.cpp:70) 7 libdispatch.dylib 0x1b02d7c0 _dispatch_call_block_and_release + 24 (init.c:1408) 8 libdispatch.dylib 0x1b02eb50 _dispatch_client_callout + 16 (object.m:495) 1541322 1 sihui_liu 2019-06-03 14:03:13 -0700 <rdar://problem/50795714> 1541326 2 371210 sihui_liu 2019-06-03 14:07:36 -0700 Created attachment 371210 Patch 1541330 3 371210 cdumez 2019-06-03 14:09:24 -0700 Comment on attachment 371210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371210&action=review > Source/WebKit/ChangeLog:8 > + Can you please explain the "fix" in the change log? 1541331 4 371210 cdumez 2019-06-03 14:10:27 -0700 Comment on attachment 371210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371210&action=review > Source/WebKit/ChangeLog:5 > + <rdar://problem/50795714> Should this be a sub-radar of this one? What about all the IDB crashes? 1541335 5 371210 cdumez 2019-06-03 14:15:03 -0700 Comment on attachment 371210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371210&action=review Are we sure the issue is not that we're using a background queue as opposed to a background *thread*? Meaning that we do use multiple threads but only 1 thread at a time given that the queue is serial? > Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:-58 > - , m_database(makeUniqueRef<WebCore::SQLiteDatabase>()) I do not understand why we need to construct this on the background queue. The SQLiteDatabase constructor does not call any of the sqlite API as far as I know. > Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:-59 > - , m_statement(makeUniqueRef<WebCore::SQLiteStatement>(m_database.get(), "SELECT host FROM hosts WHERE host = ?;"_s)) ditto. 1541343 6 371210 cdumez 2019-06-03 14:30:02 -0700 Comment on attachment 371210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371210&action=review > Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:70 > + m_database = std::make_unique<SQLiteDatabase>(); Also, now these get constructed on the background queue but still destroyed on the main thread, which may not be safe. 1541363 7 371210 cdumez 2019-06-03 15:36:37 -0700 Comment on attachment 371210 Patch Note that I am not opposed to making such a change, especially if this is how our usual database code does it. However: 1. I do not understand why this would fix the crash in question 2. These objects should get destroyed on the background queue if they get constructed on the background queue to avoid introducing new thread-safety bugs 1541646 8 sihui_liu 2019-06-04 10:52:15 -0700 (In reply to Chris Dumez from comment #7) > Comment on attachment 371210 [details] > Patch > > Note that I am not opposed to making such a change, especially if this is > how our usual database code does it. However: > 1. I do not understand why this would fix the crash in question > 2. These objects should get destroyed on the background queue if they get > constructed on the background queue to avoid introducing new thread-safety > bugs 1. The bug should already be fixed as discussed in email. I will change the changelog. 2. Correct. I saw the comment "// This object should be owned by a singleton object." so I didn't destroy the objects. NetworkProcess is not a singleton now, we should add this. 1541647 9 371300 sihui_liu 2019-06-04 10:52:39 -0700 Created attachment 371300 Patch 1541649 10 371300 cdumez 2019-06-04 10:56:22 -0700 Comment on attachment 371300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371300&action=review > Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:42 > +constexpr auto HTTPSUpgradeCheckerQuery = "SELECT host FROM hosts WHERE host = ?"_s; nit: httpsUpgradeCheckerQuery per WebKit coding style. 1541718 11 371326 sihui_liu 2019-06-04 13:16:26 -0700 Created attachment 371326 Patch for landing 1541725 12 371326 commit-queue 2019-06-04 13:47:33 -0700 Comment on attachment 371326 Patch for landing Rejecting attachment 371326 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 5000 characters of output: CURSOR_SCALE -DENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION -DENABLE_NOTIFICATIONS -DENABLE_PAYMENT_REQUEST -DENABLE_PDFKIT_PLUGIN -DENABLE_POINTER_EVENTS -DENABLE_POINTER_LOCK -DENABLE_PUBLIC_SUFFIX_LIST -DENABLE_REMOTE_INSPECTOR -DENABLE_RESIZE_OBSERVER -DENABLE_RESOURCE_LOAD_STATISTICS -DENABLE_RESOURCE_USAGE -DENABLE_RUBBER_BANDING -DENABLE_SANDBOX_EXTENSIONS -DENABLE_SERVER_PRECONNECT -DENABLE_SERVICE_CONTROLS -DENABLE_SERVICE_WORKER -DENABLE_SHAREABLE_RESOURCE -DENABLE_SPEECH_SYNTHESIS -DENABLE_STREAMS_API -DENABLE_SVG_FONTS -DENABLE_TELEPHONE_NUMBER_DETECTION -DENABLE_TEXT_AUTOSIZING -DENABLE_USERSELECT_ALL -DENABLE_USER_MESSAGE_HANDLERS -DENABLE_VARIATION_FONTS -DENABLE_VIDEO -DENABLE_VIDEO_PRESENTATION_MODE -DENABLE_VIDEO_TRACK -DENABLE_VIDEO_USES_ELEMENT_FULLSCREEN -DENABLE_WEBDRIVER_MOUSE_INTERACTIONS -DENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS -DENABLE_WEBGL -DENABLE_WEBGL2 -DENABLE_WEBGPU -DENABLE_WEB_AUDIO -DENABLE_WEB_AUTHN -DENABLE_WEB_CRYPTO -DENABLE_WEB_PROCESS_SANDBOX -DENABLE_WEB_RTC -DENABLE_WIRELESS_PLAYBACK_TARGET -DENABLE_XSLT -DENABLE_MANUAL_SANDBOXING -DHAVE_CORE_PREDICTION -DU_HIDE_DEPRECATED_API -DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0 -DFRAMEWORK_NAME=WebKit -DOBJC_OLD_DISPATCH_PROTOTYPES=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.13 -g -fvisibility=hidden -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -iquote /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-generated-files.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-own-target-headers.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-all-target-headers.hmap -iquote /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/WebKit-project-headers.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/include -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/WebCore.framework/PrivateHeaders/ForwardingHeaders -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebKit2 -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/WebKitAdditions -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/local/include/WebKitAdditions -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/webrtc -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/local/include/webrtc -I/Volumes/Data/EWS/WebKit/Source/WebKit -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources/x86_64 -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/DerivedSources -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -F/Volumes/Data/EWS/WebKit/WebKitBuild/Release -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/PrivateFrameworks -isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -include /Volumes/Data/EWS/WebKit/WebKitBuild/PrecompiledHeaders/WebKit2Prefix-gljelmzeecuvvkhaymcxhnhphybs/WebKit2Prefix.h -MMD -MT dependencies -MF /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource20-mm.d --serialize-diagnostics /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource20-mm.dia -c /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebKit2/unified-sources/UnifiedSource20-mm.mm -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource20-mm.o ** BUILD FAILED ** The following build commands failed: CompileC /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/UnifiedSource3.o /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebKit2/unified-sources/UnifiedSource3.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler (1 failure) Full output: https://webkit-queues.webkit.org/results/12376773 1542492 13 371513 sihui_liu 2019-06-06 11:33:31 -0700 Created attachment 371513 Patch for landing 1542519 14 371513 commit-queue 2019-06-06 12:16:03 -0700 Comment on attachment 371513 Patch for landing Clearing flags on attachment: 371513 Committed r246163: <https://trac.webkit.org/changeset/246163> 1542520 15 commit-queue 2019-06-06 12:16:04 -0700 All reviewed patches have been landed. Closing bug. 371210 2019-06-03 14:07:36 -0700 2019-06-04 10:52:38 -0700 Patch bug-198496-20190603140735.patch text/plain 3406 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2MzhhMDY4MmVkMDE4ZmFi YWFiYjVjNzViNDAzMDJkNTdlMmQwZTYuLjkyZmU1YjRjZTkxZWYwNDNkZTNmYTliNDJlM2M0OTMy NzgxYzQyNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDYtMDMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIgZGF0YWJhc2UgaXMgYWNjZXNzZWQgZnJvbSBtdWx0aXBsZSB0aHJlYWRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg0OTYKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzUwNzk1NzE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6 TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05l dHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmg6CisKIDIwMTktMDYtMDMgIERhcmluIEFkbGVyICA8 ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpbmlzaCBjbGVhbnVwIG9mIFN0cmluZzo6bnVt YmVyIGZvciBmbG9hdGluZyBwb2ludApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAppbmRleCAxNTZhNjI1 Y2U1ODQ1NGNiMjQxNDFmODRhN2E4N2RkNDc5YzYzZDEzLi4zNWY1MTYyYmE1ZmU4MzZmZTAzMmJl YjAzYzVmYTM1YWEwMzNjYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcApAQCAtMzksNiArMzks OCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY29uc3RleHByIGF1dG8gSFRUUFNVcGdyYWRl Q2hlY2tlclF1ZXJ5ID0gIlNFTEVDVCBob3N0IEZST00gaG9zdHMgV0hFUkUgaG9zdCA9ID8iX3M7 CisKIHN0YXRpYyBjb25zdCBTdHJpbmcmIG5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyRGF0YWJh c2VQYXRoKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiBuZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlckRhdGFiYXNlUGF0aDsKQEAgLTU1LDggKzU3LDYgQEAgc3RhdGljIGNv bnN0IFN0cmluZyYgbmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXJEYXRhYmFzZVBhdGgoKQogCiBO ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQog ICAgIDogbV93b3JrUXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoIkhUVFBTIFVwZ3JhZGUgQ2hlY2tl ciBUaHJlYWQiKSkKLSAgICAsIG1fZGF0YWJhc2UobWFrZVVuaXF1ZVJlZjxXZWJDb3JlOjpTUUxp dGVEYXRhYmFzZT4oKSkKLSAgICAsIG1fc3RhdGVtZW50KG1ha2VVbmlxdWVSZWY8V2ViQ29yZTo6 U1FMaXRlU3RhdGVtZW50PihtX2RhdGFiYXNlLmdldCgpLCAiU0VMRUNUIGhvc3QgRlJPTSBob3N0 cyBXSEVSRSBob3N0ID0gPzsiX3MpKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 CiAKQEAgLTY3LDYgKzY3LDcgQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtI VFRQU1VwZ3JhZGVDaGVja2VyKCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisg ICAgICAgIG1fZGF0YWJhc2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFNRTGl0ZURhdGFiYXNlPigpOwog ICAgICAgICBib29sIGlzRGF0YWJhc2VPcGVuID0gbV9kYXRhYmFzZS0+b3BlbihwYXRoLCBXZWJD b3JlOjpTUUxpdGVEYXRhYmFzZTo6T3Blbk1vZGU6OlJlYWRPbmx5KTsKICAgICAgICAgaWYgKCFp c0RhdGFiYXNlT3BlbikgewogI2lmIFBMQVRGT1JNKENPQ09BKQpAQCAtNzksNiArODAsNyBAQCBO ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQog ICAgICAgICAvLyBTaW5jZSB3ZSBhcmUgdXNpbmcgYSB3b3JrZXJRdWV1ZSwgdGhlIHNlcXVlbnRp YWwgZGlzcGF0Y2ggYmxvY2tzIG1heSBiZSBjYWxsZWQgYnkgZGlmZmVyZW50IHRocmVhZHMuCiAg ICAgICAgIG1fZGF0YWJhc2UtPmRpc2FibGVUaHJlYWRpbmdDaGVja3MoKTsKIAorICAgICAgICBt X3N0YXRlbWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8U1FMaXRlU3RhdGVtZW50PigqbV9kYXRhYmFz ZSwgSFRUUFNVcGdyYWRlQ2hlY2tlclF1ZXJ5KTsKICAgICAgICAgaW50IGlzU3RhdGVtZW50UHJl cGFyZWQgPSAobV9zdGF0ZW1lbnQtPnByZXBhcmUoKSA9PSBTUUxJVEVfT0spOwogICAgICAgICBB U1NFUlQoaXNTdGF0ZW1lbnRQcmVwYXJlZCk7CiAgICAgICAgIGlmICghaXNTdGF0ZW1lbnRQcmVw YXJlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hU VFBTVXBncmFkZUNoZWNrZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0hUVFBTVXBncmFkZUNoZWNrZXIuaAppbmRleCBjYzM5ZjAzNjM3NGY3MDM3NmIxYWZlOGE4MmU3 YTZmMWI5MDk4N2I3Li5hMWU2ZDIxMDMzMzZjZTVmMGU0NDg2ZGRiYTVjZDMxY2YxYzYzOGM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlci5oCkBAIC01NCw4ICs1NCw4IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBSZWY8V29ya1F1ZXVlPiBtX3dvcmtRdWV1ZTsKLSAgICBVbmlxdWVSZWY8V2ViQ29yZTo6 U1FMaXRlRGF0YWJhc2U+IG1fZGF0YWJhc2U7Ci0gICAgVW5pcXVlUmVmPFdlYkNvcmU6OlNRTGl0 ZVN0YXRlbWVudD4gbV9zdGF0ZW1lbnQ7CisgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNR TGl0ZURhdGFiYXNlPiBtX2RhdGFiYXNlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpT UUxpdGVTdGF0ZW1lbnQ+IG1fc3RhdGVtZW50OwogICAgIHN0ZDo6YXRvbWljPGJvb2w+IG1fZGlk U2V0dXBDb21wbGV0ZVN1Y2Nlc3NmdWxseSB7IGZhbHNlIH07CiB9OwogCg== 371300 2019-06-04 10:52:39 -0700 2019-06-04 13:16:24 -0700 Patch bug-198496-20190604105239.patch text/plain 4451 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyMTVkNDg1YWFmMDM4YjQx NWZmNjI5YjY2OTU4ODlhYWZmNDM4MTkuLjNkZjM3ZTc3ZDJmZjhjMWY4ZGRlODA4ZjM5NzQ1YTg5 YWIyYjM0NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDYtMDQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIgc2hvdWxkIGNvbnN0cnVjdCBhbmQgZGVzdHJ1Y3QgZGF0YWJhc2Ugb24gdGhlIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTg0OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNr ZXI6On5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcik6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaDoKKwogMjAxOS0wNi0wMyAgV2Vuc29uIEhz aWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgYW4gaW50 ZXJuYWwgc3dpdGNoIHRvIHR1cm4gaWRlbXBvdGVudCB0ZXh0IGF1dG9zaXppbmcgYW5kIHZpZXdw b3J0IHJ1bGVzIG9mZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAppbmRleCAxNTZhNjI1Y2U1ODQ1NGNi MjQxNDFmODRhN2E4N2RkNDc5YzYzZDEzLi5lYTUwOWRmNWI3Yzk5MDk0MDMxZDQwODUzMjBlMWM0 YTgzNjQ0OGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcApAQCAtMzksNiArMzksOCBAQAogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAorY29uc3RleHByIGF1dG8gSFRUUFNVcGdyYWRlQ2hlY2tlclF1 ZXJ5ID0gIlNFTEVDVCBob3N0IEZST00gaG9zdHMgV0hFUkUgaG9zdCA9ID8iX3M7CisKIHN0YXRp YyBjb25zdCBTdHJpbmcmIG5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyRGF0YWJhc2VQYXRoKCkK IHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiBuZXR3b3JrSFRUUFNVcGdyYWRl Q2hlY2tlckRhdGFiYXNlUGF0aDsKQEAgLTU1LDggKzU3LDYgQEAgc3RhdGljIGNvbnN0IFN0cmlu ZyYgbmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXJEYXRhYmFzZVBhdGgoKQogCiBOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQogICAgIDogbV93 b3JrUXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoIkhUVFBTIFVwZ3JhZGUgQ2hlY2tlciBUaHJlYWQi KSkKLSAgICAsIG1fZGF0YWJhc2UobWFrZVVuaXF1ZVJlZjxXZWJDb3JlOjpTUUxpdGVEYXRhYmFz ZT4oKSkKLSAgICAsIG1fc3RhdGVtZW50KG1ha2VVbmlxdWVSZWY8V2ViQ29yZTo6U1FMaXRlU3Rh dGVtZW50PihtX2RhdGFiYXNlLmdldCgpLCAiU0VMRUNUIGhvc3QgRlJPTSBob3N0cyBXSEVSRSBo b3N0ID0gPzsiX3MpKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKQEAgLTY3 LDYgKzY3LDcgQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyKCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIG1f ZGF0YWJhc2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFNRTGl0ZURhdGFiYXNlPigpOwogICAgICAgICBi b29sIGlzRGF0YWJhc2VPcGVuID0gbV9kYXRhYmFzZS0+b3BlbihwYXRoLCBXZWJDb3JlOjpTUUxp dGVEYXRhYmFzZTo6T3Blbk1vZGU6OlJlYWRPbmx5KTsKICAgICAgICAgaWYgKCFpc0RhdGFiYXNl T3BlbikgewogI2lmIFBMQVRGT1JNKENPQ09BKQpAQCAtNzksNiArODAsNyBAQCBOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQogICAgICAgICAv LyBTaW5jZSB3ZSBhcmUgdXNpbmcgYSB3b3JrZXJRdWV1ZSwgdGhlIHNlcXVlbnRpYWwgZGlzcGF0 Y2ggYmxvY2tzIG1heSBiZSBjYWxsZWQgYnkgZGlmZmVyZW50IHRocmVhZHMuCiAgICAgICAgIG1f ZGF0YWJhc2UtPmRpc2FibGVUaHJlYWRpbmdDaGVja3MoKTsKIAorICAgICAgICBtX3N0YXRlbWVu dCA9IHN0ZDo6bWFrZV91bmlxdWU8U1FMaXRlU3RhdGVtZW50PigqbV9kYXRhYmFzZSwgSFRUUFNV cGdyYWRlQ2hlY2tlclF1ZXJ5KTsKICAgICAgICAgaW50IGlzU3RhdGVtZW50UHJlcGFyZWQgPSAo bV9zdGF0ZW1lbnQtPnByZXBhcmUoKSA9PSBTUUxJVEVfT0spOwogICAgICAgICBBU1NFUlQoaXNT dGF0ZW1lbnRQcmVwYXJlZCk7CiAgICAgICAgIGlmICghaXNTdGF0ZW1lbnRQcmVwYXJlZCkKQEAg LTkwLDggKzkyLDggQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyKCkKIAogTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6On5OZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcigpCiB7Ci0gICAgLy8gVGhpcyBvYmplY3Qgc2hvdWxkIGJlIG93bmVk IGJ5IGEgc2luZ2xldG9uIG9iamVjdC4KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBp ZiAobV9kYXRhYmFzZSkKKyAgICAgICAgbV93b3JrUXVldWUtPmRpc3BhdGNoKFtkYXRhYmFzZSA9 IFdURk1vdmUobV9kYXRhYmFzZSksIHN0YXRlbWVudCA9IFdURk1vdmUobV9zdGF0ZW1lbnQpXSB7 IH0pOwogfQogCiB2b2lkIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyOjpxdWVyeShTdHJpbmcm JiBob3N0LCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmgKaW5kZXggY2MzOWYwMzYzNzRmNzAz NzZiMWFmZThhODJlN2E2ZjFiOTA5ODdiNy4uZGNkNDZhNjAxYmU2MzA5ODZmYzJhZTBjMWM5NjU1 OGM5NTkyMjA4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaApAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyIHsKIHB1YmxpYzoK ICAgICBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOwotICAgIE5PX1JFVFVSTl9EVUVfVE9f QVNTRVJUIH5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOworICAgIH5OZXR3b3JrSFRUUFNV cGdyYWRlQ2hlY2tlcigpOwogCiAgICAgLy8gUmV0dXJucyBgdHJ1ZWAgYWZ0ZXIgaW50ZXJuYWwg c2V0dXAgaXMgc3VjY2Vzc2Z1bGx5IGNvbXBsZXRlZC4gSWYgdGhlcmUgaXMgYW4gZXJyb3Igd2l0 aCBzZXR1cCwgb3IgaWYgc2V0dXAgaXMgaW4tcHJvZ3Jlc3MsIGl0IHdpbGwgcmV0dXJuIGBmYWxz ZWAuCiAgICAgYm9vbCBkaWRTZXR1cENvbXBsZXRlU3VjY2Vzc2Z1bGx5KCkgY29uc3QgeyByZXR1 cm4gbV9kaWRTZXR1cENvbXBsZXRlU3VjY2Vzc2Z1bGx5OyB9OwpAQCAtNTQsOCArNTQsOCBAQCBw dWJsaWM6CiAKIHByaXZhdGU6CiAgICAgUmVmPFdvcmtRdWV1ZT4gbV93b3JrUXVldWU7Ci0gICAg VW5pcXVlUmVmPFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlPiBtX2RhdGFiYXNlOwotICAgIFVuaXF1 ZVJlZjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fc3RhdGVtZW50OworICAgIHN0ZDo6dW5p cXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZT4gbV9kYXRhYmFzZTsKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX3N0YXRlbWVudDsKICAgICBzdGQ6 OmF0b21pYzxib29sPiBtX2RpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVsbHkgeyBmYWxzZSB9Owog fTsKIAo= 371326 2019-06-04 13:16:26 -0700 2019-06-06 11:33:30 -0700 Patch for landing bug-198496-20190604131626.patch text/plain 4451 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNhYjFlMGM5YTNmMDk0ZDk0 NzM0MTliZjdiZDIyYzQ5NjMzYWQzNTQuLmQyNmY0ZmQ0YzRhMTM3ZDg1Mjg5MzJmMzAwNzAxN2Y3 NDQ3YWJjNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDYtMDQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIgc2hvdWxkIGNvbnN0cnVjdCBhbmQgZGVzdHJ1Y3QgZGF0YWJhc2Ugb24gdGhlIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTg0OTYKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6 On5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaDoKKwogMjAxOS0wNi0wNCAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBsb2FkaW5nIHRoaXJk LXBhcnR5IGFwcGxpY2F0aW9ucyBmcm9tIC9BcHBsaWNhdGlvbnMgbmVlZHMgYWRkaXRpb25hbCBz eXNjYWxsIGFjY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAppbmRleCAxNTZhNjI1Y2U1ODQ1NGNi MjQxNDFmODRhN2E4N2RkNDc5YzYzZDEzLi5mOGNkODY4NTQyM2M3NmYxYjk0MjYwNTBiYjJjNDBl MjAzMzQ1MTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcApAQCAtMzksNiArMzksOCBAQAogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAorY29uc3RleHByIGF1dG8gaHR0cHNVcGdyYWRlQ2hlY2tlclF1 ZXJ5ID0gIlNFTEVDVCBob3N0IEZST00gaG9zdHMgV0hFUkUgaG9zdCA9ID8iX3M7CisKIHN0YXRp YyBjb25zdCBTdHJpbmcmIG5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyRGF0YWJhc2VQYXRoKCkK IHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiBuZXR3b3JrSFRUUFNVcGdyYWRl Q2hlY2tlckRhdGFiYXNlUGF0aDsKQEAgLTU1LDggKzU3LDYgQEAgc3RhdGljIGNvbnN0IFN0cmlu ZyYgbmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXJEYXRhYmFzZVBhdGgoKQogCiBOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQogICAgIDogbV93 b3JrUXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoIkhUVFBTIFVwZ3JhZGUgQ2hlY2tlciBUaHJlYWQi KSkKLSAgICAsIG1fZGF0YWJhc2UobWFrZVVuaXF1ZVJlZjxXZWJDb3JlOjpTUUxpdGVEYXRhYmFz ZT4oKSkKLSAgICAsIG1fc3RhdGVtZW50KG1ha2VVbmlxdWVSZWY8V2ViQ29yZTo6U1FMaXRlU3Rh dGVtZW50PihtX2RhdGFiYXNlLmdldCgpLCAiU0VMRUNUIGhvc3QgRlJPTSBob3N0cyBXSEVSRSBo b3N0ID0gPzsiX3MpKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKQEAgLTY3 LDYgKzY3LDcgQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyKCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIG1f ZGF0YWJhc2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFNRTGl0ZURhdGFiYXNlPigpOwogICAgICAgICBi b29sIGlzRGF0YWJhc2VPcGVuID0gbV9kYXRhYmFzZS0+b3BlbihwYXRoLCBXZWJDb3JlOjpTUUxp dGVEYXRhYmFzZTo6T3Blbk1vZGU6OlJlYWRPbmx5KTsKICAgICAgICAgaWYgKCFpc0RhdGFiYXNl T3BlbikgewogI2lmIFBMQVRGT1JNKENPQ09BKQpAQCAtNzksNiArODAsNyBAQCBOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKQogICAgICAgICAv LyBTaW5jZSB3ZSBhcmUgdXNpbmcgYSB3b3JrZXJRdWV1ZSwgdGhlIHNlcXVlbnRpYWwgZGlzcGF0 Y2ggYmxvY2tzIG1heSBiZSBjYWxsZWQgYnkgZGlmZmVyZW50IHRocmVhZHMuCiAgICAgICAgIG1f ZGF0YWJhc2UtPmRpc2FibGVUaHJlYWRpbmdDaGVja3MoKTsKIAorICAgICAgICBtX3N0YXRlbWVu dCA9IHN0ZDo6bWFrZV91bmlxdWU8U1FMaXRlU3RhdGVtZW50PigqbV9kYXRhYmFzZSwgSFRUUFNV cGdyYWRlQ2hlY2tlclF1ZXJ5KTsKICAgICAgICAgaW50IGlzU3RhdGVtZW50UHJlcGFyZWQgPSAo bV9zdGF0ZW1lbnQtPnByZXBhcmUoKSA9PSBTUUxJVEVfT0spOwogICAgICAgICBBU1NFUlQoaXNT dGF0ZW1lbnRQcmVwYXJlZCk7CiAgICAgICAgIGlmICghaXNTdGF0ZW1lbnRQcmVwYXJlZCkKQEAg LTkwLDggKzkyLDggQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyKCkKIAogTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6On5OZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcigpCiB7Ci0gICAgLy8gVGhpcyBvYmplY3Qgc2hvdWxkIGJlIG93bmVk IGJ5IGEgc2luZ2xldG9uIG9iamVjdC4KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBp ZiAobV9kYXRhYmFzZSkKKyAgICAgICAgbV93b3JrUXVldWUtPmRpc3BhdGNoKFtkYXRhYmFzZSA9 IFdURk1vdmUobV9kYXRhYmFzZSksIHN0YXRlbWVudCA9IFdURk1vdmUobV9zdGF0ZW1lbnQpXSB7 IH0pOwogfQogCiB2b2lkIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyOjpxdWVyeShTdHJpbmcm JiBob3N0LCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmgKaW5kZXggY2MzOWYwMzYzNzRmNzAz NzZiMWFmZThhODJlN2E2ZjFiOTA5ODdiNy4uZGNkNDZhNjAxYmU2MzA5ODZmYzJhZTBjMWM5NjU1 OGM5NTkyMjA4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaApAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyIHsKIHB1YmxpYzoK ICAgICBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOwotICAgIE5PX1JFVFVSTl9EVUVfVE9f QVNTRVJUIH5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOworICAgIH5OZXR3b3JrSFRUUFNV cGdyYWRlQ2hlY2tlcigpOwogCiAgICAgLy8gUmV0dXJucyBgdHJ1ZWAgYWZ0ZXIgaW50ZXJuYWwg c2V0dXAgaXMgc3VjY2Vzc2Z1bGx5IGNvbXBsZXRlZC4gSWYgdGhlcmUgaXMgYW4gZXJyb3Igd2l0 aCBzZXR1cCwgb3IgaWYgc2V0dXAgaXMgaW4tcHJvZ3Jlc3MsIGl0IHdpbGwgcmV0dXJuIGBmYWxz ZWAuCiAgICAgYm9vbCBkaWRTZXR1cENvbXBsZXRlU3VjY2Vzc2Z1bGx5KCkgY29uc3QgeyByZXR1 cm4gbV9kaWRTZXR1cENvbXBsZXRlU3VjY2Vzc2Z1bGx5OyB9OwpAQCAtNTQsOCArNTQsOCBAQCBw dWJsaWM6CiAKIHByaXZhdGU6CiAgICAgUmVmPFdvcmtRdWV1ZT4gbV93b3JrUXVldWU7Ci0gICAg VW5pcXVlUmVmPFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlPiBtX2RhdGFiYXNlOwotICAgIFVuaXF1 ZVJlZjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fc3RhdGVtZW50OworICAgIHN0ZDo6dW5p cXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZT4gbV9kYXRhYmFzZTsKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX3N0YXRlbWVudDsKICAgICBzdGQ6 OmF0b21pYzxib29sPiBtX2RpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVsbHkgeyBmYWxzZSB9Owog fTsKIAo= 371513 2019-06-06 11:33:31 -0700 2019-06-06 12:16:03 -0700 Patch for landing bug-198496-20190606113331.patch text/plain 4390 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRkMWZmMmI0ODU1YzExZjYw ODZkYWE4NmUwYWE2MDAzMzNiMGEyNzAuLjAwZDU4OWFjNzZiYjdjOGM2Y2M3ODIwYmI1OWFlNjQy NTRkMzIxNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDYtMDYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIgc2hvdWxkIGNvbnN0cnVjdCBhbmQgZGVzdHJ1Y3QgZGF0YWJhc2Ugb24gdGhlIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTg0OTYKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6Ok5ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6 On5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaDoKKwogMjAxOS0wNi0wNiAgVHJ1aXR0IFNhdmVs bCAgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIyNDYxMzcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuY3BwCmluZGV4IDE1NmE2MjVjZTU4NDU0Y2IyNDE0 MWY4NGE3YTg3ZGQ0NzljNjNkMTMuLmY0YWUzNzAyM2FiM2RiM2Q5NmI4YjU4YjA5NjU5OTEyMGZh YmI4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hU VFBTVXBncmFkZUNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuY3BwCkBAIC0zOSw2ICszOSw4IEBACiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCitjb25zdGV4cHIgYXV0byBodHRwc1VwZ3JhZGVDaGVja2VyUXVlcnkg PSAiU0VMRUNUIGhvc3QgRlJPTSBob3N0cyBXSEVSRSBob3N0ID0gPyJfczsKKwogc3RhdGljIGNv bnN0IFN0cmluZyYgbmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXJEYXRhYmFzZVBhdGgoKQogewog ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxTdHJpbmc+IG5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVj a2VyRGF0YWJhc2VQYXRoOwpAQCAtNTUsOCArNTcsNiBAQCBzdGF0aWMgY29uc3QgU3RyaW5nJiBu ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlckRhdGFiYXNlUGF0aCgpCiAKIE5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyOjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpCiAgICAgOiBtX3dvcmtR dWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiSFRUUFMgVXBncmFkZSBDaGVja2VyIFRocmVhZCIpKQot ICAgICwgbV9kYXRhYmFzZShtYWtlVW5pcXVlUmVmPFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlPigp KQotICAgICwgbV9zdGF0ZW1lbnQobWFrZVVuaXF1ZVJlZjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1l bnQ+KG1fZGF0YWJhc2UuZ2V0KCksICJTRUxFQ1QgaG9zdCBGUk9NIGhvc3RzIFdIRVJFIGhvc3Qg PSA/OyJfcykpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIApAQCAtNjcsNiAr NjcsNyBAQCBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIoKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgbV9kYXRh YmFzZSA9IHN0ZDo6bWFrZV91bmlxdWU8U1FMaXRlRGF0YWJhc2U+KCk7CiAgICAgICAgIGJvb2wg aXNEYXRhYmFzZU9wZW4gPSBtX2RhdGFiYXNlLT5vcGVuKHBhdGgsIFdlYkNvcmU6OlNRTGl0ZURh dGFiYXNlOjpPcGVuTW9kZTo6UmVhZE9ubHkpOwogICAgICAgICBpZiAoIWlzRGF0YWJhc2VPcGVu KSB7CiAjaWYgUExBVEZPUk0oQ09DT0EpCkBAIC03OSw2ICs4MCw3IEBAIE5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyOjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpCiAgICAgICAgIC8vIFNp bmNlIHdlIGFyZSB1c2luZyBhIHdvcmtlclF1ZXVlLCB0aGUgc2VxdWVudGlhbCBkaXNwYXRjaCBi bG9ja3MgbWF5IGJlIGNhbGxlZCBieSBkaWZmZXJlbnQgdGhyZWFkcy4KICAgICAgICAgbV9kYXRh YmFzZS0+ZGlzYWJsZVRocmVhZGluZ0NoZWNrcygpOwogCisgICAgICAgIG1fc3RhdGVtZW50ID0g c3RkOjptYWtlX3VuaXF1ZTxTUUxpdGVTdGF0ZW1lbnQ+KCptX2RhdGFiYXNlLCBodHRwc1VwZ3Jh ZGVDaGVja2VyUXVlcnkpOwogICAgICAgICBpbnQgaXNTdGF0ZW1lbnRQcmVwYXJlZCA9IChtX3N0 YXRlbWVudC0+cHJlcGFyZSgpID09IFNRTElURV9PSyk7CiAgICAgICAgIEFTU0VSVChpc1N0YXRl bWVudFByZXBhcmVkKTsKICAgICAgICAgaWYgKCFpc1N0YXRlbWVudFByZXBhcmVkKQpAQCAtOTAs OCArOTIsOCBAQCBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6TmV0d29ya0hUVFBTVXBncmFk ZUNoZWNrZXIoKQogCiBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6fk5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyKCkKIHsKLSAgICAvLyBUaGlzIG9iamVjdCBzaG91bGQgYmUgb3duZWQgYnkg YSBzaW5nbGV0b24gb2JqZWN0LgotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIGlmICht X2RhdGFiYXNlKQorICAgICAgICBtX3dvcmtRdWV1ZS0+ZGlzcGF0Y2goW2RhdGFiYXNlID0gV1RG TW92ZShtX2RhdGFiYXNlKSwgc3RhdGVtZW50ID0gV1RGTW92ZShtX3N0YXRlbWVudCldIHsgfSk7 CiB9CiAKIHZvaWQgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6OnF1ZXJ5KFN0cmluZyYmIGhv c3QsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29s KT4mJiBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaAppbmRleCBjYzM5ZjAzNjM3NGY3MDM3NmIx YWZlOGE4MmU3YTZmMWI5MDk4N2I3Li5kY2Q0NmE2MDFiZTYzMDk4NmZjMmFlMGMxYzk2NTU4Yzk1 OTIyMDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtI VFRQU1VwZ3JhZGVDaGVja2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogY2xhc3MgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIgewogcHVibGljOgogICAg IE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCk7Ci0gICAgTk9fUkVUVVJOX0RVRV9UT19BU1NF UlQgfk5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCk7CisgICAgfk5ldHdvcmtIVFRQU1VwZ3Jh ZGVDaGVja2VyKCk7CiAKICAgICAvLyBSZXR1cm5zIGB0cnVlYCBhZnRlciBpbnRlcm5hbCBzZXR1 cCBpcyBzdWNjZXNzZnVsbHkgY29tcGxldGVkLiBJZiB0aGVyZSBpcyBhbiBlcnJvciB3aXRoIHNl dHVwLCBvciBpZiBzZXR1cCBpcyBpbi1wcm9ncmVzcywgaXQgd2lsbCByZXR1cm4gYGZhbHNlYC4K ICAgICBib29sIGRpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVsbHkoKSBjb25zdCB7IHJldHVybiBt X2RpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVsbHk7IH07CkBAIC01NCw4ICs1NCw4IEBAIHB1Ymxp YzoKIAogcHJpdmF0ZToKICAgICBSZWY8V29ya1F1ZXVlPiBtX3dvcmtRdWV1ZTsKLSAgICBVbmlx dWVSZWY8V2ViQ29yZTo6U1FMaXRlRGF0YWJhc2U+IG1fZGF0YWJhc2U7Ci0gICAgVW5pcXVlUmVm PFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV9zdGF0ZW1lbnQ7CisgICAgc3RkOjp1bmlxdWVf cHRyPFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlPiBtX2RhdGFiYXNlOworICAgIHN0ZDo6dW5pcXVl X3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fc3RhdGVtZW50OwogICAgIHN0ZDo6YXRv bWljPGJvb2w+IG1fZGlkU2V0dXBDb21wbGV0ZVN1Y2Nlc3NmdWxseSB7IGZhbHNlIH07CiB9Owog Cg==