<?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>225015</bug_id>
          
          <creation_ts>2021-04-24 08:15:49 -0700</creation_ts>
          <short_desc>Block sizing is miscalculated for elements with a preferred aspect-ratio when padding is applied, and content can overflow.</short_desc>
          <delta_ts>2021-04-28 18:00:39 -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>Blocker</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>47738</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Jen Simmons">jensimmons</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>darin</cc>
    
    <cc>dino</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>graouts</cc>
    
    <cc>graouts</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rbuis</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1753849</commentid>
    <comment_count>0</comment_count>
    <who name="Jen Simmons">jensimmons</who>
    <bug_when>2021-04-24 08:15:49 -0700</bug_when>
    <thetext>When `aspect-ratio` is applied to a box with content, the box should prevent overflow by growing to be tall enough to fit the content, plus space for whatever margins or padding are involved. 

From the spec: 
&gt;In order to avoid unintentional overflow, the automatic minimum size in the ratio-dependent axis of a box with a preferred aspect ratio that is neither a replaced element nor a scroll container is its min-content size clamped from above by its maximum size.
https://www.w3.org/TR/css-sizing-4/#aspect-ratio-minimum

This works in the WebKit implementation, unless there is padding applied to the box. It looks like the padding is being subtracted from the height, instead of added, or something similarly weird.

Example: https://labs.jensimmons.com/2021/aspect-ratio/04-bug.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753865</commentid>
    <comment_count>1</comment_count>
      <attachid>426984</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-24 10:54:51 -0700</bug_when>
    <thetext>Created attachment 426984
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753990</commentid>
    <comment_count>2</comment_count>
      <attachid>426997</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-25 02:11:24 -0700</bug_when>
    <thetext>Created attachment 426997
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753995</commentid>
    <comment_count>3</comment_count>
      <attachid>427000</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-25 03:43:16 -0700</bug_when>
    <thetext>Created attachment 427000
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754027</commentid>
    <comment_count>4</comment_count>
      <attachid>427006</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-25 11:05:06 -0700</bug_when>
    <thetext>Created attachment 427006
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754028</commentid>
    <comment_count>5</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-04-25 11:06:16 -0700</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755058</commentid>
    <comment_count>6</comment_count>
      <attachid>427273</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-28 10:03:54 -0700</bug_when>
    <thetext>Created attachment 427273
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755094</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-28 11:42:20 -0700</bug_when>
    <thetext>&lt;rdar://problem/77276415&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755103</commentid>
    <comment_count>8</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-28 11:53:35 -0700</bug_when>
    <thetext>To be clear, the first patches had a WPT test included that I developed. Today I discovered that there is already a very similar WPT test available, so the latest patch imports that one.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755111</commentid>
    <comment_count>9</comment_count>
      <attachid>427273</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-04-28 12:05:36 -0700</bug_when>
    <thetext>Comment on attachment 427273
Patch

Looks OK.

But there are multiple code changes and only one test case. Seems like we need more test cases. When I see branches in code I assume each needs a different test, so this seems to require at *least* 3 tests, but maybe more if we want to cover not changing the cases we don’t want to.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755268</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-28 18:00:35 -0700</bug_when>
    <thetext>Committed r276745 (237145@main): &lt;https://commits.webkit.org/237145@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427273.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426984</attachid>
            <date>2021-04-24 10:54:51 -0700</date>
            <delta_ts>2021-04-25 02:11:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225015-20210424195449.patch</filename>
            <type>text/plain</type>
            <size>2158</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmNDlkZGI5Yjc5ZDFj
