<?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>209814</bug_id>
          
          <creation_ts>2020-03-31 09:17:51 -0700</creation_ts>
          <short_desc>[macOS] Deny mach-lookup access to &quot;com.apple.lsd.mapdb&quot; in sandbox</short_desc>
          <delta_ts>2020-04-01 15:29:26 -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>
          <dependson>209861</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>commit-queue</cc>
    
    <cc>darin</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1636049</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 09:17:51 -0700</bug_when>
    <thetext>The WebContent sandbox should deny mach-lookup access to &quot;com.apple.lsd.mapdb&quot; on macOS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636052</commentid>
    <comment_count>1</comment_count>
      <attachid>395048</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 09:26:01 -0700</bug_when>
    <thetext>Created attachment 395048
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636087</commentid>
    <comment_count>2</comment_count>
      <attachid>395060</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 10:15:09 -0700</bug_when>
    <thetext>Created attachment 395060
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636177</commentid>
    <comment_count>3</comment_count>
      <attachid>395079</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 12:28:56 -0700</bug_when>
    <thetext>Created attachment 395079
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636178</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-03-31 12:29:25 -0700</bug_when>
    <thetext>&lt;rdar://problem/61119618&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636180</commentid>
    <comment_count>5</comment_count>
      <attachid>395079</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-03-31 12:31:38 -0700</bug_when>
    <thetext>Comment on attachment 395079
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:276
&gt; +    // Map Launch Services database

WebKit coding style asks for a &quot;.&quot; here.

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:360
&gt; +#if HAVE(CSCHECKFIXDISABLE)
&gt; +            // _CSCheckFixDisable() needs to be called before checking in with Launch Services.
&gt; +            _CSCheckFixDisable();
&gt; +#endif

Why does’t this belong inside the launchServicesCheckIn function?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636181</commentid>
    <comment_count>6</comment_count>
      <attachid>395080</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 12:33:26 -0700</bug_when>
    <thetext>Created attachment 395080
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636190</commentid>
    <comment_count>7</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 12:52:07 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #5)
&gt; Comment on attachment 395079 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=395079&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:276
&gt; &gt; +    // Map Launch Services database
&gt; 
&gt; WebKit coding style asks for a &quot;.&quot; here.
&gt; 

Will fix.

&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:360
&gt; &gt; +#if HAVE(CSCHECKFIXDISABLE)
&gt; &gt; +            // _CSCheckFixDisable() needs to be called before checking in with Launch Services.
&gt; &gt; +            _CSCheckFixDisable();
&gt; &gt; +#endif
&gt; 
&gt; Why does’t this belong inside the launchServicesCheckIn function?

That is a very good point. This would mean all other WebKit processes would get this, but I think that is only a good thing. I will update the patch.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636217</commentid>
    <comment_count>8</comment_count>
      <attachid>395084</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-03-31 13:23:20 -0700</bug_when>
    <thetext>Created attachment 395084
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636330</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-03-31 17:45:20 -0700</bug_when>
    <thetext>Committed r259328: &lt;https://trac.webkit.org/changeset/259328&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 395084.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636537</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-04-01 09:47:12 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 209861</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636673</commentid>
    <comment_count>11</comment_count>
      <attachid>395207</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-04-01 15:01:59 -0700</bug_when>
    <thetext>Created attachment 395207
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1636689</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-04-01 15:29:25 -0700</bug_when>
    <thetext>Committed r259366: &lt;https://trac.webkit.org/changeset/259366&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 395207.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395048</attachid>
            <date>2020-03-31 09:26:01 -0700</date>
            <delta_ts>2020-03-31 10:15:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200331092600.patch</filename>
            <type>text/plain</type>
            <size>4092</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTMxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvY29j
b2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6
aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxh
dGZvcm1Jbml0aWFsaXplUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBwbGUu
V2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wMy0zMSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh
cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogKHIyNTkyMzYpIFsgaU9TIGFuZCBDYXRh
bGluYSB3azIgRGVidWcgXSBBU1NFUlRJT04gRkFJTEVEOiBtX2RlYnVnTG9nZ2luZ0VuYWJsZWQg
aW4gV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlYnVnQnJvYWRjYXN0Q29u
c29sZU1lc3NhZ2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2Vi
UHJvY2Vzcy5zYi5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29t
LmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHJldmlzaW9uIDI1OTI5NCkKKysrIFNvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpA
QCAtNjc4LDEwICs2NzgsMTMgQEAKICNlbmRpZgogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl
LlBvd2VyTWFuYWdlbWVudC5jb250cm9sIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5j
b3Jlc2VydmljZXMubGF1bmNoc2VydmljZXNkIikKLSAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBs
ZS5sc2QubWFwZGIiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLnRydXN0ZC5hZ2VudCIp
CiApCiAKKyhkZW55IG1hY2gtbG9va3VwICh3aXRoIHNlbmQtc2lnbmFsIFNJR1RFUk0pCisgICAg
KGdsb2JhbC1uYW1lICJjb20uYXBwbGUubHNkLm1hcGRiIikKKykKKwogKGFsbG93IG1hY2gtbG9v
a3VwCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE1MDAKICAgICAo
d2l0aCB0ZWxlbWV0cnkpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2Vi
UHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j
b2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI1OTI5NCkKKysrIFNvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAg
LTI3Myw2ICsyNzMsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlBy
CiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVy
cy5uZVNlc3Npb25NYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlKTsKICAgICBOZXR3b3JrRXh0ZW5zaW9u
Q29udGVudEZpbHRlcjo6c2V0SGFzQ29uc3VtZWRTYW5kYm94RXh0ZW5zaW9ucyhwYXJhbWV0ZXJz
Lm5lSGVscGVyRXh0ZW5zaW9uSGFuZGxlLmhhc1ZhbHVlKCkgJiYgcGFyYW1ldGVycy5uZVNlc3Np
b25NYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlLmhhc1ZhbHVlKCkpOwogCisgICAgLy8gTWFwIExhdW5j
aCBTZXJ2aWNlcyBkYXRhYmFzZQogICAgIGlmIChwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFu
ZGxlKSB7CiAgICAgICAgIGF1dG8gZXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRl
KFdURk1vdmUoKnBhcmFtZXRlcnMubWFwREJFeHRlbnNpb25IYW5kbGUpKTsKICAgICAgICAgYm9v
bCBvayA9IGV4dGVuc2lvbi0+Y29uc3VtZSgpOwpAQCAtMzE3LDYgKzMxOCwxOCBAQCB2b2lkIFdl
YlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAjZW5kaWYKIAogICAgIFdlYkNvcmU6
OnNsZWVwRGlzYWJsZXJDbGllbnQoKSA9IG1ha2VVbmlxdWU8V2ViU2xlZXBEaXNhYmxlckNsaWVu
dD4oKTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQor
ICAgIC8vIF9DU0NoZWNrRml4RGlzYWJsZSgpIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgY2hl
Y2tpbmcgaW4gd2l0aCBMYXVuY2ggU2VydmljZXMuCisgICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7
CisjZW5kaWYKKyAgICAvLyBDaGVja2luZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcyBpcyBuZWNl
c3NhcnkgdG8gYmUgYWJsZSB0byBzZXQgdGhlIHByb2Nlc3MnIGRpc3BsYXkgbmFtZS4KKyAgICAv
LyBUaGlzIG5lZWRzIHRvIGJlIGRvbmUgYWZ0ZXIgbWFwcGluZyB0aGUgTGF1bmNoIFNlcnZpY2Vz
IGRhdGFiYXNlLgorICAgIGxhdW5jaFNlcnZpY2VzQ2hlY2tJbigpOworCisgICAgdXBkYXRlUHJv
Y2Vzc05hbWUoKTsKKyNlbmRpZgogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtU2V0V2Vi
c2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMmJiBw
YXJhbWV0ZXJzKQpAQCAtMzM1LDE3ICszNDgsMTIgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9y
bVNldFdlYnNpdGVEYXRhUwogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXpl
UHJvY2Vzc05hbWUoY29uc3QgQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVy
cyYpCit2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBBdXhpbGlh
cnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogI2lmIFBM
QVRGT1JNKE1BQykKLSNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQotICAgIC8vIF9DU0NoZWNr
Rml4RGlzYWJsZSgpIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgY2hlY2tpbmcgaW4gd2l0aCBM
YXVuY2ggU2VydmljZXMuCi0gICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7Ci0jZW5kaWYKLSAgICAv
LyBUaGlzIGlzIG5lY2Vzc2FyeSBzbyB0aGF0IHdlIGFyZSBhYmxlIHRvIHNldCB0aGUgcHJvY2Vz
cycgZGlzcGxheSBuYW1lLgotICAgIF9SZWdpc3RlckFwcGxpY2F0aW9uKG51bGxwdHIsIG51bGxw
dHIpOwotCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICBtX3VpUHJvY2Vzc05hbWUgPSBw
YXJhbWV0ZXJzLnVpUHJvY2Vzc05hbWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYXJhbWV0
ZXJzKTsKICNlbmRpZgogfQogCkBAIC01MjEsOCArNTI5LDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpw
bGF0Zm9ybUluaXRpYWxpemVQcm9jZQogICAgICAgICBsYXVuY2hTZXJ2aWNlc0NoZWNrSW4oKTsK
ICAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKFdFQlBST0NFU1NfV0lORE9XU0VSVkVSX0JMT0NLSU5H
KQotCi0gICAgbV91aVByb2Nlc3NOYW1lID0gcGFyYW1ldGVycy51aVByb2Nlc3NOYW1lOwogI2Vu
ZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogICAgIGlmIChwYXJhbWV0ZXJzLmV4dHJhSW5pdGlhbGl6
YXRpb25EYXRhLmdldCgiaW5zcGVjdG9yLXByb2Nlc3MiX3MpID09ICIxIikK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395060</attachid>
            <date>2020-03-31 10:15:09 -0700</date>
            <delta_ts>2020-03-31 12:28:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200331101508.patch</filename>
            <type>text/plain</type>
            <size>5425</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTMxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvY29j
