<?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>223191</bug_id>
          
          <creation_ts>2021-03-15 10:14:16 -0700</creation_ts>
          <short_desc>Attempt to restore highlights after paint to account for newly loaded content.</short_desc>
          <delta_ts>2021-03-16 11:44:46 -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>thorton</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1739501</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 10:14:16 -0700</bug_when>
    <thetext>Attempt to restore highlights after paint to account for newly loaded content.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739503</commentid>
    <comment_count>1</comment_count>
      <attachid>423193</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 10:17:41 -0700</bug_when>
    <thetext>Created attachment 423193
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739505</commentid>
    <comment_count>2</comment_count>
      <attachid>423193</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-03-15 10:28:35 -0700</bug_when>
    <thetext>Comment on attachment 423193
Patch

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

&gt; Source/WebCore/page/Page.cpp:1614
&gt; +        if (MonotonicTime() - document.appHighlightStorage().lastRangeSearchTime()  &gt; 1_s) {

Extra space before &gt;

Isn&apos;t this going to create the appHighlightStorage if it doesn&apos;t exist? Maybe you want to use &quot;IfExists&quot;?

&gt; Source/WebCore/page/Page.cpp:1615
&gt; +            document.eventLoop().queueTask(TaskSource::InternalAsyncTask, [weakDocument = makeWeakPtr(document)] {

Probably should not even bother enqueueing the task if you don&apos;t have any remaining outstanding highlights.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739506</commentid>
    <comment_count>3</comment_count>
      <attachid>423193</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-03-15 10:30:03 -0700</bug_when>
    <thetext>Comment on attachment 423193
Patch

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

&gt; Source/WebCore/page/Page.cpp:1621
&gt; +                    appHighlightStorage-&gt;restoreUnrestoredAppHighlights();

It seems like you&apos;re going to queue up a ton of these when you paint quickly, right?? Nothing ever sets m_timeAtLastRangeSearch...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739507</commentid>
    <comment_count>4</comment_count>
      <attachid>423193</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-03-15 10:30:41 -0700</bug_when>
    <thetext>Comment on attachment 423193
Patch

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

&gt;&gt; Source/WebCore/page/Page.cpp:1621
&gt;&gt; +                    appHighlightStorage-&gt;restoreUnrestoredAppHighlights();
&gt; 
&gt; It seems like you&apos;re going to queue up a ton of these when you paint quickly, right?? Nothing ever sets m_timeAtLastRangeSearch...

... until you actually run this, but in the meantime you could have queued up hundreds.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739530</commentid>
    <comment_count>5</comment_count>
      <attachid>423193</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-03-15 10:57:37 -0700</bug_when>
    <thetext>Comment on attachment 423193
Patch

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

&gt; Source/WebCore/Modules/highlight/AppHighlightStorage.cpp:268
&gt; +    m_timeAtLastRangeSearch = MonotonicTime();

Did you mean to use `MonotonicTime::now()`? From a glance, it seems like the time offset computed inside the if statement below (`MonotonicTime() - document.appHighlightStorage().lastRangeSearchTime()`) will always be 0_s.

&gt; Source/WebCore/Modules/highlight/AppHighlightStorage.h:59
&gt; +    MonotonicTime lastRangeSearchTime() { return m_timeAtLastRangeSearch; };

Nit - lastRangeSearchTime() should be marked `const`. You can remove the extra &quot;;&quot; at the end of the method definition.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739574</commentid>
    <comment_count>6</comment_count>
      <attachid>423214</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 12:13:20 -0700</bug_when>
    <thetext>Created attachment 423214
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739579</commentid>
    <comment_count>7</comment_count>
      <attachid>423214</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-03-15 12:22:07 -0700</bug_when>
    <thetext>Comment on attachment 423214
Patch

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

&gt; Source/WebCore/page/Page.cpp:1615
&gt; +            if (MonotonicTime() - appHighlightStorage-&gt;lastRangeSearchTime() &gt; 1_s) {

This looks like it&apos;s still subtracting the last range search time from 1/1/1970.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739655</commentid>
    <comment_count>8</comment_count>
      <attachid>423234</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 14:00:35 -0700</bug_when>
    <thetext>Created attachment 423234
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739747</commentid>
    <comment_count>9</comment_count>
      <attachid>423266</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 17:13:34 -0700</bug_when>
    <thetext>Created attachment 423266
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739748</commentid>
    <comment_count>10</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 17:14:00 -0700</bug_when>
    <thetext>rdar://74722200</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739800</commentid>
    <comment_count>11</comment_count>
      <attachid>423283</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 19:26:25 -0700</bug_when>
    <thetext>Created attachment 423283
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739819</commentid>
    <comment_count>12</comment_count>
      <attachid>423291</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 20:32:13 -0700</bug_when>
    <thetext>Created attachment 423291
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739821</commentid>
    <comment_count>13</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-03-15 20:42:16 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #4)
&gt; Comment on attachment 423193 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=423193&amp;action=review
&gt; 
&gt; &gt;&gt; Source/WebCore/page/Page.cpp:1621
&gt; &gt;&gt; +                    appHighlightStorage-&gt;restoreUnrestoredAppHighlights();
&gt; &gt; 
&gt; &gt; It seems like you&apos;re going to queue up a ton of these when you paint quickly, right?? Nothing ever sets m_timeAtLastRangeSearch...
&gt; 
&gt; ... until you actually run this, but in the meantime you could have queued
&gt; up hundreds.

I don&apos;t think you&apos;ve fixed this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739845</commentid>
    <comment_count>14</comment_count>
      <attachid>423302</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-15 22:53:07 -0700</bug_when>
    <thetext>Created attachment 423302
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739848</commentid>
    <comment_count>15</comment_count>
      <attachid>423302</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-03-15 23:05:53 -0700</bug_when>
    <thetext>Comment on attachment 423302
Patch

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

&gt; Source/WebCore/page/Page.cpp:1614
&gt; +        if (auto appHighlightStorage = document.appHighlightStorageIfExists()) {

This could just be an early return, since you&apos;re in a lambda</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739952</commentid>
    <comment_count>16</comment_count>
      <attachid>423334</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-16 08:40:15 -0700</bug_when>
    <thetext>Created attachment 423334
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1740056</commentid>
    <comment_count>17</comment_count>
      <attachid>423361</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-03-16 11:12:07 -0700</bug_when>
    <thetext>Created attachment 423361
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1740074</commentid>
    <comment_count>18</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-03-16 11:44:45 -0700</bug_when>
    <thetext>Committed r274501: &lt;https://commits.webkit.org/r274501&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 423361.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423193</attachid>
            <date>2021-03-15 10:17:41 -0700</date>
            <delta_ts>2021-03-15 12:13:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315101740.patch</filename>
            <type>text/plain</type>
            <size>4226</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uODE3MjgwOWJhZjIwYzQ3YTQzODljYjNhMmVkMGRj
NzhmNTdjZTEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdo
bGlnaHRzKToKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdl
Lmg6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRv
QWZ0ZXJVcGRhdGVSZW5kZXJpbmcpOgorCiAyMDIxLTAzLTEyICBTYWlkIEFib3UtSGFsbGF3YSAg
PHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gaW5zcGVjdG9yL2NhbnZh
cy9tZW1vcnkuaHRtbCBmYWlscyB3aGVuIEdQVSByZW5kZXJpbmcgaXMgZW5hYmxlZCBmb3IgMkQg
Q2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBI
aWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0Fw
cEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDhjMzVkMDE3OGI0ZmE4YmJjYmI0MzkzMDE5NTRm
NTFmNzU5NGM4YWEuLmEwMGQyZjI2MTExYzIxMTM0NmUyZWM4OGY0NWYwYjNlMzI5MGNkZjcgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0
b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hs
aWdodFN0b3JhZ2UuY3BwCkBAIC0yNjUsNiArMjY1LDcgQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9y
YWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQogICAgICAgICBlbHNlCiAgICAg
ICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdo
bGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKICAgICB9CisgICAgbV90aW1lQXRM
YXN0UmFuZ2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lKCk7CiAgICAgbV91bnJlc3RvcmVkSGlnaGxp
Z2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIGIvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4
NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFhNDg5YjYuLjUwNGQwN2Y4ZDRhMGZhMGE3
MjM3NzFiMzQ1MzkyMmQ3YjMwNGJlMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAK
ICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYv
TW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25TZXQuaD4KICNpbmNsdWRlIDx3
dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgpAQCAtMzksMTAgKzQw
LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsK
IGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVmZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7
CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3MgQ3JlYXRlTmV3R3JvdXBGb3JIaWdobGln
aHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVXaXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBO
bywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVk
PEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1
YmxpYzoKQEAgLTUyLDkgKzU2LDExIEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk
IHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5nZT4mJik7CiAgICAgV0VCQ09SRV9FWFBP
UlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOwogICAgIHZv
aWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7CisgICAgTW9ub3RvbmljVGltZSBs
YXN0UmFuZ2VTZWFyY2hUaW1lKCkgeyByZXR1cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH07
CiAKIHByaXZhdGU6CiAgICAgV2Vha1B0cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKKyAgICBNb25v
dG9uaWNUaW1lIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoOwogICAgIFZlY3RvcjxBcHBIaWdobGln
aHRSYW5nZURhdGE+IG1fdW5yZXN0b3JlZEhpZ2hsaWdodHM7CiB9OwogCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw
cAppbmRleCBiMjU0YzZhMTczOWE5ZTJjMTUwNjJmOWEzZTlmNWFmNThlNDYwNDJjLi4xODNhOWNi
ZmNiM2Y1N2U4MGMzMDExNGFmYjcwMDQ0YWFjZjBmZWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAg
LTIzLDYgKzIzLDcgQEAKICNpbmNsdWRlICJBY3Rpdml0eVN0YXRlQ2hhbmdlT2JzZXJ2ZXIuaCIK
ICNpbmNsdWRlICJBbHRlcm5hdGl2ZVRleHRDbGllbnQuaCIKICNpbmNsdWRlICJBbmltYXRpb25G
cmFtZVJhdGUuaCIKKyNpbmNsdWRlICJBcHBIaWdobGlnaHRTdG9yYWdlLmgiCiAjaW5jbHVkZSAi
QXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNpbmNsdWRlICJBdXRoZW50aWNhdG9yQ29vcmRp
bmF0b3IuaCIKICNpbmNsdWRlICJCYWNrRm9yd2FyZENhY2hlLmgiCkBAIC0xNjA4LDYgKzE2MDks
MTkgQEAgdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKCkKICAgICBmb3JFYWNoRG9j
dW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewogICAgICAgICBkb2N1bWVudC51cGRhdGVI
aWdobGlnaHRQb3NpdGlvbnMoKTsKICAgICB9KTsKKyAgICAKKyAgICBmb3JFYWNoRG9jdW1lbnQo
W10gKERvY3VtZW50JiBkb2N1bWVudCkgeworICAgICAgICBpZiAoTW9ub3RvbmljVGltZSgpIC0g
ZG9jdW1lbnQuYXBwSGlnaGxpZ2h0U3RvcmFnZSgpLmxhc3RSYW5nZVNlYXJjaFRpbWUoKSAgPiAx
X3MpIHsKKyAgICAgICAgICAgIGRvY3VtZW50LmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291
cmNlOjpJbnRlcm5hbEFzeW5jVGFzaywgW3dlYWtEb2N1bWVudCA9IG1ha2VXZWFrUHRyKGRvY3Vt
ZW50KV0geworICAgICAgICAgICAgICAgIGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRyKHdlYWtE
b2N1bWVudC5nZXQoKSk7CisgICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAg
ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIGFwcEhpZ2hs
aWdodFN0b3JhZ2UgPSBkb2N1bWVudC0+YXBwSGlnaGxpZ2h0U3RvcmFnZUlmRXhpc3RzKCkpCisg
ICAgICAgICAgICAgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJlc3RvcmVVbnJlc3RvcmVk
QXBwSGlnaGxpZ2h0cygpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKIAog
I2lmIEVOQUJMRShWSURFTykKICAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1
bWVudCkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423214</attachid>
            <date>2021-03-15 12:13:20 -0700</date>
            <delta_ts>2021-03-15 14:00:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315121319.patch</filename>
            <type>text/plain</type>
            <size>4747</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uODE3MjgwOWJhZjIwYzQ3YTQzODljYjNhMmVkMGRj
NzhmNTdjZTEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdo
bGlnaHRzKToKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdl
Lmg6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRv
QWZ0ZXJVcGRhdGVSZW5kZXJpbmcpOgorCiAyMDIxLTAzLTEyICBTYWlkIEFib3UtSGFsbGF3YSAg
PHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gaW5zcGVjdG9yL2NhbnZh
cy9tZW1vcnkuaHRtbCBmYWlscyB3aGVuIEdQVSByZW5kZXJpbmcgaXMgZW5hYmxlZCBmb3IgMkQg
Q2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBI
aWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0Fw
cEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDhjMzVkMDE3OGI0ZmE4YmJjYmI0MzkzMDE5NTRm
NTFmNzU5NGM4YWEuLmYwZTQwZDIxZjg0ZjBiOTI1Y2NiMGMxZjkwZmJhMjMzODZhN2IxY2IgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0
b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hs
aWdodFN0b3JhZ2UuY3BwCkBAIC0yNDYsNiArMjQ2LDggQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9y
YWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVmZmVyKQogICAg
ICAgICBtX3VucmVzdG9yZWRIaWdobGlnaHRzLmFwcGVuZChhcHBIaWdobGlnaHRSYW5nZURhdGEu
dmFsdWUoKSk7CiAgICAgZWxzZQogICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0
UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsK
KyAgICAKKyAgICBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaCA9IE1vbm90b25pY1RpbWU6Om5vdygp
OwogfQogCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGln
aGxpZ2h0cygpCkBAIC0yNjUsNiArMjY3LDcgQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpy
ZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQogICAgICAgICBlbHNlCiAgICAgICAgICAg
ICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQo
U3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKICAgICB9CisgICAgbV90aW1lQXRMYXN0UmFu
Z2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKICAgICBtX3VucmVzdG9yZWRIaWdobGln
aHRzID0gV1RGTW92ZShyZW1haW5pbmdSYW5nZXMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmggYi9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKaW5kZXggNjg1
MDAzMTVkYmQ0OTdiYTJhMmIzOWZjMDUzNmMwYTY5MWE0ODliNi4uM2Q1OTlkNDZlZDI4MzExZTA5
YjE0NzU0NGU5Mjk5YTNlZWU2YmVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl
cy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v
ZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaApAQCAtMjYsNiArMjYsNyBAQAog
I3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgorI2luY2x1ZGUgPHd0Zi9N
b25vdG9uaWNUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0
Zi9PcHRpb25hbC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC0zOSwxMCArNDAs
MTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQXBwSGlnaGxpZ2h0UmFuZ2VEYXRhOwog
Y2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CitjbGFzcyBTdGF0aWNSYW5nZTsK
IGNsYXNzIEhpZ2hsaWdodDsKIAogZW51bSBjbGFzcyBDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdo
dCA6IGJvb2w7CiAKK2VudW0gY2xhc3MgUmVzdG9yZVdpdGhUZXh0U2VhcmNoIDogYm9vbCB7IE5v
LCBZZXMgfTsKKwogY2xhc3MgQXBwSGlnaGxpZ2h0U3RvcmFnZSBmaW5hbCA6IFJlZkNvdW50ZWQ8
QXBwSGlnaGxpZ2h0U3RvcmFnZT4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVi
bGljOgpAQCAtNTIsOSArNTYsMTEgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg
c3RvcmVBcHBIaWdobGlnaHQoUmVmPFN0YXRpY1JhbmdlPiYmKTsKICAgICBXRUJDT1JFX0VYUE9S
VCB2b2lkIHJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJik7CiAgICAgdm9p
ZCByZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyAgICBNb25vdG9uaWNUaW1lIGxh
c3RSYW5nZVNlYXJjaFRpbWUoKSBjb25zdCB7IHJldHVybiBtX3RpbWVBdExhc3RSYW5nZVNlYXJj
aDsgfQogCiBwcml2YXRlOgogICAgIFdlYWtQdHI8RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAg
TW9ub3RvbmljVGltZSBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaDsKICAgICBWZWN0b3I8QXBwSGln
aGxpZ2h0UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn
ZS5jcHAKaW5kZXggYjI1NGM2YTE3MzlhOWUyYzE1MDYyZjlhM2U5ZjVhZjU4ZTQ2MDQyYy4uODVi
ZjhiOWEwN2RlZjY3ZWMzNDlmYmM0ZmE2MjliZWEyNTQ1MTZhMSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw
CkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAiQWN0aXZpdHlTdGF0ZUNoYW5nZU9ic2VydmVy
LmgiCiAjaW5jbHVkZSAiQWx0ZXJuYXRpdmVUZXh0Q2xpZW50LmgiCiAjaW5jbHVkZSAiQW5pbWF0
aW9uRnJhbWVSYXRlLmgiCisjaW5jbHVkZSAiQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIgogI2luY2x1
ZGUgIkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiQXV0aGVudGljYXRvckNv
b3JkaW5hdG9yLmgiCiAjaW5jbHVkZSAiQmFja0ZvcndhcmRDYWNoZS5oIgpAQCAtMTYwOCw2ICsx
NjA5LDIxIEBAIHZvaWQgUGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiAgICAgZm9yRWFj
aERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9jdW1lbnQudXBk
YXRlSGlnaGxpZ2h0UG9zaXRpb25zKCk7CiAgICAgfSk7CisgICAgCisgICAgZm9yRWFjaERvY3Vt
ZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKGF1dG8gYXBwSGlnaGxp
Z2h0U3RvcmFnZSA9IGRvY3VtZW50LmFwcEhpZ2hsaWdodFN0b3JhZ2VJZkV4aXN0cygpKSB7Cisg
ICAgICAgICAgICBpZiAoTW9ub3RvbmljVGltZSgpIC0gYXBwSGlnaGxpZ2h0U3RvcmFnZS0+bGFz
dFJhbmdlU2VhcmNoVGltZSgpID4gMV9zKSB7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZXZl
bnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6OkludGVybmFsQXN5bmNUYXNrLCBbd2Vha0Rv
Y3VtZW50ID0gbWFrZVdlYWtQdHIoZG9jdW1lbnQpXSB7CisgICAgICAgICAgICAgICAgICAgIGF1
dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRyKHdlYWtEb2N1bWVudC5nZXQoKSk7CisgICAgICAgICAg
ICAgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47
CisKKyAgICAgICAgICAgICAgICAgICAgaWYgKGF1dG8qIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBk
b2N1bWVudC0+YXBwSGlnaGxpZ2h0U3RvcmFnZUlmRXhpc3RzKCkpCisgICAgICAgICAgICAgICAg
ICAgICAgICBhcHBIaWdobGlnaHRTdG9yYWdlLT5yZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdo
dHMoKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg
IH0pOwogCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIGZvckVhY2hEb2N1bWVudChbXSAoRG9jdW1l
bnQmIGRvY3VtZW50KSB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423234</attachid>
            <date>2021-03-15 14:00:35 -0700</date>
            <delta_ts>2021-03-15 17:13:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315140034.patch</filename>
            <type>text/plain</type>
            <size>4781</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uODE3MjgwOWJhZjIwYzQ3YTQzODljYjNhMmVkMGRj
NzhmNTdjZTEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdo
bGlnaHRzKToKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdl
Lmg6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRv
QWZ0ZXJVcGRhdGVSZW5kZXJpbmcpOgorCiAyMDIxLTAzLTEyICBTYWlkIEFib3UtSGFsbGF3YSAg
PHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gaW5zcGVjdG9yL2NhbnZh
cy9tZW1vcnkuaHRtbCBmYWlscyB3aGVuIEdQVSByZW5kZXJpbmcgaXMgZW5hYmxlZCBmb3IgMkQg
Q2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBI
aWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0Fw
cEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDhjMzVkMDE3OGI0ZmE4YmJjYmI0MzkzMDE5NTRm
NTFmNzU5NGM4YWEuLmYwZTQwZDIxZjg0ZjBiOTI1Y2NiMGMxZjkwZmJhMjMzODZhN2IxY2IgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0
b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hs
aWdodFN0b3JhZ2UuY3BwCkBAIC0yNDYsNiArMjQ2LDggQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9y
YWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVmZmVyKQogICAg
ICAgICBtX3VucmVzdG9yZWRIaWdobGlnaHRzLmFwcGVuZChhcHBIaWdobGlnaHRSYW5nZURhdGEu
dmFsdWUoKSk7CiAgICAgZWxzZQogICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0
UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsK
KyAgICAKKyAgICBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaCA9IE1vbm90b25pY1RpbWU6Om5vdygp
OwogfQogCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGln
aGxpZ2h0cygpCkBAIC0yNjUsNiArMjY3LDcgQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpy
ZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQogICAgICAgICBlbHNlCiAgICAgICAgICAg
ICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQo
U3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKICAgICB9CisgICAgbV90aW1lQXRMYXN0UmFu
Z2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKICAgICBtX3VucmVzdG9yZWRIaWdobGln
aHRzID0gV1RGTW92ZShyZW1haW5pbmdSYW5nZXMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmggYi9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKaW5kZXggNjg1
MDAzMTVkYmQ0OTdiYTJhMmIzOWZjMDUzNmMwYTY5MWE0ODliNi4uM2Q1OTlkNDZlZDI4MzExZTA5
YjE0NzU0NGU5Mjk5YTNlZWU2YmVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl
cy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v
ZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaApAQCAtMjYsNiArMjYsNyBAQAog
I3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgorI2luY2x1ZGUgPHd0Zi9N
b25vdG9uaWNUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0
Zi9PcHRpb25hbC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC0zOSwxMCArNDAs
MTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQXBwSGlnaGxpZ2h0UmFuZ2VEYXRhOwog
Y2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CitjbGFzcyBTdGF0aWNSYW5nZTsK
IGNsYXNzIEhpZ2hsaWdodDsKIAogZW51bSBjbGFzcyBDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdo
dCA6IGJvb2w7CiAKK2VudW0gY2xhc3MgUmVzdG9yZVdpdGhUZXh0U2VhcmNoIDogYm9vbCB7IE5v
LCBZZXMgfTsKKwogY2xhc3MgQXBwSGlnaGxpZ2h0U3RvcmFnZSBmaW5hbCA6IFJlZkNvdW50ZWQ8
QXBwSGlnaGxpZ2h0U3RvcmFnZT4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVi
bGljOgpAQCAtNTIsOSArNTYsMTEgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg
c3RvcmVBcHBIaWdobGlnaHQoUmVmPFN0YXRpY1JhbmdlPiYmKTsKICAgICBXRUJDT1JFX0VYUE9S
VCB2b2lkIHJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJik7CiAgICAgdm9p
ZCByZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyAgICBNb25vdG9uaWNUaW1lIGxh
c3RSYW5nZVNlYXJjaFRpbWUoKSBjb25zdCB7IHJldHVybiBtX3RpbWVBdExhc3RSYW5nZVNlYXJj
aDsgfQogCiBwcml2YXRlOgogICAgIFdlYWtQdHI8RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAg
TW9ub3RvbmljVGltZSBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaDsKICAgICBWZWN0b3I8QXBwSGln
aGxpZ2h0UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn
ZS5jcHAKaW5kZXggYjI1NGM2YTE3MzlhOWUyYzE1MDYyZjlhM2U5ZjVhZjU4ZTQ2MDQyYy4uM2Y5
YWYxNTg5ZmI3YWU0MGNmNmNlNjQ2NTU5YmYzNDI4NTg3YTRiZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw
CkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAiQWN0aXZpdHlTdGF0ZUNoYW5nZU9ic2VydmVy
LmgiCiAjaW5jbHVkZSAiQWx0ZXJuYXRpdmVUZXh0Q2xpZW50LmgiCiAjaW5jbHVkZSAiQW5pbWF0
aW9uRnJhbWVSYXRlLmgiCisjaW5jbHVkZSAiQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIgogI2luY2x1
ZGUgIkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiQXV0aGVudGljYXRvckNv
b3JkaW5hdG9yLmgiCiAjaW5jbHVkZSAiQmFja0ZvcndhcmRDYWNoZS5oIgpAQCAtMTYwOCw2ICsx
NjA5LDIyIEBAIHZvaWQgUGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiAgICAgZm9yRWFj
aERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9jdW1lbnQudXBk
YXRlSGlnaGxpZ2h0UG9zaXRpb25zKCk7CiAgICAgfSk7CisjaWYgRU5BQkxFKEFQUF9ISUdITElH
SFQpCisgICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKKyAgICAg
ICAgaWYgKGF1dG8gYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGRvY3VtZW50LmFwcEhpZ2hsaWdodFN0
b3JhZ2VJZkV4aXN0cygpKSB7CisgICAgICAgICAgICBpZiAoTW9ub3RvbmljVGltZTo6bm93KCkg
LSBhcHBIaWdobGlnaHRTdG9yYWdlLT5sYXN0UmFuZ2VTZWFyY2hUaW1lKCkgPiAxX3MpIHsKKyAg
ICAgICAgICAgICAgICBkb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6
SW50ZXJuYWxBc3luY1Rhc2ssIFt3ZWFrRG9jdW1lbnQgPSBtYWtlV2Vha1B0cihkb2N1bWVudCld
IHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBkb2N1bWVudCA9IG1ha2VSZWZQdHIod2Vha0Rv
Y3VtZW50LmdldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAg
ICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgICAgICBpZiAoYXV0
byogYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGRvY3VtZW50LT5hcHBIaWdobGlnaHRTdG9yYWdlSWZF
eGlzdHMoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJl
c3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cygpOworICAgICAgICAgICAgICAgIH0pOworICAg
ICAgICAgICAgfQorICAgICAgICB9CisgICAgfSk7CisjZW5kaWYKIAogI2lmIEVOQUJMRShWSURF
TykKICAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423266</attachid>
            <date>2021-03-15 17:13:34 -0700</date>
            <delta_ts>2021-03-15 19:26:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315171333.patch</filename>
            <type>text/plain</type>
            <size>4940</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uMjUxN2Q1MmY3ODBhMTY5Njc2NjVlYjYyYTE5NTFh
ZTA2NmE3OTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdo
bGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6
OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogTW9kdWxlcy9oaWdo
bGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKToKKwogMjAyMS0w
My0xMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV
IFByb2Nlc3NdIGluc3BlY3Rvci9jYW52YXMvbWVtb3J5Lmh0bWwgZmFpbHMgd2hlbiBHUFUgcmVu
ZGVyaW5nIGlzIGVuYWJsZWQgZm9yIDJEIENhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCA4YzM1
ZDAxNzhiNGZhOGJiY2JiNDM5MzAxOTU0ZjUxZjc1OTRjOGFhLi5mMGU0MGQyMWY4NGYwYjkyNWNj
YjBjMWY5MGZiYTIzMzg2YTdiMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcApAQCAtMjQ2LDYgKzI0Niw4
IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKICAgICAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBl
bmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAgc3Ry
b25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRp
Y1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgCisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFy
Y2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIH0KIAogdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdl
OjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQpAQCAtMjY1LDYgKzI2Nyw3IEBAIHZv
aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCkK
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl
Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CiAg
ICAgfQorICAgIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoID0gTW9ub3RvbmljVGltZTo6bm93KCk7
CiAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsK
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFh
NDg5YjYuLjU4YWY4YzQ4MDQ0YTA0ZWRlZTc2OTlmOWNjMGJkMDdjM2FhZDI0N2UgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9P
cHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVm
Q291bnRlZC5oPgpAQCAtMzksMTAgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz
IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVm
ZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3Mg
Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVX
aXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBObywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0
b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZf
TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKQEAgLTUyLDkgKzU2LDEyIEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5n
ZT4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT
aGFyZWRCdWZmZXI+JiYpOwogICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgTW9ub3RvbmljVGltZSBsYXN0UmFuZ2VTZWFyY2hUaW1lKCkgY29uc3QgeyByZXR1
cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH0KKyAgICBib29sIGhhc1VucmVzdG9yZWRIaWdo
bGlnaHRzKCkgY29uc3QgeyByZXR1cm4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5zaXplKCk7IH0K
IAogcHJpdmF0ZToKICAgICBXZWFrUHRyPERvY3VtZW50PiBtX2RvY3VtZW50OworICAgIE1vbm90
b25pY1RpbWUgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7CiAgICAgVmVjdG9yPEFwcEhpZ2hsaWdo
dFJhbmdlRGF0YT4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0czsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw
CmluZGV4IGIyNTRjNmExNzM5YTllMmMxNTA2MmY5YTNlOWY1YWY1OGU0NjA0MmMuLjFmZjRiMjBj
MGRlYWQzMWI0NjQxM2I0ZTIzMGUxODU3ZDYyYTAyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAt
MjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIkFjdGl2aXR5U3RhdGVDaGFuZ2VPYnNlcnZlci5oIgog
I2luY2x1ZGUgIkFsdGVybmF0aXZlVGV4dENsaWVudC5oIgogI2luY2x1ZGUgIkFuaW1hdGlvbkZy
YW1lUmF0ZS5oIgorI2luY2x1ZGUgIkFwcEhpZ2hsaWdodFN0b3JhZ2UuaCIKICNpbmNsdWRlICJB
cHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oIgogI2luY2x1ZGUgIkF1dGhlbnRpY2F0b3JDb29yZGlu
YXRvci5oIgogI2luY2x1ZGUgIkJhY2tGb3J3YXJkQ2FjaGUuaCIKQEAgLTE2MDgsNiArMTYwOSwy
MiBAQCB2b2lkIFBhZ2U6OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcoKQogICAgIGZvckVhY2hEb2N1
bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CiAgICAgICAgIGRvY3VtZW50LnVwZGF0ZUhp
Z2hsaWdodFBvc2l0aW9ucygpOwogICAgIH0pOworI2lmIEVOQUJMRShBUFBfSElHSExJR0hUKQor
ICAgIGZvckVhY2hEb2N1bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CisgICAgICAgIGlm
IChhdXRvIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBkb2N1bWVudC5hcHBIaWdobGlnaHRTdG9yYWdl
SWZFeGlzdHMoKSkgeworICAgICAgICAgICAgaWYgKGFwcEhpZ2hsaWdodFN0b3JhZ2UtPmhhc1Vu
cmVzdG9yZWRIaWdobGlnaHRzKCkgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgLSBhcHBIaWdobGln
aHRTdG9yYWdlLT5sYXN0UmFuZ2VTZWFyY2hUaW1lKCkgPiAxX3MpIHsKKyAgICAgICAgICAgICAg
ICBkb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6SW50ZXJuYWxBc3lu
Y1Rhc2ssIFt3ZWFrRG9jdW1lbnQgPSBtYWtlV2Vha1B0cihkb2N1bWVudCldIHsKKyAgICAgICAg
ICAgICAgICAgICAgYXV0byBkb2N1bWVudCA9IG1ha2VSZWZQdHIod2Vha0RvY3VtZW50LmdldCgp
KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgICAgICAg
ICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgICAgICBpZiAoYXV0byogYXBwSGlnaGxp
Z2h0U3RvcmFnZSA9IGRvY3VtZW50LT5hcHBIaWdobGlnaHRTdG9yYWdlSWZFeGlzdHMoKSkKKyAg
ICAgICAgICAgICAgICAgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJlc3RvcmVVbnJlc3Rv
cmVkQXBwSGlnaGxpZ2h0cygpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfQor
ICAgICAgICB9CisgICAgfSk7CisjZW5kaWYKIAogI2lmIEVOQUJMRShWSURFTykKICAgICBmb3JF
YWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423283</attachid>
            <date>2021-03-15 19:26:25 -0700</date>
            <delta_ts>2021-03-15 20:32:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315192623.patch</filename>
            <type>text/plain</type>
            <size>5149</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uMjUxN2Q1MmY3ODBhMTY5Njc2NjVlYjYyYTE5NTFh
ZTA2NmE3OTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdo
bGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6
OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogTW9kdWxlcy9oaWdo
bGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKToKKwogMjAyMS0w
My0xMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV
IFByb2Nlc3NdIGluc3BlY3Rvci9jYW52YXMvbWVtb3J5Lmh0bWwgZmFpbHMgd2hlbiBHUFUgcmVu
ZGVyaW5nIGlzIGVuYWJsZWQgZm9yIDJEIENhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCA4YzM1
ZDAxNzhiNGZhOGJiY2JiNDM5MzAxOTU0ZjUxZjc1OTRjOGFhLi5mMGU0MGQyMWY4NGYwYjkyNWNj
YjBjMWY5MGZiYTIzMzg2YTdiMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcApAQCAtMjQ2LDYgKzI0Niw4
IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKICAgICAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBl
bmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAgc3Ry
b25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRp
Y1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgCisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFy
Y2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIH0KIAogdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdl
OjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQpAQCAtMjY1LDYgKzI2Nyw3IEBAIHZv
aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCkK
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl
Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CiAg
ICAgfQorICAgIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoID0gTW9ub3RvbmljVGltZTo6bm93KCk7
CiAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsK
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFh
NDg5YjYuLjU4YWY4YzQ4MDQ0YTA0ZWRlZTc2OTlmOWNjMGJkMDdjM2FhZDI0N2UgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9P
cHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVm
Q291bnRlZC5oPgpAQCAtMzksMTAgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz
IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVm
ZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3Mg
Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVX
aXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBObywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0
b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZf
TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKQEAgLTUyLDkgKzU2LDEyIEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5n
ZT4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT
aGFyZWRCdWZmZXI+JiYpOwogICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgTW9ub3RvbmljVGltZSBsYXN0UmFuZ2VTZWFyY2hUaW1lKCkgY29uc3QgeyByZXR1
cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH0KKyAgICBib29sIGhhc1VucmVzdG9yZWRIaWdo
bGlnaHRzKCkgY29uc3QgeyByZXR1cm4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5zaXplKCk7IH0K
IAogcHJpdmF0ZToKICAgICBXZWFrUHRyPERvY3VtZW50PiBtX2RvY3VtZW50OworICAgIE1vbm90
b25pY1RpbWUgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7CiAgICAgVmVjdG9yPEFwcEhpZ2hsaWdo
dFJhbmdlRGF0YT4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0czsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw
CmluZGV4IGIyNTRjNmExNzM5YTllMmMxNTA2MmY5YTNlOWY1YWY1OGU0NjA0MmMuLjEwZGZlNmNi
ZTc1YTU3MDk2YzcwZjIyZjdjNjhiZWQwZDlkNGZlMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAt
MjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIkFjdGl2aXR5U3RhdGVDaGFuZ2VPYnNlcnZlci5oIgog
I2luY2x1ZGUgIkFsdGVybmF0aXZlVGV4dENsaWVudC5oIgogI2luY2x1ZGUgIkFuaW1hdGlvbkZy
YW1lUmF0ZS5oIgorI2luY2x1ZGUgIkFwcEhpZ2hsaWdodFN0b3JhZ2UuaCIKICNpbmNsdWRlICJB
cHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oIgogI2luY2x1ZGUgIkF1dGhlbnRpY2F0b3JDb29yZGlu
YXRvci5oIgogI2luY2x1ZGUgIkJhY2tGb3J3YXJkQ2FjaGUuaCIKQEAgLTE2MDMsMTcgKzE2MDQs
MjkgQEAgdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKCkKIAogICAgIGZvckVhY2hE
b2N1bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CiAgICAgICAgIGRvY3VtZW50LmVucXVl
dWVQYWludFRpbWluZ0VudHJ5SWZOZWVkZWQoKTsKLSAgICB9KTsKLQotICAgIGZvckVhY2hEb2N1
bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CisgICAgICAgIAogICAgICAgICBkb2N1bWVu
dC51cGRhdGVIaWdobGlnaHRQb3NpdGlvbnMoKTsKLSAgICB9KTsKKworI2lmIEVOQUJMRShBUFBf
SElHSExJR0hUKQorICAgICAgICBpZiAoYXV0byBhcHBIaWdobGlnaHRTdG9yYWdlID0gZG9jdW1l
bnQuYXBwSGlnaGxpZ2h0U3RvcmFnZUlmRXhpc3RzKCkpIHsKKyAgICAgICAgICAgIGlmIChhcHBI
aWdobGlnaHRTdG9yYWdlLT5oYXNVbnJlc3RvcmVkSGlnaGxpZ2h0cygpICYmIE1vbm90b25pY1Rp
bWU6Om5vdygpIC0gYXBwSGlnaGxpZ2h0U3RvcmFnZS0+bGFzdFJhbmdlU2VhcmNoVGltZSgpID4g
MV9zKSB7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZXZlbnRMb29wKCkucXVldWVUYXNrKFRh
c2tTb3VyY2U6OkludGVybmFsQXN5bmNUYXNrLCBbd2Vha0RvY3VtZW50ID0gbWFrZVdlYWtQdHIo
ZG9jdW1lbnQpXSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVm
UHRyKHdlYWtEb2N1bWVudC5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIGlmICghZG9jdW1l
bnQpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICAg
ICAgaWYgKGF1dG8qIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBkb2N1bWVudC0+YXBwSGlnaGxpZ2h0
U3RvcmFnZUlmRXhpc3RzKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBhcHBIaWdobGlnaHRT
dG9yYWdlLT5yZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyAgICAgICAgICAgICAg
ICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2VuZGlmCiAKICNpZiBFTkFCTEUoVklE
RU8pCi0gICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAg
ICAgZG9jdW1lbnQudXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25JbWFnZUlmTmVlZGVkKCk7
Ci0gICAgfSk7CiAjZW5kaWYKKyAgICAgICAgCisgICAgfSk7CiAKICAgICBwcmlvcml0aXplVmlz
aWJsZVJlc291cmNlcygpOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423291</attachid>
            <date>2021-03-15 20:32:13 -0700</date>
            <delta_ts>2021-03-15 22:53:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315203212.patch</filename>
            <type>text/plain</type>
            <size>4940</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uMjUxN2Q1MmY3ODBhMTY5Njc2NjVlYjYyYTE5NTFh
ZTA2NmE3OTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdo
bGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6
OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogTW9kdWxlcy9oaWdo
bGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKToKKwogMjAyMS0w
My0xMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV
IFByb2Nlc3NdIGluc3BlY3Rvci9jYW52YXMvbWVtb3J5Lmh0bWwgZmFpbHMgd2hlbiBHUFUgcmVu
ZGVyaW5nIGlzIGVuYWJsZWQgZm9yIDJEIENhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCA4YzM1
ZDAxNzhiNGZhOGJiY2JiNDM5MzAxOTU0ZjUxZjc1OTRjOGFhLi5mMGU0MGQyMWY4NGYwYjkyNWNj
YjBjMWY5MGZiYTIzMzg2YTdiMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcApAQCAtMjQ2LDYgKzI0Niw4
IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKICAgICAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBl
bmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAgc3Ry
b25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRp
Y1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgCisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFy
Y2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIH0KIAogdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdl
OjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQpAQCAtMjY1LDYgKzI2Nyw3IEBAIHZv
aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCkK
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl
Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CiAg
ICAgfQorICAgIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoID0gTW9ub3RvbmljVGltZTo6bm93KCk7
CiAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsK
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFh
NDg5YjYuLjU4YWY4YzQ4MDQ0YTA0ZWRlZTc2OTlmOWNjMGJkMDdjM2FhZDI0N2UgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9P
cHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVm
Q291bnRlZC5oPgpAQCAtMzksMTAgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz
IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVm
ZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3Mg
Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVX
aXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBObywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0
b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZf
TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKQEAgLTUyLDkgKzU2LDEyIEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5n
ZT4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT
aGFyZWRCdWZmZXI+JiYpOwogICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgTW9ub3RvbmljVGltZSBsYXN0UmFuZ2VTZWFyY2hUaW1lKCkgY29uc3QgeyByZXR1
cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH0KKyAgICBib29sIGhhc1VucmVzdG9yZWRIaWdo
bGlnaHRzKCkgY29uc3QgeyByZXR1cm4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5zaXplKCk7IH0K
IAogcHJpdmF0ZToKICAgICBXZWFrUHRyPERvY3VtZW50PiBtX2RvY3VtZW50OworICAgIE1vbm90
b25pY1RpbWUgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7CiAgICAgVmVjdG9yPEFwcEhpZ2hsaWdo
dFJhbmdlRGF0YT4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0czsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw
CmluZGV4IGIyNTRjNmExNzM5YTllMmMxNTA2MmY5YTNlOWY1YWY1OGU0NjA0MmMuLjFmZjRiMjBj
MGRlYWQzMWI0NjQxM2I0ZTIzMGUxODU3ZDYyYTAyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAt
MjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIkFjdGl2aXR5U3RhdGVDaGFuZ2VPYnNlcnZlci5oIgog
I2luY2x1ZGUgIkFsdGVybmF0aXZlVGV4dENsaWVudC5oIgogI2luY2x1ZGUgIkFuaW1hdGlvbkZy
YW1lUmF0ZS5oIgorI2luY2x1ZGUgIkFwcEhpZ2hsaWdodFN0b3JhZ2UuaCIKICNpbmNsdWRlICJB
cHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oIgogI2luY2x1ZGUgIkF1dGhlbnRpY2F0b3JDb29yZGlu
YXRvci5oIgogI2luY2x1ZGUgIkJhY2tGb3J3YXJkQ2FjaGUuaCIKQEAgLTE2MDgsNiArMTYwOSwy
MiBAQCB2b2lkIFBhZ2U6OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcoKQogICAgIGZvckVhY2hEb2N1
bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CiAgICAgICAgIGRvY3VtZW50LnVwZGF0ZUhp
Z2hsaWdodFBvc2l0aW9ucygpOwogICAgIH0pOworI2lmIEVOQUJMRShBUFBfSElHSExJR0hUKQor
ICAgIGZvckVhY2hEb2N1bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CisgICAgICAgIGlm
IChhdXRvIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBkb2N1bWVudC5hcHBIaWdobGlnaHRTdG9yYWdl
SWZFeGlzdHMoKSkgeworICAgICAgICAgICAgaWYgKGFwcEhpZ2hsaWdodFN0b3JhZ2UtPmhhc1Vu
cmVzdG9yZWRIaWdobGlnaHRzKCkgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgLSBhcHBIaWdobGln
aHRTdG9yYWdlLT5sYXN0UmFuZ2VTZWFyY2hUaW1lKCkgPiAxX3MpIHsKKyAgICAgICAgICAgICAg
ICBkb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6SW50ZXJuYWxBc3lu
Y1Rhc2ssIFt3ZWFrRG9jdW1lbnQgPSBtYWtlV2Vha1B0cihkb2N1bWVudCldIHsKKyAgICAgICAg
ICAgICAgICAgICAgYXV0byBkb2N1bWVudCA9IG1ha2VSZWZQdHIod2Vha0RvY3VtZW50LmdldCgp
KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgICAgICAg
ICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgICAgICBpZiAoYXV0byogYXBwSGlnaGxp
Z2h0U3RvcmFnZSA9IGRvY3VtZW50LT5hcHBIaWdobGlnaHRTdG9yYWdlSWZFeGlzdHMoKSkKKyAg
ICAgICAgICAgICAgICAgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJlc3RvcmVVbnJlc3Rv
cmVkQXBwSGlnaGxpZ2h0cygpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfQor
ICAgICAgICB9CisgICAgfSk7CisjZW5kaWYKIAogI2lmIEVOQUJMRShWSURFTykKICAgICBmb3JF
YWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423302</attachid>
            <date>2021-03-15 22:53:07 -0700</date>
            <delta_ts>2021-03-16 11:12:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210315225306.patch</filename>
            <type>text/plain</type>
            <size>5095</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uMjUxN2Q1MmY3ODBhMTY5Njc2NjVlYjYyYTE5NTFh
ZTA2NmE3OTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdo
bGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6
OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogTW9kdWxlcy9oaWdo
bGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKToKKwogMjAyMS0w
My0xMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV
IFByb2Nlc3NdIGluc3BlY3Rvci9jYW52YXMvbWVtb3J5Lmh0bWwgZmFpbHMgd2hlbiBHUFUgcmVu
ZGVyaW5nIGlzIGVuYWJsZWQgZm9yIDJEIENhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCA4YzM1
ZDAxNzhiNGZhOGJiY2JiNDM5MzAxOTU0ZjUxZjc1OTRjOGFhLi5mMGU0MGQyMWY4NGYwYjkyNWNj
YjBjMWY5MGZiYTIzMzg2YTdiMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcApAQCAtMjQ2LDYgKzI0Niw4
IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKICAgICAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBl
bmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAgc3Ry
b25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRp
Y1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgCisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFy
Y2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIH0KIAogdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdl
OjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQpAQCAtMjY1LDYgKzI2Nyw3IEBAIHZv
aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCkK
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl
Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CiAg
ICAgfQorICAgIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoID0gTW9ub3RvbmljVGltZTo6bm93KCk7
CiAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsK
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFh
NDg5YjYuLjAwNzVhMDc3OTUyZjVmMjhiNGNhZTRmYzYwMTBjM2Q1NzIxM2MxNDAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9P
cHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVm
Q291bnRlZC5oPgpAQCAtMzksMTAgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz
IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVm
ZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3Mg
Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVX
aXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBObywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0
b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZf
TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKQEAgLTUyLDkgKzU2LDEzIEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5n
ZT4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT
aGFyZWRCdWZmZXI+JiYpOwogICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgTW9ub3RvbmljVGltZSBsYXN0UmFuZ2VTZWFyY2hUaW1lKCkgY29uc3QgeyByZXR1
cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH0KKyAgICB2b2lkIHJlc2V0TGFzdFJhbmdlU2Vh
cmNoVGltZSgpIHsgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lOjpub3co
KTsgfQorICAgIGJvb2wgaGFzVW5yZXN0b3JlZEhpZ2hsaWdodHMoKSBjb25zdCB7IHJldHVybiBt
X3VucmVzdG9yZWRIaWdobGlnaHRzLnNpemUoKTsgfQogCiBwcml2YXRlOgogICAgIFdlYWtQdHI8
RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAgTW9ub3RvbmljVGltZSBtX3RpbWVBdExhc3RSYW5n
ZVNlYXJjaDsKICAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRI
aWdobGlnaHRzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggYjI1NGM2YTE3MzlhOWUyYzE1
MDYyZjlhM2U5ZjVhZjU4ZTQ2MDQyYy4uZDBlMGI3OTE5YTYwMzY0NTQ2YjMwYWEyMWExMjE2MDM2
MDM4YjhhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAi
QWN0aXZpdHlTdGF0ZUNoYW5nZU9ic2VydmVyLmgiCiAjaW5jbHVkZSAiQWx0ZXJuYXRpdmVUZXh0
Q2xpZW50LmgiCiAjaW5jbHVkZSAiQW5pbWF0aW9uRnJhbWVSYXRlLmgiCisjaW5jbHVkZSAiQXBw
SGlnaGxpZ2h0U3RvcmFnZS5oIgogI2luY2x1ZGUgIkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgi
CiAjaW5jbHVkZSAiQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmgiCiAjaW5jbHVkZSAiQmFja0Zv
cndhcmRDYWNoZS5oIgpAQCAtMTYwOCw2ICsxNjA5LDIzIEBAIHZvaWQgUGFnZTo6ZG9BZnRlclVw
ZGF0ZVJlbmRlcmluZygpCiAgICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1l
bnQpIHsKICAgICAgICAgZG9jdW1lbnQudXBkYXRlSGlnaGxpZ2h0UG9zaXRpb25zKCk7CiAgICAg
fSk7CisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFQpCisgICAgZm9yRWFjaERvY3VtZW50KFtdIChE
b2N1bWVudCYgZG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKGF1dG8gYXBwSGlnaGxpZ2h0U3RvcmFn
ZSA9IGRvY3VtZW50LmFwcEhpZ2hsaWdodFN0b3JhZ2VJZkV4aXN0cygpKSB7CisgICAgICAgICAg
ICBpZiAoYXBwSGlnaGxpZ2h0U3RvcmFnZS0+aGFzVW5yZXN0b3JlZEhpZ2hsaWdodHMoKSAmJiBN
b25vdG9uaWNUaW1lOjpub3coKSAtIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPmxhc3RSYW5nZVNlYXJj
aFRpbWUoKSA+IDFfcykgeworICAgICAgICAgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJl
c2V0TGFzdFJhbmdlU2VhcmNoVGltZSgpOworICAgICAgICAgICAgICAgIGRvY3VtZW50LmV2ZW50
TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpJbnRlcm5hbEFzeW5jVGFzaywgW3dlYWtEb2N1
bWVudCA9IG1ha2VXZWFrUHRyKGRvY3VtZW50KV0geworICAgICAgICAgICAgICAgICAgICBhdXRv
IGRvY3VtZW50ID0gbWFrZVJlZlB0cih3ZWFrRG9jdW1lbnQuZ2V0KCkpOworICAgICAgICAgICAg
ICAgICAgICBpZiAoIWRvY3VtZW50KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwor
CisgICAgICAgICAgICAgICAgICAgIGlmIChhdXRvKiBhcHBIaWdobGlnaHRTdG9yYWdlID0gZG9j
dW1lbnQtPmFwcEhpZ2hsaWdodFN0b3JhZ2VJZkV4aXN0cygpKQorICAgICAgICAgICAgICAgICAg
ICAgICAgYXBwSGlnaGxpZ2h0U3RvcmFnZS0+cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9
KTsKKyNlbmRpZgogCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIGZvckVhY2hEb2N1bWVudChbXSAo
RG9jdW1lbnQmIGRvY3VtZW50KSB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423334</attachid>
            <date>2021-03-16 08:40:15 -0700</date>
            <delta_ts>2021-03-16 11:12:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223191-20210316084015.patch</filename>
            <type>text/plain</type>
            <size>5074</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uMjUxN2Q1MmY3ODBhMTY5Njc2NjVlYjYyYTE5NTFh
ZTA2NmE3OTQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdo
bGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6
OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogTW9kdWxlcy9oaWdo
bGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKToKKwogMjAyMS0w
My0xMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV
IFByb2Nlc3NdIGluc3BlY3Rvci9jYW52YXMvbWVtb3J5Lmh0bWwgZmFpbHMgd2hlbiBHUFUgcmVu
ZGVyaW5nIGlzIGVuYWJsZWQgZm9yIDJEIENhbnZhcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCA4YzM1
ZDAxNzhiNGZhOGJiY2JiNDM5MzAxOTU0ZjUxZjc1OTRjOGFhLi5mMGU0MGQyMWY4NGYwYjkyNWNj
YjBjMWY5MGZiYTIzMzg2YTdiMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcApAQCAtMjQ2LDYgKzI0Niw4
IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKICAgICAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBl
bmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAgc3Ry
b25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRp
Y1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgCisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFy
Y2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIH0KIAogdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdl
OjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQpAQCAtMjY1LDYgKzI2Nyw3IEBAIHZv
aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCkK
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl
Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CiAg
ICAgfQorICAgIG1fdGltZUF0TGFzdFJhbmdlU2VhcmNoID0gTW9ub3RvbmljVGltZTo6bm93KCk7
CiAgICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsK
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGln
aGxpZ2h0U3RvcmFnZS5oCmluZGV4IDY4NTAwMzE1ZGJkNDk3YmEyYTJiMzlmYzA1MzZjMGE2OTFh
NDg5YjYuLjAwNzVhMDc3OTUyZjVmMjhiNGNhZTRmYzYwMTBjM2Q1NzIxM2MxNDAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9P
cHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVm
Q291bnRlZC5oPgpAQCAtMzksMTAgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNz
IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTsKIGNsYXNzIERvY3VtZW50OwogY2xhc3MgU2hhcmVkQnVm
ZmVyOworY2xhc3MgU3RhdGljUmFuZ2U7CiBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3Mg
Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgOiBib29sOwogCitlbnVtIGNsYXNzIFJlc3RvcmVX
aXRoVGV4dFNlYXJjaCA6IGJvb2wgeyBObywgWWVzIH07CisKIGNsYXNzIEFwcEhpZ2hsaWdodFN0
b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBXVEZf
TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKQEAgLTUyLDkgKzU2LDEzIEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5n
ZT4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT
aGFyZWRCdWZmZXI+JiYpOwogICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRz
KCk7CisgICAgTW9ub3RvbmljVGltZSBsYXN0UmFuZ2VTZWFyY2hUaW1lKCkgY29uc3QgeyByZXR1
cm4gbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2g7IH0KKyAgICB2b2lkIHJlc2V0TGFzdFJhbmdlU2Vh
cmNoVGltZSgpIHsgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lOjpub3co
KTsgfQorICAgIGJvb2wgaGFzVW5yZXN0b3JlZEhpZ2hsaWdodHMoKSBjb25zdCB7IHJldHVybiBt
X3VucmVzdG9yZWRIaWdobGlnaHRzLnNpemUoKTsgfQogCiBwcml2YXRlOgogICAgIFdlYWtQdHI8
RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAgTW9ub3RvbmljVGltZSBtX3RpbWVBdExhc3RSYW5n
ZVNlYXJjaDsKICAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRI
aWdobGlnaHRzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggYjI1NGM2YTE3MzlhOWUyYzE1
MDYyZjlhM2U5ZjVhZjU4ZTQ2MDQyYy4uYzE3NGE1MTRhMTliMzQ5ODdhM2MxNTgzMWM4OGFkOTJm
ZWE1NzM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAi
QWN0aXZpdHlTdGF0ZUNoYW5nZU9ic2VydmVyLmgiCiAjaW5jbHVkZSAiQWx0ZXJuYXRpdmVUZXh0
Q2xpZW50LmgiCiAjaW5jbHVkZSAiQW5pbWF0aW9uRnJhbWVSYXRlLmgiCisjaW5jbHVkZSAiQXBw
SGlnaGxpZ2h0U3RvcmFnZS5oIgogI2luY2x1ZGUgIkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgi
CiAjaW5jbHVkZSAiQXV0aGVudGljYXRvckNvb3JkaW5hdG9yLmgiCiAjaW5jbHVkZSAiQmFja0Zv
cndhcmRDYWNoZS5oIgpAQCAtMTYwOCw2ICsxNjA5LDI0IEBAIHZvaWQgUGFnZTo6ZG9BZnRlclVw
ZGF0ZVJlbmRlcmluZygpCiAgICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1l
bnQpIHsKICAgICAgICAgZG9jdW1lbnQudXBkYXRlSGlnaGxpZ2h0UG9zaXRpb25zKCk7CiAgICAg
fSk7CisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFQpCisgICAgZm9yRWFjaERvY3VtZW50KFtdIChE
b2N1bWVudCYgZG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKCFhdXRvIGFwcEhpZ2hsaWdodFN0b3Jh
Z2UgPSBkb2N1bWVudC5hcHBIaWdobGlnaHRTdG9yYWdlSWZFeGlzdHMoKSkKKyAgICAgICAgICAg
IHJldHVybjsKKyAgICAgICAgCisgICAgICAgIGlmIChhcHBIaWdobGlnaHRTdG9yYWdlLT5oYXNV
bnJlc3RvcmVkSGlnaGxpZ2h0cygpICYmIE1vbm90b25pY1RpbWU6Om5vdygpIC0gYXBwSGlnaGxp
Z2h0U3RvcmFnZS0+bGFzdFJhbmdlU2VhcmNoVGltZSgpID4gMV9zKSB7CisgICAgICAgICAgICBh
cHBIaWdobGlnaHRTdG9yYWdlLT5yZXNldExhc3RSYW5nZVNlYXJjaFRpbWUoKTsKKyAgICAgICAg
ICAgIGRvY3VtZW50LmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpJbnRlcm5hbEFz
eW5jVGFzaywgW3dlYWtEb2N1bWVudCA9IG1ha2VXZWFrUHRyKGRvY3VtZW50KV0geworICAgICAg
ICAgICAgICAgIGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRyKHdlYWtEb2N1bWVudC5nZXQoKSk7
CisgICAgICAgICAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgICAgICAgICAgcmV0
dXJuOworCisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBk
b2N1bWVudC0+YXBwSGlnaGxpZ2h0U3RvcmFnZUlmRXhpc3RzKCkpCisgICAgICAgICAgICAgICAg
ICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UtPnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cygp
OworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKyNlbmRpZgogCiAjaWYgRU5B
QkxFKFZJREVPKQogICAgIGZvckVhY2hEb2N1bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423361</attachid>
            <date>2021-03-16 11:12:07 -0700</date>
            <delta_ts>2021-03-16 11:44:45 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-223191-20210316111206.patch</filename>
            <type>text/plain</type>
            <size>5070</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JjMDE5NmQ3MmJlOGQ0
NGMwMDJjYmJmZjg0NGY1Mzg4Y2Y3ZGExYS4uZmYwMGM5ZGM4NjYyMmFhODg5ZGUxMGZlZTRjOWYw
MTM1NTU1MTQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE1ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXR0ZW1wdCB0
byByZXN0b3JlIGhpZ2hsaWdodHMgYWZ0ZXIgcGFpbnQgdG8gYWNjb3VudCBmb3IgbmV3bHkgbG9h
ZGVkIGNvbnRlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjMxOTEKKyAgICAgICAgcmRhcjovLzc0NzIyMjAwCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdo
dFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVz
dG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKToKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdo
dC9BcHBIaWdobGlnaHRTdG9yYWdlLmg6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlBhZ2U6OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcpOgorCiAyMDIxLTAzLTEy
ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJv
Y2Vzc10gaW5zcGVjdG9yL2NhbnZhcy9tZW1vcnkuaHRtbCBmYWlscyB3aGVuIEdQVSByZW5kZXJp
bmcgaXMgZW5hYmxlZCBmb3IgMkQgQ2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDhjMzVkMDE3
OGI0ZmE4YmJjYmI0MzkzMDE5NTRmNTFmNzU5NGM4YWEuLmYwZTQwZDIxZjg0ZjBiOTI1Y2NiMGMx
ZjkwZmJhMjMzODZhN2IxY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGln
aGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yNDYsNiArMjQ2LDggQEAg
dm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRC
dWZmZXI+JiYgYnVmZmVyKQogICAgICAgICBtX3VucmVzdG9yZWRIaWdobGlnaHRzLmFwcGVuZChh
cHBIaWdobGlnaHRSYW5nZURhdGEudmFsdWUoKSk7CiAgICAgZWxzZQogICAgICAgICBzdHJvbmdE
b2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFu
Z2U6OmNyZWF0ZSgqcmFuZ2UpKTsKKyAgICAKKyAgICBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaCA9
IE1vbm90b25pY1RpbWU6Om5vdygpOwogfQogCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJl
c3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cygpCkBAIC0yNjUsNiArMjY3LDcgQEAgdm9pZCBB
cHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKQogICAg
ICAgICBlbHNlCiAgICAgICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0
ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKICAgICB9
CisgICAgbV90aW1lQXRMYXN0UmFuZ2VTZWFyY2ggPSBNb25vdG9uaWNUaW1lOjpub3coKTsKICAg
ICBtX3VucmVzdG9yZWRIaWdobGlnaHRzID0gV1RGTW92ZShyZW1haW5pbmdSYW5nZXMpOwogfQog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln
aHRTdG9yYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln
aHRTdG9yYWdlLmgKaW5kZXggNjg1MDAzMTVkYmQ0OTdiYTJhMmIzOWZjMDUzNmMwYTY5MWE0ODli
Ni4uMDA3NWEwNzc5NTJmNWYyOGI0Y2FlNGZjNjAxMGMzZDU3MjEzYzE0MCAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu
aApAQCAtMjYsNiArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYvRm9yd2Fy
ZC5oPgorI2luY2x1ZGUgPHd0Zi9Nb25vdG9uaWNUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlv
blNldC5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3Vu
dGVkLmg+CkBAIC0zOSwxMCArNDAsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQXBw
SGlnaGxpZ2h0UmFuZ2VEYXRhOwogY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBTaGFyZWRCdWZmZXI7
CitjbGFzcyBTdGF0aWNSYW5nZTsKIGNsYXNzIEhpZ2hsaWdodDsKIAogZW51bSBjbGFzcyBDcmVh
dGVOZXdHcm91cEZvckhpZ2hsaWdodCA6IGJvb2w7CiAKK2VudW0gY2xhc3MgUmVzdG9yZVdpdGhU
ZXh0U2VhcmNoIDogYm9vbCB7IE5vLCBZZXMgfTsKKwogY2xhc3MgQXBwSGlnaGxpZ2h0U3RvcmFn
ZSBmaW5hbCA6IFJlZkNvdW50ZWQ8QXBwSGlnaGxpZ2h0U3RvcmFnZT4gewogICAgIFdURl9NQUtF
X0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgpAQCAtNTIsOSArNTYsMTMgQEAgcHVibGljOgogICAg
IFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RvcmVBcHBIaWdobGlnaHQoUmVmPFN0YXRpY1JhbmdlPiYm
KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJl
ZEJ1ZmZlcj4mJik7CiAgICAgdm9pZCByZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMoKTsK
KyAgICBNb25vdG9uaWNUaW1lIGxhc3RSYW5nZVNlYXJjaFRpbWUoKSBjb25zdCB7IHJldHVybiBt
X3RpbWVBdExhc3RSYW5nZVNlYXJjaDsgfQorICAgIHZvaWQgcmVzZXRMYXN0UmFuZ2VTZWFyY2hU
aW1lKCkgeyBtX3RpbWVBdExhc3RSYW5nZVNlYXJjaCA9IE1vbm90b25pY1RpbWU6Om5vdygpOyB9
CisgICAgYm9vbCBoYXNVbnJlc3RvcmVkSGlnaGxpZ2h0cygpIGNvbnN0IHsgcmV0dXJuIG1fdW5y
ZXN0b3JlZEhpZ2hsaWdodHMuc2l6ZSgpOyB9CiAKIHByaXZhdGU6CiAgICAgV2Vha1B0cjxEb2N1
bWVudD4gbV9kb2N1bWVudDsKKyAgICBNb25vdG9uaWNUaW1lIG1fdGltZUF0TGFzdFJhbmdlU2Vh
cmNoOwogICAgIFZlY3RvcjxBcHBIaWdobGlnaHRSYW5nZURhdGE+IG1fdW5yZXN0b3JlZEhpZ2hs
aWdodHM7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIv
U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCBiMjU0YzZhMTczOWE5ZTJjMTUwNjJm
OWEzZTlmNWFmNThlNDYwNDJjLi5jMTc0YTUxNGExOWIzNDk4N2EzYzE1ODMxYzg4YWQ5MmZlYTU3
Mzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTIzLDYgKzIzLDcgQEAKICNpbmNsdWRlICJBY3Rp
dml0eVN0YXRlQ2hhbmdlT2JzZXJ2ZXIuaCIKICNpbmNsdWRlICJBbHRlcm5hdGl2ZVRleHRDbGll
bnQuaCIKICNpbmNsdWRlICJBbmltYXRpb25GcmFtZVJhdGUuaCIKKyNpbmNsdWRlICJBcHBIaWdo
bGlnaHRTdG9yYWdlLmgiCiAjaW5jbHVkZSAiQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNp
bmNsdWRlICJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3IuaCIKICNpbmNsdWRlICJCYWNrRm9yd2Fy
ZENhY2hlLmgiCkBAIC0xNjA4LDYgKzE2MDksMjQgQEAgdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRl
UmVuZGVyaW5nKCkKICAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkg
ewogICAgICAgICBkb2N1bWVudC51cGRhdGVIaWdobGlnaHRQb3NpdGlvbnMoKTsKICAgICB9KTsK
KyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVCkKKyAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3Vt
ZW50JiBkb2N1bWVudCkgeworICAgICAgICBpZiAoIWF1dG8gYXBwSGlnaGxpZ2h0U3RvcmFnZSA9
IGRvY3VtZW50LmFwcEhpZ2hsaWdodFN0b3JhZ2VJZkV4aXN0cygpKQorICAgICAgICAgICAgcmV0
dXJuOworICAgICAgICAKKyAgICAgICAgaWYgKGFwcEhpZ2hsaWdodFN0b3JhZ2UtPmhhc1VucmVz
dG9yZWRIaWdobGlnaHRzKCkgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgLSBhcHBIaWdobGlnaHRT
dG9yYWdlLT5sYXN0UmFuZ2VTZWFyY2hUaW1lKCkgPiAxX3MpIHsKKyAgICAgICAgICAgIGFwcEhp
Z2hsaWdodFN0b3JhZ2UtPnJlc2V0TGFzdFJhbmdlU2VhcmNoVGltZSgpOworICAgICAgICAgICAg
ZG9jdW1lbnQuZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6OkludGVybmFsQXN5bmNU
YXNrLCBbd2Vha0RvY3VtZW50ID0gbWFrZVdlYWtQdHIoZG9jdW1lbnQpXSB7CisgICAgICAgICAg
ICAgICAgYXV0byBkb2N1bWVudCA9IG1ha2VSZWZQdHIod2Vha0RvY3VtZW50LmdldCgpKTsKKyAg
ICAgICAgICAgICAgICBpZiAoIWRvY3VtZW50KQorICAgICAgICAgICAgICAgICAgICByZXR1cm47
CisKKyAgICAgICAgICAgICAgICBpZiAoYXV0byogYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGRvY3Vt
ZW50LT5hcHBIaWdobGlnaHRTdG9yYWdlSWZFeGlzdHMoKSkKKyAgICAgICAgICAgICAgICAgICAg
YXBwSGlnaGxpZ2h0U3RvcmFnZS0+cmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7Cisg
ICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0pOworI2VuZGlmCiAKICNpZiBFTkFCTEUo
VklERU8pCiAgICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsK
</data>

          </attachment>
      

    </bug>

</bugzilla>