<?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>235186</bug_id>
          
          <creation_ts>2022-01-13 09:00:29 -0800</creation_ts>
          <short_desc>Inject Launch Services database before NSApplication is initialized</short_desc>
          <delta_ts>2022-01-27 13:02:05 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <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>
          <dependson>235341</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>w0nka</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1830562</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 09:00:29 -0800</bug_when>
    <thetext>To avoid the main thread getting stuck, the Launch Services database should be injected before NSApplication is initialized, since the initialization now depends on the database.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830563</commentid>
    <comment_count>1</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 09:01:37 -0800</bug_when>
    <thetext>&lt;rdar://87468788&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830566</commentid>
    <comment_count>2</comment_count>
      <attachid>449067</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 09:09:04 -0800</bug_when>
    <thetext>Created attachment 449067
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830568</commentid>
    <comment_count>3</comment_count>
      <attachid>449067</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-01-13 09:14:09 -0800</bug_when>
    <thetext>Comment on attachment 449067
Patch

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

r=me

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:87
&gt; +    auto startTime = WallTime::now();

Should probably be using MonotonicTime::now()

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:89
&gt; +    auto elapsedTime = WallTime::now() - startTime;

ditto.

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:91
&gt; +        RELEASE_LOG(Loading, &quot;Waiting for Launch Services database update took %f seconds&quot;, elapsedTime.value());

Can we use RELEASE_LOG_ERROR so that it stands out in the logs? Any delay during process initialization is very visible to the user and should be avoided.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830577</commentid>
    <comment_count>4</comment_count>
      <attachid>449072</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 09:29:35 -0800</bug_when>
    <thetext>Created attachment 449072
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830578</commentid>
    <comment_count>5</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 09:30:09 -0800</bug_when>
    <thetext>(In reply to Chris Dumez from comment #3)
&gt; Comment on attachment 449067 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449067&amp;action=review
&gt; 
&gt; r=me
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:87
&gt; &gt; +    auto startTime = WallTime::now();
&gt; 
&gt; Should probably be using MonotonicTime::now()
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:89
&gt; &gt; +    auto elapsedTime = WallTime::now() - startTime;
&gt; 
&gt; ditto.
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:91
&gt; &gt; +        RELEASE_LOG(Loading, &quot;Waiting for Launch Services database update took %f seconds&quot;, elapsedTime.value());
&gt; 
&gt; Can we use RELEASE_LOG_ERROR so that it stands out in the logs? Any delay
&gt; during process initialization is very visible to the user and should be
&gt; avoided.

Done!

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830587</commentid>
    <comment_count>6</comment_count>
      <attachid>449072</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-01-13 09:53:59 -0800</bug_when>
    <thetext>Comment on attachment 449072
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:90
&gt; +    if (elapsedTime.value() &gt; 0.5)

if (elapsedTime &gt; 0.5_s)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830588</commentid>
    <comment_count>7</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-01-13 09:54:32 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #6)
&gt; Comment on attachment 449072 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449072&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:90
&gt; &gt; +    if (elapsedTime.value() &gt; 0.5)
&gt; 
&gt; if (elapsedTime &gt; 0.5_s)

Nicer indeed</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830599</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 10:02:38 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #6)
&gt; Comment on attachment 449072 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449072&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:90
&gt; &gt; +    if (elapsedTime.value() &gt; 0.5)
&gt; 
&gt; if (elapsedTime &gt; 0.5_s)

Will fix!

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830609</commentid>
    <comment_count>9</comment_count>
      <attachid>449079</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 10:19:56 -0800</bug_when>
    <thetext>Created attachment 449079
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830715</commentid>
    <comment_count>10</comment_count>
      <attachid>449110</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-13 14:18:54 -0800</bug_when>
    <thetext>Created attachment 449110
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830905</commentid>
    <comment_count>11</comment_count>
      <attachid>449171</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-14 07:24:01 -0800</bug_when>
    <thetext>Created attachment 449171
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830932</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-14 09:11:55 -0800</bug_when>
    <thetext>Committed r288019 (246045@main): &lt;https://commits.webkit.org/246045@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449171.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831279</commentid>
    <comment_count>13</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-01-15 16:42:24 -0800</bug_when>
    <thetext>EWS is hitting assertions added in this patch:
https://ews-build.s3-us-west-2.amazonaws.com/macOS-AppleSilicon-Big-Sur-Debug-WK2-Tests-EWS/r449267-21271/com.apple.WebKit.WebContent.Development-51883-crash-log.txt</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831597</commentid>
    <comment_count>14</comment_count>
      <attachid>449359</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-17 17:21:22 -0800</bug_when>
    <thetext>Created attachment 449359
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831598</commentid>
    <comment_count>15</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-17 17:22:46 -0800</bug_when>
    <thetext>Reopened, due to debug assert on EWS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831668</commentid>
    <comment_count>16</comment_count>
      <attachid>449386</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-18 07:20:34 -0800</bug_when>
    <thetext>Created attachment 449386
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831687</commentid>
    <comment_count>17</comment_count>
      <attachid>449386</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-01-18 08:36:35 -0800</bug_when>
    <thetext>Comment on attachment 449386
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:93
&gt; +        fprintf(stderr, &quot;Waiting for Launch Services database update took %f seconds&quot;, elapsedTime.value());

WTFLogAlways.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831741</commentid>
    <comment_count>18</comment_count>
      <attachid>449386</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2022-01-18 10:51:27 -0800</bug_when>
    <thetext>Comment on attachment 449386
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:36
&gt; +#import &lt;wtf/NumberOfCores.h&gt;

Nit - do we need to import this header?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831748</commentid>
    <comment_count>19</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-18 11:27:25 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #17)
&gt; Comment on attachment 449386 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449386&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:93
&gt; &gt; +        fprintf(stderr, &quot;Waiting for Launch Services database update took %f seconds&quot;, elapsedTime.value());
&gt; 
&gt; WTFLogAlways.

This patch is for debugging purposes, currently. I am speculating that writing to stderr will give us information about which test is sometimes hitting the debug assert.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831886</commentid>
    <comment_count>20</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-18 16:22:39 -0800</bug_when>
    <thetext>(In reply to Wenson Hsieh from comment #18)
&gt; Comment on attachment 449386 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449386&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm:36
&gt; &gt; +#import &lt;wtf/NumberOfCores.h&gt;
&gt; 
&gt; Nit - do we need to import this header?

Good catch! So far this patch is for debugging purposes, but will remove when a new patch is ready for review.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832195</commentid>
    <comment_count>21</comment_count>
      <attachid>449510</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-19 13:14:20 -0800</bug_when>
    <thetext>Created attachment 449510
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832202</commentid>
    <comment_count>22</comment_count>
      <attachid>449510</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-01-19 13:30:51 -0800</bug_when>
    <thetext>Comment on attachment 449510
Patch

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

This patch fails to update GPUProcessProxy.cpp accordingly. We can simplify things there now that sendNetworkProcessXPCEndpointToProcess() no longer needs a data store instance.

&gt; Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:281
&gt; +    static bool sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&amp;);

Now that it is static and doesn&apos;t use any information from the data store, I would suggest moving this to NetworkProcessProxy and make it non-static. Then WebProcessProxy could call `NetworkProcessProxy::ensureDefaultNetworkProcess().sendXPCEndpointToProcess(*this)`</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832476</commentid>
    <comment_count>23</comment_count>
      <attachid>449593</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-20 10:06:11 -0800</bug_when>
    <thetext>Created attachment 449593
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832479</commentid>
    <comment_count>24</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-20 10:11:07 -0800</bug_when>
    <thetext>(In reply to Chris Dumez from comment #22)
&gt; Comment on attachment 449510 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449510&amp;action=review
&gt; 
&gt; This patch fails to update GPUProcessProxy.cpp accordingly. We can simplify
&gt; things there now that sendNetworkProcessXPCEndpointToProcess() no longer
&gt; needs a data store instance.
&gt; 
&gt; &gt; Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:281
&gt; &gt; +    static bool sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&amp;);
&gt; 
&gt; Now that it is static and doesn&apos;t use any information from the data store, I
&gt; would suggest moving this to NetworkProcessProxy and make it non-static.
&gt; Then WebProcessProxy could call
&gt; `NetworkProcessProxy::ensureDefaultNetworkProcess().
&gt; sendXPCEndpointToProcess(*this)`

Fixed in latest patch.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832486</commentid>
    <comment_count>25</comment_count>
      <attachid>449593</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-01-20 10:20:26 -0800</bug_when>
    <thetext>Comment on attachment 449593
Patch

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

r=me

&gt; Source/WebKit/UIProcess/Network/NetworkProcessProxy.h:274
&gt; +    bool sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&amp;);

Personally, I feel we could drop &quot;NetworkProcess&quot; from the name now that it is located on the NetworkProcessProxy class. Your call.

&gt; Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm:61
&gt; +        if (GPUProcessProxy::singletonIfCreated())

if (auto gpuProcess = GPUProcessProxy::singletonIfCreated())

&gt; Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm:62
&gt; +            m_networkProcess-&gt;sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());

*gpuProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832600</commentid>
    <comment_count>26</comment_count>
      <attachid>449615</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-20 15:59:31 -0800</bug_when>
    <thetext>Created attachment 449615
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832601</commentid>
    <comment_count>27</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-20 16:00:33 -0800</bug_when>
    <thetext>(In reply to Chris Dumez from comment #25)
&gt; Comment on attachment 449593 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449593&amp;action=review
&gt; 
&gt; r=me
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Network/NetworkProcessProxy.h:274
&gt; &gt; +    bool sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&amp;);
&gt; 
&gt; Personally, I feel we could drop &quot;NetworkProcess&quot; from the name now that it
&gt; is located on the NetworkProcessProxy class. Your call.
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm:61
&gt; &gt; +        if (GPUProcessProxy::singletonIfCreated())
&gt; 
&gt; if (auto gpuProcess = GPUProcessProxy::singletonIfCreated())
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm:62
&gt; &gt; +            m_networkProcess-&gt;sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());
&gt; 
&gt; *gpuProcess

Fixed!

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832821</commentid>
    <comment_count>28</comment_count>
      <attachid>449674</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-21 11:30:31 -0800</bug_when>
    <thetext>Created attachment 449674
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832929</commentid>
    <comment_count>29</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-21 16:30:19 -0800</bug_when>
    <thetext>Committed r288387 (246284@main): &lt;https://commits.webkit.org/246284@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449674.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834666</commentid>
    <comment_count>30</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-01-27 13:02:05 -0800</bug_when>
    <thetext>*** Bug 235719 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449067</attachid>
            <date>2022-01-13 09:09:04 -0800</date>
            <delta_ts>2022-01-19 13:14:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220113090903.patch</filename>
            <type>text/plain</type>
            <size>5818</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODc5NzkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTEzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExh
dW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGlj
YXRpb24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBu
b3cgZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh
Z2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwbGF0
Zm9ybURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2Nv
YS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
Y29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6
OkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0Rm9yRGF0YWJhc2VVcGRhdGUpOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAy
Mi0wMS0xMyAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi
IEluc3BlY3RvcjogSW1wbGVtZW50IGBmcmFtZVVSTGAgb3B0aW9uIGZvciBgZGV2dG9vbHMuaW5z
cGVjdGVkV2luZG93LmV2YWxgIGNvbW1hbmQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0JKHJldmlzaW9uIDI4
Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VD
b2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNiBAQAogI2ltcG9ydCAiV2ViUGFn
ZS5oIgogCiAjaW1wb3J0ICJJbnNlcnRUZXh0T3B0aW9ucy5oIgotI2ltcG9ydCAiTGF1bmNoU2Vy
dmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxvYWRQYXJhbWV0ZXJzLmgiCiAjaW1w
b3J0ICJQbHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJVc2VyTWVkaWFDYXB0dXJlTWFuYWdlci5oIgpA
QCAtNzcsMjEgKzc2LDYgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUoY29uc3Qg
VwogCiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKGNvbnN0
IExvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewotI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRF
WFQpCi0gICAgc3RhdGljIGJvb2wgaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9
IGZhbHNlOwotICAgIGlmICghaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSkgewot
ICAgICAgICBhdXRvIHN0YXJ0VGltZSA9IFdhbGxUaW1lOjpub3coKTsKLSAgICAgICAgYm9vbCBk
YXRhYmFzZVVwZGF0ZWQgPSBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9u
KCkud2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7Ci0gICAgICAgIGF1dG8gZWxhcHNlZFRpbWUg
PSBXYWxsVGltZTo6bm93KCkgLSBzdGFydFRpbWU7Ci0gICAgICAgIGlmIChlbGFwc2VkVGltZS52
YWx1ZSgpID4gMC41KQotICAgICAgICAgICAgUkVMRUFTRV9MT0coTG9hZGluZywgIldhaXRpbmcg
Zm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxh
cHNlZFRpbWUudmFsdWUoKSk7Ci0gICAgICAgIEFTU0VSVF9VTlVTRUQoZGF0YWJhc2VVcGRhdGVk
LCBkYXRhYmFzZVVwZGF0ZWQpOwotICAgICAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKLSAgICAg
ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3Ig
TGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsKLSAgICAgICAgaGFzV2FpdGVkRm9y
TGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IHRydWU7Ci0gICAgfQotI2VuZGlmCi0KICAgICBtX2Rh
dGFEZXRlY3Rpb25Db250ZXh0ID0gcGFyYW1ldGVycy5kYXRhRGV0ZWN0aW9uQ29udGV4dDsKIAog
ICAgIGNvbnN1bWVOZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbnMocGFyYW1ldGVycy5u
ZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbkhhbmRsZXMpOwpJbmRleDogU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyLmgJKHJldmlzaW9uIDI4Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oCSh3b3JraW5nIGNv
cHkpCkBAIC0zNSwxMiArMzUsMTQgQEAgY2xhc3MgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXIgOiBwdQogcHVibGljOgogICAgIHN0YXRpYyBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdl
ciYgc2luZ2xldG9uKCk7CiAKLSAgICBib29sIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZShTZWNvbmRz
KTsKKyAgICB2b2lkIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpOwogCiBwcml2YXRlOgogICAgIHZv
aWQgaGFuZGxlRXZlbnQoeHBjX29iamVjdF90KSBvdmVycmlkZTsKICAgICB2b2lkIGRpZENvbm5l
Y3QoKSBvdmVycmlkZTsKIAorICAgIGJvb2wgd2FpdEZvckRhdGFiYXNlVXBkYXRlKFNlY29uZHMp
OworCiAgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNSZWNlaXZlZExhdW5jaFNlcnZpY2VzRGF0
YWJhc2UgeyBmYWxzZSB9OwogICAgIEJpbmFyeVNlbWFwaG9yZSBtX3NlbWFwaG9yZTsKIH07Cklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFz
ZU1hbmFnZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h
L0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLm1tCShyZXZpc2lvbiAyODc5NDIpCisrKyBT
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpbXBvcnQgIkxhdW5jaFNl
cnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJh
c2VYUENDb25zdGFudHMuaCIKKyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlhQQ0VuZHBv
aW50LmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1w
b3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CkBAIC04MSw0ICs4MiwxNiBAQCBib29sIExh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0CiAgICAgcmV0dXJuIG1fc2VtYXBob3Jl
LndhaXRGb3IodGltZW91dCk7CiB9CiAKK3ZvaWQgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCit7CisgICAgYXV0byBzdGFydFRpbWUgPSBXYWxs
VGltZTo6bm93KCk7CisgICAgYm9vbCBkYXRhYmFzZVVwZGF0ZWQgPSB3YWl0Rm9yRGF0YWJhc2VV
cGRhdGUoNV9zKTsKKyAgICBhdXRvIGVsYXBzZWRUaW1lID0gV2FsbFRpbWU6Om5vdygpIC0gc3Rh
cnRUaW1lOworICAgIGlmIChlbGFwc2VkVGltZS52YWx1ZSgpID4gMC41KQorICAgICAgICBSRUxF
QVNFX0xPRyhMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVw
ZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKKyAgICBBU1NFUlRf
VU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VVcGRhdGVkKTsKKyAgICBpZiAoIWRhdGFi
YXNlVXBkYXRlZCkKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIlRpbWVkIG91
dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlLiIpOworfQorCiB9
CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNz
Q29jb2EubW0JKHJldmlzaW9uIDI4Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j
b2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAK
IAogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaCIKICNpbXBvcnQgIkdQVVByb2Nl
c3NDb25uZWN0aW9uUGFyYW1ldGVycy5oIgorI2ltcG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFz
ZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlci5oIgogI2lt
cG9ydCAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbXBvcnQgIkxvZ2dpbmcuaCIKQEAgLTMyNiw2
ICszMjcsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAg
IG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RUb1BhdGNoLCAoSU1QKU5TQXBwbGljYXRp
b25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7CiAjZW5kaWYKIAorICAgIC8vIE9uIE1h
YywgdGhpcyBuZWVkcyB0byBiZSBjYWxsZWQgYmVmb3JlIE5TQXBwbGljYXRpb24gaXMgYmVpbmcg
aW5pdGlhbGl6ZWQuCisgICAgLy8gVGhlIE5TQXBwbGljYXRpb24gaW5pdGlhbGl6YXRpb24gaXMg
YmVpbmcgZG9uZSBpbiBbTlNBcHBsaWNhdGlvbiBfYWNjZXNzaWJpbGl0eUluaXRpYWxpemVdCisg
ICAgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OnNpbmdsZXRvbigpLndhaXRGb3JEYXRh
YmFzZVVwZGF0ZSgpOworCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19O
U1JVTkxPT1ApCiAgICAgUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IGxhdW5jaFNlcnZpY2VzRXh0
ZW5zaW9uOwogICAgIGlmIChwYXJhbWV0ZXJzLmxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uSGFuZGxl
KSB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449072</attachid>
            <date>2022-01-13 09:29:35 -0800</date>
            <delta_ts>2022-01-19 13:14:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220113092935.patch</filename>
            <type>text/plain</type>
            <size>5832</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODc5NzkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTEzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKwor
ICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExhdW5j
aCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGljYXRp
b24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBub3cg
ZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv
Q29jb2EvV2ViUGFnZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9y
bURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9M
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29j
b2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6Okxh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0Rm9yRGF0YWJhc2VVcGRhdGUpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2Vi
S2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAyMi0w
MS0xMyAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu
c3BlY3RvcjogSW1wbGVtZW50IGBmcmFtZVVSTGAgb3B0aW9uIGZvciBgZGV2dG9vbHMuaW5zcGVj
dGVkV2luZG93LmV2YWxgIGNvbW1hbmQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0JKHJldmlzaW9uIDI4Nzk0
MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2Nv
YS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNiBAQAogI2ltcG9ydCAiV2ViUGFnZS5o
IgogCiAjaW1wb3J0ICJJbnNlcnRUZXh0T3B0aW9ucy5oIgotI2ltcG9ydCAiTGF1bmNoU2Vydmlj
ZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxvYWRQYXJhbWV0ZXJzLmgiCiAjaW1wb3J0
ICJQbHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJVc2VyTWVkaWFDYXB0dXJlTWFuYWdlci5oIgpAQCAt
NzcsMjEgKzc2LDYgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUoY29uc3QgVwog
CiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKGNvbnN0IExv
YWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewotI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQp
Ci0gICAgc3RhdGljIGJvb2wgaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IGZh
bHNlOwotICAgIGlmICghaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSkgewotICAg
ICAgICBhdXRvIHN0YXJ0VGltZSA9IFdhbGxUaW1lOjpub3coKTsKLSAgICAgICAgYm9vbCBkYXRh
YmFzZVVwZGF0ZWQgPSBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCku
d2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7Ci0gICAgICAgIGF1dG8gZWxhcHNlZFRpbWUgPSBX
YWxsVGltZTo6bm93KCkgLSBzdGFydFRpbWU7Ci0gICAgICAgIGlmIChlbGFwc2VkVGltZS52YWx1
ZSgpID4gMC41KQotICAgICAgICAgICAgUkVMRUFTRV9MT0coTG9hZGluZywgIldhaXRpbmcgZm9y
IExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxhcHNl
ZFRpbWUudmFsdWUoKSk7Ci0gICAgICAgIEFTU0VSVF9VTlVTRUQoZGF0YWJhc2VVcGRhdGVkLCBk
YXRhYmFzZVVwZGF0ZWQpOwotICAgICAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKLSAgICAgICAg
ICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1
bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsKLSAgICAgICAgaGFzV2FpdGVkRm9yTGF1
bmNoU2VydmljZXNEYXRhYmFzZSA9IHRydWU7Ci0gICAgfQotI2VuZGlmCi0KICAgICBtX2RhdGFE
ZXRlY3Rpb25Db250ZXh0ID0gcGFyYW1ldGVycy5kYXRhRGV0ZWN0aW9uQ29udGV4dDsKIAogICAg
IGNvbnN1bWVOZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbnMocGFyYW1ldGVycy5uZXR3
b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbkhhbmRsZXMpOwpJbmRleDogU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0
YWJhc2VNYW5hZ2VyLmgJKHJldmlzaW9uIDI4Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oCSh3b3JraW5nIGNvcHkp
CkBAIC0zNSwxMiArMzUsMTQgQEAgY2xhc3MgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIg
OiBwdQogcHVibGljOgogICAgIHN0YXRpYyBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlciYg
c2luZ2xldG9uKCk7CiAKLSAgICBib29sIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZShTZWNvbmRzKTsK
KyAgICB2b2lkIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpOwogCiBwcml2YXRlOgogICAgIHZvaWQg
aGFuZGxlRXZlbnQoeHBjX29iamVjdF90KSBvdmVycmlkZTsKICAgICB2b2lkIGRpZENvbm5lY3Qo
KSBvdmVycmlkZTsKIAorICAgIGJvb2wgd2FpdEZvckRhdGFiYXNlVXBkYXRlKFNlY29uZHMpOwor
CiAgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNSZWNlaXZlZExhdW5jaFNlcnZpY2VzRGF0YWJh
c2UgeyBmYWxzZSB9OwogICAgIEJpbmFyeVNlbWFwaG9yZSBtX3NlbWFwaG9yZTsKIH07CkluZGV4
OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1h
bmFnZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLm1tCShyZXZpc2lvbiAyODc5NDIpCisrKyBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIu
bW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpbXBvcnQgIkxhdW5jaFNlcnZp
Y2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VY
UENDb25zdGFudHMuaCIKKyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlhQQ0VuZHBvaW50
LmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0
IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CkBAIC04MSw0ICs4MiwxNiBAQCBib29sIExhdW5j
aFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0CiAgICAgcmV0dXJuIG1fc2VtYXBob3JlLndh
aXRGb3IodGltZW91dCk7CiB9CiAKK3ZvaWQgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6
OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCit7CisgICAgYXV0byBzdGFydFRpbWUgPSBNb25vdG9u
aWNUaW1lOjpub3coKTsKKyAgICBib29sIGRhdGFiYXNlVXBkYXRlZCA9IHdhaXRGb3JEYXRhYmFz
ZVVwZGF0ZSg1X3MpOworICAgIGF1dG8gZWxhcHNlZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3co
KSAtIHN0YXJ0VGltZTsKKyAgICBpZiAoZWxhcHNlZFRpbWUudmFsdWUoKSA+IDAuNSkKKyAgICAg
ICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIldhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNl
cyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxhcHNlZFRpbWUudmFsdWUoKSk7
CisgICAgQVNTRVJUX1VOVVNFRChkYXRhYmFzZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7Cisg
ICAgaWYgKCFkYXRhYmFzZVVwZGF0ZWQpCisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRp
bmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0
ZS4iKTsKK30KKwogfQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlBy
b2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j
b2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODc5NDIpCisrKyBTb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y
OCw2ICsyOCw3IEBACiAKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgiCiAjaW1w
b3J0ICJHUFVQcm9jZXNzQ29ubmVjdGlvblBhcmFtZXRlcnMuaCIKKyNpbXBvcnQgIkxhdW5jaFNl
cnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAjaW1wb3J0ICJMZWdhY3lDdXN0b21Qcm90b2NvbE1h
bmFnZXIuaCIKICNpbXBvcnQgIkxvZ0luaXRpYWxpemF0aW9uLmgiCiAjaW1wb3J0ICJMb2dnaW5n
LmgiCkBAIC0zMjYsNiArMzI3LDEwIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs
aXplV2ViUHIKICAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24obWV0aG9kVG9QYXRjaCwgKElN
UClOU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnQpOwogI2VuZGlmCiAK
KyAgICAvLyBPbiBNYWMsIHRoaXMgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBOU0FwcGxpY2F0
aW9uIGlzIGJlaW5nIGluaXRpYWxpemVkLgorICAgIC8vIFRoZSBOU0FwcGxpY2F0aW9uIGluaXRp
YWxpemF0aW9uIGlzIGJlaW5nIGRvbmUgaW4gW05TQXBwbGljYXRpb24gX2FjY2Vzc2liaWxpdHlJ
bml0aWFsaXplXS4KKyAgICBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9u
KCkud2FpdEZvckRhdGFiYXNlVXBkYXRlKCk7CisKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJM
RShXRUJQUk9DRVNTX05TUlVOTE9PUCkKICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbGF1
bmNoU2VydmljZXNFeHRlbnNpb247CiAgICAgaWYgKHBhcmFtZXRlcnMubGF1bmNoU2VydmljZXNF
eHRlbnNpb25IYW5kbGUpIHsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449079</attachid>
            <date>2022-01-13 10:19:56 -0800</date>
            <delta_ts>2022-01-19 13:14:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220113101956.patch</filename>
            <type>text/plain</type>
            <size>5843</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODc5NzkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTEzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1leiBhbmQg
U2ltb24gRnJhc2VyLgorCisgICAgICAgIFRvIGF2b2lkIHRoZSBtYWluIHRocmVhZCBnZXR0aW5n
IHN0dWNrLCB0aGUgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHNob3VsZCBiZSBpbmplY3RlZCBi
ZWZvcmUgTlNBcHBsaWNhdGlvbgorICAgICAgICBpcyBpbml0aWFsaXplZCwgc2luY2UgdGhlIGlu
aXRpYWxpemF0aW9uIG5vdyBkZXBlbmRzIG9uIHRoZSBkYXRhYmFzZS4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6
OldlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKToKKyAgICAgICAgKiBX
ZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmg6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbToKKyAg
ICAgICAgKFdlYktpdDo6TGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRh
YmFzZVVwZGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu
bW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlBy
b2Nlc3MpOgorCiAyMDIyLTAxLTEzICBQYXRyaWNrIEFuZ2xlICA8cGFuZ2xlQGFwcGxlLmNvbT4K
IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBsZW1lbnQgYGZyYW1lVVJMYCBvcHRpb24gZm9y
IGBkZXZ0b29scy5pbnNwZWN0ZWRXaW5kb3cuZXZhbGAgY29tbWFuZApJbmRleDogU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5t
bQkocmV2aXNpb24gMjg3OTQyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
Q29jb2EvV2ViUGFnZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2IEBACiAj
aW1wb3J0ICJXZWJQYWdlLmgiCiAKICNpbXBvcnQgIkluc2VydFRleHRPcHRpb25zLmgiCi0jaW1w
b3J0ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogI2ltcG9ydCAiTG9hZFBhcmFt
ZXRlcnMuaCIKICNpbXBvcnQgIlBsdWdpblZpZXcuaCIKICNpbXBvcnQgIlVzZXJNZWRpYUNhcHR1
cmVNYW5hZ2VyLmgiCkBAIC03NywyMSArNzYsNiBAQCB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtSW5p
dGlhbGl6ZShjb25zdCBXCiAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1EaWRSZWNlaXZlTG9hZFBh
cmFtZXRlcnMoY29uc3QgTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0jaWYgSEFWRShM
U0RBVEFCQVNFQ09OVEVYVCkKLSAgICBzdGF0aWMgYm9vbCBoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlID0gZmFsc2U7Ci0gICAgaWYgKCFoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlKSB7Ci0gICAgICAgIGF1dG8gc3RhcnRUaW1lID0gV2FsbFRpbWU6Om5vdygpOwot
ICAgICAgICBib29sIGRhdGFiYXNlVXBkYXRlZCA9IExhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5h
Z2VyOjpzaW5nbGV0b24oKS53YWl0Rm9yRGF0YWJhc2VVcGRhdGUoNV9zKTsKLSAgICAgICAgYXV0
byBlbGFwc2VkVGltZSA9IFdhbGxUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKLSAgICAgICAgaWYg
KGVsYXBzZWRUaW1lLnZhbHVlKCkgPiAwLjUpCi0gICAgICAgICAgICBSRUxFQVNFX0xPRyhMb2Fk
aW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0b29rICVm
IHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChk
YXRhYmFzZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7Ci0gICAgICAgIGlmICghZGF0YWJhc2VV
cGRhdGVkKQotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIlRpbWVkIG91
dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlLiIpOwotICAgICAg
ICBoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlID0gdHJ1ZTsKLSAgICB9Ci0jZW5k
aWYKLQogICAgIG1fZGF0YURldGVjdGlvbkNvbnRleHQgPSBwYXJhbWV0ZXJzLmRhdGFEZXRlY3Rp
b25Db250ZXh0OwogCiAgICAgY29uc3VtZU5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0ZW5zaW9u
cyhwYXJhbWV0ZXJzLm5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyk7Cklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFz
ZU1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
TGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaAkocmV2aXNpb24gMjg3OTQyKQorKysgU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2Vy
LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDEyICszNSwxNCBAQCBjbGFzcyBMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlciA6IHB1CiBwdWJsaWM6CiAgICAgc3RhdGljIExhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyJiBzaW5nbGV0b24oKTsKIAotICAgIGJvb2wgd2FpdEZvckRhdGFiYXNl
VXBkYXRlKFNlY29uZHMpOworICAgIHZvaWQgd2FpdEZvckRhdGFiYXNlVXBkYXRlKCk7CiAKIHBy
aXZhdGU6CiAgICAgdm9pZCBoYW5kbGVFdmVudCh4cGNfb2JqZWN0X3QpIG92ZXJyaWRlOwogICAg
IHZvaWQgZGlkQ29ubmVjdCgpIG92ZXJyaWRlOwogCisgICAgYm9vbCB3YWl0Rm9yRGF0YWJhc2VV
cGRhdGUoU2Vjb25kcyk7CisKICAgICBzdGQ6OmF0b21pYzxib29sPiBtX2hhc1JlY2VpdmVkTGF1
bmNoU2VydmljZXNEYXRhYmFzZSB7IGZhbHNlIH07CiAgICAgQmluYXJ5U2VtYXBob3JlIG1fc2Vt
YXBob3JlOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHJldmlzaW9u
IDI4Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBAQAogI2lt
cG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKIAogI2ltcG9ydCAiTGF1bmNo
U2VydmljZXNEYXRhYmFzZVhQQ0NvbnN0YW50cy5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2lt
cG9ydCAiWFBDRW5kcG9pbnQuaCIKICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTGF1bmNoU2Vydmlj
ZXNTUEkuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KQEAgLTgxLDQgKzgy
LDE2IEBAIGJvb2wgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXQKICAgICByZXR1
cm4gbV9zZW1hcGhvcmUud2FpdEZvcih0aW1lb3V0KTsKIH0KIAordm9pZCBMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlcjo6d2FpdEZvckRhdGFiYXNlVXBkYXRlKCkKK3sKKyAgICBhdXRvIHN0
YXJ0VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGJvb2wgZGF0YWJhc2VVcGRhdGVk
ID0gd2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7CisgICAgYXV0byBlbGFwc2VkVGltZSA9IE1v
bm90b25pY1RpbWU6Om5vdygpIC0gc3RhcnRUaW1lOworICAgIGlmIChlbGFwc2VkVGltZSA+IDAu
NV9zKQorICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1
bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGlt
ZS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfVU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VV
cGRhdGVkKTsKKyAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKKyAgICAgICAgUkVMRUFTRV9MT0df
RVJST1IoTG9hZGluZywgIlRpbWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0
YWJhc2UgdXBkYXRlLiIpOworfQorCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI4Nzk0MikKKysrIFNv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcg
Y29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1cHBvcnRT
UEkuaCIKICNpbXBvcnQgIkdQVVByb2Nlc3NDb25uZWN0aW9uUGFyYW1ldGVycy5oIgorI2ltcG9y
dCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxlZ2FjeUN1c3Rv
bVByb3RvY29sTWFuYWdlci5oIgogI2ltcG9ydCAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbXBv
cnQgIkxvZ2dpbmcuaCIKQEAgLTMyNiw2ICszMjcsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RU
b1BhdGNoLCAoSU1QKU5TQXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7
CiAjZW5kaWYKIAorICAgIC8vIE9uIE1hYywgdGhpcyBuZWVkcyB0byBiZSBjYWxsZWQgYmVmb3Jl
IE5TQXBwbGljYXRpb24gaXMgYmVpbmcgaW5pdGlhbGl6ZWQuCisgICAgLy8gVGhlIE5TQXBwbGlj
YXRpb24gaW5pdGlhbGl6YXRpb24gaXMgYmVpbmcgZG9uZSBpbiBbTlNBcHBsaWNhdGlvbiBfYWNj
ZXNzaWJpbGl0eUluaXRpYWxpemVdLgorICAgIExhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2Vy
OjpzaW5nbGV0b24oKS53YWl0Rm9yRGF0YWJhc2VVcGRhdGUoKTsKKwogI2lmIFBMQVRGT1JNKE1B
QykgJiYgRU5BQkxFKFdFQlBST0NFU1NfTlNSVU5MT09QKQogICAgIFJlZlB0cjxTYW5kYm94RXh0
ZW5zaW9uPiBsYXVuY2hTZXJ2aWNlc0V4dGVuc2lvbjsKICAgICBpZiAocGFyYW1ldGVycy5sYXVu
Y2hTZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZSkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449110</attachid>
            <date>2022-01-13 14:18:54 -0800</date>
            <delta_ts>2022-01-19 13:14:14 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220113141853.patch</filename>
            <type>text/plain</type>
            <size>5879</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODc5OTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAxLTEzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1leiBhbmQgU2ltb24gRnJhc2VyLgorCisg