b2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6
aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxh
dGZvcm1Jbml0aWFsaXplUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBwbGUu
V2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wMy0zMSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh
cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogKHIyNTkyMzYpIFsgaU9TIGFuZCBDYXRh
bGluYSB3azIgRGVidWcgXSBBU1NFUlRJT04gRkFJTEVEOiBtX2RlYnVnTG9nZ2luZ0VuYWJsZWQg
aW4gV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlYnVnQnJvYWRjYXN0Q29u
c29sZU1lc3NhZ2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nl
c3NQb29sQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j
b2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5
KQpAQCAtNDA2LDYgKzQwNiwxMCBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRp
YWxpemVXCiAgICAgcGFyYW1ldGVycy5zeXN0ZW1IYXNCYXR0ZXJ5ID0gc3lzdGVtSGFzQmF0dGVy
eSgpOwogICAgIHBhcmFtZXRlcnMubWltZVR5cGVzTWFwID0gY29tbW9uTWltZVR5cGVzTWFwKCk7
CiAgICAgcGFyYW1ldGVycy5tYXBVVElGcm9tTUlNRVR5cGUgPSBjcmVhdGVVVElGcm9tTUlNRVR5
cGVNYXAoKTsKKworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBtYXBEQkhhbmRsZTsKKyAg
ICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUu
bHNkLm1hcGRiIiwgV1RGOjpudWxsb3B0LCBtYXBEQkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6
RmxhZ3M6Ok5vUmVwb3J0KTsKKyAgICBwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0g
V1RGTW92ZShtYXBEQkhhbmRsZSk7CiAjZW5kaWYKICAgICAKICNpZiBQTEFURk9STShJT1MpCkBA
IC00MjYsMTAgKzQzMCw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6
ZVcKICAgICBpZiAoV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCiAg
ICAgICAgIHBhcmFtZXRlcnMudmVjdG9yT2ZVVFR5cGVJdGVtID0gY3JlYXRlVmVjdG9yT2ZVVFR5
cGVJdGVtKCk7CiAjZW5kaWYKLQotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBtYXBEQkhh
bmRsZTsKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJj
b20uYXBwbGUubHNkLm1hcGRiIiwgV1RGOjpudWxsb3B0LCBtYXBEQkhhbmRsZSwgU2FuZGJveEV4
dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKLSAgICBwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9u
SGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRsZSk7CiAjZW5kaWYKICAgICAKICAgICAvLyBBbGxv
dyBtaWNyb3Bob25lIGFjY2VzcyBpZiBlaXRoZXIgcHJlZmVyZW5jZSBpcyBzZXQgYmVjYXVzZSBX
ZWJSVEMgcmVxdWlyZXMgbWljcm9waG9uZSBhY2Nlc3MuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAy
NTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Mu
c2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTY3OCwxMCArNjc4LDEzIEBACiAjZW5kaWYKICAgICAo
Z2xvYmFsLW5hbWUgImNvbS5hcHBsZS5Qb3dlck1hbmFnZW1lbnQuY29udHJvbCIpCiAgICAgKGds
b2JhbC1uYW1lICJjb20uYXBwbGUuY29yZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCIpCi0gICAg
KGdsb2JhbC1uYW1lICJjb20uYXBwbGUubHNkLm1hcGRiIikKICAgICAoZ2xvYmFsLW5hbWUgImNv
bS5hcHBsZS50cnVzdGQuYWdlbnQiKQogKQogCisoZGVueSBtYWNoLWxvb2t1cCAod2l0aCBzZW5k
LXNpZ25hbCBTSUdURVJNKQorICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmxzZC5tYXBkYiIp
CispCisKIChhbGxvdyBtYWNoLWxvb2t1cAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR
VUlSRUQgPj0gMTAxNTAwCiAgICAgKHdpdGggdGVsZW1ldHJ5KQpJbmRleDogU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAy
NTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h
Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsNiArMjczLDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpw
bGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1l
UGVybWFuZW50bHkoKnBhcmFtZXRlcnMubmVTZXNzaW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZSk7
CiAgICAgTmV0d29ya0V4dGVuc2lvbkNvbnRlbnRGaWx0ZXI6OnNldEhhc0NvbnN1bWVkU2FuZGJv
eEV4dGVuc2lvbnMocGFyYW1ldGVycy5uZUhlbHBlckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgp
ICYmIHBhcmFtZXRlcnMubmVTZXNzaW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgp
KTsKIAorICAgIC8vIE1hcCBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UKICAgICBpZiAocGFyYW1l
dGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSkgewogICAgICAgICBhdXRvIGV4dGVuc2lvbiA9IFNh
bmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZNb3ZlKCpwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9u
SGFuZGxlKSk7CiAgICAgICAgIGJvb2wgb2sgPSBleHRlbnNpb24tPmNvbnN1bWUoKTsKQEAgLTMx
Nyw2ICszMTgsMTggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgog
I2VuZGlmCiAKICAgICBXZWJDb3JlOjpzbGVlcERpc2FibGVyQ2xpZW50KCkgPSBtYWtlVW5pcXVl
PFdlYlNsZWVwRGlzYWJsZXJDbGllbnQ+KCk7CisKKyNpZiBQTEFURk9STShNQUMpCisjaWYgSEFW
RShDU0NIRUNLRklYRElTQUJMRSkKKyAgICAvLyBfQ1NDaGVja0ZpeERpc2FibGUoKSBuZWVkcyB0
byBiZSBjYWxsZWQgYmVmb3JlIGNoZWNraW5nIGluIHdpdGggTGF1bmNoIFNlcnZpY2VzLgorICAg
IF9DU0NoZWNrRml4RGlzYWJsZSgpOworI2VuZGlmCisgICAgLy8gQ2hlY2tpbmcgaW4gd2l0aCBM
YXVuY2ggU2VydmljZXMgaXMgbmVjZXNzYXJ5IHRvIGJlIGFibGUgdG8gc2V0IHRoZSBwcm9jZXNz
JyBkaXNwbGF5IG5hbWUuCisgICAgLy8gVGhpcyBuZWVkcyB0byBiZSBkb25lIGFmdGVyIG1hcHBp
bmcgdGhlIExhdW5jaCBTZXJ2aWNlcyBkYXRhYmFzZS4KKyAgICBsYXVuY2hTZXJ2aWNlc0NoZWNr
SW4oKTsKKworICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7CisjZW5kaWYKIH0KIAogdm9pZCBXZWJQ
cm9jZXNzOjpwbGF0Zm9ybVNldFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKFdlYlByb2Nlc3NE
YXRhU3RvcmVQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKQEAgLTMzNSwxNyArMzQ4LDEyIEBAIHZv
aWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1TZXRXZWJzaXRlRGF0YVMKICAgICB9CiB9CiAKLXZvaWQg
V2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKGNvbnN0IEF1eGlsaWFyeVByb2Nlc3NJ
bml0aWFsaXphdGlvblBhcmFtZXRlcnMmKQordm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplUHJv
Y2Vzc05hbWUoY29uc3QgQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYg
cGFyYW1ldGVycykKIHsKICNpZiBQTEFURk9STShNQUMpCi0jaWYgSEFWRShDU0NIRUNLRklYRElT
QUJMRSkKLSAgICAvLyBfQ1NDaGVja0ZpeERpc2FibGUoKSBuZWVkcyB0byBiZSBjYWxsZWQgYmVm
b3JlIGNoZWNraW5nIGluIHdpdGggTGF1bmNoIFNlcnZpY2VzLgotICAgIF9DU0NoZWNrRml4RGlz
YWJsZSgpOwotI2VuZGlmCi0gICAgLy8gVGhpcyBpcyBuZWNlc3Nhcnkgc28gdGhhdCB3ZSBhcmUg
YWJsZSB0byBzZXQgdGhlIHByb2Nlc3MnIGRpc3BsYXkgbmFtZS4KLSAgICBfUmVnaXN0ZXJBcHBs
aWNhdGlvbihudWxscHRyLCBudWxscHRyKTsKLQotICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7Cisg
ICAgbV91aVByb2Nlc3NOYW1lID0gcGFyYW1ldGVycy51aVByb2Nlc3NOYW1lOworI2Vsc2UKKyAg
ICBVTlVTRURfUEFSQU0ocGFyYW1ldGVycyk7CiAjZW5kaWYKIH0KIApAQCAtNTIxLDggKzUyOSw2
IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJvY2UKICAgICAgICAgbGF1
bmNoU2VydmljZXNDaGVja0luKCk7CiAgICAgfQogI2VuZGlmIC8vIEVOQUJMRShXRUJQUk9DRVNT
X1dJTkRPV1NFUlZFUl9CTE9DS0lORykKLQotICAgIG1fdWlQcm9jZXNzTmFtZSA9IHBhcmFtZXRl
cnMudWlQcm9jZXNzTmFtZTsKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCiAKICAgICBpZiAocGFy
YW1ldGVycy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5nZXQoImluc3BlY3Rvci1wcm9jZXNzIl9z
KSA9PSAiMSIpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395079</attachid>
            <date>2020-03-31 12:28:56 -0700</date>
            <delta_ts>2020-03-31 12:33:25 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200331122855.patch</filename>
            <type>text/plain</type>
            <size>8023</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAzLTMxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHdhcyBkb25lIGZv
