<?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>236702</bug_id>
          
          <creation_ts>2022-02-16 02:48:37 -0800</creation_ts>
          <short_desc>[CSS Container Queries] Size queries on unsupported axis should evaluate to unknown</short_desc>
          <delta_ts>2022-02-16 08:55:21 -0800</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>dino</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1842203</commentid>
    <comment_count>0</comment_count>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-02-16 02:48:37 -0800</bug_when>
    <thetext>&quot;If ... the query container does not support container size queries on the relevant axes, then the result of evaluating the size feature is unknown.

https://drafts.csswg.org/css-contain-3/#size-container</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842213</commentid>
    <comment_count>1</comment_count>
      <attachid>452170</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-02-16 03:05:00 -0800</bug_when>
    <thetext>Created attachment 452170
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842234</commentid>
    <comment_count>2</comment_count>
      <attachid>452170</attachid>
    <who name="Dean Jackson">dino</who>
    <bug_when>2022-02-16 04:28:54 -0800</bug_when>
    <thetext>Comment on attachment 452170
Patch

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

&gt; Source/WebCore/style/ContainerQueryEvaluator.cpp:203
&gt; +        if (axis == Axis::Width)
&gt; +            axis = container.renderer.isHorizontalWritingMode() ? Axis::Inline : Axis::Block;
&gt; +        else if (axis == Axis::Height)
&gt; +            axis = container.renderer.isHorizontalWritingMode() ? Axis::Block : Axis::Inline;

I guess this is only needed in the ::InlineSize case - maybe it could go there? I don&apos;t have strong opinions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842242</commentid>
    <comment_count>3</comment_count>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-02-16 04:56:39 -0800</bug_when>
    <thetext>&gt; I guess this is only needed in the ::InlineSize case - maybe it could go
&gt; there? I don&apos;t have strong opinions.

Good point!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842250</commentid>
    <comment_count>4</comment_count>
      <attachid>452186</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-02-16 05:18:24 -0800</bug_when>
    <thetext>Created attachment 452186
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842304</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-16 08:54:09 -0800</bug_when>
    <thetext>Committed r289890 (247328@main): &lt;https://commits.webkit.org/247328@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 452186.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842305</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-02-16 08:55:21 -0800</bug_when>
    <thetext>&lt;rdar://problem/89028172&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452170</attachid>
            <date>2022-02-16 03:05:00 -0800</date>
            <delta_ts>2022-02-16 05:18:19 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236702-20220216130459.patch</filename>
            <type>text/plain</type>
            <size>18163</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY4NWRjNjVlNzljNWVk
