<?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>222801</bug_id>
          
          <creation_ts>2021-03-05 05:38:31 -0800</creation_ts>
          <short_desc>Wrong image displayed for &lt;picture&gt; elements created through JavaScript</short_desc>
          <delta_ts>2021-04-28 01:39:12 -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>Images</component>
          <version>Safari Technology Preview</version>
          <rep_platform>All</rep_platform>
          <op_sys>macOS 11</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>
          <dependson>225044</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Marvin Hagemeister">webkit</reporter>
          <assigned_to name="Cameron McCormack (:heycam)">heycam</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>heycam</cc>
    
    <cc>jer.noble</cc>
    
    <cc>philipj</cc>
    
    <cc>rbuis</cc>
    
    <cc>rniwa</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1736315</commentid>
    <comment_count>0</comment_count>
      <attachid>422368</attachid>
    <who name="Marvin Hagemeister">webkit</who>
    <bug_when>2021-03-05 05:38:31 -0800</bug_when>
    <thetext>Created attachment 422368
HTML file to reproduce the issue

Picture elements that are created in JavaScript and appended to the DOM don&apos;t re-evaluate the image source on resize. Instead the initial image, from when the element was attached to the DOM is shown. Changing any attribute on one of the source elements seems to trigger the browser to re-evaluate the image choice and display the correct image.

Check out the attached HTML file for an isolated reproduction case.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736358</commentid>
    <comment_count>1</comment_count>
    <who name="Marvin Hagemeister">webkit</who>
    <bug_when>2021-03-05 08:36:59 -0800</bug_when>
    <thetext>Found another workaround: Simply adding the picture element first, before appending the source-elements, works too.

```js
// Works
container.appendChild(picture);
picture.appendChild(source1);
picture.appendChild(img);
```

vs

```js
// Doesn&apos;t work
picture.appendChild(source1);
picture.appendChild(img);
container.appendChild(picture);
```

Which leads me to believe that Safari is very picky about the order of insertion.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738856</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-03-12 05:39:12 -0800</bug_when>
    <thetext>&lt;rdar://problem/75359328&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1747782</commentid>
    <comment_count>3</comment_count>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-06 23:57:22 -0700</bug_when>
    <thetext>Thanks for the reduced test case, Marvin.

Rob, this issue looks to be a regression from https://trac.webkit.org/changeset/263345/webkit.  This is because when doing things in this order:

  * create source element
  * set source element&apos;s media attribute
  * create picture element
  * append source element to picture element
  * insert picture element into document

we never end up registering the &lt;img&gt; as a dynamic media query dependent image with the document.  This is because we only get into selectImageSource() in response to the attribute changes, which happen before the &lt;img&gt; has a &lt;picture&gt; parent, and so we don&apos;t get to the addDynamicMediaQueryDependentImage() call.

What&apos;s the purpose of checking whether a newly inserted &lt;picture&gt; element is in the document here:

https://webkit-search.igalia.com/webkit/rev/2ba963a3b7c21a24310b76fbdfa2d72b0eefbb81/Source/WebCore/html/HTMLImageElement.cpp#387-390

If we always called selectImageSource() here regardless of whether the &lt;picture&gt; is already in the document, that should cause us to correctly track MQ result changes.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754088</commentid>
    <comment_count>4</comment_count>
      <attachid>427014</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-25 17:29:51 -0700</bug_when>
    <thetext>Created attachment 427014
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754094</commentid>
    <comment_count>5</comment_count>
      <attachid>427014</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-25 17:52:16 -0700</bug_when>
    <thetext>Comment on attachment 427014
Patch

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

&gt; Source/WebCore/ChangeLog:3
&gt; +        Ensure dynamically inserted &lt;picture&gt; elements listen for MQ changes.

This is only about media query?

&gt; Source/WebCore/html/HTMLPictureElement.cpp:52
&gt; +    auto insertNotificationRequest = HTMLElement::insertedIntoAncestor(insertionType, parentOfInsertedTree);

No need to restore &amp; return this. HTMLElement/Element::insertedIntoAncestor is guaranteed to return InsertedIntoAncestorResult::Done

&gt; Source/WebCore/html/HTMLPictureElement.cpp:53
&gt; +    sourcesChanged();

This isn&apos;t quite right if it&apos;s meant to track media query changes.
In that case, what we want to do is to check insertionType.connectedToDocument.

&gt; LayoutTests/fast/picture/picture-mq-insert.html:20
&gt; +let s1 = document.createElement(&apos;source&apos;);

Please don&apos;t use two-letter variable name like s1. Spell out source1.
Also use const?

&gt; LayoutTests/fast/picture/picture-mq-insert.html:25
&gt; +let s2 = document.createElement(&apos;source&apos;);

Ditto.

&gt; LayoutTests/fast/picture/picture-mq-insert.html:30
&gt; +let img = document.createElement(&apos;img&apos;);

const?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754487</commentid>
    <comment_count>6</comment_count>
      <attachid>427117</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-26 21:54:10 -0700</bug_when>
    <thetext>Created attachment 427117
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754488</commentid>
    <comment_count>7</comment_count>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-26 21:56:44 -0700</bug_when>
    <thetext>WPT PR for this change: https://github.com/web-platform-tests/wpt/pull/28708

Safari fails this test currently (since we don&apos;t track the MQ change), but passes after this patch.  Firefox fails as it doesn&apos;t track MQ changes.  Chrome fails since while it does track MQ changes, it fails on the last assertion, which checks that removing the &lt;img&gt; from the &lt;picture&gt; re-does image source selection.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754491</commentid>
    <comment_count>8</comment_count>
      <attachid>427119</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-26 22:19:19 -0700</bug_when>
    <thetext>Created attachment 427119
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754846</commentid>
    <comment_count>9</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-27 16:45:57 -0700</bug_when>
    <thetext>Please update the patch for trunk.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754865</commentid>
    <comment_count>10</comment_count>
      <attachid>427219</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-27 17:29:00 -0700</bug_when>
    <thetext>Created attachment 427219
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754867</commentid>
    <comment_count>11</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-04-27 17:29:58 -0700</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754930</commentid>
    <comment_count>12</comment_count>
      <attachid>427219</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-27 23:46:57 -0700</bug_when>
    <thetext>Comment on attachment 427219
Patch

r=me assuming WPT PR lands first.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754931</commentid>
    <comment_count>13</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-27 23:47:14 -0700</bug_when>
    <thetext>Note that we need to wait for WPT PR to land first before we can land this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754948</commentid>
    <comment_count>14</comment_count>
      <attachid>427244</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-04-28 00:35:59 -0700</bug_when>
    <thetext>Created attachment 427244
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754960</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-28 01:39:09 -0700</bug_when>
    <thetext>Committed r276697 (237111@main): &lt;https://commits.webkit.org/237111@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427244.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>422368</attachid>
            <date>2021-03-05 05:38:31 -0800</date>
            <delta_ts>2021-03-05 05:38:31 -0800</delta_ts>
            <desc>HTML file to reproduce the issue</desc>
            <filename>index.html</filename>
            <type>text/html</type>
            <size>2165</size>
            <attacher name="Marvin Hagemeister">webkit</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KICA8aGVhZD4KICAgIDxtZXRhIGNoYXJz
