<?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>241225</bug_id>
          
          <creation_ts>2022-06-02 06:16:13 -0700</creation_ts>
          <short_desc>[CSS Container Queries] Re-evaluate queries after subframe size changes</short_desc>
          <delta_ts>2022-06-03 02:55:14 -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>CSS</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>
          
          <blocked>229659</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Antti Koivisto">koivisto</reporter>
          <assigned_to name="Antti Koivisto">koivisto</assigned_to>
          <cc>cdumez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>kangil.han</cc>
    
    <cc>macpherson</cc>
    
    <cc>menard</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1873575</commentid>
    <comment_count>0</comment_count>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 06:16:13 -0700</bug_when>
    <thetext>We fail to update on frame size change.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873576</commentid>
    <comment_count>1</comment_count>
      <attachid>459959</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 06:24:13 -0700</bug_when>
    <thetext>Created attachment 459959
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873599</commentid>
    <comment_count>2</comment_count>
      <attachid>459959</attachid>
    <who name="alan">zalan</who>
    <bug_when>2022-06-02 09:01:23 -0700</bug_when>
    <thetext>Comment on attachment 459959
Patch

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

&gt; Source/WebCore/page/FrameViewLayoutContext.h:58
&gt; +    void layoutWithoutUpdatingQueryContainers();

I assume we are not planning on introducing too many new layout() callsites, so in practice having these 2 functions and deciding &quot;which one to call when&quot; won&apos;t cause any issues -but in theory it may be a bit puzzling which one to actually use. I guess if you don&apos;t know whether you need query containers, it&apos;s better to just use layout().</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873603</commentid>
    <comment_count>3</comment_count>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 09:03:40 -0700</bug_when>
    <thetext>&gt; I assume we are not planning on introducing too many new layout() callsites,
&gt; so in practice having these 2 functions and deciding &quot;which one to call
&gt; when&quot; won&apos;t cause any issues -but in theory it may be a bit puzzling which
&gt; one to actually use. I guess if you don&apos;t know whether you need query
&gt; containers, it&apos;s better to just use layout().

The idea is to just use layout() except in container query related code (there is one other call site for some stupid reasons).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873607</commentid>
    <comment_count>4</comment_count>
      <attachid>459962</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 09:08:04 -0700</bug_when>
    <thetext>Created attachment 459962
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873609</commentid>
    <comment_count>5</comment_count>
      <attachid>459963</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 09:12:38 -0700</bug_when>
    <thetext>Created attachment 459963
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873614</commentid>
    <comment_count>6</comment_count>
      <attachid>459964</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 09:36:14 -0700</bug_when>
    <thetext>Created attachment 459964
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873616</commentid>
    <comment_count>7</comment_count>
      <attachid>459965</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-02 09:50:43 -0700</bug_when>
    <thetext>Created attachment 459965
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873845</commentid>
    <comment_count>8</comment_count>
      <attachid>460005</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-06-03 01:45:06 -0700</bug_when>
    <thetext>Created attachment 460005
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873850</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-06-03 02:54:45 -0700</bug_when>
    <thetext>Committed r295200 (251257@main): &lt;https://commits.webkit.org/251257@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 460005.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873851</commentid>
    <comment_count>10</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-06-03 02:55:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/94337695&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>459959</attachid>
            <date>2022-06-02 06:24:13 -0700</date>
            <delta_ts>2022-06-02 09:08:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-241225-20220602162412.patch</filename>
            <type>text/plain</type>
            <size>12407</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA5OGFmYTgwMjQwODdiZDMyYWU2ODZjZDIzYjJmYzBmNWYzMTYxYTcxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMg
ZG9uJ3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
Y29udGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMg
ZmFpbHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29t
ZSBjb250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy9pZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29u
dGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNl
L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpD
b21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUg
bGF5b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNp
bWlsYXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw
cDoKKFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6
OnVwZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2Vi
Q29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3
Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5
b3V0Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRp
b24gbG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3Zl
cmVkLgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91dFdpdGhvdXRVcGRh
dGluZ1F1ZXJ5Q29udGFpbmVycyk6CihXZWJDb3JlOjpGcmFtZVZpZXdMYXlvdXRDb250ZXh0Ojpw
ZXJmb3JtTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRl
eHQuaDoKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwOgooV2Vi
Q29yZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6Omhhc0NvbnRhaW5lclF1ZXJpZXMgY29uc3QpOgoq
IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oOgotLS0KIC4uLi9jc3Mv
Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCAgICAgICB8IDE4ICsrKysrKysrKysrKyst
LS0tCiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwICAgICAgICAgICAgICAgfCAxMiAr
LS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwICAgICAgICAgICAg
IHwgIDUgKy0tLS0KIC4uLi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAg
ICB8IDIwICsrKysrKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3
TGF5b3V0Q29udGV4dC5oICB8ICAyICsrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3Bl
UnVsZVNldHMuY3BwICAgfCAxMiArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5
bGVTY29wZVJ1bGVTZXRzLmggICAgIHwgIDEgKwogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cyAgICAgICAgICAgICAgICAgIHwgIDEgKwogLi4uYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRp
b24tZXhwZWN0ZWQudHh0IHwgIDIgKy0KIC4uLi9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVk
LnR4dCAgICAgICAgICB8ICAyICstCiAxMCBmaWxlcyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCsp
LCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29t
cHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl
ZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IDg5MjhkNzA5NGQ4MS4uY2Y2NGMyM2YzYjQwIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u
LmNwcApAQCAtMjg5NSwxMCArMjg5NSwyMCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5
bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAogCiAg
ICAgICAgIHN0eWxlID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxlZEVsZW1l
bnQsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHlsZSwgc3R5
bGVkUmVuZGVyZXIoKSk7CiAKLSAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2UgY2FzZXMg
Y291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgotICAgICAgICBmb3Jj
ZUZ1bGxMYXlvdXQgPSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwgc3R5bGVk
UmVuZGVyZXIoKSkKLSAgICAgICAgICAgIHx8IHN0eWxlZEVsZW1lbnQtPmlzSW5TaGFkb3dUcmVl
KCkKLSAgICAgICAgICAgIHx8IChkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0
cygpICYmIGRvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCktPmhhc1ZpZXdw
b3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzKCkgJiYgZG9jdW1lbnQub3duZXJFbGVtZW50KCkpOwor
ICAgICAgICBmb3JjZUZ1bGxMYXlvdXQgPSBbJl0geworICAgICAgICAgICAgLy8gRklYTUU6IFNv
bWUgb2YgdGhlc2UgY2FzZXMgY291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0
dGVyLgorICAgICAgICAgICAgaWYgKGlzTGF5b3V0RGVwZW5kZW50KHByb3BlcnR5SUQsIHN0eWxl
LCBzdHlsZWRSZW5kZXJlcigpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg
ICAgICAgIC8vIEZJWE1FOiBXaHk/CisgICAgICAgICAgICBpZiAoc3R5bGVkRWxlbWVudC0+aXNJ
blNoYWRvd1RyZWUoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAg
IGlmICghZG9jdW1lbnQub3duZXJFbGVtZW50KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZh
bHNlOworICAgICAgICAgICAgaWYgKCFkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4
aXN0cygpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGF1dG8m
IHJ1bGVTZXRzID0gZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKS0+cnVs
ZVNldHMoKTsKKyAgICAgICAgICAgIHJldHVybiBydWxlU2V0cy5oYXNWaWV3cG9ydERlcGVuZGVu
dE1lZGlhUXVlcmllcygpIHx8IHJ1bGVTZXRzLmhhc0NvbnRhaW5lclF1ZXJpZXMoKTsKKyAgICAg
ICAgfSgpOwogCiAgICAgICAgIGlmIChmb3JjZUZ1bGxMYXlvdXQpCiAgICAgICAgICAgICBkb2N1
bWVudC51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j
dW1lbnQuY3BwCmluZGV4IDlkMDdmYzg1ZTExYy4uZGIyYjQyOTE4MTExIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E
b2N1bWVudC5jcHAKQEAgLTIxMDEsNyArMjEwMSw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlc29sdmVT
dHlsZShSZXNvbHZlU3R5bGVUeXBlIHR5cGUpCiAgICAgICAgICAgICB1cGRhdGVSZW5kZXJUcmVl
KFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKIAogICAgICAgICAgICAgaWYgKGZyYW1lVmlldy5sYXlv
dXRDb250ZXh0KCkubmVlZHNMYXlvdXQoKSkKLSAgICAgICAgICAgICAgICBmcmFtZVZpZXcubGF5
b3V0Q29udGV4dCgpLmxheW91dCgpOworICAgICAgICAgICAgICAgIGZyYW1lVmlldy5sYXlvdXRD
b250ZXh0KCkubGF5b3V0V2l0aG91dFVwZGF0aW5nUXVlcnlDb250YWluZXJzKCk7CiAKICAgICAg
ICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogICAgICAgICB9CkBAIC0y
MjYwLDE2ICsyMjYwLDYgQEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0KCkKICAgICAgICAg
cmV0dXJuOwogCiAgICAgZnJhbWVWaWV3LT5sYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7Ci0KLSAg
ICBTdHlsZTo6U2NvcGU6OlF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCBxdWVyeUNvbnRhaW5l
clVwZGF0ZUNvbnRleHQ7Ci0gICAgd2hpbGUgKHN0eWxlU2NvcGUoKS51cGRhdGVRdWVyeUNvbnRh
aW5lclN0YXRlKHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCkpIHsKLSAgICAgICAgdXBkYXRl
U3R5bGVJZk5lZWRlZCgpOwotCi0gICAgICAgIGlmICghZnJhbWVWaWV3LT5sYXlvdXRDb250ZXh0
KCkubmVlZHNMYXlvdXQoKSkKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGZyYW1lVmll
dy0+bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOwotICAgIH0KIH0KIAogdm9pZCBEb2N1bWVudDo6
dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKERvY3VtZW50OjpSdW5Qb3N0TGF5
b3V0VGFza3MgcnVuUG9zdExheW91dFRhc2tzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu
ZGV4IDk0NGZlMmJlNTU2OC4uNWNlODJmMTY2ZDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu
Y3BwCkBAIC0yODYzLDcgKzI4NjMsNyBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlQ29udGVudHNT
aXplKCkKICNlbmRpZgogCiAgICAgaWYgKHNob3VsZExheW91dEFmdGVyQ29udGVudHNSZXNpemVk
KCkgJiYgbmVlZHNMYXlvdXQoKSkKLSAgICAgICAgbGF5b3V0Q29udGV4dCgpLmxheW91dCgpOwor
ICAgICAgICBsYXlvdXRDb250ZXh0KCkubGF5b3V0V2l0aG91dFVwZGF0aW5nUXVlcnlDb250YWlu
ZXJzKCk7CiAKICAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IHRoaXMtPnJlbmRlclZp
ZXcoKSkgewogICAgICAgICBpZiAocmVuZGVyVmlldy0+dXNlc0NvbXBvc2l0aW5nKCkpCkBAIC00
NTUzLDggKzQ1NTMsNiBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l
ZWRlZFJlY3Vyc2l2ZSgpCiAgICAgICAgIHJldHVybiBkZXNjZW5kYW50c0RlcXVlLmZpcnN0KCku
cHRyKCk7CiAgICAgfTsKIAotICAgIFN0eWxlOjpTY29wZTo6UXVlcnlDb250YWluZXJVcGRhdGVD
b250ZXh0IHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dDsKLQogICAgIGZvciAodW5zaWduZWQg
aSA9IDA7IGkgPCBtYXhVcGRhdGVQYXNzZXM7ICsraSkgewogICAgICAgICBib29sIGRpZFdvcmsg
PSBmYWxzZTsKICAgICAgICAgRGVzY2VuZGFudHNEZXF1ZSBkZXF1ZTsKQEAgLTQ1NjMsNyArNDU2
MSw2IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJz
aXZlKCkKICAgICAgICAgICAgICAgICBkaWRXb3JrID0gdHJ1ZTsKICAgICAgICAgICAgIGlmICh2
aWV3LT5uZWVkc0xheW91dCgpKSB7CiAgICAgICAgICAgICAgICAgdmlldy0+bGF5b3V0Q29udGV4
dCgpLmxheW91dCgpOwotICAgICAgICAgICAgICAgIHZpZXctPmZyYW1lKCkuZG9jdW1lbnQoKS0+
c3R5bGVTY29wZSgpLnVwZGF0ZVF1ZXJ5Q29udGFpbmVyU3RhdGUocXVlcnlDb250YWluZXJVcGRh
dGVDb250ZXh0KTsKICAgICAgICAgICAgICAgICBkaWRXb3JrID0gdHJ1ZTsKICAgICAgICAgICAg
IH0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdM
YXlvdXRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29u
dGV4dC5jcHAKaW5kZXggMmZmMzEwMjNmYWJmLi5mOTBmNGIxYTAwYTYgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcApAQCAtMTY2LDYgKzE2Niwy
NiBAQCBGcmFtZVZpZXdMYXlvdXRDb250ZXh0Ojp+RnJhbWVWaWV3TGF5b3V0Q29udGV4dCgpCiB9
CiAKIHZvaWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6bGF5b3V0KCkKK3sKKyAgICBwZXJmb3Jt
TGF5b3V0KCk7CisKKyAgICBTdHlsZTo6U2NvcGU6OlF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4
dCBxdWVyeUNvbnRhaW5lclVwZGF0ZUNvbnRleHQ7CisgICAgd2hpbGUgKGRvY3VtZW50KCktPnN0
eWxlU2NvcGUoKS51cGRhdGVRdWVyeUNvbnRhaW5lclN0YXRlKHF1ZXJ5Q29udGFpbmVyVXBkYXRl
Q29udGV4dCkpIHsKKyAgICAgICAgZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVJZk5lZWRlZCgpOwor
CisgICAgICAgIGlmICghbmVlZHNMYXlvdXQoKSkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAg
ICAgIHBlcmZvcm1MYXlvdXQoKTsKKyAgICB9Cit9CisKK3ZvaWQgRnJhbWVWaWV3TGF5b3V0Q29u
dGV4dDo6bGF5b3V0V2l0aG91dFVwZGF0aW5nUXVlcnlDb250YWluZXJzKCkKK3sKKyAgICBwZXJm
b3JtTGF5b3V0KCk7Cit9CisKK3ZvaWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6cGVyZm9ybUxh
eW91dCgpCiB7CiAgICAgTE9HX1dJVEhfU1RSRUFNKExheW91dCwgc3RyZWFtIDw8ICJGcmFtZVZp
ZXcgIiA8PCAmdmlldygpIDw8ICIgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6bGF5b3V0KCkgd2l0
aCBzaXplICIgPDwgdmlldygpLmxheW91dFNpemUoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGFn
ZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmgKaW5kZXggNmY5ZWIxZTA5MzgyLi4yMjNhYzkzYWNl
YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4
dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oCkBA
IC01NSw2ICs1NSw3IEBAIHB1YmxpYzoKICAgICB+RnJhbWVWaWV3TGF5b3V0Q29udGV4dCgpOwog
CiAgICAgdm9pZCBsYXlvdXQoKTsKKyAgICB2b2lkIGxheW91dFdpdGhvdXRVcGRhdGluZ1F1ZXJ5
Q29udGFpbmVycygpOwogICAgIGJvb2wgbmVlZHNMYXlvdXQoKSBjb25zdDsKIAogICAgIC8vIFdl
IHJlbHkgb24gdGhlIHNpZGUtZWZmZWN0cyBvZiBsYXlvdXQsIGxpa2UgY29tcG9zaXRpbmcgdXBk
YXRlcywgdG8gdXBkYXRlIHN0YXRlIGluIHZhcmlvdXMgc3Vic3lzdGVtcwpAQCAtMTI3LDYgKzEy
OCw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50
YWluZXI7CiAgICAgZnJpZW5kIGNsYXNzIFBhZ2luYXRlZExheW91dFN0YXRlTWFpbnRhaW5lcjsK
IAorICAgIHZvaWQgcGVyZm9ybUxheW91dCgpOwogICAgIGJvb2wgY2FuUGVyZm9ybUxheW91dCgp
IGNvbnN0OwogICAgIGJvb2wgbGF5b3V0RGlzYWxsb3dlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5
b3V0RGlzYWxsb3dlZENvdW50OyB9CiAgICAgYm9vbCBpc0xheW91dFNjaGVkdWxpbmdFbmFibGVk
KCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRTY2hlZHVsaW5nSXNFbmFibGVkOyB9CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwIGIvU291cmNl
L1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcAppbmRleCA4ZThjOTI1NDRhYTEu
LjJjMTlmMzU4YWViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29w
ZVJ1bGVTZXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNl
dHMuY3BwCkBAIC0xNjMsNiArMTYzLDE4IEBAIGJvb2wgU2NvcGVSdWxlU2V0czo6aGFzVmlld3Bv
cnREZXBlbmRlbnRNZWRpYVF1ZXJpZXMoKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAor
Ym9vbCBTY29wZVJ1bGVTZXRzOjpoYXNDb250YWluZXJRdWVyaWVzKCkgY29uc3QKK3sKKyAgICBp
ZiAobV9hdXRob3JTdHlsZS0+aGFzQ29udGFpbmVyUXVlcmllcygpKQorICAgICAgICByZXR1cm4g
dHJ1ZTsKKyAgICBpZiAobV91c2VyU3R5bGUgJiYgbV91c2VyU3R5bGUtPmhhc0NvbnRhaW5lclF1
ZXJpZXMoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKG1fdXNlckFnZW50TWVkaWFR
dWVyeVN0eWxlICYmIG1fdXNlckFnZW50TWVkaWFRdWVyeVN0eWxlLT5oYXNDb250YWluZXJRdWVy
aWVzKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJuIGZhbHNlOworfQorCiBz
dGQ6Om9wdGlvbmFsPER5bmFtaWNNZWRpYVF1ZXJ5RXZhbHVhdGlvbkNoYW5nZXM+IFNjb3BlUnVs
ZVNldHM6OmV2YWx1YXRlRHluYW1pY01lZGlhUXVlcnlSdWxlcyhjb25zdCBNZWRpYVF1ZXJ5RXZh
bHVhdG9yJiBldmFsdWF0b3IpCiB7CiAgICAgc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFRdWVy
eUV2YWx1YXRpb25DaGFuZ2VzPiBldmFsdWF0aW9uQ2hhbmdlczsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oIGIvU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmgKaW5kZXggNmJkOTE5OGU2ZGFjLi5hM2JkYjhlNGFkNjYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oCkBAIC03OSw2ICs3
OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc2V0VXNlckFnZW50TWVkaWFRdWVyeVN0eWxlKCk7
CiAKICAgICBib29sIGhhc1ZpZXdwb3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzKCkgY29uc3Q7Cisg
ICAgYm9vbCBoYXNDb250YWluZXJRdWVyaWVzKCkgY29uc3Q7CiAKICAgICBzdGQ6Om9wdGlvbmFs
PER5bmFtaWNNZWRpYVF1ZXJ5RXZhbHVhdGlvbkNoYW5nZXM+IGV2YWx1YXRlRHluYW1pY01lZGlh
UXVlcnlSdWxlcyhjb25zdCBNZWRpYVF1ZXJ5RXZhbHVhdG9yJik7CiAKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CmluZGV4IGMwY2JiMmUzYzcyMi4uMmQyOTI0YjllZjRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAg
LTQ3NzgsNiArNDc3OCw3IEBAIHdlYmtpdC5vcmcvYi8yMzg1NTUgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1mbGV4CiAKICMgQ29udGFpbmVy
IHF1ZXJpZXMKIHdlYmtpdC5vcmcvYi8yMjk2NTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY3VzdG9tLWxheW91dC1jb250
YWluZXItMDAxLmh0dHBzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8y
Mjk2NTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29u
dGFpbmVyLXF1ZXJpZXMvaW5saW5lLXNpemUtYmZjLWZsb2F0cy5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3N2Zy1mb3JlaWdub2JqZWN0LW5v
LXNpemUtY29udGFpbmVyLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8yMjk2NTkgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJp
ZXMvY29udGFpbmVyLXVuaXRzLWdyYWRpZW50LWludmFsaWRhdGlvbi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1n
cmFkaWVudC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWlu
ZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1l
eHBlY3RlZC50eHQKaW5kZXggOTNiY2VkNzBmNmE2Li44NDc1YTIyODdkMTEgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250
YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbi1jb250YWluZXItaW52YWxpZGF0aW9uLWV4
cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFpbmVy
LWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw0IEBACiAKIAotRkFJTCBAY29u
dGFpbmVyLWRlcGVuZGVudCBlbGVtZW50cyByZXNwb25kIHRvIHNpemUgY2hhbmdlcyBvZiBhbiBA
Y29udGFpbmVyLWRlcGVuZGVudCBpZnJhbWUgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgInJnYigw
LCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIKK1BBU1MgQGNvbnRhaW5lci1kZXBl
bmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBzaXplIGNoYW5nZXMgb2YgYW4gQGNvbnRhaW5lci1k
ZXBlbmRlbnQgaWZyYW1lCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFt
ZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1l
LWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNGZiMTkzZTA3NjA2Li43YjFlZDE3ZDYz
ZDEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbnZhbGlkYXRpb24t
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbnZhbGlkYXRp
b24tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAKLUZBSUwgQGNvbnRhaW5lci1kZXBl
bmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBpZnJhbWUgc2l6ZSBjaGFuZ2VzIGFzc2VydF9lcXVh
bHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCitQ
QVNTIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gaWZyYW1lIHNpemUg
Y2hhbmdlcwogCi0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=
</data>
<flag name="commit-queue"
          id="489086"
          type_id="3"
          status="+"
          setter="koivisto"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>459962</attachid>
            <date>2022-06-02 09:08:04 -0700</date>
            <delta_ts>2022-06-02 09:12:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-241225-20220602190803.patch</filename>
            <type>text/plain</type>
            <size>12687</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA5NTZlMTE2MDgzNGU3ZjkyNzk2NDhiODAzYjA1Mzg3ZWU3N2E2YmY2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMgZG9u
