<?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>208782</bug_id>
          
          <creation_ts>2020-03-08 06:32:30 -0700</creation_ts>
          <short_desc>Rename ResourceResponseBase::isHTTP to isInHTTPFamily</short_desc>
          <delta_ts>2020-06-01 02:01:28 -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>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>cdumez</cc>
    
    <cc>cgarcia</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>japhet</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1627503</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-03-08 06:32:30 -0700</bug_when>
    <thetext>As the comment says, the method name is misleading and the method
is inconsistent with the API of ResourceRequestBase, so remove it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1627505</commentid>
    <comment_count>1</comment_count>
      <attachid>392952</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-03-08 08:09:49 -0700</bug_when>
    <thetext>Created attachment 392952
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1627666</commentid>
    <comment_count>2</comment_count>
      <attachid>392952</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-03-08 22:55:21 -0700</bug_when>
    <thetext>Comment on attachment 392952
Patch

Seems OK. Not sure this is an improvement. I would have been tempted to rename it rather than deleting it. Seems logical to check isHTTP() before calling httpStatusCode(), less obvious to check url().protocolIsInHTTPFamily().

WebKitLegacy\win\Plugins\PluginStream.cpp(155,8): error C2039: &apos;isHTTP&apos;: is not a member of &apos;WebCore::ResourceResponse&apos;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1627695</commentid>
    <comment_count>3</comment_count>
      <attachid>393015</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-03-09 01:38:50 -0700</bug_when>
    <thetext>Created attachment 393015
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1627797</commentid>
    <comment_count>4</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-03-09 09:14:43 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #2)
&gt; Comment on attachment 392952 [details]
&gt; Patch
&gt; 
&gt; Seems OK. Not sure this is an improvement. I would have been tempted to
&gt; rename it rather than deleting it. Seems logical to check isHTTP() before
&gt; calling httpStatusCode(), less obvious to check
&gt; url().protocolIsInHTTPFamily().
&gt; 
&gt; WebKitLegacy\win\Plugins\PluginStream.cpp(155,8): error C2039: &apos;isHTTP&apos;: is
&gt; not a member of &apos;WebCore::ResourceResponse&apos;

Build error fixed but also willing to rename (Bug title would need to be updated).
isHTTPorHTTPS? isInHTTPFamily? Or even protocolIsInHTTPFamily to match URL?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657603</commentid>
    <comment_count>5</comment_count>
      <attachid>400660</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-05-30 03:08:22 -0700</bug_when>
    <thetext>Created attachment 400660
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657604</commentid>
    <comment_count>6</comment_count>
      <attachid>400661</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-05-30 03:10:12 -0700</bug_when>
    <thetext>Created attachment 400661
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657843</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-01 00:45:04 -0700</bug_when>
    <thetext>ChangeLog entry in Source/WebKitLegacy/win/ChangeLog contains OOPS!.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657847</commentid>
    <comment_count>8</comment_count>
      <attachid>400725</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-01 01:27:45 -0700</bug_when>
    <thetext>Created attachment 400725
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657852</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-01 02:00:01 -0700</bug_when>
    <thetext>Committed r262369: &lt;https://trac.webkit.org/changeset/262369&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 400725.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1657853</commentid>
    <comment_count>10</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-01 02:01:28 -0700</bug_when>
    <thetext>&lt;rdar://problem/63822588&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>392952</attachid>
            <date>2020-03-08 08:09:49 -0700</date>
            <delta_ts>2020-03-09 01:38:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208782-20200308160947.patch</filename>
            <type>text/plain</type>
            <size>8248</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRmNzRmN2MwZGY4NjU0
NWJkNDk3MmU2NDBjNjFhNWRmOWE3YzYwNC4uODIzODhhYmU0ZWJmZGYxZGExOWZhYmZmNjE2NzI4
YWFkZjJiZWMyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAzLTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlc291cmNlUmVzcG9u
c2VCYXNlOjppc0hUVFAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEFzIHRoZSBjb21tZW50IHNheXMsIHRoZSBtZXRob2QgbmFtZSBpcyBtaXNsZWFkaW5n
IGFuZCB0aGUgbWV0aG9kCisgICAgICAgIGlzIGluY29uc2lzdGVudCB3aXRoIHRoZSBBUEkgb2Yg
UmVzb3VyY2VSZXF1ZXN0QmFzZSwgc28gcmVtb3ZlIGl0LgorCisgICAgICAgIE5vIHRlc3RzIHNp
bmNlIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRl
ckNvbnRlbnRQb2xpY3kpOgorICAgICAgICAqIGxvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6
ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl
UmVzcG9uc2VCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNl
Ojppc0hUVFAgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVz
b3VyY2VSZXNwb25zZUJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VC
YXNlOjppc051bGwgY29uc3QpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VNSU1FVHlwZSBjb25zdCk6
CisKIDIwMjAtMDMtMDggIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNv
bT4KIAogICAgICAgICBDYW52YXMgZHJhd2luZyBjb21tYW5kcyBoYXZlIHRvIGJlIGZsdXNoZWQg
dG8gdGhlIEdQVVByb2Nlc3MgaW4gYmF0Y2hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0YzVlMTA2NzVmMjEyY2Fm
ZDUzMjhhODA2YWRmOWUxMjA1MWQzNmU3Li5hNzk2MjliZjVmOTQ3YTJlMzFjNDJmY2YxODA4YTQy
NmE4ODNmNDA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy
Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTA4ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlc291cmNlUmVzcG9uc2VC
YXNlOjppc0hUVFAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgIEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNo
ZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6Om1ha2VT
dG9yZURlY2lzaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5j
cHA6CisgICAgICAgIChXZWJLaXQ6OmJ1aWxkSFRUUEhlYWRlcnMpOgorCiAyMDIwLTAzLTA4ICBT
YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fu
dmFzIGRyYXdpbmcgY29tbWFuZHMgaGF2ZSB0byBiZSBmbHVzaGVkIHRvIHRoZSBHUFVQcm9jZXNz
IGluIGJhdGNoZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv
YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4
IDE1MTFmNWE3ZDRiMDM4ZTdhOGQyZGRjNGFlM2U1MDYwNDg2ZmQ3OTQuLjgwZWUxMmE2ZDRkOTM3
MmZjNzk3YmEwM2E4NjkyMTZmY2U5ZTY5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt
ZW50TG9hZGVyLmNwcApAQCAtOTk4LDcgKzk5OCw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNv
bnRpbnVlQWZ0ZXJDb250ZW50UG9saWN5KFBvbGljeUFjdGlvbiBwb2xpY3kpCiAgICAgICAgIHJl
dHVybjsKICAgICB9CiAKLSAgICBpZiAobV9yZXNwb25zZS5pc0hUVFAoKSkgeworICAgIGlmICht
X3Jlc3BvbnNlLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkgewogICAgICAgICBpbnQg
c3RhdHVzID0gbV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpOyAvLyBTdGF0dXMgbWF5IGJlIHpl
cm8gd2hlbiBsb2FkaW5nIHN1YnN0aXR1dGUgZGF0YSwgaW4gcGFydGljdWxhciBmcm9tIGEgV2Vi
QXJjaGl2ZS4KICAgICAgICAgaWYgKHN0YXR1cyAmJiAoc3RhdHVzIDwgMjAwIHx8IHN0YXR1cyA+
PSAzMDApKSB7CiAgICAgICAgICAgICBib29sIGhvc3RlZEJ5T2JqZWN0ID0gZnJhbWVMb2FkZXIo
KS0+aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCmluZGV4IDk1ZTEwNWJlYjg0YmVh
MDIxMzMzMGQyZTMyYmZiNDc4ZDRlN2JiYzguLjNiZDlhMTVjNGM5YzJkNzhjNjc0ZjhlMGY0NTAx
ZTk3ZWMyMTY0YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBs
dWdJblN0cmVhbUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBl
UGx1Z0luU3RyZWFtTG9hZGVyLmNwcApAQCAtMTI2LDcgKzEyNiw3IEBAIHZvaWQgTmV0c2NhcGVQ
bHVnSW5TdHJlYW1Mb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3Bv
bnNlJiByZXNwCiAgICAgICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgICAgICByZXR1cm47CiAK
LSAgICAgICAgaWYgKCFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYgKCFyZXNwb25zZS51
cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAg
ICAgICAgaWYgKG1fY2xpZW50LT53YW50c0FsbFN0cmVhbXMoKSkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKaW5k
ZXggYmEwMjQ4NDBlMGJmMGNmMjM0ZmNhYzlmODMwODU5ZTM2Mzc0NjQ1NS4uNDUwNmM2ZWUwY2Fm
YzJkZjE2NWE0ZTc4MzQ4MThjZTQ2ZDY4ZmM0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKQEAgLTE5MCwx
NCArMTkwLDYgQEAgUmVzb3VyY2VSZXNwb25zZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6ZmlsdGVy
KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogICAgIHJldHVybiBmaWx0ZXJlZFJl
c3BvbnNlOwogfQogCi0vLyBGSVhNRTogTmFtZSBkb2VzIG5vdCBtYWtlIGl0IGNsZWFyIHRoaXMg
aXMgdHJ1ZSBmb3IgSFRUUFMhCi1ib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjppc0hUVFAoKSBj
b25zdAotewotICAgIGxhenlJbml0KENvbW1vbkZpZWxkc09ubHkpOwotCi0gICAgcmV0dXJuIG1f
dXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKLX0KLQogY29uc3QgVVJMJiBSZXNvdXJjZVJl
c3BvbnNlQmFzZTo6dXJsKCkgY29uc3QKIHsKICAgICBsYXp5SW5pdChDb21tb25GaWVsZHNPbmx5
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS
ZXNwb25zZUJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS
ZXNwb25zZUJhc2UuaAppbmRleCAwOWM3NWIzNmViYWY4YjFkNTM2MDliZWYzNjBjNDBhOTNiYThj
NDI0Li4xZTFiYmIyMzkzM2EzNzY5MWFmMTY5Y2I0YzFjNDYyOTYxOGY3MTNjIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgK
KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFz
ZS5oCkBAIC04Miw3ICs4Miw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUmVzb3VyY2VSZXNwb25z
ZSBmcm9tQ3Jvc3NUaHJlYWREYXRhKENyb3NzVGhyZWFkRGF0YSYmKTsKIAogICAgIGJvb2wgaXNO
dWxsKCkgY29uc3QgeyByZXR1cm4gbV9pc051bGw7IH0KLSAgICBXRUJDT1JFX0VYUE9SVCBib29s
IGlzSFRUUCgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNTdWNjZXNzZnVsKCkg
Y29uc3Q7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBjb25zdCBVUkwmIHVybCgpIGNvbnN0OwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKaW5kZXggMjQ2YTRmYzcwMzIzMTBjNDNkODdk
ZDIxOTk4OWRmZGU4MzIxNmQxYS4uMTIzNDZiZDUxMjg5Nzk4NzQwNjFkZDJkMjc0ODkxZWJmZTM5
ZjZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBAIC0xNzksMTQgKzE3
OSwxNSBAQCBFeGNlcHRpb25PcjxEb2N1bWVudCo+IFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVhN
TCgpCiAKICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJlcXVpcmVzIHRoZSBmaW5hbCBNSU1FIHR5
cGUgdG8gYmUgc29tZSB2YWxpZCBYTUwgdHlwZSwgb3IgdGV4dC9odG1sLgogICAgICAgICAvLyBJ
ZiBpdCBpcyB0ZXh0L2h0bWwsIHRoZW4gdGhlIHJlc3BvbnNlVHlwZSBvZiAiZG9jdW1lbnQiIG11
c3QgaGF2ZSBiZWVuIHN1cHBsaWVkIGV4cGxpY2l0bHkuCi0gICAgICAgIGlmICgobV9yZXNwb25z
ZS5pc0hUVFAoKSAmJiAhcmVzcG9uc2VJc1hNTCgpICYmICFpc0hUTUwpCisgICAgICAgIGF1dG8g
dXJsID0gbV9yZXNwb25zZS51cmwoKTsKKyAgICAgICAgaWYgKCh1cmwucHJvdG9jb2xJc0luSFRU
UEZhbWlseSgpICYmICFyZXNwb25zZUlzWE1MKCkgJiYgIWlzSFRNTCkKICAgICAgICAgICAgIHx8
IChpc0hUTUwgJiYgcmVzcG9uc2VUeXBlKCkgPT0gUmVzcG9uc2VUeXBlOjpFbXB0eVN0cmluZykp
IHsKICAgICAgICAgICAgIG1fcmVzcG9uc2VEb2N1bWVudCA9IG51bGxwdHI7CiAgICAgICAgIH0g
ZWxzZSB7CiAgICAgICAgICAgICBpZiAoaXNIVE1MKQotICAgICAgICAgICAgICAgIG1fcmVzcG9u
c2VEb2N1bWVudCA9IEhUTUxEb2N1bWVudDo6Y3JlYXRlKG51bGxwdHIsIG1fcmVzcG9uc2UudXJs
KCkpOworICAgICAgICAgICAgICAgIG1fcmVzcG9uc2VEb2N1bWVudCA9IEhUTUxEb2N1bWVudDo6
Y3JlYXRlKG51bGxwdHIsIHVybCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAg
bV9yZXNwb25zZURvY3VtZW50ID0gWE1MRG9jdW1lbnQ6OmNyZWF0ZShudWxscHRyLCBtX3Jlc3Bv
bnNlLnVybCgpKTsKKyAgICAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQgPSBYTUxEb2N1
bWVudDo6Y3JlYXRlKG51bGxwdHIsIHVybCk7CiAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1l
bnQtPm92ZXJyaWRlTGFzdE1vZGlmaWVkKG1fcmVzcG9uc2UubGFzdE1vZGlmaWVkKCkpOwogICAg
ICAgICAgICAgbV9yZXNwb25zZURvY3VtZW50LT5zZXRDb250ZXh0RG9jdW1lbnQoY29udGV4dCk7
CiAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQtPnNldFNlY3VyaXR5T3JpZ2luUG9saWN5
KGNvbnRleHQuc2VjdXJpdHlPcmlnaW5Qb2xpY3koKSk7CkBAIC04NTQsNyArODU1LDcgQEAgU3Ry
aW5nIFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZU1JTUVUeXBlKCkgY29uc3QKICAgICBTdHJpbmcg
bWltZVR5cGUgPSBleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKG1fbWltZVR5cGVPdmVycmlk
ZSk7CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkgewogICAgICAgICBTdHJpbmcgY29udGVu
dFR5cGU7Ci0gICAgICAgIGlmIChtX3Jlc3BvbnNlLmlzSFRUUCgpKQorICAgICAgICBpZiAobV9y
ZXNwb25zZS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgICAgICBjb250
ZW50VHlwZSA9IG1fcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpDb250
ZW50VHlwZSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNvbnRlbnRUeXBlID0gbV9yZXNw
b25zZS5taW1lVHlwZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j
YWNoZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IGUyYzg2YWFmZDZmNGEzNTczZjE2YmY5MjQ3ZmM1
ZWMxMjQ3YWJlNTguLmY4MzhkZjlhOTMzMWRlOWYxMjcxZjljYTg1YTgyMDg2ZDY2NjhjMzUgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl
LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo
ZS5jcHAKQEAgLTI2Miw3ICsyNjIsNyBAQCBzdGF0aWMgYm9vbCBpc01lZGlhTUlNRVR5cGUoY29u
c3QgU3RyaW5nJiB0eXBlKQogCiBzdGF0aWMgU3RvcmVEZWNpc2lvbiBtYWtlU3RvcmVEZWNpc2lv
bihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIHNpemVfdCBib2R5U2l6ZSkKIHsK
LSAgICBpZiAoIW9yaWdpbmFsUmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkg
fHwgIXJlc3BvbnNlLmlzSFRUUCgpKQorICAgIGlmICghb3JpZ2luYWxSZXF1ZXN0LnVybCgpLnBy
b3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCAhcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJc0luSFRU
UEZhbWlseSgpKQogICAgICAgICByZXR1cm4gU3RvcmVEZWNpc2lvbjo6Tm9EdWVUb1Byb3RvY29s
OwogCiAgICAgaWYgKG9yaWdpbmFsUmVxdWVzdC5odHRwTWV0aG9kKCkgIT0gIkdFVCIpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBi
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGI2
MDVhMjg5MTNiMzhmZWVjYzQ0MzAwMjk2M2NkNTliM2Y2YjdiYjguLmQzYzUwZTc2YTkwOTMxZDQ0
ZDVkZjYxOTU1YTdiMmFmNTZhMmRmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC0xOTAsNyArMTkwLDcgQEAgdm9pZCBQbHVnaW5W
aWV3OjpTdHJlYW06OmNvbnRpbnVlTG9hZCgpCiAKIHN0YXRpYyBTdHJpbmcgYnVpbGRIVFRQSGVh
ZGVycyhjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgbG9uZyBsb25nJiBleHBlY3Rl
ZENvbnRlbnRMZW5ndGgpCiB7Ci0gICAgaWYgKCFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICBpZiAo
IXJlc3BvbnNlLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJu
IFN0cmluZygpOwogCiAgICAgU3RyaW5nQnVpbGRlciBoZWFkZXI7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>393015</attachid>
            <date>2020-03-09 01:38:50 -0700</date>
            <delta_ts>2020-05-30 03:08:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208782-20200309093849.patch</filename>
            <type>text/plain</type>
            <size>11643</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2EyYzZiNzJmYjY5NThm