ZXQ9IlVURi04IiAvPgogICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRl
dmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xLjAiIC8+CiAgICA8dGl0bGU+U2FmYXJpIFBpY3R1
cmUgRWxlbWVudCBCdWc8L3RpdGxlPgogIDwvaGVhZD4KICA8Ym9keT4KICAgIDxoMT5TYWZhcmkg
UGljdHVyZSBFbGVtZW50IEJ1ZzwvaDE+CiAgICA8cD4KICAgICAgQW55IHBpY3R1cmUgZWxlbWVu
dCBjcmVhdGVkIHRocm91Z2ggSmF2YVNjcmlwdCB3aWxsIG5vdCB1cGRhdGUgdGhlIGltYWdlCiAg
ICAgIHVwb24gcmVzaXppbmcgdGhlIGJyb3dzZXIgd2luZG93LiBJbnN0ZWFkLCBpdCB3aWxsIGJl
IHN0dWNrIGF0IHRoZSBpbWFnZQogICAgICBzaXplIGZyb20gd2hlbiBpdCB3YXMgaW5zZXJ0ZWQu
IFRvIHJlcHJvZHVjZSwgb3BlbiB0aGlzIGh0bWwgZmlsZSBpbiBhCiAgICAgIGJyb3dzZXIgYW5k
IHJlc2l6ZSB0aGUgd2luZG93LgogICAgPC9wPgogICAgPGgyPkNyZWF0ZWQgaW4gSFRNTCAod29y
a3MpPC9oMj4KICAgIDxwaWN0dXJlPgogICAgICA8c291cmNlCiAgICAgICAgbWVkaWE9IihtaW4t
d2lkdGg6IDY1MHB4KSIKICAgICAgICBzcmNzZXQ9IgogICAgICAgICAgaHR0cHM6Ly9nb29nbGVj
aHJvbWUuZ2l0aHViLmlvL3NhbXBsZXMvcGljdHVyZS1lbGVtZW50L2ltYWdlcy9raXR0ZW4tbGFy
Z2UucG5nCiAgICAgICAgIgogICAgICAvPgogICAgICA8c291cmNlCiAgICAgICAgbWVkaWE9Iiht
aW4td2lkdGg6IDQ2NXB4KSIKICAgICAgICBzcmNzZXQ9IgogICAgICAgICAgaHR0cHM6Ly9nb29n
bGVjaHJvbWUuZ2l0aHViLmlvL3NhbXBsZXMvcGljdHVyZS1lbGVtZW50L2ltYWdlcy9raXR0ZW4t
bWVkaXVtLnBuZwogICAgICAgICIKICAgICAgLz4KICAgICAgPGltZwogICAgICAgIHNyYz0iaHR0
cHM6Ly9nb29nbGVjaHJvbWUuZ2l0aHViLmlvL3NhbXBsZXMvcGljdHVyZS1lbGVtZW50L2ltYWdl
cy9raXR0ZW4tc21hbGwucG5nIgogICAgICAgIGFsdD0ia2l0dGVuIgogICAgICAvPgogICAgPC9w
aWN0dXJlPgogICAgPGgyPkNyZWF0ZWQgdGhyb3VnaCBKYXZhU2NyaXB0IChicm9rZW4pPC9oMj4K
ICAgIDxkaXYgaWQ9ImR5bmFtaWMiPjwvZGl2PgogICAgPHNjcmlwdD4KICAgICAgY29uc3QgcCA9
IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInBpY3R1cmUiKTsKCiAgICAgIGNvbnN0IHMxID0gZG9j
dW1lbnQuY3JlYXRlRWxlbWVudCgic291cmNlIik7CiAgICAgIHMxLnNldEF0dHJpYnV0ZSgibWVk
aWEiLCAiKG1pbi13aWR0aDogNjUwcHgpIik7CiAgICAgIHMxLnNldEF0dHJpYnV0ZSgKICAgICAg
ICAic3Jjc2V0IiwKICAgICAgICAiaHR0cHM6Ly9nb29nbGVjaHJvbWUuZ2l0aHViLmlvL3NhbXBs
ZXMvcGljdHVyZS1lbGVtZW50L2ltYWdlcy9raXR0ZW4tbGFyZ2UucG5nIgogICAgICApOwogICAg
ICBzMS5zZXRBdHRyaWJ1dGUoInR5cGUiLCAiaW1hZ2UvcG5nIik7CiAgICAgIHAuYXBwZW5kQ2hp
bGQoczEpOwoKICAgICAgY29uc3QgczIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzb3VyY2Ui
KTsKICAgICAgczIuc2V0QXR0cmlidXRlKCJtZWRpYSIsICIobWluLXdpZHRoOiA0NjVweCkiKTsK
ICAgICAgczIuc2V0QXR0cmlidXRlKAogICAgICAgICJzcmNzZXQiLAogICAgICAgICJodHRwczov
L2dvb2dsZWNocm9tZS5naXRodWIuaW8vc2FtcGxlcy9waWN0dXJlLWVsZW1lbnQvaW1hZ2VzL2tp
dHRlbi1tZWRpdW0ucG5nIgogICAgICApOwogICAgICBzMi5zZXRBdHRyaWJ1dGUoInR5cGUiLCAi
aW1hZ2UvcG5nIik7CiAgICAgIHAuYXBwZW5kQ2hpbGQoczIpOwoKICAgICAgY29uc3QgaW1nID0g
ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAgICAgIGltZy5zZXRBdHRyaWJ1dGUoCiAg
ICAgICAgInNyYyIsCiAgICAgICAgImh0dHBzOi8vZ29vZ2xlY2hyb21lLmdpdGh1Yi5pby9zYW1w
bGVzL3BpY3R1cmUtZWxlbWVudC9pbWFnZXMva2l0dGVuLXNtYWxsLnBuZyIKICAgICAgKTsKICAg
ICAgcC5hcHBlbmRDaGlsZChpbWcpOwoKICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImR5
bmFtaWMiKS5hcHBlbmRDaGlsZChwKTsKICAgIDwvc2NyaXB0PgogIDwvYm9keT4KPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427014</attachid>
            <date>2021-04-25 17:29:51 -0700</date>
            <delta_ts>2021-04-26 21:54:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222801-20210426102950.patch</filename>
            <type>text/plain</type>
            <size>6048</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTNiMzZmMGYzMzdmODI3
ZDM4YTc1OWQ3MzE0NGM5NWIyMDRkYTJhMC4uYTY2YTE5NzBkNWE5ZGI3MTI4ODBiMDI3ZjQxNmQy
MTg2YzRkMDUzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA0LTI1ICBDYW1l
cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIGR5bmFt
aWNhbGx5IGluc2VydGVkIDxwaWN0dXJlPiBlbGVtZW50cyBsaXN0ZW4gZm9yIE1RIGNoYW5nZXMu
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4MDEK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiB3ZSB1
cGRhdGUgYSA8c291cmNlIG1lZGlhPiBhdHRyaWJ1dGUgYmVmb3JlIGl0cyBwYXJlbnQgPHBpY3R1
cmU+IGlzCisgICAgICAgIGluIHRoZSBkb2N1bWVudCwgd2Ugd29uJ3QgcmVnaXN0ZXIgdGhlIDxp
bWc+IGFzIGEgZHluYW1pYyBtZWRpYSBxdWVyeQorICAgICAgICBkZXBlbmRlbnQgaW1hZ2UuICBT
byByZS1ldmFsdWF0ZSBvdXIgc2VsZWN0ZWQgaW1hZ2Ugd2hlbiBhIDxwaWN0dXJlPiBpcworICAg
ICAgICBpbnNlcnRlZCBzbyB0aGF0IHRoZSA8aW1nPiB3aWxsIGJlIHJlZ2lzdGVyZWQuCisKKyAg
ICAgICAgVGVzdDogZmFzdC9waWN0dXJlL3BpY3R1cmUtbXEtaW5zZXJ0Lmh0bWwKKworICAgICAg
ICAqIGh0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQ
aWN0dXJlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAgICAgICAqIGh0bWwvSFRN
TFBpY3R1cmVFbGVtZW50Lmg6CisKIDIwMjEtMDQtMjUgIEZlbGlwZSBFcmlhcyAgPGZlbGlwZWVy
aWFzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1mbGV4Ym94XSBUYWJsZSBsYXlvdXQgZGlz
cmVnYXJkcyBvdmVycmlkaW5nIHdpZHRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxQaWN0dXJlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQaWN0dXJl
RWxlbWVudC5jcHAKaW5kZXggMGVhNzc0ZDdhNmY1NDU2NDU2YzVkYWE3OTk3NDAyYzg5NjU4YjVj
Yy4uNzk2NGE4Yjk0YWQwMmRkNDczZDM5ZWFiNDZhZGI4YjcwNDNjMTliYSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcApAQCAtNDcsNiArNDcsMTMgQEAgSFRN
TFBpY3R1cmVFbGVtZW50Ojp+SFRNTFBpY3R1cmVFbGVtZW50KCkKIHsKIH0KIAorTm9kZTo6SW5z
ZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTFBpY3R1cmVFbGVtZW50OjppbnNlcnRlZEludG9B
bmNlc3RvcihJbnNlcnRpb25UeXBlIGluc2VydGlvblR5cGUsIENvbnRhaW5lck5vZGUmIHBhcmVu
dE9mSW5zZXJ0ZWRUcmVlKQoreworICAgIGF1dG8gaW5zZXJ0Tm90aWZpY2F0aW9uUmVxdWVzdCA9
IEhUTUxFbGVtZW50OjppbnNlcnRlZEludG9BbmNlc3RvcihpbnNlcnRpb25UeXBlLCBwYXJlbnRP
Zkluc2VydGVkVHJlZSk7CisgICAgc291cmNlc0NoYW5nZWQoKTsKKyAgICByZXR1cm4gaW5zZXJ0
Tm90aWZpY2F0aW9uUmVxdWVzdDsKK30KKwogdm9pZCBIVE1MUGljdHVyZUVsZW1lbnQ6OmRpZE1v
dmVUb05ld0RvY3VtZW50KERvY3VtZW50JiBvbGREb2N1bWVudCwgRG9jdW1lbnQmIG5ld0RvY3Vt
ZW50KQogewogICAgIEhUTUxFbGVtZW50OjpkaWRNb3ZlVG9OZXdEb2N1bWVudChvbGREb2N1bWVu
dCwgbmV3RG9jdW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGlj
dHVyZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmgK
aW5kZXggNTUyZjYyMjhiYjRiMmY1MDkzNWNmODI5ZTkxYTYwYTdmZGI3NjM1Ni4uNzlmYWY0NWU0
YzkzN2IyZWEzYzgwNjkzY2E3NTAxYmI5MjA0ZjE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxQaWN0dXJlRWxlbWVudC5oCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg
ICAgSFRNTFBpY3R1cmVFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOwog
CisgICAgSW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgaW5zZXJ0ZWRJbnRvQW5jZXN0b3IoSW5z
ZXJ0aW9uVHlwZSwgQ29udGFpbmVyTm9kZSYgcGFyZW50T2ZJbnNlcnRlZFRyZWUpIGZpbmFsOwog
ICAgIHZvaWQgZGlkTW92ZVRvTmV3RG9jdW1lbnQoRG9jdW1lbnQmIG9sZERvY3VtZW50LCBEb2N1
bWVudCYgbmV3RG9jdW1lbnQpIGZpbmFsOwogfTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGNmMzg2MmI2NWVhYTc2OTNk
ZGY1MmRlZjgzNzI2MmQzOWY0YTYwOTYuLmM5YzQzNDYxYWM2MmFiMDlkYjgwZDBjMDRiNjdiMWJm
YzI5M2M1OTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wNC0yNSAgQ2FtZXJvbiBNY0Nv
cm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgorCisgICAgICAgIEVuc3VyZSBkeW5hbWljYWxseSBp
bnNlcnRlZCA8cGljdHVyZT4gZWxlbWVudHMgbGlzdGVuIGZvciBNUSBjaGFuZ2VzLgorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODAxCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3BpY3R1cmUv
cGljdHVyZS1tcS1pbnNlcnQtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9w
aWN0dXJlL3BpY3R1cmUtbXEtaW5zZXJ0Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcGlj
dHVyZS9yZXNvdXJjZXMvZ3JlZW4xMDAucG5nOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3BpY3R1
cmUvcmVzb3VyY2VzL3JlZDEwMC5wbmc6IEFkZGVkLgorCiAyMDIxLTA0LTI1ICBGZWxpcGUgRXJp
YXMgIDxmZWxpcGVlcmlhc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxleGJveF0gVGFi
bGUgbGF5b3V0IGRpc3JlZ2FyZHMgb3ZlcnJpZGluZyB3aWR0aApkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvZmFzdC9waWN0dXJlL3BpY3R1cmUtbXEtaW5zZXJ0LWV4cGVjdGVkLmh0bWwgYi9MYXlv
dXRUZXN0cy9mYXN0L3BpY3R1cmUvcGljdHVyZS1tcS1pbnNlcnQtZXhwZWN0ZWQuaHRtbApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi5jYzIzZGRlNzM0YmVhNTU4NGU2OWNhMGJhMzg4YTdkNzkxZmQ1YzYzCi0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9waWN0dXJlL3BpY3R1cmUtbXEtaW5zZXJ0LWV4
cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxwPlRlc3QgcGFz
c2VzIGlmIHRoZSBzcXVhcmUgYmVsb3cgaXMgZ3JlZW4uPC9wPgorPGltZyBzcmM9InJlc291cmNl
cy9ncmVlbjEwMC5wbmciPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9waWN0dXJlL3Bp
Y3R1cmUtbXEtaW5zZXJ0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3BpY3R1cmUvcGljdHVyZS1t
cS1pbnNlcnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43N2ZhYzgxY2Y5NTllN2YxNjRmYzA4NjViNWQ1ZDc2
YzljMTQ1ZTY3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9waWN0dXJlL3Bp
Y3R1cmUtbXEtaW5zZXJ0Lmh0bWwKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8
c3R5bGU+CitpZnJhbWUgeyBib3JkZXI6IG5vbmU7IHdpZHRoOiA0MDBweDsgaGVpZ2h0OiAyMDBw
eDsgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgd2lu
ZG93LnRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworPC9zY3JpcHQ+Cis8cD5UZXN0IHBhc3Nl
cyBpZiB0aGUgc3F1YXJlIGJlbG93IGlzIGdyZWVuLjwvcD4KKzxpZnJhbWUgb25sb2FkPSJ0aGlz
LnN0eWxlLndpZHRoID0gJzI1MHB4JzsiIHNyY2RvYz0iCis8IURPQ1RZUEUgaHRtbD4KKzxzdHls
ZT4KK2JvZHkgeyBtYXJnaW46IDA7IG92ZXJmbG93OiBoaWRkZW47IH0KK2ltZyB7IHdpZHRoOiAx
MDBweDsgaGVpZ2h0OiAxMDBweDsgfQorPC9zdHlsZT4KKzxib2R5PgorPHNjcmlwdD4KK2xldCBw
aWN0dXJlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgncGljdHVyZScpOworCitsZXQgczEgPSBk
b2N1bWVudC5jcmVhdGVFbGVtZW50KCdzb3VyY2UnKTsKK3MxLnNldEF0dHJpYnV0ZSgnbWVkaWEn
LCAnKG1pbi13aWR0aDogMzAwcHgpJyk7CitzMS5zZXRBdHRyaWJ1dGUoJ3NyY3NldCcsICdyZXNv
dXJjZXMvcmVkMTAwLnBuZycpOworcGljdHVyZS5hcHBlbmQoczEpOworCitsZXQgczIgPSBkb2N1
bWVudC5jcmVhdGVFbGVtZW50KCdzb3VyY2UnKTsKK3MyLnNldEF0dHJpYnV0ZSgnbWVkaWEnLCAn
KG1pbi13aWR0aDogMjAwcHgpJyk7CitzMi5zZXRBdHRyaWJ1dGUoJ3NyY3NldCcsICdyZXNvdXJj
ZXMvZ3JlZW4xMDAucG5nJyk7CitwaWN0dXJlLmFwcGVuZChzMik7CisKK2xldCBpbWcgPSBkb2N1
bWVudC5jcmVhdGVFbGVtZW50KCdpbWcnKTsKK2ltZy5zcmMgPSAncmVzb3VyY2VzL3JlZDEwMC5w
bmcnOworcGljdHVyZS5hcHBlbmQoaW1nKTsKKworZG9jdW1lbnQuYm9keS5hcHBlbmQocGljdHVy
ZSk7CisKK2lmIChwYXJlbnQudGVzdFJ1bm5lcikKKyAgICBwYXJlbnQudGVzdFJ1bm5lci5ub3Rp
ZnlEb25lKCk7Cis8L3NjcmlwdD4KKyI+PC9pZnJhbWU+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9mYXN0L3BpY3R1cmUvcmVzb3VyY2VzL2dyZWVuMTAwLnBuZyBiL0xheW91dFRlc3RzL2Zhc3Qv
cGljdHVyZS9yZXNvdXJjZXMvZ3JlZW4xMDAucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc5MGUzN2RkNzA5NTY1
NWIyY2NmM2JiMTc4MGJiYzUyNTcxMjZiODYKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDI4Nwp6
Y21lQVNATj8ob2xIeWB1VkJxIWlhMHZwXkRJbTxqMVNKMUFGZmp3RVhQeiNPQXIqN3BVVTF9T1Ar
Jk9WVjdsfC0KdSs2UXE7Y1RePjJDLWR2QXowUFFGc0JKTGhwQG1VNXFzUldjVHRZd31Ha0NpQ3h2
WDxhWGFXRVRxQzZTXgoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvZmFzdC9waWN0dXJlL3Jlc291cmNlcy9yZWQxMDAucG5nIGIvTGF5b3V0VGVzdHMvZmFz
dC9waWN0dXJlL3Jlc291cmNlcy9yZWQxMDAucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkxZWZlYTBmNzdiODU4
OTMyODg1YTRiOTc2NDU3YmI4ZDVhOGNlYmEKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDI5Ngp6
Y21lQVNATj8ob2xIeWB1VkJxIWlhMHZwXkRJbTxqMVNKMUFGZmp1dSZIfDZmVmc/M29WR3czeW1e
RFdORDlCI28Kej5GZGg9a2V5R3wlMkspTHBDMz8ySFp2cm0jNXE0VkgjTSZXJFlvJH5FPW8tLU5s
ajVHJm4oR01hUUV+TE5ZUDdXCnoyYTM9MGJhNCEreGJebWVBdE02PTJlWlB+YHNhfWMmJEJDQyZ8
SyUlczF2eTw8PmFLTDQlNUpsQU8md1FMdnc7RQp4bT8zZ3Y1fTNnU1IwQ3FMZilvUThPa2lFQS1q
cio8RlYrPnVjcyVSWl9VI31xYylJJHp0YUQwZTBzeld1VkJyNyYKCmxpdGVyYWwgMApIY21WP2Qw
MDAwMQoK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427117</attachid>
            <date>2021-04-26 21:54:10 -0700</date>
            <delta_ts>2021-04-26 22:19:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222801-20210427145409.patch</filename>
            <type>text/plain</type>
            <size>3705</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQ0Zjc0OWIyYzYwNTE3