ciBpT1MgaW4gPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNTg5MTU+LCBhbmQg
aW4gb3JkZXIgdG8gYmUgYWJsZSB0byBkbyB0aGlzCisgICAgICAgIG9uIG1hY09TLCBjaGVja2lu
ZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcyBhbmQgdXBkYXRpbmcgdGhlIHByb2Nlc3MgbmFtZSBu
ZWVkcyB0byBiZSBkb25lIGFmdGVyIHRoZQorICAgICAgICBMYXVuY2ggU2VydmljZXMgZGF0YWJh
c2UgbWFwcGluZyBoYXMgYmVlbiBkb25lIGluIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6
ZVdlYlByb2Nlc3MuIEFsc28sIHRoZQorICAgICAgICBwcmV2aW91cyBjYWxsIHRvIFJlZ2lzdGVy
QXBwbGljYXRpb24gaGFzIGJlZW4gcmVwbGFjZWQgd2l0aCBhIGNhbGwgdG8gbGF1bmNoU2Vydmlj
ZXNDaGVja0luLCBzaW5jZQorICAgICAgICBSZWdpc3RlckFwcGxpY2F0aW9uIGlzIGFuIEFwcEtp
dCBmdW5jdGlvbiwgYW5kIHNob3VsZCBiZSBhdm9pZGVkIHNpbmNlIHRoZSBXZWJDb250ZW50IHBy
b2Nlc3MgaXMgbm90CisgICAgICAgIGEgTlNBcHBsaWNhdGlvbiBhbnltb3JlLgorCisgICAgICAg
IFRlc3Q6IGZhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCisKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZSk6CisgICAgICAgIChXZWJL
aXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MpOgorICAgICAgICAqIFdl
YlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjAtMDMtMzEgIERldmlu
IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IChyMjU5
MjM2KSBbIGlPUyBhbmQgQ2F0YWxpbmEgd2syIERlYnVnIF0gQVNTRVJUSU9OIEZBSUxFRDogbV9k
ZWJ1Z0xvZ2dpbmdFbmFibGVkIGluIFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl
OjpkZWJ1Z0Jyb2FkY2FzdENvbnNvbGVNZXNzYWdlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHJldmlzaW9uIDI1
OTI5NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j
b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTQwNiw2ICs0MDYsMTAgQEAgdm9pZCBXZWJQcm9jZXNz
UG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplVwogICAgIHBhcmFtZXRlcnMuc3lzdGVtSGFzQmF0dGVy
eSA9IHN5c3RlbUhhc0JhdHRlcnkoKTsKICAgICBwYXJhbWV0ZXJzLm1pbWVUeXBlc01hcCA9IGNv
bW1vbk1pbWVUeXBlc01hcCgpOwogICAgIHBhcmFtZXRlcnMubWFwVVRJRnJvbU1JTUVUeXBlID0g
Y3JlYXRlVVRJRnJvbU1JTUVUeXBlTWFwKCk7CisKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5k
bGUgbWFwREJIYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFj
aExvb2t1cCgiY29tLmFwcGxlLmxzZC5tYXBkYiIsIFdURjo6bnVsbG9wdCwgbWFwREJIYW5kbGUs
IFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7CisgICAgcGFyYW1ldGVycy5tYXBE
QkV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUobWFwREJIYW5kbGUpOwogI2VuZGlmCiAgICAgCiAj
aWYgUExBVEZPUk0oSU9TKQpAQCAtNDI2LDEwICs0MzAsNiBAQCB2b2lkIFdlYlByb2Nlc3NQb29s
OjpwbGF0Zm9ybUluaXRpYWxpemVXCiAgICAgaWYgKFdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjpp
c01vYmlsZVNhZmFyaSgpKQogICAgICAgICBwYXJhbWV0ZXJzLnZlY3Rvck9mVVRUeXBlSXRlbSA9
IGNyZWF0ZVZlY3Rvck9mVVRUeXBlSXRlbSgpOwogI2VuZGlmCi0KLSAgICBTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGUgbWFwREJIYW5kbGU7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFu
ZGxlRm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLmxzZC5tYXBkYiIsIFdURjo6bnVsbG9wdCwgbWFw
REJIYW5kbGUsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7Ci0gICAgcGFyYW1l
dGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUobWFwREJIYW5kbGUpOwogI2VuZGlm
CiAgICAgCiAgICAgLy8gQWxsb3cgbWljcm9waG9uZSBhY2Nlc3MgaWYgZWl0aGVyIHByZWZlcmVu
Y2UgaXMgc2V0IGJlY2F1c2UgV2ViUlRDIHJlcXVpcmVzIG1pY3JvcGhvbmUgYWNjZXNzLgpJbmRl
eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vz
cy5zYi5pbgkocmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv
bS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC02NzgsMTAgKzY3OCwx
MyBAQAogI2VuZGlmCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuUG93ZXJNYW5hZ2VtZW50
LmNvbnRyb2wiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVu
Y2hzZXJ2aWNlc2QiKQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmxzZC5tYXBkYiIpCiAg
ICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUudHJ1c3RkLmFnZW50IikKICkKIAorKGRlbnkgbWFj
aC1sb29rdXAgKHdpdGggdGVsZW1ldHJ5LWJhY2t0cmFjZSkKKyAgICAoZ2xvYmFsLW5hbWUgImNv
bS5hcHBsZS5sc2QubWFwZGIiKQorKQorCiAoYWxsb3cgbWFjaC1sb29rdXAKICNpZiBfX01BQ19P
U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTUwMAogICAgICh3aXRoIHRlbGVtZXRyeSkK
SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND
b2NvYS5tbQkocmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv
Y29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw3IEBA
IHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICAgICAgU2FuZGJv
eEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KCpwYXJhbWV0ZXJzLm5lU2Vzc2lvbk1hbmFn
ZXJFeHRlbnNpb25IYW5kbGUpOwogICAgIE5ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVyOjpz
ZXRIYXNDb25zdW1lZFNhbmRib3hFeHRlbnNpb25zKHBhcmFtZXRlcnMubmVIZWxwZXJFeHRlbnNp
b25IYW5kbGUuaGFzVmFsdWUoKSAmJiBwYXJhbWV0ZXJzLm5lU2Vzc2lvbk1hbmFnZXJFeHRlbnNp
b25IYW5kbGUuaGFzVmFsdWUoKSk7CiAKKyAgICAvLyBNYXAgTGF1bmNoIFNlcnZpY2VzIGRhdGFi
YXNlCiAgICAgaWYgKHBhcmFtZXRlcnMubWFwREJFeHRlbnNpb25IYW5kbGUpIHsKICAgICAgICAg
YXV0byBleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92ZSgqcGFyYW1l
dGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSkpOwogICAgICAgICBib29sIG9rID0gZXh0ZW5zaW9u
LT5jb25zdW1lKCk7CkBAIC0zMTcsNiArMzE4LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9y
bUluaXRpYWxpemVXZWJQcgogI2VuZGlmCiAKICAgICBXZWJDb3JlOjpzbGVlcERpc2FibGVyQ2xp
ZW50KCkgPSBtYWtlVW5pcXVlPFdlYlNsZWVwRGlzYWJsZXJDbGllbnQ+KCk7CisKKyAgICB1cGRh
dGVQcm9jZXNzTmFtZSgpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtU2V0V2Vic2l0
ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMmJiBwYXJh
bWV0ZXJzKQpAQCAtMzM1LDIzICszMzgsMzAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybVNl
dFdlYnNpdGVEYXRhUwogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplUHJv
Y2Vzc05hbWUoY29uc3QgQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYp
Cit2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBBdXhpbGlhcnlQ
cm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogI2lmIFBMQVRG
T1JNKE1BQykKLSNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQotICAgIC8vIF9DU0NoZWNrRml4
RGlzYWJsZSgpIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgY2hlY2tpbmcgaW4gd2l0aCBMYXVu
Y2ggU2VydmljZXMuCi0gICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7Ci0jZW5kaWYKLSAgICAvLyBU
aGlzIGlzIG5lY2Vzc2FyeSBzbyB0aGF0IHdlIGFyZSBhYmxlIHRvIHNldCB0aGUgcHJvY2Vzcycg
ZGlzcGxheSBuYW1lLgotICAgIF9SZWdpc3RlckFwcGxpY2F0aW9uKG51bGxwdHIsIG51bGxwdHIp
OwotCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICBtX3VpUHJvY2Vzc05hbWUgPSBwYXJh
bWV0ZXJzLnVpUHJvY2Vzc05hbWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYXJhbWV0ZXJz
KTsKICNlbmRpZgogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkKIHsK
ICNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOwor
ICAgIHN0ZDo6Y2FsbF9vbmNlKAorICAgICAgICBvbmNlRmxhZywKKyAgICAgICAgW3RoaXNdIHsK
KyNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQorICAgICAgICAgICAgLy8gX0NTQ2hlY2tGaXhE
aXNhYmxlKCkgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2luZyBpbiB3aXRoIExhdW5j
aCBTZXJ2aWNlcy4KKyAgICAgICAgICAgIF9DU0NoZWNrRml4RGlzYWJsZSgpOworI2VuZGlmCisg
ICAgICAgICAgICAvLyBDaGVja2luZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcyBpcyBuZWNlc3Nh
cnkgdG8gYmUgYWJsZSB0byBzZXQgdGhlIHByb2Nlc3MnIGRpc3BsYXkgbmFtZS4KKyAgICAgICAg
ICAgIGxhdW5jaFNlcnZpY2VzQ2hlY2tJbigpOworICAgIH0pOworCiAgICAgTlNTdHJpbmcgKmFw
cGxpY2F0aW9uTmFtZTsKICAgICBzd2l0Y2ggKG1fcHJvY2Vzc1R5cGUpIHsKICAgICBjYXNlIFBy
b2Nlc3NUeXBlOjpJbnNwZWN0b3I6CkBAIC01MjEsOCArNTMxLDYgQEAgdm9pZCBXZWJQcm9jZXNz
OjpwbGF0Zm9ybUluaXRpYWxpemVQcm9jZQogICAgICAgICBsYXVuY2hTZXJ2aWNlc0NoZWNrSW4o
KTsKICAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKFdFQlBST0NFU1NfV0lORE9XU0VSVkVSX0JMT0NL
SU5HKQotCi0gICAgbV91aVByb2Nlc3NOYW1lID0gcGFyYW1ldGVycy51aVByb2Nlc3NOYW1lOwog
I2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogICAgIGlmIChwYXJhbWV0ZXJzLmV4dHJhSW5pdGlh
bGl6YXRpb25EYXRhLmdldCgiaW5zcGVjdG9yLXByb2Nlc3MiX3MpID09ICIxIikKSW5kZXg6IExh
eW91dFRlc3RzL2Zhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC1leHBlY3RlZC50
eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1h
Y2gtbG9va3VwLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjU5Mjk0KQorKysgTGF5b3V0VGVzdHMv
ZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9va3VwLWV4cGVjdGVkLnR4dAkod29ya2lu
ZyBjb3B5KQpAQCAtOCw0ICs4LDUgQEAgUEFTUyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29r
dXBBY2NlcwogUEFTUyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2Jh
bE5hbWUoImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIsICJjb20uYXBwbGUubmVzZXNzaW9u
bWFuYWdlciIpIGlzIGZhbHNlCiBQQVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFj
Y2Vzc1RvR2xvYmFsTmFtZSgiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50IiwgImNvbS5hcHBs
ZS5uZXNlc3Npb25tYW5hZ2VyLmNvbnRlbnQtZmlsdGVyIikgaXMgZmFsc2UKIFBBU1MgaW50ZXJu
YWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKCJjb20uYXBwbGUuV2Vi
S2l0LldlYkNvbnRlbnQiLCAiY29tLmFwcGxlLnN5c3RlbS5sb2dnZXIiKSBpcyBmYWxzZQorUEFT
UyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5hbWUoImNvbS5h
cHBsZS5XZWJLaXQuV2ViQ29udGVudCIsICJjb20uYXBwbGUubHNkLm1hcGRiIikgaXMgZmFsc2UK
IApJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9va3Vw
Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94
LW1hY2gtbG9va3VwLmh0bWwJKHJldmlzaW9uIDI1OTI5NCkKKysrIExheW91dFRlc3RzL2Zhc3Qv
c2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0x
MSw2ICsxMSw3IEBAIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgc2hvdWxkQmVGYWxzZSgi
aW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKFwiY29tLmFw
cGxlLldlYktpdC5XZWJDb250ZW50XCIsIFwiY29tLmFwcGxlLm5lc2Vzc2lvbm1hbmFnZXJcIiki
KTsKICAgICBzaG91bGRCZUZhbHNlKCJpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nl
c3NUb0dsb2JhbE5hbWUoXCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnRcIiwgXCJjb20uYXBw
bGUubmVzZXNzaW9ubWFuYWdlci5jb250ZW50LWZpbHRlclwiKSIpOwogICAgIHNob3VsZEJlRmFs
c2UoImludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xvYmFsTmFtZShcImNv
bS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudFwiLCBcImNvbS5hcHBsZS5zeXN0ZW0ubG9nZ2VyXCIp
Iik7CisgICAgc2hvdWxkQmVGYWxzZSgiaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNj
ZXNzVG9HbG9iYWxOYW1lKFwiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50XCIsIFwiY29tLmFw
cGxlLmxzZC5tYXBkYlwiKSIpOwogfQogPC9zY3JpcHQ+CiA8L2hlYWQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395080</attachid>
            <date>2020-03-31 12:33:26 -0700</date>
            <delta_ts>2020-03-31 13:23:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200331123325.patch</filename>
            <type>text/plain</type>
            <size>8083</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAzLTMxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHdhcyBkb25lIGZv