ZTk5MThhYjdhNjQ0NWI0ODE1MGYzNmYxOC4uNWE5ZTJlNWY5ZjNlZjM5MjFkYTZmZWM5OGNiYmY5
Y2U3OGJlYzRkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAzLTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlc291cmNlUmVzcG9u
c2VCYXNlOjppc0hUVFAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEFzIHRoZSBjb21tZW50IHNheXMsIHRoZSBtZXRob2QgbmFtZSBpcyBtaXNsZWFkaW5n
IGFuZCB0aGUgbWV0aG9kCisgICAgICAgIGlzIGluY29uc2lzdGVudCB3aXRoIHRoZSBBUEkgb2Yg
UmVzb3VyY2VSZXF1ZXN0QmFzZSwgc28gcmVtb3ZlIGl0LgorCisgICAgICAgIE5vIHRlc3RzIHNp
bmNlIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRl
ckNvbnRlbnRQb2xpY3kpOgorICAgICAgICAqIGxvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6
ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl
UmVzcG9uc2VCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNl
Ojppc0hUVFAgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVz
b3VyY2VSZXNwb25zZUJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VC
YXNlOjppc051bGwgY29uc3QpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VNSU1FVHlwZSBjb25zdCk6
CisKIDIwMjAtMDMtMDcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg
IEJlZ2luIG1vdmluZyBvZmYgb2YgbGl2ZSByYW5nZXMgZm9yIFdlYktpdCBpbnRlcm5hbHMKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggZjZjNGQzNmMzYzVlYTA1ODU5OGJiZmU3Y2MyMTQ4MDg2NWUyNjQ0Mi4uNzNjNzYw
OWQzMzdkZTcxYzcyNTllYjgxZDkxNDk3NzFkNjU5YWI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wMy0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg
IFJlbW92ZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6aXNIVFRQCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3ODIKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAg
ICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6TmV0d29ya0NhY2hlOjptYWtlU3RvcmVEZWNpc2lvbik6CisgICAgICAgICogV2ViUHJv
Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpidWlsZEhUVFBI
ZWFkZXJzKToKKwogMjAyMC0wMy0wNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQmVnaW4gbW92aW5nIG9mZiBvZiBsaXZlIHJhbmdlcyBmb3IgV2ViS2l0IGludGVy
bmFscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nIGIvU291
cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCmluZGV4IDg3ZmZhNWU0OWFjM2IyYWJjNTE1
Y2QzODdlZjQ0NGZiOWZjMjI4YmMuLmYzYThlMzMyYjczMTAyNTY4NGQ2Y2UyNWQ1YTE0YWI5Mzgw
YzBlNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAy
MC0wMy0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbW92ZSBS
ZXNvdXJjZVJlc3BvbnNlQmFzZTo6aXNIVFRQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogUGx1
Z2lucy9QbHVnaW5TdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luU3RyZWFtOjpz
dGFydFN0cmVhbSk6CisgICAgICAgICogV2ViVVJMUmVzcG9uc2UuY3BwOgorICAgICAgICAoV2Vi
VVJMUmVzcG9uc2U6OlF1ZXJ5SW50ZXJmYWNlKToKKyAgICAgICAgKFdlYlVSTFJlc3BvbnNlOjph
bGxIZWFkZXJGaWVsZHMpOgorICAgICAgICAoV2ViVVJMUmVzcG9uc2U6OmxvY2FsaXplZFN0cmlu
Z0ZvclN0YXR1c0NvZGUpOgorICAgICAgICAoV2ViVVJMUmVzcG9uc2U6OnN0YXR1c0NvZGUpOgor
CiAyMDIwLTAzLTAzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAg
ICBXZWIgSW5zcGVjdG9yOiByZS1hZGQgYEluc3BlY3RvckZyb250ZW5kSG9zdGAgc3VwcG9ydCBm
b3IgbW92aW5nIHRoZSBpbnNwZWN0ZWQgd2luZG93CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt
ZW50TG9hZGVyLmNwcAppbmRleCAxNTExZjVhN2Q0YjAzOGU3YThkMmRkYzRhZTNlNTA2MDQ4NmZk
Nzk0Li44MGVlMTJhNmQ0ZDkzNzJmYzc5N2JhMDNhODY5MjE2ZmNlOWU2OWNhIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTk5OCw3ICs5OTgsNyBAQCB2b2lk
IERvY3VtZW50TG9hZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGljeShQb2xpY3lBY3Rpb24g
cG9saWN5KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fcmVzcG9uc2UuaXNI
VFRQKCkpIHsKKyAgICBpZiAobV9yZXNwb25zZS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5
KCkpIHsKICAgICAgICAgaW50IHN0YXR1cyA9IG1fcmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKTsg
Ly8gU3RhdHVzIG1heSBiZSB6ZXJvIHdoZW4gbG9hZGluZyBzdWJzdGl0dXRlIGRhdGEsIGluIHBh
cnRpY3VsYXIgZnJvbSBhIFdlYkFyY2hpdmUuCiAgICAgICAgIGlmIChzdGF0dXMgJiYgKHN0YXR1
cyA8IDIwMCB8fCBzdGF0dXMgPj0gMzAwKSkgewogICAgICAgICAgICAgYm9vbCBob3N0ZWRCeU9i
amVjdCA9IGZyYW1lTG9hZGVyKCktPmlzSG9zdGVkQnlPYmplY3RFbGVtZW50KCk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3Bw
IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcApp
bmRleCA5NWUxMDViZWI4NGJlYTAyMTMzMzBkMmUzMmJmYjQ3OGQ0ZTdiYmM4Li4zYmQ5YTE1YzRj
OWMyZDc4YzY3NGY4ZTBmNDUwMWU5N2VjMjE2NGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKQEAgLTEyNiw3ICsxMjYs
NyBAQCB2b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2Uo
Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcAogICAgICAgICBpZiAoIW1fY2xpZW50KQogICAg
ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghcmVzcG9uc2UuaXNIVFRQKCkpCisgICAg
ICAgIGlmICghcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAgICAg
ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChtX2NsaWVudC0+d2FudHNBbGxTdHJlYW1zKCkp
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVz
cG9uc2VCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS
ZXNwb25zZUJhc2UuY3BwCmluZGV4IGJhMDI0ODQwZTBiZjBjZjIzNGZjYWM5ZjgzMDg1OWUzNjM3
NDY0NTUuLjQ1MDZjNmVlMGNhZmMyZGYxNjVhNGU3ODM0ODE4Y2U0NmQ2OGZjNDEgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2Uu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25z
ZUJhc2UuY3BwCkBAIC0xOTAsMTQgKzE5MCw2IEBAIFJlc291cmNlUmVzcG9uc2UgUmVzb3VyY2VS
ZXNwb25zZUJhc2U6OmZpbHRlcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKICAg
ICByZXR1cm4gZmlsdGVyZWRSZXNwb25zZTsKIH0KIAotLy8gRklYTUU6IE5hbWUgZG9lcyBub3Qg
bWFrZSBpdCBjbGVhciB0aGlzIGlzIHRydWUgZm9yIEhUVFBTIQotYm9vbCBSZXNvdXJjZVJlc3Bv
bnNlQmFzZTo6aXNIVFRQKCkgY29uc3QKLXsKLSAgICBsYXp5SW5pdChDb21tb25GaWVsZHNPbmx5
KTsKLQotICAgIHJldHVybiBtX3VybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCk7Ci19Ci0KIGNv
bnN0IFVSTCYgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnVybCgpIGNvbnN0CiB7CiAgICAgbGF6eUlu
aXQoQ29tbW9uRmllbGRzT25seSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggMDljNzViMzZlYmFmOGIxZDUz
NjA5YmVmMzYwYzQwYTkzYmE4YzQyNC4uMWUxYmJiMjM5MzNhMzc2OTFhZjE2OWNiNGMxYzQ2Mjk2
MThmNzEzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNv
dXJjZVJlc3BvbnNlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv
UmVzb3VyY2VSZXNwb25zZUJhc2UuaApAQCAtODIsNyArODIsNiBAQCBwdWJsaWM6CiAgICAgc3Rh
dGljIFJlc291cmNlUmVzcG9uc2UgZnJvbUNyb3NzVGhyZWFkRGF0YShDcm9zc1RocmVhZERhdGEm
Jik7CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNOdWxsOyB9Ci0gICAg
V0VCQ09SRV9FWFBPUlQgYm9vbCBpc0hUVFAoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBi
b29sIGlzU3VjY2Vzc2Z1bCgpIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgY29uc3QgVVJM
JiB1cmwoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx
dWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IDI0
NmE0ZmM3MDMyMzEwYzQzZDg3ZGQyMTk5ODlkZmRlODMyMTZkMWEuLjEyMzQ2YmQ1MTI4OTc5ODc0
MDYxZGQyZDI3NDg5MWViZmUzOWY2ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9Y
TUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0
LmNwcApAQCAtMTc5LDE0ICsxNzksMTUgQEAgRXhjZXB0aW9uT3I8RG9jdW1lbnQqPiBYTUxIdHRw
UmVxdWVzdDo6cmVzcG9uc2VYTUwoKQogCiAgICAgICAgIC8vIFRoZSBXM0Mgc3BlYyByZXF1aXJl
cyB0aGUgZmluYWwgTUlNRSB0eXBlIHRvIGJlIHNvbWUgdmFsaWQgWE1MIHR5cGUsIG9yIHRleHQv
aHRtbC4KICAgICAgICAgLy8gSWYgaXQgaXMgdGV4dC9odG1sLCB0aGVuIHRoZSByZXNwb25zZVR5
cGUgb2YgImRvY3VtZW50IiBtdXN0IGhhdmUgYmVlbiBzdXBwbGllZCBleHBsaWNpdGx5LgotICAg
ICAgICBpZiAoKG1fcmVzcG9uc2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNlSXNYTUwoKSAmJiAhaXNI
VE1MKQorICAgICAgICBhdXRvIHVybCA9IG1fcmVzcG9uc2UudXJsKCk7CisgICAgICAgIGlmICgo
dXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiAhcmVzcG9uc2VJc1hNTCgpICYmICFpc0hU
TUwpCiAgICAgICAgICAgICB8fCAoaXNIVE1MICYmIHJlc3BvbnNlVHlwZSgpID09IFJlc3BvbnNl
VHlwZTo6RW1wdHlTdHJpbmcpKSB7CiAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQgPSBu
dWxscHRyOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKGlzSFRNTCkKLSAgICAg
ICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQgPSBIVE1MRG9jdW1lbnQ6OmNyZWF0ZShudWxs
cHRyLCBtX3Jlc3BvbnNlLnVybCgpKTsKKyAgICAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1l
bnQgPSBIVE1MRG9jdW1lbnQ6OmNyZWF0ZShudWxscHRyLCB1cmwpOwogICAgICAgICAgICAgZWxz
ZQotICAgICAgICAgICAgICAgIG1fcmVzcG9uc2VEb2N1bWVudCA9IFhNTERvY3VtZW50OjpjcmVh
dGUobnVsbHB0ciwgbV9yZXNwb25zZS51cmwoKSk7CisgICAgICAgICAgICAgICAgbV9yZXNwb25z
ZURvY3VtZW50ID0gWE1MRG9jdW1lbnQ6OmNyZWF0ZShudWxscHRyLCB1cmwpOwogICAgICAgICAg
ICAgbV9yZXNwb25zZURvY3VtZW50LT5vdmVycmlkZUxhc3RNb2RpZmllZChtX3Jlc3BvbnNlLmxh
c3RNb2RpZmllZCgpKTsKICAgICAgICAgICAgIG1fcmVzcG9uc2VEb2N1bWVudC0+c2V0Q29udGV4
dERvY3VtZW50KGNvbnRleHQpOwogICAgICAgICAgICAgbV9yZXNwb25zZURvY3VtZW50LT5zZXRT
ZWN1cml0eU9yaWdpblBvbGljeShjb250ZXh0LnNlY3VyaXR5T3JpZ2luUG9saWN5KCkpOwpAQCAt
ODU0LDcgKzg1NSw3IEBAIFN0cmluZyBYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VNSU1FVHlwZSgp
IGNvbnN0CiAgICAgU3RyaW5nIG1pbWVUeXBlID0gZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlw
ZShtX21pbWVUeXBlT3ZlcnJpZGUpOwogICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAg
ICAgICAgU3RyaW5nIGNvbnRlbnRUeXBlOwotICAgICAgICBpZiAobV9yZXNwb25zZS5pc0hUVFAo
KSkKKyAgICAgICAgaWYgKG1fcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgp
KQogICAgICAgICAgICAgY29udGVudFR5cGUgPSBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChI
VFRQSGVhZGVyTmFtZTo6Q29udGVudFR5cGUpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBj
b250ZW50VHlwZSA9IG1fcmVzcG9uc2UubWltZVR5cGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcCBiL1NvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAppbmRleCBlMmM4NmFhZmQ2
ZjRhMzU3M2YxNmJmOTI0N2ZjNWVjMTI0N2FiZTU4Li5mODM4ZGY5YTkzMzFkZTlmMTI3MWY5Y2E4
NWE4MjA4NmQ2NjY4YzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC0yNjIsNyArMjYyLDcgQEAgc3RhdGljIGJvb2wg
aXNNZWRpYU1JTUVUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIAogc3RhdGljIFN0b3JlRGVjaXNp
b24gbWFrZVN0b3JlRGVjaXNpb24oY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmln
aW5hbFJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBz
aXplX3QgYm9keVNpemUpCiB7Ci0gICAgaWYgKCFvcmlnaW5hbFJlcXVlc3QudXJsKCkucHJvdG9j
b2xJc0luSFRUUEZhbWlseSgpIHx8ICFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICBpZiAoIW9yaWdp
bmFsUmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgfHwgIXJlc3BvbnNlLnVy
bCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIFN0b3JlRGVjaXNp
b246Ok5vRHVlVG9Qcm90b2NvbDsKIAogICAgIGlmIChvcmlnaW5hbFJlcXVlc3QuaHR0cE1ldGhv
ZCgpICE9ICJHRVQiKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdp
bnMvUGx1Z2luVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVn
aW5WaWV3LmNwcAppbmRleCBiNjA1YTI4OTEzYjM4ZmVlY2M0NDMwMDI5NjNjZDU5YjNmNmI3YmI4
Li5kM2M1MGU3NmE5MDkzMWQ0NGQ1ZGY2MTk1NWE3YjJhZjU2YTJkZmU1IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtMTkwLDcgKzE5
MCw3IEBAIHZvaWQgUGx1Z2luVmlldzo6U3RyZWFtOjpjb250aW51ZUxvYWQoKQogCiBzdGF0aWMg
U3RyaW5nIGJ1aWxkSFRUUEhlYWRlcnMoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2Us
IGxvbmcgbG9uZyYgZXhwZWN0ZWRDb250ZW50TGVuZ3RoKQogewotICAgIGlmICghcmVzcG9uc2Uu
aXNIVFRQKCkpCisgICAgaWYgKCFyZXNwb25zZS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5
KCkpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAogICAgIFN0cmluZ0J1aWxkZXIgaGVhZGVy
OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5TdHJl
YW0uY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5TdHJlYW0uY3Bw
CmluZGV4IDBmNmJlZWZmYWQxZGMwMTVjOGE0NzdlN2ZiZTVjOWI2YWFmYWZmMzkuLjBiYmY5N2Nl
N2Y4YzRhMmI4MGI3MWIzYjg3NjQ2YTA4NjFhYTNiMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblN0cmVhbS5jcHAKQEAgLTE1Miw3ICsxNTIsNyBAQCB2
b2lkIFBsdWdpblN0cmVhbTo6c3RhcnRTdHJlYW0oKQogCiAgICAgbG9uZyBsb25nIGV4cGVjdGVk
Q29udGVudExlbmd0aCA9IG1fcmVzb3VyY2VSZXNwb25zZS5leHBlY3RlZENvbnRlbnRMZW5ndGgo
KTsKIAotICAgIGlmIChtX3Jlc291cmNlUmVzcG9uc2UuaXNIVFRQKCkpIHsKKyAgICBpZiAobV9y
ZXNvdXJjZVJlc3BvbnNlLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkgewogICAgICAg
ICBTdHJpbmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CiAgICAgICAgIFN0cmluZyBzZXBhcmF0b3Ig
PSAiOiAiX3M7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlVSTFJl
c3BvbnNlLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlVSTFJlc3BvbnNlLmNwcApp
bmRleCA1NjliOTgyNjRiNDViODg3OGI1ODcyYzMzMTJmZTEzODQyYzUyMGM3Li40MDk3Njc3MWQy
MmIwZmU2ZWYzMmZlMTY0ZTBiZDE3MWJjMmI0MDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9XZWJVUkxSZXNwb25zZS5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93
aW4vV2ViVVJMUmVzcG9uc2UuY3BwCkBAIC0yNjAsNyArMjYwLDcgQEAgSFJFU1VMVCBXZWJVUkxS
ZXNwb25zZTo6UXVlcnlJbnRlcmZhY2UoX0luXyBSRUZJSUQgcmlpZCwgX0NPTV9PdXRwdHJfIHZv
aWQqKiBwcHYKICAgICAgICAgKnBwdk9iamVjdCA9IHN0YXRpY19jYXN0PElXZWJVUkxSZXNwb25z
ZSo+KHRoaXMpOwogICAgIGVsc2UgaWYgKElzRXF1YWxHVUlEKHJpaWQsIElJRF9JV2ViVVJMUmVz
cG9uc2VQcml2YXRlKSkKICAgICAgICAgKnBwdk9iamVjdCA9IHN0YXRpY19jYXN0PElXZWJVUkxS
ZXNwb25zZVByaXZhdGUqPih0aGlzKTsKLSAgICBlbHNlIGlmIChtX3Jlc3BvbnNlLmlzSFRUUCgp
ICYmIElzRXF1YWxHVUlEKHJpaWQsIElJRF9JV2ViSFRUUFVSTFJlc3BvbnNlKSkKKyAgICBlbHNl
IGlmIChtX3Jlc3BvbnNlLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiBJc0VxdWFs
R1VJRChyaWlkLCBJSURfSVdlYkhUVFBVUkxSZXNwb25zZSkpCiAgICAgICAgICpwcHZPYmplY3Qg
PSBzdGF0aWNfY2FzdDxJV2ViSFRUUFVSTFJlc3BvbnNlKj4odGhpcyk7CiAgICAgZWxzZQogICAg
ICAgICByZXR1cm4gRV9OT0lOVEVSRkFDRTsKQEAgLTM1OCw3ICszNTgsNyBAQCBIUkVTVUxUIFdl
YlVSTFJlc3BvbnNlOjpVUkwoX19kZXJlZl9vcHRfb3V0IEJTVFIqIHJlc3VsdCkKIAogSFJFU1VM
VCBXZWJVUkxSZXNwb25zZTo6YWxsSGVhZGVyRmllbGRzKF9DT01fT3V0cHRyX29wdF8gSVByb3Bl
cnR5QmFnKiogaGVhZGVyRmllbGRzKQogewotICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzSFRUUCgp
KTsKKyAgICBBU1NFUlQobV9yZXNwb25zZS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkp
OwogCiAgICAgaWYgKCFoZWFkZXJGaWVsZHMpCiAgICAgICAgIHJldHVybiBFX1BPSU5URVI7CkBA
IC0zNzMsNyArMzczLDcgQEAgSFJFU1VMVCBXZWJVUkxSZXNwb25zZTo6YWxsSGVhZGVyRmllbGRz
KF9DT01fT3V0cHRyX29wdF8gSVByb3BlcnR5QmFnKiogaGVhZGVyRmkKIAogSFJFU1VMVCBXZWJV
UkxSZXNwb25zZTo6bG9jYWxpemVkU3RyaW5nRm9yU3RhdHVzQ29kZShpbnQgc3RhdHVzQ29kZSwg
X19kZXJlZl9vcHRfb3V0IEJTVFIqIHN0YXR1c1N0cmluZykKIHsKLSAgICBBU1NFUlQobV9yZXNw
b25zZS5pc0hUVFAoKSk7CisgICAgQVNTRVJUKG1fcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJc0lu
SFRUUEZhbWlseSgpKTsKICAgICBpZiAoIXN0YXR1c1N0cmluZykKICAgICAgICAgcmV0dXJuIEVf
UE9JTlRFUjsKIApAQCAtMzg3LDcgKzM4Nyw3IEBAIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6Omxv
Y2FsaXplZFN0cmluZ0ZvclN0YXR1c0NvZGUoaW50IHN0YXR1c0NvZGUsIF9fZGVyZWZfb3B0CiAK
IEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6OnN0YXR1c0NvZGUoX091dF8gaW50KiBzdGF0dXNDb2Rl
KQogewotICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzSFRUUCgpKTsKKyAgICBBU1NFUlQobV9yZXNw
b25zZS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpOwogICAgIGlmIChzdGF0dXNDb2Rl
KQogICAgICAgICAqc3RhdHVzQ29kZSA9IG1fcmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKTsKICAg
ICByZXR1cm4gU19PSzsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400660</attachid>
            <date>2020-05-30 03:08:22 -0700</date>
            <delta_ts>2020-05-30 03:10:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208782-20200530120820.patch</filename>
            <type>text/plain</type>
            <size>20297</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEyMjkzM2JiNThkNTNj