ODk1MWRhMDI0NzdkMjJjMGQ1NTI4NWFmZi4uZmFjNTMxYTVlZDlkYjRjYmNkOWRkOWJlZTQ1OWVl
MGYwMmRkZmU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTI2ICBDYW1l
cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpbWcgZWxl
bWVudHMgcGVyZm9ybSBzb3VyY2Ugc2VsZWN0aW9uIGV2ZW4gd2hlbiBub3QgaW4gdGhlIGRvY3Vt
ZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy
ODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl
IHJ1bGVzIGZvciBpbWFnZSBzb3VyY2Ugc2VsZWN0aW9uIGluIHRoZSBIVE1MIHNwZWMgZG8gbm90
IHByZXZlbnQKKyAgICAgICAgdGhlbSBmcm9tIHJ1bm5pbmcgd2hlbiBhbiA8aW1nPiBpcyBub3Qg
aW4gdGhlIGRvY3VtZW50LiAgU28gd2UgdXBkYXRlCisgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQg
dG8gY2FsbCBzZWxlY3RJbWFnZVNvdXJjZSgpIHdoZW4gaW5zZXJ0ZWQgaW50byBhbmQKKyAgICAg
ICAgcmVtb3ZlZCBmcm9tIGEgPHBpY3R1cmU+IHdpdGhvdXQgY2hlY2tpbmcgd2hldGhlciBpdCdz
IGluIGEgZG9jdW1lbnQuCisKKyAgICAgICAgVGVzdHM6IGh0dHBzOi8vZ2l0aHViLmNvbS93ZWIt
cGxhdGZvcm0tdGVzdHMvd3B0L3B1bGwvMjg3MDgKKworICAgICAgICAqIGh0bWwvSFRNTEltYWdl
RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50Ojp+SFRNTElt
YWdlRWxlbWVudCk6IFJlbW92ZSB1c2VsZXNzIGNhbGwgdG8KKyAgICAgICAgc2V0UGljdHVyZUVs
ZW1lbnQsIHNpbmNlIGFsbCBpdCBkb2VzIGlzIGNsZWFyIGEgd2VhayBwb2ludGVyLgorICAgICAg
ICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAg
ICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3Rvcik6CisK
IDIwMjEtMDQtMjUgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KIAogICAg
ICAgICBBc3NvY2lhdGUgYSBwaWN0dXJlIGVsZW1lbnQgd2l0aCBhbiBpbWcgb25seSBpZiB0aGUg
aW1nIGlzIGEgZGlyZWN0IGNoaWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVu
dC5jcHAKaW5kZXggZmMzOTdmOTk1MGUyNjNmYTk3MDNiMjY0M2NjOTdkMDFmZjUwNTAxMS4uZDA2
YTAwOGU5MTRjZWUwOTI0ODZmNjM4MWM1YjlmYzRiMDk0Mzg1OCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCkBAIC05NCw3ICs5NCw2IEBAIEhUTUxJbWFnZUVsZW1l
bnQ6On5IVE1MSW1hZ2VFbGVtZW50KCkKIAogICAgIGlmIChtX2Zvcm0pCiAgICAgICAgIG1fZm9y
bS0+cmVtb3ZlSW1nRWxlbWVudCh0aGlzKTsKLSAgICBzZXRQaWN0dXJlRWxlbWVudChudWxscHRy
KTsKIH0KIAogUmVmPEhUTUxJbWFnZUVsZW1lbnQ+IEhUTUxJbWFnZUVsZW1lbnQ6OmNyZWF0ZUZv
ckxlZ2FjeUZhY3RvcnlGdW5jdGlvbihEb2N1bWVudCYgZG9jdW1lbnQsIE9wdGlvbmFsPHVuc2ln
bmVkPiB3aWR0aCwgT3B0aW9uYWw8dW5zaWduZWQ+IGhlaWdodCkKQEAgLTM4NiwxNiArMzg1LDgg
QEAgTm9kZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVudDo6aW5z
ZXJ0ZWRJbnRvQW5jZXN0b3IoSW5zZXJ0aW8KICAgICAgICAgLy8gRklYTUU6IFdoZW4gdGhlIGhh
Y2sgaW4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmNyZWF0ZUhUTUxFbGVtZW50T3JGaW5kQ3VzdG9t
RWxlbWVudEludGVyZmFjZSB0byBlYWdlcmx5IGNhbGwgc2V0UGljdHVyZUVsZW1lbnQgaXMgcmVt
b3ZlZCwgd2UgY2FuIGp1c3QgYXNzZXJ0ICFwaWN0dXJlRWxlbWVudCgpLgogICAgICAgICBBU1NF
UlQoIXBpY3R1cmVFbGVtZW50KCkgfHwgcGljdHVyZUVsZW1lbnQoKSA9PSAmcGFyZW50T2ZJbnNl
cnRlZFRyZWUpOwogICAgICAgICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1
cmVFbGVtZW50PihwYXJlbnRPZkluc2VydGVkVHJlZSkpOwotICAgICAgICAvLyBGSVhNRTogV2Ug
c2hvdWxkIHVuY29uZGl0aW9uYWxseSBjYWxsIHNlbGVjdEltYWdlU291cmNlIHNvIHRoYXQgc291
cmNlIHNlbGVjdGlvbiBpcyBwZXJmb3JtZWQgZXZlbiBmb3IgPGltZz4gZWxlbWVudHMgb3V0c2lk
ZSB0aGUgZG9jdW1lbnQuCi0gICAgICAgIGlmIChpbnNlcnRpb25UeXBlLmNvbm5lY3RlZFRvRG9j
dW1lbnQpIHsKLSAgICAgICAgICAgIHNlbGVjdEltYWdlU291cmNlKFJlbGV2YW50TXV0YXRpb246
Olllcyk7Ci0gICAgICAgICAgICByZXR1cm4gaW5zZXJ0Tm90aWZpY2F0aW9uUmVxdWVzdDsKLSAg
ICAgICAgfQotICAgICAgICBhdXRvIGNhbmRpZGF0ZSA9IGJlc3RGaXRTb3VyY2VGcm9tUGljdHVy
ZUVsZW1lbnQoKTsKLSAgICAgICAgaWYgKCFjYW5kaWRhdGUuaXNFbXB0eSgpKSB7Ci0gICAgICAg
ICAgICBzZXRCZXN0Rml0VVJMQW5kRFBSRnJvbUltYWdlQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7Ci0g
ICAgICAgICAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlv
dXNFcnJvcihSZWxldmFudE11dGF0aW9uOjpZZXMpOwotICAgICAgICB9CisgICAgICAgIHNlbGVj
dEltYWdlU291cmNlKFJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgICAgIHJldHVybiBpbnNl
cnROb3RpZmljYXRpb25SZXF1ZXN0OwogICAgIH0KIAogICAgIC8vIElmIHdlIGhhdmUgYmVlbiBp
bnNlcnRlZCBmcm9tIGEgcmVuZGVyZXItbGVzcyBkb2N1bWVudCwKQEAgLTQxNyw4ICs0MDgsNyBA
QCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnJlbW92ZWRGcm9tQW5jZXN0b3IoUmVtb3ZhbFR5cGUg
cmVtb3ZhbFR5cGUsIENvbnRhaW5lck5vZAogICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+
KG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpICYmICFwYXJlbnRFbGVtZW50KCkpIHsKICAgICAgICAg
QVNTRVJUKHBpY3R1cmVFbGVtZW50KCkgPT0gJm9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpOwogICAg
ICAgICBzZXRQaWN0dXJlRWxlbWVudChudWxscHRyKTsKLSAgICAgICAgLy8gRklYTUU6IFdlIHNo
b3VsZCBjYWxsIHNlbGVjdEltYWdlU291cmNlIHNvIHRoYXQgc291cmNlIHNlbGVjdGlvbiBpcyBw
ZXJmb3JtZWQsIG5vdyB0aGF0IHdlIG5vIGxvbmdlciBoYXZlIGEgPHBpY3R1cmU+IGNvbnRleHQu
Ci0gICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91
c0Vycm9yKFJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgICAgIHNlbGVjdEltYWdlU291cmNl
KFJlbGV2YW50TXV0YXRpb246Olllcyk7CiAgICAgfQogCiAgICAgbV9mb3JtID0gbnVsbHB0cjsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427119</attachid>
            <date>2021-04-26 22:19:19 -0700</date>
            <delta_ts>2021-04-27 17:28:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222801-20210427151918.patch</filename>
            <type>text/plain</type>
            <size>7453</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVlNDY0OTFiZjM0ZDJl
