<?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>226365</bug_id>
          
          <creation_ts>2021-05-27 20:44:09 -0700</creation_ts>
          <short_desc>[LFC][TFC] Do not include vertical spacing when resolving percent height for table content</short_desc>
          <delta_ts>2021-05-29 06:39:06 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>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>
          <dependson>226378</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="alan">zalan</reporter>
          <assigned_to name="alan">zalan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>commit-queue</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>1764652</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-05-27 20:44:09 -0700</bug_when>
    <thetext>ssia</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764653</commentid>
    <comment_count>1</comment_count>
      <attachid>429980</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-05-27 20:49:43 -0700</bug_when>
    <thetext>Created attachment 429980
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764756</commentid>
    <comment_count>2</comment_count>
      <attachid>430010</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-05-28 07:52:17 -0700</bug_when>
    <thetext>Created attachment 430010
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764774</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-05-28 08:59:16 -0700</bug_when>
    <thetext>Committed r278199 (238242@main): &lt;https://commits.webkit.org/238242@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430010.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764776</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-05-28 09:00:20 -0700</bug_when>
    <thetext>&lt;rdar://problem/78620034&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764783</commentid>
    <comment_count>5</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2021-05-28 09:22:58 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 226378</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765075</commentid>
    <comment_count>6</comment_count>
      <attachid>430090</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-05-29 05:16:48 -0700</bug_when>
    <thetext>Created attachment 430090
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765076</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-05-29 06:39:04 -0700</bug_when>
    <thetext>Committed r278239 (238276@main): &lt;https://commits.webkit.org/238276@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430090.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429980</attachid>
            <date>2021-05-27 20:49:43 -0700</date>
            <delta_ts>2021-05-28 07:52:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226365-20210527204942.patch</filename>
            <type>text/plain</type>
            <size>14967</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM5ZjQ3MTUyYjRlZDk1