ICAgICAgIFRvIGF2b2lkIHRoZSBtYWluIHRocmVhZCBnZXR0aW5nIHN0dWNrLCB0aGUgTGF1bmNo
IFNlcnZpY2VzIGRhdGFiYXNlIHNob3VsZCBiZSBpbmplY3RlZCBiZWZvcmUgTlNBcHBsaWNhdGlv
bgorICAgICAgICBpcyBpbml0aWFsaXplZCwgc2luY2UgdGhlIGluaXRpYWxpemF0aW9uIG5vdyBk
ZXBlbmRzIG9uIHRoZSBkYXRhYmFzZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9D
b2NvYS9XZWJQYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBsYXRmb3Jt
RGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL0xh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2Nv
YS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbToKKyAgICAgICAgKFdlYktpdDo6TGF1
bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSk6CisgICAg
ICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJL
aXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorCiAyMDIyLTAx
LTEzICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T
XVtOZXR3b3JraW5nXSBBZGQgYWNjZXNzIHRvIHJlcXVpcmVkIG5ldHdvcmsgc2VydmljZQpJbmRl
eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1t
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dl
YlBhZ2VDb2NvYS5tbQkocmV2aXNpb24gMjg3NjM2KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3
ICsyNyw2IEBACiAjaW1wb3J0ICJXZWJQYWdlLmgiCiAKICNpbXBvcnQgIkluc2VydFRleHRPcHRp
b25zLmgiCi0jaW1wb3J0ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogI2ltcG9y
dCAiTG9hZFBhcmFtZXRlcnMuaCIKICNpbXBvcnQgIlBsdWdpblZpZXcuaCIKICNpbXBvcnQgIldL
QWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RCYXNlLmgiCkBAIC02NiwyMSArNjUsNiBAQCBuYW1l
c3BhY2UgV2ViS2l0IHsKIAogdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybURpZFJlY2VpdmVMb2FkUGFy
YW1ldGVycyhjb25zdCBMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSNpZiBIQVZFKExT
REFUQUJBU0VDT05URVhUKQotICAgIHN0YXRpYyBib29sIGhhc1dhaXRlZEZvckxhdW5jaFNlcnZp
Y2VzRGF0YWJhc2UgPSBmYWxzZTsKLSAgICBpZiAoIWhhc1dhaXRlZEZvckxhdW5jaFNlcnZpY2Vz
RGF0YWJhc2UpIHsKLSAgICAgICAgYXV0byBzdGFydFRpbWUgPSBXYWxsVGltZTo6bm93KCk7Ci0g
ICAgICAgIGJvb2wgZGF0YWJhc2VVcGRhdGVkID0gTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXI6OnNpbmdsZXRvbigpLndhaXRGb3JEYXRhYmFzZVVwZGF0ZSg1X3MpOwotICAgICAgICBhdXRv
IGVsYXBzZWRUaW1lID0gV2FsbFRpbWU6Om5vdygpIC0gc3RhcnRUaW1lOwotICAgICAgICBpZiAo
ZWxhcHNlZFRpbWUudmFsdWUoKSA+IDAuNSkKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKExvYWRp
bmcsICJXYWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlIHRvb2sgJWYg
c2Vjb25kcyIsIGVsYXBzZWRUaW1lLnZhbHVlKCkpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKGRh
dGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VVcGRhdGVkKTsKLSAgICAgICAgaWYgKCFkYXRhYmFzZVVw
ZGF0ZWQpCi0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiVGltZWQgb3V0
IHdhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUuIik7Ci0gICAgICAg
IGhhc1dhaXRlZEZvckxhdW5jaFNlcnZpY2VzRGF0YWJhc2UgPSB0cnVlOwotICAgIH0KLSNlbmRp
ZgotCiAgICAgbV9kYXRhRGV0ZWN0aW9uQ29udGV4dCA9IHBhcmFtZXRlcnMuZGF0YURldGVjdGlv
bkNvbnRleHQ7CiAKICAgICBjb25zdW1lTmV0d29ya0V4dGVuc2lvblNhbmRib3hFeHRlbnNpb25z
KHBhcmFtZXRlcnMubmV0d29ya0V4dGVuc2lvblNhbmRib3hFeHRlbnNpb25IYW5kbGVzKTsKSW5k
ZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNl
TWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9M
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oCShyZXZpc2lvbiAyODc2MzYpCisrKyBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIu
aAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTIgKzM1LDE0IEBAIGNsYXNzIExhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyIDogcHUKIHB1YmxpYzoKICAgICBzdGF0aWMgTGF1bmNoU2VydmljZXNE
YXRhYmFzZU1hbmFnZXImIHNpbmdsZXRvbigpOwogCi0gICAgYm9vbCB3YWl0Rm9yRGF0YWJhc2VV
cGRhdGUoU2Vjb25kcyk7CisgICAgdm9pZCB3YWl0Rm9yRGF0YWJhc2VVcGRhdGUoKTsKIAogcHJp
dmF0ZToKICAgICB2b2lkIGhhbmRsZUV2ZW50KHhwY19vYmplY3RfdCkgb3ZlcnJpZGU7CiAgICAg
dm9pZCBkaWRDb25uZWN0KCkgb3ZlcnJpZGU7CiAKKyAgICBib29sIHdhaXRGb3JEYXRhYmFzZVVw
ZGF0ZShTZWNvbmRzKTsKKwogICAgIHN0ZDo6YXRvbWljPGJvb2w+IG1faGFzUmVjZWl2ZWRMYXVu
Y2hTZXJ2aWNlc0RhdGFiYXNlIHsgZmFsc2UgfTsKICAgICBCaW5hcnlTZW1hcGhvcmUgbV9zZW1h
cGhvcmU7CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNl
cnZpY2VzRGF0YWJhc2VNYW5hZ2VyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbQkocmV2aXNpb24g
Mjg3NjM2KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw3IEBACiAjaW1w
b3J0ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogCiAjaW1wb3J0ICJMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlWFBDQ29uc3RhbnRzLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1w
b3J0ICJYUENFbmRwb2ludC5oIgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNl
c1NQSS5oPgogI2ltcG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgpAQCAtODEsNCArODIs
MTYgQEAgYm9vbCBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6d2FpdAogICAgIHJldHVy
biBtX3NlbWFwaG9yZS53YWl0Rm9yKHRpbWVvdXQpOwogfQogCit2b2lkIExhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyOjp3YWl0Rm9yRGF0YWJhc2VVcGRhdGUoKQoreworICAgIGF1dG8gc3Rh
cnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisgICAgYm9vbCBkYXRhYmFzZVVwZGF0ZWQg
PSB3YWl0Rm9yRGF0YWJhc2VVcGRhdGUoNV9zKTsKKyAgICBhdXRvIGVsYXBzZWRUaW1lID0gTW9u
b3RvbmljVGltZTo6bm93KCkgLSBzdGFydFRpbWU7CisgICAgaWYgKGVsYXBzZWRUaW1lID4gMC41
X3MpCisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJXYWl0aW5nIGZvciBMYXVu
Y2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlIHRvb2sgJWYgc2Vjb25kcyIsIGVsYXBzZWRUaW1l
LnZhbHVlKCkpOworICAgIEFTU0VSVF9VTlVTRUQoZGF0YWJhc2VVcGRhdGVkLCBkYXRhYmFzZVVw
ZGF0ZWQpOworICAgIGlmICghZGF0YWJhc2VVcGRhdGVkKQorICAgICAgICBSRUxFQVNFX0xPR19F
UlJPUihMb2FkaW5nLCAiVGltZWQgb3V0IHdhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSB1cGRhdGUuIik7Cit9CisKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j
b2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24gMjg3NjM2KQorKysgU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBj
b3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW1wb3J0ICJBY2Nlc3NpYmlsaXR5U3VwcG9ydFNQ
SS5oIgogI2ltcG9ydCAiR1BVUHJvY2Vzc0Nvbm5lY3Rpb25QYXJhbWV0ZXJzLmgiCisjaW1wb3J0
ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogI2ltcG9ydCAiTGVnYWN5Q3VzdG9t
UHJvdG9jb2xNYW5hZ2VyLmgiCiAjaW1wb3J0ICJMb2dJbml0aWFsaXphdGlvbi5oIgogI2ltcG9y
dCAiTG9nZ2luZy5oIgpAQCAtMzI2LDYgKzMyNywxMiBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRm
b3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKG1ldGhvZFRv
UGF0Y2gsIChJTVApTlNBcHBsaWNhdGlvbkFjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50KTsK
ICNlbmRpZgogCisjaWYgSEFWRShMU0RBVEFCQVNFQ09OVEVYVCkKKyAgICAvLyBPbiBNYWMsIHRo
aXMgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGJlaW5nIGluaXRp
YWxpemVkLgorICAgIC8vIFRoZSBOU0FwcGxpY2F0aW9uIGluaXRpYWxpemF0aW9uIGlzIGJlaW5n
IGRvbmUgaW4gW05TQXBwbGljYXRpb24gX2FjY2Vzc2liaWxpdHlJbml0aWFsaXplXS4KKyAgICBM
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCkud2FpdEZvckRhdGFiYXNl
VXBkYXRlKCk7CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NF
U1NfTlNSVU5MT09QKQogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBsYXVuY2hTZXJ2aWNl
c0V4dGVuc2lvbjsKICAgICBpZiAocGFyYW1ldGVycy5sYXVuY2hTZXJ2aWNlc0V4dGVuc2lvbkhh
bmRsZSkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449171</attachid>
            <date>2022-01-14 07:24:01 -0800</date>
            <delta_ts>2022-01-19 13:14:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220114072400.patch</filename>
            <type>text/plain</type>
            <size>5879</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODc5NzkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTEzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1leiBhbmQg
U2ltb24gRnJhc2VyLgorCisgICAgICAgIFRvIGF2b2lkIHRoZSBtYWluIHRocmVhZCBnZXR0aW5n
IHN0dWNrLCB0aGUgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHNob3VsZCBiZSBpbmplY3RlZCBi
ZWZvcmUgTlNBcHBsaWNhdGlvbgorICAgICAgICBpcyBpbml0aWFsaXplZCwgc2luY2UgdGhlIGlu
aXRpYWxpemF0aW9uIG5vdyBkZXBlbmRzIG9uIHRoZSBkYXRhYmFzZS4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6
OldlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKToKKyAgICAgICAgKiBX
ZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmg6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbToKKyAg
ICAgICAgKFdlYktpdDo6TGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRh
YmFzZVVwZGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu
bW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlBy
b2Nlc3MpOgorCiAyMDIyLTAxLTEzICBQYXRyaWNrIEFuZ2xlICA8cGFuZ2xlQGFwcGxlLmNvbT4K
IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBsZW1lbnQgYGZyYW1lVVJMYCBvcHRpb24gZm9y
IGBkZXZ0b29scy5pbnNwZWN0ZWRXaW5kb3cuZXZhbGAgY29tbWFuZApJbmRleDogU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5t
bQkocmV2aXNpb24gMjg3OTQyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
Q29jb2EvV2ViUGFnZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2IEBACiAj
aW1wb3J0ICJXZWJQYWdlLmgiCiAKICNpbXBvcnQgIkluc2VydFRleHRPcHRpb25zLmgiCi0jaW1w
b3J0ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogI2ltcG9ydCAiTG9hZFBhcmFt
ZXRlcnMuaCIKICNpbXBvcnQgIlBsdWdpblZpZXcuaCIKICNpbXBvcnQgIlVzZXJNZWRpYUNhcHR1
cmVNYW5hZ2VyLmgiCkBAIC03NywyMSArNzYsNiBAQCB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtSW5p
dGlhbGl6ZShjb25zdCBXCiAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1EaWRSZWNlaXZlTG9hZFBh
cmFtZXRlcnMoY29uc3QgTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0jaWYgSEFWRShM
U0RBVEFCQVNFQ09OVEVYVCkKLSAgICBzdGF0aWMgYm9vbCBoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlID0gZmFsc2U7Ci0gICAgaWYgKCFoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlKSB7Ci0gICAgICAgIGF1dG8gc3RhcnRUaW1lID0gV2FsbFRpbWU6Om5vdygpOwot
ICAgICAgICBib29sIGRhdGFiYXNlVXBkYXRlZCA9IExhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5h
Z2VyOjpzaW5nbGV0b24oKS53YWl0Rm9yRGF0YWJhc2VVcGRhdGUoNV9zKTsKLSAgICAgICAgYXV0
byBlbGFwc2VkVGltZSA9IFdhbGxUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKLSAgICAgICAgaWYg
KGVsYXBzZWRUaW1lLnZhbHVlKCkgPiAwLjUpCi0gICAgICAgICAgICBSRUxFQVNFX0xPRyhMb2Fk
aW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0b29rICVm
IHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChk
YXRhYmFzZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7Ci0gICAgICAgIGlmICghZGF0YWJhc2VV
cGRhdGVkKQotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIlRpbWVkIG91
dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlLiIpOwotICAgICAg
ICBoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlID0gdHJ1ZTsKLSAgICB9Ci0jZW5k
aWYKLQogICAgIG1fZGF0YURldGVjdGlvbkNvbnRleHQgPSBwYXJhbWV0ZXJzLmRhdGFEZXRlY3Rp
b25Db250ZXh0OwogCiAgICAgY29uc3VtZU5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0ZW5zaW9u
cyhwYXJhbWV0ZXJzLm5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyk7Cklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFz
ZU1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
TGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaAkocmV2aXNpb24gMjg3OTQyKQorKysgU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2Vy
LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDEyICszNSwxNCBAQCBjbGFzcyBMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlciA6IHB1CiBwdWJsaWM6CiAgICAgc3RhdGljIExhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyJiBzaW5nbGV0b24oKTsKIAotICAgIGJvb2wgd2FpdEZvckRhdGFiYXNl
VXBkYXRlKFNlY29uZHMpOworICAgIHZvaWQgd2FpdEZvckRhdGFiYXNlVXBkYXRlKCk7CiAKIHBy
aXZhdGU6CiAgICAgdm9pZCBoYW5kbGVFdmVudCh4cGNfb2JqZWN0X3QpIG92ZXJyaWRlOwogICAg
IHZvaWQgZGlkQ29ubmVjdCgpIG92ZXJyaWRlOwogCisgICAgYm9vbCB3YWl0Rm9yRGF0YWJhc2VV
cGRhdGUoU2Vjb25kcyk7CisKICAgICBzdGQ6OmF0b21pYzxib29sPiBtX2hhc1JlY2VpdmVkTGF1
bmNoU2VydmljZXNEYXRhYmFzZSB7IGZhbHNlIH07CiAgICAgQmluYXJ5U2VtYXBob3JlIG1fc2Vt
YXBob3JlOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHJldmlzaW9u
IDI4Nzk0MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBAQAogI2lt
cG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKIAogI2ltcG9ydCAiTGF1bmNo
U2VydmljZXNEYXRhYmFzZVhQQ0NvbnN0YW50cy5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2lt
cG9ydCAiWFBDRW5kcG9pbnQuaCIKICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTGF1bmNoU2Vydmlj
ZXNTUEkuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KQEAgLTgxLDQgKzgy
LDE2IEBAIGJvb2wgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXQKICAgICByZXR1
cm4gbV9zZW1hcGhvcmUud2FpdEZvcih0aW1lb3V0KTsKIH0KIAordm9pZCBMYXVuY2hTZXJ2aWNl
c0RhdGFiYXNlTWFuYWdlcjo6d2FpdEZvckRhdGFiYXNlVXBkYXRlKCkKK3sKKyAgICBhdXRvIHN0
YXJ0VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGJvb2wgZGF0YWJhc2VVcGRhdGVk
ID0gd2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7CisgICAgYXV0byBlbGFwc2VkVGltZSA9IE1v
bm90b25pY1RpbWU6Om5vdygpIC0gc3RhcnRUaW1lOworICAgIGlmIChlbGFwc2VkVGltZSA+IDAu
NV9zKQorICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1
bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGlt
ZS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfVU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VV
cGRhdGVkKTsKKyAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKKyAgICAgICAgUkVMRUFTRV9MT0df
RVJST1IoTG9hZGluZywgIlRpbWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0
YWJhc2UgdXBkYXRlLiIpOworfQorCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI4Nzk0MikKKysrIFNv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcg
Y29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1cHBvcnRT
UEkuaCIKICNpbXBvcnQgIkdQVVByb2Nlc3NDb25uZWN0aW9uUGFyYW1ldGVycy5oIgorI2ltcG9y
dCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxlZ2FjeUN1c3Rv
bVByb3RvY29sTWFuYWdlci5oIgogI2ltcG9ydCAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbXBv
cnQgIkxvZ2dpbmcuaCIKQEAgLTMyNiw2ICszMjcsMTIgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RU
b1BhdGNoLCAoSU1QKU5TQXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7
CiAjZW5kaWYKIAorI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCisgICAgLy8gT24gTWFjLCB0
aGlzIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgTlNBcHBsaWNhdGlvbiBpcyBiZWluZyBpbml0
aWFsaXplZC4KKyAgICAvLyBUaGUgTlNBcHBsaWNhdGlvbiBpbml0aWFsaXphdGlvbiBpcyBiZWlu
ZyBkb25lIGluIFtOU0FwcGxpY2F0aW9uIF9hY2Nlc3NpYmlsaXR5SW5pdGlhbGl6ZV0KKyAgICBM
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCkud2FpdEZvckRhdGFiYXNl
VXBkYXRlKCk7CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NF
U1NfTlNSVU5MT09QKQogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBsYXVuY2hTZXJ2aWNl
c0V4dGVuc2lvbjsKICAgICBpZiAocGFyYW1ldGVycy5sYXVuY2hTZXJ2aWNlc0V4dGVuc2lvbkhh
bmRsZSkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449359</attachid>
            <date>2022-01-17 17:21:22 -0800</date>
            <delta_ts>2022-01-18 07:20:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>235186.patch</filename>
            <type>text/plain</type>
            <size>1259</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFi
YXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j
b2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHJldmlzaW9uIDI4ODA5NykKKysr
IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFu
YWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogI2ltcG9ydCA8d3RmL2Nv
Y29hL0VudGl0bGVtZW50cy5oPgogI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vWFBDU1BJLmg+CiAj
aW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKyNpbXBvcnQgPHd0Zi9OdW1iZXJPZkNvcmVz
Lmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC04NSwxMCArODYsMTIgQEAKIHZvaWQgTGF1
bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCiB7CiAg
ICAgYXV0byBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKLSAgICBib29sIGRhdGFi
YXNlVXBkYXRlZCA9IHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSg1X3MpOworICAgIGJvb2wgZGF0YWJh
c2VVcGRhdGVkID0gd2FpdEZvckRhdGFiYXNlVXBkYXRlKDMwX3MpOwogICAgIGF1dG8gZWxhcHNl
ZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKLSAgICBpZiAoZWxhcHNl
ZFRpbWUgPiAwLjVfcykKKyAgICBpZiAoZWxhcHNlZFRpbWUgPiAwLjVfcykgewogICAgICAgICBS
RUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRh
dGFiYXNlIHVwZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKKyAg
ICAgICAgZnByaW50ZihzdGRlcnIsICJXYWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJh
c2UgdXBkYXRlIHRvb2sgJWYgc2Vjb25kcyIsIGVsYXBzZWRUaW1lLnZhbHVlKCkpOworICAgIH0K
ICAgICBBU1NFUlRfVU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VVcGRhdGVkKTsKICAg
ICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGlu
ZywgIlRpbWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRl
LiIpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449386</attachid>
            <date>2022-01-18 07:20:34 -0800</date>
            <delta_ts>2022-01-19 13:14:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>235186.patch</filename>
            <type>text/plain</type>
            <size>1259</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFi
YXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j
b2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHJldmlzaW9uIDI4ODA5NykKKysr
IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFu
YWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogI2ltcG9ydCA8d3RmL2Nv
Y29hL0VudGl0bGVtZW50cy5oPgogI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vWFBDU1BJLmg+CiAj
aW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKyNpbXBvcnQgPHd0Zi9OdW1iZXJPZkNvcmVz
Lmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC04NSwxMCArODYsMTIgQEAKIHZvaWQgTGF1
bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCiB7CiAg
ICAgYXV0byBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKLSAgICBib29sIGRhdGFi
YXNlVXBkYXRlZCA9IHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSg1X3MpOworICAgIGJvb2wgZGF0YWJh
c2VVcGRhdGVkID0gd2FpdEZvckRhdGFiYXNlVXBkYXRlKDMwX3MpOwogICAgIGF1dG8gZWxhcHNl
ZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKLSAgICBpZiAoZWxhcHNl
ZFRpbWUgPiAwLjVfcykKKyAgICBpZiAoZWxhcHNlZFRpbWUgPiAwLjVfcykgewogICAgICAgICBS
RUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRh
dGFiYXNlIHVwZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKKyAg
ICAgICAgZnByaW50ZihzdGRlcnIsICJXYWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJh
c2UgdXBkYXRlIHRvb2sgJWYgc2Vjb25kcyIsIGVsYXBzZWRUaW1lLnZhbHVlKCkpOworICAgIH0K
ICAgICBBU1NFUlRfVU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0YWJhc2VVcGRhdGVkKTsKICAg
ICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGlu
ZywgIlRpbWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRl
LiIpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449510</attachid>
            <date>2022-01-19 13:14:20 -0800</date>
            <delta_ts>2022-01-20 10:06:08 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220119131419.patch</filename>
            <type>text/plain</type>
            <size>8849</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODgyMzQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAxLTE5ICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExh
dW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGlj
YXRpb24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBu
b3cgZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuIFRvIG1ha2Ugc3VyZSBhbHNvIHByZXdhcm1lZCBX
ZWJDb250ZW50CisgICAgICAgIHByb2Nlc3NlcyBhcmUgcmVjZWl2aW5nIHRoZSBMYXVuY2ggU2Vy
dmljZXMgZGF0YWJhc2UsIHRoZSBXZWJzaXRlRGF0YVN0b3JlIG1ldGhvZAorICAgICAgICBzZW5k
TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBpcyBtYWRlIHN0YXRpYywgc2luY2Ug
cHJld2FybWVkIHByb2Nlc3NlcyB3aWxsIG5vdCBoYXZlIGEgZGF0YSBzdG9yZQorICAgICAgICBp
bml0aWFsbHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg
ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcpOgorICAg
ICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2Eu
bW06CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNlbmROZXR3b3JrUHJvY2Vz
c1hQQ0VuZHBvaW50VG9Qcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9y
ZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MgY29uc3QpOiBEZWxldGVk
LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmg6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbToKKyAgICAg
ICAgKFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1EaWRSZWNlaXZlTG9hZFBhcmFtZXRlcnMpOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIu
aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5h
Z2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6
d2FpdEZvckRhdGFiYXNlVXBkYXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlBy
b2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0
aWFsaXplV2ViUHJvY2Vzcyk6CisKIDIwMjItMDEtMTkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw
cGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQ6OkRvd25sb2FkUHJveHk6OnB1Ymxpc2hQcm9ncmVz
cygpIGZhbGxzIHRocm91Z2ggQVNTRVJUX05PVF9SRUFDSEVEKCkKSW5kZXg6IFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMjg4MjMxKQorKysg
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5
KQpAQCAtMTA1NSw4ICsxMDU1LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExh
dW5jaGluZwogICAgIH0KIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIGlmIChtX3dlYnNpdGVE
YXRhU3RvcmUpCi0gICAgICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2VuZE5ldHdvcmtQcm9jZXNz
WFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOworICAgIFdlYnNpdGVEYXRhU3RvcmU6OnNlbmRO
ZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKICNlbmRpZgogCiAgICAg
UkVMRUFTRV9BU1NFUlQoIW1fd2ViQ29ubmVjdGlvbik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZp
c2lvbiAyODgyMzEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz
aXRlRGF0YVN0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3OCw3ICsyNzgsNyBAQCBwdWJsaWM6
CiAgICAgdm9pZCBkaXNwYXRjaE9uUXVldWUoRnVuY3Rpb248dm9pZCgpPiYmKTsKIAogI2lmIFBM
QVRGT1JNKENPQ09BKQotICAgIGJvb2wgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1By
b2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JikgY29uc3Q7CisgICAgc3RhdGljIGJvb2wgc2Vu
ZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5
Jik7CiAgICAgdm9pZCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvQWxsUHJvY2Vzc2Vz
KCk7CiAgICAgCiAgICAgc3RhdGljIGJvb2wgdXNlTmV0d29ya0xvYWRlcigpOwpJbmRleDogU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv
Y29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh
L0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQkocmV2aXNpb24gMjg4MjMxKQorKysgU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv
Y29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MTYsMTQgKzYxNiwxNCBAQCBib29sIFdlYnNpdGVE
YXRhU3RvcmU6Om5ldHdvcmtQcm9jZXNzSGFzCiAgICAgcmV0dXJuIFdURjo6aGFzRW50aXRsZW1l
bnQobmV0d29ya1Byb2Nlc3MoKS5jb25uZWN0aW9uKCktPnhwY0Nvbm5lY3Rpb24oKSwgZW50aXRs
ZW1lbnQudXRmOCgpLmRhdGEoKSk7CiB9CiAKLWJvb2wgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5l
dHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JiBw
cm9jZXNzKSBjb25zdAorYm9vbCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NY
UENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7CiAg
ICAgaWYgKHByb2Nlc3Muc3RhdGUoKSAhPSBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OlN0YXRlOjpS
dW5uaW5nKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgYXV0byogY29ubmVjdGlvbiA9IHBy
b2Nlc3MuY29ubmVjdGlvbigpOwogICAgIGlmICghY29ubmVjdGlvbikKICAgICAgICAgcmV0dXJu
IGZhbHNlOwotICAgIGF1dG8gbWVzc2FnZSA9IG5ldHdvcmtQcm9jZXNzKCkueHBjRW5kcG9pbnRN
ZXNzYWdlKCk7CisgICAgYXV0byBtZXNzYWdlID0gTmV0d29ya1Byb2Nlc3NQcm94eTo6ZW5zdXJl
RGVmYXVsdE5ldHdvcmtQcm9jZXNzKCktPnhwY0VuZHBvaW50TWVzc2FnZSgpOwogICAgIGlmICgh
bWVzc2FnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHhwY19jb25uZWN0aW9uX3NlbmRf
bWVzc2FnZShjb25uZWN0aW9uLT54cGNDb25uZWN0aW9uKCksIG1lc3NhZ2UpOwpJbmRleDogU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VD
b2NvYS5tbQkocmV2aXNpb24gMjg4MjMxKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2
IEBACiAjaW1wb3J0ICJXZWJQYWdlLmgiCiAKICNpbXBvcnQgIkluc2VydFRleHRPcHRpb25zLmgi
Ci0jaW1wb3J0ICJMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oIgogI2ltcG9ydCAiTG9h
ZFBhcmFtZXRlcnMuaCIKICNpbXBvcnQgIlBsdWdpblZpZXcuaCIKICNpbXBvcnQgIlVzZXJNZWRp
YUNhcHR1cmVNYW5hZ2VyLmgiCkBAIC03NywyMSArNzYsNiBAQCB2b2lkIFdlYlBhZ2U6OnBsYXRm
b3JtSW5pdGlhbGl6ZShjb25zdCBXCiAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1EaWRSZWNlaXZl
TG9hZFBhcmFtZXRlcnMoY29uc3QgTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0jaWYg
SEFWRShMU0RBVEFCQVNFQ09OVEVYVCkKLSAgICBzdGF0aWMgYm9vbCBoYXNXYWl0ZWRGb3JMYXVu
Y2hTZXJ2aWNlc0RhdGFiYXNlID0gZmFsc2U7Ci0gICAgaWYgKCFoYXNXYWl0ZWRGb3JMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlKSB7Ci0gICAgICAgIGF1dG8gc3RhcnRUaW1lID0gV2FsbFRpbWU6Om5v
dygpOwotICAgICAgICBib29sIGRhdGFiYXNlVXBkYXRlZCA9IExhdW5jaFNlcnZpY2VzRGF0YWJh
c2VNYW5hZ2VyOjpzaW5nbGV0b24oKS53YWl0Rm9yRGF0YWJhc2VVcGRhdGUoNV9zKTsKLSAgICAg
ICAgYXV0byBlbGFwc2VkVGltZSA9IFdhbGxUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKLSAgICAg
ICAgaWYgKGVsYXBzZWRUaW1lLnZhbHVlKCkgPiAwLjUpCi0gICAgICAgICAgICBSRUxFQVNFX0xP
RyhMb2FkaW5nLCAiV2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0
b29rICVmIHNlY29uZHMiLCBlbGFwc2VkVGltZS52YWx1ZSgpKTsKLSAgICAgICAgQVNTRVJUX1VO
VVNFRChkYXRhYmFzZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7Ci0gICAgICAgIGlmICghZGF0
YWJhc2VVcGRhdGVkKQotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIlRp
bWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgdXBkYXRlLiIpOwot
ICAgICAgICBoYXNXYWl0ZWRGb3JMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlID0gdHJ1ZTsKLSAgICB9
Ci0jZW5kaWYKLQogICAgIG1fZGF0YURldGVjdGlvbkNvbnRleHQgPSBwYXJhbWV0ZXJzLmRhdGFE
ZXRlY3Rpb25Db250ZXh0OwogCiAgICAgY29uc3VtZU5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0
ZW5zaW9ucyhwYXJhbWV0ZXJzLm5ldHdvcmtFeHRlbnNpb25TYW5kYm94RXh0ZW5zaW9uSGFuZGxl
cyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNE
YXRhYmFzZU1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaAkocmV2aXNpb24gMjg4MjMxKQor
KysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VN
YW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDEyICszNSwxNCBAQCBjbGFzcyBMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlciA6IHB1CiBwdWJsaWM6CiAgICAgc3RhdGljIExhdW5jaFNl
cnZpY2VzRGF0YWJhc2VNYW5hZ2VyJiBzaW5nbGV0b24oKTsKIAotICAgIGJvb2wgd2FpdEZvckRh
dGFiYXNlVXBkYXRlKFNlY29uZHMpOworICAgIHZvaWQgd2FpdEZvckRhdGFiYXNlVXBkYXRlKCk7
CiAKIHByaXZhdGU6CiAgICAgdm9pZCBoYW5kbGVFdmVudCh4cGNfb2JqZWN0X3QpIG92ZXJyaWRl
OwogICAgIHZvaWQgZGlkQ29ubmVjdCgpIG92ZXJyaWRlOwogCisgICAgYm9vbCB3YWl0Rm9yRGF0
YWJhc2VVcGRhdGUoU2Vjb25kcyk7CisKICAgICBzdGQ6OmF0b21pYzxib29sPiBtX2hhc1JlY2Vp
dmVkTGF1bmNoU2VydmljZXNEYXRhYmFzZSB7IGZhbHNlIH07CiAgICAgQmluYXJ5U2VtYXBob3Jl
IG1fc2VtYXBob3JlOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9M
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHJl
dmlzaW9uIDI4ODIzMSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBA
QAogI2ltcG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKIAogI2ltcG9ydCAi
TGF1bmNoU2VydmljZXNEYXRhYmFzZVhQQ0NvbnN0YW50cy5oIgorI2ltcG9ydCAiTG9nZ2luZy5o
IgogI2ltcG9ydCAiWFBDRW5kcG9pbnQuaCIKICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTGF1bmNo
U2VydmljZXNTUEkuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KQEAgLTgx
LDQgKzgyLDE2IEBAIGJvb2wgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXQKICAg
ICByZXR1cm4gbV9zZW1hcGhvcmUud2FpdEZvcih0aW1lb3V0KTsKIH0KIAordm9pZCBMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6d2FpdEZvckRhdGFiYXNlVXBkYXRlKCkKK3sKKyAgICBh
dXRvIHN0YXJ0VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGJvb2wgZGF0YWJhc2VV
cGRhdGVkID0gd2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7CisgICAgYXV0byBlbGFwc2VkVGlt
ZSA9IE1vbm90b25pY1RpbWU6Om5vdygpIC0gc3RhcnRUaW1lOworICAgIGlmIChlbGFwc2VkVGlt
ZSA+IDAuNV9zKQorICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiV2FpdGluZyBm
b3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZSB0b29rICVmIHNlY29uZHMiLCBlbGFw
c2VkVGltZS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfVU5VU0VEKGRhdGFiYXNlVXBkYXRlZCwgZGF0
YWJhc2VVcGRhdGVkKTsKKyAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKKyAgICAgICAgUkVMRUFT
RV9MT0dfRVJST1IoTG9hZGluZywgIlRpbWVkIG91dCB3YWl0aW5nIGZvciBMYXVuY2ggU2Vydmlj
ZXMgZGF0YWJhc2UgdXBkYXRlLiIpOworfQorCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI4ODIzMSkK
KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdv
cmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVN1
cHBvcnRTUEkuaCIKICNpbXBvcnQgIkdQVVByb2Nlc3NDb25uZWN0aW9uUGFyYW1ldGVycy5oIgor
I2ltcG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxlZ2Fj
eUN1c3RvbVByb3RvY29sTWFuYWdlci5oIgogI2ltcG9ydCAiTG9nSW5pdGlhbGl6YXRpb24uaCIK
ICNpbXBvcnQgIkxvZ2dpbmcuaCIKQEAgLTMyNiw2ICszMjcsMTIgQEAgdm9pZCBXZWJQcm9jZXNz
OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbiht
ZXRob2RUb1BhdGNoLCAoSU1QKU5TQXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxl
bWVudCk7CiAjZW5kaWYKIAorI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCisgICAgLy8gT24g
TWFjLCB0aGlzIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgTlNBcHBsaWNhdGlvbiBpcyBiZWlu
ZyBpbml0aWFsaXplZC4KKyAgICAvLyBUaGUgTlNBcHBsaWNhdGlvbiBpbml0aWFsaXphdGlvbiBp
cyBiZWluZyBkb25lIGluIFtOU0FwcGxpY2F0aW9uIF9hY2Nlc3NpYmlsaXR5SW5pdGlhbGl6ZV0K
KyAgICBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCkud2FpdEZvckRh
dGFiYXNlVXBkYXRlKCk7CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFdF
QlBST0NFU1NfTlNSVU5MT09QKQogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBsYXVuY2hT
ZXJ2aWNlc0V4dGVuc2lvbjsKICAgICBpZiAocGFyYW1ldGVycy5sYXVuY2hTZXJ2aWNlc0V4dGVu
c2lvbkhhbmRsZSkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449593</attachid>
            <date>2022-01-20 10:06:11 -0800</date>
            <delta_ts>2022-01-20 10:20:26 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220120100610.patch</filename>
            <type>text/plain</type>
            <size>14265</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAxLTE5ICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExh
dW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGlj
YXRpb24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBu
b3cgZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuIFRvIG1ha2Ugc3VyZSBhbHNvIHByZXdhcm1lZCBX
ZWJDb250ZW50CisgICAgICAgIHByb2Nlc3NlcyBhcmUgcmVjZWl2aW5nIHRoZSBMYXVuY2ggU2Vy
dmljZXMgZGF0YWJhc2UsIHRoZSBXZWJzaXRlRGF0YVN0b3JlIG1ldGhvZAorICAgICAgICBzZW5k
TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBpcyBtb3ZlZCB0byB0aGUgY2xhc3Mg
TmV0d29ya1Byb2Nlc3NQcm94eSwgc2luY2UgcHJld2FybWVkIHByb2Nlc3NlcworICAgICAgICB3
aWxsIG5vdCBoYXZlIGEgZGF0YSBzdG9yZSBpbml0aWFsbHkuIFRoaXMgYWxsb3dzIHVzIHRvIHNp
bXBsaWZ5IHRoZSBjb2RlLCBzaW5jZSB3ZSBhcmUgbm8gbG9uZ2VyIGRlcGVuZGluZworICAgICAg
ICBvbiBoYXZpbmcgYSBXZWJzaXRlIGRhdGEgc3RvcmUgYmVmb3JlIHNlbmRpbmcgdGhlIFhQQyBl
bmRwb2ludC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAg
ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAg
ICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5t
bToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNz
WFBDRW5kcG9pbnRUb1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl
OjpzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBjb25zdCk6IERlbGV0ZWQu
CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAg
ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tOgorICAgICAg
ICAoV2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5o
OgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXIubW06CisgICAgICAgIChXZWJLaXQ6OkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3
YWl0Rm9yRGF0YWJhc2VVcGRhdGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJv
Y2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRp
YWxpemVXZWJQcm9jZXNzKToKKwogMjAyMi0wMS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw
bGUuY29tPgogCiAgICAgICAgIFdlYktpdDo6bnNUZXh0QWxpZ25tZW50RnJvbVRleHRBbGlnbm1l
bnQoKSBmYWxscyB0aHJvdWdoIEFTU0VSVF9OT1RfUkVBQ0hFRCgpCkluZGV4OiBTb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI4ODI0NikKKysr
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29w
eSkKQEAgLTM0OSwxMyArMzQ5LDYgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnNldFdlYnNpdGVE
YXRhU3RvcgogICAgIEFTU0VSVCghbV93ZWJzaXRlRGF0YVN0b3JlKTsKICAgICBXRUJQUk9DRVNT
UFJPWFlfUkVMRUFTRV9MT0coUHJvY2VzcywgInNldFdlYnNpdGVEYXRhU3RvcmUoKSBkYXRhU3Rv
cmU9JXAsIHNlc3Npb25JRD0lIiBQUkl1NjQsICZkYXRhU3RvcmUsIGRhdGFTdG9yZS5zZXNzaW9u
SUQoKS50b1VJbnQ2NCgpKTsKICAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSAmZGF0YVN0b3JlOwot
I2lmIFBMQVRGT1JNKENPQ09BKQotICAgIGRhdGFTdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENF
bmRwb2ludFRvUHJvY2VzcygqdGhpcyk7Ci0jaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQotICAgIGlm
IChHUFVQcm9jZXNzUHJveHk6OnNpbmdsZXRvbklmQ3JlYXRlZCgpKQotICAgICAgICBkYXRhU3Rv
cmUuc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKkdQVVByb2Nlc3NQcm94
eTo6c2luZ2xldG9uSWZDcmVhdGVkKCkpOwotI2VuZGlmCi0jZW5kaWYKICAgICB1cGRhdGVSZWdp
c3RyYXRpb25XaXRoRGF0YVN0b3JlKCk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6
U2V0V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMocHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzRGF0
YVN0b3JlUGFyYW1ldGVycygqdGhpcywgZGF0YVN0b3JlKSksIDApOwogCkBAIC0xMDU1LDggKzEw
NDgsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nCiAgICAgfQog
CiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKG1fd2Vic2l0ZURhdGFTdG9yZSkKLSAgICAg
ICAgbV93ZWJzaXRlRGF0YVN0b3JlLT5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJv
Y2VzcygqdGhpcyk7CisgICAgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZW5zdXJlRGVmYXVsdE5ldHdv
cmtQcm9jZXNzKCktPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlz
KTsKICNlbmRpZgogCiAgICAgUkVMRUFTRV9BU1NFUlQoIW1fd2ViQ29ubmVjdGlvbik7CkluZGV4
OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAko
cmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nl
c3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0MSwxNSArNDQxLDcgQEAgdm9pZCBHUFVQ
cm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZwogI2VuZGlmCiAKICNpZiBQTEFURk9STShD
T0NPQSkKLSAgICAvLyBVc2UgYW55IHNlc3Npb24gSUQgdG8gZ2V0IGFueSBXZWJzaXRlIGRhdGEg
c3RvcmUuIEl0IGlzIE9LIHRvIHVzZSBhbnkgV2Vic2l0ZSBkYXRhIHN0b3JlLAotICAgIC8vIHNp
bmNlIHdlIGFyZSB1c2luZyBpdCB0byBhY2Nlc3MgYW55IE5ldHdvcmtpbmcgcHJvY2Vzcywgd2hp
Y2ggYWxsIGhhdmUgdGhlIFhQQyBlbmRwb2ludC4KLSAgICAvLyBUaGUgWFBDIGVuZHBvaW50IGlz
IHVzZWQgdG8gcmVjZWl2ZSB0aGUgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIGZyb20gdGhlIE5l
dHdvcmsgcHJvY2Vzcy4KLSAgICBpZiAobV9zZXNzaW9uSURzLmlzRW1wdHkoKSkKLSAgICAgICAg
cmV0dXJuOwotICAgIGF1dG8gc3RvcmUgPSBXZWJzaXRlRGF0YVN0b3JlOjpleGlzdGluZ0RhdGFT
dG9yZUZvclNlc3Npb25JRCgqbV9zZXNzaW9uSURzLmJlZ2luKCkpOwotICAgIGlmICghc3RvcmUp
Ci0gICAgICAgIHJldHVybjsKLSAgICBtX2hhc1NlbnROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50
ID0gc3RvcmUtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsK
KyAgICBOZXR3b3JrUHJvY2Vzc1Byb3h5OjplbnN1cmVEZWZhdWx0TmV0d29ya1Byb2Nlc3MoKS0+
c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOwogI2VuZGlmCiB9
CiAKQEAgLTUxNSwxMSArNTA3LDYgQEAgdm9pZCBHUFVQcm9jZXNzUHJveHk6OmFkZFNlc3Npb24o
Y29uc3QgVwogCiAgICAgc2VuZChNZXNzYWdlczo6R1BVUHJvY2Vzczo6QWRkU2Vzc2lvbiB7IHN0
b3JlLnNlc3Npb25JRCgpLCBncHVQcm9jZXNzU2Vzc2lvblBhcmFtZXRlcnMoc3RvcmUpIH0sIDAp
OwogICAgIG1fc2Vzc2lvbklEcy5hZGQoc3RvcmUuc2Vzc2lvbklEKCkpOwotCi0jaWYgUExBVEZP
Uk0oQ09DT0EpCi0gICAgaWYgKCFtX2hhc1NlbnROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50KQot
ICAgICAgICBtX2hhc1NlbnROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50ID0gc3RvcmUuc2VuZE5l
dHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOwotI2VuZGlmCiB9CiAKIHZv
aWQgR1BVUHJvY2Vzc1Byb3h5OjpyZW1vdmVTZXNzaW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25J
RCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5
LmgJKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQ
cm9jZXNzUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDcgKzE1MSw2IEBAIHByaXZhdGU6
CiAgICAgYm9vbCBtX2hhc1NlbnRUQ0NEU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAgICAg
Ym9vbCBtX2hhc1NlbnRDYW1lcmFTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29s
IG1faGFzU2VudE1pY3JvcGhvbmVTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKLSAgICBib29s
IG1faGFzU2VudE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnQgeyBmYWxzZSB9OwogI2VuZGlmCiAK
ICNpZiBFTkFCTEUoTUVESUFfU09VUkNFKSAmJiBFTkFCTEUoVlA5KQpJbmRleDogU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgJ
KHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0
d29ya1Byb2Nlc3NQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzEsNiArMjcxLDcgQEAgcHVi
bGljOgogICAgIEFQSTo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyQ2xpZW50JiBjdXN0b21Qcm90b2Nv
bE1hbmFnZXJDbGllbnQoKSB7IHJldHVybiBtX2N1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5n
ZXQoKTsgfQogCiAjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgYm9vbCBzZW5kTmV0d29ya1Byb2Nl
c3NYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKTsKICAgICB4cGNf
b2JqZWN0X3QgeHBjRW5kcG9pbnRNZXNzYWdlKCkgY29uc3QgeyByZXR1cm4gbV9lbmRwb2ludE1l
c3NhZ2UuZ2V0KCk7IH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9O
ZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHlDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHlDb2NvYS5tbQkocmV2
aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3Jr
UHJvY2Vzc1Byb3h5Q29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTUzLDggKzUzLDE0IEBAIGJv
b2wgTmV0d29ya1Byb2Nlc3NQcm94eTo6WFBDRXZlbnRIYW5kbGUKIAogICAgIGlmIChtZXNzYWdl
TmFtZSA9PSBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlWFBDQ29uc3RhbnRzOjp4cGNMYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlWFBDRW5kcG9pbnRNZXNzYWdlTmFtZSkgewogICAgICAgICBtX25ldHdvcmtQ
cm9jZXNzLT5tX2VuZHBvaW50TWVzc2FnZSA9IGV2ZW50OwotICAgICAgICBmb3IgKGF1dG8mIGRh
dGFTdG9yZSA6IGNvcHlUb1ZlY3Rvck9mPFJlZjxXZWJzaXRlRGF0YVN0b3JlPj4obV9uZXR3b3Jr
UHJvY2Vzcy0+bV93ZWJzaXRlRGF0YVN0b3JlcykpCi0gICAgICAgICAgICBkYXRhU3RvcmUtPnNl
bmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsKKyAgICAgICAgZm9y
IChhdXRvJiBkYXRhU3RvcmUgOiBjb3B5VG9WZWN0b3JPZjxSZWY8V2Vic2l0ZURhdGFTdG9yZT4+
KG1fbmV0d29ya1Byb2Nlc3MtPm1fd2Vic2l0ZURhdGFTdG9yZXMpKSB7CisgICAgICAgICAgICBm
b3IgKGF1dG8mIHByb2Nlc3MgOiBkYXRhU3RvcmUtPnByb2Nlc3NlcygpKQorICAgICAgICAgICAg
ICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9j
ZXNzKHByb2Nlc3MpOworICAgICAgICB9CisjaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQorICAgICAg
ICBpZiAoR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGV0b25JZkNyZWF0ZWQoKSkKKyAgICAgICAgICAg
IG1fbmV0d29ya1Byb2Nlc3MtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNz
KCpHUFVQcm9jZXNzUHJveHk6OnNpbmdsZXRvbklmQ3JlYXRlZCgpKTsKKyNlbmRpZgogICAgIH0K
IAogICAgIHJldHVybiB0cnVlOwpAQCAtNjUsNCArNzEsMTggQEAgTmV0d29ya1Byb2Nlc3NQcm94
eTo6WFBDRXZlbnRIYW5kbGVyOjpYUAogewogfQogCitib29sIE5ldHdvcmtQcm9jZXNzUHJveHk6
OnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1eGlsaWFyeVByb2Nlc3NQ
cm94eSYgcHJvY2VzcykKK3sKKyAgICBpZiAocHJvY2Vzcy5zdGF0ZSgpICE9IEF1eGlsaWFyeVBy
b2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBh
dXRvKiBjb25uZWN0aW9uID0gcHJvY2Vzcy5jb25uZWN0aW9uKCk7CisgICAgaWYgKCFjb25uZWN0
aW9uKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgYXV0byBtZXNzYWdlID0geHBjRW5kcG9p
bnRNZXNzYWdlKCk7CisgICAgaWYgKCFtZXNzYWdlKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24o
KSwgbWVzc2FnZSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0KSW5kZXg6IFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJ
KHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh
L1dlYnNpdGVEYXRhU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMjc4LDkgKzI3OCw2IEBAIHB1
YmxpYzoKICAgICB2b2lkIGRpc3BhdGNoT25RdWV1ZShGdW5jdGlvbjx2b2lkKCk+JiYpOwogCiAj
aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgYm9vbCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2lu
dFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKSBjb25zdDsKLSAgICB2b2lkIHNlbmRO
ZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsKLSAgICAKICAgICBzdGF0
aWMgYm9vbCB1c2VOZXR3b3JrTG9hZGVyKCk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dl
YnNpdGVEYXRhU3RvcmVDb2NvYS5tbQkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCSh3
b3JraW5nIGNvcHkpCkBAIC02MTYsMjggKzYxNiw0IEBAIGJvb2wgV2Vic2l0ZURhdGFTdG9yZTo6
bmV0d29ya1Byb2Nlc3NIYXMKICAgICByZXR1cm4gV1RGOjpoYXNFbnRpdGxlbWVudChuZXR3b3Jr
UHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpLCBlbnRpdGxlbWVudC51dGY4
KCkuZGF0YSgpKTsKIH0KIAotYm9vbCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nl
c3NYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNv
bnN0Ci17Ci0gICAgaWYgKHByb2Nlc3Muc3RhdGUoKSAhPSBBdXhpbGlhcnlQcm9jZXNzUHJveHk6
OlN0YXRlOjpSdW5uaW5nKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgYXV0byogY29ubmVj
dGlvbiA9IHByb2Nlc3MuY29ubmVjdGlvbigpOwotICAgIGlmICghY29ubmVjdGlvbikKLSAgICAg
ICAgcmV0dXJuIGZhbHNlOwotICAgIGF1dG8gbWVzc2FnZSA9IG5ldHdvcmtQcm9jZXNzKCkueHBj
RW5kcG9pbnRNZXNzYWdlKCk7Ci0gICAgaWYgKCFtZXNzYWdlKQotICAgICAgICByZXR1cm4gZmFs
c2U7Ci0gICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5l
Y3Rpb24oKSwgbWVzc2FnZSk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLXZvaWQgV2Vic2l0ZURh
dGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb0FsbFByb2Nlc3NlcygpCi17
Ci0gICAgZm9yIChhdXRvJiBwcm9jZXNzIDogbV9wcm9jZXNzZXMpCi0gICAgICAgIHNlbmROZXR3
b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKHByb2Nlc3MpOwotI2lmIEVOQUJMRShHUFVf
UFJPQ0VTUykKLSAgICBpZiAoR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGV0b25JZkNyZWF0ZWQoKSkK
LSAgICAgICAgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKkdQVVByb2Nl
c3NQcm94eTo6c2luZ2xldG9uSWZDcmVhdGVkKCkpOwotI2VuZGlmCi19Ci0KIH0KSW5kZXg6IFNv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdl
Q29jb2EubW0JKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcs
NiBAQAogI2ltcG9ydCAiV2ViUGFnZS5oIgogCiAjaW1wb3J0ICJJbnNlcnRUZXh0T3B0aW9ucy5o
IgotI2ltcG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxv
YWRQYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJQbHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJVc2VyTWVk
aWFDYXB0dXJlTWFuYWdlci5oIgpAQCAtNzcsMjEgKzc2LDYgQEAgdm9pZCBXZWJQYWdlOjpwbGF0
Zm9ybUluaXRpYWxpemUoY29uc3QgVwogCiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2
ZUxvYWRQYXJhbWV0ZXJzKGNvbnN0IExvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewotI2lm
IEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCi0gICAgc3RhdGljIGJvb2wgaGFzV2FpdGVkRm9yTGF1
bmNoU2VydmljZXNEYXRhYmFzZSA9IGZhbHNlOwotICAgIGlmICghaGFzV2FpdGVkRm9yTGF1bmNo
U2VydmljZXNEYXRhYmFzZSkgewotICAgICAgICBhdXRvIHN0YXJ0VGltZSA9IFdhbGxUaW1lOjpu
b3coKTsKLSAgICAgICAgYm9vbCBkYXRhYmFzZVVwZGF0ZWQgPSBMYXVuY2hTZXJ2aWNlc0RhdGFi
YXNlTWFuYWdlcjo6c2luZ2xldG9uKCkud2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7Ci0gICAg
ICAgIGF1dG8gZWxhcHNlZFRpbWUgPSBXYWxsVGltZTo6bm93KCkgLSBzdGFydFRpbWU7Ci0gICAg
ICAgIGlmIChlbGFwc2VkVGltZS52YWx1ZSgpID4gMC41KQotICAgICAgICAgICAgUkVMRUFTRV9M
T0coTG9hZGluZywgIldhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUg
dG9vayAlZiBzZWNvbmRzIiwgZWxhcHNlZFRpbWUudmFsdWUoKSk7Ci0gICAgICAgIEFTU0VSVF9V
TlVTRUQoZGF0YWJhc2VVcGRhdGVkLCBkYXRhYmFzZVVwZGF0ZWQpOwotICAgICAgICBpZiAoIWRh
dGFiYXNlVXBkYXRlZCkKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJU
aW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsK
LSAgICAgICAgaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IHRydWU7Ci0gICAg
fQotI2VuZGlmCi0KICAgICBtX2RhdGFEZXRlY3Rpb25Db250ZXh0ID0gcGFyYW1ldGVycy5kYXRh
RGV0ZWN0aW9uQ29udGV4dDsKIAogICAgIGNvbnN1bWVOZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4
dGVuc2lvbnMocGFyYW1ldGVycy5uZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbkhhbmRs
ZXMpOwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgJKHJldmlzaW9uIDI4ODI0NikK
KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNl
TWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMiArMzUsMTQgQEAgY2xhc3MgTGF1bmNo
U2VydmljZXNEYXRhYmFzZU1hbmFnZXIgOiBwdQogcHVibGljOgogICAgIHN0YXRpYyBMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlciYgc2luZ2xldG9uKCk7CiAKLSAgICBib29sIHdhaXRGb3JE
YXRhYmFzZVVwZGF0ZShTZWNvbmRzKTsKKyAgICB2b2lkIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSgp
OwogCiBwcml2YXRlOgogICAgIHZvaWQgaGFuZGxlRXZlbnQoeHBjX29iamVjdF90KSBvdmVycmlk
ZTsKICAgICB2b2lkIGRpZENvbm5lY3QoKSBvdmVycmlkZTsKIAorICAgIGJvb2wgd2FpdEZvckRh
dGFiYXNlVXBkYXRlKFNlY29uZHMpOworCiAgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNSZWNl
aXZlZExhdW5jaFNlcnZpY2VzRGF0YWJhc2UgeyBmYWxzZSB9OwogICAgIEJpbmFyeVNlbWFwaG9y
ZSBtX3NlbWFwaG9yZTsKIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
TGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLm1tCShy
ZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNo
U2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcg
QEAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAKICNpbXBvcnQg
IkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENDb25zdGFudHMuaCIKKyNpbXBvcnQgIkxvZ2dpbmcu
aCIKICNpbXBvcnQgIlhQQ0VuZHBvaW50LmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5j
aFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CkBAIC04
MSw0ICs4MiwxNiBAQCBib29sIExhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0CiAg
ICAgcmV0dXJuIG1fc2VtYXBob3JlLndhaXRGb3IodGltZW91dCk7CiB9CiAKK3ZvaWQgTGF1bmNo
U2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCit7CisgICAg
YXV0byBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKKyAgICBib29sIGRhdGFiYXNl
VXBkYXRlZCA9IHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSg1X3MpOworICAgIGF1dG8gZWxhcHNlZFRp
bWUgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKKyAgICBpZiAoZWxhcHNlZFRp
bWUgPiAwLjVfcykKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIldhaXRpbmcg
Zm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxh
cHNlZFRpbWUudmFsdWUoKSk7CisgICAgQVNTRVJUX1VOVVNFRChkYXRhYmFzZVVwZGF0ZWQsIGRh
dGFiYXNlVXBkYXRlZCk7CisgICAgaWYgKCFkYXRhYmFzZVVwZGF0ZWQpCisgICAgICAgIFJFTEVB
U0VfTE9HX0VSUk9SKExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsKK30KKwogfQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODgyNDYp
CisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3
b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlT
dXBwb3J0U1BJLmgiCiAjaW1wb3J0ICJHUFVQcm9jZXNzQ29ubmVjdGlvblBhcmFtZXRlcnMuaCIK
KyNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAjaW1wb3J0ICJMZWdh
Y3lDdXN0b21Qcm90b2NvbE1hbmFnZXIuaCIKICNpbXBvcnQgIkxvZ0luaXRpYWxpemF0aW9uLmgi
CiAjaW1wb3J0ICJMb2dnaW5nLmgiCkBAIC0zMjYsNiArMzI3LDEyIEBAIHZvaWQgV2ViUHJvY2Vz
czo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24o
bWV0aG9kVG9QYXRjaCwgKElNUClOU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUZvY3VzZWRVSUVs
ZW1lbnQpOwogI2VuZGlmCiAKKyNpZiBIQVZFKExTREFUQUJBU0VDT05URVhUKQorICAgIC8vIE9u
IE1hYywgdGhpcyBuZWVkcyB0byBiZSBjYWxsZWQgYmVmb3JlIE5TQXBwbGljYXRpb24gaXMgYmVp
bmcgaW5pdGlhbGl6ZWQuCisgICAgLy8gVGhlIE5TQXBwbGljYXRpb24gaW5pdGlhbGl6YXRpb24g
aXMgYmVpbmcgZG9uZSBpbiBbTlNBcHBsaWNhdGlvbiBfYWNjZXNzaWJpbGl0eUluaXRpYWxpemVd
CisgICAgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OnNpbmdsZXRvbigpLndhaXRGb3JE
YXRhYmFzZVVwZGF0ZSgpOworI2VuZGlmCisKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShX
RUJQUk9DRVNTX05TUlVOTE9PUCkKICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbGF1bmNo
U2VydmljZXNFeHRlbnNpb247CiAgICAgaWYgKHBhcmFtZXRlcnMubGF1bmNoU2VydmljZXNFeHRl
bnNpb25IYW5kbGUpIHsK
</data>
<flag name="review"
          id="475721"
          type_id="1"
          status="+"
          setter="cdumez"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449615</attachid>
            <date>2022-01-20 15:59:31 -0800</date>
            <delta_ts>2022-01-20 15:59:31 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220120155930.patch</filename>
            <type>text/plain</type>
            <size>14130</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAxLTE5ICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKwor
ICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExhdW5j
aCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGljYXRp
b24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBub3cg
ZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuIFRvIG1ha2Ugc3VyZSBhbHNvIHByZXdhcm1lZCBXZWJD
b250ZW50CisgICAgICAgIHByb2Nlc3NlcyBhcmUgcmVjZWl2aW5nIHRoZSBMYXVuY2ggU2Vydmlj
ZXMgZGF0YWJhc2UsIHRoZSBXZWJzaXRlRGF0YVN0b3JlIG1ldGhvZAorICAgICAgICBzZW5kTmV0
d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBpcyBtb3ZlZCB0byB0aGUgY2xhc3MgTmV0
d29ya1Byb2Nlc3NQcm94eSwgc2luY2UgcHJld2FybWVkIHByb2Nlc3NlcworICAgICAgICB3aWxs
IG5vdCBoYXZlIGEgZGF0YSBzdG9yZSBpbml0aWFsbHkuIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBs
aWZ5IHRoZSBjb2RlLCBzaW5jZSB3ZSBhcmUgbm8gbG9uZ2VyIGRlcGVuZGluZworICAgICAgICBv
biBoYXZpbmcgYSBXZWJzaXRlIGRhdGEgc3RvcmUgYmVmb3JlIHNlbmRpbmcgdGhlIFhQQyBlbmRw
b2ludC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAg
ICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAgICAg
ICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToK
KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBD
RW5kcG9pbnRUb1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpz
ZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tOgorICAgICAgICAo
V2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyk6CisgICAg
ICAgICogV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIu
bW06CisgICAgICAgIChXZWJLaXQ6OkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0
Rm9yRGF0YWJhc2VVcGRhdGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp
emVXZWJQcm9jZXNzKToKKwogMjAyMi0wMS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu
Y29tPgogCiAgICAgICAgIFdlYktpdDo6bnNUZXh0QWxpZ25tZW50RnJvbVRleHRBbGlnbm1lbnQo
KSBmYWxscyB0aHJvdWdoIEFTU0VSVF9OT1RfUkVBQ0hFRCgpCkluZGV4OiBTb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI4ODI0NikKKysrIFNv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkK
QEAgLTM0OSwxMyArMzQ5LDYgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnNldFdlYnNpdGVEYXRh
U3RvcgogICAgIEFTU0VSVCghbV93ZWJzaXRlRGF0YVN0b3JlKTsKICAgICBXRUJQUk9DRVNTUFJP
WFlfUkVMRUFTRV9MT0coUHJvY2VzcywgInNldFdlYnNpdGVEYXRhU3RvcmUoKSBkYXRhU3RvcmU9
JXAsIHNlc3Npb25JRD0lIiBQUkl1NjQsICZkYXRhU3RvcmUsIGRhdGFTdG9yZS5zZXNzaW9uSUQo
KS50b1VJbnQ2NCgpKTsKICAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSAmZGF0YVN0b3JlOwotI2lm
IFBMQVRGT1JNKENPQ09BKQotICAgIGRhdGFTdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRw
b2ludFRvUHJvY2VzcygqdGhpcyk7Ci0jaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQotICAgIGlmIChH
UFVQcm9jZXNzUHJveHk6OnNpbmdsZXRvbklmQ3JlYXRlZCgpKQotICAgICAgICBkYXRhU3RvcmUu
c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKkdQVVByb2Nlc3NQcm94eTo6
c2luZ2xldG9uSWZDcmVhdGVkKCkpOwotI2VuZGlmCi0jZW5kaWYKICAgICB1cGRhdGVSZWdpc3Ry
YXRpb25XaXRoRGF0YVN0b3JlKCk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0
V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMocHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzRGF0YVN0
b3JlUGFyYW1ldGVycygqdGhpcywgZGF0YVN0b3JlKSksIDApOwogCkBAIC0xMDU1LDggKzEwNDgs
NyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nCiAgICAgfQogCiAj
aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKG1fd2Vic2l0ZURhdGFTdG9yZSkKLSAgICAgICAg
bV93ZWJzaXRlRGF0YVN0b3JlLT5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2Vz
cygqdGhpcyk7CisgICAgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZW5zdXJlRGVmYXVsdE5ldHdvcmtQ
cm9jZXNzKCktPnNlbmRYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CiAjZW5kaWYKIAogICAg
IFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5lY3Rpb24pOwpJbmRleDogU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI4ODI0NikK
KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC00NDEsMTUgKzQ0MSw3IEBAIHZvaWQgR1BVUHJvY2Vzc1Byb3h5OjpkaWRG
aW5pc2hMYXVuY2hpbmcKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgLy8gVXNl
IGFueSBzZXNzaW9uIElEIHRvIGdldCBhbnkgV2Vic2l0ZSBkYXRhIHN0b3JlLiBJdCBpcyBPSyB0
byB1c2UgYW55IFdlYnNpdGUgZGF0YSBzdG9yZSwKLSAgICAvLyBzaW5jZSB3ZSBhcmUgdXNpbmcg
aXQgdG8gYWNjZXNzIGFueSBOZXR3b3JraW5nIHByb2Nlc3MsIHdoaWNoIGFsbCBoYXZlIHRoZSBY
UEMgZW5kcG9pbnQuCi0gICAgLy8gVGhlIFhQQyBlbmRwb2ludCBpcyB1c2VkIHRvIHJlY2VpdmUg
dGhlIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBmcm9tIHRoZSBOZXR3b3JrIHByb2Nlc3MuCi0g
ICAgaWYgKG1fc2Vzc2lvbklEcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLSAgICBhdXRv
IHN0b3JlID0gV2Vic2l0ZURhdGFTdG9yZTo6ZXhpc3RpbmdEYXRhU3RvcmVGb3JTZXNzaW9uSUQo
Km1fc2Vzc2lvbklEcy5iZWdpbigpKTsKLSAgICBpZiAoIXN0b3JlKQotICAgICAgICByZXR1cm47
Ci0gICAgbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCA9IHN0b3JlLT5zZW5kTmV0
d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CisgICAgTmV0d29ya1Byb2Nl
c3NQcm94eTo6ZW5zdXJlRGVmYXVsdE5ldHdvcmtQcm9jZXNzKCktPnNlbmRYUENFbmRwb2ludFRv
UHJvY2VzcygqdGhpcyk7CiAjZW5kaWYKIH0KIApAQCAtNTE1LDExICs1MDcsNiBAQCB2b2lkIEdQ
VVByb2Nlc3NQcm94eTo6YWRkU2Vzc2lvbihjb25zdCBXCiAKICAgICBzZW5kKE1lc3NhZ2VzOjpH
UFVQcm9jZXNzOjpBZGRTZXNzaW9uIHsgc3RvcmUuc2Vzc2lvbklEKCksIGdwdVByb2Nlc3NTZXNz
aW9uUGFyYW1ldGVycyhzdG9yZSkgfSwgMCk7CiAgICAgbV9zZXNzaW9uSURzLmFkZChzdG9yZS5z
ZXNzaW9uSUQoKSk7Ci0KLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBpZiAoIW1faGFzU2VudE5l
dHdvcmtQcm9jZXNzWFBDRW5kcG9pbnQpCi0gICAgICAgIG1faGFzU2VudE5ldHdvcmtQcm9jZXNz
WFBDRW5kcG9pbnQgPSBzdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2Vz
cygqdGhpcyk7Ci0jZW5kaWYKIH0KIAogdm9pZCBHUFVQcm9jZXNzUHJveHk6OnJlbW92ZVNlc3Np
b24oUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaAkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBA
IC0xNTEsNyArMTUxLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGFzU2VudFRDQ0RTYW5kYm94
RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzU2VudENhbWVyYVNhbmRib3hFeHRl
bnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNTZW50TWljcm9waG9uZVNhbmRib3hFeHRl
bnNpb24geyBmYWxzZSB9OwotICAgIGJvb2wgbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRw
b2ludCB7IGZhbHNlIH07CiAjZW5kaWYKIAogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpICYmIEVO
QUJMRShWUDkpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ
cm9jZXNzUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3
b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29w
eSkKQEAgLTI3MSw2ICsyNzEsNyBAQCBwdWJsaWM6CiAgICAgQVBJOjpDdXN0b21Qcm90b2NvbE1h
bmFnZXJDbGllbnQmIGN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudCgpIHsgcmV0dXJuIG1fY3Vz
dG9tUHJvdG9jb2xNYW5hZ2VyQ2xpZW50LmdldCgpOyB9CiAKICNpZiBQTEFURk9STShDT0NPQSkK
KyAgICBib29sIHNlbmRYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkm
KTsKICAgICB4cGNfb2JqZWN0X3QgeHBjRW5kcG9pbnRNZXNzYWdlKCkgY29uc3QgeyByZXR1cm4g
bV9lbmRwb2ludE1lc3NhZ2UuZ2V0KCk7IH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHlDb2NvYS5tbQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHlD
b2NvYS5tbQkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0
d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5Q29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTUzLDgg
KzUzLDE0IEBAIGJvb2wgTmV0d29ya1Byb2Nlc3NQcm94eTo6WFBDRXZlbnRIYW5kbGUKIAogICAg
IGlmIChtZXNzYWdlTmFtZSA9PSBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlWFBDQ29uc3RhbnRzOjp4
cGNMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlWFBDRW5kcG9pbnRNZXNzYWdlTmFtZSkgewogICAgICAg
ICBtX25ldHdvcmtQcm9jZXNzLT5tX2VuZHBvaW50TWVzc2FnZSA9IGV2ZW50OwotICAgICAgICBm
b3IgKGF1dG8mIGRhdGFTdG9yZSA6IGNvcHlUb1ZlY3Rvck9mPFJlZjxXZWJzaXRlRGF0YVN0b3Jl
Pj4obV9uZXR3b3JrUHJvY2Vzcy0+bV93ZWJzaXRlRGF0YVN0b3JlcykpCi0gICAgICAgICAgICBk
YXRhU3RvcmUtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsK
KyAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IFdlYlByb2Nlc3NQb29sOjphbGxQcm9j
ZXNzUG9vbHMoKSkgeworICAgICAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc1Bv
b2wtPnByb2Nlc3NlcygpKQorICAgICAgICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNlbmRY
UENFbmRwb2ludFRvUHJvY2Vzcyhwcm9jZXNzKTsKKyAgICAgICAgfQorI2lmIEVOQUJMRShHUFVf
UFJPQ0VTUykKKyAgICAgICAgaWYgKGF1dG8gZ3B1UHJvY2VzcyA9IEdQVVByb2Nlc3NQcm94eTo6
c2luZ2xldG9uSWZDcmVhdGVkKCkpCisgICAgICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5zZW5k
WFBDRW5kcG9pbnRUb1Byb2Nlc3MoKmdwdVByb2Nlc3MpOworI2VuZGlmCiAgICAgfQogCiAgICAg
cmV0dXJuIHRydWU7CkBAIC02NSw0ICs3MSwxOCBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpYUENF
dmVudEhhbmRsZXI6OlhQCiB7CiB9CiAKK2Jvb2wgTmV0d29ya1Byb2Nlc3NQcm94eTo6c2VuZFhQ
Q0VuZHBvaW50VG9Qcm9jZXNzKEF1eGlsaWFyeVByb2Nlc3NQcm94eSYgcHJvY2VzcykKK3sKKyAg
ICBpZiAocHJvY2Vzcy5zdGF0ZSgpICE9IEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1
bm5pbmcpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBhdXRvKiBjb25uZWN0aW9uID0gcHJv
Y2Vzcy5jb25uZWN0aW9uKCk7CisgICAgaWYgKCFjb25uZWN0aW9uKQorICAgICAgICByZXR1cm4g
ZmFsc2U7CisgICAgYXV0byBtZXNzYWdlID0geHBjRW5kcG9pbnRNZXNzYWdlKCk7CisgICAgaWYg
KCFtZXNzYWdlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgeHBjX2Nvbm5lY3Rpb25fc2Vu
ZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24oKSwgbWVzc2FnZSk7CisgICAgcmV0
dXJuIHRydWU7Cit9CisKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVE
YXRhL1dlYnNpdGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlzaW9uIDI4ODI0NikKKysr
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAko
d29ya2luZyBjb3B5KQpAQCAtMjc4LDkgKzI3OCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3Bh
dGNoT25RdWV1ZShGdW5jdGlvbjx2b2lkKCk+JiYpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0g
ICAgYm9vbCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQ
cm9jZXNzUHJveHkmKSBjb25zdDsKLSAgICB2b2lkIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBv
aW50VG9BbGxQcm9jZXNzZXMoKTsKLSAgICAKICAgICBzdGF0aWMgYm9vbCB1c2VOZXR3b3JrTG9h
ZGVyKCk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh
dGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5t
bQkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh
dGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MTYs
MjggKzYxNiw0IEBAIGJvb2wgV2Vic2l0ZURhdGFTdG9yZTo6bmV0d29ya1Byb2Nlc3NIYXMKICAg
ICByZXR1cm4gV1RGOjpoYXNFbnRpdGxlbWVudChuZXR3b3JrUHJvY2VzcygpLmNvbm5lY3Rpb24o
KS0+eHBjQ29ubmVjdGlvbigpLCBlbnRpdGxlbWVudC51dGY4KCkuZGF0YSgpKTsKIH0KIAotYm9v
bCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2Vz
cyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNvbnN0Ci17Ci0gICAgaWYgKHByb2Nl
c3Muc3RhdGUoKSAhPSBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQotICAg
ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgYXV0byogY29ubmVjdGlvbiA9IHByb2Nlc3MuY29ubmVj
dGlvbigpOwotICAgIGlmICghY29ubmVjdGlvbikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg
IGF1dG8gbWVzc2FnZSA9IG5ldHdvcmtQcm9jZXNzKCkueHBjRW5kcG9pbnRNZXNzYWdlKCk7Ci0g
ICAgaWYgKCFtZXNzYWdlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgeHBjX2Nvbm5lY3Rp
b25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24oKSwgbWVzc2FnZSk7Ci0g
ICAgcmV0dXJuIHRydWU7Ci19Ci0KLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQ
cm9jZXNzWFBDRW5kcG9pbnRUb0FsbFByb2Nlc3NlcygpCi17Ci0gICAgZm9yIChhdXRvJiBwcm9j
ZXNzIDogbV9wcm9jZXNzZXMpCi0gICAgICAgIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50
VG9Qcm9jZXNzKHByb2Nlc3MpOwotI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykKLSAgICBpZiAoR1BV
UHJvY2Vzc1Byb3h5OjpzaW5nbGV0b25JZkNyZWF0ZWQoKSkKLSAgICAgICAgc2VuZE5ldHdvcmtQ
cm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKkdQVVByb2Nlc3NQcm94eTo6c2luZ2xldG9uSWZD
cmVhdGVkKCkpOwotI2VuZGlmCi19Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0JKHJldmlzaW9uIDI4
ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VD
b2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNiBAQAogI2ltcG9ydCAiV2ViUGFn
ZS5oIgogCiAjaW1wb3J0ICJJbnNlcnRUZXh0T3B0aW9ucy5oIgotI2ltcG9ydCAiTGF1bmNoU2Vy
dmljZXNEYXRhYmFzZU1hbmFnZXIuaCIKICNpbXBvcnQgIkxvYWRQYXJhbWV0ZXJzLmgiCiAjaW1w
b3J0ICJQbHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJVc2VyTWVkaWFDYXB0dXJlTWFuYWdlci5oIgpA
QCAtNzcsMjEgKzc2LDYgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUoY29uc3Qg
VwogCiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKGNvbnN0
IExvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewotI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRF
WFQpCi0gICAgc3RhdGljIGJvb2wgaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9
IGZhbHNlOwotICAgIGlmICghaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSkgewot
ICAgICAgICBhdXRvIHN0YXJ0VGltZSA9IFdhbGxUaW1lOjpub3coKTsKLSAgICAgICAgYm9vbCBk
YXRhYmFzZVVwZGF0ZWQgPSBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9u
KCkud2FpdEZvckRhdGFiYXNlVXBkYXRlKDVfcyk7Ci0gICAgICAgIGF1dG8gZWxhcHNlZFRpbWUg
PSBXYWxsVGltZTo6bm93KCkgLSBzdGFydFRpbWU7Ci0gICAgICAgIGlmIChlbGFwc2VkVGltZS52
YWx1ZSgpID4gMC41KQotICAgICAgICAgICAgUkVMRUFTRV9MT0coTG9hZGluZywgIldhaXRpbmcg
Zm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxh
cHNlZFRpbWUudmFsdWUoKSk7Ci0gICAgICAgIEFTU0VSVF9VTlVTRUQoZGF0YWJhc2VVcGRhdGVk
LCBkYXRhYmFzZVVwZGF0ZWQpOwotICAgICAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKLSAgICAg
ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3Ig
TGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsKLSAgICAgICAgaGFzV2FpdGVkRm9y
TGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IHRydWU7Ci0gICAgfQotI2VuZGlmCi0KICAgICBtX2Rh
dGFEZXRlY3Rpb25Db250ZXh0ID0gcGFyYW1ldGVycy5kYXRhRGV0ZWN0aW9uQ29udGV4dDsKIAog
ICAgIGNvbnN1bWVOZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbnMocGFyYW1ldGVycy5u
ZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4dGVuc2lvbkhhbmRsZXMpOwpJbmRleDogU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2Vz
RGF0YWJhc2VNYW5hZ2VyLmgJKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oCSh3b3JraW5nIGNv
cHkpCkBAIC0zNSwxMiArMzUsMTQgQEAgY2xhc3MgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXIgOiBwdQogcHVibGljOgogICAgIHN0YXRpYyBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdl
ciYgc2luZ2xldG9uKCk7CiAKLSAgICBib29sIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZShTZWNvbmRz
KTsKKyAgICB2b2lkIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpOwogCiBwcml2YXRlOgogICAgIHZv
aWQgaGFuZGxlRXZlbnQoeHBjX29iamVjdF90KSBvdmVycmlkZTsKICAgICB2b2lkIGRpZENvbm5l
Y3QoKSBvdmVycmlkZTsKIAorICAgIGJvb2wgd2FpdEZvckRhdGFiYXNlVXBkYXRlKFNlY29uZHMp
OworCiAgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNSZWNlaXZlZExhdW5jaFNlcnZpY2VzRGF0
YWJhc2UgeyBmYWxzZSB9OwogICAgIEJpbmFyeVNlbWFwaG9yZSBtX3NlbWFwaG9yZTsKIH07Cklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFz
ZU1hbmFnZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h
L0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLm1tCShyZXZpc2lvbiAyODgyNDYpCisrKyBT
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpbXBvcnQgIkxhdW5jaFNl
cnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJh
c2VYUENDb25zdGFudHMuaCIKKyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlhQQ0VuZHBv
aW50LmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1w
b3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CkBAIC04MSw0ICs4MiwxNiBAQCBib29sIExh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0CiAgICAgcmV0dXJuIG1fc2VtYXBob3Jl
LndhaXRGb3IodGltZW91dCk7CiB9CiAKK3ZvaWQgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFn
ZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpCit7CisgICAgYXV0byBzdGFydFRpbWUgPSBNb25v
dG9uaWNUaW1lOjpub3coKTsKKyAgICBib29sIGRhdGFiYXNlVXBkYXRlZCA9IHdhaXRGb3JEYXRh
YmFzZVVwZGF0ZSg1X3MpOworICAgIGF1dG8gZWxhcHNlZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpu
b3coKSAtIHN0YXJ0VGltZTsKKyAgICBpZiAoZWxhcHNlZFRpbWUgPiAwLjVfcykKKyAgICAgICAg
UkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgIldhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBk
YXRhYmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxhcHNlZFRpbWUudmFsdWUoKSk7Cisg
ICAgQVNTRVJUX1VOVVNFRChkYXRhYmFzZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7CisgICAg
aWYgKCFkYXRhYmFzZVVwZGF0ZWQpCisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcs
ICJUaW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4i
KTsKK30KKwogfQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl
c3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
V2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2
ICsyOCw3IEBACiAKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgiCiAjaW1wb3J0
ICJHUFVQcm9jZXNzQ29ubmVjdGlvblBhcmFtZXRlcnMuaCIKKyNpbXBvcnQgIkxhdW5jaFNlcnZp
Y2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAjaW1wb3J0ICJMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFn
ZXIuaCIKICNpbXBvcnQgIkxvZ0luaXRpYWxpemF0aW9uLmgiCiAjaW1wb3J0ICJMb2dnaW5nLmgi
CkBAIC0zMjYsNiArMzI3LDEyIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXpl
V2ViUHIKICAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24obWV0aG9kVG9QYXRjaCwgKElNUClO
U0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnQpOwogI2VuZGlmCiAKKyNp
ZiBIQVZFKExTREFUQUJBU0VDT05URVhUKQorICAgIC8vIE9uIE1hYywgdGhpcyBuZWVkcyB0byBi
ZSBjYWxsZWQgYmVmb3JlIE5TQXBwbGljYXRpb24gaXMgYmVpbmcgaW5pdGlhbGl6ZWQuCisgICAg
Ly8gVGhlIE5TQXBwbGljYXRpb24gaW5pdGlhbGl6YXRpb24gaXMgYmVpbmcgZG9uZSBpbiBbTlNB
cHBsaWNhdGlvbiBfYWNjZXNzaWJpbGl0eUluaXRpYWxpemVdCisgICAgTGF1bmNoU2VydmljZXNE
YXRhYmFzZU1hbmFnZXI6OnNpbmdsZXRvbigpLndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpOworI2Vu
ZGlmCisKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShXRUJQUk9DRVNTX05TUlVOTE9PUCkK
ICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbGF1bmNoU2VydmljZXNFeHRlbnNpb247CiAg
ICAgaWYgKHBhcmFtZXRlcnMubGF1bmNoU2VydmljZXNFeHRlbnNpb25IYW5kbGUpIHsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449674</attachid>
            <date>2022-01-21 11:30:31 -0800</date>
            <delta_ts>2022-01-21 16:30:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235186-20220121113030.patch</filename>
            <type>text/plain</type>
            <size>14220</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAxLTE5ICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbmplY3QgTGF1bmNoIFNlcnZp
