<?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>213629</bug_id>
          
          <creation_ts>2020-06-25 16:46:15 -0700</creation_ts>
          <short_desc>[Inline] Overlapping content when margin-right is present</short_desc>
          <delta_ts>2020-06-25 21:17:53 -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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="alan">zalan</reporter>
          <assigned_to name="alan">zalan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</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>1666279</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2020-06-25 16:46:15 -0700</bug_when>
    <thetext>&lt;rdar://problem/64391403&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666280</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-25 16:46:32 -0700</bug_when>
    <thetext>&lt;rdar://problem/64780498&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666306</commentid>
    <comment_count>2</comment_count>
      <attachid>402829</attachid>
    <who name="alan">zalan</who>
    <bug_when>2020-06-25 17:18:33 -0700</bug_when>
    <thetext>Created attachment 402829
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666318</commentid>
    <comment_count>3</comment_count>
      <attachid>402831</attachid>
    <who name="alan">zalan</who>
    <bug_when>2020-06-25 17:32:06 -0700</bug_when>
    <thetext>Created attachment 402831
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666337</commentid>
    <comment_count>4</comment_count>
      <attachid>402831</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-25 18:08:19 -0700</bug_when>
    <thetext>Comment on attachment 402831
Patch

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

please fix the tests.

&gt; Source/WebCore/ChangeLog:3
&gt; +        [Inline] setLogicalWidthForTextRun needs the current logical left position

This should describe the user-visible symptom</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666354</commentid>
    <comment_count>5</comment_count>
      <attachid>402844</attachid>
    <who name="alan">zalan</who>
    <bug_when>2020-06-25 19:35:33 -0700</bug_when>
    <thetext>Created attachment 402844
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666365</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-25 21:17:52 -0700</bug_when>
    <thetext>Committed r263550: &lt;https://trac.webkit.org/changeset/263550&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402844.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402829</attachid>
            <date>2020-06-25 17:18:33 -0700</date>
            <delta_ts>2020-06-25 17:32:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213629-20200625171832.patch</filename>
            <type>text/plain</type>
            <size>11175</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRkY2Q0OTNiNGM3NGZj
