<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>221783</bug_id>
          
          <creation_ts>2021-02-11 16:56:53 -0800</creation_ts>
          <short_desc>ASSERTION FAILED: m_state == State::Committed in WebKit::FrameLoadState::didFailLoad()</short_desc>
          <delta_ts>2021-03-16 15:45:08 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Page Loading</component>
          <version>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=222819</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Ryan Haddad">ryanhaddad</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>cdumez</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>japhet</cc>
    
    <cc>jenner</cc>
    
    <cc>julian_a_gonzalez</cc>
    
    <cc>mifenton</cc>
    
    <cc>rniwa</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1728363</commentid>
    <comment_count>0</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2021-02-11 16:56:53 -0800</bug_when>
    <thetext>loader/change-src-during-iframe-load-crash.html is a flaky crash on macOS debug WK2 bots with the following assertion failure:

ASSERTION FAILED: m_state == State::Committed
/Volumes/Data/slave/bigsur-debug/build/Source/WebKit/UIProcess/FrameLoadState.cpp(102) : void WebKit::FrameLoadState::didFailLoad()
1   0x101952d69 WTFCrash
2   0x10a71415b WTFCrashWithInfo(int, char const*, char const*, int)
3   0x10b97aaf7 WebKit::FrameLoadState::didFailLoad()
4   0x10bb4c6ee WebKit::WebFrameProxy::didFailLoad()
5   0x10bb834e5 WebKit::WebPageProxy::didFailLoadForFrame(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;)
6   0x10c875837 void IPC::callMemberFunctionImpl&lt;WebKit::WebPageProxy, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;), std::__1::tuple&lt;WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData, WebCore::ResourceRequest, unsigned long long, WebCore::ResourceError, WebKit::UserData&gt;, 0ul, 1ul, 2ul, 3ul, 4ul, 5ul&gt;(WebKit::WebPageProxy*, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;), std::__1::tuple&lt;WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData, WebCore::ResourceRequest, unsigned long long, WebCore::ResourceError, WebKit::UserData&gt;&amp;&amp;, std::__1::integer_sequence&lt;unsigned long, 0ul, 1ul, 2ul, 3ul, 4ul, 5ul&gt;)
7   0x10c872690 void IPC::callMemberFunction&lt;WebKit::WebPageProxy, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;), std::__1::tuple&lt;WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData, WebCore::ResourceRequest, unsigned long long, WebCore::ResourceError, WebKit::UserData&gt;, std::__1::integer_sequence&lt;unsigned long, 0ul, 1ul, 2ul, 3ul, 4ul, 5ul&gt; &gt;(std::__1::tuple&lt;WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData, WebCore::ResourceRequest, unsigned long long, WebCore::ResourceError, WebKit::UserData&gt;&amp;&amp;, WebKit::WebPageProxy*, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;))
8   0x10c84379e void IPC::handleMessage&lt;Messages::WebPageProxy::DidFailLoadForFrame, WebKit::WebPageProxy, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;)&gt;(IPC::Decoder&amp;, WebKit::WebPageProxy*, void (WebKit::WebPageProxy::*)(WTF::ObjectIdentifier&lt;WebCore::FrameIdentifierType&gt;, WebKit::FrameInfoData&amp;&amp;, WebCore::ResourceRequest&amp;&amp;, unsigned long long, WebCore::ResourceError const&amp;, WebKit::UserData const&amp;))
9   0x10c83c718 WebKit::WebPageProxy::didReceiveMessage(IPC::Connection&amp;, IPC::Decoder&amp;)
10  0x10ac03e01 IPC::MessageReceiverMap::dispatchMessage(IPC::Connection&amp;, IPC::Decoder&amp;)
11  0x10b9761ee WebKit::AuxiliaryProcessProxy::dispatchMessage(IPC::Connection&amp;, IPC::Decoder&amp;)
12  0x10bcbb33f WebKit::WebProcessProxy::didReceiveMessage(IPC::Connection&amp;, IPC::Decoder&amp;)
13  0x10a7939c4 IPC::Connection::dispatchMessage(IPC::Decoder&amp;)
14  0x10a794ae0 IPC::Connection::dispatchMessage(std::__1::unique_ptr&lt;IPC::Decoder, std::__1::default_delete&lt;IPC::Decoder&gt; &gt;)
15  0x10a7929e1 IPC::Connection::dispatchIncomingMessages()
16  0x10a7b5b42 IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::Decoder, std::__1::default_delete&lt;IPC::Decoder&gt; &gt;)::$_8::operator()()
17  0x10a7b5a6e WTF::Detail::CallableWrapper&lt;IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::Decoder, std::__1::default_delete&lt;IPC::Decoder&gt; &gt;)::$_8, void&gt;::call()
18  0x10197e592 WTF::Function&lt;void ()&gt;::operator()() const
19  0x101a00565 WTF::RunLoop::performWork()
20  0x101a04e01 WTF::RunLoop::performWork(void*)
21  0x7fff20460a0c __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__
22  0x7fff20460974 __CFRunLoopDoSource0
23  0x7fff204606ef __CFRunLoopDoSources0
24  0x7fff2045f121 __CFRunLoopRun
25  0x7fff2045e6ce CFRunLoopRunSpecific
26  0x7fff211ebfa1 -[NSRunLoop(NSRunLoop) runMode:beforeDate:]
27  0x1013d2a7e WTR::TestController::platformRunUntil(bool&amp;, WTF::Seconds)
28  0x10138b30f WTR::TestController::runUntil(bool&amp;, WTF::Seconds)
29  0x101392493 WTR::TestController::resetStateToConsistentValues(WTR::TestOptions const&amp;, WTR::TestController::ResetStage)::$_3::operator()() const
30  0x101390d9b WTR::TestController::resetStateToConsistentValues(WTR::TestOptions const&amp;, WTR::TestController::ResetStage)
31  0x1013fc957 WTR::TestInvocation::invoke()

https://results.webkit.org/?suite=layout-tests&amp;test=loader%2Fchange-src-during-iframe-load-crash.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728364</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-02-11 16:57:51 -0800</bug_when>
    <thetext>&lt;rdar://problem/74257153&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728365</commentid>
    <comment_count>2</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2021-02-11 16:58:34 -0800</bug_when>
    <thetext>It looks like this may have started after https://trac.webkit.org/changeset/272396/webkit landed</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728680</commentid>
    <comment_count>3</comment_count>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-02-12 11:12:57 -0800</bug_when>
    <thetext>https://trac.webkit.org/changeset/272396/webkit

introduced this test - looks like in Debug mode, a followup change is required.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731063</commentid>
    <comment_count>4</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-02-18 15:58:24 -0800</bug_when>
    <thetext>It&apos;s actually the test introduced in https://trac.webkit.org/changeset/254662/webkit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731078</commentid>
    <comment_count>5</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-02-18 16:15:39 -0800</bug_when>
    <thetext>Skipped the test on debug bots in https://commits.webkit.org/r273110 for now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731082</commentid>
    <comment_count>6</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-02-18 16:17:04 -0800</bug_when>
    <thetext>Committed r273110 (234307@main): &lt;https://commits.webkit.org/234307@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731522</commentid>
    <comment_count>7</comment_count>
      <attachid>421014</attachid>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-02-19 12:41:02 -0800</bug_when>
    <thetext>Created attachment 421014
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731524</commentid>
    <comment_count>8</comment_count>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-02-19 12:41:42 -0800</bug_when>
    <thetext>Added a patch to get a specific callstack (this isn&apos;t reproducible for me locally, but EWS can hit it).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738919</commentid>
    <comment_count>9</comment_count>
    <who name="Robert Jenner">jenner</who>
    <bug_when>2021-03-12 09:07:54 -0800</bug_when>
    <thetext>*** Bug 222819 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739785</commentid>
    <comment_count>10</comment_count>
      <attachid>423277</attachid>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-03-15 18:35:59 -0700</bug_when>
    <thetext>Created attachment 423277
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739786</commentid>
    <comment_count>11</comment_count>
      <attachid>423277</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-03-15 18:39:31 -0700</bug_when>
    <thetext>Comment on attachment 423277
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=423277&amp;action=review