OTA2MmEyODRjYzlhZjBhNWIxNDk3ODhiMi4uYjk0ZTMwOTRlYTlhMmE4ODY3YzdlNmE0OWE4NzBh
ZDk0ODQwZmE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQmxvY2sgc2l6aW5nIGlzIG1pc2Nh
bGN1bGF0ZWQgZm9yIGVsZW1lbnRzIHdpdGggYSBwcmVmZXJyZWQgYXNwZWN0LXJhdGlvIHdoZW4g
cGFkZGluZyBpcyBhcHBsaWVkLCBhbmQgY29udGVudCBjYW4gb3ZlcmZsb3cuCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBy
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t
cHV0ZUxvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTA0LTE4ICBXZW5zb24gSHNpZWggIDx3
ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFNlbGVjdGVkIGltYWdlIG92ZXJsYXkg
dGV4dCBzaG91bGQgbmV2ZXIgYmUgdmlzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAppbmRleCAxOTI0NDBiMzM4ODA4YTAzZWYxOGMxODk2MTZkZTlhOWJiZmViZGVkLi5h
MTMzZDc2ZjhlOTk1NzlmMTM5Y2VkM2ExM2ZmMTBkYjc3YjkyZGFjIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjk1NSw4ICsyOTU1LDExIEBAIFJlbmRlckJveDo6
TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWln
aHQoTGF5b3V0VW5pCiAgICAgICAgICAgICAvLyBDYWxsZXJzIHBhc3NpbmcgTGF5b3V0VW5pdDo6
bWF4KCkgZm9yIGxvZ2ljYWxIZWlnaHQgbWVhbnMgYW4gaW5kZWZpbml0ZSBoZWlnaHQsIHNvCiAg
ICAgICAgICAgICAvLyB0cmFuc2xhdGUgdGhpcyB0byBhIG51bGxvcHQgaW50cmluc2ljIGhlaWdo
dCBmb3IgZnVydGhlciBsb2dpY2FsIGhlaWdodCBjb21wdXRhdGlvbnMuCiAgICAgICAgICAgICBP
cHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNIZWlnaHQ7Ci0gICAgICAgICAgICBpZiAoY29t
cHV0ZWRWYWx1ZXMubV9leHRlbnQgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCi0gICAgICAgICAgICAg
ICAgaW50cmluc2ljSGVpZ2h0ID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQ
YWRkaW5nTG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1f
ZXh0ZW50ICE9IExheW91dFVuaXQ6Om1heCgpKSB7CisgICAgICAgICAgICAgICAgaW50cmluc2lj
SGVpZ2h0ID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQ7CisgICAgICAgICAgICAgICAgaWYgKHN0
eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gp
CisgICAgICAgICAgICAgICAgICAgICppbnRyaW5zaWNIZWlnaHQgLT0gYm9yZGVyQW5kUGFkZGlu
Z0xvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChzaG91bGRD
b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICAgICAgICAgIGhl
aWdodFJlc3VsdCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5k
UGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgTGF5b3V0
VW5pdChzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpKSwgc3R5bGUoKS5ib3hTaXppbmdGb3JB
c3BlY3RSYXRpbygpLCBsb2dpY2FsV2lkdGgoKSk7CiAgICAgICAgICAgICBlbHNlCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426997</attachid>
            <date>2021-04-25 02:11:24 -0700</date>
            <delta_ts>2021-04-25 03:43:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225015-20210425111123.patch</filename>
            <type>text/plain</type>
            <size>2746</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmNDlkZGI5Yjc5ZDFj
