<?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>235420</bug_id>
          
          <creation_ts>2022-01-20 14:04:09 -0800</creation_ts>
          <short_desc>Position:fixed layers shouldn&apos;t allocate a backing buffer if all children are offscreen</short_desc>
          <delta_ts>2022-01-23 21:30:16 -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>Compositing</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="Matt Woodrow">mattwoodrow</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>changseok</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>glenn</cc>
    
    <cc>jean-yves.avenard</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1832569</commentid>
    <comment_count>0</comment_count>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-20 14:04:09 -0800</bug_when>
    <thetext>rdar://86612099

Layers for position:fixed content can&apos;t scroll, so any descendants that don&apos;t intersect with the compositing bounds of the layer shouldn&apos;t be included when we&apos;re determine if we need a backing store.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832581</commentid>
    <comment_count>1</comment_count>
      <attachid>449611</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-20 14:14:40 -0800</bug_when>
    <thetext>Created attachment 449611
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832624</commentid>
    <comment_count>2</comment_count>
      <attachid>449625</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-20 16:50:37 -0800</bug_when>
    <thetext>Created attachment 449625
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832631</commentid>
    <comment_count>3</comment_count>
      <attachid>449611</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-01-20 17:12:08 -0800</bug_when>
    <thetext>Comment on attachment 449611
Patch

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

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2793
&gt; +static bool intersectsWithAncestor(const RenderLayer&amp; ancestor, const LayoutRect&amp; ancestorCompositedBounds, const RenderLayer&amp; child)

I would put child as the first argument.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2798
&gt; +            return true;

It would be more truthful to have the function return std::optional&lt;bool&gt; and return nullopt here.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2802
&gt; +    LayoutPoint delta = child.convertToLayerCoords(&amp;ancestor, LayoutPoint(), RenderLayer::AdjustForColumns);

auto delta. Maybe also &quot;{ }&quot; instead of LayoutPoint().

It&apos;s unfortunate that this function is called inside a descendant layer tree walk, then your loop above, and child.convertToLayerCoords() both do ancestor tree walks, which can be a perf issue (we&apos;ve seen this in the past). Maybe traverseVisibleNonCompositedDescendantLayers() can accumulate the &quot;offset from ancestor&quot; as it&apos;s doing the descendant traversal.

Probably fine in this case (we don&apos;t expect a lot of ancestor walking) but generally to be avoided.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2803
&gt; +    LayoutRect overlap = child.overlapBounds();

auto

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2804
&gt; +    overlap.move(delta.x(), delta.y());

overlap.moveBy(delta);

&gt; LayoutTests/compositing/backing/no-backing-for-offscreen-children-of-position-fixed.html:19
&gt; +  &lt;div style=&quot;position: fixed;z-index: -1;left: 0;top: 0;right: 0;bottom: 0;opacity: 0.5;&quot;&gt;

I don&apos;t think the z-index: -1 is relevant. Also this layer doesn&apos;t need to be full height or width (and making it so makes it harder to identify in the layer output). Also the opacity is not required.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832644</commentid>
    <comment_count>4</comment_count>
      <attachid>449629</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-20 18:09:04 -0800</bug_when>
    <thetext>Created attachment 449629
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1832833</commentid>
    <comment_count>5</comment_count>
      <attachid>449679</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-21 11:58:43 -0800</bug_when>
    <thetext>Created attachment 449679
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833178</commentid>
    <comment_count>6</comment_count>
      <attachid>449774</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-23 17:41:51 -0800</bug_when>
    <thetext>Created attachment 449774
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833181</commentid>
    <comment_count>7</comment_count>
      <attachid>449774</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-01-23 17:59:45 -0800</bug_when>
    <thetext>Comment on attachment 449774
Patch

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

Says Simon already reviewed this. I do have a couple comments.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2795
&gt; +    const RenderLayer* layer = &amp;child;

This can and should be written as a for loop:

    for (auto* layer = &amp;child; layer != &amp;ancestor; layer = layer-&gt;parent()) {
        If (!layer-&gt;canUseOffsetFromAncestor())
            return std::nullopt;
    }

Writing it this way also makes it even clear erhow strong the dependency is on the fact that ancestor is actually an ancestor of child. Otherwise we’ll crash with a null pointer dereference.

It also is a little confusing. The function name is “canUseOffsetFromAncestor”, but for some reason it has to be called along the entire ancestor chain. It’s as if the function only really answers “can use offset from parent”.

Finally, I think this could use a comment explaining why this check is so important. If any ancestors use transforms, then the clipping computation below could be inaccurate, basically. That’s the kind of “why” thing that could go in a comment. The function name is good, but not enough alone to explain that.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2802
&gt; +    auto delta = child.convertToLayerCoords(&amp;ancestor, { }, RenderLayer::AdjustForColumns);

To me this seems like “offset” more than “delta”.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2805
&gt; +    return overlap.intersects(ancestorCompositedBounds);

I would have thought we could write:

    return (child.overlapBounds()+ offset).intersects(ancestorCompositedBounds);

But perhaps we don’t have that operator+ defined.

&gt; Source/WebCore/rendering/RenderLayerBacking.cpp:2815
&gt; +            std::optional&lt;bool&gt; mayIntersect = intersectsWithAncestor(layer, m_owningLayer, compositedBounds());

I would use value_or(true) here rather than having a local variable of type std::optional&lt;bool&gt;. The optional&lt;bool&gt; answers the question “does intersect”. Using value_or(true) turns into a boolean that answers the question “may intersect”. So the local variable name is better if you use value_or(true).

    // If the function returns nullopt because it can’t determine if this intersects with the ancestor, then it may intersect, which is why we do value_or(true).
    bool mayIntersect = intersectsWithAncestor(layer, m_owningLayer, compositedBounds()).value_or(true);</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833186</commentid>
    <comment_count>8</comment_count>
      <attachid>449777</attachid>
    <who name="Matt Woodrow">mattwoodrow</who>
    <bug_when>2022-01-23 19:52:29 -0800</bug_when>
    <thetext>Created attachment 449777
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833188</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-23 20:49:36 -0800</bug_when>
    <thetext>Committed r288429 (246320@main): &lt;https://commits.webkit.org/246320@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449777.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449611</attachid>
            <date>2022-01-20 14:14:40 -0800</date>
            <delta_ts>2022-01-20 18:08:54 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220121111439.patch</filename>
            <type>text/plain</type>
            <size>6541</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uYjg3ZTI2NGRhY2E3OTc1MjU1NzQ0ZGIyYmY2Y2Jl