&gt; Source/WebCore/editing/FrameSelection.cpp:184
&gt; -    setCaretVisibility(activeAndFocused ? Visible : Hidden);
&gt; +    setCaretVisibility(activeAndFocused ? Visible : Hidden, false);

Please add new enum class maybe something like: ShouldUpdateAppearance { Yes, No }</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739788</commentid>
    <comment_count>12</comment_count>
      <attachid>423277</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-03-15 18:54:48 -0700</bug_when>
    <thetext>Comment on attachment 423277
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=423277&amp;action=review

&gt;&gt; Source/WebCore/editing/FrameSelection.cpp:184
&gt;&gt; +    setCaretVisibility(activeAndFocused ? Visible : Hidden, false);
&gt; 
&gt; Please add new enum class maybe something like: ShouldUpdateAppearance { Yes, No }

Or preferably:
enum class ShouldUpdateAppearance : bool { No, Yes }

(using bool underlying type and 0 meaning No, not Yes).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739814</commentid>
    <comment_count>13</comment_count>
      <attachid>423289</attachid>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-03-15 20:14:51 -0700</bug_when>
    <thetext>Created attachment 423289
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739820</commentid>
    <comment_count>14</comment_count>
      <attachid>423289</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-03-15 20:33:03 -0700</bug_when>
    <thetext>Comment on attachment 423289
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=423289&amp;action=review

&gt; Source/WebCore/editing/FrameSelection.h:302
&gt; +    enum ShouldUpdateAppearance : bool { No, Yes };

Please use enum class, not enum.
Otherwise, there will be implicit type coercion between this type and bool,
and No/Yes will pollute the namespace within FrameSelection.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1740061</commentid>
    <comment_count>15</comment_count>
      <attachid>423364</attachid>
    <who name="Julian Gonzalez">julian_a_gonzalez</who>
    <bug_when>2021-03-16 11:16:22 -0700</bug_when>
    <thetext>Created attachment 423364
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1740268</commentid>
    <comment_count>16</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-03-16 15:45:05 -0700</bug_when>
    <thetext>Committed r274526: &lt;https://commits.webkit.org/r274526&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 423364.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421014</attachid>
            <date>2021-02-19 12:41:02 -0800</date>
            <delta_ts>2021-03-15 18:35:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221783-20210219124101.patch</filename>
            <type>text/plain</type>
            <size>7667</size>
            <attacher name="Julian Gonzalez">julian_a_gonzalez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU5NDljYTg3NWNhOGJk
