<?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>220259</bug_id>
          
          <creation_ts>2021-01-04 19:28:12 -0800</creation_ts>
          <short_desc>[LFC][IFC] Do not use LineBox::isConsideredEmpty when checking if inline box stretches the line box</short_desc>
          <delta_ts>2021-01-16 06:28:45 -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>Layout and Rendering</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="alan">zalan</reporter>
          <assigned_to name="alan">zalan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>koivisto</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1717219</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-01-04 19:28:12 -0800</bug_when>
    <thetext>e.g. &lt;!DOCTYPE html&gt;&lt;span&gt;&lt;div&gt;&lt;/div&gt;&lt;/span&gt; the pre and post blocks 

block container (pre)
 inline box
block container
block container (post)
  inline box
-no struts in these generated content.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717220</commentid>
    <comment_count>1</comment_count>
      <attachid>416970</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-04 19:34:37 -0800</bug_when>
    <thetext>Created attachment 416970
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1718617</commentid>
    <comment_count>2</comment_count>
      <attachid>417360</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-10 20:16:26 -0800</bug_when>
    <thetext>Created attachment 417360
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1718622</commentid>
    <comment_count>3</comment_count>
      <attachid>417360</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-01-10 22:28:07 -0800</bug_when>
    <thetext>Comment on attachment 417360
Patch

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

&gt; Source/WebCore/layout/inlineformatting/InlineLineBuilder.h:-60
&gt; -        bool isLineConsideredEmpty { true };

Nice</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1718886</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-01-11 19:29:13 -0800</bug_when>
    <thetext>&lt;rdar://problem/73023402&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1719321</commentid>
    <comment_count>5</comment_count>
      <attachid>417542</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-13 09:53:59 -0800</bug_when>
    <thetext>Created attachment 417542
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1719588</commentid>
    <comment_count>6</comment_count>
      <attachid>417617</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-14 06:58:17 -0800</bug_when>
    <thetext>Created attachment 417617
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720114</commentid>
    <comment_count>7</comment_count>
      <attachid>417757</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-15 20:37:39 -0800</bug_when>
    <thetext>Created attachment 417757
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720115</commentid>
    <comment_count>8</comment_count>
      <attachid>417758</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-15 20:43:29 -0800</bug_when>
    <thetext>Created attachment 417758
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720118</commentid>
    <comment_count>9</comment_count>
      <attachid>417761</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-01-15 21:40:27 -0800</bug_when>
    <thetext>Created attachment 417761
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720130</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-01-16 06:28:43 -0800</bug_when>
    <thetext>Committed r271555: &lt;https://trac.webkit.org/changeset/271555&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 417761.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>416970</attachid>
            <date>2021-01-04 19:34:37 -0800</date>
            <delta_ts>2021-01-10 20:16:23 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210104193436.patch</filename>
            <type>text/plain</type>
            <size>13850</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRlMmJjNThmMjJhNGVj
ZTMyYjFjMTg3MGZhOTcxMWIwMTAzZmZlNS4uYzRjNTYxN2I2NTIxYWViYjQwMzRjNTNhMGEzZjc4
Y2VmNmUwNWRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTAxLTA0ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorICAgICAgICBibG9jayBjb250YWluZXIgKHByZSkKKyAg
ICAgICAgICBpbmxpbmUgYm94IChzcGFuKQorICAgICAgICBibG9jayBjb250YWluZXIgKGRpdikK
KyAgICAgICAgYmxvY2sgY29udGFpbmVyIChwb3N0KQorICAgICAgICAgIGlubGluZSBib3ggKHNw
YW4pCisKKyAgICAgICAgV2hpbGUgdGhlIGxpbmUgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhlIHBv
c3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCBpdCdzIG1vcmUKKyAgICAgICAgYWNjdXJh
dGUgdG8gY2hlY2sgaWYgdGhlIGxpbmUgYm94IGlzIHBhcnQgb2YgYSBjb250aW51YXRpb24gaW4g
dGhlCisgICAgICAgICJpZiB0aGlzIGlubGluZSBib3ggY29udHJpYnV0ZXMgdG8gdGhlIGxpbmUg
Ym94IGhlaWdodCIgbG9naWMuCisgICAgICAgIFRoaXMgYWxzbyBlbmFibGVzIHVzIHRvIHJlbW92
ZSBMaW5lQm94OmlzQ29uc2lkZXJlZEVtcHR5KCkuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9p
bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAo
V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRB
bGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxl
dmVsQm94QWZmZWN0c0xpbmVCb3ggY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l
Qm94OjpMaW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV9pc0NvbnNpZGVyZWRF
bXB0eSk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l
TGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpob3Jpem9udGFs
QWxpZ25tZW50T2Zmc2V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv
eDo6aXNDb25zaWRlcmVkRW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9p
bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAgICAgICAqIGxh
eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIwMjEtMDEtMDQg
IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdW1F1
aXJrXSBMZXQncyBhZG9wdCBhIGxlc3MgcXVpcmt5IGJlaGF2aW9yIGZvciBsaW5lIGJyZWFrcyBv
biBub24tZW1wdHkgbGluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp
bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGFk
N2VjOTcyMzdjMWU4OGQ3ODg2MDI2N2ExODA3ZTIwNDhhZjQzMmUuLjkzOGZkODgwYTY1OWNmNGIx
YWE2NDljZGQ5MGFlNmE0ODlkYTRkZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNl
L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu
aApAQCAtNTEsNyArNTEsNyBAQCBwdWJsaWM6CiAgICAgcHVibGljOgogICAgICAgICBJbmxpbmVM
YXlvdXRVbml0IGluaXRpYWxMaW5lSGVpZ2h0KCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaGFzU29m
dFdyYXBPcHBvcnR1bml0eUF0SW1hZ2UoKSBjb25zdDsKLSAgICAgICAgYm9vbCBpbmxpbmVMZXZl
bEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3g6OklubGluZUxldmVsQm94JiwgY29uc3Qg
TGluZUJveCYpIGNvbnN0OworICAgICAgICBib29sIGlubGluZUxldmVsQm94QWZmZWN0c0xpbmVC
b3goY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmKSBjb25zdDsKIAogICAgIHByaXZhdGU6
CiAgICAgICAgIGZyaWVuZCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp
bmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggYzRjYjM0ZTA5
ZjRlZjMzZDNjMTU5YjQyZDdmOWY1ZTY1ZGNhMTdhMC4uYWY1Nzc3YTExZDQ3ZGUxMjEzZTFhZWM1
NzFmNzM3MjNmMjY1NDVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu
ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl
eHRHZW9tZXRyeS5jcHAKQEAgLTE1OCw4ICsxNTgsNyBAQCBMaW5lQm94IExpbmVCb3hCdWlsZGVy
OjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50KQogICAg
IGF1dG8mIHJ1bnMgPSBsaW5lQ29udGVudC5ydW5zOwogICAgIGF1dG8gbGluZUxvZ2ljYWxXaWR0
aCA9IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGg7CiAgICAgYXV0byBjb250ZW50TG9naWNh
bFdpZHRoID0gbGluZUNvbnRlbnQuY29udGVudExvZ2ljYWxXaWR0aDsKLSAgICBhdXRvIGlzTGlu
ZUNvbnNpZGVyZWRFbXB0eSA9IGxpbmVDb250ZW50LmlzTGluZUNvbnNpZGVyZWRFbXB0eSA/IExp
bmVCb3g6OklzTGluZUNvbnNpZGVyZWRFbXB0eTo6WWVzIDogTGluZUJveDo6SXNMaW5lQ29uc2lk
ZXJlZEVtcHR5OjpObzsKLSAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQu
bG9naWNhbFRvcExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGlzTGluZUNvbnNpZGVyZWRFbXB0
eSwgcnVucy5zaXplKCkgfTsKKyAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRl
bnQubG9naWNhbFRvcExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIHJ1bnMuc2l6ZSgpIH07CiAK
ICAgICBpZiAoYXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9u
dGFsQWxpZ25tZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBs
aW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RM
aW5lV2l0aElubGluZUNvbnRlbnQpKQogICAgICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGln
bm1lbnRPZmZzZXQoKmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOwpAQCAtMzY2LDcgKzM2NSw3
IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25Jbmxp
bmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAKICAgICAgICAgYXV0byBtaW5pbXVtTG9naWNh
bFRvcCA9IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgfTsKICAgICAgICAgYXV0byBtYXhp
bXVtTG9naWNhbEJvdHRvbSA9IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgfTsKLSAgICAg
ICAgaWYgKHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KHJvb3RJbmxpbmVCb3gs
IGxpbmVCb3gpKSB7CisgICAgICAgIGlmIChxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGlu
ZUJveChyb290SW5saW5lQm94KSkgewogICAgICAgICAgICAgbWluaW11bUxvZ2ljYWxUb3AgPSBJ
bmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICAgICAgICAgIG1heGltdW1Mb2dpY2FsQm90dG9tID0g
cm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKTsKICAgICAgICAgICAgIGlubGlu
ZUxldmVsQm94QWJzb2x1dGVUb3BBbmRCb3R0b21NYXAuYWRkKCZyb290SW5saW5lQm94LCBBYnNv
bHV0ZVRvcEFuZEJvdHRvbSB7ICptaW5pbXVtTG9naWNhbFRvcCwgKm1heGltdW1Mb2dpY2FsQm90
dG9tIH0pOwpAQCAtNDI4LDcgKzQyNyw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVM
aW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAg
ICAgICAgICBhdXRvIGFic29sdXRlTG9naWNhbEJvdHRvbSA9IGFic29sdXRlTG9naWNhbFRvcCAr
IGlubGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKTsKICAgICAgICAgICAgIGlu
bGluZUxldmVsQm94QWJzb2x1dGVUb3BBbmRCb3R0b21NYXAuYWRkKGlubGluZUxldmVsQm94Lmdl
dCgpLCBBYnNvbHV0ZVRvcEFuZEJvdHRvbSB7IGFic29sdXRlTG9naWNhbFRvcCwgYWJzb2x1dGVM
b2dpY2FsQm90dG9tIH0pOwogICAgICAgICAgICAgLy8gU3RyZXRjaCB0aGUgbWluL21heCBhYnNv
bHV0ZSB2YWx1ZXMgaWYgYXBwbGljYWJsZS4KLSAgICAgICAgICAgIGlmIChxdWlya3MuaW5saW5l
TGV2ZWxCb3hBZmZlY3RzTGluZUJveCgqaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpKSB7CisgICAg
ICAgICAgICBpZiAocXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goKmlubGluZUxl
dmVsQm94KSkgewogICAgICAgICAgICAgICAgIG1pbmltdW1Mb2dpY2FsVG9wID0gc3RkOjptaW4o
bWluaW11bUxvZ2ljYWxUb3AudmFsdWVPcihhYnNvbHV0ZUxvZ2ljYWxUb3ApLCBhYnNvbHV0ZUxv
Z2ljYWxUb3ApOwogICAgICAgICAgICAgICAgIG1heGltdW1Mb2dpY2FsQm90dG9tID0gc3RkOjpt
YXgobWF4aW11bUxvZ2ljYWxCb3R0b20udmFsdWVPcihhYnNvbHV0ZUxvZ2ljYWxCb3R0b20pLCBh
YnNvbHV0ZUxvZ2ljYWxCb3R0b20pOwogICAgICAgICAgICAgfQpAQCAtNDM4LDcgKzQzNyw3IEBA
IHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVM
ZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgICAgIC8vIDIuIENoZWNrIGlmIHRoZSBsaW5l
IGJveCByZWxhdGl2ZSBhbGlnbmVkIGlubGluZSBib3hlcyAodG9wLCBib3R0b20gZXRjKSBoYXZl
IGVub3VnaCByb29tIGFuZCBzdHJldGNoIHRoZSBsaW5lIGJveCBmdXJ0aGVyIGlmIG5lZWRlZC4K
ICAgICAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IG1heGltdW1Mb2dpY2FsQm90dG9t
LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCgpKSAtIG1pbmltdW1Mb2dpY2FsVG9wLnZhbHVlT3Io
SW5saW5lTGF5b3V0VW5pdCgpKTsKICAgICAgICAgZm9yIChhdXRvKiBsaW5lQm94UmVsYXRpdmVJ
bmxpbmVMZXZlbEJveCA6IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94ZXMpIHsKLSAgICAg
ICAgICAgIGlmICghcXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goKmxpbmVCb3hS
ZWxhdGl2ZUlubGluZUxldmVsQm94LCBsaW5lQm94KSkKKyAgICAgICAgICAgIGlmICghcXVpcmtz
LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goKmxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVs
Qm94KSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGxpbmVCb3hMb2dp
Y2FsSGVpZ2h0ID0gc3RkOjptYXgobGluZUJveExvZ2ljYWxIZWlnaHQsIGxpbmVCb3hSZWxhdGl2
ZUlubGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSk7CiAgICAgICAgIH0KQEAg
LTQ1MSw3ICs0NTAsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdo
dEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkoTGluZQogICAgICAgICBpbmxpbmVM
ZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXAuYWRkKCZyb290SW5saW5lQm94LCBJbmxp
bmVMYXlvdXRVbml0IHsgfSk7CiAKICAgICAgICAgYXV0byBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJv
b3RJbmxpbmVCb3hCYXNlbGluZSA9IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgfTsKLSAg
ICAgICAgaWYgKHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KHJvb3RJbmxpbmVC
b3gsIGxpbmVCb3gpKQorICAgICAgICBpZiAocXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xp
bmVCb3gocm9vdElubGluZUJveCkpCiAgICAgICAgICAgICBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJv
b3RJbmxpbmVCb3hCYXNlbGluZSA9IHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50
OwogCiAgICAgICAgIGZvciAoYXV0byYgaW5saW5lTGV2ZWxCb3ggOiBsaW5lQm94Lm5vblJvb3RJ
bmxpbmVMZXZlbEJveGVzKCkpIHsKQEAgLTUwOSw3ICs1MDgsNyBAQCB2b2lkIExpbmVCb3hCdWls
ZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2Fs
bHkoTGluZQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlu
bGluZUxldmVsQm94QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoaW5saW5lTGV2ZWxCb3gu
Z2V0KCksIGFic29sdXRlQmFzZWxpbmVPZmZzZXQpOwotICAgICAgICAgICAgYXV0byBhZmZlY3Rz
Um9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZl
Y3RzTGluZUJveCgqaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpOworICAgICAgICAgICAgYXV0byBh
ZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBxdWlya3MuaW5saW5lTGV2ZWxC
b3hBZmZlY3RzTGluZUJveCgqaW5saW5lTGV2ZWxCb3gpOwogICAgICAgICAgICAgaWYgKGFmZmVj
dHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbikKICAgICAgICAgICAgICAgICBtYXhpbXVt
VG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IHN0ZDo6bWF4KG1heGltdW1Ub3BP
ZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlT3Ioc3RkOjpudW1lcmljX2xpbWl0
czxJbmxpbmVMYXlvdXRVbml0Pjo6bG93ZXN0KCkpLCBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ICsg
aW5saW5lTGV2ZWxCb3gtPmxheW91dEJvdW5kcygpLmFzY2VudCk7CiAgICAgICAgIH0KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h
dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCAyOTk2ZmIyMTRl
OGVlYjQ0ZDI4OTQ0OTg5ZWM5NDhiMTJlMDQzYWY4Li44NWRlN2EwODY2ZTIxYzEyODNlZGE3Nzdk
NzBkZjIxODBjMDNmMzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR
dWlya3MuY3BwCkBAIC00MCw3ICs0MCw3IEBAIElubGluZUxheW91dFVuaXQgSW5saW5lRm9ybWF0
dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5pdGlhbExpbmVIZWlnaHQoKSBjb25zdAogICAgIHJldHVy
biByb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKS5mbG9hdEhlaWdodCgpOwogfQogCi1ib29sIElu
bGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVC
b3goY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94LCBjb25zdCBM
aW5lQm94JiBsaW5lQm94KSBjb25zdAorYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVp
cmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3g6OklubGluZUxl
dmVsQm94JiBpbmxpbmVMZXZlbEJveCkgY29uc3QKIHsKICAgICBpZiAoaW5saW5lTGV2ZWxCb3gu
aXNJbmxpbmVCb3goKSkgewogICAgICAgICAvLyBJbmxpbmUgYm94ZXMgKGUuZy4gcm9vdCBpbmxp
bmUgYm94IG9yIDxzcGFuPikgYWZmZWN0cyBsaW5lIGJveGVzIGVpdGhlciB0aHJvdWdoIHRoZSBz
dHJ1dCBvciBhY3R1YWwgY29udGVudC4KQEAgLTUzLDggKzUzLDExIEBAIGJvb2wgSW5saW5lRm9y
bWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25z
dCBMaW5lQm94CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAg
ICAgICAgIH0KLSAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91
dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsKLSAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0lt
YWdpbmFyeVN0cnV0ICYmICFsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7CisgICAgICAgIC8v
IFRoaXMgaXMgYW4gaW5saW5lIGJveCB3aXRoIG5vIGNvbnRlbnQuIExldCdzIHNlZSBpZiB0aGUg
aW1hZ2luYXJ5IHN0cnV0IHN0cmV0Y2hlcyB0aGUgaW5saW5lIGJveC4gCisgICAgICAgIC8vIDxz
cGFuPjxkaXY+PC9kaXY+PC9zcGFuPiBwcm9kdWNlcyBlbXB0eSBwcmUvcG9zdCBibG9ja3Mgd2hl
cmUgc3RydXQgd29uJ3QgYmUgaW5qZWN0ZWQuCisgICAgICAgIGF1dG8gaXNJbnNpZGVDb250aW51
YXRpb25QcmVPclBvc3RCbG9jayA9IGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLmlzQW5vbnlt
b3VzKCk7CisgICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSAhaXNJbnNp
ZGVDb250aW51YXRpb25QcmVPclBvc3RCbG9jayAmJiBsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NN
b2RlKCk7CisgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dDsKICAgICB9
CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewogICAg
ICAgICBpZiAoaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50KQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94
LmNwcAppbmRleCA1MTAxM2Q4NGM0OTNhZDMwNjVmZmQyYjhmYjU3MWM3NTM2Y2FlMjA4Li5lYzFl
NmVlZGYwZWRlNWUyNWY0ZDFiOWQ5NTdjMjU1ZDRiZDllZTgzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApA
QCAtODMsOSArODMsOCBAQCBib29sIExpbmVCb3g6OklubGluZUxldmVsQm94OjpoYXNMaW5lQm94
UmVsYXRpdmVBbGlnbm1lbnQoKSBjb25zdAogICAgIHJldHVybiB2ZXJ0aWNhbEFsaWdubWVudCA9
PSBWZXJ0aWNhbEFsaWduOjpUb3AgfHwgdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGln
bjo6Qm90dG9tOwogfQogCi1MaW5lQm94OjpMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50
JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBJ
c0xpbmVDb25zaWRlcmVkRW1wdHkgaXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBzaXplX3QgbnVtYmVy
T2ZSdW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNh
bFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51
bWJlck9mUnVucykKICAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElubGluZUxh
eW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSkKLSAgICAsIG1faXNDb25zaWRl
cmVkRW1wdHkoaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID09IElzTGluZUNvbnNpZGVyZWRFbXB0eTo6
WWVzKQogewogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENh
cGFjaXR5KG51bWJlck9mUnVucyk7CiAgICAgbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAucmVzZXJ2
ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IDVmZTU3NjY3
ZTA4YjYwOTFkYjQzNmFlYzcxMzFiMzY2MDY4NzdmZmMuLmNlOTgwOTNhZTFmMTQ5NTM3OTcwYjY2
YjY2NmU2Y2ZjYTE5ZjlmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp
bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTEyOCw4ICsxMjgsNyBAQCBwdWJs
aWM6CiAgICAgICAgIFR5cGUgbV90eXBlIHsgVHlwZTo6SW5saW5lQm94IH07CiAgICAgfTsKIAot
ICAgIGVudW0gY2xhc3MgSXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgTm8sIFllcyB9OwotICAgIExp
bmVCb3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJbmxpbmVMYXlv
dXRVbml0IGxvZ2ljYWxXaWR0aCwgSXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBzaXplX3QgbnVtYmVy
T2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9w
TGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHNpemVfdCBudW1iZXJPZlJ1bnMp
OwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBt
X2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25z
dCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7IH0KQEAgLTEzOCw3ICsxMzcsNiBAQCBw
dWJsaWM6CiAgICAgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSgpIGNvbnN0IHsgcmV0dXJu
IGxvZ2ljYWxSZWN0KCkuc2l6ZSgpOyB9CiAKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0
PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gbV9ob3Jpem9udGFs
QWxpZ25tZW50T2Zmc2V0OyB9Ci0gICAgYm9vbCBpc0NvbnNpZGVyZWRFbXB0eSgpIGNvbnN0IHsg
cmV0dXJuIG1faXNDb25zaWRlcmVkRW1wdHk7IH0KICAgICBib29sIGhhc0lubGluZUJveCgpIGNv
bnN0IHsgcmV0dXJuIG1faGFzSW5saW5lQm94OyB9CiAKICAgICBjb25zdCBJbmxpbmVMZXZlbEJv
eCYgaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0
IHsgcmV0dXJuICptX2lubGluZUxldmVsQm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7IH0KQEAg
LTE2OSw3ICsxNjcsNiBAQCBwcml2YXRlOgogcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9n
aWNhbFJlY3Q7CiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9ob3Jpem9udGFsQWxp
Z25tZW50T2Zmc2V0OwotICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKICAg
ICBib29sIG1faGFzSW5saW5lQm94IHsgZmFsc2UgfTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxJ
bmxpbmVMZXZlbEJveD4gbV9yb290SW5saW5lQm94OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmlu
ZGV4IGE4YThmOTE4OTdkMzQxOTQ0YWMzMzU3OWUzYTAxNTIyNTJmYmNlYWYuLmQxZjJkOTg5NTZi
ZWVkNzMzOGU1NmM5OTE4MmRiNmM4ZDM0M2M1ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAK
QEAgLTI2NCw3ICsyNjQsNiBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6
OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAgICAsIG1f
bGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0Lndp
ZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpCi0gICAgICAgICwg
bV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkKICAgICAgICAgLCBpc0xhc3RMaW5lCiAgICAgICAg
ICwgbV9saW5lLnJ1bnMoKX07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5
b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCBlNmY0ZTdlMTll
MGU2Y2E5YTc3MzE5Y2E2NzBiMTQ3MmM1MWI2NjNkLi4xNmZjMzhlZjRjN2I3ZmNjMTU0ZWZmZWE3
ZTNjNzJjMTk4ZjEwNWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKQEAgLTU3LDcgKzU3LDYgQEAg
cHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdDsKICAgICAg
ICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoOwogICAgICAgICBJbmxpbmVMYXlv
dXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7Ci0gICAgICAgIGJvb2wgaXNMaW5lQ29uc2lkZXJl
ZEVtcHR5IHsgdHJ1ZSB9OwogICAgICAgICBib29sIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu
dCB7IHRydWUgfTsKICAgICAgICAgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVuczsKICAgICB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417360</attachid>
            <date>2021-01-10 20:16:26 -0800</date>
            <delta_ts>2021-01-13 09:53:57 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210110201625.patch</filename>
            <type>text/plain</type>
            <size>13869</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDhlZmE5NGNlMDI0ZmYz