MTkxNGMyODM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIGJvdW5kcyBpbnRl
cnNlY3Rpb24gY2hlY2sgdG8gaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycywK
KyAgICAgICAgc28gdGhhdCB3ZSBjYW4gZXhjbHVkZSBkZXNjZW5kYW50cyB0aGF0IGRlZmluaXRl
bHkgd29uJ3QgZHJhdyBhbnl0aGluZyBpbnRvCisgICAgICAgIHRoZSBjb21wb3NpdGluZyBsYXll
ci4gVXNlcyBhIGNvbnNlcnZhdGl2ZSBjaGVjaywgd2hpY2ggZ2l2ZXMgdXAgaWYgdGhlcmUgYXJl
CisgICAgICAgIGFueSB0cmFuc2Zvcm1zIGluIHRoZSBhbmNlc3RvciBjaGFpbi4KKworICAgICAg
ICBUZXN0OiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
TGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmludGVyc2VjdHNXaXRoQW5jZXN0
b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGlu
YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzIGNvbnN0KToKKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGYzZDFlODQxM2U1MDk1MzA4
YmMwYjg2ZWZkNjg2ODZmMzg5ZGRhOWIuLmY0YzBlNTRjNmQ5Yzg0NGM1OWRiZGJlMGI1N2EwN2Fl
ZTQwNjc3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll
ckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh
Y2tpbmcuY3BwCkBAIC0yNzkwLDEyICsyNzkwLDMxIEBAIHN0YXRpYyBMYXllclRyYXZlcnNhbCB0
cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhSZW5kZXJMYXllciYK
ICAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OkNvbnRpbnVlOwogfQogCitzdGF0aWMgYm9vbCBp
bnRlcnNlY3RzV2l0aEFuY2VzdG9yKGNvbnN0IFJlbmRlckxheWVyJiBhbmNlc3RvciwgY29uc3Qg
TGF5b3V0UmVjdCYgYW5jZXN0b3JDb21wb3NpdGVkQm91bmRzLCBjb25zdCBSZW5kZXJMYXllciYg
Y2hpbGQpCit7CisgICAgY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyID0gJmNoaWxkOworICAgIHdo
aWxlIChsYXllciAhPSAmYW5jZXN0b3IpIHsKKyAgICAgICAgaWYgKCFsYXllci0+Y2FuVXNlT2Zm
c2V0RnJvbUFuY2VzdG9yKCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgbGF5
ZXIgPSBsYXllci0+cGFyZW50KCk7CisgICAgfQorCisgICAgTGF5b3V0UG9pbnQgZGVsdGEgPSBj
aGlsZC5jb252ZXJ0VG9MYXllckNvb3JkcygmYW5jZXN0b3IsIExheW91dFBvaW50KCksIFJlbmRl
ckxheWVyOjpBZGp1c3RGb3JDb2x1bW5zKTsKKyAgICBMYXlvdXRSZWN0IG92ZXJsYXAgPSBjaGls
ZC5vdmVybGFwQm91bmRzKCk7CisgICAgb3ZlcmxhcC5tb3ZlKGRlbHRhLngoKSwgZGVsdGEueSgp
KTsKKyAgICByZXR1cm4gb3ZlcmxhcC5pbnRlcnNlY3RzKGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5k
cyk7Cit9CisKIC8vIENvbnNlcnZhdGl2ZSB0ZXN0IGZvciBoYXZpbmcgbm8gcmVuZGVyZWQgY2hp
bGRyZW4uCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVz
Y2VuZGFudExheWVycyhSZW5kZXJMYXllcjo6UGFpbnRlZENvbnRlbnRSZXF1ZXN0JiByZXF1ZXN0
KSBjb25zdAogewogICAgIGJvb2wgaGFzUGFpbnRpbmdEZXNjZW5kYW50ID0gZmFsc2U7Ci0gICAg
dHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXll
ciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZyZXF1ZXN0XShjb25zdCBSZW5kZXJMYXllciYg
bGF5ZXIpIHsKLSAgICAgICAgaGFzUGFpbnRpbmdEZXNjZW5kYW50IHw9IGxheWVyLmlzVmlzdWFs
bHlOb25FbXB0eSgmcmVxdWVzdCk7CisgICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERl
c2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZy
ZXF1ZXN0LCB0aGlzXShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKKyAgICAgICAgUmVuZGVy
TGF5ZXI6OlBhaW50ZWRDb250ZW50UmVxdWVzdCBsb2NhbFJlcXVlc3Q7CisgICAgICAgIGlmIChs
YXllci5pc1Zpc3VhbGx5Tm9uRW1wdHkoJmxvY2FsUmVxdWVzdCkgJiYgaW50ZXJzZWN0c1dpdGhB
bmNlc3RvcihtX293bmluZ0xheWVyLCBjb21wb3NpdGVkQm91bmRzKCksIGxheWVyKSkgeworICAg
ICAgICAgICAgaGFzUGFpbnRpbmdEZXNjZW5kYW50ID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlcXVl
c3Quc2V0SGFzUGFpbnRlZENvbnRlbnQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4gKGhh
c1BhaW50aW5nRGVzY2VuZGFudCAmJiByZXF1ZXN0LmlzU2F0aXNmaWVkKCkpID8gTGF5ZXJUcmF2
ZXJzYWw6OlN0b3AgOiBMYXllclRyYXZlcnNhbDo6Q29udGludWU7CiAgICAgfSk7CiAKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCBjNjQwNTRlOWY0MWYxZjBhYjFjYTRlNmM2ZWMyMjNkNTRlZDQ1NjEwLi40ZTY3M2Y1YjFkNDRj
ZDljMDI1NjYxMDU4ODFkN2NmMDVmM2YyNDBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjIt
MDEtMjAgIE1hdHQgV29vZHJvdyAgPG1hdHR3b29kcm93QGFwcGxlLmNvbT4KKworICAgICAgICBQ
b3NpdGlvbjpmaXhlZCBsYXllcnMgc2hvdWxkbid0IGFsbG9jYXRlIGEgYmFja2luZyBidWZmZXIg
aWYgYWxsIGNoaWxkcmVuIGFyZSBvZmZzY3JlZW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0MjAKKyAgICAgICAgPHJkYXI6Ly84NjYxMjA5OT4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEg
dGVzdCB0aGF0IGhhcyBhIHZpZXdwb3J0IHNpemVkIHBvc2l0aW9uOmZpeGVkIGVsZW1lbnQgKHdp
dGggY29tcG9zaXRpbmcKKyAgICAgICAgbGF5ZXIpLCBhbmQgYSBzaW5nbGUgY2hpbGQgd2hpY2gg
aXMgZW50aXJlbHkgb2Zmc2NyZWVuLiBUZXN0cyB0aGF0IHdlIGNvcnJlY3RseQorICAgICAgICBk
ZXRlcm1pbmUgdGhhdCB3ZSBkb24ndCBuZWVkIGEgYmFja2luZyBzdG9yZSBmb3IgdGhlIGxheWVy
LgorCisgICAgICAgICogY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3Jl
ZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJl
bi1vZi1wb3NpdGlvbi1maXhlZC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJl
bi1vZi1wb3NpdGlvbi1maXhlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGlu
Zy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1m
aXhlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDA0YjM5YmI2NThiNmM1MDllMjU1N2JhYmM4
ZWM2ZjZlZjU3NWVkYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZp
eGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI3IEBACisoR3JhcGhpY3NMYXllcgorICAoYW5j
aG9yIDAuMDAgMC4wMCkKKyAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAoY2hpbGRyZW4gMQor
ICAgIChHcmFwaGljc0xheWVyCisgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAo
Y29udGVudHNPcGFxdWUgMSkKKyAgICAgIChjaGlsZHJlbiAxCisgICAgICAgIChHcmFwaGljc0xh
eWVyCisgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgIChkcmF3c0Nv
bnRlbnQgMSkKKyAgICAgICAgICAoY2hpbGRyZW4gMgorICAgICAgICAgICAgKEdyYXBoaWNzTGF5
ZXIKKyAgICAgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgICAgICAo
b3BhY2l0eSAwLjUwKQorICAgICAgICAgICAgKQorICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIK
KyAgICAgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgICAgICAoZHJh
d3NDb250ZW50IDEpCisgICAgICAgICAgICApCisgICAgICAgICAgKQorICAgICAgICApCisgICAg
ICApCisgICAgKQorICApCispCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZp
eGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9y
LW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2
NWY5YjZmMTY4OTE4YzQxMzI2ZGU3MWE3NDE5NTZhYWI1ZTdlNDIKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVl
bi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9D
VFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0
UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgIAorICBmdW5jdGlvbiBk
dW1wTGF5ZXJzKCkKKyAgeworICAgIHZhciBsYXllcnNSZXN1bHQgPSBkb2N1bWVudC5nZXRFbGVt
ZW50QnlJZCgnbGF5ZXJzJyk7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgbGF5
ZXJzUmVzdWx0LmlubmVyVGV4dCA9IHdpbmRvdy5pbnRlcm5hbHMubGF5ZXJUcmVlQXNUZXh0KGRv
Y3VtZW50KTsKKyAgICAKKyAgfQorICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGR1
bXBMYXllcnMsIGZhbHNlKQorICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8ZGl2IHN0
eWxlPSJwb3NpdGlvbjogZml4ZWQ7ei1pbmRleDogLTE7bGVmdDogMDt0b3A6IDA7cmlnaHQ6IDA7
Ym90dG9tOiAwO29wYWNpdHk6IDAuNTsiPgorICAgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBhYnNv
bHV0ZTtsZWZ0OiAtMzAwcHg7d2lkdGg6IDMwMHB4O2hlaWdodDogMjAwcHg7YmFja2dyb3VuZC1j
b2xvcjogYmx1ZTsiPjwvZGl2PgorICA8L2Rpdj4KKzxwcmUgaWQ9ImxheWVycyI+TGF5ZXIgdHJl
ZSBnb2VzIGhlcmUgaW4gRFJUPC9wcmU+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449625</attachid>
            <date>2022-01-20 16:50:37 -0800</date>
            <delta_ts>2022-01-20 18:08:57 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220121135035.patch</filename>
            <type>text/plain</type>
            <size>7729</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uYjg3ZTI2NGRhY2E3OTc1MjU1NzQ0ZGIyYmY2Y2Jl