MGRiOWFjMjFhNTA4ODQyODRlNDA5YzEwZC4uOTFkMjNmZjY5YTM2MjExMTdmY2ViMmUyMGNkMTRm
MDAxNTIzZjBiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTE5ICBKdWxp
YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgQVNT
RVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGluIFdlYktpdDo6RnJh
bWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIEFzc2VydGlvbiBhZGRlZCBmb3IgZGVidWcgYnVpbGRzIHRvIGNh
dGNoIGNhbGwgZnJhbWUuCisKKyAgICAgICAgVGVzdHM6IGxvYWRlci9jaGFuZ2Utc3JjLWR1cmlu
Zy1pZnJhbWUtbG9hZC1jcmFzaC0yLmh0bWwKKyAgICAgICAgICAgICAgIGxvYWRlci9jaGFuZ2Ut
c3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC0zLmh0bWwKKyAgICAgICAgICAgICAgIGxvYWRl
ci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC00Lmh0bWwKKworICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKToKKwogMjAyMS0wMi0xOSAgRnVqaWkgSGly
b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBBIG51bWJlciBvZiBv
ZmZzY3JlZW5jYW52YXMgdGVzdHMgYXJlIGFzc2VydGluZyBpc01haW5UaHJlYWQgdHJ5aW5nIHRv
IGFjY2VzcyBzdHJpY3RDU1NQYXJzZXJDb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h
ZGVyLmNwcAppbmRleCAyOTI1MWJjNjhkZmYyYzU1MGZlZjZjZGI4MzhmNzBhODIxMTcyMjQ1Li4y
MDkzYTI1NTg2MDdjNTI5NTA5ZjYyNzY3MDcxNWI1Y2MyYjRlM2ZmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTI0MjIsOSArMjQyMiwxMyBAQCBDYWNoZVBvbGljeSBG
cmFtZUxvYWRlcjo6c3VicmVzb3VyY2VDYWNoZVBvbGljeShjb25zdCBVUkwmIHVybCkgY29uc3QK
ICAgICByZXR1cm4gQ2FjaGVQb2xpY3k6OlZlcmlmeTsKIH0KIAorI3ByYWdtYSBjbGFuZyBkaWFn
bm9zdGljIHB1c2gKKyNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV21pc3Npbmct
bm9yZXR1cm4iCisKIHZvaWQgRnJhbWVMb2FkZXI6OmRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFs
TG9hZChEb2N1bWVudExvYWRlciYgcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlciwgY29uc3QgUmVz
b3VyY2VFcnJvciYgZXJyb3IpCiB7CiAgICAgbV9wcm92aXNpb25hbExvYWRFcnJvckJlaW5nSGFu
ZGxlZFVSTCA9IHByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIudXJsKCk7CisgICAgQVNTRVJUKDAp
OwogCiAjaWYgRU5BQkxFKENPTlRFTlRfRklMVEVSSU5HKQogICAgIGF1dG8gY29udGVudEZpbHRl
ciA9IHByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIuY29udGVudEZpbHRlcigpOwpAQCAtMjQ1MSw2
ICsyNDU1LDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxM
b2FkKERvY3VtZW50TG9hZGVyJiBwcm92aXNpb25hbERvY3UKICAgICBtX3Byb3Zpc2lvbmFsTG9h
ZEVycm9yQmVpbmdIYW5kbGVkVVJMID0geyB9OwogfQogCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0
aWMgcG9wCisKIHZvaWQgRnJhbWVMb2FkZXI6OmNoZWNrTG9hZENvbXBsZXRlRm9yVGhpc0ZyYW1l
KCkKIHsKICAgICBBU1NFUlQobV9jbGllbnQtPmhhc1dlYlZpZXcoKSk7CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjEwNTcx
M2E3NGRhODkxY2FjZTA5NjIyOGE2ZWEwOGNiNzA1MTg3Ni4uYzhmY2MzMmMyM2ZlYjRhYzlkNjdl
OThkNTkyNWI5NmYwZTczMmExNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr
KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTE5ICBK
dWxpYW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAg
QVNTRVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGluIFdlYktpdDo6
RnJhbWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIENvcHkgdGhpcyB0ZXN0IHRvIGVuc3VyZSBpdCBpcyBydW4g
b24gRVdTIGEgZmV3IHRpbWVzICh0byByZXByb2R1Y2UgdGhlIGlzc3VlIGhlcmUpLgorCisgICAg
ICAgICogbG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNoLTItZXhwZWN0
ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBsb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1l
LWxvYWQtY3Jhc2gtMi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBsb2FkZXIvY2hhbmdlLXNyYy1k
dXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gtMy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq
IGxvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC0zLmh0bWw6IEFkZGVk
LgorICAgICAgICAqIGxvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC00
LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5n
LWlmcmFtZS1sb2FkLWNyYXNoLTQuaHRtbDogQWRkZWQuCisKIDIwMjEtMDItMTkgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgQSBudW1iZXIgb2Yg
b2Zmc2NyZWVuY2FudmFzIHRlc3RzIGFyZSBhc3NlcnRpbmcgaXNNYWluVGhyZWFkIHRyeWluZyB0
byBhY2Nlc3Mgc3RyaWN0Q1NTUGFyc2VyQ29udGV4dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
bG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNoLTItZXhwZWN0ZWQudHh0
IGIvTGF5b3V0VGVzdHMvbG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNo
LTItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc0YmFmODQ1MzRiNDU4NDBiYTU3MjEwMGZlMWM1
ZTQxMGM3M2QwYzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdl
LXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gtMi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBA
QAorVGhlIHRlc3QgaXMgZGVjbGFyZWQgcGFzcyBpZiB0aGVyZSBpcyBubyBjcmFzaCBvYnNlcnZl
ZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2xvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJh
bWUtbG9hZC1jcmFzaC0yLmh0bWwgYi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJp
bmctaWZyYW1lLWxvYWQtY3Jhc2gtMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYyOGJlN2E1ZTc4NWRjMzIx
ZWJmZDkwNjRhZmMxOTIxNTA2M2Q5ODYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9s
b2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gtMi5odG1sCkBAIC0wLDAg
KzEsMjcgQEAKKzxodG1sPgorPHNjcmlwdD4KKworbGV0IGRpZExvYWQgPSBmYWxzZTsKK2xldCBk
aWRGaW5pc2hUZXN0aW5nID0gZmFsc2U7CisKK2Z1bmN0aW9uIGxvYWQoKSB7CisgICAgZG9jdW1l
bnQuYm9keS5pbm5lckhUTUwgPSAnVGhlIHRlc3QgaXMgZGVjbGFyZWQgcGFzcyBpZiB0aGVyZSBp
cyBubyBjcmFzaCBvYnNlcnZlZC4nOworICAgIGRpZExvYWQgPXRydWU7CisgICAgaWYgKHdpbmRv
dy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAg
ICBpZighZGlkRmluaXNoVGVzdGluZykKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGls
RG9uZSgpOworICAgIH0KK30KKworZnVuY3Rpb24gZGlkTG9hZEZyYW1lMigpIHsKKyAgICBpZnJh
bWUxLnNyY2RvYyA9ICJ4IjsKKyAgICBkaWRGaW5pc2hUZXN0aW5nID0gdHJ1ZTsKKyAgICBpZiAo
d2luZG93LnRlc3RSdW5uZXIgJiYgZGlkTG9hZCkKKyAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlE
b25lKCk7Cit9CisKKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJsb2FkKCkiPgorPGlmcmFtZSBp
ZD0iaWZyYW1lMSIgc3JjPSJkYXRhOnRleHQvaHRtbCxmb28iPmE8L2lmcmFtZT4KKzxpZnJhbWUg
aWQ9ImlmcmFtZTIiIG9ubG9hZD0iZGlkTG9hZEZyYW1lMigpIiBzcmNkb2M9InkiPgpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvbG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNy
YXNoLTMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbG9hZGVyL2NoYW5nZS1zcmMtZHVyaW5n
LWlmcmFtZS1sb2FkLWNyYXNoLTMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu
ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc0YmFmODQ1MzRi
NDU4NDBiYTU3MjEwMGZlMWM1ZTQxMGM3M2QwYzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU
ZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gtMy1leHBlY3Rl
ZC50eHQKQEAgLTAsMCArMSBAQAorVGhlIHRlc3QgaXMgZGVjbGFyZWQgcGFzcyBpZiB0aGVyZSBp
cyBubyBjcmFzaCBvYnNlcnZlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2xvYWRlci9jaGFu
Z2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC0zLmh0bWwgYi9MYXlvdXRUZXN0cy9sb2Fk
ZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gtMy5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LjYyOGJlN2E1ZTc4NWRjMzIxZWJmZDkwNjRhZmMxOTIxNTA2M2Q5ODYKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jh
c2gtMy5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzxodG1sPgorPHNjcmlwdD4KKworbGV0IGRpZExv
YWQgPSBmYWxzZTsKK2xldCBkaWRGaW5pc2hUZXN0aW5nID0gZmFsc2U7CisKK2Z1bmN0aW9uIGxv
YWQoKSB7CisgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAnVGhlIHRlc3QgaXMgZGVjbGFy
ZWQgcGFzcyBpZiB0aGVyZSBpcyBubyBjcmFzaCBvYnNlcnZlZC4nOworICAgIGRpZExvYWQgPXRy
dWU7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIuZHVt
cEFzVGV4dCgpOworICAgICAgICBpZighZGlkRmluaXNoVGVzdGluZykKKyAgICAgICAgICAgIHRl
c3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KK30KKworZnVuY3Rpb24gZGlkTG9hZEZy
YW1lMigpIHsKKyAgICBpZnJhbWUxLnNyY2RvYyA9ICJ4IjsKKyAgICBkaWRGaW5pc2hUZXN0aW5n
ID0gdHJ1ZTsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIgJiYgZGlkTG9hZCkKKyAgICAgICAg
dGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Cit9CisKKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJs
b2FkKCkiPgorPGlmcmFtZSBpZD0iaWZyYW1lMSIgc3JjPSJkYXRhOnRleHQvaHRtbCxmb28iPmE8
L2lmcmFtZT4KKzxpZnJhbWUgaWQ9ImlmcmFtZTIiIG9ubG9hZD0iZGlkTG9hZEZyYW1lMigpIiBz
cmNkb2M9InkiPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbG9hZGVyL2NoYW5nZS1zcmMtZHVy
aW5nLWlmcmFtZS1sb2FkLWNyYXNoLTQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbG9hZGVy
L2NoYW5nZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNoLTQtZXhwZWN0ZWQudHh0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLjc0YmFmODQ1MzRiNDU4NDBiYTU3MjEwMGZlMWM1ZTQxMGM3M2QwYzgKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxv
YWQtY3Jhc2gtNC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGhlIHRlc3QgaXMgZGVjbGFy
ZWQgcGFzcyBpZiB0aGVyZSBpcyBubyBjcmFzaCBvYnNlcnZlZC4KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2xvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFzaC00Lmh0bWwg
Yi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQtY3Jhc2gt
NC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLjYyOGJlN2E1ZTc4NWRjMzIxZWJmZDkwNjRhZmMxOTIxNTA2M2Q5
ODYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9sb2FkZXIvY2hhbmdlLXNyYy1kdXJp
bmctaWZyYW1lLWxvYWQtY3Jhc2gtNC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzxodG1sPgorPHNj
cmlwdD4KKworbGV0IGRpZExvYWQgPSBmYWxzZTsKK2xldCBkaWRGaW5pc2hUZXN0aW5nID0gZmFs
c2U7CisKK2Z1bmN0aW9uIGxvYWQoKSB7CisgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAn
VGhlIHRlc3QgaXMgZGVjbGFyZWQgcGFzcyBpZiB0aGVyZSBpcyBubyBjcmFzaCBvYnNlcnZlZC4n
OworICAgIGRpZExvYWQgPXRydWU7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAg
ICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgICBpZighZGlkRmluaXNoVGVzdGlu
ZykKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KK30KKwor
ZnVuY3Rpb24gZGlkTG9hZEZyYW1lMigpIHsKKyAgICBpZnJhbWUxLnNyY2RvYyA9ICJ4IjsKKyAg
ICBkaWRGaW5pc2hUZXN0aW5nID0gdHJ1ZTsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIgJiYg
ZGlkTG9hZCkKKyAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Cit9CisKKzwvc2NyaXB0
PgorPGJvZHkgb25sb2FkPSJsb2FkKCkiPgorPGlmcmFtZSBpZD0iaWZyYW1lMSIgc3JjPSJkYXRh
OnRleHQvaHRtbCxmb28iPmE8L2lmcmFtZT4KKzxpZnJhbWUgaWQ9ImlmcmFtZTIiIG9ubG9hZD0i
ZGlkTG9hZEZyYW1lMigpIiBzcmNkb2M9InkiPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423277</attachid>
            <date>2021-03-15 18:35:59 -0700</date>
            <delta_ts>2021-03-15 20:14:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221783-20210315183558.patch</filename>
            <type>text/plain</type>
            <size>5125</size>
            <attacher name="Julian Gonzalez">julian_a_gonzalez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUwN2UwNDVmM2Q3ZGVh
