<?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>232047</bug_id>
          
          <creation_ts>2021-10-20 14:24:28 -0700</creation_ts>
          <short_desc>Launch Services database is not always sent to GPUP</short_desc>
          <delta_ts>2021-10-21 13:36:18 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>darin</cc>
    
    <cc>slewis</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1806838</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 14:24:28 -0700</bug_when>
    <thetext>Currently, the XPC endpoint for receiving the Launch Services database is being sent to GPUP in GPUProcessProxy::addSession. If GPUP has not finished launching at that point, the endpoint will not be sent.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806842</commentid>
    <comment_count>1</comment_count>
      <attachid>441938</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 14:28:36 -0700</bug_when>
    <thetext>Created attachment 441938
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806863</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-20 14:50:24 -0700</bug_when>
    <thetext>&lt;rdar://problem/84480229&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806870</commentid>
    <comment_count>3</comment_count>
      <attachid>441943</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 15:03:42 -0700</bug_when>
    <thetext>Created attachment 441943
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806871</commentid>
    <comment_count>4</comment_count>
      <attachid>441943</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-10-20 15:05:38 -0700</bug_when>
    <thetext>Comment on attachment 441943
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806873</commentid>
    <comment_count>5</comment_count>
      <attachid>441944</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 15:09:01 -0700</bug_when>
    <thetext>Created attachment 441944
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806877</commentid>
    <comment_count>6</comment_count>
      <attachid>441945</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 15:12:41 -0700</bug_when>
    <thetext>Created attachment 441945
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806882</commentid>
    <comment_count>7</comment_count>
      <attachid>441945</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 15:14:37 -0700</bug_when>
    <thetext>Comment on attachment 441945
Patch

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806891</commentid>
    <comment_count>8</comment_count>
      <attachid>441938</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-10-20 15:31:51 -0700</bug_when>
    <thetext>Comment on attachment 441938
Patch

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

Some additional thoughts.

