<?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>217116</bug_id>
          
          <creation_ts>2020-09-29 18:58:36 -0700</creation_ts>
          <short_desc>Repaint as needed when adding and removing highlights</short_desc>
          <delta_ts>2020-10-26 17:36:22 -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>New Bugs</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="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>darin</cc>
    
    <cc>peng.liu6</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1693276</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-29 18:58:36 -0700</bug_when>
    <thetext>Repaint as needed when adding and removing highlights</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693279</commentid>
    <comment_count>1</comment_count>
      <attachid>410084</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-29 19:02:05 -0700</bug_when>
    <thetext>Created attachment 410084
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693281</commentid>
    <comment_count>2</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-29 19:02:59 -0700</bug_when>
    <thetext>&lt;rdar://problem/59076190&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693291</commentid>
    <comment_count>3</comment_count>
      <attachid>410084</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-09-29 20:05:10 -0700</bug_when>
    <thetext>Comment on attachment 410084
Patch

Why do we need both this repaint code, and HighlightData::repaint()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693508</commentid>
    <comment_count>4</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-30 13:42:09 -0700</bug_when>
    <thetext>Because HighlightData(s) are ephemeral and only used for/while rendering in relation to CSS Highlights. They don&apos;t exist when ranges are added or removed from HighlightRangeGroup, and there isn&apos;t a direct relationship between the objects. So when we add or remove a new range, we need to mark that node as needing a repaint. Also, HighlightData::Repaint to be used specifically when HighlightData is being used for selections, which are stored an handled very differently than CSS Highlights. HighlightData used to be called SelectionData, but when I started to overload its usage for CSS Highlights, I changed the name. There is probably still work to be done to clean up this class and have the names be more reflective of their current use.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693510</commentid>
    <comment_count>5</comment_count>
      <attachid>410151</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-30 13:43:20 -0700</bug_when>
    <thetext>Created attachment 410151
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693518</commentid>
    <comment_count>6</comment_count>
      <attachid>410151</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-09-30 13:51:36 -0700</bug_when>
    <thetext>Comment on attachment 410151
Patch

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

&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:84
&gt; +        repaintRange(range);

Can we avoid these repaints if the HighlightRangeGroup has no associated styles?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693522</commentid>
    <comment_count>7</comment_count>
      <attachid>410151</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-30 14:05:59 -0700</bug_when>
    <thetext>Comment on attachment 410151
Patch

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

&gt;&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:84
&gt;&gt; +        repaintRange(range);
&gt; 
&gt; Can we avoid these repaints if the HighlightRangeGroup has no associated styles?

Not the way the data is structured currently, but when I change to match the spec (where the name is stored along side the ranges), then it will be possible, I&apos;ll file a bug to track the work.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693586</commentid>
    <comment_count>8</comment_count>
      <attachid>410173</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-09-30 17:09:21 -0700</bug_when>
    <thetext>Created attachment 410173
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693608</commentid>
    <comment_count>9</comment_count>
      <attachid>410173</attachid>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-09-30 18:00:21 -0700</bug_when>
    <thetext>Comment on attachment 410173
Patch

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

&gt; Source/WebCore/ChangeLog:9
&gt; +        When adding and removing psudo highlights, make sure that the

A typo?
s/psudo/pseudo/

&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:91
&gt; +    for (Ref&lt;HighlightRangeData&gt;&amp; data : m_rangesData)

Can we use auto here?

&gt; LayoutTests/http/wpt/css/css-highlight-api/highlight-text-repaint.html:62
&gt; +    &lt;script&gt;

Can be removed?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693827</commentid>
    <comment_count>10</comment_count>
      <attachid>410257</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-10-01 12:15:06 -0700</bug_when>
    <thetext>Created attachment 410257
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693945</commentid>
    <comment_count>11</comment_count>
      <attachid>410290</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-10-01 17:43:07 -0700</bug_when>
    <thetext>Created attachment 410290
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693954</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-10-01 18:10:12 -0700</bug_when>
    <thetext>Committed r267863: &lt;https://trac.webkit.org/changeset/267863&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 410290.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1701701</commentid>
    <comment_count>13</comment_count>
      <attachid>410290</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-10-26 17:36:22 -0700</bug_when>
    <thetext>Comment on attachment 410290
Patch for landing

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

Some follow-up ideas.

&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:58
&gt; +static void repaintRange(const StaticRange&amp; range)

Could change this to SimpleRange.

&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:71
&gt; +    if (is_gt(ordering)) {
&gt; +        startNode = &amp;range.endContainer();
&gt; +        endNode = &amp;range.startContainer();
&gt; +    }

Could do this:

    if (is_gt(ordering))
        std::swap(startNode, endNode);

Unclear why we are handling the case where they end up out of order, but not the case where one end or the other isn’t in the document any more, which can also happen. If we can prevent that from happening by updating the ranges as the DOM is mutated, then we can also prevent this out-of-order case from happening at that time as well.