NTlkZWY1YzM0NjY0NzVmNTcxYjM0MDRiYi4uZTNjNDJmNjBkNWMyZGYwZTdlOWJkMzc1NGRjODM1
NzA4ZmFhMDJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTE1ICBKdWxp
YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgQVNT
RVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGluIFdlYktpdDo6RnJh
bWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIERvbid0IGF0dGVtcHQgdG8gdXBkYXRlIGxheW91dCB3aGlsZSBp
biB0aGUgRnJhbWVTZWxlY3Rpb24gY29uc3RydWN0b3IgLQorICAgICAgICBvdGhlcndpc2UsIHdl
IGNhbiBicmVhayB0aGUgb3JkZXIgb2Ygb3BlcmF0aW9ucyBvZiB0aGUgbG9hZGVyLgorCisgICAg
ICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt
ZVNlbGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxl
Y3Rpb246OmZvY3VzZWRPckFjdGl2ZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpG
cmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KToKKyAgICAgICAgKiBlZGl0aW5nL0Zy
YW1lU2VsZWN0aW9uLmg6CisKIDIwMjEtMDMtMTUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl
LmNvbT4KIAogICAgICAgICBbTXVsdGktY29sdW1uXSBJZ25vcmUgbGluZSBncmlkIG9mZnNldCB3
aGVuIHRoZSBncmlkIGxpbmUgaXMgc2hvcnRlciB0aGFuIDAuNXB4CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk
aXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IGQ5M2IxMTY0ZWNjYzhjNDM0ODI5NGZlMDNi
N2JkMjQxZDM4ZWEwYTcuLmYzMWJiMDIxNWQ0NzU5ODgwMDkwNDJkNDNjMWIxZjljODIyZTBlYWUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC0xODEsNyAr
MTgxLDcgQEAgRnJhbWVTZWxlY3Rpb246OkZyYW1lU2VsZWN0aW9uKERvY3VtZW50KiBkb2N1bWVu
dCkKICAgICAvLyBDYXJldCBibGlua2luZyAoYmxpbmtzIHwgZG9lcyBub3QgYmxpbmspCiAgICAg
c2V0Q2FyZXRWaXNpYmxlKGFjdGl2ZUFuZEZvY3VzZWQpOwogI2Vsc2UKLSAgICBzZXRDYXJldFZp
c2liaWxpdHkoYWN0aXZlQW5kRm9jdXNlZCA/IFZpc2libGUgOiBIaWRkZW4pOworICAgIHNldENh
cmV0VmlzaWJpbGl0eShhY3RpdmVBbmRGb2N1c2VkID8gVmlzaWJsZSA6IEhpZGRlbiwgZmFsc2Up
OwogI2VuZGlmCiB9CiAKQEAgLTIwNjMsNyArMjA2Myw3IEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246
OmZvY3VzZWRPckFjdGl2ZVN0YXRlQ2hhbmdlZCgpCiAgICAgLy8gQ2FyZXQgYXBwZWFycyBpbiB0
aGUgYWN0aXZlIGZyYW1lLgogICAgIGlmIChhY3RpdmVBbmRGb2N1c2VkKQogICAgICAgICBzZXRT
ZWxlY3Rpb25Gcm9tTm9uZSgpOwotICAgIHNldENhcmV0VmlzaWJpbGl0eShhY3RpdmVBbmRGb2N1
c2VkID8gVmlzaWJsZSA6IEhpZGRlbik7CisgICAgc2V0Q2FyZXRWaXNpYmlsaXR5KGFjdGl2ZUFu
ZEZvY3VzZWQgPyBWaXNpYmxlIDogSGlkZGVuLCB0cnVlKTsKIAogICAgIC8vIEJlY2F1c2UgU3R5
bGU6OlJlc29sdmVyOjpjaGVja09uZVNlbGVjdG9yKCkgYW5kCiAgICAgLy8gUmVuZGVyVGhlbWU6
OmlzRm9jdXNlZCgpIGNoZWNrIGlmIHRoZSBmcmFtZSBpcyBhY3RpdmUsIHdlIGhhdmUgdG8KQEAg
LTIxODIsMTMgKzIxODIsMTMgQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6dXBkYXRlQXBwZWFyYW5j
ZSgpCiAgICAgfQogfQogCi12b2lkIEZyYW1lU2VsZWN0aW9uOjpzZXRDYXJldFZpc2liaWxpdHko
Q2FyZXRWaXNpYmlsaXR5IHZpc2liaWxpdHkpCit2b2lkIEZyYW1lU2VsZWN0aW9uOjpzZXRDYXJl
dFZpc2liaWxpdHkoQ2FyZXRWaXNpYmlsaXR5IHZpc2liaWxpdHksIGJvb2wgdXBkYXRlTGF5b3V0
QW5kQXBwZWFyYW5jZSkKIHsKICAgICBpZiAoY2FyZXRWaXNpYmlsaXR5KCkgPT0gdmlzaWJpbGl0
eSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCB0cmlnZ2Vy
IGEgc3luY2hyb25vdXMgbGF5b3V0IGhlcmUuCi0gICAgaWYgKG1fZG9jdW1lbnQpCisgICAgaWYg
KHVwZGF0ZUxheW91dEFuZEFwcGVhcmFuY2UgJiYgbV9kb2N1bWVudCkKICAgICAgICAgdXBkYXRl
U2VsZWN0aW9uQnlVcGRhdGluZ0xheW91dE9yU3R5bGUoKm1fZG9jdW1lbnQpOwogCiAjaWYgRU5B
QkxFKFRFWFRfQ0FSRVQpCkBAIC0yMTk5LDcgKzIxOTksOCBAQCB2b2lkIEZyYW1lU2VsZWN0aW9u
OjpzZXRDYXJldFZpc2liaWxpdHkoQ2FyZXRWaXNpYmlsaXR5IHZpc2liaWxpdHkpCiAgICAgQ2Fy
ZXRCYXNlOjpzZXRDYXJldFZpc2liaWxpdHkodmlzaWJpbGl0eSk7CiAjZW5kaWYKIAotICAgIHVw
ZGF0ZUFwcGVhcmFuY2UoKTsKKyAgICBpZiAodXBkYXRlTGF5b3V0QW5kQXBwZWFyYW5jZSkKKyAg
ICAgICAgdXBkYXRlQXBwZWFyYW5jZSgpOwogfQogCiB2b2lkIEZyYW1lU2VsZWN0aW9uOjpjYXJl
dEJsaW5rVGltZXJGaXJlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Zy
YW1lU2VsZWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgK
aW5kZXggMzQxZjRlZGY4ZTNkODhlN2M4MjJjNTgyMzZjOTdkYzUwYmEzN2VlNS4uYzA0NmVlMzA0
YWE2ZTI0ZjY2OGVkNTc5MmNhNjJhN2M5MzhkOWI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv
RnJhbWVTZWxlY3Rpb24uaApAQCAtMjk5LDcgKzI5OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1
cGRhdGVBcHBlYXJhbmNlQWZ0ZXJMYXlvdXRPclN0eWxlQ2hhbmdlKCk7CiAgICAgdm9pZCBhcHBl
YXJhbmNlVXBkYXRlVGltZXJGaXJlZCgpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRD
YXJldFZpc2liaWxpdHkoQ2FyZXRWaXNpYmlsaXR5KTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk
IHNldENhcmV0VmlzaWJpbGl0eShDYXJldFZpc2liaWxpdHksIGJvb2wgdXBkYXRlTGF5b3V0QW5k
QXBwZWFyYW5jZSA9IHRydWUpOwogICAgIGJvb2wgcmVjb21wdXRlQ2FyZXRSZWN0KCk7CiAgICAg
dm9pZCBpbnZhbGlkYXRlQ2FyZXRSZWN0KCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No
YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4YmRkNGJjZTIxNGIxNjMzOTdi
OTY4YjQyNDlkM2UxMTcwZjIwYTZkLi5mOWE2OGUyMjhiNjQ0NjJjODg5MzEzZWEzMTVhMmEwNTg4
MDU5ZTE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMTUgIEp1bGlhbiBHb256YWxl
eiAgPGp1bGlhbl9hX2dvbnphbGV6QGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlRJT04gRkFJ
TEVEOiBtX3N0YXRlID09IFN0YXRlOjpDb21taXR0ZWQgaW4gV2ViS2l0OjpGcmFtZUxvYWRTdGF0
ZTo6ZGlkRmFpbExvYWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjIxNzgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgU3RvcCBza2lwcGluZyBsb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxv
YWQtY3Jhc2guaHRtbCBvbiBEZWJ1ZyBib3RzLgorCisgICAgICAgICogcGxhdGZvcm0vd2syL1Rl
c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMTUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl
LmNvbT4KIAogICAgICAgICBbTXVsdGktY29sdW1uXSBJZ25vcmUgbGluZSBncmlkIG9mZnNldCB3
aGVuIHRoZSBncmlkIGxpbmUgaXMgc2hvcnRlciB0aGFuIDAuNXB4CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRm
b3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGY2MzNmM2IzOGE0ZjY5MTIxNTg3N2U3YzBm
ZjMwZGMwMjRhMzM1MTMuLmVmNWY3NmQzYWNlNjM0MTJkNThiY2E0ZDI1NmVjNTdlNTg2MTliNDIg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCisr
KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0yNDcsOCAr
MjQ3LDYgQEAgd2Via2l0Lm9yZy9iLzIyMTgxNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2ZldGNoL3JhbmdlL2dlbmVyYWwud2luZG93LmgKIAogd2Via2l0Lm9yZy9iLzIyMTgxOSBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYmF1ZGlvL3RoZS1hdWRpby1hcGkvdGhl
LW1lZGlhZWxlbWVudGF1ZGlvc291cmNlbm9kZS1pbnRlcmZhY2UvbWVkaWFFbGVtZW50QXVkaW9T
b3VyY2VUb1NjcmlwdFByb2Nlc3NvclRlc3QuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3Jn
L2IvMjIxNzgzIFsgRGVidWcgXSBsb2FkZXIvY2hhbmdlLXNyYy1kdXJpbmctaWZyYW1lLWxvYWQt
Y3Jhc2guaHRtbCBbIFNraXAgXQotCiB3ZWJraXQub3JnL2IvMjIyNTY5IGZhc3QvbWVkaWFzdHJl
YW0vbWVkaWEtc3RyZWFtLXRyYWNrLWludGVycnVwdGVkLmh0bWwgWyBDcmFzaCBQYXNzIF0KIAog
IyMjIEVORCBPRiAoMSkgQ2xhc3NpZmllZCBmYWlsdXJlcyB3aXRoIGJ1ZyByZXBvcnRzCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423289</attachid>
            <date>2021-03-15 20:14:51 -0700</date>
            <delta_ts>2021-03-16 11:16:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221783-20210315201450.patch</filename>
            <type>text/plain</type>
            <size>5748</size>
            <attacher name="Julian Gonzalez">julian_a_gonzalez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUwN2UwNDVmM2Q3ZGVh