ciBpT1MgaW4gPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNTg5MTU+LCBhbmQg
aW4gb3JkZXIgdG8gYmUgYWJsZSB0byBkbyB0aGlzCisgICAgICAgIG9uIG1hY09TLCBjaGVja2lu
ZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcyBhbmQgdXBkYXRpbmcgdGhlIHByb2Nlc3MgbmFtZSBu
ZWVkcyB0byBiZSBkb25lIGFmdGVyIHRoZQorICAgICAgICBMYXVuY2ggU2VydmljZXMgZGF0YWJh
c2UgbWFwcGluZyBoYXMgYmVlbiBkb25lIGluIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6
ZVdlYlByb2Nlc3MuIEFsc28sIHRoZQorICAgICAgICBwcmV2aW91cyBjYWxsIHRvIFJlZ2lzdGVy
QXBwbGljYXRpb24gaGFzIGJlZW4gcmVwbGFjZWQgd2l0aCBhIGNhbGwgdG8gbGF1bmNoU2Vydmlj
ZXNDaGVja0luLCBzaW5jZQorICAgICAgICBSZWdpc3RlckFwcGxpY2F0aW9uIGlzIGFuIEFwcEtp
dCBmdW5jdGlvbiwgYW5kIHNob3VsZCBiZSBhdm9pZGVkIHNpbmNlIHRoZSBXZWJDb250ZW50IHBy
b2Nlc3MgaXMgbm90CisgICAgICAgIGEgTlNBcHBsaWNhdGlvbiBhbnltb3JlLgorCisgICAgICAg
IFRlc3Q6IGZhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCisKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZSk6CisgICAgICAgIChXZWJL
aXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MpOgorICAgICAgICAqIFdl
YlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjAtMDMtMzEgIERldmlu
IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IChyMjU5
MjM2KSBbIGlPUyBhbmQgQ2F0YWxpbmEgd2syIERlYnVnIF0gQVNTRVJUSU9OIEZBSUxFRDogbV9k
ZWJ1Z0xvZ2dpbmdFbmFibGVkIGluIFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl
OjpkZWJ1Z0Jyb2FkY2FzdENvbnNvbGVNZXNzYWdlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHJldmlzaW9uIDI1
OTI5NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j
b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTQwNiw2ICs0MDYsMTAgQEAgdm9pZCBXZWJQcm9jZXNz
UG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplVwogICAgIHBhcmFtZXRlcnMuc3lzdGVtSGFzQmF0dGVy
eSA9IHN5c3RlbUhhc0JhdHRlcnkoKTsKICAgICBwYXJhbWV0ZXJzLm1pbWVUeXBlc01hcCA9IGNv
bW1vbk1pbWVUeXBlc01hcCgpOwogICAgIHBhcmFtZXRlcnMubWFwVVRJRnJvbU1JTUVUeXBlID0g
Y3JlYXRlVVRJRnJvbU1JTUVUeXBlTWFwKCk7CisKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5k
bGUgbWFwREJIYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFj
aExvb2t1cCgiY29tLmFwcGxlLmxzZC5tYXBkYiIsIFdURjo6bnVsbG9wdCwgbWFwREJIYW5kbGUs
IFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7CisgICAgcGFyYW1ldGVycy5tYXBE
QkV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUobWFwREJIYW5kbGUpOwogI2VuZGlmCiAgICAgCiAj
aWYgUExBVEZPUk0oSU9TKQpAQCAtNDI2LDEwICs0MzAsNiBAQCB2b2lkIFdlYlByb2Nlc3NQb29s
OjpwbGF0Zm9ybUluaXRpYWxpemVXCiAgICAgaWYgKFdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjpp
c01vYmlsZVNhZmFyaSgpKQogICAgICAgICBwYXJhbWV0ZXJzLnZlY3Rvck9mVVRUeXBlSXRlbSA9
IGNyZWF0ZVZlY3Rvck9mVVRUeXBlSXRlbSgpOwogI2VuZGlmCi0KLSAgICBTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGUgbWFwREJIYW5kbGU7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFu
ZGxlRm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLmxzZC5tYXBkYiIsIFdURjo6bnVsbG9wdCwgbWFw
REJIYW5kbGUsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7Ci0gICAgcGFyYW1l
dGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUobWFwREJIYW5kbGUpOwogI2VuZGlm
CiAgICAgCiAgICAgLy8gQWxsb3cgbWljcm9waG9uZSBhY2Nlc3MgaWYgZWl0aGVyIHByZWZlcmVu
Y2UgaXMgc2V0IGJlY2F1c2UgV2ViUlRDIHJlcXVpcmVzIG1pY3JvcGhvbmUgYWNjZXNzLgpJbmRl
eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vz
cy5zYi5pbgkocmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv
bS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC02NzgsMTAgKzY3OCwx
NiBAQAogI2VuZGlmCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuUG93ZXJNYW5hZ2VtZW50
LmNvbnRyb2wiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVu
Y2hzZXJ2aWNlc2QiKQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmxzZC5tYXBkYiIpCiAg
ICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUudHJ1c3RkLmFnZW50IikKICkKIAorKGRlbnkgbWFj
aC1sb29rdXAKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTYwMAor
ICAgICh3aXRoIHRlbGVtZXRyeS1iYWNrdHJhY2UpCisjZW5kaWYKKyAgICAoZ2xvYmFsLW5hbWUg
ImNvbS5hcHBsZS5sc2QubWFwZGIiKQorKQorCiAoYWxsb3cgbWFjaC1sb29rdXAKICNpZiBfX01B
Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTUwMAogICAgICh3aXRoIHRlbGVtZXRy
eSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl
c3NDb2NvYS5tbQkocmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw3
IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICAgICAgU2Fu
ZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KCpwYXJhbWV0ZXJzLm5lU2Vzc2lvbk1h
bmFnZXJFeHRlbnNpb25IYW5kbGUpOwogICAgIE5ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVy
OjpzZXRIYXNDb25zdW1lZFNhbmRib3hFeHRlbnNpb25zKHBhcmFtZXRlcnMubmVIZWxwZXJFeHRl
bnNpb25IYW5kbGUuaGFzVmFsdWUoKSAmJiBwYXJhbWV0ZXJzLm5lU2Vzc2lvbk1hbmFnZXJFeHRl
bnNpb25IYW5kbGUuaGFzVmFsdWUoKSk7CiAKKyAgICAvLyBNYXAgTGF1bmNoIFNlcnZpY2VzIGRh
dGFiYXNlCiAgICAgaWYgKHBhcmFtZXRlcnMubWFwREJFeHRlbnNpb25IYW5kbGUpIHsKICAgICAg
ICAgYXV0byBleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92ZSgqcGFy
YW1ldGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSkpOwogICAgICAgICBib29sIG9rID0gZXh0ZW5z
aW9uLT5jb25zdW1lKCk7CkBAIC0zMTcsNiArMzE4LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVXZWJQcgogI2VuZGlmCiAKICAgICBXZWJDb3JlOjpzbGVlcERpc2FibGVy
Q2xpZW50KCkgPSBtYWtlVW5pcXVlPFdlYlNsZWVwRGlzYWJsZXJDbGllbnQ+KCk7CisKKyAgICB1
cGRhdGVQcm9jZXNzTmFtZSgpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtU2V0V2Vi
c2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMmJiBw
YXJhbWV0ZXJzKQpAQCAtMzM1LDIzICszMzgsMzAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9y
bVNldFdlYnNpdGVEYXRhUwogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXpl
UHJvY2Vzc05hbWUoY29uc3QgQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVy
cyYpCit2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBBdXhpbGlh
cnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogI2lmIFBM
QVRGT1JNKE1BQykKLSNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQotICAgIC8vIF9DU0NoZWNr
Rml4RGlzYWJsZSgpIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgY2hlY2tpbmcgaW4gd2l0aCBM
YXVuY2ggU2VydmljZXMuCi0gICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7Ci0jZW5kaWYKLSAgICAv
LyBUaGlzIGlzIG5lY2Vzc2FyeSBzbyB0aGF0IHdlIGFyZSBhYmxlIHRvIHNldCB0aGUgcHJvY2Vz
cycgZGlzcGxheSBuYW1lLgotICAgIF9SZWdpc3RlckFwcGxpY2F0aW9uKG51bGxwdHIsIG51bGxw
dHIpOwotCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICBtX3VpUHJvY2Vzc05hbWUgPSBw
YXJhbWV0ZXJzLnVpUHJvY2Vzc05hbWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYXJhbWV0
ZXJzKTsKICNlbmRpZgogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkK
IHsKICNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFn
OworICAgIHN0ZDo6Y2FsbF9vbmNlKAorICAgICAgICBvbmNlRmxhZywKKyAgICAgICAgW3RoaXNd
IHsKKyNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQorICAgICAgICAgICAgLy8gX0NTQ2hlY2tG
aXhEaXNhYmxlKCkgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2luZyBpbiB3aXRoIExh
dW5jaCBTZXJ2aWNlcy4KKyAgICAgICAgICAgIF9DU0NoZWNrRml4RGlzYWJsZSgpOworI2VuZGlm
CisgICAgICAgICAgICAvLyBDaGVja2luZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcyBpcyBuZWNl
c3NhcnkgdG8gYmUgYWJsZSB0byBzZXQgdGhlIHByb2Nlc3MnIGRpc3BsYXkgbmFtZS4KKyAgICAg
ICAgICAgIGxhdW5jaFNlcnZpY2VzQ2hlY2tJbigpOworICAgIH0pOworCiAgICAgTlNTdHJpbmcg
KmFwcGxpY2F0aW9uTmFtZTsKICAgICBzd2l0Y2ggKG1fcHJvY2Vzc1R5cGUpIHsKICAgICBjYXNl
IFByb2Nlc3NUeXBlOjpJbnNwZWN0b3I6CkBAIC01MjEsOCArNTMxLDYgQEAgdm9pZCBXZWJQcm9j
ZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVQcm9jZQogICAgICAgICBsYXVuY2hTZXJ2aWNlc0NoZWNr
SW4oKTsKICAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKFdFQlBST0NFU1NfV0lORE9XU0VSVkVSX0JM
T0NLSU5HKQotCi0gICAgbV91aVByb2Nlc3NOYW1lID0gcGFyYW1ldGVycy51aVByb2Nlc3NOYW1l
OwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogICAgIGlmIChwYXJhbWV0ZXJzLmV4dHJhSW5p
dGlhbGl6YXRpb25EYXRhLmdldCgiaW5zcGVjdG9yLXByb2Nlc3MiX3MpID09ICIxIikKSW5kZXg6
IExheW91dFRlc3RzL2Zhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC1leHBlY3Rl
ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94
LW1hY2gtbG9va3VwLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjU5Mjk0KQorKysgTGF5b3V0VGVz
dHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9va3VwLWV4cGVjdGVkLnR4dAkod29y
a2luZyBjb3B5KQpAQCAtOCw0ICs4LDUgQEAgUEFTUyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hM
b29rdXBBY2NlcwogUEFTUyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0ds
b2JhbE5hbWUoImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIsICJjb20uYXBwbGUubmVzZXNz
aW9ubWFuYWdlciIpIGlzIGZhbHNlCiBQQVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1
cEFjY2Vzc1RvR2xvYmFsTmFtZSgiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50IiwgImNvbS5h
cHBsZS5uZXNlc3Npb25tYW5hZ2VyLmNvbnRlbnQtZmlsdGVyIikgaXMgZmFsc2UKIFBBU1MgaW50
ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKCJjb20uYXBwbGUu
V2ViS2l0LldlYkNvbnRlbnQiLCAiY29tLmFwcGxlLnN5c3RlbS5sb2dnZXIiKSBpcyBmYWxzZQor
UEFTUyBpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5hbWUoImNv
bS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIsICJjb20uYXBwbGUubHNkLm1hcGRiIikgaXMgZmFs
c2UKIApJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9v
a3VwLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5k
Ym94LW1hY2gtbG9va3VwLmh0bWwJKHJldmlzaW9uIDI1OTI5NCkKKysrIExheW91dFRlc3RzL2Zh
c3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCSh3b3JraW5nIGNvcHkpCkBA
IC0xMSw2ICsxMSw3IEBAIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgc2hvdWxkQmVGYWxz
ZSgiaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKFwiY29t
LmFwcGxlLldlYktpdC5XZWJDb250ZW50XCIsIFwiY29tLmFwcGxlLm5lc2Vzc2lvbm1hbmFnZXJc
IikiKTsKICAgICBzaG91bGRCZUZhbHNlKCJpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBB
Y2Nlc3NUb0dsb2JhbE5hbWUoXCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnRcIiwgXCJjb20u
YXBwbGUubmVzZXNzaW9ubWFuYWdlci5jb250ZW50LWZpbHRlclwiKSIpOwogICAgIHNob3VsZEJl
RmFsc2UoImludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xvYmFsTmFtZShc
ImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudFwiLCBcImNvbS5hcHBsZS5zeXN0ZW0ubG9nZ2Vy
XCIpIik7CisgICAgc2hvdWxkQmVGYWxzZSgiaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3Vw
QWNjZXNzVG9HbG9iYWxOYW1lKFwiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50XCIsIFwiY29t
LmFwcGxlLmxzZC5tYXBkYlwiKSIpOwogfQogPC9zY3JpcHQ+CiA8L2hlYWQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395084</attachid>
            <date>2020-03-31 13:23:20 -0700</date>
            <delta_ts>2020-03-31 17:45:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200331132319.patch</filename>
            <type>text/plain</type>
            <size>10607</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkzMDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIwLTAzLTMxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUaGlzIHdhcyBkb25lIGZvciBp
