<?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>224017</bug_id>
          
          <creation_ts>2021-03-31 14:12:51 -0700</creation_ts>
          <short_desc>Crash under GPUProcessProxy::getGPUProcessConnection()</short_desc>
          <delta_ts>2021-05-06 15:02:44 -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>Canvas</component>
          <version>WebKit Nightly Build</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=225486</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="Said Abou-Hallawa">sabouhallawa</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>cdumez</cc>
    
    <cc>darin</cc>
    
    <cc>dino</cc>
    
    <cc>ggaren</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1745775</commentid>
    <comment_count>0</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-03-31 14:12:51 -0700</bug_when>
    <thetext>The completion handler of some messages may reference members of GPUProcessProxy or WebProcessPool even though they may be already destroyed. A crash tracer may look like this:

WebKit: WebKit::GPUProcessProxy::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;) &lt;==
WebKit: WTF::Detail::CallableWrapper&lt;WebKit::WebProcessPool::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;)::$_15, void, WebKit::GPUProcessConnectionInfo const&amp;&gt;::call(WebKit::GPUProcessConnectionInfo const&amp;)
WebKit: WTF::Detail::CallableWrapper&lt;WebKit::WebProcessPool::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;)::$_15, void, WebKit::GPUProcessConnectionInfo const&amp;&gt;::call(WebKit::GPUProcessConnectionInfo const&amp;)
WebKit: WTF::Detail::CallableWrapper&lt;WebKit::GPUProcessProxy::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;)::$_3, void, WTF::Optional&lt;IPC::Attachment&gt;&amp;&amp;&gt;::call(WTF::Optional&lt;IPC::Attachment&gt;&amp;&amp;)
WebKit: WTF::Detail::CallableWrapper&lt;unsigned long long WebKit::AuxiliaryProcessProxy::sendWithAsyncReply&lt;Messages::GPUProcess::CreateGPUConnectionToWebProcess, WebKit::GPUProcessProxy::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;)::$_3&gt;(Messages::GPUProcess::CreateGPUConnectionToWebProcess&amp;&amp;, WebKit::GPUProcessProxy::getGPUProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::GPUProcessConnectionInfo const&amp;)&gt;&amp;&amp;)::$_3&amp;&amp;, unsigned long long, WTF::OptionSet&lt;IPC::SendOption&gt;, WebKit::AuxiliaryProcessProxy::ShouldStartProcessThrottlerActivity)::&apos;lambda&apos;(IPC::Decoder*), void, IPC::Decoder*&gt;::call(IPC::Decoder*)
WebKit: WTF::Detail::CallableWrapper&lt;WebKit::AuxiliaryProcessProxy::sendMessage(std::__1::unique_ptr&lt;IPC::Encoder, std::__1::default_delete&lt;IPC::Encoder&gt; &gt;, WTF::OptionSet&lt;IPC::SendOption&gt;, WTF::Optional&lt;std::__1::pair&lt;WTF::CompletionHandler&lt;void (IPC::Decoder*)&gt;, unsigned long long&gt; &gt;&amp;&amp;, WebKit::AuxiliaryProcessProxy::ShouldStartProcessThrottlerActivity)::$_0, void, IPC::Decoder*&gt;::call(IPC::Decoder*)
WebKit: WebKit::AuxiliaryProcessProxy::~AuxiliaryProcessProxy()
WebKit: WTF::RefCounted&lt;WebKit::GPUProcessProxy, std::__1::default_delete&lt;WebKit::GPUProcessProxy&gt; &gt;::deref() const
WebKit: WebKit::WebProcessPool::~WebProcessPool()
WebKit: -[WKProcessPool dealloc]
WebKit: WebKit::WebProcessProxy::~WebProcessProxy()
WebKit: WebKit::WebProcessProxy::~WebProcessProxy()
WebKit: WTF::Detail::CallableWrapper&lt;WebKit::WebPageProxy::close()::$_6, void&gt;::~CallableWrapper()
JavaScriptCore: WTF::RunLoop::performWork()
JavaScriptCore: WTF::RunLoop::performWork(void*)

GPUProcessProxy is being called although its destruction has already begun since we are inside AuxiliaryProcessProxy::~AuxiliaryProcessProxy(). This means we can&apos;t deal with this object as a super class of AuxiliaryProcessProxy anymore.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745782</commentid>
    <comment_count>1</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-03-31 14:35:53 -0700</bug_when>
    <thetext>&lt;rdar://75146104&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745794</commentid>
    <comment_count>2</comment_count>
      <attachid>424823</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-03-31 15:00:34 -0700</bug_when>
    <thetext>Created attachment 424823
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745894</commentid>
    <comment_count>3</comment_count>
      <attachid>424823</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-03-31 18:21:24 -0700</bug_when>
    <thetext>Comment on attachment 424823
Patch

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

&gt; Source/WebKit/UIProcess/WebProcessPool.cpp:365
&gt; +    if (m_gpuProcess)
&gt; +        m_gpuProcess-&gt;shutDownProcess();

I was wrong about this change. The life cycle of m_gpuProcess is different from the WebProcesses which are owned by the WebProcessPool. I made this assertion in this code 

#if ENABLE(GPU_PROCESS)
    if (m_gpuProcess) {
        ASSERT(m_gpuProcess-&gt;hasOneRef());
        m_gpuProcess-&gt;shutDownProcess();
    }
#endif

And I ran the canvas layout tests and this assertion fires multiple times. I think the assertion fires because there is a singleton GPU Process for all the WebProcesses. If there are multiple WebProcessPools, i.e. WebProcessPool::allProcessPools() has more than one item, m_gpuProcess will only be destroyed when the last WebProcessPool is destroyed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745909</commentid>
    <comment_count>4</comment_count>
      <attachid>424859</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-03-31 18:46:11 -0700</bug_when>
    <thetext>Created attachment 424859
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745967</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-01 02:04:19 -0700</bug_when>
    <thetext>Committed r275349: &lt;https://commits.webkit.org/r275349&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 424859.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754820</commentid>
    <comment_count>6</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-04-27 15:53:27 -0700</bug_when>
    <thetext>r275349 does not guarantee all the pending messages of GPUProcessProxy will be processed before starting the deletion of WebProcessPool. Some messages may be processed inside the AuxiliaryProcessProxy destructor.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754822</commentid>
    <comment_count>7</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-04-27 15:54:07 -0700</bug_when>
    <thetext>&lt;rdar://76794645&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754829</commentid>
    <comment_count>8</comment_count>
      <attachid>427210</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-04-27 16:14:20 -0700</bug_when>
    <thetext>Created attachment 427210
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754834</commentid>
    <comment_count>9</comment_count>
      <attachid>427210</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 16:21:11 -0700</bug_when>
    <thetext>Comment on attachment 427210
Patch

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

&gt; Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:199
&gt; +    replyToPendingMessages();

~AuxiliaryProcessProxy() already does that. So why does ~GPUProcessProxy() need to do it too?

&gt; Source/WebKit/UIProcess/WebProcessPool.cpp:364
&gt; +    // Force calling the destrsuctor of GPUProcessProxy to ensure the completion

typo: destrsuctor</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754836</commentid>
    <comment_count>10</comment_count>
      <attachid>427210</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 16:22:40 -0700</bug_when>
    <thetext>Comment on attachment 427210
Patch

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

&gt; Source/WebKit/UIProcess/WebProcessPool.cpp:366
&gt; +    m_gpuProcess = nullptr;

Note that this does not necessarily destroy the GPUProcessProxy since a single GPUProcessProxy may be shared by several WebProcessPool objects.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754838</commentid>
    <comment_count>11</comment_count>
      <attachid>427210</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 16:30:05 -0700</bug_when>
    <thetext>Comment on attachment 427210
Patch

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

&gt; Source/WebKit/UIProcess/WebProcessPool.cpp:-364
&gt; -    if (m_gpuProcess)

Note that this previous code was wrong too since a GPUProcessProxy can be shared by several process pool. Having a single WebProcessPool getting destroyed should not cause pending messages from other process pool to get replied to eagerly.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754839</commentid>
    <comment_count>12</comment_count>
      <attachid>427210</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-04-27 16:31:56 -0700</bug_when>
    <thetext>Comment on attachment 427210
Patch

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

&gt;&gt; Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:199
&gt;&gt; +    replyToPendingMessages();
&gt; 
&gt; ~AuxiliaryProcessProxy() already does that. So why does ~GPUProcessProxy() need to do it too?

See the completion handler in GPUProcessProxy::getGPUProcessConnection(). We capture this as a WeakPtr and if we reply the pending messages from ~AuxiliaryProcessProxy(), GPUProcessProxy will be invalid and a call like this-&gt;connection() will crash.

&gt;&gt; Source/WebKit/UIProcess/WebProcessPool.cpp:366
&gt;&gt; +    m_gpuProcess = nullptr;
&gt; 
&gt; Note that this does not necessarily destroy the GPUProcessProxy since a single GPUProcessProxy may be shared by several WebProcessPool objects.

So this may not be needed then.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754845</commentid>
    <comment_count>13</comment_count>
      <attachid>427210</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 16:45:42 -0700</bug_when>
    <thetext>Comment on attachment 427210
Patch

I think the safest fix here is to protect the WebProcessPool in the lambda in WebProcessPool::getGPUProcessConnection(), instead of using a WeakPtr.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754860</commentid>
    <comment_count>14</comment_count>
      <attachid>427217</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 17:12:48 -0700</bug_when>
    <thetext>Created attachment 427217
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754878</commentid>
    <comment_count>15</comment_count>
      <attachid>427225</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 18:37:14 -0700</bug_when>
    <thetext>Created attachment 427225
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754885</commentid>
    <comment_count>16</comment_count>
      <attachid>427227</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 19:11:26 -0700</bug_when>
    <thetext>Created attachment 427227
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754894</commentid>
    <comment_count>17</comment_count>
      <attachid>427231</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 20:07:41 -0700</bug_when>
    <thetext>Created attachment 427231
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754895</commentid>
    <comment_count>18</comment_count>
      <attachid>427232</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-27 20:20:42 -0700</bug_when>
    <thetext>Created attachment 427232
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755029</commentid>
    <comment_count>19</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-28 08:20:57 -0700</bug_when>
    <thetext>Committed r276712 (237117@main): &lt;https://commits.webkit.org/237117@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427232.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>424823</attachid>
            <date>2021-03-31 15:00:34 -0700</date>
            <delta_ts>2021-03-31 19:49:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210331150034.patch</filename>
            <type>text/plain</type>
            <size>5216</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZiMjZkNGQzNjVmZDEyZmJm