NTlkZWY1YzM0NjY0NzVmNTcxYjM0MDRiYi4uNjcwZTQ5ZjU4YTU2MzMzYTFlZGE2OTVlYTViZGFi
NmJmMmYyNmU3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE1ICBKdWxp
YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgQVNT
RVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGluIFdlYktpdDo6RnJh
bWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIERvbid0IGF0dGVtcHQgdG8gdXBkYXRlIGxheW91dCB3aGlsZSBp
biB0aGUgRnJhbWVTZWxlY3Rpb24gY29uc3RydWN0b3IgLQorICAgICAgICBvdGhlcndpc2UsIHdl
IGNhbiBicmVhayB0aGUgb3JkZXIgb2Ygb3BlcmF0aW9ucyBvZiB0aGUgbG9hZGVyLgorCisgICAg
ICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt
ZVNlbGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxl
Y3Rpb246OmZvY3VzZWRPckFjdGl2ZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpG
cmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KToKKyAgICAgICAgKiBlZGl0aW5nL0Zy
YW1lU2VsZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6c2V0Q2Fy
ZXRWaXNpYmxlKToKKwogMjAyMS0wMy0xNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFtNdWx0aS1jb2x1bW5dIElnbm9yZSBsaW5lIGdyaWQgb2Zmc2V0IHdoZW4g
dGhlIGdyaWQgbGluZSBpcyBzaG9ydGVyIHRoYW4gMC41cHgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu
Zy9GcmFtZVNlbGVjdGlvbi5jcHAKaW5kZXggZDkzYjExNjRlY2NjOGM0MzQ4Mjk0ZmUwM2I3YmQy
NDFkMzhlYTBhNy4uNTA5MDViMjczZTY5NjAzNDE5MzQ1NDgxOTUxZTIyYWJhMzVjYmUwZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTE4MSw3ICsxODEs
NyBAQCBGcmFtZVNlbGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24oRG9jdW1lbnQqIGRvY3VtZW50KQog
ICAgIC8vIENhcmV0IGJsaW5raW5nIChibGlua3MgfCBkb2VzIG5vdCBibGluaykKICAgICBzZXRD
YXJldFZpc2libGUoYWN0aXZlQW5kRm9jdXNlZCk7CiAjZWxzZQotICAgIHNldENhcmV0VmlzaWJp
bGl0eShhY3RpdmVBbmRGb2N1c2VkID8gVmlzaWJsZSA6IEhpZGRlbik7CisgICAgc2V0Q2FyZXRW
aXNpYmlsaXR5KGFjdGl2ZUFuZEZvY3VzZWQgPyBWaXNpYmxlIDogSGlkZGVuLCBObyk7CiAjZW5k
aWYKIH0KIApAQCAtMjA2Myw3ICsyMDYzLDcgQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6Zm9jdXNl
ZE9yQWN0aXZlU3RhdGVDaGFuZ2VkKCkKICAgICAvLyBDYXJldCBhcHBlYXJzIGluIHRoZSBhY3Rp
dmUgZnJhbWUuCiAgICAgaWYgKGFjdGl2ZUFuZEZvY3VzZWQpCiAgICAgICAgIHNldFNlbGVjdGlv
bkZyb21Ob25lKCk7Ci0gICAgc2V0Q2FyZXRWaXNpYmlsaXR5KGFjdGl2ZUFuZEZvY3VzZWQgPyBW
aXNpYmxlIDogSGlkZGVuKTsKKyAgICBzZXRDYXJldFZpc2liaWxpdHkoYWN0aXZlQW5kRm9jdXNl
ZCA/IFZpc2libGUgOiBIaWRkZW4sIFllcyk7CiAKICAgICAvLyBCZWNhdXNlIFN0eWxlOjpSZXNv
bHZlcjo6Y2hlY2tPbmVTZWxlY3RvcigpIGFuZAogICAgIC8vIFJlbmRlclRoZW1lOjppc0ZvY3Vz
ZWQoKSBjaGVjayBpZiB0aGUgZnJhbWUgaXMgYWN0aXZlLCB3ZSBoYXZlIHRvCkBAIC0yMTgyLDEz
ICsyMTgyLDEzIEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246OnVwZGF0ZUFwcGVhcmFuY2UoKQogICAg
IH0KIH0KIAotdm9pZCBGcmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KENhcmV0Vmlz
aWJpbGl0eSB2aXNpYmlsaXR5KQordm9pZCBGcmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmls
aXR5KENhcmV0VmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBTaG91bGRVcGRhdGVBcHBlYXJhbmNlIGRv
QXBwZWFyYW5jZVVwZGF0ZSkKIHsKICAgICBpZiAoY2FyZXRWaXNpYmlsaXR5KCkgPT0gdmlzaWJp
bGl0eSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCB0cmln
Z2VyIGEgc3luY2hyb25vdXMgbGF5b3V0IGhlcmUuCi0gICAgaWYgKG1fZG9jdW1lbnQpCisgICAg
aWYgKGRvQXBwZWFyYW5jZVVwZGF0ZSAmJiBtX2RvY3VtZW50KQogICAgICAgICB1cGRhdGVTZWxl
Y3Rpb25CeVVwZGF0aW5nTGF5b3V0T3JTdHlsZSgqbV9kb2N1bWVudCk7CiAKICNpZiBFTkFCTEUo
VEVYVF9DQVJFVCkKQEAgLTIxOTksNyArMjE5OSw4IEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246OnNl
dENhcmV0VmlzaWJpbGl0eShDYXJldFZpc2liaWxpdHkgdmlzaWJpbGl0eSkKICAgICBDYXJldEJh
c2U6OnNldENhcmV0VmlzaWJpbGl0eSh2aXNpYmlsaXR5KTsKICNlbmRpZgogCi0gICAgdXBkYXRl
QXBwZWFyYW5jZSgpOworICAgIGlmIChkb0FwcGVhcmFuY2VVcGRhdGUpCisgICAgICAgIHVwZGF0
ZUFwcGVhcmFuY2UoKTsKIH0KIAogdm9pZCBGcmFtZVNlbGVjdGlvbjo6Y2FyZXRCbGlua1RpbWVy
RmlyZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv
bi5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCmluZGV4IDM0MWY0
ZWRmOGUzZDg4ZTdjODIyYzU4MjM2Yzk3ZGM1MGJhMzdlZTUuLjE4MGJkNDZmZGU0YWQyMWIwY2Nl
NGJiM2M5M2RjOWUwMGZmMTc1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv
RnJhbWVTZWxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0
aW9uLmgKQEAgLTE4Niw3ICsxODYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBub2RlV2lsbEJlUmVt
b3ZlZChOb2RlJik7CiAgICAgdm9pZCB0ZXh0V2FzUmVwbGFjZWQoQ2hhcmFjdGVyRGF0YSosIHVu
c2lnbmVkIG9mZnNldCwgdW5zaWduZWQgb2xkTGVuZ3RoLCB1bnNpZ25lZCBuZXdMZW5ndGgpOwog
Ci0gICAgdm9pZCBzZXRDYXJldFZpc2libGUoYm9vbCBjYXJldElzVmlzaWJsZSkgeyBzZXRDYXJl
dFZpc2liaWxpdHkoY2FyZXRJc1Zpc2libGUgPyBWaXNpYmxlIDogSGlkZGVuKTsgfQorICAgIHZv
aWQgc2V0Q2FyZXRWaXNpYmxlKGJvb2wgY2FyZXRJc1Zpc2libGUpIHsgc2V0Q2FyZXRWaXNpYmls
aXR5KGNhcmV0SXNWaXNpYmxlID8gVmlzaWJsZSA6IEhpZGRlbiwgWWVzKTsgfQogICAgIHZvaWQg
cGFpbnRDYXJldChHcmFwaGljc0NvbnRleHQmLCBjb25zdCBMYXlvdXRQb2ludCYsIGNvbnN0IExh
eW91dFJlY3QmIGNsaXBSZWN0KTsKIAogICAgIC8vIFVzZWQgdG8gc3VzcGVuZCBjYXJldCBibGlu
a2luZyB3aGlsZSB0aGUgbW91c2UgaXMgZG93bi4KQEAgLTI5OSw3ICsyOTksOSBAQCBwcml2YXRl
OgogICAgIHZvaWQgdXBkYXRlQXBwZWFyYW5jZUFmdGVyTGF5b3V0T3JTdHlsZUNoYW5nZSgpOwog
ICAgIHZvaWQgYXBwZWFyYW5jZVVwZGF0ZVRpbWVyRmlyZWQoKTsKIAotICAgIFdFQkNPUkVfRVhQ
T1JUIHZvaWQgc2V0Q2FyZXRWaXNpYmlsaXR5KENhcmV0VmlzaWJpbGl0eSk7CisgICAgZW51bSBT
aG91bGRVcGRhdGVBcHBlYXJhbmNlIDogYm9vbCB7IE5vLCBZZXMgfTsKKyAgICBXRUJDT1JFX0VY
UE9SVCB2b2lkIHNldENhcmV0VmlzaWJpbGl0eShDYXJldFZpc2liaWxpdHksIFNob3VsZFVwZGF0
ZUFwcGVhcmFuY2UpOworCiAgICAgYm9vbCByZWNvbXB1dGVDYXJldFJlY3QoKTsKICAgICB2b2lk
IGludmFsaWRhdGVDYXJldFJlY3QoKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDhiZGQ0YmNlMjE0YjE2MzM5N2I5Njhi
NDI0OWQzZTExNzBmMjBhNmQuLmY5YTY4ZTIyOGI2NDQ2MmM4ODkzMTNlYTMxNWEyYTA1ODgwNTll
MTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMy0xNSAgSnVsaWFuIEdvbnphbGV6ICA8
anVsaWFuX2FfZ29uemFsZXpAYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6
IG1fc3RhdGUgPT0gU3RhdGU6OkNvbW1pdHRlZCBpbiBXZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjpk
aWRGYWlsTG9hZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjE3ODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBTdG9wIHNraXBwaW5nIGxvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1j
cmFzaC5odG1sIG9uIERlYnVnIGJvdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93azIvVGVzdEV4
cGVjdGF0aW9uczoKKwogMjAyMS0wMy0xNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFtNdWx0aS1jb2x1bW5dIElnbm9yZSBsaW5lIGdyaWQgb2Zmc2V0IHdoZW4g
dGhlIGdyaWQgbGluZSBpcyBzaG9ydGVyIHRoYW4gMC41cHgKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v
d2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZjYzM2YzYjM4YTRmNjkxMjE1ODc3ZTdjMGZmMzBk
YzAyNGEzMzUxMy4uZWY1Zjc2ZDNhY2U2MzQxMmQ1OGJjYTRkMjU2ZWM1N2U1ODYxOWI0MiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI0Nyw4ICsyNDcs
NiBAQCB3ZWJraXQub3JnL2IvMjIxODE3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
ZmV0Y2gvcmFuZ2UvZ2VuZXJhbC53aW5kb3cuaAogCiB3ZWJraXQub3JnL2IvMjIxODE5IGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2ViYXVkaW8vdGhlLWF1ZGlvLWFwaS90aGUtbWVk
aWFlbGVtZW50YXVkaW9zb3VyY2Vub2RlLWludGVyZmFjZS9tZWRpYUVsZW1lbnRBdWRpb1NvdXJj
ZVRvU2NyaXB0UHJvY2Vzc29yVGVzdC5odG1sIFsgRmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8y
MjE3ODMgWyBEZWJ1ZyBdIGxvYWRlci9jaGFuZ2Utc3JjLWR1cmluZy1pZnJhbWUtbG9hZC1jcmFz
aC5odG1sIFsgU2tpcCBdCi0KIHdlYmtpdC5vcmcvYi8yMjI1NjkgZmFzdC9tZWRpYXN0cmVhbS9t
ZWRpYS1zdHJlYW0tdHJhY2staW50ZXJydXB0ZWQuaHRtbCBbIENyYXNoIFBhc3MgXQogCiAjIyMg
RU5EIE9GICgxKSBDbGFzc2lmaWVkIGZhaWx1cmVzIHdpdGggYnVnIHJlcG9ydHMK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423364</attachid>
            <date>2021-03-16 11:16:22 -0700</date>
            <delta_ts>2021-03-16 15:45:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221783-20210316111621.patch</filename>
            <type>text/plain</type>
            <size>5888</size>
            <attacher name="Julian Gonzalez">julian_a_gonzalez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUwN2UwNDVmM2Q3ZGVh