ODkyM2I3ZjZkZmVjMWFjMmE2ZmVjOTY5MS4uOWRkNTg2YjI2OTFlY2MxMmY2ZTlkMzkwNzRlMzRm
NWM4NjJkNWJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTAxLTEwICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAocHJlKQor
ICAgICAgICAgIGlubGluZSBib3ggKHNwYW4pCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAoZGl2
KQorICAgICAgICBibG9jayBjb250YWluZXIgKHBvc3QpCisgICAgICAgICAgaW5saW5lIGJveCAo
c3BhbikKKworICAgICAgICBXaGlsZSB0aGUgbGluZXMgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhl
IHBvc3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCB0aGUgcmVhbCByZWFzb24KKyAgICAg
ICAgd2h5IHRoZXkgZG9uJ3QgdGFrZSB1cCBhbnkgcmVuZGVyaW5nIHNwYWNlIGlzIGJlY2F1c2Ug
dGhvc2UgYmxvY2sgY29udGFpbmVycyBhcmUgb25seSB0aGVyZSB0bworICAgICAgICBlbnN1cmUg
bm8gYmxvY2staW5saW5lIHNpYmxpbmcgbWl4LgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIGVu
YWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVkRW1wdHkoKS4KKworICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH
ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi
dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRl
TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOgorICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6
OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisgICAgICAgICog
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0
OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp
bmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVu
dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu
aDoKKwogMjAyMS0wMS0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg
ICAgIFtMRkNdW0lGQ11bUXVpcmtdIExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3Ig
Zm9yIGxpbmUgYnJlYWtzIG9uIG5vbi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD
b250ZXh0LmgKaW5kZXggYWQ3ZWM5NzIzN2MxZTg4ZDc4ODYwMjY3YTE4MDdlMjA0OGFmNDMyZS4u
OTM4ZmQ4ODBhNjU5Y2Y0YjFhYTY0OWNkZDkwYWU2YTQ4OWRhNGRkZiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl
eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG
b3JtYXR0aW5nQ29udGV4dC5oCkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBwdWJsaWM6
CiAgICAgICAgIElubGluZUxheW91dFVuaXQgaW5pdGlhbExpbmVIZWlnaHQoKSBjb25zdDsKICAg
ICAgICAgYm9vbCBoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSgpIGNvbnN0OwotICAgICAg
ICBib29sIGlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3QgTGluZUJveDo6SW5saW5l
TGV2ZWxCb3gmLCBjb25zdCBMaW5lQm94JikgY29uc3Q7CisgICAgICAgIGJvb2wgaW5saW5lTGV2
ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYpIGNvbnN0
OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRpbmdD
b250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp
bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw
cAppbmRleCA3ZTVhNDdkNDU0YzM2Zjc5MmQyZTIyNjExZjYzMDdkM2FmYmM1Yzc5Li41YjI3YzJi
ZmIwODBjMmU5MjJjNDdlMDg3YzhlNjY3M2JhOWI5NDhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l
dHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTU4LDggKzE1OCw3IEBAIExpbmVC
b3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYg
bGluZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0
byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBh
dXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5jb250ZW50TG9naWNhbFdpZHRo
OwotICAgIGF1dG8gaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID0gbGluZUNvbnRlbnQuaXNMaW5lQ29u
c2lkZXJlZEVtcHR5ID8gTGluZUJveDo6SXNMaW5lQ29uc2lkZXJlZEVtcHR5OjpZZXMgOiBMaW5l
Qm94OjpJc0xpbmVDb25zaWRlcmVkRW1wdHk6Ok5vOwotICAgIGF1dG8gbGluZUJveCA9IExpbmVC
b3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwgaXNM
aW5lQ29uc2lkZXJlZEVtcHR5LCBydW5zLnNpemUoKSB9OworICAgIGF1dG8gbGluZUJveCA9IExp
bmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwg
cnVucy5zaXplKCkgfTsKIAogICAgIGlmIChhdXRvIGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQg
PSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxl
KCkudGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxp
bmVDb250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkpCiAgICAgICAgIGxpbmVCb3gu
c2V0SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgqaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7
CkBAIC0zNzcsNyArMzc2LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hI
ZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmUKIAogICAgICAgICBh
dXRvIG1pbmltdW1Mb2dpY2FsVG9wID0gT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geyB9Owog
ICAgICAgICBhdXRvIG1heGltdW1Mb2dpY2FsQm90dG9tID0gT3B0aW9uYWw8SW5saW5lTGF5b3V0
VW5pdD4geyB9OwotICAgICAgICBpZiAocXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVC
b3gocm9vdElubGluZUJveCwgbGluZUJveCkpIHsKKyAgICAgICAgaWYgKHF1aXJrcy5pbmxpbmVM
ZXZlbEJveEFmZmVjdHNMaW5lQm94KHJvb3RJbmxpbmVCb3gpKSB7CiAgICAgICAgICAgICBtaW5p
bXVtTG9naWNhbFRvcCA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgICAgICAgICAgbWF4aW11
bUxvZ2ljYWxCb3R0b20gPSByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpOwog
ICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZVRvcEFuZEJvdHRvbU1hcC5hZGQoJnJv
b3RJbmxpbmVCb3gsIEFic29sdXRlVG9wQW5kQm90dG9tIHsgKm1pbmltdW1Mb2dpY2FsVG9wLCAq
bWF4aW11bUxvZ2ljYWxCb3R0b20gfSk7CkBAIC00MzksNyArNDM4LDcgQEAgdm9pZCBMaW5lQm94
QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0
aWNhbGx5KExpbmUKICAgICAgICAgICAgIGF1dG8gYWJzb2x1dGVMb2dpY2FsQm90dG9tID0gYWJz
b2x1dGVMb2dpY2FsVG9wICsgaW5saW5lTGV2ZWxCb3gtPmxheW91dEJvdW5kcygpLmhlaWdodCgp
OwogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZVRvcEFuZEJvdHRvbU1hcC5hZGQo
aW5saW5lTGV2ZWxCb3guZ2V0KCksIEFic29sdXRlVG9wQW5kQm90dG9tIHsgYWJzb2x1dGVMb2dp
Y2FsVG9wLCBhYnNvbHV0ZUxvZ2ljYWxCb3R0b20gfSk7CiAgICAgICAgICAgICAvLyBTdHJldGNo
IHRoZSBtaW4vbWF4IGFic29sdXRlIHZhbHVlcyBpZiBhcHBsaWNhYmxlLgotICAgICAgICAgICAg
aWYgKHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KCppbmxpbmVMZXZlbEJveCwg
bGluZUJveCkpIHsKKyAgICAgICAgICAgIGlmIChxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3Rz
TGluZUJveCgqaW5saW5lTGV2ZWxCb3gpKSB7CiAgICAgICAgICAgICAgICAgbWluaW11bUxvZ2lj
YWxUb3AgPSBzdGQ6Om1pbihtaW5pbXVtTG9naWNhbFRvcC52YWx1ZU9yKGFic29sdXRlTG9naWNh
bFRvcCksIGFic29sdXRlTG9naWNhbFRvcCk7CiAgICAgICAgICAgICAgICAgbWF4aW11bUxvZ2lj
YWxCb3R0b20gPSBzdGQ6Om1heChtYXhpbXVtTG9naWNhbEJvdHRvbS52YWx1ZU9yKGFic29sdXRl
TG9naWNhbEJvdHRvbSksIGFic29sdXRlTG9naWNhbEJvdHRvbSk7CiAgICAgICAgICAgICB9CkBA
IC00NDksNyArNDQ4LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWln
aHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmUKICAgICAgICAgLy8gMi4g
Q2hlY2sgaWYgdGhlIGxpbmUgYm94IHJlbGF0aXZlIGFsaWduZWQgaW5saW5lIGJveGVzICh0b3As
IGJvdHRvbSBldGMpIGhhdmUgZW5vdWdoIHJvb20gYW5kIHN0cmV0Y2ggdGhlIGxpbmUgYm94IGZ1
cnRoZXIgaWYgbmVlZGVkLgogICAgICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gbWF4
aW11bUxvZ2ljYWxCb3R0b20udmFsdWVPcihJbmxpbmVMYXlvdXRVbml0KCkpIC0gbWluaW11bUxv
Z2ljYWxUb3AudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0KCkpOwogICAgICAgICBmb3IgKGF1dG8q
IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94IDogbGluZUJveFJlbGF0aXZlSW5saW5lTGV2
ZWxCb3hlcykgewotICAgICAgICAgICAgaWYgKCFxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3Rz
TGluZUJveCgqbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpKQorICAgICAg
ICAgICAgaWYgKCFxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCgqbGluZUJveFJl
bGF0aXZlSW5saW5lTGV2ZWxCb3gpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg
ICAgICAgbGluZUJveExvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1heChsaW5lQm94TG9naWNhbEhlaWdo
dCwgbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gtPmxheW91dEJvdW5kcygpLmhlaWdodCgp
KTsKICAgICAgICAgfQpAQCAtNDYyLDcgKzQ2MSw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNv
bXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5l
CiAgICAgICAgIGlubGluZUxldmVsQm94QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoJnJv
b3RJbmxpbmVCb3gsIElubGluZUxheW91dFVuaXQgeyB9KTsKIAogICAgICAgICBhdXRvIG1heGlt
dW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gT3B0aW9uYWw8SW5saW5lTGF5
b3V0VW5pdD4geyB9OwotICAgICAgICBpZiAocXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xp
bmVCb3gocm9vdElubGluZUJveCwgbGluZUJveCkpCisgICAgICAgIGlmIChxdWlya3MuaW5saW5l
TGV2ZWxCb3hBZmZlY3RzTGluZUJveChyb290SW5saW5lQm94KSkKICAgICAgICAgICAgIG1heGlt
dW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5sYXlv
dXRCb3VuZHMoKS5hc2NlbnQ7CiAKICAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVMZXZlbEJveCA6
IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKSkgewpAQCAtNTIwLDcgKzUxOSw3IEBA
IHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVM
ZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg
fQogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFk
ZChpbmxpbmVMZXZlbEJveC5nZXQoKSwgYWJzb2x1dGVCYXNlbGluZU9mZnNldCk7Ci0gICAgICAg
ICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiA9IHF1aXJrcy5p
bmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KCppbmxpbmVMZXZlbEJveCwgbGluZUJveCk7Cisg
ICAgICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiA9IHF1
aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KCppbmxpbmVMZXZlbEJveCk7CiAgICAg
ICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKQogICAgICAg
ICAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gc3Rk
OjptYXgobWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUudmFsdWVPcihz
dGQ6Om51bWVyaWNfbGltaXRzPElubGluZUxheW91dFVuaXQ+Ojpsb3dlc3QoKSksIGFic29sdXRl
QmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50KTsK
ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUv
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3Bw
CmluZGV4IDFiZTJkYmYyY2UzZGVjOWMxYjk4NDQ4N2YxNmM0MTZjNGRiYmYzZWYuLmRhOTRjZGMy
ZjVjODhiMTUzNTFmNWFhN2UzMmY2NDRhZWY1MTQ0NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG
b3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTQwLDcgKzQwLDcgQEAgSW5saW5lTGF5b3V0
VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbml0aWFsTGluZUhlaWdodCgp
IGNvbnN0CiAgICAgcmV0dXJuIHJvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLmZsb2F0SGVpZ2h0
KCk7CiB9CiAKLWJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2
ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgaW5saW5l
TGV2ZWxCb3gsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0Citib29sIElubGluZUZvcm1h
dHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3Qg
TGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94KSBjb25zdAogewogICAgIGlm
IChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKSB7CiAgICAgICAgIC8vIElubGluZSBib3hl
cyAoZS5nLiByb290IGlubGluZSBib3ggb3IgPHNwYW4+KSBhZmZlY3RzIGxpbmUgYm94ZXMgZWl0
aGVyIHRocm91Z2ggdGhlIHN0cnV0IG9yIGFjdHVhbCBjb250ZW50LgpAQCAtNTMsOCArNTMsMTEg
QEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFm
ZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK
ICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBhdXRvIGlubGluZUJveEhhc0ltYWdp
bmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpOwotICAgICAgICByZXR1
cm4gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgJiYgIWxpbmVCb3guaXNDb25zaWRlcmVkRW1w
dHkoKTsKKyAgICAgICAgLy8gVGhpcyBpcyBhbiBpbmxpbmUgYm94IHdpdGggbm8gY29udGVudC4g
TGV0J3Mgc2VlIGlmIHRoZSBpbWFnaW5hcnkgc3RydXQgc3RyZXRjaGVzIHRoZSBpbmxpbmUgYm94
LiAKKyAgICAgICAgLy8gPHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IHByb2R1Y2VzIGVtcHR5IHBy
ZS9wb3N0IGJsb2NrcyB3aGVyZSBzdHJ1dCB3b24ndCBiZSBpbmplY3RlZC4KKyAgICAgICAgYXV0
byBpc0luc2lkZUNvbnRpbnVhdGlvblByZU9yUG9zdEJsb2NrID0gZm9ybWF0dGluZ0NvbnRleHQo
KS5yb290KCkuaXNBbm9ueW1vdXMoKTsKKyAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5h
cnlTdHJ1dCA9ICFpc0luc2lkZUNvbnRpbnVhdGlvblByZU9yUG9zdEJsb2NrICYmIGxheW91dFN0
YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsKKyAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0ltYWdp
bmFyeVN0cnV0OwogICAgIH0KICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVM
ZXZlbEJveCgpKSB7CiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5o
ZWlnaHQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0
aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggNTEwMTNkODRjNDkzYWQzMDY1ZmZkMmI4ZmI1
NzFjNzUzNmNhZTIwOC4uZWMxZTZlZWRmMGVkZTVlMjVmNGQxYjlkOTU3YzI1NWQ0YmQ5ZWU4MyAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l
TGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv
SW5saW5lTGluZUJveC5jcHAKQEAgLTgzLDkgKzgzLDggQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVM
ZXZlbEJveDo6aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkgY29uc3QKICAgICByZXR1cm4g
dmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGlnbjo6VG9wIHx8IHZlcnRpY2FsQWxpZ25t
ZW50ID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbTsKIH0KIAotTGluZUJveDo6TGluZUJveChjb25z
dCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29u
dGVudExvZ2ljYWxXaWR0aCwgSXNMaW5lQ29uc2lkZXJlZEVtcHR5IGlzTGluZUNvbnNpZGVyZWRF
bXB0eSwgc2l6ZV90IG51bWJlck9mUnVucykKK0xpbmVCb3g6OkxpbmVCb3goY29uc3QgSW5saW5l
TGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BsZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dp
Y2FsV2lkdGgsIHNpemVfdCBudW1iZXJPZlJ1bnMpCiAgICAgOiBtX2xvZ2ljYWxSZWN0KGxvZ2lj
YWxUb3BsZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0p
Ci0gICAgLCBtX2lzQ29uc2lkZXJlZEVtcHR5KGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9PSBJc0xp
bmVDb25zaWRlcmVkRW1wdHk6OlllcykKIHsKICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExp
c3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwogICAgIG1faW5saW5lTGV2
ZWxCb3hSZWN0TWFwLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnVtYmVyT2ZSdW5zKTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC
b3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC
b3guaAppbmRleCA1ZmU1NzY2N2UwOGI2MDkxZGI0MzZhZWM3MTMxYjM2NjA2ODc3ZmZjLi5jZTk4
MDkzYWUxZjE0OTUzNzk3MGI2NmI2NjZlNmNmY2ExOWY5Zjk4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC0x
MjgsOCArMTI4LDcgQEAgcHVibGljOgogICAgICAgICBUeXBlIG1fdHlwZSB7IFR5cGU6OklubGlu
ZUJveCB9OwogICAgIH07CiAKLSAgICBlbnVtIGNsYXNzIElzTGluZUNvbnNpZGVyZWRFbXB0eSB7
IE5vLCBZZXMgfTsKLSAgICBMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2Fs
VG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIElzTGluZUNvbnNpZGVyZWRF
bXB0eSwgc2l6ZV90IG51bWJlck9mUnVucyk7CisgICAgTGluZUJveChjb25zdCBJbmxpbmVMYXlv
dXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBz
aXplX3QgbnVtYmVyT2ZSdW5zKTsKIAogICAgIGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0
KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdDsgfQogICAgIElubGluZUxheW91dFVuaXQg
bG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbG9naWNhbFNpemUoKS53aWR0aCgpOyB9CkBA
IC0xMzgsNyArMTM3LDYgQEAgcHVibGljOgogICAgIElubGluZUxheW91dFNpemUgbG9naWNhbFNp
emUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnNpemUoKTsgfQogCiAgICAgT3B0aW9u
YWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpIGNvbnN0IHsg
cmV0dXJuIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsgfQotICAgIGJvb2wgaXNDb25zaWRl
cmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29uc2lkZXJlZEVtcHR5OyB9CiAgICAgYm9v
bCBoYXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX2hhc0lubGluZUJveDsgfQogCiAgICAg
Y29uc3QgSW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJv
eCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiAqbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAuZ2V0
KCZsYXlvdXRCb3gpOyB9CkBAIC0xNjksNyArMTY3LDYgQEAgcHJpdmF0ZToKIHByaXZhdGU6CiAg
ICAgSW5saW5lUmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVu
aXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsKLSAgICBib29sIG1faXNDb25zaWRlcmVk
RW1wdHkgeyB0cnVlIH07CiAgICAgYm9vbCBtX2hhc0lubGluZUJveCB7IGZhbHNlIH07CiAKICAg
ICBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lTGV2ZWxCb3g+IG1fcm9vdElubGluZUJveDsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC
dWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu
ZUxpbmVCdWlsZGVyLmNwcAppbmRleCBhOGE4ZjkxODk3ZDM0MTk0NGFjMzM1NzllM2EwMTUyMjUy
ZmJjZWFmLi5kMWYyZDk4OTU2YmVlZDczMzhlNTZjOTkxODJkYjZjOGQzNDNjNTg0IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp
bGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yNjQsNyArMjY0LDYgQEAgTGluZUJ1aWxkZXI6OkxpbmVD
b250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1S
YW5nZSYKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC50b3BMZWZ0KCkKICAgICAgICAgLCBt
X2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpCiAgICAgICAgICwgbV9saW5lLmNvbnRlbnRMb2dpY2Fs
V2lkdGgoKQotICAgICAgICAsIG1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpCiAgICAgICAgICwg
aXNMYXN0TGluZQogICAgICAgICAsIG1fbGluZS5ydW5zKCl9OwogfQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBi
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy
LmgKaW5kZXggZTZmNGU3ZTE5ZTBlNmNhOWE3NzMxOWNhNjcwYjE0NzJjNTFiNjYzZC4uMTZmYzM4
ZWY0YzdiN2ZjYzE1NGVmZmVhN2UzYzcyYzE5OGYxMDViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o
CkBAIC01Nyw3ICs1Nyw2IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9n
aWNhbFRvcExlZnQ7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aDsK
ICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoOwotICAgICAgICBi
b29sIGlzTGluZUNvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKICAgICAgICAgYm9vbCBpc0xhc3RM
aW5lV2l0aElubGluZUNvbnRlbnQgeyB0cnVlIH07CiAgICAgICAgIGNvbnN0IExpbmU6OlJ1bkxp
c3QmIHJ1bnM7CiAgICAgfTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417542</attachid>
            <date>2021-01-13 09:53:59 -0800</date>
            <delta_ts>2021-01-14 06:58:15 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210113095358.patch</filename>
            <type>text/plain</type>
            <size>13865</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTM2MmU2ZGJhMjgzMmE2