YTdjMTZhNjQwMTE1NWJlZTFiZWIzZjMuLjdkNjlhZDM0MTIzZGI5ZDBkODkwNGY3ZTgxNTViNWMz
NjI4MmVkZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDMtMzEgIFNhaWQgQWJv
dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBQcm9j
ZXNzIHRoZSBwZW5kaW5nIG1lc3NhZ2VzIG9mIEdQVVByb2Nlc3NQcm94eSBiZWZvcmUgaXRzIGRl
c3RydWN0b3IgaXMgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMjQwMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBFbnN1cmUgdGhlIHBlbmRpbmcgbWVzc2FnZXMgb2YgR1BVUHJvY2Vzc1Byb3h5
IGFyZSBwcm9jZXNzZWQgZWFybHkgZW5vdWdoCisgICAgICAgIHRvIGhhdmUgdmFsaWQgR1BVUHJv
Y2Vzc1Byb3h5IGFuZCB2YWxpZCBXZWJQcm9jZXNzUG9vbC4KKworICAgICAgICAqIFVJUHJvY2Vz
cy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpBdXhpbGlhcnlQ
cm9jZXNzUHJveHk6On5BdXhpbGlhcnlQcm9jZXNzUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpB
dXhpbGlhcnlQcm9jZXNzUHJveHk6OnJlcGx5VG9QZW5kaW5nTWVzc2FnZXMpOgorICAgICAgICAq
IFVJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv
R1BVL0dQVVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94
eTo6cHJvY2Vzc1dpbGxTaHV0RG93bik6CisgICAgICAgIEkgZG9uJ3QgdGhpcyBmdW5jdGlvbiBp
cyBldmVyIGJlZW4gY2FsbGVkLiBDb21wYXJpbmcgaXQgd2l0aAorICAgICAgICBXZWJyb2Nlc3NQ
cm94eTo6cHJvY2Vzc1dpbGxTaHV0RG93bigpLCB0aGlzIG90aGVyIGZ1bmN0aW9uIGlzIGNhbGxl
ZAorICAgICAgICBmcm9tIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6c2h1dERvd25Qcm9jZXNzKCkg
d2hpY2ggaXMgY2FsbGVkIGZyb20KKyAgICAgICAgV2ViUHJvY2Vzc1Byb3h5OjpzaHV0RG93bigp
IHdoaWNoIGlzIGNhbGxlZCBmcm9tIH5XZWJQcm9jZXNzUG9vbCgpLgorCisgICAgICAgICogVUlQ
cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bv
b2w6On5XZWJQcm9jZXNzUG9vbCk6CisgICAgICAgIE1ha2Ugc3VyZSBHUFVQcm9jZXNzUHJveHkg
aXMgc2h1dCBkb3duIGJlZm9yZSBleGl0aW5nIHRoZSBkZXN0cnVjdG9yIG9mCisgICAgICAgIFdl
YlByb2Nlc3NQb29sLiBDYWxsaW5nIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6c2h1dERvd25Qcm9j
ZXNzKCkgd2lsbAorICAgICAgICBhbHNvIGNhbGwgR1BVUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzV2ls
bFNodXREb3duKCkuCisKIDIwMjEtMDMtMzAgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNv
bT4KIAogICAgICAgICBbR1BVUF0gQWRkICJDb2RlQ29tcGxldGUiIGF0dHJpYnV0ZSB0byBzb21l
IGZlYXR1cmUgZmxhZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGls
aWFyeVByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQ
cm9jZXNzUHJveHkuY3BwCmluZGV4IDA5MjI0YTQ5OTcwMzNkM2U1YWMxMjQ1ODUyMmU3OWNlMjYy
MmU1NTYuLmQwYzgwZTNiYzhlNGI0NjRhMWZmZDYxN2FkMzFjZDM4N2EzY2U2NzUgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAKKysr
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNwcApAQCAt
NDgsMTEgKzQ4LDggQEAgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5Ojp+QXV4aWxpYXJ5UHJvY2Vzc1By
b3h5KCkKICAgICAgICAgbV9wcm9jZXNzTGF1bmNoZXItPmludmFsaWRhdGUoKTsKICAgICAgICAg
bV9wcm9jZXNzTGF1bmNoZXIgPSBudWxscHRyOwogICAgIH0KLSAgICBhdXRvIHBlbmRpbmdNZXNz
YWdlcyA9IFdURk1vdmUobV9wZW5kaW5nTWVzc2FnZXMpOwotICAgIGZvciAoYXV0byYgcGVuZGlu
Z01lc3NhZ2UgOiBwZW5kaW5nTWVzc2FnZXMpIHsKLSAgICAgICAgaWYgKHBlbmRpbmdNZXNzYWdl
LmFzeW5jUmVwbHlJbmZvKQotICAgICAgICAgICAgcGVuZGluZ01lc3NhZ2UuYXN5bmNSZXBseUlu
Zm8tPmZpcnN0KG51bGxwdHIpOwotICAgIH0KKworICAgIHJlcGx5VG9QZW5kaW5nTWVzc2FnZXMo
KTsKIH0KIAogdm9pZCBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OmdldExhdW5jaE9wdGlvbnMoUHJv
Y2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zJiBsYXVuY2hPcHRpb25zKQpAQCAtMjQ5LDYgKzI0
NiwxNSBAQCB2b2lkIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKFBy
b2Nlc3NMYXVuY2hlciosIElQQzo6Q29ubmVjdGlvbgogICAgIH0KIH0KIAordm9pZCBBdXhpbGlh
cnlQcm9jZXNzUHJveHk6OnJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKQoreworICAgIGF1dG8gcGVu
ZGluZ01lc3NhZ2VzID0gV1RGTW92ZShtX3BlbmRpbmdNZXNzYWdlcyk7CisgICAgZm9yIChhdXRv
JiBwZW5kaW5nTWVzc2FnZSA6IHBlbmRpbmdNZXNzYWdlcykgeworICAgICAgICBpZiAocGVuZGlu
Z01lc3NhZ2UuYXN5bmNSZXBseUluZm8pCisgICAgICAgICAgICBwZW5kaW5nTWVzc2FnZS5hc3lu
Y1JlcGx5SW5mby0+Zmlyc3QobnVsbHB0cik7CisgICAgfQorfQorCiB2b2lkIEF1eGlsaWFyeVBy
b2Nlc3NQcm94eTo6c2h1dERvd25Qcm9jZXNzKCkKIHsKICAgICBzd2l0Y2ggKHN0YXRlKCkpIHsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94
eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKaW5k
ZXggNDFmNmEyMzE5MDUwOTIzZTgzOGRkOTlmMjFhYTEzZTAxNmIyOTVlNC4uZjNlZmU3MGIyM2Ri
ZTZmMjk4ZTRkNWMyNzI2YzcwZGUzNGU1YzgxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKQEAgLTExOSw2ICsxMTksOCBAQCBwdWJsaWM6
CiAgICAgYm9vbCBjYW5TZW5kTWVzc2FnZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRlKCkgIT0gU3Rh
dGU6OlRlcm1pbmF0ZWQ7fQogICAgIGJvb2wgc2VuZE1lc3NhZ2UoVW5pcXVlUmVmPElQQzo6RW5j
b2Rlcj4mJiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4sIE9wdGlvbmFsPHN0ZDo6cGFpcjxD
b21wbGV0aW9uSGFuZGxlcjx2b2lkKElQQzo6RGVjb2RlciopPiwgdWludDY0X3Q+PiYmIGFzeW5j
UmVwbHlJbmZvID0gV1RGOjpudWxsb3B0LCBTaG91bGRTdGFydFByb2Nlc3NUaHJvdHRsZXJBY3Rp
dml0eSA9IFNob3VsZFN0YXJ0UHJvY2Vzc1Rocm90dGxlckFjdGl2aXR5OjpZZXMpOwogCisgICAg
dm9pZCByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCk7CisKICAgICB2b2lkIHNodXREb3duUHJvY2Vz
cygpOwogCiAgICAgV2ViQ29yZTo6UHJvY2Vzc0lkZW50aWZpZXIgY29yZVByb2Nlc3NJZGVudGlm
aWVyKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzSWRlbnRpZmllcjsgfQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBiNTE5NzU1YzRl
OGZiNmZmNDk2MjVlNmE5MjllZTU3ZWE4NDdkYjU2Li4xNjBmNzQ1ODY3MWU1ZWQ2NzMzMDMzM2Zj
MTQwMDc1OWJjMzVmY2I5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUv
R1BVUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BV
UHJvY2Vzc1Byb3h5LmNwcApAQCAtMjUyLDYgKzI1Miw3IEBAIHZvaWQgR1BVUHJvY2Vzc1Byb3h5
Ojpjb25uZWN0aW9uV2lsbE9wZW4oSVBDOjpDb25uZWN0aW9uJikKIHZvaWQgR1BVUHJvY2Vzc1By
b3h5Ojpwcm9jZXNzV2lsbFNodXREb3duKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIHsK
ICAgICBBU1NFUlRfVU5VU0VEKGNvbm5lY3Rpb24sIHRoaXMtPmNvbm5lY3Rpb24oKSA9PSAmY29u
bmVjdGlvbik7CisgICAgcmVwbHlUb1BlbmRpbmdNZXNzYWdlcygpOwogICAgIGlmIChzaW5nbGV0
b24oKSA9PSB0aGlzKQogICAgICAgICBzaW5nbGV0b24oKSA9IG51bGxwdHI7CiB9CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggNWQ2ZDExYTQwYTlmODQz
MTExODZiN2UyZjI2NDFjZjFkOTllODQzMC4uYTEzNWVkOTA2NjcyZTY2OTY3OGE2YWYzN2M1ZjVh
ZjFhZGU2NzVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz
c1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw
cApAQCAtMzYwLDYgKzM2MCwxMSBAQCBXZWJQcm9jZXNzUG9vbDo6fldlYlByb2Nlc3NQb29sKCkK
ICAgICAgICAgVUlHYW1lcGFkUHJvdmlkZXI6OnNpbmdsZXRvbigpLnByb2Nlc3NQb29sU3RvcHBl
ZFVzaW5nR2FtZXBhZHMoKnRoaXMpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1Mp
CisgICAgaWYgKG1fZ3B1UHJvY2VzcykKKyAgICAgICAgbV9ncHVQcm9jZXNzLT5zaHV0RG93blBy
b2Nlc3MoKTsKKyNlbmRpZgorCiAgICAgLy8gT25seSByZW1haW5pbmcgcHJvY2Vzc2VzIHNob3Vs
ZCBiZSBwcmUtd2FybWVkIG9uZXMgYXMgb3RoZXIga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZl
LgogICAgIHdoaWxlICghbV9wcm9jZXNzZXMuaXNFbXB0eSgpKSB7CiAgICAgICAgIGF1dG8mIHBy
b2Nlc3MgPSBtX3Byb2Nlc3Nlcy5maXJzdCgpOwo=
</data>
<flag name="commit-queue"
          id="444656"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>424859</attachid>
            <date>2021-03-31 18:46:11 -0700</date>
            <delta_ts>2021-04-27 16:14:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210331184611.patch</filename>
            <type>text/plain</type>
            <size>4102</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZiMjZkNGQzNjVmZDEyZmJm
