236209 2022-02-06 15:33:38 -0800 REGRESSION(r286936): Crash in WebKit::OriginStorageManager::StorageBucket::deleteLocalStorageData 2022-02-06 21:47:17 -0800 1 1 1 Unclassified WebKit Website Storage WebKit Nightly Build PC Linux RESOLVED FIXED InRadar P2 Normal --- 1 mcatanzaro sihui_liu achristensen bugs-noreply cdumez darin sihui_liu webkit-bug-importer youennf oldest_to_newest 1837955 0 451052 mcatanzaro 2022-02-06 15:33:38 -0800 Created attachment 451052 Full backtrace It seems that the network process is fairly crashy in WebKitGTK 2.35.2. This seems to be a regression from 2.35.1, probably related to recent storage refactoring: #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:49 #1 0x00007fecbeea5867 in __GI_abort () at abort.c:79 #2 0x00007fecbf71f5c6 in std::__replacement_assert(char const*, int, char const*, char const*) (__file=__file@entry=0x7fecc1ed58b0 "/usr/include/c++/11.2.0/optional", __line=__line@entry=440, __function=__function@entry=0x7fecc1ee9f10 "constexpr _Tp& std::_Optional_base_impl<_Tp, _Dp>::_M_get() [with _Tp = WTF::WallTime; _Dp = std::_Optional_base<WTF::WallTime, true, true>]", __condition=__condition@entry=0x7fecc1ed504c "this->_M_is_engaged()") at /usr/include/c++/11.2.0/x86_64-unknown-linux-gnu/bits/c++config.h:514 #3 0x00007fecbfa597af in std::_Optional_base_impl<WTF::WallTime, std::_Optional_base<WTF::WallTime, true, true> >::_M_get() (this=0x7fec57bfe6f0) at /usr/include/c++/11.2.0/optional:438 #4 std::_Optional_base_impl<WTF::WallTime, std::_Optional_base<WTF::WallTime, true, true> >::_M_get() (this=0x7fec57bfe6f0) at /usr/include/c++/11.2.0/optional:438 #5 std::optional<WTF::WallTime>::operator*() & (this=0x7fec57bfe6f0) at /usr/include/c++/11.2.0/optional:927 #6 WebKit::OriginStorageManager::StorageBucket::deleteLocalStorageData(WTF::WallTime) (time=..., this=0x7fec57ceaaf0) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp:249 #7 WebKit::OriginStorageManager::StorageBucket::deleteData(WTF::OptionSet<WebKit::WebsiteDataType>, WTF::WallTime) (modifiedSinceTime=..., types=..., this=0x7fec57ceaaf0) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp:185 #8 WebKit::OriginStorageManager::deleteData(WTF::OptionSet<WebKit::WebsiteDataType>, WTF::WallTime) ( this=<optimized out>, types=..., modifiedSince=...) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp:364 #9 0x00007fecbfa5aa3f in WebKit::NetworkStorageManager::deleteDataOnDisk(WTF::OptionSet<WebKit::WebsiteDataType>, WTF::WallTime, WTF::Function<bool (WebCore::ClientOrigin const&)> const&) (this=this@entry=0x7fecb7cde3a8, types=..., modifiedSinceTime=..., modifiedSinceTime@entry=..., filter=...) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp:500 #10 0x00007fecbfa5e156 in operator() (__closure=<optimized out>) at /usr/include/c++/11.2.0/bits/unique_ptr.h:172 #11 WTF::Detail::CallableWrapper<WebKit::NetworkStorageManager::deleteDataForRegistrableDomains(WTF::OptionSet<WebKit::WebsiteDataType>, const WTF::Vector<WebCore::RegistrableDomain>&, WTF::CompletionHandler<void(WTF::HashSet<WebCore::RegistrableDomain>&&)>&&)::<lambda()>, void>::call(void) (this=0x7febf4023c08) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/_builddir/WTF/Headers/wtf/Function.h:53 #12 0x00007fecbe63afdd in WTF::Function<void ()>::operator()() const (this=<synthetic pointer>) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/Function.h:79 #13 WTF::RunLoop::performWork() (this=0x7fecb7c6b000) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/RunLoop.cpp:133 #14 0x00007fecbe69b1bd in operator() (userData=<optimized out>, __closure=0x0) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/glib/RunLoopGLib.cpp:80 #15 _FUN(gpointer) () at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/glib/RunLoopGLib.cpp:82 #16 0x00007fecbe69bbad in operator() (__closure=0x0, userData=0x7fecb7c6b000, callback=0x7fecbe69b1b0 <_FUN(gpointer)>, source=0x7fec50003e80) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/glib/RunLoopGLib.cpp:53 #17 _FUN(GSource*, GSourceFunc, gpointer) () at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/glib/RunLoopGLib.cpp:56 #18 0x00007fecbea68c6b in g_main_dispatch (context=0x7fec50000b60) at ../glib/gmain.c:3413 #19 g_main_context_dispatch (context=0x7fec50000b60) at ../glib/gmain.c:4131 #20 0x00007fecbea69178 in g_main_context_iterate (context=0x7fec50000b60, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at ../glib/gmain.c:4207 #21 0x00007fecbea69493 in g_main_loop_run (loop=0x7fec50003e60) at ../glib/gmain.c:4405 #22 0x00007fecbe69bd10 in WTF::RunLoop::run() () at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/glib/RunLoopGLib.cpp:108 #23 0x00007fecbe63d8c5 in WTF::Function<void ()>::operator()() const (this=<synthetic pointer>) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/Function.h:79 #24 WTF::Thread::entryPoint(WTF::Thread::NewThreadContext*) (newThreadContext=0x7fecb7cf0120) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/Threading.cpp:191 #25 0x00007fecbe69e98d in WTF::wtfThreadEntryPoint(void*) (context=<optimized out>) at /usr/lib/debug/source/sdk/webkit2gtk-4.0.bst/Source/WTF/wtf/posix/ThreadingPOSIX.cpp:244 #26 0x00007fecbcd7e3ba in start_thread (arg=0x7fec57bff640) at pthread_create.c:481 #27 0x00007fecbef84b03 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 I'll attach a full backtrace. 1837964 1 451055 sihui_liu 2022-02-06 17:26:32 -0800 Created attachment 451055 Patch 1837982 2 451055 darin 2022-02-06 19:43:13 -0800 Comment on attachment 451055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451055&action=review > Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp:250 > - if (auto modificationTime = FileSystem::fileModificationTime(m_localStoragePath); *modificationTime >= time) { > + auto modificationTime = FileSystem::fileModificationTime(m_localStoragePath); > + if (modificationTime && *modificationTime >= time) { Since C++17, std::optional has a more economical way to write this. You can just remove the "*". Also, no need for a local variable: if (FileSystem::fileModificationTime(m_localStoragePath) >= time) { The >= expression will evaluate to false if the optional is nullopt. 1838006 3 sihui_liu 2022-02-06 21:13:42 -0800 (In reply to Darin Adler from comment #2) > Comment on attachment 451055 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=451055&action=review > > > Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp:250 > > - if (auto modificationTime = FileSystem::fileModificationTime(m_localStoragePath); *modificationTime >= time) { > > + auto modificationTime = FileSystem::fileModificationTime(m_localStoragePath); > > + if (modificationTime && *modificationTime >= time) { > > Since C++17, std::optional has a more economical way to write this. You can > just remove the "*". Also, no need for a local variable: > > if (FileSystem::fileModificationTime(m_localStoragePath) >= time) { > > The >= expression will evaluate to false if the optional is nullopt. Ah, good to know! Will make the change. 1838007 4 451065 sihui_liu 2022-02-06 21:17:44 -0800 Created attachment 451065 Patch for landing 1838012 5 ews-feeder 2022-02-06 21:46:49 -0800 Committed r289200 (246886@main): <https://commits.webkit.org/246886@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451065. 1838013 6 webkit-bug-importer 2022-02-06 21:47:17 -0800 <rdar://problem/88556107> 451052 2022-02-06 15:33:38 -0800 2022-02-06 15:33:38 -0800 Full backtrace gdb.txt text/plain 10906 mcatanzaro IzAgIF9fR0lfcmFpc2UgKHNpZz1zaWdAZW50cnk9NikgYXQgLi4vc3lzZGVwcy91bml4L3N5c3Yv bGludXgvcmFpc2UuYzo0OQogICAgICAgIHNldCA9IHtfX3ZhbCA9IHswIDxyZXBlYXRzIDE2IHRp bWVzPn19CiAgICAgICAgcGlkID0gPG9wdGltaXplZCBvdXQ+CiAgICAgICAgdGlkID0gPG9wdGlt aXplZCBvdXQ+CiMxICAweDAwMDA3ZmVjYmVlYTU4NjcgaW4gX19HSV9hYm9ydCAoKSBhdCBhYm9y dC5jOjc5CiAgICAgICAgc2F2ZV9zdGFnZSA9IDEKICAgICAgICBhY3QgPSAKICAgICAgICAgIHtf X3NpZ2FjdGlvbl9oYW5kbGVyID0ge3NhX2hhbmRsZXIgPSAweDdmZWM1N2JmZTY0MCwgc2Ffc2ln YWN0aW9uID0gMHg3ZmVjNTdiZmU2NDB9LCBzYV9tYXNrID0ge19fdmFsID0gezE0MDY1NDg0MjU2 NjgzMiwgNDQwLCAxNDA2NTQ4NDI2NTAzODQsIDE0MDY1NDg0MjU2NDY4NCwgMTQwNjUyOTMxNjE4 Mzg0LCAxNDA2NTMwNjEyMDM1ODQsIDE0MDY1MzA2MjE3MTQxNiwgMTQwNjUzMDYxMjAzNjQ4LCAx NDA2NTQ3ODMxMDUxMTMsIDE0MDY1MzA2MTIwMzU4NCwgMTQwNjUzMDYxMjAzNjk2LCAxNDA2NTE1 ODkwMDk0MTAsIDE0MDY1NDcyODI4NjYwMCwgMCwgMTQwNjU0NzI4Mjg2NDY0LCAxNDA2NTI5MzE2 MTgzODR9fSwgc2FfZmxhZ3MgPSAxMjgsIHNhX3Jlc3RvcmVyID0gMHg4MH0KICAgICAgICBzaWdz ID0gCiAgICAgICAgICAgIHtfX3ZhbCA9IHszMiwgMTQwNjU0NzI3NTk1NzMyLCAzNDczNDU5NDAy Mjk4NjE1NDI0LCAxNzU1MDc1NjI5OTkzMjA2MTQ0MCwgMTQwNjUzMDYxMjAzNTg0LCA1NzQ5MDUs IDE0MDY1MzA2MjE3MTM3NiwgMTQwNjUzMDYyMTcxNDE2LCAxNDA2NTMwNjEyMDM2ODgsIDE0MDY0 OTgxNDY0ODY3MiwgMTQwNjUzMDYxMjAzNjMyLCAxNDA2NTQ3OTIyNTAzNzEsIDIwNjE1ODQzMDI0 OCwgMTQwNjUzMDYxMjAzNjQ4LCAxNDA2NTMwNjEyMDM0NTYsIDE3NTUwNzU2Mjk5OTMyMDYxNDQw fX0KIzIgIDB4MDAwMDdmZWNiZjcxZjVjNiBpbiBzdGQ6Ol9fcmVwbGFjZW1lbnRfYXNzZXJ0KGNo YXIgY29uc3QqLCBpbnQsIGNoYXIgY29uc3QqLCBjaGFyIGNvbnN0KikKICAgIChfX2ZpbGU9X19m aWxlQGVudHJ5PTB4N2ZlY2MxZWQ1OGIwICIvdXNyL2luY2x1ZGUvYysrLzExLjIuMC9vcHRpb25h bCIsIF9fbGluZT1fX2xpbmVAZW50cnk9NDQwLCBfX2Z1bmN0aW9uPV9fZnVuY3Rpb25AZW50cnk9 MHg3ZmVjYzFlZTlmMTAgImNvbnN0ZXhwciBfVHAmIHN0ZDo6X09wdGlvbmFsX2Jhc2VfaW1wbDxf VHAsIF9EcD46Ol9NX2dldCgpIFt3aXRoIF9UcCA9IFdURjo6V2FsbFRpbWU7IF9EcCA9IHN0ZDo6 X09wdGlvbmFsX2Jhc2U8V1RGOjpXYWxsVGltZSwgdHJ1ZSwgdHJ1ZT5dIiwgX19jb25kaXRpb249 X19jb25kaXRpb25AZW50cnk9MHg3ZmVjYzFlZDUwNGMgInRoaXMtPl9NX2lzX2VuZ2FnZWQoKSIp IGF0IC91c3IvaW5jbHVkZS9jKysvMTEuMi4wL3g4Nl82NC11bmtub3duLWxpbnV4LWdudS9iaXRz L2MrK2NvbmZpZy5oOjUxNAojMyAgMHgwMDAwN2ZlY2JmYTU5N2FmIGluIHN0ZDo6X09wdGlvbmFs X2Jhc2VfaW1wbDxXVEY6OldhbGxUaW1lLCBzdGQ6Ol9PcHRpb25hbF9iYXNlPFdURjo6V2FsbFRp bWUsIHRydWUsIHRydWU+ID46Ol9NX2dldCgpICh0aGlzPTB4N2ZlYzU3YmZlNmYwKSBhdCAvdXNy L2luY2x1ZGUvYysrLzExLjIuMC9vcHRpb25hbDo0MzgKICAgICAgICBtb2RpZmljYXRpb25UaW1l ID0gc3RkOjpvcHRpb25hbDxjbGFzcyBXVEY6OldhbGxUaW1lPiBbbm8gY29udGFpbmVkIHZhbHVl XQojNCAgc3RkOjpfT3B0aW9uYWxfYmFzZV9pbXBsPFdURjo6V2FsbFRpbWUsIHN0ZDo6X09wdGlv bmFsX2Jhc2U8V1RGOjpXYWxsVGltZSwgdHJ1ZSwgdHJ1ZT4gPjo6X01fZ2V0KCkKICAgICh0aGlz PTB4N2ZlYzU3YmZlNmYwKSBhdCAvdXNyL2luY2x1ZGUvYysrLzExLjIuMC9vcHRpb25hbDo0MzgK ICAgICAgICBtb2RpZmljYXRpb25UaW1lID0gc3RkOjpvcHRpb25hbDxjbGFzcyBXVEY6OldhbGxU aW1lPiBbbm8gY29udGFpbmVkIHZhbHVlXQojNSAgc3RkOjpvcHRpb25hbDxXVEY6OldhbGxUaW1l Pjo6b3BlcmF0b3IqKCkgJiAodGhpcz0weDdmZWM1N2JmZTZmMCkgYXQgL3Vzci9pbmNsdWRlL2Mr Ky8xMS4yLjAvb3B0aW9uYWw6OTI3CiAgICAgICAgbW9kaWZpY2F0aW9uVGltZSA9IHN0ZDo6b3B0 aW9uYWw8Y2xhc3MgV1RGOjpXYWxsVGltZT4gW25vIGNvbnRhaW5lZCB2YWx1ZV0KIzYgIFdlYktp dDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmRlbGV0ZUxvY2FsU3RvcmFn ZURhdGEoV1RGOjpXYWxsVGltZSkgKHRpbWU9Li4uLCB0aGlzPTB4N2ZlYzU3Y2VhYWYwKQogICAg YXQgL3Vzci9saWIvZGVidWcvc291cmNlL3Nkay93ZWJraXQyZ3RrLTQuMC5ic3QvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcDoyNDkK ICAgICAgICBtb2RpZmljYXRpb25UaW1lID0gc3RkOjpvcHRpb25hbDxjbGFzcyBXVEY6OldhbGxU aW1lPiBbbm8gY29udGFpbmVkIHZhbHVlXQojNyAgV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdl cjo6U3RvcmFnZUJ1Y2tldDo6ZGVsZXRlRGF0YShXVEY6Ok9wdGlvblNldDxXZWJLaXQ6OldlYnNp dGVEYXRhVHlwZT4sIFdURjo6V2FsbFRpbWUpCiAgICAobW9kaWZpZWRTaW5jZVRpbWU9Li4uLCB0 eXBlcz0uLi4sIHRoaXM9MHg3ZmVjNTdjZWFhZjApCiAgICBhdCAvdXNyL2xpYi9kZWJ1Zy9zb3Vy Y2Uvc2RrL3dlYmtpdDJndGstNC4wLmJzdC9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0 b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwOjE4NQojOCAgV2ViS2l0OjpPcmlnaW5TdG9y YWdlTWFuYWdlcjo6ZGVsZXRlRGF0YShXVEY6Ok9wdGlvblNldDxXZWJLaXQ6OldlYnNpdGVEYXRh VHlwZT4sIFdURjo6V2FsbFRpbWUpCiAgICAodGhpcz08b3B0aW1pemVkIG91dD4sIHR5cGVzPS4u LiwgbW9kaWZpZWRTaW5jZT0uLi4pCiAgICBhdCAvdXNyL2xpYi9kZWJ1Zy9zb3VyY2Uvc2RrL3dl YmtpdDJndGstNC4wLmJzdC9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3Jp Z2luU3RvcmFnZU1hbmFnZXIuY3BwOjM2NAojOSAgMHgwMDAwN2ZlY2JmYTVhYTNmIGluIFdlYktp dDo6TmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpkZWxldGVEYXRhT25EaXNrKFdURjo6T3B0aW9uU2V0 PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlPiwgV1RGOjpXYWxsVGltZSwgV1RGOjpGdW5jdGlvbjxi b29sIChXZWJDb3JlOjpDbGllbnRPcmlnaW4gY29uc3QmKT4gY29uc3QmKQogICAgKHRoaXM9dGhp c0BlbnRyeT0weDdmZWNiN2NkZTNhOCwgdHlwZXM9Li4uLCBtb2RpZmllZFNpbmNlVGltZT0uLi4s IG1vZGlmaWVkU2luY2VUaW1lQGVudHJ5PS4uLiwgZmlsdGVyPS4uLikKICAgIGF0IC91c3IvbGli L2RlYnVnL3NvdXJjZS9zZGsvd2Via2l0Mmd0ay00LjAuYnN0L1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwOjUwMAogICAgICAgIG9y aWdpbiA9IAogICAgICAgICAgICBAMHg3ZmViOTYzZDY3NjA6IHt0b3BPcmlnaW4gPSB7cHJvdG9j b2wgPSB7c3RhdGljIE1heExlbmd0aCA9IDIxNDc0ODM2NDcsIG1faW1wbCA9IHttX3B0ciA9IDB4 N2ZlYzU3YzliMDIwfX0sIGhvc3QgPSB7c3RhdGljIE1heExlbmd0aCA9IDIxNDc0ODM2NDcsIG1f aW1wbCA9IHttX3B0ciA9IDB4N2ZlYzU3YzliMDQwfX0sIHBvcnQgPSBzdGQ6Om9wdGlvbmFsPHVu c2lnbmVkIHNob3J0PiBbbm8gY29udGFpbmVkIHZhbHVlXX0sIGNsaWVudE9yaWdpbiA9IHtwcm90 b2NvbCA9IHtzdGF0aWMgTWF4TGVuZ3RoID0gMjE0NzQ4MzY0NywgbV9pbXBsID0ge21fcHRyID0g MHg3ZmVjNTdjOWIwNjB9fSwgaG9zdCA9IHtzdGF0aWMgTWF4TGVuZ3RoID0gMjE0NzQ4MzY0Nywg bV9pbXBsID0ge21fcHRyID0gMHg3ZmVjNTdjZWFhNDh9fSwgcG9ydCA9IHN0ZDo6b3B0aW9uYWw8 dW5zaWduZWQgc2hvcnQ+IFtubyBjb250YWluZWQgdmFsdWVdfX0KICAgICAgICBfX2Zvcl9yYW5n ZSA9IEAweDdmZWM1N2JmZTc4ODoge21faW1wbCA9IHt7bV90YWJsZSA9IDB4N2ZlYjk2MzdjMDEw LCBtX3RhYmxlRm9yTExEQiA9IDB4N2ZlYjk2MzdjMDEwfX19CiAgICAgICAgZGVsZXRlZE9yaWdp bnMgPSB7bV9pbXBsID0ge3ttX3RhYmxlID0gMHg3ZmVjNTdjZTZlMjAsIG1fdGFibGVGb3JMTERC ID0gMHg3ZmVjNTdjZTZlMjB9fX0KIzEwIDB4MDAwMDdmZWNiZmE1ZTE1NiBpbiBvcGVyYXRvcigp IChfX2Nsb3N1cmU9PG9wdGltaXplZCBvdXQ+KSBhdCAvdXNyL2luY2x1ZGUvYysrLzExLjIuMC9i aXRzL3VuaXF1ZV9wdHIuaDoxNzIKICAgICAgICBkZWxldGVkT3JpZ2lucyA9IHttX2ltcGwgPSB7 e21fdGFibGUgPSAweDdmZWM1N2NlNmUyMCwgbV90YWJsZUZvckxMREIgPSAweDdmZWM1N2NlNmUy MH19fQogICAgICAgIGRlbGV0ZWREb21haW5zID0ge21faW1wbCA9IHt7bV90YWJsZSA9IDB4MSwg bV90YWJsZUZvckxMREIgPSAweDF9fX0KIzExIFdURjo6RGV0YWlsOjpDYWxsYWJsZVdyYXBwZXI8 V2ViS2l0OjpOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZURhdGFGb3JSZWdpc3RyYWJsZURv bWFpbnMoV1RGOjpPcHRpb25TZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU+LCBjb25zdCBXVEY6 OlZlY3RvcjxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4mLCBXVEY6OkNvbXBsZXRpb25IYW5k bGVyPHZvaWQoV1RGOjpIYXNoU2V0PFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPiYmKT4mJik6 OjxsYW1iZGEoKT4sIHZvaWQ+OjpjYWxsKHZvaWQpICh0aGlzPTB4N2ZlYmY0MDIzYzA4KSBhdCAv dXNyL2xpYi9kZWJ1Zy9zb3VyY2Uvc2RrL3dlYmtpdDJndGstNC4wLmJzdC9fYnVpbGRkaXIvV1RG L0hlYWRlcnMvd3RmL0Z1bmN0aW9uLmg6NTMKIzEyIDB4MDAwMDdmZWNiZTYzYWZkZCBpbiBXVEY6 OkZ1bmN0aW9uPHZvaWQgKCk+OjpvcGVyYXRvcigpKCkgY29uc3QgKHRoaXM9PHN5bnRoZXRpYyBw b2ludGVyPikgYXQgL3Vzci9saWIvZGVidWcvc291cmNlL3Nkay93ZWJraXQyZ3RrLTQuMC5ic3Qv U291cmNlL1dURi93dGYvRnVuY3Rpb24uaDo3OQogICAgICAgIGRpZFN1c3BlbmRGdW5jdGlvbnMg PSBmYWxzZQojMTMgV1RGOjpSdW5Mb29wOjpwZXJmb3JtV29yaygpICh0aGlzPTB4N2ZlY2I3YzZi MDAwKSBhdCAvdXNyL2xpYi9kZWJ1Zy9zb3VyY2Uvc2RrL3dlYmtpdDJndGstNC4wLmJzdC9Tb3Vy Y2UvV1RGL3d0Zi9SdW5Mb29wLmNwcDoxMzMKICAgICAgICBkaWRTdXNwZW5kRnVuY3Rpb25zID0g ZmFsc2UKIzE0IDB4MDAwMDdmZWNiZTY5YjFiZCBpbiBvcGVyYXRvcigpICh1c2VyRGF0YT08b3B0 aW1pemVkIG91dD4sIF9fY2xvc3VyZT0weDApIGF0IC91c3IvbGliL2RlYnVnL3NvdXJjZS9zZGsv d2Via2l0Mmd0ay00LjAuYnN0L1NvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcEdMaWIuY3BwOjgw CiMxNSBfRlVOKGdwb2ludGVyKSAoKSBhdCAvdXNyL2xpYi9kZWJ1Zy9zb3VyY2Uvc2RrL3dlYmtp dDJndGstNC4wLmJzdC9Tb3VyY2UvV1RGL3d0Zi9nbGliL1J1bkxvb3BHTGliLmNwcDo4MgojMTYg MHgwMDAwN2ZlY2JlNjliYmFkIGluIG9wZXJhdG9yKCkgKF9fY2xvc3VyZT0weDAsIHVzZXJEYXRh PTB4N2ZlY2I3YzZiMDAwLCBjYWxsYmFjaz0weDdmZWNiZTY5YjFiMCA8X0ZVTihncG9pbnRlcik+ LCBzb3VyY2U9MHg3ZmVjNTAwMDNlODApIGF0IC91c3IvbGliL2RlYnVnL3NvdXJjZS9zZGsvd2Vi a2l0Mmd0ay00LjAuYnN0L1NvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcEdMaWIuY3BwOjUzCiAg ICAgICAgbmFtZSA9IDB4N2ZlYzUwMDAzZWYwICJbV2ViS2l0XSBSdW5Mb29wIHdvcmsiCiAgICAg ICAgcnVuTG9vcFNvdXJjZSA9IEAweDdmZWM1MDAwM2U4MDoge3NvdXJjZSA9IHtjYWxsYmFja19k YXRhID0gMHg3ZmVjNTAwMDM3ZDAsIGNhbGxiYWNrX2Z1bmNzID0gMHg3ZmVjYmViNGIyYzAgPGdf c291cmNlX2NhbGxiYWNrX2Z1bmNzPiwgc291cmNlX2Z1bmNzID0gMHg3ZmVjYmVhMDI5MjAgPFdU Rjo6UnVuTG9vcDo6c19ydW5Mb29wU291cmNlRnVuY3Rpb25zPiwgcmVmX2NvdW50ID0gMywgY29u dGV4dCA9IDB4N2ZlYzUwMDAwYjYwLCBwcmlvcml0eSA9IDEwMCwgZmxhZ3MgPSAzNSwgc291cmNl X2lkID0gMSwgcG9sbF9mZHMgPSAweDAsIHByZXYgPSAweDAsIG5leHQgPSAweDAsIG5hbWUgPSAw eDdmZWM1MDAwM2VmMCAiW1dlYktpdF0gUnVuTG9vcCB3b3JrIiwgcHJpdiA9IDB4NTYwNWRkNWJh MDYwfSwgcnVuTG9vcCA9IDB4N2ZlY2I3YzZiMDAwfQogICAgICAgIHJldHVyblZhbHVlID0gPG9w dGltaXplZCBvdXQ+CiMxNyBfRlVOKEdTb3VyY2UqLCBHU291cmNlRnVuYywgZ3BvaW50ZXIpICgp IGF0IC91c3IvbGliL2RlYnVnL3NvdXJjZS9zZGsvd2Via2l0Mmd0ay00LjAuYnN0L1NvdXJjZS9X VEYvd3RmL2dsaWIvUnVuTG9vcEdMaWIuY3BwOjU2CiMxOCAweDAwMDA3ZmVjYmVhNjhjNmIgaW4g Z19tYWluX2Rpc3BhdGNoIChjb250ZXh0PTB4N2ZlYzUwMDAwYjYwKSBhdCAuLi9nbGliL2dtYWlu LmM6MzQxMwogICAgICAgIGRpc3BhdGNoID0gMHg3ZmVjYmU2OWJiNTAgPF9GVU4oR1NvdXJjZSos IEdTb3VyY2VGdW5jLCBncG9pbnRlcik+CiAgICAgICAgcHJldl9zb3VyY2UgPSAweDAKICAgICAg ICBiZWdpbl90aW1lX25zZWMgPSAxMDQ0NDU0Mzg3NDcwNAogICAgICAgIHdhc19pbl9jYWxsID0g PG9wdGltaXplZCBvdXQ+CiAgICAgICAgdXNlcl9kYXRhID0gMHg3ZmVjYjdjNmIwMDAKICAgICAg ICBjYWxsYmFjayA9IDB4N2ZlY2JlNjliMWIwIDxfRlVOKGdwb2ludGVyKT4KICAgICAgICBjYl9m dW5jcyA9IDB4N2ZlY2JlYjRiMmMwIDxnX3NvdXJjZV9jYWxsYmFja19mdW5jcz4KICAgICAgICBj Yl9kYXRhID0gMHg3ZmVjNTAwMDM3ZDAKICAgICAgICBuZWVkX2Rlc3Ryb3kgPSA8b3B0aW1pemVk IG91dD4KICAgICAgICBzb3VyY2UgPSAweDdmZWM1MDAwM2U4MAogICAgICAgIGN1cnJlbnQgPSAw eDdmZWM1MDAwM2ZhMAogICAgICAgIGkgPSAwCiAgICAgICAgX19mdW5jX18gPSAiZ19tYWluX2Rp c3BhdGNoIgojMTkgZ19tYWluX2NvbnRleHRfZGlzcGF0Y2ggKGNvbnRleHQ9MHg3ZmVjNTAwMDBi NjApIGF0IC4uL2dsaWIvZ21haW4uYzo0MTMxCiMyMCAweDAwMDA3ZmVjYmVhNjkxNzggaW4gZ19t YWluX2NvbnRleHRfaXRlcmF0ZSAoY29udGV4dD0weDdmZWM1MDAwMGI2MCwgYmxvY2s9YmxvY2tA ZW50cnk9MSwgZGlzcGF0Y2g9ZGlzcGF0Y2hAZW50cnk9MSwgc2VsZj08b3B0aW1pemVkIG91dD4p IGF0IC4uL2dsaWIvZ21haW4uYzo0MjA3CiAgICAgICAgbWF4X3ByaW9yaXR5ID0gMjE0NzQ4MzY0 NwogICAgICAgIHRpbWVvdXQgPSAtMQogICAgICAgIHNvbWVfcmVhZHkgPSAxCiAgICAgICAgbmZk cyA9IDEKICAgICAgICBhbGxvY2F0ZWRfbmZkcyA9IDEKICAgICAgICBmZHMgPSA8b3B0aW1pemVk IG91dD4KICAgICAgICBiZWdpbl90aW1lX25zZWMgPSAxMDQ0Mzc5MTU3MjY3NQojMjEgMHgwMDAw N2ZlY2JlYTY5NDkzIGluIGdfbWFpbl9sb29wX3J1biAobG9vcD0weDdmZWM1MDAwM2U2MCkgYXQg Li4vZ2xpYi9nbWFpbi5jOjQ0MDUKICAgICAgICBfX2Z1bmNfXyA9ICJnX21haW5fbG9vcF9ydW4i CiMyMiAweDAwMDA3ZmVjYmU2OWJkMTAgaW4gV1RGOjpSdW5Mb29wOjpydW4oKSAoKSBhdCAvdXNy L2xpYi9kZWJ1Zy9zb3VyY2Uvc2RrL3dlYmtpdDJndGstNC4wLmJzdC9Tb3VyY2UvV1RGL3d0Zi9n bGliL1J1bkxvb3BHTGliLmNwcDoxMDgKICAgICAgICBydW5Mb29wID0gQDB4N2ZlY2I3YzZiMDAw OiB7PFdURjo6RnVuY3Rpb25EaXNwYXRjaGVyPiA9IHs8V1RGOjpUaHJlYWRTYWZlUmVmQ291bnRl ZDxXVEY6OkZ1bmN0aW9uRGlzcGF0Y2hlciwgKFdURjo6RGVzdHJ1Y3Rpb25UaHJlYWQpMD4+ID0g ezxXVEY6OlRocmVhZFNhZmVSZWZDb3VudGVkQmFzZT4gPSB7bV9yZWZDb3VudCA9IHs8c3RkOjpf X2F0b21pY19iYXNlPHVuc2lnbmVkIGludD4+ID0ge3N0YXRpYyBfU19hbGlnbm1lbnQgPSA0LCBf TV9pID0gMX0sIHN0YXRpYyBpc19hbHdheXNfbG9ja19mcmVlID0gdHJ1ZX19LCA8Tm8gZGF0YSBm aWVsZHM+fSwgX3ZwdHIuRnVuY3Rpb25EaXNwYXRjaGVyID0gMHg3ZmVjYmU5ZjMyNTAgPHZ0YWJs ZSBmb3IgV1RGOjpSdW5Mb29wKzE2Pn0sIG1fY3VycmVudEl0ZXJhdGlvbiA9IHttX3N0YXJ0ID0g MSwgbV9lbmQgPSAxLCBtX2J1ZmZlciA9IHs8V1RGOjpWZWN0b3JCdWZmZXJCYXNlPFdURjo6RnVu Y3Rpb248dm9pZCgpPiwgV1RGOjpGYXN0TWFsbG9jPj4gPSB7bV9idWZmZXIgPSAweDdmZWJiNDY0 YmU4MCwgbV9jYXBhY2l0eSA9IDE2LCBtX3NpemUgPSAwfSwgPE5vIGRhdGEgZmllbGRzPn19LCBt X25leHRJdGVyYXRpb25Mb2NrID0ge3N0YXRpYyBpc0hlbGRCaXQgPSAxICdcMDAxJywgc3RhdGlj IGhhc1BhcmtlZEJpdCA9IDIgJ1wwMDInLCBtX2J5dGUgPSB7dmFsdWUgPSB7PHN0ZDo6X19hdG9t aWNfYmFzZTx1bnNpZ25lZCBjaGFyPj4gPSB7c3RhdGljIF9TX2FsaWdubWVudCA9IDEsIF9NX2kg PSAwICdcMDAwJ30sIHN0YXRpYyBpc19hbHdheXNfbG9ja19mcmVlID0gdHJ1ZX19fSwgbV9uZXh0 SXRlcmF0aW9uID0ge21fc3RhcnQgPSAwLCBtX2VuZCA9IDAsIG1fYnVmZmVyID0gezxXVEY6OlZl Y3RvckJ1ZmZlckJhc2U8V1RGOjpGdW5jdGlvbjx2b2lkKCk+LCBXVEY6OkZhc3RNYWxsb2M+PiA9 IHttX2J1ZmZlciA9IDB4MCwgbV9jYXBhY2l0eSA9IDAsIG1fc2l6ZSA9IDB9LCA8Tm8gZGF0YSBm aWVsZHM+fX0sIG1faXNGdW5jdGlvbkRpc3BhdGNoU3VzcGVuZGVkID0gZmFsc2UsIG1faGFzU3Vz cGVuZGVkRnVuY3Rpb25zID0gZmFsc2UsIHN0YXRpYyBzX3J1bkxvb3BTb3VyY2VGdW5jdGlvbnMg PSB7cHJlcGFyZSA9IDB4MCwgY2hlY2sgPSAweDAsIGRpc3BhdGNoID0gMHg3ZmVjYmU2OWJiNTAg PF9GVU4oR1NvdXJjZSosIEdTb3VyY2VGdW5jLCBncG9pbnRlcik+LCBmaW5hbGl6ZSA9IDB4MCwg Y2xvc3VyZV9jYWxsYmFjayA9IDB4MCwgY2xvc3VyZV9tYXJzaGFsID0gMHgwfSwgbV9tYWluQ29u dGV4dCA9IHttX3B0ciA9IDB4N2ZlYzUwMDAwYjYwfSwgbV9tYWluTG9vcHMgPSB7PFdURjo6VmVj dG9yQnVmZmVyPFdURjo6R1JlZlB0cjxfR01haW5Mb29wPiwgMCwgV1RGOjpGYXN0TWFsbG9jPj4g PSB7PFdURjo6VmVjdG9yQnVmZmVyQmFzZTxXVEY6OkdSZWZQdHI8X0dNYWluTG9vcD4sIFdURjo6 RmFzdE1hbGxvYz4+ID0ge21fYnVmZmVyID0gMHg3ZmVjYjdjNmMwMDAsIG1fY2FwYWNpdHkgPSAx NiwgbV9zaXplID0gMX0sIDxObyBkYXRhIGZpZWxkcz59LCA8Tm8gZGF0YSBmaWVsZHM+fSwgbV9z b3VyY2UgPSB7bV9wdHIgPSAweDdmZWM1MDAwM2U4MH0sIG1fb2JzZXJ2ZXJzID0ge21fc2V0ID0g e21faW1wbCA9IHt7bV90YWJsZSA9IDB4MCwgbV90YWJsZUZvckxMREIgPSAweDB9fX19fQogICAg ICAgIG1haW5Db250ZXh0ID0gMHg3ZmVjNTAwMDBiNjAKICAgICAgICBpbm5lcm1vc3RMb29wID0g MHg3ZmVjNTAwMDNlNjAKICAgICAgICBuZXN0ZWRNYWluTG9vcCA9IDxvcHRpbWl6ZWQgb3V0Pgoj MjMgMHgwMDAwN2ZlY2JlNjNkOGM1IGluIFdURjo6RnVuY3Rpb248dm9pZCAoKT46Om9wZXJhdG9y KCkoKSBjb25zdCAodGhpcz08c3ludGhldGljIHBvaW50ZXI+KSBhdCAvdXNyL2xpYi9kZWJ1Zy9z b3VyY2Uvc2RrL3dlYmtpdDJndGstNC4wLmJzdC9Tb3VyY2UvV1RGL3d0Zi9GdW5jdGlvbi5oOjc5 CiAgICAgICAgZnVuY3Rpb24gPSB7bV9jYWxsYWJsZVdyYXBwZXIgPSBzdGQ6OnVuaXF1ZV9wdHI8 Y2xhc3MgV1RGOjpEZXRhaWw6OkNhbGxhYmxlV3JhcHBlckJhc2U8dm9pZD4+ID0ge2dldCgpID0g MHg3ZmVjYjdjZjYzZDh9fQojMjQgV1RGOjpUaHJlYWQ6OmVudHJ5UG9pbnQoV1RGOjpUaHJlYWQ6 Ok5ld1RocmVhZENvbnRleHQqKSAobmV3VGhyZWFkQ29udGV4dD0weDdmZWNiN2NmMDEyMCkgYXQg L3Vzci9saWIvZGVidWcvc291cmNlL3Nkay93ZWJraXQyZ3RrLTQuMC5ic3QvU291cmNlL1dURi93 dGYvVGhyZWFkaW5nLmNwcDoxOTEKICAgICAgICBmdW5jdGlvbiA9IHttX2NhbGxhYmxlV3JhcHBl ciA9IHN0ZDo6dW5pcXVlX3B0cjxjbGFzcyBXVEY6OkRldGFpbDo6Q2FsbGFibGVXcmFwcGVyQmFz ZTx2b2lkPj4gPSB7Z2V0KCkgPSAweDdmZWNiN2NmNjNkOH19CiMyNSAweDAwMDA3ZmVjYmU2OWU5 OGQgaW4gV1RGOjp3dGZUaHJlYWRFbnRyeVBvaW50KHZvaWQqKSAoY29udGV4dD08b3B0aW1pemVk IG91dD4pIGF0IC91c3IvbGliL2RlYnVnL3NvdXJjZS9zZGsvd2Via2l0Mmd0ay00LjAuYnN0L1Nv dXJjZS9XVEYvd3RmL3Bvc2l4L1RocmVhZGluZ1BPU0lYLmNwcDoyNDQKIzI2IDB4MDAwMDdmZWNi Y2Q3ZTNiYSBpbiBzdGFydF90aHJlYWQgKGFyZz0weDdmZWM1N2JmZjY0MCkgYXQgcHRocmVhZF9j cmVhdGUuYzo0ODEKICAgICAgICByZXQgPSA8b3B0aW1pemVkIG91dD4KICAgICAgICBwZCA9IDB4 N2ZlYzU3YmZmNjQwCiAgICAgICAgdW53aW5kX2J1ZiA9IHtjYW5jZWxfam1wX2J1ZiA9IHt7am1w X2J1ZiA9IHsxNDA2NTMwNjEyMDc2MTYsIDgwNDIyMDM1ODQ4MTQ4MTc3MywgMTQwNzMyMzA0NDM1 OTUyLCAxNDA3MzIzMDQ0MzU2NDYsIDE0MDczMjMwNDQzNTY0NywgMCwgODA0MjIwMzU4NTk0NzI3 OTgxLCA4MDQxNzA2NzQxMDA0NDExMzN9LCBtYXNrX3dhc19zYXZlZCA9IDB9fSwgcHJpdiA9IHtw YWQgPSB7MHgwLCAweDAsIDB4MCwgMHgwfSwgZGF0YSA9IHtwcmV2ID0gMHgwLCBjbGVhbnVwID0g MHgwLCBjYW5jZWx0eXBlID0gMH19fQogICAgICAgIG5vdF9maXJzdF9jYWxsID0gMAojMjcgMHgw MDAwN2ZlY2JlZjg0YjAzIGluIGNsb25lICgpIGF0IC4uL3N5c2RlcHMvdW5peC9zeXN2L2xpbnV4 L3g4Nl82NC9jbG9uZS5TOjk1Cg== 451055 2022-02-06 17:26:32 -0800 2022-02-06 21:17:41 -0800 Patch bug-236209-20220206172630.patch text/plain 1812 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyN2I1NjIyMjQ3ZDlkNTg3 NTI0MTc3NzFkMWMwNzc2YzE0MjhkMzAuLmQ3OWRiMWNlNjIxZDFkZmMxMmY1YzcwOGUwYmExNjZh ZGY2Mzg4OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDItMDYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjg2OTM2KTog Q3Jhc2ggaW4gV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6ZGVs ZXRlTG9jYWxTdG9yYWdlRGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM2MjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIG51bGwgY2hlY2sgZm9yIG1vZGlmaWNhdGlvblRpbWUgcmV0dXJuZWQg YnkgRmlsZVN5c3RlbTo6ZmlsZU1vZGlmaWNhdGlvblRpbWUuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmRlbGV0ZUxvY2FsU3RvcmFn ZURhdGEpOgorCiAyMDIyLTAyLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFJlZmFjdG9yIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlQ29sbGVjdGlv biB0byBoYXZlIGEgc2luZ2xlIGJhY2tpbmcgc3RvcmUgdHJhdmVyc2FsIGZ1bmN0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFn ZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdp blN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAyMzRjMDlhYjI5NTU4NGJkYTg5YmU3NGU5MzgzNmRm Y2ExZWE4MmRlLi4zMGE2NjlkMmY0NTgyNTJjN2ViNmQyOWU1OTBlMGVlMDVhYTRjZTA2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFn ZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9P cmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTI0Niw3ICsyNDYsOCBAQCBwcml2YXRlOgogCiAg ICAgdm9pZCBkZWxldGVMb2NhbFN0b3JhZ2VEYXRhKFdhbGxUaW1lIHRpbWUpCiAgICAgewotICAg ICAgICBpZiAoYXV0byBtb2RpZmljYXRpb25UaW1lID0gRmlsZVN5c3RlbTo6ZmlsZU1vZGlmaWNh dGlvblRpbWUobV9sb2NhbFN0b3JhZ2VQYXRoKTsgKm1vZGlmaWNhdGlvblRpbWUgPj0gdGltZSkg eworICAgICAgICBhdXRvIG1vZGlmaWNhdGlvblRpbWUgPSBGaWxlU3lzdGVtOjpmaWxlTW9kaWZp Y2F0aW9uVGltZShtX2xvY2FsU3RvcmFnZVBhdGgpOworICAgICAgICBpZiAobW9kaWZpY2F0aW9u VGltZSAmJiAqbW9kaWZpY2F0aW9uVGltZSA+PSB0aW1lKSB7CiAgICAgICAgICAgICBpZiAobV9s b2NhbFN0b3JhZ2VNYW5hZ2VyKQogICAgICAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlTWFuYWdl ci0+Y2xlYXJEYXRhT25EaXNrKCk7CiAgICAgICAgICAgICBXZWJDb3JlOjpTUUxpdGVGaWxlU3lz dGVtOjpkZWxldGVEYXRhYmFzZUZpbGUobV9sb2NhbFN0b3JhZ2VQYXRoKTsK 451065 2022-02-06 21:17:44 -0800 2022-02-06 21:46:51 -0800 Patch for landing bug-236209-20220206211743.patch text/plain 1737 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyN2I1NjIyMjQ3ZDlkNTg3 NTI0MTc3NzFkMWMwNzc2YzE0MjhkMzAuLmYwZGY4ZjQ0NDIwMTMyYzg5ZmFkNWJhNjRjZjdlNDg4 NDBiZWM2MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDItMDYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjg2OTM2KTog Q3Jhc2ggaW4gV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6ZGVs ZXRlTG9jYWxTdG9yYWdlRGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM2MjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisK KyAgICAgICAgQWRkIG51bGwgY2hlY2sgZm9yIG1vZGlmaWNhdGlvblRpbWUgcmV0dXJuZWQgYnkg RmlsZVN5c3RlbTo6ZmlsZU1vZGlmaWNhdGlvblRpbWUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmRlbGV0ZUxvY2FsU3RvcmFnZURh dGEpOgorCiAyMDIyLTAyLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFJlZmFjdG9yIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlQ29sbGVjdGlvbiB0 byBoYXZlIGEgc2luZ2xlIGJhY2tpbmcgc3RvcmUgdHJhdmVyc2FsIGZ1bmN0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0 b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAyMzRjMDlhYjI5NTU4NGJkYTg5YmU3NGU5MzgzNmRmY2Ex ZWE4MmRlLi41ODgzMWVhYTI2NjBhZjg3NGRlNmI5NTg5MGU1N2E3ZmI2MTU1N2VjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1h bmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9Pcmln aW5TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTI0Niw3ICsyNDYsNyBAQCBwcml2YXRlOgogCiAgICAg dm9pZCBkZWxldGVMb2NhbFN0b3JhZ2VEYXRhKFdhbGxUaW1lIHRpbWUpCiAgICAgewotICAgICAg ICBpZiAoYXV0byBtb2RpZmljYXRpb25UaW1lID0gRmlsZVN5c3RlbTo6ZmlsZU1vZGlmaWNhdGlv blRpbWUobV9sb2NhbFN0b3JhZ2VQYXRoKTsgKm1vZGlmaWNhdGlvblRpbWUgPj0gdGltZSkgewor ICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZU1vZGlmaWNhdGlvblRpbWUobV9sb2NhbFN0b3Jh Z2VQYXRoKSA+PSB0aW1lKSB7CiAgICAgICAgICAgICBpZiAobV9sb2NhbFN0b3JhZ2VNYW5hZ2Vy KQogICAgICAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlTWFuYWdlci0+Y2xlYXJEYXRhT25EaXNr KCk7CiAgICAgICAgICAgICBXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFz ZUZpbGUobV9sb2NhbFN0b3JhZ2VQYXRoKTsK