Y2I1NWM0YmRjYmVhMThjNWYwYzkzNWY5OS4uMGU5ZmM0OTllMzk1NGRkZjMzZTJkZDExOTQwM2Q0
NDk0ZjllODIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTAxLTEzICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAocHJlKQor
ICAgICAgICAgIGlubGluZSBib3ggKHNwYW4pCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAoZGl2
KQorICAgICAgICBibG9jayBjb250YWluZXIgKHBvc3QpCisgICAgICAgICAgaW5saW5lIGJveCAo
c3BhbikKKworICAgICAgICBXaGlsZSB0aGUgbGluZXMgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhl
IHBvc3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCB0aGUgcmVhbCByZWFzb24KKyAgICAg
ICAgd2h5IHRoZXkgZG9uJ3QgdGFrZSB1cCBhbnkgcmVuZGVyaW5nIHNwYWNlIGlzIGJlY2F1c2Ug
dGhvc2UgYmxvY2sgY29udGFpbmVycyBhcmUgb25seSB0aGVyZSB0bworICAgICAgICBlbnN1cmUg
bm8gYmxvY2staW5saW5lIHNpYmxpbmcgbWl4LgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIGVu
YWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVkRW1wdHkoKS4KKworICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH
ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi
dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRl
TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOgorICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6
OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisgICAgICAgICog
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0
OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp
bmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVu
dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu
aDoKKwogMjAyMS0wMS0xMiAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgog
CiAgICAgICAgIE5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzIG1pZCBKYW51YXJ5IDIwMjEgZWRpdGlv
bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYWQ3ZWM5NzIzN2MxZTg4ZDc4
ODYwMjY3YTE4MDdlMjA0OGFmNDMyZS4uOTM4ZmQ4ODBhNjU5Y2Y0YjFhYTY0OWNkZDkwYWU2YTQ4
OWRhNGRkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp
bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01MSw3ICs1MSw3
IEBAIHB1YmxpYzoKICAgICBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQgaW5pdGlh
bExpbmVIZWlnaHQoKSBjb25zdDsKICAgICAgICAgYm9vbCBoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5
QXRJbWFnZSgpIGNvbnN0OwotICAgICAgICBib29sIGlubGluZUxldmVsQm94QWZmZWN0c0xpbmVC
b3goY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmLCBjb25zdCBMaW5lQm94JikgY29uc3Q7
CisgICAgICAgIGJvb2wgaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94
OjpJbmxpbmVMZXZlbEJveCYpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5k
IGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy
eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt
YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBjNmFiOGMzYjU5MWZkZTUyNTAxNGM3MTQ4
MDc0YzkyNDM2YTM0ZGM1Li5kNzA2MjlkYWNhNDU2MTY2NGY5OWJjY2Y2NjE5NTBhYmMzNDIzYmY1
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv
dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApA
QCAtMTU4LDggKzE1OCw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExp
bmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9IGxp
bmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQu
bGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5lQ29u
dGVudC5jb250ZW50TG9naWNhbFdpZHRoOwotICAgIGF1dG8gaXNMaW5lQ29uc2lkZXJlZEVtcHR5
ID0gbGluZUNvbnRlbnQuaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID8gTGluZUJveDo6SXNMaW5lQ29u
c2lkZXJlZEVtcHR5OjpZZXMgOiBMaW5lQm94OjpJc0xpbmVDb25zaWRlcmVkRW1wdHk6Ok5vOwot
ICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwg
Y29udGVudExvZ2ljYWxXaWR0aCwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBydW5zLnNpemUoKSB9
OworICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVm
dCwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsKIAogICAgIGlmIChhdXRvIGhv
cml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZz
ZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lkdGgs
IGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29u
dGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgqaG9y
aXpvbnRhbEFsaWdubWVudE9mZnNldCk7CkBAIC0zNzYsNyArMzc1LDcgQEAgdm9pZCBMaW5lQm94
QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0
aWNhbGx5KExpbmUKIAogICAgICAgICBhdXRvIG1pbmltdW1Mb2dpY2FsVG9wID0gT3B0aW9uYWw8
SW5saW5lTGF5b3V0VW5pdD4geyB9OwogICAgICAgICBhdXRvIG1heGltdW1Mb2dpY2FsQm90dG9t
ID0gT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geyB9OwotICAgICAgICBpZiAocXVpcmtzLmlu
bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3gocm9vdElubGluZUJveCwgbGluZUJveCkpIHsKKyAg
ICAgICAgaWYgKHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KHJvb3RJbmxpbmVC
b3gpKSB7CiAgICAgICAgICAgICBtaW5pbXVtTG9naWNhbFRvcCA9IElubGluZUxheW91dFVuaXQg
eyB9OwogICAgICAgICAgICAgbWF4aW11bUxvZ2ljYWxCb3R0b20gPSByb290SW5saW5lQm94Lmxh
eW91dEJvdW5kcygpLmhlaWdodCgpOwogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0
ZVRvcEFuZEJvdHRvbU1hcC5hZGQoJnJvb3RJbmxpbmVCb3gsIEFic29sdXRlVG9wQW5kQm90dG9t
IHsgKm1pbmltdW1Mb2dpY2FsVG9wLCAqbWF4aW11bUxvZ2ljYWxCb3R0b20gfSk7CkBAIC00Mzgs
NyArNDM3LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRB
bGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmUKICAgICAgICAgICAgIGF1dG8gYWJz
b2x1dGVMb2dpY2FsQm90dG9tID0gYWJzb2x1dGVMb2dpY2FsVG9wICsgaW5saW5lTGV2ZWxCb3gt
PmxheW91dEJvdW5kcygpLmhlaWdodCgpOwogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNv
bHV0ZVRvcEFuZEJvdHRvbU1hcC5hZGQoaW5saW5lTGV2ZWxCb3guZ2V0KCksIEFic29sdXRlVG9w
QW5kQm90dG9tIHsgYWJzb2x1dGVMb2dpY2FsVG9wLCBhYnNvbHV0ZUxvZ2ljYWxCb3R0b20gfSk7
CiAgICAgICAgICAgICAvLyBTdHJldGNoIHRoZSBtaW4vbWF4IGFic29sdXRlIHZhbHVlcyBpZiBh
cHBsaWNhYmxlLgotICAgICAgICAgICAgaWYgKHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNM
aW5lQm94KCppbmxpbmVMZXZlbEJveCwgbGluZUJveCkpIHsKKyAgICAgICAgICAgIGlmIChxdWly
a3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCgqaW5saW5lTGV2ZWxCb3gpKSB7CiAgICAg
ICAgICAgICAgICAgbWluaW11bUxvZ2ljYWxUb3AgPSBzdGQ6Om1pbihtaW5pbXVtTG9naWNhbFRv
cC52YWx1ZU9yKGFic29sdXRlTG9naWNhbFRvcCksIGFic29sdXRlTG9naWNhbFRvcCk7CiAgICAg
ICAgICAgICAgICAgbWF4aW11bUxvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChtYXhpbXVtTG9naWNh
bEJvdHRvbS52YWx1ZU9yKGFic29sdXRlTG9naWNhbEJvdHRvbSksIGFic29sdXRlTG9naWNhbEJv
dHRvbSk7CiAgICAgICAgICAgICB9CkBAIC00NDgsNyArNDQ3LDcgQEAgdm9pZCBMaW5lQm94QnVp
bGRlcjo6Y29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNh
bGx5KExpbmUKICAgICAgICAgLy8gMi4gQ2hlY2sgaWYgdGhlIGxpbmUgYm94IHJlbGF0aXZlIGFs
aWduZWQgaW5saW5lIGJveGVzICh0b3AsIGJvdHRvbSBldGMpIGhhdmUgZW5vdWdoIHJvb20gYW5k
IHN0cmV0Y2ggdGhlIGxpbmUgYm94IGZ1cnRoZXIgaWYgbmVlZGVkLgogICAgICAgICBhdXRvIGxp
bmVCb3hMb2dpY2FsSGVpZ2h0ID0gbWF4aW11bUxvZ2ljYWxCb3R0b20udmFsdWVPcihJbmxpbmVM
YXlvdXRVbml0KCkpIC0gbWluaW11bUxvZ2ljYWxUb3AudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0
KCkpOwogICAgICAgICBmb3IgKGF1dG8qIGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94IDog
bGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3hlcykgewotICAgICAgICAgICAgaWYgKCFxdWly
a3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCgqbGluZUJveFJlbGF0aXZlSW5saW5lTGV2
ZWxCb3gsIGxpbmVCb3gpKQorICAgICAgICAgICAgaWYgKCFxdWlya3MuaW5saW5lTGV2ZWxCb3hB
ZmZlY3RzTGluZUJveCgqbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gpKQogICAgICAgICAg
ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgbGluZUJveExvZ2ljYWxIZWlnaHQgPSBzdGQ6
Om1heChsaW5lQm94TG9naWNhbEhlaWdodCwgbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gt
PmxheW91dEJvdW5kcygpLmhlaWdodCgpKTsKICAgICAgICAgfQpAQCAtNDYxLDcgKzQ2MCw3IEBA
IHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVM
ZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgICAgIGlubGluZUxldmVsQm94QWJzb2x1dGVC
YXNlbGluZU9mZnNldE1hcC5hZGQoJnJvb3RJbmxpbmVCb3gsIElubGluZUxheW91dFVuaXQgeyB9
KTsKIAogICAgICAgICBhdXRvIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2Vs
aW5lID0gT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geyB9OwotICAgICAgICBpZiAocXVpcmtz
LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3gocm9vdElubGluZUJveCwgbGluZUJveCkpCisg
ICAgICAgIGlmIChxdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChyb290SW5saW5l
Qm94KSkKICAgICAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2Vs
aW5lID0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7CiAKICAgICAgICAgZm9y
IChhdXRvJiBpbmxpbmVMZXZlbEJveCA6IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMo
KSkgewpAQCAtNTE5LDcgKzUxOCw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5l
Qm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgICAg
ICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNv
bHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZChpbmxpbmVMZXZlbEJveC5nZXQoKSwgYWJzb2x1dGVC
YXNlbGluZU9mZnNldCk7Ci0gICAgICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5lQm94VmVy
dGljYWxQb3NpdGlvbiA9IHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KCppbmxp
bmVMZXZlbEJveCwgbGluZUJveCk7CisgICAgICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5saW5l
Qm94VmVydGljYWxQb3NpdGlvbiA9IHF1aXJrcy5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94
KCppbmxpbmVMZXZlbEJveCk7CiAgICAgICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hW
ZXJ0aWNhbFBvc2l0aW9uKQogICAgICAgICAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9v
dElubGluZUJveEJhc2VsaW5lID0gc3RkOjptYXgobWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5s
aW5lQm94QmFzZWxpbmUudmFsdWVPcihzdGQ6Om51bWVyaWNfbGltaXRzPElubGluZUxheW91dFVu
aXQ+Ojpsb3dlc3QoKSksIGFic29sdXRlQmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC0+
bGF5b3V0Qm91bmRzKCkuYXNjZW50KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWly
a3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y
bWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IDg5Y2Q5Mzk5NmQxYmE3ZTU0MGYzZDQ5ZWJl
OWJhNThlZTI1YTc0NzcuLmU5MjRkNTYyODE5YTg4NzJlMmRhYjA1M2M0YTMwNzhkZjY4YmM2MWUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu
ZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTQy
LDcgKzQyLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVp
cmtzOjppbml0aWFsTGluZUhlaWdodCgpIGNvbnN0CiAgICAgcmV0dXJuIHJvb3Quc3R5bGUoKS5m
b250TWV0cmljcygpLmZsb2F0SGVpZ2h0KCk7CiB9CiAKLWJvb2wgSW5saW5lRm9ybWF0dGluZ0Nv
bnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94
OjpJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gp
IGNvbnN0Citib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVs
Qm94QWZmZWN0c0xpbmVCb3goY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxl
dmVsQm94KSBjb25zdAogewogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKSB7
CiAgICAgICAgIC8vIElubGluZSBib3hlcyAoZS5nLiByb290IGlubGluZSBib3ggb3IgPHNwYW4+
KSBhZmZlY3RzIGxpbmUgYm94ZXMgZWl0aGVyIHRocm91Z2ggdGhlIHN0cnV0IG9yIGFjdHVhbCBj
b250ZW50LgpAQCAtNTUsOCArNTUsMTEgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6
UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAg
ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAg
ICBhdXRvIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUoKS5pbk5vUXVp
cmtzTW9kZSgpOwotICAgICAgICByZXR1cm4gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgJiYg
IWxpbmVCb3guaXNDb25zaWRlcmVkRW1wdHkoKTsKKyAgICAgICAgLy8gVGhpcyBpcyBhbiBpbmxp
bmUgYm94IHdpdGggbm8gY29udGVudC4gTGV0J3Mgc2VlIGlmIHRoZSBpbWFnaW5hcnkgc3RydXQg
c3RyZXRjaGVzIHRoZSBpbmxpbmUgYm94LiAKKyAgICAgICAgLy8gPHNwYW4+PGRpdj48L2Rpdj48
L3NwYW4+IHByb2R1Y2VzIGVtcHR5IHByZS9wb3N0IGJsb2NrcyB3aGVyZSBzdHJ1dCB3b24ndCBi
ZSBpbmplY3RlZC4KKyAgICAgICAgYXV0byBpc0luc2lkZUNvbnRpbnVhdGlvblByZU9yUG9zdEJs
b2NrID0gZm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCkuaXNBbm9ueW1vdXMoKTsKKyAgICAgICAg
YXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9ICFpc0luc2lkZUNvbnRpbnVhdGlvblBy
ZU9yUG9zdEJsb2NrICYmIGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsKKyAgICAgICAg
cmV0dXJuIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0OwogICAgIH0KICAgICBpZiAoaW5saW5l
TGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewogICAgICAgICAvLyA8YnI+IGluIG5vbi1zdGFu
ZGFyZCBtb2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlzIGVt
cHR5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv
SW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu
Zy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCA1MTAxM2Q4NGM0OTNhZDMwNjVmZmQyYjhmYjU3MWM3
NTM2Y2FlMjA4Li5lYzFlNmVlZGYwZWRlNWUyNWY0ZDFiOWQ5NTdjMjU1ZDRiZDllZTgzIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l
Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVMaW5lQm94LmNwcApAQCAtODMsOSArODMsOCBAQCBib29sIExpbmVCb3g6OklubGluZUxldmVs
Qm94OjpoYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSBjb25zdAogICAgIHJldHVybiB2ZXJ0
aWNhbEFsaWdubWVudCA9PSBWZXJ0aWNhbEFsaWduOjpUb3AgfHwgdmVydGljYWxBbGlnbm1lbnQg
PT0gVmVydGljYWxBbGlnbjo6Qm90dG9tOwogfQogCi1MaW5lQm94OjpMaW5lQm94KGNvbnN0IElu
bGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50
TG9naWNhbFdpZHRoLCBJc0xpbmVDb25zaWRlcmVkRW1wdHkgaXNMaW5lQ29uc2lkZXJlZEVtcHR5
LCBzaXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlv
dXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxX
aWR0aCwgc2l6ZV90IG51bWJlck9mUnVucykKICAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRv
cGxlZnQsIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSkKLSAg
ICAsIG1faXNDb25zaWRlcmVkRW1wdHkoaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID09IElzTGluZUNv
bnNpZGVyZWRFbXB0eTo6WWVzKQogewogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5y
ZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7CiAgICAgbV9pbmxpbmVMZXZlbEJv
eFJlY3RNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o
CmluZGV4IDVmZTU3NjY3ZTA4YjYwOTFkYjQzNmFlYzcxMzFiMzY2MDY4NzdmZmMuLmNlOTgwOTNh
ZTFmMTQ5NTM3OTcwYjY2YjY2NmU2Y2ZjYTE5ZjlmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTEyOCw4
ICsxMjgsNyBAQCBwdWJsaWM6CiAgICAgICAgIFR5cGUgbV90eXBlIHsgVHlwZTo6SW5saW5lQm94
IH07CiAgICAgfTsKIAotICAgIGVudW0gY2xhc3MgSXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgTm8s
IFllcyB9OwotICAgIExpbmVCb3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BM
ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgSXNMaW5lQ29uc2lkZXJlZEVtcHR5
LCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBv
aW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHNpemVf
dCBudW1iZXJPZlJ1bnMpOwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBj
b25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dp
Y2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7IH0KQEAgLTEz
OCw3ICsxMzcsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSgp
IGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxSZWN0KCkuc2l6ZSgpOyB9CiAKICAgICBPcHRpb25hbDxJ
bmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KCkgY29uc3QgeyByZXR1
cm4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OyB9Ci0gICAgYm9vbCBpc0NvbnNpZGVyZWRF
bXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNDb25zaWRlcmVkRW1wdHk7IH0KICAgICBib29sIGhh
c0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSW5saW5lQm94OyB9CiAKICAgICBjb25z
dCBJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBs
YXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICptX2lubGluZUxldmVsQm94UmVjdE1hcC5nZXQoJmxh
eW91dEJveCk7IH0KQEAgLTE2OSw3ICsxNjcsNiBAQCBwcml2YXRlOgogcHJpdmF0ZToKICAgICBJ
bmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4g
bV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OwotICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0
eSB7IHRydWUgfTsKICAgICBib29sIG1faGFzSW5saW5lQm94IHsgZmFsc2UgfTsKIAogICAgIHN0
ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4gbV9yb290SW5saW5lQm94OwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu
ZUJ1aWxkZXIuY3BwCmluZGV4IGE4YThmOTE4OTdkMzQxOTQ0YWMzMzU3OWUzYTAxNTIyNTJmYmNl
YWYuLmQxZjJkOTg5NTZiZWVkNzMzOGU1NmM5OTE4MmRiNmM4ZDM0M2M1ODQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM
aW5lQnVpbGRlci5jcHAKQEAgLTI2NCw3ICsyNjQsNiBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRl
bnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdl
JgogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAgICAsIG1fbGlu
ZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0
aCgpCi0gICAgICAgICwgbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkKICAgICAgICAgLCBpc0xh
c3RMaW5lCiAgICAgICAgICwgbV9saW5lLnJ1bnMoKX07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaApp
bmRleCBlNmY0ZTdlMTllMGU2Y2E5YTc3MzE5Y2E2NzBiMTQ3MmM1MWI2NjNkLi4xNmZjMzhlZjRj
N2I3ZmNjMTU0ZWZmZWE3ZTNjNzJjMTk4ZjEwNWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKQEAg
LTU3LDcgKzU3LDYgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2Fs
VG9wTGVmdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoOwogICAg
ICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7Ci0gICAgICAgIGJvb2wg
aXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwogICAgICAgICBib29sIGlzTGFzdExpbmVX
aXRoSW5saW5lQ29udGVudCB7IHRydWUgfTsKICAgICAgICAgY29uc3QgTGluZTo6UnVuTGlzdCYg
cnVuczsKICAgICB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417617</attachid>
            <date>2021-01-14 06:58:17 -0800</date>
            <delta_ts>2021-01-15 20:37:37 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210114065816.patch</filename>
            <type>text/plain</type>
            <size>8855</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmYjkxZmJiYmQ1Njlh
YWI0Mzc2YjdkOWU3NjFjYzc5MmY5YmJlMy4uMDkyMmQwNTMyNTEwN2I0OTdhNDYyZDk0MWZiNWM1
OTA1YjE1Yjk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTAxLTE0ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAocHJlKQor
ICAgICAgICAgIGlubGluZSBib3ggKHNwYW4pCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAoZGl2
KQorICAgICAgICBibG9jayBjb250YWluZXIgKHBvc3QpCisgICAgICAgICAgaW5saW5lIGJveCAo
c3BhbikKKworICAgICAgICBXaGlsZSB0aGUgbGluZXMgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhl
IHBvc3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCB0aGUgcmVhbCByZWFzb24KKyAgICAg
ICAgd2h5IHRoZXkgZG9uJ3QgdGFrZSB1cCBhbnkgcmVuZGVyaW5nIHNwYWNlIGlzIGJlY2F1c2Ug
dGhvc2UgYmxvY2sgY29udGFpbmVycyBhcmUgb25seSB0aGVyZSB0bworICAgICAgICBlbnN1cmUg
bm8gYmxvY2staW5saW5lIHNpYmxpbmcgbWl4LgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIGVu
YWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVkRW1wdHkoKS4KKworICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH
ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi
dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRl
TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOgorICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6
OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisgICAgICAgICog
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0
OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp
bmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVu
dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu
aDoKKwogMjAyMS0wMS0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg
ICAgIFtMRkNdW0lGQ11bUXVpcmtdIExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3Ig
Zm9yIGxpbmUgYnJlYWtzIG9uIG5vbi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t
ZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG
b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBjNmFiOGMzYjU5MWZkZTUyNTAxNGM3
MTQ4MDc0YzkyNDM2YTM0ZGM1Li4zMjRhZjY2ZTRhNzk1NzhiNTRiNjU3ZGQ1YmYxMmQ3M2Q5MjY2
NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J
bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw
cApAQCAtMTU4LDggKzE1OCw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0
IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9
IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRl
bnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5l
Q29udGVudC5jb250ZW50TG9naWNhbFdpZHRoOwotICAgIGF1dG8gaXNMaW5lQ29uc2lkZXJlZEVt
cHR5ID0gbGluZUNvbnRlbnQuaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID8gTGluZUJveDo6SXNMaW5l
Q29uc2lkZXJlZEVtcHR5OjpZZXMgOiBMaW5lQm94OjpJc0xpbmVDb25zaWRlcmVkRW1wdHk6Ok5v
OwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVm
dCwgY29udGVudExvZ2ljYWxXaWR0aCwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBydW5zLnNpemUo
KSB9OworICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9w
TGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsKIAogICAgIGlmIChhdXRv
IGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRP
ZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lk
dGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5l
Q29udGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgq
aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n
Q29udGV4dFF1aXJrcy5jcHAKaW5kZXggYmE3NzgzNDdmYTIzMzk4YmI3ZWNhYzExMzk5NTE0YTAw
YmMxNjVkNi4uZTU4NjkzYjlkZWI5YTgwOGUwZDk4OWFmZjNjZTQ1MGI4OGRkZGRjMCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0
dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm
b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNjUsOCArNjUs
MTEgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJv
eEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1
ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBhdXRvIGlubGluZUJveEhhc0lt
YWdpbmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpOwotICAgICAgICBy
ZXR1cm4gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgJiYgIWxpbmVCb3guaXNDb25zaWRlcmVk
RW1wdHkoKTsKKyAgICAgICAgLy8gVGhpcyBpcyBhbiBpbmxpbmUgYm94IHdpdGggbm8gY29udGVu
dC4gTGV0J3Mgc2VlIGlmIHRoZSBpbWFnaW5hcnkgc3RydXQgc3RyZXRjaGVzIHRoZSBpbmxpbmUg
Ym94LgorICAgICAgICAvLyA8c3Bhbj48ZGl2PjwvZGl2Pjwvc3Bhbj4gcHJvZHVjZXMgZW1wdHkg
cHJlL3Bvc3QgYmxvY2tzIHdoZXJlIHN0cnV0IHdvbid0IGJlIGluamVjdGVkLgorICAgICAgICBh
dXRvIGlzSW5zaWRlQ29udGludWF0aW9uUHJlT3JQb3N0QmxvY2sgPSBmb3JtYXR0aW5nQ29udGV4
dCgpLnJvb3QoKS5pc0Fub255bW91cygpOworICAgICAgICBhdXRvIGlubGluZUJveEhhc0ltYWdp
bmFyeVN0cnV0ID0gIWlzSW5zaWRlQ29udGludWF0aW9uUHJlT3JQb3N0QmxvY2sgJiYgbGF5b3V0
U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpOworICAgICAgICByZXR1cm4gaW5saW5lQm94SGFzSW1h
Z2luYXJ5U3RydXQ7CiAgICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGlu
ZUxldmVsQm94KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp
LmhlaWdodCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y
bWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCA1MTAxM2Q4NGM0OTNhZDMwNjVmZmQyYjhm
YjU3MWM3NTM2Y2FlMjA4Li5lYzFlNmVlZGYwZWRlNWUyNWY0ZDFiOWQ5NTdjMjU1ZDRiZDllZTgz
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVMaW5lQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu
Zy9JbmxpbmVMaW5lQm94LmNwcApAQCAtODMsOSArODMsOCBAQCBib29sIExpbmVCb3g6OklubGlu
ZUxldmVsQm94OjpoYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSBjb25zdAogICAgIHJldHVy
biB2ZXJ0aWNhbEFsaWdubWVudCA9PSBWZXJ0aWNhbEFsaWduOjpUb3AgfHwgdmVydGljYWxBbGln
bm1lbnQgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tOwogfQogCi1MaW5lQm94OjpMaW5lQm94KGNv
bnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBj
b250ZW50TG9naWNhbFdpZHRoLCBJc0xpbmVDb25zaWRlcmVkRW1wdHkgaXNMaW5lQ29uc2lkZXJl
ZEVtcHR5LCBzaXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBJbmxp
bmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExv
Z2ljYWxXaWR0aCwgc2l6ZV90IG51bWJlck9mUnVucykKICAgICA6IG1fbG9naWNhbFJlY3QobG9n
aWNhbFRvcGxlZnQsIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0g
fSkKLSAgICAsIG1faXNDb25zaWRlcmVkRW1wdHkoaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID09IElz
TGluZUNvbnNpZGVyZWRFbXB0eTo6WWVzKQogewogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94
TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7CiAgICAgbV9pbmxpbmVM
ZXZlbEJveFJlY3RNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu
ZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu
ZUJveC5oCmluZGV4IDVmZTU3NjY3ZTA4YjYwOTFkYjQzNmFlYzcxMzFiMzY2MDY4NzdmZmMuLmNl
OTgwOTNhZTFmMTQ5NTM3OTcwYjY2YjY2NmU2Y2ZjYTE5ZjlmOTggMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAg
LTEyOCw4ICsxMjgsNyBAQCBwdWJsaWM6CiAgICAgICAgIFR5cGUgbV90eXBlIHsgVHlwZTo6SW5s
aW5lQm94IH07CiAgICAgfTsKIAotICAgIGVudW0gY2xhc3MgSXNMaW5lQ29uc2lkZXJlZEVtcHR5
IHsgTm8sIFllcyB9OwotICAgIExpbmVCb3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2lj
YWxUb3BMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgSXNMaW5lQ29uc2lkZXJl
ZEVtcHR5LCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKKyAgICBMaW5lQm94KGNvbnN0IElubGluZUxh
eW91dFBvaW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgs
IHNpemVfdCBudW1iZXJPZlJ1bnMpOwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJl
Y3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5p
dCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7IH0K
QEAgLTEzOCw3ICsxMzcsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2Fs
U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxSZWN0KCkuc2l6ZSgpOyB9CiAKICAgICBPcHRp
b25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KCkgY29uc3Qg
eyByZXR1cm4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OyB9Ci0gICAgYm9vbCBpc0NvbnNp
ZGVyZWRFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNDb25zaWRlcmVkRW1wdHk7IH0KICAgICBi
b29sIGhhc0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSW5saW5lQm94OyB9CiAKICAg
ICBjb25zdCBJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3Qg
Qm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICptX2lubGluZUxldmVsQm94UmVjdE1hcC5n
ZXQoJmxheW91dEJveCk7IH0KQEAgLTE2OSw3ICsxNjcsNiBAQCBwcml2YXRlOgogcHJpdmF0ZToK
ICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0
VW5pdD4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OwotICAgIGJvb2wgbV9pc0NvbnNpZGVy
ZWRFbXB0eSB7IHRydWUgfTsKICAgICBib29sIG1faGFzSW5saW5lQm94IHsgZmFsc2UgfTsKIAog
ICAgIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4gbV9yb290SW5saW5lQm94OwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu
ZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGE4YThmOTE4OTdkMzQxOTQ0YWMzMzU3OWUzYTAxNTIy
NTJmYmNlYWYuLmQxZjJkOTg5NTZiZWVkNzMzOGU1NmM5OTE4MmRiNmM4ZDM0M2M1ODQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC
dWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J
bmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTI2NCw3ICsyNjQsNiBAQCBMaW5lQnVpbGRlcjo6TGlu
ZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRl
bVJhbmdlJgogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAgICAs
IG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExvZ2lj
YWxXaWR0aCgpCi0gICAgICAgICwgbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkKICAgICAgICAg
LCBpc0xhc3RMaW5lCiAgICAgICAgICwgbV9saW5lLnJ1bnMoKX07CiB9CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk
ZXIuaAppbmRleCBlNmY0ZTdlMTllMGU2Y2E5YTc3MzE5Y2E2NzBiMTQ3MmM1MWI2NjNkLi4xNmZj
MzhlZjRjN2I3ZmNjMTU0ZWZmZWE3ZTNjNzJjMTk4ZjEwNWJiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy
LmgKQEAgLTU3LDcgKzU3LDYgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRQb2ludCBs
b2dpY2FsVG9wTGVmdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRo
OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7Ci0gICAgICAg
IGJvb2wgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwogICAgICAgICBib29sIGlzTGFz
dExpbmVXaXRoSW5saW5lQ29udGVudCB7IHRydWUgfTsKICAgICAgICAgY29uc3QgTGluZTo6UnVu
TGlzdCYgcnVuczsKICAgICB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417757</attachid>
            <date>2021-01-15 20:37:39 -0800</date>
            <delta_ts>2021-01-15 20:43:27 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210115203738.patch</filename>
            <type>text/plain</type>
            <size>10410</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmYjkxZmJiYmQ1Njlh
YWI0Mzc2YjdkOWU3NjFjYzc5MmY5YmJlMy4uMDkyMmQwNTMyNTEwN2I0OTdhNDYyZDk0MWZiNWM1
OTA1YjE1Yjk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTAxLTE0ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAocHJlKQor
ICAgICAgICAgIGlubGluZSBib3ggKHNwYW4pCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAoZGl2
KQorICAgICAgICBibG9jayBjb250YWluZXIgKHBvc3QpCisgICAgICAgICAgaW5saW5lIGJveCAo
c3BhbikKKworICAgICAgICBXaGlsZSB0aGUgbGluZXMgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhl
IHBvc3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCB0aGUgcmVhbCByZWFzb24KKyAgICAg
ICAgd2h5IHRoZXkgZG9uJ3QgdGFrZSB1cCBhbnkgcmVuZGVyaW5nIHNwYWNlIGlzIGJlY2F1c2Ug
dGhvc2UgYmxvY2sgY29udGFpbmVycyBhcmUgb25seSB0aGVyZSB0bworICAgICAgICBlbnN1cmUg
bm8gYmxvY2staW5saW5lIHNpYmxpbmcgbWl4LgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIGVu
YWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVkRW1wdHkoKS4KKworICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH
ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi
dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRl
TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOgorICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6
OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisgICAgICAgICog
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0
OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp
bmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVu
dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu
aDoKKwogMjAyMS0wMS0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg
ICAgIFtMRkNdW0lGQ11bUXVpcmtdIExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3Ig
Zm9yIGxpbmUgYnJlYWtzIG9uIG5vbi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t
ZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG
b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBjNmFiOGMzYjU5MWZkZTUyNTAxNGM3
MTQ4MDc0YzkyNDM2YTM0ZGM1Li4zMjRhZjY2ZTRhNzk1NzhiNTRiNjU3ZGQ1YmYxMmQ3M2Q5MjY2
NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J
bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw
cApAQCAtMTU4LDggKzE1OCw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0
IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9
IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBsaW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRl
bnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5l
Q29udGVudC5jb250ZW50TG9naWNhbFdpZHRoOwotICAgIGF1dG8gaXNMaW5lQ29uc2lkZXJlZEVt
cHR5ID0gbGluZUNvbnRlbnQuaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID8gTGluZUJveDo6SXNMaW5l
Q29uc2lkZXJlZEVtcHR5OjpZZXMgOiBMaW5lQm94OjpJc0xpbmVDb25zaWRlcmVkRW1wdHk6Ok5v
OwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVm
dCwgY29udGVudExvZ2ljYWxXaWR0aCwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBydW5zLnNpemUo
KSB9OworICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyBsaW5lQ29udGVudC5sb2dpY2FsVG9w
TGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwgcnVucy5zaXplKCkgfTsKIAogICAgIGlmIChhdXRv
IGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRP
ZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxpbmVMb2dpY2FsV2lk
dGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5l
Q29udGVudCkpCiAgICAgICAgIGxpbmVCb3guc2V0SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgq
aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n
Q29udGV4dFF1aXJrcy5jcHAKaW5kZXggYmE3NzgzNDdmYTIzMzk4YmI3ZWNhYzExMzk5NTE0YTAw
YmMxNjVkNi4uMDQxMDc3MDAwYzQxMjIxZTRhYzhiNDMwYmYxNmI0NGVmNWI0YTFkYyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0
dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm
b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNjYsNyArNjYs
OSBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94
QWZmZWN0c0xpbmVCb3goY29uc3QgTGluZUJveAogICAgICAgICAgICAgfQogICAgICAgICB9CiAg
ICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgpLmlu
Tm9RdWlya3NNb2RlKCk7Ci0gICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1
dCAmJiAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOworICAgICAgICAvLyBJbmxpbmUgYm94
IHdpdGggc3RydXQgb25seSBzdGV0Y2hlcyB0aGUgbGluZSBib3ggd2hlbiBpdCBoYXMgYWRkaXRp
b25hbCBpbmxpbmUgbGV2ZWwgYm94ZXMgKG5vdCBpbmxpbmUgYm94ZXMpIG9yIHRoZSByb290IGlu
bGluZSBib3ggaGFzIGNvbnRlbnQuCisgICAgICAgIC8vIGUuZy4gPCFET0NUWVBFIGh0bWw+PGRp
diI+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTAwcHg7Ij48L3NwYW4+PGltZyBzcmM9ImZvbyIg
c3R5bGU9IndpZHRoOiAwcHg7IGhlaWdodDogMHB4OyI+PC9kaXY+CisgICAgICAgIHJldHVybiBp
bmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCAmJiAobGluZUJveC5oYXNOb25JbmxpbmVCb3goKSB8
fCBsaW5lQm94LnJvb3RJbmxpbmVCb3goKS5oYXNDb250ZW50KCkpOwogICAgIH0KICAgICBpZiAo
aW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpKSB7CiAgICAgICAgIGlmIChp
bmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5k
ZXggNTEwMTNkODRjNDkzYWQzMDY1ZmZkMmI4ZmI1NzFjNzUzNmNhZTIwOC4uMjM4NjVlYzk0YzZm
MWY4NjcwMmIzNWRiYTk4MzQwMDc4ZGZjNzZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKQEAgLTgzLDkg
KzgzLDggQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJlbGF0aXZl
QWxpZ25tZW50KCkgY29uc3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGlj
YWxBbGlnbjo6VG9wIHx8IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OkJvdHRv
bTsKIH0KIAotTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNh
bFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgSXNMaW5lQ29u
c2lkZXJlZEVtcHR5IGlzTGluZUNvbnNpZGVyZWRFbXB0eSwgc2l6ZV90IG51bWJlck9mUnVucykK
K0xpbmVCb3g6OkxpbmVCb3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BsZWZ0
LCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVfdCBudW1iZXJPZlJ1
bnMpCiAgICAgOiBtX2xvZ2ljYWxSZWN0KGxvZ2ljYWxUb3BsZWZ0LCBJbmxpbmVMYXlvdXRTaXpl
IHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0pCi0gICAgLCBtX2lzQ29uc2lkZXJlZEVtcHR5
KGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9PSBJc0xpbmVDb25zaWRlcmVkRW1wdHk6OlllcykKIHsK
ICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShu
dW1iZXJPZlJ1bnMpOwogICAgIG1faW5saW5lTGV2ZWxCb3hSZWN0TWFwLnJlc2VydmVJbml0aWFs
Q2FwYWNpdHkobnVtYmVyT2ZSdW5zKTsKQEAgLTk5LDcgKzk4LDcgQEAgdm9pZCBMaW5lQm94Ojph
ZGRSb290SW5saW5lQm94KHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4mJiByb290SW5s
aW5lQm94KQogCiB2b2lkIExpbmVCb3g6OmFkZElubGluZUxldmVsQm94KHN0ZDo6dW5pcXVlX3B0
cjxJbmxpbmVMZXZlbEJveD4mJiBpbmxpbmVMZXZlbEJveCkKIHsKLSAgICBtX2hhc0lubGluZUJv
eCA9IG1faGFzSW5saW5lQm94IHx8IGlubGluZUxldmVsQm94LT5pc0lubGluZUJveCgpOworICAg
IG1fYm94VHlwZXMuYWRkKGlubGluZUxldmVsQm94LT50eXBlKCkpOwogICAgIG1faW5saW5lTGV2
ZWxCb3hSZWN0TWFwLnNldCgmaW5saW5lTGV2ZWxCb3gtPmxheW91dEJveCgpLCBpbmxpbmVMZXZl
bEJveC5nZXQoKSk7CiAgICAgbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0LmFwcGVuZChXVEZN
b3ZlKGlubGluZUxldmVsQm94KSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv
dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv
dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggNWZlNTc2NjdlMDhiNjA5
MWRiNDM2YWVjNzEzMWIzNjYwNjg3N2ZmYy4uMTU2Yjk2YzI0ZmIxNDFjYWUyNWU0NjdiZDIxNjNi
NzYyYjM2ZDk2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm
b3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtOTAsMTMgKzkwLDE1IEBAIHB1YmxpYzoKICAg
ICAgICAgYm9vbCBpc0xpbmVCcmVha0JveCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBl
OjpMaW5lQnJlYWtCb3g7IH0KICAgICAgICAgYm9vbCBoYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1l
bnQoKSBjb25zdDsKIAotICAgICAgICBlbnVtIGNsYXNzIFR5cGUgewotICAgICAgICAgICAgSW5s
aW5lQm94LAotICAgICAgICAgICAgUm9vdElubGluZUJveCwKLSAgICAgICAgICAgIEF0b21pY0lu
bGluZUxldmVsQm94LAotICAgICAgICAgICAgTGluZUJyZWFrQm94LAotICAgICAgICAgICAgR2Vu
ZXJpY0lubGluZUxldmVsQm94CisgICAgICAgIGVudW0gY2xhc3MgVHlwZSA6IHVpbnQ4X3Qgewor
ICAgICAgICAgICAgSW5saW5lQm94ICAgICAgICAgICAgID0gMSA8PCAwLAorICAgICAgICAgICAg
Um9vdElubGluZUJveCAgICAgICAgID0gMSA8PCAxLAorICAgICAgICAgICAgQXRvbWljSW5saW5l
TGV2ZWxCb3ggID0gMSA8PCAyLAorICAgICAgICAgICAgTGluZUJyZWFrQm94ICAgICAgICAgID0g
MSA8PCAzLAorICAgICAgICAgICAgR2VuZXJpY0lubGluZUxldmVsQm94ID0gMSA8PCA0CiAgICAg
ICAgIH07CisgICAgICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQorCiAg
ICAgICAgIElubGluZUxldmVsQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNh
bExlZnQsIElubGluZUxheW91dFNpemUsIFR5cGUpOwogICAgICAgICBJbmxpbmVMZXZlbEJveCgp
ID0gZGVmYXVsdDsKIApAQCAtMTI4LDggKzEzMCw3IEBAIHB1YmxpYzoKICAgICAgICAgVHlwZSBt
X3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgZW51bSBjbGFzcyBJc0xp
bmVDb25zaWRlcmVkRW1wdHkgeyBObywgWWVzIH07Ci0gICAgTGluZUJveChjb25zdCBJbmxpbmVM
YXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo
LCBJc0xpbmVDb25zaWRlcmVkRW1wdHksIHNpemVfdCBudW1iZXJPZlJ1bnMpOworICAgIExpbmVC
b3goY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJbmxpbmVMYXlvdXRV
bml0IGxvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJlck9mUnVucyk7CiAKICAgICBjb25zdCBJbmxp
bmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KICAg
ICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxT
aXplKCkud2lkdGgoKTsgfQpAQCAtMTM4LDggKzEzOSw4IEBAIHB1YmxpYzoKICAgICBJbmxpbmVM
YXlvdXRTaXplIGxvZ2ljYWxTaXplKCkgY29uc3QgeyByZXR1cm4gbG9naWNhbFJlY3QoKS5zaXpl
KCk7IH0KIAogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1l
bnRPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQ7IH0K
LSAgICBib29sIGlzQ29uc2lkZXJlZEVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbnNpZGVy
ZWRFbXB0eTsgfQotICAgIGJvb2wgaGFzSW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9oYXNJ
bmxpbmVCb3g7IH0KKyAgICBib29sIGhhc0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94
VHlwZXMuY29udGFpbnMoSW5saW5lTGV2ZWxCb3g6OlR5cGU6OklubGluZUJveCk7IH0KKyAgICBi
b29sIGhhc05vbklubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94VHlwZXMuY29udGFpbnNB
bnkoeyBJbmxpbmVMZXZlbEJveDo6VHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gsIElubGluZUxl
dmVsQm94OjpUeXBlOjpMaW5lQnJlYWtCb3gsIElubGluZUxldmVsQm94OjpUeXBlOjpHZW5lcmlj
SW5saW5lTGV2ZWxCb3ggfSk7IH0KIAogICAgIGNvbnN0IElubGluZUxldmVsQm94JiBpbmxpbmVM
ZXZlbEJveEZvckxheW91dEJveChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QgeyByZXR1cm4g
Km1faW5saW5lTGV2ZWxCb3hSZWN0TWFwLmdldCgmbGF5b3V0Qm94KTsgfQogCkBAIC0xNjksOCAr
MTcwLDcgQEAgcHJpdmF0ZToKIHByaXZhdGU6CiAgICAgSW5saW5lUmVjdCBtX2xvZ2ljYWxSZWN0
OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9m
ZnNldDsKLSAgICBib29sIG1faXNDb25zaWRlcmVkRW1wdHkgeyB0cnVlIH07Ci0gICAgYm9vbCBt
X2hhc0lubGluZUJveCB7IGZhbHNlIH07CisgICAgT3B0aW9uU2V0PElubGluZUxldmVsQm94OjpU
eXBlPiBtX2JveFR5cGVzOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPElubGluZUxldmVsQm94PiBt
X3Jvb3RJbmxpbmVCb3g7CiAgICAgSW5saW5lTGV2ZWxCb3hMaXN0IG1fbm9uUm9vdElubGluZUxl
dmVsQm94TGlzdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp
bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBhOGE4ZjkxODk3ZDM0MTk0
NGFjMzM1NzllM2EwMTUyMjUyZmJjZWFmLi5kMWYyZDk4OTU2YmVlZDczMzhlNTZjOTkxODJkYjZj
OGQzNDNjNTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0
dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu
bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0yNjQsNyArMjY0LDYgQEAg
TGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50
KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC50b3BM
ZWZ0KCkKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpCiAgICAgICAgICwgbV9s
aW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKQotICAgICAgICAsIG1fbGluZS5pc0NvbnNpZGVyZWRF
bXB0eSgpCiAgICAgICAgICwgaXNMYXN0TGluZQogICAgICAgICAsIG1fbGluZS5ydW5zKCl9Owog
fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n
L0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggZTZmNGU3ZTE5ZTBlNmNhOWE3NzMxOWNhNjcwYjE0
NzJjNTFiNjYzZC4uMTZmYzM4ZWY0YzdiN2ZjYzE1NGVmZmVhN2UzYzcyYzE5OGYxMDViYiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu
ZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J
bmxpbmVMaW5lQnVpbGRlci5oCkBAIC01Nyw3ICs1Nyw2IEBAIHB1YmxpYzoKICAgICAgICAgSW5s
aW5lTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQ7CiAgICAgICAgIElubGluZUxheW91dFVuaXQg
bGluZUxvZ2ljYWxXaWR0aDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNh
bFdpZHRoOwotICAgICAgICBib29sIGlzTGluZUNvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKICAg
ICAgICAgYm9vbCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgeyB0cnVlIH07CiAgICAgICAg
IGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnM7CiAgICAgfTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417758</attachid>
            <date>2021-01-15 20:43:29 -0800</date>
            <delta_ts>2021-01-15 21:40:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210115204328.patch</filename>
            <type>text/plain</type>
            <size>10397</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE3NDBhYzEyMDQwYzYz
