<?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>234154</bug_id>
          
          <creation_ts>2021-12-10 10:13:12 -0800</creation_ts>
          <short_desc>Merge relative and absolute offsets in RenderLayer</short_desc>
          <delta_ts>2021-12-23 10:50:29 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Layout and Rendering</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</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>1822778</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-10 10:13:12 -0800</bug_when>
    <thetext>RenderLayer WIP</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822781</commentid>
    <comment_count>1</comment_count>
      <attachid>446749</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-10 10:15:33 -0800</bug_when>
    <thetext>Created attachment 446749
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822832</commentid>
    <comment_count>2</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-12-10 11:20:40 -0800</bug_when>
    <thetext>Perhaps the bug title could be improved?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822895</commentid>
    <comment_count>3</comment_count>
      <attachid>446784</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-10 12:38:30 -0800</bug_when>
    <thetext>Created attachment 446784
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823183</commentid>
    <comment_count>4</comment_count>
      <attachid>446869</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-11 03:05:22 -0800</bug_when>
    <thetext>Created attachment 446869
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1825114</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-12-17 10:16:13 -0800</bug_when>
    <thetext>&lt;rdar://problem/86639503&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826246</commentid>
    <comment_count>6</comment_count>
      <attachid>447788</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-22 01:54:46 -0800</bug_when>
    <thetext>Created attachment 447788
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826329</commentid>
    <comment_count>7</comment_count>
      <attachid>447813</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-22 10:08:38 -0800</bug_when>
    <thetext>Created attachment 447813
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826498</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-12-22 23:16:09 -0800</bug_when>
    <thetext>Committed r287385 (245525@main): &lt;https://commits.webkit.org/245525@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 447813.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826557</commentid>
    <comment_count>9</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-12-23 09:14:49 -0800</bug_when>
    <thetext>You should have fixed the changelog title before committing :(</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826569</commentid>
    <comment_count>10</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-23 10:24:55 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #9)
&gt; You should have fixed the changelog title before committing :(

Yeah I only noticed today :( I can fix up the ChangeLog if you want?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1826572</commentid>
    <comment_count>11</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-12-23 10:50:29 -0800</bug_when>
    <thetext>No point; it&apos;s the commit message that matters most.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446749</attachid>
            <date>2021-12-10 10:15:33 -0800</date>
            <delta_ts>2021-12-10 12:38:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234154-20211210181532.patch</filename>
            <type>text/plain</type>
            <size>4882</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ0ZDczY2I0ZGIyZjhl
YzFmN2IxMzI4ZGRhNmI0ZjY0MWVjNDJmMC4uNmU4MmRmZmJlYmJhMzhhZmNjMjEwYzY4NWZjZDI1
Y2UzOTVlNDZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuZGVyTGF5ZXIgV0lQCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxNTQKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJMYXllciBX
SVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24pOgorICAgICAgICAqIHJlbmRl
cmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Om9mZnNl
dEZvckluRmxvd1Bvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy
OjpzdGF0aWNJbmxpbmVQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM
YXllcjo6c3RhdGljQmxvY2tQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJMYXllcjo6c2V0U3RhdGljSW5saW5lUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyTGF5ZXI6OnNldFN0YXRpY0Jsb2NrUG9zaXRpb24pOgorCiAyMDIxLTEyLTEwICBQYXRyaWNr
IEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENTUDogQWxsb3cgZXh0
ZXJuYWwgc2NyaXB0cyB3aXRoIFNSSSBoYXNoZXMgbWF0Y2hpbmcgQ1NQCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBmYmVmNDYwOTBkMDc0ZTJmYjZmYTJjNDc1
YzFlNTlmNzQxY2NhMmMyLi41Yzg2MDAwMDczMmEwZGVkZWNjNDBmMzM2ZDU4OWFhMGQ0MzBkYjM5
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTE3MTMsMTEg
KzE3MTMsOSBAQCBib29sIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKE9wdGlvblNl
dDxVcGRhdGVMYXllclBvc2l0aW9uc0ZsYWc+KiBmbGFncwogICAgIGJvb2wgcG9zaXRpb25Pck9m
ZnNldENoYW5nZWQgPSBmYWxzZTsKICAgICBpZiAocmVuZGVyZXIoKS5pc0luRmxvd1Bvc2l0aW9u
ZWQoKSkgewogICAgICAgICBMYXlvdXRTaXplIG5ld09mZnNldCA9IGRvd25jYXN0PFJlbmRlckJv
eE1vZGVsT2JqZWN0PihyZW5kZXJlcigpKS5vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpOwotICAg
ICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCA9IG5ld09mZnNldCAhPSBtX29mZnNldEZvcklu
Rmxvd1Bvc2l0aW9uOwotICAgICAgICBtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uID0gbmV3T2Zm
c2V0OwotICAgICAgICBsb2NhbFBvaW50Lm1vdmUobV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbik7
Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbiA9IExheW91
dFNpemUoKTsKKyAgICAgICAgcG9zaXRpb25Pck9mZnNldENoYW5nZWQgPSBuZXdPZmZzZXQgIT0g
bV9vZmZzZXRGb3JQb3NpdGlvbjsKKyAgICAgICAgbV9vZmZzZXRGb3JQb3NpdGlvbiA9IG5ld09m
ZnNldDsKKyAgICAgICAgbG9jYWxQb2ludC5tb3ZlKG1fb2Zmc2V0Rm9yUG9zaXRpb24pOwogICAg
IH0KIAogICAgIC8vIEZJWE1FOiBXZSdkIHJlYWxseSBsaWtlIHRvIGp1c3QgZ2V0IHJpZCBvZiB0
aGUgY29uY2VwdCBvZiBhIGxheWVyIHJlY3RhbmdsZSBhbmQgcmVseSBvbiB0aGUgcmVuZGVyZXJz
LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBiZDZkMzgxNjc0YmM0
MjU3ZjgxNWE3Njc0MDRjYTg0N2QzNTVkZTA3Li5lZWM5ZGRiZTZmZGE3NWQxZjg3ZjNhZmI5MjIw
ZjM3YjJmNGM1NGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
TGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAt
NTEzLDcgKzUxMyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdpbGxSZW1vdmVDaGlsZFdpdGhCbGVu
ZE1vZGUoKTsKICNlbmRpZgogCi0gICAgY29uc3QgTGF5b3V0U2l6ZSYgb2Zmc2V0Rm9ySW5GbG93
UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uOyB9Cisg
ICAgY29uc3QgTGF5b3V0U2l6ZSYgb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24oKSBjb25zdCB7IHJl
dHVybiBtX29mZnNldEZvclBvc2l0aW9uOyB9CiAKICAgICB2b2lkIGNsZWFyQ2xpcFJlY3RzSW5j
bHVkaW5nRGVzY2VuZGFudHMoQ2xpcFJlY3RzVHlwZSB0eXBlVG9DbGVhciA9IEFsbENsaXBSZWN0
VHlwZXMpOwogICAgIHZvaWQgY2xlYXJDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSB0eXBlVG9DbGVh
ciA9IEFsbENsaXBSZWN0VHlwZXMpOwpAQCAtNzE3LDExICs3MTcsMTEgQEAgcHVibGljOgogICAg
IHZvaWQgc2V0UmVwYWludFN0YXR1cyhSZXBhaW50U3RhdHVzIHN0YXR1cykgeyBtX3JlcGFpbnRT
dGF0dXMgPSBzdGF0dXM7IH0KICAgICBSZXBhaW50U3RhdHVzIHJlcGFpbnRTdGF0dXMoKSBjb25z
dCB7IHJldHVybiBzdGF0aWNfY2FzdDxSZXBhaW50U3RhdHVzPihtX3JlcGFpbnRTdGF0dXMpOyB9
CiAKLSAgICBMYXlvdXRVbml0IHN0YXRpY0lubGluZVBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4g
bV9zdGF0aWNJbmxpbmVQb3NpdGlvbjsgfQotICAgIExheW91dFVuaXQgc3RhdGljQmxvY2tQb3Np
dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGljQmxvY2tQb3NpdGlvbjsgfQorICAgIExheW91
dFVuaXQgc3RhdGljSW5saW5lUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX29mZnNldEZvclBv
c2l0aW9uLndpZHRoKCk7IH0KKyAgICBMYXlvdXRVbml0IHN0YXRpY0Jsb2NrUG9zaXRpb24oKSBj
b25zdCB7IHJldHVybiBtX29mZnNldEZvclBvc2l0aW9uLmhlaWdodCgpOyB9CiAgICAKLSAgICB2
b2lkIHNldFN0YXRpY0lubGluZVBvc2l0aW9uKExheW91dFVuaXQgcG9zaXRpb24pIHsgbV9zdGF0
aWNJbmxpbmVQb3NpdGlvbiA9IHBvc2l0aW9uOyB9Ci0gICAgdm9pZCBzZXRTdGF0aWNCbG9ja1Bv
c2l0aW9uKExheW91dFVuaXQgcG9zaXRpb24pIHsgbV9zdGF0aWNCbG9ja1Bvc2l0aW9uID0gcG9z
aXRpb247IH0KKyAgICB2b2lkIHNldFN0YXRpY0lubGluZVBvc2l0aW9uKExheW91dFVuaXQgcG9z
aXRpb24pIHsgbV9vZmZzZXRGb3JQb3NpdGlvbi5zZXRXaWR0aChwb3NpdGlvbik7IH0KKyAgICB2
b2lkIHNldFN0YXRpY0Jsb2NrUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX29mZnNl
dEZvclBvc2l0aW9uLnNldEhlaWdodChwb3NpdGlvbik7IH0KIAogICAgIGJvb2wgaGFzVHJhbnNm
b3JtKCkgY29uc3QgeyByZXR1cm4gcmVuZGVyZXIoKS5oYXNUcmFuc2Zvcm0oKTsgfQogICAgIC8v
IE5vdGUgdGhhdCB0aGlzIHRyYW5zZm9ybSBoYXMgdGhlIHRyYW5zZm9ybS1vcmlnaW4gYmFrZWQg
aW4uCkBAIC0xMTc2LDggKzExNzYsOCBAQCBwcml2YXRlOgogICAgIC8vIE9ubHkgdmFsaWQgaWYg
bV9yZXBhaW50UmVjdHNWYWxpZCBpcyBzZXQgKHN0ZDo6b3B0aW9uYWw8PiBub3QgdXNlZCB0byBh
dm9pZCBwYWRkaW5nKS4KICAgICBMYXllclJlcGFpbnRSZWN0cyBtX3JlcGFpbnRSZWN0czsKIAot
ICAgIC8vIE91ciBjdXJyZW50IHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldC4KLSAgICBMYXlvdXRT
aXplIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb247CisgICAgLy8gT3VyIGN1cnJlbnQgcmVsYXRp
dmUgb3IgYWJzb2x1dGUgcG9zaXRpb24gb2Zmc2V0LgorICAgIExheW91dFNpemUgbV9vZmZzZXRG
b3JQb3NpdGlvbjsKIAogICAgIC8vIE91ciAoeCx5KSBjb29yZGluYXRlcyBhcmUgaW4gb3VyIHBh
cmVudCBsYXllcidzIGNvb3JkaW5hdGUgc3BhY2UuCiAgICAgTGF5b3V0UG9pbnQgbV90b3BMZWZ0
OwpAQCAtMTE5MCwxMCArMTE5MCw2IEBAIHByaXZhdGU6CiAgICAgTWFya2FibGU8U2Nyb2xsaW5n
U2NvcGUsIEludGVncmFsTWFya2FibGVUcmFpdHM8U2Nyb2xsaW5nU2NvcGUsIDA+PiBtX2JveFNj
cm9sbGluZ1Njb3BlOwogICAgIE1hcmthYmxlPFNjcm9sbGluZ1Njb3BlLCBJbnRlZ3JhbE1hcmth
YmxlVHJhaXRzPFNjcm9sbGluZ1Njb3BlLCAwPj4gbV9jb250ZW50c1Njcm9sbGluZ1Njb3BlOwog
Ci0gICAgLy8gQ2FjaGVkIG5vcm1hbCBmbG93IHZhbHVlcyBmb3IgYWJzb2x1dGUgcG9zaXRpb25l
ZCBlbGVtZW50cyB3aXRoIHN0YXRpYyBsZWZ0L3RvcCB2YWx1ZXMuCi0gICAgTGF5b3V0VW5pdCBt
X3N0YXRpY0lubGluZVBvc2l0aW9uOwotICAgIExheW91dFVuaXQgbV9zdGF0aWNCbG9ja1Bvc2l0
aW9uOwotCiAgICAgc3RkOjp1bmlxdWVfcHRyPFRyYW5zZm9ybWF0aW9uTWF0cml4PiBtX3RyYW5z
Zm9ybTsKICAgICAKICAgICAvLyBNYXkgdWx0aW1hdGVseSBiZSBleHRlbmRlZCB0byBtYW55IHJl
cGxpY2FzICh3aXRoIHRoZWlyIG93biBwYWludCBvcmRlcikuCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446784</attachid>
            <date>2021-12-10 12:38:30 -0800</date>
            <delta_ts>2021-12-11 03:05:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234154-20211210203829.patch</filename>
            <type>text/plain</type>
            <size>5394</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ0ZDczY2I0ZGIyZjhl
YzFmN2IxMzI4ZGRhNmI0ZjY0MWVjNDJmMC4uNzBiMjVlOTU0MDBlYTFlMzE1NTQ2MGJiM2MwOTIw
NDUzMDBjYTNmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWVyZ2UgcmVsYXRpdmUgYW5kIGFi
c29sdXRlIG9mZnNldHMgaW4gUmVuZGVyTGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDE1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtZW1iZXJzIHRvIHN0b3JlIGFic29sdXRlIChzdGF0
aWMgaW5saW5lL2Jsb2NrKSBhbmQKKyAgICAgICAgcmVsYXRpdmUgb2Zmc2V0IGFyZSB1c2VkIG9y
dGhvZ29uYWxseSwgc28gd2UganVzdCBtZXJnZQorICAgICAgICB0aGVtLgorCisgICAgICAgICog
cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy
Ojp1cGRhdGVMYXllclBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIu
aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpvZmZzZXRGb3JJbkZsb3dQb3NpdGlv
biBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c3RhdGljSW5saW5lUG9z
aXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnN0YXRpY0Jsb2Nr
UG9zaXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldFN0YXRp
Y0lubGluZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRTdGF0
aWNCbG9ja1Bvc2l0aW9uKToKKwogMjAyMS0xMi0xMCAgUGF0cmljayBHcmlmZmlzICA8cGdyaWZm
aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBDU1A6IEFsbG93IGV4dGVybmFsIHNjcmlwdHMgd2l0
aCBTUkkgaGFzaGVzIG1hdGNoaW5nIENTUApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM
YXllci5jcHAKaW5kZXggZmJlZjQ2MDkwZDA3NGUyZmI2ZmEyYzQ3NWMxZTU5Zjc0MWNjYTJjMi4u
NWM4NjAwMDA3MzJhMGRlZGVjYzQwZjMzNmQ1ODlhYTBkNDMwZGIzOSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0xNzEzLDExICsxNzEzLDkgQEAgYm9vbCBS
ZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbihPcHRpb25TZXQ8VXBkYXRlTGF5ZXJQb3Np
dGlvbnNGbGFnPiogZmxhZ3MKICAgICBib29sIHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gZmFs
c2U7CiAgICAgaWYgKHJlbmRlcmVyKCkuaXNJbkZsb3dQb3NpdGlvbmVkKCkpIHsKICAgICAgICAg
TGF5b3V0U2l6ZSBuZXdPZmZzZXQgPSBkb3duY2FzdDxSZW5kZXJCb3hNb2RlbE9iamVjdD4ocmVu
ZGVyZXIoKSkub2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24oKTsKLSAgICAgICAgcG9zaXRpb25Pck9m
ZnNldENoYW5nZWQgPSBuZXdPZmZzZXQgIT0gbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbjsKLSAg
ICAgICAgbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbiA9IG5ld09mZnNldDsKLSAgICAgICAgbG9j
YWxQb2ludC5tb3ZlKG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24pOwotICAgIH0gZWxzZSB7Ci0g
ICAgICAgIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24gPSBMYXlvdXRTaXplKCk7CisgICAgICAg
IHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gbmV3T2Zmc2V0ICE9IG1fb2Zmc2V0Rm9yUG9zaXRp
b247CisgICAgICAgIG1fb2Zmc2V0Rm9yUG9zaXRpb24gPSBuZXdPZmZzZXQ7CisgICAgICAgIGxv
Y2FsUG9pbnQubW92ZShtX29mZnNldEZvclBvc2l0aW9uKTsKICAgICB9CiAKICAgICAvLyBGSVhN
RTogV2UnZCByZWFsbHkgbGlrZSB0byBqdXN0IGdldCByaWQgb2YgdGhlIGNvbmNlcHQgb2YgYSBs
YXllciByZWN0YW5nbGUgYW5kIHJlbHkgb24gdGhlIHJlbmRlcmVycy4KZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggYmQ2ZDM4MTY3NGJjNDI1N2Y4MTVhNzY3NDA0Y2E4
NDdkMzU1ZGUwNy4uODAzNjVhMGZjZWU0ZTI4MWYzZDlhZmIxMzVmZWRmNTI1ZWM1Nzg1OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTUxMyw3ICs1MTMsMTEgQEAg
cHVibGljOgogICAgIHZvaWQgd2lsbFJlbW92ZUNoaWxkV2l0aEJsZW5kTW9kZSgpOwogI2VuZGlm
CiAKLSAgICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpIGNvbnN0
IHsgcmV0dXJuIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb247IH0KKyAgICBjb25zdCBMYXlvdXRT
aXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpIGNvbnN0CisgICAgeworICAgICAgICBBU1NF
UlQocmVuZGVyZXIoKS5pc0luRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgICAgIHJldHVybiBtX29m
ZnNldEZvclBvc2l0aW9uOworICAgIH0KIAogICAgIHZvaWQgY2xlYXJDbGlwUmVjdHNJbmNsdWRp
bmdEZXNjZW5kYW50cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0gQWxsQ2xpcFJlY3RUeXBl
cyk7CiAgICAgdm9pZCBjbGVhckNsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0g
QWxsQ2xpcFJlY3RUeXBlcyk7CkBAIC03MTcsMTEgKzcyMSwyNyBAQCBwdWJsaWM6CiAgICAgdm9p
ZCBzZXRSZXBhaW50U3RhdHVzKFJlcGFpbnRTdGF0dXMgc3RhdHVzKSB7IG1fcmVwYWludFN0YXR1
cyA9IHN0YXR1czsgfQogICAgIFJlcGFpbnRTdGF0dXMgcmVwYWludFN0YXR1cygpIGNvbnN0IHsg
cmV0dXJuIHN0YXRpY19jYXN0PFJlcGFpbnRTdGF0dXM+KG1fcmVwYWludFN0YXR1cyk7IH0KIAot
ICAgIExheW91dFVuaXQgc3RhdGljSW5saW5lUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0
YXRpY0lubGluZVBvc2l0aW9uOyB9Ci0gICAgTGF5b3V0VW5pdCBzdGF0aWNCbG9ja1Bvc2l0aW9u
KCkgY29uc3QgeyByZXR1cm4gbV9zdGF0aWNCbG9ja1Bvc2l0aW9uOyB9CisgICAgTGF5b3V0VW5p
dCBzdGF0aWNJbmxpbmVQb3NpdGlvbigpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQocmVu
ZGVyZXIoKS5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgICAgIHJldHVybiBtX29mZnNl
dEZvclBvc2l0aW9uLndpZHRoKCk7CisgICAgfQorICAgIExheW91dFVuaXQgc3RhdGljQmxvY2tQ
b3NpdGlvbigpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQocmVuZGVyZXIoKS5pc091dE9m
Rmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgICAgIHJldHVybiBtX29mZnNldEZvclBvc2l0aW9uLmhl
aWdodCgpOworICAgIH0KICAgIAotICAgIHZvaWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5
b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRpY0lubGluZVBvc2l0aW9uID0gcG9zaXRpb247IH0K
LSAgICB2b2lkIHNldFN0YXRpY0Jsb2NrUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBt
X3N0YXRpY0Jsb2NrUG9zaXRpb24gPSBwb3NpdGlvbjsgfQorICAgIHZvaWQgc2V0U3RhdGljSW5s
aW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikKKyAgICB7CisgICAgICAgIEFTU0VSVChy
ZW5kZXJlcigpLmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKKyAgICAgICAgbV9vZmZzZXRGb3JQ
b3NpdGlvbi5zZXRXaWR0aChwb3NpdGlvbik7CisgICAgfQorICAgIHZvaWQgc2V0U3RhdGljQmxv
Y2tQb3NpdGlvbihMYXlvdXRVbml0IHBvc2l0aW9uKQorICAgIHsKKyAgICAgICAgQVNTRVJUKHJl
bmRlcmVyKCkuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOworICAgICAgICBtX29mZnNldEZvclBv
c2l0aW9uLnNldEhlaWdodChwb3NpdGlvbik7CisgICAgfQogCiAgICAgYm9vbCBoYXNUcmFuc2Zv
cm0oKSBjb25zdCB7IHJldHVybiByZW5kZXJlcigpLmhhc1RyYW5zZm9ybSgpOyB9CiAgICAgLy8g
Tm90ZSB0aGF0IHRoaXMgdHJhbnNmb3JtIGhhcyB0aGUgdHJhbnNmb3JtLW9yaWdpbiBiYWtlZCBp
bi4KQEAgLTExNzYsOCArMTE5Niw4IEBAIHByaXZhdGU6CiAgICAgLy8gT25seSB2YWxpZCBpZiBt
X3JlcGFpbnRSZWN0c1ZhbGlkIGlzIHNldCAoc3RkOjpvcHRpb25hbDw+IG5vdCB1c2VkIHRvIGF2
b2lkIHBhZGRpbmcpLgogICAgIExheWVyUmVwYWludFJlY3RzIG1fcmVwYWludFJlY3RzOwogCi0g
ICAgLy8gT3VyIGN1cnJlbnQgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0LgotICAgIExheW91dFNp
emUgbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbjsKKyAgICAvLyBPdXIgY3VycmVudCByZWxhdGl2
ZSBvciBhYnNvbHV0ZSBwb3NpdGlvbiBvZmZzZXQuCisgICAgTGF5b3V0U2l6ZSBtX29mZnNldEZv
clBvc2l0aW9uOwogCiAgICAgLy8gT3VyICh4LHkpIGNvb3JkaW5hdGVzIGFyZSBpbiBvdXIgcGFy
ZW50IGxheWVyJ3MgY29vcmRpbmF0ZSBzcGFjZS4KICAgICBMYXlvdXRQb2ludCBtX3RvcExlZnQ7
CkBAIC0xMTkwLDEwICsxMjEwLDYgQEAgcHJpdmF0ZToKICAgICBNYXJrYWJsZTxTY3JvbGxpbmdT
Y29wZSwgSW50ZWdyYWxNYXJrYWJsZVRyYWl0czxTY3JvbGxpbmdTY29wZSwgMD4+IG1fYm94U2Ny
b2xsaW5nU2NvcGU7CiAgICAgTWFya2FibGU8U2Nyb2xsaW5nU2NvcGUsIEludGVncmFsTWFya2Fi
bGVUcmFpdHM8U2Nyb2xsaW5nU2NvcGUsIDA+PiBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGU7CiAK
LSAgICAvLyBDYWNoZWQgbm9ybWFsIGZsb3cgdmFsdWVzIGZvciBhYnNvbHV0ZSBwb3NpdGlvbmVk
IGVsZW1lbnRzIHdpdGggc3RhdGljIGxlZnQvdG9wIHZhbHVlcy4KLSAgICBMYXlvdXRVbml0IG1f
c3RhdGljSW5saW5lUG9zaXRpb247Ci0gICAgTGF5b3V0VW5pdCBtX3N0YXRpY0Jsb2NrUG9zaXRp
b247Ci0KICAgICBzdGQ6OnVuaXF1ZV9wdHI8VHJhbnNmb3JtYXRpb25NYXRyaXg+IG1fdHJhbnNm
b3JtOwogICAgIAogICAgIC8vIE1heSB1bHRpbWF0ZWx5IGJlIGV4dGVuZGVkIHRvIG1hbnkgcmVw
bGljYXMgKHdpdGggdGhlaXIgb3duIHBhaW50IG9yZGVyKS4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446869</attachid>
            <date>2021-12-11 03:05:22 -0800</date>
            <delta_ts>2021-12-22 01:54:40 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234154-20211211110521.patch</filename>
            <type>text/plain</type>
            <size>5709</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBhOTA4Zjk3ZGNlOWZi
YmU5ZDQwN2ZlYWQ1MDUxNmRjYzQ1M2ExYS4uNGQ4YWI5NzBjODE0MGZhZGZmOWQzYzE0Yjg4ZjNj
MWY1MTQ2NjQyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTExICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWVyZ2UgcmVsYXRpdmUgYW5kIGFi
c29sdXRlIG9mZnNldHMgaW4gUmVuZGVyTGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDE1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtZW1iZXJzIHRvIHN0b3JlIGFic29sdXRlIChzdGF0
aWMgaW5saW5lL2Jsb2NrKSBhbmQKKyAgICAgICAgcmVsYXRpdmUgb2Zmc2V0IGFyZSB1c2VkIG9y
dGhvZ29uYWxseSwgc28gd2UganVzdCBtZXJnZQorICAgICAgICB0aGVtLgorCisgICAgICAgICog
cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy
Ojp1cGRhdGVMYXllclBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIu
aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpvZmZzZXRGb3JJbkZsb3dQb3NpdGlv
biBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c3RhdGljSW5saW5lUG9z
aXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnN0YXRpY0Jsb2Nr
UG9zaXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldFN0YXRp
Y0lubGluZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRTdGF0
aWNCbG9ja1Bvc2l0aW9uKToKKwogMjAyMS0xMi0xMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw
cGxlLmNvbT4KIAogICAgICAgICBBZGQgYW4gZXhwZXJpbWVudGFsIHRyYWNrQ29uZmlndXJhdGlv
biBhY2Nlc3NvciBvbiBBdWRpb1RyYWNrICYgVmlkZW9UcmFjay4KZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGZiZWY0NjA5MGQwNzRlMmZiNmZhMmM0NzVjMWU1
OWY3NDFjY2EyYzIuLjFkYWRjNDc0NGIzNWQ1NGM0NjhkYTNlZWE0NDcwNGUwNzk4NDBkNzQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTcxMywxMSArMTcx
Myw5IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oT3B0aW9uU2V0PFVw
ZGF0ZUxheWVyUG9zaXRpb25zRmxhZz4qIGZsYWdzCiAgICAgYm9vbCBwb3NpdGlvbk9yT2Zmc2V0
Q2hhbmdlZCA9IGZhbHNlOwogICAgIGlmIChyZW5kZXJlcigpLmlzSW5GbG93UG9zaXRpb25lZCgp
KSB7CiAgICAgICAgIExheW91dFNpemUgbmV3T2Zmc2V0ID0gZG93bmNhc3Q8UmVuZGVyQm94TW9k
ZWxPYmplY3Q+KHJlbmRlcmVyKCkpLm9mZnNldEZvckluRmxvd1Bvc2l0aW9uKCk7Ci0gICAgICAg
IHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gbmV3T2Zmc2V0ICE9IG1fb2Zmc2V0Rm9ySW5GbG93
UG9zaXRpb247Ci0gICAgICAgIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24gPSBuZXdPZmZzZXQ7
Ci0gICAgICAgIGxvY2FsUG9pbnQubW92ZShtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uKTsKLSAg
ICB9IGVsc2UgewotICAgICAgICBtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uID0gTGF5b3V0U2l6
ZSgpOworICAgICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCA9IG5ld09mZnNldCAhPSBtX29m
ZnNldEZvclBvc2l0aW9uOworICAgICAgICBtX29mZnNldEZvclBvc2l0aW9uID0gbmV3T2Zmc2V0
OworICAgICAgICBsb2NhbFBvaW50Lm1vdmUobV9vZmZzZXRGb3JQb3NpdGlvbik7CiAgICAgfQog
CiAgICAgLy8gRklYTUU6IFdlJ2QgcmVhbGx5IGxpa2UgdG8ganVzdCBnZXQgcmlkIG9mIHRoZSBj
b25jZXB0IG9mIGEgbGF5ZXIgcmVjdGFuZ2xlIGFuZCByZWx5IG9uIHRoZSByZW5kZXJlcnMuCkBA
IC01MTk2LDcgKzUxOTQsNiBAQCBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZVNlbGZQYWludGlu
Z0xheWVyKCkgY29uc3QKIAogICAgIHJldHVybiBoYXNPdmVybGF5U2Nyb2xsYmFycygpCiAgICAg
ICAgIHx8IGhhc0NvbXBvc2l0ZWRTY3JvbGxhYmxlT3ZlcmZsb3coKQotICAgICAgICB8fCByZW5k
ZXJlcigpLmlzVGFibGVSb3coKQogICAgICAgICB8fCByZW5kZXJlcigpLmlzQ2FudmFzKCkKICAg
ICAgICAgfHwgcmVuZGVyZXIoKS5pc1ZpZGVvKCkKICAgICAgICAgfHwgcmVuZGVyZXIoKS5pc0Vt
YmVkZGVkT2JqZWN0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXgg
YmQ2ZDM4MTY3NGJjNDI1N2Y4MTVhNzY3NDA0Y2E4NDdkMzU1ZGUwNy4uODAzNjVhMGZjZWU0ZTI4
MWYzZDlhZmIxMzVmZWRmNTI1ZWM1Nzg1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckxheWVyLmgKQEAgLTUxMyw3ICs1MTMsMTEgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbFJlbW92
ZUNoaWxkV2l0aEJsZW5kTW9kZSgpOwogI2VuZGlmCiAKLSAgICBjb25zdCBMYXlvdXRTaXplJiBv
ZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9ySW5GbG93
UG9zaXRpb247IH0KKyAgICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlv
bigpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQocmVuZGVyZXIoKS5pc0luRmxvd1Bvc2l0
aW9uZWQoKSk7CisgICAgICAgIHJldHVybiBtX29mZnNldEZvclBvc2l0aW9uOworICAgIH0KIAog
ICAgIHZvaWQgY2xlYXJDbGlwUmVjdHNJbmNsdWRpbmdEZXNjZW5kYW50cyhDbGlwUmVjdHNUeXBl
IHR5cGVUb0NsZWFyID0gQWxsQ2xpcFJlY3RUeXBlcyk7CiAgICAgdm9pZCBjbGVhckNsaXBSZWN0
cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0gQWxsQ2xpcFJlY3RUeXBlcyk7CkBAIC03MTcs
MTEgKzcyMSwyNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRSZXBhaW50U3RhdHVzKFJlcGFpbnRT
dGF0dXMgc3RhdHVzKSB7IG1fcmVwYWludFN0YXR1cyA9IHN0YXR1czsgfQogICAgIFJlcGFpbnRT
dGF0dXMgcmVwYWludFN0YXR1cygpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFJlcGFpbnRT
dGF0dXM+KG1fcmVwYWludFN0YXR1cyk7IH0KIAotICAgIExheW91dFVuaXQgc3RhdGljSW5saW5l
UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0YXRpY0lubGluZVBvc2l0aW9uOyB9Ci0gICAg
TGF5b3V0VW5pdCBzdGF0aWNCbG9ja1Bvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0aWNC
bG9ja1Bvc2l0aW9uOyB9CisgICAgTGF5b3V0VW5pdCBzdGF0aWNJbmxpbmVQb3NpdGlvbigpIGNv
bnN0CisgICAgeworICAgICAgICBBU1NFUlQocmVuZGVyZXIoKS5pc091dE9mRmxvd1Bvc2l0aW9u
ZWQoKSk7CisgICAgICAgIHJldHVybiBtX29mZnNldEZvclBvc2l0aW9uLndpZHRoKCk7CisgICAg
fQorICAgIExheW91dFVuaXQgc3RhdGljQmxvY2tQb3NpdGlvbigpIGNvbnN0CisgICAgeworICAg
ICAgICBBU1NFUlQocmVuZGVyZXIoKS5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgICAg
IHJldHVybiBtX29mZnNldEZvclBvc2l0aW9uLmhlaWdodCgpOworICAgIH0KICAgIAotICAgIHZv
aWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRp
Y0lubGluZVBvc2l0aW9uID0gcG9zaXRpb247IH0KLSAgICB2b2lkIHNldFN0YXRpY0Jsb2NrUG9z
aXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRpY0Jsb2NrUG9zaXRpb24gPSBwb3Np
dGlvbjsgfQorICAgIHZvaWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3Np
dGlvbikKKyAgICB7CisgICAgICAgIEFTU0VSVChyZW5kZXJlcigpLmlzT3V0T2ZGbG93UG9zaXRp
b25lZCgpKTsKKyAgICAgICAgbV9vZmZzZXRGb3JQb3NpdGlvbi5zZXRXaWR0aChwb3NpdGlvbik7
CisgICAgfQorICAgIHZvaWQgc2V0U3RhdGljQmxvY2tQb3NpdGlvbihMYXlvdXRVbml0IHBvc2l0
aW9uKQorICAgIHsKKyAgICAgICAgQVNTRVJUKHJlbmRlcmVyKCkuaXNPdXRPZkZsb3dQb3NpdGlv
bmVkKCkpOworICAgICAgICBtX29mZnNldEZvclBvc2l0aW9uLnNldEhlaWdodChwb3NpdGlvbik7
CisgICAgfQogCiAgICAgYm9vbCBoYXNUcmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiByZW5kZXJl
cigpLmhhc1RyYW5zZm9ybSgpOyB9CiAgICAgLy8gTm90ZSB0aGF0IHRoaXMgdHJhbnNmb3JtIGhh
cyB0aGUgdHJhbnNmb3JtLW9yaWdpbiBiYWtlZCBpbi4KQEAgLTExNzYsOCArMTE5Niw4IEBAIHBy
aXZhdGU6CiAgICAgLy8gT25seSB2YWxpZCBpZiBtX3JlcGFpbnRSZWN0c1ZhbGlkIGlzIHNldCAo
c3RkOjpvcHRpb25hbDw+IG5vdCB1c2VkIHRvIGF2b2lkIHBhZGRpbmcpLgogICAgIExheWVyUmVw
YWludFJlY3RzIG1fcmVwYWludFJlY3RzOwogCi0gICAgLy8gT3VyIGN1cnJlbnQgcmVsYXRpdmUg
cG9zaXRpb24gb2Zmc2V0LgotICAgIExheW91dFNpemUgbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlv
bjsKKyAgICAvLyBPdXIgY3VycmVudCByZWxhdGl2ZSBvciBhYnNvbHV0ZSBwb3NpdGlvbiBvZmZz
ZXQuCisgICAgTGF5b3V0U2l6ZSBtX29mZnNldEZvclBvc2l0aW9uOwogCiAgICAgLy8gT3VyICh4
LHkpIGNvb3JkaW5hdGVzIGFyZSBpbiBvdXIgcGFyZW50IGxheWVyJ3MgY29vcmRpbmF0ZSBzcGFj
ZS4KICAgICBMYXlvdXRQb2ludCBtX3RvcExlZnQ7CkBAIC0xMTkwLDEwICsxMjEwLDYgQEAgcHJp
dmF0ZToKICAgICBNYXJrYWJsZTxTY3JvbGxpbmdTY29wZSwgSW50ZWdyYWxNYXJrYWJsZVRyYWl0
czxTY3JvbGxpbmdTY29wZSwgMD4+IG1fYm94U2Nyb2xsaW5nU2NvcGU7CiAgICAgTWFya2FibGU8
U2Nyb2xsaW5nU2NvcGUsIEludGVncmFsTWFya2FibGVUcmFpdHM8U2Nyb2xsaW5nU2NvcGUsIDA+
PiBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGU7CiAKLSAgICAvLyBDYWNoZWQgbm9ybWFsIGZsb3cg
dmFsdWVzIGZvciBhYnNvbHV0ZSBwb3NpdGlvbmVkIGVsZW1lbnRzIHdpdGggc3RhdGljIGxlZnQv
dG9wIHZhbHVlcy4KLSAgICBMYXlvdXRVbml0IG1fc3RhdGljSW5saW5lUG9zaXRpb247Ci0gICAg
TGF5b3V0VW5pdCBtX3N0YXRpY0Jsb2NrUG9zaXRpb247Ci0KICAgICBzdGQ6OnVuaXF1ZV9wdHI8
VHJhbnNmb3JtYXRpb25NYXRyaXg+IG1fdHJhbnNmb3JtOwogICAgIAogICAgIC8vIE1heSB1bHRp
bWF0ZWx5IGJlIGV4dGVuZGVkIHRvIG1hbnkgcmVwbGljYXMgKHdpdGggdGhlaXIgb3duIHBhaW50
IG9yZGVyKS4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>447788</attachid>
            <date>2021-12-22 01:54:46 -0800</date>
            <delta_ts>2021-12-22 10:08:33 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234154-20211222095444.patch</filename>
            <type>text/plain</type>
            <size>4875</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM2MWE0MmViNmMzMDUw
MjRjNTkxYzZhZWY0Njk5YzMyNWRiYjAzMS4uMDU3OWVmZDIxNjViMTRhYWM4ZjQ3NjhhNDk4ZGQ1
ZDQ4OGZkOWM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuZGVyTGF5ZXIgV0lQCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxNTQKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJMYXllciBX
SVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24pOgorICAgICAgICAqIHJlbmRl
cmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Om9mZnNl
dEZvckluRmxvd1Bvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy
OjpzdGF0aWNJbmxpbmVQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM
YXllcjo6c3RhdGljQmxvY2tQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJMYXllcjo6c2V0U3RhdGljSW5saW5lUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyTGF5ZXI6OnNldFN0YXRpY0Jsb2NrUG9zaXRpb24pOgorCiAyMDIxLTEyLTIyICBQaGlsaXBw
ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIy
ODcwMjEpOiBbRU1FXVtUaHVuZGVyXSBCdWlsZCBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDY1MDlmNWJmZTUzMmVjMDliOGYzZDhjNDUyZThiNjlh
ZjQxY2U4YmIuLjliYTAzOTljZWVhYmY1N2NhYTA3Mjk3NDcwNTkwODM2ZjJkMGVhZjggMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTcxMywxMSArMTcxMyw5
IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oT3B0aW9uU2V0PFVwZGF0
ZUxheWVyUG9zaXRpb25zRmxhZz4qIGZsYWdzCiAgICAgYm9vbCBwb3NpdGlvbk9yT2Zmc2V0Q2hh
bmdlZCA9IGZhbHNlOwogICAgIGlmIChyZW5kZXJlcigpLmlzSW5GbG93UG9zaXRpb25lZCgpKSB7
CiAgICAgICAgIExheW91dFNpemUgbmV3T2Zmc2V0ID0gZG93bmNhc3Q8UmVuZGVyQm94TW9kZWxP
YmplY3Q+KHJlbmRlcmVyKCkpLm9mZnNldEZvckluRmxvd1Bvc2l0aW9uKCk7Ci0gICAgICAgIHBv
c2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gbmV3T2Zmc2V0ICE9IG1fb2Zmc2V0Rm9ySW5GbG93UG9z
aXRpb247Ci0gICAgICAgIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24gPSBuZXdPZmZzZXQ7Ci0g
ICAgICAgIGxvY2FsUG9pbnQubW92ZShtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uKTsKLSAgICB9
IGVsc2UgewotICAgICAgICBtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uID0gTGF5b3V0U2l6ZSgp
OworICAgICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCA9IG5ld09mZnNldCAhPSBtX29mZnNl
dEZvclBvc2l0aW9uOworICAgICAgICBtX29mZnNldEZvclBvc2l0aW9uID0gbmV3T2Zmc2V0Owor
ICAgICAgICBsb2NhbFBvaW50Lm1vdmUobV9vZmZzZXRGb3JQb3NpdGlvbik7CiAgICAgfQogCiAg
ICAgLy8gRklYTUU6IFdlJ2QgcmVhbGx5IGxpa2UgdG8ganVzdCBnZXQgcmlkIG9mIHRoZSBjb25j
ZXB0IG9mIGEgbGF5ZXIgcmVjdGFuZ2xlIGFuZCByZWx5IG9uIHRoZSByZW5kZXJlcnMuCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGQ5YWZkZmMzYTk3Y2QxMTRlMDll
MzViMDNiMjAwODQ4MTRiODEzNjkuLjdiOTczMTIxMGI2MDI2MjcyZWVkNzIzOWMwYmI1YTg3YjY1
ZmVkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC01MTMsNyAr
NTEzLDcgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbFJlbW92ZUNoaWxkV2l0aEJsZW5kTW9kZSgp
OwogI2VuZGlmCiAKLSAgICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlv
bigpIGNvbnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb247IH0KKyAgICBjb25z
dCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f
b2Zmc2V0Rm9yUG9zaXRpb247IH0KIAogICAgIHZvaWQgY2xlYXJDbGlwUmVjdHNJbmNsdWRpbmdE
ZXNjZW5kYW50cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0gQWxsQ2xpcFJlY3RUeXBlcyk7
CiAgICAgdm9pZCBjbGVhckNsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0gQWxs
Q2xpcFJlY3RUeXBlcyk7CkBAIC03MTYsMTEgKzcxNiwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBz
ZXRSZXBhaW50U3RhdHVzKFJlcGFpbnRTdGF0dXMgc3RhdHVzKSB7IG1fcmVwYWludFN0YXR1cyA9
IHN0YXR1czsgfQogICAgIFJlcGFpbnRTdGF0dXMgcmVwYWludFN0YXR1cygpIGNvbnN0IHsgcmV0
dXJuIHN0YXRpY19jYXN0PFJlcGFpbnRTdGF0dXM+KG1fcmVwYWludFN0YXR1cyk7IH0KIAotICAg
IExheW91dFVuaXQgc3RhdGljSW5saW5lUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0YXRp
Y0lubGluZVBvc2l0aW9uOyB9Ci0gICAgTGF5b3V0VW5pdCBzdGF0aWNCbG9ja1Bvc2l0aW9uKCkg
Y29uc3QgeyByZXR1cm4gbV9zdGF0aWNCbG9ja1Bvc2l0aW9uOyB9CisgICAgTGF5b3V0VW5pdCBz
dGF0aWNJbmxpbmVQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9yUG9zaXRpb24u
d2lkdGgoKTsgfQorICAgIExheW91dFVuaXQgc3RhdGljQmxvY2tQb3NpdGlvbigpIGNvbnN0IHsg
cmV0dXJuIG1fb2Zmc2V0Rm9yUG9zaXRpb24uaGVpZ2h0KCk7IH0KICAgIAotICAgIHZvaWQgc2V0
U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRpY0lubGlu
ZVBvc2l0aW9uID0gcG9zaXRpb247IH0KLSAgICB2b2lkIHNldFN0YXRpY0Jsb2NrUG9zaXRpb24o
TGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRpY0Jsb2NrUG9zaXRpb24gPSBwb3NpdGlvbjsg
fQorICAgIHZvaWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikg
eyBtX29mZnNldEZvclBvc2l0aW9uLnNldFdpZHRoKHBvc2l0aW9uKTsgfQorICAgIHZvaWQgc2V0
U3RhdGljQmxvY2tQb3NpdGlvbihMYXlvdXRVbml0IHBvc2l0aW9uKSB7IG1fb2Zmc2V0Rm9yUG9z
aXRpb24uc2V0SGVpZ2h0KHBvc2l0aW9uKTsgfQogCiAgICAgYm9vbCBoYXNUcmFuc2Zvcm0oKSBj
b25zdCB7IHJldHVybiByZW5kZXJlcigpLmhhc1RyYW5zZm9ybSgpOyB9CiAgICAgLy8gTm90ZSB0
aGF0IHRoaXMgdHJhbnNmb3JtIGhhcyB0aGUgdHJhbnNmb3JtLW9yaWdpbiBiYWtlZCBpbi4KQEAg
LTExNzUsOCArMTE3NSw4IEBAIHByaXZhdGU6CiAgICAgLy8gT25seSB2YWxpZCBpZiBtX3JlcGFp
bnRSZWN0c1ZhbGlkIGlzIHNldCAoc3RkOjpvcHRpb25hbDw+IG5vdCB1c2VkIHRvIGF2b2lkIHBh
ZGRpbmcpLgogICAgIExheWVyUmVwYWludFJlY3RzIG1fcmVwYWludFJlY3RzOwogCi0gICAgLy8g
T3VyIGN1cnJlbnQgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0LgotICAgIExheW91dFNpemUgbV9v
ZmZzZXRGb3JJbkZsb3dQb3NpdGlvbjsKKyAgICAvLyBPdXIgY3VycmVudCByZWxhdGl2ZSBvciBh
YnNvbHV0ZSBwb3NpdGlvbiBvZmZzZXQuCisgICAgTGF5b3V0U2l6ZSBtX29mZnNldEZvclBvc2l0
aW9uOwogCiAgICAgLy8gT3VyICh4LHkpIGNvb3JkaW5hdGVzIGFyZSBpbiBvdXIgcGFyZW50IGxh
eWVyJ3MgY29vcmRpbmF0ZSBzcGFjZS4KICAgICBMYXlvdXRQb2ludCBtX3RvcExlZnQ7CkBAIC0x
MTg5LDEwICsxMTg5LDYgQEAgcHJpdmF0ZToKICAgICBNYXJrYWJsZTxTY3JvbGxpbmdTY29wZSwg
SW50ZWdyYWxNYXJrYWJsZVRyYWl0czxTY3JvbGxpbmdTY29wZSwgMD4+IG1fYm94U2Nyb2xsaW5n
U2NvcGU7CiAgICAgTWFya2FibGU8U2Nyb2xsaW5nU2NvcGUsIEludGVncmFsTWFya2FibGVUcmFp
dHM8U2Nyb2xsaW5nU2NvcGUsIDA+PiBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGU7CiAKLSAgICAv
LyBDYWNoZWQgbm9ybWFsIGZsb3cgdmFsdWVzIGZvciBhYnNvbHV0ZSBwb3NpdGlvbmVkIGVsZW1l
bnRzIHdpdGggc3RhdGljIGxlZnQvdG9wIHZhbHVlcy4KLSAgICBMYXlvdXRVbml0IG1fc3RhdGlj
SW5saW5lUG9zaXRpb247Ci0gICAgTGF5b3V0VW5pdCBtX3N0YXRpY0Jsb2NrUG9zaXRpb247Ci0K
ICAgICBzdGQ6OnVuaXF1ZV9wdHI8VHJhbnNmb3JtYXRpb25NYXRyaXg+IG1fdHJhbnNmb3JtOwog
ICAgIAogICAgIC8vIE1heSB1bHRpbWF0ZWx5IGJlIGV4dGVuZGVkIHRvIG1hbnkgcmVwbGljYXMg
KHdpdGggdGhlaXIgb3duIHBhaW50IG9yZGVyKS4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>447813</attachid>
            <date>2021-12-22 10:08:38 -0800</date>
            <delta_ts>2021-12-22 23:16:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234154-20211222180836.patch</filename>
            <type>text/plain</type>
            <size>4995</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM2MWE0MmViNmMzMDUw
MjRjNTkxYzZhZWY0Njk5YzMyNWRiYjAzMS4uODQ2Y2VlZWM3ZjQ4ZDlhNjA2Y2MyZjRlMWJjZjNm
MWVmNGVlZDgxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuZGVyTGF5ZXIgV0lQCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxNTQKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgIG1lbWJlcnMg
dG8gc3RvcmUgYWJzb2x1dGUgKHN0YXRpYyBpbmxpbmUvYmxvY2spIGFuZAorICAgICAgICByZWxh
dGl2ZSBvZmZzZXQgYXJlIHVzZWQgb3J0aG9nb25hbGx5LCBzbyB3ZSBqdXN0IG1lcmdlCisgICAg
ICAgIHRoZW0uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24pOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6
Om9mZnNldEZvckluRmxvd1Bvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckxheWVyOjpzdGF0aWNJbmxpbmVQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJMYXllcjo6c3RhdGljQmxvY2tQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJMYXllcjo6c2V0U3RhdGljSW5saW5lUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29y
ZTo6UmVuZGVyTGF5ZXI6OnNldFN0YXRpY0Jsb2NrUG9zaXRpb24pOgorCiAyMDIxLTEyLTIyICBQ
aGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNT
SU9OKHIyODcwMjEpOiBbRU1FXVtUaHVuZGVyXSBCdWlsZCBicm9rZW4KZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDY1MDlmNWJmZTUzMmVjMDliOGYzZDhjNDUy
ZThiNjlhZjQxY2U4YmIuLjliYTAzOTljZWVhYmY1N2NhYTA3Mjk3NDcwNTkwODM2ZjJkMGVhZjgg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTcxMywxMSAr
MTcxMyw5IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oT3B0aW9uU2V0
PFVwZGF0ZUxheWVyUG9zaXRpb25zRmxhZz4qIGZsYWdzCiAgICAgYm9vbCBwb3NpdGlvbk9yT2Zm
c2V0Q2hhbmdlZCA9IGZhbHNlOwogICAgIGlmIChyZW5kZXJlcigpLmlzSW5GbG93UG9zaXRpb25l
ZCgpKSB7CiAgICAgICAgIExheW91dFNpemUgbmV3T2Zmc2V0ID0gZG93bmNhc3Q8UmVuZGVyQm94
TW9kZWxPYmplY3Q+KHJlbmRlcmVyKCkpLm9mZnNldEZvckluRmxvd1Bvc2l0aW9uKCk7Ci0gICAg
ICAgIHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gbmV3T2Zmc2V0ICE9IG1fb2Zmc2V0Rm9ySW5G
bG93UG9zaXRpb247Ci0gICAgICAgIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb24gPSBuZXdPZmZz
ZXQ7Ci0gICAgICAgIGxvY2FsUG9pbnQubW92ZShtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uKTsK
LSAgICB9IGVsc2UgewotICAgICAgICBtX29mZnNldEZvckluRmxvd1Bvc2l0aW9uID0gTGF5b3V0
U2l6ZSgpOworICAgICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCA9IG5ld09mZnNldCAhPSBt
X29mZnNldEZvclBvc2l0aW9uOworICAgICAgICBtX29mZnNldEZvclBvc2l0aW9uID0gbmV3T2Zm
c2V0OworICAgICAgICBsb2NhbFBvaW50Lm1vdmUobV9vZmZzZXRGb3JQb3NpdGlvbik7CiAgICAg
fQogCiAgICAgLy8gRklYTUU6IFdlJ2QgcmVhbGx5IGxpa2UgdG8ganVzdCBnZXQgcmlkIG9mIHRo
ZSBjb25jZXB0IG9mIGEgbGF5ZXIgcmVjdGFuZ2xlIGFuZCByZWx5IG9uIHRoZSByZW5kZXJlcnMu
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGQ5YWZkZmMzYTk3Y2Qx
MTRlMDllMzViMDNiMjAwODQ4MTRiODEzNjkuLjdiOTczMTIxMGI2MDI2MjcyZWVkNzIzOWMwYmI1
YTg3YjY1ZmVkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM
YXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC01
MTMsNyArNTEzLDcgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbFJlbW92ZUNoaWxkV2l0aEJsZW5k
TW9kZSgpOwogI2VuZGlmCiAKLSAgICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQ
b3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9ySW5GbG93UG9zaXRpb247IH0KKyAg
ICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGb3JJbkZsb3dQb3NpdGlvbigpIGNvbnN0IHsgcmV0
dXJuIG1fb2Zmc2V0Rm9yUG9zaXRpb247IH0KIAogICAgIHZvaWQgY2xlYXJDbGlwUmVjdHNJbmNs
dWRpbmdEZXNjZW5kYW50cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFyID0gQWxsQ2xpcFJlY3RU
eXBlcyk7CiAgICAgdm9pZCBjbGVhckNsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIHR5cGVUb0NsZWFy
ID0gQWxsQ2xpcFJlY3RUeXBlcyk7CkBAIC03MTYsMTEgKzcxNiwxMSBAQCBwdWJsaWM6CiAgICAg
dm9pZCBzZXRSZXBhaW50U3RhdHVzKFJlcGFpbnRTdGF0dXMgc3RhdHVzKSB7IG1fcmVwYWludFN0
YXR1cyA9IHN0YXR1czsgfQogICAgIFJlcGFpbnRTdGF0dXMgcmVwYWludFN0YXR1cygpIGNvbnN0
IHsgcmV0dXJuIHN0YXRpY19jYXN0PFJlcGFpbnRTdGF0dXM+KG1fcmVwYWludFN0YXR1cyk7IH0K
IAotICAgIExheW91dFVuaXQgc3RhdGljSW5saW5lUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBt
X3N0YXRpY0lubGluZVBvc2l0aW9uOyB9Ci0gICAgTGF5b3V0VW5pdCBzdGF0aWNCbG9ja1Bvc2l0
aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0aWNCbG9ja1Bvc2l0aW9uOyB9CisgICAgTGF5b3V0
VW5pdCBzdGF0aWNJbmxpbmVQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9yUG9z
aXRpb24ud2lkdGgoKTsgfQorICAgIExheW91dFVuaXQgc3RhdGljQmxvY2tQb3NpdGlvbigpIGNv
bnN0IHsgcmV0dXJuIG1fb2Zmc2V0Rm9yUG9zaXRpb24uaGVpZ2h0KCk7IH0KICAgIAotICAgIHZv
aWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRp
Y0lubGluZVBvc2l0aW9uID0gcG9zaXRpb247IH0KLSAgICB2b2lkIHNldFN0YXRpY0Jsb2NrUG9z
aXRpb24oTGF5b3V0VW5pdCBwb3NpdGlvbikgeyBtX3N0YXRpY0Jsb2NrUG9zaXRpb24gPSBwb3Np
dGlvbjsgfQorICAgIHZvaWQgc2V0U3RhdGljSW5saW5lUG9zaXRpb24oTGF5b3V0VW5pdCBwb3Np
dGlvbikgeyBtX29mZnNldEZvclBvc2l0aW9uLnNldFdpZHRoKHBvc2l0aW9uKTsgfQorICAgIHZv
aWQgc2V0U3RhdGljQmxvY2tQb3NpdGlvbihMYXlvdXRVbml0IHBvc2l0aW9uKSB7IG1fb2Zmc2V0
Rm9yUG9zaXRpb24uc2V0SGVpZ2h0KHBvc2l0aW9uKTsgfQogCiAgICAgYm9vbCBoYXNUcmFuc2Zv
cm0oKSBjb25zdCB7IHJldHVybiByZW5kZXJlcigpLmhhc1RyYW5zZm9ybSgpOyB9CiAgICAgLy8g
Tm90ZSB0aGF0IHRoaXMgdHJhbnNmb3JtIGhhcyB0aGUgdHJhbnNmb3JtLW9yaWdpbiBiYWtlZCBp
bi4KQEAgLTExNzUsOCArMTE3NSw4IEBAIHByaXZhdGU6CiAgICAgLy8gT25seSB2YWxpZCBpZiBt
X3JlcGFpbnRSZWN0c1ZhbGlkIGlzIHNldCAoc3RkOjpvcHRpb25hbDw+IG5vdCB1c2VkIHRvIGF2
b2lkIHBhZGRpbmcpLgogICAgIExheWVyUmVwYWludFJlY3RzIG1fcmVwYWludFJlY3RzOwogCi0g
ICAgLy8gT3VyIGN1cnJlbnQgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0LgotICAgIExheW91dFNp
emUgbV9vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbjsKKyAgICAvLyBPdXIgY3VycmVudCByZWxhdGl2
ZSBvciBhYnNvbHV0ZSBwb3NpdGlvbiBvZmZzZXQuCisgICAgTGF5b3V0U2l6ZSBtX29mZnNldEZv
clBvc2l0aW9uOwogCiAgICAgLy8gT3VyICh4LHkpIGNvb3JkaW5hdGVzIGFyZSBpbiBvdXIgcGFy
ZW50IGxheWVyJ3MgY29vcmRpbmF0ZSBzcGFjZS4KICAgICBMYXlvdXRQb2ludCBtX3RvcExlZnQ7
CkBAIC0xMTg5LDEwICsxMTg5LDYgQEAgcHJpdmF0ZToKICAgICBNYXJrYWJsZTxTY3JvbGxpbmdT
Y29wZSwgSW50ZWdyYWxNYXJrYWJsZVRyYWl0czxTY3JvbGxpbmdTY29wZSwgMD4+IG1fYm94U2Ny
b2xsaW5nU2NvcGU7CiAgICAgTWFya2FibGU8U2Nyb2xsaW5nU2NvcGUsIEludGVncmFsTWFya2Fi
bGVUcmFpdHM8U2Nyb2xsaW5nU2NvcGUsIDA+PiBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGU7CiAK
LSAgICAvLyBDYWNoZWQgbm9ybWFsIGZsb3cgdmFsdWVzIGZvciBhYnNvbHV0ZSBwb3NpdGlvbmVk
IGVsZW1lbnRzIHdpdGggc3RhdGljIGxlZnQvdG9wIHZhbHVlcy4KLSAgICBMYXlvdXRVbml0IG1f
c3RhdGljSW5saW5lUG9zaXRpb247Ci0gICAgTGF5b3V0VW5pdCBtX3N0YXRpY0Jsb2NrUG9zaXRp
b247Ci0KICAgICBzdGQ6OnVuaXF1ZV9wdHI8VHJhbnNmb3JtYXRpb25NYXRyaXg+IG1fdHJhbnNm
b3JtOwogICAgIAogICAgIC8vIE1heSB1bHRpbWF0ZWx5IGJlIGV4dGVuZGVkIHRvIG1hbnkgcmVw
bGljYXMgKHdpdGggdGhlaXIgb3duIHBhaW50IG9yZGVyKS4K
</data>

          </attachment>
      

    </bug>

</bugzilla>