OTA2MmEyODRjYzlhZjBhNWIxNDk3ODhiMi4uYjk0ZTMwOTRlYTlhMmE4ODY3YzdlNmE0OWE4NzBh
ZDk0ODQwZmE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQmxvY2sgc2l6aW5nIGlzIG1pc2Nh
bGN1bGF0ZWQgZm9yIGVsZW1lbnRzIHdpdGggYSBwcmVmZXJyZWQgYXNwZWN0LXJhdGlvIHdoZW4g
cGFkZGluZyBpcyBhcHBsaWVkLCBhbmQgY29udGVudCBjYW4gb3ZlcmZsb3cuCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBy
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t
cHV0ZUxvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTA0LTE4ICBXZW5zb24gSHNpZWggIDx3
ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFNlbGVjdGVkIGltYWdlIG92ZXJsYXkg
dGV4dCBzaG91bGQgbmV2ZXIgYmUgdmlzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAppbmRleCAxOTI0NDBiMzM4ODA4YTAzZWYxOGMxODk2MTZkZTlhOWJiZmViZGVkLi5l
NmRjMjBiNzM4MGM1ZTI0OTk0MjdmNTE5YjI0YjA2NGNiNmRmM2E3IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjk1NCwxMyArMjk1NCwxOSBAQCBSZW5kZXJCb3g6
OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp
Z2h0KExheW91dFVuaQogICAgICAgICBpZiAoY2hlY2tNaW5NYXhIZWlnaHQpIHsKICAgICAgICAg
ICAgIC8vIENhbGxlcnMgcGFzc2luZyBMYXlvdXRVbml0OjptYXgoKSBmb3IgbG9naWNhbEhlaWdo
dCBtZWFucyBhbiBpbmRlZmluaXRlIGhlaWdodCwgc28KICAgICAgICAgICAgIC8vIHRyYW5zbGF0
ZSB0aGlzIHRvIGEgbnVsbG9wdCBpbnRyaW5zaWMgaGVpZ2h0IGZvciBmdXJ0aGVyIGxvZ2ljYWwg
aGVpZ2h0IGNvbXB1dGF0aW9ucy4KKyAgICAgICAgICAgIGJvb2wgc3VidHJhY3RCb3JkZXJQYWRk
aW5nID0gZmFsc2U7CiAgICAgICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNI
ZWlnaHQ7Ci0gICAgICAgICAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgIT0gTGF5b3V0
VW5pdDo6bWF4KCkpCi0gICAgICAgICAgICAgICAgaW50cmluc2ljSGVpZ2h0ID0gY29tcHV0ZWRW
YWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwotICAgICAg
ICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpCisg
ICAgICAgICAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgIT0gTGF5b3V0VW5pdDo6bWF4
KCkpIHsKKyAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQgPSBjb21wdXRlZFZhbHVlcy5t
X2V4dGVudDsKKyAgICAgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSB0cnVlOwor
ICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0
RnJvbUFzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBibG9j
a1NpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwg
dmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dp
Y2FsQXNwZWN0UmF0aW8oKSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9n
aWNhbFdpZHRoKCkpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHN1YnRyYWN0
Qm9yZGVyUGFkZGluZyA9IGludHJpbnNpY0hlaWdodCAmJiBzdHlsZSgpLmJveFNpemluZ0ZvckFz
cGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICAgICAgfSBlbHNl
CiAgICAgICAgICAgICAgICAgaGVpZ2h0UmVzdWx0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2lu
ZyhNYWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKSwgaW50cmluc2lj
SGVpZ2h0KS52YWx1ZU9yKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50KTsKKyAgICAgICAgICAgIGlm
IChzdWJ0cmFjdEJvcmRlclBhZGRpbmcpCisgICAgICAgICAgICAgICAgKmludHJpbnNpY0hlaWdo
dCAtPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgaGVpZ2h0
UmVzdWx0ID0gY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KGhlaWdodFJlc3VsdCwgaW50
cmluc2ljSGVpZ2h0KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFTU0VSVChoLmlz
Rml4ZWQoKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427000</attachid>
            <date>2021-04-25 03:43:16 -0700</date>
            <delta_ts>2021-04-25 11:05:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225015-20210425124315.patch</filename>
            <type>text/plain</type>
            <size>2510</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmNDlkZGI5Yjc5ZDFj