T1MgaW4gPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNTg5MTU+LCBhbmQgaW4g
b3JkZXIgdG8gYmUgYWJsZSB0byBkbyB0aGlzCisgICAgICAgIG9uIG1hY09TLCBjaGVja2luZyBp
biB3aXRoIExhdW5jaCBTZXJ2aWNlcyBhbmQgdXBkYXRpbmcgdGhlIHByb2Nlc3MgbmFtZSBuZWVk
cyB0byBiZSBkb25lIGFmdGVyIHRoZQorICAgICAgICBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2Ug
bWFwcGluZyBoYXMgYmVlbiBkb25lIGluIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdl
YlByb2Nlc3MuIEFsc28sIHRoZQorICAgICAgICBwcmV2aW91cyBjYWxsIHRvIFJlZ2lzdGVyQXBw
bGljYXRpb24gaGFzIGJlZW4gcmVwbGFjZWQgd2l0aCBhIGNhbGwgdG8gbGF1bmNoU2VydmljZXND
aGVja0luLCBzaW5jZQorICAgICAgICBSZWdpc3RlckFwcGxpY2F0aW9uIGlzIGFuIEFwcEtpdCBm
dW5jdGlvbiwgYW5kIHNob3VsZCBiZSBhdm9pZGVkIHNpbmNlIHRoZSBXZWJDb250ZW50IHByb2Nl
c3MgaXMgbm90CisgICAgICAgIGEgTlNBcHBsaWNhdGlvbiBhbnltb3JlLgorCisgICAgICAgIFRl
c3Q6IGZhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCisKKyAgICAgICAg
KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkF1
eGlsaWFyeVByb2Nlc3M6OmxhdW5jaFNlcnZpY2VzQ2hlY2tJbik6CisgICAgICAgICogVUlQcm9j
ZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBy
b2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Oldl
YlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy
b2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6
cGxhdGZvcm1Jbml0aWFsaXplUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBw
bGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wMy0zMSAgQWxleCBDaHJpc3RlbnNlbiAgPGFj
aHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBTUEkgV0tXZWJwYWdlUHJlZmVy
ZW5jZXMuX3VzZXJDb250ZW50Q29udHJvbGxlcgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQv
bWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9T
aGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI1OTI5NCkKKysrIFNv
dXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNv
cHkpCkBAIC03NSw2ICs3NSw5IEBAIGVudW0gTFNTZXNzaW9uSUQgewogdHlwZWRlZiBib29sIChe
TFNTZXJ2ZXJDb25uZWN0aW9uQWxsb3dlZEJsb2NrKSAoIENGRGljdGlvbmFyeVJlZiBvcHRpb25z
UmVmICk7CiBleHRlcm4gIkMiIHZvaWQgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1Nl
cnZlckNvbm5lY3Rpb25TdGF0dXModWludDY0X3QgZmxhZ3MsIExTU2VydmVyQ29ubmVjdGlvbkFs
bG93ZWRCbG9jayBibG9jayk7CiBleHRlcm4gIkMiIENGRGljdGlvbmFyeVJlZiBfTFNBcHBsaWNh
dGlvbkNoZWNrSW4oTFNTZXNzaW9uSUQgc2Vzc2lvbklELCBDRkRpY3Rpb25hcnlSZWYgYXBwbGlj
YXRpb25JbmZvKTsKKyNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQorZXh0ZXJuICJDIiB2b2lk
IF9DU0NoZWNrRml4RGlzYWJsZSgpOworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNp
bmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xNTEsNiArMTU0LDExIEBAIHN0YXRpYyB2b2lkIGlu
aXRpYWxpemVUaW1lckNvYWxlc2NpbmdQb2wKIAogdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjpsYXVu
Y2hTZXJ2aWNlc0NoZWNrSW4oKQogeworI2lmIEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUpCisgICAg
Ly8gX0NTQ2hlY2tGaXhEaXNhYmxlKCkgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2lu
ZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcy4KKyAgICBfQ1NDaGVja0ZpeERpc2FibGUoKTsKKyNl
bmRpZgorCiAgICAgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1NlcnZlckNvbm5lY3Rp
b25TdGF0dXMoMCwgMCk7CiAgICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gdW51c2VkID0g
X0xTQXBwbGljYXRpb25DaGVja0luKGtMU0RlZmF1bHRTZXNzaW9uSUQsIENGQnVuZGxlR2V0SW5m
b0RpY3Rpb25hcnkoQ0ZCdW5kbGVHZXRNYWluQnVuZGxlKCkpKTsKIH0KSW5kZXg6IFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQko
cmV2aXNpb24gMjU5Mjk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJv
Y2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDA2LDYgKzQwNiwxMCBAQCB2b2lk
IFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXCiAgICAgcGFyYW1ldGVycy5zeXN0
ZW1IYXNCYXR0ZXJ5ID0gc3lzdGVtSGFzQmF0dGVyeSgpOwogICAgIHBhcmFtZXRlcnMubWltZVR5
cGVzTWFwID0gY29tbW9uTWltZVR5cGVzTWFwKCk7CiAgICAgcGFyYW1ldGVycy5tYXBVVElGcm9t
TUlNRVR5cGUgPSBjcmVhdGVVVElGcm9tTUlNRVR5cGVNYXAoKTsKKworICAgIFNhbmRib3hFeHRl
bnNpb246OkhhbmRsZSBtYXBEQkhhbmRsZTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI
YW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUubHNkLm1hcGRiIiwgV1RGOjpudWxsb3B0LCBt
YXBEQkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKKyAgICBwYXJh
bWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRsZSk7CiAjZW5k
aWYKICAgICAKICNpZiBQTEFURk9STShJT1MpCkBAIC00MjYsMTAgKzQzMCw2IEBAIHZvaWQgV2Vi
UHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVcKICAgICBpZiAoV2ViQ29yZTo6SU9TQXBw
bGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCiAgICAgICAgIHBhcmFtZXRlcnMudmVjdG9yT2ZV
VFR5cGVJdGVtID0gY3JlYXRlVmVjdG9yT2ZVVFR5cGVJdGVtKCk7CiAjZW5kaWYKLQotICAgIFNh
bmRib3hFeHRlbnNpb246OkhhbmRsZSBtYXBEQkhhbmRsZTsKLSAgICBTYW5kYm94RXh0ZW5zaW9u
OjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUubHNkLm1hcGRiIiwgV1RGOjpu
dWxsb3B0LCBtYXBEQkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsK
LSAgICBwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRs
ZSk7CiAjZW5kaWYKICAgICAKICAgICAvLyBBbGxvdyBtaWNyb3Bob25lIGFjY2VzcyBpZiBlaXRo
ZXIgcHJlZmVyZW5jZSBpcyBzZXQgYmVjYXVzZSBXZWJSVEMgcmVxdWlyZXMgbWljcm9waG9uZSBh
Y2Nlc3MuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nl
c3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBs
ZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTY3
OCwxMCArNjc4LDE2IEBACiAjZW5kaWYKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5Qb3dl
ck1hbmFnZW1lbnQuY29udHJvbCIpCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuY29yZXNl
cnZpY2VzLmxhdW5jaHNlcnZpY2VzZCIpCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUubHNk
Lm1hcGRiIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiKQogKQog
CisoZGVueSBtYWNoLWxvb2t1cAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg
Pj0gMTAxNjAwCisgICAgKHdpdGggdGVsZW1ldHJ5LWJhY2t0cmFjZSkKKyNlbmRpZgorICAgIChn
bG9iYWwtbmFtZSAiY29tLmFwcGxlLmxzZC5tYXBkYiIpCispCisKIChhbGxvdyBtYWNoLWxvb2t1
cAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwCiAgICAgKHdp
dGggdGVsZW1ldHJ5KQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlBy
b2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j
b2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNTkyOTQpCisrKyBTb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x
MzQsMTAgKzEzNCw2IEBACiAjaW1wb3J0IDxvcy9zdGF0ZV9wcml2YXRlLmg+CiAjZW5kaWYKIAot
I2lmIEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUpCi1leHRlcm4gIkMiIHZvaWQgX0NTQ2hlY2tGaXhE
aXNhYmxlKCk7Ci0jZW5kaWYKLQogI2RlZmluZSBSRUxFQVNFX0xPR19TRVNTSU9OX0lEIChtX3Nl
c3Npb25JRCA/IG1fc2Vzc2lvbklELT50b1VJbnQ2NCgpIDogMCkKICNkZWZpbmUgUkVMRUFTRV9M
T0dfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNP
bkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAtIFtzZXNzaW9uSUQ9JSIgUFJJdTY0ICJd
IFdlYlByb2Nlc3M6OiIgZm10LCB0aGlzLCBSRUxFQVNFX0xPR19TRVNTSU9OX0lELCAjI19fVkFf
QVJHU19fKQogI2RlZmluZSBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKGNoYW5uZWwsIGZt
dCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRihpc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwg
Y2hhbm5lbCwgIiVwIC0gW3Nlc3Npb25JRD0lIiBQUkl1NjQgIl0gV2ViUHJvY2Vzczo6IiBmbXQs
IHRoaXMsIFJFTEVBU0VfTE9HX1NFU1NJT05fSUQsICMjX19WQV9BUkdTX18pCkBAIC0yNzMsNiAr
MjY5LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAg
ICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkoKnBhcmFtZXRlcnMubmVTZXNz
aW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZSk7CiAgICAgTmV0d29ya0V4dGVuc2lvbkNvbnRlbnRG
aWx0ZXI6OnNldEhhc0NvbnN1bWVkU2FuZGJveEV4dGVuc2lvbnMocGFyYW1ldGVycy5uZUhlbHBl
ckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgpICYmIHBhcmFtZXRlcnMubmVTZXNzaW9uTWFuYWdl
ckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgpKTsKIAorICAgIC8vIE1hcCBMYXVuY2ggU2Vydmlj
ZXMgZGF0YWJhc2UuCiAgICAgaWYgKHBhcmFtZXRlcnMubWFwREJFeHRlbnNpb25IYW5kbGUpIHsK
ICAgICAgICAgYXV0byBleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92
ZSgqcGFyYW1ldGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSkpOwogICAgICAgICBib29sIG9rID0g
ZXh0ZW5zaW9uLT5jb25zdW1lKCk7CkBAIC0zMTcsNiArMzE0LDggQEAgdm9pZCBXZWJQcm9jZXNz
OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogI2VuZGlmCiAKICAgICBXZWJDb3JlOjpzbGVlcERp
c2FibGVyQ2xpZW50KCkgPSBtYWtlVW5pcXVlPFdlYlNsZWVwRGlzYWJsZXJDbGllbnQ+KCk7CisK
KyAgICB1cGRhdGVQcm9jZXNzTmFtZSgpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3Jt
U2V0V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRl
cnMmJiBwYXJhbWV0ZXJzKQpAQCAtMzM1LDIzICszMzQsMjYgQEAgdm9pZCBXZWJQcm9jZXNzOjpw
bGF0Zm9ybVNldFdlYnNpdGVEYXRhUwogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0
aWFsaXplUHJvY2Vzc05hbWUoY29uc3QgQXV4aWxpYXJ5UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFy
YW1ldGVycyYpCit2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBB
dXhpbGlhcnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewog
I2lmIFBMQVRGT1JNKE1BQykKLSNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQotICAgIC8vIF9D
U0NoZWNrRml4RGlzYWJsZSgpIG5lZWRzIHRvIGJlIGNhbGxlZCBiZWZvcmUgY2hlY2tpbmcgaW4g
d2l0aCBMYXVuY2ggU2VydmljZXMuCi0gICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7Ci0jZW5kaWYK
LSAgICAvLyBUaGlzIGlzIG5lY2Vzc2FyeSBzbyB0aGF0IHdlIGFyZSBhYmxlIHRvIHNldCB0aGUg
cHJvY2VzcycgZGlzcGxheSBuYW1lLgotICAgIF9SZWdpc3RlckFwcGxpY2F0aW9uKG51bGxwdHIs
IG51bGxwdHIpOwotCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICBtX3VpUHJvY2Vzc05h
bWUgPSBwYXJhbWV0ZXJzLnVpUHJvY2Vzc05hbWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShw
YXJhbWV0ZXJzKTsKICNlbmRpZgogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NO
YW1lKCkKIHsKICNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9u
Y2VGbGFnOworICAgIHN0ZDo6Y2FsbF9vbmNlKAorICAgICAgICBvbmNlRmxhZywKKyAgICAgICAg
W3RoaXNdIHsKKyAgICAgICAgICAgIC8vIENoZWNraW5nIGluIHdpdGggTGF1bmNoIFNlcnZpY2Vz
IGlzIG5lY2Vzc2FyeSB0byBiZSBhYmxlIHRvIHNldCB0aGUgcHJvY2VzcycgZGlzcGxheSBuYW1l
LgorICAgICAgICAgICAgbGF1bmNoU2VydmljZXNDaGVja0luKCk7CisgICAgfSk7CisKICAgICBO
U1N0cmluZyAqYXBwbGljYXRpb25OYW1lOwogICAgIHN3aXRjaCAobV9wcm9jZXNzVHlwZSkgewog
ICAgIGNhc2UgUHJvY2Vzc1R5cGU6Okluc3BlY3RvcjoKQEAgLTUyMSw4ICs1MjMsNiBAQCB2b2lk
IFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2NlCiAgICAgICAgIGxhdW5jaFNlcnZp
Y2VzQ2hlY2tJbigpOwogICAgIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCUFJPQ0VTU19XSU5ET1dT
RVJWRVJfQkxPQ0tJTkcpCi0KLSAgICBtX3VpUHJvY2Vzc05hbWUgPSBwYXJhbWV0ZXJzLnVpUHJv
Y2Vzc05hbWU7CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAgICAgaWYgKHBhcmFtZXRlcnMu
ZXh0cmFJbml0aWFsaXphdGlvbkRhdGEuZ2V0KCJpbnNwZWN0b3ItcHJvY2VzcyJfcykgPT0gIjEi
KQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz
L0NoYW5nZUxvZwkocmV2aXNpb24gMjU5Mjk0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3
b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDMtMzEgIFBlciBBcm5lIFZvbGxh
biAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gRGVueSBtYWNoLWxvb2t1
cCBhY2Nlc3MgdG8gImNvbS5hcHBsZS5sc2QubWFwZGIiIGluIHNhbmRib3gKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTgxNAorCisgICAgICAgIFJl
dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogZmFzdC9zYW5kYm94L21hYy9zYW5k
Ym94LW1hY2gtbG9va3VwLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3NhbmRib3gvbWFj
L3NhbmRib3gtbWFjaC1sb29rdXAuaHRtbDoKKwogMjAyMC0wMy0zMSAgSmFzb24gTGF3cmVuY2Ug
IDxsYXdyZW5jZS5qQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBbIGlPUyB3azIg
XSBmYXN0L2Zvcm1zL2lucHV0LXRleHQtc2Nyb2xsLWxlZnQtb24tYmx1ci5odG1sIGlzIGZsYWt5
IGZhaWxpbmcuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRib3gtbWFj
aC1sb29rdXAtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvc2Fu
ZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDI1OTI5
NCkKKysrIExheW91dFRlc3RzL2Zhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC1l
eHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTgsNCArOCw1IEBAIFBBU1MgaW50ZXJuYWxz
Lmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXMKIFBBU1MgaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNo
TG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQiLCAi
Y29tLmFwcGxlLm5lc2Vzc2lvbm1hbmFnZXIiKSBpcyBmYWxzZQogUEFTUyBpbnRlcm5hbHMuaGFz
U2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5hbWUoImNvbS5hcHBsZS5XZWJLaXQuV2Vi
Q29udGVudCIsICJjb20uYXBwbGUubmVzZXNzaW9ubWFuYWdlci5jb250ZW50LWZpbHRlciIpIGlz
IGZhbHNlCiBQQVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xvYmFs
TmFtZSgiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50IiwgImNvbS5hcHBsZS5zeXN0ZW0ubG9n
Z2VyIikgaXMgZmFsc2UKK1BBU1MgaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNz
VG9HbG9iYWxOYW1lKCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQiLCAiY29tLmFwcGxlLmxz
ZC5tYXBkYiIpIGlzIGZhbHNlCiAKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qvc2FuZGJveC9tYWMv
c2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qv
c2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCShyZXZpc2lvbiAyNTkyOTQpCisr
KyBMYXlvdXRUZXN0cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRib3gtbWFjaC1sb29rdXAuaHRtbAko
d29ya2luZyBjb3B5KQpAQCAtMTEsNiArMTEsNyBAQCBpZiAod2luZG93LmludGVybmFscykgewog
ICAgIHNob3VsZEJlRmFsc2UoImludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1Rv
R2xvYmFsTmFtZShcImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudFwiLCBcImNvbS5hcHBsZS5u
ZXNlc3Npb25tYW5hZ2VyXCIpIik7CiAgICAgc2hvdWxkQmVGYWxzZSgiaW50ZXJuYWxzLmhhc1Nh
bmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKFwiY29tLmFwcGxlLldlYktpdC5XZWJD
b250ZW50XCIsIFwiY29tLmFwcGxlLm5lc2Vzc2lvbm1hbmFnZXIuY29udGVudC1maWx0ZXJcIiki
KTsKICAgICBzaG91bGRCZUZhbHNlKCJpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nl
c3NUb0dsb2JhbE5hbWUoXCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnRcIiwgXCJjb20uYXBw
bGUuc3lzdGVtLmxvZ2dlclwiKSIpOworICAgIHNob3VsZEJlRmFsc2UoImludGVybmFscy5oYXNT
YW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xvYmFsTmFtZShcImNvbS5hcHBsZS5XZWJLaXQuV2Vi
Q29udGVudFwiLCBcImNvbS5hcHBsZS5sc2QubWFwZGJcIikiKTsKIH0KIDwvc2NyaXB0PgogPC9o
ZWFkPgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>395207</attachid>
            <date>2020-04-01 15:01:59 -0700</date>
            <delta_ts>2020-04-01 15:29:26 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209814-20200401150158.patch</filename>
            <type>text/plain</type>
            <size>12072</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTkzNTkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTAxICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIERlbnkgbWFjaC1s
b29rdXAgYWNjZXNzIHRvICJjb20uYXBwbGUubHNkLm1hcGRiIiBpbiBzYW5kYm94CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk4MTQKKworICAgICAg
ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUaGlzIHdhcyBkb25lIGZvciBp
T1MgaW4gPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNTg5MTU+LCBhbmQgaW4g
b3JkZXIgdG8gYmUgYWJsZSB0byBkbyB0aGlzCisgICAgICAgIG9uIG1hY09TLCBjaGVja2luZyBp
biB3aXRoIExhdW5jaCBTZXJ2aWNlcyBhbmQgdXBkYXRpbmcgdGhlIHByb2Nlc3MgbmFtZSBuZWVk
cyB0byBiZSBkb25lIGFmdGVyIHRoZQorICAgICAgICBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2Ug
bWFwcGluZyBoYXMgYmVlbiBkb25lIGluIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdl
YlByb2Nlc3MuIEFsc28sIHRoZQorICAgICAgICBwcmV2aW91cyBjYWxsIHRvIFJlZ2lzdGVyQXBw
bGljYXRpb24gaGFzIGJlZW4gcmVwbGFjZWQgd2l0aCBhIGNhbGwgdG8gbGF1bmNoU2VydmljZXND
aGVja0luLCBzaW5jZQorICAgICAgICBSZWdpc3RlckFwcGxpY2F0aW9uIGlzIGFuIEFwcEtpdCBm
dW5jdGlvbiwgYW5kIHNob3VsZCBiZSBhdm9pZGVkIHNpbmNlIHRoZSBXZWJDb250ZW50IHByb2Nl
c3MgaXMgbm90CisgICAgICAgIGEgTlNBcHBsaWNhdGlvbiBhbnltb3JlLgorCisgICAgICAgIFRl
c3Q6IGZhc3Qvc2FuZGJveC9tYWMvc2FuZGJveC1tYWNoLWxvb2t1cC5odG1sCisKKyAgICAgICAg
KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkF1
eGlsaWFyeVByb2Nlc3M6OmxhdW5jaFNlcnZpY2VzQ2hlY2tJbik6CisgICAgICAgICogVUlQcm9j
ZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBy
b2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Oldl
YlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy
b2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6
cGxhdGZvcm1Jbml0aWFsaXplUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBw
bGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wNC0wMSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9s
bXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gVXNlIE9CSkVDVCBsaWJy
YXJpZXMgZm9yIFdlYkNvcmUgYW5kIFBBTApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFj
L0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy
ZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI1OTM1OSkKKysrIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkp
CkBAIC03NSw2ICs3NSw5IEBAIGVudW0gTFNTZXNzaW9uSUQgewogdHlwZWRlZiBib29sICheTFNT
ZXJ2ZXJDb25uZWN0aW9uQWxsb3dlZEJsb2NrKSAoIENGRGljdGlvbmFyeVJlZiBvcHRpb25zUmVm
ICk7CiBleHRlcm4gIkMiIHZvaWQgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1NlcnZl
ckNvbm5lY3Rpb25TdGF0dXModWludDY0X3QgZmxhZ3MsIExTU2VydmVyQ29ubmVjdGlvbkFsbG93
ZWRCbG9jayBibG9jayk7CiBleHRlcm4gIkMiIENGRGljdGlvbmFyeVJlZiBfTFNBcHBsaWNhdGlv
bkNoZWNrSW4oTFNTZXNzaW9uSUQgc2Vzc2lvbklELCBDRkRpY3Rpb25hcnlSZWYgYXBwbGljYXRp
b25JbmZvKTsKKyNpZiBIQVZFKENTQ0hFQ0tGSVhESVNBQkxFKQorZXh0ZXJuICJDIiB2b2lkIF9D
U0NoZWNrRml4RGlzYWJsZSgpOworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcg
bmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xNTEsNiArMTU0LDExIEBAIHN0YXRpYyB2b2lkIGluaXRp
YWxpemVUaW1lckNvYWxlc2NpbmdQb2wKIAogdm9pZCBBdXhpbGlhcnlQcm9jZXNzOjpsYXVuY2hT
ZXJ2aWNlc0NoZWNrSW4oKQogeworI2lmIEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUpCisgICAgLy8g
X0NTQ2hlY2tGaXhEaXNhYmxlKCkgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2luZyBp
biB3aXRoIExhdW5jaCBTZXJ2aWNlcy4KKyAgICBfQ1NDaGVja0ZpeERpc2FibGUoKTsKKyNlbmRp
ZgorCiAgICAgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1NlcnZlckNvbm5lY3Rpb25T
dGF0dXMoMCwgMCk7CiAgICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gdW51c2VkID0gX0xT
QXBwbGljYXRpb25DaGVja0luKGtMU0RlZmF1bHRTZXNzaW9uSUQsIENGQnVuZGxlR2V0SW5mb0Rp
Y3Rpb25hcnkoQ0ZCdW5kbGVHZXRNYWluQnVuZGxlKCkpKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkocmV2
aXNpb24gMjU5MzU5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz
c1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDA2LDYgKzQwNiwxMCBAQCB2b2lkIFdl
YlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXCiAgICAgcGFyYW1ldGVycy5zeXN0ZW1I
YXNCYXR0ZXJ5ID0gc3lzdGVtSGFzQmF0dGVyeSgpOwogICAgIHBhcmFtZXRlcnMubWltZVR5cGVz
TWFwID0gY29tbW9uTWltZVR5cGVzTWFwKCk7CiAgICAgcGFyYW1ldGVycy5tYXBVVElGcm9tTUlN
RVR5cGUgPSBjcmVhdGVVVElGcm9tTUlNRVR5cGVNYXAoKTsKKworICAgIFNhbmRib3hFeHRlbnNp
b246OkhhbmRsZSBtYXBEQkhhbmRsZTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5k
bGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUubHNkLm1hcGRiIiwgV1RGOjpudWxsb3B0LCBtYXBE
QkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKKyAgICBwYXJhbWV0
ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRsZSk7CiAjZW5kaWYK
ICAgICAKICNpZiBQTEFURk9STShJT1MpCkBAIC00MjYsMTAgKzQzMCw2IEBAIHZvaWQgV2ViUHJv
Y2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVcKICAgICBpZiAoV2ViQ29yZTo6SU9TQXBwbGlj
YXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCiAgICAgICAgIHBhcmFtZXRlcnMudmVjdG9yT2ZVVFR5
cGVJdGVtID0gY3JlYXRlVmVjdG9yT2ZVVFR5cGVJdGVtKCk7CiAjZW5kaWYKLQotICAgIFNhbmRi
b3hFeHRlbnNpb246OkhhbmRsZSBtYXBEQkhhbmRsZTsKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpj
cmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUubHNkLm1hcGRiIiwgV1RGOjpudWxs
b3B0LCBtYXBEQkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKLSAg
ICBwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRsZSk7
CiAjZW5kaWYKICAgICAKICAgICAvLyBBbGxvdyBtaWNyb3Bob25lIGFjY2VzcyBpZiBlaXRoZXIg
cHJlZmVyZW5jZSBpcyBzZXQgYmVjYXVzZSBXZWJSVEMgcmVxdWlyZXMgbWljcm9waG9uZSBhY2Nl
c3MuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Mu
c2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5X
ZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyNTkzNTkpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTY3OSwx
MCArNjc5LDE2IEBACiAjZW5kaWYKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5Qb3dlck1h
bmFnZW1lbnQuY29udHJvbCIpCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuY29yZXNlcnZp
Y2VzLmxhdW5jaHNlcnZpY2VzZCIpCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUubHNkLm1h
cGRiIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiKQogKQogCiso
ZGVueSBtYWNoLWxvb2t1cAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g
MTAxNjAwCisgICAgKHdpdGggdGVsZW1ldHJ5LWJhY2t0cmFjZSkKKyNlbmRpZgorICAgIChnbG9i
YWwtbmFtZSAiY29tLmFwcGxlLmxzZC5tYXBkYiIpCispCisKIChhbGxvdyBtYWNoLWxvb2t1cAog
I2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwCiAgICAgKHdpdGgg
dGVsZW1ldHJ5KQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl
c3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
V2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNTkzNTkpCisrKyBTb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQs
MTAgKzEzNCw2IEBACiAjaW1wb3J0IDxvcy9zdGF0ZV9wcml2YXRlLmg+CiAjZW5kaWYKIAotI2lm
IEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUpCi1leHRlcm4gIkMiIHZvaWQgX0NTQ2hlY2tGaXhEaXNh
YmxlKCk7Ci0jZW5kaWYKLQogI2RlZmluZSBSRUxFQVNFX0xPR19TRVNTSU9OX0lEIChtX3Nlc3Np
b25JRCA/IG1fc2Vzc2lvbklELT50b1VJbnQ2NCgpIDogMCkKICNkZWZpbmUgUkVMRUFTRV9MT0df
SUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxv
Z2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAtIFtzZXNzaW9uSUQ9JSIgUFJJdTY0ICJdIFdl
YlByb2Nlc3M6OiIgZm10LCB0aGlzLCBSRUxFQVNFX0xPR19TRVNTSU9OX0lELCAjI19fVkFfQVJH
U19fKQogI2RlZmluZSBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwg
Li4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRihpc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hh
bm5lbCwgIiVwIC0gW3Nlc3Npb25JRD0lIiBQUkl1NjQgIl0gV2ViUHJvY2Vzczo6IiBmbXQsIHRo
aXMsIFJFTEVBU0VfTE9HX1NFU1NJT05fSUQsICMjX19WQV9BUkdTX18pCkBAIC0xNjcsNiArMTYz
LDE4IEBAIHN0YXRpYyBpZCBOU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUZvY3UKIAogdm9pZCBX
ZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlv
blBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CisgICAgLy8gTWFwIExhdW5jaCBTZXJ2aWNlcyBk
YXRhYmFzZS4gVGhpcyBzaG91bGQgYmUgZG9uZSBhcyBlYXJseSBhcyBwb3NzaWJsZSwgYXMgdGhl
IG1hcHBpbmcgd2lsbCBmYWlsCisgICAgLy8gaWYgJ2NvbS5hcHBsZS5sc2QubWFwZGInIGlzIGJl
aW5nIGFjY2Vzc2VkIGJlZm9yZSB0aGlzLgorICAgIGlmIChwYXJhbWV0ZXJzLm1hcERCRXh0ZW5z
aW9uSGFuZGxlKSB7CisgICAgICAgIGF1dG8gZXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbjo6
Y3JlYXRlKFdURk1vdmUoKnBhcmFtZXRlcnMubWFwREJFeHRlbnNpb25IYW5kbGUpKTsKKyAgICAg
ICAgYm9vbCBvayA9IGV4dGVuc2lvbi0+Y29uc3VtZSgpOworICAgICAgICBBU1NFUlRfVU5VU0VE
KG9rLCBvayk7CisgICAgICAgIC8vIFBlcmZvcm0gQVBJIGNhbGxzIHdoaWNoIHdpbGwgY29tbXVu
aWNhdGUgd2l0aCB0aGUgZGF0YWJhc2UgbWFwcGluZyBzZXJ2aWNlLCBhbmQgbWFwIHRoZSBkYXRh
YmFzZS4KKyAgICAgICAgYXV0byB1dGkgPSBhZG9wdENGKFVUVHlwZUNyZWF0ZVByZWZlcnJlZElk
ZW50aWZpZXJGb3JUYWcoa1VUVGFnQ2xhc3NNSU1FVHlwZSwgQ0ZTVFIoInRleHQvaHRtbCIpLCAw
KSk7CisgICAgICAgIG9rID0gZXh0ZW5zaW9uLT5yZXZva2UoKTsKKyAgICAgICAgQVNTRVJUX1VO
VVNFRChvaywgb2spOworICAgIH0KKwogI2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9H
X0RJU0FCTEVECiAgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3Nhcnko
cGFyYW1ldGVycy53ZWJDb3JlTG9nZ2luZ0NoYW5uZWxzKTsKICAgICBXZWJLaXQ6OmluaXRpYWxp
emVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHBhcmFtZXRlcnMud2ViS2l0TG9nZ2luZ0NoYW5uZWxz
KTsKQEAgLTI3MywxNiArMjgxLDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp
emVXZWJQcgogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkoKnBh
cmFtZXRlcnMubmVTZXNzaW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZSk7CiAgICAgTmV0d29ya0V4
dGVuc2lvbkNvbnRlbnRGaWx0ZXI6OnNldEhhc0NvbnN1bWVkU2FuZGJveEV4dGVuc2lvbnMocGFy
YW1ldGVycy5uZUhlbHBlckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgpICYmIHBhcmFtZXRlcnMu
bmVTZXNzaW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgpKTsKIAotICAgIGlmIChw
YXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlKSB7Ci0gICAgICAgIGF1dG8gZXh0ZW5zaW9u
ID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlKFdURk1vdmUoKnBhcmFtZXRlcnMubWFwREJFeHRl
bnNpb25IYW5kbGUpKTsKLSAgICAgICAgYm9vbCBvayA9IGV4dGVuc2lvbi0+Y29uc3VtZSgpOwot
ICAgICAgICBBU1NFUlRfVU5VU0VEKG9rLCBvayk7Ci0gICAgICAgIC8vIFBlcmZvcm0gQVBJIGNh
bGxzIHdoaWNoIHdpbGwgY29tbXVuaWNhdGUgd2l0aCB0aGUgZGF0YWJhc2UgbWFwcGluZyBzZXJ2
aWNlLCBhbmQgbWFwIHRoZSBkYXRhYmFzZS4KLSAgICAgICAgYXV0byB1dGkgPSBhZG9wdENGKFVU
VHlwZUNyZWF0ZVByZWZlcnJlZElkZW50aWZpZXJGb3JUYWcoa1VUVGFnQ2xhc3NNSU1FVHlwZSwg
Q0ZTVFIoInRleHQvaHRtbCIpLCAwKSk7Ci0gICAgICAgIG9rID0gZXh0ZW5zaW9uLT5yZXZva2Uo
KTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChvaywgb2spOwotICAgIH0KLQogICAgIHNldFN5c3Rl
bUhhc0JhdHRlcnkocGFyYW1ldGVycy5zeXN0ZW1IYXNCYXR0ZXJ5KTsKIAogICAgIGlmIChwYXJh
bWV0ZXJzLm1pbWVUeXBlc01hcCkKQEAgLTMxNyw2ICszMTUsOCBAQCB2b2lkIFdlYlByb2Nlc3M6
OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAjZW5kaWYKIAogICAgIFdlYkNvcmU6OnNsZWVwRGlz
YWJsZXJDbGllbnQoKSA9IG1ha2VVbmlxdWU8V2ViU2xlZXBEaXNhYmxlckNsaWVudD4oKTsKKwor
ICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1T
ZXRXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyhXZWJQcm9jZXNzRGF0YVN0b3JlUGFyYW1ldGVy
cyYmIHBhcmFtZXRlcnMpCkBAIC0zMzUsMjMgKzMzNSwyNiBAQCB2b2lkIFdlYlByb2Nlc3M6OnBs
YXRmb3JtU2V0V2Vic2l0ZURhdGFTCiAgICAgfQogfQogCi12b2lkIFdlYlByb2Nlc3M6OmluaXRp
YWxpemVQcm9jZXNzTmFtZShjb25zdCBBdXhpbGlhcnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJh
bWV0ZXJzJikKK3ZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKGNvbnN0IEF1
eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAj
aWYgUExBVEZPUk0oTUFDKQotI2lmIEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUpCi0gICAgLy8gX0NT
Q2hlY2tGaXhEaXNhYmxlKCkgbmVlZHMgdG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2luZyBpbiB3
aXRoIExhdW5jaCBTZXJ2aWNlcy4KLSAgICBfQ1NDaGVja0ZpeERpc2FibGUoKTsKLSNlbmRpZgot
ICAgIC8vIFRoaXMgaXMgbmVjZXNzYXJ5IHNvIHRoYXQgd2UgYXJlIGFibGUgdG8gc2V0IHRoZSBw
cm9jZXNzJyBkaXNwbGF5IG5hbWUuCi0gICAgX1JlZ2lzdGVyQXBwbGljYXRpb24obnVsbHB0ciwg
bnVsbHB0cik7Ci0KLSAgICB1cGRhdGVQcm9jZXNzTmFtZSgpOworICAgIG1fdWlQcm9jZXNzTmFt
ZSA9IHBhcmFtZXRlcnMudWlQcm9jZXNzTmFtZTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBh
cmFtZXRlcnMpOwogI2VuZGlmCiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6dXBkYXRlUHJvY2Vzc05h
bWUoKQogewogI2lmIFBMQVRGT1JNKE1BQykKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25j
ZUZsYWc7CisgICAgc3RkOjpjYWxsX29uY2UoCisgICAgICAgIG9uY2VGbGFnLAorICAgICAgICBb
dGhpc10geworICAgICAgICAgICAgLy8gQ2hlY2tpbmcgaW4gd2l0aCBMYXVuY2ggU2VydmljZXMg
aXMgbmVjZXNzYXJ5IHRvIGJlIGFibGUgdG8gc2V0IHRoZSBwcm9jZXNzJyBkaXNwbGF5IG5hbWUu
CisgICAgICAgICAgICBsYXVuY2hTZXJ2aWNlc0NoZWNrSW4oKTsKKyAgICB9KTsKKwogICAgIE5T
U3RyaW5nICphcHBsaWNhdGlvbk5hbWU7CiAgICAgc3dpdGNoIChtX3Byb2Nlc3NUeXBlKSB7CiAg
ICAgY2FzZSBQcm9jZXNzVHlwZTo6SW5zcGVjdG9yOgpAQCAtNTIxLDggKzUyNCw2IEBAIHZvaWQg
V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJvY2UKICAgICAgICAgbGF1bmNoU2Vydmlj
ZXNDaGVja0luKCk7CiAgICAgfQogI2VuZGlmIC8vIEVOQUJMRShXRUJQUk9DRVNTX1dJTkRPV1NF
UlZFUl9CTE9DS0lORykKLQotICAgIG1fdWlQcm9jZXNzTmFtZSA9IHBhcmFtZXRlcnMudWlQcm9j
ZXNzTmFtZTsKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCiAKICAgICBpZiAocGFyYW1ldGVycy5l
eHRyYUluaXRpYWxpemF0aW9uRGF0YS5nZXQoImluc3BlY3Rvci1wcm9jZXNzIl9zKSA9PSAiMSIp
CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCShyZXZpc2lvbiAyNTkzNTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv
cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNC0wMSAgUGVyIEFybmUgVm9sbGFu
ICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBEZW55IG1hY2gtbG9va3Vw
IGFjY2VzcyB0byAiY29tLmFwcGxlLmxzZC5tYXBkYiIgaW4gc2FuZGJveAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODE0CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBmYXN0L3NhbmRib3gvbWFjL3NhbmRi
b3gtbWFjaC1sb29rdXAtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qvc2FuZGJveC9tYWMv
c2FuZGJveC1tYWNoLWxvb2t1cC5odG1sOgorCiAyMDIwLTA0LTAxICBDaHJpcyBEdW1leiAgPGNk
dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV93cmFwcGVyIG9u
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQt
Y29udGVudC9tZWRpYS1lbGVtZW50cy9yZWFkeS1zdGF0ZXMvYXV0b3BsYXkuaHRtbApJbmRleDog
TGF5b3V0VGVzdHMvZmFzdC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9va3VwLWV4cGVjdGVk
LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRib3gt
bWFjaC1sb29rdXAtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAyNTkzNTkpCisrKyBMYXlvdXRUZXN0
cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRib3gtbWFjaC1sb29rdXAtZXhwZWN0ZWQudHh0CSh3b3Jr
aW5nIGNvcHkpCkBAIC04LDQgKzgsNSBAQCBQQVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExv
b2t1cEFjY2VzCiBQQVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xv
YmFsTmFtZSgiY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50IiwgImNvbS5hcHBsZS5uZXNlc3Np
b25tYW5hZ2VyIikgaXMgZmFsc2UKIFBBU1MgaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3Vw
QWNjZXNzVG9HbG9iYWxOYW1lKCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQiLCAiY29tLmFw
cGxlLm5lc2Vzc2lvbm1hbmFnZXIuY29udGVudC1maWx0ZXIiKSBpcyBmYWxzZQogUEFTUyBpbnRl
cm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5hbWUoImNvbS5hcHBsZS5X
ZWJLaXQuV2ViQ29udGVudCIsICJjb20uYXBwbGUuc3lzdGVtLmxvZ2dlciIpIGlzIGZhbHNlCitQ
QVNTIGludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFjY2Vzc1RvR2xvYmFsTmFtZSgiY29t
LmFwcGxlLldlYktpdC5XZWJDb250ZW50IiwgImNvbS5hcHBsZS5sc2QubWFwZGIiKSBpcyBmYWxz
ZQogCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRib3gtbWFjaC1sb29r
dXAuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3NhbmRib3gvbWFjL3NhbmRi
b3gtbWFjaC1sb29rdXAuaHRtbAkocmV2aXNpb24gMjU5MzU5KQorKysgTGF5b3V0VGVzdHMvZmFz
dC9zYW5kYm94L21hYy9zYW5kYm94LW1hY2gtbG9va3VwLmh0bWwJKHdvcmtpbmcgY29weSkKQEAg
LTExLDYgKzExLDcgQEAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKICAgICBzaG91bGRCZUZhbHNl
KCJpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5hbWUoXCJjb20u
YXBwbGUuV2ViS2l0LldlYkNvbnRlbnRcIiwgXCJjb20uYXBwbGUubmVzZXNzaW9ubWFuYWdlclwi
KSIpOwogICAgIHNob3VsZEJlRmFsc2UoImludGVybmFscy5oYXNTYW5kYm94TWFjaExvb2t1cEFj
Y2Vzc1RvR2xvYmFsTmFtZShcImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudFwiLCBcImNvbS5h
cHBsZS5uZXNlc3Npb25tYW5hZ2VyLmNvbnRlbnQtZmlsdGVyXCIpIik7CiAgICAgc2hvdWxkQmVG
YWxzZSgiaW50ZXJuYWxzLmhhc1NhbmRib3hNYWNoTG9va3VwQWNjZXNzVG9HbG9iYWxOYW1lKFwi
Y29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50XCIsIFwiY29tLmFwcGxlLnN5c3RlbS5sb2dnZXJc
IikiKTsKKyAgICBzaG91bGRCZUZhbHNlKCJpbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBB
Y2Nlc3NUb0dsb2JhbE5hbWUoXCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnRcIiwgXCJjb20u
YXBwbGUubHNkLm1hcGRiXCIpIik7CiB9CiA8L3NjcmlwdD4KIDwvaGVhZD4K
</data>

          </attachment>
      

    </bug>

</bugzilla>