NzE1NTljODRkOTZmZWM3Yjk5YWYxODFhZi4uZjY5OGRmMjM3ZGEwZGNiOTVmY2MwNzFhNmRkNzQ5
NWRiNmM5NzQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTE2ICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR
dWVyaWVzXSBTaXplIHF1ZXJpZXMgb24gdW5zdXBwb3J0ZWQgYXhpcyBzaG91bGQgZXZhbHVhdGUg
dG8gdW5rbm93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjM2NzAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgIklmIC4uLiB0aGUgcXVlcnkgY29udGFpbmVyIGRvZXMgbm90IHN1cHBvcnQgY29udGFpbmVy
IHNpemUgcXVlcmllcyBvbiB0aGUgcmVsZXZhbnQgYXhlcywKKyAgICAgICAgdGhlbiB0aGUgcmVz
dWx0IG9mIGV2YWx1YXRpbmcgdGhlIHNpemUgZmVhdHVyZSBpcyB1bmtub3duLiIKKworICAgICAg
ICBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWNvbnRhaW4tMy8jc2l6ZS1jb250YWluZXIK
KworICAgICAgICAqIHN0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OlN0eWxlOjpDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGUgY29uc3Qp
OgorCisgICAgICAgIFNvbWUgY2xlYW51cHMuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpD
b250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVRdWVyeSBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpTdHlsZTo6Q29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlQ29uZGl0aW9u
IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpDb250YWluZXJRdWVyeUV2YWx1YXRv
cjo6ZXZhbHVhdGVTaXplRmVhdHVyZSBjb25zdCk6CisKKyAgICAgICAgQ2hlY2sgd2hldGhlciB0
aGUgY29udGFpbmVyIHN1cHBvcnRzIHRoZSBmZWF0dXJlIGF4aXMgYW5kIHJldHVybiBVbmtub3du
IG9mIG5vdC4KKworICAgICAgICAqIHN0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmg6CisK
KyAgICAgICAgUmVuYW1lIEV2YWx1YXRpb25Db250ZXh0IC0+IFJlc29sdmVkQ29udGFpbmVyIHRv
IGJlIGxlc3MgZ2VuZXJpYy4KKwogMjAyMi0wMi0xNSAgTmlrb2xhb3MgTW91Y2h0YXJpcyAgPG5t
b3VjaHRhcmlzQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgcGFyc2luZyBhbmQgYW5p
bWF0aW9uIHN1cHBvcnQgZm9yIG9mZnNldCBzaG9ydGhhbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmNwcAppbmRleCAyNWEyNzhmZjBmZmM0MDVj
MGI5YjQ0ZGUxNmUyMDQ1ZDdlYTgzMGM4Li5kY2YxZmY0ZDI2MmU5OGFkMzVhODk2MGNkOTZkNDY2
M2M0NGU5ODBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Db250YWluZXJRdWVy
eUV2YWx1YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvQ29udGFpbmVyUXVlcnlF
dmFsdWF0b3IuY3BwCkBAIC0zNyw4ICszNyw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlOjpTdHls
ZSB7CiAKLXN0cnVjdCBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6RXZhbHVhdGlvbkNvbnRleHQg
ewotICAgIFJlbmRlckJveCYgcmVuZGVyZXI7CitzdHJ1Y3QgQ29udGFpbmVyUXVlcnlFdmFsdWF0
b3I6OlJlc29sdmVkQ29udGFpbmVyIHsKKyAgICBjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyOwog
ICAgIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgY29udmVyc2lvbkRhdGE7CiB9OwogCkBAIC01
Miw2NCArNTIsNjQgQEAgYm9vbCBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGUoY29u
c3QgRmlsdGVyZWRDb250YWluZXJRdWVyeSYgZmlsdGVyZWRDb24KICAgICBpZiAobV9jb250YWlu
ZXJzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgYXV0byBjb250YWlu
ZXJSZW5kZXJlckZvckZpbHRlciA9IFsmXSgpIC0+IFJlbmRlckJveCogeworICAgIGF1dG8gbWFr
ZVJlc29sdmVkQ29udGFpbmVyID0gWyZdKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIpIC0+IFJl
c29sdmVkQ29udGFpbmVyIHsKKyAgICAgICAgYXV0byYgdmlldyA9IHJlbmRlcmVyLnZpZXcoKTsK
KyAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgICAgIHJlbmRlcmVyLAorICAgICAgICAgICAgQ1NT
VG9MZW5ndGhDb252ZXJzaW9uRGF0YSB7ICZyZW5kZXJlci5zdHlsZSgpLCAmdmlldy5zdHlsZSgp
LCBudWxscHRyLCAmdmlldywgMSB9CisgICAgICAgIH07CisgICAgfTsKKworICAgIGF1dG8gcmVz
b2x2ZUNvbnRhaW5lciA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8UmVzb2x2ZWRDb250YWluZXI+
IHsKICAgICAgICAgZm9yIChhdXRvJiBjb250YWluZXIgOiBtYWtlUmV2ZXJzZWRSYW5nZShtX2Nv
bnRhaW5lcnMpKSB7CiAgICAgICAgICAgICBhdXRvKiByZW5kZXJlciA9IGR5bmFtaWNEb3duY2Fz
dDxSZW5kZXJCb3g+KGNvbnRhaW5lci0+cmVuZGVyZXIoKSk7CiAgICAgICAgICAgICBpZiAoIXJl
bmRlcmVyKQotICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAgICAgICAg
IHJldHVybiB7IH07CiAgICAgICAgICAgICBpZiAoZmlsdGVyZWRDb250YWluZXJRdWVyeS5uYW1l
RmlsdGVyLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcmVuZGVyZXI7CisgICAg
ICAgICAgICAgICAgcmV0dXJuIG1ha2VSZXNvbHZlZENvbnRhaW5lcigqcmVuZGVyZXIpOwogICAg
ICAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgdHlwZSBmaWx0ZXIuCiAgICAgICAgICAgICBpZiAo
cmVuZGVyZXItPnN0eWxlKCkuY29udGFpbmVyTmFtZXMoKS5jb250YWlucyhmaWx0ZXJlZENvbnRh
aW5lclF1ZXJ5Lm5hbWVGaWx0ZXIpKQotICAgICAgICAgICAgICAgIHJldHVybiByZW5kZXJlcjsK
KyAgICAgICAgICAgICAgICByZXR1cm4gbWFrZVJlc29sdmVkQ29udGFpbmVyKCpyZW5kZXJlcik7
CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIHJldHVybiB7IH07
CiAgICAgfTsKIAotICAgIGF1dG8qIHJlbmRlcmVyID0gY29udGFpbmVyUmVuZGVyZXJGb3JGaWx0
ZXIoKTsKLSAgICBpZiAoIXJlbmRlcmVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBh
dXRvJiB2aWV3ID0gcmVuZGVyZXItPnZpZXcoKTsKLSAgICBDU1NUb0xlbmd0aENvbnZlcnNpb25E
YXRhIHsgJnJlbmRlcmVyLT5zdHlsZSgpLCAmdmlldy5zdHlsZSgpLCBudWxscHRyLCAmdmlldywg
MSB9OwotCi0gICAgRXZhbHVhdGlvbkNvbnRleHQgZXZhbHVhdGlvbkNvbnRleHQgewotICAgICAg
ICAqcmVuZGVyZXIsCi0gICAgICAgIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgeyAmcmVuZGVy
ZXItPnN0eWxlKCksICZ2aWV3LnN0eWxlKCksIG51bGxwdHIsICZ2aWV3LCAxIH0KLSAgICB9Owor
ICAgIGF1dG8gY29udGFpbmVyID0gcmVzb2x2ZUNvbnRhaW5lcigpOworICAgIGlmICghY29udGFp
bmVyKQorICAgICAgICByZXR1cm4geyB9OwogCi0gICAgcmV0dXJuIGV2YWx1YXRlUXVlcnkoZmls
dGVyZWRDb250YWluZXJRdWVyeS5xdWVyeSwgZXZhbHVhdGlvbkNvbnRleHQpID09IEV2YWx1YXRp
b25SZXN1bHQ6OlRydWU7CisgICAgcmV0dXJuIGV2YWx1YXRlUXVlcnkoZmlsdGVyZWRDb250YWlu
ZXJRdWVyeS5xdWVyeSwgKmNvbnRhaW5lcikgPT0gRXZhbHVhdGlvblJlc3VsdDo6VHJ1ZTsKIH0K
IAotYXV0byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVRdWVyeShjb25zdCBDUTo6
Q29udGFpbmVyUXVlcnkmIGNvbnRhaW5lclF1ZXJ5LCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYg
Y29udGV4dCkgY29uc3QgLT4gRXZhbHVhdGlvblJlc3VsdAorYXV0byBDb250YWluZXJRdWVyeUV2
YWx1YXRvcjo6ZXZhbHVhdGVRdWVyeShjb25zdCBDUTo6Q29udGFpbmVyUXVlcnkmIGNvbnRhaW5l
clF1ZXJ5LCBjb25zdCBSZXNvbHZlZENvbnRhaW5lciYgY29udGFpbmVyKSBjb25zdCAtPiBFdmFs
dWF0aW9uUmVzdWx0CiB7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24oY29udGFpbmVyUXVlcnks
IFsmXShjb25zdCBDUTo6Q29udGFpbmVyQ29uZGl0aW9uJiBjb250YWluZXJDb25kaXRpb24pIHsK
LSAgICAgICAgcmV0dXJuIGV2YWx1YXRlQ29uZGl0aW9uKGNvbnRhaW5lckNvbmRpdGlvbiwgY29u
dGV4dCk7CisgICAgICAgIHJldHVybiBldmFsdWF0ZUNvbmRpdGlvbihjb250YWluZXJDb25kaXRp
b24sIGNvbnRhaW5lcik7CiAgICAgfSwgWyZdKGNvbnN0IENROjpTaXplUXVlcnkmIHNpemVRdWVy
eSkgewotICAgICAgICByZXR1cm4gZXZhbHVhdGVRdWVyeShzaXplUXVlcnksIGNvbnRleHQpOwor
ICAgICAgICByZXR1cm4gZXZhbHVhdGVRdWVyeShzaXplUXVlcnksIGNvbnRhaW5lcik7CiAgICAg
fSwgWyZdKGNvbnN0IENROjpVbmtub3duUXVlcnkmKSB7CiAgICAgICAgIHJldHVybiBFdmFsdWF0
aW9uUmVzdWx0OjpVbmtub3duOwogICAgIH0pOwogfQogCi1hdXRvIENvbnRhaW5lclF1ZXJ5RXZh
bHVhdG9yOjpldmFsdWF0ZVF1ZXJ5KGNvbnN0IENROjpTaXplUXVlcnkmIHNpemVRdWVyeSwgY29u
c3QgRXZhbHVhdGlvbkNvbnRleHQmIGNvbnRleHQpIGNvbnN0IC0+IEV2YWx1YXRpb25SZXN1bHQK
K2F1dG8gQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlUXVlcnkoY29uc3QgQ1E6OlNp
emVRdWVyeSYgc2l6ZVF1ZXJ5LCBjb25zdCBSZXNvbHZlZENvbnRhaW5lciYgY29udGFpbmVyKSBj
b25zdCAtPiBFdmFsdWF0aW9uUmVzdWx0CiB7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24oc2l6
ZVF1ZXJ5LCBbJl0oY29uc3QgQ1E6OlNpemVDb25kaXRpb24mIHNpemVDb25kaXRpb24pIHsKLSAg
ICAgICAgcmV0dXJuIGV2YWx1YXRlQ29uZGl0aW9uKHNpemVDb25kaXRpb24sIGNvbnRleHQpOwor
ICAgICAgICByZXR1cm4gZXZhbHVhdGVDb25kaXRpb24oc2l6ZUNvbmRpdGlvbiwgY29udGFpbmVy
KTsKICAgICB9LCBbJl0oY29uc3QgQ1E6OlNpemVGZWF0dXJlJiBzaXplRmVhdHVyZSkgewotICAg
ICAgICByZXR1cm4gZXZhbHVhdGVTaXplRmVhdHVyZShzaXplRmVhdHVyZSwgY29udGV4dCk7Cisg
ICAgICAgIHJldHVybiBldmFsdWF0ZVNpemVGZWF0dXJlKHNpemVGZWF0dXJlLCBjb250YWluZXIp
OwogICAgIH0pOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDb25kaXRpb25UeXBlPgotYXV0byBD
b250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVDb25kaXRpb24oY29uc3QgQ29uZGl0aW9u
VHlwZSYgY29uZGl0aW9uLCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYgY29udGV4dCkgY29uc3Qg
LT4gRXZhbHVhdGlvblJlc3VsdAorYXV0byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVh
dGVDb25kaXRpb24oY29uc3QgQ29uZGl0aW9uVHlwZSYgY29uZGl0aW9uLCBjb25zdCBSZXNvbHZl
ZENvbnRhaW5lciYgY29udGFpbmVyKSBjb25zdCAtPiBFdmFsdWF0aW9uUmVzdWx0CiB7CiAgICAg
aWYgKGNvbmRpdGlvbi5xdWVyaWVzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIEV2YWx1YXRp
b25SZXN1bHQ6OlVua25vd247CiAKICAgICBzd2l0Y2ggKGNvbmRpdGlvbi5sb2dpY2FsT3BlcmF0
b3IpIHsKICAgICBjYXNlIENROjpMb2dpY2FsT3BlcmF0b3I6Ok5vdDogewotICAgICAgICBzd2l0
Y2ggKGV2YWx1YXRlUXVlcnkoY29uZGl0aW9uLnF1ZXJpZXMuZmlyc3QoKSwgY29udGV4dCkpIHsK
KyAgICAgICAgc3dpdGNoIChldmFsdWF0ZVF1ZXJ5KGNvbmRpdGlvbi5xdWVyaWVzLmZpcnN0KCks
IGNvbnRhaW5lcikpIHsKICAgICAgICAgY2FzZSBFdmFsdWF0aW9uUmVzdWx0OjpUcnVlOgogICAg
ICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OkZhbHNlOwogICAgICAgICBjYXNlIEV2
YWx1YXRpb25SZXN1bHQ6OkZhbHNlOgpAQCAtMTIxLDcgKzEyMSw3IEBAIGF1dG8gQ29udGFpbmVy
UXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlQ29uZGl0aW9uKGNvbnN0IENvbmRpdGlvblR5cGUmIGNv
bmRpdGlvbiwKICAgICBjYXNlIENROjpMb2dpY2FsT3BlcmF0b3I6OkFuZDogewogICAgICAgICBh
dXRvIHJlc3VsdCA9IEV2YWx1YXRpb25SZXN1bHQ6OlRydWU7CiAgICAgICAgIGZvciAoYXV0byBx
dWVyeSA6IGNvbmRpdGlvbi5xdWVyaWVzKSB7Ci0gICAgICAgICAgICBhdXRvIHF1ZXJ5UmVzdWx0
ID0gZXZhbHVhdGVRdWVyeShxdWVyeSwgY29udGV4dCk7CisgICAgICAgICAgICBhdXRvIHF1ZXJ5
UmVzdWx0ID0gZXZhbHVhdGVRdWVyeShxdWVyeSwgY29udGFpbmVyKTsKICAgICAgICAgICAgIGlm
IChxdWVyeVJlc3VsdCA9PSBFdmFsdWF0aW9uUmVzdWx0OjpGYWxzZSkKICAgICAgICAgICAgICAg
ICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6RmFsc2U7CiAgICAgICAgICAgICBpZiAocXVlcnlS
ZXN1bHQgPT0gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bikKQEAgLTEzMiw3ICsxMzIsNyBAQCBh
dXRvIENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZUNvbmRpdGlvbihjb25zdCBDb25k
aXRpb25UeXBlJiBjb25kaXRpb24sCiAgICAgY2FzZSBDUTo6TG9naWNhbE9wZXJhdG9yOjpPcjog
ewogICAgICAgICBhdXRvIHJlc3VsdCA9IEV2YWx1YXRpb25SZXN1bHQ6OkZhbHNlOwogICAgICAg
ICBmb3IgKGF1dG8gcXVlcnkgOiBjb25kaXRpb24ucXVlcmllcykgewotICAgICAgICAgICAgYXV0
byBxdWVyeVJlc3VsdCA9IGV2YWx1YXRlUXVlcnkocXVlcnksIGNvbnRleHQpOworICAgICAgICAg
ICAgYXV0byBxdWVyeVJlc3VsdCA9IGV2YWx1YXRlUXVlcnkocXVlcnksIGNvbnRhaW5lcik7CiAg
ICAgICAgICAgICBpZiAocXVlcnlSZXN1bHQgPT0gRXZhbHVhdGlvblJlc3VsdDo6VHJ1ZSkKICAg
ICAgICAgICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VHJ1ZTsKICAgICAgICAgICAg
IGlmIChxdWVyeVJlc3VsdCA9PSBFdmFsdWF0aW9uUmVzdWx0OjpVbmtub3duKQpAQCAtMTYwLDcg
KzE2MCw3IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVTaXplKGNv
bnN0IENTU1ZhbHVlKiB2YWx1ZSwgY29uc3QgQ1NTVG9MCiAgICAgcmV0dXJuIHByaW1pdGl2ZVZh
bHVlLmNvbXB1dGVMZW5ndGg8TGF5b3V0VW5pdD4oY29udmVyc2lvbkRhdGEpOwogfQogCi1hdXRv
IENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZVNpemVGZWF0dXJlKGNvbnN0IENROjpT
aXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUsIGNvbnN0IEV2YWx1YXRpb25Db250ZXh0JiBjb250ZXh0
KSBjb25zdCAtPiBFdmFsdWF0aW9uUmVzdWx0CithdXRvIENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9y
OjpldmFsdWF0ZVNpemVGZWF0dXJlKGNvbnN0IENROjpTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUs
IGNvbnN0IFJlc29sdmVkQ29udGFpbmVyJiBjb250YWluZXIpIGNvbnN0IC0+IEV2YWx1YXRpb25S
ZXN1bHQKIHsKICAgICBhdXRvIHRvRXZhbHVhdGlvblJlc3VsdCA9IFtdKGJvb2wgYm9vbGVhbikg
ewogICAgICAgICByZXR1cm4gYm9vbGVhbiA/IEV2YWx1YXRpb25SZXN1bHQ6OlRydWUgOiBFdmFs
dWF0aW9uUmVzdWx0OjpGYWxzZTsKQEAgLTE4OCwyNyArMTg4LDY0IEBAIGF1dG8gQ29udGFpbmVy
UXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlU2l6ZUZlYXR1cmUoY29uc3QgQ1E6OlNpemVGZWF0dXJl
JiBzaXplRmVhCiAgICAgICAgIGlmIChzaXplRmVhdHVyZS5jb21wYXJpc29uT3BlcmF0b3IgPT0g
Q1E6OkNvbXBhcmlzb25PcGVyYXRvcjo6VHJ1ZSkKICAgICAgICAgICAgIHJldHVybiB0b0V2YWx1
YXRpb25SZXN1bHQoISFzaXplKTsKIAotICAgICAgICBhdXRvIGV4cHJlc3Npb25TaXplID0gY29t
cHV0ZVNpemUoc2l6ZUZlYXR1cmUudmFsdWUuZ2V0KCksIGNvbnRleHQuY29udmVyc2lvbkRhdGEp
OworICAgICAgICBhdXRvIGV4cHJlc3Npb25TaXplID0gY29tcHV0ZVNpemUoc2l6ZUZlYXR1cmUu
dmFsdWUuZ2V0KCksIGNvbnRhaW5lci5jb252ZXJzaW9uRGF0YSk7CiAgICAgICAgIGlmICghZXhw
cmVzc2lvblNpemUpCiAgICAgICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93
bjsKIAogICAgICAgICByZXR1cm4gdG9FdmFsdWF0aW9uUmVzdWx0KGNvbXBhcmUoc2l6ZSwgKmV4
cHJlc3Npb25TaXplKSk7CiAgICAgfTsKIAotICAgIGlmIChzaXplRmVhdHVyZS5uYW1lID09IENR
OjpGZWF0dXJlTmFtZXM6OndpZHRoKCkpCi0gICAgICAgIHJldHVybiBldmFsdWF0ZVNpemUoY29u
dGV4dC5yZW5kZXJlci5jb250ZW50V2lkdGgoKSk7CisgICAgZW51bSBjbGFzcyBBeGlzIDogdWlu
dDhfdCB7IEJvdGgsIEJsb2NrLCBJbmxpbmUsIFdpZHRoLCBIZWlnaHQgfTsKKyAgICBhdXRvIGNv
bnRhaW5lclN1cHBvcnRzUmVxdWlyZWRBeGlzID0gWyZdKEF4aXMgYXhpcykgeworICAgICAgICBp
ZiAoYXhpcyA9PSBBeGlzOjpXaWR0aCkKKyAgICAgICAgICAgIGF4aXMgPSBjb250YWluZXIucmVu
ZGVyZXIuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IEF4aXM6OklubGluZSA6IEF4aXM6OkJs
b2NrOworICAgICAgICBlbHNlIGlmIChheGlzID09IEF4aXM6OkhlaWdodCkKKyAgICAgICAgICAg
IGF4aXMgPSBjb250YWluZXIucmVuZGVyZXIuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IEF4
aXM6OkJsb2NrIDogQXhpczo6SW5saW5lOworCisgICAgICAgIHN3aXRjaCAoY29udGFpbmVyLnJl
bmRlcmVyLnN0eWxlKCkuY29udGFpbmVyVHlwZSgpKSB7CisgICAgICAgIGNhc2UgQ29udGFpbmVy
VHlwZTo6U2l6ZToKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBjYXNlIENvbnRh
aW5lclR5cGU6OklubGluZVNpemU6CisgICAgICAgICAgICByZXR1cm4gYXhpcyA9PSBBeGlzOjpJ
bmxpbmU7CisgICAgICAgIGNhc2UgQ29udGFpbmVyVHlwZTo6Tm9uZToKKyAgICAgICAgICAgIEFT
U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9
CisgICAgfTsKIAotICAgIGlmIChzaXplRmVhdHVyZS5uYW1lID09IENROjpGZWF0dXJlTmFtZXM6
OmhlaWdodCgpKQotICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRleHQucmVuZGVyZXIu
Y29udGVudEhlaWdodCgpKTsKKyAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6RmVhdHVy
ZU5hbWVzOjp3aWR0aCgpKSB7CisgICAgICAgIGlmICghY29udGFpbmVyU3VwcG9ydHNSZXF1aXJl
ZEF4aXMoQXhpczo6V2lkdGgpKQorICAgICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6
OlVua25vd247CiAKLSAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6RmVhdHVyZU5hbWVz
OjppbmxpbmVTaXplKCkpCi0gICAgICAgIHJldHVybiBldmFsdWF0ZVNpemUoY29udGV4dC5yZW5k
ZXJlci5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXpl
KGNvbnRhaW5lci5yZW5kZXJlci5jb250ZW50V2lkdGgoKSk7CisgICAgfQogCi0gICAgaWYgKHNp
emVGZWF0dXJlLm5hbWUgPT0gQ1E6OkZlYXR1cmVOYW1lczo6YmxvY2tTaXplKCkpCi0gICAgICAg
IHJldHVybiBldmFsdWF0ZVNpemUoY29udGV4dC5yZW5kZXJlci5jb250ZW50TG9naWNhbEhlaWdo
dCgpKTsKKyAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6RmVhdHVyZU5hbWVzOjpoZWln
aHQoKSkgeworICAgICAgICBpZiAoIWNvbnRhaW5lclN1cHBvcnRzUmVxdWlyZWRBeGlzKEF4aXM6
OkhlaWdodCkpCisgICAgICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bjsK
KworICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRhaW5lci5yZW5kZXJlci5jb250ZW50
SGVpZ2h0KCkpOworICAgIH0KKworICAgIGlmIChzaXplRmVhdHVyZS5uYW1lID09IENROjpGZWF0
dXJlTmFtZXM6OmlubGluZVNpemUoKSkgeworICAgICAgICBpZiAoIWNvbnRhaW5lclN1cHBvcnRz
UmVxdWlyZWRBeGlzKEF4aXM6OklubGluZSkpCisgICAgICAgICAgICByZXR1cm4gRXZhbHVhdGlv
blJlc3VsdDo6VW5rbm93bjsKKworICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRhaW5l
ci5yZW5kZXJlci5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAgIH0KKworICAgIGlmIChzaXpl
RmVhdHVyZS5uYW1lID09IENROjpGZWF0dXJlTmFtZXM6OmJsb2NrU2l6ZSgpKSB7CisgICAgICAg
IGlmICghY29udGFpbmVyU3VwcG9ydHNSZXF1aXJlZEF4aXMoQXhpczo6QmxvY2spKQorICAgICAg
ICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OlVua25vd247CisKKyAgICAgICAgcmV0dXJu
IGV2YWx1YXRlU2l6ZShjb250YWluZXIucmVuZGVyZXIuY29udGVudExvZ2ljYWxIZWlnaHQoKSk7
CisgICAgfQogCiAgICAgaWYgKHNpemVGZWF0dXJlLm5hbWUgPT0gQ1E6OkZlYXR1cmVOYW1lczo6
YXNwZWN0UmF0aW8oKSkgewotICAgICAgICBhdXRvIGJveFJhdGlvID0gY29udGV4dC5yZW5kZXJl
ci5jb250ZW50V2lkdGgoKS50b0RvdWJsZSgpIC8gY29udGV4dC5yZW5kZXJlci5jb250ZW50SGVp
Z2h0KCkudG9Eb3VibGUoKTsKKyAgICAgICAgaWYgKCFjb250YWluZXJTdXBwb3J0c1JlcXVpcmVk
QXhpcyhBeGlzOjpCb3RoKSkKKyAgICAgICAgICAgIHJldHVybiBFdmFsdWF0aW9uUmVzdWx0OjpV
bmtub3duOworCisgICAgICAgIGF1dG8gYm94UmF0aW8gPSBjb250YWluZXIucmVuZGVyZXIuY29u
dGVudFdpZHRoKCkudG9Eb3VibGUoKSAvIGNvbnRhaW5lci5yZW5kZXJlci5jb250ZW50SGVpZ2h0
KCkudG9Eb3VibGUoKTsKICAgICAgICAgaWYgKHNpemVGZWF0dXJlLmNvbXBhcmlzb25PcGVyYXRv
ciA9PSBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpUcnVlKQogICAgICAgICAgICAgcmV0dXJuIHRv
RXZhbHVhdGlvblJlc3VsdCghIWJveFJhdGlvKTsKIApAQCAtMjMxLDEyICsyNjgsMTUgQEAgYXV0
byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVTaXplRmVhdHVyZShjb25zdCBDUTo6
U2l6ZUZlYXR1cmUmIHNpemVGZWEKICAgICB9CiAKICAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9
PSBDUTo6RmVhdHVyZU5hbWVzOjpvcmllbnRhdGlvbigpKSB7CisgICAgICAgIGlmICghY29udGFp
bmVyU3VwcG9ydHNSZXF1aXJlZEF4aXMoQXhpczo6Qm90aCkpCisgICAgICAgICAgICByZXR1cm4g
RXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bjsKKwogICAgICAgICBpZiAoIWlzPENTU1ByaW1pdGl2
ZVZhbHVlPihzaXplRmVhdHVyZS52YWx1ZSkgfHwgc2l6ZUZlYXR1cmUuY29tcGFyaXNvbk9wZXJh
dG9yICE9IENROjpDb21wYXJpc29uT3BlcmF0b3I6OkVxdWFsKQogICAgICAgICAgICAgcmV0dXJu
IEV2YWx1YXRpb25SZXN1bHQ6OlVua25vd247CiAKICAgICAgICAgYXV0byYgdmFsdWUgPSBkb3du
Y2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnNpemVGZWF0dXJlLnZhbHVlKTsKIAotICAgICAgICBi
b29sIGlzUG9ydHJhaXQgPSBjb250ZXh0LnJlbmRlcmVyLmNvbnRlbnRIZWlnaHQoKSA+PSBjb250
ZXh0LnJlbmRlcmVyLmNvbnRlbnRXaWR0aCgpOworICAgICAgICBib29sIGlzUG9ydHJhaXQgPSBj
b250YWluZXIucmVuZGVyZXIuY29udGVudEhlaWdodCgpID49IGNvbnRhaW5lci5yZW5kZXJlci5j
b250ZW50V2lkdGgoKTsKICAgICAgICAgaWYgKHZhbHVlLnZhbHVlSUQoKSA9PSBDU1NWYWx1ZVBv
cnRyYWl0KQogICAgICAgICAgICAgcmV0dXJuIHRvRXZhbHVhdGlvblJlc3VsdChpc1BvcnRyYWl0
KTsKICAgICAgICAgaWYgKHZhbHVlLnZhbHVlSUQoKSA9PSBDU1NWYWx1ZUxhbmRzY2FwZSkKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmgg
Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5oCmluZGV4IDk5
YmUyMjJkMTVkOWY5ZDFhYjA3YTM4Njc0MWQyM2IyOWY0OTljZDYuLmNmZTQ2YWQwM2MzYTY1NTg1
YzVlZWFmZjVhNmY3NTIwNWIzOTdlN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxl
L0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvQ29u
dGFpbmVyUXVlcnlFdmFsdWF0b3IuaApAQCAtNDAsMTMgKzQwLDEzIEBAIHB1YmxpYzoKICAgICBi
b29sIGV2YWx1YXRlKGNvbnN0IEZpbHRlcmVkQ29udGFpbmVyUXVlcnkmKSBjb25zdDsKIAogcHJp
dmF0ZToKLSAgICBzdHJ1Y3QgRXZhbHVhdGlvbkNvbnRleHQ7CisgICAgc3RydWN0IFJlc29sdmVk
Q29udGFpbmVyOwogICAgIGVudW0gY2xhc3MgRXZhbHVhdGlvblJlc3VsdCA6IHVpbnQ4X3QgeyBG
YWxzZSwgVHJ1ZSwgVW5rbm93biB9OwogCi0gICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZVF1
ZXJ5KGNvbnN0IENROjpDb250YWluZXJRdWVyeSYsIGNvbnN0IEV2YWx1YXRpb25Db250ZXh0Jikg
Y29uc3Q7Ci0gICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZVF1ZXJ5KGNvbnN0IENROjpTaXpl
UXVlcnkmLCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYpIGNvbnN0OwotICAgIHRlbXBsYXRlPHR5
cGVuYW1lIENvbmRpdGlvblR5cGU+IEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGVDb25kaXRpb24o
Y29uc3QgQ29uZGl0aW9uVHlwZSYsIGNvbnN0IEV2YWx1YXRpb25Db250ZXh0JikgY29uc3Q7Ci0g
ICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZVNpemVGZWF0dXJlKGNvbnN0IENROjpTaXplRmVh
dHVyZSYsIGNvbnN0IEV2YWx1YXRpb25Db250ZXh0JikgY29uc3Q7CisgICAgRXZhbHVhdGlvblJl
c3VsdCBldmFsdWF0ZVF1ZXJ5KGNvbnN0IENROjpDb250YWluZXJRdWVyeSYsIGNvbnN0IFJlc29s
dmVkQ29udGFpbmVyJikgY29uc3Q7CisgICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZVF1ZXJ5
KGNvbnN0IENROjpTaXplUXVlcnkmLCBjb25zdCBSZXNvbHZlZENvbnRhaW5lciYpIGNvbnN0Owor
ICAgIHRlbXBsYXRlPHR5cGVuYW1lIENvbmRpdGlvblR5cGU+IEV2YWx1YXRpb25SZXN1bHQgZXZh
bHVhdGVDb25kaXRpb24oY29uc3QgQ29uZGl0aW9uVHlwZSYsIGNvbnN0IFJlc29sdmVkQ29udGFp
bmVyJikgY29uc3Q7CisgICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZVNpemVGZWF0dXJlKGNv
bnN0IENROjpTaXplRmVhdHVyZSYsIGNvbnN0IFJlc29sdmVkQ29udGFpbmVyJikgY29uc3Q7CiAK
ICAgICBjb25zdCBWZWN0b3I8UmVmPGNvbnN0IEVsZW1lbnQ+PiYgbV9jb250YWluZXJzOwogfTsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGFjNmNkNmUxNmVlYmNhZWZmMTM4ZGYw
NTNjMzgwMTgzMWUxMjVlMTYuLjIxMzRmMTU1YzMzYTMxMzUyODA0ZGNkNWU5NWJiZGNjYTk1ZmIx
MTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIy
LTAyLTE2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NT
IENvbnRhaW5lciBRdWVyaWVzXSBTaXplIHF1ZXJpZXMgb24gdW5zdXBwb3J0ZWQgYXhpcyBzaG91
bGQgZXZhbHVhdGUgdG8gdW5rbm93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjM2NzAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW5lci1xdWVyaWVzL2FzcGVjdC1yYXRpby1mZWF0dXJlLWV2YWx1YXRpb24tZXhwZWN0ZWQudHh0
OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVy
LXF1ZXJpZXMvY29udGFpbmVyLXNlbGVjdGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy91bnN1cHBv
cnRlZC1heGlzLWV4cGVjdGVkLnR4dDoKKwogMjAyMi0wMi0xNSAgTmlrb2xhb3MgTW91Y2h0YXJp
cyAgPG5tb3VjaHRhcmlzQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgcGFyc2luZyBh
bmQgYW5pbWF0aW9uIHN1cHBvcnQgZm9yIG9mZnNldCBzaG9ydGhhbmQKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWlu
L2NvbnRhaW5lci1xdWVyaWVzL2FzcGVjdC1yYXRpby1mZWF0dXJlLWV2YWx1YXRpb24tZXhwZWN0
ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXNwZWN0LXJhdGlvLWZlYXR1cmUtZXZhbHVh
dGlvbi1leHBlY3RlZC50eHQKaW5kZXggMTc1NmVlZmFmZjQ5NTdkMmVjOTNhMWNhMGUxYmZiMGM2
OTQ3YzdhNi4uMDhhZWU5YWI1NjdkYzQyNTM3MGRlMGU1NWNhMzhiMDQ1MzJkOTg2ZCAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXNwZWN0LXJhdGlvLWZlYXR1cmUtZXZhbHVhdGlv
bi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXNwZWN0LXJhdGlvLWZl
YXR1cmUtZXZhbHVhdGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw0IEBACiAKLUZBSUwgQGNv
bnRhaW5lciBxdWVyaWVzIHdpdGggYXNwZWN0LXJhdGlvIGFuZCBzaXplIGNvbnRhaW5tZW50IGFz
c2VydF9lcXVhbHM6IFNob3VsZCBub3QgbWF0Y2ggZm9yIGlubGluZS1zaXplIGNvbnRhaW5tZW50
IGV4cGVjdGVkICJyZ2IoMjU1LCAwLCAwKSIgYnV0IGdvdCAicmdiKDAsIDEyOCwgMCkiCitQQVNT
IEBjb250YWluZXIgcXVlcmllcyB3aXRoIGFzcGVjdC1yYXRpbyBhbmQgc2l6ZSBjb250YWlubWVu
dAogRkFJTCBAY29udGFpbmVyIHF1ZXJ5IHdpdGggYXNwZWN0LXJhdGlvIGNoYW5nZSBhZnRlciBy
ZXNpemUgYXNzZXJ0X2VxdWFsczogU2hvdWxkIG1hdGNoIDIvMSBtaW4tcmF0aW8gZXhwZWN0ZWQg
InJnYigwLCAyNTUsIDApIiBidXQgZ290ICJyZ2JhKDAsIDAsIDAsIDApIgogCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItc2VsZWN0aW9uLWV4cGVjdGVkLnR4dCBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250
YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cmlu
ZGV4IDJkNmRiMzRiOTQ0NWRlMWJiYWZjYTZjM2RiMGUyMGE5NzBjMjMzNDguLjU3NDdmZTRhYTQ0
ODkyM2E2MWYzMWI5OWU2MDljODI5OTQ1ZjExNmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x
dWVyaWVzL2NvbnRhaW5lci1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5l
ci1xdWVyaWVzL2NvbnRhaW5lci1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CkBAIC0yLDcgKzIsNyBA
QAogUEFTUyBzaXplKHdpZHRoOiAxNnB4KSBmb3IgLnNpemUgPiAuaW5saW5lID4gc3BhbgogUEFT
UyBzaXplKGhlaWdodDogMTZweCkgZm9yIC5pbmxpbmUgPiAuc2l6ZSA+IHNwYW4KIFBBU1Mgc2l6
ZSh3aWR0aDogMTZweCkgZm9yIC5pbmxpbmUgPiAuc2l6ZSA+IHNwYW4KLUZBSUwgc2l6ZShoZWln
aHQpIGZvciAuc2l6ZSA+IC5pbmxpbmUgPiBzcGFuIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIi
IGJ1dCBnb3QgInRydWUiCitQQVNTIHNpemUoaGVpZ2h0KSBmb3IgLnNpemUgPiAuaW5saW5lID4g
c3BhbgogRkFJTCB0eXBlKGlubGluZS1zaXplKSBzaXplKHdpZHRoOiAxNnB4KSBmb3IgLmlubGlu
ZSA+IC5zaXplID4gc3BhbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAidHJ1ZSIgYnV0IGdvdCAi
IgogRkFJTCB0eXBlKGlubGluZS1zaXplKSBzaXplKHdpZHRoOiAxNnB4KSBmb3IgLnNpemUgPiAu
aW5saW5lID4gc3BhbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAidHJ1ZSIgYnV0IGdvdCAiIgog
RkFJTCB0eXBlKHNpemUpIHNpemUoaGVpZ2h0OiAxNnB4KSBmb3IgLmlubGluZSA+IC5zaXplID4g
c3BhbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAidHJ1ZSIgYnV0IGdvdCAiIgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNv
bnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvdW5zdXBwb3J0ZWQtYXhpcy1leHBlY3RlZC50eHQgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFp
bi9jb250YWluZXItcXVlcmllcy91bnN1cHBvcnRlZC1heGlzLWV4cGVjdGVkLnR4dAppbmRleCAy
ZjZkMDcxZGMwOGJlZjg0M2JkMGZjZmM4ODJmOTA1NjViN2Y1YzllLi5kMGFjN2UyNWQ3YzA0ZTA0
MmY1MGM1YTY0ZmFjNDIzMWJiZjUyZjBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy91bnN1cHBvcnRlZC1heGlzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmll
cy91bnN1cHBvcnRlZC1heGlzLWV4cGVjdGVkLnR4dApAQCAtMSwxNCArMSwxNCBAQAogVGVzdAog
CiBQQVNTIHNpemUod2lkdGggPiAwcHgpCi1GQUlMIHNpemUoaGVpZ2h0ID4gMHB4KSBhc3NlcnRf
ZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290ICJ0cnVlIgorUEFTUyBzaXplKGhlaWdodCA+IDBw
eCkKIFBBU1Mgc2l6ZSgoaGVpZ2h0ID4gMHB4KSBvciAod2lkdGggPiAwcHgpKQogUEFTUyBzaXpl
KCh3aWR0aCA+IDBweCkgb3IgKGhlaWdodCA+IDBweCkpCiBQQVNTIHNpemUoKG9yaWVudGF0aW9u
OiBsYW5kc2NhcGUpIG9yICh3aWR0aCA+IDBweCkpCiBQQVNTIHNpemUoKHdpZHRoID4gMHB4KSBv
ciAob3JpZW50YXRpb246IGxhbmRzY2FwZSkpCi1GQUlMIHNpemUoKGhlaWdodCA+IDBweCkgb3Ig
KG9yaWVudGF0aW9uOiBsYW5kc2NhcGUpKSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQg
Z290ICJ0cnVlIgotRkFJTCBzaXplKChoZWlnaHQgPiAwcHgpIG9yIChvcmllbnRhdGlvbjogbGFu
ZHNjYXBlKSksIHdpdGggY29udGFpbjpzaXplIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1
dCBnb3QgInRydWUiCitQQVNTIHNpemUoKGhlaWdodCA+IDBweCkgb3IgKG9yaWVudGF0aW9uOiBs
YW5kc2NhcGUpKQorUEFTUyBzaXplKChoZWlnaHQgPiAwcHgpIG9yIChvcmllbnRhdGlvbjogbGFu
ZHNjYXBlKSksIHdpdGggY29udGFpbjpzaXplCiBQQVNTIHNpemUoaW5saW5lLXNpemUgPiAwcHgp
Ci1GQUlMIHNpemUoYmxvY2stc2l6ZSA+IDBweCkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIg
YnV0IGdvdCAidHJ1ZSIKLUZBSUwgc2l6ZShibG9jay1zaXplID4gMHB4KSwgd2l0aCB3cml0aW5n
LW1vZGU6dmVydGljYWwtcmwgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAidHJ1
ZSIKK1BBU1Mgc2l6ZShibG9jay1zaXplID4gMHB4KQorUEFTUyBzaXplKGJsb2NrLXNpemUgPiAw
cHgpLCB3aXRoIHdyaXRpbmctbW9kZTp2ZXJ0aWNhbC1ybAogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452186</attachid>
            <date>2022-02-16 05:18:24 -0800</date>
            <delta_ts>2022-02-16 08:54:10 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-236702-20220216151822.patch</filename>
            <type>text/plain</type>
            <size>18111</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY4NWRjNjVlNzljNWVk
