<?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>231600</bug_id>
          
          <creation_ts>2021-10-12 11:40:24 -0700</creation_ts>
          <short_desc>REGRESSION: (r283871) [ macOS wk2 Release ] 2 css/cssom-view/scroll-behavior-main-frame tests are failing</short_desc>
          <delta_ts>2021-11-11 14:41:52 -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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Eric Hutchison">ehutchison</reporter>
          <assigned_to name="Nikos Mouchtaris">nmouchtaris</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ehutchison</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>glenn</cc>
    
    <cc>jamesr</cc>
    
    <cc>kangil.han</cc>
    
    <cc>koivisto</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>luiz</cc>
    
    <cc>mifenton</cc>
    
    <cc>nmouchtaris</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>tonikitoo</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1803267</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Hutchison">ehutchison</who>
    <bug_when>2021-10-12 11:40:24 -0700</bug_when>
    <thetext>imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html
imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html

are constantly failing on Catalina, BigSur wk2 Release since r283871 (https://trac.webkit.org/changeset/283871/webkit).

History: https://results.webkit.org/?platform=ios&amp;platform=mac&amp;suite=layout-tests&amp;suite=layout-tests&amp;test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcssom-view%2Fscroll-behavior-main-frame-root.html&amp;test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcssom-view%2Fscroll-behavior-main-frame-window.html

Build: https://build.webkit.org/#/builders/70/builds/5814

Results: https://build.webkit.org/results/Apple-BigSur-Release-WK2-Tests/r283982%20(5814)/results.html

Diff: 

--- /Volumes/Data/worker/bigsur-release-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root-expected.txt
+++ /Volumes/Data/worker/bigsur-release-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root-actual.txt
@@ -36,6 +36,6 @@
 PASS Set scrollLeft to frame with smooth scroll-behavior
 PASS Set scrollTop to frame with auto scroll-behavior
 PASS Set scrollTop to frame with smooth scroll-behavior
-PASS Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling
-PASS Aborting an ongoing smooth scrolling on the main frame with an instant scrolling
+FAIL Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling assert_equals: Final value of scrollLeft expected 1215 but got 2430
+FAIL Aborting an ongoing smooth scrolling on the main frame with an instant scrolling assert_equals: Final value of scrollLeft expected 0 but got 2430
 
--- /Volumes/Data/worker/bigsur-release-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window-expected.txt
+++ /Volumes/Data/worker/bigsur-release-tests-wk2/build/layout-test-results/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window-actual.txt
@@ -25,5 +25,5 @@
 PASS Main frame with smooth scroll-behavior ; scrollBy() with instant behavior
 PASS Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior
 PASS Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling
-PASS Aborting an ongoing smooth scrolling on the main frame with an instant scrolling
+FAIL Aborting an ongoing smooth scrolling on the main frame with an instant scrolling assert_equals: Final value of scrollLeft expected 0 but got 2430
 
The failure is flaky, but frequent on scroll-behavior-main-frame-window.html and constant on scroll-behavior-main-frame-root.html. 


Reproduced test failure locally using run-webkit-tests --iterations 1000 --exit-after-n-failures 1 -f --force --clobber-old-results --release imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html and run-webkit-tests --iterations 1000 --exit-after-n-failures 1 -f --force --clobber-old-results --release imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1803268</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-12 11:41:40 -0700</bug_when>
    <thetext>&lt;rdar://problem/84158655&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1803288</commentid>
    <comment_count>2</comment_count>
    <who name="Eric Hutchison">ehutchison</who>
    <bug_when>2021-10-12 12:05:40 -0700</bug_when>
    <thetext>Updated test expectations at https://trac.webkit.org/changeset/284000/webkit</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813764</commentid>
    <comment_count>3</comment_count>
      <attachid>443854</attachid>
    <who name="Nikos Mouchtaris">nmouchtaris</who>
    <bug_when>2021-11-10 12:49:46 -0800</bug_when>
    <thetext>Created attachment 443854
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813860</commentid>
    <comment_count>4</comment_count>
      <attachid>443883</attachid>
    <who name="Nikos Mouchtaris">nmouchtaris</who>
    <bug_when>2021-11-10 17:35:47 -0800</bug_when>
    <thetext>Created attachment 443883
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813865</commentid>
    <comment_count>5</comment_count>
      <attachid>443886</attachid>
    <who name="Nikos Mouchtaris">nmouchtaris</who>
    <bug_when>2021-11-10 17:46:37 -0800</bug_when>
    <thetext>Created attachment 443886
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813896</commentid>
    <comment_count>6</comment_count>
      <attachid>443886</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-11-10 20:23:12 -0800</bug_when>
    <thetext>Comment on attachment 443886
Patch

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

I think the real bug might be that ThreadedScrollingTree::scrollingTreeNodeRequestsScroll() should use m_nodesWithPendingScrollAnimations.set() instead of m_nodesWithPendingScrollAnimations.add() (see HashMap.h)

&gt; Source/WebCore/ChangeLog:9
&gt; +        Temporary fix for issue where second scroll doesn&apos;t cancel a current
&gt; +        scroll animation.

Is it temporary?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813897</commentid>
    <comment_count>7</comment_count>
      <attachid>443886</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-11-10 20:24:00 -0800</bug_when>
    <thetext>Comment on attachment 443886
Patch

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

&gt; Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp:256
&gt; +    scrollingTree().clearAnimationsForScrollingNodeID(scrollingNodeID());
&gt;  
&gt;      if (requestedScrollData.requestType == ScrollRequestType::CancelAnimatedScroll)
&gt;          return;

But maybe we do need to clear the pending animation if we hit the CancelAnimatedScroll clause.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813918</commentid>
    <comment_count>8</comment_count>
      <attachid>443911</attachid>
    <who name="Nikos Mouchtaris">nmouchtaris</who>
    <bug_when>2021-11-10 22:44:04 -0800</bug_when>
    <thetext>Created attachment 443911
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814149</commentid>
    <comment_count>9</comment_count>
      <attachid>443911</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-11-11 11:58:05 -0800</bug_when>
    <thetext>Comment on attachment 443911
Patch

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

&gt; Source/WebCore/ChangeLog:10
&gt; +        request has come in (first animation still in m_nodesWithPendingScrollAnimations). For the

&quot;come in&quot; could be more specific. Maybe &quot;committed to the scrolling tree&quot; or &quot;received by the scrolling thread&quot;, whichever it is.

&gt; Source/WebCore/page/scrolling/ThreadedScrollingTree.h:67
&gt; +    void removePendingScrollAnimationForNode(ScrollingNodeID nodeID) WTF_REQUIRES_LOCK(m_treeLock) override { m_nodesWithPendingScrollAnimations.remove(nodeID); }

Since this is virtual, I would move the implementation to the .cpp file.

I think it can be &apos;final&apos; instead of &apos;override&apos;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814168</commentid>
    <comment_count>10</comment_count>
      <attachid>443990</attachid>
    <who name="Nikos Mouchtaris">nmouchtaris</who>
    <bug_when>2021-11-11 12:49:00 -0800</bug_when>
    <thetext>Created attachment 443990
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814243</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-11-11 14:41:47 -0800</bug_when>
    <thetext>Committed r285669 (244156@main): &lt;https://commits.webkit.org/244156@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 443990.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443854</attachid>
            <date>2021-11-10 12:49:46 -0800</date>
            <delta_ts>2021-11-10 17:35:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231600-20211110124945.patch</filename>
            <type>text/plain</type>
            <size>5309</size>
            <attacher name="Nikos Mouchtaris">nmouchtaris</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmNlYzAwYzBiNjc3YWNl
NmE4MDIyMzg5ZGIyMmZkYzJjY2VlYjhmZS4uZjhlMWQ0MzNmYTRhMmEzN2E2NTk1NjI2MTJkNGRl
NmZlOTI1OGE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTEwICBOaWtv
bGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JF
U1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20tdmlldy9z
Y3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYXIgcGVuZGluZyBhbmltYXRp
b25zIGZvciBhIHNjcm9sbCBub2RlIHdoZW4gcmVjZWl2aW5nIAorICAgICAgICBTY3JvbGxpbmdU
cmVlU2Nyb2xsaW5nTm9kZTo6aGFuZGxlU2Nyb2xsUG9zaXRpb25SZXF1ZXN0LCBhcyBub3QgZG9p
bmcgc28gd2FzIGNhdXNpbmcgaXNzdWUKKyAgICAgICAgd2hlcmUgc2Vjb25kIGFuaW1hdGlvbiB3
b3VsZG4ndCBwbGF5IHNvbWV0aW1lcy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s
bGluZ1RyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OmNsZWFyQW5pbWF0
aW9uc0ZvclNjcm9sbGluZ05vZGVJRCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xs
aW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJl
ZVNjcm9sbGluZ05vZGU6OmhhbmRsZVNjcm9sbFBvc2l0aW9uUmVxdWVzdCk6CisgICAgICAgICog
cGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmg6CisKIDIwMjEtMTEtMDUgIE5p
a29sYW9zIE1vdWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5jb20+CiAKICAgICAgICAgTWFr
ZSBzY3JvbGwgYmFyIG1vZGUgYW4gZW51bSBjbGFzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z
Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4IGMxODI0MzAzMzM4NjI4MDgxYmZmMmY0MDNk
ODFhYzlhY2I3OGI3MDMuLmIxMDk1N2FkYzcxYmJjOTA2MzQ0ZDI3ZjE5MTE5ODk0MWQ2OGU5MWQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAg
LTIzMSw2ICsyMzEsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZFBlbmRpbmdTY3JvbGxVcGRh
dGUoU2Nyb2xsVXBkYXRlJiYpOwogICAgIFZlY3RvcjxTY3JvbGxVcGRhdGU+IHRha2VQZW5kaW5n
U2Nyb2xsVXBkYXRlcygpOworICAgIAorICAgIHZpcnR1YWwgdm9pZCBjbGVhckFuaW1hdGlvbnNG
b3JTY3JvbGxpbmdOb2RlSUQoU2Nyb2xsaW5nTm9kZUlEKSB7IH0KIAogcHJvdGVjdGVkOgogICAg
IFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBoYW5kbGVXaGVlbEV2ZW50V2l0aE5vZGUoY29uc3Qg
UGxhdGZvcm1XaGVlbEV2ZW50JiwgT3B0aW9uU2V0PFdoZWVsRXZlbnRQcm9jZXNzaW5nU3RlcHM+
LCBTY3JvbGxpbmdUcmVlTm9kZSosIEV2ZW50VGFyZ2V0aW5nID0gRXZlbnRUYXJnZXRpbmc6OlBy
b3BhZ2F0ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv
bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu
Zy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKaW5kZXggMjdmOGU4NTA5ZjFmMTIwYzU5
NGZmMzliYzAwNGY2M2UzM2FlOWNjNC4uZGZjODc5ZmQ4YWUxMDViNTk4ZjllM2MyYmJmOTEwMzc1
OTlkOGZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs
aW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs
aW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcApAQCAtMjQ1LDYgKzI0NSw3IEBAIHZv
aWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OmhhbmRsZVNjcm9sbFBvc2l0aW9uUmVxdWVz
dChjb25zdCBSZXF1ZXN0ZWRTY3JvCiAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3Ry
ZWFtIDw8ICJTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZSAiIDw8IHNjcm9sbGluZ05vZGVJRCgp
IDw8ICIgaGFuZGxlU2Nyb2xsUG9zaXRpb25SZXF1ZXN0KCkgLSBwb3NpdGlvbiAiIDw8IHJlcXVl
c3RlZFNjcm9sbERhdGEuc2Nyb2xsUG9zaXRpb24gPDwgIiBhbmltYXRlZCAiIDw8IChyZXF1ZXN0
ZWRTY3JvbGxEYXRhLmFuaW1hdGVkID09IFNjcm9sbElzQW5pbWF0ZWQ6OlllcykpOwogCiAgICAg
c3RvcEFuaW1hdGVkU2Nyb2xsKCk7CisgICAgc2Nyb2xsaW5nVHJlZSgpLmNsZWFyQW5pbWF0aW9u
c0ZvclNjcm9sbGluZ05vZGVJRChzY3JvbGxpbmdOb2RlSUQoKSk7CiAKICAgICBpZiAocmVxdWVz
dGVkU2Nyb2xsRGF0YS5yZXF1ZXN0VHlwZSA9PSBTY3JvbGxSZXF1ZXN0VHlwZTo6Q2FuY2VsQW5p
bWF0ZWRTY3JvbGwpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUv
cGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKaW5kZXggZDc3ZDJkN2Y0ZmRi
NTNkMWZkZDVmZWNmNjQzMDkyMmY1MDkzYzk3Yy4uMDQ0ODI1YWMyZTBmMDEzMTY1ZTdhMTlkMTJi
YWExNjAwYTk2NDRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv
VGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp
bmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAg
IExvY2smIHRyZWVMb2NrKCkgV1RGX1JFVFVSTlNfTE9DSyhtX3RyZWVMb2NrKSB7IHJldHVybiBt
X3RyZWVMb2NrOyB9CiAKICAgICBib29sIHNjcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0IHsg
cmV0dXJuIG1fc2Nyb2xsQW5pbWF0b3JFbmFibGVkOyB9Ci0KKyAgICB2b2lkIGNsZWFyQW5pbWF0
aW9uc0ZvclNjcm9sbGluZ05vZGVJRChTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKSBXVEZfUkVRVUlS
RVNfTE9DSyhtX3RyZWVMb2NrKSBvdmVycmlkZSB7IG1fbm9kZXNXaXRoUGVuZGluZ1Njcm9sbEFu
aW1hdGlvbnMucmVtb3ZlKG5vZGVJRCk7IH0KIHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBUaHJl
YWRlZFNjcm9sbGluZ1RyZWUoQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvciYpOwogCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg
ODlhNWMyMTEyNzJkZTUyNTczMTBjNDBiZWZjNTQ1MDQ1OTA3ZmRjYi4uY2U0ZjViM2UzMDdhYmEx
YTBmYTUwNjE2ZWE5OTNiN2UwNDE0MjNhMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEx
LTEwICBOaWtvbGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAg
ICAgIFJFR1JFU1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nz
b20tdmlldy9zY3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9t
YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTEtMDUgIExhdXJvIE1vdXJhICA8bG1v
dXJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dMSUJdIEdhcmRlbmluZyBtb3JlIHRpbWVvdXRz
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg
MDRkYTVlMDhiYzIzNDlkYzc2MThjODY0YjIzOTVmNTQ5NTlmZDhmYS4uYzE5NjQxNTE5NWYxMjZm
NDllMTQ1YjE2N2VlZDgzYTA3MzVkODE3NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv
cm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h
Yy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTY3NSw5ICsxNjc1LDYgQEAgd2Via2l0Lm9yZy9i
LzIzMTA4MyBbIERlYnVnIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50
LXNlY3VyaXR5LXAKIAogd2Via2l0Lm9yZy9iLzIzMTM4NiBbIEJpZ1N1ciBdIGh0dHAvdGVzdHMv
cmVzb3VyY2VMb2FkU3RhdGlzdGljcy93ZWJzaXRlLWRhdGEtcmVtb3ZhbC1mb3Itc2l0ZS13aXRo
LXVzZXItaW50ZXJhY3Rpb24uaHRtbCBbIFBhc3MgVGltZW91dCBdCiAKLXdlYmtpdC5vcmcvYi8y
MzE2MDAgWyBSZWxlYXNlIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
b20tdmlldy9zY3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZS13aW5kb3cuaHRtbCBbIFBhc3MgRmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjMxNjAwIFsgUmVsZWFzZSBdIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsLWJlaGF2aW9yLW1haW4tZnJhbWUt
cm9vdC5odG1sIFsgRmFpbHVyZSBdCi0KIHdlYmtpdC5vcmcvYi8yMzE3NjUgWyBSZWxlYXNlIF0g
aHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3dlYnNpdGUtZGF0YS1yZW1vdmFsLWZv
ci1zaXRlLW5hdmlnYXRlZC10by13aXRoLWxpbmstZGVjb3JhdGlvbi5odG1sIFsgUGFzcyBUaW1l
b3V0IF0KIAogd2Via2l0Lm9yZy9iLzIzMTc4MCBbIERlYnVnIF0gaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy93ZWJydGMvc2ltdWxjYXN0L2Jhc2ljLmh0dHBzLmh0bWwgWyBQYXNzIEZh
aWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443883</attachid>
            <date>2021-11-10 17:35:47 -0800</date>
            <delta_ts>2021-11-10 17:46:34 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231600-20211110173546.patch</filename>
            <type>text/plain</type>
            <size>46542</size>
            <attacher name="Nikos Mouchtaris">nmouchtaris</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY3NmY1ZDQyNjg5MGZi
OWE2NGY3NTY1ZGIyZWE5NTJmMDhlODMxNy4uYTJhMjI5NzM4ZGM2YjU4YmM4MDZhNTYyZDcyN2Ez
ZjljYmYyZjU0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDIxLTExLTEwICBOaWtv
bGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JF
U1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20tdmlldy9z
Y3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISku
CisKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50
OjpzY3JvbGxCeUxpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNjcm9sbEJ5UGFn
ZXMpOgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpleGVjdXRlU2Nyb2xsUGFnZUJhY2t3YXJkKToKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1
dGVTY3JvbGxQYWdlRm9yd2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpleGVjdXRlU2Nyb2xsTGlu
ZVVwKToKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1dGVTY3JvbGxMaW5lRG93bik6CisgICAgICAg
IChXZWJDb3JlOjpleGVjdXRlU2Nyb2xsVG9CZWdpbm5pbmdPZkRvY3VtZW50KToKKyAgICAgICAg
KFdlYkNvcmU6OmV4ZWN1dGVTY3JvbGxUb0VuZE9mRG9jdW1lbnQpOgorICAgICAgICAqIHBhZ2Uv
RXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndoZWVsR3JhbnVsYXJpdHlUb1Nj
cm9sbEdyYW51bGFyaXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6bG9naWNh
bFNjcm9sbFJlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6ZGVm
YXVsdFNwYWNlRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6
c2Nyb2xsRGlzdGFuY2UpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkZyYW1lVmlldzo6YWRqdXN0U2Nyb2xsU3RlcEZvckZpeGVkQ29udGVudCk6Cisg
ICAgICAgICogcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5jcHA6CisgICAgICAg
IChXZWJDb3JlOjpLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjpzY3JvbGxEaXN0YW5jZSBjb25z
dCk6CisgICAgICAgIChXZWJDb3JlOjpLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2Fy
ZFNjcm9sbEZvcktleWJvYXJkRXZlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6S2V5Ym9h
cmRTY3JvbGxpbmdBbmltYXRvcjo6YmVnaW5LZXlib2FyZFNjcm9sbEdlc3R1cmUpOgorICAgICAg
ICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s
bEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxU
eXBlcy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpzY3JvbGwpOgorICAgICAgICAqIHBsYXRmb3JtL1Nj
cm9sbGJhci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXI6OnByZXNzZWRQYXJ0U2Ny
b2xsR3JhbnVsYXJpdHkpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9TY3JvbGxBbmltYXRvcklP
Uy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9ySU9TOjpoYW5kbGVUb3VjaEV2
ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OlBvcHVwTWVudVdpbjo6d25kUHJvYyk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmxvZ2ljYWxTY3JvbGwp
OgorCiAyMDIxLTExLTEwICBUaW0gTmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CiAKICAgICAgICAg
UmVtb3ZlIG5vbi1zdGFuZGFyZCAtd2Via2l0LWJvcmRlci1maXQgQ1NTIHByb3BlcnR5CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
CmluZGV4IGNiYWE4MzNlMTcwMDYwYmI1MWM1NzI0ZmE5OTNiZmY4NzZmM2UyYjYuLjNiNzU0YTcw
NTk3YTNkYzQ5NjMxMDhkZWM4ZjRjNTI2Y2E3MTZiYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg
QEAKKzIwMjEtMTEtMTAgIE5pa29sYW9zIE1vdWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5j
b20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHIyODM4NzEpIFsgbWFjT1Mgd2syIFJlbGVhc2Ug
XSAyIGNzcy9jc3NvbS12aWV3L3Njcm9sbC1iZWhhdmlvci1tYWluLWZyYW1lIHRlc3RzIGFyZSBm
YWlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MzE2MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IFNjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5OgorICAgICAgICAoaGVhZGVyc19mb3JfdHlwZSk6
CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06Cisg
ICAgICAgICgtW1dLQ29udGVudFZpZXcga2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I6ZGlzdGFu
Y2VGb3JJbmNyZW1lbnQ6aW5EaXJlY3Rpb246XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9X
S0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IubW06CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3Jv
bGxpbmdBbmltYXRvciBrZXlib2FyZFNjcm9sbEZvckV2ZW50Ol0pOgorICAgICAgICAoLVtXS0tl
eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IgYmVnaW5XaXRoRXZlbnQ6XSk6CisgICAgICAgICgtW1dL
S2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3IgZGlzdGFuY2VGb3JJbmNyZW1lbnQ6aW5EaXJlY3Rp
b246XSk6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJQb3B1cE1lbnVQcm94eVdpbi5jcHA6
CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudVByb3h5V2luOjpvbk1vdXNlV2hlZWwpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YlZpZXc6Om9uSG9yaXpvbnRhbFNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6Om9u
VmVydGljYWxTY3JvbGwpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw
cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2Nyb2xsQnkpOgorICAgICAgICAqIFdlYlBy
b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl
YlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQ
YWdlR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybURlZmF1bHRCZWhh
dmlvckZvcktleUV2ZW50KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh
Z2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1Ob25FZGl0aW5nQmVo
YXZpb3JGb3JTZWxlY3Rvcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3dpbi9XZWJQ
YWdlV2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybURlZmF1bHRCZWhh
dmlvckZvcktleUV2ZW50KToKKwogMjAyMS0xMS0xMCAgUGVyIEFybmUgVm9sbGFuIDxwdm9sbGFu
QGFwcGxlLmNvbT4KIAogICAgICAgICBCbG9jayBzYW5kYm94IGFjY2VzcyB0byBjb25zdW1lIG1h
Y2ggZXh0ZW5zaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGJiODA4NjQ5Y2U0
NjJlNTEwOGMxZWE0YWVmZGJhYmVhOTZjMDg5OWEuLmVjMmQ1MjAyY2E0OWEzOTNmN2ZkMjNhZDAy
YWNiMzkxZWQ5OTI0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n
ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
OCBAQAorMjAyMS0xMS0xMCAgTmlrb2xhb3MgTW91Y2h0YXJpcyAgPG5tb3VjaHRhcmlzQGFwcGxl
LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiAocjI4Mzg3MSkgWyBtYWNPUyB3azIgUmVsZWFz
ZSBdIDIgY3NzL2Nzc29tLXZpZXcvc2Nyb2xsLWJlaGF2aW9yLW1haW4tZnJhbWUgdGVzdHMgYXJl
IGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIzMTYwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogV2ViVmlldy9XZWJGcmFtZVZpZXcubW06CisgICAgICAgICgtW1dlYkZyYW1lVmlldyBfc2Ny
b2xsVG9CZWdpbm5pbmdPZkRvY3VtZW50XSk6CisgICAgICAgICgtW1dlYkZyYW1lVmlldyBfc2Ny
b2xsVG9FbmRPZkRvY3VtZW50XSk6CisgICAgICAgICgtW1dlYkZyYW1lVmlldyBfcGFnZVZlcnRp
Y2FsbHk6XSk6CisgICAgICAgICgtW1dlYkZyYW1lVmlldyBfcGFnZUhvcml6b250YWxseTpdKToK
KyAgICAgICAgKC1bV2ViRnJhbWVWaWV3IF9zY3JvbGxMaW5lVmVydGljYWxseTpdKToKKyAgICAg
ICAgKC1bV2ViRnJhbWVWaWV3IF9zY3JvbGxMaW5lSG9yaXpvbnRhbGx5Ol0pOgorCiAyMDIxLTEx
LTEwICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ0ZdIFJlZHVj
ZSBkdXBsaWNhdGlvbiBhbmQgdW5uZWVkZWQgYnVmZmVyIGFsbG9jYXRpb25zIGFuZCBjb3B5aW5n
IGluIFVSTCBjb2RlLCBhbHNvIHJlbW92ZSB1bnVzZWQgbWV0aG9kcyBhbmQgZnVuY3Rpb25zCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggMGQwNWY5NmIzNzBkZWJkZGNmOGE3NDAwODU4
NGI5ZWJmODViYzEyOC4uZDZiOTMxMGNhMDgxNDA0NTA1MTJiY2YyOGQxMDRmNmYxNDAzMThjYSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTEw
ICBOaWtvbGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAg
IFJFR1JFU1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20t
dmlldy9zY3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoK
KyAgICAgICAgKFdlYlZpZXc6OnZlcnRpY2FsU2Nyb2xsKToKKyAgICAgICAgKFdlYlZpZXc6Omhv
cml6b250YWxTY3JvbGwpOgorICAgICAgICAoV2ViVmlldzo6a2V5RG93bik6CisKIDIwMjEtMTEt
MDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg
IEFYOiByZW5hbWUgYWN0aW9uVmVyYigpIGFzIGxvY2FsaXplZEFjdGlvblZlcmIoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t
L0VsZW1lbnQuY3BwCmluZGV4IGJmOWE3M2Q1MTFkMmRiMGQ5ODM3M2EzNmI0NTAxZTE1OGQwNTQ0
ZjkuLjJhYmFlOWJlZWUwNTQ3MjZmOTFmOTQxZjgyMTI5ZTEyZjgxOTBhOTEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v
RWxlbWVudC5jcHAKQEAgLTExMjgsMTIgKzExMjgsMTIgQEAgdm9pZCBFbGVtZW50OjpzY3JvbGxC
eVVuaXRzKGludCB1bml0cywgU2Nyb2xsR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCiAKIHZvaWQg
RWxlbWVudDo6c2Nyb2xsQnlMaW5lcyhpbnQgbGluZXMpCiB7Ci0gICAgc2Nyb2xsQnlVbml0cyhs
aW5lcywgU2Nyb2xsQnlMaW5lKTsKKyAgICBzY3JvbGxCeVVuaXRzKGxpbmVzLCBTY3JvbGxHcmFu
dWxhcml0eTo6TGluZSk7CiB9CiAKIHZvaWQgRWxlbWVudDo6c2Nyb2xsQnlQYWdlcyhpbnQgcGFn
ZXMpCiB7Ci0gICAgc2Nyb2xsQnlVbml0cyhwYWdlcywgU2Nyb2xsQnlQYWdlKTsKKyAgICBzY3Jv
bGxCeVVuaXRzKHBhZ2VzLCBTY3JvbGxHcmFudWxhcml0eTo6UGFnZSk7CiB9CiAKIHN0YXRpYyBk
b3VibGUgbG9jYWxab29tRm9yUmVuZGVyZXIoY29uc3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIp
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvckNvbW1hbmQuY3BwIGIv
U291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcAppbmRleCAyNjU5ZDI0MGI3
N2UyMDFjYzg4Mzk2MDk3YjA2MDhjNTgzYzZjNmFiLi5mMTg3NTlkMDYyZGY1OTZmOTQ1N2Q5MTkw
YTU3MGE3MTQ5MmUzNGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv
ckNvbW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFuZC5j
cHAKQEAgLTk4OSwzMiArOTg5LDMyIEBAIHN0YXRpYyBib29sIGV4ZWN1dGVSZW1vdmVGb3JtYXQo
RnJhbWUmIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3VyY2UsIGNvbnN0CiAKIHN0YXRp
YyBib29sIGV4ZWN1dGVTY3JvbGxQYWdlQmFja3dhcmQoRnJhbWUmIGZyYW1lLCBFdmVudCosIEVk
aXRvckNvbW1hbmRTb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgcmV0dXJuIGZyYW1lLmV2
ZW50SGFuZGxlcigpLmxvZ2ljYWxTY3JvbGxSZWN1cnNpdmVseShTY3JvbGxCbG9ja0RpcmVjdGlv
bkJhY2t3YXJkLCBTY3JvbGxCeVBhZ2UpOworICAgIHJldHVybiBmcmFtZS5ldmVudEhhbmRsZXIo
KS5sb2dpY2FsU2Nyb2xsUmVjdXJzaXZlbHkoU2Nyb2xsQmxvY2tEaXJlY3Rpb25CYWNrd2FyZCwg
U2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2UpOwogfQogCiBzdGF0aWMgYm9vbCBleGVjdXRlU2Nyb2xs
UGFnZUZvcndhcmQoRnJhbWUmIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3VyY2UsIGNv
bnN0IFN0cmluZyYpCiB7Ci0gICAgcmV0dXJuIGZyYW1lLmV2ZW50SGFuZGxlcigpLmxvZ2ljYWxT
Y3JvbGxSZWN1cnNpdmVseShTY3JvbGxCbG9ja0RpcmVjdGlvbkZvcndhcmQsIFNjcm9sbEJ5UGFn
ZSk7CisgICAgcmV0dXJuIGZyYW1lLmV2ZW50SGFuZGxlcigpLmxvZ2ljYWxTY3JvbGxSZWN1cnNp
dmVseShTY3JvbGxCbG9ja0RpcmVjdGlvbkZvcndhcmQsIFNjcm9sbEdyYW51bGFyaXR5OjpQYWdl
KTsKIH0KIAogc3RhdGljIGJvb2wgZXhlY3V0ZVNjcm9sbExpbmVVcChGcmFtZSYgZnJhbWUsIEV2
ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29uc3QgU3RyaW5nJikKIHsKLSAgICByZXR1cm4g
ZnJhbWUuZXZlbnRIYW5kbGVyKCkuc2Nyb2xsUmVjdXJzaXZlbHkoU2Nyb2xsVXAsIFNjcm9sbEJ5
TGluZSk7CisgICAgcmV0dXJuIGZyYW1lLmV2ZW50SGFuZGxlcigpLnNjcm9sbFJlY3Vyc2l2ZWx5
KFNjcm9sbFVwLCBTY3JvbGxHcmFudWxhcml0eTo6TGluZSk7CiB9CiAKIHN0YXRpYyBib29sIGV4
ZWN1dGVTY3JvbGxMaW5lRG93bihGcmFtZSYgZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNv
dXJjZSwgY29uc3QgU3RyaW5nJikKIHsKLSAgICByZXR1cm4gZnJhbWUuZXZlbnRIYW5kbGVyKCku
c2Nyb2xsUmVjdXJzaXZlbHkoU2Nyb2xsRG93biwgU2Nyb2xsQnlMaW5lKTsKKyAgICByZXR1cm4g
ZnJhbWUuZXZlbnRIYW5kbGVyKCkuc2Nyb2xsUmVjdXJzaXZlbHkoU2Nyb2xsRG93biwgU2Nyb2xs
R3JhbnVsYXJpdHk6OkxpbmUpOwogfQogCiBzdGF0aWMgYm9vbCBleGVjdXRlU2Nyb2xsVG9CZWdp
bm5pbmdPZkRvY3VtZW50KEZyYW1lJiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNl
LCBjb25zdCBTdHJpbmcmKQogewotICAgIHJldHVybiBmcmFtZS5ldmVudEhhbmRsZXIoKS5sb2dp
Y2FsU2Nyb2xsUmVjdXJzaXZlbHkoU2Nyb2xsQmxvY2tEaXJlY3Rpb25CYWNrd2FyZCwgU2Nyb2xs
QnlEb2N1bWVudCk7CisgICAgcmV0dXJuIGZyYW1lLmV2ZW50SGFuZGxlcigpLmxvZ2ljYWxTY3Jv
bGxSZWN1cnNpdmVseShTY3JvbGxCbG9ja0RpcmVjdGlvbkJhY2t3YXJkLCBTY3JvbGxHcmFudWxh
cml0eTo6RG9jdW1lbnQpOwogfQogCiBzdGF0aWMgYm9vbCBleGVjdXRlU2Nyb2xsVG9FbmRPZkRv
Y3VtZW50KEZyYW1lJiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNlLCBjb25zdCBT
dHJpbmcmKQogewotICAgIHJldHVybiBmcmFtZS5ldmVudEhhbmRsZXIoKS5sb2dpY2FsU2Nyb2xs
UmVjdXJzaXZlbHkoU2Nyb2xsQmxvY2tEaXJlY3Rpb25Gb3J3YXJkLCBTY3JvbGxCeURvY3VtZW50
KTsKKyAgICByZXR1cm4gZnJhbWUuZXZlbnRIYW5kbGVyKCkubG9naWNhbFNjcm9sbFJlY3Vyc2l2
ZWx5KFNjcm9sbEJsb2NrRGlyZWN0aW9uRm9yd2FyZCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3Vt
ZW50KTsKIH0KIAogc3RhdGljIGJvb2wgZXhlY3V0ZVNlbGVjdEFsbChGcmFtZSYgZnJhbWUsIEV2
ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29uc3QgU3RyaW5nJikKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
RXZlbnRIYW5kbGVyLmNwcAppbmRleCA2ZWJiYzQ3YTQ2Y2QxMmU3ODg4ODhlZmU0NzdhZGQ2M2Ni
NmQxZGI3Li5iMmZhNjlmOGVlMmU5ZTBmYjMxMGJkYWEzYmU5ZmQ4MjlkZWIxYmI2IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0yOTgsMTMgKzI5OCwxMyBAQCBzdGF0aWMg
aW5saW5lIFNjcm9sbEdyYW51bGFyaXR5IHdoZWVsR3JhbnVsYXJpdHlUb1Njcm9sbEdyYW51bGFy
aXR5KHVuc2lnbmVkIGRlbAogewogICAgIHN3aXRjaCAoZGVsdGFNb2RlKSB7CiAgICAgY2FzZSBX
aGVlbEV2ZW50OjpET01fREVMVEFfUEFHRToKLSAgICAgICAgcmV0dXJuIFNjcm9sbEJ5UGFnZTsK
KyAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpQYWdlOwogICAgIGNhc2UgV2hlZWxF
dmVudDo6RE9NX0RFTFRBX0xJTkU6Ci0gICAgICAgIHJldHVybiBTY3JvbGxCeUxpbmU7CisgICAg
ICAgIHJldHVybiBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAgICBjYXNlIFdoZWVsRXZlbnQ6
OkRPTV9ERUxUQV9QSVhFTDoKLSAgICAgICAgcmV0dXJuIFNjcm9sbEJ5UGl4ZWw7CisgICAgICAg
IHJldHVybiBTY3JvbGxHcmFudWxhcml0eTo6UGl4ZWw7CiAgICAgZGVmYXVsdDoKLSAgICAgICAg
cmV0dXJuIFNjcm9sbEJ5UGl4ZWw7CisgICAgICAgIHJldHVybiBTY3JvbGxHcmFudWxhcml0eTo6
UGl4ZWw7CiAgICAgfQogfQogCkBAIC0xMjg3LDcgKzEyODcsNyBAQCBib29sIEV2ZW50SGFuZGxl
cjo6bG9naWNhbFNjcm9sbFJlY3Vyc2l2ZWx5KFNjcm9sbExvZ2ljYWxEaXJlY3Rpb24gZGlyZWN0
aW9uLCBTYwogICAgIGJvb2wgc2Nyb2xsZWQgPSBmYWxzZTsKICNpZiBQTEFURk9STShDT0NPQSkK
ICAgICAvLyBNYWMgYWxzbyByZXNldHMgdGhlIHNjcm9sbCBwb3NpdGlvbiBpbiB0aGUgaW5saW5l
IGRpcmVjdGlvbi4KLSAgICBpZiAoZ3JhbnVsYXJpdHkgPT0gU2Nyb2xsQnlEb2N1bWVudCAmJiB2
aWV3ICYmIHZpZXctPmxvZ2ljYWxTY3JvbGwoU2Nyb2xsSW5saW5lRGlyZWN0aW9uQmFja3dhcmQs
IFNjcm9sbEJ5RG9jdW1lbnQpKQorICAgIGlmIChncmFudWxhcml0eSA9PSBTY3JvbGxHcmFudWxh
cml0eTo6RG9jdW1lbnQgJiYgdmlldyAmJiB2aWV3LT5sb2dpY2FsU2Nyb2xsKFNjcm9sbElubGlu
ZURpcmVjdGlvbkJhY2t3YXJkLCBTY3JvbGxHcmFudWxhcml0eTo6RG9jdW1lbnQpKQogICAgICAg
ICBzY3JvbGxlZCA9IHRydWU7CiAjZW5kaWYKICAgICBpZiAodmlldyAmJiB2aWV3LT5sb2dpY2Fs
U2Nyb2xsKGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpKQpAQCAtNDI0OCw3ICs0MjQ4LDcgQEAgdm9p
ZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRTcGFjZUV2ZW50SGFuZGxlcihLZXlib2FyZEV2ZW50JiBl
dmVudCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgU2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJl
Y3Rpb24gPSBldmVudC5zaGlmdEtleSgpID8gU2Nyb2xsQmxvY2tEaXJlY3Rpb25CYWNrd2FyZCA6
IFNjcm9sbEJsb2NrRGlyZWN0aW9uRm9yd2FyZDsKLSAgICBpZiAobG9naWNhbFNjcm9sbE92ZXJm
bG93KGRpcmVjdGlvbiwgU2Nyb2xsQnlQYWdlKSkgeworICAgIGlmIChsb2dpY2FsU2Nyb2xsT3Zl
cmZsb3coZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eTo6UGFnZSkpIHsKICAgICAgICAgZXZl
bnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQyNTcs
NyArNDI1Nyw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0U3BhY2VFdmVudEhhbmRsZXIo
S2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm47CiAK
LSAgICBib29sIGRlZmF1bHRIYW5kbGVkID0gbV9mcmFtZS5zZXR0aW5ncygpLmV2ZW50SGFuZGxl
ckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZCgpID8gc3RhcnRLZXlib2FyZFNj
cm9sbGluZyhldmVudCkgOiB2aWV3LT5sb2dpY2FsU2Nyb2xsKGRpcmVjdGlvbiwgU2Nyb2xsQnlQ
YWdlKTsKKyAgICBib29sIGRlZmF1bHRIYW5kbGVkID0gbV9mcmFtZS5zZXR0aW5ncygpLmV2ZW50
SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZCgpID8gc3RhcnRLZXli
b2FyZFNjcm9sbGluZyhldmVudCkgOiB2aWV3LT5sb2dpY2FsU2Nyb2xsKGRpcmVjdGlvbiwgU2Ny
b2xsR3JhbnVsYXJpdHk6OlBhZ2UpOwogICAgIGlmIChkZWZhdWx0SGFuZGxlZCkKICAgICAgICAg
ZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKIH0KQEAgLTQyOTksMTMgKzQyOTksMTMgQEAgZmxv
YXQgRXZlbnRIYW5kbGVyOjpzY3JvbGxEaXN0YW5jZShTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9u
LCBTY3JvbGxHcmFudWxhcml0eQogICAgIH0oKTsKIAogICAgIHN3aXRjaCAoZ3JhbnVsYXJpdHkp
IHsKLSAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxpbmU6CisgICAgY2FzZSBT
Y3JvbGxHcmFudWxhcml0eTo6TGluZToKICAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+bGluZVN0
ZXAoKTsKLSAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2U6CisgICAgY2Fz
ZSBTY3JvbGxHcmFudWxhcml0eTo6UGFnZToKICAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+cGFn
ZVN0ZXAoKTsKLSAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeURvY3VtZW50Ogor
ICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50OgogICAgICAgICByZXR1cm4gc2Ny
b2xsYmFyLT50b3RhbFNpemUoKTsKLSAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxC
eVBpeGVsOgorICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlBpeGVsOgogICAgICAgICByZXR1
cm4gc2Nyb2xsYmFyLT5waXhlbFN0ZXAoKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3
LmNwcAppbmRleCAyYzdkODE5Yjk5NWUxZDM2YWU4YzcxYmJhOGYxNzQ4M2VlNjgzODk5Li44ZjY4
NTk3NjI4YzM2YTNkOTY3NzVjYmFkZWJiMTZkMmQ1ZDMwYTc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt
ZVZpZXcuY3BwCkBAIC0zODM2LDcgKzM4MzYsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2Nyb2xsVG9Q
b3NpdGlvbldpdGhBbmltYXRpb24oY29uc3QgU2Nyb2xsUG9zaXRpb24mIHBvc2l0aW9uLCBTYwog
CiBmbG9hdCBGcmFtZVZpZXc6OmFkanVzdFNjcm9sbFN0ZXBGb3JGaXhlZENvbnRlbnQoZmxvYXQg
c3RlcCwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaXR5
IGdyYW51bGFyaXR5KQogewotICAgIGlmIChncmFudWxhcml0eSAhPSBTY3JvbGxCeVBhZ2UgfHwg
b3JpZW50YXRpb24gPT0gU2Nyb2xsYmFyT3JpZW50YXRpb246Okhvcml6b250YWwpCisgICAgaWYg
KGdyYW51bGFyaXR5ICE9IFNjcm9sbEdyYW51bGFyaXR5OjpQYWdlIHx8IG9yaWVudGF0aW9uID09
IFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9udGFsKQogICAgICAgICByZXR1cm4gc3RlcDsK
IAogICAgIFRyYWNrZWRSZW5kZXJlckxpc3RIYXNoU2V0KiBwb3NpdGlvbmVkT2JqZWN0cyA9IG51
bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9s
bGluZ0FuaW1hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWJvYXJkU2Nyb2xs
aW5nQW5pbWF0b3IuY3BwCmluZGV4IGZiZGVhZmZkMmJjNGEyZjhkMTcyMjAzZTE5MDlmY2U5N2Qx
OTg0ZjMuLmU1YWQyZmRjMTRkNGE2NWNlZGVjNjk0ODM5ZDMyMjA4ZDY5NjVkNzEgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Iu
Y3BwCkBAIC0xNTUsMTMgKzE1NSwxMyBAQCBmbG9hdCBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9y
OjpzY3JvbGxEaXN0YW5jZShTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbAogCiAgICAg
aWYgKHNjcm9sbGJhcikgewogICAgICAgICBzd2l0Y2ggKGdyYW51bGFyaXR5KSB7Ci0gICAgICAg
IGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5TGluZToKKyAgICAgICAgY2FzZSBTY3Jv
bGxHcmFudWxhcml0eTo6TGluZToKICAgICAgICAgICAgIHJldHVybiBzY3JvbGxiYXItPmxpbmVT
dGVwKCk7Ci0gICAgICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZToKKyAg
ICAgICAgY2FzZSBTY3JvbGxHcmFudWxhcml0eTo6UGFnZToKICAgICAgICAgICAgIHJldHVybiBz
Y3JvbGxiYXItPnBhZ2VTdGVwKCk7Ci0gICAgICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlNj
cm9sbEJ5RG9jdW1lbnQ6CisgICAgICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50
OgogICAgICAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+dG90YWxTaXplKCk7Ci0gICAgICAgIGNh
c2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGl4ZWw6CisgICAgICAgIGNhc2UgU2Nyb2xs
R3JhbnVsYXJpdHk6OlBpeGVsOgogICAgICAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+cGl4ZWxT
dGVwKCk7CiAgICAgICAgIH0KICAgICB9CkBAIC0yMDIsMTggKzIwMiwxOCBAQCBzdGQ6Om9wdGlv
bmFsPEtleWJvYXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2FyZFNj
cm9sbEZvcktleWJvYQogICAgICAgICBzd2l0Y2ggKGtleS52YWx1ZSgpKSB7CiAgICAgICAgIGNh
c2UgS2V5Ym9hcmRTY3JvbGxpbmdLZXk6OkxlZnRBcnJvdzoKICAgICAgICAgY2FzZSBLZXlib2Fy
ZFNjcm9sbGluZ0tleTo6UmlnaHRBcnJvdzoKLSAgICAgICAgICAgIHJldHVybiBldmVudC5hbHRL
ZXkoKSA/IFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2UgOiBTY3JvbGxHcmFudWxhcml0
eTo6U2Nyb2xsQnlMaW5lOworICAgICAgICAgICAgcmV0dXJuIGV2ZW50LmFsdEtleSgpID8gU2Ny
b2xsR3JhbnVsYXJpdHk6OlBhZ2UgOiBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAgICAgICAg
Y2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6VXBBcnJvdzoKICAgICAgICAgY2FzZSBLZXlib2Fy
ZFNjcm9sbGluZ0tleTo6RG93bkFycm93OgogICAgICAgICAgICAgaWYgKGV2ZW50Lm1ldGFLZXko
KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5RG9j
dW1lbnQ7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVu
dDsKICAgICAgICAgICAgIGlmIChldmVudC5hbHRLZXkoKSkKLSAgICAgICAgICAgICAgICByZXR1
cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZTsKLSAgICAgICAgICAgIHJldHVybiBT
Y3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlMaW5lOworICAgICAgICAgICAgICAgIHJldHVybiBT
Y3JvbGxHcmFudWxhcml0eTo6UGFnZTsKKyAgICAgICAgICAgIHJldHVybiBTY3JvbGxHcmFudWxh
cml0eTo6TGluZTsKICAgICAgICAgY2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6U3BhY2U6CiAg
ICAgICAgIGNhc2UgS2V5Ym9hcmRTY3JvbGxpbmdLZXk6OlBhZ2VVcDoKICAgICAgICAgY2FzZSBL
ZXlib2FyZFNjcm9sbGluZ0tleTo6UGFnZURvd246Ci0gICAgICAgICAgICByZXR1cm4gU2Nyb2xs
R3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZTsKKyAgICAgICAgICAgIHJldHVybiBTY3JvbGxHcmFu
dWxhcml0eTo6UGFnZTsKICAgICAgICAgfTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JF
QUNIRUQoKTsKICAgICB9KCk7CkBAIC0yNjcsNyArMjY3LDcgQEAgYm9vbCBLZXlib2FyZFNjcm9s
bGluZ0FuaW1hdG9yOjpiZWdpbktleWJvYXJkU2Nyb2xsR2VzdHVyZShjb25zdCBQbGF0Zm9ybUtl
eWJvYXIKICAgICBpZiAobV9zY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVzc2VkKQogICAgICAgICBy
ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9jdXJyZW50S2V5Ym9hcmRTY3JvbGwtPmdyYW51bGFy
aXR5ID09IFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeURvY3VtZW50KSB7CisgICAgaWYgKG1f
Y3VycmVudEtleWJvYXJkU2Nyb2xsLT5ncmFudWxhcml0eSA9PSBTY3JvbGxHcmFudWxhcml0eTo6
RG9jdW1lbnQpIHsKICAgICAgICAgbV92ZWxvY2l0eSA9IHsgfTsKICAgICAgICAgc3RvcEtleWJv
YXJkU2Nyb2xsQW5pbWF0aW9uKCk7CiAgICAgICAgIGF1dG8gbmV3UG9zaXRpb24gPSBJbnRQb2lu
dChtX3Njcm9sbEFuaW1hdG9yLmN1cnJlbnRQb3NpdGlvbigpICsgbV9jdXJyZW50S2V5Ym9hcmRT
Y3JvbGwtPm9mZnNldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv
bGxBbmltYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5j
cHAKaW5kZXggYmJkOTRkYjRlZDU0ZDE4MDY5Yzk5OTM0Y2E0ZTNiZDMyNDZhOTFiMy4uMDUwYzY2
ZjhjYjg1N2UwN2VkNmRkNmVjNmRhNmZhZTViNTYyZDY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcApAQCAtMjE3LDcgKzIxNyw3IEBAIGJvb2wgU2Nyb2xs
QW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBlKQog
ICAgICAgICAgICAgICAgIGlmIChuZWdhdGl2ZSkKICAgICAgICAgICAgICAgICAgICAgZGVsdGFZ
ID0gLWRlbHRhWTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHNjcm9sbChTY3JvbGxiYXJP
cmllbnRhdGlvbjo6VmVydGljYWwsIFNjcm9sbEJ5UGl4ZWwsIHZlcnRpY2FsU2Nyb2xsYmFyLT5w
aXhlbFN0ZXAoKSwgLWRlbHRhWSwgYmVoYXZpb3IpOworICAgICAgICAgICAgc2Nyb2xsKFNjcm9s
bGJhck9yaWVudGF0aW9uOjpWZXJ0aWNhbCwgU2Nyb2xsR3JhbnVsYXJpdHk6OlBpeGVsLCB2ZXJ0
aWNhbFNjcm9sbGJhci0+cGl4ZWxTdGVwKCksIC1kZWx0YVksIGJlaGF2aW9yKTsKICAgICAgICAg
fQogCiAgICAgICAgIGlmIChkZWx0YVgpIHsKQEAgLTIyNyw3ICsyMjcsNyBAQCBib29sIFNjcm9s
bEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZSkK
ICAgICAgICAgICAgICAgICBpZiAobmVnYXRpdmUpCiAgICAgICAgICAgICAgICAgICAgIGRlbHRh
WCA9IC1kZWx0YVg7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBzY3JvbGwoU2Nyb2xsYmFy
T3JpZW50YXRpb246Okhvcml6b250YWwsIFNjcm9sbEJ5UGl4ZWwsIGhvcml6b250YWxTY3JvbGxi
YXItPnBpeGVsU3RlcCgpLCAtZGVsdGFYLCBiZWhhdmlvcik7CisgICAgICAgICAgICBzY3JvbGwo
U2Nyb2xsYmFyT3JpZW50YXRpb246Okhvcml6b250YWwsIFNjcm9sbEdyYW51bGFyaXR5OjpQaXhl
bCwgaG9yaXpvbnRhbFNjcm9sbGJhci0+cGl4ZWxTdGVwKCksIC1kZWx0YVgsIGJlaGF2aW9yKTsK
ICAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gaGFuZGxlZDsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9TY3JvbGxUeXBlcy5oCmluZGV4IDBhZDJlMjdhODdlMTBiZDU3NjdmNDkzYjAxYTAxOTI2MDA5
OWFkOTcuLmY4ZjM5MmJlMGRkMjE2MmZhNTVhZjU2NzJkMTdiMzg4OGIxOTY2NzIgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFR5cGVzLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVHlwZXMuaApAQCAtMTMwLDExICsxMzAsMTEgQEAgaW5saW5l
IFNjcm9sbERpcmVjdGlvbiBsb2dpY2FsVG9QaHlzaWNhbChTY3JvbGxMb2dpY2FsRGlyZWN0aW9u
IGRpcmVjdGlvbiwgYm9vbAogICAgIHJldHVybiBTY3JvbGxVcDsKIH0KIAotZW51bSBTY3JvbGxH
cmFudWxhcml0eSA6IHVpbnQ4X3QgewotICAgIFNjcm9sbEJ5TGluZSwKLSAgICBTY3JvbGxCeVBh
Z2UsCi0gICAgU2Nyb2xsQnlEb2N1bWVudCwKLSAgICBTY3JvbGxCeVBpeGVsCitlbnVtIGNsYXNz
IFNjcm9sbEdyYW51bGFyaXR5IDogdWludDhfdCB7CisgICAgTGluZSwKKyAgICBQYWdlLAorICAg
IERvY3VtZW50LAorICAgIFBpeGVsCiB9OwogCiBlbnVtIGNsYXNzIFNjcm9sbEVsYXN0aWNpdHkg
OiB1aW50OF90IHsKQEAgLTMzMCw0ICszMzAsMTMgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRy
YWl0czxXZWJDb3JlOjpTY3JvbGxQaW5uaW5nQmVoYXZpb3I+IHsKICAgICA+OwogfTsKIAordGVt
cGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eT4gewor
ICAgIHVzaW5nIHZhbHVlcyA9IEVudW1WYWx1ZXM8CisgICAgICAgIFdlYkNvcmU6OlNjcm9sbEdy
YW51bGFyaXR5LAorICAgICAgICBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6TGluZSwKKyAg
ICAgICAgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2UsCisgICAgICAgIFdlYkNvcmU6
OlNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVudCwKKyAgICAgICAgV2ViQ29yZTo6U2Nyb2xsR3Jh
bnVsYXJpdHk6OlBpeGVsCisgICAgPjsKK307CiB9IC8vIG5hbWVzcGFjZSBXVEYKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAppbmRleCBiNTUyZDRkODEzMWVlZWE3
MDA5ZGRlMzBmNGNjMGQ2ZGU3MTQxMWExLi44ZjIwY2VjODU0MTNiZWFkY2I0N2I3ZTIxODAzOWQ3
ZTI0Njg4ZTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxl
QXJlYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3Bw
CkBAIC0xMTMsMTYgKzExMywxNiBAQCBib29sIFNjcm9sbGFibGVBcmVhOjpzY3JvbGwoU2Nyb2xs
RGlyZWN0aW9uIGRpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHkgZ3JhbnVsYQogCiAgICAgZmxv
YXQgc3RlcCA9IDA7CiAgICAgc3dpdGNoIChncmFudWxhcml0eSkgewotICAgIGNhc2UgU2Nyb2xs
QnlMaW5lOgorICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU6CiAgICAgICAgIHN0ZXAg
PSBzY3JvbGxiYXItPmxpbmVTdGVwKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU2Nyb2xs
QnlQYWdlOgorICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2U6CiAgICAgICAgIHN0ZXAg
PSBzY3JvbGxiYXItPnBhZ2VTdGVwKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU2Nyb2xs
QnlEb2N1bWVudDoKKyAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVudDoKICAgICAg
ICAgc3RlcCA9IHNjcm9sbGJhci0+dG90YWxTaXplKCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNh
c2UgU2Nyb2xsQnlQaXhlbDoKKyAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpQaXhlbDoKICAg
ICAgICAgc3RlcCA9IHNjcm9sbGJhci0+cGl4ZWxTdGVwKCk7CiAgICAgICAgIGJyZWFrOwogICAg
IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IDZhNGE1NzQ1YTAwZmI3
MTBlYWVlMzNiM2RjY2IwMzgwNmMxNGFhMzcuLjYyOGRjMWNlMmQwYThjN2EzMDI4MTNlNDUwNjM2
NDA4MDE3Zjk3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJh
ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAtMjM0
LDggKzIzNCw4IEBAIFNjcm9sbERpcmVjdGlvbiBTY3JvbGxiYXI6OnByZXNzZWRQYXJ0U2Nyb2xs
RGlyZWN0aW9uKCkKIFNjcm9sbEdyYW51bGFyaXR5IFNjcm9sbGJhcjo6cHJlc3NlZFBhcnRTY3Jv
bGxHcmFudWxhcml0eSgpCiB7CiAgICAgaWYgKG1fcHJlc3NlZFBhcnQgPT0gQmFja0J1dHRvblN0
YXJ0UGFydCB8fCBtX3ByZXNzZWRQYXJ0ID09IEJhY2tCdXR0b25FbmRQYXJ0IHx8ICBtX3ByZXNz
ZWRQYXJ0ID09IEZvcndhcmRCdXR0b25TdGFydFBhcnQgfHwgbV9wcmVzc2VkUGFydCA9PSBGb3J3
YXJkQnV0dG9uRW5kUGFydCkKLSAgICAgICAgcmV0dXJuIFNjcm9sbEJ5TGluZTsKLSAgICByZXR1
cm4gU2Nyb2xsQnlQYWdlOworICAgICAgICByZXR1cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7
CisgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpQYWdlOwogfQogCiB2b2lkIFNjcm9sbGJh
cjo6bW92ZVRodW1iKGludCBwb3MsIGJvb2wgZHJhZ2dpbmdEb2N1bWVudCkKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9TY3JvbGxBbmltYXRvcklPUy5tbSBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9TY3JvbGxBbmltYXRvcklPUy5tbQppbmRleCAxNjJkNjM5
ZmYzMWNhMzNkNThlMzhjYWZhMmU4MTM0YTVlZWE3ZGM5Li4zMjE1MWIwYzY4YTcyNmJiMTA4YjUw
YzE1NmM3MDc3ZjE4ZDc0NmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p
b3MvU2Nyb2xsQW5pbWF0b3JJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z
L1Njcm9sbEFuaW1hdG9ySU9TLm1tCkBAIC0xMzksMTMgKzEzOSwxMyBAQCBib29sIFNjcm9sbEFu
aW1hdG9ySU9TOjpoYW5kbGVUb3VjaEV2ZW50KGNvbnN0IFBsYXRmb3JtVG91Y2hFdmVudCYgdG91
Y2hFdmVudCkKICAgICAvLyBIb3Jpem9udGFsCiAgICAgaWYgKG1fdG91Y2hTY3JvbGxBeGlzTGF0
Y2ggIT0gQXhpc0xhdGNoVmVydGljYWwpIHsKICAgICAgICAgaW50IGRlbHRhID0gdG91Y2hEZWx0
YS53aWR0aCgpOwotICAgICAgICBoYW5kbGVkIHw9IG1fc2Nyb2xsYWJsZUFyZWFGb3JUb3VjaFNl
cXVlbmNlLT5zY3JvbGwoZGVsdGEgPCAwID8gU2Nyb2xsTGVmdCA6IFNjcm9sbFJpZ2h0LCBTY3Jv
bGxCeVBpeGVsLCBhYnMoZGVsdGEpKTsKKyAgICAgICAgaGFuZGxlZCB8PSBtX3Njcm9sbGFibGVB
cmVhRm9yVG91Y2hTZXF1ZW5jZS0+c2Nyb2xsKGRlbHRhIDwgMCA/IFNjcm9sbExlZnQgOiBTY3Jv
bGxSaWdodCwgU2Nyb2xsR3JhbnVsYXJpdHk6OlBpeGVsLCBhYnMoZGVsdGEpKTsKICAgICB9CiAg
ICAgCiAgICAgLy8gVmVydGljYWwKICAgICBpZiAobV90b3VjaFNjcm9sbEF4aXNMYXRjaCAhPSBB
eGlzTGF0Y2hIb3Jpem9udGFsKSB7CiAgICAgICAgIGludCBkZWx0YSA9IHRvdWNoRGVsdGEuaGVp
Z2h0KCk7Ci0gICAgICAgIGhhbmRsZWQgfD0gbV9zY3JvbGxhYmxlQXJlYUZvclRvdWNoU2VxdWVu
Y2UtPnNjcm9sbChkZWx0YSA8IDAgPyBTY3JvbGxVcCA6IFNjcm9sbERvd24sIFNjcm9sbEJ5UGl4
ZWwsIGFicyhkZWx0YSkpOworICAgICAgICBoYW5kbGVkIHw9IG1fc2Nyb2xsYWJsZUFyZWFGb3JU
b3VjaFNlcXVlbmNlLT5zY3JvbGwoZGVsdGEgPCAwID8gU2Nyb2xsVXAgOiBTY3JvbGxEb3duLCBT
Y3JvbGxHcmFudWxhcml0eTo6UGl4ZWwsIGFicyhkZWx0YSkpOwogICAgIH0KICAgICAKICAgICAv
LyBSZXR1cm4gZmFsc2UgdW50aWwgd2UgbWFuYWdlIHRvIHNjcm9sbCBhdCBhbGwsIGFuZCB0aGVu
IGtlZXAgcmV0dXJuaW5nIHRydWUgdW50aWwgdGhlIGdlc3R1cmUgZW5kcy4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAKaW5kZXggYjE0M2JmYTJmN2Y4NTUw
MWIzZDA4OTIyNmM4ZTYwOGMxNGZlOWI0Mi4uZTJjMTM4ZTkxNzE5ODhjZWM4ODI1YTk3NGViZjQx
NzhmZWI1MjhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1BvcHVw
TWVudVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdp
bi5jcHAKQEAgLTEwNjAsNyArMTA2MCw3IEBAIExSRVNVTFQgUG9wdXBNZW51V2luOjp3bmRQcm9j
KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhCiAgICAg
ICAgICAgICAgICAgICAgIC0taTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgU2Nyb2xs
YWJsZUFyZWE6OnNjcm9sbChpID4gMCA/IFNjcm9sbFVwIDogU2Nyb2xsRG93biwgU2Nyb2xsQnlM
aW5lLCBhYnMoaSkpOworICAgICAgICAgICAgU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbChpID4gMCA/
IFNjcm9sbFVwIDogU2Nyb2xsRG93biwgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmUsIGFicyhpKSk7
CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCmluZGV4IDNkMjA1YmM1ZTA0OTI2ZGM1Y2YwNDFiYWM5NWFkYmM0MDhmNWY1
YjkuLmViYTg1OWVhZGJkN2Y3Yzc0MGNhZjNhMDAyMTY2ODAyNjkwNTgzNDggMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC05MjUsOCArOTI1LDggQEAgYm9vbCBSZW5k
ZXJCb3g6OmxvZ2ljYWxTY3JvbGwoU2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNj
cm9sbEdyYW51bGFyaXQKICAgICBpZiAoYXV0byogc2Nyb2xsYWJsZUFyZWEgPSBsYXllcigpID8g
bGF5ZXIoKS0+c2Nyb2xsYWJsZUFyZWEoKSA6IG51bGxwdHIpIHsKICNpZiBQTEFURk9STShDT0NP
QSkKICAgICAgICAgLy8gT24gTWFjIG9ubHkgd2UgcmVzZXQgdGhlIGlubGluZSBkaXJlY3Rpb24g
cG9zaXRpb24gd2hlbiBkb2luZyBhIGRvY3VtZW50IHNjcm9sbCAoZS5nLiwgaGl0dGluZyBIb21l
L0VuZCkuCi0gICAgICAgIGlmIChncmFudWxhcml0eSA9PSBTY3JvbGxCeURvY3VtZW50KQotICAg
ICAgICAgICAgc2Nyb2xsZWQgPSBzY3JvbGxhYmxlQXJlYS0+c2Nyb2xsKGxvZ2ljYWxUb1BoeXNp
Y2FsKFNjcm9sbElubGluZURpcmVjdGlvbkJhY2t3YXJkLCBpc0hvcml6b250YWxXcml0aW5nTW9k
ZSgpLCBzdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpLCBTY3JvbGxCeURvY3Vt
ZW50LCBtdWx0aXBsaWVyKTsKKyAgICAgICAgaWYgKGdyYW51bGFyaXR5ID09IFNjcm9sbEdyYW51
bGFyaXR5OjpEb2N1bWVudCkKKyAgICAgICAgICAgIHNjcm9sbGVkID0gc2Nyb2xsYWJsZUFyZWEt
PnNjcm9sbChsb2dpY2FsVG9QaHlzaWNhbChTY3JvbGxJbmxpbmVEaXJlY3Rpb25CYWNrd2FyZCwg
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5n
TW9kZSgpKSwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50LCBtdWx0aXBsaWVyKTsKICNlbmRp
ZgogICAgICAgICBpZiAoc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbChsb2dpY2FsVG9QaHlzaWNhbChk
aXJlY3Rpb24sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCksIHN0eWxlKCkuaXNGbGlwcGVkQmxv
Y2tzV3JpdGluZ01vZGUoKSksIGdyYW51bGFyaXR5LCBtdWx0aXBsaWVyKSkKICAgICAgICAgICAg
IHNjcm9sbGVkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJr
aXQvbWVzc2FnZXMucHkgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5
CmluZGV4IDM3NTRhZTQ0NzQ1ZjdlNDA4OWZjYWVlZjMyMDMwMjE2MzMwYTEwY2EuLjhiZDBkYjI5
N2JmYjQwNzRmNjg5MDA0MmZjZGE0Nzg0NTBkZjA1NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkKKysrIGIvU291cmNlL1dlYktpdC9TY3JpcHRz
L3dlYmtpdC9tZXNzYWdlcy5weQpAQCAtNzYzLDYgKzc2Myw3IEBAIGRlZiBoZWFkZXJzX2Zvcl90
eXBlKHR5cGUpOgogICAgICAgICAnV2ViQ29yZTo6Um91dGVTaGFyaW5nUG9saWN5JzogWyc8V2Vi
Q29yZS9BdWRpb1Nlc3Npb24uaD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OlNXU2VydmVyQ29ubmVj
dGlvbklkZW50aWZpZXInOiBbJzxXZWJDb3JlL1NlcnZpY2VXb3JrZXJUeXBlcy5oPiddLAogICAg
ICAgICAnV2ViQ29yZTo6U2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudEVuYWJsZWQnOiBbJzxXZWJD
b3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPiddLAorICAgICAgICAnV2ViQ29yZTo6U2Nyb2xs
R3JhbnVsYXJpdHknOiBbJzxXZWJDb3JlL1Njcm9sbFR5cGVzLmg+J10sCiAgICAgICAgICdXZWJD
b3JlOjpTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50SW5pdCc6IFsnPFdlYkNvcmUvU2VjdXJp
dHlQb2xpY3lWaW9sYXRpb25FdmVudC5oPiddLAogICAgICAgICAnV2ViQ29yZTo6U2VsZWN0aW9u
RGlyZWN0aW9uJzogWyc8V2ViQ29yZS9WaXNpYmxlU2VsZWN0aW9uLmg+J10sCiAgICAgICAgICdX
ZWJDb3JlOjpTZWxlY3Rpb25HZW9tZXRyeSc6IFsnIkVkaXRvclN0YXRlLmgiJ10sCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u
Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5tbQppbmRleCAzOTQzOGJmMWQ3NTUzMTk0NTY2MDQwMjA1NTAwYmI3NDhlMTJjMzkxLi4xN2Vk
MzJiNWE0Mzc2ZWZmNjA5MDY0MGQyMDZjYWZmZTMwZGViNTQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAg
LTU5MzIsMTcgKzU5MzIsMTcgQEAgc3RhdGljIE5TU3RyaW5nICpjb250ZW50VHlwZUZyb21GaWVs
ZE5hbWUoV2ViQ29yZTo6QXV0b2ZpbGxGaWVsZE5hbWUgZmllbGROYW1lKQogICAgIEJPT0wgZGly
ZWN0aW9uSXNIb3Jpem9udGFsID0gZGlyZWN0aW9uID09IFdlYkNvcmU6OlNjcm9sbERpcmVjdGlv
bjo6U2Nyb2xsTGVmdCB8fCBkaXJlY3Rpb24gPT0gV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uOjpT
Y3JvbGxSaWdodDsKIAogICAgIHN3aXRjaCAoaW5jcmVtZW50KSB7Ci0gICAgY2FzZSBXZWJDb3Jl
OjpTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlEb2N1bWVudDogeworICAgIGNhc2UgV2ViQ29y
ZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50OiB7CiAgICAgICAgIENHU2l6ZSBkb2N1bWVu
dFNpemUgPSBbc2VsZiBjb252ZXJ0UmVjdDpzZWxmLmJvdW5kcyB0b1ZpZXc6c2VsZi53ZWJWaWV3
XS5zaXplOwogICAgICAgICByZXR1cm4gZGlyZWN0aW9uSXNIb3Jpem9udGFsID8gZG9jdW1lbnRT
aXplLndpZHRoIDogZG9jdW1lbnRTaXplLmhlaWdodDsKICAgICB9Ci0gICAgY2FzZSBXZWJDb3Jl
OjpTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQYWdlOiB7CisgICAgY2FzZSBXZWJDb3JlOjpT
Y3JvbGxHcmFudWxhcml0eTo6UGFnZTogewogICAgICAgICBDR1NpemUgcGFnZVNpemUgPSBbc2Vs
ZiBjb252ZXJ0U2l6ZTpDR1NpemVNYWtlKDAsIFdlYkNvcmU6OlNjcm9sbGJhcjo6cGFnZVN0ZXAo
X3BhZ2UtPnVub2JzY3VyZWRDb250ZW50UmVjdCgpLmhlaWdodCgpLCBzZWxmLmJvdW5kcy5zaXpl
LmhlaWdodCkpIHRvVmlldzpzZWxmLndlYlZpZXddOwogICAgICAgICByZXR1cm4gZGlyZWN0aW9u
SXNIb3Jpem9udGFsID8gcGFnZVNpemUud2lkdGggOiBwYWdlU2l6ZS5oZWlnaHQ7CiAgICAgfQot
ICAgIGNhc2UgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5TGluZToKKyAgICBj
YXNlIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpMaW5lOgogICAgICAgICByZXR1cm4gW3Nl
bGYgY29udmVydFNpemU6Q0dTaXplTWFrZSgwLCBXZWJDb3JlOjpTY3JvbGxiYXI6OnBpeGVsc1Bl
ckxpbmVTdGVwKCkpIHRvVmlldzpzZWxmLndlYlZpZXddLmhlaWdodDsKLSAgICBjYXNlIFdlYkNv
cmU6OlNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBpeGVsOgorICAgIGNhc2UgV2ViQ29yZTo6
U2Nyb2xsR3JhbnVsYXJpdHk6OlBpeGVsOgogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAg
QVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5tbQppbmRleCBjMzEyMzgzNGU3
ZmE5M2MyOTdkNzk3YmU2YTlkN2RlYzViMzlmNzc4Li42YjNlZGM3NmIzOTYwNGU1NTU3NTUwMzBh
ZjUyMWRiZDk2ZTQwN2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv
V0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IubW0KQEAgLTIxOSwyMiArMjE5LDIy
IEBAIHN0YXRpYyBXZWJDb3JlOjpCb3hTaWRlIGJveFNpZGUoV2ViQ29yZTo6U2Nyb2xsRGlyZWN0
aW9uIGRpcmVjdGlvbikKICAgICAgICAgY2FzZSBLZXk6OkxlZnRBcnJvdzoKICAgICAgICAgY2Fz
ZSBLZXk6OlJpZ2h0QXJyb3c6CiAgICAgICAgICAgICBpZiAoYWx0UHJlc3NlZCkKLSAgICAgICAg
ICAgICAgICByZXR1cm4gV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZTsK
LSAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlM
aW5lOworICAgICAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6
UGFnZTsKKyAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6TGlu
ZTsKICAgICAgICAgY2FzZSBLZXk6OlVwQXJyb3c6CiAgICAgICAgIGNhc2UgS2V5OjpEb3duQXJy
b3c6CiAgICAgICAgICAgICBpZiAoYWx0UHJlc3NlZCkKLSAgICAgICAgICAgICAgICByZXR1cm4g
V2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZTsKKyAgICAgICAgICAgICAg
ICByZXR1cm4gV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2U7CiAgICAgICAgICAgICBp
ZiAoY21kUHJlc3NlZCkKLSAgICAgICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6U2Nyb2xsR3Jh
bnVsYXJpdHk6OlNjcm9sbEJ5RG9jdW1lbnQ7Ci0gICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6
U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5TGluZTsKKyAgICAgICAgICAgICAgICByZXR1cm4g
V2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50OworICAgICAgICAgICAgcmV0dXJu
IFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpMaW5lOwogICAgICAgICBjYXNlIEtleTo6UGFn
ZVVwOgogICAgICAgICBjYXNlIEtleTo6UGFnZURvd246CiAgICAgICAgIGNhc2UgS2V5OjpTcGFj
ZToKLSAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xs
QnlQYWdlOworICAgICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpQ
YWdlOwogICAgICAgICBjYXNlIEtleTo6T3RoZXI6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JF
QUNIRUQoKTsKLSAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6
U2Nyb2xsQnlMaW5lOworICAgICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFy
aXR5OjpMaW5lOwogICAgICAgICB9OwogICAgIH0oKTsKIApAQCAtMjkzLDcgKzI5Myw3IEBAIHN0
YXRpYyBXZWJDb3JlOjpCb3hTaWRlIGJveFNpZGUoV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uIGRp
cmVjdGlvbikKICAgICBfc2Nyb2xsVHJpZ2dlcmluZ0tleUlzUHJlc3NlZCA9IFlFUzsKICAgICBf
Y3VycmVudFNjcm9sbCA9IHNjcm9sbDsKIAotICAgIGlmIChzY3JvbGwtPmdyYW51bGFyaXR5ID09
IFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeURvY3VtZW50KSB7CisgICAgaWYg
KHNjcm9sbC0+Z3JhbnVsYXJpdHkgPT0gV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3Vt
ZW50KSB7CiAgICAgICAgIF92ZWxvY2l0eSA9IHsgfTsKICAgICAgICAgW3NlbGYgc3RvcEFuaW1h
dGVkU2Nyb2xsXTsKICAgICAgICAgW3NlbGYgc3RvcERpc3BsYXlMaW5rXTsKQEAgLTU0NSwxMyAr
NTQ1LDEzIEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGZhcnRoZXN0UG9pbnRJbkRpcmVj
dGlvbihXZWJDb3JlOjpGbG9hdFBvaW50IGEsIFdlYkNvCiAKICAgICBpZiAoIV9kZWxlZ2F0ZVJl
c3BvbmRzVG9EaXN0YW5jZUZvckluY3JlbWVudCkgewogICAgICAgICBzd2l0Y2ggKGluY3JlbWVu
dCkgewotICAgICAgICBjYXNlIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeURv
Y3VtZW50OgorICAgICAgICBjYXNlIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVu
dDoKICAgICAgICAgICAgIHJldHVybiBkaXJlY3Rpb25Jc0hvcml6b250YWwgPyBzY3JvbGxWaWV3
LmNvbnRlbnRTaXplLndpZHRoIDogc2Nyb2xsVmlldy5jb250ZW50U2l6ZS5oZWlnaHQ7Ci0gICAg
ICAgIGNhc2UgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZToKKyAgICAg
ICAgY2FzZSBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6UGFnZToKICAgICAgICAgICAgIHJl
dHVybiAoZGlyZWN0aW9uSXNIb3Jpem9udGFsID8gc2Nyb2xsVmlldy5mcmFtZS5zaXplLndpZHRo
IDogc2Nyb2xsVmlldy5mcmFtZS5zaXplLmhlaWdodCkgKiBkZWZhdWx0UGFnZVNjcm9sbEZyYWN0
aW9uOwotICAgICAgICBjYXNlIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxp
bmU6CisgICAgICAgIGNhc2UgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU6CiAgICAg
ICAgICAgICByZXR1cm4gZGVmYXVsdExpbmVTY3JvbGxIZWlnaHQgKiBzY3JvbGxWaWV3Lnpvb21T
Y2FsZTsKLSAgICAgICAgY2FzZSBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQ
aXhlbDoKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6UGl4ZWw6CiAg
ICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNI
RUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJQb3B1cE1l
bnVQcm94eVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vV2ViUG9wdXBNZW51
UHJveHlXaW4uY3BwCmluZGV4IDg4ZWU1N2JlYjAyMjQwMDcxZmM2YmQwZjZmYzI4ODQxNmQzZDRm
YTUuLjljNDVjNDNiYjMzNTM4OTJiNDk4NTU3NDg5NGM2OGU5NDc4NTQwZjYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJQb3B1cE1lbnVQcm94eVdpbi5jcHAKKysr
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1dlYlBvcHVwTWVudVByb3h5V2luLmNwcApA
QCAtNzYzLDcgKzc2Myw3IEBAIExSRVNVTFQgV2ViUG9wdXBNZW51UHJveHlXaW46Om9uTW91c2VX
aGVlbChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhCiAgICAgICAgICAgICAt
LWk7CiAgICAgfQogCi0gICAgU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbChpID4gMCA/IFNjcm9sbFVw
IDogU2Nyb2xsRG93biwgU2Nyb2xsQnlMaW5lLCBhYnMoaSkpOworICAgIFNjcm9sbGFibGVBcmVh
OjpzY3JvbGwoaSA+IDAgPyBTY3JvbGxVcCA6IFNjcm9sbERvd24sIFNjcm9sbEdyYW51bGFyaXR5
OjpMaW5lLCBhYnMoaSkpOwogICAgIHJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy93aW4vV2ViVmlldy5jcHAKaW5kZXggMGM3ZjQwY2I0OWZmMTA3MWMxOGEzODBkNjM0NjhlNmM4
OGZkNTQ5OC4uODIxNjNhMGIzZjAyOTJiNGYzYmZkMjUwMzc5MmE3OWI4MmJlMGQ3NCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcApAQCAtNDAxLDE5ICs0MDEsMTkgQEAg
TFJFU1VMVCBXZWJWaWV3Ojpvbkhvcml6b250YWxTY3JvbGwoSFdORCBoV25kLCBVSU5UIG1lc3Nh
Z2UsIFdQQVJBTSB3UGFyYW0sIExQQVIKICAgICBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0
eTsKICAgICBzd2l0Y2ggKExPV09SRCh3UGFyYW0pKSB7CiAgICAgY2FzZSBTQl9MSU5FTEVGVDoK
LSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7CisgICAgICAgIGdyYW51bGFyaXR5
ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7CiAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbExl
ZnQ7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU0JfTElORVJJR0hUOgotICAgICAgICBncmFu
dWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFu
dWxhcml0eTo6TGluZTsKICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsUmlnaHQ7CiAgICAgICAg
IGJyZWFrOwogICAgIGNhc2UgU0JfUEFHRUxFRlQ6Ci0gICAgICAgIGdyYW51bGFyaXR5ID0gU2Ny
b2xsQnlEb2N1bWVudDsKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxhcml0eTo6
RG9jdW1lbnQ7CiAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbExlZnQ7CiAgICAgICAgIGJyZWFr
OwogICAgIGNhc2UgU0JfUEFHRVJJR0hUOgotICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5
RG9jdW1lbnQ7CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3Vt
ZW50OwogICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxSaWdodDsKICAgICAgICAgYnJlYWs7CiAg
ICAgZGVmYXVsdDoKQEAgLTQzMywxOSArNDMzLDE5IEBAIExSRVNVTFQgV2ViVmlldzo6b25WZXJ0
aWNhbFNjcm9sbChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFN
CiAgICAgU2Nyb2xsR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHk7CiAgICAgc3dpdGNoIChMT1dPUkQo
d1BhcmFtKSkgewogICAgIGNhc2UgU0JfTElORURPV046Ci0gICAgICAgIGdyYW51bGFyaXR5ID0g
U2Nyb2xsQnlMaW5lOworICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEdyYW51bGFyaXR5OjpM
aW5lOwogICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxEb3duOwogICAgICAgICBicmVhazsKICAg
ICBjYXNlIFNCX0xJTkVVUDoKLSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7Cisg
ICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7CiAgICAgICAgIGRp
cmVjdGlvbiA9IFNjcm9sbFVwOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFNCX1BBR0VET1dO
OgotICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5RG9jdW1lbnQ7CisgICAgICAgIGdyYW51
bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50OwogICAgICAgICBkaXJlY3Rpb24g
PSBTY3JvbGxEb3duOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFNCX1BBR0VVUDoKLSAgICAg
ICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeURvY3VtZW50OworICAgICAgICBncmFudWxhcml0eSA9
IFNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVudDsKICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xs
VXA7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQ1NDA5YmVkY2U1NjE3YTRhMDdmNzIxMmE4
N2ZmZDYyZDZmMDAwZjcuLmU0NmM1NGQwNzIxNzNjYjIxOTBlYjg5Y2RhMTU2ODA3YjgzYzdmZjIg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0z
MzA3LDcgKzMzMDcsNyBAQCBib29sIFdlYlBhZ2U6OmxvZ2ljYWxTY3JvbGwoUGFnZSogcGFnZSwg
U2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjcm9sbAogICAgIHJldHVybiBwYWdl
LT51c2VySW5wdXRCcmlkZ2UoKS5sb2dpY2FsU2Nyb2xsUmVjdXJzaXZlbHkoZGlyZWN0aW9uLCBn
cmFudWxhcml0eSk7CiB9CiAKLWJvb2wgV2ViUGFnZTo6c2Nyb2xsQnkodWludDMyX3Qgc2Nyb2xs
RGlyZWN0aW9uLCB1aW50MzJfdCBzY3JvbGxHcmFudWxhcml0eSkKK2Jvb2wgV2ViUGFnZTo6c2Ny
b2xsQnkodWludDMyX3Qgc2Nyb2xsRGlyZWN0aW9uLCBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0
eSBzY3JvbGxHcmFudWxhcml0eSkKIHsKICAgICByZXR1cm4gc2Nyb2xsKG1fcGFnZS5nZXQoKSwg
c3RhdGljX2Nhc3Q8U2Nyb2xsRGlyZWN0aW9uPihzY3JvbGxEaXJlY3Rpb24pLCBzdGF0aWNfY2Fz
dDxTY3JvbGxHcmFudWxhcml0eT4oc2Nyb2xsR3JhbnVsYXJpdHkpKTsKIH0KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA0ZGQ1ODdjYmJlMzFhZTEwYzIw
OTk0YjZlNTEyMjM5Y2E0NzlkMTQyLi5lZWFhNjAxZDc2YTc3YzJmM2QzZjQ2NmYzNjliZTk5YTFm
NzM1YzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ
YWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBA
IC0zODcsNyArMzg3LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzY3JvbGxNYWluRnJhbWVJZk5v
dEF0TWF4U2Nyb2xsUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0
KTsKIAotICAgIGJvb2wgc2Nyb2xsQnkodWludDMyX3Qgc2Nyb2xsRGlyZWN0aW9uLCB1aW50MzJf
dCBzY3JvbGxHcmFudWxhcml0eSk7CisgICAgYm9vbCBzY3JvbGxCeSh1aW50MzJfdCBzY3JvbGxE
aXJlY3Rpb24sIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5KTsKIAogICAgIHZvaWQgY2VudGVy
U2VsZWN0aW9uSW5WaXNpYmxlQXJlYSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCAxODViZTU0N2MzYWMxYThl
OWYzMjJhOTk3OWY2ODIxNzdmZWE3N2U0Li40MTZiMjYzOWI5NWI5YzQyMGM0ZTg2ODU1MWYzYWU5
YjljYzg0NzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X
ZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTE2OCw3ICsxNjgsNyBAQCBHZW5lcmF0ZVN5bnRoZXRp
Y0VkaXRpbmdDb21tYW5kKGVudW06dWludDhfdCBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21t
YW5kVHlwZQogICAgIERpZEVuZERhdGVUaW1lUGlja2VyKCk7CiAjZW5kaWYKIAotICAgIFNjcm9s
bEJ5KHVpbnQzMl90IHNjcm9sbERpcmVjdGlvbiwgdWludDMyX3Qgc2Nyb2xsR3JhbnVsYXJpdHkp
CisgICAgU2Nyb2xsQnkodWludDMyX3Qgc2Nyb2xsRGlyZWN0aW9uLCBlbnVtOnVpbnQ4X3QgV2Vi
Q29yZTo6U2Nyb2xsR3JhbnVsYXJpdHkgc2Nyb2xsR3JhbnVsYXJpdHkpCiAgICAgQ2VudGVyU2Vs
ZWN0aW9uSW5WaXNpYmxlQXJlYSgpCiAKICAgICBHb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90
IG5hdmlnYXRpb25JRCwgc3RydWN0IFdlYkNvcmU6OkJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXIg
YmFja0ZvcndhcmRJdGVtSUQsIGVudW06dWludDhfdCBXZWJDb3JlOjpGcmFtZUxvYWRUeXBlIGJh
Y2tGb3J3YXJkVHlwZSwgZW51bTp1aW50OF90IFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51
aW5nTG9hZCBzaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIHN0ZDo6b3B0aW9uYWw8V2ViS2l0
OjpXZWJzaXRlUG9saWNpZXNEYXRhPiB3ZWJzaXRlUG9saWNpZXMsIGJvb2wgbGFzdE5hdmlnYXRp
b25XYXNBcHBJbml0aWF0ZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKaW5kZXggZTM1MDY2ZjM1Mzg1Y2RhZmJjODZlYzcwNDNk
MTNkNzZmNzk2NGEwOC4uMDUzMzViZTI0NjQzZDZlMzYxY2Q4YmMwMjZmMjA0YTdiNGY2NGZmZSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VH
dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdl
R3RrLmNwcApAQCAtMTA0LDMxICsxMDQsMzEgQEAgYm9vbCBXZWJQYWdlOjpwZXJmb3JtRGVmYXVs
dEJlaGF2aW9yRm9yS2V5RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYga2V5Ym9hcmQKIAog
ICAgIHN3aXRjaCAoa2V5Ym9hcmRFdmVudC53aW5kb3dzVmlydHVhbEtleUNvZGUoKSkgewogICAg
IGNhc2UgVktfU1BBQ0U6Ci0gICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIGtleWJvYXJkRXZl
bnQuc2hpZnRLZXkoKSA/IFNjcm9sbFVwIDogU2Nyb2xsRG93biwgU2Nyb2xsQnlQYWdlKTsKKyAg
ICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwga2V5Ym9hcmRFdmVudC5zaGlmdEtleSgpID8gU2Ny
b2xsVXAgOiBTY3JvbGxEb3duLCBTY3JvbGxHcmFudWxhcml0eTo6UGFnZSk7CiAgICAgICAgIGJy
ZWFrOwogICAgIGNhc2UgVktfTEVGVDoKLSAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsTGVmdCwgU2Nyb2xsQnlMaW5lKTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsTGVmdCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmUpOwogICAgICAgICBicmVhazsKICAgICBj
YXNlIFZLX1JJR0hUOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxSaWdodCwg
U2Nyb2xsQnlMaW5lKTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsUmlnaHQs
IFNjcm9sbEdyYW51bGFyaXR5OjpMaW5lKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBWS19V
UDoKLSAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEJ5TGluZSk7
CisgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbFVwLCBTY3JvbGxHcmFudWxhcml0
eTo6TGluZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVktfRE9XTjoKLSAgICAgICAgc2Ny
b2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Nyb2xsQnlMaW5lKTsKKyAgICAgICAgc2Ny
b2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmUpOwog
ICAgICAgICBicmVhazsKICAgICBjYXNlIFZLX0hPTUU6Ci0gICAgICAgIHNjcm9sbChtX3BhZ2Uu
Z2V0KCksIFNjcm9sbFVwLCBTY3JvbGxCeURvY3VtZW50KTsKKyAgICAgICAgc2Nyb2xsKG1fcGFn
ZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVudCk7CiAgICAgICAg
IGJyZWFrOwogICAgIGNhc2UgVktfRU5EOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBT
Y3JvbGxEb3duLCBTY3JvbGxCeURvY3VtZW50KTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQo
KSwgU2Nyb2xsRG93biwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50KTsKICAgICAgICAgYnJl
YWs7CiAgICAgY2FzZSBWS19QUklPUjoKLSAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsVXAsIFNjcm9sbEJ5UGFnZSk7CisgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9s
bFVwLCBTY3JvbGxHcmFudWxhcml0eTo6UGFnZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug
VktfTkVYVDoKLSAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Nyb2xs
QnlQYWdlKTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Nyb2xs
R3JhbnVsYXJpdHk6OlBhZ2UpOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg
ICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9tYWMvV2ViUGFnZU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IDFlMjNhZmZlZGVjYWZkYmNkYTMxMDM4YzkxYmY4MDhk
YWE4ODNlYzEuLmMwYTk4YWM3OGY4MmU5ZjQzOTJlNDFiY2EzNTk1MGZjMDhkOWU2Y2IgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t
CkBAIC00NjcsMjcgKzQ2NywyNyBAQCBib29sIFdlYlBhZ2U6OnBlcmZvcm1Ob25FZGl0aW5nQmVo
YXZpb3JGb3JTZWxlY3Rvcihjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBLZXlibwogICAgIAogICAg
IGlmICghZnJhbWUtPnNldHRpbmdzKCkuZXZlbnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRT
Y3JvbGxpbmdFbmFibGVkKCkpIHsKICAgICAgICAgaWYgKHNlbGVjdG9yID09ICJtb3ZlVXA6IikK
LSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3Jv
bGxVcCwgU2Nyb2xsQnlMaW5lKTsKKyAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3Jv
bGwobV9wYWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmUpOwogICAg
ICAgICBlbHNlIGlmIChzZWxlY3RvciA9PSAibW92ZVRvQmVnaW5uaW5nT2ZQYXJhZ3JhcGg6IikK
LSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3Jv
bGxVcCwgU2Nyb2xsQnlQYWdlKTsKKyAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3Jv
bGwobV9wYWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2UpOwogICAg
ICAgICBlbHNlIGlmIChzZWxlY3RvciA9PSAibW92ZVRvQmVnaW5uaW5nT2ZEb2N1bWVudDoiKSB7
Ci0gICAgICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsVXAsIFNjcm9sbEJ5RG9jdW1lbnQpOwotICAgICAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiB8
PSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxMZWZ0LCBTY3JvbGxCeURvY3VtZW50KTsKKyAg
ICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxV
cCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50KTsKKyAgICAgICAgICAgIGRpZFBlcmZvcm1B
Y3Rpb24gfD0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsTGVmdCwgU2Nyb2xsR3JhbnVsYXJp
dHk6OkRvY3VtZW50KTsKICAgICAgICAgfSBlbHNlIGlmIChzZWxlY3RvciA9PSAibW92ZURvd246
IikKLSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBT
Y3JvbGxEb3duLCBTY3JvbGxCeUxpbmUpOworICAgICAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiA9
IHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbERvd24sIFNjcm9sbEdyYW51bGFyaXR5OjpMaW5l
KTsKICAgICAgICAgZWxzZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVUb0VuZE9mUGFyYWdyYXBoOiIp
Ci0gICAgICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsRG93biwgU2Nyb2xsQnlQYWdlKTsKKyAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBz
Y3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3duLCBTY3JvbGxHcmFudWxhcml0eTo6UGFnZSk7
CiAgICAgICAgIGVsc2UgaWYgKHNlbGVjdG9yID09ICJtb3ZlVG9FbmRPZkRvY3VtZW50OiIpIHsK
LSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3Jv
bGxEb3duLCBTY3JvbGxCeURvY3VtZW50KTsKLSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24g
fD0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsTGVmdCwgU2Nyb2xsQnlEb2N1bWVudCk7Cisg
ICAgICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xs
RG93biwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50KTsKKyAgICAgICAgICAgIGRpZFBlcmZv
cm1BY3Rpb24gfD0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsTGVmdCwgU2Nyb2xsR3JhbnVs
YXJpdHk6OkRvY3VtZW50KTsKICAgICAgICAgfSBlbHNlIGlmIChzZWxlY3RvciA9PSAibW92ZUxl
ZnQ6IikKLSAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgp
LCBTY3JvbGxMZWZ0LCBTY3JvbGxCeUxpbmUpOworICAgICAgICAgICAgZGlkUGVyZm9ybUFjdGlv
biA9IHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExlZnQsIFNjcm9sbEdyYW51bGFyaXR5OjpM
aW5lKTsKICAgICAgICAgZWxzZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVXb3JkTGVmdDoiKQotICAg
ICAgICAgICAgZGlkUGVyZm9ybUFjdGlvbiA9IHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExl
ZnQsIFNjcm9sbEJ5UGFnZSk7CisgICAgICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xs
KG1fcGFnZS5nZXQoKSwgU2Nyb2xsTGVmdCwgU2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2UpOwogICAg
ICAgICBlbHNlIGlmIChzZWxlY3RvciA9PSAibW92ZVJpZ2h0OiIpCi0gICAgICAgICAgICBkaWRQ
ZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsUmlnaHQsIFNjcm9sbEJ5
TGluZSk7CisgICAgICAgICAgICBkaWRQZXJmb3JtQWN0aW9uID0gc2Nyb2xsKG1fcGFnZS5nZXQo
KSwgU2Nyb2xsUmlnaHQsIFNjcm9sbEdyYW51bGFyaXR5OjpMaW5lKTsKICAgICAgICAgZWxzZSBp
ZiAoc2VsZWN0b3IgPT0gIm1vdmVXb3JkUmlnaHQ6IikKLSAgICAgICAgICAgIGRpZFBlcmZvcm1B
Y3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxSaWdodCwgU2Nyb2xsQnlQYWdlKTsK
KyAgICAgICAgICAgIGRpZFBlcmZvcm1BY3Rpb24gPSBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3Jv
bGxSaWdodCwgU2Nyb2xsR3JhbnVsYXJpdHk6OlBhZ2UpOwogICAgIH0KIAogICAgIGlmIChzZWxl
Y3RvciA9PSAibW92ZVRvTGVmdEVuZE9mTGluZToiKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYlBhZ2Uvd2luL1dlYlBhZ2VXaW4uY3BwIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlBhZ2Uvd2luL1dlYlBhZ2VXaW4uY3BwCmluZGV4IDBjZjQ3MDdkNDRmYjIw
YTJjYjEyNWFhZjk0NjVkMTI4MmJmODQ2NTEuLmFmYWQ0ZjliMTNhYjE2YjA5MjUyNWE4NGJhYWVk
MzQ5MzNjOGU1MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L3dpbi9XZWJQYWdlV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn
ZS93aW4vV2ViUGFnZVdpbi5jcHAKQEAgLTc1LDI4ICs3NSwyOCBAQCBib29sIFdlYlBhZ2U6OnBl
cmZvcm1EZWZhdWx0QmVoYXZpb3JGb3JLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50JiBr
ZXlib2FyZAogCiAgICAgc3dpdGNoIChrZXlib2FyZEV2ZW50LndpbmRvd3NWaXJ0dWFsS2V5Q29k
ZSgpKSB7CiAgICAgY2FzZSBWS19MRUZUOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBT
Y3JvbGxMZWZ0LCBTY3JvbGxCeUxpbmUpOworICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBT
Y3JvbGxMZWZ0LCBTY3JvbGxHcmFudWxhcml0eTo6TGluZSk7CiAgICAgICAgIGJyZWFrOwogICAg
IGNhc2UgVktfUklHSFQ6Ci0gICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbFJpZ2h0
LCBTY3JvbGxCeUxpbmUpOworICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxSaWdo
dCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFZL
X1VQOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsQnlMaW5l
KTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEdyYW51bGFy
aXR5OjpMaW5lKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBWS19ET1dOOgotICAgICAgICBz
Y3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3duLCBTY3JvbGxCeUxpbmUpOworICAgICAgICBz
Y3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3duLCBTY3JvbGxHcmFudWxhcml0eTo6TGluZSk7
CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVktfSE9NRToKLSAgICAgICAgc2Nyb2xsKG1fcGFn
ZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEJ5RG9jdW1lbnQpOworICAgICAgICBzY3JvbGwobV9w
YWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50KTsKICAgICAg
ICAgYnJlYWs7CiAgICAgY2FzZSBWS19FTkQ6Ci0gICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCks
IFNjcm9sbERvd24sIFNjcm9sbEJ5RG9jdW1lbnQpOworICAgICAgICBzY3JvbGwobV9wYWdlLmdl
dCgpLCBTY3JvbGxEb3duLCBTY3JvbGxHcmFudWxhcml0eTo6RG9jdW1lbnQpOwogICAgICAgICBi
cmVhazsKICAgICBjYXNlIFZLX1BSSU9SOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBT
Y3JvbGxVcCwgU2Nyb2xsQnlQYWdlKTsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Ny
b2xsVXAsIFNjcm9sbEdyYW51bGFyaXR5OjpQYWdlKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz
ZSBWS19ORVhUOgotICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3duLCBTY3Jv
bGxCeVBhZ2UpOworICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3duLCBTY3Jv
bGxHcmFudWxhcml0eTo6UGFnZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg
ICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dl
YlZpZXcvV2ViRnJhbWVWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X
ZWJGcmFtZVZpZXcubW0KaW5kZXggZDVlZGFlNGVjNjUxYzZlZWIzM2YyZjQ0ZGVjZTNkMTlmNzMz
NTgzNS4uNzNlZjg2Y2JlZGM2NmNiNTUyOGJhNTY5N2FlZjM1NjQ1YmQ0ZDQ0NyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0KKysrIGIv
U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0KQEAgLTYzMyw3
ICs2MzMsNyBAQCBlbnVtIHsKIAogLSAoQk9PTClfc2Nyb2xsVG9CZWdpbm5pbmdPZkRvY3VtZW50
CiB7Ci0gICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOldlYkNvcmU6OlNj
cm9sbFVwIGdyYW51bGFyaXR5OldlYkNvcmU6OlNjcm9sbEJ5RG9jdW1lbnRdKQorICAgIGlmIChb
c2VsZiBfc2Nyb2xsT3ZlcmZsb3dJbkRpcmVjdGlvbjpXZWJDb3JlOjpTY3JvbGxVcCBncmFudWxh
cml0eTpXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eTo6RG9jdW1lbnRdKQogICAgICAgICByZXR1
cm4gWUVTOwogICAgIGlmICghW3NlbGYgX2lzU2Nyb2xsYWJsZV0pCiAgICAgICAgIHJldHVybiBO
TzsKQEAgLTY0NSw3ICs2NDUsNyBAQCBlbnVtIHsKIAogLSAoQk9PTClfc2Nyb2xsVG9FbmRPZkRv
Y3VtZW50CiB7Ci0gICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOldlYkNv
cmU6OlNjcm9sbERvd24gZ3JhbnVsYXJpdHk6V2ViQ29yZTo6U2Nyb2xsQnlEb2N1bWVudF0pCisg
ICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOldlYkNvcmU6OlNjcm9sbERv
d24gZ3JhbnVsYXJpdHk6V2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50XSkKICAg
ICAgICAgcmV0dXJuIFlFUzsKICAgICBpZiAoIVtzZWxmIF9pc1Njcm9sbGFibGVdKQogICAgICAg
ICByZXR1cm4gTk87CkBAIC03NDIsNyArNzQyLDcgQEAgZW51bSB7CiAKIC0gKEJPT0wpX3BhZ2VW
ZXJ0aWNhbGx5OihCT09MKXVwCiB7Ci0gICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGly
ZWN0aW9uOnVwID8gV2ViQ29yZTo6U2Nyb2xsVXAgOiBXZWJDb3JlOjpTY3JvbGxEb3duIGdyYW51
bGFyaXR5OldlYkNvcmU6OlNjcm9sbEJ5UGFnZV0pCisgICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVy
Zmxvd0luRGlyZWN0aW9uOnVwID8gV2ViQ29yZTo6U2Nyb2xsVXAgOiBXZWJDb3JlOjpTY3JvbGxE
b3duIGdyYW51bGFyaXR5OldlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpQYWdlXSkKICAgICAg
ICAgcmV0dXJuIFlFUzsKICAgICAKICAgICBpZiAoIVtzZWxmIF9pc1Njcm9sbGFibGVdKQpAQCAt
NzU0LDcgKzc1NCw3IEBAIGVudW0gewogCiAtIChCT09MKV9wYWdlSG9yaXpvbnRhbGx5OihCT09M
KWxlZnQKIHsKLSAgICBpZiAoW3NlbGYgX3Njcm9sbE92ZXJmbG93SW5EaXJlY3Rpb246bGVmdCA/
IFdlYkNvcmU6OlNjcm9sbExlZnQgOiBXZWJDb3JlOjpTY3JvbGxSaWdodCBncmFudWxhcml0eTpX
ZWJDb3JlOjpTY3JvbGxCeVBhZ2VdKQorICAgIGlmIChbc2VsZiBfc2Nyb2xsT3ZlcmZsb3dJbkRp
cmVjdGlvbjpsZWZ0ID8gV2ViQ29yZTo6U2Nyb2xsTGVmdCA6IFdlYkNvcmU6OlNjcm9sbFJpZ2h0
IGdyYW51bGFyaXR5OldlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpQYWdlXSkKICAgICAgICAg
cmV0dXJuIFlFUzsKIAogICAgIGlmICghW3NlbGYgX2lzU2Nyb2xsYWJsZV0pCkBAIC03NzYsNyAr
Nzc2LDcgQEAgZW51bSB7CiAKIC0gKEJPT0wpX3Njcm9sbExpbmVWZXJ0aWNhbGx5OihCT09MKXVw
CiB7Ci0gICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOnVwID8gV2ViQ29y
ZTo6U2Nyb2xsVXAgOiBXZWJDb3JlOjpTY3JvbGxEb3duIGdyYW51bGFyaXR5OldlYkNvcmU6OlNj
cm9sbEJ5TGluZV0pCisgICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOnVw
ID8gV2ViQ29yZTo6U2Nyb2xsVXAgOiBXZWJDb3JlOjpTY3JvbGxEb3duIGdyYW51bGFyaXR5Oldl
YkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5OjpMaW5lXSkKICAgICAgICAgcmV0dXJuIFlFUzsKIAog
ICAgIGlmICghW3NlbGYgX2lzU2Nyb2xsYWJsZV0pCkBAIC03ODgsNyArNzg4LDcgQEAgZW51bSB7
CiAKIC0gKEJPT0wpX3Njcm9sbExpbmVIb3Jpem9udGFsbHk6KEJPT0wpbGVmdAogewotICAgIGlm
IChbc2VsZiBfc2Nyb2xsT3ZlcmZsb3dJbkRpcmVjdGlvbjpsZWZ0ID8gV2ViQ29yZTo6U2Nyb2xs
TGVmdCA6IFdlYkNvcmU6OlNjcm9sbFJpZ2h0IGdyYW51bGFyaXR5OldlYkNvcmU6OlNjcm9sbEJ5
TGluZV0pCisgICAgaWYgKFtzZWxmIF9zY3JvbGxPdmVyZmxvd0luRGlyZWN0aW9uOmxlZnQgPyBX
ZWJDb3JlOjpTY3JvbGxMZWZ0IDogV2ViQ29yZTo6U2Nyb2xsUmlnaHQgZ3JhbnVsYXJpdHk6V2Vi
Q29yZTo6U2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmVdKQogICAgICAgICByZXR1cm4gWUVTOwogCiAg
ICAgaWYgKCFbc2VsZiBfaXNTY3JvbGxhYmxlXSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5j
cHAKaW5kZXggNjU2OTk3ODEyODUwMGY3YjBhM2FiMGUxNjMzMGYwNTU3OWIzOWNmZi4uYWIzZDBh
YjA2Mjg2ZjU0NzY1ZDg4MDEzODE1Mzk0Mjk5YjI4MWNjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4v
V2ViVmlldy5jcHAKQEAgLTIwODQsMTkgKzIwODQsMTkgQEAgYm9vbCBXZWJWaWV3Ojp2ZXJ0aWNh
bFNjcm9sbChXUEFSQU0gd1BhcmFtLCBMUEFSQU0gLypsUGFyYW0qLykKICAgICBTY3JvbGxHcmFu
dWxhcml0eSBncmFudWxhcml0eTsKICAgICBzd2l0Y2ggKExPV09SRCh3UGFyYW0pKSB7CiAgICAg
Y2FzZSBTQl9MSU5FRE9XTjoKLSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7Cisg
ICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7CiAgICAgICAgIGRp
cmVjdGlvbiA9IFNjcm9sbERvd247CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU0JfTElORVVQ
OgotICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZ3JhbnVsYXJp
dHkgPSBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xs
VXA7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU0JfUEFHRURPV046Ci0gICAgICAgIGdyYW51
bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVudDsKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxH
cmFudWxhcml0eTo6RG9jdW1lbnQ7CiAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CiAg
ICAgICAgIGJyZWFrOwogICAgIGNhc2UgU0JfUEFHRVVQOgotICAgICAgICBncmFudWxhcml0eSA9
IFNjcm9sbEJ5RG9jdW1lbnQ7CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJp
dHk6OkRvY3VtZW50OwogICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKICAgICAgICAgYnJl
YWs7CiAgICAgZGVmYXVsdDoKQEAgLTIxMTQsMTkgKzIxMTQsMTkgQEAgYm9vbCBXZWJWaWV3Ojpo
b3Jpem9udGFsU2Nyb2xsKFdQQVJBTSB3UGFyYW0sIExQQVJBTSAvKmxQYXJhbSovKQogICAgIFNj
cm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5OwogICAgIHN3aXRjaCAoTE9XT1JEKHdQYXJhbSkp
IHsKICAgICBjYXNlIFNCX0xJTkVMRUZUOgotICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5
TGluZTsKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAg
ICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsTGVmdDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBT
Ql9MSU5FUklHSFQ6Ci0gICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOworICAgICAg
ICBncmFudWxhcml0eSA9IFNjcm9sbEdyYW51bGFyaXR5OjpMaW5lOwogICAgICAgICBkaXJlY3Rp
b24gPSBTY3JvbGxSaWdodDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBTQl9QQUdFTEVGVDoK
LSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeURvY3VtZW50OworICAgICAgICBncmFudWxh
cml0eSA9IFNjcm9sbEdyYW51bGFyaXR5OjpEb2N1bWVudDsKICAgICAgICAgZGlyZWN0aW9uID0g
U2Nyb2xsTGVmdDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBTQl9QQUdFUklHSFQ6Ci0gICAg
ICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVudDsKKyAgICAgICAgZ3JhbnVsYXJpdHkg
PSBTY3JvbGxHcmFudWxhcml0eTo6RG9jdW1lbnQ7CiAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9s
bFJpZ2h0OwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgpAQCAtMjM1OSwzNSArMjM1OSwz
NSBAQCBib29sIFdlYlZpZXc6OmtleURvd24oV1BBUkFNIHZpcnR1YWxLZXlDb2RlLCBMUEFSQU0g
a2V5RGF0YSwgYm9vbCBzeXN0ZW1LZXlEb3duKQogICAgIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51
bGFyaXR5IHsgfTsKICAgICBzd2l0Y2ggKHZpcnR1YWxLZXlDb2RlKSB7CiAgICAgICAgIGNhc2Ug
VktfTEVGVDoKLSAgICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOworICAgICAg
ICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAgICAgICAgICAg
IGRpcmVjdGlvbiA9IFNjcm9sbExlZnQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2Fz
ZSBWS19SSUdIVDoKLSAgICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOworICAg
ICAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxhcml0eTo6TGluZTsKICAgICAgICAg
ICAgIGRpcmVjdGlvbiA9IFNjcm9sbFJpZ2h0OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg
IGNhc2UgVktfVVA6Ci0gICAgICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAg
ICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7CiAgICAgICAg
ICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj
YXNlIFZLX0RPV046Ci0gICAgICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAg
ICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkxpbmU7CiAgICAgICAg
ICAgICBkaXJlY3Rpb24gPSBTY3JvbGxEb3duOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg
IGNhc2UgVktfSE9NRToKLSAgICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVu
dDsKKyAgICAgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsR3JhbnVsYXJpdHk6OkRvY3VtZW50
OwogICAgICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsVXA7CiAgICAgICAgICAgICBicmVhazsK
ICAgICAgICAgY2FzZSBWS19FTkQ6Ci0gICAgICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5
RG9jdW1lbnQ7CisgICAgICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEdyYW51bGFyaXR5OjpE
b2N1bWVudDsKICAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CiAgICAgICAgICAg
ICBicmVhazsKICAgICAgICAgY2FzZSBWS19QUklPUjoKLSAgICAgICAgICAgIGdyYW51bGFyaXR5
ID0gU2Nyb2xsQnlQYWdlOworICAgICAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxh
cml0eTo6UGFnZTsKICAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbFVwOwogICAgICAgICAg
ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgVktfTkVYVDoKLSAgICAgICAgICAgIGdyYW51bGFyaXR5
ID0gU2Nyb2xsQnlQYWdlOworICAgICAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxHcmFudWxh
cml0eTo6UGFnZTsKICAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CiAgICAgICAg
ICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443886</attachid>
            <date>2021-11-10 17:46:37 -0800</date>
            <delta_ts>2021-11-10 22:44:00 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231600-20211110174637.patch</filename>
            <type>text/plain</type>
            <size>5154</size>
            <attacher name="Nikos Mouchtaris">nmouchtaris</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY3NmY1ZDQyNjg5MGZi
OWE2NGY3NTY1ZGIyZWE5NTJmMDhlODMxNy4uNjk1NjVhMWNhY2QxNmIyZjEwMGFjODQ1ZGE3MmUx
NWI4ZDM5N2I1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTExLTEwICBOaWtv
bGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JF
U1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20tdmlldy9z
Y3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcG9yYXJ5IGZpeCBmb3IgaXNz
dWUgd2hlcmUgc2Vjb25kIHNjcm9sbCBkb2Vzbid0IGNhbmNlbCBhIGN1cnJlbnQKKyAgICAgICAg
c2Nyb2xsIGFuaW1hdGlvbi4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1Ry
ZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OmNsZWFyQW5pbWF0aW9uc0Zv
clNjcm9sbGluZ05vZGVJRCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl
ZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9s
bGluZ05vZGU6OmhhbmRsZVNjcm9sbFBvc2l0aW9uUmVxdWVzdCk6CisKIDIwMjEtMTEtMTAgIFRp
bSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbm9uLXN0YW5kYXJk
IC13ZWJraXQtYm9yZGVyLWZpdCBDU1MgcHJvcGVydHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAppbmRleCAxNWMzNzg5ZWY4Njc3M2YzN2RlMWM1ZDYy
YWU3YzMxZDRkNjJlZTMyLi5kMmQ5NDZlNGU1NjQ1OTBlNTNkMjQ2ZTNhMmE0NDlmNWM2N2UxNWZk
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl
LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCkBA
IC0yMzQsNiArMjM0LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGRQZW5kaW5nU2Nyb2xsVXBk
YXRlKFNjcm9sbFVwZGF0ZSYmKTsKICAgICBWZWN0b3I8U2Nyb2xsVXBkYXRlPiB0YWtlUGVuZGlu
Z1Njcm9sbFVwZGF0ZXMoKTsKKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgY2xlYXJBbmltYXRpb25z
Rm9yU2Nyb2xsaW5nTm9kZUlEKFNjcm9sbGluZ05vZGVJRCkgeyB9CiAKIHByb3RlY3RlZDoKICAg
ICBXaGVlbEV2ZW50SGFuZGxpbmdSZXN1bHQgaGFuZGxlV2hlZWxFdmVudFdpdGhOb2RlKGNvbnN0
IFBsYXRmb3JtV2hlZWxFdmVudCYsIE9wdGlvblNldDxXaGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBz
PiwgU2Nyb2xsaW5nVHJlZU5vZGUqLCBFdmVudFRhcmdldGluZyA9IEV2ZW50VGFyZ2V0aW5nOjpQ
cm9wYWdhdGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny
b2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp
bmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IDdmODRjYzhmYzg4NzNjMmNk
ZmQyMjc1NTYxNDViN2Q2ZDE2ZTM4ZTkuLjM5OWE2OTUwYjRlZmI2YWI4ZjllOTIxZmFlZmE3ZjZl
ZmYyODkwNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s
bGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s
bGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTI1MCw2ICsyNTAsNyBAQCB2
b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpoYW5kbGVTY3JvbGxQb3NpdGlvblJlcXVl
c3QoY29uc3QgUmVxdWVzdGVkU2NybwogICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0
cmVhbSA8PCAiU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUgIiA8PCBzY3JvbGxpbmdOb2RlSUQo
KSA8PCAiIGhhbmRsZVNjcm9sbFBvc2l0aW9uUmVxdWVzdCgpIC0gcG9zaXRpb24gIiA8PCByZXF1
ZXN0ZWRTY3JvbGxEYXRhLnNjcm9sbFBvc2l0aW9uIDw8ICIgYW5pbWF0ZWQgIiA8PCAocmVxdWVz
dGVkU2Nyb2xsRGF0YS5hbmltYXRlZCA9PSBTY3JvbGxJc0FuaW1hdGVkOjpZZXMpKTsKIAogICAg
IHN0b3BBbmltYXRlZFNjcm9sbCgpOworICAgIHNjcm9sbGluZ1RyZWUoKS5jbGVhckFuaW1hdGlv
bnNGb3JTY3JvbGxpbmdOb2RlSUQoc2Nyb2xsaW5nTm9kZUlEKCkpOwogCiAgICAgaWYgKHJlcXVl
c3RlZFNjcm9sbERhdGEucmVxdWVzdFR5cGUgPT0gU2Nyb2xsUmVxdWVzdFR5cGU6OkNhbmNlbEFu
aW1hdGVkU2Nyb2xsKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl
L3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCmluZGV4IGQ3N2QyZDdmNGZk
YjUzZDFmZGQ1ZmVjZjY0MzA5MjJmNTA5M2M5N2MuLmMzZmFjODYyMmI0YTkwMjg4M2Y3NzI0N2Ix
NWVhNTBiZGFmYmEyOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n
L1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs
aW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCkBAIC02NCw2ICs2NCw3IEBAIHB1YmxpYzoKICAg
ICBMb2NrJiB0cmVlTG9jaygpIFdURl9SRVRVUk5TX0xPQ0sobV90cmVlTG9jaykgeyByZXR1cm4g
bV90cmVlTG9jazsgfQogCiAgICAgYm9vbCBzY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdCB7
IHJldHVybiBtX3Njcm9sbEFuaW1hdG9yRW5hYmxlZDsgfQorICAgIHZvaWQgY2xlYXJBbmltYXRp
b25zRm9yU2Nyb2xsaW5nTm9kZUlEKFNjcm9sbGluZ05vZGVJRCBub2RlSUQpIFdURl9SRVFVSVJF
U19MT0NLKG1fdHJlZUxvY2spIG92ZXJyaWRlIHsgbV9ub2Rlc1dpdGhQZW5kaW5nU2Nyb2xsQW5p
bWF0aW9ucy5yZW1vdmUobm9kZUlEKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgVGhy
ZWFkZWRTY3JvbGxpbmdUcmVlKEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3ImKTsKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBh
MjZkNWU4MWM0NGYzMmExOTk0MTk2N2U0ZTU5ZjYxM2E0Zjc4ZDYzLi4wYjkwZTEwZDMxNDg2ODFh
MjgxMzhiMzIxZjYyMGRjMTIzYjA1YTJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMTEt
MTAgIE5pa29sYW9zIE1vdWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5jb20+CisKKyAgICAg
ICAgUkVHUkVTU0lPTjogKHIyODM4NzEpIFsgbWFjT1Mgd2syIFJlbGVhc2UgXSAyIGNzcy9jc3Nv
bS12aWV3L3Njcm9sbC1iZWhhdmlvci1tYWluLWZyYW1lIHRlc3RzIGFyZSBmYWlsaW5nCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE2MDAKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21h
Yy13azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMS0xMCAgVGltIE5ndXllbiAgPG50aW1A
YXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBub24tc3RhbmRhcmQgLXdlYmtpdC1ib3JkZXIt
Zml0IENTUyBwcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdr
Mi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhw
ZWN0YXRpb25zCmluZGV4IDg2MTQ4M2NiNDkyMDQyZWYxMjVmMTQyYzgwODNlMWFjNDkxMWMzYTku
LjMyMmE1YmVkOWE2ZTMxMjNmN2M0YzRhZTBhNDhkODViYTNmOWFkYmQgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU
ZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE2NzksOSArMTY3OSw2
IEBAIHdlYmtpdC5vcmcvYi8yMzEwODMgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wCiAKIHdlYmtpdC5vcmcvYi8yMzEzODYgWyBCaWdT
dXIgXSBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3Mvd2Vic2l0ZS1kYXRhLXJlbW92
YWwtZm9yLXNpdGUtd2l0aC11c2VyLWludGVyYWN0aW9uLmh0bWwgWyBQYXNzIFRpbWVvdXQgXQog
Ci13ZWJraXQub3JnL2IvMjMxNjAwIFsgUmVsZWFzZSBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsLWJlaGF2aW9yLW1haW4tZnJhbWUtd2luZG93
Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIzMTYwMCBbIFJlbGVhc2UgXSBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbC1iZWhh
dmlvci1tYWluLWZyYW1lLXJvb3QuaHRtbCBbIEZhaWx1cmUgXQotCiB3ZWJraXQub3JnL2IvMjMx
NzY1IFsgUmVsZWFzZSBdIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy93ZWJzaXRl
LWRhdGEtcmVtb3ZhbC1mb3Itc2l0ZS1uYXZpZ2F0ZWQtdG8td2l0aC1saW5rLWRlY29yYXRpb24u
aHRtbCBbIFBhc3MgVGltZW91dCBdCiAKIHdlYmtpdC5vcmcvYi8yMzE3ODAgWyBEZWJ1ZyBdIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3NpbXVsY2FzdC9iYXNpYy5odHRw
cy5odG1sIFsgUGFzcyBGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443911</attachid>
            <date>2021-11-10 22:44:04 -0800</date>
            <delta_ts>2021-11-11 11:58:05 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231600-20211110224403.patch</filename>
            <type>text/plain</type>
            <size>6507</size>
            <attacher name="Nikos Mouchtaris">nmouchtaris</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY3NmY1ZDQyNjg5MGZi
OWE2NGY3NTY1ZGIyZWE5NTJmMDhlODMxNy4uNWYyYWFmMmEyNGFlMDAwNmYyMjRjOTU0ZTYxODk0
ZDU5ZWZmZDdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTExLTEwICBOaWtv
bGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JF
U1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20tdmlldy9z
Y3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciBpc3N1ZSB3aGVyZSBh
IHNjcm9sbCBhbmltYXRpb24gaXMgbm90IHByb3Blcmx5IGNhbmNlbGxlZCBieSBhIHNlY29uZCBz
Y3JvbGwgcmVxdWVzdC4KKyAgICAgICAgVGhpcyBvY2N1cnMgd2hlbiB0aGUgZmlyc3Qgc2Nyb2xs
IGFuaW1hdGlvbiBoYXMgbm90IGJlZW4gZnVsbHkgc3RhcnRlZCBieSB0aGUgdGltZSB0aGUgc2Vj
b25kCisgICAgICAgIHJlcXVlc3QgaGFzIGNvbWUgaW4gKGZpcnN0IGFuaW1hdGlvbiBzdGlsbCBp
biBtX25vZGVzV2l0aFBlbmRpbmdTY3JvbGxBbmltYXRpb25zKS4gRm9yIHRoZQorICAgICAgICBz
Y2VuYXJpbyB3aGVyZSB0aGUgc2Vjb25kIHNjcm9sbCByZXF1ZXN0IGlzIGFuaW1hdGVkLCB3ZSBj
aGFuZ2UKKyAgICAgICAgVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZVJl
cXVlc3RzU2Nyb2xsIHRvIHVzZSBzZXQgKGFkZCBpcyBpZ25vcmVkIGlmCisgICAgICAgIGtleSBl
eGlzdHMgaW4gdGhlIGhhc2ggbWFwIHdoaWNoIGNhdXNlZCB0aGUgc2Vjb25kIHJlcXVlc3QgdG8g
YmUgaWdub3JlZCkuIEZvciB0aGUgc2NlbmFyaW8gCisgICAgICAgIHdoZXJlIHRoZSBzZWNvbmQg
c2Nyb2xsIHJlcXVlc3QgaXMgbm90IGFuaW1hdGVkLCB3ZSBjbGVhciB0aGUgcGVuZGluZyByZXF1
ZXN0IGZvciB0aGF0IAorICAgICAgICBzY3JvbGxpbmcgbm9kZSAoaWYgb25lIGV4aXN0cykuCisK
KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmg6CisgICAgICAgIChXZWJD
b3JlOjpTY3JvbGxpbmdUcmVlOjpjbGVhckFuaW1hdGlvbnNGb3JTY3JvbGxpbmdOb2RlSUQpOgor
ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpoYW5kbGVTY3Jv
bGxQb3NpdGlvblJlcXVlc3QpOgorCiAyMDIxLTExLTEwICBUaW0gTmd1eWVuICA8bnRpbUBhcHBs
ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG5vbi1zdGFuZGFyZCAtd2Via2l0LWJvcmRlci1maXQg
Q1NTIHByb3BlcnR5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T
Y3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU
cmVlLmgKaW5kZXggMTVjMzc4OWVmODY3NzNmMzdkZTFjNWQ2MmFlN2MzMWQ0ZDYyZWUzMi4uNmIy
YzU0NDk2NTM4ODM0NDM5NWUwYjg4YTdiODc1YTBmYTY3YzA3ZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtMjM0LDYgKzIzNCw3IEBAIHB1
YmxpYzoKIAogICAgIHZvaWQgYWRkUGVuZGluZ1Njcm9sbFVwZGF0ZShTY3JvbGxVcGRhdGUmJik7
CiAgICAgVmVjdG9yPFNjcm9sbFVwZGF0ZT4gdGFrZVBlbmRpbmdTY3JvbGxVcGRhdGVzKCk7Cisg
ICAgdmlydHVhbCB2b2lkIHJlbW92ZVBlbmRpbmdTY3JvbGxBbmltYXRpb25Gb3JOb2RlKFNjcm9s
bGluZ05vZGVJRCkgeyB9CiAKIHByb3RlY3RlZDoKICAgICBXaGVlbEV2ZW50SGFuZGxpbmdSZXN1
bHQgaGFuZGxlV2hlZWxFdmVudFdpdGhOb2RlKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYsIE9w
dGlvblNldDxXaGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBzPiwgU2Nyb2xsaW5nVHJlZU5vZGUqLCBF
dmVudFRhcmdldGluZyA9IEV2ZW50VGFyZ2V0aW5nOjpQcm9wYWdhdGUpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGlu
Z05vZGUuY3BwCmluZGV4IDdmODRjYzhmYzg4NzNjMmNkZmQyMjc1NTYxNDViN2Q2ZDE2ZTM4ZTku
LjIwYTYyYjg4MGQwOTdjOTVkZGI0NjNmZWJjOTRmM2U4OTcxZjRkNDQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xs
aW5nTm9kZS5jcHAKQEAgLTI1MSw4ICsyNTEsMTAgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xs
aW5nTm9kZTo6aGFuZGxlU2Nyb2xsUG9zaXRpb25SZXF1ZXN0KGNvbnN0IFJlcXVlc3RlZFNjcm8K
IAogICAgIHN0b3BBbmltYXRlZFNjcm9sbCgpOwogCi0gICAgaWYgKHJlcXVlc3RlZFNjcm9sbERh
dGEucmVxdWVzdFR5cGUgPT0gU2Nyb2xsUmVxdWVzdFR5cGU6OkNhbmNlbEFuaW1hdGVkU2Nyb2xs
KQorICAgIGlmIChyZXF1ZXN0ZWRTY3JvbGxEYXRhLnJlcXVlc3RUeXBlID09IFNjcm9sbFJlcXVl
c3RUeXBlOjpDYW5jZWxBbmltYXRlZFNjcm9sbCkgeworICAgICAgICBzY3JvbGxpbmdUcmVlKCku
cmVtb3ZlUGVuZGluZ1Njcm9sbEFuaW1hdGlvbkZvck5vZGUoc2Nyb2xsaW5nTm9kZUlEKCkpOwog
ICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgaWYgKHNjcm9sbGluZ1RyZWUoKS5zY3JvbGxp
bmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsKHNjcm9sbGluZ05vZGVJRCgpLCByZXF1ZXN0ZWRTY3Jv
bGxEYXRhKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn
ZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggOWVjMTAyNzZmNWRi
NWMxMDE5YThkZmFjOGNhYTNlZjg3OWQzOTYzZS4uYzFlN2EyNTA1YTM2MjQzZjQyN2VhNjVmZDQ0
OWY0NjNlODdiOTQ4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv
VGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s
bGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCkBAIC0xNzksNyArMTc5LDcgQEAgdm9pZCBU
aHJlYWRlZFNjcm9sbGluZ1RyZWU6OmRpZENvbW1pdFRyZWVPblNjcm9sbGluZ1RocmVhZCgpCiBi
b29sIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6c2Nyb2xsaW5nVHJlZU5vZGVSZXF1ZXN0c1Njcm9s
bChTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBSZXF1ZXN0ZWRTY3JvbGxEYXRhJiByZXF1
ZXN0KQogewogICAgIGlmIChyZXF1ZXN0LmFuaW1hdGVkID09IFNjcm9sbElzQW5pbWF0ZWQ6Olll
cykgewotICAgICAgICBtX25vZGVzV2l0aFBlbmRpbmdTY3JvbGxBbmltYXRpb25zLmFkZChub2Rl
SUQsIHJlcXVlc3QpOworICAgICAgICBtX25vZGVzV2l0aFBlbmRpbmdTY3JvbGxBbmltYXRpb25z
LnNldChub2RlSUQsIHJlcXVlc3QpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAg
cmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv
VGhyZWFkZWRTY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9U
aHJlYWRlZFNjcm9sbGluZ1RyZWUuaAppbmRleCBkNzdkMmQ3ZjRmZGI1M2QxZmRkNWZlY2Y2NDMw
OTIyZjUwOTNjOTdjLi5mNjRkZGE4YmJjZWVhMjVmMWRiYzFiMzdiNjE3NmZkZjBkNmQwYjRhIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGlu
Z1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9s
bGluZ1RyZWUuaApAQCAtNjQsNiArNjQsNyBAQCBwdWJsaWM6CiAgICAgTG9jayYgdHJlZUxvY2so
KSBXVEZfUkVUVVJOU19MT0NLKG1fdHJlZUxvY2spIHsgcmV0dXJuIG1fdHJlZUxvY2s7IH0KIAog
ICAgIGJvb2wgc2Nyb2xsQW5pbWF0b3JFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxB
bmltYXRvckVuYWJsZWQ7IH0KKyAgICB2b2lkIHJlbW92ZVBlbmRpbmdTY3JvbGxBbmltYXRpb25G
b3JOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQpIFdURl9SRVFVSVJFU19MT0NLKG1fdHJlZUxv
Y2spIG92ZXJyaWRlIHsgbV9ub2Rlc1dpdGhQZW5kaW5nU2Nyb2xsQW5pbWF0aW9ucy5yZW1vdmUo
bm9kZUlEKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgVGhyZWFkZWRTY3JvbGxpbmdU
cmVlKEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3ImKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhMjZkNWU4MWM0NGYzMmEx
OTk0MTk2N2U0ZTU5ZjYxM2E0Zjc4ZDYzLi4wYjkwZTEwZDMxNDg2ODFhMjgxMzhiMzIxZjYyMGRj
MTIzYjA1YTJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMTEtMTAgIE5pa29sYW9zIE1v
dWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjog
KHIyODM4NzEpIFsgbWFjT1Mgd2syIFJlbGVhc2UgXSAyIGNzcy9jc3NvbS12aWV3L3Njcm9sbC1i
ZWhhdmlvci1tYWluLWZyYW1lIHRlc3RzIGFyZSBmYWlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE2MDAKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvVGVzdEV4cGVj
dGF0aW9uczoKKwogMjAyMS0xMS0xMCAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAg
ICAgICAgIFJlbW92ZSBub24tc3RhbmRhcmQgLXdlYmtpdC1ib3JkZXItZml0IENTUyBwcm9wZXJ0
eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRp
b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4
IDg2MTQ4M2NiNDkyMDQyZWYxMjVmMTQyYzgwODNlMWFjNDkxMWMzYTkuLjMyMmE1YmVkOWE2ZTMx
MjNmN2M0YzRhZTBhNDhkODViYTNmOWFkYmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm
b3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE2NzksOSArMTY3OSw2IEBAIHdlYmtpdC5vcmcv
Yi8yMzEwODMgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVu
dC1zZWN1cml0eS1wCiAKIHdlYmtpdC5vcmcvYi8yMzEzODYgWyBCaWdTdXIgXSBodHRwL3Rlc3Rz
L3Jlc291cmNlTG9hZFN0YXRpc3RpY3Mvd2Vic2l0ZS1kYXRhLXJlbW92YWwtZm9yLXNpdGUtd2l0
aC11c2VyLWludGVyYWN0aW9uLmh0bWwgWyBQYXNzIFRpbWVvdXQgXQogCi13ZWJraXQub3JnL2Iv
MjMxNjAwIFsgUmVsZWFzZSBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
c29tLXZpZXcvc2Nyb2xsLWJlaGF2aW9yLW1haW4tZnJhbWUtd2luZG93Lmh0bWwgWyBQYXNzIEZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIzMTYwMCBbIFJlbGVhc2UgXSBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbC1iZWhhdmlvci1tYWluLWZyYW1l
LXJvb3QuaHRtbCBbIEZhaWx1cmUgXQotCiB3ZWJraXQub3JnL2IvMjMxNzY1IFsgUmVsZWFzZSBd
IGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy93ZWJzaXRlLWRhdGEtcmVtb3ZhbC1m
b3Itc2l0ZS1uYXZpZ2F0ZWQtdG8td2l0aC1saW5rLWRlY29yYXRpb24uaHRtbCBbIFBhc3MgVGlt
ZW91dCBdCiAKIHdlYmtpdC5vcmcvYi8yMzE3ODAgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvd2VicnRjL3NpbXVsY2FzdC9iYXNpYy5odHRwcy5odG1sIFsgUGFzcyBG
YWlsdXJlIF0K
</data>
<flag name="review"
          id="468743"
          type_id="1"
          status="+"
          setter="simon.fraser"
    />
    <flag name="commit-queue"
          id="468855"
          type_id="3"
          status="-"
          setter="simon.fraser"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443990</attachid>
            <date>2021-11-11 12:49:00 -0800</date>
            <delta_ts>2021-11-11 14:41:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231600-20211111124859.patch</filename>
            <type>text/plain</type>
            <size>7110</size>
            <attacher name="Nikos Mouchtaris">nmouchtaris</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk3ZDdiNDA2OWU0ODMz
M2QxYWUzNjMyNmE4NTZhMjM2NDYxYzVmNS4uMzRjOTI4ZjJkNWEzZTkyM2Y1ZmZkY2FlYmIxNGY4
YmVmM2RlYWJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTExLTExICBOaWtv
bGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JF
U1NJT046IChyMjgzODcxKSBbIG1hY09TIHdrMiBSZWxlYXNlIF0gMiBjc3MvY3Nzb20tdmlldy9z
Y3JvbGwtYmVoYXZpb3ItbWFpbi1mcmFtZSB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjAwCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEZpeCBmb3IgaXNzdWUgd2hlcmUgYSBz
Y3JvbGwgYW5pbWF0aW9uIGlzIG5vdCBwcm9wZXJseSBjYW5jZWxsZWQgYnkgYSBzZWNvbmQgc2Ny
b2xsIHJlcXVlc3QuCisgICAgICAgIFRoaXMgb2NjdXJzIHdoZW4gdGhlIGZpcnN0IHNjcm9sbCBh
bmltYXRpb24gaGFzIG5vdCBiZWVuIGZ1bGx5IHN0YXJ0ZWQgYnkgdGhlIHRpbWUgdGhlIHNlY29u
ZAorICAgICAgICByZXF1ZXN0IGhhcyBiZWVuIHJlY2VpdmVkIGJ5IHRoZSBzY3JvbGxpbmcgdGhy
ZWFkIChmaXJzdCBhbmltYXRpb24gc3RpbGwgaW4gCisgICAgICAgIG1fbm9kZXNXaXRoUGVuZGlu
Z1Njcm9sbEFuaW1hdGlvbnMpLiBGb3IgdGhlIHNjZW5hcmlvIHdoZXJlIHRoZSBzZWNvbmQgc2Ny
b2xsIHJlcXVlc3QgaXMgYW5pbWF0ZWQsIAorICAgICAgICB3ZSBjaGFuZ2UgVGhyZWFkZWRTY3Jv
bGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsIHRvIHVzZSBzZXQgKGFk
ZCBpcyBpZ25vcmVkIGlmCisgICAgICAgIGtleSBleGlzdHMgaW4gdGhlIGhhc2ggbWFwIHdoaWNo
IGNhdXNlZCB0aGUgc2Vjb25kIHJlcXVlc3QgdG8gYmUgaWdub3JlZCkuIEZvciB0aGUgc2NlbmFy
aW8gCisgICAgICAgIHdoZXJlIHRoZSBzZWNvbmQgc2Nyb2xsIHJlcXVlc3QgaXMgbm90IGFuaW1h
dGVkLCB3ZSBjbGVhciB0aGUgcGVuZGluZyByZXF1ZXN0IGZvciB0aGF0IAorICAgICAgICBzY3Jv
bGxpbmcgbm9kZSAoaWYgb25lIGV4aXN0cykuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9T
Y3JvbGxpbmdUcmVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpyZW1vdmVQ
ZW5kaW5nU2Nyb2xsQW5pbWF0aW9uRm9yTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv
U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs
aW5nVHJlZVNjcm9sbGluZ05vZGU6OmhhbmRsZVNjcm9sbFBvc2l0aW9uUmVxdWVzdCk6CisgICAg
ICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OlRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6c2Nyb2xsaW5nVHJlZU5vZGVSZXF1ZXN0
c1Njcm9sbCk6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OnJlbW92
ZVBlbmRpbmdTY3JvbGxBbmltYXRpb25Gb3JOb2RlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGlu
Zy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaDoKKwogMjAyMS0xMS0xMSAgUmFjaGVsIEdpbnNiZXJn
ICA8cmdpbnNiZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBpbiBXZWJDb3Jl
IGZvciB3ZWIgYXBwIG1hbmlmZXN0IGljb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s
bGluZy9TY3JvbGxpbmdUcmVlLmgKaW5kZXggMTVjMzc4OWVmODY3NzNmMzdkZTFjNWQ2MmFlN2Mz
MWQ0ZDYyZWUzMi4uNmIyYzU0NDk2NTM4ODM0NDM5NWUwYjg4YTdiODc1YTBmYTY3YzA3ZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtMjM0
LDYgKzIzNCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkUGVuZGluZ1Njcm9sbFVwZGF0ZShT
Y3JvbGxVcGRhdGUmJik7CiAgICAgVmVjdG9yPFNjcm9sbFVwZGF0ZT4gdGFrZVBlbmRpbmdTY3Jv
bGxVcGRhdGVzKCk7CisgICAgdmlydHVhbCB2b2lkIHJlbW92ZVBlbmRpbmdTY3JvbGxBbmltYXRp
b25Gb3JOb2RlKFNjcm9sbGluZ05vZGVJRCkgeyB9CiAKIHByb3RlY3RlZDoKICAgICBXaGVlbEV2
ZW50SGFuZGxpbmdSZXN1bHQgaGFuZGxlV2hlZWxFdmVudFdpdGhOb2RlKGNvbnN0IFBsYXRmb3Jt
V2hlZWxFdmVudCYsIE9wdGlvblNldDxXaGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBzPiwgU2Nyb2xs
aW5nVHJlZU5vZGUqLCBFdmVudFRhcmdldGluZyA9IEV2ZW50VGFyZ2V0aW5nOjpQcm9wYWdhdGUp
OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl
ZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs
aW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IDdmODRjYzhmYzg4NzNjMmNkZmQyMjc1NTYx
NDViN2Q2ZDE2ZTM4ZTkuLjIwYTYyYjg4MGQwOTdjOTVkZGI0NjNmZWJjOTRmM2U4OTcxZjRkNDQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVT
Y3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv
bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTI1MSw4ICsyNTEsMTAgQEAgdm9pZCBTY3Jv
bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6aGFuZGxlU2Nyb2xsUG9zaXRpb25SZXF1ZXN0KGNvbnN0
IFJlcXVlc3RlZFNjcm8KIAogICAgIHN0b3BBbmltYXRlZFNjcm9sbCgpOwogCi0gICAgaWYgKHJl
cXVlc3RlZFNjcm9sbERhdGEucmVxdWVzdFR5cGUgPT0gU2Nyb2xsUmVxdWVzdFR5cGU6OkNhbmNl
bEFuaW1hdGVkU2Nyb2xsKQorICAgIGlmIChyZXF1ZXN0ZWRTY3JvbGxEYXRhLnJlcXVlc3RUeXBl
ID09IFNjcm9sbFJlcXVlc3RUeXBlOjpDYW5jZWxBbmltYXRlZFNjcm9sbCkgeworICAgICAgICBz
Y3JvbGxpbmdUcmVlKCkucmVtb3ZlUGVuZGluZ1Njcm9sbEFuaW1hdGlvbkZvck5vZGUoc2Nyb2xs
aW5nTm9kZUlEKCkpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgaWYgKHNjcm9sbGlu
Z1RyZWUoKS5zY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsKHNjcm9sbGluZ05vZGVJRCgp
LCByZXF1ZXN0ZWRTY3JvbGxEYXRhKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKaW5k
ZXggOWVjMTAyNzZmNWRiNWMxMDE5YThkZmFjOGNhYTNlZjg3OWQzOTYzZS4uYjBiMzRkZjg1ZTIz
YzkyODcwNTg5ZTU4ZDdjMDliYWNkMDUwY2QyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCkBAIC0xNzksNyAr
MTc5LDcgQEAgdm9pZCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OmRpZENvbW1pdFRyZWVPblNjcm9s
bGluZ1RocmVhZCgpCiBib29sIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6c2Nyb2xsaW5nVHJlZU5v
ZGVSZXF1ZXN0c1Njcm9sbChTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBSZXF1ZXN0ZWRT
Y3JvbGxEYXRhJiByZXF1ZXN0KQogewogICAgIGlmIChyZXF1ZXN0LmFuaW1hdGVkID09IFNjcm9s
bElzQW5pbWF0ZWQ6OlllcykgewotICAgICAgICBtX25vZGVzV2l0aFBlbmRpbmdTY3JvbGxBbmlt
YXRpb25zLmFkZChub2RlSUQsIHJlcXVlc3QpOworICAgICAgICBtX25vZGVzV2l0aFBlbmRpbmdT
Y3JvbGxBbmltYXRpb25zLnNldChub2RlSUQsIHJlcXVlc3QpOwogICAgICAgICByZXR1cm4gdHJ1
ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNDk4LDYgKzQ5OCwxMSBAQCB2b2lkIFRo
cmVhZGVkU2Nyb2xsaW5nVHJlZTo6ZGlzcGxheURpZFJlZnJlc2goUGxhdGZvcm1EaXNwbGF5SUQg
ZGlzcGxheUlEKQogICAgIH0pOwogfQogCit2b2lkIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6cmVt
b3ZlUGVuZGluZ1Njcm9sbEFuaW1hdGlvbkZvck5vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkK
K3sKKyAgICBtX25vZGVzV2l0aFBlbmRpbmdTY3JvbGxBbmltYXRpb25zLnJlbW92ZShub2RlSUQp
OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoQVNZTkNf
U0NST0xMSU5HKSAmJiBFTkFCTEUoU0NST0xMSU5HX1RIUkVBRCkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNl
L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKaW5kZXggZDc3
ZDJkN2Y0ZmRiNTNkMWZkZDVmZWNmNjQzMDkyMmY1MDkzYzk3Yy4uNThjOWY3NTRjOTU1YTViYWEx
ZDg4YjAzZDljMDYzNDE3YzkxYjc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z
Y3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn
ZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKQEAgLTY0LDYgKzY0LDcgQEAgcHVi
bGljOgogICAgIExvY2smIHRyZWVMb2NrKCkgV1RGX1JFVFVSTlNfTE9DSyhtX3RyZWVMb2NrKSB7
IHJldHVybiBtX3RyZWVMb2NrOyB9CiAKICAgICBib29sIHNjcm9sbEFuaW1hdG9yRW5hYmxlZCgp
IGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsQW5pbWF0b3JFbmFibGVkOyB9CisgICAgdm9pZCByZW1v
dmVQZW5kaW5nU2Nyb2xsQW5pbWF0aW9uRm9yTm9kZShTY3JvbGxpbmdOb2RlSUQpIFdURl9SRVFV
SVJFU19MT0NLKG1fdHJlZUxvY2spIGZpbmFsOwogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQg
VGhyZWFkZWRTY3JvbGxpbmdUcmVlKEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3ImKTsKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCBjNzE1ZTY0MWI1YmExZWZkYmE1YmE3ZTVkY2FlNzU4MmYxNTRlYzYzLi41ZmU2ZDU3ZGJmYTQw
ZDRkZGRiMGU5NTVhMmMyM2VlYzMzMDdhYWY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEt
MTEtMTEgIE5pa29sYW9zIE1vdWNodGFyaXMgIDxubW91Y2h0YXJpc0BhcHBsZS5jb20+CisKKyAg
ICAgICAgUkVHUkVTU0lPTjogKHIyODM4NzEpIFsgbWFjT1Mgd2syIFJlbGVhc2UgXSAyIGNzcy9j
c3NvbS12aWV3L3Njcm9sbC1iZWhhdmlvci1tYWluLWZyYW1lIHRlc3RzIGFyZSBmYWlsaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE2MDAKKwor
ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9t
YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTEtMTEgIEtpbW1vIEtpbm51bmVuICA8
a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChpT1MgMTUsIEdQVSBQ
cm9jZXNzKTogRmFpbHMgdG8gbG9hZCB0ZXh0dXJlIG1hcApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZv
cm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDg2MTQ4M2NiNDkyMDQyZWYxMjVmMTQy
YzgwODNlMWFjNDkxMWMzYTkuLjMyMmE1YmVkOWE2ZTMxMjNmN2M0YzRhZTBhNDhkODViYTNmOWFk
YmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMK
QEAgLTE2NzksOSArMTY3OSw2IEBAIHdlYmtpdC5vcmcvYi8yMzEwODMgWyBEZWJ1ZyBdIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wCiAKIHdlYmtpdC5v
cmcvYi8yMzEzODYgWyBCaWdTdXIgXSBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3Mv
d2Vic2l0ZS1kYXRhLXJlbW92YWwtZm9yLXNpdGUtd2l0aC11c2VyLWludGVyYWN0aW9uLmh0bWwg
WyBQYXNzIFRpbWVvdXQgXQogCi13ZWJraXQub3JnL2IvMjMxNjAwIFsgUmVsZWFzZSBdIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsLWJlaGF2aW9y
LW1haW4tZnJhbWUtd2luZG93Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIz
MTYwMCBbIFJlbGVhc2UgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Nv
bS12aWV3L3Njcm9sbC1iZWhhdmlvci1tYWluLWZyYW1lLXJvb3QuaHRtbCBbIEZhaWx1cmUgXQot
CiB3ZWJraXQub3JnL2IvMjMxNzY1IFsgUmVsZWFzZSBdIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2Fk
U3RhdGlzdGljcy93ZWJzaXRlLWRhdGEtcmVtb3ZhbC1mb3Itc2l0ZS1uYXZpZ2F0ZWQtdG8td2l0
aC1saW5rLWRlY29yYXRpb24uaHRtbCBbIFBhc3MgVGltZW91dCBdCiAKIHdlYmtpdC5vcmcvYi8y
MzE3ODAgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3Np
bXVsY2FzdC9iYXNpYy5odHRwcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0K
</data>

          </attachment>
      

    </bug>

</bugzilla>