NTlkZWY1YzM0NjY0NzVmNTcxYjM0MDRiYi4uZTk1ZDE2MGFkYjQyNTY2MzExNGI0OTNkZWI5ZWQ0
Yjg1YjA3MWQwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE2ICBKdWxp
YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgQVNT
RVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGluIFdlYktpdDo6RnJh
bWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIERvbid0IGF0dGVtcHQgdG8gdXBkYXRlIGxheW91dCB3aGlsZSBp
biB0aGUgRnJhbWVTZWxlY3Rpb24gY29uc3RydWN0b3IgLQorICAgICAgICBvdGhlcndpc2UsIHdl
IGNhbiBicmVhayB0aGUgb3JkZXIgb2Ygb3BlcmF0aW9ucyBvZiB0aGUgbG9hZGVyLgorCisgICAg
ICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt
ZVNlbGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxl
Y3Rpb246OmZvY3VzZWRPckFjdGl2ZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpG
cmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KToKKyAgICAgICAgKiBlZGl0aW5nL0Zy
YW1lU2VsZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6c2V0Q2Fy
ZXRWaXNpYmxlKToKKwogMjAyMS0wMy0xNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFtNdWx0aS1jb2x1bW5dIElnbm9yZSBsaW5lIGdyaWQgb2Zmc2V0IHdoZW4g
dGhlIGdyaWQgbGluZSBpcyBzaG9ydGVyIHRoYW4gMC41cHgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu
Zy9GcmFtZVNlbGVjdGlvbi5jcHAKaW5kZXggZDkzYjExNjRlY2NjOGM0MzQ4Mjk0ZmUwM2I3YmQy
NDFkMzhlYTBhNy4uZGM0YjdmMTdmNWZjNzYzYWI5ODQ4ZmI4NDY5NDYyYzc1OGFjMWRkZCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTE4MSw3ICsxODEs
NyBAQCBGcmFtZVNlbGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24oRG9jdW1lbnQqIGRvY3VtZW50KQog
ICAgIC8vIENhcmV0IGJsaW5raW5nIChibGlua3MgfCBkb2VzIG5vdCBibGluaykKICAgICBzZXRD
YXJldFZpc2libGUoYWN0aXZlQW5kRm9jdXNlZCk7CiAjZWxzZQotICAgIHNldENhcmV0VmlzaWJp
bGl0eShhY3RpdmVBbmRGb2N1c2VkID8gVmlzaWJsZSA6IEhpZGRlbik7CisgICAgc2V0Q2FyZXRW
aXNpYmlsaXR5KGFjdGl2ZUFuZEZvY3VzZWQgPyBWaXNpYmxlIDogSGlkZGVuLCBTaG91bGRVcGRh
dGVBcHBlYXJhbmNlOjpObyk7CiAjZW5kaWYKIH0KIApAQCAtMjA2Myw3ICsyMDYzLDcgQEAgdm9p
ZCBGcmFtZVNlbGVjdGlvbjo6Zm9jdXNlZE9yQWN0aXZlU3RhdGVDaGFuZ2VkKCkKICAgICAvLyBD
YXJldCBhcHBlYXJzIGluIHRoZSBhY3RpdmUgZnJhbWUuCiAgICAgaWYgKGFjdGl2ZUFuZEZvY3Vz
ZWQpCiAgICAgICAgIHNldFNlbGVjdGlvbkZyb21Ob25lKCk7Ci0gICAgc2V0Q2FyZXRWaXNpYmls
aXR5KGFjdGl2ZUFuZEZvY3VzZWQgPyBWaXNpYmxlIDogSGlkZGVuKTsKKyAgICBzZXRDYXJldFZp
c2liaWxpdHkoYWN0aXZlQW5kRm9jdXNlZCA/IFZpc2libGUgOiBIaWRkZW4sIFNob3VsZFVwZGF0
ZUFwcGVhcmFuY2U6Olllcyk7CiAKICAgICAvLyBCZWNhdXNlIFN0eWxlOjpSZXNvbHZlcjo6Y2hl
Y2tPbmVTZWxlY3RvcigpIGFuZAogICAgIC8vIFJlbmRlclRoZW1lOjppc0ZvY3VzZWQoKSBjaGVj
ayBpZiB0aGUgZnJhbWUgaXMgYWN0aXZlLCB3ZSBoYXZlIHRvCkBAIC0yMTgyLDEzICsyMTgyLDEz
IEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246OnVwZGF0ZUFwcGVhcmFuY2UoKQogICAgIH0KIH0KIAot
dm9pZCBGcmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KENhcmV0VmlzaWJpbGl0eSB2
aXNpYmlsaXR5KQordm9pZCBGcmFtZVNlbGVjdGlvbjo6c2V0Q2FyZXRWaXNpYmlsaXR5KENhcmV0
VmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBTaG91bGRVcGRhdGVBcHBlYXJhbmNlIGRvQXBwZWFyYW5j
ZVVwZGF0ZSkKIHsKICAgICBpZiAoY2FyZXRWaXNpYmlsaXR5KCkgPT0gdmlzaWJpbGl0eSkKICAg
ICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCB0cmlnZ2VyIGEgc3lu
Y2hyb25vdXMgbGF5b3V0IGhlcmUuCi0gICAgaWYgKG1fZG9jdW1lbnQpCisgICAgaWYgKGRvQXBw
ZWFyYW5jZVVwZGF0ZSA9PSBTaG91bGRVcGRhdGVBcHBlYXJhbmNlOjpZZXMgJiYgbV9kb2N1bWVu
dCkKICAgICAgICAgdXBkYXRlU2VsZWN0aW9uQnlVcGRhdGluZ0xheW91dE9yU3R5bGUoKm1fZG9j
dW1lbnQpOwogCiAjaWYgRU5BQkxFKFRFWFRfQ0FSRVQpCkBAIC0yMTk5LDcgKzIxOTksOCBAQCB2
b2lkIEZyYW1lU2VsZWN0aW9uOjpzZXRDYXJldFZpc2liaWxpdHkoQ2FyZXRWaXNpYmlsaXR5IHZp
c2liaWxpdHkpCiAgICAgQ2FyZXRCYXNlOjpzZXRDYXJldFZpc2liaWxpdHkodmlzaWJpbGl0eSk7
CiAjZW5kaWYKIAotICAgIHVwZGF0ZUFwcGVhcmFuY2UoKTsKKyAgICBpZiAoZG9BcHBlYXJhbmNl
VXBkYXRlID09IFNob3VsZFVwZGF0ZUFwcGVhcmFuY2U6OlllcykKKyAgICAgICAgdXBkYXRlQXBw
ZWFyYW5jZSgpOwogfQogCiB2b2lkIEZyYW1lU2VsZWN0aW9uOjpjYXJldEJsaW5rVGltZXJGaXJl
ZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgg
Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKaW5kZXggMzQxZjRlZGY4
ZTNkODhlN2M4MjJjNTgyMzZjOTdkYzUwYmEzN2VlNS4uZDE1NjZhNDkyZTUzOGQ4MGJjYzU3Y2U4
NzcxMzI2MjA5ODFiOTJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFt
ZVNlbGVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24u
aApAQCAtMTg2LDcgKzE4Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG5vZGVXaWxsQmVSZW1vdmVk
KE5vZGUmKTsKICAgICB2b2lkIHRleHRXYXNSZXBsYWNlZChDaGFyYWN0ZXJEYXRhKiwgdW5zaWdu
ZWQgb2Zmc2V0LCB1bnNpZ25lZCBvbGRMZW5ndGgsIHVuc2lnbmVkIG5ld0xlbmd0aCk7CiAKLSAg
ICB2b2lkIHNldENhcmV0VmlzaWJsZShib29sIGNhcmV0SXNWaXNpYmxlKSB7IHNldENhcmV0Vmlz
aWJpbGl0eShjYXJldElzVmlzaWJsZSA/IFZpc2libGUgOiBIaWRkZW4pOyB9CisgICAgdm9pZCBz
ZXRDYXJldFZpc2libGUoYm9vbCBjYXJldElzVmlzaWJsZSkgeyBzZXRDYXJldFZpc2liaWxpdHko
Y2FyZXRJc1Zpc2libGUgPyBWaXNpYmxlIDogSGlkZGVuLCBTaG91bGRVcGRhdGVBcHBlYXJhbmNl
OjpZZXMpOyB9CiAgICAgdm9pZCBwYWludENhcmV0KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IExh
eW91dFBvaW50JiwgY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3QpOwogCiAgICAgLy8gVXNlZCB0
byBzdXNwZW5kIGNhcmV0IGJsaW5raW5nIHdoaWxlIHRoZSBtb3VzZSBpcyBkb3duLgpAQCAtMjk5
LDcgKzI5OSw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVBcHBlYXJhbmNlQWZ0ZXJMYXlv
dXRPclN0eWxlQ2hhbmdlKCk7CiAgICAgdm9pZCBhcHBlYXJhbmNlVXBkYXRlVGltZXJGaXJlZCgp
OwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRDYXJldFZpc2liaWxpdHkoQ2FyZXRWaXNp
YmlsaXR5KTsKKyAgICBlbnVtIGNsYXNzIFNob3VsZFVwZGF0ZUFwcGVhcmFuY2UgOiBib29sIHsg
Tm8sIFllcyB9OworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0Q2FyZXRWaXNpYmlsaXR5KENh
cmV0VmlzaWJpbGl0eSwgU2hvdWxkVXBkYXRlQXBwZWFyYW5jZSk7CisKICAgICBib29sIHJlY29t
cHV0ZUNhcmV0UmVjdCgpOwogICAgIHZvaWQgaW52YWxpZGF0ZUNhcmV0UmVjdCgpOwogCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k
ZXggOGJkZDRiY2UyMTRiMTYzMzk3Yjk2OGI0MjQ5ZDNlMTE3MGYyMGE2ZC4uN2Y3NjZmNDViNGNm
NzdjNDEwMDRkMTBkOGExMjhiNDU5OTQ0MTM3YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIx
LTAzLTE2ICBKdWxpYW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisK
KyAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0dGVkIGlu
IFdlYktpdDo6RnJhbWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTc4MworCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3Agc2tpcHBpbmcgbG9hZGVyL2NoYW5n
ZS1zcmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNoLmh0bWwgb24gRGVidWcgYm90cy4KKworICAg
ICAgICAqIHBsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTE1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW011bHRpLWNvbHVtbl0gSWdu
b3JlIGxpbmUgZ3JpZCBvZmZzZXQgd2hlbiB0aGUgZ3JpZCBsaW5lIGlzIHNob3J0ZXIgdGhhbiAw
LjVweApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmNjMz
ZjNiMzhhNGY2OTEyMTU4NzdlN2MwZmYzMGRjMDI0YTMzNTEzLi5lZjVmNzZkM2FjZTYzNDEyZDU4
YmNhNGQyNTZlYzU3ZTU4NjE5YjQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93
azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4
cGVjdGF0aW9ucwpAQCAtMjQ3LDggKzI0Nyw2IEBAIHdlYmtpdC5vcmcvYi8yMjE4MTcgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9yYW5nZS9nZW5lcmFsLndpbmRvdy5oCiAK
IHdlYmtpdC5vcmcvYi8yMjE4MTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJh
dWRpby90aGUtYXVkaW8tYXBpL3RoZS1tZWRpYWVsZW1lbnRhdWRpb3NvdXJjZW5vZGUtaW50ZXJm
YWNlL21lZGlhRWxlbWVudEF1ZGlvU291cmNlVG9TY3JpcHRQcm9jZXNzb3JUZXN0Lmh0bWwgWyBG
YWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIyMTc4MyBbIERlYnVnIF0gbG9hZGVyL2NoYW5nZS1z
cmMtZHVyaW5nLWlmcmFtZS1sb2FkLWNyYXNoLmh0bWwgWyBTa2lwIF0KLQogd2Via2l0Lm9yZy9i
LzIyMjU2OSBmYXN0L21lZGlhc3RyZWFtL21lZGlhLXN0cmVhbS10cmFjay1pbnRlcnJ1cHRlZC5o
dG1sIFsgQ3Jhc2ggUGFzcyBdCiAKICMjIyBFTkQgT0YgKDEpIENsYXNzaWZpZWQgZmFpbHVyZXMg
d2l0aCBidWcgcmVwb3J0cwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>