NmNjMDg1NDc0N2JmOTZjMjNhZWNmYjU3MC4uOGVjMGNlMjlmZTA3MjFhNTRiMGIyNmYyNWIyYmMz
MzhmMjNkNWRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTI2ICBDYW1l
cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpbWcgZWxl
bWVudHMgcGVyZm9ybSBzb3VyY2Ugc2VsZWN0aW9uIGV2ZW4gd2hlbiBub3QgaW4gdGhlIGRvY3Vt
ZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy
ODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl
IHJ1bGVzIGZvciBpbWFnZSBzb3VyY2Ugc2VsZWN0aW9uIGluIHRoZSBIVE1MIHNwZWMgZG8gbm90
IHByZXZlbnQKKyAgICAgICAgdGhlbSBmcm9tIHJ1bm5pbmcgd2hlbiBhbiA8aW1nPiBpcyBub3Qg
aW4gdGhlIGRvY3VtZW50LiAgU28gd2UgdXBkYXRlCisgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQg
dG8gY2FsbCBzZWxlY3RJbWFnZVNvdXJjZSgpIHdoZW4gaW5zZXJ0ZWQgaW50byBhbmQKKyAgICAg
ICAgcmVtb3ZlZCBmcm9tIGEgPHBpY3R1cmU+IHdpdGhvdXQgY2hlY2tpbmcgd2hldGhlciBpdCdz
IGluIGEgZG9jdW1lbnQuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9z
b3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MuaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VF
bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6On5IVE1MSW1h
Z2VFbGVtZW50KTogUmVtb3ZlIHVzZWxlc3MgY2FsbCB0bworICAgICAgICBzZXRQaWN0dXJlRWxl
bWVudCwgc2luY2UgYWxsIGl0IGRvZXMgaXMgY2xlYXIgYSB3ZWFrIHBvaW50ZXIuCisgICAgICAg
IChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjppbnNlcnRlZEludG9BbmNlc3Rvcik6CisgICAg
ICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKToKKwog
MjAyMS0wNC0yNiAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgogCiAgICAg
ICAgIEFzc29jaWF0ZSBhIHBpY3R1cmUgZWxlbWVudCB3aXRoIGFuIGltZyBvbmx5IGlmIHRoZSBp
bWcgaXMgYSBkaXJlY3QgY2hpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxJbWFnZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50
LmNwcAppbmRleCBmYzM5N2Y5OTUwZTI2M2ZhOTcwM2IyNjQzY2M5N2QwMWZmNTA1MDExLi5kMDZh
MDA4ZTkxNGNlZTA5MjQ4NmY2MzgxYzViOWZjNGIwOTQzODU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKQEAgLTk0LDcgKzk0LDYgQEAgSFRNTEltYWdlRWxlbWVu
dDo6fkhUTUxJbWFnZUVsZW1lbnQoKQogCiAgICAgaWYgKG1fZm9ybSkKICAgICAgICAgbV9mb3Jt
LT5yZW1vdmVJbWdFbGVtZW50KHRoaXMpOwotICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIp
OwogfQogCiBSZWY8SFRNTEltYWdlRWxlbWVudD4gSFRNTEltYWdlRWxlbWVudDo6Y3JlYXRlRm9y
TGVnYWN5RmFjdG9yeUZ1bmN0aW9uKERvY3VtZW50JiBkb2N1bWVudCwgT3B0aW9uYWw8dW5zaWdu
ZWQ+IHdpZHRoLCBPcHRpb25hbDx1bnNpZ25lZD4gaGVpZ2h0KQpAQCAtMzg2LDE2ICszODUsOCBA
QCBOb2RlOjpJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdCBIVE1MSW1hZ2VFbGVtZW50OjppbnNl
cnRlZEludG9BbmNlc3RvcihJbnNlcnRpbwogICAgICAgICAvLyBGSVhNRTogV2hlbiB0aGUgaGFj
ayBpbiBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6Y3JlYXRlSFRNTEVsZW1lbnRPckZpbmRDdXN0b21F
bGVtZW50SW50ZXJmYWNlIHRvIGVhZ2VybHkgY2FsbCBzZXRQaWN0dXJlRWxlbWVudCBpcyByZW1v
dmVkLCB3ZSBjYW4ganVzdCBhc3NlcnQgIXBpY3R1cmVFbGVtZW50KCkuCiAgICAgICAgIEFTU0VS
VCghcGljdHVyZUVsZW1lbnQoKSB8fCBwaWN0dXJlRWxlbWVudCgpID09ICZwYXJlbnRPZkluc2Vy
dGVkVHJlZSk7CiAgICAgICAgIHNldFBpY3R1cmVFbGVtZW50KCZkb3duY2FzdDxIVE1MUGljdHVy
ZUVsZW1lbnQ+KHBhcmVudE9mSW5zZXJ0ZWRUcmVlKSk7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBz
aG91bGQgdW5jb25kaXRpb25hbGx5IGNhbGwgc2VsZWN0SW1hZ2VTb3VyY2Ugc28gdGhhdCBzb3Vy
Y2Ugc2VsZWN0aW9uIGlzIHBlcmZvcm1lZCBldmVuIGZvciA8aW1nPiBlbGVtZW50cyBvdXRzaWRl
IHRoZSBkb2N1bWVudC4KLSAgICAgICAgaWYgKGluc2VydGlvblR5cGUuY29ubmVjdGVkVG9Eb2N1
bWVudCkgewotICAgICAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2UoUmVsZXZhbnRNdXRhdGlvbjo6
WWVzKTsKLSAgICAgICAgICAgIHJldHVybiBpbnNlcnROb3RpZmljYXRpb25SZXF1ZXN0OwotICAg
ICAgICB9Ci0gICAgICAgIGF1dG8gY2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZyb21QaWN0dXJl
RWxlbWVudCgpOwotICAgICAgICBpZiAoIWNhbmRpZGF0ZS5pc0VtcHR5KCkpIHsKLSAgICAgICAg
ICAgIHNldEJlc3RGaXRVUkxBbmREUFJGcm9tSW1hZ2VDYW5kaWRhdGUoY2FuZGlkYXRlKTsKLSAg
ICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91
c0Vycm9yKFJlbGV2YW50TXV0YXRpb246Olllcyk7Ci0gICAgICAgIH0KKyAgICAgICAgc2VsZWN0
SW1hZ2VTb3VyY2UoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgcmV0dXJuIGluc2Vy
dE5vdGlmaWNhdGlvblJlcXVlc3Q7CiAgICAgfQogCiAgICAgLy8gSWYgd2UgaGF2ZSBiZWVuIGlu
c2VydGVkIGZyb20gYSByZW5kZXJlci1sZXNzIGRvY3VtZW50LApAQCAtNDE3LDggKzQwOCw3IEBA
IHZvaWQgSFRNTEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3RvcihSZW1vdmFsVHlwZSBy
ZW1vdmFsVHlwZSwgQ29udGFpbmVyTm9kCiAgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4o
b2xkUGFyZW50T2ZSZW1vdmVkVHJlZSkgJiYgIXBhcmVudEVsZW1lbnQoKSkgewogICAgICAgICBB
U1NFUlQocGljdHVyZUVsZW1lbnQoKSA9PSAmb2xkUGFyZW50T2ZSZW1vdmVkVHJlZSk7CiAgICAg
ICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIpOwotICAgICAgICAvLyBGSVhNRTogV2Ugc2hv
dWxkIGNhbGwgc2VsZWN0SW1hZ2VTb3VyY2Ugc28gdGhhdCBzb3VyY2Ugc2VsZWN0aW9uIGlzIHBl
cmZvcm1lZCwgbm93IHRoYXQgd2Ugbm8gbG9uZ2VyIGhhdmUgYSA8cGljdHVyZT4gY29udGV4dC4K
LSAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3Vz
RXJyb3IoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2Uo
UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAgICB9CiAKICAgICBtX2Zvcm0gPSBudWxscHRyOwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMWMzY2M1MWNkYmNlMTZiNGFlM2FjMjI4
Mjg0ZjYyYTY5ZjUwOTI4ZS4uMzQ5YWQ5MmMxNmJmOTg0NDU2ZDcyMGZjYmFjZjMwYjk5MGNjYTk5
NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEt
MDQtMjYgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KKworICAgICAgICBN
YWtlIGltZyBlbGVtZW50cyBwZXJmb3JtIHNvdXJjZSBzZWxlY3Rpb24gZXZlbiB3aGVuIG5vdCBp
biB0aGUgZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjI4MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250
ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MtZXhwZWN0ZWQudHh0
OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1i
ZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0
bWw6IEFkZGVkLgorCiAyMDIxLTA0LTI2ICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBs
ZS5jb20+CiAKICAgICAgICAgQXNzb2NpYXRlIGEgcGljdHVyZSBlbGVtZW50IHdpdGggYW4gaW1n
IG9ubHkgaWYgdGhlIGltZyBpcyBhIGRpcmVjdCBjaGlsZC4KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRk
ZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLWV4cGVj
dGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt
bC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlh
LW91dHNpZGUtZG9jLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YmVmMTkzM2U4MzM3NmQwMzhj
ZjFhYzM2MGE0YjIyMDkwZDMxYTNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250
ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MtZXhwZWN0ZWQudHh0
CkBAIC0wLDAgKzEsNCBAQAorCisKK1BBU1MgSW1hZ2Ugc291cmNlIHNlbGVjdGlvbiB1c2luZyBt
ZWRpYSBxdWVyaWVzIGlzIHBlcmZvcm1lZCBmb3IgaW1nIGVsZW1lbnRzIG91dHNpZGUgdGhlIGRv
Y3VtZW50CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQv
c291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlt
Zy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRvYy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI0YjJl
ODY1Zjc0MmVmYWExYjFlZWU2ZTM3ZGVjYzAxMjUxNTNhYWMKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRv
Yy5odG1sCkBAIC0wLDAgKzEsNDggQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPkltYWdlIHNv
dXJjZSBzZWxlY3Rpb24gdXNpbmcgbWVkaWEgcXVlcmllcyBpcyBwZXJmb3JtZWQgZm9yIGltZyBl
bGVtZW50cyBvdXRzaWRlIHRoZSBkb2N1bWVudDwvdGl0bGU+Cis8c2NyaXB0IHNyYz0iL3Jlc291
cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90
ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8aWZyYW1lIHdpZHRoPSIzNTAiIGhlaWdo
dD0iMTAwIiBvbmxvYWQ9ImFzeW5jX3Rlc3QodGhpcy5jb250ZW50V2luZG93LnJ1bikiIHNyY2Rv
Yz0iCis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQ+Citjb25zdCB7IGFzc2VydF9lcXVhbHMgfSA9
IHBhcmVudDsKK2NvbnN0IGlmcmFtZSA9IHBhcmVudC5kb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdp
ZnJhbWUnKTsKKworZnVuY3Rpb24gcnVuKHQpIHsKKyAgY29uc3QgcGljdHVyZSA9IGRvY3VtZW50
LmNyZWF0ZUVsZW1lbnQoJ3BpY3R1cmUnKTsKKworICBjb25zdCBzb3VyY2UxID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgnc291cmNlJyk7CisgIHNvdXJjZTEuc2V0QXR0cmlidXRlKCdtZWRpYScs
ICcobWluLXdpZHRoOiAzMDBweCknKTsKKyAgc291cmNlMS5zZXRBdHRyaWJ1dGUoJ3NyY3NldCcs
ICdkYXRhOixhJyk7CisgIHBpY3R1cmUuYXBwZW5kKHNvdXJjZTEpOworCisgIGNvbnN0IHNvdXJj
ZTIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzb3VyY2UnKTsKKyAgc291cmNlMi5zZXRBdHRy
aWJ1dGUoJ21lZGlhJywgJyhtaW4td2lkdGg6IDIwMHB4KScpOworICBzb3VyY2UyLnNldEF0dHJp
YnV0ZSgnc3Jjc2V0JywgJ2RhdGE6LGInKTsKKyAgcGljdHVyZS5hcHBlbmQoc291cmNlMik7CisK
KyAgY29uc3QgaW1nID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaW1nJyk7CisgIGltZy5zcmMg
PSAnZGF0YTosYyc7CisgIHBpY3R1cmUuYXBwZW5kKGltZyk7CisKKyAgcXVldWVNaWNyb3Rhc2so
dC5zdGVwX2Z1bmMoZnVuY3Rpb24oKSB7CisgICAgYXNzZXJ0X2VxdWFscyhpbWcuY3VycmVudFNy
YywgJ2RhdGE6LGEnLCAnSW5pdGlhbCBjdXJyZW50U3JjIHZhbHVlJyk7CisgICAgbWF0Y2hNZWRp
YShzb3VyY2UxLm1lZGlhKS5hZGRFdmVudExpc3RlbmVyKAorICAgICAgJ2NoYW5nZScsCisgICAg
ICBmdW5jdGlvbigpIHsKKyAgICAgICAgcXVldWVNaWNyb3Rhc2sodC5zdGVwX2Z1bmMoZnVuY3Rp
b24oKSB7CisgICAgICAgICAgYXNzZXJ0X2VxdWFscyhpbWcuY3VycmVudFNyYywgJ2RhdGE6LGIn
LCAnQWZ0ZXIgTVEgY2hhbmdlJyk7CisgICAgICAgICAgaW1nLnJlbW92ZSgpOworICAgICAgICAg
IHF1ZXVlTWljcm90YXNrKHQuc3RlcF9mdW5jKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgYXNz
ZXJ0X2VxdWFscyhpbWcuY3VycmVudFNyYywgJ2RhdGE6LGMnLCAnQWZ0ZXIgcmVtb3ZpbmcgaW1n
Jyk7CisgICAgICAgICAgICB0LmRvbmUoKTsKKyAgICAgICAgICB9KSk7CisgICAgICAgIH0pKTsK
KyAgICAgIH0sCisgICAgICB7IG9uY2U6IHRydWUgfQorICAgICk7CisgICAgaWZyYW1lLndpZHRo
ID0gMjUwOworICB9KSk7Cit9Cis8L3NjcmlwdD4KKyI+PC9pZnJhbWU+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427219</attachid>
            <date>2021-04-27 17:29:00 -0700</date>
            <delta_ts>2021-04-28 00:35:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222801-20210428102858.patch</filename>
            <type>text/plain</type>
            <size>7453</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmYxNWU3ZTg3OTkyNWMx