MjkzNWU0YzBlMDQ2NzkzMjBhNzgxMmQyYy4uMjViMDQ0NGQ5OWY2NTM3NWM3NzFkZjc4Y2FlNzY1
M2UwMjA1NDEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTAxLTE1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5k
IHBvc3QgYW5vbnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2lu
YXJ5IHN0cnV0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAg
ICAgPCFET0NUWVBFIGh0bWw+PHNwYW4+PGRpdj48L2Rpdj48L3NwYW4+IGdlbmVyYXRlcyB0aGUg
Zm9sbG93aW5nIGxheW91dCB0cmVlOgorCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAocHJlKQor
ICAgICAgICAgIGlubGluZSBib3ggKHNwYW4pCisgICAgICAgIGJsb2NrIGNvbnRhaW5lciAoZGl2
KQorICAgICAgICBibG9jayBjb250YWluZXIgKHBvc3QpCisgICAgICAgICAgaW5saW5lIGJveCAo
c3BhbikKKworICAgICAgICBXaGlsZSB0aGUgbGluZXMgZm9yIGJvdGggdGhlIHByZSBhbmQgdGhl
IHBvc3QgYmxvY2tzIGFyZSBjb25zaWRlcmVkIGVtcHR5LCB0aGUgcmVhbCByZWFzb24KKyAgICAg
ICAgd2h5IHRoZXkgZG9uJ3QgdGFrZSB1cCBhbnkgcmVuZGVyaW5nIHNwYWNlIGlzIGJlY2F1c2Ug
dGhvc2UgYmxvY2sgY29udGFpbmVycyBhcmUgb25seSB0aGVyZSB0bworICAgICAgICBlbnN1cmUg
bm8gYmxvY2staW5saW5lIHNpYmxpbmcgbWl4LgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIGVu
YWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVkRW1wdHkoKS4KKworICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH
ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi
dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb21wdXRl
TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkpOgorICAgICAg
ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6
OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisgICAgICAgICog
bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0
OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp
bmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg
ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVu
dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu
aDoKKwogMjAyMS0wMS0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K
IAogICAgICAgICBTY3JvbGwgcG9zaXRpb24gaXMgbG9zdCB3aGVuIGhvbWluZyBvdXQgYW5kIHJl
c3VtaW5nIFNhZmFyaSBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p
bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl
eHRHZW9tZXRyeS5jcHAKaW5kZXggMWExNTI1MTEzNTU0YjlmYjJkZWVkYjVhZDE2MjM2YzBlMWM0
NGVjOS4uMmY0N2I5NjQwMWFjY2FmODJhNjc0YmUwZTQ0OWQ5ODQyMDM0ZjlhNyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu
Z0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv
cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTE1OCw4ICsx
NTgsNyBAQCBMaW5lQm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6
TGluZUNvbnRlbnQmIGxpbmVDb250ZW50KQogICAgIGF1dG8mIHJ1bnMgPSBsaW5lQ29udGVudC5y
dW5zOwogICAgIGF1dG8gbGluZUxvZ2ljYWxXaWR0aCA9IGxpbmVDb250ZW50LmxpbmVMb2dpY2Fs
V2lkdGg7CiAgICAgYXV0byBjb250ZW50TG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQuY29udGVu
dExvZ2ljYWxXaWR0aDsKLSAgICBhdXRvIGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9IGxpbmVDb250
ZW50LmlzTGluZUNvbnNpZGVyZWRFbXB0eSA/IExpbmVCb3g6OklzTGluZUNvbnNpZGVyZWRFbXB0
eTo6WWVzIDogTGluZUJveDo6SXNMaW5lQ29uc2lkZXJlZEVtcHR5OjpObzsKLSAgICBhdXRvIGxp
bmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGNvbnRlbnRMb2dp
Y2FsV2lkdGgsIGlzTGluZUNvbnNpZGVyZWRFbXB0eSwgcnVucy5zaXplKCkgfTsKKyAgICBhdXRv
IGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGNvbnRlbnRM
b2dpY2FsV2lkdGgsIHJ1bnMuc2l6ZSgpIH07CiAKICAgICBpZiAoYXV0byBob3Jpem9udGFsQWxp
Z25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1bnMsIHJv
b3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9n
aWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpKQogICAg
ICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKmhvcml6b250YWxBbGln
bm1lbnRPZmZzZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv
cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu
Y3BwCmluZGV4IGY1MDM2YTI2MDcyZTQ3YTM0OTAyYmI2Yzc3MzkxMjVmODI5MDY5NTQuLmFjMzMz
MDEyNDQ3NmNiZTMzMTVkY2UwZTQyMGVjOTNhOTdhNjBiMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVp
cmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTY2LDcgKzY2LDkgQEAgYm9vbCBJbmxp
bmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94
KGNvbnN0IExpbmVCb3gKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBhdXRvIGlu
bGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUoKS5pblN0YW5kYXJkc01vZGUo
KTsKLSAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ICYmICFsaW5lQm94
LmlzQ29uc2lkZXJlZEVtcHR5KCk7CisgICAgICAgIC8vIElubGluZSBib3ggd2l0aCBzdHJ1dCBv
bmx5IHN0ZXRjaGVzIHRoZSBsaW5lIGJveCB3aGVuIGl0IGhhcyBhZGRpdGlvbmFsIGlubGluZSBs
ZXZlbCBib3hlcyAobm90IGlubGluZSBib3hlcykgb3IgdGhlIHJvb3QgaW5saW5lIGJveCBoYXMg
Y29udGVudC4KKyAgICAgICAgLy8gZS5nLiA8IURPQ1RZUEUgaHRtbD48ZGl2Ij48c3BhbiBzdHls
ZT0iZm9udC1zaXplOiAxMDBweDsiPjwvc3Bhbj48aW1nIHNyYz0iZm9vIiBzdHlsZT0id2lkdGg6
IDBweDsgaGVpZ2h0OiAwcHg7Ij48L2Rpdj4KKyAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0lt
YWdpbmFyeVN0cnV0ICYmIChsaW5lQm94Lmhhc05vbklubGluZUJveCgpIHx8IGxpbmVCb3gucm9v
dElubGluZUJveCgpLmhhc0NvbnRlbnQoKSk7CiAgICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJv
eC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94
LmxheW91dEJvdW5kcygpLmhlaWdodCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5
b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCA1MTAxM2Q4NGM0
OTNhZDMwNjVmZmQyYjhmYjU3MWM3NTM2Y2FlMjA4Li4yMzg2NWVjOTRjNmYxZjg2NzAyYjM1ZGJh
OTgzNDAwNzhkZmM3NmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAtODMsOSArODMsOCBAQCBib29s
IExpbmVCb3g6OklubGluZUxldmVsQm94OjpoYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSBj
b25zdAogICAgIHJldHVybiB2ZXJ0aWNhbEFsaWdubWVudCA9PSBWZXJ0aWNhbEFsaWduOjpUb3Ag
fHwgdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tOwogfQogCi1MaW5l
Qm94OjpMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5s
aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBJc0xpbmVDb25zaWRlcmVkRW1wdHkg
aXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBzaXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGlu
ZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91
dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJlck9mUnVucykKICAgICA6IG1f
bG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9n
aWNhbFdpZHRoLCB7IH0gfSkKLSAgICAsIG1faXNDb25zaWRlcmVkRW1wdHkoaXNMaW5lQ29uc2lk
ZXJlZEVtcHR5ID09IElzTGluZUNvbnNpZGVyZWRFbXB0eTo6WWVzKQogewogICAgIG1fbm9uUm9v
dElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7
CiAgICAgbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1i
ZXJPZlJ1bnMpOwpAQCAtOTksNyArOTgsNyBAQCB2b2lkIExpbmVCb3g6OmFkZFJvb3RJbmxpbmVC
b3goc3RkOjp1bmlxdWVfcHRyPElubGluZUxldmVsQm94PiYmIHJvb3RJbmxpbmVCb3gpCiAKIHZv
aWQgTGluZUJveDo6YWRkSW5saW5lTGV2ZWxCb3goc3RkOjp1bmlxdWVfcHRyPElubGluZUxldmVs
Qm94PiYmIGlubGluZUxldmVsQm94KQogewotICAgIG1faGFzSW5saW5lQm94ID0gbV9oYXNJbmxp
bmVCb3ggfHwgaW5saW5lTGV2ZWxCb3gtPmlzSW5saW5lQm94KCk7CisgICAgbV9ib3hUeXBlcy5h
ZGQoaW5saW5lTGV2ZWxCb3gtPnR5cGUoKSk7CiAgICAgbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAu
c2V0KCZpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm94KCksIGlubGluZUxldmVsQm94LmdldCgpKTsK
ICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExpc3QuYXBwZW5kKFdURk1vdmUoaW5saW5lTGV2
ZWxCb3gpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt
YXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA1ZmU1NzY2N2UwOGI2MDkxZGI0MzZhZWM3MTMx
YjM2NjA2ODc3ZmZjLi4xNTZiOTZjMjRmYjE0MWNhZTI1ZTQ2N2JkMjE2M2I3NjJiMzZkOTYyIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM
aW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lTGluZUJveC5oCkBAIC05MCwxMyArOTAsMTUgQEAgcHVibGljOgogICAgICAgICBib29sIGlz
TGluZUJyZWFrQm94KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6OkxpbmVCcmVha0Jv
eDsgfQogICAgICAgICBib29sIGhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpIGNvbnN0Owog
Ci0gICAgICAgIGVudW0gY2xhc3MgVHlwZSB7Ci0gICAgICAgICAgICBJbmxpbmVCb3gsCi0gICAg
ICAgICAgICBSb290SW5saW5lQm94LAotICAgICAgICAgICAgQXRvbWljSW5saW5lTGV2ZWxCb3gs
Ci0gICAgICAgICAgICBMaW5lQnJlYWtCb3gsCi0gICAgICAgICAgICBHZW5lcmljSW5saW5lTGV2
ZWxCb3gKKyAgICAgICAgZW51bSBjbGFzcyBUeXBlIDogdWludDhfdCB7CisgICAgICAgICAgICBJ
bmxpbmVCb3ggICAgICAgICAgICAgPSAxIDw8IDAsCisgICAgICAgICAgICBSb290SW5saW5lQm94
ICAgICAgICAgPSAxIDw8IDEsCisgICAgICAgICAgICBBdG9taWNJbmxpbmVMZXZlbEJveCAgPSAx
IDw8IDIsCisgICAgICAgICAgICBMaW5lQnJlYWtCb3ggICAgICAgICAgPSAxIDw8IDMsCisgICAg
ICAgICAgICBHZW5lcmljSW5saW5lTGV2ZWxCb3ggPSAxIDw8IDQKICAgICAgICAgfTsKKyAgICAg
ICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CisKICAgICAgICAgSW5saW5l
TGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5l
TGF5b3V0U2l6ZSwgVHlwZSk7CiAgICAgICAgIElubGluZUxldmVsQm94KCkgPSBkZWZhdWx0Owog
CkBAIC0xMjgsOCArMTMwLDcgQEAgcHVibGljOgogICAgICAgICBUeXBlIG1fdHlwZSB7IFR5cGU6
OklubGluZUJveCB9OwogICAgIH07CiAKLSAgICBlbnVtIGNsYXNzIElzTGluZUNvbnNpZGVyZWRF
bXB0eSB7IE5vLCBZZXMgfTsKLSAgICBMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50JiBs
b2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIElzTGluZUNvbnNp
ZGVyZWRFbXB0eSwgc2l6ZV90IG51bWJlck9mUnVucyk7CisgICAgTGluZUJveChjb25zdCBJbmxp
bmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdp
ZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKIAogICAgIGNvbnN0IElubGluZVJlY3QmIGxvZ2lj
YWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdDsgfQogICAgIElubGluZUxheW91
dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbG9naWNhbFNpemUoKS53aWR0aCgp
OyB9CkBAIC0xMzgsOCArMTM5LDggQEAgcHVibGljOgogICAgIElubGluZUxheW91dFNpemUgbG9n
aWNhbFNpemUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnNpemUoKTsgfQogCiAgICAg
T3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpIGNv
bnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsgfQotICAgIGJvb2wgaXND
b25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29uc2lkZXJlZEVtcHR5OyB9Ci0g
ICAgYm9vbCBoYXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX2hhc0lubGluZUJveDsgfQor
ICAgIGJvb2wgaGFzSW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9ib3hUeXBlcy5jb250YWlu
cyhJbmxpbmVMZXZlbEJveDo6VHlwZTo6SW5saW5lQm94KTsgfQorICAgIGJvb2wgaGFzTm9uSW5s
aW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9ib3hUeXBlcy5jb250YWluc0FueSh7IElubGluZUxl
dmVsQm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6
OkxpbmVCcmVha0JveCwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6OkdlbmVyaWNJbmxpbmVMZXZlbEJv
eCB9KTsgfQogCiAgICAgY29uc3QgSW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94Rm9yTGF5
b3V0Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiAqbV9pbmxpbmVMZXZl
bEJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAKQEAgLTE2OSw4ICsxNzAsNyBAQCBwcml2
YXRlOgogcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgT3B0aW9u
YWw8SW5saW5lTGF5b3V0VW5pdD4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OwotICAgIGJv
b2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKLSAgICBib29sIG1faGFzSW5saW5lQm94
IHsgZmFsc2UgfTsKKyAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxCb3g6OlR5cGU+IG1fYm94VHlw
ZXM7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lTGV2ZWxCb3g+IG1fcm9vdElubGluZUJv
eDsKICAgICBJbmxpbmVMZXZlbEJveExpc3QgbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0Owpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l
TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv
SW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGE4YThmOTE4OTdkMzQxOTQ0YWMzMzU3OWUzYTAx
NTIyNTJmYmNlYWYuLmQxZjJkOTg5NTZiZWVkNzMzOGU1NmM5OTE4MmRiNmM4ZDM0M2M1ODQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp
bmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu
Zy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTI2NCw3ICsyNjQsNiBAQCBMaW5lQnVpbGRlcjo6
TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5l
SXRlbVJhbmdlJgogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAg
ICAsIG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExv
Z2ljYWxXaWR0aCgpCi0gICAgICAgICwgbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkKICAgICAg
ICAgLCBpc0xhc3RMaW5lCiAgICAgICAgICwgbV9saW5lLnJ1bnMoKX07CiB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl
ci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1
aWxkZXIuaAppbmRleCBlNmY0ZTdlMTllMGU2Y2E5YTc3MzE5Y2E2NzBiMTQ3MmM1MWI2NjNkLi4x
NmZjMzhlZjRjN2I3ZmNjMTU0ZWZmZWE3ZTNjNzJjMTk4ZjEwNWJiIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls
ZGVyLmgKQEAgLTU3LDcgKzU3LDYgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRQb2lu
dCBsb2dpY2FsVG9wTGVmdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdp
ZHRoOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGg7Ci0gICAg
ICAgIGJvb2wgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwogICAgICAgICBib29sIGlz
TGFzdExpbmVXaXRoSW5saW5lQ29udGVudCB7IHRydWUgfTsKICAgICAgICAgY29uc3QgTGluZTo6
UnVuTGlzdCYgcnVuczsKICAgICB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417761</attachid>
            <date>2021-01-15 21:40:27 -0800</date>
            <delta_ts>2021-01-16 06:28:44 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220259-20210115214027.patch</filename>
            <type>text/plain</type>
            <size>10757</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE3NDBhYzEyMDQwYzYz
