<?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>213379</bug_id>
          
          <creation_ts>2020-06-19 08:02:12 -0700</creation_ts>
          <short_desc>[macOS] Connections to the preference daemon are established before entering the sandbox</short_desc>
          <delta_ts>2020-06-30 15:19:01 -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>213577</dependson>
          
          <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>lingcherd_ho</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1664360</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 08:02:12 -0700</bug_when>
    <thetext>On macOS, connections to the preference daemon are established before entering the sandbox. These connections also persist after entering the sandbox and denying access to the preference daemon. There should not be attempts to connect to the preference daemon before entering the sandbox, since these attempts will not be stopped by the sandbox.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664477</commentid>
    <comment_count>1</comment_count>
      <attachid>402313</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 13:11:49 -0700</bug_when>
    <thetext>Created attachment 402313
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664511</commentid>
    <comment_count>2</comment_count>
      <attachid>402313</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-19 14:13:55 -0700</bug_when>
    <thetext>Comment on attachment 402313
Patch

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

&gt; Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm:96
&gt; +    StringBuilder path;
&gt; +    path.append([webKit2Bundle resourcePath]);
&gt; +    path.append(&quot;/&quot;);
&gt; +    path.append(&quot;com.apple.WebKit.NetworkProcess.sb&quot;);
&gt; +    sandboxParameters.setOverrideSandboxProfilePath(path.toString());

This is a job for makeString, not StringBuilder.

    sandboxParameters.setOverrideSandboxProfilePath(makeString([webKit2Bundle resourcePath], &quot;/com.apple.WebKit.NetworkProcess.sb&quot;));

Or use a local String variable if you like.

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:229
&gt; +    // We don&apos;t need to talk to the dock.

Capitalize Dock.

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:233
&gt; +    if (Class nsApplicationClass = NSClassFromString(@&quot;NSApplication&quot;)) {
&gt; +        if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
&gt; +            [nsApplicationClass _preventDockConnections];
&gt; +    }

I know this code is pre-existing and only being moved, but this does seem risky — if this method is renamed, moved, or removed this code will just silently stop having any effect.

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:589
&gt; +    StringBuilder path;
&gt; +    path.append([webKit2Bundle resourcePath]);
&gt; +    path.append(&quot;/&quot;);
&gt; +    path.append(&quot;com.apple.WebProcess.sb&quot;);
&gt; +    sandboxParameters.setOverrideSandboxProfilePath(path.toString());

This is a job for makeString, not StringBuilder.

    sandboxParameters.setOverrideSandboxProfilePath(makeString([webKit2Bundle resourcePath], &quot;/com.apple.WebKit.WebProcess.sb&quot;));

Or use a local String variable if you like.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664536</commentid>
    <comment_count>3</comment_count>
      <attachid>402329</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 14:52:43 -0700</bug_when>
    <thetext>Created attachment 402329
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664538</commentid>
    <comment_count>4</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 14:54:12 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #2)
&gt; Comment on attachment 402313 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=402313&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm:96
&gt; &gt; +    StringBuilder path;
&gt; &gt; +    path.append([webKit2Bundle resourcePath]);
&gt; &gt; +    path.append(&quot;/&quot;);
&gt; &gt; +    path.append(&quot;com.apple.WebKit.NetworkProcess.sb&quot;);
&gt; &gt; +    sandboxParameters.setOverrideSandboxProfilePath(path.toString());
&gt; 
&gt; This is a job for makeString, not StringBuilder.
&gt; 
&gt;    
&gt; sandboxParameters.setOverrideSandboxProfilePath(makeString([webKit2Bundle
&gt; resourcePath], &quot;/com.apple.WebKit.NetworkProcess.sb&quot;));
&gt; 
&gt; Or use a local String variable if you like.
&gt; 

Fixed.

&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:229
&gt; &gt; +    // We don&apos;t need to talk to the dock.
&gt; 
&gt; Capitalize Dock.
&gt; 

Done.

&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:233
&gt; &gt; +    if (Class nsApplicationClass = NSClassFromString(@&quot;NSApplication&quot;)) {
&gt; &gt; +        if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
&gt; &gt; +            [nsApplicationClass _preventDockConnections];
&gt; &gt; +    }
&gt; 
&gt; I know this code is pre-existing and only being moved, but this does seem
&gt; risky — if this method is renamed, moved, or removed this code will just
&gt; silently stop having any effect.
&gt; 

I could be wrong, but it seems this method is supported.

&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:589
&gt; &gt; +    StringBuilder path;
&gt; &gt; +    path.append([webKit2Bundle resourcePath]);
&gt; &gt; +    path.append(&quot;/&quot;);
&gt; &gt; +    path.append(&quot;com.apple.WebProcess.sb&quot;);
&gt; &gt; +    sandboxParameters.setOverrideSandboxProfilePath(path.toString());
&gt; 
&gt; This is a job for makeString, not StringBuilder.
&gt; 
&gt;    
&gt; sandboxParameters.setOverrideSandboxProfilePath(makeString([webKit2Bundle
&gt; resourcePath], &quot;/com.apple.WebKit.WebProcess.sb&quot;));
&gt; 
&gt; Or use a local String variable if you like.

Fixed.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664540</commentid>
    <comment_count>5</comment_count>
      <attachid>402329</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-19 14:55:44 -0700</bug_when>
    <thetext>Comment on attachment 402329
Patch

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

&gt; Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm:92
&gt; +    sandboxParameters.setOverrideSandboxProfilePath(makeString(String([webKitBundle resourcePath]), &quot;/com.apple.WebKit.NetworkProcess.sb&quot;));

You should not need String() around [webKitBundle resourcePath]. If you do, that’s a bug in StringConcatenation.h implementation that we should fix.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664546</commentid>
    <comment_count>6</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-19 14:59:51 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #4)