NzE1NTljODRkOTZmZWM3Yjk5YWYxODFhZi4uZTk5MTQ4NmZjOWU3OWRjOTIxZGNiZjcyYzUwMmQ0
MzM3OTllYjI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTE2ICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR
dWVyaWVzXSBTaXplIHF1ZXJpZXMgb24gdW5zdXBwb3J0ZWQgYXhpcyBzaG91bGQgZXZhbHVhdGUg
dG8gdW5rbm93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjM2NzAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGVhbiBKYWNrc29uLgorCisgICAgICAg
ICJJZiAuLi4gdGhlIHF1ZXJ5IGNvbnRhaW5lciBkb2VzIG5vdCBzdXBwb3J0IGNvbnRhaW5lciBz
aXplIHF1ZXJpZXMgb24gdGhlIHJlbGV2YW50IGF4ZXMsCisgICAgICAgIHRoZW4gdGhlIHJlc3Vs
dCBvZiBldmFsdWF0aW5nIHRoZSBzaXplIGZlYXR1cmUgaXMgdW5rbm93bi4iCisKKyAgICAgICAg
aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1jb250YWluLTMvI3NpemUtY29udGFpbmVyCisK
KyAgICAgICAgKiBzdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpTdHlsZTo6Q29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlIGNvbnN0KToK
KworICAgICAgICBTb21lIGNsZWFudXBzLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6Q29u
dGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlUXVlcnkgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6U3R5bGU6OkNvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZUNvbmRpdGlvbiBj
b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6Q29udGFpbmVyUXVlcnlFdmFsdWF0b3I6
OmV2YWx1YXRlU2l6ZUZlYXR1cmUgY29uc3QpOgorCisgICAgICAgIENoZWNrIHdoZXRoZXIgdGhl
IGNvbnRhaW5lciBzdXBwb3J0cyB0aGUgZmVhdHVyZSBheGlzIGFuZCByZXR1cm4gVW5rbm93biBv
ZiBub3QuCisKKyAgICAgICAgKiBzdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5oOgorCisg
ICAgICAgIFJlbmFtZSBFdmFsdWF0aW9uQ29udGV4dCAtPiBSZXNvbHZlZENvbnRhaW5lciB0byBi
ZSBsZXNzIGdlbmVyaWMuCisKIDIwMjItMDItMTUgIE5pa29sYW9zIE1vdWNodGFyaXMgIDxubW91
Y2h0YXJpc0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHBhcnNpbmcgYW5kIGFuaW1h
dGlvbiBzdXBwb3J0IGZvciBvZmZzZXQgc2hvcnRoYW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9zdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9z
dHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5jcHAKaW5kZXggMjVhMjc4ZmYwZmZjNDA1YzBi
OWI0NGRlMTZlMjA0NWQ3ZWE4MzBjOC4uNmUxNDEyMTQ5OWI1MjQ2OGMwOWJmZmE1OTE5NzY3NGIw
MWJmMDUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvQ29udGFpbmVyUXVlcnlF
dmFsdWF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZh
bHVhdG9yLmNwcApAQCAtMzcsOCArMzcsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZTo6U3R5bGUg
ewogCi1zdHJ1Y3QgQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OkV2YWx1YXRpb25Db250ZXh0IHsK
LSAgICBSZW5kZXJCb3gmIHJlbmRlcmVyOworc3RydWN0IENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9y
OjpSZXNvbHZlZENvbnRhaW5lciB7CisgICAgY29uc3QgUmVuZGVyQm94JiByZW5kZXJlcjsKICAg
ICBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhIGNvbnZlcnNpb25EYXRhOwogfTsKIApAQCAtNTIs
NjQgKzUyLDY0IEBAIGJvb2wgQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlKGNvbnN0
IEZpbHRlcmVkQ29udGFpbmVyUXVlcnkmIGZpbHRlcmVkQ29uCiAgICAgaWYgKG1fY29udGFpbmVy
cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8gY29udGFpbmVy
UmVuZGVyZXJGb3JGaWx0ZXIgPSBbJl0oKSAtPiBSZW5kZXJCb3gqIHsKKyAgICBhdXRvIG1ha2VS
ZXNvbHZlZENvbnRhaW5lciA9IFsmXShjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyKSAtPiBSZXNv
bHZlZENvbnRhaW5lciB7CisgICAgICAgIGF1dG8mIHZpZXcgPSByZW5kZXJlci52aWV3KCk7Cisg
ICAgICAgIHJldHVybiB7CisgICAgICAgICAgICByZW5kZXJlciwKKyAgICAgICAgICAgIENTU1Rv
TGVuZ3RoQ29udmVyc2lvbkRhdGEgeyAmcmVuZGVyZXIuc3R5bGUoKSwgJnZpZXcuc3R5bGUoKSwg
bnVsbHB0ciwgJnZpZXcsIDEgfQorICAgICAgICB9OworICAgIH07CisKKyAgICBhdXRvIHJlc29s
dmVDb250YWluZXIgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPFJlc29sdmVkQ29udGFpbmVyPiB7
CiAgICAgICAgIGZvciAoYXV0byYgY29udGFpbmVyIDogbWFrZVJldmVyc2VkUmFuZ2UobV9jb250
YWluZXJzKSkgewogICAgICAgICAgICAgYXV0byogcmVuZGVyZXIgPSBkeW5hbWljRG93bmNhc3Q8
UmVuZGVyQm94Pihjb250YWluZXItPnJlbmRlcmVyKCkpOwogICAgICAgICAgICAgaWYgKCFyZW5k
ZXJlcikKLSAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgICAgICBy
ZXR1cm4geyB9OwogICAgICAgICAgICAgaWYgKGZpbHRlcmVkQ29udGFpbmVyUXVlcnkubmFtZUZp
bHRlci5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHJlbmRlcmVyOworICAgICAg
ICAgICAgICAgIHJldHVybiBtYWtlUmVzb2x2ZWRDb250YWluZXIoKnJlbmRlcmVyKTsKICAgICAg
ICAgICAgIC8vIEZJWE1FOiBTdXBwb3J0IHR5cGUgZmlsdGVyLgogICAgICAgICAgICAgaWYgKHJl
bmRlcmVyLT5zdHlsZSgpLmNvbnRhaW5lck5hbWVzKCkuY29udGFpbnMoZmlsdGVyZWRDb250YWlu
ZXJRdWVyeS5uYW1lRmlsdGVyKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcmVuZGVyZXI7Cisg
ICAgICAgICAgICAgICAgcmV0dXJuIG1ha2VSZXNvbHZlZENvbnRhaW5lcigqcmVuZGVyZXIpOwog
ICAgICAgICB9Ci0gICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICByZXR1cm4geyB9Owog
ICAgIH07CiAKLSAgICBhdXRvKiByZW5kZXJlciA9IGNvbnRhaW5lclJlbmRlcmVyRm9yRmlsdGVy
KCk7Ci0gICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgYXV0
byYgdmlldyA9IHJlbmRlcmVyLT52aWV3KCk7Ci0gICAgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0
YSB7ICZyZW5kZXJlci0+c3R5bGUoKSwgJnZpZXcuc3R5bGUoKSwgbnVsbHB0ciwgJnZpZXcsIDEg
fTsKLQotICAgIEV2YWx1YXRpb25Db250ZXh0IGV2YWx1YXRpb25Db250ZXh0IHsKLSAgICAgICAg
KnJlbmRlcmVyLAotICAgICAgICBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhIHsgJnJlbmRlcmVy
LT5zdHlsZSgpLCAmdmlldy5zdHlsZSgpLCBudWxscHRyLCAmdmlldywgMSB9Ci0gICAgfTsKKyAg
ICBhdXRvIGNvbnRhaW5lciA9IHJlc29sdmVDb250YWluZXIoKTsKKyAgICBpZiAoIWNvbnRhaW5l
cikKKyAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiBldmFsdWF0ZVF1ZXJ5KGZpbHRl
cmVkQ29udGFpbmVyUXVlcnkucXVlcnksIGV2YWx1YXRpb25Db250ZXh0KSA9PSBFdmFsdWF0aW9u
UmVzdWx0OjpUcnVlOworICAgIHJldHVybiBldmFsdWF0ZVF1ZXJ5KGZpbHRlcmVkQ29udGFpbmVy
UXVlcnkucXVlcnksICpjb250YWluZXIpID09IEV2YWx1YXRpb25SZXN1bHQ6OlRydWU7CiB9CiAK
LWF1dG8gQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlUXVlcnkoY29uc3QgQ1E6OkNv
bnRhaW5lclF1ZXJ5JiBjb250YWluZXJRdWVyeSwgY29uc3QgRXZhbHVhdGlvbkNvbnRleHQmIGNv
bnRleHQpIGNvbnN0IC0+IEV2YWx1YXRpb25SZXN1bHQKK2F1dG8gQ29udGFpbmVyUXVlcnlFdmFs
dWF0b3I6OmV2YWx1YXRlUXVlcnkoY29uc3QgQ1E6OkNvbnRhaW5lclF1ZXJ5JiBjb250YWluZXJR
dWVyeSwgY29uc3QgUmVzb2x2ZWRDb250YWluZXImIGNvbnRhaW5lcikgY29uc3QgLT4gRXZhbHVh
dGlvblJlc3VsdAogewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKGNvbnRhaW5lclF1ZXJ5LCBb
Jl0oY29uc3QgQ1E6OkNvbnRhaW5lckNvbmRpdGlvbiYgY29udGFpbmVyQ29uZGl0aW9uKSB7Ci0g
ICAgICAgIHJldHVybiBldmFsdWF0ZUNvbmRpdGlvbihjb250YWluZXJDb25kaXRpb24sIGNvbnRl
eHQpOworICAgICAgICByZXR1cm4gZXZhbHVhdGVDb25kaXRpb24oY29udGFpbmVyQ29uZGl0aW9u
LCBjb250YWluZXIpOwogICAgIH0sIFsmXShjb25zdCBDUTo6U2l6ZVF1ZXJ5JiBzaXplUXVlcnkp
IHsKLSAgICAgICAgcmV0dXJuIGV2YWx1YXRlUXVlcnkoc2l6ZVF1ZXJ5LCBjb250ZXh0KTsKKyAg
ICAgICAgcmV0dXJuIGV2YWx1YXRlUXVlcnkoc2l6ZVF1ZXJ5LCBjb250YWluZXIpOwogICAgIH0s
IFsmXShjb25zdCBDUTo6VW5rbm93blF1ZXJ5JikgewogICAgICAgICByZXR1cm4gRXZhbHVhdGlv
blJlc3VsdDo6VW5rbm93bjsKICAgICB9KTsKIH0KIAotYXV0byBDb250YWluZXJRdWVyeUV2YWx1
YXRvcjo6ZXZhbHVhdGVRdWVyeShjb25zdCBDUTo6U2l6ZVF1ZXJ5JiBzaXplUXVlcnksIGNvbnN0
IEV2YWx1YXRpb25Db250ZXh0JiBjb250ZXh0KSBjb25zdCAtPiBFdmFsdWF0aW9uUmVzdWx0Cith
dXRvIENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZVF1ZXJ5KGNvbnN0IENROjpTaXpl
UXVlcnkmIHNpemVRdWVyeSwgY29uc3QgUmVzb2x2ZWRDb250YWluZXImIGNvbnRhaW5lcikgY29u
c3QgLT4gRXZhbHVhdGlvblJlc3VsdAogewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHNpemVR
dWVyeSwgWyZdKGNvbnN0IENROjpTaXplQ29uZGl0aW9uJiBzaXplQ29uZGl0aW9uKSB7Ci0gICAg
ICAgIHJldHVybiBldmFsdWF0ZUNvbmRpdGlvbihzaXplQ29uZGl0aW9uLCBjb250ZXh0KTsKKyAg
ICAgICAgcmV0dXJuIGV2YWx1YXRlQ29uZGl0aW9uKHNpemVDb25kaXRpb24sIGNvbnRhaW5lcik7
CiAgICAgfSwgWyZdKGNvbnN0IENROjpTaXplRmVhdHVyZSYgc2l6ZUZlYXR1cmUpIHsKLSAgICAg
ICAgcmV0dXJuIGV2YWx1YXRlU2l6ZUZlYXR1cmUoc2l6ZUZlYXR1cmUsIGNvbnRleHQpOworICAg
ICAgICByZXR1cm4gZXZhbHVhdGVTaXplRmVhdHVyZShzaXplRmVhdHVyZSwgY29udGFpbmVyKTsK
ICAgICB9KTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQ29uZGl0aW9uVHlwZT4KLWF1dG8gQ29u
dGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlQ29uZGl0aW9uKGNvbnN0IENvbmRpdGlvblR5
cGUmIGNvbmRpdGlvbiwgY29uc3QgRXZhbHVhdGlvbkNvbnRleHQmIGNvbnRleHQpIGNvbnN0IC0+
IEV2YWx1YXRpb25SZXN1bHQKK2F1dG8gQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRl
Q29uZGl0aW9uKGNvbnN0IENvbmRpdGlvblR5cGUmIGNvbmRpdGlvbiwgY29uc3QgUmVzb2x2ZWRD
b250YWluZXImIGNvbnRhaW5lcikgY29uc3QgLT4gRXZhbHVhdGlvblJlc3VsdAogewogICAgIGlm
IChjb25kaXRpb24ucXVlcmllcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBFdmFsdWF0aW9u
UmVzdWx0OjpVbmtub3duOwogCiAgICAgc3dpdGNoIChjb25kaXRpb24ubG9naWNhbE9wZXJhdG9y
KSB7CiAgICAgY2FzZSBDUTo6TG9naWNhbE9wZXJhdG9yOjpOb3Q6IHsKLSAgICAgICAgc3dpdGNo
IChldmFsdWF0ZVF1ZXJ5KGNvbmRpdGlvbi5xdWVyaWVzLmZpcnN0KCksIGNvbnRleHQpKSB7Cisg
ICAgICAgIHN3aXRjaCAoZXZhbHVhdGVRdWVyeShjb25kaXRpb24ucXVlcmllcy5maXJzdCgpLCBj
b250YWluZXIpKSB7CiAgICAgICAgIGNhc2UgRXZhbHVhdGlvblJlc3VsdDo6VHJ1ZToKICAgICAg
ICAgICAgIHJldHVybiBFdmFsdWF0aW9uUmVzdWx0OjpGYWxzZTsKICAgICAgICAgY2FzZSBFdmFs
dWF0aW9uUmVzdWx0OjpGYWxzZToKQEAgLTEyMSw3ICsxMjEsNyBAQCBhdXRvIENvbnRhaW5lclF1
ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZUNvbmRpdGlvbihjb25zdCBDb25kaXRpb25UeXBlJiBjb25k
aXRpb24sCiAgICAgY2FzZSBDUTo6TG9naWNhbE9wZXJhdG9yOjpBbmQ6IHsKICAgICAgICAgYXV0
byByZXN1bHQgPSBFdmFsdWF0aW9uUmVzdWx0OjpUcnVlOwogICAgICAgICBmb3IgKGF1dG8gcXVl
cnkgOiBjb25kaXRpb24ucXVlcmllcykgewotICAgICAgICAgICAgYXV0byBxdWVyeVJlc3VsdCA9
IGV2YWx1YXRlUXVlcnkocXVlcnksIGNvbnRleHQpOworICAgICAgICAgICAgYXV0byBxdWVyeVJl
c3VsdCA9IGV2YWx1YXRlUXVlcnkocXVlcnksIGNvbnRhaW5lcik7CiAgICAgICAgICAgICBpZiAo
cXVlcnlSZXN1bHQgPT0gRXZhbHVhdGlvblJlc3VsdDo6RmFsc2UpCiAgICAgICAgICAgICAgICAg
cmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OkZhbHNlOwogICAgICAgICAgICAgaWYgKHF1ZXJ5UmVz
dWx0ID09IEV2YWx1YXRpb25SZXN1bHQ6OlVua25vd24pCkBAIC0xMzIsNyArMTMyLDcgQEAgYXV0
byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVDb25kaXRpb24oY29uc3QgQ29uZGl0
aW9uVHlwZSYgY29uZGl0aW9uLAogICAgIGNhc2UgQ1E6OkxvZ2ljYWxPcGVyYXRvcjo6T3I6IHsK
ICAgICAgICAgYXV0byByZXN1bHQgPSBFdmFsdWF0aW9uUmVzdWx0OjpGYWxzZTsKICAgICAgICAg
Zm9yIChhdXRvIHF1ZXJ5IDogY29uZGl0aW9uLnF1ZXJpZXMpIHsKLSAgICAgICAgICAgIGF1dG8g
cXVlcnlSZXN1bHQgPSBldmFsdWF0ZVF1ZXJ5KHF1ZXJ5LCBjb250ZXh0KTsKKyAgICAgICAgICAg
IGF1dG8gcXVlcnlSZXN1bHQgPSBldmFsdWF0ZVF1ZXJ5KHF1ZXJ5LCBjb250YWluZXIpOwogICAg
ICAgICAgICAgaWYgKHF1ZXJ5UmVzdWx0ID09IEV2YWx1YXRpb25SZXN1bHQ6OlRydWUpCiAgICAg
ICAgICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OlRydWU7CiAgICAgICAgICAgICBp
ZiAocXVlcnlSZXN1bHQgPT0gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bikKQEAgLTE2MCw3ICsx
NjAsNyBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlU2l6ZShjb25z
dCBDU1NWYWx1ZSogdmFsdWUsIGNvbnN0IENTU1RvTAogICAgIHJldHVybiBwcmltaXRpdmVWYWx1
ZS5jb21wdXRlTGVuZ3RoPExheW91dFVuaXQ+KGNvbnZlcnNpb25EYXRhKTsKIH0KIAotYXV0byBD
b250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVTaXplRmVhdHVyZShjb25zdCBDUTo6U2l6
ZUZlYXR1cmUmIHNpemVGZWF0dXJlLCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYgY29udGV4dCkg
Y29uc3QgLT4gRXZhbHVhdGlvblJlc3VsdAorYXV0byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6
ZXZhbHVhdGVTaXplRmVhdHVyZShjb25zdCBDUTo6U2l6ZUZlYXR1cmUmIHNpemVGZWF0dXJlLCBj
b25zdCBSZXNvbHZlZENvbnRhaW5lciYgY29udGFpbmVyKSBjb25zdCAtPiBFdmFsdWF0aW9uUmVz
dWx0CiB7CiAgICAgYXV0byB0b0V2YWx1YXRpb25SZXN1bHQgPSBbXShib29sIGJvb2xlYW4pIHsK
ICAgICAgICAgcmV0dXJuIGJvb2xlYW4gPyBFdmFsdWF0aW9uUmVzdWx0OjpUcnVlIDogRXZhbHVh
dGlvblJlc3VsdDo6RmFsc2U7CkBAIC0xODgsMjcgKzE4OCw2MyBAQCBhdXRvIENvbnRhaW5lclF1
ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZVNpemVGZWF0dXJlKGNvbnN0IENROjpTaXplRmVhdHVyZSYg
c2l6ZUZlYQogICAgICAgICBpZiAoc2l6ZUZlYXR1cmUuY29tcGFyaXNvbk9wZXJhdG9yID09IENR
OjpDb21wYXJpc29uT3BlcmF0b3I6OlRydWUpCiAgICAgICAgICAgICByZXR1cm4gdG9FdmFsdWF0
aW9uUmVzdWx0KCEhc2l6ZSk7CiAKLSAgICAgICAgYXV0byBleHByZXNzaW9uU2l6ZSA9IGNvbXB1
dGVTaXplKHNpemVGZWF0dXJlLnZhbHVlLmdldCgpLCBjb250ZXh0LmNvbnZlcnNpb25EYXRhKTsK
KyAgICAgICAgYXV0byBleHByZXNzaW9uU2l6ZSA9IGNvbXB1dGVTaXplKHNpemVGZWF0dXJlLnZh
bHVlLmdldCgpLCBjb250YWluZXIuY29udmVyc2lvbkRhdGEpOwogICAgICAgICBpZiAoIWV4cHJl
c3Npb25TaXplKQogICAgICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OlVua25vd247
CiAKICAgICAgICAgcmV0dXJuIHRvRXZhbHVhdGlvblJlc3VsdChjb21wYXJlKHNpemUsICpleHBy
ZXNzaW9uU2l6ZSkpOwogICAgIH07CiAKLSAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6
RmVhdHVyZU5hbWVzOjp3aWR0aCgpKQotICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRl
eHQucmVuZGVyZXIuY29udGVudFdpZHRoKCkpOworICAgIGVudW0gY2xhc3MgQXhpcyA6IHVpbnQ4
X3QgeyBCb3RoLCBCbG9jaywgSW5saW5lLCBXaWR0aCwgSGVpZ2h0IH07CisgICAgYXV0byBjb250
YWluZXJTdXBwb3J0c1JlcXVpcmVkQXhpcyA9IFsmXShBeGlzIGF4aXMpIHsKKyAgICAgICAgc3dp
dGNoIChjb250YWluZXIucmVuZGVyZXIuc3R5bGUoKS5jb250YWluZXJUeXBlKCkpIHsKKyAgICAg
ICAgY2FzZSBDb250YWluZXJUeXBlOjpTaXplOgorICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg
ICAgICAgIGNhc2UgQ29udGFpbmVyVHlwZTo6SW5saW5lU2l6ZToKKyAgICAgICAgICAgIGlmIChh
eGlzID09IEF4aXM6OldpZHRoKQorICAgICAgICAgICAgICAgIHJldHVybiBjb250YWluZXIucmVu
ZGVyZXIuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICAgICAgICAgIGlmIChheGlzID09
IEF4aXM6OkhlaWdodCkKKyAgICAgICAgICAgICAgICByZXR1cm4gIWNvbnRhaW5lci5yZW5kZXJl
ci5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpOworICAgICAgICAgICAgcmV0dXJuIGF4aXMgPT0g
QXhpczo6SW5saW5lOworICAgICAgICBjYXNlIENvbnRhaW5lclR5cGU6Ok5vbmU6CisgICAgICAg
ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg
ICAgICAgfQorICAgIH07CiAKLSAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6RmVhdHVy
ZU5hbWVzOjpoZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIGV2YWx1YXRlU2l6ZShjb250ZXh0LnJl
bmRlcmVyLmNvbnRlbnRIZWlnaHQoKSk7CisgICAgaWYgKHNpemVGZWF0dXJlLm5hbWUgPT0gQ1E6
OkZlYXR1cmVOYW1lczo6d2lkdGgoKSkgeworICAgICAgICBpZiAoIWNvbnRhaW5lclN1cHBvcnRz
UmVxdWlyZWRBeGlzKEF4aXM6OldpZHRoKSkKKyAgICAgICAgICAgIHJldHVybiBFdmFsdWF0aW9u
UmVzdWx0OjpVbmtub3duOwogCi0gICAgaWYgKHNpemVGZWF0dXJlLm5hbWUgPT0gQ1E6OkZlYXR1
cmVOYW1lczo6aW5saW5lU2l6ZSgpKQotICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRl
eHQucmVuZGVyZXIuY29udGVudExvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgcmV0dXJuIGV2YWx1
YXRlU2l6ZShjb250YWluZXIucmVuZGVyZXIuY29udGVudFdpZHRoKCkpOworICAgIH0KIAotICAg
IGlmIChzaXplRmVhdHVyZS5uYW1lID09IENROjpGZWF0dXJlTmFtZXM6OmJsb2NrU2l6ZSgpKQot
ICAgICAgICByZXR1cm4gZXZhbHVhdGVTaXplKGNvbnRleHQucmVuZGVyZXIuY29udGVudExvZ2lj
YWxIZWlnaHQoKSk7CisgICAgaWYgKHNpemVGZWF0dXJlLm5hbWUgPT0gQ1E6OkZlYXR1cmVOYW1l
czo6aGVpZ2h0KCkpIHsKKyAgICAgICAgaWYgKCFjb250YWluZXJTdXBwb3J0c1JlcXVpcmVkQXhp
cyhBeGlzOjpIZWlnaHQpKQorICAgICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OlVu
a25vd247CisKKyAgICAgICAgcmV0dXJuIGV2YWx1YXRlU2l6ZShjb250YWluZXIucmVuZGVyZXIu
Y29udGVudEhlaWdodCgpKTsKKyAgICB9CisKKyAgICBpZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBD
UTo6RmVhdHVyZU5hbWVzOjppbmxpbmVTaXplKCkpIHsKKyAgICAgICAgaWYgKCFjb250YWluZXJT
dXBwb3J0c1JlcXVpcmVkQXhpcyhBeGlzOjpJbmxpbmUpKQorICAgICAgICAgICAgcmV0dXJuIEV2
YWx1YXRpb25SZXN1bHQ6OlVua25vd247CisKKyAgICAgICAgcmV0dXJuIGV2YWx1YXRlU2l6ZShj
b250YWluZXIucmVuZGVyZXIuY29udGVudExvZ2ljYWxXaWR0aCgpKTsKKyAgICB9CisKKyAgICBp
ZiAoc2l6ZUZlYXR1cmUubmFtZSA9PSBDUTo6RmVhdHVyZU5hbWVzOjpibG9ja1NpemUoKSkgewor
ICAgICAgICBpZiAoIWNvbnRhaW5lclN1cHBvcnRzUmVxdWlyZWRBeGlzKEF4aXM6OkJsb2NrKSkK
KyAgICAgICAgICAgIHJldHVybiBFdmFsdWF0aW9uUmVzdWx0OjpVbmtub3duOworCisgICAgICAg
IHJldHVybiBldmFsdWF0ZVNpemUoY29udGFpbmVyLnJlbmRlcmVyLmNvbnRlbnRMb2dpY2FsSGVp
Z2h0KCkpOworICAgIH0KIAogICAgIGlmIChzaXplRmVhdHVyZS5uYW1lID09IENROjpGZWF0dXJl
TmFtZXM6OmFzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAgYXV0byBib3hSYXRpbyA9IGNvbnRleHQu
cmVuZGVyZXIuY29udGVudFdpZHRoKCkudG9Eb3VibGUoKSAvIGNvbnRleHQucmVuZGVyZXIuY29u
dGVudEhlaWdodCgpLnRvRG91YmxlKCk7CisgICAgICAgIGlmICghY29udGFpbmVyU3VwcG9ydHNS
ZXF1aXJlZEF4aXMoQXhpczo6Qm90aCkpCisgICAgICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJl
c3VsdDo6VW5rbm93bjsKKworICAgICAgICBhdXRvIGJveFJhdGlvID0gY29udGFpbmVyLnJlbmRl
cmVyLmNvbnRlbnRXaWR0aCgpLnRvRG91YmxlKCkgLyBjb250YWluZXIucmVuZGVyZXIuY29udGVu
dEhlaWdodCgpLnRvRG91YmxlKCk7CiAgICAgICAgIGlmIChzaXplRmVhdHVyZS5jb21wYXJpc29u
T3BlcmF0b3IgPT0gQ1E6OkNvbXBhcmlzb25PcGVyYXRvcjo6VHJ1ZSkKICAgICAgICAgICAgIHJl
dHVybiB0b0V2YWx1YXRpb25SZXN1bHQoISFib3hSYXRpbyk7CiAKQEAgLTIzMSwxMiArMjY3LDE1
IEBAIGF1dG8gQ29udGFpbmVyUXVlcnlFdmFsdWF0b3I6OmV2YWx1YXRlU2l6ZUZlYXR1cmUoY29u
c3QgQ1E6OlNpemVGZWF0dXJlJiBzaXplRmVhCiAgICAgfQogCiAgICAgaWYgKHNpemVGZWF0dXJl
Lm5hbWUgPT0gQ1E6OkZlYXR1cmVOYW1lczo6b3JpZW50YXRpb24oKSkgeworICAgICAgICBpZiAo
IWNvbnRhaW5lclN1cHBvcnRzUmVxdWlyZWRBeGlzKEF4aXM6OkJvdGgpKQorICAgICAgICAgICAg
cmV0dXJuIEV2YWx1YXRpb25SZXN1bHQ6OlVua25vd247CisKICAgICAgICAgaWYgKCFpczxDU1NQ
cmltaXRpdmVWYWx1ZT4oc2l6ZUZlYXR1cmUudmFsdWUpIHx8IHNpemVGZWF0dXJlLmNvbXBhcmlz
b25PcGVyYXRvciAhPSBDUTo6Q29tcGFyaXNvbk9wZXJhdG9yOjpFcXVhbCkKICAgICAgICAgICAg
IHJldHVybiBFdmFsdWF0aW9uUmVzdWx0OjpVbmtub3duOwogCiAgICAgICAgIGF1dG8mIHZhbHVl
ID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpzaXplRmVhdHVyZS52YWx1ZSk7CiAKLSAg
ICAgICAgYm9vbCBpc1BvcnRyYWl0ID0gY29udGV4dC5yZW5kZXJlci5jb250ZW50SGVpZ2h0KCkg
Pj0gY29udGV4dC5yZW5kZXJlci5jb250ZW50V2lkdGgoKTsKKyAgICAgICAgYm9vbCBpc1BvcnRy
YWl0ID0gY29udGFpbmVyLnJlbmRlcmVyLmNvbnRlbnRIZWlnaHQoKSA+PSBjb250YWluZXIucmVu
ZGVyZXIuY29udGVudFdpZHRoKCk7CiAgICAgICAgIGlmICh2YWx1ZS52YWx1ZUlEKCkgPT0gQ1NT
VmFsdWVQb3J0cmFpdCkKICAgICAgICAgICAgIHJldHVybiB0b0V2YWx1YXRpb25SZXN1bHQoaXNQ
b3J0cmFpdCk7CiAgICAgICAgIGlmICh2YWx1ZS52YWx1ZUlEKCkgPT0gQ1NTVmFsdWVMYW5kc2Nh
cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Db250YWluZXJRdWVyeUV2YWx1
YXRvci5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvQ29udGFpbmVyUXVlcnlFdmFsdWF0b3IuaApp
bmRleCA5OWJlMjIyZDE1ZDlmOWQxYWIwN2EzODY3NDFkMjNiMjlmNDk5Y2Q2Li5jZmU0NmFkMDNj
M2E2NTU4NWM1ZWVhZmY1YTZmNzUyMDViMzk3ZTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9zdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0
eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmgKQEAgLTQwLDEzICs0MCwxMyBAQCBwdWJsaWM6
CiAgICAgYm9vbCBldmFsdWF0ZShjb25zdCBGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5JikgY29uc3Q7
CiAKIHByaXZhdGU6Ci0gICAgc3RydWN0IEV2YWx1YXRpb25Db250ZXh0OworICAgIHN0cnVjdCBS
ZXNvbHZlZENvbnRhaW5lcjsKICAgICBlbnVtIGNsYXNzIEV2YWx1YXRpb25SZXN1bHQgOiB1aW50
OF90IHsgRmFsc2UsIFRydWUsIFVua25vd24gfTsKIAotICAgIEV2YWx1YXRpb25SZXN1bHQgZXZh
bHVhdGVRdWVyeShjb25zdCBDUTo6Q29udGFpbmVyUXVlcnkmLCBjb25zdCBFdmFsdWF0aW9uQ29u
dGV4dCYpIGNvbnN0OwotICAgIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGVRdWVyeShjb25zdCBD
UTo6U2l6ZVF1ZXJ5JiwgY29uc3QgRXZhbHVhdGlvbkNvbnRleHQmKSBjb25zdDsKLSAgICB0ZW1w
bGF0ZTx0eXBlbmFtZSBDb25kaXRpb25UeXBlPiBFdmFsdWF0aW9uUmVzdWx0IGV2YWx1YXRlQ29u
ZGl0aW9uKGNvbnN0IENvbmRpdGlvblR5cGUmLCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYpIGNv
bnN0OwotICAgIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGVTaXplRmVhdHVyZShjb25zdCBDUTo6
U2l6ZUZlYXR1cmUmLCBjb25zdCBFdmFsdWF0aW9uQ29udGV4dCYpIGNvbnN0OworICAgIEV2YWx1
YXRpb25SZXN1bHQgZXZhbHVhdGVRdWVyeShjb25zdCBDUTo6Q29udGFpbmVyUXVlcnkmLCBjb25z
dCBSZXNvbHZlZENvbnRhaW5lciYpIGNvbnN0OworICAgIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVh
dGVRdWVyeShjb25zdCBDUTo6U2l6ZVF1ZXJ5JiwgY29uc3QgUmVzb2x2ZWRDb250YWluZXImKSBj
b25zdDsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDb25kaXRpb25UeXBlPiBFdmFsdWF0aW9uUmVz
dWx0IGV2YWx1YXRlQ29uZGl0aW9uKGNvbnN0IENvbmRpdGlvblR5cGUmLCBjb25zdCBSZXNvbHZl
ZENvbnRhaW5lciYpIGNvbnN0OworICAgIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGVTaXplRmVh
dHVyZShjb25zdCBDUTo6U2l6ZUZlYXR1cmUmLCBjb25zdCBSZXNvbHZlZENvbnRhaW5lciYpIGNv
bnN0OwogCiAgICAgY29uc3QgVmVjdG9yPFJlZjxjb25zdCBFbGVtZW50Pj4mIG1fY29udGFpbmVy
czsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBhYzZjZDZlMTZlZWJjYWVm
ZjEzOGRmMDUzYzM4MDE4MzFlMTI1ZTE2Li42MzE3OWFiM2ZlODlkYTU3ZTkwOWQ5ZDU3NGVhM2Fm
YjhlN2U5YTdkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA
QAorMjAyMi0wMi0xNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAg
ICAgW0NTUyBDb250YWluZXIgUXVlcmllc10gU2l6ZSBxdWVyaWVzIG9uIHVuc3VwcG9ydGVkIGF4
aXMgc2hvdWxkIGV2YWx1YXRlIHRvIHVua25vd24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IERlYW4g
SmFja3Nvbi4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4v
Y29udGFpbmVyLXF1ZXJpZXMvYXNwZWN0LXJhdGlvLWZlYXR1cmUtZXZhbHVhdGlvbi1leHBlY3Rl
ZC50eHQ6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250
YWluZXItcXVlcmllcy9jb250YWluZXItc2VsZWN0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg
KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL3Vu
c3VwcG9ydGVkLWF4aXMtZXhwZWN0ZWQudHh0OgorCiAyMDIyLTAyLTE1ICBOaWtvbGFvcyBNb3Vj
aHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBwYXJz
aW5nIGFuZCBhbmltYXRpb24gc3VwcG9ydCBmb3Igb2Zmc2V0IHNob3J0aGFuZApkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNv
bnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvYXNwZWN0LXJhdGlvLWZlYXR1cmUtZXZhbHVhdGlvbi1l
eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hc3BlY3QtcmF0aW8tZmVhdHVyZS1l
dmFsdWF0aW9uLWV4cGVjdGVkLnR4dAppbmRleCAxNzU2ZWVmYWZmNDk1N2QyZWM5M2ExY2EwZTFi
ZmIwYzY5NDdjN2E2Li4wOGFlZTlhYjU2N2RjNDI1MzcwZGUwZTU1Y2EzOGIwNDUzMmQ5ODZkIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hc3BlY3QtcmF0aW8tZmVhdHVyZS1ldmFs
dWF0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9hc3BlY3QtcmF0
aW8tZmVhdHVyZS1ldmFsdWF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAotRkFJ
TCBAY29udGFpbmVyIHF1ZXJpZXMgd2l0aCBhc3BlY3QtcmF0aW8gYW5kIHNpemUgY29udGFpbm1l
bnQgYXNzZXJ0X2VxdWFsczogU2hvdWxkIG5vdCBtYXRjaCBmb3IgaW5saW5lLXNpemUgY29udGFp
bm1lbnQgZXhwZWN0ZWQgInJnYigyNTUsIDAsIDApIiBidXQgZ290ICJyZ2IoMCwgMTI4LCAwKSIK
K1BBU1MgQGNvbnRhaW5lciBxdWVyaWVzIHdpdGggYXNwZWN0LXJhdGlvIGFuZCBzaXplIGNvbnRh
aW5tZW50CiBGQUlMIEBjb250YWluZXIgcXVlcnkgd2l0aCBhc3BlY3QtcmF0aW8gY2hhbmdlIGFm
dGVyIHJlc2l6ZSBhc3NlcnRfZXF1YWxzOiBTaG91bGQgbWF0Y2ggMi8xIG1pbi1yYXRpbyBleHBl
Y3RlZCAicmdiKDAsIDI1NSwgMCkiIGJ1dCBnb3QgInJnYmEoMCwgMCwgMCwgMCkiCiAKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci1zZWxlY3Rpb24tZXhwZWN0ZWQu
dHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXNlbGVjdGlvbi1leHBlY3RlZC50
eHQKaW5kZXggMmQ2ZGIzNGI5NDQ1ZGUxYmJhZmNhNmMzZGIwZTIwYTk3MGMyMzM0OC4uNTc0N2Zl
NGFhNDQ4OTIzYTYxZjMxYjk5ZTYwOWM4Mjk5NDVmMTE2YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFp
bmVyLXF1ZXJpZXMvY29udGFpbmVyLXNlbGVjdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29u
dGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXNlbGVjdGlvbi1leHBlY3RlZC50eHQKQEAgLTIsNyAr
Miw3IEBACiBQQVNTIHNpemUod2lkdGg6IDE2cHgpIGZvciAuc2l6ZSA+IC5pbmxpbmUgPiBzcGFu
CiBQQVNTIHNpemUoaGVpZ2h0OiAxNnB4KSBmb3IgLmlubGluZSA+IC5zaXplID4gc3BhbgogUEFT
UyBzaXplKHdpZHRoOiAxNnB4KSBmb3IgLmlubGluZSA+IC5zaXplID4gc3BhbgotRkFJTCBzaXpl
KGhlaWdodCkgZm9yIC5zaXplID4gLmlubGluZSA+IHNwYW4gYXNzZXJ0X2VxdWFsczogZXhwZWN0
ZWQgIiIgYnV0IGdvdCAidHJ1ZSIKK1BBU1Mgc2l6ZShoZWlnaHQpIGZvciAuc2l6ZSA+IC5pbmxp
bmUgPiBzcGFuCiBGQUlMIHR5cGUoaW5saW5lLXNpemUpIHNpemUod2lkdGg6IDE2cHgpIGZvciAu
aW5saW5lID4gLnNpemUgPiBzcGFuIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJ0cnVlIiBidXQg
Z290ICIiCiBGQUlMIHR5cGUoaW5saW5lLXNpemUpIHNpemUod2lkdGg6IDE2cHgpIGZvciAuc2l6
ZSA+IC5pbmxpbmUgPiBzcGFuIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJ0cnVlIiBidXQgZ290
ICIiCiBGQUlMIHR5cGUoc2l6ZSkgc2l6ZShoZWlnaHQ6IDE2cHgpIGZvciAuaW5saW5lID4gLnNp
emUgPiBzcGFuIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJ0cnVlIiBidXQgZ290ICIiCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy91bnN1cHBvcnRlZC1heGlzLWV4cGVjdGVkLnR4
dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j
b250YWluL2NvbnRhaW5lci1xdWVyaWVzL3Vuc3VwcG9ydGVkLWF4aXMtZXhwZWN0ZWQudHh0Cmlu
ZGV4IDJmNmQwNzFkYzA4YmVmODQzYmQwZmNmYzg4MmY5MDU2NWI3ZjVjOWUuLmQwYWM3ZTI1ZDdj
MDRlMDQyZjUwYzVhNjRmYWM0MjMxYmJmNTJmMGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x
dWVyaWVzL3Vuc3VwcG9ydGVkLWF4aXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x
dWVyaWVzL3Vuc3VwcG9ydGVkLWF4aXMtZXhwZWN0ZWQudHh0CkBAIC0xLDE0ICsxLDE0IEBACiBU
ZXN0CiAKIFBBU1Mgc2l6ZSh3aWR0aCA+IDBweCkKLUZBSUwgc2l6ZShoZWlnaHQgPiAwcHgpIGFz
c2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgInRydWUiCitQQVNTIHNpemUoaGVpZ2h0
ID4gMHB4KQogUEFTUyBzaXplKChoZWlnaHQgPiAwcHgpIG9yICh3aWR0aCA+IDBweCkpCiBQQVNT
IHNpemUoKHdpZHRoID4gMHB4KSBvciAoaGVpZ2h0ID4gMHB4KSkKIFBBU1Mgc2l6ZSgob3JpZW50
YXRpb246IGxhbmRzY2FwZSkgb3IgKHdpZHRoID4gMHB4KSkKIFBBU1Mgc2l6ZSgod2lkdGggPiAw
cHgpIG9yIChvcmllbnRhdGlvbjogbGFuZHNjYXBlKSkKLUZBSUwgc2l6ZSgoaGVpZ2h0ID4gMHB4
KSBvciAob3JpZW50YXRpb246IGxhbmRzY2FwZSkpIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIi
IGJ1dCBnb3QgInRydWUiCi1GQUlMIHNpemUoKGhlaWdodCA+IDBweCkgb3IgKG9yaWVudGF0aW9u
OiBsYW5kc2NhcGUpKSwgd2l0aCBjb250YWluOnNpemUgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQg
IiIgYnV0IGdvdCAidHJ1ZSIKK1BBU1Mgc2l6ZSgoaGVpZ2h0ID4gMHB4KSBvciAob3JpZW50YXRp
b246IGxhbmRzY2FwZSkpCitQQVNTIHNpemUoKGhlaWdodCA+IDBweCkgb3IgKG9yaWVudGF0aW9u
OiBsYW5kc2NhcGUpKSwgd2l0aCBjb250YWluOnNpemUKIFBBU1Mgc2l6ZShpbmxpbmUtc2l6ZSA+
IDBweCkKLUZBSUwgc2l6ZShibG9jay1zaXplID4gMHB4KSBhc3NlcnRfZXF1YWxzOiBleHBlY3Rl
ZCAiIiBidXQgZ290ICJ0cnVlIgotRkFJTCBzaXplKGJsb2NrLXNpemUgPiAwcHgpLCB3aXRoIHdy
aXRpbmctbW9kZTp2ZXJ0aWNhbC1ybCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290
ICJ0cnVlIgorUEFTUyBzaXplKGJsb2NrLXNpemUgPiAwcHgpCitQQVNTIHNpemUoYmxvY2stc2l6
ZSA+IDBweCksIHdpdGggd3JpdGluZy1tb2RlOnZlcnRpY2FsLXJsCiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>