235224 2022-01-14 02:13:34 -0800 [GTK][WPE] REGRESSION(r264408): Exit cleanly if Connection to UIProcess severed 2022-03-30 00:43:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=217655 https://bugs.webkit.org/show_bug.cgi?id=183348 InRadar P2 Normal --- 1 psaavedra psaavedra achristensen beidson bugs-noreply cdumez cgarcia darin heycam kkinnunen mcatanzaro webkit-bug-importer oldest_to_newest 1830846 0 psaavedra 2022-01-14 02:13:34 -0800 Related-to: https://bugs.webkit.org/show_bug.cgi?id=217655#c14 I've noticed that this commit (https://bugs.webkit.org/show_bug.cgi?id=214307) have deleted some specific logic that affects to the WPE and GTK ports: ``` commit 813abc09e84c9a406836319bfa8f7fb83d378605 Author: cdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Date: Wed Jul 15 18:23:22 2020 +0000 [WK2] Make establishing a connection between the WebProcess and the Network process more robust https://bugs.webkit.org/show_bug.cgi?id=214307 <rdar://problem/64592340> Reviewed by Alex Christensen. ``` ``` diff diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp index 6f2d8fad165f..c73c43e9857c 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -1100,23 +1100,28 @@ void WebProcess::setInjectedBundleParameters(const IPC::DataReference& value) static NetworkProcessConnectionInfo getNetworkProcessConnection(IPC::Connection& connection) { NetworkProcessConnectionInfo connectionInfo; - if (!connection.sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(), Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(connectionInfo), 0)) { - // If we failed the first time, retry once. The attachment may have become invalid - // before it was received by the web process if the network process crashed. - if (!connection.sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(), Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(connectionInfo), 0)) { -#if PLATFORM(GTK) || PLATFORM(WPE) - // GTK+ and WPE ports don't exit on send sync message failure. - // In this particular case, the network process can be terminated by the UI process while the - // Web process is still initializing, so we always want to exit instead of crashing. This can - // happen when the WebView is created and then destroyed quickly. - // See https://bugs.webkit.org/show_bug.cgi?id=183348. + auto requestConnection = [&] { + if (!connection.isValid()) { + // Connection to UIProcess has been severed, exit cleanly. exit(0); -#else - CRASH(); -#endif ... ``` The change removes the specific logic for WPE and GTK added in: ``` commit f0627f5287186ec975c3439e9bcfe119493adc95 Author: carlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Date: Thu May 3 08:45:32 2018 +0000 REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127 https://bugs.webkit.org/show_bug.cgi?id=183348 ``` The comment in https://bugs.webkit.org/show_bug.cgi?id=183348#c40 offers a justification for that code. 1830851 1 449152 psaavedra 2022-01-14 02:24:58 -0800 Created attachment 449152 patch 1830859 2 449152 cgarcia 2022-01-14 03:15:53 -0800 Comment on attachment 449152 patch View in context: https://bugs.webkit.org/attachment.cgi?id=449152&action=review > Source/WebKit/ChangeLog:8 > + This patch reverts the WPE and GTK specific code removed in '[WK2] Make > + establishing a connection between the WebProcess and the Network process more > + robust' (https://bugs.webkit.org/show_bug.cgi?id=214307): Better use the revision number to refer to other commits r12345. > Source/WebKit/ChangeLog:10 > + GTK+ and WPE ports don't exit on send sync message failure. In those particular GTK+ -> GTK > Source/WebKit/ChangeLog:14 > + cases, the network process can be terminated by the UI process while the > + Web process is still initializing, so we always want to exit instead of crashing. This can > + happen when the WebView is created and then destroyed quickly. > + See https://bugs.webkit.org/show_bug.cgi?id=183348. Have you confirmed this is still a problem? > Source/WebKit/WebProcess/WebProcess.cpp:1123 > + // GTK+ and WPE ports don't exit on send sync message failure. GTK+ -> GTK > Source/WebKit/WebProcess/WebProcess.cpp:1284 > + // GTK+ and WPE ports don't exit on send sync message failure. Ditto. > Source/WebKit/WebProcess/WebProcess.cpp:1378 > + // GTK+ and WPE ports don't exit on send sync message failure. Ditto. > Source/WebKit/WebProcess/WebProcess.cpp:1386 > +#endif Too much duplicated code, maybe we can add a function failedToSendSyncMessage or something like that and move this logic there. 1833244 3 449796 psaavedra 2022-01-24 03:35:16 -0800 Created attachment 449796 patch 1833258 4 psaavedra 2022-01-24 04:39:24 -0800 (In reply to Carlos Garcia Campos from comment #2) > Comment on attachment 449152 [details] > patch ... > GTK+ -> GTK > > > Source/WebKit/ChangeLog:14 > > + cases, the network process can be terminated by the UI process while the > > + Web process is still initializing, so we always want to exit instead of crashing. This can > > + happen when the WebView is created and then destroyed quickly. > > + See https://bugs.webkit.org/show_bug.cgi?id=183348. > > Have you confirmed this is still a problem? > We observed this problem in custom WPE browser what makes extensive use of uses PSON. 1833265 5 449802 psaavedra 2022-01-24 04:59:38 -0800 Created attachment 449802 patch 1833358 6 449802 mcatanzaro 2022-01-24 09:13:22 -0800 Comment on attachment 449802 patch View in context: https://bugs.webkit.org/attachment.cgi?id=449802&action=review > Source/WebKit/WebProcess/WebProcess.cpp:1104 > + // GTK and WPE ports don't exit on send sync message failure. Hm, this comment is wrong. You clearly do exit right below. I see the comment originally comes from r231298, but the context has changed a little since then: now you've got this in its own function called "failedToSendSyncMessage," and saying we don't exit on sync message failure and then doing exactly that doesn't make sense. Needs to be reworded... somehow. Ideally, we'd explain why it's OK for GTK/WPE to exit cleanly while other ports crash. It might make sense to remove the PLATFORM guards here, btw. Looking at the context in https://bugs.webkit.org/show_bug.cgi?id=183348#c45, I see they were added to resolve an emergency when we didn't have time to convince Apple owners that the code is cleaner without them. This might be a good time to try again, because it's really confusing why some ports want to crash here and others don't. At the least, we should try to indicate why different ports do different things in the comment. I wonder what Carlos Garcia thinks about this, since he's dealt with most of the web process termination bugs over the years. 1833752 7 psaavedra 2022-01-25 09:55:43 -0800 (In reply to Michael Catanzaro from comment #6) > Comment on attachment 449802 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=449802&action=review > > > Source/WebKit/WebProcess/WebProcess.cpp:1104 > > + // GTK and WPE ports don't exit on send sync message failure. > > Hm, this comment is wrong. You clearly do exit right below. > > I see the comment originally comes from r231298, but the context has changed > a little since then: now you've got this in its own function called > "failedToSendSyncMessage," and saying we don't exit on sync message failure > and then doing exactly that doesn't make sense. Needs to be reworded... > somehow. Ideally, we'd explain why it's OK for GTK/WPE to exit cleanly while > other ports crash. > > It might make sense to remove the PLATFORM guards here, btw. Looking at the > context in https://bugs.webkit.org/show_bug.cgi?id=183348#c45, I see they > were added to resolve an emergency when we didn't have time to convince > Apple owners that the code is cleaner without them. This might be a good > time to try again, because it's really confusing why some ports want to > crash here and others don't. At the least, we should try to indicate why > different ports do different things in the comment. I wonder what Carlos > Garcia thinks about this, since he's dealt with most of the web process > termination bugs over the years. I see your point. This change is too much delicate. I agree with you, let's wait for the Carlos's input. He could have another ideas or he could suggest another approach for address this. 1836802 8 449802 cgarcia 2022-02-03 01:09:46 -0800 Comment on attachment 449802 patch View in context: https://bugs.webkit.org/attachment.cgi?id=449802&action=review > Source/WebKit/ChangeLog:3 > + [GTK][WPE] Exit cleanly if Connection to UIProcess severed. Regression (r214307) Please, make this match the bug title, note that 214307 is not the revision number, but the bug number. > Source/WebKit/ChangeLog:8 > + robust' (r12345): 12345 was an example, it should be r264408. > Source/WebKit/ChangeLog:10 > + GTK+ and WPE ports don't exit on send sync message failure. In those particular GTK+ -> GTK > Source/WebKit/ChangeLog:14 > + See https://bugs.webkit.org/show_bug.cgi?id=183348. The patch landed in this bug included a unit test that is still passing. Are you sure this is still a problem? We would need a way to reproduce the crash or a test. >>> Source/WebKit/WebProcess/WebProcess.cpp:1104 >>> + // GTK and WPE ports don't exit on send sync message failure. >> >> Hm, this comment is wrong. You clearly do exit right below. >> >> I see the comment originally comes from r231298, but the context has changed a little since then: now you've got this in its own function called "failedToSendSyncMessage," and saying we don't exit on sync message failure and then doing exactly that doesn't make sense. Needs to be reworded... somehow. Ideally, we'd explain why it's OK for GTK/WPE to exit cleanly while other ports crash. >> >> It might make sense to remove the PLATFORM guards here, btw. Looking at the context in https://bugs.webkit.org/show_bug.cgi?id=183348#c45, I see they were added to resolve an emergency when we didn't have time to convince Apple owners that the code is cleaner without them. This might be a good time to try again, because it's really confusing why some ports want to crash here and others don't. At the least, we should try to indicate why different ports do different things in the comment. I wonder what Carlos Garcia thinks about this, since he's dealt with most of the web process termination bugs over the years. > > I see your point. This change is too much delicate. I agree with you, let's wait for the Carlos's input. He could have another ideas or he could suggest another approach for address this. I see the comment is confusing, it actually means that GTK and WPE don't exit on send sync message failure in general (the setting is disabled), but in this particular case we want to exit, but not crash. 1848066 9 psaavedra 2022-03-03 14:25:34 -0800 Still I'm not sure this is the same case than the one described in the test case but I just got a crash. Here the trace: ``` #0 __libc_do_syscall () at libc-do-syscall.S:49 #1 0x74a4ca56 in __libc_signal_restore_set (set=0x7e90aac8) at ../sysdeps/unix/sysv/linux/internal-signals.h:86 #2 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:48 #3 0x74a3d768 in __GI_abort () at abort.c:79 #4 0x75190af6 in WebKit::WebProcess::ensureNetworkProcessConnection() () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #5 0x7518ffd0 in WebKit::WebProcess::initializeWebProcess(WebKit::WebProcessCreationParameters&&) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #6 0x74ee804c in WebKit::WebProcess::didReceiveWebProcessMessage(IPC::Connection&, IPC::Decoder&) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #7 0x75007d18 in IPC::Connection::dispatchMessage(std::unique_ptr<IPC::Decoder, std::default_delete<IPC::Decoder> >) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #8 0x75007f96 in IPC::Connection::dispatchOneIncomingMessage() () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #9 0x7694d280 in WTF::RunLoop::performWork() () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #10 0x76986ad8 in WTF::RunLoop::TimerBase::TimerBase(WTF::RunLoop&)::$_3::__invoke(void*) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #11 0x769861dc in WTF::RunLoop::$_0::__invoke(_GSource*, int (*)(void*), void*) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #12 0x7474a74e in g_main_dispatch (context=0x22498c8) at ../glib-2.62.6/glib/gmain.c:3216 #13 g_main_context_dispatch (context=context@entry=0x22498c8) at ../glib-2.62.6/glib/gmain.c:3908 #14 0x7474a9e4 in g_main_context_iterate (context=0x22498c8, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at ../glib-2.62.6/glib/gmain.c:3981 #15 0x7474ac50 in g_main_loop_run (loop=0x224ae58) at ../glib-2.62.6/glib/gmain.c:4175 #16 0x76986620 in WTF::RunLoop::run() () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #17 0x75231ee6 in int WebKit::AuxiliaryProcessMain<WebKit::WebProcess, WebKit::WebProcessMainWPE>(int, char**) () from /home/psaavedra/Downloads/webkit/usr/lib/libWPEWebKit-1.0.so.3.11.9 #18 0x74a3d9fa in __libc_start_main (main=0x4e7fd4, argc=0, argv=0x0, init=<optimized out>, fini=0x4e678d <__libc_csu_fini>, rtld_fini=0x76f7b02d <_dl_fini>, stack_end=0x7e90b4f4) at libc-start.c:308 #19 0x004e6608 in _start () at start.S:112 ``` 1854695 10 cgarcia 2022-03-24 08:50:00 -0700 *** Bug 238325 has been marked as a duplicate of this bug. *** 1855941 11 449802 cgarcia 2022-03-29 01:12:10 -0700 Comment on attachment 449802 patch View in context: https://bugs.webkit.org/attachment.cgi?id=449802&action=review > Source/WebKit/WebProcess/WebProcess.cpp:1101 > +[[ noreturn ]] inline void failedToSendSyncMessage() NO_RETURN 1855943 12 456004 psaavedra 2022-03-29 01:24:15 -0700 Created attachment 456004 patch 1856005 13 mcatanzaro 2022-03-29 06:53:05 -0700 (In reply to Pablo Saavedra from comment #12) > Created attachment 456004 [details] > patch Hi Pablo, is it OK for us to land this? 1856314 14 ews-feeder 2022-03-30 00:42:46 -0700 Committed r292099 (249019@main): <https://commits.webkit.org/249019@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456004. 1856315 15 webkit-bug-importer 2022-03-30 00:43:17 -0700 <rdar://problem/91030061> 449152 2022-01-14 02:24:58 -0800 2022-01-24 03:35:10 -0800 patch bug-235224-20220114112456.patch text/plain 4820 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc4NjBkMmZjYTZhMzcxYzJk OTc2ZGUxY2E1NjQ3ZjMxN2NiYTM1NGIuLjg1NmRlYTc0YmRjMWY1NDBhYWU4MGM2OTM1MWVlMzJj ZDQ2NWMyNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDEtMTQgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBFeGl0 IGNsZWFubHkgaWYgQ29ubmVjdGlvbiB0byBVSVByb2Nlc3Mgc2V2ZXJlZC4gUmVncmVzc2lvbiAo cjIxNDMwNykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNTIyNAorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUgV1BFIGFuZCBHVEsgc3Bl Y2lmaWMgY29kZSByZW1vdmVkIGluICdbV0syXSBNYWtlCisgICAgICAgIGVzdGFibGlzaGluZyBh IGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsgcHJvY2Vz cyBtb3JlCisgICAgICAgIHJvYnVzdCcgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTQzMDcpOgorCisgICAgICAgIEdUSysgYW5kIFdQRSBwb3J0cyBkb24ndCBleGl0 IG9uIHNlbmQgc3luYyBtZXNzYWdlIGZhaWx1cmUuIEluIHRob3NlIHBhcnRpY3VsYXIKKyAgICAg ICAgY2FzZXMsIHRoZSBuZXR3b3JrIHByb2Nlc3MgY2FuIGJlIHRlcm1pbmF0ZWQgYnkgdGhlIFVJ IHByb2Nlc3Mgd2hpbGUgdGhlCisgICAgICAgIFdlYiBwcm9jZXNzIGlzIHN0aWxsIGluaXRpYWxp emluZywgc28gd2UgYWx3YXlzIHdhbnQgdG8gZXhpdCBpbnN0ZWFkIG9mIGNyYXNoaW5nLiBUaGlz IGNhbgorICAgICAgICBoYXBwZW4gd2hlbiB0aGUgV2ViVmlldyBpcyBjcmVhdGVkIGFuZCB0aGVu IGRlc3Ryb3llZCBxdWlja2x5LgorICAgICAgICBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4MzM0OC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3M6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Z2V0 V2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbik6CisKIDIwMjItMDEtMDQgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBIYW5nIGluIEFWVHJhY2tQcml2 YXRlQVZGT2JqQ0ltcGw6OmJpdHJhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl c3MuY3BwCmluZGV4IGZhOTkzMjg3Y2ZiNmQwODM0ZGU5MTlkMThkZGRlODkwMmJhOTQ2NmMuLmFk YjY3MjQ2NDEyMTA2NzA1NjIzYjFhMmZhMmE1NTRiZDNhNDQ2MzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTExMTgsOCArMTExOCwxOCBAQCBzdGF0aWMgTmV0 d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oSVBD OjpDb25uZWN0aW9uJgogICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4RmFpbGVkQXR0 ZW1wdHMgPSAxMDsKICAgICB1bnNpZ25lZCBmYWlsZWRBdHRlbXB0cyA9IDA7CiAgICAgd2hpbGUg KCFyZXF1ZXN0Q29ubmVjdGlvbigpKSB7Ci0gICAgICAgIGlmICgrK2ZhaWxlZEF0dGVtcHRzID49 IG1heEZhaWxlZEF0dGVtcHRzKQorICAgICAgICBpZiAoKytmYWlsZWRBdHRlbXB0cyA+PSBtYXhG YWlsZWRBdHRlbXB0cykgeworI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQorICAg ICAgICAgICAgLy8gR1RLKyBhbmQgV1BFIHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1l c3NhZ2UgZmFpbHVyZS4KKyAgICAgICAgICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBjYXNlLCB0 aGUgbmV0d29yayBwcm9jZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9jZXNzIHdo aWxlIHRoZQorICAgICAgICAgICAgLy8gV2ViIHByb2Nlc3MgaXMgc3RpbGwgaW5pdGlhbGl6aW5n LCBzbyB3ZSBhbHdheXMgd2FudCB0byBleGl0IGluc3RlYWQgb2YgY3Jhc2hpbmcuIFRoaXMgY2Fu CisgICAgICAgICAgICAvLyBoYXBwZW4gd2hlbiB0aGUgV2ViVmlldyBpcyBjcmVhdGVkIGFuZCB0 aGVuIGRlc3Ryb3llZCBxdWlja2x5LgorICAgICAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMzNDguCisgICAgICAgICAgICBleGl0KDApOwor I2Vsc2UKICAgICAgICAgICAgIENSQVNIKCk7CisjZW5kaWYKKyAgICAgICAgfQogCiAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246 IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiB0byBuZXR3b3JrIHByb2Nlc3MsIHdpbGwgcmV0cnku Li4iKTsKIApAQCAtMTI3MCw3ICsxMjgwLDE2IEBAIEdQVVByb2Nlc3NDb25uZWN0aW9uSW5mbyBX ZWJQcm9jZXNzOjpnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24mIGNvCiAg ICAgICAgIC8vIElmIHdlIGZhaWxlZCB0aGUgZmlyc3QgdGltZSwgcmV0cnkgb25jZS4gVGhlIGF0 dGFjaG1lbnQgbWF5IGhhdmUgYmVjb21lIGludmFsaWQKICAgICAgICAgLy8gYmVmb3JlIGl0IHdh cyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFz aGVkLgogICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nl c3NQcm94eTo6R2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24ocGFyYW1ldGVycyksIE1lc3NhZ2VzOjpX ZWJQcm9jZXNzUHJveHk6OkdldEdQVVByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9u SW5mbyksIDApKQorI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQorICAgICAgICAg ICAgLy8gR1RLKyBhbmQgV1BFIHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2Ug ZmFpbHVyZS4KKyAgICAgICAgICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBjYXNlLCB0aGUgbmV0 d29yayBwcm9jZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9jZXNzIHdoaWxlIHRo ZQorICAgICAgICAgICAgLy8gV2ViIHByb2Nlc3MgaXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3 ZSBhbHdheXMgd2FudCB0byBleGl0IGluc3RlYWQgb2YgY3Jhc2hpbmcuIFRoaXMgY2FuCisgICAg ICAgICAgICAvLyBoYXBwZW4gd2hlbiB0aGUgV2ViVmlldyBpcyBjcmVhdGVkIGFuZCB0aGVuIGRl c3Ryb3llZCBxdWlja2x5LgorICAgICAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODMzNDguCisgICAgICAgICAgICBleGl0KDApOworI2Vsc2UK ICAgICAgICAgICAgIENSQVNIKCk7CisjZW5kaWYKICAgICB9CiAKICAgICByZXR1cm4gY29ubmVj dGlvbkluZm87CkBAIC0xMzU1LDcgKzEzNzQsMTYgQEAgc3RhdGljIFdlYkF1dGhuUHJvY2Vzc0Nv bm5lY3Rpb25JbmZvIGdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW8K ICAgICAgICAgLy8gYmVmb3JlIGl0IHdhcyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYg dGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVkLgogICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2Vu ZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0V2ViQXV0aG5Qcm9jZXNzQ29ubmVj dGlvbigpLCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRXZWJBdXRoblByb2Nlc3NDb25u ZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyksIDApKSB7CiAgICAgICAgICAgICBSRUxFQVNF X0xPR19FUlJPUihXZWJBdXRobiwgImdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb246IFVuYWJs ZSB0byBjb25uZWN0IHRvIFdlYkF1dGhuIHByb2Nlc3MgKFRlcm1pbmF0aW5nKSIpOworI2lmIFBM QVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQorICAgICAgICAgICAgLy8gR1RLKyBhbmQgV1BF IHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2UgZmFpbHVyZS4KKyAgICAgICAg ICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBjYXNlLCB0aGUgbmV0d29yayBwcm9jZXNzIGNhbiBi ZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9jZXNzIHdoaWxlIHRoZQorICAgICAgICAgICAgLy8g V2ViIHByb2Nlc3MgaXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3ZSBhbHdheXMgd2FudCB0byBl eGl0IGluc3RlYWQgb2YgY3Jhc2hpbmcuIFRoaXMgY2FuCisgICAgICAgICAgICAvLyBoYXBwZW4g d2hlbiB0aGUgV2ViVmlldyBpcyBjcmVhdGVkIGFuZCB0aGVuIGRlc3Ryb3llZCBxdWlja2x5Lgor ICAgICAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODMzNDguCisgICAgICAgICAgICBleGl0KDApOworI2Vsc2UKICAgICAgICAgICAgIENSQVNI KCk7CisjZW5kaWYKICAgICAgICAgfQogICAgIH0KIAo= 449796 2022-01-24 03:35:16 -0800 2022-01-24 05:08:33 -0800 patch bug-235224-20220124123515.patch text/plain 4086 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ3NmEzNGQ2NDk2YjFjMTY1 YWYzZWE3YmEyMGJlMzhkMDIxZTUzY2EuLmIzNDJkNDQ5OTFkMDRhODlhMTA2MzllOThjNTdhNTlk Mjg1NmRiYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDEtMTQgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBFeGl0 IGNsZWFubHkgaWYgQ29ubmVjdGlvbiB0byBVSVByb2Nlc3Mgc2V2ZXJlZC4gUmVncmVzc2lvbiAo cjIxNDMwNykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNTIyNAorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUgV1BFIGFuZCBHVEsgc3Bl Y2lmaWMgY29kZSByZW1vdmVkIGluICdbV0syXSBNYWtlCisgICAgICAgIGVzdGFibGlzaGluZyBh IGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsgcHJvY2Vz cyBtb3JlCisgICAgICAgIHJvYnVzdCcgKHIxMjM0NSk6CisKKyAgICAgICAgR1RLKyBhbmQgV1BF IHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2UgZmFpbHVyZS4gSW4gdGhvc2Ug cGFydGljdWxhcgorICAgICAgICBjYXNlcywgdGhlIG5ldHdvcmsgcHJvY2VzcyBjYW4gYmUgdGVy bWluYXRlZCBieSB0aGUgVUkgcHJvY2VzcyB3aGlsZSB0aGUKKyAgICAgICAgV2ViIHByb2Nlc3Mg aXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3ZSBhbHdheXMgd2FudCB0byBleGl0IGluc3RlYWQg b2YgY3Jhc2hpbmcuIFRoaXMgY2FuCisgICAgICAgIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlz IGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJveWVkIHF1aWNrbHkuCisgICAgICAgIFNlZSBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMzQ4LgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpnZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKToKKwogMjAyMi0wMS0y NCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFBy b2Nlc3NdIFtGaWx0ZXJzXSBNb3ZlIEZFSW1hZ2UgdG8gdGhlICdwbGF0Zm9ybScgZGlyZWN0b3J5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggNjg5NzBlZDcwNDUz NzkzOTBmNTI4MWIyNzY1ODExYTIyYzA3ZTJkMi4uNTVlYjgwNTJkZTkxZmY1MzlmZGIyMDljNTlh MGFjZjViOGU0YmY2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApA QCAtMTA5OCw2ICsxMDk4LDIwIEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SW5qZWN0ZWRCdW5kbGVQ YXJhbWV0ZXJzKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgdmFsdWUpCiAgICAgaW5qZWN0ZWRC dW5kbGUtPnNldEJ1bmRsZVBhcmFtZXRlcnModmFsdWUpOwogfQogCitzdGF0aWMgdm9pZCBmYWls ZWRUb1NlbmRTeW5jTWVzc2FnZSgpCit7CisjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShX UEUpCisgICAgLy8gR1RLIGFuZCBXUEUgcG9ydHMgZG9uJ3QgZXhpdCBvbiBzZW5kIHN5bmMgbWVz c2FnZSBmYWlsdXJlLgorICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBjYXNlLCB0aGUgbmV0d29y ayBwcm9jZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9jZXNzIHdoaWxlIHRoZQor ICAgIC8vIFdlYiBwcm9jZXNzIGlzIHN0aWxsIGluaXRpYWxpemluZywgc28gd2UgYWx3YXlzIHdh bnQgdG8gZXhpdCBpbnN0ZWFkIG9mIGNyYXNoaW5nLiBUaGlzIGNhbgorICAgIC8vIGhhcHBlbiB3 aGVuIHRoZSBXZWJWaWV3IGlzIGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJveWVkIHF1aWNrbHkuCisg ICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMzNDgu CisgICAgZXhpdCgwKTsKKyNlbHNlCisgICAgQ1JBU0goKTsKKyNlbmRpZgorfQorCiBzdGF0aWMg TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24o SVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewogICAgIE5ldHdvcmtQcm9jZXNzQ29ubmVj dGlvbkluZm8gY29ubmVjdGlvbkluZm87CkBAIC0xMTE3LDcgKzExMzEsNyBAQCBzdGF0aWMgTmV0 d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oSVBD OjpDb25uZWN0aW9uJgogICAgIHVuc2lnbmVkIGZhaWxlZEF0dGVtcHRzID0gMDsKICAgICB3aGls ZSAoIXJlcXVlc3RDb25uZWN0aW9uKCkpIHsKICAgICAgICAgaWYgKCsrZmFpbGVkQXR0ZW1wdHMg Pj0gbWF4RmFpbGVkQXR0ZW1wdHMpCi0gICAgICAgICAgICBDUkFTSCgpOworICAgICAgICAgICAg ZmFpbGVkVG9TZW5kU3luY01lc3NhZ2UoKTsKIAogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQ cm9jZXNzLCAiZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5l Y3Rpb24gdG8gbmV0d29yayBwcm9jZXNzLCB3aWxsIHJldHJ5Li4uIik7CiAKQEAgLTEyNzAsNyAr MTI4NCw3IEBAIEdQVVByb2Nlc3NDb25uZWN0aW9uSW5mbyBXZWJQcm9jZXNzOjpnZXRHUFVQcm9j ZXNzQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24mIGNvCiAgICAgICAgIC8vIElmIHdlIGZhaWxl ZCB0aGUgZmlyc3QgdGltZSwgcmV0cnkgb25jZS4gVGhlIGF0dGFjaG1lbnQgbWF5IGhhdmUgYmVj b21lIGludmFsaWQKICAgICAgICAgLy8gYmVmb3JlIGl0IHdhcyByZWNlaXZlZCBieSB0aGUgd2Vi IHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVkLgogICAgICAgICBpZiAoIWNv bm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0R1BVUHJvY2Vz c0Nvbm5lY3Rpb24ocGFyYW1ldGVycyksIE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldEdQ VVByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyksIDApKQotICAgICAgICAg ICAgQ1JBU0goKTsKKyAgICAgICAgICAgIGZhaWxlZFRvU2VuZFN5bmNNZXNzYWdlKCk7CiAgICAg fQogCiAgICAgcmV0dXJuIGNvbm5lY3Rpb25JbmZvOwpAQCAtMTM1NSw3ICsxMzY5LDcgQEAgc3Rh dGljIFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb25JbmZvIGdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5l Y3Rpb24oSVBDOjpDb25uZWN0aW8KICAgICAgICAgLy8gYmVmb3JlIGl0IHdhcyByZWNlaXZlZCBi eSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVkLgogICAgICAg ICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0 V2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbigpLCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpH ZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyksIDApKSB7 CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihXZWJBdXRobiwgImdldFdlYkF1dGhuUHJv Y2Vzc0Nvbm5lY3Rpb246IFVuYWJsZSB0byBjb25uZWN0IHRvIFdlYkF1dGhuIHByb2Nlc3MgKFRl cm1pbmF0aW5nKSIpOwotICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgICAgIGZhaWxlZFRv U2VuZFN5bmNNZXNzYWdlKCk7CiAgICAgICAgIH0KICAgICB9CiAK 449802 2022-01-24 04:59:38 -0800 2022-03-29 01:24:09 -0700 patch bug-235224-20220124135937.patch text/plain 4101 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ3NmEzNGQ2NDk2YjFjMTY1 YWYzZWE3YmEyMGJlMzhkMDIxZTUzY2EuLmIzNDJkNDQ5OTFkMDRhODlhMTA2MzllOThjNTdhNTlk Mjg1NmRiYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDEtMTQgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBFeGl0 IGNsZWFubHkgaWYgQ29ubmVjdGlvbiB0byBVSVByb2Nlc3Mgc2V2ZXJlZC4gUmVncmVzc2lvbiAo cjIxNDMwNykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNTIyNAorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUgV1BFIGFuZCBHVEsgc3Bl Y2lmaWMgY29kZSByZW1vdmVkIGluICdbV0syXSBNYWtlCisgICAgICAgIGVzdGFibGlzaGluZyBh IGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsgcHJvY2Vz cyBtb3JlCisgICAgICAgIHJvYnVzdCcgKHIxMjM0NSk6CisKKyAgICAgICAgR1RLKyBhbmQgV1BF IHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2UgZmFpbHVyZS4gSW4gdGhvc2Ug cGFydGljdWxhcgorICAgICAgICBjYXNlcywgdGhlIG5ldHdvcmsgcHJvY2VzcyBjYW4gYmUgdGVy bWluYXRlZCBieSB0aGUgVUkgcHJvY2VzcyB3aGlsZSB0aGUKKyAgICAgICAgV2ViIHByb2Nlc3Mg aXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3ZSBhbHdheXMgd2FudCB0byBleGl0IGluc3RlYWQg b2YgY3Jhc2hpbmcuIFRoaXMgY2FuCisgICAgICAgIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlz IGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJveWVkIHF1aWNrbHkuCisgICAgICAgIFNlZSBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMzQ4LgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpnZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKToKKwogMjAyMi0wMS0y NCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFBy b2Nlc3NdIFtGaWx0ZXJzXSBNb3ZlIEZFSW1hZ2UgdG8gdGhlICdwbGF0Zm9ybScgZGlyZWN0b3J5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggNjg5NzBlZDcwNDUz NzkzOTBmNTI4MWIyNzY1ODExYTIyYzA3ZTJkMi4uODI2NjM3ZTk2MWUzODhiMWRjMThmNGFiZDFh Mjk3ZWMwMGVhZTM0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApA QCAtMTA5OCw2ICsxMDk4LDIwIEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SW5qZWN0ZWRCdW5kbGVQ YXJhbWV0ZXJzKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgdmFsdWUpCiAgICAgaW5qZWN0ZWRC dW5kbGUtPnNldEJ1bmRsZVBhcmFtZXRlcnModmFsdWUpOwogfQogCitbWyBub3JldHVybiBdXSBp bmxpbmUgdm9pZCBmYWlsZWRUb1NlbmRTeW5jTWVzc2FnZSgpCit7CisjaWYgUExBVEZPUk0oR1RL KSB8fCBQTEFURk9STShXUEUpCisgICAgLy8gR1RLIGFuZCBXUEUgcG9ydHMgZG9uJ3QgZXhpdCBv biBzZW5kIHN5bmMgbWVzc2FnZSBmYWlsdXJlLgorICAgIC8vIEluIHRoaXMgcGFydGljdWxhciBj YXNlLCB0aGUgbmV0d29yayBwcm9jZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRoZSBVSSBwcm9j ZXNzIHdoaWxlIHRoZQorICAgIC8vIFdlYiBwcm9jZXNzIGlzIHN0aWxsIGluaXRpYWxpemluZywg c28gd2UgYWx3YXlzIHdhbnQgdG8gZXhpdCBpbnN0ZWFkIG9mIGNyYXNoaW5nLiBUaGlzIGNhbgor ICAgIC8vIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlzIGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJv eWVkIHF1aWNrbHkuCisgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODMzNDguCisgICAgZXhpdCgwKTsKKyNlbHNlCisgICAgQ1JBU0goKTsKKyNlbmRp ZgorfQorCiBzdGF0aWMgTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewogICAgIE5ldHdv cmtQcm9jZXNzQ29ubmVjdGlvbkluZm8gY29ubmVjdGlvbkluZm87CkBAIC0xMTE3LDcgKzExMzEs NyBAQCBzdGF0aWMgTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJgogICAgIHVuc2lnbmVkIGZhaWxlZEF0dGVtcHRz ID0gMDsKICAgICB3aGlsZSAoIXJlcXVlc3RDb25uZWN0aW9uKCkpIHsKICAgICAgICAgaWYgKCsr ZmFpbGVkQXR0ZW1wdHMgPj0gbWF4RmFpbGVkQXR0ZW1wdHMpCi0gICAgICAgICAgICBDUkFTSCgp OworICAgICAgICAgICAgZmFpbGVkVG9TZW5kU3luY01lc3NhZ2UoKTsKIAogICAgICAgICBSRUxF QVNFX0xPR19FUlJPUihQcm9jZXNzLCAiZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBGYWls ZWQgdG8gZ2V0IGNvbm5lY3Rpb24gdG8gbmV0d29yayBwcm9jZXNzLCB3aWxsIHJldHJ5Li4uIik7 CiAKQEAgLTEyNzAsNyArMTI4NCw3IEBAIEdQVVByb2Nlc3NDb25uZWN0aW9uSW5mbyBXZWJQcm9j ZXNzOjpnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24mIGNvCiAgICAgICAg IC8vIElmIHdlIGZhaWxlZCB0aGUgZmlyc3QgdGltZSwgcmV0cnkgb25jZS4gVGhlIGF0dGFjaG1l bnQgbWF5IGhhdmUgYmVjb21lIGludmFsaWQKICAgICAgICAgLy8gYmVmb3JlIGl0IHdhcyByZWNl aXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVkLgog ICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94 eTo6R2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24ocGFyYW1ldGVycyksIE1lc3NhZ2VzOjpXZWJQcm9j ZXNzUHJveHk6OkdldEdQVVByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0aW9uSW5mbyks IDApKQotICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgICAgIGZhaWxlZFRvU2VuZFN5bmNN ZXNzYWdlKCk7CiAgICAgfQogCiAgICAgcmV0dXJuIGNvbm5lY3Rpb25JbmZvOwpAQCAtMTM1NSw3 ICsxMzY5LDcgQEAgc3RhdGljIFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb25JbmZvIGdldFdlYkF1 dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW8KICAgICAgICAgLy8gYmVmb3JlIGl0 IHdhcyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBj cmFzaGVkLgogICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBy b2Nlc3NQcm94eTo6R2V0V2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbigpLCBNZXNzYWdlczo6V2Vi UHJvY2Vzc1Byb3h5OjpHZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0 aW9uSW5mbyksIDApKSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihXZWJBdXRobiwg ImdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb246IFVuYWJsZSB0byBjb25uZWN0IHRvIFdlYkF1 dGhuIHByb2Nlc3MgKFRlcm1pbmF0aW5nKSIpOwotICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAg ICAgICAgIGZhaWxlZFRvU2VuZFN5bmNNZXNzYWdlKCk7CiAgICAgICAgIH0KICAgICB9CiAK 456004 2022-03-29 01:24:15 -0700 2022-03-30 00:42:57 -0700 patch bug-235224-20220329102414.patch text/plain 4110 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzNjZhNDc1ZTA2MzNiNWRi MTAzMWY3NDliM2YzNzVhNzM1YTg0MzAuLmM2NGM1ZjFhZTBmYmNhYjA1OWJiNWIzZWEzNmIxMzI2 MjlmOGFiN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjItMDMtMjkgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBFeGl0 IGNsZWFubHkgaWYgQ29ubmVjdGlvbiB0byBVSVByb2Nlc3Mgc2V2ZXJlZC4gUmVncmVzc2lvbiAo cjIxNDMwNykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNTIyNAorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUgV1BFIGFuZCBHVEsgc3Bl Y2lmaWMgY29kZSByZW1vdmVkIGluICdbV0syXSBNYWtlCisgICAgICAgIGVzdGFibGlzaGluZyBh IGNvbm5lY3Rpb24gYmV0d2VlbiB0aGUgV2ViUHJvY2VzcyBhbmQgdGhlIE5ldHdvcmsgcHJvY2Vz cyBtb3JlCisgICAgICAgIHJvYnVzdCcgKHIxMjM0NSk6CisKKyAgICAgICAgR1RLKyBhbmQgV1BF IHBvcnRzIGRvbid0IGV4aXQgb24gc2VuZCBzeW5jIG1lc3NhZ2UgZmFpbHVyZS4gSW4gdGhvc2Ug cGFydGljdWxhcgorICAgICAgICBjYXNlcywgdGhlIG5ldHdvcmsgcHJvY2VzcyBjYW4gYmUgdGVy bWluYXRlZCBieSB0aGUgVUkgcHJvY2VzcyB3aGlsZSB0aGUKKyAgICAgICAgV2ViIHByb2Nlc3Mg aXMgc3RpbGwgaW5pdGlhbGl6aW5nLCBzbyB3ZSBhbHdheXMgd2FudCB0byBleGl0IGluc3RlYWQg b2YgY3Jhc2hpbmcuIFRoaXMgY2FuCisgICAgICAgIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlz IGNyZWF0ZWQgYW5kIHRoZW4gZGVzdHJveWVkIHF1aWNrbHkuCisgICAgICAgIFNlZSBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMzQ4LgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpnZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uKToKKwogMjAyMi0wMy0y OCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbG9nZ2lu ZyBhYm91dCBwcm9jZXNzIGVudGVyaW5nIGJhY2tncm91bmQgdG8gTmV0d29ya1Byb2Nlc3M6OnBy b2Nlc3NEaWRSZXN1bWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRl eCBjZjU3OWE0MzM3MDJiNWIwMGMzNmUwZWY1MmY4ZTU5OTRkZWMwNTAzLi4yZTZhNTVkMmQ0YTQx MWQzNDY4ZTNlMWIwYjZjMWVjYzdkMTEyNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwCkBAIC0xMTIzLDYgKzExMjMsMjAgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRJ bmplY3RlZEJ1bmRsZVBhcmFtZXRlcnMoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiB2YWx1ZSkK ICAgICBpbmplY3RlZEJ1bmRsZS0+c2V0QnVuZGxlUGFyYW1ldGVycyh2YWx1ZSk7CiB9CiAKK05P X1JFVFVSTiBpbmxpbmUgdm9pZCBmYWlsZWRUb1NlbmRTeW5jTWVzc2FnZSgpCit7CisjaWYgUExB VEZPUk0oR1RLKSB8fCBQTEFURk9STShXUEUpCisgICAgLy8gR1RLIGFuZCBXUEUgcG9ydHMgZG9u J3QgZXhpdCBvbiBzZW5kIHN5bmMgbWVzc2FnZSBmYWlsdXJlLgorICAgIC8vIEluIHRoaXMgcGFy dGljdWxhciBjYXNlLCB0aGUgbmV0d29yayBwcm9jZXNzIGNhbiBiZSB0ZXJtaW5hdGVkIGJ5IHRo ZSBVSSBwcm9jZXNzIHdoaWxlIHRoZQorICAgIC8vIFdlYiBwcm9jZXNzIGlzIHN0aWxsIGluaXRp YWxpemluZywgc28gd2UgYWx3YXlzIHdhbnQgdG8gZXhpdCBpbnN0ZWFkIG9mIGNyYXNoaW5nLiBU aGlzIGNhbgorICAgIC8vIGhhcHBlbiB3aGVuIHRoZSBXZWJWaWV3IGlzIGNyZWF0ZWQgYW5kIHRo ZW4gZGVzdHJveWVkIHF1aWNrbHkuCisgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODMzNDguCisgICAgZXhpdCgwKTsKKyNlbHNlCisgICAgQ1JBU0go KTsKKyNlbmRpZgorfQorCiBzdGF0aWMgTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXRO ZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewog ICAgIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkluZm8gY29ubmVjdGlvbkluZm87CkBAIC0xMTQy LDcgKzExNTYsNyBAQCBzdGF0aWMgTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uSW5mbyBnZXROZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJgogICAgIHVuc2lnbmVkIGZhaWxl ZEF0dGVtcHRzID0gMDsKICAgICB3aGlsZSAoIXJlcXVlc3RDb25uZWN0aW9uKCkpIHsKICAgICAg ICAgaWYgKCsrZmFpbGVkQXR0ZW1wdHMgPj0gbWF4RmFpbGVkQXR0ZW1wdHMpCi0gICAgICAgICAg ICBDUkFTSCgpOworICAgICAgICAgICAgZmFpbGVkVG9TZW5kU3luY01lc3NhZ2UoKTsKIAogICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiZ2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0 aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5lY3Rpb24gdG8gbmV0d29yayBwcm9jZXNzLCB3aWxsIHJl dHJ5Li4uIik7CiAKQEAgLTEyOTUsNyArMTMwOSw3IEBAIEdQVVByb2Nlc3NDb25uZWN0aW9uSW5m byBXZWJQcm9jZXNzOjpnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24mIGNv CiAgICAgICAgIC8vIElmIHdlIGZhaWxlZCB0aGUgZmlyc3QgdGltZSwgcmV0cnkgb25jZS4gVGhl IGF0dGFjaG1lbnQgbWF5IGhhdmUgYmVjb21lIGludmFsaWQKICAgICAgICAgLy8gYmVmb3JlIGl0 IHdhcyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsgcHJvY2VzcyBj cmFzaGVkLgogICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBy b2Nlc3NQcm94eTo6R2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24ocGFyYW1ldGVycyksIE1lc3NhZ2Vz OjpXZWJQcm9jZXNzUHJveHk6OkdldEdQVVByb2Nlc3NDb25uZWN0aW9uOjpSZXBseShjb25uZWN0 aW9uSW5mbyksIDApKQotICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgICAgIGZhaWxlZFRv U2VuZFN5bmNNZXNzYWdlKCk7CiAgICAgfQogCiAgICAgcmV0dXJuIGNvbm5lY3Rpb25JbmZvOwpA QCAtMTM4MCw3ICsxMzk0LDcgQEAgc3RhdGljIFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb25JbmZv IGdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW8KICAgICAgICAgLy8g YmVmb3JlIGl0IHdhcyByZWNlaXZlZCBieSB0aGUgd2ViIHByb2Nlc3MgaWYgdGhlIG5ldHdvcmsg cHJvY2VzcyBjcmFzaGVkLgogICAgICAgICBpZiAoIWNvbm5lY3Rpb24uc2VuZFN5bmMoTWVzc2Fn ZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0V2ViQXV0aG5Qcm9jZXNzQ29ubmVjdGlvbigpLCBNZXNz YWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRXZWJBdXRoblByb2Nlc3NDb25uZWN0aW9uOjpSZXBs eShjb25uZWN0aW9uSW5mbyksIDApKSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihX ZWJBdXRobiwgImdldFdlYkF1dGhuUHJvY2Vzc0Nvbm5lY3Rpb246IFVuYWJsZSB0byBjb25uZWN0 IHRvIFdlYkF1dGhuIHByb2Nlc3MgKFRlcm1pbmF0aW5nKSIpOwotICAgICAgICAgICAgQ1JBU0go KTsKKyAgICAgICAgICAgIGZhaWxlZFRvU2VuZFN5bmNNZXNzYWdlKCk7CiAgICAgICAgIH0KICAg ICB9CiAK