MjhlYjU2OTIxZWFkMGE2ZWM5MWY2NzE2Zi4uZDE2ZGI0YjFhY2E4MjgwZmRhMDRlYTRkMTEyNmIw
YjZkNTg5NjlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI3ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBp
bmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcgd2hlbiByZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9y
IHRhYmxlIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyNjM2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIDx0YWJsZSBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYm9yZGVyLXNwYWNpbmc6IDEwcHg7
Ij48dHI+PHRkIHN0eWxlPSJoZWlnaHQ6IDEwMCUiPjwvdGQ+PC90cj48L3RhYmxlPgorICAgICAg
ICBUaGUgPHRkPidzIDEwMCUgaGVpZ2h0IGlzIHJlc29sdmVkIGFnYWluc3QgMTAwcHggLSAoMiAq
IDEwcHgpIC0+IDgwcHg7CisKKyAgICAgICAgVGVzdDogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u
dGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy5odG1sCisKKyAgICAg
ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRl
eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0
OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv
bnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9y
bWF0dGluZ0dlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0
aW5nR2VvbWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlciBjb25zdCk6CisgICAgICAgICogbGF5b3V0
L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgorICAg
ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0dGlu
Z0NvbnRleHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6
VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpoZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9j
a1dpdGhGaXhlZEhlaWdodCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250
ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaDoKKyAgICAgICAgKFdlYkNvcmU6Okxh
eW91dDo6VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpmb3JtYXR0aW5nQ29udGV4dCBjb25zdCk6CisK
IDIwMjEtMDUtMjcgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM
RkNdIFRyYW5zaXRpb24gY29udGFpbmluZyBibG9jayBmb3IgbG9vcHMgdG8gcmFuZ2UgbG9vcHMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y
bWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGJk
NjAyZGM2Yjg1ZTFjNGFjZGM3NjdiMjc3MDY2NTE3MDA0MjdhYTIuLjJlNzNlYmRlY2MxZTUzZDRi
Y2ZiMGUyZjVjOTQ3NGYwMDIyZjRhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZv
cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDgsNyArNDgsNyBAQCBXVEZfTUFLRV9JU09fQUxMT0NB
VEVEX0lNUEwoVGFibGVGb3JtYXR0aW5nQ29udGV4dCk7CiAvLyBodHRwczovL3d3dy53My5vcmcv
VFIvY3NzLXRhYmxlcy0zLyN0YWJsZS1sYXlvdXQtYWxnb3JpdGhtCiBUYWJsZUZvcm1hdHRpbmdD
b250ZXh0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lckJveCYgZm9ybWF0
dGluZ0NvbnRleHRSb290LCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKQog
ICAgIDogRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290LCBmb3JtYXR0aW5n
U3RhdGUpCi0gICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlzLCBmb3JtYXR0aW5n
U3RhdGUudGFibGVHcmlkKCkpCisgICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlz
KQogICAgICwgbV90YWJsZUZvcm1hdHRpbmdRdWlya3MoKnRoaXMpCiB7CiB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9y
bWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4
dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDcyOWFjMjgwMzYxZmU1NDgw
N2IzN2Q1MzY2NzNlM2Q4MjE4NmZlNjAuLjZlZjE1YTUwZGVmMDRmNzM4N2NjMWFmMzU2Y2NjNzYy
MDNhYjRhOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u
dGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5o
CkBAIC01NCw2ICs1NCw4IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBVbmlxdWVSZWY8VGFibGVH
cmlkPiBlbnN1cmVUYWJsZUdyaWQoY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCk7CiAKKyAg
ICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyBy
ZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpm
b3JtYXR0aW5nU3RhdGUoKSk7IH0KKwogcHJpdmF0ZToKICAgICBjbGFzcyBUYWJsZUxheW91dCB7
CiAgICAgcHVibGljOgpAQCAtODEsNyArODMsNiBAQCBwcml2YXRlOgogICAgIEludHJpbnNpY1dp
ZHRoQ29uc3RyYWludHMgY29tcHV0ZWRQcmVmZXJyZWRXaWR0aEZvckNvbHVtbnMoKTsKICAgICB2
b2lkIGNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJsZUhv
cml6b250YWxTcGFjZSwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxhYmxlVmVydGljYWxTcGFj
ZSk7CiAKLSAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkg
Y29uc3QgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdD
b250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYg
Zm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+
KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KIAogICAgIGNvbnN0IFRh
YmxlRm9ybWF0dGluZ0dlb21ldHJ5IG1fdGFibGVGb3JtYXR0aW5nR2VvbWV0cnk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl
Rm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n
Q29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmluZGV4IGM2ODQzYzgz
NGQ5YzllM2ExOWNkYjg3ZDBiOTViZDg2YjBhNTk2YmQuLmNkNGY4ZTMwZGExMTQ4ZGQ0MzhkMjE1
YjY4OTQ2MzQ0NDA5MGQwNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0
aW5nR2VvbWV0cnkuY3BwCkBAIC0zOSw5ICszOSw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu
YW1lc3BhY2UgTGF5b3V0IHsKIAotVGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5KGNvbnN0IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQmIHRhYmxlRm9ybWF0dGlu
Z0NvbnRleHQsIGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCkKK1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5
OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0JiB0
YWJsZUZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogRm9ybWF0dGluZ0dlb21ldHJ5KHRhYmxlRm9y
bWF0dGluZ0NvbnRleHQpCi0gICAgLCBtX2dyaWQoZ3JpZCkKIHsKIH0KIApAQCAtNjUsOSArNjQs
MTAgQEAgTGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y2VsbEJveENvbnRlbnRI
ZWlnaHQoY29uc3QgQ29udGFpbmVyQm94JiBjZWwKIAogRWRnZXMgVGFibGVGb3JtYXR0aW5nR2Vv
bWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlcihjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNv
bnN0CiB7CisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0
YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY2VsbEJveCA9IGNlbGwuYm94KCk7CiAgICAg
YXV0byBib3JkZXIgPSBjb21wdXRlZEJvcmRlcihjZWxsQm94KTsKLSAgICBhdXRvIGNvbGxhcHNl
ZEJvcmRlciA9IG1fZ3JpZC5jb2xsYXBzZWRCb3JkZXIoKTsKKyAgICBhdXRvIGNvbGxhcHNlZEJv
cmRlciA9IGdyaWQuY29sbGFwc2VkQm9yZGVyKCk7CiAgICAgaWYgKCFjb2xsYXBzZWRCb3JkZXIp
CiAgICAgICAgIHJldHVybiBib3JkZXI7CiAKQEAgLTc3LDMxICs3NywzMSBAQCBFZGdlcyBUYWJs
ZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y29tcHV0ZWRDZWxsQm9yZGVyKGNvbnN0IFRhYmxlR3JpZDo6
Q2VsbCYgY2VsbCkgYwogICAgIGlmICghY2VsbFBvc2l0aW9uLmNvbHVtbikKICAgICAgICAgYm9y
ZGVyLmhvcml6b250YWwubGVmdCA9IGNvbGxhcHNlZEJvcmRlci0+aG9yaXpvbnRhbC5sZWZ0IC8g
MjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclJpZ2h0ID0gY29tcHV0
ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0
aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9udGFsLnJpZ2h0OworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyUmlnaHQgPSBjb21wdXRlZEJvcmRlcihncmlkLnNsb3QoeyBjZWxsUG9z
aXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jp
em9udGFsLnJpZ2h0OwogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5sZWZ0ID0gc3RkOjptYXgo
Ym9yZGVyLmhvcml6b250YWwubGVmdCwgYWRqYWNlbnRCb3JkZXJSaWdodCkgLyAyOwogICAgIH0K
ICAgICAvLyBDb2xsYXBzZWQgYm9yZGVyIHJpZ2h0IGZyb20gdGFibGUgYW5kIGFkamFjZW50IGNl
bGxzLgotICAgIGlmIChjZWxsUG9zaXRpb24uY29sdW1uID09IG1fZ3JpZC5jb2x1bW5zKCkuc2l6
ZSgpIC0gMSkKKyAgICBpZiAoY2VsbFBvc2l0aW9uLmNvbHVtbiA9PSBncmlkLmNvbHVtbnMoKS5z
aXplKCkgLSAxKQogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9IGNvbGxhcHNlZEJv
cmRlci0+aG9yaXpvbnRhbC5yaWdodCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8gYWRq
YWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRp
b24uY29sdW1uICsgMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9u
dGFsLmxlZnQ7CisgICAgICAgIGF1dG8gYWRqYWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3Jk
ZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiArIDEsIGNlbGxQb3NpdGlvbi5yb3cg
fSktPmNlbGwoKS5ib3goKSkuaG9yaXpvbnRhbC5sZWZ0OwogICAgICAgICBib3JkZXIuaG9yaXpv
bnRhbC5yaWdodCA9IHN0ZDo6bWF4KGJvcmRlci5ob3Jpem9udGFsLnJpZ2h0LCBhZGphY2VudEJv
cmRlckxlZnQpIC8gMjsKICAgICB9CiAgICAgLy8gQ29sbGFwc2VkIGJvcmRlciB0b3AgZnJvbSB0
YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4KLSAgICBhdXRvJiByb3dzID0gbV9ncmlkLnJv
d3MoKS5saXN0KCk7CisgICAgYXV0byYgcm93cyA9IGdyaWQucm93cygpLmxpc3QoKTsKICAgICBp
ZiAoIWNlbGxQb3NpdGlvbi5yb3cpCiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBjb2xs
YXBzZWRCb3JkZXItPnZlcnRpY2FsLnRvcCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8g
YWRqYWNlbnRCb3JkZXJCb3R0b20gPSBjb21wdXRlZEJvcmRlcihtX2dyaWQuc2xvdCh7IGNlbGxQ
b3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5yb3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZl
cnRpY2FsLmJvdHRvbTsKKyAgICAgICAgYXV0byBhZGphY2VudEJvcmRlckJvdHRvbSA9IGNvbXB1
dGVkQm9yZGVyKGdyaWQuc2xvdCh7IGNlbGxQb3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5y
b3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZlcnRpY2FsLmJvdHRvbTsKICAgICAgICAgYXV0byBh
ZGphY2VudFJvd0JvdHRvbSA9IGNvbXB1dGVkQm9yZGVyKHJvd3NbY2VsbFBvc2l0aW9uLnJvdyAt
IDFdLmJveCgpKS52ZXJ0aWNhbC5ib3R0b207CiAgICAgICAgIGF1dG8gYWRqYWNlbnRDb2xsYXBz
ZWRCb3JkZXIgPSBzdGQ6Om1heChhZGphY2VudEJvcmRlckJvdHRvbSwgYWRqYWNlbnRSb3dCb3R0
b20pOwogICAgICAgICBib3JkZXIudmVydGljYWwudG9wID0gc3RkOjptYXgoYm9yZGVyLnZlcnRp
Y2FsLnRvcCwgYWRqYWNlbnRDb2xsYXBzZWRCb3JkZXIpIC8gMjsKICAgICB9CiAgICAgLy8gQ29s
bGFwc2VkIGJvcmRlciBib3R0b20gZnJvbSB0YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4K
LSAgICBpZiAoY2VsbFBvc2l0aW9uLnJvdyA9PSBtX2dyaWQucm93cygpLnNpemUoKSAtIDEpCisg
ICAgaWYgKGNlbGxQb3NpdGlvbi5yb3cgPT0gZ3JpZC5yb3dzKCkuc2l6ZSgpIC0gMSkKICAgICAg
ICAgYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSA9IGNvbGxhcHNlZEJvcmRlci0+dmVydGljYWwuYm90
dG9tIC8gMjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclRvcCA9IGNv
bXB1dGVkQm9yZGVyKG1fZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiwgY2VsbFBvc2l0
aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGljYWwudG9wOworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyVG9wID0gY29tcHV0ZWRCb3JkZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0
aW9uLmNvbHVtbiwgY2VsbFBvc2l0aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGlj
YWwudG9wOwogICAgICAgICBhdXRvIGFkamFjZW50Um93VG9wID0gY29tcHV0ZWRCb3JkZXIocm93
c1tjZWxsUG9zaXRpb24ucm93ICsgMV0uYm94KCkpLnZlcnRpY2FsLnRvcDsKICAgICAgICAgYXV0
byBhZGphY2VudENvbGxhcHNlZEJvcmRlciA9IHN0ZDo6bWF4KGFkamFjZW50Qm9yZGVyVG9wLCBh
ZGphY2VudFJvd1RvcCk7CiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC5ib3R0b20gPSBzdGQ6Om1h
eChib3JkZXIudmVydGljYWwuYm90dG9tLCBhZGphY2VudENvbGxhcHNlZEJvcmRlcikgLyAyOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJs
ZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h
dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oCmluZGV4IGFkMmJi
MTBhZDIzOWEwYjc3NjcwYTM4MzllNDViNzhlNzM4ZDlmY2QuLmYxMTE2MzRmMDg1NDZlMDVhYjBl
MDBhNmJlZDM1NGRkYmU3MTRmMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m
b3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5LmgKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgVGFibGVGb3JtYXR0aW5nQ29u
dGV4dDsKIAogY2xhc3MgVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGlu
Z0dlb21ldHJ5IHsKIHB1YmxpYzoKLSAgICBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBU
YWJsZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgVGFibGVHcmlkJik7CisgICAgVGFibGVGb3Jt
YXR0aW5nR2VvbWV0cnkoY29uc3QgVGFibGVGb3JtYXR0aW5nQ29udGV4dCYpOwogCiAgICAgTGF5
b3V0VW5pdCBjZWxsQm94Q29udGVudEhlaWdodChjb25zdCBDb250YWluZXJCb3gmKSBjb25zdDsK
ICAgICBFZGdlcyBjb21wdXRlZENlbGxCb3JkZXIoY29uc3QgVGFibGVHcmlkOjpDZWxsJikgY29u
c3Q7CkBAIC00Nyw3ICs0Nyw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBjb25zdCBUYWJs
ZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRv
d25jYXN0PFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0
dGluZ0NvbnRleHQoKSk7IH0KLSAgICBjb25zdCBUYWJsZUdyaWQmIG1fZ3JpZDsKIH07CiAKIH0K
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcAppbmRleCBiODk4
MDM3NzBkYzhhNjdkNmY5MGNlZTQ0YjY0YzVjMzcxMmEzNWUxLi5hYzllMjhjOGQ3YzVhMWUwMTNj
MTc5ODdhMTVmNjM3ZjkzYjI4NzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ1F1aXJrcy5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1h
dHRpbmdRdWlya3MuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiTGF5b3V0Q29udGFp
bmluZ0Jsb2NrQ2hhaW5JdGVyYXRvci5oIgogI2luY2x1ZGUgIkxheW91dFN0YXRlLmgiCiAjaW5j
bHVkZSAiVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oIgorI2luY2x1ZGUgIlRhYmxlR3JpZC5oIgog
CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTYxLDEyICs2Miwx
OSBAQCBMYXlvdXRVbml0IFRhYmxlRm9ybWF0dGluZ1F1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJl
c3RDb250YWluaW5nQmxvY2tXaXRoRml4ZWRIZQogICAgIC8vIFRoZSAibGV0J3MgZmluZCB0aGUg
bmVhcmVzdCBhbmNlc3RvciB3aXRoIGZpeGVkIGhlaWdodCB0byByZXNvbHZlIHBlcmNlbnQgaGVp
Z2h0IiBxdWlyayBpcyBsaW1pdGVkIHRvIHRoZSB0YWJsZSBmb3JtYXR0aW5nCiAgICAgLy8gY29u
dGV4dC4gSWYgd2UgY2FuJ3QgcmVzb2x2ZSBpdCB3aXRoaW4gdGhlIHRhYmxlIHN1YnRyZWUsIHdl
IGRlZmF1bHQgaXQgdG8gMC4KICAgICAvLyBlLmcgPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDBweCI+
PHRhYmxlPjx0cj48dGQgc3R5bGU9ImhlaWdodDogMTAwJSI+PC90ZD48L3RyPjwvdGFibGU+PC9k
aXY+IGlzIHJlc29sdmVkIHRvIDBweC4KLSAgICBhdXRvIGZpeGVkTG9naWNhbEhlaWdodCA9IFsm
XShjb25zdCBhdXRvJiBhbmNlc3RvckJveCkgeworICAgIGF1dG8mIHRhYmxlQm94ID0gZm9ybWF0
dGluZ0NvbnRleHQoKS5yb290KCk7CisgICAgYXV0byBmaXhlZExvZ2ljYWxIZWlnaHQgPSBbJl0o
Y29uc3QgYXV0byYgYW5jZXN0b3JCb3gpIC0+IE9wdGlvbmFsPExheW91dFVuaXQ+IHsKICAgICAg
ICAgYXV0byBoZWlnaHQgPSBhbmNlc3RvckJveC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAg
ICAgICAgcmV0dXJuIGhlaWdodC5pc0ZpeGVkKCkgPyBtYWtlT3B0aW9uYWwoTGF5b3V0VW5pdCB7
IGhlaWdodC52YWx1ZSgpIH0pIDogV1RGOjpudWxsb3B0OworICAgICAgICBpZiAoIWhlaWdodC5p
c0ZpeGVkKCkpCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICBpZiAoJmFuY2VzdG9y
Qm94ICE9ICZ0YWJsZUJveCkKKyAgICAgICAgICAgIHJldHVybiBMYXlvdXRVbml0IHsgaGVpZ2h0
LnZhbHVlKCkgfTsKKyAgICAgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9y
bWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgICAgIGF1dG8gdmVydGljYWxTcGFjaW5n
ID0gZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVuaXQgeyBo
ZWlnaHQudmFsdWUoKSAtICgoZ3JpZC5yb3dzKCkuc2l6ZSgpICsgMSkgKiB2ZXJ0aWNhbFNwYWNp
bmcpIH07CiAgICAgfTsKIAotICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWluaW5nQmxv
Y2tDaGFpbihsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLmNvbnRhaW5pbmdC
bG9jaygpKSkgeworICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWluaW5nQmxvY2tDaGFp
bihsYXlvdXRCb3gsIHRhYmxlQm94LmNvbnRhaW5pbmdCbG9jaygpKSkgewogICAgICAgICBpZiAo
YXV0byBmaXhlZEhlaWdodCA9IGZpeGVkTG9naWNhbEhlaWdodChhbmNlc3RvcikpCiAgICAgICAg
ICAgICByZXR1cm4gKmZpeGVkSGVpZ2h0OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nUXVpcmtz
LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl
Rm9ybWF0dGluZ1F1aXJrcy5oCmluZGV4IGU5NGNhMWQyZGI3ZmFmOGQ3NzQ1MzI3OTVjMGU3NTgx
MGMxNGJhZTYuLjRhZmYzZTk5YjJlZjQ3ZDBkZDkzM2I3OWNlNDRhMWI3MzIzNDRiYTUgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFi
bGVGb3JtYXR0aW5nUXVpcmtzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp
bmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaApAQCAtNDAsNiArNDAsMTAg
QEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSWdub3JlQ2hpbGRDb250ZW50VmVy
dGljYWxNYXJnaW4oY29uc3QgQ29udGFpbmVyQm94Jik7CiAgICAgTGF5b3V0VW5pdCBoZWlnaHRW
YWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhlaWdodChjb25zdCBCb3gmKSBj
b25zdCBmaW5hbDsKKworcHJpdmF0ZToKKyAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0
JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFRhYmxlRm9ybWF0
dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdRdWlya3M6OmZvcm1hdHRpbmdDb250ZXh0KCkpOyB9CisK
IH07CiAKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwppbmRleCAxNDI3YWQ0MzgwNzdiNzk0MmIwYzliNGM4MDk0YWY2YWM3YTllMjBi
Li5mYjdkYzQ1MDcwYTQ5MGFlNDg4ZjkwN2QwYmFlOGIzNTFkMDA5NDY5IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjEtMDUtMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwor
ICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBpbmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcgd2hlbiBy
ZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9yIHRhYmxlIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjM2NQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogV2Vi
S2l0IHRhYmxlIGxheW91dCBkb24ndCByZXNvbHZlIHRoZSBoZWlnaHQgcGVyY2VudCBwcm9wZXJs
eSB3aGVuIGJvcmRlciBzcGFjaW5nIGlzIHByZXNlbnQuCisgICAgICAgICogZmFzdC9sYXlvdXRm
b3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy1l
eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250
ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWw6IEFkZGVkLgor
CiAyMDIxLTA1LTI2ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAg
ICAgTWFrZSBNZWRpYVNlc3Npb24gcmVhZHlzdGF0ZSBlbnVtcyBhbGwgbG93ZXJjYXNlCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBlZTJmYzFlMTA1ZGE3NDFmNjAzZmNlYzUzMjI2ZWE4ZTgwYWIzZWI1
Li4yMmI2OWU4YzllYWI4YThhZDM2YzYyOGNiZjQ3MGUxODIwYmY2MDkxIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQ4NzMsNiArNDg3Myw3IEBAIHdlYmtpdC5vcmcvYi8zMTI3OCBbIERlYnVnIF0g
ZmFzdC9tdWx0aWNvbC9zcGFubmVyLWdldC1yZS1hZGRlZC1vbi1tb3ZlLWNyYXNoLmh0CiB3ZWJr
aXQub3JnL2IvMjI1MjQ3IFsgRGVidWcgXSBmYXN0L211bHRpY29sL3NwYW4vZmxvYXQtYmVjb21l
cy1zcGFubmVyLWNyYXNoLmh0bWwgWyBTa2lwIF0KIAogd2Via2l0Lm9yZy9iLzIyNjAwMiBmYXN0
L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctaGVpZ2h0Lmh0bWwgWyBT
a2lwIF0KK3dlYmtpdC5vcmcvYi8yMjYzNjQgZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90
YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy5odG1sIFsgU2tpcCBdCiAKICMg
VGhpcyB3ZWJzdG9yYWdlIHRlc3QgaGFzIGNyYXNoZWQgc2luY2UgaXQgd2FzIGltcG9ydGVkLgog
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJzdG9yYWdlL3N0b3JhZ2Vfc2Vzc2lv
bl9zZXRpdGVtX3F1b3RhZXhjZWVkZWRlcnIud2luZG93Lmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtd2l0aC1w
ZXJjZW50LWNvbHVtbnMtYW5kLXNwYWNpbmctZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zh
c3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtd2l0aC1wZXJjZW50LWNvbHVtbnMtYW5k
LXNwYWNpbmctZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MzA4ODcyYjJkZGZlYTk4MmY4NjU0
N2RlZmU4MWM1ZTkwNjIwYjdmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9s
YXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3Bh
Y2luZy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzxzdHlsZT4KK2RpdiB7CisgYmFj
a2dyb3VuZC1jb2xvcjogZ3JlZW47Cisgd2lkdGg6IDEwMnB4OworIGhlaWdodDogMjM1cHg7Cisg
bWFyZ2luOiAxMHB4OworfQorPC9zdHlsZT4KKzxkaXYgc3R5bGU9Im1hcmdpbi10b3A6IDE4cHg7
Ij48L2Rpdj4KKzxkaXY+PC9kaXY+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRo
LXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlv
dXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2lu
Zy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLjNmMTY3ZTYyYWNlZGEwNGNiY2JhN2E3YjEzMGMyNTk4OGY4MWU1
MjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj
b250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWwKQEAgLTAs
MCArMSwxMCBAQAorPHN0eWxlPgordGQgeworIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworIHdp
ZHRoOiAxMDBweDsKK30KKzwvc3R5bGU+Cis8dGFibGUgaGVpZ2h0PTUwMCBzdHlsZT0iYm9yZGVy
LXNwYWNpbmc6IDEwcHg7Ij4KKzx0cj48dGQgaGVpZ2h0PTUwJT48L3RkPjwvdHI+Cis8dHI+PHRk
IGhlaWdodD01MCU+PC90ZD48L3RyPgorPC90YWJsZT4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430010</attachid>
            <date>2021-05-28 07:52:17 -0700</date>
            <delta_ts>2021-05-29 05:16:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226365-20210528075216.patch</filename>
            <type>text/plain</type>
            <size>14984</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUwNjM5ZmIwMWYwMGEy