OTA2MmEyODRjYzlhZjBhNWIxNDk3ODhiMi4uYjk0ZTMwOTRlYTlhMmE4ODY3YzdlNmE0OWE4NzBh
ZDk0ODQwZmE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQmxvY2sgc2l6aW5nIGlzIG1pc2Nh
bGN1bGF0ZWQgZm9yIGVsZW1lbnRzIHdpdGggYSBwcmVmZXJyZWQgYXNwZWN0LXJhdGlvIHdoZW4g
cGFkZGluZyBpcyBhcHBsaWVkLCBhbmQgY29udGVudCBjYW4gb3ZlcmZsb3cuCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBy
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t
cHV0ZUxvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTA0LTE4ICBXZW5zb24gSHNpZWggIDx3
ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFNlbGVjdGVkIGltYWdlIG92ZXJsYXkg
dGV4dCBzaG91bGQgbmV2ZXIgYmUgdmlzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAppbmRleCAxOTI0NDBiMzM4ODA4YTAzZWYxOGMxODk2MTZkZTlhOWJiZmViZGVkLi5m
ODgzY2EyNDU4ZTE1OGIyM2RjM2MxZDAwMWViM2YyNzJjMmQ4MzgyIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjk1NiwxMSArMjk1NiwxNiBAQCBSZW5kZXJCb3g6
OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp
Z2h0KExheW91dFVuaQogICAgICAgICAgICAgLy8gdHJhbnNsYXRlIHRoaXMgdG8gYSBudWxsb3B0
IGludHJpbnNpYyBoZWlnaHQgZm9yIGZ1cnRoZXIgbG9naWNhbCBoZWlnaHQgY29tcHV0YXRpb25z
LgogICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljSGVpZ2h0OwogICAg
ICAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ICE9IExheW91dFVuaXQ6Om1heCgp
KQotICAgICAgICAgICAgICAgIGludHJpbnNpY0hlaWdodCA9IGNvbXB1dGVkVmFsdWVzLm1fZXh0
ZW50IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgICAgIGlmIChz
aG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICAgICAg
ICAgIGludHJpbnNpY0hlaWdodCA9IGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50OworICAgICAgICAg
ICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAg
ICAgICAgICAgICAgICBpZiAoaW50cmluc2ljSGVpZ2h0ICYmIHN0eWxlKCkuYm94U2l6aW5nRm9y
QXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gpCisgICAgICAgICAgICAgICAg
ICAgICppbnRyaW5zaWNIZWlnaHQgLT0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsK
ICAgICAgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8o
aG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRk
aW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSksIHN0
eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9naWNhbFdpZHRoKCkpOwotICAgICAg
ICAgICAgZWxzZQorICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBpZiAoaW50
cmluc2ljSGVpZ2h0KQorICAgICAgICAgICAgICAgICAgICAqaW50cmluc2ljSGVpZ2h0IC09IGJv
cmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICAgICAgaGVpZ2h0UmVz
dWx0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNYWluT3JQcmVmZXJyZWRTaXplLCBzdHls
ZSgpLmxvZ2ljYWxIZWlnaHQoKSwgaW50cmluc2ljSGVpZ2h0KS52YWx1ZU9yKGNvbXB1dGVkVmFs
dWVzLm1fZXh0ZW50KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9
IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChoZWlnaHRSZXN1bHQsIGludHJpbnNpY0hl
aWdodCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBBU1NFUlQoaC5pc0ZpeGVkKCkp
Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427006</attachid>
            <date>2021-04-25 11:05:06 -0700</date>
            <delta_ts>2021-04-28 10:03:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225015-20210425200505.patch</filename>
            <type>text/plain</type>
            <size>6001</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmNDlkZGI5Yjc5ZDFj