YTdjMTZhNjQwMTE1NWJlZTFiZWIzZjMuLjhjYzNiMjMxNjkxNzhlMDczYzliMjRjZjYxYjYwOTQ2
OGRlMDNkMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDMtMzEgIFNhaWQgQWJv
dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBQcm9j
ZXNzIHRoZSBwZW5kaW5nIG1lc3NhZ2VzIG9mIEdQVVByb2Nlc3NQcm94eSBiZWZvcmUgaXRzIGRl
c3RydWN0b3IgaXMgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMjQwMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBFbnN1cmUgYWxsIHRoZSBwZW5kaW5nIG1lc3NhZ2VzIG9mIHRoZSBzaW5nbGV0
b24gR1BVUHJvY2Vzc1Byb3h5IGFyZQorICAgICAgICBwcm9jZXNzZWQgZXZlcnkgdGltZSBhIFdl
YlByb2Nlc3NQb29sIGlzIGFib3V0IHRvIGJlIGRlbGV0ZWQuIFdoZW4gY2FsbGluZworICAgICAg
ICB0aGUgY29tcGxldGlvbiBoYW5kbGVycyBvZiB0aGVzZSBtZXNzYWdlcywgdGhlIEdQVVByb2Nl
c3NQcm94eSBhbmQgdGhlIAorICAgICAgICBXZWJQcm9jZXNzUG9vbCBoYXZlIHRvIGJlIHZhbGlk
CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5Ojp+QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5
KToKKyAgICAgICAgKFdlYktpdDo6QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5OjpyZXBseVRvUGVuZGlu
Z01lc3NhZ2VzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5Lmg6
CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzc1Bvb2w6On5XZWJQcm9jZXNzUG9vbCk6CisKIDIwMjEtMDMtMzAgIFBlbmcg
TGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gQWRkICJDb2RlQ29t
cGxldGUiIGF0dHJpYnV0ZSB0byBzb21lIGZlYXR1cmUgZmxhZ3MKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9BdXhpbGlhcnlQcm9jZXNzUHJveHkuY3BwCmluZGV4IDA5MjI0YTQ5OTcw
MzNkM2U1YWMxMjQ1ODUyMmU3OWNlMjYyMmU1NTYuLmQwYzgwZTNiYzhlNGI0NjRhMWZmZDYxN2Fk
MzFjZDM4N2EzY2U2NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1eGls
aWFyeVByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxp
YXJ5UHJvY2Vzc1Byb3h5LmNwcApAQCAtNDgsMTEgKzQ4LDggQEAgQXV4aWxpYXJ5UHJvY2Vzc1By
b3h5Ojp+QXV4aWxpYXJ5UHJvY2Vzc1Byb3h5KCkKICAgICAgICAgbV9wcm9jZXNzTGF1bmNoZXIt
PmludmFsaWRhdGUoKTsKICAgICAgICAgbV9wcm9jZXNzTGF1bmNoZXIgPSBudWxscHRyOwogICAg
IH0KLSAgICBhdXRvIHBlbmRpbmdNZXNzYWdlcyA9IFdURk1vdmUobV9wZW5kaW5nTWVzc2FnZXMp
OwotICAgIGZvciAoYXV0byYgcGVuZGluZ01lc3NhZ2UgOiBwZW5kaW5nTWVzc2FnZXMpIHsKLSAg
ICAgICAgaWYgKHBlbmRpbmdNZXNzYWdlLmFzeW5jUmVwbHlJbmZvKQotICAgICAgICAgICAgcGVu
ZGluZ01lc3NhZ2UuYXN5bmNSZXBseUluZm8tPmZpcnN0KG51bGxwdHIpOwotICAgIH0KKworICAg
IHJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKTsKIH0KIAogdm9pZCBBdXhpbGlhcnlQcm9jZXNzUHJv
eHk6OmdldExhdW5jaE9wdGlvbnMoUHJvY2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zJiBsYXVu
Y2hPcHRpb25zKQpAQCAtMjQ5LDYgKzI0NiwxNSBAQCB2b2lkIEF1eGlsaWFyeVByb2Nlc3NQcm94
eTo6ZGlkRmluaXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVuY2hlciosIElQQzo6Q29ubmVjdGlvbgog
ICAgIH0KIH0KIAordm9pZCBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OnJlcGx5VG9QZW5kaW5nTWVz
c2FnZXMoKQoreworICAgIGF1dG8gcGVuZGluZ01lc3NhZ2VzID0gV1RGTW92ZShtX3BlbmRpbmdN
ZXNzYWdlcyk7CisgICAgZm9yIChhdXRvJiBwZW5kaW5nTWVzc2FnZSA6IHBlbmRpbmdNZXNzYWdl
cykgeworICAgICAgICBpZiAocGVuZGluZ01lc3NhZ2UuYXN5bmNSZXBseUluZm8pCisgICAgICAg
ICAgICBwZW5kaW5nTWVzc2FnZS5hc3luY1JlcGx5SW5mby0+Zmlyc3QobnVsbHB0cik7CisgICAg
fQorfQorCiB2b2lkIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6c2h1dERvd25Qcm9jZXNzKCkKIHsK
ICAgICBzd2l0Y2ggKHN0YXRlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL0F1eGlsaWFyeVByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4
aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKaW5kZXggNDFmNmEyMzE5MDUwOTIzZTgzOGRkOTlmMjFhYTEz
ZTAxNmIyOTVlNC4uZjNlZmU3MGIyM2RiZTZmMjk4ZTRkNWMyNzI2YzcwZGUzNGU1YzgxZCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5LmgKQEAg
LTExOSw2ICsxMTksOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBjYW5TZW5kTWVzc2FnZSgpIGNvbnN0
IHsgcmV0dXJuIHN0YXRlKCkgIT0gU3RhdGU6OlRlcm1pbmF0ZWQ7fQogICAgIGJvb2wgc2VuZE1l
c3NhZ2UoVW5pcXVlUmVmPElQQzo6RW5jb2Rlcj4mJiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlv
bj4sIE9wdGlvbmFsPHN0ZDo6cGFpcjxDb21wbGV0aW9uSGFuZGxlcjx2b2lkKElQQzo6RGVjb2Rl
ciopPiwgdWludDY0X3Q+PiYmIGFzeW5jUmVwbHlJbmZvID0gV1RGOjpudWxsb3B0LCBTaG91bGRT
dGFydFByb2Nlc3NUaHJvdHRsZXJBY3Rpdml0eSA9IFNob3VsZFN0YXJ0UHJvY2Vzc1Rocm90dGxl
ckFjdGl2aXR5OjpZZXMpOwogCisgICAgdm9pZCByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCk7CisK
ICAgICB2b2lkIHNodXREb3duUHJvY2VzcygpOwogCiAgICAgV2ViQ29yZTo6UHJvY2Vzc0lkZW50
aWZpZXIgY29yZVByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzSWRl
bnRpZmllcjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz
c1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmlu
ZGV4IDVkNmQxMWE0MGE5Zjg0MzExMTg2YjdlMmYyNjQxY2YxZDk5ZTg0MzAuLjI3MTg2MzQyZWZk
MTI2NmYxYjdlOGJiMzBjZTk5N2E2MDBiYWRiYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTM2MCw2ICszNjAsMTEgQEAgV2ViUHJvY2Vzc1Bvb2w6
On5XZWJQcm9jZXNzUG9vbCgpCiAgICAgICAgIFVJR2FtZXBhZFByb3ZpZGVyOjpzaW5nbGV0b24o
KS5wcm9jZXNzUG9vbFN0b3BwZWRVc2luZ0dhbWVwYWRzKCp0aGlzKTsKICNlbmRpZgogCisjaWYg
RU5BQkxFKEdQVV9QUk9DRVNTKQorICAgIGlmIChtX2dwdVByb2Nlc3MpCisgICAgICAgIG1fZ3B1
UHJvY2Vzcy0+cmVwbHlUb1BlbmRpbmdNZXNzYWdlcygpOworI2VuZGlmCisKICAgICAvLyBPbmx5
IHJlbWFpbmluZyBwcm9jZXNzZXMgc2hvdWxkIGJlIHByZS13YXJtZWQgb25lcyBhcyBvdGhlciBr
ZWVwIHRoZSBwcm9jZXNzIHBvb2wgYWxpdmUuCiAgICAgd2hpbGUgKCFtX3Byb2Nlc3Nlcy5pc0Vt
cHR5KCkpIHsKICAgICAgICAgYXV0byYgcHJvY2VzcyA9IG1fcHJvY2Vzc2VzLmZpcnN0KCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427210</attachid>
            <date>2021-04-27 16:14:20 -0700</date>
            <delta_ts>2021-04-27 17:06:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427161419.patch</filename>
            <type>text/plain</type>
            <size>2728</size>
            <attacher name="Said Abou-Hallawa">sabouhallawa</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkxZWQ5Y2Y1NGMzZWMyY2Ex