MTkxNGMyODM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIGJvdW5kcyBpbnRl
cnNlY3Rpb24gY2hlY2sgdG8gaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycywK
KyAgICAgICAgc28gdGhhdCB3ZSBjYW4gZXhjbHVkZSBkZXNjZW5kYW50cyB0aGF0IGRlZmluaXRl
bHkgd29uJ3QgZHJhdyBhbnl0aGluZyBpbnRvCisgICAgICAgIHRoZSBjb21wb3NpdGluZyBsYXll
ci4gVXNlcyBhIGNvbnNlcnZhdGl2ZSBjaGVjaywgd2hpY2ggZ2l2ZXMgdXAgaWYgdGhlcmUgYXJl
CisgICAgICAgIGFueSB0cmFuc2Zvcm1zIGluIHRoZSBhbmNlc3RvciBjaGFpbi4KKworICAgICAg
ICBUZXN0OiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
TGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmludGVyc2VjdHNXaXRoQW5jZXN0
b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGlu
YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzIGNvbnN0KToKKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGYzZDFlODQxM2U1MDk1MzA4
YmMwYjg2ZWZkNjg2ODZmMzg5ZGRhOWIuLmY0YzBlNTRjNmQ5Yzg0NGM1OWRiZGJlMGI1N2EwN2Fl
ZTQwNjc3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll
ckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh
Y2tpbmcuY3BwCkBAIC0yNzkwLDEyICsyNzkwLDMxIEBAIHN0YXRpYyBMYXllclRyYXZlcnNhbCB0
cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhSZW5kZXJMYXllciYK
ICAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OkNvbnRpbnVlOwogfQogCitzdGF0aWMgYm9vbCBp
bnRlcnNlY3RzV2l0aEFuY2VzdG9yKGNvbnN0IFJlbmRlckxheWVyJiBhbmNlc3RvciwgY29uc3Qg
TGF5b3V0UmVjdCYgYW5jZXN0b3JDb21wb3NpdGVkQm91bmRzLCBjb25zdCBSZW5kZXJMYXllciYg
Y2hpbGQpCit7CisgICAgY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyID0gJmNoaWxkOworICAgIHdo
aWxlIChsYXllciAhPSAmYW5jZXN0b3IpIHsKKyAgICAgICAgaWYgKCFsYXllci0+Y2FuVXNlT2Zm
c2V0RnJvbUFuY2VzdG9yKCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgbGF5
ZXIgPSBsYXllci0+cGFyZW50KCk7CisgICAgfQorCisgICAgTGF5b3V0UG9pbnQgZGVsdGEgPSBj
aGlsZC5jb252ZXJ0VG9MYXllckNvb3JkcygmYW5jZXN0b3IsIExheW91dFBvaW50KCksIFJlbmRl
ckxheWVyOjpBZGp1c3RGb3JDb2x1bW5zKTsKKyAgICBMYXlvdXRSZWN0IG92ZXJsYXAgPSBjaGls
ZC5vdmVybGFwQm91bmRzKCk7CisgICAgb3ZlcmxhcC5tb3ZlKGRlbHRhLngoKSwgZGVsdGEueSgp
KTsKKyAgICByZXR1cm4gb3ZlcmxhcC5pbnRlcnNlY3RzKGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5k
cyk7Cit9CisKIC8vIENvbnNlcnZhdGl2ZSB0ZXN0IGZvciBoYXZpbmcgbm8gcmVuZGVyZWQgY2hp
bGRyZW4uCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVz
Y2VuZGFudExheWVycyhSZW5kZXJMYXllcjo6UGFpbnRlZENvbnRlbnRSZXF1ZXN0JiByZXF1ZXN0
KSBjb25zdAogewogICAgIGJvb2wgaGFzUGFpbnRpbmdEZXNjZW5kYW50ID0gZmFsc2U7Ci0gICAg
dHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXll
ciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZyZXF1ZXN0XShjb25zdCBSZW5kZXJMYXllciYg
bGF5ZXIpIHsKLSAgICAgICAgaGFzUGFpbnRpbmdEZXNjZW5kYW50IHw9IGxheWVyLmlzVmlzdWFs
bHlOb25FbXB0eSgmcmVxdWVzdCk7CisgICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERl
c2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZy
ZXF1ZXN0LCB0aGlzXShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKKyAgICAgICAgUmVuZGVy
TGF5ZXI6OlBhaW50ZWRDb250ZW50UmVxdWVzdCBsb2NhbFJlcXVlc3Q7CisgICAgICAgIGlmIChs
YXllci5pc1Zpc3VhbGx5Tm9uRW1wdHkoJmxvY2FsUmVxdWVzdCkgJiYgaW50ZXJzZWN0c1dpdGhB
bmNlc3RvcihtX293bmluZ0xheWVyLCBjb21wb3NpdGVkQm91bmRzKCksIGxheWVyKSkgeworICAg
ICAgICAgICAgaGFzUGFpbnRpbmdEZXNjZW5kYW50ID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlcXVl
c3Quc2V0SGFzUGFpbnRlZENvbnRlbnQoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4gKGhh
c1BhaW50aW5nRGVzY2VuZGFudCAmJiByZXF1ZXN0LmlzU2F0aXNmaWVkKCkpID8gTGF5ZXJUcmF2
ZXJzYWw6OlN0b3AgOiBMYXllclRyYXZlcnNhbDo6Q29udGludWU7CiAgICAgfSk7CiAKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCBjNjQwNTRlOWY0MWYxZjBhYjFjYTRlNmM2ZWMyMjNkNTRlZDQ1NjEwLi40ZTY3M2Y1YjFkNDRj
ZDljMDI1NjYxMDU4ODFkN2NmMDVmM2YyNDBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjIt
MDEtMjAgIE1hdHQgV29vZHJvdyAgPG1hdHR3b29kcm93QGFwcGxlLmNvbT4KKworICAgICAgICBQ
b3NpdGlvbjpmaXhlZCBsYXllcnMgc2hvdWxkbid0IGFsbG9jYXRlIGEgYmFja2luZyBidWZmZXIg
aWYgYWxsIGNoaWxkcmVuIGFyZSBvZmZzY3JlZW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0MjAKKyAgICAgICAgPHJkYXI6Ly84NjYxMjA5OT4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEg
dGVzdCB0aGF0IGhhcyBhIHZpZXdwb3J0IHNpemVkIHBvc2l0aW9uOmZpeGVkIGVsZW1lbnQgKHdp
dGggY29tcG9zaXRpbmcKKyAgICAgICAgbGF5ZXIpLCBhbmQgYSBzaW5nbGUgY2hpbGQgd2hpY2gg
aXMgZW50aXJlbHkgb2Zmc2NyZWVuLiBUZXN0cyB0aGF0IHdlIGNvcnJlY3RseQorICAgICAgICBk
ZXRlcm1pbmUgdGhhdCB3ZSBkb24ndCBuZWVkIGEgYmFja2luZyBzdG9yZSBmb3IgdGhlIGxheWVy
LgorCisgICAgICAgICogY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3Jl
ZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJl
bi1vZi1wb3NpdGlvbi1maXhlZC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJl
bi1vZi1wb3NpdGlvbi1maXhlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGlu
Zy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1m
aXhlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDA0YjM5YmI2NThiNmM1MDllMjU1N2JhYmM4
ZWM2ZjZlZjU3NWVkYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZp
eGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI3IEBACisoR3JhcGhpY3NMYXllcgorICAoYW5j
aG9yIDAuMDAgMC4wMCkKKyAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAoY2hpbGRyZW4gMQor
ICAgIChHcmFwaGljc0xheWVyCisgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAo
Y29udGVudHNPcGFxdWUgMSkKKyAgICAgIChjaGlsZHJlbiAxCisgICAgICAgIChHcmFwaGljc0xh
eWVyCisgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgIChkcmF3c0Nv
bnRlbnQgMSkKKyAgICAgICAgICAoY2hpbGRyZW4gMgorICAgICAgICAgICAgKEdyYXBoaWNzTGF5
ZXIKKyAgICAgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgICAgICAo
b3BhY2l0eSAwLjUwKQorICAgICAgICAgICAgKQorICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIK
KyAgICAgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgICAgICAgICAoZHJh
d3NDb250ZW50IDEpCisgICAgICAgICAgICApCisgICAgICAgICAgKQorICAgICAgICApCisgICAg
ICApCisgICAgKQorICApCispCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZp
eGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9y
LW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2
NWY5YjZmMTY4OTE4YzQxMzI2ZGU3MWE3NDE5NTZhYWI1ZTdlNDIKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVl
bi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9D
VFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0
UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgIAorICBmdW5jdGlvbiBk
dW1wTGF5ZXJzKCkKKyAgeworICAgIHZhciBsYXllcnNSZXN1bHQgPSBkb2N1bWVudC5nZXRFbGVt
ZW50QnlJZCgnbGF5ZXJzJyk7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgbGF5
ZXJzUmVzdWx0LmlubmVyVGV4dCA9IHdpbmRvdy5pbnRlcm5hbHMubGF5ZXJUcmVlQXNUZXh0KGRv
Y3VtZW50KTsKKyAgICAKKyAgfQorICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGR1
bXBMYXllcnMsIGZhbHNlKQorICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8ZGl2IHN0
eWxlPSJwb3NpdGlvbjogZml4ZWQ7ei1pbmRleDogLTE7bGVmdDogMDt0b3A6IDA7cmlnaHQ6IDA7
Ym90dG9tOiAwO29wYWNpdHk6IDAuNTsiPgorICAgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBhYnNv
bHV0ZTtsZWZ0OiAtMzAwcHg7d2lkdGg6IDMwMHB4O2hlaWdodDogMjAwcHg7YmFja2dyb3VuZC1j
b2xvcjogYmx1ZTsiPjwvZGl2PgorICA8L2Rpdj4KKzxwcmUgaWQ9ImxheWVycyI+TGF5ZXIgdHJl
ZSBnb2VzIGhlcmUgaW4gRFJUPC9wcmU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2luZy1hbmNlc3Rv
ci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5LW5v
bi1zdGFja2luZy1hbmNlc3Rvci1leHBlY3RlZC50eHQKaW5kZXggOGViNGFiNTcxYzFiMTIzMzE4
ZmI4NjQ5Y2YwMmM1N2RlMTc2YjIwZi4uMmZjNmQwMDQ3MjVjZTgyMDQzODZmZDkwZmI5YmVhYWRl
YjI2YjUyMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcC1jaGlsZC1i
eS1ub24tc3RhY2tpbmctYW5jZXN0b3ItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Nv
bXBvc2l0aW5nL2NsaXAtY2hpbGQtYnktbm9uLXN0YWNraW5nLWFuY2VzdG9yLWV4cGVjdGVkLnR4
dApAQCAtMTAsNyArMTAsNiBAQAogICAgICAgICAgIChwb3NpdGlvbiA4LjAwIDguMDApCiAgICAg
ICAgICAgKGJvdW5kcyAxMDAuMDAgMTAwLjAwKQogICAgICAgICAgIChjb250ZW50c09wYXF1ZSAx
KQotICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKICAgICAgICAgKQogICAgICAgKQogICAgICkK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVy
LWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9t
ZXRyeS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0CmluZGV4IGFjMGM3NTFh
NzMwYzAxN2YxMmExNWVjYzlkZmVkNTEzOTAyZDViNmIuLmExMTVmYzIxNTkyMGQ0M2E4ZjI3ZGQz
MzViODA1MDg3ZDM2MDQ2NDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dl
b21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0
VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZpeGVkLWV4cGVj
dGVkLnR4dApAQCAtMTUsNyArMTUsNiBAQAogICAgICAgICAgIChvZmZzZXRGcm9tUmVuZGVyZXIg
d2lkdGg9LTEwMCBoZWlnaHQ9LTEwMCkKICAgICAgICAgICAocG9zaXRpb24gMC4wMCAzMDAwLjAw
KQogICAgICAgICAgIChib3VuZHMgMzAwLjAwIDIwMC4wMCkKLSAgICAgICAgICAoZHJhd3NDb250
ZW50IDEpCiAgICAgICAgICkKICAgICAgICkKICAgICApCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449629</attachid>
            <date>2022-01-20 18:09:04 -0800</date>
            <delta_ts>2022-01-21 11:58:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220121150902.patch</filename>
            <type>text/plain</type>
            <size>7808</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uYjg3ZTI2NGRhY2E3OTc1MjU1NzQ0ZGIyYmY2Y2Jl