OTA2MmEyODRjYzlhZjBhNWIxNDk3ODhiMi4uYTI4NmY2NDhjODBlZjEyOGZmMDc5ZjIyYzhlODA1
MjZmYzBiYWE5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA0LTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2FzcGVjdC1yYXRpb10gVHJlYXQg
Ym9yZGVyL3BhZGRpbmcgY29ycmVjdGx5IGZvciBib3gtc2l6aW5nOiBib3JkZXItYm94CisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGNvbXB1dGlu
ZyBsb2dpY2FsIGhlaWdodCBpbiBhc3BlY3QtcmF0aW8gY2FzZSwgdG8gY29tcHV0ZSB0aGUgYXV0
b21hdGljCisgICAgICAgIG1pbmltdW0gc2l6ZSBbMV0gZm9yIG1pbi1oZWlnaHQ6IGF1dG8sIHRo
ZSBwYWRkaW5nIHdhcyBhbHdheXMgc3VidHJhY3RlZCwKKyAgICAgICAgaG93ZXZlciBpdCBzaG91
bGQgb25seSBiZSBzdWJ0cmFjdGVkIGluIHRoZSBib3gtc2l6aW5nOiBjb250ZW50LWJveCBjYXNl
LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzIuaHRtbAorCisgICAg
ICAgIFsxXSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8t
bWluaW11bQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwogMjAyMS0w
NC0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBT
ZWxlY3RlZCBpbWFnZSBvdmVybGF5IHRleHQgc2hvdWxkIG5ldmVyIGJlIHZpc2libGUKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMTkyNDQwYjMzODgwOGEwM2VmMThj
MTg5NjE2ZGU5YTliYmZlYmRlZC4uZjg4M2NhMjQ1OGUxNThiMjNkYzNjMWQwMDFlYjNmMjcyYzJk
ODM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI5NTYsMTEg
KzI5NTYsMTYgQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgUmVuZGVy
Qm94Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKICAgICAgICAgICAgIC8vIHRyYW5z
bGF0ZSB0aGlzIHRvIGEgbnVsbG9wdCBpbnRyaW5zaWMgaGVpZ2h0IGZvciBmdXJ0aGVyIGxvZ2lj
YWwgaGVpZ2h0IGNvbXB1dGF0aW9ucy4KICAgICAgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+
IGludHJpbnNpY0hlaWdodDsKICAgICAgICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCAhPSBMYXlvdXRVbml0OjptYXgoKSkKLSAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQg
PSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0
KCk7Ci0gICAgICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0
UmF0aW8oKSkKKyAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQgPSBjb21wdXRlZFZhbHVl
cy5tX2V4dGVudDsKKyAgICAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy
b21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICAgICAgaWYgKGludHJpbnNpY0hlaWdodCAm
JiBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50
Qm94KQorICAgICAgICAgICAgICAgICAgICAqaW50cmluc2ljSGVpZ2h0IC09IGJvcmRlckFuZFBh
ZGRpbmdMb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICAgICAgaGVpZ2h0UmVzdWx0ID0gYmxv
Y2tTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCks
IHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9n
aWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxv
Z2ljYWxXaWR0aCgpKTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg
ICAgICAgICAgICAgICAgaWYgKGludHJpbnNpY0hlaWdodCkKKyAgICAgICAgICAgICAgICAgICAg
KmludHJpbnNpY0hlaWdodCAtPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAg
ICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWFp
bk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCksIGludHJpbnNpY0hlaWdo
dCkudmFsdWVPcihjb21wdXRlZFZhbHVlcy5tX2V4dGVudCk7CisgICAgICAgICAgICB9CiAgICAg
ICAgICAgICBoZWlnaHRSZXN1bHQgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoaGVp
Z2h0UmVzdWx0LCBpbnRyaW5zaWNIZWlnaHQpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAg
ICAgQVNTRVJUKGguaXNGaXhlZCgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IDcxMjYzZjY3ZTM3ZGMwYmY4OTIwM2NhMzNiMjE1NmFmNzQ5MGMxMzcuLmE4NjkyYzA2MmFjMjYy
MTUyYTc3ZjM4ZjgzYWZmYjIxOWVlNTkwZTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI1ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgW2FzcGVjdC1yYXRpb10gVHJlYXQgYm9yZGVyL3BhZGRpbmcgY29ycmVj
dGx5IGZvciBib3gtc2l6aW5nOiBib3JkZXItYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBmb3IgdGhpcy4KKworICAgICAgICAqIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0
LXJhdGlvLTAzMi1leHBlY3RlZC54aHQ6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzMi5o
dG1sOiBBZGRlZC4KKwogMjAyMS0wNC0xOCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0
Lm9yZz4KIAogICAgICAgICBGaXggaW50ZXJwb2xhdGlvbiBvZiB0aGUgcm90YXRlIENTUyBwcm9w
ZXJ0eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzMi1l
eHBlY3RlZC54aHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDMyLWV4cGVj
dGVkLnhodApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi4wNWExMzc5NDQ4MmE5NGY2YzEwYmQ5ZDRjOTg3MDRlNjNlZjYw
MzMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv
LTAzMi1leHBlY3RlZC54aHQKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0bWwgUFVCTElD
ICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RS
L3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cu
dzMub3JnLzE5OTkveGh0bWwiPgorIDxoZWFkPgorICA8dGl0bGU+Q1NTIFJlZnRlc3QgUmVmZXJl
bmNlPC90aXRsZT4KKyAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHw6lyYXJkIFRhbGJvdCIg
aHJlZj0iaHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVnc1NlY3Rpb24vY3NzMjF0ZXN0
c3VpdGUvIiAvPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWworICBkaXYKKyAg
eworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgd2lkdGg6
IDEwMHB4OworICB9CisgIF1dPjwvc3R5bGU+CisgPC9oZWFkPgorIDxib2R5PgorICA8cD5UZXN0
IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8g
cmVkPC9zdHJvbmc+LjwvcD4KKyAgPGRpdj48L2Rpdj4KKyA8L2JvZHk+Cis8L2h0bWw+CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDMyLmh0bWwgYi9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDMyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDUxZDEx
ZGU2NjgwMjlkMWFkYmY4OTk5OWQwYzZhY2EzNmZhYTlhMwotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzIuaHRtbApAQCAtMCwwICsxLDggQEAK
KzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPkNTUyBhc3BlY3QtcmF0aW86IGRpdiBibG9jayBzaXpl
ICsgbWluLWhlaWdodDogYXV0byArIGJvcmRlci9wYWRkaW5nICsgYm94LXNpemluZzogYm9yZGVy
LWJveDwvdGl0bGU+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vd3d3LnczLm9yZy9U
Ui9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1taW5pbXVtIiAvPgorPGxpbmsgcmVsPSJtYXRj
aCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMTAwcHgtc3F1YXJlLnho
dCIgLz4KKworPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJl
IGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisKKzxkaXYgc3R5bGU9ImRpc3BsYXk6
aW5saW5lLWJsb2NrOyBiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDUwcHg7IGFzcGVjdC1yYXRp
bzogMS8xO2JveC1zaXppbmc6IGJvcmRlci1ib3g7IHBhZGRpbmc6IDEwcHggMHB4Ij48ZGl2IHN0
eWxlPSJoZWlnaHQ6IDgwcHgiPjwvZGl2PjwvZGl2PjxkaXYgc3R5bGU9ImRpc3BsYXk6aW5saW5l
LWJsb2NrOyBiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDUwcHg7IGFzcGVjdC1yYXRpbzogMS8x
O2JveC1zaXppbmc6IGJvcmRlci1ib3g7IGJvcmRlci13aWR0aDogMTBweCAwcHg7IGJvcmRlci1z
dHlsZTogc29saWQ7IGJvcmRlci1jb2xvcjogZ3JlZW4iPjxkaXYgc3R5bGU9ImhlaWdodDogODBw
eCI+PC9kaXY+PC9kaXY+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427273</attachid>
            <date>2021-04-28 10:03:54 -0700</date>
            <delta_ts>2021-04-28 18:00:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225015-20210428190353.patch</filename>
            <type>text/plain</type>
            <size>5907</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmNDlkZGI5Yjc5ZDFj