MTVhN2FlODExYWJmN2YxOGY4YmYyNTQuLmRkMGJlNjY4OGVlZmMyYmNlMTY3NjdhNDk0ZmQ0MjZk
N2ZlMDhlODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDQtMjcgIFNhaWQgQWJv
dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBQcm9j
ZXNzIEdQVVByb2Nlc3NQcm94eSBwZW5kaW5nIG1lc3NhZ2VzIHdoZW4gaXQgYW5kIFdlYlByb2Nl
c3NQb29sIGFyZSB2YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjI0MDE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgRW5zdXJlIHRoZSBwZW5kaW5nIG1lc3NhZ2VzIG9mIEdQVVByb2Nlc3NQcm94eSBh
cmUgcmVwbGllZCBiZWZvcmUgZXhpdGluZworICAgICAgICB0aGUgZGVzdHJ1Y3RvciBvZiBHUFVQ
cm9jZXNzUHJveHkgYW5kIFdlYlByb2Nlc3NQb29sLgorCisgICAgICAgICogVUlQcm9jZXNzL0dQ
VS9HUFVQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpHUFVQcm9jZXNzUHJveHk6
On5HUFVQcm9jZXNzUHJveHkpOgorICAgICAgICBNYWtlIHN1cmUgdGhlIHBlbmRpbmcgbWVzc2Fn
ZSBhcmUgcmVwbGllZCBiZWZvcmUgR1BVUHJvY2Vzc1Byb3h5IGJlY29tZXMKKyAgICAgICAgaW52
YWxpZC4gTm90ZSByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgaXMgYWxzbyBjYWxsZWQgZnJvbSB0
aGUgZGVzdHJ1Y3RvcgorICAgICAgICBvZiBBdXhpbGlhcnlQcm9jZXNzUHJveHkgYnV0IGF0IHRo
aXMgdGltZSwgdGhlIHN1cGVyY2xhc3MgaXMgaW52YWxpZC4KKworICAgICAgICAqIFVJUHJvY2Vz
cy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+
V2ViUHJvY2Vzc1Bvb2wpOgorICAgICAgICBNYWtlIHN1cmUgd2hlbiBXZWJQcm9jZXNzUG9vbCBp
cyBiZWluZyBkZWxldGVkLCBubyBHUFVQcm9jZXNzUHJveHkgcGVuZGluZworICAgICAgICBtZXNz
YWdlcyBhcmUgcmVwbGllZC4KKwogMjAyMS0wNC0yNiAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRo
aUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI3MTg2MSk6IFtpT1NdIEFjY2Vz
c29yeSBiYXIgbmF2aWdhdGlvbiB0byBlbGVtZW50cyBvdXRzaWRlIHRoZSB2aWV3cG9ydCBmYWls
cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94
eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcApp
bmRleCBlZmM4NTY3YjJjM2I1YzEyYTc0ZWI4ZjgzMzQwOGJmZWI1NzVkNzYzLi5iNzhlODVlODg1
OTNkOWQ3NTVmYzhiODMzMThiMjkwMTliYTEwNTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTk0LDcgKzE5NCwxMCBAQCBHUFVQ
cm9jZXNzUHJveHk6OkdQVVByb2Nlc3NQcm94eSgpCiAgICAgdXBkYXRlUHJvY2Vzc0Fzc2VydGlv
bigpOwogfQogCi1HUFVQcm9jZXNzUHJveHk6On5HUFVQcm9jZXNzUHJveHkoKSA9IGRlZmF1bHQ7
CitHUFVQcm9jZXNzUHJveHk6On5HUFVQcm9jZXNzUHJveHkoKQoreworICAgIHJlcGx5VG9QZW5k
aW5nTWVzc2FnZXMoKTsKK30KIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiB2b2lkIEdQVVBy
b2Nlc3NQcm94eTo6c2V0VXNlTW9ja0NhcHR1cmVEZXZpY2VzKGJvb2wgdmFsdWUpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggZmRhZDg1NGFkYTY5ZjQ2
YTkxYmNlNTM2MjFhMTlmNmI5NTU5NjE0OS4uNWI4MjU3MmI5ZGUxOTYyYTdkYmZhOThhMjIyMWU4
OGQxNTk3NThiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz
c1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw
cApAQCAtMzYxLDggKzM2MSw5IEBAIFdlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vzc1Bvb2woKQog
I2VuZGlmCiAKICNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYgKG1fZ3B1UHJvY2VzcykK
LSAgICAgICAgbV9ncHVQcm9jZXNzLT5yZXBseVRvUGVuZGluZ01lc3NhZ2VzKCk7CisgICAgLy8g
Rm9yY2UgY2FsbGluZyB0aGUgZGVzdHJzdWN0b3Igb2YgR1BVUHJvY2Vzc1Byb3h5IHRvIGVuc3Vy
ZSB0aGUgY29tcGxldGlvbgorICAgIC8vIGhhbmRsZXJzIG9mIGl0cyBtZXNzYWdlcyB3aWxsIGhh
dmUgYSB2YWxpZCBXZWJQcm9jZXNzUG9vbC4KKyAgICBtX2dwdVByb2Nlc3MgPSBudWxscHRyOwog
I2VuZGlmCiAKICAgICAvLyBPbmx5IHJlbWFpbmluZyBwcm9jZXNzZXMgc2hvdWxkIGJlIHByZS13
YXJtZWQgb25lcyBhcyBvdGhlciBrZWVwIHRoZSBwcm9jZXNzIHBvb2wgYWxpdmUuCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427217</attachid>
            <date>2021-04-27 17:12:48 -0700</date>
            <delta_ts>2021-04-27 19:11:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427171248.patch</filename>
            <type>text/plain</type>
            <size>3490</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyNzI0YzRkNWRmNGU2M2Q5
MjhhMTg5ZTMyZDA2MTVhYmY0NmI5ZjcuLjlhMGNiM2Q3MWU1ZmFhMTMzNzBmM2IxM2Y3OGYwZGMx
MTdiYTBkOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDQtMjcgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBHUFVQcm9jZXNz
UHJveHk6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNworICAgICAgICA8cmRhcjovLzc1MTQ2MTA0
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj
cmFzaCB3b3VsZCBoYXBwZW4gd2hlbiByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgZ2V0IGNhbGxl
ZCBpbiB0aGUgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5CisgICAgICAgIGRlc3RydWN0b3IgYW5kIHRo
ZXJlIHdvdWxkIGJlIGEgcGVuZGluZyBnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigpIElQQy4gVGhl
IGxhbWJkYSBpbgorICAgICAgICBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rp
b24oKSB3b3VsZCBjaGVjayBpZiBhIFdlYWtQdHIgdG8gdGhlIFdlYlByb2Nlc3NQb29sIGlzCisg
ICAgICAgIHZhbGlkIGJlZm9yZSBjYWxsaW5nIGBlbnN1cmVHUFVQcm9jZXNzKCkuZ2V0R1BVUHJv
Y2Vzc0Nvbm5lY3Rpb24oKWAuIEhvd2V2ZXIsIGF0IHRoaXMgcG9pbnQsIAorICAgICAgICB0aGUg
V2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3RvciBpcyBzdGlsbCBydW5uaW5nIHNvIHRoZSBXZWFrUHRy
IGlzIHN0aWxsIHZhbGlkIGJ1dCAKKyAgICAgICAgYGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQ
cm9jZXNzQ29ubmVjdGlvbigpYCB3aWxsIGNyYXNoIGJlY2F1c2UgdGhlIEdQVVByb2Nlc3NQcm94
eQorICAgICAgICBkZXN0cnVjdG9yIGhhcyBhbHJlYWR5IHJ1bi4KKworICAgICAgICBUbyBhZGRy
ZXNzIHRoaXMsIHdlIGludmFsaWRhdGUgdGhlIFdlYlByb2Nlc3NQb29sJ3MgV2Vha1B0cnMgYXMg
c29vbiBhcyBpdHMgZGVzdHJ1Y3RvciBzdGFydHMKKyAgICAgICAgcnVubmluZy4gQXMgYSByZXN1
bHQsIHdlYWtUaGlzIHdpbGwgYmUgbnVsbCBpbiBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vz
c0Nvbm5lY3Rpb24oKSdzCisgICAgICAgIGxhbWJkYSwgaWYgY2FsbGVkIGR1cmluZyB0aGUgV2Vi
UHJvY2Vzc1Bvb2wncyBkZXN0cnVjdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vz
c1Bvb2wpOgorICAgICAgICAtIERyb3AgY29kZSB0aGF0IHdhcyBjYXVzaW5nIHRoZSBHUFVQcm9j
ZXNzUHJveHkgdG8gcmVwbHkgdG8gYWxsIGl0cyBwZW5kaW5nIElQQyBtZXNzYWdlcyB3aGVuZW5l
dmVyCisgICAgICAgICAgYSBXZWJQcm9jZXNzUG9vbCBnZXRzIGRlc3Ryb3llZC4gVGhpcyBpcyBp
bmNvcnJlY3Qgc2luY2UgYSBHUFVQcm9jZXNzUHJveHkgbWF5IGJlIHNoYXJlZCBieSBzZXZlcmFs
CisgICAgICAgICAgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cy4gTm90ZSB0aGF0IHRoZSBBdXhpbGlh
cnlQcm9jZXNzUHJveHkgZGVzdHJ1Y3RvciBhbHJlYWR5IHRha2VzIGNhcmUgb2YKKyAgICAgICAg
ICBjYWxsaW5nIHJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKS4KKyAgICAgICAgLSBBZGQgY29kZSB0
byBpbnZhbGlkYXRlIHRoZSBXZWJQcm9jZXNzUG9vbCdzIFdlYWtQdHJzIGFzIHNvb24gYXMgdGhl
IFdlYlByb2Nlc3NQb29sIHN0YXJ0cyBkZXN0cnVjdGlvbi4KKyAgICAgICAgICBUaGlzIG1ha2Vz
IHN1cmUgdGhhdCBsYW1iZGFzIGNhcHR1cmluZyBhIFdlYWtQdHI8V2ViUHJvY2Vzc1Bvb2w+IGRv
IG5vdCBkbyB1bnNhZmUgdGhpbmdzIGlmIGNhbGxlZAorICAgICAgICAgIHdoaWxlIHRoZSBXZWJQ
cm9jZXNzUG9vbCBpcyBiZWluZyBkZXN0cm95ZWQuCisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6
ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDb3B5LW9uLXdyaXRlIHNlbWFudGljcyBz
aG91bGQgYmUgYW4gaW50ZXJuYWwgaW1wbGVtZW50YXRpb24gZGV0YWlsIG9mIFN0b3JhZ2VNYXAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBmZGFkODU0
YWRhNjlmNDZhOTFiY2U1MzYyMWExOWY2Yjk1NTk2MTQ5Li44MTMxMzNmMWMwMzU1YWY5ZTkzZTk0
MjgzMTE3Yzg0Njg1MDQ1Y2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz
c1Bvb2wuY3BwCkBAIC0zMzcsNiArMzM3LDExIEBAIFdlYlByb2Nlc3NQb29sOjpXZWJQcm9jZXNz
UG9vbChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiYgY29uZmlndXJhdGlvbikKIAogV2Vi
UHJvY2Vzc1Bvb2w6On5XZWJQcm9jZXNzUG9vbCgpCiB7CisgICAgLy8gTWFrZSBzdXJlIHdlIGlu
dmFsaWRhdGUgb3VyIFdlYWtQdHJzIGFzIHNvb24gYXMgd2Ugc3RhcnQgZGVzdHJ1Y3Rpb24gc28g
dGhhdCBsYW1iZGFzCisgICAgLy8gY2FwdHVyaW5nIGEgV2Vha1B0cjxXZWJQcm9jZXNzUG9vbD4g
ZG8gbm90IGRvIHVuc2FmZSB0aGluZ3MgaW4gdGhlIG1pZGRsZSBvZiB0aGUKKyAgICAvLyBXZWJQ
cm9jZXNzUG9vbCBkZXN0cnVjdGlvbi4KKyAgICB3ZWFrUHRyRmFjdG9yeSgpLnJldm9rZUFsbCgp
OworCiAgICAgbV93ZWJQcm9jZXNzQ2FjaGUtPmNsZWFyKCk7CiAKICAgICBib29sIHJlbW92ZWQg
PSBwcm9jZXNzUG9vbHMoKS5yZW1vdmVGaXJzdCh0aGlzKTsKQEAgLTM2MCwxMSArMzY1LDYgQEAg
V2ViUHJvY2Vzc1Bvb2w6On5XZWJQcm9jZXNzUG9vbCgpCiAgICAgICAgIFVJR2FtZXBhZFByb3Zp
ZGVyOjpzaW5nbGV0b24oKS5wcm9jZXNzUG9vbFN0b3BwZWRVc2luZ0dhbWVwYWRzKCp0aGlzKTsK
ICNlbmRpZgogCi0jaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQotICAgIGlmIChtX2dwdVByb2Nlc3Mp
Ci0gICAgICAgIG1fZ3B1UHJvY2Vzcy0+cmVwbHlUb1BlbmRpbmdNZXNzYWdlcygpOwotI2VuZGlm
Ci0KICAgICAvLyBPbmx5IHJlbWFpbmluZyBwcm9jZXNzZXMgc2hvdWxkIGJlIHByZS13YXJtZWQg
b25lcyBhcyBvdGhlciBrZWVwIHRoZSBwcm9jZXNzIHBvb2wgYWxpdmUuCiAgICAgd2hpbGUgKCFt
X3Byb2Nlc3Nlcy5pc0VtcHR5KCkpIHsKICAgICAgICAgYXV0byYgcHJvY2VzcyA9IG1fcHJvY2Vz
c2VzLmZpcnN0KCk7Cg==
</data>
<flag name="commit-queue"
          id="447757"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427225</attachid>
            <date>2021-04-27 18:37:14 -0700</date>
            <delta_ts>2021-04-27 19:11:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427183713.patch</filename>
            <type>text/plain</type>
            <size>4099</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyNjY3MWVmYThiMjNiYjFk