MGUwOTViZDk2OGQyZGRmZjQ0ZmFiNjNiNy4uOWExNDAyNDljYjZjNTZlYjY5YWZiN2RiYmViZTMy
NDMwM2M5ZjAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI4ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBp
bmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcgd2hlbiByZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9y
IHRhYmxlIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyNjM2NQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisg
ICAgICAgIDx0YWJsZSBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYm9yZGVyLXNwYWNpbmc6IDEwcHg7
Ij48dHI+PHRkIHN0eWxlPSJoZWlnaHQ6IDEwMCUiPjwvdGQ+PC90cj48L3RhYmxlPgorICAgICAg
ICBUaGUgPHRkPidzIDEwMCUgaGVpZ2h0IGlzIHJlc29sdmVkIGFnYWluc3QgMTAwcHggLSAoMiAq
IDEwcHgpIC0+IDgwcHg7CisKKyAgICAgICAgVGVzdDogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u
dGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy5odG1sCisKKyAgICAg
ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRl
eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0
OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv
bnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9y
bWF0dGluZ0dlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0
aW5nR2VvbWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlciBjb25zdCk6CisgICAgICAgICogbGF5b3V0
L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgorICAg
ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0dGlu
Z0NvbnRleHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6
VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpoZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9j
a1dpdGhGaXhlZEhlaWdodCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250
ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaDoKKyAgICAgICAgKFdlYkNvcmU6Okxh
eW91dDo6VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpmb3JtYXR0aW5nQ29udGV4dCBjb25zdCk6CisK
IDIwMjEtMDUtMjggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM
RkNdIFRyYW5zaXRpb24gY29udGFpbmluZyBibG9jayBmb3IgbG9vcHMgdG8gcmFuZ2UgbG9vcHMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y
bWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVi
YjMzZTlmODVkYzUxYTZhNjc1NjVlY2ZhODYwYjFlNDg1NWFhOTEuLmQwN2ZmYTRkZDBlZGY4NTg2
MDAxNGNhOTcwNGNmMmNlOWFkMmI2NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZv
cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDgsNyArNDgsNyBAQCBXVEZfTUFLRV9JU09fQUxMT0NB
VEVEX0lNUEwoVGFibGVGb3JtYXR0aW5nQ29udGV4dCk7CiAvLyBodHRwczovL3d3dy53My5vcmcv
VFIvY3NzLXRhYmxlcy0zLyN0YWJsZS1sYXlvdXQtYWxnb3JpdGhtCiBUYWJsZUZvcm1hdHRpbmdD
b250ZXh0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lckJveCYgZm9ybWF0
dGluZ0NvbnRleHRSb290LCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKQog
ICAgIDogRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290LCBmb3JtYXR0aW5n
U3RhdGUpCi0gICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlzLCBmb3JtYXR0aW5n
U3RhdGUudGFibGVHcmlkKCkpCisgICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlz
KQogICAgICwgbV90YWJsZUZvcm1hdHRpbmdRdWlya3MoKnRoaXMpCiB7CiB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9y
bWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4
dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGJiMjQxMWQ0MWRmMWFmN2U2
NzQ3YmY1ZDc3ZWQ0NDQzMzliYjJkOGUuLjk0MWNmMDlhYTY5YTFjMzY0ZTkyNjgxZTQyN2QwZTQy
ZWUwYzdmYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u
dGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5o
CkBAIC01NCw2ICs1NCw4IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBVbmlxdWVSZWY8VGFibGVH
cmlkPiBlbnN1cmVUYWJsZUdyaWQoY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCk7CiAKKyAg
ICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyBy
ZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpm
b3JtYXR0aW5nU3RhdGUoKSk7IH0KKwogcHJpdmF0ZToKICAgICBjbGFzcyBUYWJsZUxheW91dCB7
CiAgICAgcHVibGljOgpAQCAtODEsNyArODMsNiBAQCBwcml2YXRlOgogICAgIEludHJpbnNpY1dp
ZHRoQ29uc3RyYWludHMgY29tcHV0ZWRQcmVmZXJyZWRXaWR0aEZvckNvbHVtbnMoKTsKICAgICB2
b2lkIGNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJsZUhv
cml6b250YWxTcGFjZSwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxhYmxlVmVydGljYWxTcGFj
ZSk7CiAKLSAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkg
Y29uc3QgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdD
b250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYg
Zm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+
KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KIAogICAgIGNvbnN0IFRh
YmxlRm9ybWF0dGluZ0dlb21ldHJ5IG1fdGFibGVGb3JtYXR0aW5nR2VvbWV0cnk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl
Rm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n
Q29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmluZGV4IDNlM2I2Zjc2
YTBmNGU4ZWVkZjgxNTRkOTU2OWJlMzczZjYxNDMxNTcuLmMyZGQxNmRkYTg3ZmNkZTBiYjk3NGE4
YTBkYWYxMTM3MTZlYjQ0ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0
aW5nR2VvbWV0cnkuY3BwCkBAIC0zOSw5ICszOSw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu
YW1lc3BhY2UgTGF5b3V0IHsKIAotVGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5KGNvbnN0IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQmIHRhYmxlRm9ybWF0dGlu
Z0NvbnRleHQsIGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCkKK1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5
OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0JiB0
YWJsZUZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogRm9ybWF0dGluZ0dlb21ldHJ5KHRhYmxlRm9y
bWF0dGluZ0NvbnRleHQpCi0gICAgLCBtX2dyaWQoZ3JpZCkKIHsKIH0KIApAQCAtNjUsOSArNjQs
MTAgQEAgTGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y2VsbEJveENvbnRlbnRI
ZWlnaHQoY29uc3QgQ29udGFpbmVyQm94JiBjZWwKIAogRWRnZXMgVGFibGVGb3JtYXR0aW5nR2Vv
bWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlcihjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNv
bnN0CiB7CisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0
YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY2VsbEJveCA9IGNlbGwuYm94KCk7CiAgICAg
YXV0byBib3JkZXIgPSBjb21wdXRlZEJvcmRlcihjZWxsQm94KTsKLSAgICBhdXRvIGNvbGxhcHNl
ZEJvcmRlciA9IG1fZ3JpZC5jb2xsYXBzZWRCb3JkZXIoKTsKKyAgICBhdXRvIGNvbGxhcHNlZEJv
cmRlciA9IGdyaWQuY29sbGFwc2VkQm9yZGVyKCk7CiAgICAgaWYgKCFjb2xsYXBzZWRCb3JkZXIp
CiAgICAgICAgIHJldHVybiBib3JkZXI7CiAKQEAgLTc3LDMxICs3NywzMSBAQCBFZGdlcyBUYWJs
ZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y29tcHV0ZWRDZWxsQm9yZGVyKGNvbnN0IFRhYmxlR3JpZDo6
Q2VsbCYgY2VsbCkgYwogICAgIGlmICghY2VsbFBvc2l0aW9uLmNvbHVtbikKICAgICAgICAgYm9y
ZGVyLmhvcml6b250YWwubGVmdCA9IGNvbGxhcHNlZEJvcmRlci0+aG9yaXpvbnRhbC5sZWZ0IC8g
MjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclJpZ2h0ID0gY29tcHV0
ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0
aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9udGFsLnJpZ2h0OworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyUmlnaHQgPSBjb21wdXRlZEJvcmRlcihncmlkLnNsb3QoeyBjZWxsUG9z
aXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jp
em9udGFsLnJpZ2h0OwogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5sZWZ0ID0gc3RkOjptYXgo
Ym9yZGVyLmhvcml6b250YWwubGVmdCwgYWRqYWNlbnRCb3JkZXJSaWdodCkgLyAyOwogICAgIH0K
ICAgICAvLyBDb2xsYXBzZWQgYm9yZGVyIHJpZ2h0IGZyb20gdGFibGUgYW5kIGFkamFjZW50IGNl
bGxzLgotICAgIGlmIChjZWxsUG9zaXRpb24uY29sdW1uID09IG1fZ3JpZC5jb2x1bW5zKCkuc2l6
ZSgpIC0gMSkKKyAgICBpZiAoY2VsbFBvc2l0aW9uLmNvbHVtbiA9PSBncmlkLmNvbHVtbnMoKS5z
aXplKCkgLSAxKQogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9IGNvbGxhcHNlZEJv
cmRlci0+aG9yaXpvbnRhbC5yaWdodCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8gYWRq
YWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRp
b24uY29sdW1uICsgMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9u
dGFsLmxlZnQ7CisgICAgICAgIGF1dG8gYWRqYWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3Jk
ZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiArIDEsIGNlbGxQb3NpdGlvbi5yb3cg
fSktPmNlbGwoKS5ib3goKSkuaG9yaXpvbnRhbC5sZWZ0OwogICAgICAgICBib3JkZXIuaG9yaXpv
bnRhbC5yaWdodCA9IHN0ZDo6bWF4KGJvcmRlci5ob3Jpem9udGFsLnJpZ2h0LCBhZGphY2VudEJv
cmRlckxlZnQpIC8gMjsKICAgICB9CiAgICAgLy8gQ29sbGFwc2VkIGJvcmRlciB0b3AgZnJvbSB0
YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4KLSAgICBhdXRvJiByb3dzID0gbV9ncmlkLnJv
d3MoKS5saXN0KCk7CisgICAgYXV0byYgcm93cyA9IGdyaWQucm93cygpLmxpc3QoKTsKICAgICBp
ZiAoIWNlbGxQb3NpdGlvbi5yb3cpCiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBjb2xs
YXBzZWRCb3JkZXItPnZlcnRpY2FsLnRvcCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8g
YWRqYWNlbnRCb3JkZXJCb3R0b20gPSBjb21wdXRlZEJvcmRlcihtX2dyaWQuc2xvdCh7IGNlbGxQ
b3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5yb3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZl
cnRpY2FsLmJvdHRvbTsKKyAgICAgICAgYXV0byBhZGphY2VudEJvcmRlckJvdHRvbSA9IGNvbXB1
dGVkQm9yZGVyKGdyaWQuc2xvdCh7IGNlbGxQb3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5y
b3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZlcnRpY2FsLmJvdHRvbTsKICAgICAgICAgYXV0byBh
ZGphY2VudFJvd0JvdHRvbSA9IGNvbXB1dGVkQm9yZGVyKHJvd3NbY2VsbFBvc2l0aW9uLnJvdyAt
IDFdLmJveCgpKS52ZXJ0aWNhbC5ib3R0b207CiAgICAgICAgIGF1dG8gYWRqYWNlbnRDb2xsYXBz
ZWRCb3JkZXIgPSBzdGQ6Om1heChhZGphY2VudEJvcmRlckJvdHRvbSwgYWRqYWNlbnRSb3dCb3R0
b20pOwogICAgICAgICBib3JkZXIudmVydGljYWwudG9wID0gc3RkOjptYXgoYm9yZGVyLnZlcnRp
Y2FsLnRvcCwgYWRqYWNlbnRDb2xsYXBzZWRCb3JkZXIpIC8gMjsKICAgICB9CiAgICAgLy8gQ29s
bGFwc2VkIGJvcmRlciBib3R0b20gZnJvbSB0YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4K
LSAgICBpZiAoY2VsbFBvc2l0aW9uLnJvdyA9PSBtX2dyaWQucm93cygpLnNpemUoKSAtIDEpCisg
ICAgaWYgKGNlbGxQb3NpdGlvbi5yb3cgPT0gZ3JpZC5yb3dzKCkuc2l6ZSgpIC0gMSkKICAgICAg
ICAgYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSA9IGNvbGxhcHNlZEJvcmRlci0+dmVydGljYWwuYm90
dG9tIC8gMjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclRvcCA9IGNv
bXB1dGVkQm9yZGVyKG1fZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiwgY2VsbFBvc2l0
aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGljYWwudG9wOworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyVG9wID0gY29tcHV0ZWRCb3JkZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0
aW9uLmNvbHVtbiwgY2VsbFBvc2l0aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGlj
YWwudG9wOwogICAgICAgICBhdXRvIGFkamFjZW50Um93VG9wID0gY29tcHV0ZWRCb3JkZXIocm93
c1tjZWxsUG9zaXRpb24ucm93ICsgMV0uYm94KCkpLnZlcnRpY2FsLnRvcDsKICAgICAgICAgYXV0
byBhZGphY2VudENvbGxhcHNlZEJvcmRlciA9IHN0ZDo6bWF4KGFkamFjZW50Qm9yZGVyVG9wLCBh
ZGphY2VudFJvd1RvcCk7CiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC5ib3R0b20gPSBzdGQ6Om1h
eChib3JkZXIudmVydGljYWwuYm90dG9tLCBhZGphY2VudENvbGxhcHNlZEJvcmRlcikgLyAyOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJs
ZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h
dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oCmluZGV4IGFkMmJi
MTBhZDIzOWEwYjc3NjcwYTM4MzllNDViNzhlNzM4ZDlmY2QuLmYxMTE2MzRmMDg1NDZlMDVhYjBl
MDBhNmJlZDM1NGRkYmU3MTRmMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m
b3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5LmgKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgVGFibGVGb3JtYXR0aW5nQ29u
dGV4dDsKIAogY2xhc3MgVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGlu
Z0dlb21ldHJ5IHsKIHB1YmxpYzoKLSAgICBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBU
YWJsZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgVGFibGVHcmlkJik7CisgICAgVGFibGVGb3Jt
YXR0aW5nR2VvbWV0cnkoY29uc3QgVGFibGVGb3JtYXR0aW5nQ29udGV4dCYpOwogCiAgICAgTGF5
b3V0VW5pdCBjZWxsQm94Q29udGVudEhlaWdodChjb25zdCBDb250YWluZXJCb3gmKSBjb25zdDsK
ICAgICBFZGdlcyBjb21wdXRlZENlbGxCb3JkZXIoY29uc3QgVGFibGVHcmlkOjpDZWxsJikgY29u
c3Q7CkBAIC00Nyw3ICs0Nyw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBjb25zdCBUYWJs
ZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRv
d25jYXN0PFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0
dGluZ0NvbnRleHQoKSk7IH0KLSAgICBjb25zdCBUYWJsZUdyaWQmIG1fZ3JpZDsKIH07CiAKIH0K
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcAppbmRleCAwODRi
MjFjM2NjZWRmZGEwOThhZGIzYmQ0NTBhMmJiNWM3MWQxZGViLi5hYzllMjhjOGQ3YzVhMWUwMTNj
MTc5ODdhMTVmNjM3ZjkzYjI4NzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ1F1aXJrcy5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1h
dHRpbmdRdWlya3MuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiTGF5b3V0Q29udGFp
bmluZ0Jsb2NrQ2hhaW5JdGVyYXRvci5oIgogI2luY2x1ZGUgIkxheW91dFN0YXRlLmgiCiAjaW5j
bHVkZSAiVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oIgorI2luY2x1ZGUgIlRhYmxlR3JpZC5oIgog
CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTYxLDEyICs2Miwx
OSBAQCBMYXlvdXRVbml0IFRhYmxlRm9ybWF0dGluZ1F1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJl
c3RDb250YWluaW5nQmxvY2tXaXRoRml4ZWRIZQogICAgIC8vIFRoZSAibGV0J3MgZmluZCB0aGUg
bmVhcmVzdCBhbmNlc3RvciB3aXRoIGZpeGVkIGhlaWdodCB0byByZXNvbHZlIHBlcmNlbnQgaGVp
Z2h0IiBxdWlyayBpcyBsaW1pdGVkIHRvIHRoZSB0YWJsZSBmb3JtYXR0aW5nCiAgICAgLy8gY29u
dGV4dC4gSWYgd2UgY2FuJ3QgcmVzb2x2ZSBpdCB3aXRoaW4gdGhlIHRhYmxlIHN1YnRyZWUsIHdl
IGRlZmF1bHQgaXQgdG8gMC4KICAgICAvLyBlLmcgPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDBweCI+
PHRhYmxlPjx0cj48dGQgc3R5bGU9ImhlaWdodDogMTAwJSI+PC90ZD48L3RyPjwvdGFibGU+PC9k
aXY+IGlzIHJlc29sdmVkIHRvIDBweC4KLSAgICBhdXRvIGZpeGVkTG9naWNhbEhlaWdodCA9IFsm
XShjb25zdCBhdXRvJiBhbmNlc3RvckJveCkgeworICAgIGF1dG8mIHRhYmxlQm94ID0gZm9ybWF0
dGluZ0NvbnRleHQoKS5yb290KCk7CisgICAgYXV0byBmaXhlZExvZ2ljYWxIZWlnaHQgPSBbJl0o
Y29uc3QgYXV0byYgYW5jZXN0b3JCb3gpIC0+IE9wdGlvbmFsPExheW91dFVuaXQ+IHsKICAgICAg
ICAgYXV0byBoZWlnaHQgPSBhbmNlc3RvckJveC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAg
ICAgICAgcmV0dXJuIGhlaWdodC5pc0ZpeGVkKCkgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoTGF5b3V0
VW5pdCB7IGhlaWdodC52YWx1ZSgpIH0pIDogc3RkOjpudWxsb3B0OworICAgICAgICBpZiAoIWhl
aWdodC5pc0ZpeGVkKCkpCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICBpZiAoJmFu
Y2VzdG9yQm94ICE9ICZ0YWJsZUJveCkKKyAgICAgICAgICAgIHJldHVybiBMYXlvdXRVbml0IHsg
aGVpZ2h0LnZhbHVlKCkgfTsKKyAgICAgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0
KCkuZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgICAgIGF1dG8gdmVydGljYWxT
cGFjaW5nID0gZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVu
aXQgeyBoZWlnaHQudmFsdWUoKSAtICgoZ3JpZC5yb3dzKCkuc2l6ZSgpICsgMSkgKiB2ZXJ0aWNh
bFNwYWNpbmcpIH07CiAgICAgfTsKIAotICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWlu
aW5nQmxvY2tDaGFpbihsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLmNvbnRh
aW5pbmdCbG9jaygpKSkgeworICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWluaW5nQmxv
Y2tDaGFpbihsYXlvdXRCb3gsIHRhYmxlQm94LmNvbnRhaW5pbmdCbG9jaygpKSkgewogICAgICAg
ICBpZiAoYXV0byBmaXhlZEhlaWdodCA9IGZpeGVkTG9naWNhbEhlaWdodChhbmNlc3RvcikpCiAg
ICAgICAgICAgICByZXR1cm4gKmZpeGVkSGVpZ2h0OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5n
UXVpcmtzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl
L1RhYmxlRm9ybWF0dGluZ1F1aXJrcy5oCmluZGV4IGU5NGNhMWQyZGI3ZmFmOGQ3NzQ1MzI3OTVj
MGU3NTgxMGMxNGJhZTYuLjRhZmYzZTk5YjJlZjQ3ZDBkZDkzM2I3OWNlNDRhMWI3MzIzNDRiYTUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv
cm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaApAQCAtNDAsNiAr
NDAsMTAgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSWdub3JlQ2hpbGRDb250
ZW50VmVydGljYWxNYXJnaW4oY29uc3QgQ29udGFpbmVyQm94Jik7CiAgICAgTGF5b3V0VW5pdCBo
ZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhlaWdodChjb25zdCBC
b3gmKSBjb25zdCBmaW5hbDsKKworcHJpdmF0ZToKKyAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdD
b250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFRhYmxl
Rm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdRdWlya3M6OmZvcm1hdHRpbmdDb250ZXh0KCkp
OyB9CisKIH07CiAKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMTZlZGRmNDRiNjgxNWM0YjA0YmZmZjgyMGExOTI0MmIz
NTJmMTIyLi5jMzRiZDBmMmMzYTAwZjc2MDM0ZTViZmIzZDk3ZjZkZTg3ZWVlMmRhIDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv
bT4KKworICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBpbmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcg
d2hlbiByZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9yIHRhYmxlIGNvbnRlbnQKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjM2NQorCisgICAgICAg
IFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9u
czogV2ViS2l0IHRhYmxlIGxheW91dCBkb24ndCByZXNvbHZlIHRoZSBoZWlnaHQgcGVyY2VudCBw
cm9wZXJseSB3aGVuIGJvcmRlciBzcGFjaW5nIGlzIHByZXNlbnQuCisgICAgICAgICogZmFzdC9s
YXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3Bh
Y2luZy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRp
bmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWw6IEFk
ZGVkLgorCiAyMDIxLTA1LTI4ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9y
Zz4KIAogICAgICAgICBNb3JlIHJlYWRpbHkgbGF5b3V0IHdoZW4gc2Nyb2xsLXNuYXAgcHJvcGVy
dGllcyBjaGFuZ2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGVlMmZjMWUxMDVkYTc0MWY2MDNmY2Vj
NTMyMjZlYThlODBhYjNlYjUuLjIyYjY5ZThjOWVhYjhhOGFkMzZjNjI4Y2JmNDcwZTE4MjBiZjYw
OTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDg3Myw2ICs0ODczLDcgQEAgd2Via2l0Lm9yZy9i
LzMxMjc4IFsgRGVidWcgXSBmYXN0L211bHRpY29sL3NwYW5uZXItZ2V0LXJlLWFkZGVkLW9uLW1v
dmUtY3Jhc2guaHQKIHdlYmtpdC5vcmcvYi8yMjUyNDcgWyBEZWJ1ZyBdIGZhc3QvbXVsdGljb2wv
c3Bhbi9mbG9hdC1iZWNvbWVzLXNwYW5uZXItY3Jhc2guaHRtbCBbIFNraXAgXQogCiB3ZWJraXQu
b3JnL2IvMjI2MDAyIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLXJv
dy1oZWlnaHQuaHRtbCBbIFNraXAgXQord2Via2l0Lm9yZy9iLzIyNjM2NCBmYXN0L2xheW91dGZv
cm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0
bWwgWyBTa2lwIF0KIAogIyBUaGlzIHdlYnN0b3JhZ2UgdGVzdCBoYXMgY3Jhc2hlZCBzaW5jZSBp
dCB3YXMgaW1wb3J0ZWQuCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnN0b3Jh
Z2Uvc3RvcmFnZV9zZXNzaW9uX3NldGl0ZW1fcXVvdGFleGNlZWRlZGVyci53aW5kb3cuaHRtbCBb
IFNraXAgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u
dGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy1leHBlY3RlZC5odG1s
IGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBl
cmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjczMDg4
NzJiMmRkZmVhOTgyZjg2NTQ3ZGVmZTgxYzVlOTA2MjBiN2YKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2Vu
dC1jb2x1bW5zLWFuZC1zcGFjaW5nLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPHN0
eWxlPgorZGl2IHsKKyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyB3aWR0aDogMTAycHg7Cisg
aGVpZ2h0OiAyMzVweDsKKyBtYXJnaW46IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0i
bWFyZ2luLXRvcDogMThweDsiPjwvZGl2PgorPGRpdj48L2Rpdj4KXCBObyBuZXdsaW5lIGF0IGVu
ZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj
b250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWwgYi9MYXlv
dXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1j
b2x1bW5zLWFuZC1zcGFjaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2YxNjdlNjJhY2VkYTA0Y2JjYmE3
YTdiMTMwYzI1OTg4ZjgxZTUyMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv
bGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtd2l0aC1wZXJjZW50LWNvbHVtbnMtYW5kLXNw
YWNpbmcuaHRtbApAQCAtMCwwICsxLDEwIEBACis8c3R5bGU+Cit0ZCB7CisgYmFja2dyb3VuZC1j
b2xvcjogZ3JlZW47Cisgd2lkdGg6IDEwMHB4OworfQorPC9zdHlsZT4KKzx0YWJsZSBoZWlnaHQ9
NTAwIHN0eWxlPSJib3JkZXItc3BhY2luZzogMTBweDsiPgorPHRyPjx0ZCBoZWlnaHQ9NTAlPjwv
dGQ+PC90cj4KKzx0cj48dGQgaGVpZ2h0PTUwJT48L3RkPjwvdHI+Cis8L3RhYmxlPgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430090</attachid>
            <date>2021-05-29 05:16:48 -0700</date>
            <delta_ts>2021-05-29 06:39:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226365-20210529051648.patch</filename>
            <type>text/plain</type>
            <size>14990</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU5MjFkNDUxNTI1MTU3