ZTc5MmEyYjNmYThmYzc0NDhiZWI5M2IxZi4uMWI5OWI1YmZiYjUzZTNmMzVhYTliODViZGNiZDFl
MjFkZGJiNWVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTI1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lubGluZV0gc2V0TG9naWNh
bFdpZHRoRm9yVGV4dFJ1biBuZWVkcyB0aGUgY3VycmVudCBsb2dpY2FsIGxlZnQgcG9zaXRpb24K
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYyOQor
ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQzOTE0MDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gY29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0
aW9uc0ZvclNlZ21lbnQgbG9vcHMgdGhyb3VnaCB0aGUgQmlkaSBydW5zIGFuZCBjb21wdXRlcyB0
aGVpciBsb2dpY2FsIHdpZHRocy4KKyAgICAgICAgMi4gVGV4dCBtZWFzdXJpbmcgbmVlZHMgdGhl
IGN1cnJlbnQgbG9naWNhbCBsZWZ0IHBvc2l0aW9uIGluIG9yZGVyIHRvIGNvbXB1dGUgdGhlIHJ1
biB3aWR0aCBwcm9wZXJseSAoZS5nIHRhYiBzaXplKQorICAgICAgICAzLiBUaGUgY3VycmVudCBs
b2dpY2FsIGxlZnQgaW5jbHVkZXMgbWFyZ2lucywgYm9kZXJzIGFuZCBwYWRkaW5ncyAoZS5nIDxz
cGFuIHN0eWxlPSJtYXJnaW46IDEwMHB4OyI+dGV4dCBjb250ZW50PC9zcGFuPiAndGV4dCBjb250
ZW50JyBzdGFydHMgYXQgMTAwcHggLWlnbm9yZSB0aGUgbGluZSBvZmZzZXQgZm9yIG5vdykKKyAg
ICAgICAgNC4gVGhlIEJpRGkgbG9vcCBqdW1wcyBvdmVyIGVtcHR5IGlubGluZSBjb250YWluZXJz
IChlLmcuIHRleHQ8c3BhbiBzdHlsZT0iYm9yZGVyOiAxMHB4IHNvbGlkIGdyZWVuIj48L3NwYW4+
Y29udGVudCkgYW5kIGl0IGxhY2tzIHRoZSBpbmZvcm1hdGlvbiB0byBiZSBhYmxlIHRvIHJlc29s
dmUgbmVzdGVkIGlubGluZSBjb250YWluZXJzLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcHJlLWNv
bXB1dGVzIHRoZSBzcGFjaW5nIG9mZnNldCBmb3IgZWFjaCBJbmxpbmVUZXh0Qm94IHNvIHRoYXQg
d2UgY291bGQgdXNlIGl0IGxhdGVyIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgbGVmdCBwb3NpdGlv
biBmb3IgdGhlIHRleHQgbWVhc3VyaW5nLgorCisgICAgICAgIDxzcGFuIHN0eWxlPSJtYXJnaW4t
cmlnaHQ6IDFweCI+WzFdPHNwYW4gc3R5bGU9Im1hcmdpbjogMnB4Ij5bMl08L3NwYW4+WzNdPC9z
cGFuPls0XQorICAgICAgICBbMV0gLT4gMHB4IG9mZnNldAorICAgICAgICBbMl0gLT4gMnB4IG9m
ZnNldAorICAgICAgICBbM10gLT4gNHB4IG9mZnNldAorICAgICAgICBbNF0gLT4gNXB4IG9mZnNl
dAorCisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRpb24uaHRt
bAorCisgICAgICAgICogcmVuZGVyaW5nL0NvbXBsZXhMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkNvbXBsZXhMaW5lTGF5b3V0Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRp
b25zRm9yU2VnbWVudCk6CisKIDIwMjAtMDYtMjMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl
LmNvbT4KIAogICAgICAgICBbTXVsdGljb2xdIFJlc2V0IHRoZSBjaGlsZHJlbklubGluZSBzdGF0
ZSBvbiB0aGUgUmVuZGVyQmxvY2tGbG93IHdoZW4gZGVzdHJveWluZyB0aGUgbXVsdGljb2x1bW4g
Y29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvbXBsZXhMaW5l
TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db21wbGV4TGluZUxheW91dC5j
cHAKaW5kZXggYTExN2RmMjc4ZTJjOTYyMjk5Mjk2ZWM0NzkwYjlkMjMxMTJjYjIzYi4uNDBlN2Nj
ZjI1ODUyZDYzYWI4YjIzNTZlODZmZjQwYTRmMGEwNjEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL0NvbXBsZXhMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvQ29tcGxleExpbmVMYXlvdXQuY3BwCkBAIC04NTIsOCArODUyLDggQEAgc3Rh
dGljIGJvb2wgaXNMYXN0SW5GbG93UnVuKEJpZGlSdW4mIHJ1blRvQ2hlY2spCiAgICAgfQogICAg
IHJldHVybiB0cnVlOwogfQotICAgIAotQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1
dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmVCb3gqIGxpbmVC
b3gsIGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbywgVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24sIGZs
b2F0JiBsb2dpY2FsTGVmdCwKKworQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1dGVJ
bmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmVCb3gqIGxpbmVCb3gs
IGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbywgVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24sIGZsb2F0
JiBsaW5lTG9naWNhbExlZnQsCiAgICAgZmxvYXQmIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgQmlk
aVJ1biogZmlyc3RSdW4sIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4sIEdseXBoT3ZlcmZsb3dB
bmRGYWxsYmFja0ZvbnRzTWFwJiB0ZXh0Qm94RGF0YU1hcCwgVmVydGljYWxQb3NpdGlvbkNhY2hl
JiB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsCiAgICAgV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1
cmVtZW50cykKIHsKQEAgLTg2MSwxMSArODYxLDQ5IEBAIEJpZGlSdW4qIENvbXBsZXhMaW5lTGF5
b3V0Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5l
CiAgICAgYm9vbCBjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0ID0gc3R5bGUoKS5oYW5naW5nUHVu
Y3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246OkZpcnN0KTsKICAgICBib29s
IGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gc3R5bGUoKS5oYW5naW5nUHVuY3R1YXRpb24oKS5j
b250YWlucyhIYW5naW5nUHVuY3R1YXRpb246Okxhc3QpOwogICAgIGJvb2wgaXNMVFIgPSBzdHls
ZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKLSAgICBmbG9hdCB0b3RhbExvZ2ljYWxXaWR0
aCA9IGxpbmVCb3gtPmdldEZsb3dTcGFjaW5nTG9naWNhbFdpZHRoKCk7CisgICAgZmxvYXQgY29u
dGVudFdpZHRoID0gMDsKICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ID0g
MDsKICAgICBib29sIGlzQWZ0ZXJFeHBhbnNpb24gPSBpczxSZW5kZXJSdWJ5QmFzZT4obV9mbG93
KSA/IGRvd25jYXN0PFJlbmRlclJ1YnlCYXNlPihtX2Zsb3cpLmlzQWZ0ZXJFeHBhbnNpb24oKSA6
IHRydWU7CiAgICAgVmVjdG9yPHVuc2lnbmVkLCAxNj4gZXhwYW5zaW9uT3Bwb3J0dW5pdGllczsK
IAorICAgIEhhc2hNYXA8SW5saW5lVGV4dEJveCosIExheW91dFVuaXQ+IGxvZ2ljYWxTcGFjaW5n
Rm9ySW5saW5lVGV4dEJveGVzOworICAgIGF1dG8gY29sbGVjdFNwYWNpbmdMb2dpY2FsV2lkdGhz
ID0gWyZdICgpIHsKKyAgICAgICAgYXV0byB0b3RhbFNwYWNpbmdXaWR0aCA9IExheW91dFVuaXQg
eyB9OworICAgICAgICAvLyBDb2xsZWN0IHRoZSBzcGFjaW5nIHBvc2l0aW9ucyAobWFyZ2luLCBi
b3JkZXIgcGFkZGluZykgZm9yIHRoZSB0ZXh0Ym94ZXMgYnkgdHJhdmVyc2luZyB0aGUgaW5saW5l
IHRyZWUgb2YgdGhlIGN1cnJlbnQgbGluZS4KKyAgICAgICAgVmVjdG9yPElubGluZUJveCo+IHF1
ZXVlOworICAgICAgICBxdWV1ZS5hcHBlbmQobGluZUJveCk7CisgICAgICAgIC8vIDEuIFZpc2l0
IGVhY2ggaW5saW5lIGJveCBpbiBhIHByZW9yZGVyIGZhc2hpb24KKyAgICAgICAgLy8gMi4gQWNj
dW11bGF0ZSB0aGUgc3BhY2luZyB3aGVuIHdlIGZpbmQgYW4gSW5saW5lRmxvd0JveCAoaW5saW5l
IGNvbnRhaW5lciBlLmcgc3BhY2UpCisgICAgICAgIC8vIDMuIEFkZCB0aGUgSW5saW5lVGV4dEJv
eGVzIHRvIHRoZSBoYXNobWFwCisgICAgICAgIHdoaWxlICghcXVldWUuaXNFbXB0eSgpKSB7Cisg
ICAgICAgICAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICAgICAgICAgIGF1dG8qIGlubGluZUJv
eCA9IHF1ZXVlLmxhc3QoKTsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SW5saW5lRmxvd0JveD4o
aW5saW5lQm94KSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVGbG93Qm94ID0g
ZG93bmNhc3Q8SW5saW5lRmxvd0JveD4oKmlubGluZUJveCk7CisgICAgICAgICAgICAgICAgICAg
IHRvdGFsU3BhY2luZ1dpZHRoICs9IGlubGluZUZsb3dCb3gubWFyZ2luQm9yZGVyUGFkZGluZ0xv
Z2ljYWxMZWZ0KCk7CisgICAgICAgICAgICAgICAgICAgIGlmIChhdXRvKiBjaGlsZCA9IGlubGlu
ZUZsb3dCb3guZmlyc3RDaGlsZCgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZS5h
cHBlbmQoY2hpbGQpOworICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg
ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAg
ICAgfQorICAgICAgICAgICAgICAgIGlmIChpczxJbmxpbmVUZXh0Qm94PihpbmxpbmVCb3gpKQor
ICAgICAgICAgICAgICAgICAgICBsb2dpY2FsU3BhY2luZ0ZvcklubGluZVRleHRCb3hlcy5hZGQo
ZG93bmNhc3Q8SW5saW5lVGV4dEJveD4oaW5saW5lQm94KSwgdG90YWxTcGFjaW5nV2lkdGgpOwor
ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgd2hpbGUg
KCFxdWV1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSAq
cXVldWUudGFrZUxhc3QoKTsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SW5saW5lRmxvd0JveD4o
aW5saW5lQm94KSkKKyAgICAgICAgICAgICAgICAgICAgdG90YWxTcGFjaW5nV2lkdGggKz0gZG93
bmNhc3Q8SW5saW5lRmxvd0JveD4oaW5saW5lQm94KS5tYXJnaW5Cb3JkZXJQYWRkaW5nTG9naWNh
bFJpZ2h0KCk7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIG5leHRTaWJsaW5nID0gaW5saW5l
Qm94Lm5leHRPbkxpbmUoKSkgeworICAgICAgICAgICAgICAgICAgICBxdWV1ZS5hcHBlbmQobmV4
dFNpYmxpbmcpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9
CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9OworICAgIGNvbGxlY3RTcGFjaW5nTG9n
aWNhbFdpZHRocygpOworCiAgICAgQmlkaVJ1biogcnVuID0gZmlyc3RSdW47CiAgICAgQmlkaVJ1
biogcHJldmlvdXNSdW4gPSBudWxscHRyOwogICAgIGZvciAoOyBydW47IHJ1biA9IHJ1bi0+bmV4
dCgpKSB7CkBAIC04OTcsNyArOTM1LDcgQEAgQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNv
bXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmUKICAgICAg
ICAgICAgICAgICBmbG9hdCBoYW5nU3RhcnRXaWR0aCA9IHJlbmRlclRleHQuaGFuZ2FibGVQdW5j
dHVhdGlvblN0YXJ0V2lkdGgocnVuLT5tX3N0YXJ0KTsKICAgICAgICAgICAgICAgICBhdmFpbGFi
bGVMb2dpY2FsV2lkdGggKz0gaGFuZ1N0YXJ0V2lkdGg7CiAgICAgICAgICAgICAgICAgaWYgKHN0
eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQotICAgICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdCAtPSBoYW5nU3RhcnRXaWR0aDsKKyAgICAgICAgICAgICAgICAgICAgbGluZUxvZ2lj
YWxMZWZ0IC09IGhhbmdTdGFydFdpZHRoOwogICAgICAgICAgICAgICAgIGNhbkhhbmdQdW5jdHVh
dGlvbkF0U3RhcnQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtOTA2
LDcgKzk0NCw3IEBAIEJpZGlSdW4qIENvbXBsZXhMaW5lTGF5b3V0Ojpjb21wdXRlSW5saW5lRGly
ZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5lCiAgICAgICAgICAgICAgICAgZmxv
YXQgaGFuZ0VuZFdpZHRoID0gcmVuZGVyVGV4dC5oYW5nYWJsZVB1bmN0dWF0aW9uRW5kV2lkdGgo
cnVuLT5tX3N0b3AgLSAxKTsKICAgICAgICAgICAgICAgICBhdmFpbGFibGVMb2dpY2FsV2lkdGgg
Kz0gaGFuZ0VuZFdpZHRoOwogICAgICAgICAgICAgICAgIGlmICghc3R5bGUoKS5pc0xlZnRUb1Jp
Z2h0RGlyZWN0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0IC09IGhhbmdF
bmRXaWR0aDsKKyAgICAgICAgICAgICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0IC09IGhhbmdFbmRX
aWR0aDsKICAgICAgICAgICAgICAgICBjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCA9IGZhbHNlOwog
ICAgICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC05MTUsMTMgKzk1MywxMyBAQCBCaWRpUnVu
KiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvclNl
Z21lbnQoUm9vdElubGluZQogCiAgICAgICAgICAgICBpZiAodW5zaWduZWQgbGVuZ3RoID0gcmVu
ZGVyVGV4dC50ZXh0KCkubGVuZ3RoKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoIXJ1bi0+bV9z
dGFydCAmJiBuZWVkc1dvcmRTcGFjaW5nICYmIGlzU3BhY2VPck5ld2xpbmUocmVuZGVyVGV4dC5j
aGFyYWN0ZXJBdChydW4tPm1fc3RhcnQpKSkKLSAgICAgICAgICAgICAgICAgICAgdG90YWxMb2dp
Y2FsV2lkdGggKz0gbGluZVN0eWxlKCpyZW5kZXJUZXh0LnBhcmVudCgpLCBsaW5lSW5mbykuZm9u
dENhc2NhZGUoKS53b3JkU3BhY2luZygpOworICAgICAgICAgICAgICAgICAgICBjb250ZW50V2lk
dGggKz0gbGluZVN0eWxlKCpyZW5kZXJUZXh0LnBhcmVudCgpLCBsaW5lSW5mbykuZm9udENhc2Nh
ZGUoKS53b3JkU3BhY2luZygpOwogICAgICAgICAgICAgICAgIC8vIHJ1bi0+bV9zdGFydCA9PSBy
dW4tPm1fc3RvcCBzaG91bGQgb25seSBiZSB0cnVlIGlmZiB0aGUgcnVuIGlzIGEgcmVwbGFjZWQg
cnVuIGZvciBiaWRpOiBpc29sYXRlLgogICAgICAgICAgICAgICAgIEFTU0VSVChydW4tPm1fc3Rv
cCA+IDAgfHwgcnVuLT5tX3N0YXJ0ID09IHJ1bi0+bV9zdG9wKTsKICAgICAgICAgICAgICAgICBu
ZWVkc1dvcmRTcGFjaW5nID0gcnVuLT5tX3N0b3AgPT0gbGVuZ3RoICYmICFpc1NwYWNlT3JOZXds
aW5lKHJlbmRlclRleHQuY2hhcmFjdGVyQXQocnVuLT5tX3N0b3AgLSAxKSk7CiAgICAgICAgICAg
ICB9Ci0KLSAgICAgICAgICAgIHNldExvZ2ljYWxXaWR0aEZvclRleHRSdW4obGluZUJveCwgcnVu
LCByZW5kZXJUZXh0LCB0b3RhbExvZ2ljYWxXaWR0aCwgbGluZUluZm8sIHRleHRCb3hEYXRhTWFw
LCB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsIHdvcmRNZWFzdXJlbWVudHMpOworICAgICAgICAgICAg
YXV0byBjdXJyZW50TG9naWNhbExlZnRQb3NpdGlvbiA9IGxpbmVMb2dpY2FsTGVmdCArIGxvZ2lj
YWxTcGFjaW5nRm9ySW5saW5lVGV4dEJveGVzLmdldCgmdGV4dEJveCkgKyBjb250ZW50V2lkdGg7
CisgICAgICAgICAgICBzZXRMb2dpY2FsV2lkdGhGb3JUZXh0UnVuKGxpbmVCb3gsIHJ1biwgcmVu
ZGVyVGV4dCwgY3VycmVudExvZ2ljYWxMZWZ0UG9zaXRpb24sIGxpbmVJbmZvLCB0ZXh0Qm94RGF0
YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hlLCB3b3JkTWVhc3VyZW1lbnRzKTsKICAgICAgICAg
fSBlbHNlIHsKICAgICAgICAgICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0U3RhcnQgPSBmYWxzZTsK
ICAgICAgICAgICAgIGJvb2wgZW5jb3VudGVyZWRKdXN0aWZpZWRSdWJ5ID0gZmFsc2U7CkBAIC05
NDcsMTEgKzk4NSwxMCBAQCBCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGlu
ZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZQogICAgICAgICAgICAgICAg
IGlmIChpczxSZW5kZXJSdWJ5UnVuPihyZW5kZXJCb3gpKQogICAgICAgICAgICAgICAgICAgICBz
ZXRNYXJnaW5zRm9yUnVieVJ1bihydW4sIGRvd25jYXN0PFJlbmRlclJ1YnlSdW4+KHJlbmRlckJv
eCksIHByZXZpb3VzUnVuID8gJnByZXZpb3VzUnVuLT5yZW5kZXJlcigpIDogbnVsbHB0ciwgbGlu
ZUluZm8pOwogICAgICAgICAgICAgICAgIHJ1bi0+Ym94KCktPnNldExvZ2ljYWxXaWR0aChtX2Zs
b3cubG9naWNhbFdpZHRoRm9yQ2hpbGQocmVuZGVyQm94KSk7Ci0gICAgICAgICAgICAgICAgdG90
YWxMb2dpY2FsV2lkdGggKz0gbV9mbG93Lm1hcmdpblN0YXJ0Rm9yQ2hpbGQocmVuZGVyQm94KSAr
IG1fZmxvdy5tYXJnaW5FbmRGb3JDaGlsZChyZW5kZXJCb3gpOwogICAgICAgICAgICAgfQogICAg
ICAgICB9CiAKLSAgICAgICAgdG90YWxMb2dpY2FsV2lkdGggKz0gcnVuLT5ib3goKS0+bG9naWNh
bFdpZHRoKCk7CisgICAgICAgIGNvbnRlbnRXaWR0aCArPSBydW4tPmJveCgpLT5sb2dpY2FsV2lk
dGgoKTsKICAgICAgICAgcHJldmlvdXNSdW4gPSBydW47CiAgICAgfQogCkBAIC05NzAsMTAgKzEw
MDcsOSBAQCBCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlv
blBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZQogICAgIGlmIChpczxSZW5kZXJSdWJ5QmFz
ZT4obV9mbG93KSAmJiAhZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCkKICAgICAgICAgdGV4dEFs
aWduID0gVGV4dEFsaWduTW9kZTo6Q2VudGVyOwogCi0gICAgdXBkYXRlTG9naWNhbFdpZHRoRm9y
QWxpZ25tZW50KG1fZmxvdywgdGV4dEFsaWduLCBsaW5lQm94LCB0cmFpbGluZ1NwYWNlUnVuLCBs
b2dpY2FsTGVmdCwgdG90YWxMb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgZXhw
YW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Ci0KKyAgICBhdXRvIHRvdGFsTG9naWNhbFdpZHRoID0g
Y29udGVudFdpZHRoICsgbGluZUJveC0+Z2V0Rmxvd1NwYWNpbmdMb2dpY2FsV2lkdGgoKTsKKyAg
ICB1cGRhdGVMb2dpY2FsV2lkdGhGb3JBbGlnbm1lbnQobV9mbG93LCB0ZXh0QWxpZ24sIGxpbmVC
b3gsIHRyYWlsaW5nU3BhY2VSdW4sIGxpbmVMb2dpY2FsTGVmdCwgdG90YWxMb2dpY2FsV2lkdGgs
IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7CiAgICAg
Y29tcHV0ZUV4cGFuc2lvbkZvckp1c3RpZmllZFRleHQoZmlyc3RSdW4sIHRyYWlsaW5nU3BhY2VS
dW4sIGV4cGFuc2lvbk9wcG9ydHVuaXRpZXMsIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQsIHRv
dGFsTG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpOwotCiAgICAgcmV0dXJuIHJ1
bjsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCmluZGV4IGIyOWI0MWM3YjZiYzJlMjFkMWU4ZjRlYmM3Y2FjNTdmYzgyYzI4MTQu
LjJmODczN2RhM2JiNTk3ODNiNGI2NWE1NGM4OWY0MTQ1YjIyYmI0MDggMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxNCBAQAorMjAyMC0wNi0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg
ICAgICAgIFtJbmxpbmVdIHNldExvZ2ljYWxXaWR0aEZvclRleHRSdW4gbmVlZHMgdGhlIGN1cnJl
bnQgbG9naWNhbCBsZWZ0IHBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMTM2MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MzkxNDAz
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFz
dC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlvbi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg
ICAgICAgKiBmYXN0L2lubGluZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLmh0bWw6IEFkZGVkLgor
CiAyMDIwLTA2LTIzICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBb
IGlPUyBSZWxlYXNlIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJzb2NrZXRz
L1NlY3VyZS1DbG9zZS1SZWFzb24tVW5wYWlyZWQtc3Vycm9nYXRlcy5hbnkuaHRtbCAmIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vic29ja2V0cy9TZWN1cmUtQ2xvc2UtUmVhc29u
LVVucGFpcmVkLXN1cnJvZ2F0ZXMuYW55Lndvcmtlci5odG1sIGFyZSBmbGFreSBmYWlsdXJlcwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlv
bi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1w
b3NpdGlvbi1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk0NDI1ZDc5NmNhODJiNTZlMjI3ZDlm
NTJlZDI2OTE2Zjk0Mjc2MDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lu
bGluZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw2IEBA
Cis8c3R5bGU+Cisub3V0ZXIgeworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxl
PgorPHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bh
bj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9z
aXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRp
b24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi5kZDM2YjExMzljNjIxNWM3YzNhMTY2MDVlZTQwNGRjNzBhODkz
ZDAxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0
LXRhYi1wb3NpdGlvbi5odG1sCkBAIC0wLDAgKzEsNyBAQAorPHN0eWxlPgorLm91dGVyIHsKKyAg
bWFyZ2luLXJpZ2h0OiAyMHB4OworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxl
PgorPHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bh
bj4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402831</attachid>
            <date>2020-06-25 17:32:06 -0700</date>
            <delta_ts>2020-06-25 19:35:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213629-20200625173205.patch</filename>
            <type>text/plain</type>
            <size>11175</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRkY2Q0OTNiNGM3NGZj