MWM2NmFkY2UyY2NjYmNlNWFhZTdkOGIuLjI1MDE1YmU1YjE2Y2M5YTRlOGI2ZTBkM2RkM2NhMzU4
ODYzOWJjMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDQtMjcgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBHUFVQcm9jZXNz
UHJveHk6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNworICAgICAgICA8cmRhcjovLzc1MTQ2MTA0
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj
cmFzaCB3b3VsZCBoYXBwZW4gd2hlbiByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgZ2V0IGNhbGxl
ZCBpbiB0aGUgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5CisgICAgICAgIGRlc3RydWN0b3IgYW5kIHRo
ZXJlIHdvdWxkIGJlIGEgcGVuZGluZyBnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigpIElQQy4gVGhl
IGxhbWJkYSBpbgorICAgICAgICBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rp
b24oKSB3b3VsZCBjaGVjayBpZiBhIFdlYWtQdHIgdG8gdGhlIFdlYlByb2Nlc3NQb29sIGlzCisg
ICAgICAgIHZhbGlkIGJlZm9yZSBjYWxsaW5nIGBlbnN1cmVHUFVQcm9jZXNzKCkuZ2V0R1BVUHJv
Y2Vzc0Nvbm5lY3Rpb24oKWAuIEhvd2V2ZXIsIGF0IHRoaXMgcG9pbnQsIAorICAgICAgICB0aGUg
V2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3RvciBpcyBzdGlsbCBydW5uaW5nIHNvIHRoZSBXZWFrUHRy
IGlzIHN0aWxsIHZhbGlkIGJ1dCAKKyAgICAgICAgYGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQ
cm9jZXNzQ29ubmVjdGlvbigpYCB3aWxsIGNyYXNoIGJlY2F1c2UgdGhlIEdQVVByb2Nlc3NQcm94
eQorICAgICAgICBkZXN0cnVjdG9yIGhhcyBhbHJlYWR5IHJ1bi4KKworICAgICAgICBUbyBhZGRy
ZXNzIHRoaXMsIHdlIGludmFsaWRhdGUgdGhlIFdlYlByb2Nlc3NQb29sJ3MgV2Vha1B0cnMgYXMg
c29vbiBhcyBpdHMgZGVzdHJ1Y3RvciBzdGFydHMKKyAgICAgICAgcnVubmluZy4gQXMgYSByZXN1
bHQsIHdlYWtUaGlzIHdpbGwgYmUgbnVsbCBpbiBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vz
c0Nvbm5lY3Rpb24oKSdzCisgICAgICAgIGxhbWJkYSwgaWYgY2FsbGVkIGR1cmluZyB0aGUgV2Vi
UHJvY2Vzc1Bvb2wncyBkZXN0cnVjdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vz
c1Bvb2wpOgorICAgICAgICAtIERyb3AgY29kZSB0aGF0IHdhcyBjYXVzaW5nIHRoZSBHUFVQcm9j
ZXNzUHJveHkgdG8gcmVwbHkgdG8gYWxsIGl0cyBwZW5kaW5nIElQQyBtZXNzYWdlcyB3aGVuZW5l
dmVyCisgICAgICAgICAgYSBXZWJQcm9jZXNzUG9vbCBnZXRzIGRlc3Ryb3llZC4gVGhpcyBpcyBp
bmNvcnJlY3Qgc2luY2UgYSBHUFVQcm9jZXNzUHJveHkgbWF5IGJlIHNoYXJlZCBieSBzZXZlcmFs
CisgICAgICAgICAgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cy4gTm90ZSB0aGF0IHRoZSBBdXhpbGlh
cnlQcm9jZXNzUHJveHkgZGVzdHJ1Y3RvciBhbHJlYWR5IHRha2VzIGNhcmUgb2YKKyAgICAgICAg
ICBjYWxsaW5nIHJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKS4KKyAgICAgICAgLSBBZGQgY29kZSB0
byBpbnZhbGlkYXRlIHRoZSBXZWJQcm9jZXNzUG9vbCdzIFdlYWtQdHJzIGFzIHNvb24gYXMgdGhl
IFdlYlByb2Nlc3NQb29sIHN0YXJ0cyBkZXN0cnVjdGlvbi4KKyAgICAgICAgICBUaGlzIG1ha2Vz
IHN1cmUgdGhhdCBsYW1iZGFzIGNhcHR1cmluZyBhIFdlYWtQdHI8V2ViUHJvY2Vzc1Bvb2w+IGRv
IG5vdCBkbyB1bnNhZmUgdGhpbmdzIGlmIGNhbGxlZAorICAgICAgICAgIHdoaWxlIHRoZSBXZWJQ
cm9jZXNzUG9vbCBpcyBiZWluZyBkZXN0cm95ZWQuCisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6
ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJUEM6OmRlY29kZXI6OmRlY29kZSgpIHNo
b3VsZCBtYXJrIGRlY29kZXIgYXMgaW52YWxpZCB3aGVuIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBmZGFkODU0YWRhNjlmNDZhOTFiY2U1
MzYyMWExOWY2Yjk1NTk2MTQ5Li44MTMxMzNmMWMwMzU1YWY5ZTkzZTk0MjgzMTE3Yzg0Njg1MDQ1
Y2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5j
cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0z
MzcsNiArMzM3LDExIEBAIFdlYlByb2Nlc3NQb29sOjpXZWJQcm9jZXNzUG9vbChBUEk6OlByb2Nl
c3NQb29sQ29uZmlndXJhdGlvbiYgY29uZmlndXJhdGlvbikKIAogV2ViUHJvY2Vzc1Bvb2w6On5X
ZWJQcm9jZXNzUG9vbCgpCiB7CisgICAgLy8gTWFrZSBzdXJlIHdlIGludmFsaWRhdGUgb3VyIFdl
YWtQdHJzIGFzIHNvb24gYXMgd2Ugc3RhcnQgZGVzdHJ1Y3Rpb24gc28gdGhhdCBsYW1iZGFzCisg
ICAgLy8gY2FwdHVyaW5nIGEgV2Vha1B0cjxXZWJQcm9jZXNzUG9vbD4gZG8gbm90IGRvIHVuc2Fm
ZSB0aGluZ3MgaW4gdGhlIG1pZGRsZSBvZiB0aGUKKyAgICAvLyBXZWJQcm9jZXNzUG9vbCBkZXN0
cnVjdGlvbi4KKyAgICB3ZWFrUHRyRmFjdG9yeSgpLnJldm9rZUFsbCgpOworCiAgICAgbV93ZWJQ
cm9jZXNzQ2FjaGUtPmNsZWFyKCk7CiAKICAgICBib29sIHJlbW92ZWQgPSBwcm9jZXNzUG9vbHMo
KS5yZW1vdmVGaXJzdCh0aGlzKTsKQEAgLTM2MCwxMSArMzY1LDYgQEAgV2ViUHJvY2Vzc1Bvb2w6
On5XZWJQcm9jZXNzUG9vbCgpCiAgICAgICAgIFVJR2FtZXBhZFByb3ZpZGVyOjpzaW5nbGV0b24o
KS5wcm9jZXNzUG9vbFN0b3BwZWRVc2luZ0dhbWVwYWRzKCp0aGlzKTsKICNlbmRpZgogCi0jaWYg
RU5BQkxFKEdQVV9QUk9DRVNTKQotICAgIGlmIChtX2dwdVByb2Nlc3MpCi0gICAgICAgIG1fZ3B1
UHJvY2Vzcy0+cmVwbHlUb1BlbmRpbmdNZXNzYWdlcygpOwotI2VuZGlmCi0KICAgICAvLyBPbmx5
IHJlbWFpbmluZyBwcm9jZXNzZXMgc2hvdWxkIGJlIHByZS13YXJtZWQgb25lcyBhcyBvdGhlciBr
ZWVwIHRoZSBwcm9jZXNzIHBvb2wgYWxpdmUuCiAgICAgd2hpbGUgKCFtX3Byb2Nlc3Nlcy5pc0Vt
cHR5KCkpIHsKICAgICAgICAgYXV0byYgcHJvY2VzcyA9IG1fcHJvY2Vzc2VzLmZpcnN0KCk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBiY2YyYTlm
MTRhZThiYTE0Y2I2OWQ2YmM1ZmY0YmU4ZWVhZjNlMGQzLi44Mjg2YTkxY2I1ZTAxMmE5MDUxMDdl
ZGYxMTYzNjE3OTdhMDc0ZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl
c3NQcm94eS5jcHAKQEAgLTQ0MCw3ICs0NDAsOCBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJv
Y2Vzc1dpbGxTaHV0RG93bihJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pCiAgICAgQVNTRVJU
X1VOVVNFRChjb25uZWN0aW9uLCB0aGlzLT5jb25uZWN0aW9uKCkgPT0gJmNvbm5lY3Rpb24pOwog
CiAjaWYgSEFWRShDVkRJU1BMQVlMSU5LKQotICAgIHByb2Nlc3NQb29sKCkuc3RvcERpc3BsYXlM
aW5rcyhjb25uZWN0aW9uKTsKKyAgICBpZiAobV9wcm9jZXNzUG9vbCkKKyAgICAgICAgbV9wcm9j
ZXNzUG9vbC0+c3RvcERpc3BsYXlMaW5rcyhjb25uZWN0aW9uKTsKICNlbmRpZgogfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427227</attachid>
            <date>2021-04-27 19:11:26 -0700</date>
            <delta_ts>2021-04-27 20:07:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427191125.patch</filename>
            <type>text/plain</type>
            <size>4673</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyNjY3MWVmYThiMjNiYjFk