MTkxNGMyODM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIGJvdW5kcyBpbnRl
cnNlY3Rpb24gY2hlY2sgdG8gaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycywK
KyAgICAgICAgc28gdGhhdCB3ZSBjYW4gZXhjbHVkZSBkZXNjZW5kYW50cyB0aGF0IGRlZmluaXRl
bHkgd29uJ3QgZHJhdyBhbnl0aGluZyBpbnRvCisgICAgICAgIHRoZSBjb21wb3NpdGluZyBsYXll
ci4gVXNlcyBhIGNvbnNlcnZhdGl2ZSBjaGVjaywgd2hpY2ggZ2l2ZXMgdXAgaWYgdGhlcmUgYXJl
CisgICAgICAgIGFueSB0cmFuc2Zvcm1zIGluIHRoZSBhbmNlc3RvciBjaGFpbi4KKworICAgICAg
ICBUZXN0OiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
TGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmludGVyc2VjdHNXaXRoQW5jZXN0
b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGlu
YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzIGNvbnN0KToKKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGYzZDFlODQxM2U1MDk1MzA4
YmMwYjg2ZWZkNjg2ODZmMzg5ZGRhOWIuLmJkY2Q5Mzg5N2U3NzUyZjAyMzA5YmI4MjhjOGU2OGZl
MDVlMGEwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll
ckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh
Y2tpbmcuY3BwCkBAIC0yNzkwLDEyICsyNzkwLDM0IEBAIHN0YXRpYyBMYXllclRyYXZlcnNhbCB0
cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhSZW5kZXJMYXllciYK
ICAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OkNvbnRpbnVlOwogfQogCitzdGF0aWMgc3RkOjpv
cHRpb25hbDxib29sPiBpbnRlcnNlY3RzV2l0aEFuY2VzdG9yKGNvbnN0IFJlbmRlckxheWVyJiBj
aGlsZCwgY29uc3QgUmVuZGVyTGF5ZXImIGFuY2VzdG9yLCBjb25zdCBMYXlvdXRSZWN0JiBhbmNl
c3RvckNvbXBvc2l0ZWRCb3VuZHMpCit7CisgICAgY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyID0g
JmNoaWxkOworICAgIHdoaWxlIChsYXllciAhPSAmYW5jZXN0b3IpIHsKKyAgICAgICAgaWYgKCFs
YXllci0+Y2FuVXNlT2Zmc2V0RnJvbUFuY2VzdG9yKCkpCisgICAgICAgICAgICByZXR1cm4gc3Rk
OjpudWxsb3B0OworICAgICAgICBsYXllciA9IGxheWVyLT5wYXJlbnQoKTsKKyAgICB9CisKKyAg
ICBhdXRvIGRlbHRhID0gY2hpbGQuY29udmVydFRvTGF5ZXJDb29yZHMoJmFuY2VzdG9yLCB7IH0s
IFJlbmRlckxheWVyOjpBZGp1c3RGb3JDb2x1bW5zKTsKKyAgICBhdXRvIG92ZXJsYXAgPSBjaGls
ZC5vdmVybGFwQm91bmRzKCk7CisgICAgb3ZlcmxhcC5tb3ZlQnkoZGVsdGEpOworICAgIHJldHVy
biBvdmVybGFwLmludGVyc2VjdHMoYW5jZXN0b3JDb21wb3NpdGVkQm91bmRzKTsKK30KKwogLy8g
Q29uc2VydmF0aXZlIHRlc3QgZm9yIGhhdmluZyBubyByZW5kZXJlZCBjaGlsZHJlbi4KIGJvb2wg
UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJz
KFJlbmRlckxheWVyOjpQYWludGVkQ29udGVudFJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0CiB7CiAg
ICAgYm9vbCBoYXNQYWludGluZ0Rlc2NlbmRhbnQgPSBmYWxzZTsKLSAgICB0cmF2ZXJzZVZpc2li
bGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhtX293bmluZ0xheWVyLCBbJmhhc1BhaW50
aW5nRGVzY2VuZGFudCwgJnJlcXVlc3RdKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgewotICAg
ICAgICBoYXNQYWludGluZ0Rlc2NlbmRhbnQgfD0gbGF5ZXIuaXNWaXN1YWxseU5vbkVtcHR5KCZy
ZXF1ZXN0KTsKKyAgICB0cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVy
cyhtX293bmluZ0xheWVyLCBbJmhhc1BhaW50aW5nRGVzY2VuZGFudCwgJnJlcXVlc3QsIHRoaXNd
KGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBSZW5kZXJMYXllcjo6UGFpbnRl
ZENvbnRlbnRSZXF1ZXN0IGxvY2FsUmVxdWVzdDsKKyAgICAgICAgaWYgKGxheWVyLmlzVmlzdWFs
bHlOb25FbXB0eSgmbG9jYWxSZXF1ZXN0KSkgeworICAgICAgICAgICAgc3RkOjpvcHRpb25hbDxi
b29sPiBtYXlJbnRlcnNlY3QgPSBpbnRlcnNlY3RzV2l0aEFuY2VzdG9yKGxheWVyLCBtX293bmlu
Z0xheWVyLCBjb21wb3NpdGVkQm91bmRzKCkpOworICAgICAgICAgICAgaWYgKCFtYXlJbnRlcnNl
Y3QgfHwgKm1heUludGVyc2VjdCkgeworICAgICAgICAgICAgICAgIGhhc1BhaW50aW5nRGVzY2Vu
ZGFudCA9IHRydWU7CisgICAgICAgICAgICAgICAgcmVxdWVzdC5zZXRIYXNQYWludGVkQ29udGVu
dCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgICAgIHJldHVybiAoaGFzUGFpbnRp
bmdEZXNjZW5kYW50ICYmIHJlcXVlc3QuaXNTYXRpc2ZpZWQoKSkgPyBMYXllclRyYXZlcnNhbDo6
U3RvcCA6IExheWVyVHJhdmVyc2FsOjpDb250aW51ZTsKICAgICB9KTsKIApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM2NDA1
NGU5ZjQxZjFmMGFiMWNhNGU2YzZlYzIyM2Q1NGVkNDU2MTAuLjRlNjczZjViMWQ0NGNkOWMwMjU2
NjEwNTg4MWQ3Y2YwNWYzZjI0MGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wMS0yMCAg
TWF0dCBXb29kcm93ICA8bWF0dHdvb2Ryb3dAYXBwbGUuY29tPgorCisgICAgICAgIFBvc2l0aW9u
OmZpeGVkIGxheWVycyBzaG91bGRuJ3QgYWxsb2NhdGUgYSBiYWNraW5nIGJ1ZmZlciBpZiBhbGwg
Y2hpbGRyZW4gYXJlIG9mZnNjcmVlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIzNTQyMAorICAgICAgICA8cmRhcjovLzg2NjEyMDk5PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHMgYSB0ZXN0IHRo
YXQgaGFzIGEgdmlld3BvcnQgc2l6ZWQgcG9zaXRpb246Zml4ZWQgZWxlbWVudCAod2l0aCBjb21w
b3NpdGluZworICAgICAgICBsYXllciksIGFuZCBhIHNpbmdsZSBjaGlsZCB3aGljaCBpcyBlbnRp
cmVseSBvZmZzY3JlZW4uIFRlc3RzIHRoYXQgd2UgY29ycmVjdGx5CisgICAgICAgIGRldGVybWlu
ZSB0aGF0IHdlIGRvbid0IG5lZWQgYSBiYWNraW5nIHN0b3JlIGZvciB0aGUgbGF5ZXIuCisKKyAg
ICAgICAgKiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNv
bXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBv
c2l0aW9uLWZpeGVkLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAxLTE1ICBTYW0gV2VpbmlnICA8d2Vp
bmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBDU1MgR3JhZGllbnRzOiBpbnRlcnBvbGF0aW9uIG1v
ZGUgc2hvdWxkIGRlZmF1bHQgdG8gT0tMYWIgaWYgYW55IG5vbi1sZWdhY3kgY29sb3Igc3ludGF4
IGNvbG9ycyBhcmUgdXNlZCBpbiB0aGUgc3RvcHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nv
bXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBv
c2l0aW9uLWZpeGVkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tp
bmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLWV4
cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iODRiNWRlM2Q3NmQ0NjM5YjNiN2ZmZDJhNWJhYjEyODYy
NTU4NTI5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2lu
Zy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhw
ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjYgQEAKKyhHcmFwaGljc0xheWVyCisgIChhbmNob3IgMC4w
MCAwLjAwKQorICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgIChjaGlsZHJlbiAxCisgICAgKEdy
YXBoaWNzTGF5ZXIKKyAgICAgIChib3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgICAgIChjb250ZW50
c09wYXF1ZSAxKQorICAgICAgKGNoaWxkcmVuIDEKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAg
ICAgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAgICAgKGRyYXdzQ29udGVudCAx
KQorICAgICAgICAgIChjaGlsZHJlbiAyCisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAg
ICAgICAgICAgICAoYm91bmRzIDIwMC4wMCAyMDAuMDApCisgICAgICAgICAgICApCisgICAgICAg
ICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDAp
CisgICAgICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICkKKyAgICAgICAg
ICApCisgICAgICAgICkKKyAgICAgICkKKyAgICApCisgICkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hp
bGRyZW4tb2YtcG9zaXRpb24tZml4ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2Jh
Y2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVk
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uZmQ5YTBkYTMxZWI2ZDAwOWFkYWMxOTJkMTVmMmMyNGE4ZjJlYTcx
ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvbm8t
YmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLmh0bWwKQEAg
LTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICA8c2NyaXB0
PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7
CisgICAgCisgIGZ1bmN0aW9uIGR1bXBMYXllcnMoKQorICB7CisgICAgdmFyIGxheWVyc1Jlc3Vs
dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdsYXllcnMnKTsKKyAgICBpZiAod2luZG93LnRl
c3RSdW5uZXIpCisgICAgICBsYXllcnNSZXN1bHQuaW5uZXJUZXh0ID0gd2luZG93LmludGVybmFs
cy5sYXllclRyZWVBc1RleHQoZG9jdW1lbnQpOworICAgIAorICB9CisgIHdpbmRvdy5hZGRFdmVu
dExpc3RlbmVyKCdsb2FkJywgZHVtcExheWVycywgZmFsc2UpCisgIDwvc2NyaXB0PgorPC9oZWFk
PgorPGJvZHk+CisgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBmaXhlZDsgei1pbmRleDogLTE7IGxl
ZnQ6IDA7IHRvcDogMDsgd2lkdGg6MjAwcHg7IGhlaWdodDoyMDBweDsiPgorICAgIDxkaXYgc3R5
bGU9InBvc2l0aW9uOiBhYnNvbHV0ZTsgbGVmdDogLTMwMHB4OyB3aWR0aDogMzAwcHg7IGhlaWdo
dDogMjAwcHg7IGJhY2tncm91bmQtY29sb3I6IGJsdWU7Ij48L2Rpdj4KKyAgPC9kaXY+Cis8cHJl
IGlkPSJsYXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlIGluIERSVDwvcHJlPgorPC9ib2R5Pgor
PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcC1jaGlsZC1i
eS1ub24tc3RhY2tpbmctYW5jZXN0b3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9z
aXRpbmcvY2xpcC1jaGlsZC1ieS1ub24tc3RhY2tpbmctYW5jZXN0b3ItZXhwZWN0ZWQudHh0Cmlu
ZGV4IDhlYjRhYjU3MWMxYjEyMzMxOGZiODY0OWNmMDJjNTdkZTE3NmIyMGYuLjJmYzZkMDA0NzI1
Y2U4MjA0Mzg2ZmQ5MGZiOWJlYWFkZWIyNmI1MjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Nv
bXBvc2l0aW5nL2NsaXAtY2hpbGQtYnktbm9uLXN0YWNraW5nLWFuY2VzdG9yLWV4cGVjdGVkLnR4
dAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2lu
Zy1hbmNlc3Rvci1leHBlY3RlZC50eHQKQEAgLTEwLDcgKzEwLDYgQEAKICAgICAgICAgICAocG9z
aXRpb24gOC4wMCA4LjAwKQogICAgICAgICAgIChib3VuZHMgMTAwLjAwIDEwMC4wMCkKICAgICAg
ICAgICAoY29udGVudHNPcGFxdWUgMSkKLSAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCiAgICAg
ICAgICkKICAgICAgICkKICAgICApCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu
Zy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0
VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZpeGVkLWV4cGVj
dGVkLnR4dAppbmRleCBhYzBjNzUxYTczMGMwMTdmMTJhMTVlY2M5ZGZlZDUxMzkwMmQ1YjZiLi5h
MTE1ZmMyMTU5MjBkNDNhOGYyN2RkMzM1YjgwNTA4N2QzNjA0NjQ3IDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhw
ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxh
eWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQKQEAgLTE1LDcgKzE1LDYgQEAKICAgICAgICAg
ICAob2Zmc2V0RnJvbVJlbmRlcmVyIHdpZHRoPS0xMDAgaGVpZ2h0PS0xMDApCiAgICAgICAgICAg
KHBvc2l0aW9uIDAuMDAgMzAwMC4wMCkKICAgICAgICAgICAoYm91bmRzIDMwMC4wMCAyMDAuMDAp
Ci0gICAgICAgICAgKGRyYXdzQ29udGVudCAxKQogICAgICAgICApCiAgICAgICApCiAgICAgKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449679</attachid>
            <date>2022-01-21 11:58:43 -0800</date>
            <delta_ts>2022-01-23 17:41:44 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220122085841.patch</filename>
            <type>text/plain</type>
            <size>8209</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uYjg3ZTI2NGRhY2E3OTc1MjU1NzQ0ZGIyYmY2Y2Jl