J3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMgZmFp
bHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29tZSBj
b250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNlL1dl
YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpDb21w
dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUgbGF5
b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNpbWls
YXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoK
KFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6OnVw
ZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2ViQ29y
ZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3Ojp1
cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0
Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRpb24g
bG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3ZlcmVk
LgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91dFdpdGhvdXRVcGRhdGlu
Z1F1ZXJ5Q29udGFpbmVycyk6CihXZWJDb3JlOjpGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpwZXJm
b3JtTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQu
aDoKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwOgooV2ViQ29y
ZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6Omhhc0NvbnRhaW5lclF1ZXJpZXMgY29uc3QpOgoqIFNv
dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oOgotLS0KIC4uLi9jc3MvQ1NT
Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCAgICAgICB8IDE4ICsrKysrKysrKysrLS0tLQog
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTIgKy0tLS0t
LS0tLQogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwICAgICAgICAgICAgIHwgIDUg
Ky0tLS0KIC4uLi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgICB8IDIy
ICsrKysrKysrKysrKysrKysrKy0KIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0
Q29udGV4dC5oICB8ICAyICsrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNl
dHMuY3BwICAgfCAxMiArKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3Bl
UnVsZVNldHMuaCAgICAgfCAgMSArCiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zICAgICAg
ICAgICAgICAgICAgfCAgMSArCiAuLi5hbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBl
Y3RlZC50eHQgfCAgMiArLQogLi4uL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0ICAg
ICAgICAgIHwgIDIgKy0KIDEwIGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDIyIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0
eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVE
ZWNsYXJhdGlvbi5jcHAKaW5kZXggODkyOGQ3MDk0ZDgxLi5jZjY0YzIzZjNiNDAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBA
IC0yODk1LDEwICsyODk1LDIwIEBAIFJlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJh
Y3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsCiAKICAgICAgICAg
c3R5bGUgPSBjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eSgqc3R5bGVkRWxlbWVudCwgbV9w
c2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBwcm9wZXJ0eUlELCBvd25lZFN0eWxlLCBzdHlsZWRSZW5k
ZXJlcigpKTsKIAotICAgICAgICAvLyBGSVhNRTogU29tZSBvZiB0aGVzZSBjYXNlcyBjb3VsZCBi
ZSBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIuCi0gICAgICAgIGZvcmNlRnVsbExh
eW91dCA9IGlzTGF5b3V0RGVwZW5kZW50KHByb3BlcnR5SUQsIHN0eWxlLCBzdHlsZWRSZW5kZXJl
cigpKQotICAgICAgICAgICAgfHwgc3R5bGVkRWxlbWVudC0+aXNJblNoYWRvd1RyZWUoKQotICAg
ICAgICAgICAgfHwgKGRvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCkgJiYg
ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKS0+aGFzVmlld3BvcnREZXBl
bmRlbnRNZWRpYVF1ZXJpZXMoKSAmJiBkb2N1bWVudC5vd25lckVsZW1lbnQoKSk7CisgICAgICAg
IGZvcmNlRnVsbExheW91dCA9IFsmXSB7CisgICAgICAgICAgICAvLyBGSVhNRTogU29tZSBvZiB0
aGVzZSBjYXNlcyBjb3VsZCBiZSBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIuCisg
ICAgICAgICAgICBpZiAoaXNMYXlvdXREZXBlbmRlbnQocHJvcGVydHlJRCwgc3R5bGUsIHN0eWxl
ZFJlbmRlcmVyKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAg
Ly8gRklYTUU6IFdoeT8KKyAgICAgICAgICAgIGlmIChzdHlsZWRFbGVtZW50LT5pc0luU2hhZG93
VHJlZSgpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgaWYgKCFk
b2N1bWVudC5vd25lckVsZW1lbnQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgICAgICAgICBpZiAoIWRvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCkp
CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgYXV0byYgcnVsZVNl
dHMgPSBkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpLT5ydWxlU2V0cygp
OworICAgICAgICAgICAgcmV0dXJuIHJ1bGVTZXRzLmhhc1ZpZXdwb3J0RGVwZW5kZW50TWVkaWFR
dWVyaWVzKCkgfHwgcnVsZVNldHMuaGFzQ29udGFpbmVyUXVlcmllcygpOworICAgICAgICB9KCk7
CiAKICAgICAgICAgaWYgKGZvcmNlRnVsbExheW91dCkKICAgICAgICAgICAgIGRvY3VtZW50LnVw
ZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j
cHAKaW5kZXggOWQwN2ZjODVlMTFjLi5kYjJiNDI5MTgxMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50
LmNwcApAQCAtMjEwMSw3ICsyMTAxLDcgQEAgdm9pZCBEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKFJl
c29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgICAgIHVwZGF0ZVJlbmRlclRyZWUoV1RGTW92
ZShzdHlsZVVwZGF0ZSkpOwogCiAgICAgICAgICAgICBpZiAoZnJhbWVWaWV3LmxheW91dENvbnRl
eHQoKS5uZWVkc0xheW91dCgpKQotICAgICAgICAgICAgICAgIGZyYW1lVmlldy5sYXlvdXRDb250
ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQo
KS5sYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMoKTsKIAogICAgICAgICAgICAg
c3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7CiAgICAgICAgIH0KQEAgLTIyNjAsMTYg
KzIyNjAsNiBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVMYXlvdXQoKQogICAgICAgICByZXR1cm47
CiAKICAgICBmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKLQotICAgIFN0eWxl
OjpTY29wZTo6UXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0IHF1ZXJ5Q29udGFpbmVyVXBkYXRl
Q29udGV4dDsKLSAgICB3aGlsZSAoc3R5bGVTY29wZSgpLnVwZGF0ZVF1ZXJ5Q29udGFpbmVyU3Rh
dGUocXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0KSkgewotICAgICAgICB1cGRhdGVTdHlsZUlm
TmVlZGVkKCk7Ci0KLSAgICAgICAgaWYgKCFmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5uZWVk
c0xheW91dCgpKQotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgZnJhbWVWaWV3LT5sYXlv
dXRDb250ZXh0KCkubGF5b3V0KCk7Ci0gICAgfQogfQogCiB2b2lkIERvY3VtZW50Ojp1cGRhdGVM
YXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoRG9jdW1lbnQ6OlJ1blBvc3RMYXlvdXRUYXNr
cyBydW5Qb3N0TGF5b3V0VGFza3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOTQ0
ZmUyYmU1NTY4Li41Y2U4MmYxNjZkMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
RnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAg
LTI4NjMsNyArMjg2Myw3IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUoKQog
I2VuZGlmCiAKICAgICBpZiAoc2hvdWxkTGF5b3V0QWZ0ZXJDb250ZW50c1Jlc2l6ZWQoKSAmJiBu
ZWVkc0xheW91dCgpKQotICAgICAgICBsYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAg
IGxheW91dENvbnRleHQoKS5sYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMoKTsK
IAogICAgIGlmIChSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpKSB7
CiAgICAgICAgIGlmIChyZW5kZXJWaWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKQEAgLTQ1NTMsOCAr
NDU1Myw2IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVj
dXJzaXZlKCkKICAgICAgICAgcmV0dXJuIGRlc2NlbmRhbnRzRGVxdWUuZmlyc3QoKS5wdHIoKTsK
ICAgICB9OwogCi0gICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRhaW5lclVwZGF0ZUNvbnRleHQg
cXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OwotCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg
aSA8IG1heFVwZGF0ZVBhc3NlczsgKytpKSB7CiAgICAgICAgIGJvb2wgZGlkV29yayA9IGZhbHNl
OwogICAgICAgICBEZXNjZW5kYW50c0RlcXVlIGRlcXVlOwpAQCAtNDU2Myw3ICs0NTYxLDYgQEAg
dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQog
ICAgICAgICAgICAgICAgIGRpZFdvcmsgPSB0cnVlOwogICAgICAgICAgICAgaWYgKHZpZXctPm5l
ZWRzTGF5b3V0KCkpIHsKICAgICAgICAgICAgICAgICB2aWV3LT5sYXlvdXRDb250ZXh0KCkubGF5
b3V0KCk7Ci0gICAgICAgICAgICAgICAgdmlldy0+ZnJhbWUoKS5kb2N1bWVudCgpLT5zdHlsZVNj
b3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5lclVwZGF0ZUNvbnRl
eHQpOwogICAgICAgICAgICAgICAgIGRpZFdvcmsgPSB0cnVlOwogICAgICAgICAgICAgfQogICAg
ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENv
bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNw
cAppbmRleCAyZmYzMTAyM2ZhYmYuLjZlZDRmNTg3Y2MwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCkBAIC0xNjcsNyArMTY3LDI3IEBAIEZy
YW1lVmlld0xheW91dENvbnRleHQ6On5GcmFtZVZpZXdMYXlvdXRDb250ZXh0KCkKIAogdm9pZCBG
cmFtZVZpZXdMYXlvdXRDb250ZXh0OjpsYXlvdXQoKQogewotICAgIExPR19XSVRIX1NUUkVBTShM
YXlvdXQsIHN0cmVhbSA8PCAiRnJhbWVWaWV3ICIgPDwgJnZpZXcoKSA8PCAiIEZyYW1lVmlld0xh
eW91dENvbnRleHQ6OmxheW91dCgpIHdpdGggc2l6ZSAiIDw8IHZpZXcoKS5sYXlvdXRTaXplKCkp
OworICAgIHBlcmZvcm1MYXlvdXQoKTsKKworICAgIFN0eWxlOjpTY29wZTo6UXVlcnlDb250YWlu
ZXJVcGRhdGVDb250ZXh0IHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dDsKKyAgICB3aGlsZSAo
ZG9jdW1lbnQoKS0+c3R5bGVTY29wZSgpLnVwZGF0ZVF1ZXJ5Q29udGFpbmVyU3RhdGUocXVlcnlD
b250YWluZXJVcGRhdGVDb250ZXh0KSkgeworICAgICAgICBkb2N1bWVudCgpLT51cGRhdGVTdHls
ZUlmTmVlZGVkKCk7CisKKyAgICAgICAgaWYgKCFuZWVkc0xheW91dCgpKQorICAgICAgICAgICAg
YnJlYWs7CisKKyAgICAgICAgcGVyZm9ybUxheW91dCgpOworICAgIH0KK30KKwordm9pZCBGcmFt
ZVZpZXdMYXlvdXRDb250ZXh0OjpsYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMo
KQoreworICAgIHBlcmZvcm1MYXlvdXQoKTsKK30KKwordm9pZCBGcmFtZVZpZXdMYXlvdXRDb250
ZXh0OjpwZXJmb3JtTGF5b3V0KCkKK3sKKyAgICBMT0dfV0lUSF9TVFJFQU0oTGF5b3V0LCBzdHJl
YW0gPDwgIkZyYW1lVmlldyAiIDw8ICZ2aWV3KCkgPDwgIiBGcmFtZVZpZXdMYXlvdXRDb250ZXh0
OjpwZXJmb3JtTGF5b3V0KCkgd2l0aCBzaXplICIgPDwgdmlldygpLmxheW91dFNpemUoKSk7CiAK
ICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFmcmFtZSgpLmRv
Y3VtZW50KCktPmluUmVuZGVyVHJlZVVwZGF0ZSgpKTsKICAgICBBU1NFUlQoTGF5b3V0RGlzYWxs
b3dlZFNjb3BlOjppc0xheW91dEFsbG93ZWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh
bWVWaWV3TGF5b3V0Q29udGV4dC5oCmluZGV4IDZmOWViMWUwOTM4Mi4uMjIzYWM5M2FjZWFkIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaApAQCAtNTUs
NiArNTUsNyBAQCBwdWJsaWM6CiAgICAgfkZyYW1lVmlld0xheW91dENvbnRleHQoKTsKIAogICAg
IHZvaWQgbGF5b3V0KCk7CisgICAgdm9pZCBsYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRh
aW5lcnMoKTsKICAgICBib29sIG5lZWRzTGF5b3V0KCkgY29uc3Q7CiAKICAgICAvLyBXZSByZWx5
IG9uIHRoZSBzaWRlLWVmZmVjdHMgb2YgbGF5b3V0LCBsaWtlIGNvbXBvc2l0aW5nIHVwZGF0ZXMs
IHRvIHVwZGF0ZSBzdGF0ZSBpbiB2YXJpb3VzIHN1YnN5c3RlbXMKQEAgLTEyNyw2ICsxMjgsNyBA
QCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVy
OwogICAgIGZyaWVuZCBjbGFzcyBQYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI7CiAKKyAg
ICB2b2lkIHBlcmZvcm1MYXlvdXQoKTsKICAgICBib29sIGNhblBlcmZvcm1MYXlvdXQoKSBjb25z
dDsKICAgICBib29sIGxheW91dERpc2FsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX2xheW91dERp
c2FsbG93ZWRDb3VudDsgfQogICAgIGJvb2wgaXNMYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCgpIGNv
bnN0IHsgcmV0dXJuIG1fbGF5b3V0U2NoZWR1bGluZ0lzRW5hYmxlZDsgfQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKaW5kZXggOGU4YzkyNTQ0YWExLi4yYzE5
ZjM1OGFlYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxl
U2V0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNw
cApAQCAtMTYzLDYgKzE2MywxOCBAQCBib29sIFNjb3BlUnVsZVNldHM6Omhhc1ZpZXdwb3J0RGVw
ZW5kZW50TWVkaWFRdWVyaWVzKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wg
U2NvcGVSdWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmllcygpIGNvbnN0Cit7CisgICAgaWYgKG1f
YXV0aG9yU3R5bGUtPmhhc0NvbnRhaW5lclF1ZXJpZXMoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7
CisgICAgaWYgKG1fdXNlclN0eWxlICYmIG1fdXNlclN0eWxlLT5oYXNDb250YWluZXJRdWVyaWVz
KCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChtX3VzZXJBZ2VudE1lZGlhUXVlcnlT
dHlsZSAmJiBtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZS0+aGFzQ29udGFpbmVyUXVlcmllcygp
KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogc3RkOjpv
cHRpb25hbDxEeW5hbWljTWVkaWFRdWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBTY29wZVJ1bGVTZXRz
OjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMoY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRv
ciYgZXZhbHVhdG9yKQogewogICAgIHN0ZDo6b3B0aW9uYWw8RHluYW1pY01lZGlhUXVlcnlFdmFs
dWF0aW9uQ2hhbmdlcz4gZXZhbHVhdGlvbkNoYW5nZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0
eWxlU2NvcGVSdWxlU2V0cy5oCmluZGV4IDZiZDkxOThlNmRhYy4uYTNiZGI4ZTRhZDY2IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaApAQCAtNzksNiArNzksNyBA
QCBwdWJsaWM6CiAgICAgdm9pZCByZXNldFVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSgpOwogCiAg
ICAgYm9vbCBoYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmllcygpIGNvbnN0OworICAgIGJv
b2wgaGFzQ29udGFpbmVyUXVlcmllcygpIGNvbnN0OwogCiAgICAgc3RkOjpvcHRpb25hbDxEeW5h
bWljTWVkaWFRdWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5
UnVsZXMoY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl
eCBjMGNiYjJlM2M3MjIuLjJkMjkyNGI5ZWY0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00Nzc4
LDYgKzQ3NzgsNyBAQCB3ZWJraXQub3JnL2IvMjM4NTU1IGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW4tZmxleAogCiAjIENvbnRhaW5lciBxdWVy
aWVzCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2N1c3RvbS1sYXlvdXQtY29udGFpbmVy
LTAwMS5odHRwcy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5NjU5
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5l
ci1xdWVyaWVzL2lubGluZS1zaXplLWJmYy1mbG9hdHMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9zdmctZm9yZWlnbm9iamVjdC1uby1zaXpl
LWNvbnRhaW5lci5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2Nv
bnRhaW5lci11bml0cy1ncmFkaWVudC1pbnZhbGlkYXRpb24uaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItdW5pdHMtZ3JhZGll
bnQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1
ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4v
Y29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0
ZWQudHh0CmluZGV4IDkzYmNlZDcwZjZhNi4uODQ3NWEyMjg3ZDExIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9j
b250YWluZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3Rl
ZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZh
bGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAKLUZBSUwgQGNvbnRhaW5l
ci1kZXBlbmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBzaXplIGNoYW5nZXMgb2YgYW4gQGNvbnRh
aW5lci1kZXBlbmRlbnQgaWZyYW1lIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4
LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCitQQVNTIEBjb250YWluZXItZGVwZW5kZW50
IGVsZW1lbnRzIHJlc3BvbmQgdG8gc2l6ZSBjaGFuZ2VzIG9mIGFuIEBjb250YWluZXItZGVwZW5k
ZW50IGlmcmFtZQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52
YWxpZGF0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbnZh
bGlkYXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDRmYjE5M2UwNzYwNi4uN2IxZWQxN2Q2M2QxIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVj
dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4
cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAogCi1GQUlMIEBjb250YWluZXItZGVwZW5kZW50
IGVsZW1lbnRzIHJlc3BvbmQgdG8gaWZyYW1lIHNpemUgY2hhbmdlcyBhc3NlcnRfZXF1YWxzOiBl
eHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAsIDApIgorUEFTUyBA
Y29udGFpbmVyLWRlcGVuZGVudCBlbGVtZW50cyByZXNwb25kIHRvIGlmcmFtZSBzaXplIGNoYW5n
ZXMKIAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>459963</attachid>
            <date>2022-06-02 09:12:38 -0700</date>
            <delta_ts>2022-06-02 09:36:10 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-241225-20220602191237.patch</filename>
            <type>text/plain</type>
            <size>12694</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA1MTBjNzIwYzJjZTg2ZjdhZTU3N2E1MWZiNDE4NjBhMDIyMTM2NTJhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMgZG9u