MjkzNWU0YzBlMDQ2NzkzMjBhNzgxMmQyYy4uOTc5ZDk5ZDFiMTEwYjhkMjYwODcwOTA0ZGRhYjhk
NmNmNDhhY2FmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIxLTAxLTE1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg
dXNlIExpbmVCb3g6OmlzQ29uc2lkZXJlZEVtcHR5IHdoZW4gY2hlY2tpbmcgaWYgaW5saW5lIGJv
eCBzdHJldGNoZXMgdGhlIGxpbmUgYm94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29p
dmlzdG8uCisKKyAgICAgICAgMS4gSW5saW5lIGJveCBhbHdheXMgaGF2ZSBhIHN0cnV0IGluIHN0
YW5kYXJkcyBtb2RlIGFuZCBpdCBzdHJldGNoZXMgdGhlIGxpbmUgYm94IGV2ZW4gd2hlbiB0aGUg
aW5saW5lIGJveCBpdHNlbGYgaGFzIG5vIGNvbnRlbnQuCisgICAgICAgIDwhRE9DVFlQRSBodG1s
PjxkaXY+dGhpcyBpcyBhIH4xMDBweCB0YWxsIGxpbmU8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAx
MDBweDsiPjwvc3Bhbj48L2Rpdj4KKworICAgICAgICAyLiBleGNlcHQgd2hlbiB0aGUgbGluZSBp
cyBjb21wbGV0ZWx5IGVtcHR5ICh0aGUgaW5saW5lIGJveCBzdGlsbCBoYXMgYSBzdHJ1dCBidXQg
aXQgZG9lcyBub3QgYWZmZWN0IHRoZSBsaW5lIGJveCkuCisgICAgICAgIDwhRE9DVFlQRSBodG1s
PjxkaXY+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTAwcHg7Ij48L3NwYW4+PHNwYW4gc3R5bGU9
ImZvbnQtc2l6ZTogMjAwcHg7Ij48L3NwYW4+PC9kaXY+CisKKyAgICAgICAgMy4gYnV0IG5vdCBl
bXB0eSBsaWtlIHRoaXM6CisgICAgICAgIDwhRE9DVFlQRSBodG1sPjxkaXY+PHNwYW4gc3R5bGU9
ImZvbnQtc2l6ZTogMTAwcHg7Ij48L3NwYW4+PGJyPjwvZGl2PgorCisgICAgICAgIDQuIG9yIHRo
aXM6CisgICAgICAgIDwhRE9DVFlQRSBodG1sPjxkaXY+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTog
MTAwcHg7Ij48L3NwYW4+PGltZyBzcmM9ImZvbyIgc3R5bGU9IndpZHRoOiAwcHg7IGhlaWdodDog
MHB4OyI+PC9kaXY+CisKKyAgICAgICAgV2hpbGUgIzIgcHJvZHVjZXMgYSAwcHggdGFsbCBsaW5l
IGJveCwgIzEsICMzIGFuZCAjNCBwcm9kdWNlIH4xMDBweCB0YWxsIGxpbmVzLgorICAgICAgICBU
aGlzIGNoYW5nZSBhbHNvIGVuYWJsZXMgdXMgdG8gcmVtb3ZlIExpbmVCb3g6aXNDb25zaWRlcmVk
RW1wdHkoKS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h
dHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l
Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6
OkxpbmVCb3hCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC
b3hCdWlsZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1Zl
cnRpY2FsbHkpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h
dHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l
Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCBj
b25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAg
ICAoV2ViQ29yZTo6TGF5b3V0OjptX2lzQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAg
ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgIChX
ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3Qp
OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBj
b25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l
TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6
bGF5b3V0SW5saW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv
SW5saW5lTGluZUJ1aWxkZXIuaDoKKwogMjAyMS0wMS0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24u
ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTY3JvbGwgcG9zaXRpb24gaXMgbG9zdCB3aGVu
IGhvbWluZyBvdXQgYW5kIHJlc3VtaW5nIFNhZmFyaSBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0
R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s
aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggMWExNTI1MTEzNTU0YjlmYjJk
ZWVkYjVhZDE2MjM2YzBlMWM0NGVjOS4uMmY0N2I5NjQwMWFjY2FmODJhNjc0YmUwZTQ0OWQ5ODQy
MDM0ZjlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp
bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy
eS5jcHAKQEAgLTE1OCw4ICsxNTgsNyBAQCBMaW5lQm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChj
b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50KQogICAgIGF1dG8mIHJ1
bnMgPSBsaW5lQ29udGVudC5ydW5zOwogICAgIGF1dG8gbGluZUxvZ2ljYWxXaWR0aCA9IGxpbmVD
b250ZW50LmxpbmVMb2dpY2FsV2lkdGg7CiAgICAgYXV0byBjb250ZW50TG9naWNhbFdpZHRoID0g
bGluZUNvbnRlbnQuY29udGVudExvZ2ljYWxXaWR0aDsKLSAgICBhdXRvIGlzTGluZUNvbnNpZGVy
ZWRFbXB0eSA9IGxpbmVDb250ZW50LmlzTGluZUNvbnNpZGVyZWRFbXB0eSA/IExpbmVCb3g6Oklz
TGluZUNvbnNpZGVyZWRFbXB0eTo6WWVzIDogTGluZUJveDo6SXNMaW5lQ29uc2lkZXJlZEVtcHR5
OjpObzsKLSAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNhbFRv
cExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGlzTGluZUNvbnNpZGVyZWRFbXB0eSwgcnVucy5z
aXplKCkgfTsKKyAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgbGluZUNvbnRlbnQubG9naWNh
bFRvcExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIHJ1bnMuc2l6ZSgpIH07CiAKICAgICBpZiAo
YXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25t
ZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNh
bFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElu
bGluZUNvbnRlbnQpKQogICAgICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGlnbm1lbnRPZmZz
ZXQoKmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu
Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0
dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IGY1MDM2YTI2MDcyZTQ3YTM0OTAyYmI2Yzc3Mzkx
MjVmODI5MDY5NTQuLmFjMzMzMDEyNDQ3NmNiZTMzMTVkY2UwZTQyMGVjOTNhOTdhNjBiMWQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv
cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s
aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTY2LDcg
KzY2LDkgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZl
bEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAgICAgICAgIH0KICAgICAgICAg
fQogICAgICAgICBhdXRvIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUo
KS5pblN0YW5kYXJkc01vZGUoKTsKLSAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0ltYWdpbmFy
eVN0cnV0ICYmICFsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7CisgICAgICAgIC8vIElubGlu
ZSBib3ggd2l0aCBzdHJ1dCBvbmx5IHN0ZXRjaGVzIHRoZSBsaW5lIGJveCB3aGVuIGl0IGhhcyBh
ZGRpdGlvbmFsIGlubGluZSBsZXZlbCBib3hlcyAobm90IGlubGluZSBib3hlcykgb3IgdGhlIHJv
b3QgaW5saW5lIGJveCBoYXMgY29udGVudC4KKyAgICAgICAgLy8gZS5nLiA8IURPQ1RZUEUgaHRt
bD48ZGl2Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxMDBweDsiPjwvc3Bhbj48aW1nIHNyYz0i
Zm9vIiBzdHlsZT0id2lkdGg6IDBweDsgaGVpZ2h0OiAwcHg7Ij48L2Rpdj4KKyAgICAgICAgcmV0
dXJuIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ICYmIChsaW5lQm94Lmhhc05vbklubGluZUJv
eCgpIHx8IGxpbmVCb3gucm9vdElubGluZUJveCgpLmhhc0NvbnRlbnQoKSk7CiAgICAgfQogICAg
IGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKICAgICAgICAg
aWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgpKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw
cAppbmRleCA1MTAxM2Q4NGM0OTNhZDMwNjVmZmQyYjhmYjU3MWM3NTM2Y2FlMjA4Li4yMzg2NWVj
OTRjNmYxZjg2NzAyYjM1ZGJhOTgzNDAwNzhkZmM3NmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAt
ODMsOSArODMsOCBAQCBib29sIExpbmVCb3g6OklubGluZUxldmVsQm94OjpoYXNMaW5lQm94UmVs
YXRpdmVBbGlnbm1lbnQoKSBjb25zdAogICAgIHJldHVybiB2ZXJ0aWNhbEFsaWdubWVudCA9PSBW
ZXJ0aWNhbEFsaWduOjpUb3AgfHwgdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGljYWxBbGlnbjo6
Qm90dG9tOwogfQogCi1MaW5lQm94OjpMaW5lQm94KGNvbnN0IElubGluZUxheW91dFBvaW50JiBs
b2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBJc0xp
bmVDb25zaWRlcmVkRW1wdHkgaXNMaW5lQ29uc2lkZXJlZEVtcHR5LCBzaXplX3QgbnVtYmVyT2ZS
dW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRv
cGxlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90IG51bWJl
ck9mUnVucykKICAgICA6IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElubGluZUxheW91
dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSkKLSAgICAsIG1faXNDb25zaWRlcmVk
RW1wdHkoaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID09IElzTGluZUNvbnNpZGVyZWRFbXB0eTo6WWVz
KQogewogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFj
aXR5KG51bWJlck9mUnVucyk7CiAgICAgbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAucmVzZXJ2ZUlu
aXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwpAQCAtOTksNyArOTgsNyBAQCB2b2lkIExpbmVC
b3g6OmFkZFJvb3RJbmxpbmVCb3goc3RkOjp1bmlxdWVfcHRyPElubGluZUxldmVsQm94PiYmIHJv
b3RJbmxpbmVCb3gpCiAKIHZvaWQgTGluZUJveDo6YWRkSW5saW5lTGV2ZWxCb3goc3RkOjp1bmlx
dWVfcHRyPElubGluZUxldmVsQm94PiYmIGlubGluZUxldmVsQm94KQogewotICAgIG1faGFzSW5s
aW5lQm94ID0gbV9oYXNJbmxpbmVCb3ggfHwgaW5saW5lTGV2ZWxCb3gtPmlzSW5saW5lQm94KCk7
CisgICAgbV9ib3hUeXBlcy5hZGQoaW5saW5lTGV2ZWxCb3gtPnR5cGUoKSk7CiAgICAgbV9pbmxp
bmVMZXZlbEJveFJlY3RNYXAuc2V0KCZpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm94KCksIGlubGlu
ZUxldmVsQm94LmdldCgpKTsKICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExpc3QuYXBwZW5k
KFdURk1vdmUoaW5saW5lTGV2ZWxCb3gpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA1ZmU1NzY2N2Uw
OGI2MDkxZGI0MzZhZWM3MTMxYjM2NjA2ODc3ZmZjLi4xNTZiOTZjMjRmYjE0MWNhZTI1ZTQ2N2Jk
MjE2M2I3NjJiMzZkOTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l
Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu
bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC05MCwxMyArOTAsMTUgQEAgcHVibGlj
OgogICAgICAgICBib29sIGlzTGluZUJyZWFrQm94KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09
IFR5cGU6OkxpbmVCcmVha0JveDsgfQogICAgICAgICBib29sIGhhc0xpbmVCb3hSZWxhdGl2ZUFs
aWdubWVudCgpIGNvbnN0OwogCi0gICAgICAgIGVudW0gY2xhc3MgVHlwZSB7Ci0gICAgICAgICAg
ICBJbmxpbmVCb3gsCi0gICAgICAgICAgICBSb290SW5saW5lQm94LAotICAgICAgICAgICAgQXRv
bWljSW5saW5lTGV2ZWxCb3gsCi0gICAgICAgICAgICBMaW5lQnJlYWtCb3gsCi0gICAgICAgICAg
ICBHZW5lcmljSW5saW5lTGV2ZWxCb3gKKyAgICAgICAgZW51bSBjbGFzcyBUeXBlIDogdWludDhf
dCB7CisgICAgICAgICAgICBJbmxpbmVCb3ggICAgICAgICAgICAgPSAxIDw8IDAsCisgICAgICAg
ICAgICBSb290SW5saW5lQm94ICAgICAgICAgPSAxIDw8IDEsCisgICAgICAgICAgICBBdG9taWNJ
bmxpbmVMZXZlbEJveCAgPSAxIDw8IDIsCisgICAgICAgICAgICBMaW5lQnJlYWtCb3ggICAgICAg
ICAgPSAxIDw8IDMsCisgICAgICAgICAgICBHZW5lcmljSW5saW5lTGV2ZWxCb3ggPSAxIDw8IDQK
ICAgICAgICAgfTsKKyAgICAgICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9
CisKICAgICAgICAgSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBs
b2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSwgVHlwZSk7CiAgICAgICAgIElubGluZUxldmVs
Qm94KCkgPSBkZWZhdWx0OwogCkBAIC0xMjgsOCArMTMwLDcgQEAgcHVibGljOgogICAgICAgICBU
eXBlIG1fdHlwZSB7IFR5cGU6OklubGluZUJveCB9OwogICAgIH07CiAKLSAgICBlbnVtIGNsYXNz
IElzTGluZUNvbnNpZGVyZWRFbXB0eSB7IE5vLCBZZXMgfTsKLSAgICBMaW5lQm94KGNvbnN0IElu
bGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs
V2lkdGgsIElzTGluZUNvbnNpZGVyZWRFbXB0eSwgc2l6ZV90IG51bWJlck9mUnVucyk7CisgICAg
TGluZUJveChjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElubGluZUxh
eW91dFVuaXQgbG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZSdW5zKTsKIAogICAgIGNvbnN0
IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdDsg
fQogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbG9n
aWNhbFNpemUoKS53aWR0aCgpOyB9CkBAIC0xMzgsOCArMTM5LDggQEAgcHVibGljOgogICAgIElu
bGluZUxheW91dFNpemUgbG9naWNhbFNpemUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgp
LnNpemUoKTsgfQogCiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFs
aWdubWVudE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNl
dDsgfQotICAgIGJvb2wgaXNDb25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29u
c2lkZXJlZEVtcHR5OyB9Ci0gICAgYm9vbCBoYXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBt
X2hhc0lubGluZUJveDsgfQorICAgIGJvb2wgaGFzSW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4g
bV9ib3hUeXBlcy5jb250YWlucyhJbmxpbmVMZXZlbEJveDo6VHlwZTo6SW5saW5lQm94KTsgfQor
ICAgIGJvb2wgaGFzTm9uSW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9ib3hUeXBlcy5jb250
YWluc0FueSh7IElubGluZUxldmVsQm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwgSW5s
aW5lTGV2ZWxCb3g6OlR5cGU6OkxpbmVCcmVha0JveCwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6Okdl
bmVyaWNJbmxpbmVMZXZlbEJveCB9KTsgfQogCiAgICAgY29uc3QgSW5saW5lTGV2ZWxCb3gmIGlu
bGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJl
dHVybiAqbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAKQEAgLTE2
OSw4ICsxNzAsNyBAQCBwcml2YXRlOgogcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9naWNh
bFJlY3Q7CiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9ob3Jpem9udGFsQWxpZ25t
ZW50T2Zmc2V0OwotICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKLSAgICBi
b29sIG1faGFzSW5saW5lQm94IHsgZmFsc2UgfTsKKyAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxC
b3g6OlR5cGU+IG1fYm94VHlwZXM7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lTGV2ZWxC
b3g+IG1fcm9vdElubGluZUJveDsKICAgICBJbmxpbmVMZXZlbEJveExpc3QgbV9ub25Sb290SW5s
aW5lTGV2ZWxCb3hMaXN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu
ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0
L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGE4YThmOTE4OTdk
MzQxOTQ0YWMzMzU3OWUzYTAxNTIyNTJmYmNlYWYuLmQxZjJkOTg5NTZiZWVkNzMzOGU1NmM5OTE4
MmRiNmM4ZDM0M2M1ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm
b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv
dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTI2NCw3ICsyNjQs
NiBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNv
bnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0
LnRvcExlZnQoKQogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAg
LCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpCi0gICAgICAgICwgbV9saW5lLmlzQ29uc2lk
ZXJlZEVtcHR5KCkKICAgICAgICAgLCBpc0xhc3RMaW5lCiAgICAgICAgICwgbV9saW5lLnJ1bnMo
KX07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu
Zy9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h
dHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCBlNmY0ZTdlMTllMGU2Y2E5YTc3MzE5Y2E2
NzBiMTQ3MmM1MWI2NjNkLi4xNmZjMzhlZjRjN2I3ZmNjMTU0ZWZmZWE3ZTNjNzJjMTk4ZjEwNWJi
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp
bmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0
aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKQEAgLTU3LDcgKzU3LDYgQEAgcHVibGljOgogICAgICAg
ICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdDsKICAgICAgICAgSW5saW5lTGF5b3V0
VW5pdCBsaW5lTG9naWNhbFdpZHRoOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM
b2dpY2FsV2lkdGg7Ci0gICAgICAgIGJvb2wgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9
OwogICAgICAgICBib29sIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCB7IHRydWUgfTsKICAg
ICAgICAgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVuczsKICAgICB9Owo=
</data>

          </attachment>
      

    </bug>

</bugzilla>