MTkxNGMyODM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIGJvdW5kcyBpbnRl
cnNlY3Rpb24gY2hlY2sgdG8gaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycywK
KyAgICAgICAgc28gdGhhdCB3ZSBjYW4gZXhjbHVkZSBkZXNjZW5kYW50cyB0aGF0IGRlZmluaXRl
bHkgd29uJ3QgZHJhdyBhbnl0aGluZyBpbnRvCisgICAgICAgIHRoZSBjb21wb3NpdGluZyBsYXll
ci4gVXNlcyBhIGNvbnNlcnZhdGl2ZSBjaGVjaywgd2hpY2ggZ2l2ZXMgdXAgaWYgdGhlcmUgYXJl
CisgICAgICAgIGFueSB0cmFuc2Zvcm1zIGluIHRoZSBhbmNlc3RvciBjaGFpbi4KKworICAgICAg
ICBUZXN0OiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
TGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmludGVyc2VjdHNXaXRoQW5jZXN0
b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGlu
YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzIGNvbnN0KToKKwogMjAyMi0wMS0xNSAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIEdyYWRpZW50czogaW50ZXJwb2xh
dGlvbiBtb2RlIHNob3VsZCBkZWZhdWx0IHRvIE9LTGFiIGlmIGFueSBub24tbGVnYWN5IGNvbG9y
IHN5bnRheCBjb2xvcnMgYXJlIHVzZWQgaW4gdGhlIHN0b3BzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGYzZDFlODQxM2U1MDk1MzA4
YmMwYjg2ZWZkNjg2ODZmMzg5ZGRhOWIuLmJkY2Q5Mzg5N2U3NzUyZjAyMzA5YmI4MjhjOGU2OGZl
MDVlMGEwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll
ckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh
Y2tpbmcuY3BwCkBAIC0yNzkwLDEyICsyNzkwLDM0IEBAIHN0YXRpYyBMYXllclRyYXZlcnNhbCB0
cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhSZW5kZXJMYXllciYK
ICAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OkNvbnRpbnVlOwogfQogCitzdGF0aWMgc3RkOjpv
cHRpb25hbDxib29sPiBpbnRlcnNlY3RzV2l0aEFuY2VzdG9yKGNvbnN0IFJlbmRlckxheWVyJiBj
aGlsZCwgY29uc3QgUmVuZGVyTGF5ZXImIGFuY2VzdG9yLCBjb25zdCBMYXlvdXRSZWN0JiBhbmNl
c3RvckNvbXBvc2l0ZWRCb3VuZHMpCit7CisgICAgY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyID0g
JmNoaWxkOworICAgIHdoaWxlIChsYXllciAhPSAmYW5jZXN0b3IpIHsKKyAgICAgICAgaWYgKCFs
YXllci0+Y2FuVXNlT2Zmc2V0RnJvbUFuY2VzdG9yKCkpCisgICAgICAgICAgICByZXR1cm4gc3Rk
OjpudWxsb3B0OworICAgICAgICBsYXllciA9IGxheWVyLT5wYXJlbnQoKTsKKyAgICB9CisKKyAg
ICBhdXRvIGRlbHRhID0gY2hpbGQuY29udmVydFRvTGF5ZXJDb29yZHMoJmFuY2VzdG9yLCB7IH0s
IFJlbmRlckxheWVyOjpBZGp1c3RGb3JDb2x1bW5zKTsKKyAgICBhdXRvIG92ZXJsYXAgPSBjaGls
ZC5vdmVybGFwQm91bmRzKCk7CisgICAgb3ZlcmxhcC5tb3ZlQnkoZGVsdGEpOworICAgIHJldHVy
biBvdmVybGFwLmludGVyc2VjdHMoYW5jZXN0b3JDb21wb3NpdGVkQm91bmRzKTsKK30KKwogLy8g
Q29uc2VydmF0aXZlIHRlc3QgZm9yIGhhdmluZyBubyByZW5kZXJlZCBjaGlsZHJlbi4KIGJvb2wg
UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJz
KFJlbmRlckxheWVyOjpQYWludGVkQ29udGVudFJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0CiB7CiAg
ICAgYm9vbCBoYXNQYWludGluZ0Rlc2NlbmRhbnQgPSBmYWxzZTsKLSAgICB0cmF2ZXJzZVZpc2li
bGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhtX293bmluZ0xheWVyLCBbJmhhc1BhaW50
aW5nRGVzY2VuZGFudCwgJnJlcXVlc3RdKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgewotICAg
ICAgICBoYXNQYWludGluZ0Rlc2NlbmRhbnQgfD0gbGF5ZXIuaXNWaXN1YWxseU5vbkVtcHR5KCZy
ZXF1ZXN0KTsKKyAgICB0cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVy
cyhtX293bmluZ0xheWVyLCBbJmhhc1BhaW50aW5nRGVzY2VuZGFudCwgJnJlcXVlc3QsIHRoaXNd
KGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBSZW5kZXJMYXllcjo6UGFpbnRl
ZENvbnRlbnRSZXF1ZXN0IGxvY2FsUmVxdWVzdDsKKyAgICAgICAgaWYgKGxheWVyLmlzVmlzdWFs
bHlOb25FbXB0eSgmbG9jYWxSZXF1ZXN0KSkgeworICAgICAgICAgICAgc3RkOjpvcHRpb25hbDxi
b29sPiBtYXlJbnRlcnNlY3QgPSBpbnRlcnNlY3RzV2l0aEFuY2VzdG9yKGxheWVyLCBtX293bmlu
Z0xheWVyLCBjb21wb3NpdGVkQm91bmRzKCkpOworICAgICAgICAgICAgaWYgKCFtYXlJbnRlcnNl
Y3QgfHwgKm1heUludGVyc2VjdCkgeworICAgICAgICAgICAgICAgIGhhc1BhaW50aW5nRGVzY2Vu
ZGFudCA9IHRydWU7CisgICAgICAgICAgICAgICAgcmVxdWVzdC5zZXRIYXNQYWludGVkQ29udGVu
dCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgICAgIHJldHVybiAoaGFzUGFpbnRp
bmdEZXNjZW5kYW50ICYmIHJlcXVlc3QuaXNTYXRpc2ZpZWQoKSkgPyBMYXllclRyYXZlcnNhbDo6
U3RvcCA6IExheWVyVHJhdmVyc2FsOjpDb250aW51ZTsKICAgICB9KTsKIApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM2NDA1
NGU5ZjQxZjFmMGFiMWNhNGU2YzZlYzIyM2Q1NGVkNDU2MTAuLjRlNjczZjViMWQ0NGNkOWMwMjU2
NjEwNTg4MWQ3Y2YwNWYzZjI0MGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wMS0yMCAg
TWF0dCBXb29kcm93ICA8bWF0dHdvb2Ryb3dAYXBwbGUuY29tPgorCisgICAgICAgIFBvc2l0aW9u
OmZpeGVkIGxheWVycyBzaG91bGRuJ3QgYWxsb2NhdGUgYSBiYWNraW5nIGJ1ZmZlciBpZiBhbGwg
Y2hpbGRyZW4gYXJlIG9mZnNjcmVlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIzNTQyMAorICAgICAgICA8cmRhcjovLzg2NjEyMDk5PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHMgYSB0ZXN0IHRo
YXQgaGFzIGEgdmlld3BvcnQgc2l6ZWQgcG9zaXRpb246Zml4ZWQgZWxlbWVudCAod2l0aCBjb21w
b3NpdGluZworICAgICAgICBsYXllciksIGFuZCBhIHNpbmdsZSBjaGlsZCB3aGljaCBpcyBlbnRp
cmVseSBvZmZzY3JlZW4uIFRlc3RzIHRoYXQgd2UgY29ycmVjdGx5CisgICAgICAgIGRldGVybWlu
ZSB0aGF0IHdlIGRvbid0IG5lZWQgYSBiYWNraW5nIHN0b3JlIGZvciB0aGUgbGF5ZXIuCisKKyAg
ICAgICAgKiBjb21wb3NpdGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGls
ZHJlbi1vZi1wb3NpdGlvbi1maXhlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNv
bXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBv
c2l0aW9uLWZpeGVkLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAxLTE1ICBTYW0gV2VpbmlnICA8d2Vp
bmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBDU1MgR3JhZGllbnRzOiBpbnRlcnBvbGF0aW9uIG1v
ZGUgc2hvdWxkIGRlZmF1bHQgdG8gT0tMYWIgaWYgYW55IG5vbi1sZWdhY3kgY29sb3Igc3ludGF4
IGNvbG9ycyBhcmUgdXNlZCBpbiB0aGUgc3RvcHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nv
bXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBv
c2l0aW9uLWZpeGVkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tp
bmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLWV4
cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42NDA4NTdjMzlhZDQwODUyZWE3Y2NhNDlhMTFiYmFmMjIy
YjUwZjI4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2lu
Zy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhw
ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTYgQEAKKyhHcmFwaGljc0xheWVyCisgIChhbmNob3IgMC4w
MCAwLjAwKQorICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgIChjaGlsZHJlbiAxCisgICAgKEdy
YXBoaWNzTGF5ZXIKKyAgICAgIChib3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgICAgIChjb250ZW50
c09wYXF1ZSAxKQorICAgICAgKGNoaWxkcmVuIDEKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAg
ICAgICAgICAoYm91bmRzIDIwMC4wMCAyMDAuMDApCisgICAgICAgICkKKyAgICAgICkKKyAgICAp
CisgICkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9u
by1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQuaHRtbCBi
L0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVu
LWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGRmNjE5NDRlN2Yz
MGU1NTQ1ODQ5NzU1YWI4Y2Q1MTQ3Y2U1ZGY5ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVu
LW9mLXBvc2l0aW9uLWZpeGVkLmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+
Cis8aHRtbD4KKzxoZWFkPgorICA8c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisg
ICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgCisgIGZ1bmN0aW9uIGR1bXBMYXllcnMo
KQorICB7CisgICAgdmFyIGxheWVyc1Jlc3VsdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCds
YXllcnMnKTsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICBsYXllcnNSZXN1bHQu
aW5uZXJUZXh0ID0gd2luZG93LmludGVybmFscy5sYXllclRyZWVBc1RleHQoZG9jdW1lbnQpOwor
ICAgIAorICB9CisgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZHVtcExheWVycywg
ZmFsc2UpCisgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgIDxkaXYgc3R5bGU9InBvc2l0
aW9uOiBmaXhlZDsgbGVmdDogMDsgdG9wOiAwOyB3aWR0aDoyMDBweDsgaGVpZ2h0OjIwMHB4OyI+
CisgICAgPGRpdiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyBsZWZ0OiAtMzAwcHg7IHdpZHRo
OiAzMDBweDsgaGVpZ2h0OiAyMDBweDsgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsiPjwvZGl2Pgor
ICA8L2Rpdj4KKzxwcmUgaWQ9ImxheWVycyI+TGF5ZXIgdHJlZSBnb2VzIGhlcmUgaW4gRFJUPC9w
cmU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu
Zy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2luZy1hbmNlc3Rvci1leHBlY3RlZC50eHQgYi9MYXlv
dXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2luZy1hbmNlc3Rvci1l
eHBlY3RlZC50eHQKaW5kZXggOGViNGFiNTcxYzFiMTIzMzE4ZmI4NjQ5Y2YwMmM1N2RlMTc2YjIw
Zi4uMmZjNmQwMDQ3MjVjZTgyMDQzODZmZDkwZmI5YmVhYWRlYjI2YjUyMiAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcC1jaGlsZC1ieS1ub24tc3RhY2tpbmctYW5jZXN0
b3ItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXAtY2hpbGQt
Ynktbm9uLXN0YWNraW5nLWFuY2VzdG9yLWV4cGVjdGVkLnR4dApAQCAtMTAsNyArMTAsNiBAQAog
ICAgICAgICAgIChwb3NpdGlvbiA4LjAwIDguMDApCiAgICAgICAgICAgKGJvdW5kcyAxMDAuMDAg
MTAwLjAwKQogICAgICAgICAgIChjb250ZW50c09wYXF1ZSAxKQotICAgICAgICAgIChkcmF3c0Nv
bnRlbnQgMSkKICAgICAgICAgKQogICAgICAgKQogICAgICkKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3Rl
ZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3Vu
ZHMtZml4ZWQtZXhwZWN0ZWQudHh0CmluZGV4IGFjMGM3NTFhNzMwYzAxN2YxMmExNWVjYzlkZmVk
NTEzOTAyZDViNmIuLmExMTVmYzIxNTkyMGQ0M2E4ZjI3ZGQzMzViODA1MDg3ZDM2MDQ2NDcgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJv
dW5kcy1maXhlZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2Vv
bWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4dApAQCAtMTUsNyArMTUs
NiBAQAogICAgICAgICAgIChvZmZzZXRGcm9tUmVuZGVyZXIgd2lkdGg9LTEwMCBoZWlnaHQ9LTEw
MCkKICAgICAgICAgICAocG9zaXRpb24gMC4wMCAzMDAwLjAwKQogICAgICAgICAgIChib3VuZHMg
MzAwLjAwIDIwMC4wMCkKLSAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCiAgICAgICAgICkKICAg
ICAgICkKICAgICApCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2Nv
bXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0
LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQKaW5kZXggNTVhYzM2MzJlNDJjMGI5MmFl
OGZjNGZhYjA2YmExNDVhYWM4ZTM3Ni4uNmI5ZGI0YzYwZmM5ZDk0NDc3YzExN2IxYjgxMGZjNWM4
NGYwOTAxZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9jb21wb3Np
dGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0CisrKyBi
L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQt
bGF5ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4dApAQCAtMTUsNyArMTUsNiBAQAogICAgICAg
ICAgIChvZmZzZXRGcm9tUmVuZGVyZXIgd2lkdGg9LTEwMCBoZWlnaHQ9LTEwMCkKICAgICAgICAg
ICAocG9zaXRpb24gMC4wMCAzMDAwLjAwKQogICAgICAgICAgIChib3VuZHMgMzAwLjAwIDIwMC4w
MCkKLSAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCiAgICAgICAgICkKICAgICAgICkKICAgICAp
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449774</attachid>
            <date>2022-01-23 17:41:51 -0800</date>
            <delta_ts>2022-01-23 19:52:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220124144149.patch</filename>
            <type>text/plain</type>
            <size>8205</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uNWQ5OGE0ZjkzMWM3ZTA3ZGI5NGYxY2YzZmM3OWU1