J3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMgZmFp
bHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29tZSBj
b250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNlL1dl
YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpDb21w
dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUgbGF5
b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNpbWls
YXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoK
KFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6OnVw
ZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2ViQ29y
ZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3Ojp1
cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0
Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRpb24g
bG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3ZlcmVk
LgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91dFdpdGhvdXRVcGRhdGlu
Z1F1ZXJ5Q29udGFpbmVycyk6CihXZWJDb3JlOjpGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpwZXJm
b3JtTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQu
aDoKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwOgooV2ViQ29y
ZTo6U3R5bGU6OlNjb3BlUnVsZVNldHM6Omhhc0NvbnRhaW5lclF1ZXJpZXMgY29uc3QpOgoqIFNv
dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oOgotLS0KIC4uLi9jc3MvQ1NT
Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCAgICAgICB8IDE4ICsrKysrKysrKysrLS0tLQog
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgIHwgMTIgKy0tLS0t
LS0tLQogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwICAgICAgICAgICAgIHwgIDUg
Ky0tLS0KIC4uLi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgICB8IDIy
ICsrKysrKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0
Q29udGV4dC5oICB8ICAyICsrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNl
dHMuY3BwICAgfCAxMiArKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3Bl
UnVsZVNldHMuaCAgICAgfCAgMSArCiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zICAgICAg
ICAgICAgICAgICAgfCAgMSArCiAuLi5hbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBl
Y3RlZC50eHQgfCAgMiArLQogLi4uL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0ICAg
ICAgICAgIHwgIDIgKy0KIDEwIGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDIxIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0
eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVE
ZWNsYXJhdGlvbi5jcHAKaW5kZXggODkyOGQ3MDk0ZDgxLi5jZjY0YzIzZjNiNDAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBA
IC0yODk1LDEwICsyODk1LDIwIEBAIFJlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJh
Y3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsCiAKICAgICAgICAg
c3R5bGUgPSBjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eSgqc3R5bGVkRWxlbWVudCwgbV9w
c2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBwcm9wZXJ0eUlELCBvd25lZFN0eWxlLCBzdHlsZWRSZW5k
ZXJlcigpKTsKIAotICAgICAgICAvLyBGSVhNRTogU29tZSBvZiB0aGVzZSBjYXNlcyBjb3VsZCBi
ZSBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIuCi0gICAgICAgIGZvcmNlRnVsbExh
eW91dCA9IGlzTGF5b3V0RGVwZW5kZW50KHByb3BlcnR5SUQsIHN0eWxlLCBzdHlsZWRSZW5kZXJl
cigpKQotICAgICAgICAgICAgfHwgc3R5bGVkRWxlbWVudC0+aXNJblNoYWRvd1RyZWUoKQotICAg
ICAgICAgICAgfHwgKGRvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCkgJiYg
ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKS0+aGFzVmlld3BvcnREZXBl
bmRlbnRNZWRpYVF1ZXJpZXMoKSAmJiBkb2N1bWVudC5vd25lckVsZW1lbnQoKSk7CisgICAgICAg
IGZvcmNlRnVsbExheW91dCA9IFsmXSB7CisgICAgICAgICAgICAvLyBGSVhNRTogU29tZSBvZiB0
aGVzZSBjYXNlcyBjb3VsZCBiZSBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIuCisg
ICAgICAgICAgICBpZiAoaXNMYXlvdXREZXBlbmRlbnQocHJvcGVydHlJRCwgc3R5bGUsIHN0eWxl
ZFJlbmRlcmVyKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAg
Ly8gRklYTUU6IFdoeT8KKyAgICAgICAgICAgIGlmIChzdHlsZWRFbGVtZW50LT5pc0luU2hhZG93
VHJlZSgpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgaWYgKCFk
b2N1bWVudC5vd25lckVsZW1lbnQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgICAgICAgICBpZiAoIWRvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCkp
CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgYXV0byYgcnVsZVNl
dHMgPSBkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpLT5ydWxlU2V0cygp
OworICAgICAgICAgICAgcmV0dXJuIHJ1bGVTZXRzLmhhc1ZpZXdwb3J0RGVwZW5kZW50TWVkaWFR
dWVyaWVzKCkgfHwgcnVsZVNldHMuaGFzQ29udGFpbmVyUXVlcmllcygpOworICAgICAgICB9KCk7
CiAKICAgICAgICAgaWYgKGZvcmNlRnVsbExheW91dCkKICAgICAgICAgICAgIGRvY3VtZW50LnVw
ZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j
cHAKaW5kZXggOWQwN2ZjODVlMTFjLi5kYjJiNDI5MTgxMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50
LmNwcApAQCAtMjEwMSw3ICsyMTAxLDcgQEAgdm9pZCBEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKFJl
c29sdmVTdHlsZVR5cGUgdHlwZSkKICAgICAgICAgICAgIHVwZGF0ZVJlbmRlclRyZWUoV1RGTW92
ZShzdHlsZVVwZGF0ZSkpOwogCiAgICAgICAgICAgICBpZiAoZnJhbWVWaWV3LmxheW91dENvbnRl
eHQoKS5uZWVkc0xheW91dCgpKQotICAgICAgICAgICAgICAgIGZyYW1lVmlldy5sYXlvdXRDb250
ZXh0KCkubGF5b3V0KCk7CisgICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQo
KS5sYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMoKTsKIAogICAgICAgICAgICAg
c3R5bGVVcGRhdGUgPSByZXNvbHZlci5yZXNvbHZlKCk7CiAgICAgICAgIH0KQEAgLTIyNjAsMTYg
KzIyNjAsNiBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVMYXlvdXQoKQogICAgICAgICByZXR1cm47
CiAKICAgICBmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKLQotICAgIFN0eWxl
OjpTY29wZTo6UXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0IHF1ZXJ5Q29udGFpbmVyVXBkYXRl
Q29udGV4dDsKLSAgICB3aGlsZSAoc3R5bGVTY29wZSgpLnVwZGF0ZVF1ZXJ5Q29udGFpbmVyU3Rh
dGUocXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0KSkgewotICAgICAgICB1cGRhdGVTdHlsZUlm
TmVlZGVkKCk7Ci0KLSAgICAgICAgaWYgKCFmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5uZWVk
c0xheW91dCgpKQotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgZnJhbWVWaWV3LT5sYXlv
dXRDb250ZXh0KCkubGF5b3V0KCk7Ci0gICAgfQogfQogCiB2b2lkIERvY3VtZW50Ojp1cGRhdGVM
YXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoRG9jdW1lbnQ6OlJ1blBvc3RMYXlvdXRUYXNr
cyBydW5Qb3N0TGF5b3V0VGFza3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOTQ0
ZmUyYmU1NTY4Li41Y2U4MmYxNjZkMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
RnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAg
LTI4NjMsNyArMjg2Myw3IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUoKQog
I2VuZGlmCiAKICAgICBpZiAoc2hvdWxkTGF5b3V0QWZ0ZXJDb250ZW50c1Jlc2l6ZWQoKSAmJiBu
ZWVkc0xheW91dCgpKQotICAgICAgICBsYXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CisgICAgICAg
IGxheW91dENvbnRleHQoKS5sYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMoKTsK
IAogICAgIGlmIChSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpKSB7
CiAgICAgICAgIGlmIChyZW5kZXJWaWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKQEAgLTQ1NTMsOCAr
NDU1Myw2IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVj
dXJzaXZlKCkKICAgICAgICAgcmV0dXJuIGRlc2NlbmRhbnRzRGVxdWUuZmlyc3QoKS5wdHIoKTsK
ICAgICB9OwogCi0gICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRhaW5lclVwZGF0ZUNvbnRleHQg
cXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OwotCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg
aSA8IG1heFVwZGF0ZVBhc3NlczsgKytpKSB7CiAgICAgICAgIGJvb2wgZGlkV29yayA9IGZhbHNl
OwogICAgICAgICBEZXNjZW5kYW50c0RlcXVlIGRlcXVlOwpAQCAtNDU2Myw3ICs0NTYxLDYgQEAg
dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQog
ICAgICAgICAgICAgICAgIGRpZFdvcmsgPSB0cnVlOwogICAgICAgICAgICAgaWYgKHZpZXctPm5l
ZWRzTGF5b3V0KCkpIHsKICAgICAgICAgICAgICAgICB2aWV3LT5sYXlvdXRDb250ZXh0KCkubGF5
b3V0KCk7Ci0gICAgICAgICAgICAgICAgdmlldy0+ZnJhbWUoKS5kb2N1bWVudCgpLT5zdHlsZVNj
b3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5lclVwZGF0ZUNvbnRl
eHQpOwogICAgICAgICAgICAgICAgIGRpZFdvcmsgPSB0cnVlOwogICAgICAgICAgICAgfQogICAg
ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENv
bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNw
cAppbmRleCAyZmYzMTAyM2ZhYmYuLmE0ZjhmY2MxNGUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCkBAIC0xNjksNiArMTY5LDI4IEBAIHZv
aWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6bGF5b3V0KCkKIHsKICAgICBMT0dfV0lUSF9TVFJF
QU0oTGF5b3V0LCBzdHJlYW0gPDwgIkZyYW1lVmlldyAiIDw8ICZ2aWV3KCkgPDwgIiBGcmFtZVZp
ZXdMYXlvdXRDb250ZXh0OjpsYXlvdXQoKSB3aXRoIHNpemUgIiA8PCB2aWV3KCkubGF5b3V0U2l6
ZSgpKTsKIAorICAgIHBlcmZvcm1MYXlvdXQoKTsKKworICAgIFN0eWxlOjpTY29wZTo6UXVlcnlD
b250YWluZXJVcGRhdGVDb250ZXh0IHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dDsKKyAgICB3
aGlsZSAoZG9jdW1lbnQoKS0+c3R5bGVTY29wZSgpLnVwZGF0ZVF1ZXJ5Q29udGFpbmVyU3RhdGUo
cXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0KSkgeworICAgICAgICBkb2N1bWVudCgpLT51cGRh
dGVTdHlsZUlmTmVlZGVkKCk7CisKKyAgICAgICAgaWYgKCFuZWVkc0xheW91dCgpKQorICAgICAg
ICAgICAgYnJlYWs7CisKKyAgICAgICAgcGVyZm9ybUxheW91dCgpOworICAgIH0KK30KKwordm9p
ZCBGcmFtZVZpZXdMYXlvdXRDb250ZXh0OjpsYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRh
aW5lcnMoKQoreworICAgIExPR19XSVRIX1NUUkVBTShMYXlvdXQsIHN0cmVhbSA8PCAiRnJhbWVW
aWV3ICIgPDwgJnZpZXcoKSA8PCAiIEZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91dFdpdGhv
dXRVcGRhdGluZ1F1ZXJ5Q29udGFpbmVycygpIHdpdGggc2l6ZSAiIDw8IHZpZXcoKS5sYXlvdXRT
aXplKCkpOworCisgICAgcGVyZm9ybUxheW91dCgpOworfQorCit2b2lkIEZyYW1lVmlld0xheW91
dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQoKQorewogICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VD
VVJJVFlfSU1QTElDQVRJT04oIWZyYW1lKCkuZG9jdW1lbnQoKS0+aW5SZW5kZXJUcmVlVXBkYXRl
KCkpOwogICAgIEFTU0VSVChMYXlvdXREaXNhbGxvd2VkU2NvcGU6OmlzTGF5b3V0QWxsb3dlZCgp
KTsKICAgICBBU1NFUlQoIXZpZXcoKS5pc1BhaW50aW5nKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaAppbmRleCA2ZjllYjFlMDkzODIuLjIyM2FjOTNh
Y2VhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250
ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmgK
QEAgLTU1LDYgKzU1LDcgQEAgcHVibGljOgogICAgIH5GcmFtZVZpZXdMYXlvdXRDb250ZXh0KCk7
CiAKICAgICB2b2lkIGxheW91dCgpOworICAgIHZvaWQgbGF5b3V0V2l0aG91dFVwZGF0aW5nUXVl
cnlDb250YWluZXJzKCk7CiAgICAgYm9vbCBuZWVkc0xheW91dCgpIGNvbnN0OwogCiAgICAgLy8g
V2UgcmVseSBvbiB0aGUgc2lkZS1lZmZlY3RzIG9mIGxheW91dCwgbGlrZSBjb21wb3NpdGluZyB1
cGRhdGVzLCB0byB1cGRhdGUgc3RhdGUgaW4gdmFyaW91cyBzdWJzeXN0ZW1zCkBAIC0xMjcsNiAr
MTI4LDcgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgU3VidHJlZUxheW91dFN0YXRlTWFp
bnRhaW5lcjsKICAgICBmcmllbmQgY2xhc3MgUGFnaW5hdGVkTGF5b3V0U3RhdGVNYWludGFpbmVy
OwogCisgICAgdm9pZCBwZXJmb3JtTGF5b3V0KCk7CiAgICAgYm9vbCBjYW5QZXJmb3JtTGF5b3V0
KCkgY29uc3Q7CiAgICAgYm9vbCBsYXlvdXREaXNhbGxvd2VkKCkgY29uc3QgeyByZXR1cm4gbV9s
YXlvdXREaXNhbGxvd2VkQ291bnQ7IH0KICAgICBib29sIGlzTGF5b3V0U2NoZWR1bGluZ0VuYWJs
ZWQoKSBjb25zdCB7IHJldHVybiBtX2xheW91dFNjaGVkdWxpbmdJc0VuYWJsZWQ7IH0KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwCmluZGV4IDhlOGM5MjU0NGFh
MS4uMmMxOWYzNThhZWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNj
b3BlUnVsZVNldHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxl
U2V0cy5jcHAKQEAgLTE2Myw2ICsxNjMsMTggQEAgYm9vbCBTY29wZVJ1bGVTZXRzOjpoYXNWaWV3
cG9ydERlcGVuZGVudE1lZGlhUXVlcmllcygpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQog
Citib29sIFNjb3BlUnVsZVNldHM6Omhhc0NvbnRhaW5lclF1ZXJpZXMoKSBjb25zdAoreworICAg
IGlmIChtX2F1dGhvclN0eWxlLT5oYXNDb250YWluZXJRdWVyaWVzKCkpCisgICAgICAgIHJldHVy
biB0cnVlOworICAgIGlmIChtX3VzZXJTdHlsZSAmJiBtX3VzZXJTdHlsZS0+aGFzQ29udGFpbmVy
UXVlcmllcygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAobV91c2VyQWdlbnRNZWRp
YVF1ZXJ5U3R5bGUgJiYgbV91c2VyQWdlbnRNZWRpYVF1ZXJ5U3R5bGUtPmhhc0NvbnRhaW5lclF1
ZXJpZXMoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisK
IHN0ZDo6b3B0aW9uYWw8RHluYW1pY01lZGlhUXVlcnlFdmFsdWF0aW9uQ2hhbmdlcz4gU2NvcGVS
dWxlU2V0czo6ZXZhbHVhdGVEeW5hbWljTWVkaWFRdWVyeVJ1bGVzKGNvbnN0IE1lZGlhUXVlcnlF
dmFsdWF0b3ImIGV2YWx1YXRvcikKIHsKICAgICBzdGQ6Om9wdGlvbmFsPER5bmFtaWNNZWRpYVF1
ZXJ5RXZhbHVhdGlvbkNoYW5nZXM+IGV2YWx1YXRpb25DaGFuZ2VzOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmggYi9Tb3VyY2UvV2ViQ29yZS9z
dHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaAppbmRleCA2YmQ5MTk4ZTZkYWMuLmEzYmRiOGU0YWQ2
NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmgK
KysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmgKQEAgLTc5LDYg
Kzc5LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXRVc2VyQWdlbnRNZWRpYVF1ZXJ5U3R5bGUo
KTsKIAogICAgIGJvb2wgaGFzVmlld3BvcnREZXBlbmRlbnRNZWRpYVF1ZXJpZXMoKSBjb25zdDsK
KyAgICBib29sIGhhc0NvbnRhaW5lclF1ZXJpZXMoKSBjb25zdDsKIAogICAgIHN0ZDo6b3B0aW9u
YWw8RHluYW1pY01lZGlhUXVlcnlFdmFsdWF0aW9uQ2hhbmdlcz4gZXZhbHVhdGVEeW5hbWljTWVk
aWFRdWVyeVJ1bGVzKGNvbnN0IE1lZGlhUXVlcnlFdmFsdWF0b3ImKTsKIApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMKaW5kZXggYzBjYmIyZTNjNzIyLi4yZDI5MjRiOWVmNGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA
QCAtNDc3OCw2ICs0Nzc4LDcgQEAgd2Via2l0Lm9yZy9iLzIzODU1NSBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLWZsZXgKIAogIyBDb250YWlu
ZXIgcXVlcmllcwogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jdXN0b20tbGF5b3V0LWNv
bnRhaW5lci0wMDEuaHR0cHMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9i
LzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9j
b250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjk2NTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvc3ZnLWZvcmVpZ25vYmplY3Qt
bm8tc2l6ZS1jb250YWluZXIuaHRtbCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl
cmllcy9jb250YWluZXItdW5pdHMtZ3JhZGllbnQtaW52YWxpZGF0aW9uLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjk2NTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXVuaXRz
LWdyYWRpZW50Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW5lci1xdWVyaWVzL2lmcmFtZS1pbi1jb250YWluZXItaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4
dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j
b250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbi1jb250YWluZXItaW52YWxpZGF0aW9u
LWV4cGVjdGVkLnR4dAppbmRleCA5M2JjZWQ3MGY2YTYuLjg0NzVhMjI4N2QxMSAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNv
bnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24t
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbi1jb250YWlu
ZXItaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAogCi1GQUlMIEBj
b250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gc2l6ZSBjaGFuZ2VzIG9mIGFu
IEBjb250YWluZXItZGVwZW5kZW50IGlmcmFtZSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAicmdi
KDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAsIDApIgorUEFTUyBAY29udGFpbmVyLWRl
cGVuZGVudCBlbGVtZW50cyByZXNwb25kIHRvIHNpemUgY2hhbmdlcyBvZiBhbiBAY29udGFpbmVy
LWRlcGVuZGVudCBpZnJhbWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZy
YW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJh
bWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAppbmRleCA0ZmIxOTNlMDc2MDYuLjdiMWVkMTdk
NjNkMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlv
bi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRh
dGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw0IEBACiAKIAotRkFJTCBAY29udGFpbmVyLWRl
cGVuZGVudCBlbGVtZW50cyByZXNwb25kIHRvIGlmcmFtZSBzaXplIGNoYW5nZXMgYXNzZXJ0X2Vx
dWFsczogZXhwZWN0ZWQgInJnYigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIK
K1BBU1MgQGNvbnRhaW5lci1kZXBlbmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBpZnJhbWUgc2l6
ZSBjaGFuZ2VzCiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>459964</attachid>
            <date>2022-06-02 09:36:14 -0700</date>
            <delta_ts>2022-06-02 09:50:39 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-241225-20220602193613.patch</filename>
            <type>text/plain</type>
            <size>12621</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA5MTY4NjZkZDI4N2M2NmY2ZjZkNzhhOTY2NWY2YmFjNjY4NTQyNWQwIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMgZG9u