ZDU4MTljOTk3ZDY1MmVkMWViYTE3OThiOS4uNzFmZDZkYmU5MDNlMGVkZDU4ZmFmZTg3M2U4MGEz
YjgxNTJlOTFhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI5ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBp
bmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcgd2hlbiByZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9y
IHRhYmxlIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyNjM2NQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisg
ICAgICAgIDx0YWJsZSBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYm9yZGVyLXNwYWNpbmc6IDEwcHg7
Ij48dHI+PHRkIHN0eWxlPSJoZWlnaHQ6IDEwMCUiPjwvdGQ+PC90cj48L3RhYmxlPgorICAgICAg
ICBUaGUgPHRkPidzIDEwMCUgaGVpZ2h0IGlzIHJlc29sdmVkIGFnYWluc3QgMTAwcHggLSAoMiAq
IDEwcHgpIC0+IDgwcHg7CisKKyAgICAgICAgVGVzdDogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u
dGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy5odG1sCisKKyAgICAg
ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRl
eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0
OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv
bnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9y
bWF0dGluZ0dlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0
aW5nR2VvbWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlciBjb25zdCk6CisgICAgICAgICogbGF5b3V0
L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgorICAg
ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0dGlu
Z0NvbnRleHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6
VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpoZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9j
a1dpdGhGaXhlZEhlaWdodCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250
ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaDoKKyAgICAgICAgKFdlYkNvcmU6Okxh
eW91dDo6VGFibGVGb3JtYXR0aW5nUXVpcmtzOjpmb3JtYXR0aW5nQ29udGV4dCBjb25zdCk6CisK
IDIwMjEtMDUtMjkgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM
RkNdIFRyYW5zaXRpb24gY29udGFpbmluZyBibG9jayBmb3IgbG9vcHMgdG8gcmFuZ2UgbG9vcHMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y
bWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVi
YjMzZTlmODVkYzUxYTZhNjc1NjVlY2ZhODYwYjFlNDg1NWFhOTEuLmQwN2ZmYTRkZDBlZGY4NTg2
MDAxNGNhOTcwNGNmMmNlOWFkMmI2NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZv
cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDgsNyArNDgsNyBAQCBXVEZfTUFLRV9JU09fQUxMT0NB
VEVEX0lNUEwoVGFibGVGb3JtYXR0aW5nQ29udGV4dCk7CiAvLyBodHRwczovL3d3dy53My5vcmcv
VFIvY3NzLXRhYmxlcy0zLyN0YWJsZS1sYXlvdXQtYWxnb3JpdGhtCiBUYWJsZUZvcm1hdHRpbmdD
b250ZXh0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lckJveCYgZm9ybWF0
dGluZ0NvbnRleHRSb290LCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKQog
ICAgIDogRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290LCBmb3JtYXR0aW5n
U3RhdGUpCi0gICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlzLCBmb3JtYXR0aW5n
U3RhdGUudGFibGVHcmlkKCkpCisgICAgLCBtX3RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5KCp0aGlz
KQogICAgICwgbV90YWJsZUZvcm1hdHRpbmdRdWlya3MoKnRoaXMpCiB7CiB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9y
bWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4
dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGJiMjQxMWQ0MWRmMWFmN2U2
NzQ3YmY1ZDc3ZWQ0NDQzMzliYjJkOGUuLjk0MWNmMDlhYTY5YTFjMzY0ZTkyNjgxZTQyN2QwZTQy
ZWUwYzdmYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u
dGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5o
CkBAIC01NCw2ICs1NCw4IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBVbmlxdWVSZWY8VGFibGVH
cmlkPiBlbnN1cmVUYWJsZUdyaWQoY29uc3QgQ29udGFpbmVyQm94JiB0YWJsZUJveCk7CiAKKyAg
ICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyBy
ZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpm
b3JtYXR0aW5nU3RhdGUoKSk7IH0KKwogcHJpdmF0ZToKICAgICBjbGFzcyBUYWJsZUxheW91dCB7
CiAgICAgcHVibGljOgpAQCAtODEsNyArODMsNiBAQCBwcml2YXRlOgogICAgIEludHJpbnNpY1dp
ZHRoQ29uc3RyYWludHMgY29tcHV0ZWRQcmVmZXJyZWRXaWR0aEZvckNvbHVtbnMoKTsKICAgICB2
b2lkIGNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFTcGFjZShMYXlvdXRVbml0IGF2YWlsYWJsZUhv
cml6b250YWxTcGFjZSwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxhYmxlVmVydGljYWxTcGFj
ZSk7CiAKLSAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkg
Y29uc3QgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdD
b250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYg
Zm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8VGFibGVGb3JtYXR0aW5nU3RhdGU+
KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KIAogICAgIGNvbnN0IFRh
YmxlRm9ybWF0dGluZ0dlb21ldHJ5IG1fdGFibGVGb3JtYXR0aW5nR2VvbWV0cnk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl
Rm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n
Q29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmluZGV4IDNlM2I2Zjc2
YTBmNGU4ZWVkZjgxNTRkOTU2OWJlMzczZjYxNDMxNTcuLmMyZGQxNmRkYTg3ZmNkZTBiYjk3NGE4
YTBkYWYxMTM3MTZlYjQ0ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0
aW5nR2VvbWV0cnkuY3BwCkBAIC0zOSw5ICszOSw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu
YW1lc3BhY2UgTGF5b3V0IHsKIAotVGFibGVGb3JtYXR0aW5nR2VvbWV0cnk6OlRhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5KGNvbnN0IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQmIHRhYmxlRm9ybWF0dGlu
Z0NvbnRleHQsIGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCkKK1RhYmxlRm9ybWF0dGluZ0dlb21ldHJ5
OjpUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0JiB0
YWJsZUZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogRm9ybWF0dGluZ0dlb21ldHJ5KHRhYmxlRm9y
bWF0dGluZ0NvbnRleHQpCi0gICAgLCBtX2dyaWQoZ3JpZCkKIHsKIH0KIApAQCAtNjUsOSArNjQs
MTAgQEAgTGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y2VsbEJveENvbnRlbnRI
ZWlnaHQoY29uc3QgQ29udGFpbmVyQm94JiBjZWwKIAogRWRnZXMgVGFibGVGb3JtYXR0aW5nR2Vv
bWV0cnk6OmNvbXB1dGVkQ2VsbEJvcmRlcihjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNv
bnN0CiB7CisgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0
YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY2VsbEJveCA9IGNlbGwuYm94KCk7CiAgICAg
YXV0byBib3JkZXIgPSBjb21wdXRlZEJvcmRlcihjZWxsQm94KTsKLSAgICBhdXRvIGNvbGxhcHNl
ZEJvcmRlciA9IG1fZ3JpZC5jb2xsYXBzZWRCb3JkZXIoKTsKKyAgICBhdXRvIGNvbGxhcHNlZEJv
cmRlciA9IGdyaWQuY29sbGFwc2VkQm9yZGVyKCk7CiAgICAgaWYgKCFjb2xsYXBzZWRCb3JkZXIp
CiAgICAgICAgIHJldHVybiBib3JkZXI7CiAKQEAgLTc3LDMxICs3NywzMSBAQCBFZGdlcyBUYWJs
ZUZvcm1hdHRpbmdHZW9tZXRyeTo6Y29tcHV0ZWRDZWxsQm9yZGVyKGNvbnN0IFRhYmxlR3JpZDo6
Q2VsbCYgY2VsbCkgYwogICAgIGlmICghY2VsbFBvc2l0aW9uLmNvbHVtbikKICAgICAgICAgYm9y
ZGVyLmhvcml6b250YWwubGVmdCA9IGNvbGxhcHNlZEJvcmRlci0+aG9yaXpvbnRhbC5sZWZ0IC8g
MjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclJpZ2h0ID0gY29tcHV0
ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0
aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9udGFsLnJpZ2h0OworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyUmlnaHQgPSBjb21wdXRlZEJvcmRlcihncmlkLnNsb3QoeyBjZWxsUG9z
aXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jp
em9udGFsLnJpZ2h0OwogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5sZWZ0ID0gc3RkOjptYXgo
Ym9yZGVyLmhvcml6b250YWwubGVmdCwgYWRqYWNlbnRCb3JkZXJSaWdodCkgLyAyOwogICAgIH0K
ICAgICAvLyBDb2xsYXBzZWQgYm9yZGVyIHJpZ2h0IGZyb20gdGFibGUgYW5kIGFkamFjZW50IGNl
bGxzLgotICAgIGlmIChjZWxsUG9zaXRpb24uY29sdW1uID09IG1fZ3JpZC5jb2x1bW5zKCkuc2l6
ZSgpIC0gMSkKKyAgICBpZiAoY2VsbFBvc2l0aW9uLmNvbHVtbiA9PSBncmlkLmNvbHVtbnMoKS5z
aXplKCkgLSAxKQogICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9IGNvbGxhcHNlZEJv
cmRlci0+aG9yaXpvbnRhbC5yaWdodCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8gYWRq
YWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRp
b24uY29sdW1uICsgMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJveCgpKS5ob3Jpem9u
dGFsLmxlZnQ7CisgICAgICAgIGF1dG8gYWRqYWNlbnRCb3JkZXJMZWZ0ID0gY29tcHV0ZWRCb3Jk
ZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiArIDEsIGNlbGxQb3NpdGlvbi5yb3cg
fSktPmNlbGwoKS5ib3goKSkuaG9yaXpvbnRhbC5sZWZ0OwogICAgICAgICBib3JkZXIuaG9yaXpv
bnRhbC5yaWdodCA9IHN0ZDo6bWF4KGJvcmRlci5ob3Jpem9udGFsLnJpZ2h0LCBhZGphY2VudEJv
cmRlckxlZnQpIC8gMjsKICAgICB9CiAgICAgLy8gQ29sbGFwc2VkIGJvcmRlciB0b3AgZnJvbSB0
YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4KLSAgICBhdXRvJiByb3dzID0gbV9ncmlkLnJv
d3MoKS5saXN0KCk7CisgICAgYXV0byYgcm93cyA9IGdyaWQucm93cygpLmxpc3QoKTsKICAgICBp
ZiAoIWNlbGxQb3NpdGlvbi5yb3cpCiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC50b3AgPSBjb2xs
YXBzZWRCb3JkZXItPnZlcnRpY2FsLnRvcCAvIDI7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8g
YWRqYWNlbnRCb3JkZXJCb3R0b20gPSBjb21wdXRlZEJvcmRlcihtX2dyaWQuc2xvdCh7IGNlbGxQ
b3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5yb3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZl
cnRpY2FsLmJvdHRvbTsKKyAgICAgICAgYXV0byBhZGphY2VudEJvcmRlckJvdHRvbSA9IGNvbXB1
dGVkQm9yZGVyKGdyaWQuc2xvdCh7IGNlbGxQb3NpdGlvbi5jb2x1bW4sIGNlbGxQb3NpdGlvbi5y
b3cgLSAxIH0pLT5jZWxsKCkuYm94KCkpLnZlcnRpY2FsLmJvdHRvbTsKICAgICAgICAgYXV0byBh
ZGphY2VudFJvd0JvdHRvbSA9IGNvbXB1dGVkQm9yZGVyKHJvd3NbY2VsbFBvc2l0aW9uLnJvdyAt
IDFdLmJveCgpKS52ZXJ0aWNhbC5ib3R0b207CiAgICAgICAgIGF1dG8gYWRqYWNlbnRDb2xsYXBz
ZWRCb3JkZXIgPSBzdGQ6Om1heChhZGphY2VudEJvcmRlckJvdHRvbSwgYWRqYWNlbnRSb3dCb3R0
b20pOwogICAgICAgICBib3JkZXIudmVydGljYWwudG9wID0gc3RkOjptYXgoYm9yZGVyLnZlcnRp
Y2FsLnRvcCwgYWRqYWNlbnRDb2xsYXBzZWRCb3JkZXIpIC8gMjsKICAgICB9CiAgICAgLy8gQ29s
bGFwc2VkIGJvcmRlciBib3R0b20gZnJvbSB0YWJsZSwgcm93IGFuZCBhZGphY2VudCBjZWxscy4K
LSAgICBpZiAoY2VsbFBvc2l0aW9uLnJvdyA9PSBtX2dyaWQucm93cygpLnNpemUoKSAtIDEpCisg
ICAgaWYgKGNlbGxQb3NpdGlvbi5yb3cgPT0gZ3JpZC5yb3dzKCkuc2l6ZSgpIC0gMSkKICAgICAg
ICAgYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSA9IGNvbGxhcHNlZEJvcmRlci0+dmVydGljYWwuYm90
dG9tIC8gMjsKICAgICBlbHNlIHsKLSAgICAgICAgYXV0byBhZGphY2VudEJvcmRlclRvcCA9IGNv
bXB1dGVkQm9yZGVyKG1fZ3JpZC5zbG90KHsgY2VsbFBvc2l0aW9uLmNvbHVtbiwgY2VsbFBvc2l0
aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGljYWwudG9wOworICAgICAgICBhdXRv
IGFkamFjZW50Qm9yZGVyVG9wID0gY29tcHV0ZWRCb3JkZXIoZ3JpZC5zbG90KHsgY2VsbFBvc2l0
aW9uLmNvbHVtbiwgY2VsbFBvc2l0aW9uLnJvdyArIDEgfSktPmNlbGwoKS5ib3goKSkudmVydGlj
YWwudG9wOwogICAgICAgICBhdXRvIGFkamFjZW50Um93VG9wID0gY29tcHV0ZWRCb3JkZXIocm93
c1tjZWxsUG9zaXRpb24ucm93ICsgMV0uYm94KCkpLnZlcnRpY2FsLnRvcDsKICAgICAgICAgYXV0
byBhZGphY2VudENvbGxhcHNlZEJvcmRlciA9IHN0ZDo6bWF4KGFkamFjZW50Qm9yZGVyVG9wLCBh
ZGphY2VudFJvd1RvcCk7CiAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC5ib3R0b20gPSBzdGQ6Om1h
eChib3JkZXIudmVydGljYWwuYm90dG9tLCBhZGphY2VudENvbGxhcHNlZEJvcmRlcikgLyAyOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJs
ZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h
dHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdHZW9tZXRyeS5oCmluZGV4IGFkMmJi
MTBhZDIzOWEwYjc3NjcwYTM4MzllNDViNzhlNzM4ZDlmY2QuLmYxMTE2MzRmMDg1NDZlMDVhYjBl
MDBhNmJlZDM1NGRkYmU3MTRmMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m
b3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0
dGluZ0dlb21ldHJ5LmgKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgVGFibGVGb3JtYXR0aW5nQ29u
dGV4dDsKIAogY2xhc3MgVGFibGVGb3JtYXR0aW5nR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGlu
Z0dlb21ldHJ5IHsKIHB1YmxpYzoKLSAgICBUYWJsZUZvcm1hdHRpbmdHZW9tZXRyeShjb25zdCBU
YWJsZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgVGFibGVHcmlkJik7CisgICAgVGFibGVGb3Jt
YXR0aW5nR2VvbWV0cnkoY29uc3QgVGFibGVGb3JtYXR0aW5nQ29udGV4dCYpOwogCiAgICAgTGF5
b3V0VW5pdCBjZWxsQm94Q29udGVudEhlaWdodChjb25zdCBDb250YWluZXJCb3gmKSBjb25zdDsK
ICAgICBFZGdlcyBjb21wdXRlZENlbGxCb3JkZXIoY29uc3QgVGFibGVHcmlkOjpDZWxsJikgY29u
c3Q7CkBAIC00Nyw3ICs0Nyw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBjb25zdCBUYWJs
ZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRv
d25jYXN0PFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdHZW9tZXRyeTo6Zm9ybWF0
dGluZ0NvbnRleHQoKSk7IH0KLSAgICBjb25zdCBUYWJsZUdyaWQmIG1fZ3JpZDsKIH07CiAKIH0K
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmNwcAppbmRleCAwODRi
MjFjM2NjZWRmZGEwOThhZGIzYmQ0NTBhMmJiNWM3MWQxZGViLi5hYzllMjhjOGQ3YzVhMWUwMTNj
MTc5ODdhMTVmNjM3ZjkzYjI4NzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ1F1aXJrcy5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1h
dHRpbmdRdWlya3MuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiTGF5b3V0Q29udGFp
bmluZ0Jsb2NrQ2hhaW5JdGVyYXRvci5oIgogI2luY2x1ZGUgIkxheW91dFN0YXRlLmgiCiAjaW5j
bHVkZSAiVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oIgorI2luY2x1ZGUgIlRhYmxlR3JpZC5oIgog
CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTYxLDEyICs2Miwx
OSBAQCBMYXlvdXRVbml0IFRhYmxlRm9ybWF0dGluZ1F1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJl
c3RDb250YWluaW5nQmxvY2tXaXRoRml4ZWRIZQogICAgIC8vIFRoZSAibGV0J3MgZmluZCB0aGUg
bmVhcmVzdCBhbmNlc3RvciB3aXRoIGZpeGVkIGhlaWdodCB0byByZXNvbHZlIHBlcmNlbnQgaGVp
Z2h0IiBxdWlyayBpcyBsaW1pdGVkIHRvIHRoZSB0YWJsZSBmb3JtYXR0aW5nCiAgICAgLy8gY29u
dGV4dC4gSWYgd2UgY2FuJ3QgcmVzb2x2ZSBpdCB3aXRoaW4gdGhlIHRhYmxlIHN1YnRyZWUsIHdl
IGRlZmF1bHQgaXQgdG8gMC4KICAgICAvLyBlLmcgPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDBweCI+
PHRhYmxlPjx0cj48dGQgc3R5bGU9ImhlaWdodDogMTAwJSI+PC90ZD48L3RyPjwvdGFibGU+PC9k
aXY+IGlzIHJlc29sdmVkIHRvIDBweC4KLSAgICBhdXRvIGZpeGVkTG9naWNhbEhlaWdodCA9IFsm
XShjb25zdCBhdXRvJiBhbmNlc3RvckJveCkgeworICAgIGF1dG8mIHRhYmxlQm94ID0gZm9ybWF0
dGluZ0NvbnRleHQoKS5yb290KCk7CisgICAgYXV0byBmaXhlZExvZ2ljYWxIZWlnaHQgPSBbJl0o
Y29uc3QgYXV0byYgYW5jZXN0b3JCb3gpIC0+IE9wdGlvbmFsPExheW91dFVuaXQ+IHsKICAgICAg
ICAgYXV0byBoZWlnaHQgPSBhbmNlc3RvckJveC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAg
ICAgICAgcmV0dXJuIGhlaWdodC5pc0ZpeGVkKCkgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoTGF5b3V0
VW5pdCB7IGhlaWdodC52YWx1ZSgpIH0pIDogc3RkOjpudWxsb3B0OworICAgICAgICBpZiAoIWhl
aWdodC5pc0ZpeGVkKCkpCisgICAgICAgICAgICByZXR1cm4geyB9OworICAgICAgICBpZiAoJmFu
Y2VzdG9yQm94ICE9ICZ0YWJsZUJveCkKKyAgICAgICAgICAgIHJldHVybiBMYXlvdXRVbml0IHsg
aGVpZ2h0LnZhbHVlKCkgfTsKKyAgICAgICAgYXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdDb250ZXh0
KCkuZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CisgICAgICAgIGF1dG8gdmVydGljYWxT
cGFjaW5nID0gZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVu
aXQgeyBoZWlnaHQudmFsdWUoKSAtICgoZ3JpZC5yb3dzKCkuc2l6ZSgpICsgMSkgKiB2ZXJ0aWNh
bFNwYWNpbmcpIH07CiAgICAgfTsKIAotICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWlu
aW5nQmxvY2tDaGFpbihsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLmNvbnRh
aW5pbmdCbG9jaygpKSkgeworICAgIGZvciAoYXV0byYgYW5jZXN0b3IgOiBjb250YWluaW5nQmxv
Y2tDaGFpbihsYXlvdXRCb3gsIHRhYmxlQm94LmNvbnRhaW5pbmdCbG9jaygpKSkgewogICAgICAg
ICBpZiAoYXV0byBmaXhlZEhlaWdodCA9IGZpeGVkTG9naWNhbEhlaWdodChhbmNlc3RvcikpCiAg
ICAgICAgICAgICByZXR1cm4gKmZpeGVkSGVpZ2h0OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5n
UXVpcmtzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl
L1RhYmxlRm9ybWF0dGluZ1F1aXJrcy5oCmluZGV4IGU5NGNhMWQyZGI3ZmFmOGQ3NzQ1MzI3OTVj
MGU3NTgxMGMxNGJhZTYuLjRhZmYzZTk5YjJlZjQ3ZDBkZDkzM2I3OWNlNDRhMWI3MzIzNDRiYTUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi
bGUvVGFibGVGb3JtYXR0aW5nUXVpcmtzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv
cm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUZvcm1hdHRpbmdRdWlya3MuaApAQCAtNDAsNiAr
NDAsMTAgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSWdub3JlQ2hpbGRDb250
ZW50VmVydGljYWxNYXJnaW4oY29uc3QgQ29udGFpbmVyQm94Jik7CiAgICAgTGF5b3V0VW5pdCBo
ZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhlaWdodChjb25zdCBC
b3gmKSBjb25zdCBmaW5hbDsKKworcHJpdmF0ZToKKyAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdD
b250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFRhYmxl
Rm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdRdWlya3M6OmZvcm1hdHRpbmdDb250ZXh0KCkp
OyB9CisKIH07CiAKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiNDFhODViYTM1MjJkMGYwMzAxZTJlNDg0N2VmNGM3MmI1
MTZiNTYzLi41ZDA3NGMwZGRmNTRhMjBmYWY3ZTM0Mjg5MjZjYjFlN2FhMzYxZTg0IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv
bT4KKworICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBpbmNsdWRlIHZlcnRpY2FsIHNwYWNpbmcg
d2hlbiByZXNvbHZpbmcgcGVyY2VudCBoZWlnaHQgZm9yIHRhYmxlIGNvbnRlbnQKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjM2NQorCisgICAgICAg
IFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9u
czogV2ViS2l0IHRhYmxlIGxheW91dCBkb24ndCByZXNvbHZlIHRoZSBoZWlnaHQgcGVyY2VudCBw
cm9wZXJseSB3aGVuIGJvcmRlciBzcGFjaW5nIGlzIHByZXNlbnQuCisgICAgICAgICogZmFzdC9s
YXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3Bh
Y2luZy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRp
bmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWw6IEFk
ZGVkLgorCiAyMDIxLTA1LTI4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t
PgogCiAgICAgICAgIFdlYiBwcm9jZXNzIHRlcm1pbmF0ZXMgd2hlbiBhdHRlbXB0aW5nIHRvIGxv
ZyBpbiBvbiBiYW5raWQubm8KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGVlMmZjMWUxMDVkYTc0MWY2
MDNmY2VjNTMyMjZlYThlODBhYjNlYjUuLjIyYjY5ZThjOWVhYjhhOGFkMzZjNjI4Y2JmNDcwZTE4
MjBiZjYwOTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDg3Myw2ICs0ODczLDcgQEAgd2Via2l0
Lm9yZy9iLzMxMjc4IFsgRGVidWcgXSBmYXN0L211bHRpY29sL3NwYW5uZXItZ2V0LXJlLWFkZGVk
LW9uLW1vdmUtY3Jhc2guaHQKIHdlYmtpdC5vcmcvYi8yMjUyNDcgWyBEZWJ1ZyBdIGZhc3QvbXVs
dGljb2wvc3Bhbi9mbG9hdC1iZWNvbWVzLXNwYW5uZXItY3Jhc2guaHRtbCBbIFNraXAgXQogCiB3
ZWJraXQub3JnL2IvMjI2MDAyIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2lt
cGxlLXJvdy1oZWlnaHQuaHRtbCBbIFNraXAgXQord2Via2l0Lm9yZy9iLzIyNjM2NCBmYXN0L2xh
eW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFj
aW5nLmh0bWwgWyBTa2lwIF0KIAogIyBUaGlzIHdlYnN0b3JhZ2UgdGVzdCBoYXMgY3Jhc2hlZCBz
aW5jZSBpdCB3YXMgaW1wb3J0ZWQuCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dl
YnN0b3JhZ2Uvc3RvcmFnZV9zZXNzaW9uX3NldGl0ZW1fcXVvdGFleGNlZWRlZGVyci53aW5kb3cu
aHRtbCBbIFNraXAgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0
aW5nY29udGV4dC90YWJsZS13aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy1leHBlY3Rl
ZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS13
aXRoLXBlcmNlbnQtY29sdW1ucy1hbmQtc3BhY2luZy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LjczMDg4NzJiMmRkZmVhOTgyZjg2NTQ3ZGVmZTgxYzVlOTA2MjBiN2YKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgt
cGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMCBA
QAorPHN0eWxlPgorZGl2IHsKKyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyB3aWR0aDogMTAy
cHg7CisgaGVpZ2h0OiAyMzVweDsKKyBtYXJnaW46IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBz
dHlsZT0ibWFyZ2luLXRvcDogMThweDsiPjwvZGl2PgorPGRpdj48L2Rpdj4KXCBObyBuZXdsaW5l
IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h
dHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVyY2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWwg
Yi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXdpdGgtcGVy
Y2VudC1jb2x1bW5zLWFuZC1zcGFjaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2YxNjdlNjJhY2VkYTA0
Y2JjYmE3YTdiMTMwYzI1OTg4ZjgxZTUyMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtd2l0aC1wZXJjZW50LWNvbHVtbnMt
YW5kLXNwYWNpbmcuaHRtbApAQCAtMCwwICsxLDEwIEBACis8c3R5bGU+Cit0ZCB7CisgYmFja2dy
b3VuZC1jb2xvcjogZ3JlZW47Cisgd2lkdGg6IDEwMHB4OworfQorPC9zdHlsZT4KKzx0YWJsZSBo
ZWlnaHQ9NTAwIHN0eWxlPSJib3JkZXItc3BhY2luZzogMTBweDsiPgorPHRyPjx0ZCBoZWlnaHQ9
NTAlPjwvdGQ+PC90cj4KKzx0cj48dGQgaGVpZ2h0PTUwJT48L3RkPjwvdHI+Cis8L3RhYmxlPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>