MWM2NmFkY2UyY2NjYmNlNWFhZTdkOGIuLjI1MDE1YmU1YjE2Y2M5YTRlOGI2ZTBkM2RkM2NhMzU4
ODYzOWJjMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDQtMjcgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBHUFVQcm9jZXNz
UHJveHk6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNworICAgICAgICA8cmRhcjovLzc1MTQ2MTA0
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj
cmFzaCB3b3VsZCBoYXBwZW4gd2hlbiByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgZ2V0IGNhbGxl
ZCBpbiB0aGUgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5CisgICAgICAgIGRlc3RydWN0b3IgYW5kIHRo
ZXJlIHdvdWxkIGJlIGEgcGVuZGluZyBnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigpIElQQy4gVGhl
IGxhbWJkYSBpbgorICAgICAgICBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rp
b24oKSB3b3VsZCBjaGVjayBpZiBhIFdlYWtQdHIgdG8gdGhlIFdlYlByb2Nlc3NQb29sIGlzCisg
ICAgICAgIHZhbGlkIGJlZm9yZSBjYWxsaW5nIGBlbnN1cmVHUFVQcm9jZXNzKCkuZ2V0R1BVUHJv
Y2Vzc0Nvbm5lY3Rpb24oKWAuIEhvd2V2ZXIsIGF0IHRoaXMgcG9pbnQsIAorICAgICAgICB0aGUg
V2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3RvciBpcyBzdGlsbCBydW5uaW5nIHNvIHRoZSBXZWFrUHRy
IGlzIHN0aWxsIHZhbGlkIGJ1dCAKKyAgICAgICAgYGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQ
cm9jZXNzQ29ubmVjdGlvbigpYCB3aWxsIGNyYXNoIGJlY2F1c2UgdGhlIEdQVVByb2Nlc3NQcm94
eQorICAgICAgICBkZXN0cnVjdG9yIGhhcyBhbHJlYWR5IHJ1bi4KKworICAgICAgICBUbyBhZGRy
ZXNzIHRoaXMsIHdlIGludmFsaWRhdGUgdGhlIFdlYlByb2Nlc3NQb29sJ3MgV2Vha1B0cnMgYXMg
c29vbiBhcyBpdHMgZGVzdHJ1Y3RvciBzdGFydHMKKyAgICAgICAgcnVubmluZy4gQXMgYSByZXN1
bHQsIHdlYWtUaGlzIHdpbGwgYmUgbnVsbCBpbiBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vz
c0Nvbm5lY3Rpb24oKSdzCisgICAgICAgIGxhbWJkYSwgaWYgY2FsbGVkIGR1cmluZyB0aGUgV2Vi
UHJvY2Vzc1Bvb2wncyBkZXN0cnVjdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vz
c1Bvb2wpOgorICAgICAgICAtIERyb3AgY29kZSB0aGF0IHdhcyBjYXVzaW5nIHRoZSBHUFVQcm9j
ZXNzUHJveHkgdG8gcmVwbHkgdG8gYWxsIGl0cyBwZW5kaW5nIElQQyBtZXNzYWdlcyB3aGVuZW5l
dmVyCisgICAgICAgICAgYSBXZWJQcm9jZXNzUG9vbCBnZXRzIGRlc3Ryb3llZC4gVGhpcyBpcyBp
bmNvcnJlY3Qgc2luY2UgYSBHUFVQcm9jZXNzUHJveHkgbWF5IGJlIHNoYXJlZCBieSBzZXZlcmFs
CisgICAgICAgICAgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cy4gTm90ZSB0aGF0IHRoZSBBdXhpbGlh
cnlQcm9jZXNzUHJveHkgZGVzdHJ1Y3RvciBhbHJlYWR5IHRha2VzIGNhcmUgb2YKKyAgICAgICAg
ICBjYWxsaW5nIHJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKS4KKyAgICAgICAgLSBBZGQgY29kZSB0
byBpbnZhbGlkYXRlIHRoZSBXZWJQcm9jZXNzUG9vbCdzIFdlYWtQdHJzIGFzIHNvb24gYXMgdGhl
IFdlYlByb2Nlc3NQb29sIHN0YXJ0cyBkZXN0cnVjdGlvbi4KKyAgICAgICAgICBUaGlzIG1ha2Vz
IHN1cmUgdGhhdCBsYW1iZGFzIGNhcHR1cmluZyBhIFdlYWtQdHI8V2ViUHJvY2Vzc1Bvb2w+IGRv
IG5vdCBkbyB1bnNhZmUgdGhpbmdzIGlmIGNhbGxlZAorICAgICAgICAgIHdoaWxlIHRoZSBXZWJQ
cm9jZXNzUG9vbCBpcyBiZWluZyBkZXN0cm95ZWQuCisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6
ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJUEM6OmRlY29kZXI6OmRlY29kZSgpIHNo
b3VsZCBtYXJrIGRlY29kZXIgYXMgaW52YWxpZCB3aGVuIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBmZGFkODU0YWRhNjlmNDZhOTFiY2U1
MzYyMWExOWY2Yjk1NTk2MTQ5Li41OWY4NmE5YWVlMjc3MTk2M2E2YjMwNTliZGRjYWNjMjMwOTNl
M2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5j
cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0z
MzcsMTMgKzMzNywxOCBAQCBXZWJQcm9jZXNzUG9vbDo6V2ViUHJvY2Vzc1Bvb2woQVBJOjpQcm9j
ZXNzUG9vbENvbmZpZ3VyYXRpb24mIGNvbmZpZ3VyYXRpb24pCiAKIFdlYlByb2Nlc3NQb29sOjp+
V2ViUHJvY2Vzc1Bvb2woKQogeworICAgIG1fbWVzc2FnZVJlY2VpdmVyTWFwLmludmFsaWRhdGUo
KTsKKworICAgIC8vIE1ha2Ugc3VyZSB3ZSBpbnZhbGlkYXRlIG91ciBXZWFrUHRycyBhcyBzb29u
IGFzIHdlIHN0YXJ0IGRlc3RydWN0aW9uIHNvIHRoYXQgbGFtYmRhcworICAgIC8vIGNhcHR1cmlu
ZyBhIFdlYWtQdHI8V2ViUHJvY2Vzc1Bvb2w+IGRvIG5vdCBkbyB1bnNhZmUgdGhpbmdzIGluIHRo
ZSBtaWRkbGUgb2YgdGhlCisgICAgLy8gV2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3Rpb24uCisgICAg
d2Vha1B0ckZhY3RvcnkoKS5yZXZva2VBbGwoKTsKKwogICAgIG1fd2ViUHJvY2Vzc0NhY2hlLT5j
bGVhcigpOwogCiAgICAgYm9vbCByZW1vdmVkID0gcHJvY2Vzc1Bvb2xzKCkucmVtb3ZlRmlyc3Qo
dGhpcyk7CiAgICAgQVNTRVJUX1VOVVNFRChyZW1vdmVkLCByZW1vdmVkKTsKIAotICAgIG1fbWVz
c2FnZVJlY2VpdmVyTWFwLmludmFsaWRhdGUoKTsKLQogICAgIGZvciAoYXV0byYgc3VwcGxlbWVu
dCA6IG1fc3VwcGxlbWVudHMudmFsdWVzKCkpIHsKICAgICAgICAgc3VwcGxlbWVudC0+cHJvY2Vz
c1Bvb2xEZXN0cm95ZWQoKTsKICAgICAgICAgc3VwcGxlbWVudC0+Y2xlYXJQcm9jZXNzUG9vbCgp
OwpAQCAtMzYwLDExICszNjUsNiBAQCBXZWJQcm9jZXNzUG9vbDo6fldlYlByb2Nlc3NQb29sKCkK
ICAgICAgICAgVUlHYW1lcGFkUHJvdmlkZXI6OnNpbmdsZXRvbigpLnByb2Nlc3NQb29sU3RvcHBl
ZFVzaW5nR2FtZXBhZHMoKnRoaXMpOwogI2VuZGlmCiAKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1Mp
Ci0gICAgaWYgKG1fZ3B1UHJvY2VzcykKLSAgICAgICAgbV9ncHVQcm9jZXNzLT5yZXBseVRvUGVu
ZGluZ01lc3NhZ2VzKCk7Ci0jZW5kaWYKLQogICAgIC8vIE9ubHkgcmVtYWluaW5nIHByb2Nlc3Nl
cyBzaG91bGQgYmUgcHJlLXdhcm1lZCBvbmVzIGFzIG90aGVyIGtlZXAgdGhlIHByb2Nlc3MgcG9v
bCBhbGl2ZS4KICAgICB3aGlsZSAoIW1fcHJvY2Vzc2VzLmlzRW1wdHkoKSkgewogICAgICAgICBh
dXRvJiBwcm9jZXNzID0gbV9wcm9jZXNzZXMuZmlyc3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGJjZjJhOWYxNGFlOGJhMTRjYjY5ZDZiYzVm
ZjRiZThlZWFmM2UwZDMuLmRjY2QyY2M5MjJhNWViNzA0ZTQzZDkzNzQ4NzhiNTE2MThkNjBkMDMg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtNDQw
LDcgKzQ0MCw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzV2lsbFNodXREb3duKElQ
Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKICAgICBBU1NFUlRfVU5VU0VEKGNvbm5lY3Rpb24s
IHRoaXMtPmNvbm5lY3Rpb24oKSA9PSAmY29ubmVjdGlvbik7CiAKICNpZiBIQVZFKENWRElTUExB
WUxJTkspCi0gICAgcHJvY2Vzc1Bvb2woKS5zdG9wRGlzcGxheUxpbmtzKGNvbm5lY3Rpb24pOwor
ICAgIGlmIChtX3Byb2Nlc3NQb29sKQorICAgICAgICBtX3Byb2Nlc3NQb29sLT5zdG9wRGlzcGxh
eUxpbmtzKGNvbm5lY3Rpb24pOwogI2VuZGlmCiB9CiAKQEAgLTQ4MCw3ICs0ODEsOCBAQCB2b2lk
IFdlYlByb2Nlc3NQcm94eTo6c2h1dERvd24oKQogICAgIG1fcm91dGluZ0FyYml0cmF0b3ItPnBy
b2Nlc3NEaWRUZXJtaW5hdGUoKTsKICNlbmRpZgogCi0gICAgbV9wcm9jZXNzUG9vbC0+ZGlzY29u
bmVjdFByb2Nlc3MoKnRoaXMpOworICAgIGlmIChtX3Byb2Nlc3NQb29sKQorICAgICAgICBtX3By
b2Nlc3NQb29sLT5kaXNjb25uZWN0UHJvY2VzcygqdGhpcyk7CiB9CiAKIFdlYlBhZ2VQcm94eSog
V2ViUHJvY2Vzc1Byb3h5Ojp3ZWJQYWdlKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlEKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427231</attachid>
            <date>2021-04-27 20:07:41 -0700</date>
            <delta_ts>2021-04-27 20:23:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427200740.patch</filename>
            <type>text/plain</type>
            <size>3788</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyNjY3MWVmYThiMjNiYjFk