MWQyM2RkZTI0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEFkZHMgYSBib3VuZHMgaW50ZXJz
ZWN0aW9uIGNoZWNrIHRvIGlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXllcnMsCisg
ICAgICAgIHNvIHRoYXQgd2UgY2FuIGV4Y2x1ZGUgZGVzY2VuZGFudHMgdGhhdCBkZWZpbml0ZWx5
IHdvbid0IGRyYXcgYW55dGhpbmcgaW50bworICAgICAgICB0aGUgY29tcG9zaXRpbmcgbGF5ZXIu
IFVzZXMgYSBjb25zZXJ2YXRpdmUgY2hlY2ssIHdoaWNoIGdpdmVzIHVwIGlmIHRoZXJlIGFyZQor
ICAgICAgICBhbnkgdHJhbnNmb3JtcyBpbiB0aGUgYW5jZXN0b3IgY2hhaW4uCisKKyAgICAgICAg
VGVzdDogY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRy
ZW4tb2YtcG9zaXRpb24tZml4ZWQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh
eWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbnRlcnNlY3RzV2l0aEFuY2VzdG9y
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0
aW9uRm9yRGVzY2VuZGFudExheWVycyBjb25zdCk6CisKIDIwMjItMDEtMTUgIFNhbSBXZWluaWcg
IDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIENTUyBHcmFkaWVudHM6IGludGVycG9sYXRp
b24gbW9kZSBzaG91bGQgZGVmYXVsdCB0byBPS0xhYiBpZiBhbnkgbm9uLWxlZ2FjeSBjb2xvciBz
eW50YXggY29sb3JzIGFyZSB1c2VkIGluIHRoZSBzdG9wcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCBmM2QxZTg0MTNlNTA5NTMwOGJj
MGI4NmVmZDY4Njg2ZjM4OWRkYTliLi5iZGNkOTM4OTdlNzc1MmYwMjMwOWJiODI4YzhlNjhmZTA1
ZTBhMDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC
YWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr
aW5nLmNwcApAQCAtMjc5MCwxMiArMjc5MCwzNCBAQCBzdGF0aWMgTGF5ZXJUcmF2ZXJzYWwgdHJh
dmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMoUmVuZGVyTGF5ZXImCiAg
ICAgcmV0dXJuIExheWVyVHJhdmVyc2FsOjpDb250aW51ZTsKIH0KIAorc3RhdGljIHN0ZDo6b3B0
aW9uYWw8Ym9vbD4gaW50ZXJzZWN0c1dpdGhBbmNlc3Rvcihjb25zdCBSZW5kZXJMYXllciYgY2hp
bGQsIGNvbnN0IFJlbmRlckxheWVyJiBhbmNlc3RvciwgY29uc3QgTGF5b3V0UmVjdCYgYW5jZXN0
b3JDb21wb3NpdGVkQm91bmRzKQoreworICAgIGNvbnN0IFJlbmRlckxheWVyKiBsYXllciA9ICZj
aGlsZDsKKyAgICB3aGlsZSAobGF5ZXIgIT0gJmFuY2VzdG9yKSB7CisgICAgICAgIGlmICghbGF5
ZXItPmNhblVzZU9mZnNldEZyb21BbmNlc3RvcigpKQorICAgICAgICAgICAgcmV0dXJuIHN0ZDo6
bnVsbG9wdDsKKyAgICAgICAgbGF5ZXIgPSBsYXllci0+cGFyZW50KCk7CisgICAgfQorCisgICAg
YXV0byBkZWx0YSA9IGNoaWxkLmNvbnZlcnRUb0xheWVyQ29vcmRzKCZhbmNlc3RvciwgeyB9LCBS
ZW5kZXJMYXllcjo6QWRqdXN0Rm9yQ29sdW1ucyk7CisgICAgYXV0byBvdmVybGFwID0gY2hpbGQu
b3ZlcmxhcEJvdW5kcygpOworICAgIG92ZXJsYXAubW92ZUJ5KGRlbHRhKTsKKyAgICByZXR1cm4g
b3ZlcmxhcC5pbnRlcnNlY3RzKGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5kcyk7Cit9CisKIC8vIENv
bnNlcnZhdGl2ZSB0ZXN0IGZvciBoYXZpbmcgbm8gcmVuZGVyZWQgY2hpbGRyZW4uCiBib29sIFJl
bmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycyhS
ZW5kZXJMYXllcjo6UGFpbnRlZENvbnRlbnRSZXF1ZXN0JiByZXF1ZXN0KSBjb25zdAogewogICAg
IGJvb2wgaGFzUGFpbnRpbmdEZXNjZW5kYW50ID0gZmFsc2U7Ci0gICAgdHJhdmVyc2VWaXNpYmxl
Tm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXllciwgWyZoYXNQYWludGlu
Z0Rlc2NlbmRhbnQsICZyZXF1ZXN0XShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKLSAgICAg
ICAgaGFzUGFpbnRpbmdEZXNjZW5kYW50IHw9IGxheWVyLmlzVmlzdWFsbHlOb25FbXB0eSgmcmVx
dWVzdCk7CisgICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMo
bV9vd25pbmdMYXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZyZXF1ZXN0LCB0aGlzXShj
b25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKKyAgICAgICAgUmVuZGVyTGF5ZXI6OlBhaW50ZWRD
b250ZW50UmVxdWVzdCBsb2NhbFJlcXVlc3Q7CisgICAgICAgIGlmIChsYXllci5pc1Zpc3VhbGx5
Tm9uRW1wdHkoJmxvY2FsUmVxdWVzdCkpIHsKKyAgICAgICAgICAgIHN0ZDo6b3B0aW9uYWw8Ym9v
bD4gbWF5SW50ZXJzZWN0ID0gaW50ZXJzZWN0c1dpdGhBbmNlc3RvcihsYXllciwgbV9vd25pbmdM
YXllciwgY29tcG9zaXRlZEJvdW5kcygpKTsKKyAgICAgICAgICAgIGlmICghbWF5SW50ZXJzZWN0
IHx8ICptYXlJbnRlcnNlY3QpIHsKKyAgICAgICAgICAgICAgICBoYXNQYWludGluZ0Rlc2NlbmRh
bnQgPSB0cnVlOworICAgICAgICAgICAgICAgIHJlcXVlc3Quc2V0SGFzUGFpbnRlZENvbnRlbnQo
KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgICAgICByZXR1cm4gKGhhc1BhaW50aW5n
RGVzY2VuZGFudCAmJiByZXF1ZXN0LmlzU2F0aXNmaWVkKCkpID8gTGF5ZXJUcmF2ZXJzYWw6OlN0
b3AgOiBMYXllclRyYXZlcnNhbDo6Q29udGludWU7CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNjQwNTRl
OWY0MWYxZjBhYjFjYTRlNmM2ZWMyMjNkNTRlZDQ1NjEwLi5lNmEyZjc1YjcxMGI3N2RlZWJlNmVk
YmI5ZjNlMjQ2ZWI3MTY2ZGJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDEtMjAgIE1h
dHQgV29vZHJvdyAgPG1hdHR3b29kcm93QGFwcGxlLmNvbT4KKworICAgICAgICBQb3NpdGlvbjpm
aXhlZCBsYXllcnMgc2hvdWxkbid0IGFsbG9jYXRlIGEgYmFja2luZyBidWZmZXIgaWYgYWxsIGNo
aWxkcmVuIGFyZSBvZmZzY3JlZW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMzU0MjAKKyAgICAgICAgPHJkYXI6Ly84NjYxMjA5OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgQWRkcyBhIHRlc3QgdGhhdCBo
YXMgYSB2aWV3cG9ydCBzaXplZCBwb3NpdGlvbjpmaXhlZCBlbGVtZW50ICh3aXRoIGNvbXBvc2l0
aW5nCisgICAgICAgIGxheWVyKSwgYW5kIGEgc2luZ2xlIGNoaWxkIHdoaWNoIGlzIGVudGlyZWx5
IG9mZnNjcmVlbi4gVGVzdHMgdGhhdCB3ZSBjb3JyZWN0bHkKKyAgICAgICAgZGV0ZXJtaW5lIHRo
YXQgd2UgZG9uJ3QgbmVlZCBhIGJhY2tpbmcgc3RvcmUgZm9yIHRoZSBsYXllci4KKworICAgICAg
ICAqIGNvbXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVu
LW9mLXBvc2l0aW9uLWZpeGVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY29tcG9z
aXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRp
b24tZml4ZWQuaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMTUgIFNhbSBXZWluaWcgIDx3ZWluaWdA
YXBwbGUuY29tPgogCiAgICAgICAgIENTUyBHcmFkaWVudHM6IGludGVycG9sYXRpb24gbW9kZSBz
aG91bGQgZGVmYXVsdCB0byBPS0xhYiBpZiBhbnkgbm9uLWxlZ2FjeSBjb2xvciBzeW50YXggY29s
b3JzIGFyZSB1c2VkIGluIHRoZSBzdG9wcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9z
aXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRp
b24tZml4ZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9u
by1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhwZWN0
ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLjY0MDg1N2MzOWFkNDA4NTJlYTdjY2E0OWExMWJiYWYyMjJiNTBm
MjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25v
LWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC1leHBlY3Rl
ZC50eHQKQEAgLTAsMCArMSwxNiBAQAorKEdyYXBoaWNzTGF5ZXIKKyAgKGFuY2hvciAwLjAwIDAu
MDApCisgIChib3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgKGNoaWxkcmVuIDEKKyAgICAoR3JhcGhp
Y3NMYXllcgorICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAgICAgKGNvbnRlbnRzT3Bh
cXVlIDEpCisgICAgICAoY2hpbGRyZW4gMQorICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAg
ICAgIChib3VuZHMgMjAwLjAwIDIwMC4wMCkKKyAgICAgICAgKQorICAgICAgKQorICAgICkKKyAg
KQorKQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL25vLWJh
Y2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlvbi1maXhlZC5odG1sIGIvTGF5
b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hp
bGRyZW4tb2YtcG9zaXRpb24tZml4ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wZGY2MTk0NGU3ZjMwZTU1
NDU4NDk3NTVhYjhjZDUxNDdjZTVkZjlmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv
Y29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1vZmZzY3JlZW4tY2hpbGRyZW4tb2Yt
cG9zaXRpb24tZml4ZWQuaHRtbApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxo
dG1sPgorPGhlYWQ+CisgIDxzY3JpcHQ+CisgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0
ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAKKyAgZnVuY3Rpb24gZHVtcExheWVycygpCisg
IHsKKyAgICB2YXIgbGF5ZXJzUmVzdWx0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2xheWVy
cycpOworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgIGxheWVyc1Jlc3VsdC5pbm5l
clRleHQgPSB3aW5kb3cuaW50ZXJuYWxzLmxheWVyVHJlZUFzVGV4dChkb2N1bWVudCk7CisgICAg
CisgIH0KKyAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkdW1wTGF5ZXJzLCBmYWxz
ZSkKKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPGRpdiBzdHlsZT0icG9zaXRpb246
IGZpeGVkOyBsZWZ0OiAwOyB0b3A6IDA7IHdpZHRoOjIwMHB4OyBoZWlnaHQ6MjAwcHg7Ij4KKyAg
ICA8ZGl2IHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7IGxlZnQ6IC0zMDBweDsgd2lkdGg6IDMw
MHB4OyBoZWlnaHQ6IDIwMHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOyI+PC9kaXY+CisgIDwv
ZGl2PgorPHByZSBpZD0ibGF5ZXJzIj5MYXllciB0cmVlIGdvZXMgaGVyZSBpbiBEUlQ8L3ByZT4K
KzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2Ns
aXAtY2hpbGQtYnktbm9uLXN0YWNraW5nLWFuY2VzdG9yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2NvbXBvc2l0aW5nL2NsaXAtY2hpbGQtYnktbm9uLXN0YWNraW5nLWFuY2VzdG9yLWV4cGVj
dGVkLnR4dAppbmRleCA4ZWI0YWI1NzFjMWIxMjMzMThmYjg2NDljZjAyYzU3ZGUxNzZiMjBmLi4y
ZmM2ZDAwNDcyNWNlODIwNDM4NmZkOTBmYjliZWFhZGViMjZiNTIyIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2luZy1hbmNlc3Rvci1l
eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcC1jaGlsZC1ieS1u
b24tc3RhY2tpbmctYW5jZXN0b3ItZXhwZWN0ZWQudHh0CkBAIC0xMCw3ICsxMCw2IEBACiAgICAg
ICAgICAgKHBvc2l0aW9uIDguMDAgOC4wMCkKICAgICAgICAgICAoYm91bmRzIDEwMC4wMCAxMDAu
MDApCiAgICAgICAgICAgKGNvbnRlbnRzT3BhcXVlIDEpCi0gICAgICAgICAgKGRyYXdzQ29udGVu
dCAxKQogICAgICAgICApCiAgICAgICApCiAgICAgKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
Y29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4
dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1m
aXhlZC1leHBlY3RlZC50eHQKaW5kZXggYWMwYzc1MWE3MzBjMDE3ZjEyYTE1ZWNjOWRmZWQ1MTM5
MDJkNWI2Yi4uYTExNWZjMjE1OTIwZDQzYThmMjdkZDMzNWI4MDUwODdkMzYwNDY0NyAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRz
LWZpeGVkLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9nZW9tZXRy
eS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0CkBAIC0xNSw3ICsxNSw2IEBA
CiAgICAgICAgICAgKG9mZnNldEZyb21SZW5kZXJlciB3aWR0aD0tMTAwIGhlaWdodD0tMTAwKQog
ICAgICAgICAgIChwb3NpdGlvbiAwLjAwIDMwMDAuMDApCiAgICAgICAgICAgKGJvdW5kcyAzMDAu
MDAgMjAwLjAwKQotICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKICAgICAgICAgKQogICAgICAg
KQogICAgICkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvY29tcG9z
aXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4dCBiL0xh
eW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5
ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4dAppbmRleCA1NWFjMzYzMmU0MmMwYjkyYWU4ZmM0
ZmFiMDZiYTE0NWFhYzhlMzc2Li42YjlkYjRjNjBmYzlkOTQ0NzdjMTE3YjFiODEwZmM1Yzg0ZjA5
MDFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2NvbXBvc2l0aW5n
L2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQKKysrIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXll
ci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0CkBAIC0xNSw3ICsxNSw2IEBACiAgICAgICAgICAg
KG9mZnNldEZyb21SZW5kZXJlciB3aWR0aD0tMTAwIGhlaWdodD0tMTAwKQogICAgICAgICAgIChw
b3NpdGlvbiAwLjAwIDMwMDAuMDApCiAgICAgICAgICAgKGJvdW5kcyAzMDAuMDAgMjAwLjAwKQot
ICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKICAgICAgICAgKQogICAgICAgKQogICAgICkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449777</attachid>
            <date>2022-01-23 19:52:29 -0800</date>
            <delta_ts>2022-01-23 21:30:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235420-20220124165227.patch</filename>
            <type>text/plain</type>
            <size>8365</size>
            <attacher name="Matt Woodrow">mattwoodrow</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwMzRkZDMyNzRhYjIx
MWZiYWI5NTQ2ZGI1NmQ3MDUzN2U3ZjMwZS4uN2NkYzQxNzE0NmY2OTAyM2MzMmFlMGE0YTQ1NTBi
ZDk3ZjRmMjU4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAxLTIwICBNYXR0
IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgUG9zaXRpb246Zml4
ZWQgbGF5ZXJzIHNob3VsZG4ndCBhbGxvY2F0ZSBhIGJhY2tpbmcgYnVmZmVyIGlmIGFsbCBjaGls
ZHJlbiBhcmUgb2Zmc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjM1NDIwCisgICAgICAgIDxyZGFyOi8vODY2MTIwOTk+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyIGFuZCBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGRz
IGEgYm91bmRzIGludGVyc2VjdGlvbiBjaGVjayB0byBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNj
ZW5kYW50TGF5ZXJzLAorICAgICAgICBzbyB0aGF0IHdlIGNhbiBleGNsdWRlIGRlc2NlbmRhbnRz
IHRoYXQgZGVmaW5pdGVseSB3b24ndCBkcmF3IGFueXRoaW5nIGludG8KKyAgICAgICAgdGhlIGNv
bXBvc2l0aW5nIGxheWVyLiBVc2VzIGEgY29uc2VydmF0aXZlIGNoZWNrLCB3aGljaCBnaXZlcyB1
cCBpZiB0aGVyZSBhcmUKKyAgICAgICAgYW55IHRyYW5zZm9ybXMgaW4gdGhlIGFuY2VzdG9yIGNo
YWluLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3It
b2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLmh0bWwKKworICAgICAgICAqIHJl
bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW50ZXJz
ZWN0c1dpdGhBbmNlc3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6
OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXllcnMgY29uc3QpOgorCiAyMDIyLTAx
LTE1ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBDU1MgR3JhZGll
bnRzOiBpbnRlcnBvbGF0aW9uIG1vZGUgc2hvdWxkIGRlZmF1bHQgdG8gT0tMYWIgaWYgYW55IG5v
bi1sZWdhY3kgY29sb3Igc3ludGF4IGNvbG9ycyBhcmUgdXNlZCBpbiB0aGUgc3RvcHMKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggZjNk
MWU4NDEzZTUwOTUzMDhiYzBiODZlZmQ2ODY4NmYzODlkZGE5Yi4uNjg3OWNhNWVlNzBmNTFiN2Y0
MmI0YzVmNTRjZjFiNDBjMjllMmViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTI3OTAsMTIgKzI3OTAsMzQgQEAgc3RhdGljIExh
eWVyVHJhdmVyc2FsIHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJz
KFJlbmRlckxheWVyJgogICAgIHJldHVybiBMYXllclRyYXZlcnNhbDo6Q29udGludWU7CiB9CiAK
K3N0YXRpYyBzdGQ6Om9wdGlvbmFsPGJvb2w+IGludGVyc2VjdHNXaXRoQW5jZXN0b3IoY29uc3Qg
UmVuZGVyTGF5ZXImIGNoaWxkLCBjb25zdCBSZW5kZXJMYXllciYgYW5jZXN0b3IsIGNvbnN0IExh
eW91dFJlY3QmIGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5kcykKK3sKKyAgICAvLyBJZiBhbnkgbGF5
ZXJzIGJldHdlZW4gY2hpbGQgYW5kIGFuY2VzdG9yIGFyZSB0cmFuc2Zvcm1lZCwgdGhlbiBhZGp1
c3RpbmcgdGhlIG9mZnNldCBpcworICAgIC8vIGluc3VmZmljaWVudCB0byBjb252ZXJ0IGNvb3Jk
aW5hdGVzIGludG8gYW5jZXN0b3IncyBjb29yZGluYXRlIHNwYWNlLgorICAgIGZvciAoYXV0byog
bGF5ZXIgPSAmY2hpbGQ7IGxheWVyICE9ICZhbmNlc3RvcjsgbGF5ZXIgPSBsYXllci0+cGFyZW50
KCkpIHsKKyAgICAgICAgaWYgKCFsYXllci0+Y2FuVXNlT2Zmc2V0RnJvbUFuY2VzdG9yKCkpCisg
ICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworICAgIH0KKworICAgIGF1dG8gb2Zmc2V0
ID0gY2hpbGQuY29udmVydFRvTGF5ZXJDb29yZHMoJmFuY2VzdG9yLCB7IH0sIFJlbmRlckxheWVy
OjpBZGp1c3RGb3JDb2x1bW5zKTsKKyAgICBhdXRvIG92ZXJsYXAgPSBjaGlsZC5vdmVybGFwQm91
bmRzKCk7CisgICAgb3ZlcmxhcC5tb3ZlQnkob2Zmc2V0KTsKKyAgICByZXR1cm4gb3ZlcmxhcC5p
bnRlcnNlY3RzKGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5kcyk7Cit9CisKIC8vIENvbnNlcnZhdGl2
ZSB0ZXN0IGZvciBoYXZpbmcgbm8gcmVuZGVyZWQgY2hpbGRyZW4uCiBib29sIFJlbmRlckxheWVy
QmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycyhSZW5kZXJMYXll
cjo6UGFpbnRlZENvbnRlbnRSZXF1ZXN0JiByZXF1ZXN0KSBjb25zdAogewogICAgIGJvb2wgaGFz
UGFpbnRpbmdEZXNjZW5kYW50ID0gZmFsc2U7Ci0gICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9z
aXRlZERlc2NlbmRhbnRMYXllcnMobV9vd25pbmdMYXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRh
bnQsICZyZXF1ZXN0XShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKLSAgICAgICAgaGFzUGFp
bnRpbmdEZXNjZW5kYW50IHw9IGxheWVyLmlzVmlzdWFsbHlOb25FbXB0eSgmcmVxdWVzdCk7Cisg
ICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMobV9vd25pbmdM
YXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnQsICZyZXF1ZXN0LCB0aGlzXShjb25zdCBSZW5k
ZXJMYXllciYgbGF5ZXIpIHsKKyAgICAgICAgUmVuZGVyTGF5ZXI6OlBhaW50ZWRDb250ZW50UmVx
dWVzdCBsb2NhbFJlcXVlc3Q7CisgICAgICAgIGlmIChsYXllci5pc1Zpc3VhbGx5Tm9uRW1wdHko
JmxvY2FsUmVxdWVzdCkpIHsKKyAgICAgICAgICAgIGJvb2wgbWF5SW50ZXJzZWN0ID0gaW50ZXJz
ZWN0c1dpdGhBbmNlc3RvcihsYXllciwgbV9vd25pbmdMYXllciwgY29tcG9zaXRlZEJvdW5kcygp
KS52YWx1ZV9vcih0cnVlKTsKKyAgICAgICAgICAgIGlmIChtYXlJbnRlcnNlY3QpIHsKKyAgICAg
ICAgICAgICAgICBoYXNQYWludGluZ0Rlc2NlbmRhbnQgPSB0cnVlOworICAgICAgICAgICAgICAg
IHJlcXVlc3Quc2V0SGFzUGFpbnRlZENvbnRlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg
fQogICAgICAgICByZXR1cm4gKGhhc1BhaW50aW5nRGVzY2VuZGFudCAmJiByZXF1ZXN0LmlzU2F0
aXNmaWVkKCkpID8gTGF5ZXJUcmF2ZXJzYWw6OlN0b3AgOiBMYXllclRyYXZlcnNhbDo6Q29udGlu
dWU7CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNjQwNTRlOWY0MWYxZjBhYjFjYTRlNmM2ZWMyMjNkNTRl
ZDQ1NjEwLi5lYmE0MzIzYjRlYzlkMzZjZjk1MmUxN2YxM2IxOTg0NjBjZGQ0ZmVlIDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTggQEAKKzIwMjItMDEtMjAgIE1hdHQgV29vZHJvdyAgPG1hdHR3b29kcm93QGFw
cGxlLmNvbT4KKworICAgICAgICBQb3NpdGlvbjpmaXhlZCBsYXllcnMgc2hvdWxkbid0IGFsbG9j
YXRlIGEgYmFja2luZyBidWZmZXIgaWYgYWxsIGNoaWxkcmVuIGFyZSBvZmZzY3JlZW4uCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0MjAKKyAgICAg
ICAgPHJkYXI6Ly84NjYxMjA5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIg
YW5kIERhcmluIEFkbGVyLgorCisgICAgICAgIEFkZHMgYSB0ZXN0IHRoYXQgaGFzIGEgdmlld3Bv
cnQgc2l6ZWQgcG9zaXRpb246Zml4ZWQgZWxlbWVudCAod2l0aCBjb21wb3NpdGluZworICAgICAg
ICBsYXllciksIGFuZCBhIHNpbmdsZSBjaGlsZCB3aGljaCBpcyBlbnRpcmVseSBvZmZzY3JlZW4u
IFRlc3RzIHRoYXQgd2UgY29ycmVjdGx5CisgICAgICAgIGRldGVybWluZSB0aGF0IHdlIGRvbid0
IG5lZWQgYSBiYWNraW5nIHN0b3JlIGZvciB0aGUgbGF5ZXIuCisKKyAgICAgICAgKiBjb21wb3Np
dGluZy9iYWNraW5nL25vLWJhY2tpbmctZm9yLW9mZnNjcmVlbi1jaGlsZHJlbi1vZi1wb3NpdGlv
bi1maXhlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2JhY2tp
bmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLmh0
bWw6IEFkZGVkLgorCiAyMDIyLTAxLTE1ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4K
IAogICAgICAgICBDU1MgR3JhZGllbnRzOiBpbnRlcnBvbGF0aW9uIG1vZGUgc2hvdWxkIGRlZmF1
bHQgdG8gT0tMYWIgaWYgYW55IG5vbi1sZWdhY3kgY29sb3Igc3ludGF4IGNvbG9ycyBhcmUgdXNl
ZCBpbiB0aGUgc3RvcHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tp
bmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLWV4
cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1m
b3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZpeGVkLWV4cGVjdGVkLnR4dApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi42NDA4NTdjMzlhZDQwODUyZWE3Y2NhNDlhMTFiYmFmMjIyYjUwZjI4Ci0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZv
ci1vZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQtZXhwZWN0ZWQudHh0CkBAIC0w
LDAgKzEsMTYgQEAKKyhHcmFwaGljc0xheWVyCisgIChhbmNob3IgMC4wMCAwLjAwKQorICAoYm91
bmRzIDgwMC4wMCA2MDAuMDApCisgIChjaGlsZHJlbiAxCisgICAgKEdyYXBoaWNzTGF5ZXIKKyAg
ICAgIChib3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgICAgIChjb250ZW50c09wYXF1ZSAxKQorICAg
ICAgKGNoaWxkcmVuIDEKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAoYm91bmRz
IDIwMC4wMCAyMDAuMDApCisgICAgICAgICkKKyAgICAgICkKKyAgICApCisgICkKKykKKwpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9uby1iYWNraW5nLWZvci1v
ZmZzY3JlZW4tY2hpbGRyZW4tb2YtcG9zaXRpb24tZml4ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Nv
bXBvc2l0aW5nL2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBv
c2l0aW9uLWZpeGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGRmNjE5NDRlN2YzMGU1NTQ1ODQ5NzU1YWI4
Y2Q1MTQ3Y2U1ZGY5ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2JhY2tpbmcvbm8tYmFja2luZy1mb3Itb2Zmc2NyZWVuLWNoaWxkcmVuLW9mLXBvc2l0aW9uLWZp
eGVkLmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk
PgorICA8c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5k
dW1wQXNUZXh0KCk7CisgICAgCisgIGZ1bmN0aW9uIGR1bXBMYXllcnMoKQorICB7CisgICAgdmFy
IGxheWVyc1Jlc3VsdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdsYXllcnMnKTsKKyAgICBp
ZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICBsYXllcnNSZXN1bHQuaW5uZXJUZXh0ID0gd2lu
ZG93LmludGVybmFscy5sYXllclRyZWVBc1RleHQoZG9jdW1lbnQpOworICAgIAorICB9CisgIHdp
bmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZHVtcExheWVycywgZmFsc2UpCisgIDwvc2Ny
aXB0PgorPC9oZWFkPgorPGJvZHk+CisgIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBmaXhlZDsgbGVm
dDogMDsgdG9wOiAwOyB3aWR0aDoyMDBweDsgaGVpZ2h0OjIwMHB4OyI+CisgICAgPGRpdiBzdHls
ZT0icG9zaXRpb246IGFic29sdXRlOyBsZWZ0OiAtMzAwcHg7IHdpZHRoOiAzMDBweDsgaGVpZ2h0
OiAyMDBweDsgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsiPjwvZGl2PgorICA8L2Rpdj4KKzxwcmUg
aWQ9ImxheWVycyI+TGF5ZXIgdHJlZSBnb2VzIGhlcmUgaW4gRFJUPC9wcmU+Cis8L2JvZHk+Cis8
L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwLWNoaWxkLWJ5
LW5vbi1zdGFja2luZy1hbmNlc3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3Np
dGluZy9jbGlwLWNoaWxkLWJ5LW5vbi1zdGFja2luZy1hbmNlc3Rvci1leHBlY3RlZC50eHQKaW5k
ZXggOGViNGFiNTcxYzFiMTIzMzE4ZmI4NjQ5Y2YwMmM1N2RlMTc2YjIwZi4uMmZjNmQwMDQ3MjVj
ZTgyMDQzODZmZDkwZmI5YmVhYWRlYjI2YjUyMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY29t
cG9zaXRpbmcvY2xpcC1jaGlsZC1ieS1ub24tc3RhY2tpbmctYW5jZXN0b3ItZXhwZWN0ZWQudHh0
CisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXAtY2hpbGQtYnktbm9uLXN0YWNraW5n
LWFuY2VzdG9yLWV4cGVjdGVkLnR4dApAQCAtMTAsNyArMTAsNiBAQAogICAgICAgICAgIChwb3Np
dGlvbiA4LjAwIDguMDApCiAgICAgICAgICAgKGJvdW5kcyAxMDAuMDAgMTAwLjAwKQogICAgICAg
ICAgIChjb250ZW50c09wYXF1ZSAxKQotICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKICAgICAg
ICAgKQogICAgICAgKQogICAgICkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9jb21wb3NpdGluZy9nZW9tZXRyeS9saW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0
ZWQudHh0CmluZGV4IGFjMGM3NTFhNzMwYzAxN2YxMmExNWVjYzlkZmVkNTEzOTAyZDViNmIuLmEx
MTVmYzIxNTkyMGQ0M2E4ZjI3ZGQzMzViODA1MDg3ZDM2MDQ2NDcgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBl
Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5
ZXItYm91bmRzLWZpeGVkLWV4cGVjdGVkLnR4dApAQCAtMTUsNyArMTUsNiBAQAogICAgICAgICAg
IChvZmZzZXRGcm9tUmVuZGVyZXIgd2lkdGg9LTEwMCBoZWlnaHQ9LTEwMCkKICAgICAgICAgICAo
cG9zaXRpb24gMC4wMCAzMDAwLjAwKQogICAgICAgICAgIChib3VuZHMgMzAwLjAwIDIwMC4wMCkK
LSAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCiAgICAgICAgICkKICAgICAgICkKICAgICApCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2NvbXBvc2l0aW5nL2dlb21l
dHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1maXhlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9w
bGF0Zm9ybS9pb3Mtd2syL2NvbXBvc2l0aW5nL2dlb21ldHJ5L2xpbWl0LWxheWVyLWJvdW5kcy1m
aXhlZC1leHBlY3RlZC50eHQKaW5kZXggNTVhYzM2MzJlNDJjMGI5MmFlOGZjNGZhYjA2YmExNDVh
YWM4ZTM3Ni4uNmI5ZGI0YzYwZmM5ZDk0NDc3YzExN2IxYjgxMGZjNWM4NGYwOTAxZiAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9jb21wb3NpdGluZy9nZW9tZXRyeS9s
aW1pdC1sYXllci1ib3VuZHMtZml4ZWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3Bs
YXRmb3JtL2lvcy13azIvY29tcG9zaXRpbmcvZ2VvbWV0cnkvbGltaXQtbGF5ZXItYm91bmRzLWZp
eGVkLWV4cGVjdGVkLnR4dApAQCAtMTUsNyArMTUsNiBAQAogICAgICAgICAgIChvZmZzZXRGcm9t
UmVuZGVyZXIgd2lkdGg9LTEwMCBoZWlnaHQ9LTEwMCkKICAgICAgICAgICAocG9zaXRpb24gMC4w
MCAzMDAwLjAwKQogICAgICAgICAgIChib3VuZHMgMzAwLjAwIDIwMC4wMCkKLSAgICAgICAgICAo
ZHJhd3NDb250ZW50IDEpCiAgICAgICAgICkKICAgICAgICkKICAgICApCg==
</data>
<flag name="commit-queue"
          id="475983"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>