ZTc5MmEyYjNmYThmYzc0NDhiZWI5M2IxZi4uMWI5OWI1YmZiYjUzZTNmMzVhYTliODViZGNiZDFl
MjFkZGJiNWVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTI1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lubGluZV0gc2V0TG9naWNh
bFdpZHRoRm9yVGV4dFJ1biBuZWVkcyB0aGUgY3VycmVudCBsb2dpY2FsIGxlZnQgcG9zaXRpb24K
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYyOQor
ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQzOTE0MDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gY29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0
aW9uc0ZvclNlZ21lbnQgbG9vcHMgdGhyb3VnaCB0aGUgQmlkaSBydW5zIGFuZCBjb21wdXRlcyB0
aGVpciBsb2dpY2FsIHdpZHRocy4KKyAgICAgICAgMi4gVGV4dCBtZWFzdXJpbmcgbmVlZHMgdGhl
IGN1cnJlbnQgbG9naWNhbCBsZWZ0IHBvc2l0aW9uIGluIG9yZGVyIHRvIGNvbXB1dGUgdGhlIHJ1
biB3aWR0aCBwcm9wZXJseSAoZS5nIHRhYiBzaXplKQorICAgICAgICAzLiBUaGUgY3VycmVudCBs
b2dpY2FsIGxlZnQgaW5jbHVkZXMgbWFyZ2lucywgYm9kZXJzIGFuZCBwYWRkaW5ncyAoZS5nIDxz
cGFuIHN0eWxlPSJtYXJnaW46IDEwMHB4OyI+dGV4dCBjb250ZW50PC9zcGFuPiAndGV4dCBjb250
ZW50JyBzdGFydHMgYXQgMTAwcHggLWlnbm9yZSB0aGUgbGluZSBvZmZzZXQgZm9yIG5vdykKKyAg
ICAgICAgNC4gVGhlIEJpRGkgbG9vcCBqdW1wcyBvdmVyIGVtcHR5IGlubGluZSBjb250YWluZXJz
IChlLmcuIHRleHQ8c3BhbiBzdHlsZT0iYm9yZGVyOiAxMHB4IHNvbGlkIGdyZWVuIj48L3NwYW4+
Y29udGVudCkgYW5kIGl0IGxhY2tzIHRoZSBpbmZvcm1hdGlvbiB0byBiZSBhYmxlIHRvIHJlc29s
dmUgbmVzdGVkIGlubGluZSBjb250YWluZXJzLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcHJlLWNv
bXB1dGVzIHRoZSBzcGFjaW5nIG9mZnNldCBmb3IgZWFjaCBJbmxpbmVUZXh0Qm94IHNvIHRoYXQg
d2UgY291bGQgdXNlIGl0IGxhdGVyIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgbGVmdCBwb3NpdGlv
biBmb3IgdGhlIHRleHQgbWVhc3VyaW5nLgorCisgICAgICAgIDxzcGFuIHN0eWxlPSJtYXJnaW4t
cmlnaHQ6IDFweCI+WzFdPHNwYW4gc3R5bGU9Im1hcmdpbjogMnB4Ij5bMl08L3NwYW4+WzNdPC9z
cGFuPls0XQorICAgICAgICBbMV0gLT4gMHB4IG9mZnNldAorICAgICAgICBbMl0gLT4gMnB4IG9m
ZnNldAorICAgICAgICBbM10gLT4gNHB4IG9mZnNldAorICAgICAgICBbNF0gLT4gNXB4IG9mZnNl
dAorCisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRpb24uaHRt
bAorCisgICAgICAgICogcmVuZGVyaW5nL0NvbXBsZXhMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkNvbXBsZXhMaW5lTGF5b3V0Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRp
b25zRm9yU2VnbWVudCk6CisKIDIwMjAtMDYtMjMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl
LmNvbT4KIAogICAgICAgICBbTXVsdGljb2xdIFJlc2V0IHRoZSBjaGlsZHJlbklubGluZSBzdGF0
ZSBvbiB0aGUgUmVuZGVyQmxvY2tGbG93IHdoZW4gZGVzdHJveWluZyB0aGUgbXVsdGljb2x1bW4g
Y29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvbXBsZXhMaW5l
TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db21wbGV4TGluZUxheW91dC5j
cHAKaW5kZXggYTExN2RmMjc4ZTJjOTYyMjk5Mjk2ZWM0NzkwYjlkMjMxMTJjYjIzYi4uNDMzNGI2
NDA2MjA0M2YxMzA0MmExNWVkN2MyNTIyNzA1ZmI5MjIzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL0NvbXBsZXhMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvQ29tcGxleExpbmVMYXlvdXQuY3BwCkBAIC04NTIsOCArODUyLDggQEAgc3Rh
dGljIGJvb2wgaXNMYXN0SW5GbG93UnVuKEJpZGlSdW4mIHJ1blRvQ2hlY2spCiAgICAgfQogICAg
IHJldHVybiB0cnVlOwogfQotICAgIAotQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1
dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmVCb3gqIGxpbmVC
b3gsIGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbywgVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24sIGZs
b2F0JiBsb2dpY2FsTGVmdCwKKworQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1dGVJ
bmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmVCb3gqIGxpbmVCb3gs
IGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbywgVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24sIGZsb2F0
JiBsaW5lTG9naWNhbExlZnQsCiAgICAgZmxvYXQmIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgQmlk
aVJ1biogZmlyc3RSdW4sIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4sIEdseXBoT3ZlcmZsb3dB
bmRGYWxsYmFja0ZvbnRzTWFwJiB0ZXh0Qm94RGF0YU1hcCwgVmVydGljYWxQb3NpdGlvbkNhY2hl
JiB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsCiAgICAgV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1
cmVtZW50cykKIHsKQEAgLTg2MSwxMSArODYxLDQ5IEBAIEJpZGlSdW4qIENvbXBsZXhMaW5lTGF5
b3V0Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5l
CiAgICAgYm9vbCBjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0ID0gc3R5bGUoKS5oYW5naW5nUHVu
Y3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246OkZpcnN0KTsKICAgICBib29s
IGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gc3R5bGUoKS5oYW5naW5nUHVuY3R1YXRpb24oKS5j
b250YWlucyhIYW5naW5nUHVuY3R1YXRpb246Okxhc3QpOwogICAgIGJvb2wgaXNMVFIgPSBzdHls
ZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKLSAgICBmbG9hdCB0b3RhbExvZ2ljYWxXaWR0
aCA9IGxpbmVCb3gtPmdldEZsb3dTcGFjaW5nTG9naWNhbFdpZHRoKCk7CisgICAgZmxvYXQgY29u
dGVudFdpZHRoID0gMDsKICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ID0g
MDsKICAgICBib29sIGlzQWZ0ZXJFeHBhbnNpb24gPSBpczxSZW5kZXJSdWJ5QmFzZT4obV9mbG93
KSA/IGRvd25jYXN0PFJlbmRlclJ1YnlCYXNlPihtX2Zsb3cpLmlzQWZ0ZXJFeHBhbnNpb24oKSA6
IHRydWU7CiAgICAgVmVjdG9yPHVuc2lnbmVkLCAxNj4gZXhwYW5zaW9uT3Bwb3J0dW5pdGllczsK
IAorICAgIEhhc2hNYXA8SW5saW5lVGV4dEJveCosIExheW91dFVuaXQ+IGxvZ2ljYWxTcGFjaW5n
Rm9ySW5saW5lVGV4dEJveGVzOworICAgIGF1dG8gY29sbGVjdFNwYWNpbmdMb2dpY2FsV2lkdGhz
ID0gWyZdICgpIHsKKyAgICAgICAgYXV0byB0b3RhbFNwYWNpbmdXaWR0aCA9IExheW91dFVuaXQg
eyB9OworICAgICAgICAvLyBDb2xsZWN0IHRoZSBzcGFjaW5nIHBvc2l0aW9ucyAobWFyZ2luLCBi
b3JkZXIgcGFkZGluZykgZm9yIHRoZSB0ZXh0Ym94ZXMgYnkgdHJhdmVyc2luZyB0aGUgaW5saW5l
IHRyZWUgb2YgdGhlIGN1cnJlbnQgbGluZS4KKyAgICAgICAgVmVjdG9yPElubGluZUJveCo+IHF1
ZXVlOworICAgICAgICBxdWV1ZS5hcHBlbmQobGluZUJveCk7CisgICAgICAgIC8vIDEuIFZpc2l0
IGVhY2ggaW5saW5lIGJveCBpbiBhIHByZW9yZGVyIGZhc2hpb24KKyAgICAgICAgLy8gMi4gQWNj
dW11bGF0ZSB0aGUgc3BhY2luZyB3aGVuIHdlIGZpbmQgYW4gSW5saW5lRmxvd0JveCAoaW5saW5l
IGNvbnRhaW5lciBlLmcuIHNwYW4pCisgICAgICAgIC8vIDMuIEFkZCB0aGUgSW5saW5lVGV4dEJv
eGVzIHRvIHRoZSBoYXNobWFwCisgICAgICAgIHdoaWxlICghcXVldWUuaXNFbXB0eSgpKSB7Cisg
ICAgICAgICAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICAgICAgICAgIGF1dG8qIGlubGluZUJv
eCA9IHF1ZXVlLmxhc3QoKTsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SW5saW5lRmxvd0JveD4o
aW5saW5lQm94KSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVGbG93Qm94ID0g
ZG93bmNhc3Q8SW5saW5lRmxvd0JveD4oKmlubGluZUJveCk7CisgICAgICAgICAgICAgICAgICAg
IHRvdGFsU3BhY2luZ1dpZHRoICs9IGlubGluZUZsb3dCb3gubWFyZ2luQm9yZGVyUGFkZGluZ0xv
Z2ljYWxMZWZ0KCk7CisgICAgICAgICAgICAgICAgICAgIGlmIChhdXRvKiBjaGlsZCA9IGlubGlu
ZUZsb3dCb3guZmlyc3RDaGlsZCgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZS5h
cHBlbmQoY2hpbGQpOworICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg
ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAg
ICAgfQorICAgICAgICAgICAgICAgIGlmIChpczxJbmxpbmVUZXh0Qm94PihpbmxpbmVCb3gpKQor
ICAgICAgICAgICAgICAgICAgICBsb2dpY2FsU3BhY2luZ0ZvcklubGluZVRleHRCb3hlcy5hZGQo
ZG93bmNhc3Q8SW5saW5lVGV4dEJveD4oaW5saW5lQm94KSwgdG90YWxTcGFjaW5nV2lkdGgpOwor
ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgd2hpbGUg
KCFxdWV1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSAq
cXVldWUudGFrZUxhc3QoKTsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SW5saW5lRmxvd0JveD4o
aW5saW5lQm94KSkKKyAgICAgICAgICAgICAgICAgICAgdG90YWxTcGFjaW5nV2lkdGggKz0gZG93
bmNhc3Q8SW5saW5lRmxvd0JveD4oaW5saW5lQm94KS5tYXJnaW5Cb3JkZXJQYWRkaW5nTG9naWNh
bFJpZ2h0KCk7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIG5leHRTaWJsaW5nID0gaW5saW5l
Qm94Lm5leHRPbkxpbmUoKSkgeworICAgICAgICAgICAgICAgICAgICBxdWV1ZS5hcHBlbmQobmV4
dFNpYmxpbmcpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9
CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9OworICAgIGNvbGxlY3RTcGFjaW5nTG9n
aWNhbFdpZHRocygpOworCiAgICAgQmlkaVJ1biogcnVuID0gZmlyc3RSdW47CiAgICAgQmlkaVJ1
biogcHJldmlvdXNSdW4gPSBudWxscHRyOwogICAgIGZvciAoOyBydW47IHJ1biA9IHJ1bi0+bmV4
dCgpKSB7CkBAIC04OTcsNyArOTM1LDcgQEAgQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNv
bXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmUKICAgICAg
ICAgICAgICAgICBmbG9hdCBoYW5nU3RhcnRXaWR0aCA9IHJlbmRlclRleHQuaGFuZ2FibGVQdW5j
dHVhdGlvblN0YXJ0V2lkdGgocnVuLT5tX3N0YXJ0KTsKICAgICAgICAgICAgICAgICBhdmFpbGFi
bGVMb2dpY2FsV2lkdGggKz0gaGFuZ1N0YXJ0V2lkdGg7CiAgICAgICAgICAgICAgICAgaWYgKHN0
eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQotICAgICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdCAtPSBoYW5nU3RhcnRXaWR0aDsKKyAgICAgICAgICAgICAgICAgICAgbGluZUxvZ2lj
YWxMZWZ0IC09IGhhbmdTdGFydFdpZHRoOwogICAgICAgICAgICAgICAgIGNhbkhhbmdQdW5jdHVh
dGlvbkF0U3RhcnQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtOTA2
LDcgKzk0NCw3IEBAIEJpZGlSdW4qIENvbXBsZXhMaW5lTGF5b3V0Ojpjb21wdXRlSW5saW5lRGly
ZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5lCiAgICAgICAgICAgICAgICAgZmxv
YXQgaGFuZ0VuZFdpZHRoID0gcmVuZGVyVGV4dC5oYW5nYWJsZVB1bmN0dWF0aW9uRW5kV2lkdGgo
cnVuLT5tX3N0b3AgLSAxKTsKICAgICAgICAgICAgICAgICBhdmFpbGFibGVMb2dpY2FsV2lkdGgg
Kz0gaGFuZ0VuZFdpZHRoOwogICAgICAgICAgICAgICAgIGlmICghc3R5bGUoKS5pc0xlZnRUb1Jp
Z2h0RGlyZWN0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0IC09IGhhbmdF
bmRXaWR0aDsKKyAgICAgICAgICAgICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0IC09IGhhbmdFbmRX
aWR0aDsKICAgICAgICAgICAgICAgICBjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCA9IGZhbHNlOwog
ICAgICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC05MTUsMTMgKzk1MywxMyBAQCBCaWRpUnVu
KiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvclNl
Z21lbnQoUm9vdElubGluZQogCiAgICAgICAgICAgICBpZiAodW5zaWduZWQgbGVuZ3RoID0gcmVu
ZGVyVGV4dC50ZXh0KCkubGVuZ3RoKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoIXJ1bi0+bV9z
dGFydCAmJiBuZWVkc1dvcmRTcGFjaW5nICYmIGlzU3BhY2VPck5ld2xpbmUocmVuZGVyVGV4dC5j
aGFyYWN0ZXJBdChydW4tPm1fc3RhcnQpKSkKLSAgICAgICAgICAgICAgICAgICAgdG90YWxMb2dp
Y2FsV2lkdGggKz0gbGluZVN0eWxlKCpyZW5kZXJUZXh0LnBhcmVudCgpLCBsaW5lSW5mbykuZm9u
dENhc2NhZGUoKS53b3JkU3BhY2luZygpOworICAgICAgICAgICAgICAgICAgICBjb250ZW50V2lk
dGggKz0gbGluZVN0eWxlKCpyZW5kZXJUZXh0LnBhcmVudCgpLCBsaW5lSW5mbykuZm9udENhc2Nh
ZGUoKS53b3JkU3BhY2luZygpOwogICAgICAgICAgICAgICAgIC8vIHJ1bi0+bV9zdGFydCA9PSBy
dW4tPm1fc3RvcCBzaG91bGQgb25seSBiZSB0cnVlIGlmZiB0aGUgcnVuIGlzIGEgcmVwbGFjZWQg
cnVuIGZvciBiaWRpOiBpc29sYXRlLgogICAgICAgICAgICAgICAgIEFTU0VSVChydW4tPm1fc3Rv
cCA+IDAgfHwgcnVuLT5tX3N0YXJ0ID09IHJ1bi0+bV9zdG9wKTsKICAgICAgICAgICAgICAgICBu
ZWVkc1dvcmRTcGFjaW5nID0gcnVuLT5tX3N0b3AgPT0gbGVuZ3RoICYmICFpc1NwYWNlT3JOZXds
aW5lKHJlbmRlclRleHQuY2hhcmFjdGVyQXQocnVuLT5tX3N0b3AgLSAxKSk7CiAgICAgICAgICAg
ICB9Ci0KLSAgICAgICAgICAgIHNldExvZ2ljYWxXaWR0aEZvclRleHRSdW4obGluZUJveCwgcnVu
LCByZW5kZXJUZXh0LCB0b3RhbExvZ2ljYWxXaWR0aCwgbGluZUluZm8sIHRleHRCb3hEYXRhTWFw
LCB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsIHdvcmRNZWFzdXJlbWVudHMpOworICAgICAgICAgICAg
YXV0byBjdXJyZW50TG9naWNhbExlZnRQb3NpdGlvbiA9IGxpbmVMb2dpY2FsTGVmdCArIGxvZ2lj
YWxTcGFjaW5nRm9ySW5saW5lVGV4dEJveGVzLmdldCgmdGV4dEJveCkgKyBjb250ZW50V2lkdGg7
CisgICAgICAgICAgICBzZXRMb2dpY2FsV2lkdGhGb3JUZXh0UnVuKGxpbmVCb3gsIHJ1biwgcmVu
ZGVyVGV4dCwgY3VycmVudExvZ2ljYWxMZWZ0UG9zaXRpb24sIGxpbmVJbmZvLCB0ZXh0Qm94RGF0
YU1hcCwgdmVydGljYWxQb3NpdGlvbkNhY2hlLCB3b3JkTWVhc3VyZW1lbnRzKTsKICAgICAgICAg
fSBlbHNlIHsKICAgICAgICAgICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0U3RhcnQgPSBmYWxzZTsK
ICAgICAgICAgICAgIGJvb2wgZW5jb3VudGVyZWRKdXN0aWZpZWRSdWJ5ID0gZmFsc2U7CkBAIC05
NDcsMTEgKzk4NSwxMCBAQCBCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGlu
ZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZQogICAgICAgICAgICAgICAg
IGlmIChpczxSZW5kZXJSdWJ5UnVuPihyZW5kZXJCb3gpKQogICAgICAgICAgICAgICAgICAgICBz
ZXRNYXJnaW5zRm9yUnVieVJ1bihydW4sIGRvd25jYXN0PFJlbmRlclJ1YnlSdW4+KHJlbmRlckJv
eCksIHByZXZpb3VzUnVuID8gJnByZXZpb3VzUnVuLT5yZW5kZXJlcigpIDogbnVsbHB0ciwgbGlu
ZUluZm8pOwogICAgICAgICAgICAgICAgIHJ1bi0+Ym94KCktPnNldExvZ2ljYWxXaWR0aChtX2Zs
b3cubG9naWNhbFdpZHRoRm9yQ2hpbGQocmVuZGVyQm94KSk7Ci0gICAgICAgICAgICAgICAgdG90
YWxMb2dpY2FsV2lkdGggKz0gbV9mbG93Lm1hcmdpblN0YXJ0Rm9yQ2hpbGQocmVuZGVyQm94KSAr
IG1fZmxvdy5tYXJnaW5FbmRGb3JDaGlsZChyZW5kZXJCb3gpOwogICAgICAgICAgICAgfQogICAg
ICAgICB9CiAKLSAgICAgICAgdG90YWxMb2dpY2FsV2lkdGggKz0gcnVuLT5ib3goKS0+bG9naWNh
bFdpZHRoKCk7CisgICAgICAgIGNvbnRlbnRXaWR0aCArPSBydW4tPmJveCgpLT5sb2dpY2FsV2lk
dGgoKTsKICAgICAgICAgcHJldmlvdXNSdW4gPSBydW47CiAgICAgfQogCkBAIC05NzAsMTAgKzEw
MDcsOSBAQCBCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlv
blBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZQogICAgIGlmIChpczxSZW5kZXJSdWJ5QmFz
ZT4obV9mbG93KSAmJiAhZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCkKICAgICAgICAgdGV4dEFs
aWduID0gVGV4dEFsaWduTW9kZTo6Q2VudGVyOwogCi0gICAgdXBkYXRlTG9naWNhbFdpZHRoRm9y
QWxpZ25tZW50KG1fZmxvdywgdGV4dEFsaWduLCBsaW5lQm94LCB0cmFpbGluZ1NwYWNlUnVuLCBs
b2dpY2FsTGVmdCwgdG90YWxMb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgZXhw
YW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Ci0KKyAgICBhdXRvIHRvdGFsTG9naWNhbFdpZHRoID0g
Y29udGVudFdpZHRoICsgbGluZUJveC0+Z2V0Rmxvd1NwYWNpbmdMb2dpY2FsV2lkdGgoKTsKKyAg
ICB1cGRhdGVMb2dpY2FsV2lkdGhGb3JBbGlnbm1lbnQobV9mbG93LCB0ZXh0QWxpZ24sIGxpbmVC
b3gsIHRyYWlsaW5nU3BhY2VSdW4sIGxpbmVMb2dpY2FsTGVmdCwgdG90YWxMb2dpY2FsV2lkdGgs
IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7CiAgICAg
Y29tcHV0ZUV4cGFuc2lvbkZvckp1c3RpZmllZFRleHQoZmlyc3RSdW4sIHRyYWlsaW5nU3BhY2VS
dW4sIGV4cGFuc2lvbk9wcG9ydHVuaXRpZXMsIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQsIHRv
dGFsTG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpOwotCiAgICAgcmV0dXJuIHJ1
bjsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCmluZGV4IGIyOWI0MWM3YjZiYzJlMjFkMWU4ZjRlYmM3Y2FjNTdmYzgyYzI4MTQu
LjJmODczN2RhM2JiNTk3ODNiNGI2NWE1NGM4OWY0MTQ1YjIyYmI0MDggMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxNCBAQAorMjAyMC0wNi0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg
ICAgICAgIFtJbmxpbmVdIHNldExvZ2ljYWxXaWR0aEZvclRleHRSdW4gbmVlZHMgdGhlIGN1cnJl
bnQgbG9naWNhbCBsZWZ0IHBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMTM2MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MzkxNDAz
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFz
dC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlvbi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg
ICAgICAgKiBmYXN0L2lubGluZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLmh0bWw6IEFkZGVkLgor
CiAyMDIwLTA2LTIzICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBb
IGlPUyBSZWxlYXNlIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJzb2NrZXRz
L1NlY3VyZS1DbG9zZS1SZWFzb24tVW5wYWlyZWQtc3Vycm9nYXRlcy5hbnkuaHRtbCAmIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vic29ja2V0cy9TZWN1cmUtQ2xvc2UtUmVhc29u
LVVucGFpcmVkLXN1cnJvZ2F0ZXMuYW55Lndvcmtlci5odG1sIGFyZSBmbGFreSBmYWlsdXJlcwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlv
bi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1w
b3NpdGlvbi1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk0NDI1ZDc5NmNhODJiNTZlMjI3ZDlm
NTJlZDI2OTE2Zjk0Mjc2MDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lu
bGluZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw2IEBA
Cis8c3R5bGU+Cisub3V0ZXIgeworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxl
PgorPHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bh
bj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9z
aXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRp
b24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi5kZDM2YjExMzljNjIxNWM3YzNhMTY2MDVlZTQwNGRjNzBhODkz
ZDAxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0
LXRhYi1wb3NpdGlvbi5odG1sCkBAIC0wLDAgKzEsNyBAQAorPHN0eWxlPgorLm91dGVyIHsKKyAg
bWFyZ2luLXJpZ2h0OiAyMHB4OworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxl
PgorPHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bh
bj4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402844</attachid>
            <date>2020-06-25 19:35:33 -0700</date>
            <delta_ts>2020-06-25 21:17:52 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213629-20200625193533.patch</filename>
            <type>text/plain</type>
            <size>11229</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRkY2Q0OTNiNGM3NGZj