NTVlMjY1NTQzNDY3OTliZGEyNTM2ZmZkNS4uODViZjEyNjZlMzgzYjExYWUwMzNlODU2YmJlZTQz
YjM0NmFhZDc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA1LTMwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlc291cmNlUmVzcG9u
c2VCYXNlOjppc0hUVFAgdG8gaXNJbkhUVFBGYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHRoZSBjb21tZW50IHNheXMsIHRoZSBtZXRob2Qg
bmFtZSBpcyBtaXNsZWFkaW5nIGFuZCB0aGUgbWV0aG9kCisgICAgICAgIGlzIGluY29uc2lzdGVu
dCB3aXRoIHRoZSBBUEkgb2YgUmVzb3VyY2VSZXF1ZXN0QmFzZSwgc28gcmVuYW1lIGl0CisgICAg
ICAgIHRvIG1ha2UgaXQgY2xlYXIgdGhlIG1ldGhvZCBjYW4gYmUgdXNlZCBmb3IgYm90aCBodHRw
IGFuZCBodHRwcworICAgICAgICBwcm90b2NvbHMuCisKKyAgICAgICAgTm8gdGVzdHMgc2luY2Ug
bm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjb250aW51ZUFmdGVyQ29u
dGVudFBvbGljeSk6CisgICAgICAgICogbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRS
ZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNw
b25zZUJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZUJhc2U6Omlz
SW5IVFRQRmFtaWx5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VC
YXNlOjppc0hUVFAgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv
UmVzb3VyY2VSZXNwb25zZUJhc2UuaDoKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlTUlNRVR5cGUgY29u
c3QpOgorICAgICAgICAqIHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OmV4dGVybmFsRW50aXR5TWltZVR5cGVBbGxvd2VkKToKKwogMjAy
MC0wNS0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAg
ICBmb3Itb2Ygc2hvdWxkIGNoZWNrIHRoZSBpdGVyYWJsZSBpcyBhIEpTQXJyYXkgZm9yIEZhc3RB
cnJheSBpbiBERkcgaXRlcmF0b3Jfb3BlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu
Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkNGRkODIyYWJiNWU4NjkyNTBj
ZGU4NjgxYjEyMDM1MjczZDViMjFiLi44YjNhOTc5Njk0ODk2YzgwZGY1YmE0MTAxZTgyNGFiYWZi
NDUzMmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA1LTMwICBSb2IgQnVpcyAg
PHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlc291cmNlUmVzcG9uc2VCYXNl
Ojppc0hUVFAgdG8gaXNJbkhUVFBGYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAgKiBOZXR3
b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3
b3JrQ2FjaGU6Om1ha2VTdG9yZURlY2lzaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdp
bnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmJ1aWxkSFRUUEhlYWRlcnMpOgor
CiAyMDIwLTA1LTI4ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAK
ICAgICAgICAgRG8gbm90IHNlbmQgYSBzZWNvbmQgc3luYyByZXF1ZXN0IGZvciBwb3NpdGl0aW9u
IGluZm9ybWF0aW9uIHRvIHRoZSB3ZWIgcHJvY2VzcyBpZiB3ZSBoYXZlIG5vdCByZWNpZXZlZCBp
bmZvcm1hdGlvbiBzaW5jZSB0aGUgcHJldmlvdXMgc3luYyByZXF1ZXN0LgpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS93
aW4vQ2hhbmdlTG9nCmluZGV4IDMzZGVjOGQyN2Q2NWNkMGRmOWFhMTRiYjVhOTMyNzdjODljZTNj
ZTEuLmI0YTJmNzFjYTM2ZTEwMzhkZmZhMjE1ZGU4YmRjNmZkNTNlZjgwMjUgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0wNS0zMCAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmFtZSBSZXNvdXJjZVJlc3BvbnNlQmFz
ZTo6aXNIVFRQIHRvIGlzSW5IVFRQRmFtaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAg
KiBQbHVnaW5zL1BsdWdpblN0cmVhbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5TdHJl
YW06OnN0YXJ0U3RyZWFtKToKKyAgICAgICAgKiBXZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAg
IChXZWJVUkxSZXNwb25zZTo6UXVlcnlJbnRlcmZhY2UpOgorICAgICAgICAoV2ViVVJMUmVzcG9u
c2U6OmFsbEhlYWRlckZpZWxkcyk6CisgICAgICAgIChXZWJVUkxSZXNwb25zZTo6bG9jYWxpemVk
U3RyaW5nRm9yU3RhdHVzQ29kZSk6CisgICAgICAgIChXZWJVUkxSZXNwb25zZTo6c3RhdHVzQ29k
ZSk6CisKIDIwMjAtMDUtMTkgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j
b20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBBU1NFUlQobV9lZ2xEaXNwbGF5ID09IEVHTF9OT19E
SVNQTEFZKSBmYWlscyBpbiB+UGxhdGZvcm1EaXNwbGF5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv
RG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDE2NzBlYmQzYmZhOGQ0YmJhNjJjNjRlMGI4ZDE4ZDM4
MGMxMGJhYTYuLmU0MTI0MWFkMTE1ZDZhMWFlOTkzOWIyNDg3MTBjYjljZDdmMmVkNGYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtMTAwNCw3ICsxMDA0LDcg
QEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5
QWN0aW9uIHBvbGljeSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChtX3Jlc3Bv
bnNlLmlzSFRUUCgpKSB7CisgICAgaWYgKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkgewog
ICAgICAgICBpbnQgc3RhdHVzID0gbV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpOyAvLyBTdGF0
dXMgbWF5IGJlIHplcm8gd2hlbiBsb2FkaW5nIHN1YnN0aXR1dGUgZGF0YSwgaW4gcGFydGljdWxh
ciBmcm9tIGEgV2ViQXJjaGl2ZS4KICAgICAgICAgaWYgKHN0YXR1cyAmJiAoc3RhdHVzIDwgMjAw
IHx8IHN0YXR1cyA+PSAzMDApKSB7CiAgICAgICAgICAgICBib29sIGhvc3RlZEJ5T2JqZWN0ID0g
ZnJhbWVMb2FkZXIoKS0+aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCmluZGV4IDk1
ZTEwNWJlYjg0YmVhMDIxMzMzMGQyZTMyYmZiNDc4ZDRlN2JiYzguLmYzOWVhMjlkNmRlMGIzNGUw
MTYyZWU5OThmYzRmNjQ4ZmRhZjRiYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcApAQCAtMTI2LDcgKzEyNiw3IEBAIHZv
aWQgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBS
ZXNvdXJjZVJlc3BvbnNlJiByZXNwCiAgICAgICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgICAg
ICByZXR1cm47CiAKLSAgICAgICAgaWYgKCFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYg
KCFyZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg
ICAgIGlmIChtX2NsaWVudC0+d2FudHNBbGxTdHJlYW1zKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCmluZGV4
IDAxZDNkZGNlODQ1ZmM3NzEzNzFiN2JhNmYzMjIzOGMyMWU3ZTcyN2IuLmNiYzY1NzBiOGUxNmFh
MmMxZjA1NGU3MGQwYmM3Yzg3ZmU5NTEwNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCkBAIC0xOTQsOCAr
MTk0LDcgQEAgUmVzb3VyY2VSZXNwb25zZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6ZmlsdGVyKGNv
bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLAogICAgIHJldHVybiBmaWx0ZXJlZFJlc3Bv
bnNlOwogfQogCi0vLyBGSVhNRTogTmFtZSBkb2VzIG5vdCBtYWtlIGl0IGNsZWFyIHRoaXMgaXMg
dHJ1ZSBmb3IgSFRUUFMhCi1ib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjppc0hUVFAoKSBjb25z
dAorYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6aXNJbkhUVFBGYW1pbHkoKSBjb25zdAogewog
ICAgIGxhenlJbml0KENvbW1vbkZpZWxkc09ubHkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggZTMyMThm
OGU5MGI5MmI5MjA4Y2ZhOTZjMDk4NWQ4ZDA0ZGYzZTVmNy4uZDFiMzdiNjA4NWI4ZDFkOTlkMzVj
MWEyOWFlMGIzN2QyZTAyOTgwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaApAQCAtODMsNyArODMsNyBAQCBwdWJs
aWM6CiAgICAgc3RhdGljIFJlc291cmNlUmVzcG9uc2UgZnJvbUNyb3NzVGhyZWFkRGF0YShDcm9z
c1RocmVhZERhdGEmJik7CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNO
dWxsOyB9Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0hUVFAoKSBjb25zdDsKKyAgICBXRUJD
T1JFX0VYUE9SVCBib29sIGlzSW5IVFRQRmFtaWx5KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBP
UlQgYm9vbCBpc1N1Y2Nlc3NmdWwoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0
IFVSTCYgdXJsKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0
cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRl
eCAxZGZhMDI1OWRkNDc4NjBkNDk2ZjU5OTYwNWU2N2MwYWM3NDJlMGRjLi5jOTYxOTc0NTA3NDlh
ODdhNDQyZjQ3OWYwZmVhNmEwNTA0MzcyNGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94
bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx
dWVzdC5jcHAKQEAgLTE3OCw3ICsxNzgsNyBAQCBFeGNlcHRpb25PcjxEb2N1bWVudCo+IFhNTEh0
dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpCiAKICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJlcXVp
cmVzIHRoZSBmaW5hbCBNSU1FIHR5cGUgdG8gYmUgc29tZSB2YWxpZCBYTUwgdHlwZSwgb3IgdGV4
dC9odG1sLgogICAgICAgICAvLyBJZiBpdCBpcyB0ZXh0L2h0bWwsIHRoZW4gdGhlIHJlc3BvbnNl
VHlwZSBvZiAiZG9jdW1lbnQiIG11c3QgaGF2ZSBiZWVuIHN1cHBsaWVkIGV4cGxpY2l0bHkuCi0g
ICAgICAgIGlmICgobV9yZXNwb25zZS5pc0hUVFAoKSAmJiAhcmVzcG9uc2VJc1hNTCgpICYmICFp
c0hUTUwpCisgICAgICAgIGlmICgobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpICYmICFyZXNw
b25zZUlzWE1MKCkgJiYgIWlzSFRNTCkKICAgICAgICAgICAgIHx8IChpc0hUTUwgJiYgcmVzcG9u
c2VUeXBlKCkgPT0gUmVzcG9uc2VUeXBlOjpFbXB0eVN0cmluZykpIHsKICAgICAgICAgICAgIG1f
cmVzcG9uc2VEb2N1bWVudCA9IG51bGxwdHI7CiAgICAgICAgIH0gZWxzZSB7CkBAIC04NTQsNyAr
ODU0LDcgQEAgU3RyaW5nIFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZU1JTUVUeXBlKCkgY29uc3QK
ICAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIFNhbWUgbG9naWMgYXMg
ZXh0ZXJuYWxFbnRpdHlNaW1lVHlwZUFsbG93ZWQoKSBpbiBYTUxEb2N1bWVudFBhcnNlckxpYnht
bDIuY3BwLiBLZWVwIHRoZW0gaW4gc3luYy4KICAgICAgICAgU3RyaW5nIGNvbnRlbnRUeXBlOwot
ICAgICAgICBpZiAobV9yZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYgKG1fcmVzcG9uc2Uu
aXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgICAgIGNvbnRlbnRUeXBlID0gbV9yZXNwb25zZS5o
dHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRUeXBlKTsKICAgICAgICAgZWxz
ZQogICAgICAgICAgICAgY29udGVudFR5cGUgPSBtX3Jlc3BvbnNlLm1pbWVUeXBlKCk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyTGlieG1s
Mi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyTGlieG1s
Mi5jcHAKaW5kZXggMmUwMjE3YmNjM2I3ZTE4ZTVhODk3NjAwYmYwM2UyYzI4ZjgwYjhmZi4uNWZi
YzdhMDc5NGM0N2JkYWRkZmZiNTRjMzQxM2IyNzJhNDZmY2QwZCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcApAQCAt
Mzg2LDcgKzM4Niw3IEBAIHN0YXRpYyBib29sIGV4dGVybmFsRW50aXR5TWltZVR5cGVBbGxvd2Vk
KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogICAgIFN0cmluZyBtaW1lVHlwZSA9
IGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5cGUoY29udGVudFR5cGUpOwogICAgIGlmIChtaW1l
VHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gU2FtZSBsb2dpYyBhcyBYTUxIdHRwUmVxdWVz
dDo6cmVzcG9uc2VNSU1FVHlwZSgpLiBLZWVwIHRoZW0gaW4gc3luYy4KLSAgICAgICAgaWYgKHJl
c3BvbnNlLmlzSFRUUCgpKQorICAgICAgICBpZiAocmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkK
ICAgICAgICAgICAgIG1pbWVUeXBlID0gY29udGVudFR5cGU7CiAgICAgICAgIGVsc2UKICAgICAg
ICAgICAgIG1pbWVUeXBlID0gcmVzcG9uc2UubWltZVR5cGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcCBiL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAppbmRleCA1M2MyNmI1
YzM4ZmFjYzUxZDBjZjM0YWU1MjViYjQyNjc5MzdkNWIxLi42NGNkNGJjZDE2MTY3YzZlMmJlODll
MmRiYzU5NzIyZWM1YTNmNmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j
ZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC0yNjUsNyArMjY1LDcgQEAgc3RhdGljIGJv
b2wgaXNNZWRpYU1JTUVUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIAogc3RhdGljIFN0b3JlRGVj
aXNpb24gbWFrZVN0b3JlRGVjaXNpb24oY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBv
cmlnaW5hbFJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl
LCBzaXplX3QgYm9keVNpemUpCiB7Ci0gICAgaWYgKCFvcmlnaW5hbFJlcXVlc3QudXJsKCkucHJv
dG9jb2xJc0luSFRUUEZhbWlseSgpIHx8ICFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICBpZiAoIW9y
aWdpbmFsUmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgfHwgIXJlc3BvbnNl
LmlzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgIHJldHVybiBTdG9yZURlY2lzaW9uOjpOb0R1ZVRv
UHJvdG9jb2w7CiAKICAgICBpZiAob3JpZ2luYWxSZXF1ZXN0Lmh0dHBNZXRob2QoKSAhPSAiR0VU
IikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp
ZXcuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAK
aW5kZXggOTU3NjQ2ZTFiNWUyMjAyZjkyOWYzY2VkMDQ3NGNmZGRjM2NhNWZmMi4uYTIwMzg0ZGRj
ZjUzYWUxODViMTVhNjMxMDFiNmI0M2VmMjM4ZDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTE5MCw3ICsxOTAsNyBAQCB2b2lk
IFBsdWdpblZpZXc6OlN0cmVhbTo6Y29udGludWVMb2FkKCkKIAogc3RhdGljIFN0cmluZyBidWls
ZEhUVFBIZWFkZXJzKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBsb25nIGxvbmcm
IGV4cGVjdGVkQ29udGVudExlbmd0aCkKIHsKLSAgICBpZiAoIXJlc3BvbnNlLmlzSFRUUCgpKQor
ICAgIGlmICghcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIFN0cmlu
ZygpOwogCiAgICAgU3RyaW5nQnVpbGRlciBoZWFkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9QbHVnaW5zL1BsdWdpblN0cmVhbS5jcHAKaW5kZXggYzgwZTcwNDQ1N2MwOGRjZTg2
NTA0YTU5ZDI1OGI0ZmNmMmJhZDA0NS4uYjQ1NTY4NDZjOWNjZjYwZGQ3ZDQxN2Y2NzhlM2Y3ODJl
ZjRmYmU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVn
aW5TdHJlYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2lu
U3RyZWFtLmNwcApAQCAtMTUyLDcgKzE1Miw3IEBAIHZvaWQgUGx1Z2luU3RyZWFtOjpzdGFydFN0
cmVhbSgpCiAKICAgICBsb25nIGxvbmcgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gbV9yZXNvdXJj
ZVJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpOwogCi0gICAgaWYgKG1fcmVzb3VyY2VS
ZXNwb25zZS5pc0hUVFAoKSkgeworICAgIGlmIChtX3Jlc291cmNlUmVzcG9uc2UuaXNJbkhUVFBG
YW1pbHkoKSkgewogICAgICAgICBTdHJpbmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CiAgICAgICAg
IFN0cmluZyBzZXBhcmF0b3IgPSAiOiAiX3M7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYlVSTFJlc3BvbnNlLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dl
YlVSTFJlc3BvbnNlLmNwcAppbmRleCA1NjliOTgyNjRiNDViODg3OGI1ODcyYzMzMTJmZTEzODQy
YzUyMGM3Li5hODBkZWJkYWRhNzJlMThmYTExOWYwZWEwOTcwOGJjOWMxYWUxMjczIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJVUkxSZXNwb25zZS5jcHAKKysrIGIvU291
cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVVJMUmVzcG9uc2UuY3BwCkBAIC0yNjAsNyArMjYwLDcg
QEAgSFJFU1VMVCBXZWJVUkxSZXNwb25zZTo6UXVlcnlJbnRlcmZhY2UoX0luXyBSRUZJSUQgcmlp
ZCwgX0NPTV9PdXRwdHJfIHZvaWQqKiBwcHYKICAgICAgICAgKnBwdk9iamVjdCA9IHN0YXRpY19j
YXN0PElXZWJVUkxSZXNwb25zZSo+KHRoaXMpOwogICAgIGVsc2UgaWYgKElzRXF1YWxHVUlEKHJp
aWQsIElJRF9JV2ViVVJMUmVzcG9uc2VQcml2YXRlKSkKICAgICAgICAgKnBwdk9iamVjdCA9IHN0
YXRpY19jYXN0PElXZWJVUkxSZXNwb25zZVByaXZhdGUqPih0aGlzKTsKLSAgICBlbHNlIGlmICht
X3Jlc3BvbnNlLmlzSFRUUCgpICYmIElzRXF1YWxHVUlEKHJpaWQsIElJRF9JV2ViSFRUUFVSTFJl
c3BvbnNlKSkKKyAgICBlbHNlIGlmIChtX3Jlc3BvbnNlLmlzSW5IVFRQRmFtaWx5KCkgJiYgSXNF
cXVhbEdVSUQocmlpZCwgSUlEX0lXZWJIVFRQVVJMUmVzcG9uc2UpKQogICAgICAgICAqcHB2T2Jq
ZWN0ID0gc3RhdGljX2Nhc3Q8SVdlYkhUVFBVUkxSZXNwb25zZSo+KHRoaXMpOwogICAgIGVsc2UK
ICAgICAgICAgcmV0dXJuIEVfTk9JTlRFUkZBQ0U7CkBAIC0zNTgsNyArMzU4LDcgQEAgSFJFU1VM
VCBXZWJVUkxSZXNwb25zZTo6VVJMKF9fZGVyZWZfb3B0X291dCBCU1RSKiByZXN1bHQpCiAKIEhS
RVNVTFQgV2ViVVJMUmVzcG9uc2U6OmFsbEhlYWRlckZpZWxkcyhfQ09NX091dHB0cl9vcHRfIElQ
cm9wZXJ0eUJhZyoqIGhlYWRlckZpZWxkcykKIHsKLSAgICBBU1NFUlQobV9yZXNwb25zZS5pc0hU
VFAoKSk7CisgICAgQVNTRVJUKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSk7CiAKICAgICBp
ZiAoIWhlYWRlckZpZWxkcykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKQEAgLTM3Myw3ICsz
NzMsNyBAQCBIUkVTVUxUIFdlYlVSTFJlc3BvbnNlOjphbGxIZWFkZXJGaWVsZHMoX0NPTV9PdXRw
dHJfb3B0XyBJUHJvcGVydHlCYWcqKiBoZWFkZXJGaQogCiBIUkVTVUxUIFdlYlVSTFJlc3BvbnNl
Ojpsb2NhbGl6ZWRTdHJpbmdGb3JTdGF0dXNDb2RlKGludCBzdGF0dXNDb2RlLCBfX2RlcmVmX29w
dF9vdXQgQlNUUiogc3RhdHVzU3RyaW5nKQogewotICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzSFRU
UCgpKTsKKyAgICBBU1NFUlQobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKTsKICAgICBpZiAo
IXN0YXR1c1N0cmluZykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKIApAQCAtMzg3LDcgKzM4
Nyw3IEBAIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6OmxvY2FsaXplZFN0cmluZ0ZvclN0YXR1c0Nv
ZGUoaW50IHN0YXR1c0NvZGUsIF9fZGVyZWZfb3B0CiAKIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6
OnN0YXR1c0NvZGUoX091dF8gaW50KiBzdGF0dXNDb2RlKQogewotICAgIEFTU0VSVChtX3Jlc3Bv
bnNlLmlzSFRUUCgpKTsKKyAgICBBU1NFUlQobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKTsK
ICAgICBpZiAoc3RhdHVzQ29kZSkKICAgICAgICAgKnN0YXR1c0NvZGUgPSBtX3Jlc3BvbnNlLmh0
dHBTdGF0dXNDb2RlKCk7CiAgICAgcmV0dXJuIFNfT0s7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3Vy
Y2VzLXdpdGgtMHgwMC1pbi1oZWFkZXIud2luZG93LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvaDEtcGFyc2luZy9yZXNvdXJj
ZXMtd2l0aC0weDAwLWluLWhlYWRlci53aW5kb3ctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZl
ZWMwODdjYzdkN2QwZGM0MjE5MzA5MzVkODFjMTBlZjUwODk5YWUKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBh
cnNpbmcvcmVzb3VyY2VzLXdpdGgtMHgwMC1pbi1oZWFkZXIud2luZG93LWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDUgQEAKKworUEFTUyBFeHBlY3QgbmV0d29yayBlcnJvciBmb3Igc2NyaXB0IHdp
dGggMHgwMCBpbiBhIGhlYWRlciAKK0ZBSUwgRXhwZWN0IG5ldHdvcmsgZXJyb3IgZm9yIGZyYW1l
IG5hdmlnYXRpb24gdG8gcmVzb3VyY2Ugd2l0aCAweDAwIGluIGEgaGVhZGVyIGFzc2VydF9lcXVh
bHM6IGV4cGVjdGVkIG51bGwgYnV0IGdvdCBEb2N1bWVudCBub2RlIHdpdGggMSBjaGlsZAorUEFT
UyBFeHBlY3QgbmV0d29yayBlcnJvciBmb3IgaW1hZ2Ugd2l0aCAweDAwIGluIGEgaGVhZGVyIAor
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzLXdpdGgtMHgwMC1pbi1oZWFkZXIud2luZG93Lmh0
bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gx
LXBhcnNpbmcvcmVzb3VyY2VzLXdpdGgtMHgwMC1pbi1oZWFkZXIud2luZG93Lmh0bWwKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uMjM4MjkxMzUyOGU2OTNiM2E1ZDU2YzY2MGE0NTA2MDk4MGI1NDhjMwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0
Y2gvaDEtcGFyc2luZy9yZXNvdXJjZXMtd2l0aC0weDAwLWluLWhlYWRlci53aW5kb3cuaHRtbApA
QCAtMCwwICsxIEBACis8IS0tIFRoaXMgZmlsZSBpcyByZXF1aXJlZCBmb3IgV2ViS2l0IHRlc3Qg
aW5mcmFzdHJ1Y3R1cmUgdG8gcnVuIHRoZSB0ZW1wbGF0ZWQgdGVzdCAtLT4KXCBObyBuZXdsaW5l
IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzLXdpdGgtMHgwMC1pbi1o
ZWFkZXIud2luZG93LmpzIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy13aXRoLTB4MDAtaW4taGVhZGVyLndpbmRv
dy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi5lNmI4NGZjMWI3OWFmNDY3NmEzNTA4ZTdhNGY5ZGY5OTMyMjcxYzU4
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy13aXRoLTB4MDAtaW4taGVhZGVyLndp
bmRvdy5qcwpAQCAtMCwwICsxLDMxIEBACithc3luY190ZXN0KHQgPT4geworICBjb25zdCBzY3Jp
cHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzY3JpcHQiKTsKKyAgdC5hZGRfY2xlYW51cCgo
KSA9PiBzY3JpcHQucmVtb3ZlKCkpOworICBzY3JpcHQuc3JjID0gInJlc291cmNlcy9zY3JpcHQt
d2l0aC0weDAwLWluLWhlYWRlci5weSI7CisgIHNjcmlwdC5vbmVycm9yID0gdC5zdGVwX2Z1bmNf
ZG9uZSgpOworICBzY3JpcHQub25sb2FkID0gdC51bnJlYWNoZWRfZnVuYygpOworICBkb2N1bWVu
dC5ib2R5LmFwcGVuZChzY3JpcHQpOworfSwgIkV4cGVjdCBuZXR3b3JrIGVycm9yIGZvciBzY3Jp
cHQgd2l0aCAweDAwIGluIGEgaGVhZGVyIik7CisKK2FzeW5jX3Rlc3QodCA9PiB7CisgIGNvbnN0
IGZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CisgIHQuYWRkX2NsZWFu
dXAoKCkgPT4gZnJhbWUucmVtb3ZlKCkpOworICBmcmFtZS5zcmMgPSAicmVzb3VyY2VzL2RvY3Vt
ZW50LXdpdGgtMHgwMC1pbi1oZWFkZXIucHkiOworICAvLyBJZiBuZXR3b3JrIGVycm9ycyByZXN1
bHQgaW4gbG9hZCBldmVudHMgZm9yIGZyYW1lcyBwZXIKKyAgLy8gaHR0cHM6Ly9naXRodWIuY29t
L3doYXR3Zy9odG1sL2lzc3Vlcy8xMjUgYW5kIGh0dHBzOi8vZ2l0aHViLmNvbS93aGF0d2cvaHRt
bC9pc3N1ZXMvMTIzMCB0aGlzCisgIC8vIHNob3VsZCBiZSBjaGFuZ2VkIHRvIHVzZSB0aGUgbG9h
ZCBldmVudCBpbnN0ZWFkLgorICB0LnN0ZXBfdGltZW91dCgoKSA9PiB7CisgICAgYXNzZXJ0X2Vx
dWFscyhmcmFtZS5jb250ZW50RG9jdW1lbnQsIG51bGwpOworICAgIHQuZG9uZSgpOworICB9LCAy
MDAwKTsKKyAgZG9jdW1lbnQuYm9keS5hcHBlbmQoZnJhbWUpOworfSwgIkV4cGVjdCBuZXR3b3Jr
IGVycm9yIGZvciBmcmFtZSBuYXZpZ2F0aW9uIHRvIHJlc291cmNlIHdpdGggMHgwMCBpbiBhIGhl
YWRlciIpOworCithc3luY190ZXN0KHQgPT4geworICBjb25zdCBpbWcgPSBkb2N1bWVudC5jcmVh
dGVFbGVtZW50KCJpbWciKTsKKyAgdC5hZGRfY2xlYW51cCgoKSA9PiBpbWcucmVtb3ZlKCkpOwor
ICBpbWcuc3JjID0gInJlc291cmNlcy9ibHVlLXdpdGgtMHgwMC1pbi1hLWhlYWRlci5hc2lzIjsK
KyAgaW1nLm9uZXJyb3IgPSB0LnN0ZXBfZnVuY19kb25lKCk7CisgIGltZy5vbmxvYWQgPSB0LnVu
cmVhY2hlZF9mdW5jKCk7CisgIGRvY3VtZW50LmJvZHkuYXBwZW5kKGltZyk7Cit9LCAiRXhwZWN0
IG5ldHdvcmsgZXJyb3IgZm9yIGltYWdlIHdpdGggMHgwMCBpbiBhIGhlYWRlciIpOwpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9o
MS1wYXJzaW5nL3Jlc291cmNlcy9SRUFETUUubWQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL1JFQURNRS5tZApu
ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwLi4yMTc1ZDI3NDA4OGJkYWViMmVlNjM2NzY1Y2MzMWEyZmE2ZjNiMTMyCi0tLSAv
ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy9SRUFETUUubWQKQEAgLTAsMCArMSw2IEBACitg
Ymx1ZS13aXRoLTB4MDAtaW4tYS1oZWFkZXIuYXNpc2AgaXMgYSBjb3B5IGZyb20gYC4uLy4uL2lt
YWdlcy9ibHVlLnBuZ2Agd2l0aCB0aGUgZm9sbG93aW5nIHByZXBlbmRlZCB1c2luZyBDb250cm9s
IFBpY3R1cmVzIHRvIHNpZ25pZnkgYWN0dWFsIG5ld2xpbmVzIGFuZCAweDAwOgorYGBgCitIVFRQ
LzEuMSAyMDAgQU4gSU1BR0XikI3ikIoKK0NvbnRlbnQtVHlwZTogaW1hZ2UvcG5n4pCN4pCKCitD
dXN0b206IOKQgOKQjeKQiuKQjeKQigorYGBgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL2Js
dWUtd2l0aC0weDAwLWluLWEtaGVhZGVyLmFzaXMgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL2JsdWUtd2l0aC0w
eDAwLWluLWEtaGVhZGVyLmFzaXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTAyMzQwYTYzMTNmZWI3NWMxY2FkN2Yx
NWI0ZDVhMzFlOWM2NzU2OApHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgNTQ2CnpjbWVZVzI/QHxR
KUg3NXRHQjhrWl5pJU5rYiMhOy08I051P0RAbn5PKEc5NkFOVlFWUCV1UCZCKWkyMFAyVEdJewp6
bSpuU0tES1BNSUBwNSRyX19fMFBOcFVlU0Z6fFlNeEM4O3xSdl55ZVU7Pmh8dDV8Si02a35DYXlB
IzhAYjIyWjEKejlGfXhQVXE9UnBqczR0ejU/TyhLJkh8NmZWZz80aiF5d0ZmSmJ5KEJQKHppY2ko
XlBkK31xMkp5YktJSCU/RXkmCnpANGZrOygzNGZiV0JjNXhKVEVSOVUwNzVZVypmeThXJTYmS2Ap
UDtuV0E8TSVCcmA3bFhxVkd2KXxMOHlWUjdtTAp6KlQ/Y3pUWD9vKXtCaUR8KStwOW41N3pYTmVe
ZThgZktYLVRTOW8oekArYGxDQXV3dGZKWURAPCk7VDNLMFJTLWAKQi10cXRkCgpsaXRlcmFsIDAK
SGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL2RvY3VtZW50LXdpdGgtMHgw
MC1pbi1oZWFkZXIucHkgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL2RvY3VtZW50LXdpdGgtMHgwMC1pbi1oZWFk
ZXIucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uNmU4ZGI2MTk1OTEwZWY0Yzg1ZGNlZDhiMjQ1NDFlY2RlODNjNTQw
NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvZmV0Y2gvaDEtcGFyc2luZy9yZXNvdXJjZXMvZG9jdW1lbnQtd2l0aC0weDAwLWlu
LWhlYWRlci5weQpAQCAtMCwwICsxLDQgQEAKK2RlZiBtYWluKHJlcXVlc3QsIHJlc3BvbnNlKToK
KyAgICByZXNwb25zZS5oZWFkZXJzLnNldCgiQ29udGVudC1UeXBlIiwgInRleHQvaHRtbCIpCisg
ICAgcmVzcG9uc2UuaGVhZGVycy5zZXQoIkN1c3RvbSIsICJcMCIpCisgICAgcmV0dXJuICI8IWRv
Y3R5cGUgaHRtbD48Yj5UaGlzIGlzIGEgZG9jdW1lbnQuPC9iPiIKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvaDEtcGFyc2luZy9y
ZXNvdXJjZXMvc2NyaXB0LXdpdGgtMHgwMC1pbi1oZWFkZXIucHkgYi9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL3Nj
cmlwdC13aXRoLTB4MDAtaW4taGVhZGVyLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY0YTAxNmEzNjk4MzFlZTVk
Y2RiMzU2MzQ2OGNjZjhkZDBiMDk4MmIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2Vz
L3NjcmlwdC13aXRoLTB4MDAtaW4taGVhZGVyLnB5CkBAIC0wLDAgKzEsNCBAQAorZGVmIG1haW4o
cmVxdWVzdCwgcmVzcG9uc2UpOgorICAgIHJlc3BvbnNlLmhlYWRlcnMuc2V0KCJDb250ZW50LVR5
cGUiLCAidGV4dC9qYXZhc2NyaXB0IikKKyAgICByZXNwb25zZS5oZWFkZXJzLnNldCgiQ3VzdG9t
IiwgIlwwIikKKyAgICByZXR1cm4gInZhciB0aGlzSXNKYXZhU2NyaXB0ID0gMCIKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvaDEt
cGFyc2luZy9yZXNvdXJjZXMvdzNjLWltcG9ydC5sb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL3czYy1pbXBv
cnQubG9nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLjAyMjY3NjQzYTNiNzBkYTFlOWFlMjVkZWRjODIzMDkzOTgwMDgz
YzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvcmVzb3VyY2VzL3czYy1pbXBvcnQubG9nCkBAIC0w
LDAgKzEsMjAgQEAKK1RoZSB0ZXN0cyBpbiB0aGlzIGRpcmVjdG9yeSB3ZXJlIGltcG9ydGVkIGZy
b20gdGhlIFczQyByZXBvc2l0b3J5LgorRG8gTk9UIG1vZGlmeSB0aGVzZSB0ZXN0cyBkaXJlY3Rs
eSBpbiBXZWJLaXQuCitJbnN0ZWFkLCBjcmVhdGUgYSBwdWxsIHJlcXVlc3Qgb24gdGhlIFdQVCBn
aXRodWI6CisJaHR0cHM6Ly9naXRodWIuY29tL3dlYi1wbGF0Zm9ybS10ZXN0cy93cHQKKworVGhl
biBydW4gdGhlIFRvb2xzL1NjcmlwdHMvaW1wb3J0LXczYy10ZXN0cyBpbiBXZWJLaXQgdG8gcmVp
bXBvcnQKKworRG8gTk9UIG1vZGlmeSBvciByZW1vdmUgdGhpcyBmaWxlLgorCistLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0KK1Byb3BlcnRpZXMgcmVxdWlyaW5nIHZlbmRvciBwcmVmaXhlczoKK05vbmUKK1Byb3Bl
cnR5IHZhbHVlcyByZXF1aXJpbmcgdmVuZG9yIHByZWZpeGVzOgorTm9uZQorLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tCitMaXN0IG9mIGZpbGVzOgorL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvZmV0Y2gvaDEtcGFyc2luZy9yZXNvdXJjZXMvUkVBRE1FLm1kCisvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291
cmNlcy9ibHVlLXdpdGgtMHgwMC1pbi1hLWhlYWRlci5hc2lzCisvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy9kb2N1
bWVudC13aXRoLTB4MDAtaW4taGVhZGVyLnB5CisvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy9zY3JpcHQtd2l0aC0w
eDAwLWluLWhlYWRlci5weQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3czYy1pbXBvcnQubG9nIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3cz
Yy1pbXBvcnQubG9nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRiNzczYTIyMzRkZTRjZjFiOWU2NDg1NmEzNjQ5YTJm
NWUzZTczMGYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2ZldGNoL2gxLXBhcnNpbmcvdzNjLWltcG9ydC5sb2cKQEAgLTAsMCAr
MSwxNyBAQAorVGhlIHRlc3RzIGluIHRoaXMgZGlyZWN0b3J5IHdlcmUgaW1wb3J0ZWQgZnJvbSB0
aGUgVzNDIHJlcG9zaXRvcnkuCitEbyBOT1QgbW9kaWZ5IHRoZXNlIHRlc3RzIGRpcmVjdGx5IGlu
IFdlYktpdC4KK0luc3RlYWQsIGNyZWF0ZSBhIHB1bGwgcmVxdWVzdCBvbiB0aGUgV1BUIGdpdGh1
YjoKKwlodHRwczovL2dpdGh1Yi5jb20vd2ViLXBsYXRmb3JtLXRlc3RzL3dwdAorCitUaGVuIHJ1
biB0aGUgVG9vbHMvU2NyaXB0cy9pbXBvcnQtdzNjLXRlc3RzIGluIFdlYktpdCB0byByZWltcG9y
dAorCitEbyBOT1QgbW9kaWZ5IG9yIHJlbW92ZSB0aGlzIGZpbGUuCisKKy0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LQorUHJvcGVydGllcyByZXF1aXJpbmcgdmVuZG9yIHByZWZpeGVzOgorTm9uZQorUHJvcGVydHkg
dmFsdWVzIHJlcXVpcmluZyB2ZW5kb3IgcHJlZml4ZXM6CitOb25lCistLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K
K0xpc3Qgb2YgZmlsZXM6CisvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9mZXRjaC9oMS1wYXJzaW5nL3Jlc291cmNlcy13aXRoLTB4MDAtaW4taGVhZGVyLndpbmRv
dy5qcwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400661</attachid>
            <date>2020-05-30 03:10:12 -0700</date>
            <delta_ts>2020-06-01 01:27:39 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208782-20200530121009.patch</filename>
            <type>text/plain</type>
            <size>12061</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEyMjkzM2JiNThkNTNj