J3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMgZmFp
bHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29tZSBj
b250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNlL1dl
YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpDb21w
dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUgbGF5
b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNpbWls
YXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoK
KFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6OnVw
ZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2ViQ29y
ZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3Ojp1
cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0
Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRpb24g
bG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3ZlcmVk
LgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQpOgoqIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oOgoqIFNvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHA6CihXZWJDb3JlOjpTdHlsZTo6U2NvcGVS
dWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmllcyBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmg6Ci0tLQogLi4uL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVj
bGFyYXRpb24uY3BwICAgICAgIHwgMTggKysrKysrKysrKystLS0tCiBTb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuY3BwICAgICAgICAgICAgICAgfCAxMiArLS0tLS0tLS0tCiBTb3VyY2UvV2Vi
Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgICAgICAgICAgICAgfCAgNSArLS0tLQogLi4uL1dlYkNv
cmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcCAgIHwgMjIgKysrKysrKysrKysrKysr
KysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmggIHwgIDIg
KysKIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAgICB8IDEyICsr
KysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oICAgICB8
ICAxICsKIExheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgICAgICAgICAgICAgICAgICB8ICAx
ICsKIC4uLmFtZS1pbi1jb250YWluZXItaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dCB8ICAyICst
CiAuLi4vaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQgICAgICAgICAgfCAgMiArLQog
MTAgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApp
bmRleCA4OTI4ZDcwOTRkODEuLmNmNjRjMjNmM2I0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTI4OTUsMTAgKzI4OTUs
MjAgQEAgUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZh
bHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwKIAogICAgICAgICBzdHlsZSA9IGNvbXB1dGVS
ZW5kZXJTdHlsZUZvclByb3BlcnR5KCpzdHlsZWRFbGVtZW50LCBtX3BzZXVkb0VsZW1lbnRTcGVj
aWZpZXIsIHByb3BlcnR5SUQsIG93bmVkU3R5bGUsIHN0eWxlZFJlbmRlcmVyKCkpOwogCi0gICAg
ICAgIC8vIEZJWE1FOiBTb21lIG9mIHRoZXNlIGNhc2VzIGNvdWxkIGJlIG5hcnJvd2VkIGRvd24g
b3Igb3B0aW1pemVkIGJldHRlci4KLSAgICAgICAgZm9yY2VGdWxsTGF5b3V0ID0gaXNMYXlvdXRE
ZXBlbmRlbnQocHJvcGVydHlJRCwgc3R5bGUsIHN0eWxlZFJlbmRlcmVyKCkpCi0gICAgICAgICAg
ICB8fCBzdHlsZWRFbGVtZW50LT5pc0luU2hhZG93VHJlZSgpCi0gICAgICAgICAgICB8fCAoZG9j
dW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKSAmJiBkb2N1bWVudC5zdHlsZVNj
b3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpLT5oYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmll
cygpICYmIGRvY3VtZW50Lm93bmVyRWxlbWVudCgpKTsKKyAgICAgICAgZm9yY2VGdWxsTGF5b3V0
ID0gWyZdIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBTb21lIG9mIHRoZXNlIGNhc2VzIGNvdWxk
IGJlIG5hcnJvd2VkIGRvd24gb3Igb3B0aW1pemVkIGJldHRlci4KKyAgICAgICAgICAgIGlmIChp
c0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwgc3R5bGVkUmVuZGVyZXIoKSkpCisg
ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAvLyBGSVhNRTogV2h5Pwor
ICAgICAgICAgICAgaWYgKHN0eWxlZEVsZW1lbnQtPmlzSW5TaGFkb3dUcmVlKCkpCisgICAgICAg
ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBpZiAoIWRvY3VtZW50Lm93bmVyRWxl
bWVudCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGlmICgh
ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKSkKKyAgICAgICAgICAgICAg
ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBhdXRvJiBydWxlU2V0cyA9IGRvY3VtZW50LnN0
eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCktPnJ1bGVTZXRzKCk7CisgICAgICAgICAgICBy
ZXR1cm4gcnVsZVNldHMuaGFzVmlld3BvcnREZXBlbmRlbnRNZWRpYVF1ZXJpZXMoKSB8fCBydWxl
U2V0cy5oYXNDb250YWluZXJRdWVyaWVzKCk7CisgICAgICAgIH0oKTsKIAogICAgICAgICBpZiAo
Zm9yY2VGdWxsTGF5b3V0KQogICAgICAgICAgICAgZG9jdW1lbnQudXBkYXRlTGF5b3V0SWdub3Jl
UGVuZGluZ1N0eWxlc2hlZXRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j
dW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5ZDA3ZmM4
NWUxMWMuLmRiMmI0MjkxODExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt
ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0yMTAxLDcg
KzIxMDEsNyBAQCB2b2lkIERvY3VtZW50OjpyZXNvbHZlU3R5bGUoUmVzb2x2ZVN0eWxlVHlwZSB0
eXBlKQogICAgICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZShXVEZNb3ZlKHN0eWxlVXBkYXRlKSk7
CiAKICAgICAgICAgICAgIGlmIChmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0
KCkpCi0gICAgICAgICAgICAgICAgZnJhbWVWaWV3LmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsK
KyAgICAgICAgICAgICAgICBmcmFtZVZpZXcubGF5b3V0Q29udGV4dCgpLmxheW91dFdpdGhvdXRV
cGRhdGluZ1F1ZXJ5Q29udGFpbmVycygpOwogCiAgICAgICAgICAgICBzdHlsZVVwZGF0ZSA9IHJl
c29sdmVyLnJlc29sdmUoKTsKICAgICAgICAgfQpAQCAtMjI2MCwxNiArMjI2MCw2IEBAIHZvaWQg
RG9jdW1lbnQ6OnVwZGF0ZUxheW91dCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZyYW1lVmll
dy0+bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOwotCi0gICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNv
bnRhaW5lclVwZGF0ZUNvbnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OwotICAgIHdo
aWxlIChzdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5l
clVwZGF0ZUNvbnRleHQpKSB7Ci0gICAgICAgIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKLQotICAg
ICAgICBpZiAoIWZyYW1lVmlldy0+bGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCi0gICAg
ICAgICAgICBicmVhazsKLQotICAgICAgICBmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5sYXlv
dXQoKTsKLSAgICB9CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dElnbm9yZVBlbmRp
bmdTdHlsZXNoZWV0cyhEb2N1bWVudDo6UnVuUG9zdExheW91dFRhc2tzIHJ1blBvc3RMYXlvdXRU
YXNrcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA5NDRmZTJiZTU1NjguLjVjZTgy
ZjE2NmQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjg2Myw3ICsyODYzLDcg
QEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUNvbnRlbnRzU2l6ZSgpCiAjZW5kaWYKIAogICAgIGlm
IChzaG91bGRMYXlvdXRBZnRlckNvbnRlbnRzUmVzaXplZCgpICYmIG5lZWRzTGF5b3V0KCkpCi0g
ICAgICAgIGxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAgICAgICAgbGF5b3V0Q29udGV4dCgp
LmxheW91dFdpdGhvdXRVcGRhdGluZ1F1ZXJ5Q29udGFpbmVycygpOwogCiAgICAgaWYgKFJlbmRl
clZpZXcqIHJlbmRlclZpZXcgPSB0aGlzLT5yZW5kZXJWaWV3KCkpIHsKICAgICAgICAgaWYgKHJl
bmRlclZpZXctPnVzZXNDb21wb3NpdGluZygpKQpAQCAtNDU1Myw4ICs0NTUzLDYgQEAgdm9pZCBG
cmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQogICAgICAg
ICByZXR1cm4gZGVzY2VuZGFudHNEZXF1ZS5maXJzdCgpLnB0cigpOwogICAgIH07CiAKLSAgICBT
dHlsZTo6U2NvcGU6OlF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCBxdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQ7Ci0KICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbWF4VXBkYXRlUGFz
c2VzOyArK2kpIHsKICAgICAgICAgYm9vbCBkaWRXb3JrID0gZmFsc2U7CiAgICAgICAgIERlc2Nl
bmRhbnRzRGVxdWUgZGVxdWU7CkBAIC00NTYzLDcgKzQ1NjEsNiBAQCB2b2lkIEZyYW1lVmlldzo6
dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZSgpCiAgICAgICAgICAgICAgICAg
ZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICBpZiAodmlldy0+bmVlZHNMYXlvdXQoKSkgewog
ICAgICAgICAgICAgICAgIHZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKLSAgICAgICAg
ICAgICAgICB2aWV3LT5mcmFtZSgpLmRvY3VtZW50KCktPnN0eWxlU2NvcGUoKS51cGRhdGVRdWVy
eUNvbnRhaW5lclN0YXRlKHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCk7CiAgICAgICAgICAg
ICAgICAgZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCmluZGV4IDJmZjMxMDIz
ZmFiZi4uYTRmOGZjYzE0ZTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l
Vmlld0xheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3
TGF5b3V0Q29udGV4dC5jcHAKQEAgLTE2OSw2ICsxNjksMjggQEAgdm9pZCBGcmFtZVZpZXdMYXlv
dXRDb250ZXh0OjpsYXlvdXQoKQogewogICAgIExPR19XSVRIX1NUUkVBTShMYXlvdXQsIHN0cmVh
bSA8PCAiRnJhbWVWaWV3ICIgPDwgJnZpZXcoKSA8PCAiIEZyYW1lVmlld0xheW91dENvbnRleHQ6
OmxheW91dCgpIHdpdGggc2l6ZSAiIDw8IHZpZXcoKS5sYXlvdXRTaXplKCkpOwogCisgICAgcGVy
Zm9ybUxheW91dCgpOworCisgICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRhaW5lclVwZGF0ZUNv
bnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OworICAgIHdoaWxlIChkb2N1bWVudCgp
LT5zdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQpKSB7CisgICAgICAgIGRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZOZWVkZWQo
KTsKKworICAgICAgICBpZiAoIW5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICBicmVhazsKKwor
ICAgICAgICBwZXJmb3JtTGF5b3V0KCk7CisgICAgfQorfQorCit2b2lkIEZyYW1lVmlld0xheW91
dENvbnRleHQ6OmxheW91dFdpdGhvdXRVcGRhdGluZ1F1ZXJ5Q29udGFpbmVycygpCit7CisgICAg
TE9HX1dJVEhfU1RSRUFNKExheW91dCwgc3RyZWFtIDw8ICJGcmFtZVZpZXcgIiA8PCAmdmlldygp
IDw8ICIgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6bGF5b3V0V2l0aG91dFVwZGF0aW5nUXVlcnlD
b250YWluZXJzKCkgd2l0aCBzaXplICIgPDwgdmlldygpLmxheW91dFNpemUoKSk7CisKKyAgICBw
ZXJmb3JtTGF5b3V0KCk7Cit9CisKK3ZvaWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6cGVyZm9y
bUxheW91dCgpCit7CiAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP
TighZnJhbWUoKS5kb2N1bWVudCgpLT5pblJlbmRlclRyZWVVcGRhdGUoKSk7CiAgICAgQVNTRVJU
KExheW91dERpc2FsbG93ZWRTY29wZTo6aXNMYXlvdXRBbGxvd2VkKCkpOwogICAgIEFTU0VSVCgh
dmlldygpLmlzUGFpbnRpbmcoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlld0xheW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5
b3V0Q29udGV4dC5oCmluZGV4IDZmOWViMWUwOTM4Mi4uMjIzYWM5M2FjZWFkIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaApAQCAtNTUsNiArNTUsNyBA
QCBwdWJsaWM6CiAgICAgfkZyYW1lVmlld0xheW91dENvbnRleHQoKTsKIAogICAgIHZvaWQgbGF5
b3V0KCk7CisgICAgdm9pZCBsYXlvdXRXaXRob3V0VXBkYXRpbmdRdWVyeUNvbnRhaW5lcnMoKTsK
ICAgICBib29sIG5lZWRzTGF5b3V0KCkgY29uc3Q7CiAKICAgICAvLyBXZSByZWx5IG9uIHRoZSBz
aWRlLWVmZmVjdHMgb2YgbGF5b3V0LCBsaWtlIGNvbXBvc2l0aW5nIHVwZGF0ZXMsIHRvIHVwZGF0
ZSBzdGF0ZSBpbiB2YXJpb3VzIHN1YnN5c3RlbXMKQEAgLTEyNyw2ICsxMjgsNyBAQCBwcml2YXRl
OgogICAgIGZyaWVuZCBjbGFzcyBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOwogICAgIGZy
aWVuZCBjbGFzcyBQYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI7CiAKKyAgICB2b2lkIHBl
cmZvcm1MYXlvdXQoKTsKICAgICBib29sIGNhblBlcmZvcm1MYXlvdXQoKSBjb25zdDsKICAgICBi
b29sIGxheW91dERpc2FsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX2xheW91dERpc2FsbG93ZWRD
b3VudDsgfQogICAgIGJvb2wgaXNMYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0
dXJuIG1fbGF5b3V0U2NoZWR1bGluZ0lzRW5hYmxlZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl
L1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKaW5kZXggOGU4YzkyNTQ0YWExLi4yYzE5ZjM1OGFlYmYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtMTYz
LDYgKzE2MywxOCBAQCBib29sIFNjb3BlUnVsZVNldHM6Omhhc1ZpZXdwb3J0RGVwZW5kZW50TWVk
aWFRdWVyaWVzKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgU2NvcGVSdWxl
U2V0czo6aGFzQ29udGFpbmVyUXVlcmllcygpIGNvbnN0Cit7CisgICAgaWYgKG1fYXV0aG9yU3R5
bGUtPmhhc0NvbnRhaW5lclF1ZXJpZXMoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYg
KG1fdXNlclN0eWxlICYmIG1fdXNlclN0eWxlLT5oYXNDb250YWluZXJRdWVyaWVzKCkpCisgICAg
ICAgIHJldHVybiB0cnVlOworICAgIGlmIChtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSAmJiBt
X3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZS0+aGFzQ29udGFpbmVyUXVlcmllcygpKQorICAgICAg
ICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogc3RkOjpvcHRpb25hbDxE
eW5hbWljTWVkaWFRdWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBTY29wZVJ1bGVTZXRzOjpldmFsdWF0
ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMoY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgZXZhbHVh
dG9yKQogewogICAgIHN0ZDo6b3B0aW9uYWw8RHluYW1pY01lZGlhUXVlcnlFdmFsdWF0aW9uQ2hh
bmdlcz4gZXZhbHVhdGlvbkNoYW5nZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHls
ZS9TdHlsZVNjb3BlUnVsZVNldHMuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVS
dWxlU2V0cy5oCmluZGV4IDZiZDkxOThlNmRhYy4uYTNiZGI4ZTRhZDY2IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaApAQCAtNzksNiArNzksNyBAQCBwdWJsaWM6
CiAgICAgdm9pZCByZXNldFVzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSgpOwogCiAgICAgYm9vbCBo
YXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmllcygpIGNvbnN0OworICAgIGJvb2wgaGFzQ29u
dGFpbmVyUXVlcmllcygpIGNvbnN0OwogCiAgICAgc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFR
dWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMoY29u
c3QgTWVkaWFRdWVyeUV2YWx1YXRvciYpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjMGNiYjJl
M2M3MjIuLjJkMjkyNGI5ZWY0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00Nzc4LDYgKzQ3Nzgs
NyBAQCB3ZWJraXQub3JnL2IvMjM4NTU1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1jb250YWluL2NvbnRhaW4tZmxleAogCiAjIENvbnRhaW5lciBxdWVyaWVzCiB3ZWJr
aXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j
b250YWluL2NvbnRhaW5lci1xdWVyaWVzL2N1c3RvbS1sYXlvdXQtY29udGFpbmVyLTAwMS5odHRw
cy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVz
L2lubGluZS1zaXplLWJmYy1mbG9hdHMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9zdmctZm9yZWlnbm9iamVjdC1uby1zaXplLWNvbnRhaW5l
ci5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11
bml0cy1ncmFkaWVudC1pbnZhbGlkYXRpb24uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
Y29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItdW5pdHMtZ3JhZGllbnQuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZy
YW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVy
LXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0Cmlu
ZGV4IDkzYmNlZDcwZjZhNi4uODQ3NWEyMjg3ZDExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXIt
cXVlcmllcy9pZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKKysr
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNv
bnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24t
ZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAKLUZBSUwgQGNvbnRhaW5lci1kZXBlbmRl
bnQgZWxlbWVudHMgcmVzcG9uZCB0byBzaXplIGNoYW5nZXMgb2YgYW4gQGNvbnRhaW5lci1kZXBl
bmRlbnQgaWZyYW1lIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0
IGdvdCAicmdiKDI1NSwgMCwgMCkiCitQQVNTIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRz
IHJlc3BvbmQgdG8gc2l6ZSBjaGFuZ2VzIG9mIGFuIEBjb250YWluZXItZGVwZW5kZW50IGlmcmFt
ZQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9u
LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lmcmFtZS1pbnZhbGlkYXRpb24t
ZXhwZWN0ZWQudHh0CmluZGV4IDRmYjE5M2UwNzYwNi4uN2IxZWQxN2Q2M2QxIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
Y29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4
dApAQCAtMSw0ICsxLDQgQEAKIAogCi1GQUlMIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRz
IHJlc3BvbmQgdG8gaWZyYW1lIHNpemUgY2hhbmdlcyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAi
cmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAsIDApIgorUEFTUyBAY29udGFpbmVy
LWRlcGVuZGVudCBlbGVtZW50cyByZXNwb25kIHRvIGlmcmFtZSBzaXplIGNoYW5nZXMKIAotLSAK
Mi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>459965</attachid>
            <date>2022-06-02 09:50:43 -0700</date>
            <delta_ts>2022-06-03 01:45:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-241225-20220602195042.patch</filename>
            <type>text/plain</type>
            <size>11742</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA2ODJjODZiNjk3ZjdiNjk1NjJkNjk0MzNmMDJiMTY2MGFiNDc5ZTZjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMgZG9u