Y2VzIGRhdGFiYXNlIGJlZm9yZSBOU0FwcGxpY2F0aW9uIGlzIGluaXRpYWxpemVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxODYKKyAgICAgICAg
PHJkYXI6Ly84NzQ2ODc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKwor
ICAgICAgICBUbyBhdm9pZCB0aGUgbWFpbiB0aHJlYWQgZ2V0dGluZyBzdHVjaywgdGhlIExhdW5j
aCBTZXJ2aWNlcyBkYXRhYmFzZSBzaG91bGQgYmUgaW5qZWN0ZWQgYmVmb3JlIE5TQXBwbGljYXRp
b24KKyAgICAgICAgaXMgaW5pdGlhbGl6ZWQsIHNpbmNlIHRoZSBpbml0aWFsaXphdGlvbiBub3cg
ZGVwZW5kcyBvbiB0aGUgZGF0YWJhc2UuIFRvIG1ha2Ugc3VyZSBhbHNvIHByZXdhcm1lZCBXZWJD
b250ZW50CisgICAgICAgIHByb2Nlc3NlcyBhcmUgcmVjZWl2aW5nIHRoZSBMYXVuY2ggU2Vydmlj
ZXMgZGF0YWJhc2UsIHRoZSBXZWJzaXRlRGF0YVN0b3JlIG1ldGhvZAorICAgICAgICBzZW5kTmV0
d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBpcyBtb3ZlZCB0byB0aGUgY2xhc3MgTmV0
d29ya1Byb2Nlc3NQcm94eSwgc2luY2UgcHJld2FybWVkIHByb2Nlc3NlcworICAgICAgICB3aWxs
IG5vdCBoYXZlIGEgZGF0YSBzdG9yZSBpbml0aWFsbHkuIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBs
aWZ5IHRoZSBjb2RlLCBzaW5jZSB3ZSBhcmUgbm8gbG9uZ2VyIGRlcGVuZGluZworICAgICAgICBv
biBoYXZpbmcgYSBXZWJzaXRlIGRhdGEgc3RvcmUgYmVmb3JlIHNlbmRpbmcgdGhlIFhQQyBlbmRw
b2ludC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAg
ICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAgICAg
ICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToK
KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBD
RW5kcG9pbnRUb1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpz
ZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tOgorICAgICAgICAo
V2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyk6CisgICAg
ICAgICogV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlci5oOgor
ICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIu
bW06CisgICAgICAgIChXZWJLaXQ6OkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyOjp3YWl0
Rm9yRGF0YWJhc2VVcGRhdGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp
emVXZWJQcm9jZXNzKToKKwogMjAyMi0wMS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu
Y29tPgogCiAgICAgICAgIFdlYktpdDo6bnNUZXh0QWxpZ25tZW50RnJvbVRleHRBbGlnbm1lbnQo
KSBmYWxscyB0aHJvdWdoIEFTU0VSVF9OT1RfUkVBQ0hFRCgpCkluZGV4OiBTb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI4ODI0NikKKysrIFNv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkK
QEAgLTM0OSwxMyArMzQ5LDYgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnNldFdlYnNpdGVEYXRh
U3RvcgogICAgIEFTU0VSVCghbV93ZWJzaXRlRGF0YVN0b3JlKTsKICAgICBXRUJQUk9DRVNTUFJP
WFlfUkVMRUFTRV9MT0coUHJvY2VzcywgInNldFdlYnNpdGVEYXRhU3RvcmUoKSBkYXRhU3RvcmU9
JXAsIHNlc3Npb25JRD0lIiBQUkl1NjQsICZkYXRhU3RvcmUsIGRhdGFTdG9yZS5zZXNzaW9uSUQo
KS50b1VJbnQ2NCgpKTsKICAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSAmZGF0YVN0b3JlOwotI2lm
IFBMQVRGT1JNKENPQ09BKQotICAgIGRhdGFTdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRw
b2ludFRvUHJvY2VzcygqdGhpcyk7Ci0jaWYgRU5BQkxFKEdQVV9QUk9DRVNTKQotICAgIGlmIChH
UFVQcm9jZXNzUHJveHk6OnNpbmdsZXRvbklmQ3JlYXRlZCgpKQotICAgICAgICBkYXRhU3RvcmUu
c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKkdQVVByb2Nlc3NQcm94eTo6
c2luZ2xldG9uSWZDcmVhdGVkKCkpOwotI2VuZGlmCi0jZW5kaWYKICAgICB1cGRhdGVSZWdpc3Ry
YXRpb25XaXRoRGF0YVN0b3JlKCk7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0
V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMocHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzRGF0YVN0
b3JlUGFyYW1ldGVycygqdGhpcywgZGF0YVN0b3JlKSksIDApOwogCkBAIC0xMDU1LDggKzEwNDgs
OCBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nCiAgICAgfQogCiAj
aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKG1fd2Vic2l0ZURhdGFTdG9yZSkKLSAgICAgICAg
bV93ZWJzaXRlRGF0YVN0b3JlLT5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2Vz
cygqdGhpcyk7CisgICAgaWYgKGF1dG8gbmV0d29ya1Byb2Nlc3MgPSBOZXR3b3JrUHJvY2Vzc1By
b3h5OjpkZWZhdWx0TmV0d29ya1Byb2Nlc3MoKSkKKyAgICAgICAgbmV0d29ya1Byb2Nlc3MtPnNl
bmRYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CiAjZW5kaWYKIAogICAgIFJFTEVBU0VfQVNT
RVJUKCFtX3dlYkNvbm5lY3Rpb24pOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BV
L0dQVVByb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA
IC00NDEsMTUgKzQ0MSw4IEBAIHZvaWQgR1BVUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hp
bmcKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgLy8gVXNlIGFueSBzZXNzaW9u
IElEIHRvIGdldCBhbnkgV2Vic2l0ZSBkYXRhIHN0b3JlLiBJdCBpcyBPSyB0byB1c2UgYW55IFdl
YnNpdGUgZGF0YSBzdG9yZSwKLSAgICAvLyBzaW5jZSB3ZSBhcmUgdXNpbmcgaXQgdG8gYWNjZXNz
IGFueSBOZXR3b3JraW5nIHByb2Nlc3MsIHdoaWNoIGFsbCBoYXZlIHRoZSBYUEMgZW5kcG9pbnQu
Ci0gICAgLy8gVGhlIFhQQyBlbmRwb2ludCBpcyB1c2VkIHRvIHJlY2VpdmUgdGhlIExhdW5jaCBT
ZXJ2aWNlcyBkYXRhYmFzZSBmcm9tIHRoZSBOZXR3b3JrIHByb2Nlc3MuCi0gICAgaWYgKG1fc2Vz
c2lvbklEcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLSAgICBhdXRvIHN0b3JlID0gV2Vi
c2l0ZURhdGFTdG9yZTo6ZXhpc3RpbmdEYXRhU3RvcmVGb3JTZXNzaW9uSUQoKm1fc2Vzc2lvbklE
cy5iZWdpbigpKTsKLSAgICBpZiAoIXN0b3JlKQotICAgICAgICByZXR1cm47Ci0gICAgbV9oYXNT
ZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCA9IHN0b3JlLT5zZW5kTmV0d29ya1Byb2Nlc3NY
UENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CisgICAgaWYgKGF1dG8gbmV0d29ya1Byb2Nlc3Mg
PSBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkZWZhdWx0TmV0d29ya1Byb2Nlc3MoKSkKKyAgICAgICAg
bmV0d29ya1Byb2Nlc3MtPnNlbmRYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CiAjZW5kaWYK
IH0KIApAQCAtNTE1LDExICs1MDgsNiBAQCB2b2lkIEdQVVByb2Nlc3NQcm94eTo6YWRkU2Vzc2lv
bihjb25zdCBXCiAKICAgICBzZW5kKE1lc3NhZ2VzOjpHUFVQcm9jZXNzOjpBZGRTZXNzaW9uIHsg
c3RvcmUuc2Vzc2lvbklEKCksIGdwdVByb2Nlc3NTZXNzaW9uUGFyYW1ldGVycyhzdG9yZSkgfSwg
MCk7CiAgICAgbV9zZXNzaW9uSURzLmFkZChzdG9yZS5zZXNzaW9uSUQoKSk7Ci0KLSNpZiBQTEFU
Rk9STShDT0NPQSkKLSAgICBpZiAoIW1faGFzU2VudE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnQp
Ci0gICAgICAgIG1faGFzU2VudE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnQgPSBzdG9yZS5zZW5k
TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7Ci0jZW5kaWYKIH0KIAog
dm9pZCBHUFVQcm9jZXNzUHJveHk6OnJlbW92ZVNlc3Npb24oUEFMOjpTZXNzaW9uSUQgc2Vzc2lv
bklEKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5o
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJv
eHkuaAkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQ
VVByb2Nlc3NQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNyArMTUxLDYgQEAgcHJpdmF0
ZToKICAgICBib29sIG1faGFzU2VudFRDQ0RTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAg
ICBib29sIG1faGFzU2VudENhbWVyYVNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJv
b2wgbV9oYXNTZW50TWljcm9waG9uZVNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwotICAgIGJv
b2wgbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCB7IGZhbHNlIH07CiAjZW5kaWYK
IAogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpICYmIEVOQUJMRShWUDkpCkluZGV4OiBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku
aAkocmV2aXNpb24gMjg4MjQ2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9O
ZXR3b3JrUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3MSw2ICsyNzEsNyBAQCBw
dWJsaWM6CiAgICAgQVBJOjpDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQmIGN1c3RvbVByb3Rv
Y29sTWFuYWdlckNsaWVudCgpIHsgcmV0dXJuIG1fY3VzdG9tUHJvdG9jb2xNYW5hZ2VyQ2xpZW50
LmdldCgpOyB9CiAKICNpZiBQTEFURk9STShDT0NPQSkKKyAgICBib29sIHNlbmRYUENFbmRwb2lu
dFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKTsKICAgICB4cGNfb2JqZWN0X3QgeHBj
RW5kcG9pbnRNZXNzYWdlKCkgY29uc3QgeyByZXR1cm4gbV9lbmRwb2ludE1lc3NhZ2UuZ2V0KCk7
IH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdv
cmtQcm9jZXNzUHJveHlDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHlDb2NvYS5tbQkocmV2aXNpb24gMjg4MjQ2
KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5
Q29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTUzLDggKzUzLDE0IEBAIGJvb2wgTmV0d29ya1By
b2Nlc3NQcm94eTo6WFBDRXZlbnRIYW5kbGUKIAogICAgIGlmIChtZXNzYWdlTmFtZSA9PSBMYXVu
Y2hTZXJ2aWNlc0RhdGFiYXNlWFBDQ29uc3RhbnRzOjp4cGNMYXVuY2hTZXJ2aWNlc0RhdGFiYXNl
WFBDRW5kcG9pbnRNZXNzYWdlTmFtZSkgewogICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5tX2Vu
ZHBvaW50TWVzc2FnZSA9IGV2ZW50OwotICAgICAgICBmb3IgKGF1dG8mIGRhdGFTdG9yZSA6IGNv
cHlUb1ZlY3Rvck9mPFJlZjxXZWJzaXRlRGF0YVN0b3JlPj4obV9uZXR3b3JrUHJvY2Vzcy0+bV93
ZWJzaXRlRGF0YVN0b3JlcykpCi0gICAgICAgICAgICBkYXRhU3RvcmUtPnNlbmROZXR3b3JrUHJv
Y2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsKKyAgICAgICAgZm9yIChhdXRvJiBwcm9j
ZXNzUG9vbCA6IFdlYlByb2Nlc3NQb29sOjphbGxQcm9jZXNzUG9vbHMoKSkgeworICAgICAgICAg
ICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc1Bvb2wtPnByb2Nlc3NlcygpKQorICAgICAg
ICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNlbmRYUENFbmRwb2ludFRvUHJvY2Vzcyhwcm9j
ZXNzKTsKKyAgICAgICAgfQorI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykKKyAgICAgICAgaWYgKGF1
dG8gZ3B1UHJvY2VzcyA9IEdQVVByb2Nlc3NQcm94eTo6c2luZ2xldG9uSWZDcmVhdGVkKCkpCisg
ICAgICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5zZW5kWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKmdw
dVByb2Nlc3MpOworI2VuZGlmCiAgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CkBAIC02NSw0ICs3
MSwxOCBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpYUENFdmVudEhhbmRsZXI6OlhQCiB7CiB9CiAK
K2Jvb2wgTmV0d29ya1Byb2Nlc3NQcm94eTo6c2VuZFhQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1eGls
aWFyeVByb2Nlc3NQcm94eSYgcHJvY2VzcykKK3sKKyAgICBpZiAocHJvY2Vzcy5zdGF0ZSgpICE9
IEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIHJldHVybiBm
YWxzZTsKKyAgICBhdXRvKiBjb25uZWN0aW9uID0gcHJvY2Vzcy5jb25uZWN0aW9uKCk7CisgICAg
aWYgKCFjb25uZWN0aW9uKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgYXV0byBtZXNzYWdl
ID0geHBjRW5kcG9pbnRNZXNzYWdlKCk7CisgICAgaWYgKCFtZXNzYWdlKQorICAgICAgICByZXR1
cm4gZmFsc2U7CisgICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhw
Y0Nvbm5lY3Rpb24oKSwgbWVzc2FnZSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0KSW5kZXg6
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl
RGF0YVN0b3JlLmgJKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMjc4LDkg
KzI3OCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3BhdGNoT25RdWV1ZShGdW5jdGlvbjx2b2lk
KCk+JiYpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgYm9vbCBzZW5kTmV0d29ya1Byb2Nl
c3NYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKSBjb25zdDsKLSAg
ICB2b2lkIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsKLSAg
ICAKICAgICBzdGF0aWMgYm9vbCB1c2VOZXR3b3JrTG9hZGVyKCk7CiAjZW5kaWYKIApJbmRleDog
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9y
ZUNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVE
YXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQkocmV2aXNpb24gMjg4MjQ2KQorKysg
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9y
ZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MTYsMjggKzYxNiw0IEBAIGJvb2wgV2Vic2l0
ZURhdGFTdG9yZTo6bmV0d29ya1Byb2Nlc3NIYXMKICAgICByZXR1cm4gV1RGOjpoYXNFbnRpdGxl
bWVudChuZXR3b3JrUHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpLCBlbnRp
dGxlbWVudC51dGY4KCkuZGF0YSgpKTsKIH0KIAotYm9vbCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5k
TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkm
IHByb2Nlc3MpIGNvbnN0Ci17Ci0gICAgaWYgKHByb2Nlc3Muc3RhdGUoKSAhPSBBdXhpbGlhcnlQ
cm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg
YXV0byogY29ubmVjdGlvbiA9IHByb2Nlc3MuY29ubmVjdGlvbigpOwotICAgIGlmICghY29ubmVj
dGlvbikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGF1dG8gbWVzc2FnZSA9IG5ldHdvcmtQ
cm9jZXNzKCkueHBjRW5kcG9pbnRNZXNzYWdlKCk7Ci0gICAgaWYgKCFtZXNzYWdlKQotICAgICAg
ICByZXR1cm4gZmFsc2U7Ci0gICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rp
b24tPnhwY0Nvbm5lY3Rpb24oKSwgbWVzc2FnZSk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLXZv
aWQgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb0FsbFBy
b2Nlc3NlcygpCi17Ci0gICAgZm9yIChhdXRvJiBwcm9jZXNzIDogbV9wcm9jZXNzZXMpCi0gICAg
ICAgIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKHByb2Nlc3MpOwotI2lm
IEVOQUJMRShHUFVfUFJPQ0VTUykKLSAgICBpZiAoR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGV0b25J
ZkNyZWF0ZWQoKSkKLSAgICAgICAgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nl
c3MoKkdQVVByb2Nlc3NQcm94eTo6c2luZ2xldG9uSWZDcmVhdGVkKCkpOwotI2VuZGlmCi19Ci0K
IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VD
b2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9D
b2NvYS9XZWJQYWdlQ29jb2EubW0JKHJldmlzaW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQkod29ya2luZyBjb3B5KQpA
QCAtMjcsNyArMjcsNiBAQAogI2ltcG9ydCAiV2ViUGFnZS5oIgogCiAjaW1wb3J0ICJJbnNlcnRU
ZXh0T3B0aW9ucy5oIgotI2ltcG9ydCAiTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIuaCIK
ICNpbXBvcnQgIkxvYWRQYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJQbHVnaW5WaWV3LmgiCiAjaW1w
b3J0ICJVc2VyTWVkaWFDYXB0dXJlTWFuYWdlci5oIgpAQCAtNzcsMjEgKzc2LDYgQEAgdm9pZCBX
ZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUoY29uc3QgVwogCiB2b2lkIFdlYlBhZ2U6OnBsYXRm
b3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKGNvbnN0IExvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0
ZXJzKQogewotI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCi0gICAgc3RhdGljIGJvb2wgaGFz
V2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IGZhbHNlOwotICAgIGlmICghaGFzV2Fp
dGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSkgewotICAgICAgICBhdXRvIHN0YXJ0VGltZSA9
IFdhbGxUaW1lOjpub3coKTsKLSAgICAgICAgYm9vbCBkYXRhYmFzZVVwZGF0ZWQgPSBMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCkud2FpdEZvckRhdGFiYXNlVXBkYXRl
KDVfcyk7Ci0gICAgICAgIGF1dG8gZWxhcHNlZFRpbWUgPSBXYWxsVGltZTo6bm93KCkgLSBzdGFy
dFRpbWU7Ci0gICAgICAgIGlmIChlbGFwc2VkVGltZS52YWx1ZSgpID4gMC41KQotICAgICAgICAg
ICAgUkVMRUFTRV9MT0coTG9hZGluZywgIldhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSB1cGRhdGUgdG9vayAlZiBzZWNvbmRzIiwgZWxhcHNlZFRpbWUudmFsdWUoKSk7Ci0gICAg
ICAgIEFTU0VSVF9VTlVTRUQoZGF0YWJhc2VVcGRhdGVkLCBkYXRhYmFzZVVwZGF0ZWQpOwotICAg
ICAgICBpZiAoIWRhdGFiYXNlVXBkYXRlZCkKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S
KExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3IgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNl
IHVwZGF0ZS4iKTsKLSAgICAgICAgaGFzV2FpdGVkRm9yTGF1bmNoU2VydmljZXNEYXRhYmFzZSA9
IHRydWU7Ci0gICAgfQotI2VuZGlmCi0KICAgICBtX2RhdGFEZXRlY3Rpb25Db250ZXh0ID0gcGFy
YW1ldGVycy5kYXRhRGV0ZWN0aW9uQ29udGV4dDsKIAogICAgIGNvbnN1bWVOZXR3b3JrRXh0ZW5z
aW9uU2FuZGJveEV4dGVuc2lvbnMocGFyYW1ldGVycy5uZXR3b3JrRXh0ZW5zaW9uU2FuZGJveEV4
dGVuc2lvbkhhbmRsZXMpOwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xh
dW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgJKHJldmlz
aW9uIDI4ODI0NikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9MYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMiArMzUsMTQgQEAg
Y2xhc3MgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIgOiBwdQogcHVibGljOgogICAgIHN0
YXRpYyBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlTWFuYWdlciYgc2luZ2xldG9uKCk7CiAKLSAgICBi
b29sIHdhaXRGb3JEYXRhYmFzZVVwZGF0ZShTZWNvbmRzKTsKKyAgICB2b2lkIHdhaXRGb3JEYXRh
YmFzZVVwZGF0ZSgpOwogCiBwcml2YXRlOgogICAgIHZvaWQgaGFuZGxlRXZlbnQoeHBjX29iamVj
dF90KSBvdmVycmlkZTsKICAgICB2b2lkIGRpZENvbm5lY3QoKSBvdmVycmlkZTsKIAorICAgIGJv
b2wgd2FpdEZvckRhdGFiYXNlVXBkYXRlKFNlY29uZHMpOworCiAgICAgc3RkOjphdG9taWM8Ym9v
bD4gbV9oYXNSZWNlaXZlZExhdW5jaFNlcnZpY2VzRGF0YWJhc2UgeyBmYWxzZSB9OwogICAgIEJp
bmFyeVNlbWFwaG9yZSBtX3NlbWFwaG9yZTsKIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvY29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VN
YW5hZ2VyLm1tCShyZXZpc2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29jb2EvTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXIubW0JKHdvcmtpbmcgY29weSkKQEAg
LTI3LDYgKzI3LDcgQEAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgi
CiAKICNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENDb25zdGFudHMuaCIKKyNpbXBv
cnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlhQQ0VuZHBvaW50LmgiCiAjaW1wb3J0IDxwYWwvc3Bp
L2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvRW50aXRsZW1l
bnRzLmg+CkBAIC04MSw0ICs4MiwxNiBAQCBib29sIExhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5h
Z2VyOjp3YWl0CiAgICAgcmV0dXJuIG1fc2VtYXBob3JlLndhaXRGb3IodGltZW91dCk7CiB9CiAK
K3ZvaWQgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OndhaXRGb3JEYXRhYmFzZVVwZGF0
ZSgpCit7CisgICAgYXV0byBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKKyAgICBi
b29sIGRhdGFiYXNlVXBkYXRlZCA9IHdhaXRGb3JEYXRhYmFzZVVwZGF0ZSg1X3MpOworICAgIGF1
dG8gZWxhcHNlZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZTsKKyAgICBp
ZiAoZWxhcHNlZFRpbWUgPiAwLjVfcykKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTG9hZGlu
ZywgIldhaXRpbmcgZm9yIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSB1cGRhdGUgdG9vayAlZiBz
ZWNvbmRzIiwgZWxhcHNlZFRpbWUudmFsdWUoKSk7CisgICAgQVNTRVJUX1VOVVNFRChkYXRhYmFz
ZVVwZGF0ZWQsIGRhdGFiYXNlVXBkYXRlZCk7CisgICAgaWYgKCFkYXRhYmFzZVVwZGF0ZWQpCisg
ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJUaW1lZCBvdXQgd2FpdGluZyBmb3Ig
TGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNlIHVwZGF0ZS4iKTsKK30KKwogfQpJbmRleDogU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZp
c2lvbiAyODgyNDYpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbXBvcnQgIkFj
Y2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgiCiAjaW1wb3J0ICJHUFVQcm9jZXNzQ29ubmVjdGlvblBh
cmFtZXRlcnMuaCIKKyNpbXBvcnQgIkxhdW5jaFNlcnZpY2VzRGF0YWJhc2VNYW5hZ2VyLmgiCiAj
aW1wb3J0ICJMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXIuaCIKICNpbXBvcnQgIkxvZ0luaXRp
YWxpemF0aW9uLmgiCiAjaW1wb3J0ICJMb2dnaW5nLmgiCkBAIC0zMjYsNiArMzI3LDEyIEBAIHZv
aWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICBtZXRob2Rfc2V0SW1w
bGVtZW50YXRpb24obWV0aG9kVG9QYXRjaCwgKElNUClOU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0
eUZvY3VzZWRVSUVsZW1lbnQpOwogI2VuZGlmCiAKKyNpZiBIQVZFKExTREFUQUJBU0VDT05URVhU
KQorICAgIC8vIE9uIE1hYywgdGhpcyBuZWVkcyB0byBiZSBjYWxsZWQgYmVmb3JlIE5TQXBwbGlj
YXRpb24gaXMgYmVpbmcgaW5pdGlhbGl6ZWQuCisgICAgLy8gVGhlIE5TQXBwbGljYXRpb24gaW5p
dGlhbGl6YXRpb24gaXMgYmVpbmcgZG9uZSBpbiBbTlNBcHBsaWNhdGlvbiBfYWNjZXNzaWJpbGl0
eUluaXRpYWxpemVdCisgICAgTGF1bmNoU2VydmljZXNEYXRhYmFzZU1hbmFnZXI6OnNpbmdsZXRv
bigpLndhaXRGb3JEYXRhYmFzZVVwZGF0ZSgpOworI2VuZGlmCisKICNpZiBQTEFURk9STShNQUMp
ICYmIEVOQUJMRShXRUJQUk9DRVNTX05TUlVOTE9PUCkKICAgICBSZWZQdHI8U2FuZGJveEV4dGVu
c2lvbj4gbGF1bmNoU2VydmljZXNFeHRlbnNpb247CiAgICAgaWYgKHBhcmFtZXRlcnMubGF1bmNo
U2VydmljZXNFeHRlbnNpb25IYW5kbGUpIHsK
</data>

          </attachment>
      

    </bug>

</bugzilla>