M2I1NjU0NmFiZjNiMTZjNjI4MTljMTdlNS4uZjQzOWQ3ZDA1NGFlNmI1NmFjMTZhMjM4NjE3NmE3
Zjc4NmEwZmMxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTI2ICBDYW1l
cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpbWcgZWxl
bWVudHMgcGVyZm9ybSBzb3VyY2Ugc2VsZWN0aW9uIGV2ZW4gd2hlbiBub3QgaW4gdGhlIGRvY3Vt
ZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy
ODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl
IHJ1bGVzIGZvciBpbWFnZSBzb3VyY2Ugc2VsZWN0aW9uIGluIHRoZSBIVE1MIHNwZWMgZG8gbm90
IHByZXZlbnQKKyAgICAgICAgdGhlbSBmcm9tIHJ1bm5pbmcgd2hlbiBhbiA8aW1nPiBpcyBub3Qg
aW4gdGhlIGRvY3VtZW50LiAgU28gd2UgdXBkYXRlCisgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQg
dG8gY2FsbCBzZWxlY3RJbWFnZVNvdXJjZSgpIHdoZW4gaW5zZXJ0ZWQgaW50byBhbmQKKyAgICAg
ICAgcmVtb3ZlZCBmcm9tIGEgPHBpY3R1cmU+IHdpdGhvdXQgY2hlY2tpbmcgd2hldGhlciBpdCdz
IGluIGEgZG9jdW1lbnQuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9z
b3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MuaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VF
bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6On5IVE1MSW1h
Z2VFbGVtZW50KTogUmVtb3ZlIHVzZWxlc3MgY2FsbCB0bworICAgICAgICBzZXRQaWN0dXJlRWxl
bWVudCwgc2luY2UgYWxsIGl0IGRvZXMgaXMgY2xlYXIgYSB3ZWFrIHBvaW50ZXIuCisgICAgICAg
IChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjppbnNlcnRlZEludG9BbmNlc3Rvcik6CisgICAg
ICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKToKKwog
MjAyMS0wNC0yNyAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgogCiAgICAg
ICAgIEFzc29jaWF0ZSBhIHBpY3R1cmUgZWxlbWVudCB3aXRoIGFuIGltZyBvbmx5IGlmIHRoZSBp
bWcgaXMgYSBkaXJlY3QgY2hpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxJbWFnZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50
LmNwcAppbmRleCBmYzM5N2Y5OTUwZTI2M2ZhOTcwM2IyNjQzY2M5N2QwMWZmNTA1MDExLi5kMDZh
MDA4ZTkxNGNlZTA5MjQ4NmY2MzgxYzViOWZjNGIwOTQzODU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKQEAgLTk0LDcgKzk0LDYgQEAgSFRNTEltYWdlRWxlbWVu
dDo6fkhUTUxJbWFnZUVsZW1lbnQoKQogCiAgICAgaWYgKG1fZm9ybSkKICAgICAgICAgbV9mb3Jt
LT5yZW1vdmVJbWdFbGVtZW50KHRoaXMpOwotICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIp
OwogfQogCiBSZWY8SFRNTEltYWdlRWxlbWVudD4gSFRNTEltYWdlRWxlbWVudDo6Y3JlYXRlRm9y
TGVnYWN5RmFjdG9yeUZ1bmN0aW9uKERvY3VtZW50JiBkb2N1bWVudCwgT3B0aW9uYWw8dW5zaWdu
ZWQ+IHdpZHRoLCBPcHRpb25hbDx1bnNpZ25lZD4gaGVpZ2h0KQpAQCAtMzg2LDE2ICszODUsOCBA
QCBOb2RlOjpJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdCBIVE1MSW1hZ2VFbGVtZW50OjppbnNl
cnRlZEludG9BbmNlc3RvcihJbnNlcnRpbwogICAgICAgICAvLyBGSVhNRTogV2hlbiB0aGUgaGFj
ayBpbiBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6Y3JlYXRlSFRNTEVsZW1lbnRPckZpbmRDdXN0b21F
bGVtZW50SW50ZXJmYWNlIHRvIGVhZ2VybHkgY2FsbCBzZXRQaWN0dXJlRWxlbWVudCBpcyByZW1v
dmVkLCB3ZSBjYW4ganVzdCBhc3NlcnQgIXBpY3R1cmVFbGVtZW50KCkuCiAgICAgICAgIEFTU0VS
VCghcGljdHVyZUVsZW1lbnQoKSB8fCBwaWN0dXJlRWxlbWVudCgpID09ICZwYXJlbnRPZkluc2Vy
dGVkVHJlZSk7CiAgICAgICAgIHNldFBpY3R1cmVFbGVtZW50KCZkb3duY2FzdDxIVE1MUGljdHVy
ZUVsZW1lbnQ+KHBhcmVudE9mSW5zZXJ0ZWRUcmVlKSk7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBz
aG91bGQgdW5jb25kaXRpb25hbGx5IGNhbGwgc2VsZWN0SW1hZ2VTb3VyY2Ugc28gdGhhdCBzb3Vy
Y2Ugc2VsZWN0aW9uIGlzIHBlcmZvcm1lZCBldmVuIGZvciA8aW1nPiBlbGVtZW50cyBvdXRzaWRl
IHRoZSBkb2N1bWVudC4KLSAgICAgICAgaWYgKGluc2VydGlvblR5cGUuY29ubmVjdGVkVG9Eb2N1
bWVudCkgewotICAgICAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2UoUmVsZXZhbnRNdXRhdGlvbjo6
WWVzKTsKLSAgICAgICAgICAgIHJldHVybiBpbnNlcnROb3RpZmljYXRpb25SZXF1ZXN0OwotICAg
ICAgICB9Ci0gICAgICAgIGF1dG8gY2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZyb21QaWN0dXJl
RWxlbWVudCgpOwotICAgICAgICBpZiAoIWNhbmRpZGF0ZS5pc0VtcHR5KCkpIHsKLSAgICAgICAg
ICAgIHNldEJlc3RGaXRVUkxBbmREUFJGcm9tSW1hZ2VDYW5kaWRhdGUoY2FuZGlkYXRlKTsKLSAg
ICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91
c0Vycm9yKFJlbGV2YW50TXV0YXRpb246Olllcyk7Ci0gICAgICAgIH0KKyAgICAgICAgc2VsZWN0
SW1hZ2VTb3VyY2UoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgcmV0dXJuIGluc2Vy
dE5vdGlmaWNhdGlvblJlcXVlc3Q7CiAgICAgfQogCiAgICAgLy8gSWYgd2UgaGF2ZSBiZWVuIGlu
c2VydGVkIGZyb20gYSByZW5kZXJlci1sZXNzIGRvY3VtZW50LApAQCAtNDE3LDggKzQwOCw3IEBA
IHZvaWQgSFRNTEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3RvcihSZW1vdmFsVHlwZSBy
ZW1vdmFsVHlwZSwgQ29udGFpbmVyTm9kCiAgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4o
b2xkUGFyZW50T2ZSZW1vdmVkVHJlZSkgJiYgIXBhcmVudEVsZW1lbnQoKSkgewogICAgICAgICBB
U1NFUlQocGljdHVyZUVsZW1lbnQoKSA9PSAmb2xkUGFyZW50T2ZSZW1vdmVkVHJlZSk7CiAgICAg
ICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIpOwotICAgICAgICAvLyBGSVhNRTogV2Ugc2hv
dWxkIGNhbGwgc2VsZWN0SW1hZ2VTb3VyY2Ugc28gdGhhdCBzb3VyY2Ugc2VsZWN0aW9uIGlzIHBl
cmZvcm1lZCwgbm93IHRoYXQgd2Ugbm8gbG9uZ2VyIGhhdmUgYSA8cGljdHVyZT4gY29udGV4dC4K
LSAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3Vz
RXJyb3IoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2Uo
UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAgICB9CiAKICAgICBtX2Zvcm0gPSBudWxscHRyOwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggZDNlNTc3MDFhMTc3ZjEyZjQ3NTE1MGZh
YWE0Nzk0NDE5YTYzYmM0YS4uYWIwNzEzMmZiZjcxOTQxOTliMDU2Nzk1ODIzMWJjZTY0ZDI4YTMw
ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEt
MDQtMjYgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KKworICAgICAgICBN
YWtlIGltZyBlbGVtZW50cyBwZXJmb3JtIHNvdXJjZSBzZWxlY3Rpb24gZXZlbiB3aGVuIG5vdCBp
biB0aGUgZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjI4MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250
ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MtZXhwZWN0ZWQudHh0
OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1i
ZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0
bWw6IEFkZGVkLgorCiAyMDIxLTA0LTI3ICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBs
ZS5jb20+CiAKICAgICAgICAgQXNzb2NpYXRlIGEgcGljdHVyZSBlbGVtZW50IHdpdGggYW4gaW1n
IG9ubHkgaWYgdGhlIGltZyBpcyBhIGRpcmVjdCBjaGlsZC4KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRk
ZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLWV4cGVj
dGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt
bC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlh
LW91dHNpZGUtZG9jLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YmVmMTkzM2U4MzM3NmQwMzhj
ZjFhYzM2MGE0YjIyMDkwZDMxYTNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250
ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MtZXhwZWN0ZWQudHh0
CkBAIC0wLDAgKzEsNCBAQAorCisKK1BBU1MgSW1hZ2Ugc291cmNlIHNlbGVjdGlvbiB1c2luZyBt
ZWRpYSBxdWVyaWVzIGlzIHBlcmZvcm1lZCBmb3IgaW1nIGVsZW1lbnRzIG91dHNpZGUgdGhlIGRv
Y3VtZW50CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQv
c291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlt
Zy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRvYy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI0YjJl
ODY1Zjc0MmVmYWExYjFlZWU2ZTM3ZGVjYzAxMjUxNTNhYWMKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRv
Yy5odG1sCkBAIC0wLDAgKzEsNDggQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPkltYWdlIHNv
dXJjZSBzZWxlY3Rpb24gdXNpbmcgbWVkaWEgcXVlcmllcyBpcyBwZXJmb3JtZWQgZm9yIGltZyBl
bGVtZW50cyBvdXRzaWRlIHRoZSBkb2N1bWVudDwvdGl0bGU+Cis8c2NyaXB0IHNyYz0iL3Jlc291
cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90
ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8aWZyYW1lIHdpZHRoPSIzNTAiIGhlaWdo
dD0iMTAwIiBvbmxvYWQ9ImFzeW5jX3Rlc3QodGhpcy5jb250ZW50V2luZG93LnJ1bikiIHNyY2Rv
Yz0iCis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQ+Citjb25zdCB7IGFzc2VydF9lcXVhbHMgfSA9
IHBhcmVudDsKK2NvbnN0IGlmcmFtZSA9IHBhcmVudC5kb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdp
ZnJhbWUnKTsKKworZnVuY3Rpb24gcnVuKHQpIHsKKyAgY29uc3QgcGljdHVyZSA9IGRvY3VtZW50
LmNyZWF0ZUVsZW1lbnQoJ3BpY3R1cmUnKTsKKworICBjb25zdCBzb3VyY2UxID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgnc291cmNlJyk7CisgIHNvdXJjZTEuc2V0QXR0cmlidXRlKCdtZWRpYScs
ICcobWluLXdpZHRoOiAzMDBweCknKTsKKyAgc291cmNlMS5zZXRBdHRyaWJ1dGUoJ3NyY3NldCcs
ICdkYXRhOixhJyk7CisgIHBpY3R1cmUuYXBwZW5kKHNvdXJjZTEpOworCisgIGNvbnN0IHNvdXJj
ZTIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzb3VyY2UnKTsKKyAgc291cmNlMi5zZXRBdHRy
aWJ1dGUoJ21lZGlhJywgJyhtaW4td2lkdGg6IDIwMHB4KScpOworICBzb3VyY2UyLnNldEF0dHJp
YnV0ZSgnc3Jjc2V0JywgJ2RhdGE6LGInKTsKKyAgcGljdHVyZS5hcHBlbmQoc291cmNlMik7CisK
KyAgY29uc3QgaW1nID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaW1nJyk7CisgIGltZy5zcmMg
PSAnZGF0YTosYyc7CisgIHBpY3R1cmUuYXBwZW5kKGltZyk7CisKKyAgcXVldWVNaWNyb3Rhc2so
dC5zdGVwX2Z1bmMoZnVuY3Rpb24oKSB7CisgICAgYXNzZXJ0X2VxdWFscyhpbWcuY3VycmVudFNy
YywgJ2RhdGE6LGEnLCAnSW5pdGlhbCBjdXJyZW50U3JjIHZhbHVlJyk7CisgICAgbWF0Y2hNZWRp
YShzb3VyY2UxLm1lZGlhKS5hZGRFdmVudExpc3RlbmVyKAorICAgICAgJ2NoYW5nZScsCisgICAg
ICBmdW5jdGlvbigpIHsKKyAgICAgICAgcXVldWVNaWNyb3Rhc2sodC5zdGVwX2Z1bmMoZnVuY3Rp
b24oKSB7CisgICAgICAgICAgYXNzZXJ0X2VxdWFscyhpbWcuY3VycmVudFNyYywgJ2RhdGE6LGIn
LCAnQWZ0ZXIgTVEgY2hhbmdlJyk7CisgICAgICAgICAgaW1nLnJlbW92ZSgpOworICAgICAgICAg
IHF1ZXVlTWljcm90YXNrKHQuc3RlcF9mdW5jKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgYXNz
ZXJ0X2VxdWFscyhpbWcuY3VycmVudFNyYywgJ2RhdGE6LGMnLCAnQWZ0ZXIgcmVtb3ZpbmcgaW1n
Jyk7CisgICAgICAgICAgICB0LmRvbmUoKTsKKyAgICAgICAgICB9KSk7CisgICAgICAgIH0pKTsK
KyAgICAgIH0sCisgICAgICB7IG9uY2U6IHRydWUgfQorICAgICk7CisgICAgaWZyYW1lLndpZHRo
ID0gMjUwOworICB9KSk7Cit9Cis8L3NjcmlwdD4KKyI+PC9pZnJhbWU+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427244</attachid>
            <date>2021-04-28 00:35:59 -0700</date>
            <delta_ts>2021-04-28 01:39:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222801-20210428173558.patch</filename>
            <type>text/plain</type>
            <size>7619</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmYxNWU3ZTg3OTkyNWMx