MWM2NmFkY2UyY2NjYmNlNWFhZTdkOGIuLjk2YWU4NzhiMTk2Y2ZiNDZmMjMxNjRkZmQyOGVjMWQ2
MmYxODUxMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDQtMjcgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBHUFVQcm9jZXNz
UHJveHk6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNworICAgICAgICA8cmRhcjovLzc1MTQ2MTA0
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj
cmFzaCB3b3VsZCBoYXBwZW4gd2hlbiByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgZ2V0IGNhbGxl
ZCBpbiB0aGUgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5CisgICAgICAgIGRlc3RydWN0b3IgYW5kIHRo
ZXJlIHdvdWxkIGJlIGEgcGVuZGluZyBnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigpIElQQy4gVGhl
IGxhbWJkYSBpbgorICAgICAgICBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rp
b24oKSB3b3VsZCBjaGVjayBpZiBhIFdlYWtQdHIgdG8gdGhlIFdlYlByb2Nlc3NQb29sIGlzCisg
ICAgICAgIHZhbGlkIGJlZm9yZSBjYWxsaW5nIGBlbnN1cmVHUFVQcm9jZXNzKCkuZ2V0R1BVUHJv
Y2Vzc0Nvbm5lY3Rpb24oKWAuIEhvd2V2ZXIsIGF0IHRoaXMgcG9pbnQsIAorICAgICAgICB0aGUg
V2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3RvciBpcyBzdGlsbCBydW5uaW5nIHNvIHRoZSBXZWFrUHRy
IGlzIHN0aWxsIHZhbGlkIGJ1dCAKKyAgICAgICAgYGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQ
cm9jZXNzQ29ubmVjdGlvbigpYCB3aWxsIGNyYXNoIGJlY2F1c2UgdGhlIEdQVVByb2Nlc3NQcm94
eQorICAgICAgICBkZXN0cnVjdG9yIGhhcyBhbHJlYWR5IHJ1bi4KKworICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29s
Ojp+V2ViUHJvY2Vzc1Bvb2wpOgorICAgICAgICBEcm9wIGNvZGUgdGhhdCB3YXMgY2F1c2luZyB0
aGUgR1BVUHJvY2Vzc1Byb3h5IHRvIHJlcGx5IHRvIGFsbCBpdHMgcGVuZGluZyBJUEMgbWVzc2Fn
ZXMgd2hlbmVuZXZlcgorICAgICAgICBhIFdlYlByb2Nlc3NQb29sIGdldHMgZGVzdHJveWVkLiBU
aGlzIGlzIGluY29ycmVjdCBzaW5jZSBhIEdQVVByb2Nlc3NQcm94eSBtYXkgYmUgc2hhcmVkIGJ5
IHNldmVyYWwKKyAgICAgICAgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cy4gTm90ZSB0aGF0IHRoZSBB
dXhpbGlhcnlQcm9jZXNzUHJveHkgZGVzdHJ1Y3RvciBhbHJlYWR5IHRha2VzIGNhcmUgb2YKKyAg
ICAgICAgY2FsbGluZyByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkuCisKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzc1Bvb2w6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgUHJv
dGVjdCB0aGUgV2ViUHJvY2Vzc1Bvb2wgaXMgdGhlIGxhbWJkYSB0byBwcmV2ZW50IHRoZSBjYXNl
IHdoZXJlIHRoaXMgbGFtYmRhIGdldHMgY2FsbGVkIGFuZCB0aGUKKyAgICAgICAgV2ViUHJvY2Vz
c1Bvb2wgJiBHUFVQcm9jZXNzUHJveHkgYXJlIGluIHRoZSBtaWRkbGUgb2YgZGVzdHJ1Y3Rpb24u
CisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg
ICBJUEM6OmRlY29kZXI6OmRlY29kZSgpIHNob3VsZCBtYXJrIGRlY29kZXIgYXMgaW52YWxpZCB3
aGVuIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl
c3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApp
bmRleCBmZGFkODU0YWRhNjlmNDZhOTFiY2U1MzYyMWExOWY2Yjk1NTk2MTQ5Li41NjNlOWMyYTc4
MWU2NTc5NDdkODkyMDJmODEzM2YzMDdlYjM0MTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0zNjAsMTEgKzM2MCw2IEBAIFdlYlByb2Nlc3NQb29s
Ojp+V2ViUHJvY2Vzc1Bvb2woKQogICAgICAgICBVSUdhbWVwYWRQcm92aWRlcjo6c2luZ2xldG9u
KCkucHJvY2Vzc1Bvb2xTdG9wcGVkVXNpbmdHYW1lcGFkcygqdGhpcyk7CiAjZW5kaWYKIAotI2lm
IEVOQUJMRShHUFVfUFJPQ0VTUykKLSAgICBpZiAobV9ncHVQcm9jZXNzKQotICAgICAgICBtX2dw
dVByb2Nlc3MtPnJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKTsKLSNlbmRpZgotCiAgICAgLy8gT25s
eSByZW1haW5pbmcgcHJvY2Vzc2VzIHNob3VsZCBiZSBwcmUtd2FybWVkIG9uZXMgYXMgb3RoZXIg
a2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlLgogICAgIHdoaWxlICghbV9wcm9jZXNzZXMuaXNF
bXB0eSgpKSB7CiAgICAgICAgIGF1dG8mIHByb2Nlc3MgPSBtX3Byb2Nlc3Nlcy5maXJzdCgpOwpA
QCAtNTI5LDcgKzUyNCw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmdwdVByb2Nlc3NFeGl0ZWQo
UHJvY2Vzc0lEIGlkZW50aWZpZXIsIEdQVVByb2Nlc3NUZXJtaW5hdGlvCiAKIHZvaWQgV2ViUHJv
Y2Vzc1Bvb2w6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYgd2ViUHJv
Y2Vzc1Byb3h5LCBHUFVQcm9jZXNzQ29ubmVjdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBN
ZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRHUFVQcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXll
ZFJlcGx5JiYgcmVwbHkpCiB7Ci0gICAgZW5zdXJlR1BVUHJvY2VzcygpLmdldEdQVVByb2Nlc3ND
b25uZWN0aW9uKHdlYlByb2Nlc3NQcm94eSwgcGFyYW1ldGVycywgW3RoaXMsIHdlYWtUaGlzID0g
bWFrZVdlYWtQdHIoKnRoaXMpLCBwYXJhbWV0ZXJzLCB3ZWJQcm9jZXNzUHJveHkgPSBtYWtlV2Vh
a1B0cih3ZWJQcm9jZXNzUHJveHkpLCByZXBseSA9IFdURk1vdmUocmVwbHkpXSAoYXV0byYgY29u
bmVjdGlvbkluZm8pIG11dGFibGUgeworICAgIGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQcm9j
ZXNzQ29ubmVjdGlvbih3ZWJQcm9jZXNzUHJveHksIHBhcmFtZXRlcnMsIFt0aGlzLCBwcm90ZWN0
ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHBhcmFtZXRlcnMsIHdlYlByb2Nlc3NQcm94eSA9IG1h
a2VXZWFrUHRyKHdlYlByb2Nlc3NQcm94eSksIHJlcGx5ID0gV1RGTW92ZShyZXBseSldIChhdXRv
JiBjb25uZWN0aW9uSW5mbykgbXV0YWJsZSB7CiAgICAgICAgIGlmIChVTkxJS0VMWSghSVBDOjpD
b25uZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChjb25uZWN0aW9uSW5mby5pZGVudGlmaWVyKCkp
ICYmIHdlYlByb2Nlc3NQcm94eSAmJiB3ZWFrVGhpcykpIHsKICAgICAgICAgICAgIFdFQlBST0NF
U1NQT09MX1JFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJnZXRHUFVQcm9jZXNzQ29ubmVjdGlv
bjogRmFpbGVkIGZpcnN0IGF0dGVtcHQsIHJldHJ5aW5nIik7CiAgICAgICAgICAgICBlbnN1cmVH
UFVQcm9jZXNzKCkuZ2V0R1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKndlYlByb2Nlc3NQcm94eSwgcGFy
YW1ldGVycywgV1RGTW92ZShyZXBseSkpOwo=
</data>
<flag name="commit-queue"
          id="447762"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427232</attachid>
            <date>2021-04-27 20:20:42 -0700</date>
            <delta_ts>2021-04-28 08:20:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224017-20210427202042.patch</filename>
            <type>text/plain</type>
            <size>3919</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyNjY3MWVmYThiMjNiYjFk