NTVlMjY1NTQzNDY3OTliZGEyNTM2ZmZkNS4uODViZjEyNjZlMzgzYjExYWUwMzNlODU2YmJlZTQz
YjM0NmFhZDc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA1LTMwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlc291cmNlUmVzcG9u
c2VCYXNlOjppc0hUVFAgdG8gaXNJbkhUVFBGYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHRoZSBjb21tZW50IHNheXMsIHRoZSBtZXRob2Qg
bmFtZSBpcyBtaXNsZWFkaW5nIGFuZCB0aGUgbWV0aG9kCisgICAgICAgIGlzIGluY29uc2lzdGVu
dCB3aXRoIHRoZSBBUEkgb2YgUmVzb3VyY2VSZXF1ZXN0QmFzZSwgc28gcmVuYW1lIGl0CisgICAg
ICAgIHRvIG1ha2UgaXQgY2xlYXIgdGhlIG1ldGhvZCBjYW4gYmUgdXNlZCBmb3IgYm90aCBodHRw
IGFuZCBodHRwcworICAgICAgICBwcm90b2NvbHMuCisKKyAgICAgICAgTm8gdGVzdHMgc2luY2Ug
bm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjb250aW51ZUFmdGVyQ29u
dGVudFBvbGljeSk6CisgICAgICAgICogbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRS
ZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNw
b25zZUJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZUJhc2U6Omlz
SW5IVFRQRmFtaWx5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VC
YXNlOjppc0hUVFAgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv
UmVzb3VyY2VSZXNwb25zZUJhc2UuaDoKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlTUlNRVR5cGUgY29u
c3QpOgorICAgICAgICAqIHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OmV4dGVybmFsRW50aXR5TWltZVR5cGVBbGxvd2VkKToKKwogMjAy
MC0wNS0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAg
ICBmb3Itb2Ygc2hvdWxkIGNoZWNrIHRoZSBpdGVyYWJsZSBpcyBhIEpTQXJyYXkgZm9yIEZhc3RB
cnJheSBpbiBERkcgaXRlcmF0b3Jfb3BlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu
Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkNGRkODIyYWJiNWU4NjkyNTBj
ZGU4NjgxYjEyMDM1MjczZDViMjFiLi44YjNhOTc5Njk0ODk2YzgwZGY1YmE0MTAxZTgyNGFiYWZi
NDUzMmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA1LTMwICBSb2IgQnVpcyAg
PHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlc291cmNlUmVzcG9uc2VCYXNl
Ojppc0hUVFAgdG8gaXNJbkhUVFBGYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAgKiBOZXR3
b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3
b3JrQ2FjaGU6Om1ha2VTdG9yZURlY2lzaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdp
bnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmJ1aWxkSFRUUEhlYWRlcnMpOgor
CiAyMDIwLTA1LTI4ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAK
ICAgICAgICAgRG8gbm90IHNlbmQgYSBzZWNvbmQgc3luYyByZXF1ZXN0IGZvciBwb3NpdGl0aW9u
IGluZm9ybWF0aW9uIHRvIHRoZSB3ZWIgcHJvY2VzcyBpZiB3ZSBoYXZlIG5vdCByZWNpZXZlZCBp
bmZvcm1hdGlvbiBzaW5jZSB0aGUgcHJldmlvdXMgc3luYyByZXF1ZXN0LgpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS93
aW4vQ2hhbmdlTG9nCmluZGV4IDMzZGVjOGQyN2Q2NWNkMGRmOWFhMTRiYjVhOTMyNzdjODljZTNj
ZTEuLmI0YTJmNzFjYTM2ZTEwMzhkZmZhMjE1ZGU4YmRjNmZkNTNlZjgwMjUgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0wNS0zMCAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmFtZSBSZXNvdXJjZVJlc3BvbnNlQmFz
ZTo6aXNIVFRQIHRvIGlzSW5IVFRQRmFtaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAg
KiBQbHVnaW5zL1BsdWdpblN0cmVhbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5TdHJl
YW06OnN0YXJ0U3RyZWFtKToKKyAgICAgICAgKiBXZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAg
IChXZWJVUkxSZXNwb25zZTo6UXVlcnlJbnRlcmZhY2UpOgorICAgICAgICAoV2ViVVJMUmVzcG9u
c2U6OmFsbEhlYWRlckZpZWxkcyk6CisgICAgICAgIChXZWJVUkxSZXNwb25zZTo6bG9jYWxpemVk
U3RyaW5nRm9yU3RhdHVzQ29kZSk6CisgICAgICAgIChXZWJVUkxSZXNwb25zZTo6c3RhdHVzQ29k
ZSk6CisKIDIwMjAtMDUtMTkgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j
b20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBBU1NFUlQobV9lZ2xEaXNwbGF5ID09IEVHTF9OT19E
SVNQTEFZKSBmYWlscyBpbiB+UGxhdGZvcm1EaXNwbGF5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv
RG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDE2NzBlYmQzYmZhOGQ0YmJhNjJjNjRlMGI4ZDE4ZDM4
MGMxMGJhYTYuLmU0MTI0MWFkMTE1ZDZhMWFlOTkzOWIyNDg3MTBjYjljZDdmMmVkNGYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtMTAwNCw3ICsxMDA0LDcg
QEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5
QWN0aW9uIHBvbGljeSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChtX3Jlc3Bv
bnNlLmlzSFRUUCgpKSB7CisgICAgaWYgKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkgewog
ICAgICAgICBpbnQgc3RhdHVzID0gbV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpOyAvLyBTdGF0
dXMgbWF5IGJlIHplcm8gd2hlbiBsb2FkaW5nIHN1YnN0aXR1dGUgZGF0YSwgaW4gcGFydGljdWxh
ciBmcm9tIGEgV2ViQXJjaGl2ZS4KICAgICAgICAgaWYgKHN0YXR1cyAmJiAoc3RhdHVzIDwgMjAw
IHx8IHN0YXR1cyA+PSAzMDApKSB7CiAgICAgICAgICAgICBib29sIGhvc3RlZEJ5T2JqZWN0ID0g
ZnJhbWVMb2FkZXIoKS0+aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCmluZGV4IDk1
ZTEwNWJlYjg0YmVhMDIxMzMzMGQyZTMyYmZiNDc4ZDRlN2JiYzguLmYzOWVhMjlkNmRlMGIzNGUw
MTYyZWU5OThmYzRmNjQ4ZmRhZjRiYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcApAQCAtMTI2LDcgKzEyNiw3IEBAIHZv
aWQgTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBS
ZXNvdXJjZVJlc3BvbnNlJiByZXNwCiAgICAgICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgICAg
ICByZXR1cm47CiAKLSAgICAgICAgaWYgKCFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYg
KCFyZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg
ICAgIGlmIChtX2NsaWVudC0+d2FudHNBbGxTdHJlYW1zKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCmluZGV4
IDAxZDNkZGNlODQ1ZmM3NzEzNzFiN2JhNmYzMjIzOGMyMWU3ZTcyN2IuLmNiYzY1NzBiOGUxNmFh
MmMxZjA1NGU3MGQwYmM3Yzg3ZmU5NTEwNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCkBAIC0xOTQsOCAr
MTk0LDcgQEAgUmVzb3VyY2VSZXNwb25zZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6ZmlsdGVyKGNv
bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLAogICAgIHJldHVybiBmaWx0ZXJlZFJlc3Bv
bnNlOwogfQogCi0vLyBGSVhNRTogTmFtZSBkb2VzIG5vdCBtYWtlIGl0IGNsZWFyIHRoaXMgaXMg
dHJ1ZSBmb3IgSFRUUFMhCi1ib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjppc0hUVFAoKSBjb25z
dAorYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6aXNJbkhUVFBGYW1pbHkoKSBjb25zdAogewog
ICAgIGxhenlJbml0KENvbW1vbkZpZWxkc09ubHkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggZTMyMThm
OGU5MGI5MmI5MjA4Y2ZhOTZjMDk4NWQ4ZDA0ZGYzZTVmNy4uZDFiMzdiNjA4NWI4ZDFkOTlkMzVj
MWEyOWFlMGIzN2QyZTAyOTgwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaApAQCAtODMsNyArODMsNyBAQCBwdWJs
aWM6CiAgICAgc3RhdGljIFJlc291cmNlUmVzcG9uc2UgZnJvbUNyb3NzVGhyZWFkRGF0YShDcm9z
c1RocmVhZERhdGEmJik7CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNO
dWxsOyB9Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0hUVFAoKSBjb25zdDsKKyAgICBXRUJD
T1JFX0VYUE9SVCBib29sIGlzSW5IVFRQRmFtaWx5KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBP
UlQgYm9vbCBpc1N1Y2Nlc3NmdWwoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0
IFVSTCYgdXJsKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0
cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRl
eCAxZGZhMDI1OWRkNDc4NjBkNDk2ZjU5OTYwNWU2N2MwYWM3NDJlMGRjLi5jOTYxOTc0NTA3NDlh
ODdhNDQyZjQ3OWYwZmVhNmEwNTA0MzcyNGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94
bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx
dWVzdC5jcHAKQEAgLTE3OCw3ICsxNzgsNyBAQCBFeGNlcHRpb25PcjxEb2N1bWVudCo+IFhNTEh0
dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpCiAKICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJlcXVp
cmVzIHRoZSBmaW5hbCBNSU1FIHR5cGUgdG8gYmUgc29tZSB2YWxpZCBYTUwgdHlwZSwgb3IgdGV4
dC9odG1sLgogICAgICAgICAvLyBJZiBpdCBpcyB0ZXh0L2h0bWwsIHRoZW4gdGhlIHJlc3BvbnNl
VHlwZSBvZiAiZG9jdW1lbnQiIG11c3QgaGF2ZSBiZWVuIHN1cHBsaWVkIGV4cGxpY2l0bHkuCi0g
ICAgICAgIGlmICgobV9yZXNwb25zZS5pc0hUVFAoKSAmJiAhcmVzcG9uc2VJc1hNTCgpICYmICFp
c0hUTUwpCisgICAgICAgIGlmICgobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpICYmICFyZXNw
b25zZUlzWE1MKCkgJiYgIWlzSFRNTCkKICAgICAgICAgICAgIHx8IChpc0hUTUwgJiYgcmVzcG9u
c2VUeXBlKCkgPT0gUmVzcG9uc2VUeXBlOjpFbXB0eVN0cmluZykpIHsKICAgICAgICAgICAgIG1f
cmVzcG9uc2VEb2N1bWVudCA9IG51bGxwdHI7CiAgICAgICAgIH0gZWxzZSB7CkBAIC04NTQsNyAr
ODU0LDcgQEAgU3RyaW5nIFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZU1JTUVUeXBlKCkgY29uc3QK
ICAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIFNhbWUgbG9naWMgYXMg
ZXh0ZXJuYWxFbnRpdHlNaW1lVHlwZUFsbG93ZWQoKSBpbiBYTUxEb2N1bWVudFBhcnNlckxpYnht
bDIuY3BwLiBLZWVwIHRoZW0gaW4gc3luYy4KICAgICAgICAgU3RyaW5nIGNvbnRlbnRUeXBlOwot
ICAgICAgICBpZiAobV9yZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYgKG1fcmVzcG9uc2Uu
aXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgICAgIGNvbnRlbnRUeXBlID0gbV9yZXNwb25zZS5o
dHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRUeXBlKTsKICAgICAgICAgZWxz
ZQogICAgICAgICAgICAgY29udGVudFR5cGUgPSBtX3Jlc3BvbnNlLm1pbWVUeXBlKCk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyTGlieG1s
Mi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyTGlieG1s
Mi5jcHAKaW5kZXggMmUwMjE3YmNjM2I3ZTE4ZTVhODk3NjAwYmYwM2UyYzI4ZjgwYjhmZi4uNWZi
YzdhMDc5NGM0N2JkYWRkZmZiNTRjMzQxM2IyNzJhNDZmY2QwZCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcApAQCAt
Mzg2LDcgKzM4Niw3IEBAIHN0YXRpYyBib29sIGV4dGVybmFsRW50aXR5TWltZVR5cGVBbGxvd2Vk
KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogICAgIFN0cmluZyBtaW1lVHlwZSA9
IGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5cGUoY29udGVudFR5cGUpOwogICAgIGlmIChtaW1l
VHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gU2FtZSBsb2dpYyBhcyBYTUxIdHRwUmVxdWVz
dDo6cmVzcG9uc2VNSU1FVHlwZSgpLiBLZWVwIHRoZW0gaW4gc3luYy4KLSAgICAgICAgaWYgKHJl
c3BvbnNlLmlzSFRUUCgpKQorICAgICAgICBpZiAocmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkK
ICAgICAgICAgICAgIG1pbWVUeXBlID0gY29udGVudFR5cGU7CiAgICAgICAgIGVsc2UKICAgICAg
ICAgICAgIG1pbWVUeXBlID0gcmVzcG9uc2UubWltZVR5cGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcCBiL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAppbmRleCA1M2MyNmI1
YzM4ZmFjYzUxZDBjZjM0YWU1MjViYjQyNjc5MzdkNWIxLi42NGNkNGJjZDE2MTY3YzZlMmJlODll
MmRiYzU5NzIyZWM1YTNmNmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j
ZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC0yNjUsNyArMjY1LDcgQEAgc3RhdGljIGJv
b2wgaXNNZWRpYU1JTUVUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIAogc3RhdGljIFN0b3JlRGVj
aXNpb24gbWFrZVN0b3JlRGVjaXNpb24oY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBv
cmlnaW5hbFJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl
LCBzaXplX3QgYm9keVNpemUpCiB7Ci0gICAgaWYgKCFvcmlnaW5hbFJlcXVlc3QudXJsKCkucHJv
dG9jb2xJc0luSFRUUEZhbWlseSgpIHx8ICFyZXNwb25zZS5pc0hUVFAoKSkKKyAgICBpZiAoIW9y
aWdpbmFsUmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgfHwgIXJlc3BvbnNl
LmlzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgIHJldHVybiBTdG9yZURlY2lzaW9uOjpOb0R1ZVRv
UHJvdG9jb2w7CiAKICAgICBpZiAob3JpZ2luYWxSZXF1ZXN0Lmh0dHBNZXRob2QoKSAhPSAiR0VU
IikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp
ZXcuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAK
aW5kZXggOTU3NjQ2ZTFiNWUyMjAyZjkyOWYzY2VkMDQ3NGNmZGRjM2NhNWZmMi4uYTIwMzg0ZGRj
ZjUzYWUxODViMTVhNjMxMDFiNmI0M2VmMjM4ZDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTE5MCw3ICsxOTAsNyBAQCB2b2lk
IFBsdWdpblZpZXc6OlN0cmVhbTo6Y29udGludWVMb2FkKCkKIAogc3RhdGljIFN0cmluZyBidWls
ZEhUVFBIZWFkZXJzKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBsb25nIGxvbmcm
IGV4cGVjdGVkQ29udGVudExlbmd0aCkKIHsKLSAgICBpZiAoIXJlc3BvbnNlLmlzSFRUUCgpKQor
ICAgIGlmICghcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIFN0cmlu
ZygpOwogCiAgICAgU3RyaW5nQnVpbGRlciBoZWFkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9QbHVnaW5zL1BsdWdpblN0cmVhbS5jcHAKaW5kZXggYzgwZTcwNDQ1N2MwOGRjZTg2
NTA0YTU5ZDI1OGI0ZmNmMmJhZDA0NS4uYjQ1NTY4NDZjOWNjZjYwZGQ3ZDQxN2Y2NzhlM2Y3ODJl
ZjRmYmU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVn
aW5TdHJlYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2lu
U3RyZWFtLmNwcApAQCAtMTUyLDcgKzE1Miw3IEBAIHZvaWQgUGx1Z2luU3RyZWFtOjpzdGFydFN0
cmVhbSgpCiAKICAgICBsb25nIGxvbmcgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gbV9yZXNvdXJj
ZVJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpOwogCi0gICAgaWYgKG1fcmVzb3VyY2VS
ZXNwb25zZS5pc0hUVFAoKSkgeworICAgIGlmIChtX3Jlc291cmNlUmVzcG9uc2UuaXNJbkhUVFBG
YW1pbHkoKSkgewogICAgICAgICBTdHJpbmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CiAgICAgICAg
IFN0cmluZyBzZXBhcmF0b3IgPSAiOiAiX3M7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYlVSTFJlc3BvbnNlLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dl
YlVSTFJlc3BvbnNlLmNwcAppbmRleCA1NjliOTgyNjRiNDViODg3OGI1ODcyYzMzMTJmZTEzODQy
YzUyMGM3Li5hODBkZWJkYWRhNzJlMThmYTExOWYwZWEwOTcwOGJjOWMxYWUxMjczIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJVUkxSZXNwb25zZS5jcHAKKysrIGIvU291
cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVVJMUmVzcG9uc2UuY3BwCkBAIC0yNjAsNyArMjYwLDcg
QEAgSFJFU1VMVCBXZWJVUkxSZXNwb25zZTo6UXVlcnlJbnRlcmZhY2UoX0luXyBSRUZJSUQgcmlp
ZCwgX0NPTV9PdXRwdHJfIHZvaWQqKiBwcHYKICAgICAgICAgKnBwdk9iamVjdCA9IHN0YXRpY19j
YXN0PElXZWJVUkxSZXNwb25zZSo+KHRoaXMpOwogICAgIGVsc2UgaWYgKElzRXF1YWxHVUlEKHJp
aWQsIElJRF9JV2ViVVJMUmVzcG9uc2VQcml2YXRlKSkKICAgICAgICAgKnBwdk9iamVjdCA9IHN0
YXRpY19jYXN0PElXZWJVUkxSZXNwb25zZVByaXZhdGUqPih0aGlzKTsKLSAgICBlbHNlIGlmICht
X3Jlc3BvbnNlLmlzSFRUUCgpICYmIElzRXF1YWxHVUlEKHJpaWQsIElJRF9JV2ViSFRUUFVSTFJl
c3BvbnNlKSkKKyAgICBlbHNlIGlmIChtX3Jlc3BvbnNlLmlzSW5IVFRQRmFtaWx5KCkgJiYgSXNF
cXVhbEdVSUQocmlpZCwgSUlEX0lXZWJIVFRQVVJMUmVzcG9uc2UpKQogICAgICAgICAqcHB2T2Jq
ZWN0ID0gc3RhdGljX2Nhc3Q8SVdlYkhUVFBVUkxSZXNwb25zZSo+KHRoaXMpOwogICAgIGVsc2UK
ICAgICAgICAgcmV0dXJuIEVfTk9JTlRFUkZBQ0U7CkBAIC0zNTgsNyArMzU4LDcgQEAgSFJFU1VM
VCBXZWJVUkxSZXNwb25zZTo6VVJMKF9fZGVyZWZfb3B0X291dCBCU1RSKiByZXN1bHQpCiAKIEhS
RVNVTFQgV2ViVVJMUmVzcG9uc2U6OmFsbEhlYWRlckZpZWxkcyhfQ09NX091dHB0cl9vcHRfIElQ
cm9wZXJ0eUJhZyoqIGhlYWRlckZpZWxkcykKIHsKLSAgICBBU1NFUlQobV9yZXNwb25zZS5pc0hU
VFAoKSk7CisgICAgQVNTRVJUKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSk7CiAKICAgICBp
ZiAoIWhlYWRlckZpZWxkcykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKQEAgLTM3Myw3ICsz
NzMsNyBAQCBIUkVTVUxUIFdlYlVSTFJlc3BvbnNlOjphbGxIZWFkZXJGaWVsZHMoX0NPTV9PdXRw
dHJfb3B0XyBJUHJvcGVydHlCYWcqKiBoZWFkZXJGaQogCiBIUkVTVUxUIFdlYlVSTFJlc3BvbnNl
Ojpsb2NhbGl6ZWRTdHJpbmdGb3JTdGF0dXNDb2RlKGludCBzdGF0dXNDb2RlLCBfX2RlcmVmX29w
dF9vdXQgQlNUUiogc3RhdHVzU3RyaW5nKQogewotICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzSFRU
UCgpKTsKKyAgICBBU1NFUlQobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKTsKICAgICBpZiAo
IXN0YXR1c1N0cmluZykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKIApAQCAtMzg3LDcgKzM4
Nyw3IEBAIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6OmxvY2FsaXplZFN0cmluZ0ZvclN0YXR1c0Nv
ZGUoaW50IHN0YXR1c0NvZGUsIF9fZGVyZWZfb3B0CiAKIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6
OnN0YXR1c0NvZGUoX091dF8gaW50KiBzdGF0dXNDb2RlKQogewotICAgIEFTU0VSVChtX3Jlc3Bv
bnNlLmlzSFRUUCgpKTsKKyAgICBBU1NFUlQobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKTsK
ICAgICBpZiAoc3RhdHVzQ29kZSkKICAgICAgICAgKnN0YXR1c0NvZGUgPSBtX3Jlc3BvbnNlLmh0
dHBTdGF0dXNDb2RlKCk7CiAgICAgcmV0dXJuIFNfT0s7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400725</attachid>
            <date>2020-06-01 01:27:45 -0700</date>
            <delta_ts>2020-06-01 02:00:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208782-20200601102743.patch</filename>
            <type>text/plain</type>
            <size>11903</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBjNTQzMmVlMmFjMjUz
YTVhMTk0MWE0YTllMTExZGIzMmIxMGEyYS4uMDg0MWE2OGRmYjVhNmVjNzAyNmJmMmMxMWM5NTVj
NTdiNGEzZmIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA2LTAxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlc291cmNlUmVzcG9u
c2VCYXNlOjppc0hUVFAgdG8gaXNJbkhUVFBGYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IFNh
bSBXZWluaWcuCisKKyAgICAgICAgQXMgdGhlIGNvbW1lbnQgc2F5cywgdGhlIG1ldGhvZCBuYW1l
IGlzIG1pc2xlYWRpbmcgYW5kIHRoZSBtZXRob2QKKyAgICAgICAgaXMgaW5jb25zaXN0ZW50IHdp
dGggdGhlIEFQSSBvZiBSZXNvdXJjZVJlcXVlc3RCYXNlLCBzbyByZW5hbWUgaXQKKyAgICAgICAg
dG8gbWFrZSBpdCBjbGVhciB0aGUgbWV0aG9kIGNhbiBiZSB1c2VkIGZvciBib3RoIGh0dHAgYW5k
IGh0dHBzCisgICAgICAgIHByb3RvY29scy4KKworICAgICAgICBObyB0ZXN0cyBzaW5jZSBubyBj
aGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJDb250ZW50
UG9saWN5KToKKyAgICAgICAgKiBsb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI6OmRpZFJlY2Vp
dmVSZXNwb25zZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl
QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6aXNJbkhU
VFBGYW1pbHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZUJhc2U6
OmlzSFRUUCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNv
dXJjZVJlc3BvbnNlQmFzZS5oOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VNSU1FVHlwZSBjb25zdCk6
CisgICAgICAgICogeG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6ZXh0ZXJuYWxFbnRpdHlNaW1lVHlwZUFsbG93ZWQpOgorCiAyMDIwLTA1
LTMxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFRp
ZHkgdXAgU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5oCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg1
YTM5ZTM2ZDY5MzU4ZWMxNDhlMTE5MGUxMGIxYTcwM2FlNDJjYmYuLjFlNDY5NGEyYjg1ODdmOWZk
ZTJmNTdjOWY2ZDJmOGI0YTA0MDYyZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAt
MDYtMDEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW5hbWUgUmVz
b3VyY2VSZXNwb25zZUJhc2U6OmlzSFRUUCB0byBpc0luSFRUUEZhbWlseQorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NzgyCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisg
ICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAg
KFdlYktpdDo6TmV0d29ya0NhY2hlOjptYWtlU3RvcmVEZWNpc2lvbik6CisgICAgICAgICogV2Vi
UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpidWlsZEhU
VFBIZWFkZXJzKToKKwogMjAyMC0wNS0zMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl
bkB3ZWJraXQub3JnPgogCiAgICAgICAgIERlcHJlY2F0ZSBXS0J1bmRsZVBvc3RTeW5jaHJvbm91
c01lc3NhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZyBi
L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRleCAzM2RlYzhkMjdkNjVjZDBk
ZjlhYTE0YmI1YTkzMjc3Yzg5Y2UzY2UxLi5jYjI2NzVjMTNiZDY2NTc1YjY2NWMzMWZmMDkyNjkw
MzBlOGQ5MDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cK
KysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK
KzIwMjAtMDYtMDEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW5h
bWUgUmVzb3VyY2VSZXNwb25zZUJhc2U6OmlzSFRUUCB0byBpc0luSFRUUEZhbWlseQorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NzgyCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdl
LgorCisgICAgICAgICogUGx1Z2lucy9QbHVnaW5TdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6UGx1Z2luU3RyZWFtOjpzdGFydFN0cmVhbSk6CisgICAgICAgICogV2ViVVJMUmVzcG9uc2Uu
Y3BwOgorICAgICAgICAoV2ViVVJMUmVzcG9uc2U6OlF1ZXJ5SW50ZXJmYWNlKToKKyAgICAgICAg
KFdlYlVSTFJlc3BvbnNlOjphbGxIZWFkZXJGaWVsZHMpOgorICAgICAgICAoV2ViVVJMUmVzcG9u
c2U6OmxvY2FsaXplZFN0cmluZ0ZvclN0YXR1c0NvZGUpOgorICAgICAgICAoV2ViVVJMUmVzcG9u
c2U6OnN0YXR1c0NvZGUpOgorCiAyMDIwLTA1LTE5ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp
LkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQVNTRVJUKG1fZWdsRGlzcGxh
eSA9PSBFR0xfTk9fRElTUExBWSkgZmFpbHMgaW4gflBsYXRmb3JtRGlzcGxheSgpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAxNjcwZWJkM2JmYThkNGJiYTYy
YzY0ZTBiOGQxOGQzODBjMTBiYWE2Li5lNDEyNDFhZDExNWQ2YTFhZTk5MzliMjQ4NzEwY2I5Y2Q3
ZjJlZDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTEw
MDQsNyArMTAwNCw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJDb250ZW50
UG9saWN5KFBvbGljeUFjdGlvbiBwb2xpY3kpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAg
ICBpZiAobV9yZXNwb25zZS5pc0hUVFAoKSkgeworICAgIGlmIChtX3Jlc3BvbnNlLmlzSW5IVFRQ
RmFtaWx5KCkpIHsKICAgICAgICAgaW50IHN0YXR1cyA9IG1fcmVzcG9uc2UuaHR0cFN0YXR1c0Nv
ZGUoKTsgLy8gU3RhdHVzIG1heSBiZSB6ZXJvIHdoZW4gbG9hZGluZyBzdWJzdGl0dXRlIGRhdGEs
IGluIHBhcnRpY3VsYXIgZnJvbSBhIFdlYkFyY2hpdmUuCiAgICAgICAgIGlmIChzdGF0dXMgJiYg
KHN0YXR1cyA8IDIwMCB8fCBzdGF0dXMgPj0gMzAwKSkgewogICAgICAgICAgICAgYm9vbCBob3N0
ZWRCeU9iamVjdCA9IGZyYW1lTG9hZGVyKCktPmlzSG9zdGVkQnlPYmplY3RFbGVtZW50KCk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2Fk
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy
LmNwcAppbmRleCA5NWUxMDViZWI4NGJlYTAyMTMzMzBkMmUzMmJmYjQ3OGQ0ZTdiYmM4Li5mMzll
YTI5ZDZkZTBiMzRlMDE2MmVlOTk4ZmM0ZjY0OGZkYWY0YmFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvTmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXIuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2xvYWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKQEAgLTEyNiw3
ICsxMjYsNyBAQCB2b2lkIE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyOjpkaWRSZWNlaXZlUmVz
cG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcAogICAgICAgICBpZiAoIW1fY2xpZW50
KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghcmVzcG9uc2UuaXNIVFRQKCkp
CisgICAgICAgIGlmICghcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgICAgIHJl
dHVybjsKIAogICAgICAgICBpZiAobV9jbGllbnQtPndhbnRzQWxsU3RyZWFtcygpKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFz
ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VC
YXNlLmNwcAppbmRleCAwMWQzZGRjZTg0NWZjNzcxMzcxYjdiYTZmMzIyMzhjMjFlN2U3MjdiLi5j
YmM2NTcwYjhlMTZhYTJjMWYwNTRlNzBkMGJjN2M4N2ZlOTUxMDRhIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNw
cApAQCAtMTk0LDggKzE5NCw3IEBAIFJlc291cmNlUmVzcG9uc2UgUmVzb3VyY2VSZXNwb25zZUJh
c2U6OmZpbHRlcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwKICAgICByZXR1cm4g
ZmlsdGVyZWRSZXNwb25zZTsKIH0KIAotLy8gRklYTUU6IE5hbWUgZG9lcyBub3QgbWFrZSBpdCBj
bGVhciB0aGlzIGlzIHRydWUgZm9yIEhUVFBTIQotYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6
aXNIVFRQKCkgY29uc3QKK2Jvb2wgUmVzb3VyY2VSZXNwb25zZUJhc2U6OmlzSW5IVFRQRmFtaWx5
KCkgY29uc3QKIHsKICAgICBsYXp5SW5pdChDb21tb25GaWVsZHNPbmx5KTsKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5o
IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5o
CmluZGV4IGUzMjE4ZjhlOTBiOTJiOTIwOGNmYTk2YzA5ODVkOGQwNGRmM2U1ZjcuLmQxYjM3YjYw
ODViOGQxZDk5ZDM1YzFhMjlhZTBiMzdkMmUwMjk4MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKQEAgLTgzLDcg
KzgzLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZXNvdXJjZVJlc3BvbnNlIGZyb21Dcm9zc1Ro
cmVhZERhdGEoQ3Jvc3NUaHJlYWREYXRhJiYpOwogCiAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7
IHJldHVybiBtX2lzTnVsbDsgfQotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNIVFRQKCkgY29u
c3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0luSFRUUEZhbWlseSgpIGNvbnN0OwogICAg
IFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNTdWNjZXNzZnVsKCkgY29uc3Q7CiAKICAgICBXRUJDT1JF
X0VYUE9SVCBjb25zdCBVUkwmIHVybCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx
dWVzdC5jcHAKaW5kZXggMWRmYTAyNTlkZDQ3ODYwZDQ5NmY1OTk2MDVlNjdjMGFjNzQyZTBkYy4u
Yzk2MTk3NDUwNzQ5YTg3YTQ0MmY0NzlmMGZlYTZhMDUwNDM3MjRmMiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94
bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBAIC0xNzgsNyArMTc4LDcgQEAgRXhjZXB0aW9uT3I8RG9j
dW1lbnQqPiBYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VYTUwoKQogCiAgICAgICAgIC8vIFRoZSBX
M0Mgc3BlYyByZXF1aXJlcyB0aGUgZmluYWwgTUlNRSB0eXBlIHRvIGJlIHNvbWUgdmFsaWQgWE1M
IHR5cGUsIG9yIHRleHQvaHRtbC4KICAgICAgICAgLy8gSWYgaXQgaXMgdGV4dC9odG1sLCB0aGVu
IHRoZSByZXNwb25zZVR5cGUgb2YgImRvY3VtZW50IiBtdXN0IGhhdmUgYmVlbiBzdXBwbGllZCBl
eHBsaWNpdGx5LgotICAgICAgICBpZiAoKG1fcmVzcG9uc2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNl
SXNYTUwoKSAmJiAhaXNIVE1MKQorICAgICAgICBpZiAoKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1p
bHkoKSAmJiAhcmVzcG9uc2VJc1hNTCgpICYmICFpc0hUTUwpCiAgICAgICAgICAgICB8fCAoaXNI
VE1MICYmIHJlc3BvbnNlVHlwZSgpID09IFJlc3BvbnNlVHlwZTo6RW1wdHlTdHJpbmcpKSB7CiAg
ICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQgPSBudWxscHRyOwogICAgICAgICB9IGVsc2Ug
ewpAQCAtODU0LDcgKzg1NCw3IEBAIFN0cmluZyBYTUxIdHRwUmVxdWVzdDo6cmVzcG9uc2VNSU1F
VHlwZSgpIGNvbnN0CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBT
YW1lIGxvZ2ljIGFzIGV4dGVybmFsRW50aXR5TWltZVR5cGVBbGxvd2VkKCkgaW4gWE1MRG9jdW1l
bnRQYXJzZXJMaWJ4bWwyLmNwcC4gS2VlcCB0aGVtIGluIHN5bmMuCiAgICAgICAgIFN0cmluZyBj
b250ZW50VHlwZTsKLSAgICAgICAgaWYgKG1fcmVzcG9uc2UuaXNIVFRQKCkpCisgICAgICAgIGlm
IChtX3Jlc3BvbnNlLmlzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgICAgICBjb250ZW50VHlwZSA9
IG1fcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpDb250ZW50VHlwZSk7
CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNvbnRlbnRUeXBlID0gbV9yZXNwb25zZS5taW1l
VHlwZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVu
dFBhcnNlckxpYnhtbDIuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVu
dFBhcnNlckxpYnhtbDIuY3BwCmluZGV4IDJlMDIxN2JjYzNiN2UxOGU1YTg5NzYwMGJmMDNlMmMy
OGY4MGI4ZmYuLjVmYmM3YTA3OTRjNDdiZGFkZGZmYjU0YzM0MTNiMjcyYTQ2ZmNkMGQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwy
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyTGli
eG1sMi5jcHAKQEAgLTM4Niw3ICszODYsNyBAQCBzdGF0aWMgYm9vbCBleHRlcm5hbEVudGl0eU1p
bWVUeXBlQWxsb3dlZChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKICAgICBTdHJp
bmcgbWltZVR5cGUgPSBleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKGNvbnRlbnRUeXBlKTsK
ICAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIFNhbWUgbG9naWMgYXMg
WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlTUlNRVR5cGUoKS4gS2VlcCB0aGVtIGluIHN5bmMuCi0g
ICAgICAgIGlmIChyZXNwb25zZS5pc0hUVFAoKSkKKyAgICAgICAgaWYgKHJlc3BvbnNlLmlzSW5I
VFRQRmFtaWx5KCkpCiAgICAgICAgICAgICBtaW1lVHlwZSA9IGNvbnRlbnRUeXBlOwogICAgICAg
ICBlbHNlCiAgICAgICAgICAgICBtaW1lVHlwZSA9IHJlc3BvbnNlLm1pbWVUeXBlKCk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5j
cHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAK
aW5kZXggNTNjMjZiNWMzOGZhY2M1MWQwY2YzNGFlNTI1YmI0MjY3OTM3ZDViMS4uNjRjZDRiY2Qx
NjE2N2M2ZTJiZTg5ZTJkYmM1OTcyMmVjNWEzZjZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcApAQCAtMjY1LDcgKzI2NSw3
IEBAIHN0YXRpYyBib29sIGlzTWVkaWFNSU1FVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCiAKIHN0
YXRpYyBTdG9yZURlY2lzaW9uIG1ha2VTdG9yZURlY2lzaW9uKGNvbnN0IFdlYkNvcmU6OlJlc291
cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv
bnNlJiByZXNwb25zZSwgc2l6ZV90IGJvZHlTaXplKQogewotICAgIGlmICghb3JpZ2luYWxSZXF1
ZXN0LnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCAhcmVzcG9uc2UuaXNIVFRQKCkp
CisgICAgaWYgKCFvcmlnaW5hbFJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgp
IHx8ICFyZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKQogICAgICAgICByZXR1cm4gU3RvcmVEZWNp
c2lvbjo6Tm9EdWVUb1Byb3RvY29sOwogCiAgICAgaWYgKG9yaWdpbmFsUmVxdWVzdC5odHRwTWV0
aG9kKCkgIT0gIkdFVCIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1
Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs
dWdpblZpZXcuY3BwCmluZGV4IDk1NzY0NmUxYjVlMjIwMmY5MjlmM2NlZDA0NzRjZmRkYzNjYTVm
ZjIuLmEyMDM4NGRkY2Y1M2FlMTg1YjE1YTYzMTAxYjZiNDNlZjIzOGQzODEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC0xOTAsNyAr
MTkwLDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpTdHJlYW06OmNvbnRpbnVlTG9hZCgpCiAKIHN0YXRp
YyBTdHJpbmcgYnVpbGRIVFRQSGVhZGVycyhjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25z
ZSwgbG9uZyBsb25nJiBleHBlY3RlZENvbnRlbnRMZW5ndGgpCiB7Ci0gICAgaWYgKCFyZXNwb25z
ZS5pc0hUVFAoKSkKKyAgICBpZiAoIXJlc3BvbnNlLmlzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAg
IHJldHVybiBTdHJpbmcoKTsKIAogICAgIFN0cmluZ0J1aWxkZXIgaGVhZGVyOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5TdHJlYW0uY3BwIGIvU291
cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5TdHJlYW0uY3BwCmluZGV4IGM4MGU3
MDQ0NTdjMDhkY2U4NjUwNGE1OWQyNThiNGZjZjJiYWQwNDUuLmI0NTU2ODQ2YzljY2Y2MGRkN2Q0
MTdmNjc4ZTNmNzgyZWY0ZmJlNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1BsdWdpbnMvUGx1Z2luU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9Q
bHVnaW5zL1BsdWdpblN0cmVhbS5jcHAKQEAgLTE1Miw3ICsxNTIsNyBAQCB2b2lkIFBsdWdpblN0
cmVhbTo6c3RhcnRTdHJlYW0oKQogCiAgICAgbG9uZyBsb25nIGV4cGVjdGVkQ29udGVudExlbmd0
aCA9IG1fcmVzb3VyY2VSZXNwb25zZS5leHBlY3RlZENvbnRlbnRMZW5ndGgoKTsKIAotICAgIGlm
IChtX3Jlc291cmNlUmVzcG9uc2UuaXNIVFRQKCkpIHsKKyAgICBpZiAobV9yZXNvdXJjZVJlc3Bv
bnNlLmlzSW5IVFRQRmFtaWx5KCkpIHsKICAgICAgICAgU3RyaW5nQnVpbGRlciBzdHJpbmdCdWls
ZGVyOwogICAgICAgICBTdHJpbmcgc2VwYXJhdG9yID0gIjogIl9zOwogCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJVUkxSZXNwb25zZS5jcHAgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9XZWJVUkxSZXNwb25zZS5jcHAKaW5kZXggNTY5Yjk4MjY0YjQ1Yjg4NzhiNTg3
MmMzMzEyZmUxMzg0MmM1MjBjNy4uYTgwZGViZGFkYTcyZTE4ZmExMTlmMGVhMDk3MDhiYzljMWFl
MTI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVVJMUmVzcG9uc2Uu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlVSTFJlc3BvbnNlLmNwcApAQCAt
MjYwLDcgKzI2MCw3IEBAIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6OlF1ZXJ5SW50ZXJmYWNlKF9J
bl8gUkVGSUlEIHJpaWQsIF9DT01fT3V0cHRyXyB2b2lkKiogcHB2CiAgICAgICAgICpwcHZPYmpl
Y3QgPSBzdGF0aWNfY2FzdDxJV2ViVVJMUmVzcG9uc2UqPih0aGlzKTsKICAgICBlbHNlIGlmIChJ
c0VxdWFsR1VJRChyaWlkLCBJSURfSVdlYlVSTFJlc3BvbnNlUHJpdmF0ZSkpCiAgICAgICAgICpw
cHZPYmplY3QgPSBzdGF0aWNfY2FzdDxJV2ViVVJMUmVzcG9uc2VQcml2YXRlKj4odGhpcyk7Ci0g
ICAgZWxzZSBpZiAobV9yZXNwb25zZS5pc0hUVFAoKSAmJiBJc0VxdWFsR1VJRChyaWlkLCBJSURf
SVdlYkhUVFBVUkxSZXNwb25zZSkpCisgICAgZWxzZSBpZiAobV9yZXNwb25zZS5pc0luSFRUUEZh
bWlseSgpICYmIElzRXF1YWxHVUlEKHJpaWQsIElJRF9JV2ViSFRUUFVSTFJlc3BvbnNlKSkKICAg
ICAgICAgKnBwdk9iamVjdCA9IHN0YXRpY19jYXN0PElXZWJIVFRQVVJMUmVzcG9uc2UqPih0aGlz
KTsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBFX05PSU5URVJGQUNFOwpAQCAtMzU4LDcgKzM1
OCw3IEBAIEhSRVNVTFQgV2ViVVJMUmVzcG9uc2U6OlVSTChfX2RlcmVmX29wdF9vdXQgQlNUUiog
cmVzdWx0KQogCiBIUkVTVUxUIFdlYlVSTFJlc3BvbnNlOjphbGxIZWFkZXJGaWVsZHMoX0NPTV9P
dXRwdHJfb3B0XyBJUHJvcGVydHlCYWcqKiBoZWFkZXJGaWVsZHMpCiB7Ci0gICAgQVNTRVJUKG1f
cmVzcG9uc2UuaXNIVFRQKCkpOworICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzSW5IVFRQRmFtaWx5
KCkpOwogCiAgICAgaWYgKCFoZWFkZXJGaWVsZHMpCiAgICAgICAgIHJldHVybiBFX1BPSU5URVI7
CkBAIC0zNzMsNyArMzczLDcgQEAgSFJFU1VMVCBXZWJVUkxSZXNwb25zZTo6YWxsSGVhZGVyRmll
bGRzKF9DT01fT3V0cHRyX29wdF8gSVByb3BlcnR5QmFnKiogaGVhZGVyRmkKIAogSFJFU1VMVCBX
ZWJVUkxSZXNwb25zZTo6bG9jYWxpemVkU3RyaW5nRm9yU3RhdHVzQ29kZShpbnQgc3RhdHVzQ29k
ZSwgX19kZXJlZl9vcHRfb3V0IEJTVFIqIHN0YXR1c1N0cmluZykKIHsKLSAgICBBU1NFUlQobV9y
ZXNwb25zZS5pc0hUVFAoKSk7CisgICAgQVNTRVJUKG1fcmVzcG9uc2UuaXNJbkhUVFBGYW1pbHko
KSk7CiAgICAgaWYgKCFzdGF0dXNTdHJpbmcpCiAgICAgICAgIHJldHVybiBFX1BPSU5URVI7CiAK
QEAgLTM4Nyw3ICszODcsNyBAQCBIUkVTVUxUIFdlYlVSTFJlc3BvbnNlOjpsb2NhbGl6ZWRTdHJp
bmdGb3JTdGF0dXNDb2RlKGludCBzdGF0dXNDb2RlLCBfX2RlcmVmX29wdAogCiBIUkVTVUxUIFdl
YlVSTFJlc3BvbnNlOjpzdGF0dXNDb2RlKF9PdXRfIGludCogc3RhdHVzQ29kZSkKIHsKLSAgICBB
U1NFUlQobV9yZXNwb25zZS5pc0hUVFAoKSk7CisgICAgQVNTRVJUKG1fcmVzcG9uc2UuaXNJbkhU
VFBGYW1pbHkoKSk7CiAgICAgaWYgKHN0YXR1c0NvZGUpCiAgICAgICAgICpzdGF0dXNDb2RlID0g
bV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpOwogICAgIHJldHVybiBTX09LOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>