M2I1NjU0NmFiZjNiMTZjNjI4MTljMTdlNS4uYzYxNDFkNDJhYjdlZDViZDFkNzc3M2RmZGZmODgy
MTYyZDQxNjQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTI2ICBDYW1l
cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpbWcgZWxl
bWVudHMgcGVyZm9ybSBzb3VyY2Ugc2VsZWN0aW9uIGV2ZW4gd2hlbiBub3QgaW4gdGhlIGRvY3Vt
ZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy
ODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIFRoZSBy
dWxlcyBmb3IgaW1hZ2Ugc291cmNlIHNlbGVjdGlvbiBpbiB0aGUgSFRNTCBzcGVjIGRvIG5vdCBw
cmV2ZW50CisgICAgICAgIHRoZW0gZnJvbSBydW5uaW5nIHdoZW4gYW4gPGltZz4gaXMgbm90IGlu
IHRoZSBkb2N1bWVudC4gIFNvIHdlIHVwZGF0ZQorICAgICAgICBIVE1MSW1hZ2VFbGVtZW50IHRv
IGNhbGwgc2VsZWN0SW1hZ2VTb3VyY2UoKSB3aGVuIGluc2VydGVkIGludG8gYW5kCisgICAgICAg
IHJlbW92ZWQgZnJvbSBhIDxwaWN0dXJlPiB3aXRob3V0IGNoZWNraW5nIHdoZXRoZXIgaXQncyBp
biBhIGRvY3VtZW50LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291
cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTEltYWdlRWxl
bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50Ojp+SFRNTEltYWdl
RWxlbWVudCk6IFJlbW92ZSB1c2VsZXNzIGNhbGwgdG8KKyAgICAgICAgc2V0UGljdHVyZUVsZW1l
bnQsIHNpbmNlIGFsbCBpdCBkb2VzIGlzIGNsZWFyIGEgd2VhayBwb2ludGVyLgorICAgICAgICAo
V2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAgICAg
ICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3Rvcik6CisKIDIw
MjEtMDQtMjcgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KIAogICAgICAg
ICBBc3NvY2lhdGUgYSBwaWN0dXJlIGVsZW1lbnQgd2l0aCBhbiBpbWcgb25seSBpZiB0aGUgaW1n
IGlzIGEgZGlyZWN0IGNoaWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M
SW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5j
cHAKaW5kZXggZmMzOTdmOTk1MGUyNjNmYTk3MDNiMjY0M2NjOTdkMDFmZjUwNTAxMS4uZDA2YTAw
OGU5MTRjZWUwOTI0ODZmNjM4MWM1YjlmYzRiMDk0Mzg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxJbWFnZUVsZW1lbnQuY3BwCkBAIC05NCw3ICs5NCw2IEBAIEhUTUxJbWFnZUVsZW1lbnQ6
On5IVE1MSW1hZ2VFbGVtZW50KCkKIAogICAgIGlmIChtX2Zvcm0pCiAgICAgICAgIG1fZm9ybS0+
cmVtb3ZlSW1nRWxlbWVudCh0aGlzKTsKLSAgICBzZXRQaWN0dXJlRWxlbWVudChudWxscHRyKTsK
IH0KIAogUmVmPEhUTUxJbWFnZUVsZW1lbnQ+IEhUTUxJbWFnZUVsZW1lbnQ6OmNyZWF0ZUZvckxl
Z2FjeUZhY3RvcnlGdW5jdGlvbihEb2N1bWVudCYgZG9jdW1lbnQsIE9wdGlvbmFsPHVuc2lnbmVk
PiB3aWR0aCwgT3B0aW9uYWw8dW5zaWduZWQ+IGhlaWdodCkKQEAgLTM4NiwxNiArMzg1LDggQEAg
Tm9kZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0
ZWRJbnRvQW5jZXN0b3IoSW5zZXJ0aW8KICAgICAgICAgLy8gRklYTUU6IFdoZW4gdGhlIGhhY2sg
aW4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmNyZWF0ZUhUTUxFbGVtZW50T3JGaW5kQ3VzdG9tRWxl
bWVudEludGVyZmFjZSB0byBlYWdlcmx5IGNhbGwgc2V0UGljdHVyZUVsZW1lbnQgaXMgcmVtb3Zl
ZCwgd2UgY2FuIGp1c3QgYXNzZXJ0ICFwaWN0dXJlRWxlbWVudCgpLgogICAgICAgICBBU1NFUlQo
IXBpY3R1cmVFbGVtZW50KCkgfHwgcGljdHVyZUVsZW1lbnQoKSA9PSAmcGFyZW50T2ZJbnNlcnRl
ZFRyZWUpOwogICAgICAgICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVF
bGVtZW50PihwYXJlbnRPZkluc2VydGVkVHJlZSkpOwotICAgICAgICAvLyBGSVhNRTogV2Ugc2hv
dWxkIHVuY29uZGl0aW9uYWxseSBjYWxsIHNlbGVjdEltYWdlU291cmNlIHNvIHRoYXQgc291cmNl
IHNlbGVjdGlvbiBpcyBwZXJmb3JtZWQgZXZlbiBmb3IgPGltZz4gZWxlbWVudHMgb3V0c2lkZSB0
aGUgZG9jdW1lbnQuCi0gICAgICAgIGlmIChpbnNlcnRpb25UeXBlLmNvbm5lY3RlZFRvRG9jdW1l
bnQpIHsKLSAgICAgICAgICAgIHNlbGVjdEltYWdlU291cmNlKFJlbGV2YW50TXV0YXRpb246Olll
cyk7Ci0gICAgICAgICAgICByZXR1cm4gaW5zZXJ0Tm90aWZpY2F0aW9uUmVxdWVzdDsKLSAgICAg
ICAgfQotICAgICAgICBhdXRvIGNhbmRpZGF0ZSA9IGJlc3RGaXRTb3VyY2VGcm9tUGljdHVyZUVs
ZW1lbnQoKTsKLSAgICAgICAgaWYgKCFjYW5kaWRhdGUuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAg
ICBzZXRCZXN0Rml0VVJMQW5kRFBSRnJvbUltYWdlQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7Ci0gICAg
ICAgICAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNF
cnJvcihSZWxldmFudE11dGF0aW9uOjpZZXMpOwotICAgICAgICB9CisgICAgICAgIHNlbGVjdElt
YWdlU291cmNlKFJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgICAgIHJldHVybiBpbnNlcnRO
b3RpZmljYXRpb25SZXF1ZXN0OwogICAgIH0KIAogICAgIC8vIElmIHdlIGhhdmUgYmVlbiBpbnNl
cnRlZCBmcm9tIGEgcmVuZGVyZXItbGVzcyBkb2N1bWVudCwKQEAgLTQxNyw4ICs0MDgsNyBAQCB2
b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnJlbW92ZWRGcm9tQW5jZXN0b3IoUmVtb3ZhbFR5cGUgcmVt
b3ZhbFR5cGUsIENvbnRhaW5lck5vZAogICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KG9s
ZFBhcmVudE9mUmVtb3ZlZFRyZWUpICYmICFwYXJlbnRFbGVtZW50KCkpIHsKICAgICAgICAgQVNT
RVJUKHBpY3R1cmVFbGVtZW50KCkgPT0gJm9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpOwogICAgICAg
ICBzZXRQaWN0dXJlRWxlbWVudChudWxscHRyKTsKLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs
ZCBjYWxsIHNlbGVjdEltYWdlU291cmNlIHNvIHRoYXQgc291cmNlIHNlbGVjdGlvbiBpcyBwZXJm
b3JtZWQsIG5vdyB0aGF0IHdlIG5vIGxvbmdlciBoYXZlIGEgPHBpY3R1cmU+IGNvbnRleHQuCi0g
ICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vy
cm9yKFJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgICAgIHNlbGVjdEltYWdlU291cmNlKFJl
bGV2YW50TXV0YXRpb246Olllcyk7CiAgICAgfQogCiAgICAgbV9mb3JtID0gbnVsbHB0cjsKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGQzZTU3NzAxYTE3N2YxMmY0NzUxNTBmYWFh
NDc5NDQxOWE2M2JjNGEuLmI1ZDU1ZDVhMTNiMzI1NGMwODUwZTU5NzRhNjliZTMzYWNiMDA5ZjYg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA0
LTI2ICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFr
ZSBpbWcgZWxlbWVudHMgcGVyZm9ybSBzb3VyY2Ugc2VsZWN0aW9uIGV2ZW4gd2hlbiBub3QgaW4g
dGhlIGRvY3VtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAg
ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQv
dGhlLWltZy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRvYy1leHBlY3RlZC50eHQ6IEFk
ZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRl
ZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MuaHRtbDog
QWRkZWQuCisKIDIwMjEtMDQtMjcgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNv
bT4KIAogICAgICAgICBBc3NvY2lhdGUgYSBwaWN0dXJlIGVsZW1lbnQgd2l0aCBhbiBpbWcgb25s
eSBpZiB0aGUgaW1nIGlzIGEgZGlyZWN0IGNoaWxkLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j
b250ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0c2lkZS1kb2MtZXhwZWN0ZWQu
dHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3Nl
bWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9zb3VyY2UtbWVkaWEtb3V0
c2lkZS1kb2MtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRiZWYxOTMzZTgzMzc2ZDAzOGNmMWFj
MzYwYTRiMjIwOTBkMzFhM2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQv
dGhlLWltZy1lbGVtZW50L3NvdXJjZS1tZWRpYS1vdXRzaWRlLWRvYy1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSw0IEBACisKKworUEFTUyBJbWFnZSBzb3VyY2Ugc2VsZWN0aW9uIHVzaW5nIG1lZGlh
IHF1ZXJpZXMgaXMgcGVyZm9ybWVkIGZvciBpbWcgZWxlbWVudHMgb3V0c2lkZSB0aGUgZG9jdW1l
bnQKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9zb3Vy
Y2UtbWVkaWEtb3V0c2lkZS1kb2MuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVs
ZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTk5N2UxNGU0
YmNmMjMwYWUyZDNlMDQ4ZjBhNmRkZGMwYjAyZjhmYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1i
ZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvc291cmNlLW1lZGlhLW91dHNpZGUtZG9jLmh0
bWwKQEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+SW1hZ2Ugc291cmNl
IHNlbGVjdGlvbiB1c2luZyBtZWRpYSBxdWVyaWVzIGlzIHBlcmZvcm1lZCBmb3IgaW1nIGVsZW1l
bnRzIG91dHNpZGUgdGhlIGRvY3VtZW50PC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0i
aHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy8jcmVhY3RpbmctdG8tZW52aXJvbm1lbnQtY2hh
bmdlcyI+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5v
cmcvI3JlYWN0aW5nLXRvLWRvbS1tdXRhdGlvbnMiPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMv
dGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhh
cm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPGlmcmFtZSB3aWR0aD0iMzUwIiBoZWlnaHQ9IjEw
MCIgb25sb2FkPSJhc3luY190ZXN0KHRoaXMuY29udGVudFdpbmRvdy5ydW4pIiBzcmNkb2M9Igor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0PgorY29uc3QgeyBhc3NlcnRfZXF1YWxzIH0gPSBwYXJl
bnQ7Citjb25zdCBpZnJhbWUgPSBwYXJlbnQuZG9jdW1lbnQucXVlcnlTZWxlY3RvcignaWZyYW1l
Jyk7CisKK2Z1bmN0aW9uIHJ1bih0KSB7CisgIGNvbnN0IHBpY3R1cmUgPSBkb2N1bWVudC5jcmVh
dGVFbGVtZW50KCdwaWN0dXJlJyk7CisKKyAgY29uc3Qgc291cmNlMSA9IGRvY3VtZW50LmNyZWF0
ZUVsZW1lbnQoJ3NvdXJjZScpOworICBzb3VyY2UxLnNldEF0dHJpYnV0ZSgnbWVkaWEnLCAnKG1p
bi13aWR0aDogMzAwcHgpJyk7CisgIHNvdXJjZTEuc2V0QXR0cmlidXRlKCdzcmNzZXQnLCAnZGF0
YTosYScpOworICBwaWN0dXJlLmFwcGVuZChzb3VyY2UxKTsKKworICBjb25zdCBzb3VyY2UyID0g
ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc291cmNlJyk7CisgIHNvdXJjZTIuc2V0QXR0cmlidXRl
KCdtZWRpYScsICcobWluLXdpZHRoOiAyMDBweCknKTsKKyAgc291cmNlMi5zZXRBdHRyaWJ1dGUo
J3NyY3NldCcsICdkYXRhOixiJyk7CisgIHBpY3R1cmUuYXBwZW5kKHNvdXJjZTIpOworCisgIGNv
bnN0IGltZyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2ltZycpOworICBpbWcuc3JjID0gJ2Rh
dGE6LGMnOworICBwaWN0dXJlLmFwcGVuZChpbWcpOworCisgIHF1ZXVlTWljcm90YXNrKHQuc3Rl
cF9mdW5jKGZ1bmN0aW9uKCkgeworICAgIGFzc2VydF9lcXVhbHMoaW1nLmN1cnJlbnRTcmMsICdk
YXRhOixhJywgJ0luaXRpYWwgY3VycmVudFNyYyB2YWx1ZScpOworICAgIG1hdGNoTWVkaWEoc291
cmNlMS5tZWRpYSkuYWRkRXZlbnRMaXN0ZW5lcigKKyAgICAgICdjaGFuZ2UnLAorICAgICAgZnVu
Y3Rpb24oKSB7CisgICAgICAgIHF1ZXVlTWljcm90YXNrKHQuc3RlcF9mdW5jKGZ1bmN0aW9uKCkg
eworICAgICAgICAgIGFzc2VydF9lcXVhbHMoaW1nLmN1cnJlbnRTcmMsICdkYXRhOixiJywgJ0Fm
dGVyIE1RIGNoYW5nZScpOworICAgICAgICAgIGltZy5yZW1vdmUoKTsKKyAgICAgICAgICBxdWV1
ZU1pY3JvdGFzayh0LnN0ZXBfZnVuYyhmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIGFzc2VydF9l
cXVhbHMoaW1nLmN1cnJlbnRTcmMsICdkYXRhOixjJywgJ0FmdGVyIHJlbW92aW5nIGltZycpOwor
ICAgICAgICAgICAgdC5kb25lKCk7CisgICAgICAgICAgfSkpOworICAgICAgICB9KSk7CisgICAg
ICB9LAorICAgICAgeyBvbmNlOiB0cnVlIH0KKyAgICApOworICAgIGlmcmFtZS53aWR0aCA9IDI1
MDsKKyAgfSkpOworfQorPC9zY3JpcHQ+CisiPjwvaWZyYW1lPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>