ZTc5MmEyYjNmYThmYzc0NDhiZWI5M2IxZi4uOTQzZWVmNjJmOTIzMDNlMjM1ODg4ZmFiZmRlOTkz
OGY2YmM4MGVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTI1ICBaYWxh
biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lubGluZV0gT3ZlcmxhcHBp
bmcgY29udGVudCB3aGVuIG1hcmdpbi1yaWdodCBpcyBwcmVzZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MjkKKyAgICAgICAgPHJkYXI6Ly9w
cm9ibGVtLzY0MzkxNDAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKwor
ICAgICAgICAxLiBjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudCBsb29w
cyB0aHJvdWdoIHRoZSBCaWRpIHJ1bnMgYW5kIGNvbXB1dGVzIHRoZWlyIGxvZ2ljYWwgd2lkdGhz
LgorICAgICAgICAyLiBUZXh0IG1lYXN1cmluZyBuZWVkcyB0aGUgY3VycmVudCBsb2dpY2FsIGxl
ZnQgcG9zaXRpb24gaW4gb3JkZXIgdG8gY29tcHV0ZSB0aGUgcnVuIHdpZHRoIHByb3Blcmx5IChl
LmcgdGFiIHNpemUpCisgICAgICAgIDMuIFRoZSBjdXJyZW50IGxvZ2ljYWwgbGVmdCBpbmNsdWRl
cyBtYXJnaW5zLCBib2RlcnMgYW5kIHBhZGRpbmdzIChlLmcgPHNwYW4gc3R5bGU9Im1hcmdpbjog
MTAwcHg7Ij50ZXh0IGNvbnRlbnQ8L3NwYW4+ICd0ZXh0IGNvbnRlbnQnIHN0YXJ0cyBhdCAxMDBw
eCAtaWdub3JlIHRoZSBsaW5lIG9mZnNldCBmb3Igbm93KQorICAgICAgICA0LiBUaGUgQmlEaSBs
b29wIGp1bXBzIG92ZXIgZW1wdHkgaW5saW5lIGNvbnRhaW5lcnMgKGUuZy4gdGV4dDxzcGFuIHN0
eWxlPSJib3JkZXI6IDEwcHggc29saWQgZ3JlZW4iPjwvc3Bhbj5jb250ZW50KSBhbmQgaXQgbGFj
a3MgdGhlIGluZm9ybWF0aW9uIHRvIGJlIGFibGUgdG8gcmVzb2x2ZSBuZXN0ZWQgaW5saW5lIGNv
bnRhaW5lcnMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBwcmUtY29tcHV0ZXMgdGhlIHNwYWNpbmcg
b2Zmc2V0IGZvciBlYWNoIElubGluZVRleHRCb3ggc28gdGhhdCB3ZSBjb3VsZCB1c2UgaXQgbGF0
ZXIgdG8gY29tcHV0ZSB0aGUgbG9naWNhbCBsZWZ0IHBvc2l0aW9uIGZvciB0aGUgdGV4dCBtZWFz
dXJpbmcuCisKKyAgICAgICAgPHNwYW4gc3R5bGU9Im1hcmdpbi1yaWdodDogMXB4Ij5bMV08c3Bh
biBzdHlsZT0ibWFyZ2luOiAycHgiPlsyXTwvc3Bhbj5bM108L3NwYW4+WzRdCisgICAgICAgIFsx
XSAtPiAwcHggb2Zmc2V0CisgICAgICAgIFsyXSAtPiAycHggb2Zmc2V0CisgICAgICAgIFszXSAt
PiA0cHggb2Zmc2V0CisgICAgICAgIFs0XSAtPiA1cHggb2Zmc2V0CisKKyAgICAgICAgVGVzdDog
ZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlvbi5odG1sCisKKyAgICAgICAgKiByZW5k
ZXJpbmcvQ29tcGxleExpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcGxleExp
bmVMYXlvdXQ6OmNvbXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KToKKwog
MjAyMC0wNi0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtN
dWx0aWNvbF0gUmVzZXQgdGhlIGNoaWxkcmVuSW5saW5lIHN0YXRlIG9uIHRoZSBSZW5kZXJCbG9j
a0Zsb3cgd2hlbiBkZXN0cm95aW5nIHRoZSBtdWx0aWNvbHVtbiBjb250ZXh0CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ29tcGxleExpbmVMYXlvdXQuY3BwIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL0NvbXBsZXhMaW5lTGF5b3V0LmNwcAppbmRleCBhMTE3ZGYyNzhl
MmM5NjIyOTkyOTZlYzQ3OTBiOWQyMzExMmNiMjNiLi5kY2QwNDYxMzFlMTZjM2YyM2UwMmFiN2Yw
NjMwNGNjOTg5YjJlMzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ29t
cGxleExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db21wbGV4
TGluZUxheW91dC5jcHAKQEAgLTg1Miw4ICs4NTIsOCBAQCBzdGF0aWMgYm9vbCBpc0xhc3RJbkZs
b3dSdW4oQmlkaVJ1biYgcnVuVG9DaGVjaykKICAgICB9CiAgICAgcmV0dXJuIHRydWU7CiB9Ci0g
ICAgCi1CaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBv
c2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZUJveCogbGluZUJveCwgY29uc3QgTGluZUluZm8m
IGxpbmVJbmZvLCBUZXh0QWxpZ25Nb2RlIHRleHRBbGlnbiwgZmxvYXQmIGxvZ2ljYWxMZWZ0LAor
CitCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0
aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZUJveCogbGluZUJveCwgY29uc3QgTGluZUluZm8mIGxp
bmVJbmZvLCBUZXh0QWxpZ25Nb2RlIHRleHRBbGlnbiwgZmxvYXQmIGxpbmVMb2dpY2FsTGVmdCwK
ICAgICBmbG9hdCYgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBCaWRpUnVuKiBmaXJzdFJ1biwgQmlk
aVJ1biogdHJhaWxpbmdTcGFjZVJ1biwgR2x5cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAm
IHRleHRCb3hEYXRhTWFwLCBWZXJ0aWNhbFBvc2l0aW9uQ2FjaGUmIHZlcnRpY2FsUG9zaXRpb25D
YWNoZSwKICAgICBXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzKQogewpAQCAtODYx
LDExICs4NjEsNDkgQEAgQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1dGVJbmxpbmVE
aXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmUKICAgICBib29sIGNhbkhhbmdQ
dW5jdHVhdGlvbkF0U3RhcnQgPSBzdHlsZSgpLmhhbmdpbmdQdW5jdHVhdGlvbigpLmNvbnRhaW5z
KEhhbmdpbmdQdW5jdHVhdGlvbjo6Rmlyc3QpOwogICAgIGJvb2wgY2FuSGFuZ1B1bmN0dWF0aW9u
QXRFbmQgPSBzdHlsZSgpLmhhbmdpbmdQdW5jdHVhdGlvbigpLmNvbnRhaW5zKEhhbmdpbmdQdW5j
dHVhdGlvbjo6TGFzdCk7CiAgICAgYm9vbCBpc0xUUiA9IHN0eWxlKCkuaXNMZWZ0VG9SaWdodERp
cmVjdGlvbigpOwotICAgIGZsb2F0IHRvdGFsTG9naWNhbFdpZHRoID0gbGluZUJveC0+Z2V0Rmxv
d1NwYWNpbmdMb2dpY2FsV2lkdGgoKTsKKyAgICBmbG9hdCBjb250ZW50V2lkdGggPSAwOwogICAg
IHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgPSAwOwogICAgIGJvb2wgaXNBZnRl
ckV4cGFuc2lvbiA9IGlzPFJlbmRlclJ1YnlCYXNlPihtX2Zsb3cpID8gZG93bmNhc3Q8UmVuZGVy
UnVieUJhc2U+KG1fZmxvdykuaXNBZnRlckV4cGFuc2lvbigpIDogdHJ1ZTsKICAgICBWZWN0b3I8
dW5zaWduZWQsIDE2PiBleHBhbnNpb25PcHBvcnR1bml0aWVzOwogCisgICAgSGFzaE1hcDxJbmxp
bmVUZXh0Qm94KiwgTGF5b3V0VW5pdD4gbG9naWNhbFNwYWNpbmdGb3JJbmxpbmVUZXh0Qm94ZXM7
CisgICAgYXV0byBjb2xsZWN0U3BhY2luZ0xvZ2ljYWxXaWR0aHMgPSBbJl0gKCkgeworICAgICAg
ICBhdXRvIHRvdGFsU3BhY2luZ1dpZHRoID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgIC8vIENv
bGxlY3QgdGhlIHNwYWNpbmcgcG9zaXRpb25zIChtYXJnaW4sIGJvcmRlciBwYWRkaW5nKSBmb3Ig
dGhlIHRleHRib3hlcyBieSB0cmF2ZXJzaW5nIHRoZSBpbmxpbmUgdHJlZSBvZiB0aGUgY3VycmVu
dCBsaW5lLgorICAgICAgICBWZWN0b3I8SW5saW5lQm94Kj4gcXVldWU7CisgICAgICAgIHF1ZXVl
LmFwcGVuZChsaW5lQm94KTsKKyAgICAgICAgLy8gMS4gVmlzaXQgZWFjaCBpbmxpbmUgYm94IGlu
IGEgcHJlb3JkZXIgZmFzaGlvbgorICAgICAgICAvLyAyLiBBY2N1bXVsYXRlIHRoZSBzcGFjaW5n
IHdoZW4gd2UgZmluZCBhbiBJbmxpbmVGbG93Qm94IChpbmxpbmUgY29udGFpbmVyIGUuZy4gc3Bh
bikKKyAgICAgICAgLy8gMy4gQWRkIHRoZSBJbmxpbmVUZXh0Qm94ZXMgdG8gdGhlIGhhc2htYXAK
KyAgICAgICAgd2hpbGUgKCFxdWV1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIHdoaWxlICh0
cnVlKSB7CisgICAgICAgICAgICAgICAgYXV0byogaW5saW5lQm94ID0gcXVldWUubGFzdCgpOwor
ICAgICAgICAgICAgICAgIGlmIChpczxJbmxpbmVGbG93Qm94PihpbmxpbmVCb3gpKSB7CisgICAg
ICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUZsb3dCb3ggPSBkb3duY2FzdDxJbmxpbmVGbG93
Qm94PigqaW5saW5lQm94KTsKKyAgICAgICAgICAgICAgICAgICAgdG90YWxTcGFjaW5nV2lkdGgg
Kz0gaW5saW5lRmxvd0JveC5tYXJnaW5Cb3JkZXJQYWRkaW5nTG9naWNhbExlZnQoKTsKKyAgICAg
ICAgICAgICAgICAgICAgaWYgKGF1dG8qIGNoaWxkID0gaW5saW5lRmxvd0JveC5maXJzdENoaWxk
KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHF1ZXVlLmFwcGVuZChjaGlsZCk7CisgICAg
ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAg
ICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg
ICAgaWYgKGlzPElubGluZVRleHRCb3g+KGlubGluZUJveCkpCisgICAgICAgICAgICAgICAgICAg
IGxvZ2ljYWxTcGFjaW5nRm9ySW5saW5lVGV4dEJveGVzLmFkZChkb3duY2FzdDxJbmxpbmVUZXh0
Qm94PihpbmxpbmVCb3gpLCB0b3RhbFNwYWNpbmdXaWR0aCk7CisgICAgICAgICAgICAgICAgYnJl
YWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB3aGlsZSAoIXF1ZXVlLmlzRW1wdHkoKSkg
eworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9ICpxdWV1ZS50YWtlTGFzdCgpOwor
ICAgICAgICAgICAgICAgIGlmIChpczxJbmxpbmVGbG93Qm94PihpbmxpbmVCb3gpKQorICAgICAg
ICAgICAgICAgICAgICB0b3RhbFNwYWNpbmdXaWR0aCArPSBkb3duY2FzdDxJbmxpbmVGbG93Qm94
PihpbmxpbmVCb3gpLm1hcmdpbkJvcmRlclBhZGRpbmdMb2dpY2FsUmlnaHQoKTsKKyAgICAgICAg
ICAgICAgICBpZiAoYXV0byogbmV4dFNpYmxpbmcgPSBpbmxpbmVCb3gubmV4dE9uTGluZSgpKSB7
CisgICAgICAgICAgICAgICAgICAgIHF1ZXVlLmFwcGVuZChuZXh0U2libGluZyk7CisgICAgICAg
ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAg
ICAgICAgfQorICAgIH07CisgICAgY29sbGVjdFNwYWNpbmdMb2dpY2FsV2lkdGhzKCk7CisKICAg
ICBCaWRpUnVuKiBydW4gPSBmaXJzdFJ1bjsKICAgICBCaWRpUnVuKiBwcmV2aW91c1J1biA9IG51
bGxwdHI7CiAgICAgZm9yICg7IHJ1bjsgcnVuID0gcnVuLT5uZXh0KCkpIHsKQEAgLTg5Nyw3ICs5
MzUsNyBAQCBCaWRpUnVuKiBDb21wbGV4TGluZUxheW91dDo6Y29tcHV0ZUlubGluZURpcmVjdGlv
blBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZQogICAgICAgICAgICAgICAgIGZsb2F0IGhh
bmdTdGFydFdpZHRoID0gcmVuZGVyVGV4dC5oYW5nYWJsZVB1bmN0dWF0aW9uU3RhcnRXaWR0aChy
dW4tPm1fc3RhcnQpOwogICAgICAgICAgICAgICAgIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCArPSBo
YW5nU3RhcnRXaWR0aDsKICAgICAgICAgICAgICAgICBpZiAoc3R5bGUoKS5pc0xlZnRUb1JpZ2h0
RGlyZWN0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0IC09IGhhbmdTdGFy
dFdpZHRoOworICAgICAgICAgICAgICAgICAgICBsaW5lTG9naWNhbExlZnQgLT0gaGFuZ1N0YXJ0
V2lkdGg7CiAgICAgICAgICAgICAgICAgY2FuSGFuZ1B1bmN0dWF0aW9uQXRTdGFydCA9IGZhbHNl
OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC05MDYsNyArOTQ0LDcgQEAgQmlkaVJ1
biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JT
ZWdtZW50KFJvb3RJbmxpbmUKICAgICAgICAgICAgICAgICBmbG9hdCBoYW5nRW5kV2lkdGggPSBy
ZW5kZXJUZXh0LmhhbmdhYmxlUHVuY3R1YXRpb25FbmRXaWR0aChydW4tPm1fc3RvcCAtIDEpOwog
ICAgICAgICAgICAgICAgIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCArPSBoYW5nRW5kV2lkdGg7CiAg
ICAgICAgICAgICAgICAgaWYgKCFzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKLSAg
ICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnQgLT0gaGFuZ0VuZFdpZHRoOworICAgICAgICAg
ICAgICAgICAgICBsaW5lTG9naWNhbExlZnQgLT0gaGFuZ0VuZFdpZHRoOwogICAgICAgICAgICAg
ICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gZmFsc2U7CiAgICAgICAgICAgICB9CiAgICAg
ICAgICAgICAKQEAgLTkxNSwxMyArOTUzLDEzIEBAIEJpZGlSdW4qIENvbXBsZXhMaW5lTGF5b3V0
Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5lCiAK
ICAgICAgICAgICAgIGlmICh1bnNpZ25lZCBsZW5ndGggPSByZW5kZXJUZXh0LnRleHQoKS5sZW5n
dGgoKSkgewogICAgICAgICAgICAgICAgIGlmICghcnVuLT5tX3N0YXJ0ICYmIG5lZWRzV29yZFNw
YWNpbmcgJiYgaXNTcGFjZU9yTmV3bGluZShyZW5kZXJUZXh0LmNoYXJhY3RlckF0KHJ1bi0+bV9z
dGFydCkpKQotICAgICAgICAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCArPSBsaW5lU3R5
bGUoKnJlbmRlclRleHQucGFyZW50KCksIGxpbmVJbmZvKS5mb250Q2FzY2FkZSgpLndvcmRTcGFj
aW5nKCk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRlbnRXaWR0aCArPSBsaW5lU3R5bGUoKnJl
bmRlclRleHQucGFyZW50KCksIGxpbmVJbmZvKS5mb250Q2FzY2FkZSgpLndvcmRTcGFjaW5nKCk7
CiAgICAgICAgICAgICAgICAgLy8gcnVuLT5tX3N0YXJ0ID09IHJ1bi0+bV9zdG9wIHNob3VsZCBv
bmx5IGJlIHRydWUgaWZmIHRoZSBydW4gaXMgYSByZXBsYWNlZCBydW4gZm9yIGJpZGk6IGlzb2xh
dGUuCiAgICAgICAgICAgICAgICAgQVNTRVJUKHJ1bi0+bV9zdG9wID4gMCB8fCBydW4tPm1fc3Rh
cnQgPT0gcnVuLT5tX3N0b3ApOwogICAgICAgICAgICAgICAgIG5lZWRzV29yZFNwYWNpbmcgPSBy
dW4tPm1fc3RvcCA9PSBsZW5ndGggJiYgIWlzU3BhY2VPck5ld2xpbmUocmVuZGVyVGV4dC5jaGFy
YWN0ZXJBdChydW4tPm1fc3RvcCAtIDEpKTsKICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAg
c2V0TG9naWNhbFdpZHRoRm9yVGV4dFJ1bihsaW5lQm94LCBydW4sIHJlbmRlclRleHQsIHRvdGFs
TG9naWNhbFdpZHRoLCBsaW5lSW5mbywgdGV4dEJveERhdGFNYXAsIHZlcnRpY2FsUG9zaXRpb25D
YWNoZSwgd29yZE1lYXN1cmVtZW50cyk7CisgICAgICAgICAgICBhdXRvIGN1cnJlbnRMb2dpY2Fs
TGVmdFBvc2l0aW9uID0gbG9naWNhbFNwYWNpbmdGb3JJbmxpbmVUZXh0Qm94ZXMuZ2V0KCZ0ZXh0
Qm94KSArIGNvbnRlbnRXaWR0aDsKKyAgICAgICAgICAgIHNldExvZ2ljYWxXaWR0aEZvclRleHRS
dW4obGluZUJveCwgcnVuLCByZW5kZXJUZXh0LCBjdXJyZW50TG9naWNhbExlZnRQb3NpdGlvbiwg
bGluZUluZm8sIHRleHRCb3hEYXRhTWFwLCB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUsIHdvcmRNZWFz
dXJlbWVudHMpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgY2FuSGFuZ1B1bmN0dWF0
aW9uQXRTdGFydCA9IGZhbHNlOwogICAgICAgICAgICAgYm9vbCBlbmNvdW50ZXJlZEp1c3RpZmll
ZFJ1YnkgPSBmYWxzZTsKQEAgLTk0NywxMSArOTg1LDExIEBAIEJpZGlSdW4qIENvbXBsZXhMaW5l
TGF5b3V0Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5s
aW5lCiAgICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlclJ1YnlSdW4+KHJlbmRlckJveCkpCiAg
ICAgICAgICAgICAgICAgICAgIHNldE1hcmdpbnNGb3JSdWJ5UnVuKHJ1biwgZG93bmNhc3Q8UmVu
ZGVyUnVieVJ1bj4ocmVuZGVyQm94KSwgcHJldmlvdXNSdW4gPyAmcHJldmlvdXNSdW4tPnJlbmRl
cmVyKCkgOiBudWxscHRyLCBsaW5lSW5mbyk7CiAgICAgICAgICAgICAgICAgcnVuLT5ib3goKS0+
c2V0TG9naWNhbFdpZHRoKG1fZmxvdy5sb2dpY2FsV2lkdGhGb3JDaGlsZChyZW5kZXJCb3gpKTsK
LSAgICAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCArPSBtX2Zsb3cubWFyZ2luU3RhcnRG
b3JDaGlsZChyZW5kZXJCb3gpICsgbV9mbG93Lm1hcmdpbkVuZEZvckNoaWxkKHJlbmRlckJveCk7
CisgICAgICAgICAgICAgICAgY29udGVudFdpZHRoICs9IG1fZmxvdy5tYXJnaW5TdGFydEZvckNo
aWxkKHJlbmRlckJveCkgKyBtX2Zsb3cubWFyZ2luRW5kRm9yQ2hpbGQocmVuZGVyQm94KTsKICAg
ICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHRvdGFsTG9naWNhbFdpZHRoICs9IHJ1
bi0+Ym94KCktPmxvZ2ljYWxXaWR0aCgpOworICAgICAgICBjb250ZW50V2lkdGggKz0gcnVuLT5i
b3goKS0+bG9naWNhbFdpZHRoKCk7CiAgICAgICAgIHByZXZpb3VzUnVuID0gcnVuOwogICAgIH0K
IApAQCAtOTcwLDEwICsxMDA4LDkgQEAgQmlkaVJ1biogQ29tcGxleExpbmVMYXlvdXQ6OmNvbXB1
dGVJbmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmUKICAgICBpZiAo
aXM8UmVuZGVyUnVieUJhc2U+KG1fZmxvdykgJiYgIWV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQp
CiAgICAgICAgIHRleHRBbGlnbiA9IFRleHRBbGlnbk1vZGU6OkNlbnRlcjsKIAotICAgIHVwZGF0
ZUxvZ2ljYWxXaWR0aEZvckFsaWdubWVudChtX2Zsb3csIHRleHRBbGlnbiwgbGluZUJveCwgdHJh
aWxpbmdTcGFjZVJ1biwgbG9naWNhbExlZnQsIHRvdGFsTG9naWNhbFdpZHRoLCBhdmFpbGFibGVM
b2dpY2FsV2lkdGgsIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQpOwotCisgICAgYXV0byB0b3Rh
bExvZ2ljYWxXaWR0aCA9IGNvbnRlbnRXaWR0aCArIGxpbmVCb3gtPmdldEZsb3dTcGFjaW5nTG9n
aWNhbFdpZHRoKCk7CisgICAgdXBkYXRlTG9naWNhbFdpZHRoRm9yQWxpZ25tZW50KG1fZmxvdywg
dGV4dEFsaWduLCBsaW5lQm94LCB0cmFpbGluZ1NwYWNlUnVuLCBsaW5lTG9naWNhbExlZnQsIHRv
dGFsTG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGV4cGFuc2lvbk9wcG9ydHVu
aXR5Q291bnQpOwogICAgIGNvbXB1dGVFeHBhbnNpb25Gb3JKdXN0aWZpZWRUZXh0KGZpcnN0UnVu
LCB0cmFpbGluZ1NwYWNlUnVuLCBleHBhbnNpb25PcHBvcnR1bml0aWVzLCBleHBhbnNpb25PcHBv
cnR1bml0eUNvdW50LCB0b3RhbExvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsK
LQogICAgIHJldHVybiBydW47CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiMjliNDFjN2I2YmMyZTIxZDFlOGY0ZWJj
N2NhYzU3ZmM4MmMyODE0Li5lMmNlYzU1YTFmMWMwNWUxOWY3ZDNiOTcyYjMyMWEzZTZhZjZlNThk
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDYtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFu
QGFwcGxlLmNvbT4KKworICAgICAgICBbSW5saW5lXSBPdmVybGFwcGluZyBjb250ZW50IHdoZW4g
bWFyZ2luLXJpZ2h0IGlzIHByZXNlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMzYyOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQzOTE0MDM+
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogZmFzdC9p
bmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlvbi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAg
ICAgKiBmYXN0L2lubGluZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLmh0bWw6IEFkZGVkLgorCiAy
MDIwLTA2LTIzICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlP
UyBSZWxlYXNlIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJzb2NrZXRzL1Nl
Y3VyZS1DbG9zZS1SZWFzb24tVW5wYWlyZWQtc3Vycm9nYXRlcy5hbnkuaHRtbCAmIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vic29ja2V0cy9TZWN1cmUtQ2xvc2UtUmVhc29uLVVu
cGFpcmVkLXN1cnJvZ2F0ZXMuYW55Lndvcmtlci5odG1sIGFyZSBmbGFreSBmYWlsdXJlcwpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3NpdGlvbi1l
eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRhYi1wb3Np
dGlvbi1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk0NDI1ZDc5NmNhODJiNTZlMjI3ZDlmNTJl
ZDI2OTE2Zjk0Mjc2MDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGlu
ZS9pbmNvcnJlY3QtdGFiLXBvc2l0aW9uLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw2IEBACis8
c3R5bGU+Cisub3V0ZXIgeworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxlPgor
PHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bhbj4K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRp
b24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2luY29ycmVjdC10YWItcG9zaXRpb24u
aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi5kZDM2YjExMzljNjIxNWM3YzNhMTY2MDVlZTQwNGRjNzBhODkzZDAx
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5jb3JyZWN0LXRh
Yi1wb3NpdGlvbi5odG1sCkBAIC0wLDAgKzEsNyBAQAorPHN0eWxlPgorLm91dGVyIHsKKyAgbWFy
Z2luLXJpZ2h0OiAyMHB4OworICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7Cit9Cis8L3N0eWxlPgor
PHNwYW4gY2xhc3M9b3V0ZXI+CXNob3VsZDxzcGFuPm5vdCBvdmVybGFwPC9zcGFuPjwvc3Bhbj4K
</data>

          </attachment>
      

    </bug>

</bugzilla>