&gt; Source/WebCore/Modules/highlight/HighlightRangeGroup.cpp:74
&gt; +    auto node = startNode;
&gt; +    while (node != endNode) {

Can clean this up to use intersectingNodes. Likely would not need the is_eq check above at all if we did that, since I think it does the right thing.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410084</attachid>
            <date>2020-09-29 19:02:05 -0700</date>
            <delta_ts>2020-09-30 13:43:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217116-20200929190204.patch</filename>
            <type>text/plain</type>
            <size>7395</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh
MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uMDk0MzcwNzM3ZGNjYTQ5ZjMxYzcwN2Q3ZDdiYzQ5
YTA5NjVjYmYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI5ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBh
cyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vNTkwNzYxOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgV2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIHBzdWRvIGhpZ2hsaWdodHMs
IG1ha2Ugc3VyZSB0aGF0IHRoZQorICAgICAgICByaWdodCBhcmVhcyBhcmUgcmVwYWludGVkLgor
CisgICAgICAgIFRlc3Q6IGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQt
dGV4dC1yZXBhaW50Lmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0hpZ2hsaWdo
dFJhbmdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVwYWludFJhbmdlKToKKyAgICAg
ICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OnJlbW92ZUZyb21TZXRMaWtlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExpa2UpOgor
ICAgICAgICAoV2ViQ29yZTo6SGlnaGxpZ2h0UmFuZ2VHcm91cDo6YWRkVG9TZXRMaWtlKToKKwog
MjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAg
IFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBVViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3Ig
ZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hp
Z2hsaWdodC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv
aGlnaGxpZ2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCmluZGV4IGZjMTI5NDAwYWQ1YzZhMjBi
YWIzZTRkM2FmNWM5MjI0NWViYzNmNGUuLmM1MjIwZmQ5NjJjM2M3ODNkYWNhNGZmMmJhOWY0ODJm
YWVmYTdmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0hp
Z2hsaWdodFJhbmdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxp
Z2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCkBAIC0yOSw3ICsyOSw5IEBACiAjaW5jbHVkZSAi
SURMVHlwZXMuaCIKICNpbmNsdWRlICJKU0RPTVNldExpa2UuaCIKICNpbmNsdWRlICJKU1N0YXRp
Y1JhbmdlLmgiCisjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgogI2luY2x1ZGUgIlByb3BlcnR5
U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2lu
Y2x1ZGUgIlN0YXRpY1JhbmdlLmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5j
bHVkZSA8d3RmL1JlZi5oPgpAQCAtNTMsMTUgKzU1LDQyIEBAIHZvaWQgSGlnaGxpZ2h0UmFuZ2VH
cm91cDo6aW5pdGlhbGl6ZVNldExpa2UoRE9NU2V0QWRhcHRlciYgc2V0KQogICAgICAgICBzZXQu
YWRkPElETEludGVyZmFjZTxTdGF0aWNSYW5nZT4+KHJhbmdlRGF0YS0+cmFuZ2UpOwogfQogCitz
dGF0aWMgdm9pZCByZXBhaW50UmFuZ2UoY29uc3QgU3RhdGljUmFuZ2UmIHJhbmdlKQoreworICAg
IGF1dG8qIHN0YXJ0Tm9kZSA9ICZyYW5nZS5zdGFydENvbnRhaW5lcigpOworICAgIGF1dG8qIGVu
ZE5vZGUgPSAmcmFuZ2UuZW5kQ29udGFpbmVyKCk7CisgICAgYXV0byBvcmRlcmluZyA9IGRvY3Vt
ZW50T3JkZXIoKnN0YXJ0Tm9kZSwgKmVuZE5vZGUpOworICAgIGlmIChpc19lcShvcmRlcmluZykp
IHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCkpCisg
ICAgICAgICAgICByZW5kZXJlci0+cmVwYWludCgpOworICAgICAgICByZXR1cm47CisgICAgfQor
ICAgIGlmIChpc19ndChvcmRlcmluZykpIHsKKyAgICAgICAgc3RhcnROb2RlID0gJnJhbmdlLmVu
ZENvbnRhaW5lcigpOworICAgICAgICBlbmROb2RlID0gJnJhbmdlLnN0YXJ0Q29udGFpbmVyKCk7
CisgICAgfQorCisgICAgYXV0byBub2RlID0gc3RhcnROb2RlOworICAgIHdoaWxlIChub2RlICE9
IGVuZE5vZGUpIHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigp
KQorICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQoKTsKKyAgICAgICAgbm9kZSA9IE5vZGVU
cmF2ZXJzYWw6Om5leHQoKm5vZGUpOworICAgIH0KK30KKwogYm9vbCBIaWdobGlnaHRSYW5nZUdy
b3VwOjpyZW1vdmVGcm9tU2V0TGlrZShjb25zdCBTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAg
cmV0dXJuIG1fcmFuZ2VzRGF0YS5yZW1vdmVGaXJzdE1hdGNoaW5nKFsmcmFuZ2VdKGNvbnN0IFJl
ZjxIaWdobGlnaHRSYW5nZURhdGE+JiBjdXJyZW50KSB7CisgICAgICAgIHJlcGFpbnRSYW5nZShy
YW5nZSk7CiAgICAgICAgIHJldHVybiBjdXJyZW50LmdldCgpLnJhbmdlLmdldCgpID09IHJhbmdl
OwogICAgIH0pOwogfQogCiB2b2lkIEhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExp
a2UoKQogeworICAgIGZvciAoUmVmPEhpZ2hsaWdodFJhbmdlRGF0YT4mIGRhdGEgOiBtX3Jhbmdl
c0RhdGEpCisgICAgICAgIHJlcGFpbnRSYW5nZShkYXRhLT5yYW5nZSk7CisKICAgICBtX3Jhbmdl
c0RhdGEuY2xlYXIoKTsKIH0KIApAQCAtNjksNiArOTgsNyBAQCBib29sIEhpZ2hsaWdodFJhbmdl
R3JvdXA6OmFkZFRvU2V0TGlrZShTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAgaWYgKG5vdEZv
dW5kICE9IG1fcmFuZ2VzRGF0YS5maW5kTWF0Y2hpbmcoWyZyYW5nZV0oY29uc3QgUmVmPEhpZ2hs
aWdodFJhbmdlRGF0YT4mIGN1cnJlbnQpIHsgcmV0dXJuIGN1cnJlbnQuZ2V0KCkucmFuZ2UuZ2V0
KCkgPT0gcmFuZ2U7IH0pKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmVwYWludFJhbmdl
KHJhbmdlKTsKICAgICBtX3Jhbmdlc0RhdGEuYXBwZW5kKEhpZ2hsaWdodFJhbmdlRGF0YTo6Y3Jl
YXRlKHJhbmdlKSk7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzRlMzVjMDRhYzMx
YzBjOTY2ZDRjMGU4NDAwYjFiOTgwNTEyYzAzYi4uODEzNGM0YzMzZTkyOWFlNzVlYTllMTUwODQ0
ZWMwOTVhZDZlOWQ0YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA5LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBhcyBu
ZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC93cHQvY3NzL2Nzcy1oaWdo
bGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVw
YWludC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1h
cGkvaGlnaGxpZ2h0LXRleHQtcmVwbGFjZS1leHBlY3RlZC5odG1sOiBSZW1vdmVkLgorCiAyMDIw
LTA5LTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dl
YkF1dGhuXSBEb24ndCBzZXQgdGhlIFVWIG9wdGlvbiBpZiB0aGUgYXV0aGVudGljYXRvciBkb2Vz
bid0IHN1cHBvcnQgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3Mt
aGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBh
aW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43YTllYjNlYWU0ZTVjYTVmOTI2ZTgyYzU5Yzhh
OTI3MzkzZWUzZGQ3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0CkBA
IC0wLDAgKzEsOCBAQAorT25lIHR3byB0aHJlZQorKHJlcGFpbnQgcmVjdHMKKyAgKHJlY3QgOCA4
IDc4NCAxOCkKKyAgKHJlY3QgOCA4IDc4NCAxOCkKKyAgKHJlY3QgOCA4IDc4NCAxOCkKKyAgKHJl
Y3QgOCA4IDc4NCAxOCkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQuaHRtbCBiL0xheW91dFRl
c3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uMjlkNDdlZWM1YzY3Y2U3NjY4OGJlNDBkZTljNTdjYmExMjJiYmFj
MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxp
Z2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50Lmh0bWwKQEAgLTAsMCArMSw2MiBAQAorPCFE
T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4K
KyAgICA8dGl0bGU+TXVsdGlwbGUgY3VzdG9tIGhpZ2hsaWdodCBwc2V1ZG8gZWxlbWVudHMuPC90
aXRsZT4KKyAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtaGlnaGxpZ2h0LWFwaS0xLyNjcmVhdGluZy1oaWdobGlnaHRzIj4KKyAgICA8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSJoaWdobGlnaHQtdGV4dC1leHBlY3RlZC5odG1sIj4KKyAgICA8bWV0
YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IkhpZ2hsaWdodCBSYW5nZXMgc2hvdWxkIGJlIGFibGUg
dG8gYmUgYWRkZWQgYW5kIHJlbW92ZWQgZnJvbSB0aGUgSGlnaGxpZ2h0UmFuZ2VHcm91cC4iPgor
ICAgIDxzdHlsZT4KKyAgICAgICAgOjpoaWdobGlnaHQoZXhhbXBsZS1oaWdobGlnaHQpIHsKKyAg
ICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgICAgICAgICBjb2xvcjpyZWQ7
CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHNwYW4gaWQ9
InRleHQxIj5PbmUgdHdvIHRocmVlPC9zcGFuPgorCisgICAgPHByZSBpZD0icmVwYWludFJlY3Rz
Ij48L3ByZT4KKworICAgIDxzY3JpcHQ+CisgICAgICAgIGZ1bmN0aW9uIHJlcGFpbnRUZXN0KCkK
KyAgICAgICAgeworICAgICAgICAgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAg
ICAgICAgICAgIGFsZXJ0KCdUaGlzIHRlc3QgcmVxdWlyZXMgdGVzdFJ1bm5lciB0byBydW4hJyk7
CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBp
ZiAoIXdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICAgICAgICAgICAgICAgYWxlcnQoJ1RoaXMgdGVz
dCByZXF1aXJlcyB3aW5kb3cuaW50ZXJhbHMgdG8gcnVuIScpOworICAgICAgICAgICAgICAgICBy
ZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnN0YXJ0
VHJhY2tpbmdSZXBhaW50cygpOworICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIuZHVtcEFz
VGV4dChmYWxzZSk7CisKKyAgICAgICAgICAgIGxldCB0ZXh0RWxlbWVudCA9IGRvY3VtZW50Lmdl
dEVsZW1lbnRCeUlkKCd0ZXh0MScpOworCisgICAgICAgICAgICBsZXQgcmFuZ2UxID0gbmV3IFN0
YXRpY1JhbmdlKHtzdGFydENvbnRhaW5lcjogdGV4dEVsZW1lbnQuY2hpbGROb2Rlc1swXSwgc3Rh
cnRPZmZzZXQ6IDEsIGVuZENvbnRhaW5lcjogdGV4dEVsZW1lbnQuY2hpbGROb2Rlc1swXSwgZW5k
T2Zmc2V0OiAyfSkKKyAgICAgICAgICAgIGxldCByYW5nZTIgPSBuZXcgU3RhdGljUmFuZ2Uoe3N0
YXJ0Q29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBzdGFydE9mZnNldDogMywg
ZW5kQ29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBlbmRPZmZzZXQ6IDR9KTsK
KyAgICAgICAgICAgIGxldCByYW5nZTMgPSBuZXcgU3RhdGljUmFuZ2Uoe3N0YXJ0Q29udGFpbmVy
OiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBzdGFydE9mZnNldDogOCwgZW5kQ29udGFpbmVy
OiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBlbmRPZmZzZXQ6IDEyfSk7CisKKyAgICAgICAg
ICAgIGxldCBoaWdobGlnaHRSYW5nZUdyb3VwMSA9IG5ldyBIaWdobGlnaHRSYW5nZUdyb3VwKHJh
bmdlMSk7CisgICAgICAgICAgICBDU1MuaGlnaGxpZ2h0cy5zZXQoImV4YW1wbGUtaGlnaGxpZ2h0
IiwgaGlnaGxpZ2h0UmFuZ2VHcm91cDEpOworCisgICAgICAgICAgICBoaWdobGlnaHRSYW5nZUdy
b3VwMS5hZGQocmFuZ2UyKTsKKyAgICAgICAgICAgIGhpZ2hsaWdodFJhbmdlR3JvdXAxLmRlbGV0
ZShyYW5nZTEpOworICAgICAgICAgICAgaGlnaGxpZ2h0UmFuZ2VHcm91cDEuYWRkKHJhbmdlMyk7
CisKKyAgICAgICAgICAgIHZhciByZXBhaW50UmVjdHMgPSB3aW5kb3cuaW50ZXJuYWxzLnJlcGFp
bnRSZWN0c0FzVGV4dCgpOworICAgICAgICAgICAgd2luZG93LmludGVybmFscy5zdG9wVHJhY2tp
bmdSZXBhaW50cygpOworCisgICAgICAgICAgICB2YXIgcHJlID0gZG9jdW1lbnQuZ2V0RWxlbWVu
dEJ5SWQoJ3JlcGFpbnRSZWN0cycpOworICAgICAgICAgICAgcHJlLmlubmVySFRNTCA9IHJlcGFp
bnRSZWN0czsKKyAgICAgICAgfQorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9h
ZCcsIHJlcGFpbnRUZXN0LCBmYWxzZSk7CisgICAgPC9zY3JpcHQ+CisKKyAgICA8c2NyaXB0Pgor
ICAgICAgICAKKyAgICA8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410151</attachid>
            <date>2020-09-30 13:43:20 -0700</date>
            <delta_ts>2020-10-01 17:43:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217116-20200930134319.patch</filename>
            <type>text/plain</type>
            <size>7463</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh
MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uMDk0MzcwNzM3ZGNjYTQ5ZjMxYzcwN2Q3ZDdiYzQ5
YTA5NjVjYmYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI5ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBh
cyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vNTkwNzYxOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgV2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIHBzdWRvIGhpZ2hsaWdodHMs
IG1ha2Ugc3VyZSB0aGF0IHRoZQorICAgICAgICByaWdodCBhcmVhcyBhcmUgcmVwYWludGVkLgor
CisgICAgICAgIFRlc3Q6IGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQt
dGV4dC1yZXBhaW50Lmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0hpZ2hsaWdo
dFJhbmdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVwYWludFJhbmdlKToKKyAgICAg
ICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OnJlbW92ZUZyb21TZXRMaWtlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExpa2UpOgor
ICAgICAgICAoV2ViQ29yZTo6SGlnaGxpZ2h0UmFuZ2VHcm91cDo6YWRkVG9TZXRMaWtlKToKKwog
MjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAg
IFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBVViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3Ig
ZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hp
Z2hsaWdodC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv
aGlnaGxpZ2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCmluZGV4IGZjMTI5NDAwYWQ1YzZhMjBi
YWIzZTRkM2FmNWM5MjI0NWViYzNmNGUuLmM1MjIwZmQ5NjJjM2M3ODNkYWNhNGZmMmJhOWY0ODJm
YWVmYTdmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0hp
Z2hsaWdodFJhbmdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxp
Z2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCkBAIC0yOSw3ICsyOSw5IEBACiAjaW5jbHVkZSAi
SURMVHlwZXMuaCIKICNpbmNsdWRlICJKU0RPTVNldExpa2UuaCIKICNpbmNsdWRlICJKU1N0YXRp
Y1JhbmdlLmgiCisjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgogI2luY2x1ZGUgIlByb3BlcnR5
U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2lu
Y2x1ZGUgIlN0YXRpY1JhbmdlLmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5j
bHVkZSA8d3RmL1JlZi5oPgpAQCAtNTMsMTUgKzU1LDQyIEBAIHZvaWQgSGlnaGxpZ2h0UmFuZ2VH
cm91cDo6aW5pdGlhbGl6ZVNldExpa2UoRE9NU2V0QWRhcHRlciYgc2V0KQogICAgICAgICBzZXQu
YWRkPElETEludGVyZmFjZTxTdGF0aWNSYW5nZT4+KHJhbmdlRGF0YS0+cmFuZ2UpOwogfQogCitz
dGF0aWMgdm9pZCByZXBhaW50UmFuZ2UoY29uc3QgU3RhdGljUmFuZ2UmIHJhbmdlKQoreworICAg
IGF1dG8qIHN0YXJ0Tm9kZSA9ICZyYW5nZS5zdGFydENvbnRhaW5lcigpOworICAgIGF1dG8qIGVu
ZE5vZGUgPSAmcmFuZ2UuZW5kQ29udGFpbmVyKCk7CisgICAgYXV0byBvcmRlcmluZyA9IGRvY3Vt
ZW50T3JkZXIoKnN0YXJ0Tm9kZSwgKmVuZE5vZGUpOworICAgIGlmIChpc19lcShvcmRlcmluZykp
IHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCkpCisg
ICAgICAgICAgICByZW5kZXJlci0+cmVwYWludCgpOworICAgICAgICByZXR1cm47CisgICAgfQor
ICAgIGlmIChpc19ndChvcmRlcmluZykpIHsKKyAgICAgICAgc3RhcnROb2RlID0gJnJhbmdlLmVu
ZENvbnRhaW5lcigpOworICAgICAgICBlbmROb2RlID0gJnJhbmdlLnN0YXJ0Q29udGFpbmVyKCk7
CisgICAgfQorCisgICAgYXV0byBub2RlID0gc3RhcnROb2RlOworICAgIHdoaWxlIChub2RlICE9
IGVuZE5vZGUpIHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigp
KQorICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQoKTsKKyAgICAgICAgbm9kZSA9IE5vZGVU
cmF2ZXJzYWw6Om5leHQoKm5vZGUpOworICAgIH0KK30KKwogYm9vbCBIaWdobGlnaHRSYW5nZUdy
b3VwOjpyZW1vdmVGcm9tU2V0TGlrZShjb25zdCBTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAg
cmV0dXJuIG1fcmFuZ2VzRGF0YS5yZW1vdmVGaXJzdE1hdGNoaW5nKFsmcmFuZ2VdKGNvbnN0IFJl
ZjxIaWdobGlnaHRSYW5nZURhdGE+JiBjdXJyZW50KSB7CisgICAgICAgIHJlcGFpbnRSYW5nZShy
YW5nZSk7CiAgICAgICAgIHJldHVybiBjdXJyZW50LmdldCgpLnJhbmdlLmdldCgpID09IHJhbmdl
OwogICAgIH0pOwogfQogCiB2b2lkIEhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExp
a2UoKQogeworICAgIGZvciAoUmVmPEhpZ2hsaWdodFJhbmdlRGF0YT4mIGRhdGEgOiBtX3Jhbmdl
c0RhdGEpCisgICAgICAgIHJlcGFpbnRSYW5nZShkYXRhLT5yYW5nZSk7CisKICAgICBtX3Jhbmdl
c0RhdGEuY2xlYXIoKTsKIH0KIApAQCAtNjksNiArOTgsNyBAQCBib29sIEhpZ2hsaWdodFJhbmdl
R3JvdXA6OmFkZFRvU2V0TGlrZShTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAgaWYgKG5vdEZv
dW5kICE9IG1fcmFuZ2VzRGF0YS5maW5kTWF0Y2hpbmcoWyZyYW5nZV0oY29uc3QgUmVmPEhpZ2hs
aWdodFJhbmdlRGF0YT4mIGN1cnJlbnQpIHsgcmV0dXJuIGN1cnJlbnQuZ2V0KCkucmFuZ2UuZ2V0
KCkgPT0gcmFuZ2U7IH0pKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmVwYWludFJhbmdl
KHJhbmdlKTsKICAgICBtX3Jhbmdlc0RhdGEuYXBwZW5kKEhpZ2hsaWdodFJhbmdlRGF0YTo6Y3Jl
YXRlKHJhbmdlKSk7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzRlMzVjMDRhYzMx
YzBjOTY2ZDRjMGU4NDAwYjFiOTgwNTEyYzAzYi4uODEzNGM0YzMzZTkyOWFlNzVlYTllMTUwODQ0
ZWMwOTVhZDZlOWQ0YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA5LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBhcyBu
ZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC93cHQvY3NzL2Nzcy1oaWdo
bGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVw
YWludC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1h
cGkvaGlnaGxpZ2h0LXRleHQtcmVwbGFjZS1leHBlY3RlZC5odG1sOiBSZW1vdmVkLgorCiAyMDIw
LTA5LTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dl
YkF1dGhuXSBEb24ndCBzZXQgdGhlIFVWIG9wdGlvbiBpZiB0aGUgYXV0aGVudGljYXRvciBkb2Vz
bid0IHN1cHBvcnQgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3Mt
aGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBh
aW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YmIwNTFiNWMwYTVlNWY1NDQwNzI1NzhkYjY1
ODBmZGVhMmE5ODFjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0CkBA
IC0wLDAgKzEsOCBAQAorT25lIHR3byB0aHJlZQorKHJlcGFpbnQgcmVjdHMKKyAgKHJlY3QgOCA4
IDc4NCAyMCkKKyAgKHJlY3QgOCA4IDc4NCAyMCkKKyAgKHJlY3QgOCA4IDc4NCAyMCkKKyAgKHJl
Y3QgOCA4IDc4NCAyMCkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQuaHRtbCBiL0xheW91dFRl
c3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uY2RjMTNmY2NiMTkwYzUwYTliMDBiOGYzMzQyMzkwMDU2MGZjZGRh
MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxp
Z2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50Lmh0bWwKQEAgLTAsMCArMSw2NiBAQAorPCFE
T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4K
KyAgICA8dGl0bGU+TXVsdGlwbGUgY3VzdG9tIGhpZ2hsaWdodCBwc2V1ZG8gZWxlbWVudHMuPC90
aXRsZT4KKyAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtaGlnaGxpZ2h0LWFwaS0xLyNjcmVhdGluZy1oaWdobGlnaHRzIj4KKyAgICA8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSJoaWdobGlnaHQtdGV4dC1leHBlY3RlZC5odG1sIj4KKyAgICA8bWV0
YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IkhpZ2hsaWdodCBSYW5nZXMgc2hvdWxkIGJlIGFibGUg
dG8gYmUgYWRkZWQgYW5kIHJlbW92ZWQgZnJvbSB0aGUgSGlnaGxpZ2h0UmFuZ2VHcm91cC4iPgor
ICAgIDxzdHlsZT4KKyAgICAgICAgOjpoaWdobGlnaHQoZXhhbXBsZS1oaWdobGlnaHQpIHsKKyAg
ICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgICAgICAgICBjb2xvcjpyZWQ7
CisgICAgICAgIH0KKyAgICAgICAgI3RleHQxCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvbnQ6
IDIwcHggQWhlbTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAg
ICA8c3BhbiBpZD0idGV4dDEiPk9uZSB0d28gdGhyZWU8L3NwYW4+CisKKyAgICA8cHJlIGlkPSJy
ZXBhaW50UmVjdHMiPjwvcHJlPgorCisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gcmVw
YWludFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVy
KSB7CisgICAgICAgICAgICAgICAgYWxlcnQoJ1RoaXMgdGVzdCByZXF1aXJlcyB0ZXN0UnVubmVy
IHRvIHJ1biEnKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAg
ICAgICAgICAgIGlmICghd2luZG93LmludGVybmFscykgeworICAgICAgICAgICAgICAgICBhbGVy
dCgnVGhpcyB0ZXN0IHJlcXVpcmVzIHdpbmRvdy5pbnRlcmFscyB0byBydW4hJyk7CisgICAgICAg
ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHdpbmRvdy5pbnRl
cm5hbHMuc3RhcnRUcmFja2luZ1JlcGFpbnRzKCk7CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1
bm5lci5kdW1wQXNUZXh0KGZhbHNlKTsKKworICAgICAgICAgICAgbGV0IHRleHRFbGVtZW50ID0g
ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RleHQxJyk7CisKKyAgICAgICAgICAgIGxldCByYW5n
ZTEgPSBuZXcgU3RhdGljUmFuZ2Uoe3N0YXJ0Q29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5v
ZGVzWzBdLCBzdGFydE9mZnNldDogMSwgZW5kQ29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5v
ZGVzWzBdLCBlbmRPZmZzZXQ6IDJ9KQorICAgICAgICAgICAgbGV0IHJhbmdlMiA9IG5ldyBTdGF0
aWNSYW5nZSh7c3RhcnRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0
T2Zmc2V0OiAzLCBlbmRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9m
ZnNldDogNH0pOworICAgICAgICAgICAgbGV0IHJhbmdlMyA9IG5ldyBTdGF0aWNSYW5nZSh7c3Rh
cnRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0T2Zmc2V0OiA4LCBl
bmRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9mZnNldDogMTJ9KTsK
KworICAgICAgICAgICAgbGV0IGhpZ2hsaWdodFJhbmdlR3JvdXAxID0gbmV3IEhpZ2hsaWdodFJh
bmdlR3JvdXAocmFuZ2UxKTsKKyAgICAgICAgICAgIENTUy5oaWdobGlnaHRzLnNldCgiZXhhbXBs
ZS1oaWdobGlnaHQiLCBoaWdobGlnaHRSYW5nZUdyb3VwMSk7CisKKyAgICAgICAgICAgIGhpZ2hs
aWdodFJhbmdlR3JvdXAxLmFkZChyYW5nZTIpOworICAgICAgICAgICAgaGlnaGxpZ2h0UmFuZ2VH
cm91cDEuZGVsZXRlKHJhbmdlMSk7CisgICAgICAgICAgICBoaWdobGlnaHRSYW5nZUdyb3VwMS5h
ZGQocmFuZ2UzKTsKKworICAgICAgICAgICAgdmFyIHJlcGFpbnRSZWN0cyA9IHdpbmRvdy5pbnRl
cm5hbHMucmVwYWludFJlY3RzQXNUZXh0KCk7CisgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxz
LnN0b3BUcmFja2luZ1JlcGFpbnRzKCk7CisKKyAgICAgICAgICAgIHZhciBwcmUgPSBkb2N1bWVu
dC5nZXRFbGVtZW50QnlJZCgncmVwYWludFJlY3RzJyk7CisgICAgICAgICAgICBwcmUuaW5uZXJI
VE1MID0gcmVwYWludFJlY3RzOworICAgICAgICB9CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExp
c3RlbmVyKCdsb2FkJywgcmVwYWludFRlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKworICAg
IDxzY3JpcHQ+CisgICAgICAgIAorICAgIDwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410173</attachid>
            <date>2020-09-30 17:09:21 -0700</date>
            <delta_ts>2020-10-01 17:43:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217116-20200930170920.patch</filename>
            <type>text/plain</type>
            <size>8020</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh
MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uMDk0MzcwNzM3ZGNjYTQ5ZjMxYzcwN2Q3ZDdiYzQ5
YTA5NjVjYmYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI5ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBh
cyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vNTkwNzYxOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgV2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIHBzdWRvIGhpZ2hsaWdodHMs
IG1ha2Ugc3VyZSB0aGF0IHRoZQorICAgICAgICByaWdodCBhcmVhcyBhcmUgcmVwYWludGVkLgor
CisgICAgICAgIFRlc3Q6IGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQt
dGV4dC1yZXBhaW50Lmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0hpZ2hsaWdo
dFJhbmdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVwYWludFJhbmdlKToKKyAgICAg
ICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OnJlbW92ZUZyb21TZXRMaWtlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExpa2UpOgor
ICAgICAgICAoV2ViQ29yZTo6SGlnaGxpZ2h0UmFuZ2VHcm91cDo6YWRkVG9TZXRMaWtlKToKKwog
MjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAg
IFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBVViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3Ig
ZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hp
Z2hsaWdodC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv
aGlnaGxpZ2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCmluZGV4IGZjMTI5NDAwYWQ1YzZhMjBi
YWIzZTRkM2FmNWM5MjI0NWViYzNmNGUuLmM1MjIwZmQ5NjJjM2M3ODNkYWNhNGZmMmJhOWY0ODJm
YWVmYTdmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0hp
Z2hsaWdodFJhbmdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxp
Z2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCkBAIC0yOSw3ICsyOSw5IEBACiAjaW5jbHVkZSAi
SURMVHlwZXMuaCIKICNpbmNsdWRlICJKU0RPTVNldExpa2UuaCIKICNpbmNsdWRlICJKU1N0YXRp
Y1JhbmdlLmgiCisjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgogI2luY2x1ZGUgIlByb3BlcnR5
U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2lu
Y2x1ZGUgIlN0YXRpY1JhbmdlLmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5j
bHVkZSA8d3RmL1JlZi5oPgpAQCAtNTMsMTUgKzU1LDQyIEBAIHZvaWQgSGlnaGxpZ2h0UmFuZ2VH
cm91cDo6aW5pdGlhbGl6ZVNldExpa2UoRE9NU2V0QWRhcHRlciYgc2V0KQogICAgICAgICBzZXQu
YWRkPElETEludGVyZmFjZTxTdGF0aWNSYW5nZT4+KHJhbmdlRGF0YS0+cmFuZ2UpOwogfQogCitz
dGF0aWMgdm9pZCByZXBhaW50UmFuZ2UoY29uc3QgU3RhdGljUmFuZ2UmIHJhbmdlKQoreworICAg
IGF1dG8qIHN0YXJ0Tm9kZSA9ICZyYW5nZS5zdGFydENvbnRhaW5lcigpOworICAgIGF1dG8qIGVu
ZE5vZGUgPSAmcmFuZ2UuZW5kQ29udGFpbmVyKCk7CisgICAgYXV0byBvcmRlcmluZyA9IGRvY3Vt
ZW50T3JkZXIoKnN0YXJ0Tm9kZSwgKmVuZE5vZGUpOworICAgIGlmIChpc19lcShvcmRlcmluZykp
IHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCkpCisg
ICAgICAgICAgICByZW5kZXJlci0+cmVwYWludCgpOworICAgICAgICByZXR1cm47CisgICAgfQor
ICAgIGlmIChpc19ndChvcmRlcmluZykpIHsKKyAgICAgICAgc3RhcnROb2RlID0gJnJhbmdlLmVu
ZENvbnRhaW5lcigpOworICAgICAgICBlbmROb2RlID0gJnJhbmdlLnN0YXJ0Q29udGFpbmVyKCk7
CisgICAgfQorCisgICAgYXV0byBub2RlID0gc3RhcnROb2RlOworICAgIHdoaWxlIChub2RlICE9
IGVuZE5vZGUpIHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigp
KQorICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQoKTsKKyAgICAgICAgbm9kZSA9IE5vZGVU
cmF2ZXJzYWw6Om5leHQoKm5vZGUpOworICAgIH0KK30KKwogYm9vbCBIaWdobGlnaHRSYW5nZUdy
b3VwOjpyZW1vdmVGcm9tU2V0TGlrZShjb25zdCBTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAg
cmV0dXJuIG1fcmFuZ2VzRGF0YS5yZW1vdmVGaXJzdE1hdGNoaW5nKFsmcmFuZ2VdKGNvbnN0IFJl
ZjxIaWdobGlnaHRSYW5nZURhdGE+JiBjdXJyZW50KSB7CisgICAgICAgIHJlcGFpbnRSYW5nZShy
YW5nZSk7CiAgICAgICAgIHJldHVybiBjdXJyZW50LmdldCgpLnJhbmdlLmdldCgpID09IHJhbmdl
OwogICAgIH0pOwogfQogCiB2b2lkIEhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExp
a2UoKQogeworICAgIGZvciAoUmVmPEhpZ2hsaWdodFJhbmdlRGF0YT4mIGRhdGEgOiBtX3Jhbmdl
c0RhdGEpCisgICAgICAgIHJlcGFpbnRSYW5nZShkYXRhLT5yYW5nZSk7CisKICAgICBtX3Jhbmdl
c0RhdGEuY2xlYXIoKTsKIH0KIApAQCAtNjksNiArOTgsNyBAQCBib29sIEhpZ2hsaWdodFJhbmdl
R3JvdXA6OmFkZFRvU2V0TGlrZShTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAgaWYgKG5vdEZv
dW5kICE9IG1fcmFuZ2VzRGF0YS5maW5kTWF0Y2hpbmcoWyZyYW5nZV0oY29uc3QgUmVmPEhpZ2hs
aWdodFJhbmdlRGF0YT4mIGN1cnJlbnQpIHsgcmV0dXJuIGN1cnJlbnQuZ2V0KCkucmFuZ2UuZ2V0
KCkgPT0gcmFuZ2U7IH0pKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmVwYWludFJhbmdl
KHJhbmdlKTsKICAgICBtX3Jhbmdlc0RhdGEuYXBwZW5kKEhpZ2hsaWdodFJhbmdlRGF0YTo6Y3Jl
YXRlKHJhbmdlKSk7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzRlMzVjMDRhYzMx
YzBjOTY2ZDRjMGU4NDAwYjFiOTgwNTEyYzAzYi4uODEzNGM0YzMzZTkyOWFlNzVlYTllMTUwODQ0
ZWMwOTVhZDZlOWQ0YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA5LTI5ICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBhcyBu
ZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC93cHQvY3NzL2Nzcy1oaWdo
bGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVw
YWludC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1h
cGkvaGlnaGxpZ2h0LXRleHQtcmVwbGFjZS1leHBlY3RlZC5odG1sOiBSZW1vdmVkLgorCiAyMDIw
LTA5LTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dl
YkF1dGhuXSBEb24ndCBzZXQgdGhlIFVWIG9wdGlvbiBpZiB0aGUgYXV0aGVudGljYXRvciBkb2Vz
bid0IHN1cHBvcnQgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3Mt
aGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBh
aW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YmIwNTFiNWMwYTVlNWY1NDQwNzI1NzhkYjY1
ODBmZGVhMmE5ODFjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0CkBA
IC0wLDAgKzEsOCBAQAorT25lIHR3byB0aHJlZQorKHJlcGFpbnQgcmVjdHMKKyAgKHJlY3QgOCA4
IDc4NCAyMCkKKyAgKHJlY3QgOCA4IDc4NCAyMCkKKyAgKHJlY3QgOCA4IDc4NCAyMCkKKyAgKHJl
Y3QgOCA4IDc4NCAyMCkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQuaHRtbCBiL0xheW91dFRl
c3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uY2RjMTNmY2NiMTkwYzUwYTliMDBiOGYzMzQyMzkwMDU2MGZjZGRh
MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxp
Z2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50Lmh0bWwKQEAgLTAsMCArMSw2NiBAQAorPCFE
T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4K
KyAgICA8dGl0bGU+TXVsdGlwbGUgY3VzdG9tIGhpZ2hsaWdodCBwc2V1ZG8gZWxlbWVudHMuPC90
aXRsZT4KKyAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtaGlnaGxpZ2h0LWFwaS0xLyNjcmVhdGluZy1oaWdobGlnaHRzIj4KKyAgICA8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSJoaWdobGlnaHQtdGV4dC1leHBlY3RlZC5odG1sIj4KKyAgICA8bWV0
YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IkhpZ2hsaWdodCBSYW5nZXMgc2hvdWxkIGJlIGFibGUg
dG8gYmUgYWRkZWQgYW5kIHJlbW92ZWQgZnJvbSB0aGUgSGlnaGxpZ2h0UmFuZ2VHcm91cC4iPgor
ICAgIDxzdHlsZT4KKyAgICAgICAgOjpoaWdobGlnaHQoZXhhbXBsZS1oaWdobGlnaHQpIHsKKyAg
ICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgICAgICAgICBjb2xvcjpyZWQ7
CisgICAgICAgIH0KKyAgICAgICAgI3RleHQxCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvbnQ6
IDIwcHggQWhlbTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAg
ICA8c3BhbiBpZD0idGV4dDEiPk9uZSB0d28gdGhyZWU8L3NwYW4+CisKKyAgICA8cHJlIGlkPSJy
ZXBhaW50UmVjdHMiPjwvcHJlPgorCisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gcmVw
YWludFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVy
KSB7CisgICAgICAgICAgICAgICAgYWxlcnQoJ1RoaXMgdGVzdCByZXF1aXJlcyB0ZXN0UnVubmVy
IHRvIHJ1biEnKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAg
ICAgICAgICAgIGlmICghd2luZG93LmludGVybmFscykgeworICAgICAgICAgICAgICAgICBhbGVy
dCgnVGhpcyB0ZXN0IHJlcXVpcmVzIHdpbmRvdy5pbnRlcmFscyB0byBydW4hJyk7CisgICAgICAg
ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHdpbmRvdy5pbnRl
cm5hbHMuc3RhcnRUcmFja2luZ1JlcGFpbnRzKCk7CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1
bm5lci5kdW1wQXNUZXh0KGZhbHNlKTsKKworICAgICAgICAgICAgbGV0IHRleHRFbGVtZW50ID0g
ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RleHQxJyk7CisKKyAgICAgICAgICAgIGxldCByYW5n
ZTEgPSBuZXcgU3RhdGljUmFuZ2Uoe3N0YXJ0Q29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5v
ZGVzWzBdLCBzdGFydE9mZnNldDogMSwgZW5kQ29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5v
ZGVzWzBdLCBlbmRPZmZzZXQ6IDJ9KQorICAgICAgICAgICAgbGV0IHJhbmdlMiA9IG5ldyBTdGF0
aWNSYW5nZSh7c3RhcnRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0
T2Zmc2V0OiAzLCBlbmRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9m
ZnNldDogNH0pOworICAgICAgICAgICAgbGV0IHJhbmdlMyA9IG5ldyBTdGF0aWNSYW5nZSh7c3Rh
cnRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0T2Zmc2V0OiA4LCBl
bmRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9mZnNldDogMTJ9KTsK
KworICAgICAgICAgICAgbGV0IGhpZ2hsaWdodFJhbmdlR3JvdXAxID0gbmV3IEhpZ2hsaWdodFJh
bmdlR3JvdXAocmFuZ2UxKTsKKyAgICAgICAgICAgIENTUy5oaWdobGlnaHRzLnNldCgiZXhhbXBs
ZS1oaWdobGlnaHQiLCBoaWdobGlnaHRSYW5nZUdyb3VwMSk7CisKKyAgICAgICAgICAgIGhpZ2hs
aWdodFJhbmdlR3JvdXAxLmFkZChyYW5nZTIpOworICAgICAgICAgICAgaGlnaGxpZ2h0UmFuZ2VH
cm91cDEuZGVsZXRlKHJhbmdlMSk7CisgICAgICAgICAgICBoaWdobGlnaHRSYW5nZUdyb3VwMS5h
ZGQocmFuZ2UzKTsKKworICAgICAgICAgICAgdmFyIHJlcGFpbnRSZWN0cyA9IHdpbmRvdy5pbnRl
cm5hbHMucmVwYWludFJlY3RzQXNUZXh0KCk7CisgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxz
LnN0b3BUcmFja2luZ1JlcGFpbnRzKCk7CisKKyAgICAgICAgICAgIHZhciBwcmUgPSBkb2N1bWVu
dC5nZXRFbGVtZW50QnlJZCgncmVwYWludFJlY3RzJyk7CisgICAgICAgICAgICBwcmUuaW5uZXJI
VE1MID0gcmVwYWludFJlY3RzOworICAgICAgICB9CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExp
c3RlbmVyKCdsb2FkJywgcmVwYWludFRlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKworICAg
IDxzY3JpcHQ+CisgICAgICAgIAorICAgIDwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxp
Z2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L3BsYXRmb3JtL2lvcy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRl
eHQtcmVwYWludC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjUwMTRiMTU5ZWYzNGJiMTE1YjRj
MjQ1MDc5OTkxMGEyY2Q4ZGMwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRm
b3JtL2lvcy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVw
YWludC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw4IEBACitPbmUgdHdvIHRocmVlCisocmVwYWlu
dCByZWN0cworICAocmVjdCA4IDggNzg0IDIxKQorICAocmVjdCA4IDggNzg0IDIxKQorICAocmVj
dCA4IDggNzg0IDIxKQorICAocmVjdCA4IDggNzg0IDIxKQorKQorCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410257</attachid>
            <date>2020-10-01 12:15:06 -0700</date>
            <delta_ts>2020-10-01 17:43:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217116-20201001121505.patch</filename>
            <type>text/plain</type>
            <size>7958</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh
MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uMDk0MzcwNzM3ZGNjYTQ5ZjMxYzcwN2Q3ZDdiYzQ5
YTA5NjVjYmYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI5ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBh
cyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vNTkwNzYxOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgV2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIHBzdWRvIGhpZ2hsaWdodHMs
IG1ha2Ugc3VyZSB0aGF0IHRoZQorICAgICAgICByaWdodCBhcmVhcyBhcmUgcmVwYWludGVkLgor
CisgICAgICAgIFRlc3Q6IGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQt
dGV4dC1yZXBhaW50Lmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0hpZ2hsaWdo
dFJhbmdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVwYWludFJhbmdlKToKKyAgICAg
ICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OnJlbW92ZUZyb21TZXRMaWtlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExpa2UpOgor
ICAgICAgICAoV2ViQ29yZTo6SGlnaGxpZ2h0UmFuZ2VHcm91cDo6YWRkVG9TZXRMaWtlKToKKwog
MjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAg
IFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBVViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3Ig
ZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hp
Z2hsaWdodC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv
aGlnaGxpZ2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCmluZGV4IGZjMTI5NDAwYWQ1YzZhMjBi
YWIzZTRkM2FmNWM5MjI0NWViYzNmNGUuLjdkZDg3Mjk2Y2U3NWViOTkzMTcwMjg0ZTRiMTJhYjlh
OGY5N2U2MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0hp
Z2hsaWdodFJhbmdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxp
Z2h0L0hpZ2hsaWdodFJhbmdlR3JvdXAuY3BwCkBAIC0yOSw3ICsyOSw5IEBACiAjaW5jbHVkZSAi
SURMVHlwZXMuaCIKICNpbmNsdWRlICJKU0RPTVNldExpa2UuaCIKICNpbmNsdWRlICJKU1N0YXRp
Y1JhbmdlLmgiCisjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgogI2luY2x1ZGUgIlByb3BlcnR5
U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2lu
Y2x1ZGUgIlN0YXRpY1JhbmdlLmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5j
bHVkZSA8d3RmL1JlZi5oPgpAQCAtNTMsMTUgKzU1LDQyIEBAIHZvaWQgSGlnaGxpZ2h0UmFuZ2VH
cm91cDo6aW5pdGlhbGl6ZVNldExpa2UoRE9NU2V0QWRhcHRlciYgc2V0KQogICAgICAgICBzZXQu
YWRkPElETEludGVyZmFjZTxTdGF0aWNSYW5nZT4+KHJhbmdlRGF0YS0+cmFuZ2UpOwogfQogCitz
dGF0aWMgdm9pZCByZXBhaW50UmFuZ2UoY29uc3QgU3RhdGljUmFuZ2UmIHJhbmdlKQoreworICAg
IGF1dG8qIHN0YXJ0Tm9kZSA9ICZyYW5nZS5zdGFydENvbnRhaW5lcigpOworICAgIGF1dG8qIGVu
ZE5vZGUgPSAmcmFuZ2UuZW5kQ29udGFpbmVyKCk7CisgICAgYXV0byBvcmRlcmluZyA9IGRvY3Vt
ZW50T3JkZXIoKnN0YXJ0Tm9kZSwgKmVuZE5vZGUpOworICAgIGlmIChpc19lcShvcmRlcmluZykp
IHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCkpCisg
ICAgICAgICAgICByZW5kZXJlci0+cmVwYWludCgpOworICAgICAgICByZXR1cm47CisgICAgfQor
ICAgIGlmIChpc19ndChvcmRlcmluZykpIHsKKyAgICAgICAgc3RhcnROb2RlID0gJnJhbmdlLmVu
ZENvbnRhaW5lcigpOworICAgICAgICBlbmROb2RlID0gJnJhbmdlLnN0YXJ0Q29udGFpbmVyKCk7
CisgICAgfQorCisgICAgYXV0byBub2RlID0gc3RhcnROb2RlOworICAgIHdoaWxlIChub2RlICE9
IGVuZE5vZGUpIHsKKyAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigp
KQorICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQoKTsKKyAgICAgICAgbm9kZSA9IE5vZGVU
cmF2ZXJzYWw6Om5leHQoKm5vZGUpOworICAgIH0KK30KKwogYm9vbCBIaWdobGlnaHRSYW5nZUdy
b3VwOjpyZW1vdmVGcm9tU2V0TGlrZShjb25zdCBTdGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAg
cmV0dXJuIG1fcmFuZ2VzRGF0YS5yZW1vdmVGaXJzdE1hdGNoaW5nKFsmcmFuZ2VdKGNvbnN0IFJl
ZjxIaWdobGlnaHRSYW5nZURhdGE+JiBjdXJyZW50KSB7CisgICAgICAgIHJlcGFpbnRSYW5nZShy
YW5nZSk7CiAgICAgICAgIHJldHVybiBjdXJyZW50LmdldCgpLnJhbmdlLmdldCgpID09IHJhbmdl
OwogICAgIH0pOwogfQogCiB2b2lkIEhpZ2hsaWdodFJhbmdlR3JvdXA6OmNsZWFyRnJvbVNldExp
a2UoKQogeworICAgIGZvciAoYXV0byYgZGF0YSA6IG1fcmFuZ2VzRGF0YSkKKyAgICAgICAgcmVw
YWludFJhbmdlKGRhdGEtPnJhbmdlKTsKKwogICAgIG1fcmFuZ2VzRGF0YS5jbGVhcigpOwogfQog
CkBAIC02OSw2ICs5OCw3IEBAIGJvb2wgSGlnaGxpZ2h0UmFuZ2VHcm91cDo6YWRkVG9TZXRMaWtl
KFN0YXRpY1JhbmdlJiByYW5nZSkKIHsKICAgICBpZiAobm90Rm91bmQgIT0gbV9yYW5nZXNEYXRh
LmZpbmRNYXRjaGluZyhbJnJhbmdlXShjb25zdCBSZWY8SGlnaGxpZ2h0UmFuZ2VEYXRhPiYgY3Vy
cmVudCkgeyByZXR1cm4gY3VycmVudC5nZXQoKS5yYW5nZS5nZXQoKSA9PSByYW5nZTsgfSkpCiAg
ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXBhaW50UmFuZ2UocmFuZ2UpOwogICAgIG1fcmFu
Z2VzRGF0YS5hcHBlbmQoSGlnaGxpZ2h0UmFuZ2VEYXRhOjpjcmVhdGUocmFuZ2UpKTsKICAgICAK
ICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzNGUzNWMwNGFjMzFjMGM5NjZkNGMwZTg0MDBiMWI5
ODA1MTJjMDNiLi44MTM0YzRjMzNlOTI5YWU3NWVhOWUxNTA4NDRlYzA5NWFkNmU5ZDRhIDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDktMjkgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJk
bmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXBhaW50IGFzIG5lZWRlZCB3aGVuIGFkZGluZyBh
bmQgcmVtb3ZpbmcgaGlnaGxpZ2h0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjE3MTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgKiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0
LXRleHQtcmVwYWludC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L2Nz
cy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1yZXBhaW50Lmh0bWw6IEFkZGVkLgor
ICAgICAgICAqIGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4dC1y
ZXBsYWNlLWV4cGVjdGVkLmh0bWw6IFJlbW92ZWQuCisKIDIwMjAtMDktMjEgIEppZXdlbiBUYW4g
IDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIERvbid0IHNldCB0
aGUgVVYgb3B0aW9uIGlmIHRoZSBhdXRoZW50aWNhdG9yIGRvZXNuJ3Qgc3VwcG9ydCBpdApkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3NzL2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hs
aWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3Nz
L2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQtZXhwZWN0ZWQudHh0Cm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLjViYjA1MWI1YzBhNWU1ZjU0NDA3MjU3OGRiNjU4MGZkZWEyYTk4MWMKLS0tIC9k
ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkv
aGlnaGxpZ2h0LXRleHQtcmVwYWludC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw4IEBACitPbmUg
dHdvIHRocmVlCisocmVwYWludCByZWN0cworICAocmVjdCA4IDggNzg0IDIwKQorICAocmVjdCA4
IDggNzg0IDIwKQorICAocmVjdCA4IDggNzg0IDIwKQorICAocmVjdCA4IDggNzg0IDIwKQorKQor
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkv
aGlnaGxpZ2h0LXRleHQtcmVwYWludC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3NzL2Nz
cy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQuaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5k
MzhjOTQwYTYxZWJjNThlYzY1ZDlhODZlMjUzOGE2NzQzNjNhMWM3Ci0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvY3NzL2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10
ZXh0LXJlcGFpbnQuaHRtbApAQCAtMCwwICsxLDYxIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s
PgorPGhlYWQ+CisgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgIDx0aXRsZT5NdWx0aXBs
ZSBjdXN0b20gaGlnaGxpZ2h0IHBzZXVkbyBlbGVtZW50cy48L3RpdGxlPgorICAgIDxsaW5rIHJl
bD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1oaWdobGlnaHQtYXBp
LTEvI2NyZWF0aW5nLWhpZ2hsaWdodHMiPgorICAgIDxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Imhp
Z2hsaWdodC10ZXh0LWV4cGVjdGVkLmh0bWwiPgorICAgIDxtZXRhIG5hbWU9ImFzc2VydCIgY29u
dGVudD0iSGlnaGxpZ2h0IFJhbmdlcyBzaG91bGQgYmUgYWJsZSB0byBiZSBhZGRlZCBhbmQgcmVt
b3ZlZCBmcm9tIHRoZSBIaWdobGlnaHRSYW5nZUdyb3VwLiI+CisgICAgPHN0eWxlPgorICAgICAg
ICA6OmhpZ2hsaWdodChleGFtcGxlLWhpZ2hsaWdodCkgeworICAgICAgICAgICAgYmFja2dyb3Vu
ZC1jb2xvcjogYmx1ZTsKKyAgICAgICAgICAgIGNvbG9yOnJlZDsKKyAgICAgICAgfQorICAgICAg
ICAjdGV4dDEKKyAgICAgICAgeworICAgICAgICAgICAgZm9udDogMjBweCBBaGVtOworICAgICAg
ICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxzcGFuIGlkPSJ0ZXh0MSI+
T25lIHR3byB0aHJlZTwvc3Bhbj4KKyAgICA8cHJlIGlkPSJyZXBhaW50UmVjdHMiPjwvcHJlPgor
CisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gcmVwYWludFRlc3QoKQorICAgICAgICB7
CisgICAgICAgICAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICAgICAg
YWxlcnQoJ1RoaXMgdGVzdCByZXF1aXJlcyB0ZXN0UnVubmVyIHRvIHJ1biEnKTsKKyAgICAgICAg
ICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghd2luZG93
LmludGVybmFscykgeworICAgICAgICAgICAgICAgICBhbGVydCgnVGhpcyB0ZXN0IHJlcXVpcmVz
IHdpbmRvdy5pbnRlcmFscyB0byBydW4hJyk7CisgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg
ICAgICAgICAgIH0KKyAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc3RhcnRUcmFja2luZ1Jl
cGFpbnRzKCk7CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci5kdW1wQXNUZXh0KGZhbHNl
KTsKKworICAgICAgICAgICAgbGV0IHRleHRFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5
SWQoJ3RleHQxJyk7CisKKyAgICAgICAgICAgIGxldCByYW5nZTEgPSBuZXcgU3RhdGljUmFuZ2Uo
e3N0YXJ0Q29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBzdGFydE9mZnNldDog
MSwgZW5kQ29udGFpbmVyOiB0ZXh0RWxlbWVudC5jaGlsZE5vZGVzWzBdLCBlbmRPZmZzZXQ6IDJ9
KQorICAgICAgICAgICAgbGV0IHJhbmdlMiA9IG5ldyBTdGF0aWNSYW5nZSh7c3RhcnRDb250YWlu
ZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0T2Zmc2V0OiAzLCBlbmRDb250YWlu
ZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9mZnNldDogNH0pOworICAgICAgICAg
ICAgbGV0IHJhbmdlMyA9IG5ldyBTdGF0aWNSYW5nZSh7c3RhcnRDb250YWluZXI6IHRleHRFbGVt
ZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0T2Zmc2V0OiA4LCBlbmRDb250YWluZXI6IHRleHRFbGVt
ZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9mZnNldDogMTJ9KTsKKworICAgICAgICAgICAgbGV0IGhp
Z2hsaWdodFJhbmdlR3JvdXAxID0gbmV3IEhpZ2hsaWdodFJhbmdlR3JvdXAocmFuZ2UxKTsKKyAg
ICAgICAgICAgIENTUy5oaWdobGlnaHRzLnNldCgiZXhhbXBsZS1oaWdobGlnaHQiLCBoaWdobGln
aHRSYW5nZUdyb3VwMSk7CisKKyAgICAgICAgICAgIGhpZ2hsaWdodFJhbmdlR3JvdXAxLmFkZChy
YW5nZTIpOworICAgICAgICAgICAgaGlnaGxpZ2h0UmFuZ2VHcm91cDEuZGVsZXRlKHJhbmdlMSk7
CisgICAgICAgICAgICBoaWdobGlnaHRSYW5nZUdyb3VwMS5hZGQocmFuZ2UzKTsKKworICAgICAg
ICAgICAgdmFyIHJlcGFpbnRSZWN0cyA9IHdpbmRvdy5pbnRlcm5hbHMucmVwYWludFJlY3RzQXNU
ZXh0KCk7CisgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnN0b3BUcmFja2luZ1JlcGFpbnRz
KCk7CisKKyAgICAgICAgICAgIHZhciBwcmUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVw
YWludFJlY3RzJyk7CisgICAgICAgICAgICBwcmUuaW5uZXJIVE1MID0gcmVwYWludFJlY3RzOwor
ICAgICAgICB9CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgcmVwYWlu
dFRlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1h
cGkvaGlnaGxpZ2h0LXRleHQtcmVwYWludC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0
Zm9ybS9pb3MvaHR0cC93cHQvY3NzL2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJl
cGFpbnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI1MDE0YjE1OWVmMzRiYjExNWI0YzI0NTA3
OTk5MTBhMmNkOGRjMDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p
b3MvaHR0cC93cHQvY3NzL2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQt
ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorT25lIHR3byB0aHJlZQorKHJlcGFpbnQgcmVj
dHMKKyAgKHJlY3QgOCA4IDc4NCAyMSkKKyAgKHJlY3QgOCA4IDc4NCAyMSkKKyAgKHJlY3QgOCA4
IDc4NCAyMSkKKyAgKHJlY3QgOCA4IDc4NCAyMSkKKykKKwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410290</attachid>
            <date>2020-10-01 17:43:07 -0700</date>
            <delta_ts>2020-10-01 18:10:13 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-217116-20201001174306.patch</filename>
            <type>text/plain</type>
            <size>7954</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh
MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uYWU5ODk3OTNlYzY1ZjRkN2Q1ZmQyYzE2YjU5M2Nh
NWEzMmJlMDAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI5ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBh
cyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5kIHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzExNgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vNTkwNzYxOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy
LgorCisgICAgICAgIFdoZW4gYWRkaW5nIGFuZCByZW1vdmluZyBwc3VkbyBoaWdobGlnaHRzLCBt
YWtlIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgcmlnaHQgYXJlYXMgYXJlIHJlcGFpbnRlZC4KKwor
ICAgICAgICBUZXN0OiBodHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRl
eHQtcmVwYWludC5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9IaWdobGlnaHRS
YW5nZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlcGFpbnRSYW5nZSk6CisgICAgICAg
IChXZWJDb3JlOjpIaWdobGlnaHRSYW5nZUdyb3VwOjpyZW1vdmVGcm9tU2V0TGlrZSk6CisgICAg
ICAgIChXZWJDb3JlOjpIaWdobGlnaHRSYW5nZUdyb3VwOjpjbGVhckZyb21TZXRMaWtlKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhpZ2hsaWdodFJhbmdlR3JvdXA6OmFkZFRvU2V0TGlrZSk6CisKIDIw
MjAtMDktMjEgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb
V2ViQXV0aG5dIERvbid0IHNldCB0aGUgVVYgb3B0aW9uIGlmIHRoZSBhdXRoZW50aWNhdG9yIGRv
ZXNuJ3Qgc3VwcG9ydCBpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdo
bGlnaHQvSGlnaGxpZ2h0UmFuZ2VHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hp
Z2hsaWdodC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcAppbmRleCBmYzEyOTQwMGFkNWM2YTIwYmFi
M2U0ZDNhZjVjOTIyNDVlYmMzZjRlLi43ZGQ4NzI5NmNlNzVlYjk5MzE3MDI4NGU0YjEyYWI5YThm
OTdlNjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9IaWdo
bGlnaHRSYW5nZUdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdo
dC9IaWdobGlnaHRSYW5nZUdyb3VwLmNwcApAQCAtMjksNyArMjksOSBAQAogI2luY2x1ZGUgIklE
TFR5cGVzLmgiCiAjaW5jbHVkZSAiSlNET01TZXRMaWtlLmgiCiAjaW5jbHVkZSAiSlNTdGF0aWNS
YW5nZS5oIgorI2luY2x1ZGUgIk5vZGVUcmF2ZXJzYWwuaCIKICNpbmNsdWRlICJQcm9wZXJ0eVNl
dENTU1N0eWxlRGVjbGFyYXRpb24uaCIKKyNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNs
dWRlICJTdGF0aWNSYW5nZS5oIgogI2luY2x1ZGUgIlN0eWxlUHJvcGVydGllcy5oIgogI2luY2x1
ZGUgPHd0Zi9SZWYuaD4KQEAgLTUzLDE1ICs1NSw0MiBAQCB2b2lkIEhpZ2hsaWdodFJhbmdlR3Jv
dXA6OmluaXRpYWxpemVTZXRMaWtlKERPTVNldEFkYXB0ZXImIHNldCkKICAgICAgICAgc2V0LmFk
ZDxJRExJbnRlcmZhY2U8U3RhdGljUmFuZ2U+PihyYW5nZURhdGEtPnJhbmdlKTsKIH0KIAorc3Rh
dGljIHZvaWQgcmVwYWludFJhbmdlKGNvbnN0IFN0YXRpY1JhbmdlJiByYW5nZSkKK3sKKyAgICBh
dXRvKiBzdGFydE5vZGUgPSAmcmFuZ2Uuc3RhcnRDb250YWluZXIoKTsKKyAgICBhdXRvKiBlbmRO
b2RlID0gJnJhbmdlLmVuZENvbnRhaW5lcigpOworICAgIGF1dG8gb3JkZXJpbmcgPSBkb2N1bWVu
dE9yZGVyKCpzdGFydE5vZGUsICplbmROb2RlKTsKKyAgICBpZiAoaXNfZXEob3JkZXJpbmcpKSB7
CisgICAgICAgIGlmIChhdXRvIHJlbmRlcmVyID0gc3RhcnROb2RlLT5yZW5kZXJlcigpKQorICAg
ICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAg
ICBpZiAoaXNfZ3Qob3JkZXJpbmcpKSB7CisgICAgICAgIHN0YXJ0Tm9kZSA9ICZyYW5nZS5lbmRD
b250YWluZXIoKTsKKyAgICAgICAgZW5kTm9kZSA9ICZyYW5nZS5zdGFydENvbnRhaW5lcigpOwor
ICAgIH0KKworICAgIGF1dG8gbm9kZSA9IHN0YXJ0Tm9kZTsKKyAgICB3aGlsZSAobm9kZSAhPSBl
bmROb2RlKSB7CisgICAgICAgIGlmIChhdXRvIHJlbmRlcmVyID0gbm9kZS0+cmVuZGVyZXIoKSkK
KyAgICAgICAgICAgIHJlbmRlcmVyLT5yZXBhaW50KCk7CisgICAgICAgIG5vZGUgPSBOb2RlVHJh
dmVyc2FsOjpuZXh0KCpub2RlKTsKKyAgICB9Cit9CisKIGJvb2wgSGlnaGxpZ2h0UmFuZ2VHcm91
cDo6cmVtb3ZlRnJvbVNldExpa2UoY29uc3QgU3RhdGljUmFuZ2UmIHJhbmdlKQogewogICAgIHJl
dHVybiBtX3Jhbmdlc0RhdGEucmVtb3ZlRmlyc3RNYXRjaGluZyhbJnJhbmdlXShjb25zdCBSZWY8
SGlnaGxpZ2h0UmFuZ2VEYXRhPiYgY3VycmVudCkgeworICAgICAgICByZXBhaW50UmFuZ2UocmFu
Z2UpOwogICAgICAgICByZXR1cm4gY3VycmVudC5nZXQoKS5yYW5nZS5nZXQoKSA9PSByYW5nZTsK
ICAgICB9KTsKIH0KIAogdm9pZCBIaWdobGlnaHRSYW5nZUdyb3VwOjpjbGVhckZyb21TZXRMaWtl
KCkKIHsKKyAgICBmb3IgKGF1dG8mIGRhdGEgOiBtX3Jhbmdlc0RhdGEpCisgICAgICAgIHJlcGFp
bnRSYW5nZShkYXRhLT5yYW5nZSk7CisKICAgICBtX3Jhbmdlc0RhdGEuY2xlYXIoKTsKIH0KIApA
QCAtNjksNiArOTgsNyBAQCBib29sIEhpZ2hsaWdodFJhbmdlR3JvdXA6OmFkZFRvU2V0TGlrZShT
dGF0aWNSYW5nZSYgcmFuZ2UpCiB7CiAgICAgaWYgKG5vdEZvdW5kICE9IG1fcmFuZ2VzRGF0YS5m
aW5kTWF0Y2hpbmcoWyZyYW5nZV0oY29uc3QgUmVmPEhpZ2hsaWdodFJhbmdlRGF0YT4mIGN1cnJl
bnQpIHsgcmV0dXJuIGN1cnJlbnQuZ2V0KCkucmFuZ2UuZ2V0KCkgPT0gcmFuZ2U7IH0pKQogICAg
ICAgICByZXR1cm4gZmFsc2U7CisgICAgcmVwYWludFJhbmdlKHJhbmdlKTsKICAgICBtX3Jhbmdl
c0RhdGEuYXBwZW5kKEhpZ2hsaWdodFJhbmdlRGF0YTo6Y3JlYXRlKHJhbmdlKSk7CiAgICAgCiAg
ICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzRlMzVjMDRhYzMxYzBjOTY2ZDRjMGU4NDAwYjFiOTgw
NTEyYzAzYi4uZDdiMzRiZjlkZDlmN2YxNzg0ZDAwNjI1MmEyNzExYTdiZGUzOWNkNiAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE0IEBACisyMDIwLTA5LTI5ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5l
ckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwYWludCBhcyBuZWVkZWQgd2hlbiBhZGRpbmcgYW5k
IHJlbW92aW5nIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNzExNgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4K
KworICAgICAgICAqIGh0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdobGlnaHQtdGV4
dC1yZXBhaW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC93cHQvY3NzL2Nz
cy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGFpbnQuaHRtbDogQWRkZWQuCisgICAg
ICAgICogaHR0cC93cHQvY3NzL2Nzcy1oaWdobGlnaHQtYXBpL2hpZ2hsaWdodC10ZXh0LXJlcGxh
Y2UtZXhwZWN0ZWQuaHRtbDogUmVtb3ZlZC4KKwogMjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGpp
ZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBV
ViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3IgZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0
LXRleHQtcmVwYWludC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3Nz
LWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVwYWludC1leHBlY3RlZC50eHQKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uNWJiMDUxYjVjMGE1ZTVmNTQ0MDcyNTc4ZGI2NTgwZmRlYTJhOTgxYwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdo
bGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK09uZSB0d28g
dGhyZWUKKyhyZXBhaW50IHJlY3RzCisgIChyZWN0IDggOCA3ODQgMjApCisgIChyZWN0IDggOCA3
ODQgMjApCisgIChyZWN0IDggOCA3ODQgMjApCisgIChyZWN0IDggOCA3ODQgMjApCispCisKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9oaWdo
bGlnaHQtdGV4dC1yZXBhaW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3NzLWhp
Z2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVwYWludC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQzOGM5
NDBhNjFlYmM1OGVjNjVkOWE4NmUyNTM4YTY3NDM2M2ExYzcKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQt
cmVwYWludC5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8
aGVhZD4KKyAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgPHRpdGxlPk11bHRpcGxlIGN1
c3RvbSBoaWdobGlnaHQgcHNldWRvIGVsZW1lbnRzLjwvdGl0bGU+CisgICAgPGxpbmsgcmVsPSJo
ZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWhpZ2hsaWdodC1hcGktMS8j
Y3JlYXRpbmctaGlnaGxpZ2h0cyI+CisgICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iaGlnaGxp
Z2h0LXRleHQtZXhwZWN0ZWQuaHRtbCI+CisgICAgPG1ldGEgbmFtZT0iYXNzZXJ0IiBjb250ZW50
PSJIaWdobGlnaHQgUmFuZ2VzIHNob3VsZCBiZSBhYmxlIHRvIGJlIGFkZGVkIGFuZCByZW1vdmVk
IGZyb20gdGhlIEhpZ2hsaWdodFJhbmdlR3JvdXAuIj4KKyAgICA8c3R5bGU+CisgICAgICAgIDo6
aGlnaGxpZ2h0KGV4YW1wbGUtaGlnaGxpZ2h0KSB7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNv
bG9yOiBibHVlOworICAgICAgICAgICAgY29sb3I6cmVkOworICAgICAgICB9CisgICAgICAgICN0
ZXh0MQorICAgICAgICB7CisgICAgICAgICAgICBmb250OiAyMHB4IEFoZW07CisgICAgICAgIH0K
KyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHNwYW4gaWQ9InRleHQxIj5PbmUg
dHdvIHRocmVlPC9zcGFuPgorICAgIDxwcmUgaWQ9InJlcGFpbnRSZWN0cyI+PC9wcmU+CisKKyAg
ICA8c2NyaXB0PgorICAgICAgICBmdW5jdGlvbiByZXBhaW50VGVzdCgpCisgICAgICAgIHsKKyAg
ICAgICAgICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgICAgICBhbGVy
dCgnVGhpcyB0ZXN0IHJlcXVpcmVzIHRlc3RSdW5uZXIgdG8gcnVuIScpOworICAgICAgICAgICAg
ICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCF3aW5kb3cuaW50
ZXJuYWxzKSB7CisgICAgICAgICAgICAgICAgIGFsZXJ0KCdUaGlzIHRlc3QgcmVxdWlyZXMgd2lu
ZG93LmludGVyYWxzIHRvIHJ1biEnKTsKKyAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg
ICAgICAgfQorICAgICAgICAgICAgd2luZG93LmludGVybmFscy5zdGFydFRyYWNraW5nUmVwYWlu
dHMoKTsKKyAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLmR1bXBBc1RleHQoZmFsc2UpOwor
CisgICAgICAgICAgICBsZXQgdGV4dEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn
dGV4dDEnKTsKKworICAgICAgICAgICAgbGV0IHJhbmdlMSA9IG5ldyBTdGF0aWNSYW5nZSh7c3Rh
cnRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIHN0YXJ0T2Zmc2V0OiAxLCBl
bmRDb250YWluZXI6IHRleHRFbGVtZW50LmNoaWxkTm9kZXNbMF0sIGVuZE9mZnNldDogMn0pCisg
ICAgICAgICAgICBsZXQgcmFuZ2UyID0gbmV3IFN0YXRpY1JhbmdlKHtzdGFydENvbnRhaW5lcjog
dGV4dEVsZW1lbnQuY2hpbGROb2Rlc1swXSwgc3RhcnRPZmZzZXQ6IDMsIGVuZENvbnRhaW5lcjog
dGV4dEVsZW1lbnQuY2hpbGROb2Rlc1swXSwgZW5kT2Zmc2V0OiA0fSk7CisgICAgICAgICAgICBs
ZXQgcmFuZ2UzID0gbmV3IFN0YXRpY1JhbmdlKHtzdGFydENvbnRhaW5lcjogdGV4dEVsZW1lbnQu
Y2hpbGROb2Rlc1swXSwgc3RhcnRPZmZzZXQ6IDgsIGVuZENvbnRhaW5lcjogdGV4dEVsZW1lbnQu
Y2hpbGROb2Rlc1swXSwgZW5kT2Zmc2V0OiAxMn0pOworCisgICAgICAgICAgICBsZXQgaGlnaGxp
Z2h0UmFuZ2VHcm91cDEgPSBuZXcgSGlnaGxpZ2h0UmFuZ2VHcm91cChyYW5nZTEpOworICAgICAg
ICAgICAgQ1NTLmhpZ2hsaWdodHMuc2V0KCJleGFtcGxlLWhpZ2hsaWdodCIsIGhpZ2hsaWdodFJh
bmdlR3JvdXAxKTsKKworICAgICAgICAgICAgaGlnaGxpZ2h0UmFuZ2VHcm91cDEuYWRkKHJhbmdl
Mik7CisgICAgICAgICAgICBoaWdobGlnaHRSYW5nZUdyb3VwMS5kZWxldGUocmFuZ2UxKTsKKyAg
ICAgICAgICAgIGhpZ2hsaWdodFJhbmdlR3JvdXAxLmFkZChyYW5nZTMpOworCisgICAgICAgICAg
ICB2YXIgcmVwYWludFJlY3RzID0gd2luZG93LmludGVybmFscy5yZXBhaW50UmVjdHNBc1RleHQo
KTsKKyAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc3RvcFRyYWNraW5nUmVwYWludHMoKTsK
KworICAgICAgICAgICAgdmFyIHByZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZXBhaW50
UmVjdHMnKTsKKyAgICAgICAgICAgIHByZS5pbm5lckhUTUwgPSByZXBhaW50UmVjdHM7CisgICAg
ICAgIH0KKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCByZXBhaW50VGVz
dCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2h0dHAvd3B0L2Nzcy9jc3MtaGlnaGxpZ2h0LWFwaS9o
aWdobGlnaHQtdGV4dC1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt
L2lvcy9odHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVwYWlu
dC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjUwMTRiMTU5ZWYzNGJiMTE1YjRjMjQ1MDc5OTkx
MGEyY2Q4ZGMwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9o
dHRwL3dwdC9jc3MvY3NzLWhpZ2hsaWdodC1hcGkvaGlnaGxpZ2h0LXRleHQtcmVwYWludC1leHBl
Y3RlZC50eHQKQEAgLTAsMCArMSw4IEBACitPbmUgdHdvIHRocmVlCisocmVwYWludCByZWN0cwor
ICAocmVjdCA4IDggNzg0IDIxKQorICAocmVjdCA4IDggNzg0IDIxKQorICAocmVjdCA4IDggNzg0
IDIxKQorICAocmVjdCA4IDggNzg0IDIxKQorKQorCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>