MWM2NmFkY2UyY2NjYmNlNWFhZTdkOGIuLjk2YWU4NzhiMTk2Y2ZiNDZmMjMxNjRkZmQyOGVjMWQ2
MmYxODUxMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDQtMjcgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBHUFVQcm9jZXNz
UHJveHk6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNworICAgICAgICA8cmRhcjovLzc1MTQ2MTA0
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBj
cmFzaCB3b3VsZCBoYXBwZW4gd2hlbiByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkgZ2V0IGNhbGxl
ZCBpbiB0aGUgQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5CisgICAgICAgIGRlc3RydWN0b3IgYW5kIHRo
ZXJlIHdvdWxkIGJlIGEgcGVuZGluZyBnZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigpIElQQy4gVGhl
IGxhbWJkYSBpbgorICAgICAgICBXZWJQcm9jZXNzUG9vbDo6Z2V0R1BVUHJvY2Vzc0Nvbm5lY3Rp
b24oKSB3b3VsZCBjaGVjayBpZiBhIFdlYWtQdHIgdG8gdGhlIFdlYlByb2Nlc3NQb29sIGlzCisg
ICAgICAgIHZhbGlkIGJlZm9yZSBjYWxsaW5nIGBlbnN1cmVHUFVQcm9jZXNzKCkuZ2V0R1BVUHJv
Y2Vzc0Nvbm5lY3Rpb24oKWAuIEhvd2V2ZXIsIGF0IHRoaXMgcG9pbnQsIAorICAgICAgICB0aGUg
V2ViUHJvY2Vzc1Bvb2wgZGVzdHJ1Y3RvciBpcyBzdGlsbCBydW5uaW5nIHNvIHRoZSBXZWFrUHRy
IGlzIHN0aWxsIHZhbGlkIGJ1dCAKKyAgICAgICAgYGVuc3VyZUdQVVByb2Nlc3MoKS5nZXRHUFVQ
cm9jZXNzQ29ubmVjdGlvbigpYCB3aWxsIGNyYXNoIGJlY2F1c2UgdGhlIEdQVVByb2Nlc3NQcm94
eQorICAgICAgICBkZXN0cnVjdG9yIGhhcyBhbHJlYWR5IHJ1bi4KKworICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29s
Ojp+V2ViUHJvY2Vzc1Bvb2wpOgorICAgICAgICBEcm9wIGNvZGUgdGhhdCB3YXMgY2F1c2luZyB0
aGUgR1BVUHJvY2Vzc1Byb3h5IHRvIHJlcGx5IHRvIGFsbCBpdHMgcGVuZGluZyBJUEMgbWVzc2Fn
ZXMgd2hlbmVuZXZlcgorICAgICAgICBhIFdlYlByb2Nlc3NQb29sIGdldHMgZGVzdHJveWVkLiBU
aGlzIGlzIGluY29ycmVjdCBzaW5jZSBhIEdQVVByb2Nlc3NQcm94eSBtYXkgYmUgc2hhcmVkIGJ5
IHNldmVyYWwKKyAgICAgICAgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cy4gTm90ZSB0aGF0IHRoZSBB
dXhpbGlhcnlQcm9jZXNzUHJveHkgZGVzdHJ1Y3RvciBhbHJlYWR5IHRha2VzIGNhcmUgb2YKKyAg
ICAgICAgY2FsbGluZyByZXBseVRvUGVuZGluZ01lc3NhZ2VzKCkuCisKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzc1Bvb2w6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgUHJv
dGVjdCB0aGUgV2ViUHJvY2Vzc1Bvb2wgaXMgdGhlIGxhbWJkYSB0byBwcmV2ZW50IHRoZSBjYXNl
IHdoZXJlIHRoaXMgbGFtYmRhIGdldHMgY2FsbGVkIGFuZCB0aGUKKyAgICAgICAgV2ViUHJvY2Vz
c1Bvb2wgJiBHUFVQcm9jZXNzUHJveHkgYXJlIGluIHRoZSBtaWRkbGUgb2YgZGVzdHJ1Y3Rpb24u
CisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg
ICBJUEM6OmRlY29kZXI6OmRlY29kZSgpIHNob3VsZCBtYXJrIGRlY29kZXIgYXMgaW52YWxpZCB3
aGVuIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl
c3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApp
bmRleCBmZGFkODU0YWRhNjlmNDZhOTFiY2U1MzYyMWExOWY2Yjk1NTk2MTQ5Li5lYjliOTZmM2Ux
MmRmY2UwZmRmNTE2OWE5NjNmMjE2MGJhMjhhNjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0zNjAsMTEgKzM2MCw2IEBAIFdlYlByb2Nlc3NQb29s
Ojp+V2ViUHJvY2Vzc1Bvb2woKQogICAgICAgICBVSUdhbWVwYWRQcm92aWRlcjo6c2luZ2xldG9u
KCkucHJvY2Vzc1Bvb2xTdG9wcGVkVXNpbmdHYW1lcGFkcygqdGhpcyk7CiAjZW5kaWYKIAotI2lm
IEVOQUJMRShHUFVfUFJPQ0VTUykKLSAgICBpZiAobV9ncHVQcm9jZXNzKQotICAgICAgICBtX2dw
dVByb2Nlc3MtPnJlcGx5VG9QZW5kaW5nTWVzc2FnZXMoKTsKLSNlbmRpZgotCiAgICAgLy8gT25s
eSByZW1haW5pbmcgcHJvY2Vzc2VzIHNob3VsZCBiZSBwcmUtd2FybWVkIG9uZXMgYXMgb3RoZXIg
a2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlLgogICAgIHdoaWxlICghbV9wcm9jZXNzZXMuaXNF
bXB0eSgpKSB7CiAgICAgICAgIGF1dG8mIHByb2Nlc3MgPSBtX3Byb2Nlc3Nlcy5maXJzdCgpOwpA
QCAtNTI5LDggKzUyNCw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmdwdVByb2Nlc3NFeGl0ZWQo
UHJvY2Vzc0lEIGlkZW50aWZpZXIsIEdQVVByb2Nlc3NUZXJtaW5hdGlvCiAKIHZvaWQgV2ViUHJv
Y2Vzc1Bvb2w6OmdldEdQVVByb2Nlc3NDb25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYgd2ViUHJv
Y2Vzc1Byb3h5LCBHUFVQcm9jZXNzQ29ubmVjdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBN
ZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRHUFVQcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXll
ZFJlcGx5JiYgcmVwbHkpCiB7Ci0gICAgZW5zdXJlR1BVUHJvY2VzcygpLmdldEdQVVByb2Nlc3ND
b25uZWN0aW9uKHdlYlByb2Nlc3NQcm94eSwgcGFyYW1ldGVycywgW3RoaXMsIHdlYWtUaGlzID0g
bWFrZVdlYWtQdHIoKnRoaXMpLCBwYXJhbWV0ZXJzLCB3ZWJQcm9jZXNzUHJveHkgPSBtYWtlV2Vh
a1B0cih3ZWJQcm9jZXNzUHJveHkpLCByZXBseSA9IFdURk1vdmUocmVwbHkpXSAoYXV0byYgY29u
bmVjdGlvbkluZm8pIG11dGFibGUgewotICAgICAgICBpZiAoVU5MSUtFTFkoIUlQQzo6Q29ubmVj
dGlvbjo6aWRlbnRpZmllcklzVmFsaWQoY29ubmVjdGlvbkluZm8uaWRlbnRpZmllcigpKSAmJiB3
ZWJQcm9jZXNzUHJveHkgJiYgd2Vha1RoaXMpKSB7CisgICAgZW5zdXJlR1BVUHJvY2VzcygpLmdl
dEdQVVByb2Nlc3NDb25uZWN0aW9uKHdlYlByb2Nlc3NQcm94eSwgcGFyYW1ldGVycywgW3RoaXMs
IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcGFyYW1ldGVycywgd2ViUHJvY2Vzc1By
b3h5ID0gbWFrZVdlYWtQdHIod2ViUHJvY2Vzc1Byb3h5KSwgcmVwbHkgPSBXVEZNb3ZlKHJlcGx5
KV0gKGF1dG8mIGNvbm5lY3Rpb25JbmZvKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKFVOTElLRUxZ
KCFJUEM6OkNvbm5lY3Rpb246OmlkZW50aWZpZXJJc1ZhbGlkKGNvbm5lY3Rpb25JbmZvLmlkZW50
aWZpZXIoKSkgJiYgd2ViUHJvY2Vzc1Byb3h5KSkgewogICAgICAgICAgICAgV0VCUFJPQ0VTU1BP
T0xfUkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgImdldEdQVVByb2Nlc3NDb25uZWN0aW9uOiBG
YWlsZWQgZmlyc3QgYXR0ZW1wdCwgcmV0cnlpbmciKTsKICAgICAgICAgICAgIGVuc3VyZUdQVVBy
b2Nlc3MoKS5nZXRHUFVQcm9jZXNzQ29ubmVjdGlvbigqd2ViUHJvY2Vzc1Byb3h5LCBwYXJhbWV0
ZXJzLCBXVEZNb3ZlKHJlcGx5KSk7CiAgICAgICAgICAgICByZXR1cm47Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>