&gt; Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:439
&gt; +    auto it = m_sessionIDs.begin();
&gt; +    if (it != m_sessionIDs.end()) {
&gt; +        auto webSiteDataStore = WebsiteDataStore::existingDataStoreForSessionID(*m_sessionIDs.begin());

This is a slightly unusual pattern. Since m_sessionIDs is a HashSet, choosing the first by iterating gives you an arbitrary member of the set, variable. If that is indeed what you want then I suppose this is OK, but note that this is neither truly random, nor fits any reliable pattern. Almost worth a comment explaining why it’s OK to use only one of the session IDs in a set, because I do not think that is obvious. Maybe just a comment saying &quot;all session IDs are guaranteed to have the same data store&quot;.

Coding style wise, this calls begin() an extra time even though it uses a local variable. There are two ways I might write this that I think would be good style:

    // &lt;Comment explaining why choosing an arbitrary session ID is OK, but random is not needed.&gt;
    if (auto it = m_sessionIDs.begin(); it != m_sessionIDs.end()) {
        auto store = WebsiteDataStore::existingDataStoreForSessionID(*it);

Or:

    // &lt;Comment explaining why choosing an arbitrary session ID is OK, but random is not needed.&gt;
    if (!m_sessionIDs.isEmpty()) {
        auto store = WebsiteDataStore::existingDataStoreForSessionID(m_sessionIDs.begin());

Also, how solid is the guarantee that existingDataStoreForSessionID will not return null?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806909</commentid>
    <comment_count>9</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-20 15:59:42 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #8)
&gt; Comment on attachment 441938 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=441938&amp;action=review
&gt; 
&gt; Some additional thoughts.
&gt; 
&gt; &gt; Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:439
&gt; &gt; +    auto it = m_sessionIDs.begin();
&gt; &gt; +    if (it != m_sessionIDs.end()) {
&gt; &gt; +        auto webSiteDataStore = WebsiteDataStore::existingDataStoreForSessionID(*m_sessionIDs.begin());
&gt; 
&gt; This is a slightly unusual pattern. Since m_sessionIDs is a HashSet,
&gt; choosing the first by iterating gives you an arbitrary member of the set,
&gt; variable. If that is indeed what you want then I suppose this is OK, but
&gt; note that this is neither truly random, nor fits any reliable pattern.
&gt; Almost worth a comment explaining why it’s OK to use only one of the session
&gt; IDs in a set, because I do not think that is obvious. Maybe just a comment
&gt; saying &quot;all session IDs are guaranteed to have the same data store&quot;.
&gt; 
&gt; Coding style wise, this calls begin() an extra time even though it uses a
&gt; local variable. There are two ways I might write this that I think would be
&gt; good style:
&gt; 
&gt;     // &lt;Comment explaining why choosing an arbitrary session ID is OK, but
&gt; random is not needed.&gt;
&gt;     if (auto it = m_sessionIDs.begin(); it != m_sessionIDs.end()) {
&gt;         auto store = WebsiteDataStore::existingDataStoreForSessionID(*it);
&gt; 
&gt; Or:
&gt; 
&gt;     // &lt;Comment explaining why choosing an arbitrary session ID is OK, but
&gt; random is not needed.&gt;
&gt;     if (!m_sessionIDs.isEmpty()) {
&gt;         auto store =
&gt; WebsiteDataStore::existingDataStoreForSessionID(m_sessionIDs.begin());
&gt; 

That is a good point. I will upload a revised patch, adopting one of these approaches and adding a comment. The reason any session ID is OK to use, is that we&apos;re looking to get the XPC endpoint from any Networking process. All Networking processes has this endpoint, and it does not matter from which Networking process we get it from.

&gt; Also, how solid is the guarantee that existingDataStoreForSessionID will not
&gt; return null?

That is also a good point. Although unlikely, I think it is possible that the data store for this session has been removed at this point, since this session ID is kept in a hash map not controlled by the data store class. I will add a null check here.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806910</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-20 16:07:21 -0700</bug_when>
    <thetext>Committed r284582 (243319@main): &lt;https://commits.webkit.org/243319@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441945.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1807175</commentid>
    <comment_count>11</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-21 08:56:02 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1807176</commentid>
    <comment_count>12</comment_count>
      <attachid>442032</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-21 08:56:03 -0700</bug_when>
    <thetext>Created attachment 442032
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1807178</commentid>
    <comment_count>13</comment_count>
      <attachid>442033</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-21 08:59:56 -0700</bug_when>
    <thetext>Created attachment 442033
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1807324</commentid>
    <comment_count>14</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-10-21 13:15:41 -0700</bug_when>
    <thetext>I believe the api-gtk are unrelated to the patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1807344</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-21 13:36:16 -0700</bug_when>
    <thetext>Committed r284641 (243361@main): &lt;https://commits.webkit.org/243361@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 442033.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441938</attachid>
            <date>2021-10-20 14:28:36 -0700</date>
            <delta_ts>2021-10-20 15:03:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211020142835.patch</filename>
            <type>text/plain</type>
            <size>4755</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ1NjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTIwICBQZXIgQXJuZSBW
b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSBpcyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCB0aGUgWFBDIGVuZHBvaW50IGZvciBy
ZWNlaXZpbmcgdGhlIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBpcyBiZWluZyBzZW50IHRvIEdQ
VVAgaW4gR1BVUHJvY2Vzc1Byb3h5OjphZGRTZXNzaW9uLgorICAgICAgICBJZiBHUFVQIGhhcyBu
b3QgZmluaXNoZWQgbGF1bmNoaW5nIGF0IHRoYXQgcG9pbnQsIHRoZSBlbmRwb2ludCB3aWxsIG5v
dCBiZSBzZW50LgorCisgICAgICAgICogVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3Bw
OgorICAgICAgICAoV2ViS2l0OjpHUFVQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6
CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94eTo6YWRkU2Vzc2lvbik6CisgICAgICAg
ICogVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAgICAgICAoV2Vi
S2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJv
Y2VzcyBjb25zdCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh
U3RvcmUuaDoKKwogMjAyMS0xMC0yMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+
CiAKICAgICAgICAgRmFjdG9yIG91dCBzb21lIE5vdGlmaWNhdGlvbnMtc3BlY2lmaWMgbWVzc2Fn
ZXMgZnJvbSBXZWJQYWdlUHJveHkgbWVzc2FnZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAyODQ1MTQpCisrKyBT
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBj
b3B5KQpAQCAtNDMyLDYgKzQzMiwxNCBAQCB2b2lkIEdQVVByb2Nlc3NQcm94eTo6ZGlkRmluaXNo
TGF1bmNoaW5nCiAgICAgaWYgKHhwY19jb25uZWN0aW9uX3QgY29ubmVjdGlvbiA9IHRoaXMtPmNv
bm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpKQogICAgICAgICBtX3Rocm90dGxlci5kaWRDb25u
ZWN0VG9Qcm9jZXNzKHhwY19jb25uZWN0aW9uX2dldF9waWQoY29ubmVjdGlvbikpOwogI2VuZGlm
CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBhdXRvIGl0ID0gbV9zZXNzaW9uSURzLmJlZ2lu
KCk7CisgICAgaWYgKGl0ICE9IG1fc2Vzc2lvbklEcy5lbmQoKSkgeworICAgICAgICBhdXRvIHdl
YlNpdGVEYXRhU3RvcmUgPSBXZWJzaXRlRGF0YVN0b3JlOjpleGlzdGluZ0RhdGFTdG9yZUZvclNl
c3Npb25JRCgqbV9zZXNzaW9uSURzLmJlZ2luKCkpOworICAgICAgICBtX2hhc1NlbnRMYXVuY2hT
ZXJ2aWNlc0RhdGFiYXNlID0gd2ViU2l0ZURhdGFTdG9yZS0+c2VuZE5ldHdvcmtQcm9jZXNzWFBD
RW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOworICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIEdQVVBy
b2Nlc3NQcm94eTo6dXBkYXRlUHJvY2Vzc0Fzc2VydGlvbigpCkBAIC00OTgsNyArNTA2LDggQEAg
dm9pZCBHUFVQcm9jZXNzUHJveHk6OmFkZFNlc3Npb24oY29uc3QgVwogICAgIG1fc2Vzc2lvbklE
cy5hZGQoc3RvcmUuc2Vzc2lvbklEKCkpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgc3Rv
cmUuc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOworICAgIGlm
ICghbV9oYXNTZW50TGF1bmNoU2VydmljZXNEYXRhYmFzZSkKKyAgICAgICAgbV9oYXNTZW50TGF1
bmNoU2VydmljZXNEYXRhYmFzZSA9IHN0b3JlLnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50
VG9Qcm9jZXNzKCp0aGlzKTsKICNlbmRpZgogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCShyZXZpc2lvbiAyODQ1MTQpCisrKyBTb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkK
QEAgLTE0Niw2ICsxNDYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNTZW50VENDRFNhbmRi
b3hFeHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNTZW50Q2FtZXJhU2FuZGJveEV4
dGVuc2lvbiB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1NlbnRNaWNyb3Bob25lU2FuZGJveEV4
dGVuc2lvbiB7IGZhbHNlIH07CisgICAgYm9vbCBtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFi
YXNlIHsgZmFsc2UgfTsKICNlbmRpZgogICAgIEhhc2hTZXQ8UEFMOjpTZXNzaW9uSUQ+IG1fc2Vz
c2lvbklEczsKIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X
ZWJzaXRlRGF0YVN0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZpc2lvbiAyODQ1MTQpCisrKyBTb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHdvcmtp
bmcgY29weSkKQEAgLTI4MCw3ICsyODAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaE9u
UXVldWUoRnVuY3Rpb248dm9pZCgpPiYmKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZv
aWQgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vz
c1Byb3h5JikgY29uc3Q7CisgICAgYm9vbCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRv
UHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKSBjb25zdDsKICAgICB2b2lkIHNlbmROZXR3
b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKTsKICAgICAKICAgICBzdGF0aWMg
Ym9vbCB1c2VOZXR3b3JrTG9hZGVyKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9y
ZUNvY29hLm1tCShyZXZpc2lvbiAyODQ1MTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcgY29weSkK
QEAgLTU5OCwxNyArNTk4LDE4IEBAIGJvb2wgV2Vic2l0ZURhdGFTdG9yZTo6bmV0d29ya1Byb2Nl
c3NIYXMKICAgICByZXR1cm4gV1RGOjpoYXNFbnRpdGxlbWVudChuZXR3b3JrUHJvY2VzcygpLmNv
bm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpLCBlbnRpdGxlbWVudC51dGY4KCkuZGF0YSgpKTsK
IH0KIAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2lu
dFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNvbnN0Citib29sIFdl
YnNpdGVEYXRhU3RvcmU6OnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1
eGlsaWFyeVByb2Nlc3NQcm94eSYgcHJvY2VzcykgY29uc3QKIHsKICAgICBpZiAocHJvY2Vzcy5z
dGF0ZSgpICE9IEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCi0gICAgICAg
IHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGF1dG8qIGNvbm5lY3Rpb24gPSBw
cm9jZXNzLmNvbm5lY3Rpb24oKTsKICAgICBpZiAoIWNvbm5lY3Rpb24pCi0gICAgICAgIHJldHVy
bjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGF1dG8gbWVzc2FnZSA9IG5ldHdvcmtQcm9j
ZXNzKCkueHBjRW5kcG9pbnRNZXNzYWdlKCk7CiAgICAgaWYgKCFtZXNzYWdlKQotICAgICAgICBy
ZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB4cGNfY29ubmVjdGlvbl9zZW5kX21l
c3NhZ2UoY29ubmVjdGlvbi0+eHBjQ29ubmVjdGlvbigpLCBtZXNzYWdlKTsKKyAgICByZXR1cm4g
dHJ1ZTsKIH0KIAogdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENF
bmRwb2ludFRvQWxsUHJvY2Vzc2VzKCkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441943</attachid>
            <date>2021-10-20 15:03:42 -0700</date>
            <delta_ts>2021-10-20 15:08:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211020150341.patch</filename>
            <type>text/plain</type>
            <size>4813</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ1NjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEwLTIwICBQZXIgQXJuZSBW
b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSBpcyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84
NDQ4MDIyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBDdXJyZW50bHksIHRoZSBYUEMgZW5kcG9pbnQgZm9yIHJlY2VpdmluZyB0aGUgTGF1bmNoIFNl
cnZpY2VzIGRhdGFiYXNlIGlzIGJlaW5nIHNlbnQgdG8gR1BVUCBpbiBHUFVQcm9jZXNzUHJveHk6
OmFkZFNlc3Npb24uCisgICAgICAgIElmIEdQVVAgaGFzIG5vdCBmaW5pc2hlZCBsYXVuY2hpbmcg
YXQgdGhhdCBwb2ludCwgdGhlIGVuZHBvaW50IHdpbGwgbm90IGJlIHNlbnQgb24gdGhlIGZpcnN0
IHBhZ2UgbG9hZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNw
cDoKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcp
OgorICAgICAgICAoV2ViS2l0OjpHUFVQcm9jZXNzUHJveHk6OmFkZFNlc3Npb24pOgorICAgICAg
ICAqIFVJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz
L1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1By
b2Nlc3MgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0
YVN0b3JlLmg6CisKIDIwMjEtMTAtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t
PgogCiAgICAgICAgIEZhY3RvciBvdXQgc29tZSBOb3RpZmljYXRpb25zLXNwZWNpZmljIG1lc3Nh
Z2VzIGZyb20gV2ViUGFnZVByb3h5IG1lc3NhZ2VzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMjg0NTE0KQorKysg
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcg
Y29weSkKQEAgLTQzMiw2ICs0MzIsMTQgQEAgdm9pZCBHUFVQcm9jZXNzUHJveHk6OmRpZEZpbmlz
aExhdW5jaGluZwogICAgIGlmICh4cGNfY29ubmVjdGlvbl90IGNvbm5lY3Rpb24gPSB0aGlzLT5j
b25uZWN0aW9uKCktPnhwY0Nvbm5lY3Rpb24oKSkKICAgICAgICAgbV90aHJvdHRsZXIuZGlkQ29u
bmVjdFRvUHJvY2Vzcyh4cGNfY29ubmVjdGlvbl9nZXRfcGlkKGNvbm5lY3Rpb24pKTsKICNlbmRp
ZgorCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgYXV0byBpdCA9IG1fc2Vzc2lvbklEcy5iZWdp
bigpOworICAgIGlmIChpdCAhPSBtX3Nlc3Npb25JRHMuZW5kKCkpIHsKKyAgICAgICAgYXV0byB3
ZWJTaXRlRGF0YVN0b3JlID0gV2Vic2l0ZURhdGFTdG9yZTo6ZXhpc3RpbmdEYXRhU3RvcmVGb3JT
ZXNzaW9uSUQoKm1fc2Vzc2lvbklEcy5iZWdpbigpKTsKKyAgICAgICAgbV9oYXNTZW50TGF1bmNo
U2VydmljZXNEYXRhYmFzZSA9IHdlYlNpdGVEYXRhU3RvcmUtPnNlbmROZXR3b3JrUHJvY2Vzc1hQ
Q0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBHUFVQ
cm9jZXNzUHJveHk6OnVwZGF0ZVByb2Nlc3NBc3NlcnRpb24oKQpAQCAtNDk4LDcgKzUwNiw4IEBA
IHZvaWQgR1BVUHJvY2Vzc1Byb3h5OjphZGRTZXNzaW9uKGNvbnN0IFcKICAgICBtX3Nlc3Npb25J
RHMuYWRkKHN0b3JlLnNlc3Npb25JRCgpKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHN0
b3JlLnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKKyAgICBp
ZiAoIW1faGFzU2VudExhdW5jaFNlcnZpY2VzRGF0YWJhc2UpCisgICAgICAgIG1faGFzU2VudExh
dW5jaFNlcnZpY2VzRGF0YWJhc2UgPSBzdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2lu
dFRvUHJvY2VzcygqdGhpcyk7CiAjZW5kaWYKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaAkocmV2aXNpb24gMjg0NTE0KQorKysgU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCSh3b3JraW5nIGNvcHkp
CkBAIC0xNDYsNiArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGFzU2VudFRDQ0RTYW5k
Ym94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzU2VudENhbWVyYVNhbmRib3hF
eHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNTZW50TWljcm9waG9uZVNhbmRib3hF
eHRlbnNpb24geyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNTZW50TGF1bmNoU2VydmljZXNEYXRh
YmFzZSB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBIYXNoU2V0PFBBTDo6U2Vzc2lvbklEPiBtX3Nl
c3Npb25JRHM7CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv
V2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkocmV2aXNpb24gMjg0NTE0KQorKysgU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCSh3b3Jr
aW5nIGNvcHkpCkBAIC0yODAsNyArMjgwLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hP
blF1ZXVlKEZ1bmN0aW9uPHZvaWQoKT4mJik7CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICB2
b2lkIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1eGlsaWFyeVByb2Nl
c3NQcm94eSYpIGNvbnN0OworICAgIGJvb2wgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRU
b1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JikgY29uc3Q7CiAgICAgdm9pZCBzZW5kTmV0
d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvQWxsUHJvY2Vzc2VzKCk7CiAgICAgCiAgICAgc3RhdGlj
IGJvb2wgdXNlTmV0d29ya0xvYWRlcigpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3Rv
cmVDb2NvYS5tbQkocmV2aXNpb24gMjg0NTE0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCSh3b3JraW5nIGNvcHkp
CkBAIC01OTgsMTcgKzU5OCwxOCBAQCBib29sIFdlYnNpdGVEYXRhU3RvcmU6Om5ldHdvcmtQcm9j
ZXNzSGFzCiAgICAgcmV0dXJuIFdURjo6aGFzRW50aXRsZW1lbnQobmV0d29ya1Byb2Nlc3MoKS5j
b25uZWN0aW9uKCktPnhwY0Nvbm5lY3Rpb24oKSwgZW50aXRsZW1lbnQudXRmOCgpLmRhdGEoKSk7
CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9p
bnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JiBwcm9jZXNzKSBjb25zdAorYm9vbCBX
ZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcyhB
dXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNvbnN0CiB7CiAgICAgaWYgKHByb2Nlc3Mu
c3RhdGUoKSAhPSBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQotICAgICAg
ICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBhdXRvKiBjb25uZWN0aW9uID0g
cHJvY2Vzcy5jb25uZWN0aW9uKCk7CiAgICAgaWYgKCFjb25uZWN0aW9uKQotICAgICAgICByZXR1
cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBhdXRvIG1lc3NhZ2UgPSBuZXR3b3JrUHJv
Y2VzcygpLnhwY0VuZHBvaW50TWVzc2FnZSgpOwogICAgIGlmICghbWVzc2FnZSkKLSAgICAgICAg
cmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9t
ZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24oKSwgbWVzc2FnZSk7CisgICAgcmV0dXJu
IHRydWU7CiB9CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBD
RW5kcG9pbnRUb0FsbFByb2Nlc3NlcygpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441944</attachid>
            <date>2021-10-20 15:09:01 -0700</date>
            <delta_ts>2021-10-20 15:11:17 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211020150900.patch</filename>
            <type>text/plain</type>
            <size>5003</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ1NjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEwLTIwICBQZXIgQXJuZSBW
b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSBpcyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84
NDQ4MDIyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBDdXJyZW50bHksIHRoZSBYUEMgZW5kcG9pbnQgZm9yIHJlY2VpdmluZyB0aGUgTGF1bmNoIFNl
cnZpY2VzIGRhdGFiYXNlIGlzIGJlaW5nIHNlbnQgdG8gR1BVUCBpbiBHUFVQcm9jZXNzUHJveHk6
OmFkZFNlc3Npb24uCisgICAgICAgIElmIEdQVVAgaGFzIG5vdCBmaW5pc2hlZCBsYXVuY2hpbmcg
YXQgdGhhdCBwb2ludCwgdGhlIGVuZHBvaW50IHdpbGwgbm90IGJlIHNlbnQgb24gdGhlIGZpcnN0
IHBhZ2UgbG9hZC4gVGhpcyBpcyBhZGRyZXNzZWQgYnkKKyAgICAgICAgc2VuZGluZyB0aGUgWFBD
IGVuZHBvaW50IGluIEdQVVByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nLCBzaW5jZSB0
aGUgWFBDIGNvbm5lY3Rpb24gb3ZlciB3aGljaCB0aGUgWFBDIGVuZHBvaW50IGlzCisgICAgICAg
IGJlaW5nIHNlbnQgaXMgYXZhaWxhYmxlIHRoZW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BV
L0dQVVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94eTo6
ZGlkRmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc1Byb3h5Ojph
ZGRTZXNzaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29j
b2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNlbmROZXR3b3JrUHJv
Y2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi
c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oOgorCiAyMDIxLTEwLTIwICBCcmFkeSBFaWRzb24g
IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IHNvbWUgTm90aWZpY2F0
aW9ucy1zcGVjaWZpYyBtZXNzYWdlcyBmcm9tIFdlYlBhZ2VQcm94eSBtZXNzYWdlcwpJbmRleDog
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHJl
dmlzaW9uIDI4NDUxNCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNz
UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzIsNiArNDMyLDE0IEBAIHZvaWQgR1BVUHJv
Y2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcKICAgICBpZiAoeHBjX2Nvbm5lY3Rpb25fdCBj
b25uZWN0aW9uID0gdGhpcy0+Y29ubmVjdGlvbigpLT54cGNDb25uZWN0aW9uKCkpCiAgICAgICAg
IG1fdGhyb3R0bGVyLmRpZENvbm5lY3RUb1Byb2Nlc3MoeHBjX2Nvbm5lY3Rpb25fZ2V0X3BpZChj
b25uZWN0aW9uKSk7CiAjZW5kaWYKKworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGF1dG8gaXQg
PSBtX3Nlc3Npb25JRHMuYmVnaW4oKTsKKyAgICBpZiAoaXQgIT0gbV9zZXNzaW9uSURzLmVuZCgp
KSB7CisgICAgICAgIGF1dG8gd2ViU2l0ZURhdGFTdG9yZSA9IFdlYnNpdGVEYXRhU3RvcmU6OmV4
aXN0aW5nRGF0YVN0b3JlRm9yU2Vzc2lvbklEKCptX3Nlc3Npb25JRHMuYmVnaW4oKSk7CisgICAg
ICAgIG1faGFzU2VudExhdW5jaFNlcnZpY2VzRGF0YWJhc2UgPSB3ZWJTaXRlRGF0YVN0b3JlLT5z
ZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CisgICAgfQorI2Vu
ZGlmCiB9CiAKIHZvaWQgR1BVUHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzQXNzZXJ0aW9uKCkK
QEAgLTQ5OCw3ICs1MDYsOCBAQCB2b2lkIEdQVVByb2Nlc3NQcm94eTo6YWRkU2Vzc2lvbihjb25z
dCBXCiAgICAgbV9zZXNzaW9uSURzLmFkZChzdG9yZS5zZXNzaW9uSUQoKSk7CiAKICNpZiBQTEFU
Rk9STShDT0NPQSkKLSAgICBzdG9yZS5zZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJv
Y2VzcygqdGhpcyk7CisgICAgaWYgKCFtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlKQor
ICAgICAgICBtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlID0gc3RvcmUuc2VuZE5ldHdv
cmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRoaXMpOwogI2VuZGlmCiB9CiAKSW5kZXg6
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgJKHJldmlz
aW9uIDI4NDUxNCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJv
eHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDYgKzE0Niw3IEBAIHByaXZhdGU6CiAgICAgYm9v
bCBtX2hhc1NlbnRUQ0NEU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hh
c1NlbnRDYW1lcmFTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzU2Vu
dE1pY3JvcGhvbmVTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKKyAgICBib29sIG1faGFzU2Vu
dExhdW5jaFNlcnZpY2VzRGF0YWJhc2UgeyBmYWxzZSB9OwogI2VuZGlmCiAgICAgSGFzaFNldDxQ
QUw6OlNlc3Npb25JRD4gbV9zZXNzaW9uSURzOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlz
aW9uIDI4NDUxNCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp
dGVEYXRhU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMjgwLDcgKzI4MCw3IEBAIHB1YmxpYzoK
ICAgICB2b2lkIGRpc3BhdGNoT25RdWV1ZShGdW5jdGlvbjx2b2lkKCk+JiYpOwogCiAjaWYgUExB
VEZPUk0oQ09DT0EpCi0gICAgdm9pZCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvUHJv
Y2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmKSBjb25zdDsKKyAgICBib29sIHNlbmROZXR3b3Jr
UHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1eGlsaWFyeVByb2Nlc3NQcm94eSYpIGNvbnN0
OwogICAgIHZvaWQgc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb0FsbFByb2Nlc3Nlcygp
OwogICAgIAogICAgIHN0YXRpYyBib29sIHVzZU5ldHdvcmtMb2FkZXIoKTsKSW5kZXg6IFNvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2Nv
YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9D
b2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHJldmlzaW9uIDI4NDUxNCkKKysrIFNvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2Nv
YS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTk4LDE3ICs1OTgsMTggQEAgYm9vbCBXZWJzaXRlRGF0
YVN0b3JlOjpuZXR3b3JrUHJvY2Vzc0hhcwogICAgIHJldHVybiBXVEY6Omhhc0VudGl0bGVtZW50
KG5ldHdvcmtQcm9jZXNzKCkuY29ubmVjdGlvbigpLT54cGNDb25uZWN0aW9uKCksIGVudGl0bGVt
ZW50LnV0ZjgoKS5kYXRhKCkpOwogfQogCi12b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnNlbmROZXR3
b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKEF1eGlsaWFyeVByb2Nlc3NQcm94eSYgcHJv
Y2VzcykgY29uc3QKK2Jvb2wgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9jZXNzWFBD
RW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JiBwcm9jZXNzKSBjb25zdAog
ewogICAgIGlmIChwcm9jZXNzLnN0YXRlKCkgIT0gQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5OjpTdGF0
ZTo6UnVubmluZykKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg
YXV0byogY29ubmVjdGlvbiA9IHByb2Nlc3MuY29ubmVjdGlvbigpOwogICAgIGlmICghY29ubmVj
dGlvbikKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgYXV0byBt
ZXNzYWdlID0gbmV0d29ya1Byb2Nlc3MoKS54cGNFbmRwb2ludE1lc3NhZ2UoKTsKICAgICBpZiAo
IW1lc3NhZ2UpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHhw
Y19jb25uZWN0aW9uX3NlbmRfbWVzc2FnZShjb25uZWN0aW9uLT54cGNDb25uZWN0aW9uKCksIG1l
c3NhZ2UpOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnNl
bmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9BbGxQcm9jZXNzZXMoKQo=
</data>
<flag name="review"
          id="466335"
          type_id="1"
          status="+"
          setter="bfulgham"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441945</attachid>
            <date>2021-10-20 15:12:41 -0700</date>
            <delta_ts>2021-10-20 16:07:22 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211020151240.patch</filename>
            <type>text/plain</type>
            <size>5002</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ1NjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEwLTIwICBQZXIgQXJuZSBW
b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSBpcyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84
NDQ4MDIyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAg
IEN1cnJlbnRseSwgdGhlIFhQQyBlbmRwb2ludCBmb3IgcmVjZWl2aW5nIHRoZSBMYXVuY2ggU2Vy
dmljZXMgZGF0YWJhc2UgaXMgYmVpbmcgc2VudCB0byBHUFVQIGluIEdQVVByb2Nlc3NQcm94eTo6
YWRkU2Vzc2lvbi4KKyAgICAgICAgSWYgR1BVUCBoYXMgbm90IGZpbmlzaGVkIGxhdW5jaGluZyBh
dCB0aGF0IHBvaW50LCB0aGUgZW5kcG9pbnQgd2lsbCBub3QgYmUgc2VudCBvbiB0aGUgZmlyc3Qg
cGFnZSBsb2FkLiBUaGlzIGlzIGFkZHJlc3NlZCBieQorICAgICAgICBzZW5kaW5nIHRoZSBYUEMg
ZW5kcG9pbnQgaW4gR1BVUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcsIHNpbmNlIHRo
ZSBYUEMgY29ubmVjdGlvbiBvdmVyIHdoaWNoIHRoZSBYUEMgZW5kcG9pbnQgaXMKKyAgICAgICAg
YmVpbmcgc2VudCBpcyBhdmFpbGFibGUgdGhlbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9HUFUv
R1BVUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc1Byb3h5Ojpk
aWRGaW5pc2hMYXVuY2hpbmcpOgorICAgICAgICAoV2ViS2l0OjpHUFVQcm9jZXNzUHJveHk6OmFk
ZFNlc3Npb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5Lmg6Cisg
ICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2Nv
YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdvcmtQcm9j
ZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJz
aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmg6CisKIDIwMjEtMTAtMjAgIEJyYWR5IEVpZHNvbiAg
PGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIEZhY3RvciBvdXQgc29tZSBOb3RpZmljYXRp
b25zLXNwZWNpZmljIG1lc3NhZ2VzIGZyb20gV2ViUGFnZVByb3h5IG1lc3NhZ2VzCkluZGV4OiBT
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAkocmV2
aXNpb24gMjg0NTE0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQ
cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzMiw2ICs0MzIsMTQgQEAgdm9pZCBHUFVQcm9j
ZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZwogICAgIGlmICh4cGNfY29ubmVjdGlvbl90IGNv
bm5lY3Rpb24gPSB0aGlzLT5jb25uZWN0aW9uKCktPnhwY0Nvbm5lY3Rpb24oKSkKICAgICAgICAg
bV90aHJvdHRsZXIuZGlkQ29ubmVjdFRvUHJvY2Vzcyh4cGNfY29ubmVjdGlvbl9nZXRfcGlkKGNv
bm5lY3Rpb24pKTsKICNlbmRpZgorCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgYXV0byBpdCA9
IG1fc2Vzc2lvbklEcy5iZWdpbigpOworICAgIGlmIChpdCAhPSBtX3Nlc3Npb25JRHMuZW5kKCkp
IHsKKyAgICAgICAgYXV0byB3ZWJTaXRlRGF0YVN0b3JlID0gV2Vic2l0ZURhdGFTdG9yZTo6ZXhp
c3RpbmdEYXRhU3RvcmVGb3JTZXNzaW9uSUQoKm1fc2Vzc2lvbklEcy5iZWdpbigpKTsKKyAgICAg
ICAgbV9oYXNTZW50TGF1bmNoU2VydmljZXNEYXRhYmFzZSA9IHdlYlNpdGVEYXRhU3RvcmUtPnNl
bmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKKyAgICB9CisjZW5k
aWYKIH0KIAogdm9pZCBHUFVQcm9jZXNzUHJveHk6OnVwZGF0ZVByb2Nlc3NBc3NlcnRpb24oKQpA
QCAtNDk4LDcgKzUwNiw4IEBAIHZvaWQgR1BVUHJvY2Vzc1Byb3h5OjphZGRTZXNzaW9uKGNvbnN0
IFcKICAgICBtX3Nlc3Npb25JRHMuYWRkKHN0b3JlLnNlc3Npb25JRCgpKTsKIAogI2lmIFBMQVRG
T1JNKENPQ09BKQotICAgIHN0b3JlLnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9j
ZXNzKCp0aGlzKTsKKyAgICBpZiAoIW1faGFzU2VudExhdW5jaFNlcnZpY2VzRGF0YWJhc2UpCisg
ICAgICAgIG1faGFzU2VudExhdW5jaFNlcnZpY2VzRGF0YWJhc2UgPSBzdG9yZS5zZW5kTmV0d29y
a1Byb2Nlc3NYUENFbmRwb2ludFRvUHJvY2VzcygqdGhpcyk7CiAjZW5kaWYKIH0KIApJbmRleDog
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuaAkocmV2aXNp
b24gMjg0NTE0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94
eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYsNiArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBib29s
IG1faGFzU2VudFRDQ0RTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFz
U2VudENhbWVyYVNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNTZW50
TWljcm9waG9uZVNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNTZW50
TGF1bmNoU2VydmljZXNEYXRhYmFzZSB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBIYXNoU2V0PFBB
TDo6U2Vzc2lvbklEPiBtX3Nlc3Npb25JRHM7CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkocmV2aXNp
b24gMjg0NTE0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0
ZURhdGFTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODAsNyArMjgwLDcgQEAgcHVibGljOgog
ICAgIHZvaWQgZGlzcGF0Y2hPblF1ZXVlKEZ1bmN0aW9uPHZvaWQoKT4mJik7CiAKICNpZiBQTEFU
Rk9STShDT0NPQSkKLSAgICB2b2lkIHNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9j
ZXNzKEF1eGlsaWFyeVByb2Nlc3NQcm94eSYpIGNvbnN0OworICAgIGJvb2wgc2VuZE5ldHdvcmtQ
cm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JikgY29uc3Q7
CiAgICAgdm9pZCBzZW5kTmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludFRvQWxsUHJvY2Vzc2VzKCk7
CiAgICAgCiAgICAgc3RhdGljIGJvb2wgdXNlTmV0d29ya0xvYWRlcigpOwpJbmRleDogU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29h
Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0Nv
Y29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQkocmV2aXNpb24gMjg0NTE0KQorKysgU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29h
Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01OTgsMTcgKzU5OCwxOCBAQCBib29sIFdlYnNpdGVEYXRh
U3RvcmU6Om5ldHdvcmtQcm9jZXNzSGFzCiAgICAgcmV0dXJuIFdURjo6aGFzRW50aXRsZW1lbnQo
bmV0d29ya1Byb2Nlc3MoKS5jb25uZWN0aW9uKCktPnhwY0Nvbm5lY3Rpb24oKSwgZW50aXRsZW1l
bnQudXRmOCgpLmRhdGEoKSk7CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2VuZE5ldHdv
cmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoQXV4aWxpYXJ5UHJvY2Vzc1Byb3h5JiBwcm9j
ZXNzKSBjb25zdAorYm9vbCBXZWJzaXRlRGF0YVN0b3JlOjpzZW5kTmV0d29ya1Byb2Nlc3NYUENF
bmRwb2ludFRvUHJvY2VzcyhBdXhpbGlhcnlQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNvbnN0CiB7
CiAgICAgaWYgKHByb2Nlc3Muc3RhdGUoKSAhPSBBdXhpbGlhcnlQcm9jZXNzUHJveHk6OlN0YXRl
OjpSdW5uaW5nKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBh
dXRvKiBjb25uZWN0aW9uID0gcHJvY2Vzcy5jb25uZWN0aW9uKCk7CiAgICAgaWYgKCFjb25uZWN0
aW9uKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBhdXRvIG1l
c3NhZ2UgPSBuZXR3b3JrUHJvY2VzcygpLnhwY0VuZHBvaW50TWVzc2FnZSgpOwogICAgIGlmICgh
bWVzc2FnZSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgeHBj
X2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24oKSwgbWVz
c2FnZSk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2Vu
ZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb0FsbFByb2Nlc3NlcygpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442032</attachid>
            <date>2021-10-21 08:56:03 -0700</date>
            <delta_ts>2021-10-21 08:59:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211021085601.patch</filename>
            <type>text/plain</type>
            <size>3108</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ2MDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTIxICBQZXIgQXJuZSAg
PHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZSBp
cyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDQ4MDIy
OT4KKworICAgICAgICBVbnJldmlld2VkLCBhZGRyZXNzIHBvc3QgY29tbWl0IHJldmlldyBmZWVk
YmFjay4KKworICAgICAgICBBZGRyZXNzIHJldmlldyBmZWVkYmFjay4gQWxzbyByZW5hbWUgYSBk
YXRhIG1lbWJlciB3aGljaCBoYWQgYSBtaXNsZWFkaW5nIG5hbWUuCisKKyAgICAgICAgKiBVSVBy
b2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nl
c3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vz
c1Byb3h5OjphZGRTZXNzaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQ
cm94eS5oOgorCiAyMDIxLTEwLTIxICBDaHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KIAog
ICAgICAgICBbV1BFXVtHVEtdIEVuYWJsZSBzbW9vdGggc2Nyb2xsaW5nIGJ5IGRlZmF1bHQKSW5k
ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3Bw
CShyZXZpc2lvbiAyODQ2MDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJv
Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM0LDExICs0MzQsMTUgQEAgdm9pZCBH
UFVQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZwogI2VuZGlmCiAKICNpZiBQTEFURk9S
TShDT0NPQSkKLSAgICBhdXRvIGl0ID0gbV9zZXNzaW9uSURzLmJlZ2luKCk7Ci0gICAgaWYgKGl0
ICE9IG1fc2Vzc2lvbklEcy5lbmQoKSkgewotICAgICAgICBhdXRvIHdlYlNpdGVEYXRhU3RvcmUg
PSBXZWJzaXRlRGF0YVN0b3JlOjpleGlzdGluZ0RhdGFTdG9yZUZvclNlc3Npb25JRCgqbV9zZXNz
aW9uSURzLmJlZ2luKCkpOwotICAgICAgICBtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFiYXNl
ID0gd2ViU2l0ZURhdGFTdG9yZS0+c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nl
c3MoKnRoaXMpOwotICAgIH0KKyAgICAvLyBVc2UgYW55IHNlc3Npb24gSUQgdG8gZ2V0IGFueSBX
ZWJzaXRlIGRhdGEgc3RvcmUuIEl0IGlzIE9LIHRvIHVzZSBhbnkgV2Vic2l0ZSBkYXRhIHN0b3Jl
LAorICAgIC8vIHNpbmNlIHdlIGFyZSB1c2luZyBpdCB0byBhY2Nlc3MgYW55IE5ldHdvcmtpbmcg
cHJvY2Vzcywgd2hpY2ggYWxsIGhhdmUgdGhlIFhQQyBlbmRwb2ludC4KKyAgICAvLyBUaGUgWFBD
IGVuZHBvaW50IGlzIHVzZWQgdG8gcmVjZWl2ZSB0aGUgTGF1bmNoIFNlcnZpY2VzIGRhdGFiYXNl
IGZyb20gdGhlIE5ldHdvcmsgcHJvY2Vzcy4KKyAgICBpZiAobV9zZXNzaW9uSURzLmlzRW1wdHko
KSkKKyAgICAgICAgcmV0dXJuOworICAgIGF1dG8gc3RvcmUgPSBXZWJzaXRlRGF0YVN0b3JlOjpl
eGlzdGluZ0RhdGFTdG9yZUZvclNlc3Npb25JRCgqbV9zZXNzaW9uSURzLmJlZ2luKCkpOworICAg
IGlmICghc3RvcmUpCisgICAgICAgIHJldHVybjsKKyAgICBtX2hhc1NlbnROZXR3b3JrUHJvY2Vz
c1hQQ0VuZHBvaW50ID0gc3RvcmUtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9j
ZXNzKCp0aGlzKTsKICNlbmRpZgogfQogCkBAIC01MDYsOCArNTEwLDggQEAgdm9pZCBHUFVQcm9j
ZXNzUHJveHk6OmFkZFNlc3Npb24oY29uc3QgVwogICAgIG1fc2Vzc2lvbklEcy5hZGQoc3RvcmUu
c2Vzc2lvbklEKCkpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKCFtX2hhc1NlbnRM
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlKQotICAgICAgICBtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0Rh
dGFiYXNlID0gc3RvcmUuc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nlc3MoKnRo
aXMpOworICAgIGlmICghbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCkKKyAgICAg
ICAgbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCA9IHN0b3JlLnNlbmROZXR3b3Jr
UHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKICNlbmRpZgogfQogCkluZGV4OiBT
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCShyZXZpc2lv
biAyODQ2MDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5
LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg
bV9oYXNTZW50VENDRFNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNT
ZW50Q2FtZXJhU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1NlbnRN
aWNyb3Bob25lU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2hhc1NlbnRM
YXVuY2hTZXJ2aWNlc0RhdGFiYXNlIHsgZmFsc2UgfTsKKyAgICBib29sIG1faGFzU2VudE5ldHdv
cmtQcm9jZXNzWFBDRW5kcG9pbnQgeyBmYWxzZSB9OwogI2VuZGlmCiAgICAgSGFzaFNldDxQQUw6
OlNlc3Npb25JRD4gbV9zZXNzaW9uSURzOwogfTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442033</attachid>
            <date>2021-10-21 08:59:56 -0700</date>
            <delta_ts>2021-10-21 13:36:17 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232047-20211021085954.patch</filename>
            <type>text/plain</type>
            <size>3114</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ2MDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTIxICBQZXIgQXJuZSBW
b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExhdW5jaCBTZXJ2aWNlcyBkYXRh
YmFzZSBpcyBub3QgYWx3YXlzIHNlbnQgdG8gR1BVUAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDQ3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84
NDQ4MDIyOT4KKworICAgICAgICBVbnJldmlld2VkLCBhZGRyZXNzIHBvc3QgY29tbWl0IHJldmll
dyBmZWVkYmFjay4KKworICAgICAgICBBZGRyZXNzIHJldmlldyBmZWVkYmFjay4gQWxzbyByZW5h
bWUgYSBkYXRhIG1lbWJlciB3aGljaCBoYWQgYSBtaXNsZWFkaW5nIG5hbWUuCisKKyAgICAgICAg
KiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQ
VVByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAgKFdlYktpdDo6R1BV
UHJvY2Vzc1Byb3h5OjphZGRTZXNzaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVBy
b2Nlc3NQcm94eS5oOgorCiAyMDIxLTEwLTIxICBDaHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNv
bT4KIAogICAgICAgICBbV1BFXVtHVEtdIEVuYWJsZSBzbW9vdGggc2Nyb2xsaW5nIGJ5IGRlZmF1
bHQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJv
eHkuY3BwCShyZXZpc2lvbiAyODQ2MDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUv
R1BVUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM0LDExICs0MzQsMTUgQEAg
dm9pZCBHUFVQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZwogI2VuZGlmCiAKICNpZiBQ
TEFURk9STShDT0NPQSkKLSAgICBhdXRvIGl0ID0gbV9zZXNzaW9uSURzLmJlZ2luKCk7Ci0gICAg
aWYgKGl0ICE9IG1fc2Vzc2lvbklEcy5lbmQoKSkgewotICAgICAgICBhdXRvIHdlYlNpdGVEYXRh
U3RvcmUgPSBXZWJzaXRlRGF0YVN0b3JlOjpleGlzdGluZ0RhdGFTdG9yZUZvclNlc3Npb25JRCgq
bV9zZXNzaW9uSURzLmJlZ2luKCkpOwotICAgICAgICBtX2hhc1NlbnRMYXVuY2hTZXJ2aWNlc0Rh
dGFiYXNlID0gd2ViU2l0ZURhdGFTdG9yZS0+c2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRU
b1Byb2Nlc3MoKnRoaXMpOwotICAgIH0KKyAgICAvLyBVc2UgYW55IHNlc3Npb24gSUQgdG8gZ2V0
IGFueSBXZWJzaXRlIGRhdGEgc3RvcmUuIEl0IGlzIE9LIHRvIHVzZSBhbnkgV2Vic2l0ZSBkYXRh
IHN0b3JlLAorICAgIC8vIHNpbmNlIHdlIGFyZSB1c2luZyBpdCB0byBhY2Nlc3MgYW55IE5ldHdv
cmtpbmcgcHJvY2Vzcywgd2hpY2ggYWxsIGhhdmUgdGhlIFhQQyBlbmRwb2ludC4KKyAgICAvLyBU
aGUgWFBDIGVuZHBvaW50IGlzIHVzZWQgdG8gcmVjZWl2ZSB0aGUgTGF1bmNoIFNlcnZpY2VzIGRh
dGFiYXNlIGZyb20gdGhlIE5ldHdvcmsgcHJvY2Vzcy4KKyAgICBpZiAobV9zZXNzaW9uSURzLmlz
RW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGF1dG8gc3RvcmUgPSBXZWJzaXRlRGF0YVN0
b3JlOjpleGlzdGluZ0RhdGFTdG9yZUZvclNlc3Npb25JRCgqbV9zZXNzaW9uSURzLmJlZ2luKCkp
OworICAgIGlmICghc3RvcmUpCisgICAgICAgIHJldHVybjsKKyAgICBtX2hhc1NlbnROZXR3b3Jr
UHJvY2Vzc1hQQ0VuZHBvaW50ID0gc3RvcmUtPnNlbmROZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50
VG9Qcm9jZXNzKCp0aGlzKTsKICNlbmRpZgogfQogCkBAIC01MDYsOCArNTEwLDggQEAgdm9pZCBH
UFVQcm9jZXNzUHJveHk6OmFkZFNlc3Npb24oY29uc3QgVwogICAgIG1fc2Vzc2lvbklEcy5hZGQo
c3RvcmUuc2Vzc2lvbklEKCkpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKCFtX2hh
c1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlKQotICAgICAgICBtX2hhc1NlbnRMYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlID0gc3RvcmUuc2VuZE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnRUb1Byb2Nl
c3MoKnRoaXMpOworICAgIGlmICghbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCkK
KyAgICAgICAgbV9oYXNTZW50TmV0d29ya1Byb2Nlc3NYUENFbmRwb2ludCA9IHN0b3JlLnNlbmRO
ZXR3b3JrUHJvY2Vzc1hQQ0VuZHBvaW50VG9Qcm9jZXNzKCp0aGlzKTsKICNlbmRpZgogfQogCklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oCShy
ZXZpc2lvbiAyODQ2MDMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vz
c1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYsNyBAQCBwcml2YXRlOgogICAg
IGJvb2wgbV9oYXNTZW50VENDRFNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogICAgIGJvb2wg
bV9oYXNTZW50Q2FtZXJhU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hh
c1NlbnRNaWNyb3Bob25lU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2hh
c1NlbnRMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlIHsgZmFsc2UgfTsKKyAgICBib29sIG1faGFzU2Vu
dE5ldHdvcmtQcm9jZXNzWFBDRW5kcG9pbnQgeyBmYWxzZSB9OwogI2VuZGlmCiAgICAgSGFzaFNl
dDxQQUw6OlNlc3Npb25JRD4gbV9zZXNzaW9uSURzOwogfTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>