J3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMgZmFp
bHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29tZSBj
b250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNlL1dl
YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpDb21w
dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUgbGF5
b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNpbWls
YXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoK
KFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6OnVw
ZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2ViQ29y
ZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3Ojp1
cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0
Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRpb24g
bG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3ZlcmVk
LgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQpOgoqIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oOgoqIFNvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHA6CihXZWJDb3JlOjpTdHlsZTo6U2NvcGVS
dWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmllcyBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmg6Ci0tLQogLi4uL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVj
bGFyYXRpb24uY3BwICAgICAgICB8IDE4ICsrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNv
cmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgICB8IDEzICsrLS0tLS0tLS0tLS0KIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCAgICAgICAgICAgICAgfCAgMyAtLS0KIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgfCAxNSArKysrKysr
KysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oICAg
fCAgMSArCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwICAgIHwg
MTIgKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMu
aCAgICAgIHwgIDEgKwogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyAgICAgICAgICAgICAg
ICAgICB8ICAxICsKIC4uLnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50
eHQgfCAgMiArLQogLi4uL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0ICAgICAgICAg
ICB8ICAyICstCiAxMCBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl
Y2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy
YXRpb24uY3BwCmluZGV4IDg5MjhkNzA5NGQ4MS4uY2Y2NGMyM2YzYjQwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjg5
NSwxMCArMjg5NSwyMCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6
OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAogCiAgICAgICAgIHN0eWxl
ID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxlZEVsZW1lbnQsIG1fcHNldWRv
RWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHlsZSwgc3R5bGVkUmVuZGVyZXIo
KSk7CiAKLSAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2UgY2FzZXMgY291bGQgYmUgbmFy
cm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgotICAgICAgICBmb3JjZUZ1bGxMYXlvdXQg
PSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwgc3R5bGVkUmVuZGVyZXIoKSkK
LSAgICAgICAgICAgIHx8IHN0eWxlZEVsZW1lbnQtPmlzSW5TaGFkb3dUcmVlKCkKLSAgICAgICAg
ICAgIHx8IChkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpICYmIGRvY3Vt
ZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCktPmhhc1ZpZXdwb3J0RGVwZW5kZW50
TWVkaWFRdWVyaWVzKCkgJiYgZG9jdW1lbnQub3duZXJFbGVtZW50KCkpOworICAgICAgICBmb3Jj
ZUZ1bGxMYXlvdXQgPSBbJl0geworICAgICAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2Ug
Y2FzZXMgY291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgorICAgICAg
ICAgICAgaWYgKGlzTGF5b3V0RGVwZW5kZW50KHByb3BlcnR5SUQsIHN0eWxlLCBzdHlsZWRSZW5k
ZXJlcigpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIC8vIEZJ
WE1FOiBXaHk/CisgICAgICAgICAgICBpZiAoc3R5bGVkRWxlbWVudC0+aXNJblNoYWRvd1RyZWUo
KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghZG9jdW1l
bnQub3duZXJFbGVtZW50KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg
ICAgICAgaWYgKCFkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpKQorICAg
ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGF1dG8mIHJ1bGVTZXRzID0g
ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKS0+cnVsZVNldHMoKTsKKyAg
ICAgICAgICAgIHJldHVybiBydWxlU2V0cy5oYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmll
cygpIHx8IHJ1bGVTZXRzLmhhc0NvbnRhaW5lclF1ZXJpZXMoKTsKKyAgICAgICAgfSgpOwogCiAg
ICAgICAgIGlmIChmb3JjZUZ1bGxMYXlvdXQpCiAgICAgICAgICAgICBkb2N1bWVudC51cGRhdGVM
YXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu
ZGV4IDlkMDdmYzg1ZTExYy4uMTk5ODE4ZGQ0MzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK
QEAgLTIyMDcsOCArMjIwNyw5IEBAIHN0YXRpYyBib29sIGlzU2FmZVRvVXBkYXRlU3R5bGVPckxh
eW91dChjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQpCiAKIGJvb2wgRG9jdW1lbnQ6OnVwZGF0ZVN0
eWxlSWZOZWVkZWQoKQogewotICAgIGlmICh0b3BEb2N1bWVudCgpLmlzUmVzb2x2aW5nQ29udGFp
bmVyUXVlcmllcygpKQorICAgIGlmIChpc1Jlc29sdmluZ0NvbnRhaW5lclF1ZXJpZXMoKSkKICAg
ICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgUmVmUHRyPEZyYW1lVmlldz4gZnJhbWVWaWV3ID0g
dmlldygpOwogICAgIHsKICAgICAgICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJbk1haW5UaHJl
YWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwpAQCAtMjI2MCwxNiArMjI2MSw2IEBAIHZvaWQgRG9j
dW1lbnQ6OnVwZGF0ZUxheW91dCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZyYW1lVmlldy0+
bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOwotCi0gICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OwotICAgIHdoaWxl
IChzdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQpKSB7Ci0gICAgICAgIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKLQotICAgICAg
ICBpZiAoIWZyYW1lVmlldy0+bGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCi0gICAgICAg
ICAgICBicmVhazsKLQotICAgICAgICBmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQo
KTsKLSAgICB9CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT
dHlsZXNoZWV0cyhEb2N1bWVudDo6UnVuUG9zdExheW91dFRhc2tzIHJ1blBvc3RMYXlvdXRUYXNr
cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA5NDRmZTJiZTU1NjguLjQ3ODU0YzI4
NzcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDU1Myw4ICs0NTUzLDYgQEAg
dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQog
ICAgICAgICByZXR1cm4gZGVzY2VuZGFudHNEZXF1ZS5maXJzdCgpLnB0cigpOwogICAgIH07CiAK
LSAgICBTdHlsZTo6U2NvcGU6OlF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCBxdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQ7Ci0KICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbWF4VXBk
YXRlUGFzc2VzOyArK2kpIHsKICAgICAgICAgYm9vbCBkaWRXb3JrID0gZmFsc2U7CiAgICAgICAg
IERlc2NlbmRhbnRzRGVxdWUgZGVxdWU7CkBAIC00NTYzLDcgKzQ1NjEsNiBAQCB2b2lkIEZyYW1l
Vmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZSgpCiAgICAgICAgICAg
ICAgICAgZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICBpZiAodmlldy0+bmVlZHNMYXlvdXQo
KSkgewogICAgICAgICAgICAgICAgIHZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKLSAg
ICAgICAgICAgICAgICB2aWV3LT5mcmFtZSgpLmRvY3VtZW50KCktPnN0eWxlU2NvcGUoKS51cGRh
dGVRdWVyeUNvbnRhaW5lclN0YXRlKHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCk7CiAgICAg
ICAgICAgICAgICAgZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCmluZGV4IDJm
ZjMxMDIzZmFiZi4uYmU1MGE4M2U0YWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl
L0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh
bWVWaWV3TGF5b3V0Q29udGV4dC5jcHAKQEAgLTE2OSw2ICsxNjksMjEgQEAgdm9pZCBGcmFtZVZp
ZXdMYXlvdXRDb250ZXh0OjpsYXlvdXQoKQogewogICAgIExPR19XSVRIX1NUUkVBTShMYXlvdXQs
IHN0cmVhbSA8PCAiRnJhbWVWaWV3ICIgPDwgJnZpZXcoKSA8PCAiIEZyYW1lVmlld0xheW91dENv
bnRleHQ6OmxheW91dCgpIHdpdGggc2l6ZSAiIDw8IHZpZXcoKS5sYXlvdXRTaXplKCkpOwogCisg
ICAgcGVyZm9ybUxheW91dCgpOworCisgICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OworICAgIHdoaWxlIChkb2N1
bWVudCgpLT5zdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQpKSB7CisgICAgICAgIGRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZO
ZWVkZWQoKTsKKworICAgICAgICBpZiAoIW5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICBicmVh
azsKKworICAgICAgICBwZXJmb3JtTGF5b3V0KCk7CisgICAgfQorfQorCit2b2lkIEZyYW1lVmll
d0xheW91dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQoKQorewogICAgIFJFTEVBU0VfQVNTRVJUX1dJ
VEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIWZyYW1lKCkuZG9jdW1lbnQoKS0+aW5SZW5kZXJUcmVl
VXBkYXRlKCkpOwogICAgIEFTU0VSVChMYXlvdXREaXNhbGxvd2VkU2NvcGU6OmlzTGF5b3V0QWxs
b3dlZCgpKTsKICAgICBBU1NFUlQoIXZpZXcoKS5pc1BhaW50aW5nKCkpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaAppbmRleCA2ZjllYjFlMDkzODIuLjg3
OWI4NzdkZDYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlv
dXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250
ZXh0LmgKQEAgLTEyNyw2ICsxMjcsNyBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBTdWJ0
cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOwogICAgIGZyaWVuZCBjbGFzcyBQYWdpbmF0ZWRMYXlv
dXRTdGF0ZU1haW50YWluZXI7CiAKKyAgICB2b2lkIHBlcmZvcm1MYXlvdXQoKTsKICAgICBib29s
IGNhblBlcmZvcm1MYXlvdXQoKSBjb25zdDsKICAgICBib29sIGxheW91dERpc2FsbG93ZWQoKSBj
b25zdCB7IHJldHVybiBtX2xheW91dERpc2FsbG93ZWRDb3VudDsgfQogICAgIGJvb2wgaXNMYXlv
dXRTY2hlZHVsaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0U2NoZWR1bGluZ0lz
RW5hYmxlZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1
bGVTZXRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAK
aW5kZXggOGU4YzkyNTQ0YWExLi4yYzE5ZjM1OGFlYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtMTYzLDYgKzE2MywxOCBAQCBib29sIFNjb3Bl
UnVsZVNldHM6Omhhc1ZpZXdwb3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzKCkgY29uc3QKICAgICBy
ZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgU2NvcGVSdWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmll
cygpIGNvbnN0Cit7CisgICAgaWYgKG1fYXV0aG9yU3R5bGUtPmhhc0NvbnRhaW5lclF1ZXJpZXMo
KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKG1fdXNlclN0eWxlICYmIG1fdXNlclN0
eWxlLT5oYXNDb250YWluZXJRdWVyaWVzKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlm
IChtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSAmJiBtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHls
ZS0+aGFzQ29udGFpbmVyUXVlcmllcygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJl
dHVybiBmYWxzZTsKK30KKwogc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFRdWVyeUV2YWx1YXRp
b25DaGFuZ2VzPiBTY29wZVJ1bGVTZXRzOjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMo
Y29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgZXZhbHVhdG9yKQogewogICAgIHN0ZDo6b3B0aW9u
YWw8RHluYW1pY01lZGlhUXVlcnlFdmFsdWF0aW9uQ2hhbmdlcz4gZXZhbHVhdGlvbkNoYW5nZXM7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaCBi
L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oCmluZGV4IDZiZDkxOThl
NmRhYy4uYTNiZGI4ZTRhZDY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls
ZVNjb3BlUnVsZVNldHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVs
ZVNldHMuaApAQCAtNzksNiArNzksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNldFVzZXJBZ2Vu
dE1lZGlhUXVlcnlTdHlsZSgpOwogCiAgICAgYm9vbCBoYXNWaWV3cG9ydERlcGVuZGVudE1lZGlh
UXVlcmllcygpIGNvbnN0OworICAgIGJvb2wgaGFzQ29udGFpbmVyUXVlcmllcygpIGNvbnN0Owog
CiAgICAgc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFRdWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBl
dmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMoY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYp
OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjMGNiYjJlM2M3MjIuLjJkMjkyNGI5ZWY0ZiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zCkBAIC00Nzc4LDYgKzQ3NzgsNyBAQCB3ZWJraXQub3JnL2IvMjM4NTU1
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW4t
ZmxleAogCiAjIENvbnRhaW5lciBxdWVyaWVzCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVz
L2N1c3RvbS1sYXlvdXQtY29udGFpbmVyLTAwMS5odHRwcy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCit3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lubGluZS1zaXplLWJmYy1mbG9hdHMu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9z
dmctZm9yZWlnbm9iamVjdC1uby1zaXplLWNvbnRhaW5lci5odG1sIFsgU2tpcCBdCiB3ZWJraXQu
b3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250
YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1ncmFkaWVudC1pbnZhbGlkYXRp
b24uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy9jb250YWluZXItdW5pdHMtZ3JhZGllbnQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlk
YXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRh
aW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDkzYmNlZDcwZjZhNi4uODQ3NWEy
Mjg3ZDExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFp
bmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMv
aWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEs
NCBAQAogCiAKLUZBSUwgQGNvbnRhaW5lci1kZXBlbmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBz
aXplIGNoYW5nZXMgb2YgYW4gQGNvbnRhaW5lci1kZXBlbmRlbnQgaWZyYW1lIGFzc2VydF9lcXVh
bHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCitQ
QVNTIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gc2l6ZSBjaGFuZ2Vz
IG9mIGFuIEBjb250YWluZXItZGVwZW5kZW50IGlmcmFtZQogCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250
YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW5lci1xdWVyaWVzL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDRmYjE5
M2UwNzYwNi4uN2IxZWQxN2Q2M2QxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAogCi1G
QUlMIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gaWZyYW1lIHNpemUg
Y2hhbmdlcyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3Qg
InJnYigyNTUsIDAsIDApIgorUEFTUyBAY29udGFpbmVyLWRlcGVuZGVudCBlbGVtZW50cyByZXNw
b25kIHRvIGlmcmFtZSBzaXplIGNoYW5nZXMKIAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>460005</attachid>
            <date>2022-06-03 01:45:06 -0700</date>
            <delta_ts>2022-06-03 02:54:47 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-241225-20220603114505.patch</filename>
            <type>text/plain</type>
            <size>11742</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">RnJvbSA2ODJjODZiNjk3ZjdiNjk1NjJkNjk0MzNmMDJiMTY2MGFiNDc5ZTZjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl
OiBUaHUsIDIgSnVuIDIwMjIgMTY6MTY6NDEgKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv
bnRhaW5lciBRdWVyaWVzXSBSZS1ldmFsdWF0ZSBxdWVyaWVzIGFmdGVyIHN1YmZyYW1lCiBzaXpl
IGNoYW5nZXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTIyNQoK
UmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMuCgpDb250YWluZXIgcXVlcmllcyBpbiBmcmFtZXMgZG9u
J3QgcmVhY3QgdG8gZnJhbWUgc2l6ZSBjaGFuZ2VzLgoKKiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zOgoKTWFyayBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9pbmxpbmUtc2l6ZS1iZmMtZmxvYXRzLmh0bWwgYXMgZmFp
bHVyZSwgaXQgaGFzIGV2ZXIKYmVlbiBwYXNzaW5nIGJ5IGZsdWtlICh0aGVyZSBhcmUgc29tZSBj
b250YWlubWVudCBpc3N1ZXMgd2l0aCBmbG9hdHMpLgoKKiBMYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvaWZyYW1lLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQ6CiogU291cmNlL1dl
YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CihXZWJDb3JlOjpDb21w
dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKCkVuc3VyZSB3ZSB1cGRhdGUgbGF5
b3V0IHdoZW4gdGhlcmUgYXJlIGNvbnRhaW5lciBxdWVyaWVzIGluIGEgc3ViZnJhbWUsIHNpbWls
YXIgdG8gbWVkaWEgcXVlcmllcy4KCiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoK
KFdlYkNvcmU6OkRvY3VtZW50OjpyZXNvbHZlU3R5bGUpOgooV2ViQ29yZTo6RG9jdW1lbnQ6OnVw
ZGF0ZUxheW91dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwOgooV2ViQ29y
ZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUpOgooV2ViQ29yZTo6RnJhbWVWaWV3Ojp1
cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKiBTb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgooV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0
Q29udGV4dDo6bGF5b3V0KToKCk1vdmUgdGhlIGNvbnRhaW5lciBxdWVyeSBpbnZhbGlkYXRpb24g
bG9vcCB0byB0aGUgbWFpbiBsYXlvdXQgZnVuY3Rpb24gc28gYWxsIHBhdGhzIGFyZSBjb3ZlcmVk
LgoKKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQpOgoqIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oOgoqIFNvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHA6CihXZWJDb3JlOjpTdHlsZTo6U2NvcGVS
dWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmllcyBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmg6Ci0tLQogLi4uL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVj
bGFyYXRpb24uY3BwICAgICAgICB8IDE4ICsrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNv
cmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgICB8IDEzICsrLS0tLS0tLS0tLS0KIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCAgICAgICAgICAgICAgfCAgMyAtLS0KIFNv
dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgfCAxNSArKysrKysr
KysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5oICAg
fCAgMSArCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuY3BwICAgIHwg
MTIgKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMu
aCAgICAgIHwgIDEgKwogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyAgICAgICAgICAgICAg
ICAgICB8ICAxICsKIC4uLnJhbWUtaW4tY29udGFpbmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50
eHQgfCAgMiArLQogLi4uL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0ICAgICAgICAg
ICB8ICAyICstCiAxMCBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl
Y2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy
YXRpb24uY3BwCmluZGV4IDg5MjhkNzA5NGQ4MS4uY2Y2NGMyM2YzYjQwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjg5
NSwxMCArMjg5NSwyMCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6
OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAogCiAgICAgICAgIHN0eWxl
ID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxlZEVsZW1lbnQsIG1fcHNldWRv
RWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHlsZSwgc3R5bGVkUmVuZGVyZXIo
KSk7CiAKLSAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2UgY2FzZXMgY291bGQgYmUgbmFy
cm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgotICAgICAgICBmb3JjZUZ1bGxMYXlvdXQg
PSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwgc3R5bGVkUmVuZGVyZXIoKSkK
LSAgICAgICAgICAgIHx8IHN0eWxlZEVsZW1lbnQtPmlzSW5TaGFkb3dUcmVlKCkKLSAgICAgICAg
ICAgIHx8IChkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpICYmIGRvY3Vt
ZW50LnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCktPmhhc1ZpZXdwb3J0RGVwZW5kZW50
TWVkaWFRdWVyaWVzKCkgJiYgZG9jdW1lbnQub3duZXJFbGVtZW50KCkpOworICAgICAgICBmb3Jj
ZUZ1bGxMYXlvdXQgPSBbJl0geworICAgICAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2Ug
Y2FzZXMgY291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgorICAgICAg
ICAgICAgaWYgKGlzTGF5b3V0RGVwZW5kZW50KHByb3BlcnR5SUQsIHN0eWxlLCBzdHlsZWRSZW5k
ZXJlcigpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIC8vIEZJ
WE1FOiBXaHk/CisgICAgICAgICAgICBpZiAoc3R5bGVkRWxlbWVudC0+aXNJblNoYWRvd1RyZWUo
KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghZG9jdW1l
bnQub3duZXJFbGVtZW50KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg
ICAgICAgaWYgKCFkb2N1bWVudC5zdHlsZVNjb3BlKCkucmVzb2x2ZXJJZkV4aXN0cygpKQorICAg
ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGF1dG8mIHJ1bGVTZXRzID0g
ZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVySWZFeGlzdHMoKS0+cnVsZVNldHMoKTsKKyAg
ICAgICAgICAgIHJldHVybiBydWxlU2V0cy5oYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmll
cygpIHx8IHJ1bGVTZXRzLmhhc0NvbnRhaW5lclF1ZXJpZXMoKTsKKyAgICAgICAgfSgpOwogCiAg
ICAgICAgIGlmIChmb3JjZUZ1bGxMYXlvdXQpCiAgICAgICAgICAgICBkb2N1bWVudC51cGRhdGVM
YXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu
ZGV4IDlkMDdmYzg1ZTExYy4uMTk5ODE4ZGQ0MzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK
QEAgLTIyMDcsOCArMjIwNyw5IEBAIHN0YXRpYyBib29sIGlzU2FmZVRvVXBkYXRlU3R5bGVPckxh
eW91dChjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQpCiAKIGJvb2wgRG9jdW1lbnQ6OnVwZGF0ZVN0
eWxlSWZOZWVkZWQoKQogewotICAgIGlmICh0b3BEb2N1bWVudCgpLmlzUmVzb2x2aW5nQ29udGFp
bmVyUXVlcmllcygpKQorICAgIGlmIChpc1Jlc29sdmluZ0NvbnRhaW5lclF1ZXJpZXMoKSkKICAg
ICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgUmVmUHRyPEZyYW1lVmlldz4gZnJhbWVWaWV3ID0g
dmlldygpOwogICAgIHsKICAgICAgICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJbk1haW5UaHJl
YWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwpAQCAtMjI2MCwxNiArMjI2MSw2IEBAIHZvaWQgRG9j
dW1lbnQ6OnVwZGF0ZUxheW91dCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZyYW1lVmlldy0+
bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOwotCi0gICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OwotICAgIHdoaWxl
IChzdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQpKSB7Ci0gICAgICAgIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKLQotICAgICAg
ICBpZiAoIWZyYW1lVmlldy0+bGF5b3V0Q29udGV4dCgpLm5lZWRzTGF5b3V0KCkpCi0gICAgICAg
ICAgICBicmVhazsKLQotICAgICAgICBmcmFtZVZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQo
KTsKLSAgICB9CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT
dHlsZXNoZWV0cyhEb2N1bWVudDo6UnVuUG9zdExheW91dFRhc2tzIHJ1blBvc3RMYXlvdXRUYXNr
cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA5NDRmZTJiZTU1NjguLjQ3ODU0YzI4
NzcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDU1Myw4ICs0NTUzLDYgQEAg
dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKQog
ICAgICAgICByZXR1cm4gZGVzY2VuZGFudHNEZXF1ZS5maXJzdCgpLnB0cigpOwogICAgIH07CiAK
LSAgICBTdHlsZTo6U2NvcGU6OlF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCBxdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQ7Ci0KICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbWF4VXBk
YXRlUGFzc2VzOyArK2kpIHsKICAgICAgICAgYm9vbCBkaWRXb3JrID0gZmFsc2U7CiAgICAgICAg
IERlc2NlbmRhbnRzRGVxdWUgZGVxdWU7CkBAIC00NTYzLDcgKzQ1NjEsNiBAQCB2b2lkIEZyYW1l
Vmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZSgpCiAgICAgICAgICAg
ICAgICAgZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICBpZiAodmlldy0+bmVlZHNMYXlvdXQo
KSkgewogICAgICAgICAgICAgICAgIHZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKLSAg
ICAgICAgICAgICAgICB2aWV3LT5mcmFtZSgpLmRvY3VtZW50KCktPnN0eWxlU2NvcGUoKS51cGRh
dGVRdWVyeUNvbnRhaW5lclN0YXRlKHF1ZXJ5Q29udGFpbmVyVXBkYXRlQ29udGV4dCk7CiAgICAg
ICAgICAgICAgICAgZGlkV29yayA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCmluZGV4IDJm
ZjMxMDIzZmFiZi4uYmU1MGE4M2U0YWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl
L0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh
bWVWaWV3TGF5b3V0Q29udGV4dC5jcHAKQEAgLTE2OSw2ICsxNjksMjEgQEAgdm9pZCBGcmFtZVZp
ZXdMYXlvdXRDb250ZXh0OjpsYXlvdXQoKQogewogICAgIExPR19XSVRIX1NUUkVBTShMYXlvdXQs
IHN0cmVhbSA8PCAiRnJhbWVWaWV3ICIgPDwgJnZpZXcoKSA8PCAiIEZyYW1lVmlld0xheW91dENv
bnRleHQ6OmxheW91dCgpIHdpdGggc2l6ZSAiIDw8IHZpZXcoKS5sYXlvdXRTaXplKCkpOwogCisg
ICAgcGVyZm9ybUxheW91dCgpOworCisgICAgU3R5bGU6OlNjb3BlOjpRdWVyeUNvbnRhaW5lclVw
ZGF0ZUNvbnRleHQgcXVlcnlDb250YWluZXJVcGRhdGVDb250ZXh0OworICAgIHdoaWxlIChkb2N1
bWVudCgpLT5zdHlsZVNjb3BlKCkudXBkYXRlUXVlcnlDb250YWluZXJTdGF0ZShxdWVyeUNvbnRh
aW5lclVwZGF0ZUNvbnRleHQpKSB7CisgICAgICAgIGRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZO
ZWVkZWQoKTsKKworICAgICAgICBpZiAoIW5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICBicmVh
azsKKworICAgICAgICBwZXJmb3JtTGF5b3V0KCk7CisgICAgfQorfQorCit2b2lkIEZyYW1lVmll
d0xheW91dENvbnRleHQ6OnBlcmZvcm1MYXlvdXQoKQorewogICAgIFJFTEVBU0VfQVNTRVJUX1dJ
VEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIWZyYW1lKCkuZG9jdW1lbnQoKS0+aW5SZW5kZXJUcmVl
VXBkYXRlKCkpOwogICAgIEFTU0VSVChMYXlvdXREaXNhbGxvd2VkU2NvcGU6OmlzTGF5b3V0QWxs
b3dlZCgpKTsKICAgICBBU1NFUlQoIXZpZXcoKS5pc1BhaW50aW5nKCkpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuaAppbmRleCA2ZjllYjFlMDkzODIuLjg3
OWI4NzdkZDYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlv
dXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250
ZXh0LmgKQEAgLTEyNyw2ICsxMjcsNyBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBTdWJ0
cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOwogICAgIGZyaWVuZCBjbGFzcyBQYWdpbmF0ZWRMYXlv
dXRTdGF0ZU1haW50YWluZXI7CiAKKyAgICB2b2lkIHBlcmZvcm1MYXlvdXQoKTsKICAgICBib29s
IGNhblBlcmZvcm1MYXlvdXQoKSBjb25zdDsKICAgICBib29sIGxheW91dERpc2FsbG93ZWQoKSBj
b25zdCB7IHJldHVybiBtX2xheW91dERpc2FsbG93ZWRDb3VudDsgfQogICAgIGJvb2wgaXNMYXlv
dXRTY2hlZHVsaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0U2NoZWR1bGluZ0lz
RW5hYmxlZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1
bGVTZXRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAK
aW5kZXggOGU4YzkyNTQ0YWExLi4yYzE5ZjM1OGFlYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5
bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtMTYzLDYgKzE2MywxOCBAQCBib29sIFNjb3Bl
UnVsZVNldHM6Omhhc1ZpZXdwb3J0RGVwZW5kZW50TWVkaWFRdWVyaWVzKCkgY29uc3QKICAgICBy
ZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgU2NvcGVSdWxlU2V0czo6aGFzQ29udGFpbmVyUXVlcmll
cygpIGNvbnN0Cit7CisgICAgaWYgKG1fYXV0aG9yU3R5bGUtPmhhc0NvbnRhaW5lclF1ZXJpZXMo
KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKG1fdXNlclN0eWxlICYmIG1fdXNlclN0
eWxlLT5oYXNDb250YWluZXJRdWVyaWVzKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlm
IChtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHlsZSAmJiBtX3VzZXJBZ2VudE1lZGlhUXVlcnlTdHls
ZS0+aGFzQ29udGFpbmVyUXVlcmllcygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJl
dHVybiBmYWxzZTsKK30KKwogc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFRdWVyeUV2YWx1YXRp
b25DaGFuZ2VzPiBTY29wZVJ1bGVTZXRzOjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMo
Y29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgZXZhbHVhdG9yKQogewogICAgIHN0ZDo6b3B0aW9u
YWw8RHluYW1pY01lZGlhUXVlcnlFdmFsdWF0aW9uQ2hhbmdlcz4gZXZhbHVhdGlvbkNoYW5nZXM7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVsZVNldHMuaCBi
L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5oCmluZGV4IDZiZDkxOThl
NmRhYy4uYTNiZGI4ZTRhZDY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls
ZVNjb3BlUnVsZVNldHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVs
ZVNldHMuaApAQCAtNzksNiArNzksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNldFVzZXJBZ2Vu
dE1lZGlhUXVlcnlTdHlsZSgpOwogCiAgICAgYm9vbCBoYXNWaWV3cG9ydERlcGVuZGVudE1lZGlh
UXVlcmllcygpIGNvbnN0OworICAgIGJvb2wgaGFzQ29udGFpbmVyUXVlcmllcygpIGNvbnN0Owog
CiAgICAgc3RkOjpvcHRpb25hbDxEeW5hbWljTWVkaWFRdWVyeUV2YWx1YXRpb25DaGFuZ2VzPiBl
dmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5UnVsZXMoY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYp
OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjMGNiYjJlM2M3MjIuLjJkMjkyNGI5ZWY0ZiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zCkBAIC00Nzc4LDYgKzQ3NzgsNyBAQCB3ZWJraXQub3JnL2IvMjM4NTU1
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW4t
ZmxleAogCiAjIENvbnRhaW5lciBxdWVyaWVzCiB3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVz
L2N1c3RvbS1sYXlvdXQtY29udGFpbmVyLTAwMS5odHRwcy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCit3ZWJraXQub3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2lubGluZS1zaXplLWJmYy1mbG9hdHMu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9z
dmctZm9yZWlnbm9iamVjdC1uby1zaXplLWNvbnRhaW5lci5odG1sIFsgU2tpcCBdCiB3ZWJraXQu
b3JnL2IvMjI5NjU5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250
YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1ncmFkaWVudC1pbnZhbGlkYXRp
b24uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTY1OSBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy9jb250YWluZXItdW5pdHMtZ3JhZGllbnQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlk
YXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvaWZyYW1lLWluLWNvbnRh
aW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDkzYmNlZDcwZjZhNi4uODQ3NWEy
Mjg3ZDExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9pZnJhbWUtaW4tY29udGFp
bmVyLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMv
aWZyYW1lLWluLWNvbnRhaW5lci1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEs
NCBAQAogCiAKLUZBSUwgQGNvbnRhaW5lci1kZXBlbmRlbnQgZWxlbWVudHMgcmVzcG9uZCB0byBz
aXplIGNoYW5nZXMgb2YgYW4gQGNvbnRhaW5lci1kZXBlbmRlbnQgaWZyYW1lIGFzc2VydF9lcXVh
bHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCitQ
QVNTIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gc2l6ZSBjaGFuZ2Vz
IG9mIGFuIEBjb250YWluZXItZGVwZW5kZW50IGlmcmFtZQogCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250
YWluZXItcXVlcmllcy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW5lci1xdWVyaWVzL2lmcmFtZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDRmYjE5
M2UwNzYwNi4uN2IxZWQxN2Q2M2QxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9p
ZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy9pZnJhbWUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAogCi1G
QUlMIEBjb250YWluZXItZGVwZW5kZW50IGVsZW1lbnRzIHJlc3BvbmQgdG8gaWZyYW1lIHNpemUg
Y2hhbmdlcyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3Qg
InJnYigyNTUsIDAsIDApIgorUEFTUyBAY29udGFpbmVyLWRlcGVuZGVudCBlbGVtZW50cyByZXNw
b25kIHRvIGlmcmFtZSBzaXplIGNoYW5nZXMKIAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK
</data>

          </attachment>
      

    </bug>

</bugzilla>