OTA2MmEyODRjYzlhZjBhNWIxNDk3ODhiMi4uODAxNjg4YjJmMGQ4YzFhNzk3OGIwNDM4ZWU5Y2Fm
ZDdkMTdmZGNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA0LTI4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2FzcGVjdC1yYXRpb10gVHJlYXQg
Ym9yZGVyL3BhZGRpbmcgY29ycmVjdGx5IGZvciBib3gtc2l6aW5nOiBib3JkZXItYm94CisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGNvbXB1dGlu
ZyBsb2dpY2FsIGhlaWdodCBpbiBhc3BlY3QtcmF0aW8gY2FzZSwgdG8gY29tcHV0ZSB0aGUgYXV0
b21hdGljCisgICAgICAgIG1pbmltdW0gc2l6ZSBbMV0gZm9yIG1pbi1oZWlnaHQ6IGF1dG8sIHRo
ZSBwYWRkaW5nIHdhcyBhbHdheXMgc3VidHJhY3RlZCwKKyAgICAgICAgaG93ZXZlciBpdCBzaG91
bGQgb25seSBiZSBzdWJ0cmFjdGVkIGluIHRoZSBib3gtc2l6aW5nOiBjb250ZW50LWJveCBjYXNl
LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzUuaHRtbAorCisgICAg
ICAgIFsxXSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8t
bWluaW11bQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwogMjAyMS0w
NC0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBT
ZWxlY3RlZCBpbWFnZSBvdmVybGF5IHRleHQgc2hvdWxkIG5ldmVyIGJlIHZpc2libGUKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMTkyNDQwYjMzODgwOGEwM2VmMThj
MTg5NjE2ZGU5YTliYmZlYmRlZC4uZjg4M2NhMjQ1OGUxNThiMjNkYzNjMWQwMDFlYjNmMjcyYzJk
ODM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI5NTYsMTEg
KzI5NTYsMTYgQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgUmVuZGVy
Qm94Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKICAgICAgICAgICAgIC8vIHRyYW5z
bGF0ZSB0aGlzIHRvIGEgbnVsbG9wdCBpbnRyaW5zaWMgaGVpZ2h0IGZvciBmdXJ0aGVyIGxvZ2lj
YWwgaGVpZ2h0IGNvbXB1dGF0aW9ucy4KICAgICAgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+
IGludHJpbnNpY0hlaWdodDsKICAgICAgICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCAhPSBMYXlvdXRVbml0OjptYXgoKSkKLSAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQg
PSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0
KCk7Ci0gICAgICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0
UmF0aW8oKSkKKyAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQgPSBjb21wdXRlZFZhbHVl
cy5tX2V4dGVudDsKKyAgICAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy
b21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICAgICAgaWYgKGludHJpbnNpY0hlaWdodCAm
JiBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50
Qm94KQorICAgICAgICAgICAgICAgICAgICAqaW50cmluc2ljSGVpZ2h0IC09IGJvcmRlckFuZFBh
ZGRpbmdMb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICAgICAgaGVpZ2h0UmVzdWx0ID0gYmxv
Y2tTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCks
IHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9n
aWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxv
Z2ljYWxXaWR0aCgpKTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg
ICAgICAgICAgICAgICAgaWYgKGludHJpbnNpY0hlaWdodCkKKyAgICAgICAgICAgICAgICAgICAg
KmludHJpbnNpY0hlaWdodCAtPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAg
ICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWFp
bk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCksIGludHJpbnNpY0hlaWdo
dCkudmFsdWVPcihjb21wdXRlZFZhbHVlcy5tX2V4dGVudCk7CisgICAgICAgICAgICB9CiAgICAg
ICAgICAgICBoZWlnaHRSZXN1bHQgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoaGVp
Z2h0UmVzdWx0LCBpbnRyaW5zaWNIZWlnaHQpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAg
ICAgQVNTRVJUKGguaXNGaXhlZCgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IDcxMjYzZjY3ZTM3ZGMwYmY4OTIwM2NhMzNiMjE1NmFmNzQ5MGMxMzcuLjA5ZThlMDc4Mzg0NThk
OGJlZWZiMjBlNTFiZDY5MmFlOTU5YTAyNDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgW2FzcGVjdC1yYXRpb10gVHJlYXQgYm9yZGVyL3BhZGRpbmcgY29ycmVj
dGx5IGZvciBib3gtc2l6aW5nOiBib3JkZXItYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBJbXBvcnQgV1BUIHRlc3QgZm9yIHRoaXMuCisKKyAgICAg
ICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2Nr
LWFzcGVjdC1yYXRpby0wMzUtZXhwZWN0ZWQueGh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRp
by0wMzUuaHRtbDogQWRkZWQuCisKIDIwMjEtMDQtMTggIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz
QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IGludGVycG9sYXRpb24gb2YgdGhlIHJvdGF0ZSBD
U1MgcHJvcGVydHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRp
by0wMzUtZXhwZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAz
NS1leHBlY3RlZC54aHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDVhMTM3OTQ0ODJhOTRmNmMxMGJkOWQ0Yzk4NzA0
ZTYzZWY2MDMzMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj
dC1yYXRpby0wMzUtZXhwZWN0ZWQueGh0CkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1s
IFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmljdC8vRU4iICJodHRwOi8vd3d3Lncz
Lm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sIHhtbG5zPSJodHRw
Oi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKyA8aGVhZD4KKyAgPHRpdGxlPkNTUyBSZWZ0ZXN0
IFJlZmVyZW5jZTwvdGl0bGU+CisgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iR8OpcmFyZCBU
YWxib3QiIGhyZWY9Imh0dHA6Ly93d3cuZ3RhbGJvdC5vcmcvQnJvd3NlckJ1Z3NTZWN0aW9uL2Nz
czIxdGVzdHN1aXRlLyIgLz4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsKKyAg
ZGl2CisgIHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgIGhlaWdodDogMTAwcHg7Cisg
IHdpZHRoOiAxMDBweDsKKyAgfQorICBdXT48L3N0eWxlPgorIDwvaGVhZD4KKyA8Ym9keT4KKyAg
PHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ry
b25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisgIDxkaXY+PC9kaXY+CisgPC9ib2R5PgorPC9odG1s
PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNS5odG1s
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNS5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LmVhYTIzYTI0ZmVkM2IzNGJkOTQ1Y2ZkMGM2N2RhMWJkZWE3OTVmNTcKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDM1Lmh0bWwKQEAgLTAsMCAr
MSwxMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTIGFzcGVjdC1yYXRpbzogZGl2IGJs
b2NrIHNpemUgKyBtaW4taGVpZ2h0OiBhdXRvPC90aXRsZT4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0
aXRsZT0iVGluZy1ZdSBMaW4iIGhyZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KKzxsaW5r
IHJlbD0iYXV0aG9yIiB0aXRsZT0iTW96aWxsYSIgaHJlZj0iaHR0cHM6Ly93d3cubW96aWxsYS5v
cmcvIj4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nz
cy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKzxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uLy4u
L3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS54aHQiPgorCis8cD5UZXN0
IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8g
cmVkPC9zdHJvbmc+LjwvcD4KKzxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyBib3gtc2l6
aW5nOiBib3JkZXItYm94OyBhc3BlY3QtcmF0aW86IDIvMTsKKyAgICAgICAgICAgIHdpZHRoOiAx
MDBweDsgYm9yZGVyOiAxMHB4IHNvbGlkIGdyZWVuOyBwYWRkaW5nOiAxMHB4OyI+CisgIDxkaXYg
c3R5bGU9ImhlaWdodDogNjBweCI+PC9kaXY+Cis8L2Rpdj4K
</data>

          </attachment>
      

    </bug>

</bugzilla>