&gt; (In reply to Darin Adler from comment #2)
&gt; &gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:233
&gt; &gt; &gt; +    if (Class nsApplicationClass = NSClassFromString(@&quot;NSApplication&quot;)) {
&gt; &gt; &gt; +        if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
&gt; &gt; &gt; +            [nsApplicationClass _preventDockConnections];
&gt; &gt; &gt; +    }
&gt; &gt; 
&gt; &gt; I know this code is pre-existing and only being moved, but this does seem
&gt; &gt; risky — if this method is renamed, moved, or removed this code will just
&gt; &gt; silently stop having any effect.
&gt; 
&gt; I could be wrong, but it seems this method is supported.

Why then are we calling it in such an unusual way?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664567</commentid>
    <comment_count>7</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 15:28:38 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #6)
&gt; (In reply to Per Arne Vollan from comment #4)
&gt; &gt; (In reply to Darin Adler from comment #2)
&gt; &gt; &gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:233
&gt; &gt; &gt; &gt; +    if (Class nsApplicationClass = NSClassFromString(@&quot;NSApplication&quot;)) {
&gt; &gt; &gt; &gt; +        if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
&gt; &gt; &gt; &gt; +            [nsApplicationClass _preventDockConnections];
&gt; &gt; &gt; &gt; +    }
&gt; &gt; &gt; 
&gt; &gt; &gt; I know this code is pre-existing and only being moved, but this does seem
&gt; &gt; &gt; risky — if this method is renamed, moved, or removed this code will just
&gt; &gt; &gt; silently stop having any effect.
&gt; &gt; 
&gt; &gt; I could be wrong, but it seems this method is supported.
&gt; 
&gt; Why then are we calling it in such an unusual way?

That is a good point! I wonder if it is done this way for it to compile on OS&apos;s where this method is not supported?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664580</commentid>
    <comment_count>8</comment_count>
      <attachid>402341</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 15:49:26 -0700</bug_when>
    <thetext>Created attachment 402341
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664583</commentid>
    <comment_count>9</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-19 15:50:40 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #7)
&gt; (In reply to Darin Adler from comment #6)
&gt; &gt; (In reply to Per Arne Vollan from comment #4)
&gt; &gt; &gt; (In reply to Darin Adler from comment #2)
&gt; &gt; &gt; &gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:233
&gt; &gt; &gt; &gt; &gt; +    if (Class nsApplicationClass = NSClassFromString(@&quot;NSApplication&quot;)) {
&gt; &gt; &gt; &gt; &gt; +        if ([nsApplicationClass respondsToSelector:@selector(_preventDockConnections)])
&gt; &gt; &gt; &gt; &gt; +            [nsApplicationClass _preventDockConnections];
&gt; &gt; &gt; &gt; &gt; +    }
&gt; &gt; &gt; &gt; 
&gt; &gt; &gt; &gt; I know this code is pre-existing and only being moved, but this does seem
&gt; &gt; &gt; &gt; risky — if this method is renamed, moved, or removed this code will just
&gt; &gt; &gt; &gt; silently stop having any effect.
&gt; &gt; &gt; 
&gt; &gt; &gt; I could be wrong, but it seems this method is supported.
&gt; &gt; 
&gt; &gt; Why then are we calling it in such an unusual way?
&gt; 
&gt; That is a good point! I wonder if it is done this way for it to compile on
&gt; OS&apos;s where this method is not supported?

Trying out a patch without using respondsToSelector.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664603</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-19 16:38:01 -0700</bug_when>
    <thetext>Committed r263295: &lt;https://trac.webkit.org/changeset/263295&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402341.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664604</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-19 16:38:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/64549175&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665883</commentid>
    <comment_count>12</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-24 15:23:25 -0700</bug_when>
    <thetext>This broke setting log channels via -WebCoreLogging</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665886</commentid>
    <comment_count>13</comment_count>
    <who name="Yusuke Suzuki">ysuzuki</who>
    <bug_when>2020-06-24 15:30:25 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 213577</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667704</commentid>
    <comment_count>14</comment_count>
      <attachid>403234</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-06-30 13:22:22 -0700</bug_when>
    <thetext>Created attachment 403234
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667763</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-30 15:19:00 -0700</bug_when>
    <thetext>Committed r263773: &lt;https://trac.webkit.org/changeset/263773&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 403234.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402313</attachid>
            <date>2020-06-19 13:11:49 -0700</date>
            <delta_ts>2020-06-19 14:13:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213379-20200619131148.patch</filename>
            <type>text/plain</type>
            <size>12141</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjgwKQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2
LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj
T1NdIENvbm5lY3Rpb25zIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQg
YmVmb3JlIGVudGVyaW5nIHRoZSBzYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBVc2UgY29ycmVjdCBwYXJhbWV0ZXIgdHlwZXMgaW4gX0NGUHJl
ZnNTZXREaXJlY3RNb2RlRW5hYmxlZCBhbmQgX0NGUHJlZnNTZXRSZWFkT25seSwgYW5kIG1vdmUK
KyAgICAgICAgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZCBpbnNpZGUgYW4gT2JqZWN0aXZl
LUMgZ3VhcmQsIHNpbmNlIEJPT0wgb25seSBzZWVtcyB0byBiZSBhIGJ1aWx0aW4KKyAgICAgICAg
dHlwZSBpbiBPYmplY3RpdmUtQy4KKworICAgICAgICAqIHBhbC9zcGkvY2YvQ0ZVdGlsaXRpZXNT
UEkuaDoKKwogMjAyMC0wNi0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu
Y29tPgogCiAgICAgICAgIFtDb2NvYV0gVW5pZnkgImZvbnQ6IiBDU1Mgc2hvcnRoYW5kIHZhbHVl
cyBiZXR3ZWVuIG1hY09TIGFuZCBpT1MgZmFtaWx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9QQUwv
cGFsL3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl
L1BBTC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHJldmlzaW9uIDI2MjkwNCkKKysrIFNv
dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHdvcmtpbmcgY29w
eSkKQEAgLTU4LDcgKzU4LDkgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRldlYlNlcnZpY2VzQ29weVBy
b3ZpZAogCiB2b2lkIF9fQ0ZSdW5Mb29wU2V0T3B0aW9uc1JlYXNvbihfX0NGUnVuTG9vcE9wdGlv
bnMgb3B0cywgQ0ZTdHJpbmdSZWYgcmVhc29uKTsKIAotdm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1v
ZGVFbmFibGVkKGJvb2wgZW5hYmxlZCk7Ci12b2lkIF9DRlByZWZzU2V0UmVhZE9ubHkoYm9vbCBm
bGFnKTsKKyNpZmRlZiBfX09CSkNfXwordm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1vZGVFbmFibGVk
KEJPT0wgZW5hYmxlZCk7CisjZW5kaWYKK3ZvaWQgX0NGUHJlZnNTZXRSZWFkT25seShCb29sZWFu
IGZsYWcpOwogCiBXVEZfRVhURVJOX0NfRU5ECkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjYyOTcy
KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwz
NyBAQAorMjAyMC0wNi0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisK
KyAgICAgICAgW21hY09TXSBDb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24gYXJl
IGVzdGFibGlzaGVkIGJlZm9yZSBlbnRlcmluZyB0aGUgc2FuZGJveAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMzc5CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gbWFjT1MsIGNvbm5lY3Rpb25zIHRv
IHRoZSBwcmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQgYmVmb3JlIGVudGVyaW5nIHRo
ZSBzYW5kYm94LiBUaGVzZSBjb25uZWN0aW9ucyBhbHNvIHBlcnNpc3QKKyAgICAgICAgYWZ0ZXIg
ZW50ZXJpbmcgdGhlIHNhbmRib3ggYW5kIGRlbnlpbmcgYWNjZXNzIHRvIHRoZSBwcmVmZXJlbmNl
IGRhZW1vbi4gVGhlcmUgc2hvdWxkIG5vdCBiZSBhdHRlbXB0cyB0byBjb25uZWN0IHRvIHRoZQor
ICAgICAgICBwcmVmZXJlbmNlIGRhZW1vbiBiZWZvcmUgZW50ZXJpbmcgdGhlIHNhbmRib3gsIHNp
bmNlIHRoZXNlIGF0dGVtcHRzIHdpbGwgbm90IGJlIHN0b3BwZWQgYnkgdGhlIHNhbmRib3guIFRo
aXMgcGF0Y2ggbW92ZXMKKyAgICAgICAgY29kZSB0aGF0IGNvbm5lY3RzIHRvIHRoZSBwcmVmZXJl
bmNlIGRhZW1vbiB0byBiZSBleGVjdXRlZCBhZnRlciB0aGUgc2FuZGJveCBoYXMgYmVlbiBlbnRl
cmVkLiBUaGF0IGluY2x1ZGVzIGNvZGUgdG8KKyAgICAgICAgcHJldmVudCBjb25uZWN0aW9ucyB0
byB0aGUgRG9jayBhbmQgY29kZSB0byBpbml0aWFsaXplIFdlYktpdCBsb2dnaW5nLiBBbHNvLCBp
bnN0ZWFkIG9mIGNhbGxpbmcgW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOl0sCisgICAgICAgIGNh
bGwgW05TQnVuZGxlIGJ1bmRsZVdpdGhJZGVudGlmaWVyOl0sIHNpbmNlIGNhbGxpbmcgW05TQnVu
ZGxlIGJ1bmRsZUZvckNsYXNzOl0gd2lsbCBjb25uZWN0IHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1v
bi4KKyAgICAgICAgRmluYWxseSwgYWxsb3cgdGhlIHN5c2NhbGwgU1lTX2dldGhvc3R1dWlkLCBz
aW5jZSB0aGF0IGlzIG5lZWRlZCBieSBDb3JlRm91bmRhdGlvbiB3aGVuIHRoZXJlIGlzIG5vIGFj
Y2VzcyB0byB0aGUKKyAgICAgICAgcHJlZmVyZW5jZSBkYWVtb24uCisKKyAgICAgICAgTm8gbmV3
IHRlc3RzLiBUaGlzIHNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLiBJdCB3b3Vs
ZCBiZSBuaWNlIHRvIGhhdmUgYSB0ZXN0IHRvIG1ha2Ugc3VyZSB0aGF0IHRoZXJlIGFyZSBubwor
ICAgICAgICBjb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24ganVzdCBiZWZvcmUg
ZW50ZXJpbmcgdGhlIHNhbmRib3gsIGJ1dCBJIGFtIG5vdCBhd2FyZSBvZiBob3cgdG8gaW1wbGVt
ZW50IHRoaXMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NN
YWMubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplU2FuZGJv
eCk6CisgICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuY3BwOgorICAgICAgICAoV2Vi
S2l0OjpBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplKToKKyAgICAgICAgKiBTaGFyZWQvQ29j
b2EvV2ViS2l0MkluaXRpYWxpemVDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6cnVuSW5pdGlh
bGl6YXRpb25Db2RlKToKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2Nv
YS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tOgorICAgICAgICAoV2ViS2l0OjpYUENTZXJ2
aWNlTWFpbik6CisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tOgor
ICAgICAgICAoV2ViS2l0Ojp3ZWJLaXQyQnVuZGxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2Nv
Y29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxh
dGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6
OmluaXRpYWxpemVTYW5kYm94KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQ
cm9jZXNzLnNiLmluOgorCiAyMDIwLTA2LTEyICBUYWthc2hpIEtvbW9yaSAgPFRha2FzaGkuS29t
b3JpQHNvbnkuY29tPgogCiAgICAgICAgIFtDdXJsXSBJbXBsZW1lbnQgZnVuY3Rpb25zIHRvIHVz
ZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI2Mjkw
NCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFj
Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw5ICs4NywxMyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNz
OjphbGxvd1NwZWNpZmljSFRUUFNDCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplU2Fu
ZGJveChjb25zdCBBdXhpbGlhcnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJh
bWV0ZXJzLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBzYW5kYm94UGFyYW1ldGVy
cykKIHsKICAgICAvLyBOZWVkIHRvIG92ZXJpZGUgdGhlIGRlZmF1bHQsIGJlY2F1c2Ugc2Vydmlj
ZSBoYXMgYSBkaWZmZXJlbnQgYnVuZGxlIElELgotICAgIE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxl
ID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKEAiV0tXZWJWaWV3
IildOworICAgIE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZVdpdGhJ
ZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYktpdCJdOwogCi0gICAgc2FuZGJveFBhcmFtZXRlcnMu
c2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgoW3dlYktpdDJCdW5kbGUgcGF0aEZvclJlc291
cmNlOkAiY29tLmFwcGxlLldlYktpdC5OZXR3b3JrUHJvY2VzcyIgb2ZUeXBlOkAic2IiXSk7Cisg
ICAgU3RyaW5nQnVpbGRlciBwYXRoOworICAgIHBhdGguYXBwZW5kKFt3ZWJLaXQyQnVuZGxlIHJl
c291cmNlUGF0aF0pOworICAgIHBhdGguYXBwZW5kKCIvIik7CisgICAgcGF0aC5hcHBlbmQoImNv
bS5hcHBsZS5XZWJLaXQuTmV0d29ya1Byb2Nlc3Muc2IiKTsKKyAgICBzYW5kYm94UGFyYW1ldGVy
cy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aChwYXRoLnRvU3RyaW5nKCkpOwogCiAgICAg
QXV4aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gocGFyYW1ldGVycywgc2FuZGJveFBh
cmFtZXRlcnMpOwogfQpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vz
cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vz
cy5jcHAJKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0F1eGlsaWFy
eVByb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw4ICsyNywxMCBAQAogI2luY2x1ZGUg
IkF1eGlsaWFyeVByb2Nlc3MuaCIKIAogI2luY2x1ZGUgIkNvbnRlbnRXb3JsZFNoYXJlZC5oIgor
I2luY2x1ZGUgIkxvZ0luaXRpYWxpemF0aW9uLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu
Y2x1ZGUgIlNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlIDxXZWJD
b3JlL0xvZ0luaXRpYWxpemF0aW9uLmg+CiAjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgogCiAj
aWYgIU9TKFdJTkRPV1MpCkBAIC03Niw2ICs3OCwxMSBAQCB2b2lkIEF1eGlsaWFyeVByb2Nlc3M6
OmluaXRpYWxpemUoY29uc3QgCiAgICAgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyBz
YW5kYm94UGFyYW1ldGVyczsKICAgICBpbml0aWFsaXplU2FuZGJveChwYXJhbWV0ZXJzLCBzYW5k
Ym94UGFyYW1ldGVycyk7CiAKKyNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNB
QkxFRAorICAgIFdlYkNvcmU6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCk7Cisg
ICAgV2ViS2l0Ojppbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOworI2VuZGlmIC8v
ICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisKICAgICBpbml0aWFsaXpl
UHJvY2Vzc05hbWUocGFyYW1ldGVycyk7CiAKICAgICAvLyBJbiBXZWJLaXQyLCBvbmx5IHRoZSBV
SSBwcm9jZXNzIHNob3VsZCBldmVyIGJlIGdlbmVyYXRpbmcgY2VydGFpbiBpZGVudGlmaWVycy4K
SW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYktpdDJJbml0aWFsaXplQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViS2l0MkluaXRp
YWxpemVDb2NvYS5tbQkocmV2aXNpb24gMjYyOTA0KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQv
Q29jb2EvV2ViS2l0MkluaXRpYWxpemVDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsMTAg
KzI2LDggQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViS2l0MkluaXRpYWxpemUu
aCIKIAotI2ltcG9ydCAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbXBvcnQgIlZlcnNpb25DaGVj
a3MuaCIKICNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0luaXRpYWxpemVUaHJlYWRpbmcuaD4KLSNp
bXBvcnQgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KICNpbXBvcnQgPG11dGV4PgogI2lt
cG9ydCA8d3RmL01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC01
NiwxMSArNTQsNiBAQCBzdGF0aWMgdm9pZCBydW5Jbml0aWFsaXphdGlvbkNvZGUodm9pZCogCiAg
ICAgUnVuTG9vcDo6aW5pdGlhbGl6ZU1haW4oKTsKIAogICAgIFdURjo6UmVmQ291bnRlZEJhc2U6
OmVuYWJsZVRocmVhZGluZ0NoZWNrc0dsb2JhbGx5KCk7Ci0KLSNpZiAhTE9HX0RJU0FCTEVEIHx8
ICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgIFdlYkNvcmU6OmluaXRpYWxpemVMb2dDaGFubmVs
c0lmTmVjZXNzYXJ5KCk7Ci0gICAgV2ViS2l0Ojppbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vz
c2FyeSgpOwotI2VuZGlmIC8vICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVE
CiB9CiAKIHZvaWQgSW5pdGlhbGl6ZVdlYktpdDIoKQpJbmRleDogU291cmNlL1dlYktpdC9TaGFy
ZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1t
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMv
Q29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlTWFpbi5tbQkocmV2aXNpb24gMjYyOTA0KQorKysg
U291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNl
L1hQQ1NlcnZpY2VNYWluLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMywxMCArMzMsNiBAQAogI2lt
cG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vWFBDU1BJLmg+
CiAKLSNpZiBQTEFURk9STShNQUMpCi0jaW1wb3J0IDxwYWwvc3BpL21hYy9OU0FwcGxpY2F0aW9u
U1BJLmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0YXRpYyB2b2lkIFhQQ1Nl
cnZpY2VFdmVudEhhbmRsZXIoeHBjX2Nvbm5lY3Rpb25fdCBwZWVyKQpAQCAtMTY5LDEyICsxNjUs
NiBAQCBpbnQgWFBDU2VydmljZU1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqCiAjaWYgUExBVEZP
Uk0oTUFDKQogICAgIC8vIERvbid0IGFsbG93IEFwcGxlIEV2ZW50cyBpbiBXZWJLaXQgcHJvY2Vz
c2VzLiBUaGlzIGNhbiBiZSByZW1vdmVkIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzE0MDEyODIzPiBp
cyBmaXhlZC4KICAgICBzZXRlbnYoIl9fQVBQTEVFVkVOVFNTRVJWSUNFTkFNRSIsICIiLCAxKTsK
LQotICAgIC8vIFdlIGRvbid0IG5lZWQgdG8gdGFsayB0byB0aGUgZG9jay4KLSAgICBpZiAoQ2xh
c3MgbnNBcHBsaWNhdGlvbkNsYXNzID0gTlNDbGFzc0Zyb21TdHJpbmcoQCJOU0FwcGxpY2F0aW9u
IikpIHsKLSAgICAgICAgaWYgKFtuc0FwcGxpY2F0aW9uQ2xhc3MgcmVzcG9uZHNUb1NlbGVjdG9y
OkBzZWxlY3RvcihfcHJldmVudERvY2tDb25uZWN0aW9ucyldKQotICAgICAgICAgICAgW25zQXBw
bGljYXRpb25DbGFzcyBfcHJldmVudERvY2tDb25uZWN0aW9uc107Ci0gICAgfQogI2VuZGlmCiAK
ICAgICB4cGNfbWFpbihYUENTZXJ2aWNlRXZlbnRIYW5kbGVyKTsKSW5kZXg6IFNvdXJjZS9XZWJL
aXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCShyZXZpc2lvbiAyNjI5
MDQpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQko
d29ya2luZyBjb3B5KQpAQCAtNTIwLDcgKzUyMCw3IEBAIHN0YXRpYyBib29sIHRyeUFwcGx5Q2Fj
aGVkU2FuZGJveChjb25zdCAKIAogc3RhdGljIGlubGluZSBjb25zdCBOU0J1bmRsZSAqd2ViS2l0
MkJ1bmRsZSgpCiB7Ci0gICAgY29uc3Qgc3RhdGljIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5k
bGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJXS1dlYlZpZXciKV07CisgICAg
Y29uc3Qgc3RhdGljIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50
aWZpZXI6QCJjb20uYXBwbGUuV2ViS2l0Il07CiAgICAgcmV0dXJuIGJ1bmRsZTsKIH0KIApJbmRl
eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vz
cy5zYi5pbgkocmV2aXNpb24gMjYyOTA0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv
bS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDg5LDYgKzEwODks
NyBAQAogICAgICAgICAoc3lzY2FsbC1udW1iZXIgU1lTX3Vsb2NrX3dhaXQyKSA7OyA8cmRhcjov
L3Byb2JsZW0vNTg3NDM3Nzg+CiAjZW5kaWYKICAgICAgICAgKHN5c2NhbGwtbnVtYmVyIFNZU19m
c3RhdDY0X2V4dGVuZGVkKSA7OyA8cmRhcjovL3Byb2JsZW0vNjEzMTAwMTk+CisgICAgICAgIChz
eXNjYWxsLW51bWJlciBTWVNfZ2V0aG9zdHV1aWQpCiAgICAgKQogCiAjaWYgX19NQUNfT1NfWF9W
RVJTSU9OX01JTl9SRVFVSVJFRCA+IDEwMTUwMApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNjI5MDQpCisr
KyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xODUsMTEgKzE4NSw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1J
bml0aWFsaXplV2ViUHIKICAgICAgICAgQVNTRVJUKFN0cmluZyh1dGkuZ2V0KCkpID09IFN0cmlu
ZyhhZG9wdENGKFVUVHlwZUNyZWF0ZVByZWZlcnJlZElkZW50aWZpZXJGb3JUYWcoa1VUVGFnQ2xh
c3NNSU1FVHlwZSwgQ0ZTVFIoInRleHQvaHRtbCIpLCAwKSkuZ2V0KCkpKTsKICAgICB9CiAKLSNp
ZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgIFdlYkNvcmU6Omlu
aXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHBhcmFtZXRlcnMud2ViQ29yZUxvZ2dpbmdD
aGFubmVscyk7Ci0gICAgV2ViS2l0Ojppbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeShw
YXJhbWV0ZXJzLndlYktpdExvZ2dpbmdDaGFubmVscyk7Ci0jZW5kaWYKLQogICAgIFdlYkNvcmU6
OnNldEFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcihwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRs
ZUlkZW50aWZpZXIpOwogICAgIHNldEFwcGxpY2F0aW9uU0RLVmVyc2lvbihwYXJhbWV0ZXJzLnVp
UHJvY2Vzc1NES1ZlcnNpb24pOwogCkBAIC0yMzEsNiArMjI2LDEyIEBAIHZvaWQgV2ViUHJvY2Vz
czo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICNlbmRpZgogCiAjaWYgVVNFKEFQUEtJVCkKKyAg
ICAvLyBXZSBkb24ndCBuZWVkIHRvIHRhbGsgdG8gdGhlIGRvY2suCisgICAgaWYgKENsYXNzIG5z
QXBwbGljYXRpb25DbGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAiTlNBcHBsaWNhdGlvbiIpKSB7
CisgICAgICAgIGlmIChbbnNBcHBsaWNhdGlvbkNsYXNzIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs
ZWN0b3IoX3ByZXZlbnREb2NrQ29ubmVjdGlvbnMpXSkKKyAgICAgICAgICAgIFtuc0FwcGxpY2F0
aW9uQ2xhc3MgX3ByZXZlbnREb2NrQ29ubmVjdGlvbnNdOworICAgIH0KKwogICAgIFtbTlNVc2Vy
RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6QHsgQCJOU0Fw
cGxpY2F0aW9uQ3Jhc2hPbkV4Y2VwdGlvbnMiIDogQFlFUyB9XTsKIAogICAgIC8vIHJkYXI6Ly85
MTE4NjM5IGFjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50IGluIE5TQXBwbGljYXRpb24gZGVm
YXVsdHMgdG8gdXNlIHRoZSBrZXlXaW5kb3cuIFNpbmNlIHRoZXJlJ3MKQEAgLTIzOCw3ICsyMzks
NyBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgTWV0aG9k
IG1ldGhvZFRvUGF0Y2ggPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbTlNBcHBsaWNhdGlvbiBj
bGFzc10sIEBzZWxlY3RvcihhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCkpOwogICAgIG1l
dGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RUb1BhdGNoLCAoSU1QKU5TQXBwbGljYXRpb25B
Y2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7CiAjZW5kaWYKLSAgICAKKwogI2lmIFBMQVRG
T1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NFU1NfTlNSVU5MT09QKQogICAgIC8vIE5lZWQgdG8g
aW5pdGlhbGl6ZSBhY2Nlc3NpYmlsaXR5IGZvciBWb2ljZU92ZXIgdG8gd29yayB3aGVuIHRoZSBX
ZWJDb250ZW50IHByb2Nlc3MgaXMgdXNpbmcgTlNSdW5Mb29wLgogICAgIC8vIEN1cnJlbnRseSwg
aXQgaXMgYWxzbyBuZWVkZWQgdG8gYWxsb2NhdGUgYW5kIGluaXRpYWxpemUgYW4gTlNBcHBsaWNh
dGlvbiBvYmplY3QuCkBAIC01NzksOSArNTgwLDEzIEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlh
bGl6ZVNhbmRib3goY29uc3QKIHsKICNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKE1BQ0NB
VEFMWVNUKQogICAgIC8vIE5lZWQgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQsIGJlY2F1c2Ugc2Vy
dmljZSBoYXMgYSBkaWZmZXJlbnQgYnVuZGxlIElELgotICAgIE5TQnVuZGxlICp3ZWJLaXQyQnVu
ZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKEAiV0tXZWJW
aWV3IildOworICAgIE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZVdp
dGhJZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYktpdCJdOwogCi0gICAgc2FuZGJveFBhcmFtZXRl
cnMuc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgoW3dlYktpdDJCdW5kbGUgcGF0aEZvclJl
c291cmNlOkAiY29tLmFwcGxlLldlYlByb2Nlc3MiIG9mVHlwZTpAInNiIl0pOworICAgIFN0cmlu
Z0J1aWxkZXIgcGF0aDsKKyAgICBwYXRoLmFwcGVuZChbd2ViS2l0MkJ1bmRsZSByZXNvdXJjZVBh
dGhdKTsKKyAgICBwYXRoLmFwcGVuZCgiLyIpOworICAgIHBhdGguYXBwZW5kKCJjb20uYXBwbGUu
V2ViUHJvY2Vzcy5zYiIpOworICAgIHNhbmRib3hQYXJhbWV0ZXJzLnNldE92ZXJyaWRlU2FuZGJv
eFByb2ZpbGVQYXRoKHBhdGgudG9TdHJpbmcoKSk7CiAKICAgICBBdXhpbGlhcnlQcm9jZXNzOjpp
bml0aWFsaXplU2FuZGJveChwYXJhbWV0ZXJzLCBzYW5kYm94UGFyYW1ldGVycyk7CiAjZW5kaWYK
</data>
<flag name="review"
          id="417742"
          type_id="1"
          status="+"
          setter="darin"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402329</attachid>
            <date>2020-06-19 14:52:43 -0700</date>
            <delta_ts>2020-06-19 14:52:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213379-20200619145242.patch</filename>
            <type>text/plain</type>
            <size>11959</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjgwKQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2
LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj
T1NdIENvbm5lY3Rpb25zIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQg
YmVmb3JlIGVudGVyaW5nIHRoZSBzYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB
ZGxlci4KKworICAgICAgICBVc2UgY29ycmVjdCBwYXJhbWV0ZXIgdHlwZXMgaW4gX0NGUHJlZnNT
ZXREaXJlY3RNb2RlRW5hYmxlZCBhbmQgX0NGUHJlZnNTZXRSZWFkT25seSwgYW5kIG1vdmUKKyAg
ICAgICAgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZCBpbnNpZGUgYW4gT2JqZWN0aXZlLUMg
Z3VhcmQsIHNpbmNlIEJPT0wgb25seSBzZWVtcyB0byBiZSBhIGJ1aWx0aW4KKyAgICAgICAgdHlw
ZSBpbiBPYmplY3RpdmUtQy4KKworICAgICAgICAqIHBhbC9zcGkvY2YvQ0ZVdGlsaXRpZXNTUEku
aDoKKwogMjAyMC0wNi0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t
PgogCiAgICAgICAgIFtDb2NvYV0gVW5pZnkgImZvbnQ6IiBDU1Mgc2hvcnRoYW5kIHZhbHVlcyBi
ZXR3ZWVuIG1hY09TIGFuZCBpT1MgZmFtaWx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9QQUwvcGFs
L3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BB
TC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJj
ZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHdvcmtpbmcgY29weSkK
QEAgLTU4LDcgKzU4LDkgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRldlYlNlcnZpY2VzQ29weVByb3Zp
ZAogCiB2b2lkIF9fQ0ZSdW5Mb29wU2V0T3B0aW9uc1JlYXNvbihfX0NGUnVuTG9vcE9wdGlvbnMg
b3B0cywgQ0ZTdHJpbmdSZWYgcmVhc29uKTsKIAotdm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1vZGVF
bmFibGVkKGJvb2wgZW5hYmxlZCk7Ci12b2lkIF9DRlByZWZzU2V0UmVhZE9ubHkoYm9vbCBmbGFn
KTsKKyNpZmRlZiBfX09CSkNfXwordm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1vZGVFbmFibGVkKEJP
T0wgZW5hYmxlZCk7CisjZW5kaWYKK3ZvaWQgX0NGUHJlZnNTZXRSZWFkT25seShCb29sZWFuIGZs
YWcpOwogCiBXVEZfRVhURVJOX0NfRU5ECkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjYyOTcyKQor
KysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNyBA
QAorMjAyMC0wNi0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAg
ICAgICAgW21hY09TXSBDb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24gYXJlIGVz
dGFibGlzaGVkIGJlZm9yZSBlbnRlcmluZyB0aGUgc2FuZGJveAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMzc5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgT24gbWFjT1MsIGNvbm5lY3Rpb25zIHRvIHRoZSBw
cmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQgYmVmb3JlIGVudGVyaW5nIHRoZSBzYW5k
Ym94LiBUaGVzZSBjb25uZWN0aW9ucyBhbHNvIHBlcnNpc3QKKyAgICAgICAgYWZ0ZXIgZW50ZXJp
bmcgdGhlIHNhbmRib3ggYW5kIGRlbnlpbmcgYWNjZXNzIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1v
bi4gVGhlcmUgc2hvdWxkIG5vdCBiZSBhdHRlbXB0cyB0byBjb25uZWN0IHRvIHRoZQorICAgICAg
ICBwcmVmZXJlbmNlIGRhZW1vbiBiZWZvcmUgZW50ZXJpbmcgdGhlIHNhbmRib3gsIHNpbmNlIHRo
ZXNlIGF0dGVtcHRzIHdpbGwgbm90IGJlIHN0b3BwZWQgYnkgdGhlIHNhbmRib3guIFRoaXMgcGF0
Y2ggbW92ZXMKKyAgICAgICAgY29kZSB0aGF0IGNvbm5lY3RzIHRvIHRoZSBwcmVmZXJlbmNlIGRh
ZW1vbiB0byBiZSBleGVjdXRlZCBhZnRlciB0aGUgc2FuZGJveCBoYXMgYmVlbiBlbnRlcmVkLiBU
aGF0IGluY2x1ZGVzIGNvZGUgdG8KKyAgICAgICAgcHJldmVudCBjb25uZWN0aW9ucyB0byB0aGUg
RG9jayBhbmQgY29kZSB0byBpbml0aWFsaXplIFdlYktpdCBsb2dnaW5nLiBBbHNvLCBpbnN0ZWFk
IG9mIGNhbGxpbmcgW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOl0sCisgICAgICAgIGNhbGwgW05T
QnVuZGxlIGJ1bmRsZVdpdGhJZGVudGlmaWVyOl0sIHNpbmNlIGNhbGxpbmcgW05TQnVuZGxlIGJ1
bmRsZUZvckNsYXNzOl0gd2lsbCBjb25uZWN0IHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbi4KKyAg
ICAgICAgRmluYWxseSwgYWxsb3cgdGhlIHN5c2NhbGwgU1lTX2dldGhvc3R1dWlkLCBzaW5jZSB0
aGF0IGlzIG5lZWRlZCBieSBDb3JlRm91bmRhdGlvbiB3aGVuIHRoZXJlIGlzIG5vIGFjY2VzcyB0
byB0aGUKKyAgICAgICAgcHJlZmVyZW5jZSBkYWVtb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz
LiBUaGlzIHNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLiBJdCB3b3VsZCBiZSBu
aWNlIHRvIGhhdmUgYSB0ZXN0IHRvIG1ha2Ugc3VyZSB0aGF0IHRoZXJlIGFyZSBubworICAgICAg
ICBjb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24ganVzdCBiZWZvcmUgZW50ZXJp
bmcgdGhlIHNhbmRib3gsIGJ1dCBJIGFtIG5vdCBhd2FyZSBvZiBob3cgdG8gaW1wbGVtZW50IHRo
aXMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW06
CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6Cisg
ICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpB
dXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplKToKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2Vi
S2l0MkluaXRpYWxpemVDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6cnVuSW5pdGlhbGl6YXRp
b25Db2RlKToKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENT
ZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tOgorICAgICAgICAoV2ViS2l0OjpYUENTZXJ2aWNlTWFp
bik6CisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tOgorICAgICAg
ICAoV2ViS2l0Ojp3ZWJLaXQyQnVuZGxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dl
YlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1J
bml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRp
YWxpemVTYW5kYm94KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNz
LnNiLmluOgorCiAyMDIwLTA2LTEyICBUYWthc2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNv
bnkuY29tPgogCiAgICAgICAgIFtDdXJsXSBJbXBsZW1lbnQgZnVuY3Rpb25zIHRvIHVzZSBSZXNv
dXJjZUxvYWRTdGF0aXN0aWNzLgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9t
YWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3
b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI2MjkwNCkKKysr
IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCSh3
b3JraW5nIGNvcHkpCkBAIC04Nyw5ICs4Nyw5IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmFsbG93
U3BlY2lmaWNIVFRQU0MKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNv
bnN0IEF1eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMs
IFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHNhbmRib3hQYXJhbWV0ZXJzKQogewog
ICAgIC8vIE5lZWQgdG8gb3ZlcmlkZSB0aGUgZGVmYXVsdCwgYmVjYXVzZSBzZXJ2aWNlIGhhcyBh
IGRpZmZlcmVudCBidW5kbGUgSUQuCi0gICAgTlNCdW5kbGUgKndlYktpdDJCdW5kbGUgPSBbTlNC
dW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJXS1dlYlZpZXciKV07Cisg
ICAgYXV0byB3ZWJLaXRCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50aWZpZXI6QCJj
b20uYXBwbGUuV2ViS2l0Il07CiAKLSAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRPdmVycmlkZVNh
bmRib3hQcm9maWxlUGF0aChbd2ViS2l0MkJ1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJjb20uYXBw
bGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzIiBvZlR5cGU6QCJzYiJdKTsKKyAgICBzYW5kYm94UGFy
YW1ldGVycy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aChtYWtlU3RyaW5nKFN0cmluZyhb
d2ViS2l0QnVuZGxlIHJlc291cmNlUGF0aF0pLCAiL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya1By
b2Nlc3Muc2IiKSk7CiAKICAgICBBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveChw
YXJhbWV0ZXJzLCBzYW5kYm94UGFyYW1ldGVycyk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1No
YXJlZC9BdXhpbGlhcnlQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1No
YXJlZC9BdXhpbGlhcnlQcm9jZXNzLmNwcAkocmV2aXNpb24gMjYyOTA0KQorKysgU291cmNlL1dl
YktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDgg
KzI3LDEwIEBACiAjaW5jbHVkZSAiQXV4aWxpYXJ5UHJvY2Vzcy5oIgogCiAjaW5jbHVkZSAiQ29u
dGVudFdvcmxkU2hhcmVkLmgiCisjaW5jbHVkZSAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbmNs
dWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVy
cy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KICNpbmNsdWRlIDxw
YWwvU2Vzc2lvbklELmg+CiAKICNpZiAhT1MoV0lORE9XUykKQEAgLTc2LDYgKzc4LDExIEBAIHZv
aWQgQXV4aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZShjb25zdCAKICAgICBTYW5kYm94SW5pdGlh
bGl6YXRpb25QYXJhbWV0ZXJzIHNhbmRib3hQYXJhbWV0ZXJzOwogICAgIGluaXRpYWxpemVTYW5k
Ym94KHBhcmFtZXRlcnMsIHNhbmRib3hQYXJhbWV0ZXJzKTsKIAorI2lmICFMT0dfRElTQUJMRUQg
fHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5u
ZWxzSWZOZWNlc3NhcnkoKTsKKyAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVj
ZXNzYXJ5KCk7CisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJM
RUQKKwogICAgIGluaXRpYWxpemVQcm9jZXNzTmFtZShwYXJhbWV0ZXJzKTsKIAogICAgIC8vIElu
IFdlYktpdDIsIG9ubHkgdGhlIFVJIHByb2Nlc3Mgc2hvdWxkIGV2ZXIgYmUgZ2VuZXJhdGluZyBj
ZXJ0YWluIGlkZW50aWZpZXJzLgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi
S2l0MkluaXRpYWxpemVDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJl
ZC9Db2NvYS9XZWJLaXQySW5pdGlhbGl6ZUNvY29hLm1tCShyZXZpc2lvbiAyNjI5MDQpCisrKyBT
b3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJLaXQySW5pdGlhbGl6ZUNvY29hLm1tCSh3b3Jr
aW5nIGNvcHkpCkBAIC0yNiwxMCArMjYsOCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0
ICJXZWJLaXQySW5pdGlhbGl6ZS5oIgogCi0jaW1wb3J0ICJMb2dJbml0aWFsaXphdGlvbi5oIgog
I2ltcG9ydCAiVmVyc2lvbkNoZWNrcy5oIgogI2ltcG9ydCA8SmF2YVNjcmlwdENvcmUvSW5pdGlh
bGl6ZVRocmVhZGluZy5oPgotI2ltcG9ydCA8V2ViQ29yZS9Mb2dJbml0aWFsaXphdGlvbi5oPgog
I2ltcG9ydCA8bXV0ZXg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8d3Rm
L1JlZkNvdW50ZWQuaD4KQEAgLTU2LDExICs1NCw2IEBAIHN0YXRpYyB2b2lkIHJ1bkluaXRpYWxp
emF0aW9uQ29kZSh2b2lkKiAKICAgICBSdW5Mb29wOjppbml0aWFsaXplTWFpbigpOwogCiAgICAg
V1RGOjpSZWZDb3VudGVkQmFzZTo6ZW5hYmxlVGhyZWFkaW5nQ2hlY2tzR2xvYmFsbHkoKTsKLQot
I2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0gICAgV2ViQ29yZTo6
aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKTsKLSAgICBXZWJLaXQ6OmluaXRpYWxp
emVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCk7Ci0jZW5kaWYgLy8gIUxPR19ESVNBQkxFRCB8fCAh
UkVMRUFTRV9MT0dfRElTQUJMRUQKIH0KIAogdm9pZCBJbml0aWFsaXplV2ViS2l0MigpCkluZGV4
OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZp
Y2UvWFBDU2VydmljZU1haW4ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQv
RW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCShy
ZXZpc2lvbiAyNjI5MDQpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0
aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1haW4ubW0JKHdvcmtpbmcgY29weSkKQEAg
LTMzLDEwICszMyw2IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0IDx3dGYv
c3BpL2Rhcndpbi9YUENTUEkuaD4KIAotI2lmIFBMQVRGT1JNKE1BQykKLSNpbXBvcnQgPHBhbC9z
cGkvbWFjL05TQXBwbGljYXRpb25TUEkuaD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViS2l0IHsK
IAogc3RhdGljIHZvaWQgWFBDU2VydmljZUV2ZW50SGFuZGxlcih4cGNfY29ubmVjdGlvbl90IHBl
ZXIpCkBAIC0xNjksMTIgKzE2NSw2IEBAIGludCBYUENTZXJ2aWNlTWFpbihpbnQgYXJnYywgY29u
c3QgY2hhcioKICNpZiBQTEFURk9STShNQUMpCiAgICAgLy8gRG9uJ3QgYWxsb3cgQXBwbGUgRXZl
bnRzIGluIFdlYktpdCBwcm9jZXNzZXMuIFRoaXMgY2FuIGJlIHJlbW92ZWQgd2hlbiA8cmRhcjov
L3Byb2JsZW0vMTQwMTI4MjM+IGlzIGZpeGVkLgogICAgIHNldGVudigiX19BUFBMRUVWRU5UU1NF
UlZJQ0VOQU1FIiwgIiIsIDEpOwotCi0gICAgLy8gV2UgZG9uJ3QgbmVlZCB0byB0YWxrIHRvIHRo
ZSBkb2NrLgotICAgIGlmIChDbGFzcyBuc0FwcGxpY2F0aW9uQ2xhc3MgPSBOU0NsYXNzRnJvbVN0
cmluZyhAIk5TQXBwbGljYXRpb24iKSkgewotICAgICAgICBpZiAoW25zQXBwbGljYXRpb25DbGFz
cyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25zKV0p
Ci0gICAgICAgICAgICBbbnNBcHBsaWNhdGlvbkNsYXNzIF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25z
XTsKLSAgICB9CiAjZW5kaWYKIAogICAgIHhwY19tYWluKFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIp
OwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NN
YWMubW0JKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhp
bGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MjAsNyArNTIwLDcgQEAgc3Rh
dGljIGJvb2wgdHJ5QXBwbHlDYWNoZWRTYW5kYm94KGNvbnN0IAogCiBzdGF0aWMgaW5saW5lIGNv
bnN0IE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlKCkKIHsKLSAgICBjb25zdCBzdGF0aWMgTlNCdW5k
bGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpOU0NsYXNzRnJvbVN0cmluZyhA
IldLV2ViVmlldyIpXTsKKyAgICBjb25zdCBzdGF0aWMgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1
bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJLaXQiXTsKICAgICByZXR1
cm4gYnVuZGxlOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxl
LldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyNjI5MDQpCisrKyBTb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29w
eSkKQEAgLTEwODksNiArMTA4OSw3IEBACiAgICAgICAgIChzeXNjYWxsLW51bWJlciBTWVNfdWxv
Y2tfd2FpdDIpIDs7IDxyZGFyOi8vcHJvYmxlbS81ODc0Mzc3OD4KICNlbmRpZgogICAgICAgICAo
c3lzY2FsbC1udW1iZXIgU1lTX2ZzdGF0NjRfZXh0ZW5kZWQpIDs7IDxyZGFyOi8vcHJvYmxlbS82
MTMxMDAxOT4KKyAgICAgICAgKHN5c2NhbGwtbnVtYmVyIFNZU19nZXRob3N0dXVpZCkKICAgICAp
CiAKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID4gMTAxNTAwCkluZGV4OiBT
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0J
KHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4NSwxMSArMTg1LDYgQEAgdm9pZCBX
ZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAgICBBU1NFUlQoU3RyaW5n
KHV0aS5nZXQoKSkgPT0gU3RyaW5nKGFkb3B0Q0YoVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRp
ZmllckZvclRhZyhrVVRUYWdDbGFzc01JTUVUeXBlLCBDRlNUUigidGV4dC9odG1sIiksIDApKS5n
ZXQoKSkpOwogICAgIH0KIAotI2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FC
TEVECi0gICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkocGFyYW1l
dGVycy53ZWJDb3JlTG9nZ2luZ0NoYW5uZWxzKTsKLSAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dD
aGFubmVsc0lmTmVjZXNzYXJ5KHBhcmFtZXRlcnMud2ViS2l0TG9nZ2luZ0NoYW5uZWxzKTsKLSNl
bmRpZgotCiAgICAgV2ViQ29yZTo6c2V0QXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKHBhcmFt
ZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcik7CiAgICAgc2V0QXBwbGljYXRpb25TREtW
ZXJzaW9uKHBhcmFtZXRlcnMudWlQcm9jZXNzU0RLVmVyc2lvbik7CiAKQEAgLTIzMSw2ICsyMjYs
MTIgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogI2VuZGlmCiAK
ICNpZiBVU0UoQVBQS0lUKQorICAgIC8vIFdlIGRvbid0IG5lZWQgdG8gdGFsayB0byB0aGUgRG9j
ay4KKyAgICBpZiAoQ2xhc3MgbnNBcHBsaWNhdGlvbkNsYXNzID0gTlNDbGFzc0Zyb21TdHJpbmco
QCJOU0FwcGxpY2F0aW9uIikpIHsKKyAgICAgICAgaWYgKFtuc0FwcGxpY2F0aW9uQ2xhc3MgcmVz
cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJldmVudERvY2tDb25uZWN0aW9ucyldKQorICAg
ICAgICAgICAgW25zQXBwbGljYXRpb25DbGFzcyBfcHJldmVudERvY2tDb25uZWN0aW9uc107Cisg
ICAgfQorCiAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gcmVnaXN0
ZXJEZWZhdWx0czpAeyBAIk5TQXBwbGljYXRpb25DcmFzaE9uRXhjZXB0aW9ucyIgOiBAWUVTIH1d
OwogCiAgICAgLy8gcmRhcjovLzkxMTg2MzkgYWNjZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnQg
aW4gTlNBcHBsaWNhdGlvbiBkZWZhdWx0cyB0byB1c2UgdGhlIGtleVdpbmRvdy4gU2luY2UgdGhl
cmUncwpAQCAtMjM4LDcgKzIzOSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs
aXplV2ViUHIKICAgICBNZXRob2QgbWV0aG9kVG9QYXRjaCA9IGNsYXNzX2dldEluc3RhbmNlTWV0
aG9kKFtOU0FwcGxpY2F0aW9uIGNsYXNzXSwgQHNlbGVjdG9yKGFjY2Vzc2liaWxpdHlGb2N1c2Vk
VUlFbGVtZW50KSk7CiAgICAgbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKG1ldGhvZFRvUGF0Y2gs
IChJTVApTlNBcHBsaWNhdGlvbkFjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50KTsKICNlbmRp
ZgotICAgIAorCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19OU1JVTkxP
T1ApCiAgICAgLy8gTmVlZCB0byBpbml0aWFsaXplIGFjY2Vzc2liaWxpdHkgZm9yIFZvaWNlT3Zl
ciB0byB3b3JrIHdoZW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBpcyB1c2luZyBOU1J1bkxvb3Au
CiAgICAgLy8gQ3VycmVudGx5LCBpdCBpcyBhbHNvIG5lZWRlZCB0byBhbGxvY2F0ZSBhbmQgaW5p
dGlhbGl6ZSBhbiBOU0FwcGxpY2F0aW9uIG9iamVjdC4KQEAgLTU3OSw5ICs1ODAsOSBAQCB2b2lk
IFdlYlByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNvbnN0CiB7CiAjaWYgUExBVEZPUk0oTUFD
KSB8fCBQTEFURk9STShNQUNDQVRBTFlTVCkKICAgICAvLyBOZWVkIHRvIG92ZXJyaWRlIHRoZSBk
ZWZhdWx0LCBiZWNhdXNlIHNlcnZpY2UgaGFzIGEgZGlmZmVyZW50IGJ1bmRsZSBJRC4KLSAgICBO
U0J1bmRsZSAqd2ViS2l0MkJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpOU0NsYXNz
RnJvbVN0cmluZyhAIldLV2ViVmlldyIpXTsKKyAgICBhdXRvIHdlYktpdEJ1bmRsZSA9IFtOU0J1
bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJLaXQiXTsKIAotICAgIHNh
bmRib3hQYXJhbWV0ZXJzLnNldE92ZXJyaWRlU2FuZGJveFByb2ZpbGVQYXRoKFt3ZWJLaXQyQnVu
ZGxlIHBhdGhGb3JSZXNvdXJjZTpAImNvbS5hcHBsZS5XZWJQcm9jZXNzIiBvZlR5cGU6QCJzYiJd
KTsKKyAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aCht
YWtlU3RyaW5nKFN0cmluZyhbd2ViS2l0QnVuZGxlIHJlc291cmNlUGF0aF0pLCAiL2NvbS5hcHBs
ZS5XZWJQcm9jZXNzLnNiIikpOwogCiAgICAgQXV4aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZVNh
bmRib3gocGFyYW1ldGVycywgc2FuZGJveFBhcmFtZXRlcnMpOwogI2VuZGlmCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402341</attachid>
            <date>2020-06-19 15:49:26 -0700</date>
            <delta_ts>2020-06-19 16:38:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213379-20200619154925.patch</filename>
            <type>text/plain</type>
            <size>11774</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjgwKQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2
LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj
T1NdIENvbm5lY3Rpb25zIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQg
YmVmb3JlIGVudGVyaW5nIHRoZSBzYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB
ZGxlci4KKworICAgICAgICBVc2UgY29ycmVjdCBwYXJhbWV0ZXIgdHlwZXMgaW4gX0NGUHJlZnNT
ZXREaXJlY3RNb2RlRW5hYmxlZCBhbmQgX0NGUHJlZnNTZXRSZWFkT25seSwgYW5kIG1vdmUKKyAg
ICAgICAgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZCBpbnNpZGUgYW4gT2JqZWN0aXZlLUMg
Z3VhcmQsIHNpbmNlIEJPT0wgb25seSBzZWVtcyB0byBiZSBhIGJ1aWx0aW4KKyAgICAgICAgdHlw
ZSBpbiBPYmplY3RpdmUtQy4KKworICAgICAgICAqIHBhbC9zcGkvY2YvQ0ZVdGlsaXRpZXNTUEku
aDoKKwogMjAyMC0wNi0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t
PgogCiAgICAgICAgIFtDb2NvYV0gVW5pZnkgImZvbnQ6IiBDU1Mgc2hvcnRoYW5kIHZhbHVlcyBi
ZXR3ZWVuIG1hY09TIGFuZCBpT1MgZmFtaWx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9QQUwvcGFs
L3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BB
TC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJj
ZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGVXRpbGl0aWVzU1BJLmgJKHdvcmtpbmcgY29weSkK
QEAgLTU4LDcgKzU4LDkgQEAgQ0ZEaWN0aW9uYXJ5UmVmIF9DRldlYlNlcnZpY2VzQ29weVByb3Zp
ZAogCiB2b2lkIF9fQ0ZSdW5Mb29wU2V0T3B0aW9uc1JlYXNvbihfX0NGUnVuTG9vcE9wdGlvbnMg
b3B0cywgQ0ZTdHJpbmdSZWYgcmVhc29uKTsKIAotdm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1vZGVF
bmFibGVkKGJvb2wgZW5hYmxlZCk7Ci12b2lkIF9DRlByZWZzU2V0UmVhZE9ubHkoYm9vbCBmbGFn
KTsKKyNpZmRlZiBfX09CSkNfXwordm9pZCBfQ0ZQcmVmc1NldERpcmVjdE1vZGVFbmFibGVkKEJP
T0wgZW5hYmxlZCk7CisjZW5kaWYKK3ZvaWQgX0NGUHJlZnNTZXRSZWFkT25seShCb29sZWFuIGZs
YWcpOwogCiBXVEZfRVhURVJOX0NfRU5ECkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjYyOTcyKQor
KysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNyBA
QAorMjAyMC0wNi0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAg
ICAgICAgW21hY09TXSBDb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24gYXJlIGVz
dGFibGlzaGVkIGJlZm9yZSBlbnRlcmluZyB0aGUgc2FuZGJveAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMzc5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgT24gbWFjT1MsIGNvbm5lY3Rpb25zIHRvIHRoZSBw
cmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQgYmVmb3JlIGVudGVyaW5nIHRoZSBzYW5k
Ym94LiBUaGVzZSBjb25uZWN0aW9ucyBhbHNvIHBlcnNpc3QKKyAgICAgICAgYWZ0ZXIgZW50ZXJp
bmcgdGhlIHNhbmRib3ggYW5kIGRlbnlpbmcgYWNjZXNzIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1v
bi4gVGhlcmUgc2hvdWxkIG5vdCBiZSBhdHRlbXB0cyB0byBjb25uZWN0IHRvIHRoZQorICAgICAg
ICBwcmVmZXJlbmNlIGRhZW1vbiBiZWZvcmUgZW50ZXJpbmcgdGhlIHNhbmRib3gsIHNpbmNlIHRo
ZXNlIGF0dGVtcHRzIHdpbGwgbm90IGJlIHN0b3BwZWQgYnkgdGhlIHNhbmRib3guIFRoaXMgcGF0
Y2ggbW92ZXMKKyAgICAgICAgY29kZSB0aGF0IGNvbm5lY3RzIHRvIHRoZSBwcmVmZXJlbmNlIGRh
ZW1vbiB0byBiZSBleGVjdXRlZCBhZnRlciB0aGUgc2FuZGJveCBoYXMgYmVlbiBlbnRlcmVkLiBU
aGF0IGluY2x1ZGVzIGNvZGUgdG8KKyAgICAgICAgcHJldmVudCBjb25uZWN0aW9ucyB0byB0aGUg
RG9jayBhbmQgY29kZSB0byBpbml0aWFsaXplIFdlYktpdCBsb2dnaW5nLiBBbHNvLCBpbnN0ZWFk
IG9mIGNhbGxpbmcgW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOl0sCisgICAgICAgIGNhbGwgW05T
QnVuZGxlIGJ1bmRsZVdpdGhJZGVudGlmaWVyOl0sIHNpbmNlIGNhbGxpbmcgW05TQnVuZGxlIGJ1
bmRsZUZvckNsYXNzOl0gd2lsbCBjb25uZWN0IHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbi4KKyAg
ICAgICAgRmluYWxseSwgYWxsb3cgdGhlIHN5c2NhbGwgU1lTX2dldGhvc3R1dWlkLCBzaW5jZSB0
aGF0IGlzIG5lZWRlZCBieSBDb3JlRm91bmRhdGlvbiB3aGVuIHRoZXJlIGlzIG5vIGFjY2VzcyB0
byB0aGUKKyAgICAgICAgcHJlZmVyZW5jZSBkYWVtb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz
LiBUaGlzIHNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLiBJdCB3b3VsZCBiZSBu
aWNlIHRvIGhhdmUgYSB0ZXN0IHRvIG1ha2Ugc3VyZSB0aGF0IHRoZXJlIGFyZSBubworICAgICAg
ICBjb25uZWN0aW9ucyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24ganVzdCBiZWZvcmUgZW50ZXJp
bmcgdGhlIHNhbmRib3gsIGJ1dCBJIGFtIG5vdCBhd2FyZSBvZiBob3cgdG8gaW1wbGVtZW50IHRo
aXMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW06
CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6Cisg
ICAgICAgICogU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpB
dXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplKToKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2Vi
S2l0MkluaXRpYWxpemVDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6cnVuSW5pdGlhbGl6YXRp
b25Db2RlKToKKyAgICAgICAgKiBTaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENT
ZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tOgorICAgICAgICAoV2ViS2l0OjpYUENTZXJ2aWNlTWFp
bik6CisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tOgorICAgICAg
ICAoV2ViS2l0Ojp3ZWJLaXQyQnVuZGxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dl
YlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1J
bml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRp
YWxpemVTYW5kYm94KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNz
LnNiLmluOgorCiAyMDIwLTA2LTEyICBUYWthc2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNv
bnkuY29tPgogCiAgICAgICAgIFtDdXJsXSBJbXBsZW1lbnQgZnVuY3Rpb25zIHRvIHVzZSBSZXNv
dXJjZUxvYWRTdGF0aXN0aWNzLgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9t
YWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3
b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI2MjkwNCkKKysr
IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCSh3
b3JraW5nIGNvcHkpCkBAIC04Nyw5ICs4Nyw5IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmFsbG93
U3BlY2lmaWNIVFRQU0MKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNv
bnN0IEF1eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMs
IFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHNhbmRib3hQYXJhbWV0ZXJzKQogewog
ICAgIC8vIE5lZWQgdG8gb3ZlcmlkZSB0aGUgZGVmYXVsdCwgYmVjYXVzZSBzZXJ2aWNlIGhhcyBh
IGRpZmZlcmVudCBidW5kbGUgSUQuCi0gICAgTlNCdW5kbGUgKndlYktpdDJCdW5kbGUgPSBbTlNC
dW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJXS1dlYlZpZXciKV07Cisg
ICAgYXV0byB3ZWJLaXRCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50aWZpZXI6QCJj
b20uYXBwbGUuV2ViS2l0Il07CiAKLSAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRPdmVycmlkZVNh
bmRib3hQcm9maWxlUGF0aChbd2ViS2l0MkJ1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJjb20uYXBw
bGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzIiBvZlR5cGU6QCJzYiJdKTsKKyAgICBzYW5kYm94UGFy
YW1ldGVycy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aChtYWtlU3RyaW5nKFN0cmluZyhb
d2ViS2l0QnVuZGxlIHJlc291cmNlUGF0aF0pLCAiL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya1By
b2Nlc3Muc2IiKSk7CiAKICAgICBBdXhpbGlhcnlQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveChw
YXJhbWV0ZXJzLCBzYW5kYm94UGFyYW1ldGVycyk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1No
YXJlZC9BdXhpbGlhcnlQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1No
YXJlZC9BdXhpbGlhcnlQcm9jZXNzLmNwcAkocmV2aXNpb24gMjYyOTA0KQorKysgU291cmNlL1dl
YktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDgg
KzI3LDEwIEBACiAjaW5jbHVkZSAiQXV4aWxpYXJ5UHJvY2Vzcy5oIgogCiAjaW5jbHVkZSAiQ29u
dGVudFdvcmxkU2hhcmVkLmgiCisjaW5jbHVkZSAiTG9nSW5pdGlhbGl6YXRpb24uaCIKICNpbmNs
dWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVy
cy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KICNpbmNsdWRlIDxw
YWwvU2Vzc2lvbklELmg+CiAKICNpZiAhT1MoV0lORE9XUykKQEAgLTc2LDYgKzc4LDExIEBAIHZv
aWQgQXV4aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZShjb25zdCAKICAgICBTYW5kYm94SW5pdGlh
bGl6YXRpb25QYXJhbWV0ZXJzIHNhbmRib3hQYXJhbWV0ZXJzOwogICAgIGluaXRpYWxpemVTYW5k
Ym94KHBhcmFtZXRlcnMsIHNhbmRib3hQYXJhbWV0ZXJzKTsKIAorI2lmICFMT0dfRElTQUJMRUQg
fHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5u
ZWxzSWZOZWNlc3NhcnkoKTsKKyAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVj
ZXNzYXJ5KCk7CisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJM
RUQKKwogICAgIGluaXRpYWxpemVQcm9jZXNzTmFtZShwYXJhbWV0ZXJzKTsKIAogICAgIC8vIElu
IFdlYktpdDIsIG9ubHkgdGhlIFVJIHByb2Nlc3Mgc2hvdWxkIGV2ZXIgYmUgZ2VuZXJhdGluZyBj
ZXJ0YWluIGlkZW50aWZpZXJzLgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi
S2l0MkluaXRpYWxpemVDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJl
ZC9Db2NvYS9XZWJLaXQySW5pdGlhbGl6ZUNvY29hLm1tCShyZXZpc2lvbiAyNjI5MDQpCisrKyBT
b3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJLaXQySW5pdGlhbGl6ZUNvY29hLm1tCSh3b3Jr
aW5nIGNvcHkpCkBAIC0yNiwxMCArMjYsOCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0
ICJXZWJLaXQySW5pdGlhbGl6ZS5oIgogCi0jaW1wb3J0ICJMb2dJbml0aWFsaXphdGlvbi5oIgog
I2ltcG9ydCAiVmVyc2lvbkNoZWNrcy5oIgogI2ltcG9ydCA8SmF2YVNjcmlwdENvcmUvSW5pdGlh
bGl6ZVRocmVhZGluZy5oPgotI2ltcG9ydCA8V2ViQ29yZS9Mb2dJbml0aWFsaXphdGlvbi5oPgog
I2ltcG9ydCA8bXV0ZXg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8d3Rm
L1JlZkNvdW50ZWQuaD4KQEAgLTU2LDExICs1NCw2IEBAIHN0YXRpYyB2b2lkIHJ1bkluaXRpYWxp
emF0aW9uQ29kZSh2b2lkKiAKICAgICBSdW5Mb29wOjppbml0aWFsaXplTWFpbigpOwogCiAgICAg
V1RGOjpSZWZDb3VudGVkQmFzZTo6ZW5hYmxlVGhyZWFkaW5nQ2hlY2tzR2xvYmFsbHkoKTsKLQot
I2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0gICAgV2ViQ29yZTo6
aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKTsKLSAgICBXZWJLaXQ6OmluaXRpYWxp
emVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCk7Ci0jZW5kaWYgLy8gIUxPR19ESVNBQkxFRCB8fCAh
UkVMRUFTRV9MT0dfRElTQUJMRUQKIH0KIAogdm9pZCBJbml0aWFsaXplV2ViS2l0MigpCkluZGV4
OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZp
Y2UvWFBDU2VydmljZU1haW4ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQv
RW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCShy
ZXZpc2lvbiAyNjI5MDQpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0
aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1haW4ubW0JKHdvcmtpbmcgY29weSkKQEAg
LTMzLDEwICszMyw2IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0IDx3dGYv
c3BpL2Rhcndpbi9YUENTUEkuaD4KIAotI2lmIFBMQVRGT1JNKE1BQykKLSNpbXBvcnQgPHBhbC9z
cGkvbWFjL05TQXBwbGljYXRpb25TUEkuaD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViS2l0IHsK
IAogc3RhdGljIHZvaWQgWFBDU2VydmljZUV2ZW50SGFuZGxlcih4cGNfY29ubmVjdGlvbl90IHBl
ZXIpCkBAIC0xNjksMTIgKzE2NSw2IEBAIGludCBYUENTZXJ2aWNlTWFpbihpbnQgYXJnYywgY29u
c3QgY2hhcioKICNpZiBQTEFURk9STShNQUMpCiAgICAgLy8gRG9uJ3QgYWxsb3cgQXBwbGUgRXZl
bnRzIGluIFdlYktpdCBwcm9jZXNzZXMuIFRoaXMgY2FuIGJlIHJlbW92ZWQgd2hlbiA8cmRhcjov
L3Byb2JsZW0vMTQwMTI4MjM+IGlzIGZpeGVkLgogICAgIHNldGVudigiX19BUFBMRUVWRU5UU1NF
UlZJQ0VOQU1FIiwgIiIsIDEpOwotCi0gICAgLy8gV2UgZG9uJ3QgbmVlZCB0byB0YWxrIHRvIHRo
ZSBkb2NrLgotICAgIGlmIChDbGFzcyBuc0FwcGxpY2F0aW9uQ2xhc3MgPSBOU0NsYXNzRnJvbVN0
cmluZyhAIk5TQXBwbGljYXRpb24iKSkgewotICAgICAgICBpZiAoW25zQXBwbGljYXRpb25DbGFz
cyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25zKV0p
Ci0gICAgICAgICAgICBbbnNBcHBsaWNhdGlvbkNsYXNzIF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25z
XTsKLSAgICB9CiAjZW5kaWYKIAogICAgIHhwY19tYWluKFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIp
OwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NN
YWMubW0JKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhp
bGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MjAsNyArNTIwLDcgQEAgc3Rh
dGljIGJvb2wgdHJ5QXBwbHlDYWNoZWRTYW5kYm94KGNvbnN0IAogCiBzdGF0aWMgaW5saW5lIGNv
bnN0IE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlKCkKIHsKLSAgICBjb25zdCBzdGF0aWMgTlNCdW5k
bGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpOU0NsYXNzRnJvbVN0cmluZyhA
IldLV2ViVmlldyIpXTsKKyAgICBjb25zdCBzdGF0aWMgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1
bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJLaXQiXTsKICAgICByZXR1
cm4gYnVuZGxlOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxl
LldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyNjI5MDQpCisrKyBTb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29w
eSkKQEAgLTEwODksNiArMTA4OSw3IEBACiAgICAgICAgIChzeXNjYWxsLW51bWJlciBTWVNfdWxv
Y2tfd2FpdDIpIDs7IDxyZGFyOi8vcHJvYmxlbS81ODc0Mzc3OD4KICNlbmRpZgogICAgICAgICAo
c3lzY2FsbC1udW1iZXIgU1lTX2ZzdGF0NjRfZXh0ZW5kZWQpIDs7IDxyZGFyOi8vcHJvYmxlbS82
MTMxMDAxOT4KKyAgICAgICAgKHN5c2NhbGwtbnVtYmVyIFNZU19nZXRob3N0dXVpZCkKICAgICAp
CiAKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID4gMTAxNTAwCkluZGV4OiBT
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0J
KHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4NSwxMSArMTg1LDYgQEAgdm9pZCBX
ZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAgICBBU1NFUlQoU3RyaW5n
KHV0aS5nZXQoKSkgPT0gU3RyaW5nKGFkb3B0Q0YoVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRp
ZmllckZvclRhZyhrVVRUYWdDbGFzc01JTUVUeXBlLCBDRlNUUigidGV4dC9odG1sIiksIDApKS5n
ZXQoKSkpOwogICAgIH0KIAotI2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FC
TEVECi0gICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkocGFyYW1l
dGVycy53ZWJDb3JlTG9nZ2luZ0NoYW5uZWxzKTsKLSAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dD
aGFubmVsc0lmTmVjZXNzYXJ5KHBhcmFtZXRlcnMud2ViS2l0TG9nZ2luZ0NoYW5uZWxzKTsKLSNl
bmRpZgotCiAgICAgV2ViQ29yZTo6c2V0QXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKHBhcmFt
ZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcik7CiAgICAgc2V0QXBwbGljYXRpb25TREtW
ZXJzaW9uKHBhcmFtZXRlcnMudWlQcm9jZXNzU0RLVmVyc2lvbik7CiAKQEAgLTIzMSw2ICsyMjYs
OSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAjZW5kaWYKIAog
I2lmIFVTRShBUFBLSVQpCisgICAgLy8gV2UgZG9uJ3QgbmVlZCB0byB0YWxrIHRvIHRoZSBEb2Nr
LgorICAgIFtOU0FwcGxpY2F0aW9uIF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25zXTsKKwogICAgIFtb
TlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6QHsg
QCJOU0FwcGxpY2F0aW9uQ3Jhc2hPbkV4Y2VwdGlvbnMiIDogQFlFUyB9XTsKIAogICAgIC8vIHJk
YXI6Ly85MTE4NjM5IGFjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50IGluIE5TQXBwbGljYXRp
b24gZGVmYXVsdHMgdG8gdXNlIHRoZSBrZXlXaW5kb3cuIFNpbmNlIHRoZXJlJ3MKQEAgLTIzOCw3
ICsyMzYsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAgICAg
TWV0aG9kIG1ldGhvZFRvUGF0Y2ggPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbTlNBcHBsaWNh
dGlvbiBjbGFzc10sIEBzZWxlY3RvcihhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCkpOwog
ICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RUb1BhdGNoLCAoSU1QKU5TQXBwbGlj
YXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7CiAjZW5kaWYKLSAgICAKKwogI2lm
IFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NFU1NfTlNSVU5MT09QKQogICAgIC8vIE5l
ZWQgdG8gaW5pdGlhbGl6ZSBhY2Nlc3NpYmlsaXR5IGZvciBWb2ljZU92ZXIgdG8gd29yayB3aGVu
IHRoZSBXZWJDb250ZW50IHByb2Nlc3MgaXMgdXNpbmcgTlNSdW5Mb29wLgogICAgIC8vIEN1cnJl
bnRseSwgaXQgaXMgYWxzbyBuZWVkZWQgdG8gYWxsb2NhdGUgYW5kIGluaXRpYWxpemUgYW4gTlNB
cHBsaWNhdGlvbiBvYmplY3QuCkBAIC01NzksOSArNTc3LDkgQEAgdm9pZCBXZWJQcm9jZXNzOjpp
bml0aWFsaXplU2FuZGJveChjb25zdAogewogI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0o
TUFDQ0FUQUxZU1QpCiAgICAgLy8gTmVlZCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCwgYmVjYXVz
ZSBzZXJ2aWNlIGhhcyBhIGRpZmZlcmVudCBidW5kbGUgSUQuCi0gICAgTlNCdW5kbGUgKndlYktp
dDJCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJX
S1dlYlZpZXciKV07CisgICAgYXV0byB3ZWJLaXRCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlV2l0
aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViS2l0Il07CiAKLSAgICBzYW5kYm94UGFyYW1ldGVy
cy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aChbd2ViS2l0MkJ1bmRsZSBwYXRoRm9yUmVz
b3VyY2U6QCJjb20uYXBwbGUuV2ViUHJvY2VzcyIgb2ZUeXBlOkAic2IiXSk7CisgICAgc2FuZGJv
eFBhcmFtZXRlcnMuc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgobWFrZVN0cmluZyhTdHJp
bmcoW3dlYktpdEJ1bmRsZSByZXNvdXJjZVBhdGhdKSwgIi9jb20uYXBwbGUuV2ViUHJvY2Vzcy5z
YiIpKTsKIAogICAgIEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KHBhcmFtZXRl
cnMsIHNhbmRib3hQYXJhbWV0ZXJzKTsKICNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>403234</attachid>
            <date>2020-06-30 13:22:22 -0700</date>
            <delta_ts>2020-06-30 15:19:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213379-20200630132221.patch</filename>
            <type>text/plain</type>
            <size>11207</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjYzNzYxKQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2
LTMwICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj
T1NdIENvbm5lY3Rpb25zIHRvIHRoZSBwcmVmZXJlbmNlIGRhZW1vbiBhcmUgZXN0YWJsaXNoZWQg
YmVmb3JlIGVudGVyaW5nIHRoZSBzYW5kYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB
ZGxlci4KKworICAgICAgICBVc2UgY29ycmVjdCBwYXJhbWV0ZXIgdHlwZXMgaW4gX0NGUHJlZnNT
ZXREaXJlY3RNb2RlRW5hYmxlZCBhbmQgX0NGUHJlZnNTZXRSZWFkT25seSwgYW5kIG1vdmUKKyAg
ICAgICAgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZCBpbnNpZGUgYW4gT2JqZWN0aXZlLUMg
Z3VhcmQsIHNpbmNlIEJPT0wgb25seSBzZWVtcyB0byBiZSBhIGJ1aWx0aW4KKyAgICAgICAgdHlw
ZSBpbiBPYmplY3RpdmUtQy4KKworICAgICAgICAqIHBhbC9zcGkvY2YvQ0ZVdGlsaXRpZXNTUEku
aDoKKwogMjAyMC0wNi0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAg
ICAgW1hjb2RlXSBFbmFibGUgdGhlICJNeSBNYWMgKE1hYyBDYXRhbHlzdCkiIGRlc3RpbmF0aW9u
IGluIFdlYktpdCBYY29kZSBwcm9qZWN0cwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z
cGkvY2YvQ0ZVdGlsaXRpZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9QQUwv
cGFsL3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oCShyZXZpc2lvbiAyNjM3NjEpCisrKyBTb3VyY2Uv
V2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oCSh3b3JraW5nIGNvcHkpCkBA
IC01OCw3ICs1OCw5IEBAIENGRGljdGlvbmFyeVJlZiBfQ0ZXZWJTZXJ2aWNlc0NvcHlQcm92aWQK
IAogdm9pZCBfX0NGUnVuTG9vcFNldE9wdGlvbnNSZWFzb24oX19DRlJ1bkxvb3BPcHRpb25zIG9w
dHMsIENGU3RyaW5nUmVmIHJlYXNvbik7CiAKLXZvaWQgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5h
YmxlZChib29sIGVuYWJsZWQpOwotdm9pZCBfQ0ZQcmVmc1NldFJlYWRPbmx5KGJvb2wgZmxhZyk7
CisjaWZkZWYgX19PQkpDX18KK3ZvaWQgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZChCT09M
IGVuYWJsZWQpOworI2VuZGlmCit2b2lkIF9DRlByZWZzU2V0UmVhZE9ubHkoQm9vbGVhbiBmbGFn
KTsKIAogV1RGX0VYVEVSTl9DX0VORApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2Mzc2MSkKKysr
IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAK
KzIwMjAtMDYtMzAgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAg
ICAgIFttYWNPU10gQ29ubmVjdGlvbnMgdG8gdGhlIHByZWZlcmVuY2UgZGFlbW9uIGFyZSBlc3Rh
Ymxpc2hlZCBiZWZvcmUgZW50ZXJpbmcgdGhlIHNhbmRib3gKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzM3OQorCisgICAgICAgIFJldmlld2VkIGJ5
IERhcmluIEFkbGVyLgorCisgICAgICAgIE9uIG1hY09TLCBjb25uZWN0aW9ucyB0byB0aGUgcHJl
ZmVyZW5jZSBkYWVtb24gYXJlIGVzdGFibGlzaGVkIGJlZm9yZSBlbnRlcmluZyB0aGUgc2FuZGJv
eC4gVGhlc2UgY29ubmVjdGlvbnMgYWxzbyBwZXJzaXN0CisgICAgICAgIGFmdGVyIGVudGVyaW5n
IHRoZSBzYW5kYm94IGFuZCBkZW55aW5nIGFjY2VzcyB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24u
IFRoZXJlIHNob3VsZCBub3QgYmUgYXR0ZW1wdHMgdG8gY29ubmVjdCB0byB0aGUKKyAgICAgICAg
cHJlZmVyZW5jZSBkYWVtb24gYmVmb3JlIGVudGVyaW5nIHRoZSBzYW5kYm94LCBzaW5jZSB0aGVz
ZSBhdHRlbXB0cyB3aWxsIG5vdCBiZSBzdG9wcGVkIGJ5IHRoZSBzYW5kYm94LiBUaGlzIHBhdGNo
IG1vdmVzCisgICAgICAgIGNvZGUgdGhhdCBjb25uZWN0cyB0byB0aGUgcHJlZmVyZW5jZSBkYWVt
b24gdG8gYmUgZXhlY3V0ZWQgYWZ0ZXIgdGhlIHNhbmRib3ggaGFzIGJlZW4gZW50ZXJlZC4gVGhh
dCBpbmNsdWRlcyBjb2RlIHRvCisgICAgICAgIHByZXZlbnQgY29ubmVjdGlvbnMgdG8gdGhlIERv
Y2sgYW5kIGNvZGUgdG8gaW5pdGlhbGl6ZSBXZWJLaXQgbG9nZ2luZy4gQWxzbywgaW5zdGVhZCBv
ZiBjYWxsaW5nIFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpdLAorICAgICAgICBjYWxsIFtOU0J1
bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpdLCBzaW5jZSBjYWxsaW5nIFtOU0J1bmRsZSBidW5k
bGVGb3JDbGFzczpdIHdpbGwgY29ubmVjdCB0byB0aGUgcHJlZmVyZW5jZSBkYWVtb24uCisgICAg
ICAgIEZpbmFsbHksIGFsbG93IHRoZSBzeXNjYWxsIFNZU19nZXRob3N0dXVpZCwgc2luY2UgdGhh
dCBpcyBuZWVkZWQgYnkgQ29yZUZvdW5kYXRpb24gd2hlbiB0aGVyZSBpcyBubyBhY2Nlc3MgdG8g
dGhlCisgICAgICAgIHByZWZlcmVuY2UgZGFlbW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g
VGhpcyBzaG91bGQgYmUgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4gSXQgd291bGQgYmUgbmlj
ZSB0byBoYXZlIGEgdGVzdCB0byBtYWtlIHN1cmUgdGhhdCB0aGVyZSBhcmUgbm8KKyAgICAgICAg
Y29ubmVjdGlvbnMgdG8gdGhlIHByZWZlcmVuY2UgZGFlbW9uIGp1c3QgYmVmb3JlIGVudGVyaW5n
IHRoZSBzYW5kYm94LCBidXQgSSBhbSBub3QgYXdhcmUgb2YgaG93IHRvIGltcGxlbWVudCB0aGlz
LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tOgor
ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gpOgorICAg
ICAgICAqIFNoYXJlZC9BdXhpbGlhcnlQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXV4
aWxpYXJ5UHJvY2Vzczo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYktp
dDJJbml0aWFsaXplQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OnJ1bkluaXRpYWxpemF0aW9u
Q29kZSk6CisgICAgICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2Vy
dmljZS9YUENTZXJ2aWNlTWFpbi5tbToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZU1haW4p
OgorICAgICAgICAqIFNoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbToKKyAgICAgICAg
KFdlYktpdDo6d2ViS2l0MkJ1bmRsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5p
dGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjppbml0aWFs
aXplU2FuZGJveCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5z
Yi5pbjoKKwogMjAyMC0wNi0zMCAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAg
ICAgICAgIFNjcnVuY2hpbmcgYSB2aWRlbyB0byBQaVAgY2FuIHJlc3VsdCBpbiBicm9rZW4gYW5p
bWF0aW9uIGFuZCBsZWF2ZSBTYWZhcmkgaW4gYSBiYWQgc3RhdGUKSW5kZXg6IFNvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCShy
ZXZpc2lvbiAyNjM3NjEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL21hYy9OZXR3
b3JrUHJvY2Vzc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtODcsOSArODcsOSBAQCB2b2lkIE5l
dHdvcmtQcm9jZXNzOjphbGxvd1NwZWNpZmljSFRUUFNDCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpp
bml0aWFsaXplU2FuZGJveChjb25zdCBBdXhpbGlhcnlQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJh
bWV0ZXJzJiBwYXJhbWV0ZXJzLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBzYW5k
Ym94UGFyYW1ldGVycykKIHsKICAgICAvLyBOZWVkIHRvIG92ZXJpZGUgdGhlIGRlZmF1bHQsIGJl
Y2F1c2Ugc2VydmljZSBoYXMgYSBkaWZmZXJlbnQgYnVuZGxlIElELgotICAgIE5TQnVuZGxlICp3
ZWJLaXQyQnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOk5TQ2xhc3NGcm9tU3RyaW5n
KEAiV0tXZWJWaWV3IildOworICAgIGF1dG8gd2ViS2l0QnVuZGxlID0gW05TQnVuZGxlIGJ1bmRs
ZVdpdGhJZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYktpdCJdOwogCi0gICAgc2FuZGJveFBhcmFt
ZXRlcnMuc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgoW3dlYktpdDJCdW5kbGUgcGF0aEZv
clJlc291cmNlOkAiY29tLmFwcGxlLldlYktpdC5OZXR3b3JrUHJvY2VzcyIgb2ZUeXBlOkAic2Ii
XSk7CisgICAgc2FuZGJveFBhcmFtZXRlcnMuc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgo
bWFrZVN0cmluZyhTdHJpbmcoW3dlYktpdEJ1bmRsZSByZXNvdXJjZVBhdGhdKSwgIi9jb20uYXBw
bGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNiIikpOwogCiAgICAgQXV4aWxpYXJ5UHJvY2Vzczo6
aW5pdGlhbGl6ZVNhbmRib3gocGFyYW1ldGVycywgc2FuZGJveFBhcmFtZXRlcnMpOwogfQpJbmRl
eDogU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYktpdC9TaGFyZWQvQXV4aWxpYXJ5UHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI2
Mzc2MSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0F1eGlsaWFyeVByb2Nlc3MuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0yNyw4ICsyNywxMCBAQAogI2luY2x1ZGUgIkF1eGlsaWFyeVByb2Nlc3Mu
aCIKIAogI2luY2x1ZGUgIkNvbnRlbnRXb3JsZFNoYXJlZC5oIgorI2luY2x1ZGUgIkxvZ0luaXRp
YWxpemF0aW9uLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlNhbmRib3hJbml0
aWFsaXphdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0xvZ0luaXRpYWxpemF0
aW9uLmg+CiAjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5oPgogCiAjaWYgIU9TKFdJTkRPV1MpCkBA
IC03Niw2ICs3OCwxMSBAQCB2b2lkIEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemUoY29uc3Qg
CiAgICAgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyBzYW5kYm94UGFyYW1ldGVyczsK
ICAgICBpbml0aWFsaXplU2FuZGJveChwYXJhbWV0ZXJzLCBzYW5kYm94UGFyYW1ldGVycyk7CiAK
KyNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAorICAgIFdlYkNvcmU6
OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCk7CisgICAgV2ViS2l0Ojppbml0aWFs
aXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOworI2VuZGlmIC8vICFMT0dfRElTQUJMRUQgfHwg
IVJFTEVBU0VfTE9HX0RJU0FCTEVECisKICAgICBpbml0aWFsaXplUHJvY2Vzc05hbWUocGFyYW1l
dGVycyk7CiAKICAgICAvLyBJbiBXZWJLaXQyLCBvbmx5IHRoZSBVSSBwcm9jZXNzIHNob3VsZCBl
dmVyIGJlIGdlbmVyYXRpbmcgY2VydGFpbiBpZGVudGlmaWVycy4KSW5kZXg6IFNvdXJjZS9XZWJL
aXQvU2hhcmVkL0NvY29hL1dlYktpdDJJbml0aWFsaXplQ29jb2EubW0KPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViS2l0MkluaXRpYWxpemVDb2NvYS5tbQkocmV2
aXNpb24gMjYzNzYxKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViS2l0MkluaXRp
YWxpemVDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsMTAgKzI2LDggQEAKICNpbXBvcnQg
ImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViS2l0MkluaXRpYWxpemUuaCIKIAotI2ltcG9ydCAiTG9n
SW5pdGlhbGl6YXRpb24uaCIKICNpbXBvcnQgIlZlcnNpb25DaGVja3MuaCIKICNpbXBvcnQgPEph
dmFTY3JpcHRDb3JlL0luaXRpYWxpemVUaHJlYWRpbmcuaD4KLSNpbXBvcnQgPFdlYkNvcmUvTG9n
SW5pdGlhbGl6YXRpb24uaD4KICNpbXBvcnQgPG11dGV4PgogI2ltcG9ydCA8d3RmL01haW5UaHJl
YWQuaD4KICNpbXBvcnQgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC01NiwxMSArNTQsNiBAQCBzdGF0
aWMgdm9pZCBydW5Jbml0aWFsaXphdGlvbkNvZGUodm9pZCogCiAgICAgV1RGOjppbml0aWFsaXpl
TWFpblRocmVhZCgpOwogCiAgICAgV1RGOjpSZWZDb3VudGVkQmFzZTo6ZW5hYmxlVGhyZWFkaW5n
Q2hlY2tzR2xvYmFsbHkoKTsKLQotI2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJ
U0FCTEVECi0gICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKTsK
LSAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCk7Ci0jZW5kaWYg
Ly8gIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJMRUQKIH0KIAogdm9pZCBJbml0
aWFsaXplV2ViS2l0MigpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRp
bGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1haW4ubW0KPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNl
L1hQQ1NlcnZpY2VNYWluLm1tCShyZXZpc2lvbiAyNjM3NjEpCisrKyBTb3VyY2UvV2ViS2l0L1No
YXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1haW4u
bW0JKHdvcmtpbmcgY29weSkKQEAgLTMzLDEwICszMyw2IEBACiAjaW1wb3J0IDx3dGYvUmV0YWlu
UHRyLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndpbi9YUENTUEkuaD4KIAotI2lmIFBMQVRGT1JN
KE1BQykKLSNpbXBvcnQgPHBhbC9zcGkvbWFjL05TQXBwbGljYXRpb25TUEkuaD4KLSNlbmRpZgot
CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RhdGljIHZvaWQgWFBDU2VydmljZUV2ZW50SGFuZGxl
cih4cGNfY29ubmVjdGlvbl90IHBlZXIpCkBAIC0xNjksMTIgKzE2NSw2IEBAIGludCBYUENTZXJ2
aWNlTWFpbihpbnQgYXJnYywgY29uc3QgY2hhcioKICNpZiBQTEFURk9STShNQUMpCiAgICAgLy8g
RG9uJ3QgYWxsb3cgQXBwbGUgRXZlbnRzIGluIFdlYktpdCBwcm9jZXNzZXMuIFRoaXMgY2FuIGJl
IHJlbW92ZWQgd2hlbiA8cmRhcjovL3Byb2JsZW0vMTQwMTI4MjM+IGlzIGZpeGVkLgogICAgIHNl
dGVudigiX19BUFBMRUVWRU5UU1NFUlZJQ0VOQU1FIiwgIiIsIDEpOwotCi0gICAgLy8gV2UgZG9u
J3QgbmVlZCB0byB0YWxrIHRvIHRoZSBkb2NrLgotICAgIGlmIChDbGFzcyBuc0FwcGxpY2F0aW9u
Q2xhc3MgPSBOU0NsYXNzRnJvbVN0cmluZyhAIk5TQXBwbGljYXRpb24iKSkgewotICAgICAgICBp
ZiAoW25zQXBwbGljYXRpb25DbGFzcyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcmV2
ZW50RG9ja0Nvbm5lY3Rpb25zKV0pCi0gICAgICAgICAgICBbbnNBcHBsaWNhdGlvbkNsYXNzIF9w
cmV2ZW50RG9ja0Nvbm5lY3Rpb25zXTsKLSAgICB9CiAjZW5kaWYKIAogICAgIHhwY19tYWluKFhQ
Q1NlcnZpY2VFdmVudEhhbmRsZXIpOwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1
eGlsaWFyeVByb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQv
bWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0JKHJldmlzaW9uIDI2Mzc2MSkKKysrIFNvdXJjZS9X
ZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBA
IC01MTcsNyArNTE3LDcgQEAgc3RhdGljIGJvb2wgdHJ5QXBwbHlDYWNoZWRTYW5kYm94KGNvbnN0
IAogCiBzdGF0aWMgaW5saW5lIGNvbnN0IE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlKCkKIHsKLSAg
ICBjb25zdCBzdGF0aWMgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFz
czpOU0NsYXNzRnJvbVN0cmluZyhAIldLV2ViVmlldyIpXTsKKyAgICBjb25zdCBzdGF0aWMgTlNC
dW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBs
ZS5XZWJLaXQiXTsKICAgICByZXR1cm4gYnVuZGxlOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lv
biAyNjM3NjEpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nl
c3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTExNDgsNiArMTE0OCw3IEBACiAgICAgICAgIChz
eXNjYWxsLW51bWJlciBTWVNfdWxvY2tfd2FpdDIpIDs7IDxyZGFyOi8vcHJvYmxlbS81ODc0Mzc3
OD4KICNlbmRpZgogICAgICAgICAoc3lzY2FsbC1udW1iZXIgU1lTX2ZzdGF0NjRfZXh0ZW5kZWQp
IDs7IDxyZGFyOi8vcHJvYmxlbS82MTMxMDAxOT4KKyAgICAgICAgKHN5c2NhbGwtbnVtYmVyIFNZ
U19nZXRob3N0dXVpZCkKICAgICApCiAKICAgICAoaWYgKGVxdWFsPyAocGFyYW0gIkNQVSIpICJh
cm02NCIpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv
Y29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI2Mzc2MSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTIyNiw2ICsy
MjYsOSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAjZW5kaWYK
IAogI2lmIFVTRShBUFBLSVQpCisgICAgLy8gV2UgZG9uJ3QgbmVlZCB0byB0YWxrIHRvIHRoZSBE
b2NrLgorICAgIFtOU0FwcGxpY2F0aW9uIF9wcmV2ZW50RG9ja0Nvbm5lY3Rpb25zXTsKKwogICAg
IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6
QHsgQCJOU0FwcGxpY2F0aW9uQ3Jhc2hPbkV4Y2VwdGlvbnMiIDogQFlFUyB9XTsKIAogICAgIC8v
IHJkYXI6Ly85MTE4NjM5IGFjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50IGluIE5TQXBwbGlj
YXRpb24gZGVmYXVsdHMgdG8gdXNlIHRoZSBrZXlXaW5kb3cuIFNpbmNlIHRoZXJlJ3MKQEAgLTIz
Myw3ICsyMzYsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAg
ICAgTWV0aG9kIG1ldGhvZFRvUGF0Y2ggPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbTlNBcHBs
aWNhdGlvbiBjbGFzc10sIEBzZWxlY3RvcihhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCkp
OwogICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RUb1BhdGNoLCAoSU1QKU5TQXBw
bGljYXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7CiAjZW5kaWYKLSAgICAKKwog
I2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NFU1NfTlNSVU5MT09QKQogICAgIC8v
IE5lZWQgdG8gaW5pdGlhbGl6ZSBhY2Nlc3NpYmlsaXR5IGZvciBWb2ljZU92ZXIgdG8gd29yayB3
aGVuIHRoZSBXZWJDb250ZW50IHByb2Nlc3MgaXMgdXNpbmcgTlNSdW5Mb29wLgogICAgIC8vIEN1
cnJlbnRseSwgaXQgaXMgYWxzbyBuZWVkZWQgdG8gYWxsb2NhdGUgYW5kIGluaXRpYWxpemUgYW4g
TlNBcHBsaWNhdGlvbiBvYmplY3QuCkBAIC01NjQsOSArNTY3LDkgQEAgdm9pZCBXZWJQcm9jZXNz
Ojppbml0aWFsaXplU2FuZGJveChjb25zdAogewogI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZP
Uk0oTUFDQ0FUQUxZU1QpCiAgICAgLy8gTmVlZCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCwgYmVj
YXVzZSBzZXJ2aWNlIGhhcyBhIGRpZmZlcmVudCBidW5kbGUgSUQuCi0gICAgTlNCdW5kbGUgKndl
YktpdDJCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmco
QCJXS1dlYlZpZXciKV07CisgICAgYXV0byB3ZWJLaXRCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxl
V2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViS2l0Il07CiAKLSAgICBzYW5kYm94UGFyYW1l
dGVycy5zZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aChbd2ViS2l0MkJ1bmRsZSBwYXRoRm9y
UmVzb3VyY2U6QCJjb20uYXBwbGUuV2ViUHJvY2VzcyIgb2ZUeXBlOkAic2IiXSk7CisgICAgc2Fu
ZGJveFBhcmFtZXRlcnMuc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgobWFrZVN0cmluZyhT
dHJpbmcoW3dlYktpdEJ1bmRsZSByZXNvdXJjZVBhdGhdKSwgIi9jb20uYXBwbGUuV2ViUHJvY2Vz
cy5zYiIpKTsKIAogICAgIEF1eGlsaWFyeVByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KHBhcmFt
ZXRlcnMsIHNhbmRib3hQYXJhbWV0ZXJzKTsKICNlbmRpZgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>