<?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>213351</bug_id>
          
          <creation_ts>2020-06-18 13:35:42 -0700</creation_ts>
          <short_desc>[ Catalina Debug WK2 ] fast/events/platform-wheelevent-in-scrolling-div.html is a flaky failure</short_desc>
          <delta_ts>2020-06-23 08:14:16 -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>Tools / Tests</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="Karl Rackler">rackler</reporter>
          <assigned_to name="Simon Fraser (smfr)">simon.fraser</assigned_to>
          <cc>graouts</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>tsavell</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1663979</commentid>
    <comment_count>0</comment_count>
    <who name="Karl Rackler">rackler</who>
    <bug_when>2020-06-18 13:35:42 -0700</bug_when>
    <thetext>fast/events/platform-wheelevent-in-scrolling-div.html

We are seeing this test failing on Catalina WK2.  Infrequent failure.  We are seeing once every one to two days.

History:
https://results.webkit.org/?suite=layout-tests&amp;test=fast%2Fevents%2Fplatform-wheelevent-in-scrolling-div.html


Diff:
--- /Volumes/Data/slave/catalina-debug-tests-wk2/build/layout-test-results/fast/events/platform-wheelevent-in-scrolling-div-expected.txt
+++ /Volumes/Data/slave/catalina-debug-tests-wk2/build/layout-test-results/fast/events/platform-wheelevent-in-scrolling-div-actual.txt
@@ -1,6 +1,3 @@
-PASS event.wheelDeltaY is window.expectedScrollTop*-120
-PASS event.wheelDeltaX is window.expectedScrollLeft*-120
-PASS event.wheelDelta is window.expectedScrollTop*-120
-PASS div.scrollTop is window.expectedScrollTop*window.pixelsPerWheelTick
-PASS div.scrollLeft is window.expectedScrollLeft*window.pixelsPerWheelTick
+FAIL div.scrollTop should be 200. Was 0.
+FAIL div.scrollLeft should be 120. Was 0.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1663980</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-18 13:36:51 -0700</bug_when>
    <thetext>&lt;rdar://problem/64502429&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664034</commentid>
    <comment_count>2</comment_count>
    <who name="Karl Rackler">rackler</who>
    <bug_when>2020-06-18 15:54:48 -0700</bug_when>
    <thetext>Unable to reproduce this failure locally using run-webkit-test.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664044</commentid>
    <comment_count>3</comment_count>
      <attachid>402248</attachid>
    <who name="Karl Rackler">rackler</who>
    <bug_when>2020-06-18 16:24:20 -0700</bug_when>
    <thetext>Created attachment 402248
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664046</commentid>
    <comment_count>4</comment_count>
      <attachid>402248</attachid>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-06-18 16:28:10 -0700</bug_when>
    <thetext>Comment on attachment 402248
Patch

Clearing flags on attachment: 402248

Committed r263244: &lt;https://trac.webkit.org/changeset/263244&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664047</commentid>
    <comment_count>5</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-06-18 16:28:12 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664048</commentid>
    <comment_count>6</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-06-18 16:29:05 -0700</bug_when>
    <thetext>Reopening after landing test expectations</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664903</commentid>
    <comment_count>7</comment_count>
      <attachid>402434</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-21 17:51:34 -0700</bug_when>
    <thetext>Created attachment 402434
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664904</commentid>
    <comment_count>8</comment_count>
      <attachid>402434</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-21 17:53:23 -0700</bug_when>
    <thetext>Comment on attachment 402434
Patch

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

&gt; LayoutTests/fast/events/platform-wheelevent-in-scrolling-div.html:28
&gt; +                eventSender.callAfterScrollingCompletes(() =&gt; {
&gt; +                    checkOffsets();
&gt; +                });

Nit - I think this would read better as `eventSender.callAfterScrollingCompletes(checkOffsets);`</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664905</commentid>
    <comment_count>9</comment_count>
      <attachid>402435</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-21 18:07:10 -0700</bug_when>
    <thetext>Created attachment 402435
For landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664923</commentid>
    <comment_count>10</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-21 20:37:05 -0700</bug_when>
    <thetext>EWS still shows a timeout :(</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665283</commentid>
    <comment_count>11</comment_count>
      <attachid>402533</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-22 21:18:49 -0700</bug_when>
    <thetext>Created attachment 402533
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665284</commentid>
    <comment_count>12</comment_count>
      <attachid>402534</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-06-22 21:23:12 -0700</bug_when>
    <thetext>Created attachment 402534
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665288</commentid>
    <comment_count>13</comment_count>
      <attachid>402534</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-06-22 21:43:34 -0700</bug_when>
    <thetext>Comment on attachment 402534
Patch

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

&gt; Tools/ChangeLog:9
&gt; +        The variadic CGEventCreateScrollWheelEvent() seems to have an issue that causes the resulting event

Seems mysterious and worth a radar??</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665291</commentid>
    <comment_count>14</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-06-22 22:05:13 -0700</bug_when>
    <thetext>Very nice!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665387</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-23 08:14:16 -0700</bug_when>
    <thetext>Committed r263396: &lt;https://trac.webkit.org/changeset/263396&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402534.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402248</attachid>
            <date>2020-06-18 16:24:20 -0700</date>
            <delta_ts>2020-06-18 16:29:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213351-20200618182419.patch</filename>
            <type>text/plain</type>
            <size>1503</size>
            <attacher name="Karl Rackler">rackler</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjIyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNThjYWFmMjdkNjg3OTIwMmEzZTRl
MzNiM2NkMWRhYmJiMjE4NjljYS4uZGUxZjM4MTUwYjJjNjZlZGE0OGJkNDFlNDI4ZTRmY2E5Zjc5
NTQyZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA2LTE4ICBLYXJsIFJhY2tsZXIgIDxy
YWNrbGVyQGFwcGxlLmNvbT4KKworICAgICAgICBbIENhdGFsaW5hIERlYnVnIFdLMiBdIGZhc3Qv
ZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sIGlzIGEgZmxh
a3kgZmFpbHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjEzMzUxCisKKyAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZy4KKworICAgICAg
ICAqIHBsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wNi0xOCAgWmFs
YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10gQXZhaWxh
YmxlIHNwYWNlIGNvbXB1dGF0aW9uIGZvciB0aGUgZmxvYXQgYXZvaWRlciBuZWVkcyBjb29yZGlu
YXRlIG1hcHBpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0
aW9ucwppbmRleCBhNjJjMzljYjRhNDlhNTAxNTZjMWRmNzM3ZDQ2ZDM4Y2NkNzViNzI2Li43ODYy
ZWI4YjU4MTYzNGNmMmNkNzZhNDY5ZmE5ZDEwZmFmYjQwZmIyIDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMDM3LDMgKzEwMzcsNSBAQCB3
ZWJraXQub3JnL2IvMjEyMDQyIFsgRGVidWcgXSBmYXN0L3Njcm9sbGluZy9tYWMvc2Nyb2xsYmFy
cy9zZWxlY3Qtb3ZlcmxheS1zY3JvbAogd2Via2l0Lm9yZy9iLzIxMzIxMiBbIE1vamF2ZSBSZWxl
YXNlIF0gd2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL3RleHR1cmVzL2NhbnZhc19zdWJfcmVjdGFu
Z2xlL3RleC0yZC1yZ2IxNmYtcmdiLWhhbGZfZmxvYXQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiAK
IHdlYmtpdC5vcmcvYi8yMTMyOTIgWyBDYXRhbGluYSBSZWxlYXNlIF0gaHR0cC90ZXN0cy9JbmRl
eGVkREIvc3RvcmFnZS1saW1pdC0xLmh0dHBzLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQorCit3ZWJr
aXQub3JnL2IvMjEzMzUxIFsgQ2F0YWxpbmEgRGVidWcgXSBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13
aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbCBbIFBhc3MgRmFpbHVyZSBdIApcIE5vIG5l
d2xpbmUgYXQgZW5kIG9mIGZpbGUK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402434</attachid>
            <date>2020-06-21 17:51:34 -0700</date>
            <delta_ts>2020-06-22 21:18:45 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213351-20200621175133.patch</filename>
            <type>text/plain</type>
            <size>6121</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzIyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGVkNWNiNmEwYzg2MTlmNWFkM2Q4
MTYyNTI2Y2YwZDhhYzlkMmRjZC4uM2Q1N2MyOTcxYmVmZWNlMGJhYzYzYTFhOTNmZGZjYjE3YTUx
OTBiMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA2LTIxICBTaW1vbiBGcmFzZXIgIDxz
aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFsgQ2F0YWxpbmEgRGVidWcgV0syIF0g
ZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgaXMg
YSBmbGFreSBmYWlsdXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMTMzNTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NTAyNDI5PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgdGVzdCB0
byB1c2UgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCkuIEFsc28gcmVtb3ZlIGFuIGlu
aXRpYWwgMTAwbXMgdGltZW91dCBhbmQKKyAgICAgICAgc29tZSB1Z2x5IHVzZXMgb2YgIndpbmRv
dy4iLgorCisgICAgICAgICogZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3Jv
bGxpbmctZGl2LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13
aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMt
d2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjAtMDYtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFu
QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdW1F1aXJrXSBUYWJsZSBoZWlnaHQgbmVl
ZHMgcXVpcmsgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Bs
YXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhw
ZWN0ZWQudHh0CmluZGV4IGI0ZjI2ZDc3MWQzZGI1MmU3YWI4YWI1NzkzZjgzYmM3ZThmMjY5YTcu
LjNlYzkzMGU5Y2RkYzQ2ZTkzMzA2ZTkwMWMwZTIyMjJjNzQyODgzOTMgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRp
di1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2LWV4cGVjdGVkLnR4dApAQCAtMSw2ICsxLDYgQEAKLVBB
U1MgZXZlbnQud2hlZWxEZWx0YVkgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAKLVBB
U1MgZXZlbnQud2hlZWxEZWx0YVggaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCotMTIwCi1Q
QVNTIGV2ZW50LndoZWVsRGVsdGEgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAKLVBB
U1MgZGl2LnNjcm9sbFRvcCBpcyB3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3Aqd2luZG93LnBpeGVs
c1BlcldoZWVsVGljawotUEFTUyBkaXYuc2Nyb2xsTGVmdCBpcyB3aW5kb3cuZXhwZWN0ZWRTY3Jv
bGxMZWZ0KndpbmRvdy5waXhlbHNQZXJXaGVlbFRpY2sKK1BBU1MgZXZlbnQud2hlZWxEZWx0YVkg
aXMgZXhwZWN0ZWRTY3JvbGxUb3AqLTEyMAorUEFTUyBldmVudC53aGVlbERlbHRhWCBpcyBleHBl
Y3RlZFNjcm9sbExlZnQqLTEyMAorUEFTUyBldmVudC53aGVlbERlbHRhIGlzIGV4cGVjdGVkU2Ny
b2xsVG9wKi0xMjAKK1BBU1MgZGl2LnNjcm9sbFRvcCBpcyBleHBlY3RlZFNjcm9sbFRvcCAqIHBp
eGVsc1BlcldoZWVsVGljaworUEFTUyBkaXYuc2Nyb2xsTGVmdCBpcyBleHBlY3RlZFNjcm9sbExl
ZnQgKiBwaXhlbHNQZXJXaGVlbFRpY2sKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9l
dmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgYi9MYXlvdXRU
ZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRt
bAppbmRleCA2OGY3M2RiMWZhYTU0ZTkyMzZkMDJlYTQxMDczOGNiOTFjNmU1ODE3Li5iMTA2N2Y5
ZTU5ZGU5ZmJlY2FhYzdmNTMzOWEyODViMzFmNGYxNTJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbAor
KysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9s
bGluZy1kaXYuaHRtbApAQCAtMTMsMjMgKzEzLDI2IEBACiAKICAgICAgICAgICAgIGZ1bmN0aW9u
IGRpc3BhdGNoV2hlZWxFdmVudCgpCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYg
KCF3aW5kb3cuZXZlbnRTZW5kZXIpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKwogICAg
ICAgICAgICAgICAgIHZhciBvdmVyZmxvd0VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ
ZCgib3ZlcmZsb3ciKTsKICAgICAgICAgICAgICAgICBpZiAob3ZlcmZsb3dFbGVtZW50KQogICAg
ICAgICAgICAgICAgICAgICBvdmVyZmxvd0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V3
aGVlbCIsIG1vdXNld2hlZWxIYW5kbGVyLCBmYWxzZSk7CiAKLSAgICAgICAgICAgICAgICBpZiAo
d2luZG93LmV2ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v
dXNlTW92ZVRvKDEwMCwgMTEwKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91
c2VTY3JvbGxCeSgtd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCwgLXdpbmRvdy5leHBlY3RlZFNj
cm9sbFRvcCk7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgc2V0VGltZW91
dCgnY2hlY2tPZmZzZXRzKCk7JywgMTAwKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5t
b3VzZU1vdmVUbygxMDAsIDExMCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRv
cldoZWVsRXZlbnRzKCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC
eSgtZXhwZWN0ZWRTY3JvbGxMZWZ0LCAtZXhwZWN0ZWRTY3JvbGxUb3ApOworICAgICAgICAgICAg
ICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcygoKSA9PiB7CisgICAg
ICAgICAgICAgICAgICAgIGNoZWNrT2Zmc2V0cygpOworICAgICAgICAgICAgICAgIH0pOwogICAg
ICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBjaGVja09mZnNldHMoKQogICAgICAg
ICAgICAgewogICAgICAgICAgICAgICAgIGRpdiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJv
dmVyZmxvdyIpOwotICAgICAgICAgICAgICAgIHNob3VsZEJlKCJkaXYuc2Nyb2xsVG9wIiwgIndp
bmRvdy5leHBlY3RlZFNjcm9sbFRvcCp3aW5kb3cucGl4ZWxzUGVyV2hlZWxUaWNrIik7Ci0gICAg
ICAgICAgICAgICAgc2hvdWxkQmUoImRpdi5zY3JvbGxMZWZ0IiwgIndpbmRvdy5leHBlY3RlZFNj
cm9sbExlZnQqd2luZG93LnBpeGVsc1BlcldoZWVsVGljayIpOworICAgICAgICAgICAgICAgIHNo
b3VsZEJlKCJkaXYuc2Nyb2xsVG9wIiwgImV4cGVjdGVkU2Nyb2xsVG9wICogcGl4ZWxzUGVyV2hl
ZWxUaWNrIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImRpdi5zY3JvbGxMZWZ0IiwgImV4
cGVjdGVkU2Nyb2xsTGVmdCAqIHBpeGVsc1BlcldoZWVsVGljayIpOwogCiAgICAgICAgICAgICAg
ICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICAgICAgICAgICAgICAgICAgICB3aW5kb3cudGVz
dFJ1bm5lci5ub3RpZnlEb25lKCk7CkBAIC0zOCwxOCArNDEsMjEgQEAKICAgICAgICAgICAgIGZ1
bmN0aW9uIG1vdXNld2hlZWxIYW5kbGVyKGUpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAg
ICAgZXZlbnQgPSBlOwotICAgICAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC53aGVlbERlbHRh
WSIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3AqLTEyMCIpOwotICAgICAgICAgICAgICAgIHNo
b3VsZEJlKCJldmVudC53aGVlbERlbHRhWCIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0x
MjAiKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YVkiLCAiZXhw
ZWN0ZWRTY3JvbGxUb3AqLTEyMCIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC53
aGVlbERlbHRhWCIsICJleHBlY3RlZFNjcm9sbExlZnQqLTEyMCIpOwogCiAgICAgICAgICAgICAg
ICAgaWYgKGUud2hlZWxEZWx0YVkpCi0gICAgICAgICAgICAgICAgICAgIHNob3VsZEJlKCJldmVu
dC53aGVlbERlbHRhIiwgIndpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMTIwIik7CisgICAgICAg
ICAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC53aGVlbERlbHRhIiwgImV4cGVjdGVkU2Nyb2xs
VG9wKi0xMjAiKTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHNo
b3VsZEJlKCJldmVudC53aGVlbERlbHRhIiwgIndpbmRvdy5leHBlY3RlZFNjcm9sbExlZnQqLTEy
MCIpOworICAgICAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJl
eHBlY3RlZFNjcm9sbExlZnQqLTEyMCIpOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgCisg
ICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsICgpID0+IHsKKyAgICAg
ICAgICAgICAgICBkaXNwYXRjaFdoZWVsRXZlbnQoKTsKKyAgICAgICAgICAgIH0sIGZhbHNlKTsK
ICAgICAgICAgPC9zY3JpcHQ+CiAgICAgPC9oZWFkPgotCi0gICAgPGJvZHkgc3R5bGU9Im1hcmdp
bjowIiBvbmxvYWQ9InNldFRpbWVvdXQoJ2Rpc3BhdGNoV2hlZWxFdmVudCgpOycsIDEwMCkiPgor
ICAgIDxib2R5IHN0eWxlPSJtYXJnaW46MCI+CiAgICAgICAgIDxkaXYgaWQ9Im92ZXJmbG93IiBz
dHlsZT0iYm9yZGVyOjJweCBzb2xpZCBibGFjaztvdmVyZmxvdzphdXRvO2hlaWdodDoyMDBweDt3
aWR0aDoyMDBweDsiPgogICAgICAgICAgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpy
ZWQ7aGVpZ2h0OjIwMHB4O3dpZHRoOjQwMHB4OyI+PC9kaXY+CiAgICAgICAgICAgICA8ZGl2IHN0
eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOmdyZWVuO2hlaWdodDoyMDBweDt3aWR0aDo0MDBweDsiPjwv
ZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0
YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCmlu
ZGV4IDM3OTNiOGY2OWIxNGNhNmJkYzM5YWI0NmJlYTIzOTFiMjdhYmM5NDEuLmI1NTQzMzlmNjgz
ZTI4YzhmNDgxYzU1NTYxN2NiNTJiM2RkMzY3M2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEwMzgsNiArMTAzOCw0IEBAIHdlYmtpdC5v
cmcvYi8yMTMyMTIgWyBNb2phdmUgUmVsZWFzZSBdIHdlYmdsLzIuMC4wL2NvbmZvcm1hbmNlMi90
ZXh0dXJlcy9jYW52YXNfCiAKIHdlYmtpdC5vcmcvYi8yMTMyOTIgWyBDYXRhbGluYSBSZWxlYXNl
IF0gaHR0cC90ZXN0cy9JbmRleGVkREIvc3RvcmFnZS1saW1pdC0xLmh0dHBzLmh0bWwgWyBQYXNz
IEZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMjEzMzUxIFsgQ2F0YWxpbmEgRGVidWcgXSBmYXN0
L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbCBbIFBhc3Mg
RmFpbHVyZSBdIAotCi13ZWJraXQub3JnL2IvMjEzMzc1IFsgRGVidWcgXSB3ZWJhdWRpby9iaXF1
YWQtYmFuZHBhc3MuaHRtbCBbIFBhc3MgQ3Jhc2ggXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp
bGUKK3dlYmtpdC5vcmcvYi8yMTMzNzUgWyBEZWJ1ZyBdIHdlYmF1ZGlvL2JpcXVhZC1iYW5kcGFz
cy5odG1sIFsgUGFzcyBDcmFzaCBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402435</attachid>
            <date>2020-06-21 18:07:10 -0700</date>
            <delta_ts>2020-06-22 21:18:46 -0700</delta_ts>
            <desc>For landing</desc>
            <filename>bug-213351-20200621180709.patch</filename>
            <type>text/plain</type>
            <size>6068</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzIyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGVkNWNiNmEwYzg2MTlmNWFkM2Q4
MTYyNTI2Y2YwZDhhYzlkMmRjZC4uZmY3ZWQ3NjZkMWMzNzczM2VkYmE3NmQ5YjQxNDk3MDY5NTRh
MDM2OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA2LTIxICBTaW1vbiBGcmFzZXIgIDxz
aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFsgQ2F0YWxpbmEgRGVidWcgV0syIF0g
ZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgaXMg
YSBmbGFreSBmYWlsdXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMTMzNTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NTAyNDI5PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBGaXggdGhlIHRlc3QgdG8g
dXNlIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpLiBBbHNvIHJlbW92ZSBhbiBpbml0
aWFsIDEwMG1zIHRpbWVvdXQgYW5kCisgICAgICAgIHNvbWUgdWdseSB1c2VzIG9mICJ3aW5kb3cu
Ii4KKworICAgICAgICAqIGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xs
aW5nLWRpdi1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdr
Mi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTA2LTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh
cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXVtRdWlya10gVGFibGUgaGVpZ2h0IG5lZWRz
IHF1aXJrIGhhbmRsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wbGF0
Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz
dHMvZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2LWV4cGVj
dGVkLnR4dAppbmRleCBiNGYyNmQ3NzFkM2RiNTJlN2FiOGFiNTc5M2Y4M2JjN2U4ZjI2OWE3Li4z
ZWM5MzBlOWNkZGM0NmU5MzMwNmU5MDFjMGUyMjIyYzc0Mjg4MzkzIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYt
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVs
ZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50eHQKQEAgLTEsNiArMSw2IEBACi1QQVNT
IGV2ZW50LndoZWVsRGVsdGFZIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMTIwCi1QQVNT
IGV2ZW50LndoZWVsRGVsdGFYIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbExlZnQqLTEyMAotUEFT
UyBldmVudC53aGVlbERlbHRhIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMTIwCi1QQVNT
IGRpdi5zY3JvbGxUb3AgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKndpbmRvdy5waXhlbHNQ
ZXJXaGVlbFRpY2sKLVBBU1MgZGl2LnNjcm9sbExlZnQgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xs
TGVmdCp3aW5kb3cucGl4ZWxzUGVyV2hlZWxUaWNrCitQQVNTIGV2ZW50LndoZWVsRGVsdGFZIGlz
IGV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAKK1BBU1MgZXZlbnQud2hlZWxEZWx0YVggaXMgZXhwZWN0
ZWRTY3JvbGxMZWZ0Ki0xMjAKK1BBU1MgZXZlbnQud2hlZWxEZWx0YSBpcyBleHBlY3RlZFNjcm9s
bFRvcCotMTIwCitQQVNTIGRpdi5zY3JvbGxUb3AgaXMgZXhwZWN0ZWRTY3JvbGxUb3AgKiBwaXhl
bHNQZXJXaGVlbFRpY2sKK1BBU1MgZGl2LnNjcm9sbExlZnQgaXMgZXhwZWN0ZWRTY3JvbGxMZWZ0
ICogcGl4ZWxzUGVyV2hlZWxUaWNrCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZl
bnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sIGIvTGF5b3V0VGVz
dHMvZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwK
aW5kZXggNjhmNzNkYjFmYWE1NGU5MjM2ZDAyZWE0MTA3MzhjYjkxYzZlNTgxNy4uMzI5NzlmODY0
MmIxOTlkZTRhZWNjYjhjZjYxNjU4MDYyOWI2ZTEwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
ZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxp
bmctZGl2Lmh0bWwKQEAgLTEzLDIzICsxMywyNCBAQAogCiAgICAgICAgICAgICBmdW5jdGlvbiBk
aXNwYXRjaFdoZWVsRXZlbnQoKQogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGlmICgh
d2luZG93LmV2ZW50U2VuZGVyKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAg
ICAgICAgICAgICB2YXIgb3ZlcmZsb3dFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo
Im92ZXJmbG93Iik7CiAgICAgICAgICAgICAgICAgaWYgKG92ZXJmbG93RWxlbWVudCkKICAgICAg
ICAgICAgICAgICAgICAgb3ZlcmZsb3dFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNld2hl
ZWwiLCBtb3VzZXdoZWVsSGFuZGxlciwgZmFsc2UpOwogCi0gICAgICAgICAgICAgICAgaWYgKHdp
bmRvdy5ldmVudFNlbmRlcikgewotICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3Vz
ZU1vdmVUbygxMDAsIDExMCk7Ci0gICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl
U2Nyb2xsQnkoLXdpbmRvdy5leHBlY3RlZFNjcm9sbExlZnQsIC13aW5kb3cuZXhwZWN0ZWRTY3Jv
bGxUb3ApOwotICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIHNldFRpbWVvdXQo
J2NoZWNrT2Zmc2V0cygpOycsIDEwMCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91
c2VNb3ZlVG8oMTAwLCAxMTApOworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JX
aGVlbEV2ZW50cygpOworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnko
LWV4cGVjdGVkU2Nyb2xsTGVmdCwgLWV4cGVjdGVkU2Nyb2xsVG9wKTsKKyAgICAgICAgICAgICAg
ICBldmVudFNlbmRlci5jYWxsQWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoY2hlY2tPZmZzZXRzKTsK
ICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZnVuY3Rpb24gY2hlY2tPZmZzZXRzKCkKICAg
ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBkaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ
ZCgib3ZlcmZsb3ciKTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZSgiZGl2LnNjcm9sbFRvcCIs
ICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3Aqd2luZG93LnBpeGVsc1BlcldoZWVsVGljayIpOwot
ICAgICAgICAgICAgICAgIHNob3VsZEJlKCJkaXYuc2Nyb2xsTGVmdCIsICJ3aW5kb3cuZXhwZWN0
ZWRTY3JvbGxMZWZ0KndpbmRvdy5waXhlbHNQZXJXaGVlbFRpY2siKTsKKyAgICAgICAgICAgICAg
ICBzaG91bGRCZSgiZGl2LnNjcm9sbFRvcCIsICJleHBlY3RlZFNjcm9sbFRvcCAqIHBpeGVsc1Bl
cldoZWVsVGljayIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJkaXYuc2Nyb2xsTGVmdCIs
ICJleHBlY3RlZFNjcm9sbExlZnQgKiBwaXhlbHNQZXJXaGVlbFRpY2siKTsKIAogICAgICAgICAg
ICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAgICAgICAgICAgICAgICAgd2luZG93
LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwpAQCAtMzgsMTggKzM5LDIxIEBACiAgICAgICAgICAg
ICBmdW5jdGlvbiBtb3VzZXdoZWVsSGFuZGxlcihlKQogICAgICAgICAgICAgewogICAgICAgICAg
ICAgICAgIGV2ZW50ID0gZTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxE
ZWx0YVkiLCAid2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAiKTsKLSAgICAgICAgICAgICAg
ICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YVgiLCAid2luZG93LmV4cGVjdGVkU2Nyb2xsTGVm
dCotMTIwIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImV2ZW50LndoZWVsRGVsdGFZIiwg
ImV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAiKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZl
bnQud2hlZWxEZWx0YVgiLCAiZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0xMjAiKTsKIAogICAgICAgICAg
ICAgICAgIGlmIChlLndoZWVsRGVsdGFZKQotICAgICAgICAgICAgICAgICAgICBzaG91bGRCZSgi
ZXZlbnQud2hlZWxEZWx0YSIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3AqLTEyMCIpOworICAg
ICAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJleHBlY3RlZFNj
cm9sbFRvcCotMTIwIik7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAg
ICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxMZWZ0
Ki0xMjAiKTsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmUoImV2ZW50LndoZWVsRGVsdGEi
LCAiZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0xMjAiKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAg
IAorICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCAoKSA9PiB7Cisg
ICAgICAgICAgICAgICAgZGlzcGF0Y2hXaGVlbEV2ZW50KCk7CisgICAgICAgICAgICB9LCBmYWxz
ZSk7CiAgICAgICAgIDwvc2NyaXB0PgogICAgIDwvaGVhZD4KLQotICAgIDxib2R5IHN0eWxlPSJt
YXJnaW46MCIgb25sb2FkPSJzZXRUaW1lb3V0KCdkaXNwYXRjaFdoZWVsRXZlbnQoKTsnLCAxMDAp
Ij4KKyAgICA8Ym9keSBzdHlsZT0ibWFyZ2luOjAiPgogICAgICAgICA8ZGl2IGlkPSJvdmVyZmxv
dyIgc3R5bGU9ImJvcmRlcjoycHggc29saWQgYmxhY2s7b3ZlcmZsb3c6YXV0bztoZWlnaHQ6MjAw
cHg7d2lkdGg6MjAwcHg7Ij4KICAgICAgICAgICAgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQtY29s
b3I6cmVkO2hlaWdodDoyMDBweDt3aWR0aDo0MDBweDsiPjwvZGl2PgogICAgICAgICAgICAgPGRp
diBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpncmVlbjtoZWlnaHQ6MjAwcHg7d2lkdGg6NDAwcHg7
Ij48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4
cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9u
cwppbmRleCAzNzkzYjhmNjliMTRjYTZiZGMzOWFiNDZiZWEyMzkxYjI3YWJjOTQxLi5iNTU0MzM5
ZjY4M2UyOGM4ZjQ4MWM1NTU2MTdjYjUyYjNkZDM2NzNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxh
dGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMDM4LDYgKzEwMzgsNCBAQCB3ZWJr
aXQub3JnL2IvMjEzMjEyIFsgTW9qYXZlIFJlbGVhc2UgXSB3ZWJnbC8yLjAuMC9jb25mb3JtYW5j
ZTIvdGV4dHVyZXMvY2FudmFzXwogCiB3ZWJraXQub3JnL2IvMjEzMjkyIFsgQ2F0YWxpbmEgUmVs
ZWFzZSBdIGh0dHAvdGVzdHMvSW5kZXhlZERCL3N0b3JhZ2UtbGltaXQtMS5odHRwcy5odG1sIFsg
UGFzcyBGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxMzM1MSBbIENhdGFsaW5hIERlYnVnIF0g
ZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgWyBQ
YXNzIEZhaWx1cmUgXSAKLQotd2Via2l0Lm9yZy9iLzIxMzM3NSBbIERlYnVnIF0gd2ViYXVkaW8v
YmlxdWFkLWJhbmRwYXNzLmh0bWwgWyBQYXNzIENyYXNoIF0KXCBObyBuZXdsaW5lIGF0IGVuZCBv
ZiBmaWxlCit3ZWJraXQub3JnL2IvMjEzMzc1IFsgRGVidWcgXSB3ZWJhdWRpby9iaXF1YWQtYmFu
ZHBhc3MuaHRtbCBbIFBhc3MgQ3Jhc2ggXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402533</attachid>
            <date>2020-06-22 21:18:49 -0700</date>
            <delta_ts>2020-06-22 21:23:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213351-20200622211848.patch</filename>
            <type>text/plain</type>
            <size>10946</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzIyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTUyYzAyMzVmM2JjMzNmZjc3YzI2NDEzMTAzOGQ5ZTAy
M2M1ZGIyMS4uYmI4ZDA1MmFjMDU0ZGUyMjcwNTJkOTQ2NzQzNGViNGU1MmFiOTdiMyAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIwLTA2LTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor
CisgICAgICAgIFsgQ2F0YWxpbmEgRGVidWcgV0syIF0gZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNTEKKyAgICAgICAg
PHJkYXI6Ly9wcm9ibGVtLzY0NTAyNDI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSB2YXJpYWRpYyBDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxF
dmVudCgpIHNlZW1zIHRvIGhhdmUgYW4gaXNzdWUgdGhhdCBjYXVzZXMgdGhlIHJlc3VsdGluZyBl
dmVudAorICAgICAgICB0byByYXJlbHkgcHV0IHRoZSB4IHZhbHVlIGludG8gdGhlIGRlbHRhWS4g
Q2hhbmdlIHRvIHRoZSBub24tdmFyaWFkaWMgQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQy
KCkKKyAgICAgICAgdG8gYXZvaWQgdGhpcy4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21h
Yy9FdmVudFNlbmRpbmdDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtFdmVudFNlbmRpbmdDb250
cm9sbGVyIG1vdXNlU2Nyb2xsQnlYOmFuZFk6Y29udGludW91c2x5Ol0pOgorICAgICAgICAoLVtF
dmVudFNlbmRpbmdDb250cm9sbGVyIG1vdXNlU2Nyb2xsQnlYOmFuZFk6d2l0aFdoZWVsOmFuZE1v
bWVudHVtUGhhc2VzOl0pOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2Vu
ZGVyUHJveHkubW06CisgICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJveHk6Om1vdXNlU2Nyb2xs
QnkpOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5V2l0aFdo
ZWVsQW5kTW9tZW50dW1QaGFzZXMpOgorCiAyMDIwLTA2LTIwICBKZXIgTm9ibGUgIDxqZXIubm9i
bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI1OTIxOSk6IFNsZWVwIGFzc2Vy
dGlvbiByZW1haW5zIGFjdGl2ZSBpZiBXS1dlYlZpZXcgaXMgY2xvc2VkIG9yIFdlYkNvbnRlbnQg
cHJvY2VzcyBjcmFzaGVzCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRXZl
bnRTZW5kaW5nQ29udHJvbGxlci5tbSBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNl
bmRpbmdDb250cm9sbGVyLm1tCmluZGV4IDVjMDEyODdkMGFlZGE5ZDRhMzcxMmRiYzYzYjEzMjRm
NzdhMmJiNzIuLmNhM2U2ZDBhZDgzYmZlOWVkNTFjM2QxZTQxNDhlNTk5YWZmZTZhOTAgMTAwNjQ0
Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNlbmRpbmdDb250cm9sbGVyLm1t
CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNlbmRpbmdDb250cm9sbGVyLm1t
CkBAIC04MTcsNyArODE3LDcgQEAgLSAodm9pZCltb3VzZVNjcm9sbEJ5WDooaW50KXggYW5kWToo
aW50KXkgY29udGludW91c2x5OihCT09MKWNvbnRpbnVvdXNseQogewogI2lmICFQTEFURk9STShJ
T1NfRkFNSUxZKQogICAgIENHU2Nyb2xsRXZlbnRVbml0IHVuaXQgPSBjb250aW51b3VzbHkgPyBr
Q0dTY3JvbGxFdmVudFVuaXRQaXhlbCA6IGtDR1Njcm9sbEV2ZW50VW5pdExpbmU7Ci0gICAgQ0dF
dmVudFJlZiBjZ1Njcm9sbEV2ZW50ID0gQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQoTlVM
TCwgdW5pdCwgMiwgeSwgeCk7CisgICAgQ0dFdmVudFJlZiBjZ1Njcm9sbEV2ZW50ID0gQ0dFdmVu
dENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQyKE5VTEwsIHVuaXQsIDIsIHksIHgsIDApOwogICAgIAog
ICAgIC8vIFNldCB0aGUgQ0dFdmVudCBsb2NhdGlvbiBpbiBmbGlwcGVkIGNvb3JkcyByZWxhdGl2
ZSB0byB0aGUgZmlyc3Qgc2NyZWVuLCB3aGljaAogICAgIC8vIGNvbXBlbnNhdGVzIGZvciB0aGUg
YmVoYXZpb3Igb2YgK1tOU0V2ZW50IGV2ZW50V2l0aENHRXZlbnQ6XSB3aGVuIHRoZSBldmVudCBo
YXMKQEAgLTg4Myw3ICs4ODMsNyBAQCAtICh2b2lkKW1vdXNlU2Nyb2xsQnlYOihpbnQpeCBhbmRZ
OihpbnQpeSB3aXRoV2hlZWw6KE5TU3RyaW5nKilwaGFzZU5hbWUgYW5kTW9tZQogICAgIGlmICht
b21lbnR1bSA9PSBrQ0dNb21lbnR1bVNjcm9sbFBoYXNlRW5kKQogICAgICAgICBfc2VudE1vbWVu
dHVtUGhhc2VFbmQgPSBZRVM7CiAKLSAgICBDR0V2ZW50UmVmIGNnU2Nyb2xsRXZlbnQgPSBDR0V2
ZW50Q3JlYXRlU2Nyb2xsV2hlZWxFdmVudChOVUxMLCBrQ0dTY3JvbGxFdmVudFVuaXRMaW5lLCAy
LCB5LCB4KTsKKyAgICBDR0V2ZW50UmVmIGNnU2Nyb2xsRXZlbnQgPSBDR0V2ZW50Q3JlYXRlU2Ny
b2xsV2hlZWxFdmVudDIoTlVMTCwga0NHU2Nyb2xsRXZlbnRVbml0TGluZSwgMiwgeSwgeCwgMCk7
CiAKICAgICAvLyBTZXQgdGhlIENHRXZlbnQgbG9jYXRpb24gaW4gZmxpcHBlZCBjb29yZHMgcmVs
YXRpdmUgdG8gdGhlIGZpcnN0IHNjcmVlbiwgd2hpY2gKICAgICAvLyBjb21wZW5zYXRlcyBmb3Ig
dGhlIGJlaGF2aW9yIG9mICtbTlNFdmVudCBldmVudFdpdGhDR0V2ZW50Ol0gd2hlbiB0aGUgZXZl
bnQgaGFzCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9FdmVudFNlbmRl
clByb3h5Lm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvRXZlbnRTZW5kZXJQcm94eS5t
bQppbmRleCBjYzE1YWNkNjcxYzMzZWEyZDE2ODFkMDIwNzcyZmU1YmZiNmIzMTRhLi5mODNiZjdk
ZDU3ZGM0ODFmZTM2NWRmZTAzYmY3YmQyYjZhNzQ1ZmQ2IDEwMDY0NAotLS0gYS9Ub29scy9XZWJL
aXRUZXN0UnVubmVyL21hYy9FdmVudFNlbmRlclByb3h5Lm1tCisrKyBiL1Rvb2xzL1dlYktpdFRl
c3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW0KQEAgLTgyNiw3ICs4MjYsNyBAQCB2b2lk
IEV2ZW50U2VuZGVyUHJveHk6OmtleURvd24oV0tTdHJpbmdSZWYga2V5LCBXS0V2ZW50TW9kaWZp
ZXJzIG1vZGlmaWVycywgdW5zaQogCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6Om1vdXNlU2Nyb2xs
QnkoaW50IHgsIGludCB5KQogewotICAgIFJldGFpblB0cjxDR0V2ZW50UmVmPiBjZ1Njcm9sbEV2
ZW50ID0gYWRvcHRDRihDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxFdmVudCgwLCBrQ0dTY3JvbGxF
dmVudFVuaXRMaW5lLCAyLCB5LCB4KSk7CisgICAgUmV0YWluUHRyPENHRXZlbnRSZWY+IGNnU2Ny
b2xsRXZlbnQgPSBhZG9wdENGKENHRXZlbnRDcmVhdGVTY3JvbGxXaGVlbEV2ZW50MigwLCBrQ0dT
Y3JvbGxFdmVudFVuaXRMaW5lLCAyLCB5LCB4LCAwKSk7CiAKICAgICAvLyBTZXQgdGhlIENHRXZl
bnQgbG9jYXRpb24gaW4gZmxpcHBlZCBjb29yZHMgcmVsYXRpdmUgdG8gdGhlIGZpcnN0IHNjcmVl
biwgd2hpY2gKICAgICAvLyBjb21wZW5zYXRlcyBmb3IgdGhlIGJlaGF2aW9yIG9mICtbTlNFdmVu
dCBldmVudFdpdGhDR0V2ZW50Ol0gd2hlbiB0aGUgZXZlbnQgaGFzCkBAIC04NTMsNyArODUzLDcg
QEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojpjb250aW51b3VzTW91c2VTY3JvbGxCeShpbnQgeCwg
aW50IHksIGJvb2wgcGFnZWQpCiAKIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6bW91c2VTY3JvbGxC
eVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGludCB4LCBpbnQgeSwgaW50IHBoYXNlLCBpbnQg
bW9tZW50dW0pCiB7Ci0gICAgUmV0YWluUHRyPENHRXZlbnRSZWY+IGNnU2Nyb2xsRXZlbnQgPSBh
ZG9wdENGKENHRXZlbnRDcmVhdGVTY3JvbGxXaGVlbEV2ZW50KDAsIGtDR1Njcm9sbEV2ZW50VW5p
dExpbmUsIDIsIHksIHgpKTsKKyAgICBSZXRhaW5QdHI8Q0dFdmVudFJlZj4gY2dTY3JvbGxFdmVu
dCA9IGFkb3B0Q0YoQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQyKDAsIGtDR1Njcm9sbEV2
ZW50VW5pdExpbmUsIDIsIHksIHgsIDApKTsKIAogICAgIC8vIFNldCB0aGUgQ0dFdmVudCBsb2Nh
dGlvbiBpbiBmbGlwcGVkIGNvb3JkcyByZWxhdGl2ZSB0byB0aGUgZmlyc3Qgc2NyZWVuLCB3aGlj
aAogICAgIC8vIGNvbXBlbnNhdGVzIGZvciB0aGUgYmVoYXZpb3Igb2YgK1tOU0V2ZW50IGV2ZW50
V2l0aENHRXZlbnQ6XSB3aGVuIHRoZSBldmVudCBoYXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ZWQ1Y2I2YTBjODYxOWY1
YWQzZDgxNjI1MjZjZjBkOGFjOWQyZGNkLi40OTFiNWM3ZjVmYTZlMGVmNmZlZjRmNzUxYjEwYzA1
NDFlZmIxMjU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDYtMjEgIFNpbW9uIEZyYXNl
ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgWyBDYXRhbGluYSBEZWJ1ZyBX
SzIgXSBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRt
bCBpcyBhIGZsYWt5IGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzM1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ1MDI0Mjk+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHRoZSB0
ZXN0IHRvIHVzZSBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKS4gQWxzbyByZW1vdmUg
YW4gaW5pdGlhbCAxMDBtcyB0aW1lb3V0IGFuZAorICAgICAgICBzb21lIHVnbHkgdXNlcyBvZiAi
d2luZG93LiIsIGFuZCBtYWtlIGl0IGEgcHJvcGVyIGpzLXRlc3QtcHJlL2pzLXRlc3QtcG9zdCB0
ZXN0LgorCisgICAgICAgICogZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3Jv
bGxpbmctZGl2LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13
aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMt
d2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjAtMDYtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFu
QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdW1F1aXJrXSBUYWJsZSBoZWlnaHQgbmVl
ZHMgcXVpcmsgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Bs
YXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhw
ZWN0ZWQudHh0CmluZGV4IGI0ZjI2ZDc3MWQzZGI1MmU3YWI4YWI1NzkzZjgzYmM3ZThmMjY5YTcu
LmM3ZGFiMDA2MmE3NGM5NTJhODE0MmVlZTY3MjRiMTAxOWZiZmI0OTUgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRp
di1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2LWV4cGVjdGVkLnR4dApAQCAtMSw2ICsxLDkgQEAKLVBB
U1MgZXZlbnQud2hlZWxEZWx0YVkgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAKLVBB
U1MgZXZlbnQud2hlZWxEZWx0YVggaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCotMTIwCi1Q
QVNTIGV2ZW50LndoZWVsRGVsdGEgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAKLVBB
U1MgZGl2LnNjcm9sbFRvcCBpcyB3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3Aqd2luZG93LnBpeGVs
c1BlcldoZWVsVGljawotUEFTUyBkaXYuc2Nyb2xsTGVmdCBpcyB3aW5kb3cuZXhwZWN0ZWRTY3Jv
bGxMZWZ0KndpbmRvdy5waXhlbHNQZXJXaGVlbFRpY2sKK1BBU1MgZXZlbnQud2hlZWxEZWx0YVkg
aXMgZXhwZWN0ZWRTY3JvbGxUb3AgKiAtMTIwCitQQVNTIGV2ZW50LndoZWVsRGVsdGFYIGlzIGV4
cGVjdGVkU2Nyb2xsTGVmdCAqIC0xMjAKK1BBU1MgZXZlbnQud2hlZWxEZWx0YSBpcyBleHBlY3Rl
ZFNjcm9sbFRvcCAqIC0xMjAKK1BBU1MgZGl2LnNjcm9sbFRvcCBpcyBleHBlY3RlZFNjcm9sbFRv
cCAqIHBpeGVsc1BlcldoZWVsVGljaworUEFTUyBkaXYuc2Nyb2xsTGVmdCBpcyBleHBlY3RlZFNj
cm9sbExlZnQgKiBwaXhlbHNQZXJXaGVlbFRpY2sKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlz
IHRydWUKKworVEVTVCBDT01QTEVURQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2
ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbCBiL0xheW91dFRl
c3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1s
CmluZGV4IDY4ZjczZGIxZmFhNTRlOTIzNmQwMmVhNDEwNzM4Y2I5MWM2ZTU4MTcuLjA5ZDA2OGQ3
OWQyNjFhOWMxNzQ3ZWYxYWY5YTYxMDkyNjkwMGMyMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sCisr
KyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xs
aW5nLWRpdi5odG1sCkBAIC04LDUzICs4LDU4IEBACiAgICAgICAgICAgICB2YXIgZXZlbnQ7CiAg
ICAgICAgICAgICB2YXIgZGl2OwogCi0gICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIp
Ci0gICAgICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAg
ICBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlzcGF0Y2hX
aGVlbEV2ZW50KCkKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBpZiAoIXdpbmRvdy5l
dmVudFNlbmRlcikgeworICAgICAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAg
ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAg
ICAgIHZhciBvdmVyZmxvd0VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcmZs
b3ciKTsKICAgICAgICAgICAgICAgICBpZiAob3ZlcmZsb3dFbGVtZW50KQogICAgICAgICAgICAg
ICAgICAgICBvdmVyZmxvd0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V3aGVlbCIsIG1v
dXNld2hlZWxIYW5kbGVyLCBmYWxzZSk7CiAKLSAgICAgICAgICAgICAgICBpZiAod2luZG93LmV2
ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRv
KDEwMCwgMTEwKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC
eSgtd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCwgLXdpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCk7
Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgc2V0VGltZW91dCgnY2hlY2tP
ZmZzZXRzKCk7JywgMTAwKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVU
bygxMDAsIDExMCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZl
bnRzKCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeSgtZXhwZWN0
ZWRTY3JvbGxMZWZ0LCAtZXhwZWN0ZWRTY3JvbGxUb3ApOworICAgICAgICAgICAgICAgIGV2ZW50
U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhjaGVja09mZnNldHMpOwogICAgICAg
ICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBjaGVja09mZnNldHMoKQogICAgICAgICAg
ICAgewogICAgICAgICAgICAgICAgIGRpdiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVy
ZmxvdyIpOwotICAgICAgICAgICAgICAgIHNob3VsZEJlKCJkaXYuc2Nyb2xsVG9wIiwgIndpbmRv
dy5leHBlY3RlZFNjcm9sbFRvcCp3aW5kb3cucGl4ZWxzUGVyV2hlZWxUaWNrIik7Ci0gICAgICAg
ICAgICAgICAgc2hvdWxkQmUoImRpdi5zY3JvbGxMZWZ0IiwgIndpbmRvdy5leHBlY3RlZFNjcm9s
bExlZnQqd2luZG93LnBpeGVsc1BlcldoZWVsVGljayIpOworICAgICAgICAgICAgICAgIHNob3Vs
ZEJlKCJkaXYuc2Nyb2xsVG9wIiwgImV4cGVjdGVkU2Nyb2xsVG9wICogcGl4ZWxzUGVyV2hlZWxU
aWNrIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImRpdi5zY3JvbGxMZWZ0IiwgImV4cGVj
dGVkU2Nyb2xsTGVmdCAqIHBpeGVsc1BlcldoZWVsVGljayIpOwogCi0gICAgICAgICAgICAgICAg
aWYgKHdpbmRvdy50ZXN0UnVubmVyKQotICAgICAgICAgICAgICAgICAgICB3aW5kb3cudGVzdFJ1
bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CiAgICAg
ICAgICAgICB9CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIG1vdXNld2hlZWxIYW5kbGVyKGUpCiAg
ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgZXZlbnQgPSBlOwotICAgICAgICAgICAgICAg
IHNob3VsZEJlKCJldmVudC53aGVlbERlbHRhWSIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3Aq
LTEyMCIpOwotICAgICAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC53aGVlbERlbHRhWCIsICJ3
aW5kb3cuZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0xMjAiKTsKKyAgICAgICAgICAgICAgICBzaG91bGRC
ZSgiZXZlbnQud2hlZWxEZWx0YVkiLCAiZXhwZWN0ZWRTY3JvbGxUb3AgKiAtMTIwIik7CisgICAg
ICAgICAgICAgICAgc2hvdWxkQmUoImV2ZW50LndoZWVsRGVsdGFYIiwgImV4cGVjdGVkU2Nyb2xs
TGVmdCAqIC0xMjAiKTsKIAogICAgICAgICAgICAgICAgIGlmIChlLndoZWVsRGVsdGFZKQotICAg
ICAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJ3aW5kb3cuZXhw
ZWN0ZWRTY3JvbGxUb3AqLTEyMCIpOworICAgICAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZl
bnQud2hlZWxEZWx0YSIsICJleHBlY3RlZFNjcm9sbFRvcCAqIC0xMjAiKTsKICAgICAgICAgICAg
ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHNob3VsZEJlKCJldmVudC53aGVlbERlbHRh
IiwgIndpbmRvdy5leHBlY3RlZFNjcm9sbExlZnQqLTEyMCIpOworICAgICAgICAgICAgICAgICAg
ICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJleHBlY3RlZFNjcm9sbExlZnQgKiAtMTIw
Iik7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHdpbmRvdy5hZGRF
dmVudExpc3RlbmVyKCdsb2FkJywgKCkgPT4geworICAgICAgICAgICAgICAgIHNldFRpbWVvdXQo
ZGlzcGF0Y2hXaGVlbEV2ZW50LCAwKTsKKyAgICAgICAgICAgIH0sIGZhbHNlKTsKICAgICAgICAg
PC9zY3JpcHQ+CiAgICAgPC9oZWFkPgotCi0gICAgPGJvZHkgc3R5bGU9Im1hcmdpbjowIiBvbmxv
YWQ9InNldFRpbWVvdXQoJ2Rpc3BhdGNoV2hlZWxFdmVudCgpOycsIDEwMCkiPgorICAgIDxib2R5
IHN0eWxlPSJtYXJnaW46MCI+CiAgICAgICAgIDxkaXYgaWQ9Im92ZXJmbG93IiBzdHlsZT0iYm9y
ZGVyOjJweCBzb2xpZCBibGFjaztvdmVyZmxvdzphdXRvO2hlaWdodDoyMDBweDt3aWR0aDoyMDBw
eDsiPgogICAgICAgICAgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpyZWQ7aGVpZ2h0
OjIwMHB4O3dpZHRoOjQwMHB4OyI+PC9kaXY+CiAgICAgICAgICAgICA8ZGl2IHN0eWxlPSJiYWNr
Z3JvdW5kLWNvbG9yOmdyZWVuO2hlaWdodDoyMDBweDt3aWR0aDo0MDBweDsiPjwvZGl2PgogICAg
ICAgICAgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpyZWQ7aGVpZ2h0OjIwMHB4O3dp
ZHRoOjQwMHB4OyI+PC9kaXY+CiAgICAgICAgIDwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJjb25z
b2xlIj48L2Rpdj4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0
LXBvc3QuanMiPjwvc2NyaXB0PgogICAgIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz
L3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAzNzkzYjhmNjliMTRjYTZi
ZGMzOWFiNDZiZWEyMzkxYjI3YWJjOTQxLi5iNTU0MzM5ZjY4M2UyOGM4ZjQ4MWM1NTU2MTdjYjUy
YjNkZDM2NzNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RF
eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0
YXRpb25zCkBAIC0xMDM4LDYgKzEwMzgsNCBAQCB3ZWJraXQub3JnL2IvMjEzMjEyIFsgTW9qYXZl
IFJlbGVhc2UgXSB3ZWJnbC8yLjAuMC9jb25mb3JtYW5jZTIvdGV4dHVyZXMvY2FudmFzXwogCiB3
ZWJraXQub3JnL2IvMjEzMjkyIFsgQ2F0YWxpbmEgUmVsZWFzZSBdIGh0dHAvdGVzdHMvSW5kZXhl
ZERCL3N0b3JhZ2UtbGltaXQtMS5odHRwcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAotd2Via2l0
Lm9yZy9iLzIxMzM1MSBbIENhdGFsaW5hIERlYnVnIF0gZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXSAKLQotd2Via2l0
Lm9yZy9iLzIxMzM3NSBbIERlYnVnIF0gd2ViYXVkaW8vYmlxdWFkLWJhbmRwYXNzLmh0bWwgWyBQ
YXNzIENyYXNoIF0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit3ZWJraXQub3JnL2IvMjEz
Mzc1IFsgRGVidWcgXSB3ZWJhdWRpby9iaXF1YWQtYmFuZHBhc3MuaHRtbCBbIFBhc3MgQ3Jhc2gg
XQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402534</attachid>
            <date>2020-06-22 21:23:12 -0700</date>
            <delta_ts>2020-06-23 08:14:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213351-20200622212311.patch</filename>
            <type>text/plain</type>
            <size>11138</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzIwMWFjMzhlM2IxNWYyNjk2NTM5ZjkyNTE4MzE5NjE0
NWJiMDZjYy4uMDVhZjY0ZjViN2QxM2I1ZTdjYzlkOTFkNzEwZTA5OTM4MGMwZmRiMiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIwLTA2LTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor
CisgICAgICAgIFsgQ2F0YWxpbmEgRGVidWcgV0syIF0gZmFzdC9ldmVudHMvcGxhdGZvcm0td2hl
ZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzNTEKKyAgICAgICAg
PHJkYXI6Ly9wcm9ibGVtLzY0NTAyNDI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSB2YXJpYWRpYyBDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxF
dmVudCgpIHNlZW1zIHRvIGhhdmUgYW4gaXNzdWUgdGhhdCBjYXVzZXMgdGhlIHJlc3VsdGluZyBl
dmVudAorICAgICAgICB0byByYXJlbHkgcHV0IHRoZSB4IHZhbHVlIGludG8gdGhlIGRlbHRhWS4g
Q2hhbmdlIHRvIHRoZSBub24tdmFyaWFkaWMgQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQy
KCkKKyAgICAgICAgdG8gYXZvaWQgdGhpcy4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21h
Yy9FdmVudFNlbmRpbmdDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtFdmVudFNlbmRpbmdDb250
cm9sbGVyIG1vdXNlU2Nyb2xsQnlYOmFuZFk6Y29udGludW91c2x5Ol0pOgorICAgICAgICAoLVtF
dmVudFNlbmRpbmdDb250cm9sbGVyIG1vdXNlU2Nyb2xsQnlYOmFuZFk6d2l0aFdoZWVsOmFuZE1v
bWVudHVtUGhhc2VzOl0pOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2Vu
ZGVyUHJveHkubW06CisgICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJveHk6Om1vdXNlU2Nyb2xs
QnkpOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5V2l0aFdo
ZWVsQW5kTW9tZW50dW1QaGFzZXMpOgorCiAyMDIwLTA2LTIyICBGdWppaSBIaXJvbm9yaSAgPEhp
cm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dIGZhc3QvZG9tL1dpbmRvdy9h
bGVydC13aXRoLXVubWF0Y2hlZC11dGYxNi1zdXJyb2dhdGUtc2hvdWxkLW5vdC1jcmFzaC5odG1s
IGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNl
bmRpbmdDb250cm9sbGVyLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGlu
Z0NvbnRyb2xsZXIubW0KaW5kZXggNWMwMTI4N2QwYWVkYTlkNGEzNzEyZGJjNjNiMTMyNGY3N2Ey
YmI3Mi4uY2EzZTZkMGFkODNiZmU5ZWQ1MWMzZDFlNDE0OGU1OTlhZmZlNmE5MCAxMDA2NDQKLS0t
IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KKysr
IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KQEAg
LTgxNyw3ICs4MTcsNyBAQCAtICh2b2lkKW1vdXNlU2Nyb2xsQnlYOihpbnQpeCBhbmRZOihpbnQp
eSBjb250aW51b3VzbHk6KEJPT0wpY29udGludW91c2x5CiB7CiAjaWYgIVBMQVRGT1JNKElPU19G
QU1JTFkpCiAgICAgQ0dTY3JvbGxFdmVudFVuaXQgdW5pdCA9IGNvbnRpbnVvdXNseSA/IGtDR1Nj
cm9sbEV2ZW50VW5pdFBpeGVsIDoga0NHU2Nyb2xsRXZlbnRVbml0TGluZTsKLSAgICBDR0V2ZW50
UmVmIGNnU2Nyb2xsRXZlbnQgPSBDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxFdmVudChOVUxMLCB1
bml0LCAyLCB5LCB4KTsKKyAgICBDR0V2ZW50UmVmIGNnU2Nyb2xsRXZlbnQgPSBDR0V2ZW50Q3Jl
YXRlU2Nyb2xsV2hlZWxFdmVudDIoTlVMTCwgdW5pdCwgMiwgeSwgeCwgMCk7CiAgICAgCiAgICAg
Ly8gU2V0IHRoZSBDR0V2ZW50IGxvY2F0aW9uIGluIGZsaXBwZWQgY29vcmRzIHJlbGF0aXZlIHRv
IHRoZSBmaXJzdCBzY3JlZW4sIHdoaWNoCiAgICAgLy8gY29tcGVuc2F0ZXMgZm9yIHRoZSBiZWhh
dmlvciBvZiArW05TRXZlbnQgZXZlbnRXaXRoQ0dFdmVudDpdIHdoZW4gdGhlIGV2ZW50IGhhcwpA
QCAtODgzLDcgKzg4Myw3IEBAIC0gKHZvaWQpbW91c2VTY3JvbGxCeVg6KGludCl4IGFuZFk6KGlu
dCl5IHdpdGhXaGVlbDooTlNTdHJpbmcqKXBoYXNlTmFtZSBhbmRNb21lCiAgICAgaWYgKG1vbWVu
dHVtID09IGtDR01vbWVudHVtU2Nyb2xsUGhhc2VFbmQpCiAgICAgICAgIF9zZW50TW9tZW50dW1Q
aGFzZUVuZCA9IFlFUzsKIAotICAgIENHRXZlbnRSZWYgY2dTY3JvbGxFdmVudCA9IENHRXZlbnRD
cmVhdGVTY3JvbGxXaGVlbEV2ZW50KE5VTEwsIGtDR1Njcm9sbEV2ZW50VW5pdExpbmUsIDIsIHks
IHgpOworICAgIENHRXZlbnRSZWYgY2dTY3JvbGxFdmVudCA9IENHRXZlbnRDcmVhdGVTY3JvbGxX
aGVlbEV2ZW50MihOVUxMLCBrQ0dTY3JvbGxFdmVudFVuaXRMaW5lLCAyLCB5LCB4LCAwKTsKIAog
ICAgIC8vIFNldCB0aGUgQ0dFdmVudCBsb2NhdGlvbiBpbiBmbGlwcGVkIGNvb3JkcyByZWxhdGl2
ZSB0byB0aGUgZmlyc3Qgc2NyZWVuLCB3aGljaAogICAgIC8vIGNvbXBlbnNhdGVzIGZvciB0aGUg
YmVoYXZpb3Igb2YgK1tOU0V2ZW50IGV2ZW50V2l0aENHRXZlbnQ6XSB3aGVuIHRoZSBldmVudCBo
YXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJv
eHkubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9FdmVudFNlbmRlclByb3h5Lm1tCmlu
ZGV4IGNjMTVhY2Q2NzFjMzNlYTJkMTY4MWQwMjA3NzJmZTViZmI2YjMxNGEuLmY4M2JmN2RkNTdk
YzQ4MWZlMzY1ZGZlMDNiZjdiZDJiNmE3NDVmZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl
c3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1
bm5lci9tYWMvRXZlbnRTZW5kZXJQcm94eS5tbQpAQCAtODI2LDcgKzgyNiw3IEBAIHZvaWQgRXZl
bnRTZW5kZXJQcm94eTo6a2V5RG93bihXS1N0cmluZ1JlZiBrZXksIFdLRXZlbnRNb2RpZmllcnMg
bW9kaWZpZXJzLCB1bnNpCiAKIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShp
bnQgeCwgaW50IHkpCiB7Ci0gICAgUmV0YWluUHRyPENHRXZlbnRSZWY+IGNnU2Nyb2xsRXZlbnQg
PSBhZG9wdENGKENHRXZlbnRDcmVhdGVTY3JvbGxXaGVlbEV2ZW50KDAsIGtDR1Njcm9sbEV2ZW50
VW5pdExpbmUsIDIsIHksIHgpKTsKKyAgICBSZXRhaW5QdHI8Q0dFdmVudFJlZj4gY2dTY3JvbGxF
dmVudCA9IGFkb3B0Q0YoQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQyKDAsIGtDR1Njcm9s
bEV2ZW50VW5pdExpbmUsIDIsIHksIHgsIDApKTsKIAogICAgIC8vIFNldCB0aGUgQ0dFdmVudCBs
b2NhdGlvbiBpbiBmbGlwcGVkIGNvb3JkcyByZWxhdGl2ZSB0byB0aGUgZmlyc3Qgc2NyZWVuLCB3
aGljaAogICAgIC8vIGNvbXBlbnNhdGVzIGZvciB0aGUgYmVoYXZpb3Igb2YgK1tOU0V2ZW50IGV2
ZW50V2l0aENHRXZlbnQ6XSB3aGVuIHRoZSBldmVudCBoYXMKQEAgLTg1Myw3ICs4NTMsNyBAQCB2
b2lkIEV2ZW50U2VuZGVyUHJveHk6OmNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5KGludCB4LCBpbnQg
eSwgYm9vbCBwYWdlZCkKIAogdm9pZCBFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5V2l0
aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoaW50IHgsIGludCB5LCBpbnQgcGhhc2UsIGludCBtb21l
bnR1bSkKIHsKLSAgICBSZXRhaW5QdHI8Q0dFdmVudFJlZj4gY2dTY3JvbGxFdmVudCA9IGFkb3B0
Q0YoQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQoMCwga0NHU2Nyb2xsRXZlbnRVbml0TGlu
ZSwgMiwgeSwgeCkpOworICAgIFJldGFpblB0cjxDR0V2ZW50UmVmPiBjZ1Njcm9sbEV2ZW50ID0g
YWRvcHRDRihDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxFdmVudDIoMCwga0NHU2Nyb2xsRXZlbnRV
bml0TGluZSwgMiwgeSwgeCwgMCkpOwogCiAgICAgLy8gU2V0IHRoZSBDR0V2ZW50IGxvY2F0aW9u
IGluIGZsaXBwZWQgY29vcmRzIHJlbGF0aXZlIHRvIHRoZSBmaXJzdCBzY3JlZW4sIHdoaWNoCiAg
ICAgLy8gY29tcGVuc2F0ZXMgZm9yIHRoZSBiZWhhdmlvciBvZiArW05TRXZlbnQgZXZlbnRXaXRo
Q0dFdmVudDpdIHdoZW4gdGhlIGV2ZW50IGhhcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZjNTMxYWJmZTk0YjM4NGRjYmY4
ZTg5Y2Q3ZmMxZmM2OGMwNWJjYjguLmI1YmUwYjc1NzhkMTk4MDUwYTVlZDEyYjQxNzFjY2FkNDli
OGFkNzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0wNi0yMSAgU2ltb24gRnJhc2VyICA8
c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBbIENhdGFsaW5hIERlYnVnIFdLMiBd
IGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sIGlz
IGEgZmxha3kgZmFpbHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjEzMzUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDUwMjQyOT4KKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggdGhlIHRlc3Qg
dG8gdXNlIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpLiBBbHNvIHJlbW92ZSBhbiBp
bml0aWFsIDEwMG1zIHRpbWVvdXQgYW5kCisgICAgICAgIHNvbWUgdWdseSB1c2VzIG9mICJ3aW5k
b3cuIiwgYW5kIG1ha2UgaXQgYSBwcm9wZXIganMtdGVzdC1wcmUvanMtdGVzdC1wb3N0IHRlc3Qu
CisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGlu
Zy1kaXYtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVs
ZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azIv
VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wNi0yMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9y
aS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBmYXN0L2RvbS9XaW5kb3cvYWxlcnQt
d2l0aC11bm1hdGNoZWQtdXRmMTYtc3Vycm9nYXRlLXNob3VsZC1ub3QtY3Jhc2guaHRtbCBpcyBm
YWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVl
bGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9l
dmVudHMvcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2LWV4cGVjdGVkLnR4dApp
bmRleCBiNGYyNmQ3NzFkM2RiNTJlN2FiOGFiNTc5M2Y4M2JjN2U4ZjI2OWE3Li5jN2RhYjAwNjJh
NzRjOTUyYTgxNDJlZWU2NzI0YjEwMTlmYmZiNDk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m
YXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhwZWN0ZWQu
dHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4t
c2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50eHQKQEAgLTEsNiArMSw5IEBACi1QQVNTIGV2ZW50Lndo
ZWVsRGVsdGFZIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMTIwCi1QQVNTIGV2ZW50Lndo
ZWVsRGVsdGFYIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbExlZnQqLTEyMAotUEFTUyBldmVudC53
aGVlbERlbHRhIGlzIHdpbmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMTIwCi1QQVNTIGRpdi5zY3Jv
bGxUb3AgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKndpbmRvdy5waXhlbHNQZXJXaGVlbFRp
Y2sKLVBBU1MgZGl2LnNjcm9sbExlZnQgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCp3aW5k
b3cucGl4ZWxzUGVyV2hlZWxUaWNrCitQQVNTIGV2ZW50LndoZWVsRGVsdGFZIGlzIGV4cGVjdGVk
U2Nyb2xsVG9wICogLTEyMAorUEFTUyBldmVudC53aGVlbERlbHRhWCBpcyBleHBlY3RlZFNjcm9s
bExlZnQgKiAtMTIwCitQQVNTIGV2ZW50LndoZWVsRGVsdGEgaXMgZXhwZWN0ZWRTY3JvbGxUb3Ag
KiAtMTIwCitQQVNTIGRpdi5zY3JvbGxUb3AgaXMgZXhwZWN0ZWRTY3JvbGxUb3AgKiBwaXhlbHNQ
ZXJXaGVlbFRpY2sKK1BBU1MgZGl2LnNjcm9sbExlZnQgaXMgZXhwZWN0ZWRTY3JvbGxMZWZ0ICog
cGl4ZWxzUGVyV2hlZWxUaWNrCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF
U1QgQ09NUExFVEUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGxhdGZv
cm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2
ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbAppbmRleCA2OGY3
M2RiMWZhYTU0ZTkyMzZkMDJlYTQxMDczOGNiOTFjNmU1ODE3Li4wOWQwNjhkNzlkMjYxYTljMTc0
N2VmMWFmOWE2MTA5MjY5MDBjMjBlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50
cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRtbAorKysgYi9MYXlvdXRU
ZXN0cy9mYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYuaHRt
bApAQCAtOCw1MyArOCw1OCBAQAogICAgICAgICAgICAgdmFyIGV2ZW50OwogICAgICAgICAgICAg
dmFyIGRpdjsKIAotICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQotICAgICAgICAg
ICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICAgICAganNUZXN0SXNB
c3luYyA9IHRydWU7CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpc3BhdGNoV2hlZWxFdmVudCgp
CiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIp
IHsKKyAgICAgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICAgICAg
ICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICB2YXIgb3Zl
cmZsb3dFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJmbG93Iik7CiAgICAg
ICAgICAgICAgICAgaWYgKG92ZXJmbG93RWxlbWVudCkKICAgICAgICAgICAgICAgICAgICAgb3Zl
cmZsb3dFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNld2hlZWwiLCBtb3VzZXdoZWVsSGFu
ZGxlciwgZmFsc2UpOwogCi0gICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikg
ewotICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDExMCk7
Ci0gICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnkoLXdpbmRvdy5l
eHBlY3RlZFNjcm9sbExlZnQsIC13aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3ApOwotICAgICAgICAg
ICAgICAgIH0KLQotICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoJ2NoZWNrT2Zmc2V0cygpOycs
IDEwMCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oMTAwLCAxMTAp
OworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOworICAg
ICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnkoLWV4cGVjdGVkU2Nyb2xsTGVm
dCwgLWV4cGVjdGVkU2Nyb2xsVG9wKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5jYWxs
QWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoY2hlY2tPZmZzZXRzKTsKICAgICAgICAgICAgIH0KIAog
ICAgICAgICAgICAgZnVuY3Rpb24gY2hlY2tPZmZzZXRzKCkKICAgICAgICAgICAgIHsKICAgICAg
ICAgICAgICAgICBkaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcmZsb3ciKTsKLSAg
ICAgICAgICAgICAgICBzaG91bGRCZSgiZGl2LnNjcm9sbFRvcCIsICJ3aW5kb3cuZXhwZWN0ZWRT
Y3JvbGxUb3Aqd2luZG93LnBpeGVsc1BlcldoZWVsVGljayIpOwotICAgICAgICAgICAgICAgIHNo
b3VsZEJlKCJkaXYuc2Nyb2xsTGVmdCIsICJ3aW5kb3cuZXhwZWN0ZWRTY3JvbGxMZWZ0KndpbmRv
dy5waXhlbHNQZXJXaGVlbFRpY2siKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgiZGl2LnNj
cm9sbFRvcCIsICJleHBlY3RlZFNjcm9sbFRvcCAqIHBpeGVsc1BlcldoZWVsVGljayIpOworICAg
ICAgICAgICAgICAgIHNob3VsZEJlKCJkaXYuc2Nyb2xsTGVmdCIsICJleHBlY3RlZFNjcm9sbExl
ZnQgKiBwaXhlbHNQZXJXaGVlbFRpY2siKTsKIAotICAgICAgICAgICAgICAgIGlmICh3aW5kb3cu
dGVzdFJ1bm5lcikKLSAgICAgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5
RG9uZSgpOworICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgICAgICAgICAgfQog
CiAgICAgICAgICAgICBmdW5jdGlvbiBtb3VzZXdoZWVsSGFuZGxlcihlKQogICAgICAgICAgICAg
ewogICAgICAgICAgICAgICAgIGV2ZW50ID0gZTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZSgi
ZXZlbnQud2hlZWxEZWx0YVkiLCAid2luZG93LmV4cGVjdGVkU2Nyb2xsVG9wKi0xMjAiKTsKLSAg
ICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YVgiLCAid2luZG93LmV4cGVj
dGVkU2Nyb2xsTGVmdCotMTIwIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImV2ZW50Lndo
ZWVsRGVsdGFZIiwgImV4cGVjdGVkU2Nyb2xsVG9wICogLTEyMCIpOworICAgICAgICAgICAgICAg
IHNob3VsZEJlKCJldmVudC53aGVlbERlbHRhWCIsICJleHBlY3RlZFNjcm9sbExlZnQgKiAtMTIw
Iik7CiAKICAgICAgICAgICAgICAgICBpZiAoZS53aGVlbERlbHRhWSkKLSAgICAgICAgICAgICAg
ICAgICAgc2hvdWxkQmUoImV2ZW50LndoZWVsRGVsdGEiLCAid2luZG93LmV4cGVjdGVkU2Nyb2xs
VG9wKi0xMjAiKTsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmUoImV2ZW50LndoZWVsRGVs
dGEiLCAiZXhwZWN0ZWRTY3JvbGxUb3AgKiAtMTIwIik7CiAgICAgICAgICAgICAgICAgZWxzZQot
ICAgICAgICAgICAgICAgICAgICBzaG91bGRCZSgiZXZlbnQud2hlZWxEZWx0YSIsICJ3aW5kb3cu
ZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0xMjAiKTsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmUo
ImV2ZW50LndoZWVsRGVsdGEiLCAiZXhwZWN0ZWRTY3JvbGxMZWZ0ICogLTEyMCIpOwogICAgICAg
ICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5l
cignbG9hZCcsICgpID0+IHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGRpc3BhdGNoV2hl
ZWxFdmVudCwgMCk7CisgICAgICAgICAgICB9LCBmYWxzZSk7CiAgICAgICAgIDwvc2NyaXB0Pgog
ICAgIDwvaGVhZD4KLQotICAgIDxib2R5IHN0eWxlPSJtYXJnaW46MCIgb25sb2FkPSJzZXRUaW1l
b3V0KCdkaXNwYXRjaFdoZWVsRXZlbnQoKTsnLCAxMDApIj4KKyAgICA8Ym9keSBzdHlsZT0ibWFy
Z2luOjAiPgogICAgICAgICA8ZGl2IGlkPSJvdmVyZmxvdyIgc3R5bGU9ImJvcmRlcjoycHggc29s
aWQgYmxhY2s7b3ZlcmZsb3c6YXV0bztoZWlnaHQ6MjAwcHg7d2lkdGg6MjAwcHg7Ij4KICAgICAg
ICAgICAgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6cmVkO2hlaWdodDoyMDBweDt3aWR0
aDo0MDBweDsiPjwvZGl2PgogICAgICAgICAgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xv
cjpncmVlbjtoZWlnaHQ6MjAwcHg7d2lkdGg6NDAwcHg7Ij48L2Rpdj4KICAgICAgICAgICAgIDxk
aXYgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6cmVkO2hlaWdodDoyMDBweDt3aWR0aDo0MDBweDsi
PjwvZGl2PgogICAgICAgICA8L2Rpdj4KICAgICAgICAgPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+
CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48
L3NjcmlwdD4KICAgICA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w
bGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZWI2ZWUxZGJmZDVhNDlkNDJiNGI2OTYyMTE3
NjYxYjZmZDIzMzI1MS4uMzQ1YjlkN2UwMTk1ZjllYTA5ZDg4MzhmNzQ2MjdiYjY0YzU4OGIzNyAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25z
CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAt
MTAzOCw4ICsxMDM4LDYgQEAgd2Via2l0Lm9yZy9iLzIxMzIxMiBbIE1vamF2ZSBSZWxlYXNlIF0g
d2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL3RleHR1cmVzL2NhbnZhc18KIAogd2Via2l0Lm9yZy9i
LzIxMzI5MiBbIENhdGFsaW5hIFJlbGVhc2UgXSBodHRwL3Rlc3RzL0luZGV4ZWREQi9zdG9yYWdl
LWxpbWl0LTEuaHR0cHMuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTMz
NTEgWyBDYXRhbGluYSBEZWJ1ZyBdIGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQtaW4t
c2Nyb2xsaW5nLWRpdi5odG1sIFsgUGFzcyBGYWlsdXJlIF0gCi0KIHdlYmtpdC5vcmcvYi8yMTMz
NzUgWyBEZWJ1ZyBdIHdlYmF1ZGlvL2JpcXVhZC1iYW5kcGFzcy5odG1sIFsgUGFzcyBDcmFzaCBd
CiAKLXdlYmtpdC5vcmcvYi8yMTM0NjEgZmFzdC9tZWRpYXN0cmVhbS9tZWRpYXN0cmVhbXRyYWNr
LXZpZGVvLWZyYW1lUmF0ZS1jbG9uZS1pbmNyZWFzaW5nLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQpc
IE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK3dlYmtpdC5vcmcvYi8yMTM0NjEgZmFzdC9tZWRp
YXN0cmVhbS9tZWRpYXN0cmVhbXRyYWNrLXZpZGVvLWZyYW1lUmF0ZS1jbG9uZS1pbmNyZWFzaW5n
Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>