<?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>213183</bug_id>
          
          <creation_ts>2020-06-14 10:15:55 -0700</creation_ts>
          <short_desc>[iOS] Two KeyboardInputTests are failing on recent iOS SDK versions</short_desc>
          <delta_ts>2020-06-18 16:04:50 -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="Wenson Hsieh">wenson_hsieh</reporter>
          <assigned_to name="Wenson Hsieh">wenson_hsieh</assigned_to>
          <cc>bdakin</cc>
    
    <cc>jbedard</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1662495</commentid>
    <comment_count>0</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 10:15:55 -0700</bug_when>
    <thetext>They are:

• KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder
• KeyboardInputTests.RangedSelectionRectAfterRestoringFirstResponder</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662496</commentid>
    <comment_count>1</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 10:16:57 -0700</bug_when>
    <thetext>&lt;rdar://problem/64273483&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662499</commentid>
    <comment_count>2</comment_count>
      <attachid>401864</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 10:42:31 -0700</bug_when>
    <thetext>Created attachment 401864
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662500</commentid>
    <comment_count>3</comment_count>
      <attachid>401865</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 10:47:59 -0700</bug_when>
    <thetext>Created attachment 401865
Typo fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662503</commentid>
    <comment_count>4</comment_count>
      <attachid>401866</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 10:50:57 -0700</bug_when>
    <thetext>Created attachment 401866
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662507</commentid>
    <comment_count>5</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 11:52:17 -0700</bug_when>
    <thetext>For some reason, this causes KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder to crash on iOS 13.4 :(

Need to either figure out why (or maybe just define out the test on 13.4, since trunk won&apos;t support it anyways).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662514</commentid>
    <comment_count>6</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 13:12:37 -0700</bug_when>
    <thetext>(In reply to Wenson Hsieh from comment #5)
&gt; For some reason, this causes
&gt; KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder to crash
&gt; on iOS 13.4 :(
&gt; 
&gt; Need to either figure out why (or maybe just define out the test on 13.4,
&gt; since trunk won&apos;t support it anyways).

Unable to reproduce locally using the internal iOS 13.4 SDK (17E262).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662519</commentid>
    <comment_count>7</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 14:22:39 -0700</bug_when>
    <thetext>(In reply to Wenson Hsieh from comment #6)
&gt; (In reply to Wenson Hsieh from comment #5)
&gt; &gt; For some reason, this causes
&gt; &gt; KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder to crash
&gt; &gt; on iOS 13.4 :(
&gt; &gt; 
&gt; &gt; Need to either figure out why (or maybe just define out the test on 13.4,
&gt; &gt; since trunk won&apos;t support it anyways).
&gt; 
&gt; Unable to reproduce locally using the internal iOS 13.4 SDK (17E262).

Also unable to reproduce locally using the public iOS 13.5 SDK.

Guess I&apos;m going to have to use EWS to debug this...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662523</commentid>
    <comment_count>8</comment_count>
      <attachid>401873</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 15:19:14 -0700</bug_when>
    <thetext>Created attachment 401873
Highly speculative fix...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662524</commentid>
    <comment_count>9</comment_count>
      <attachid>401873</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-14 16:02:42 -0700</bug_when>
    <thetext>Comment on attachment 401873
Highly speculative fix...

Looks like that was it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662525</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-14 16:06:15 -0700</bug_when>
    <thetext>Committed r263014: &lt;https://trac.webkit.org/changeset/263014&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 401873.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664032</commentid>
    <comment_count>11</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-18 15:44:42 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664033</commentid>
    <comment_count>12</comment_count>
      <attachid>402245</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-18 15:44:43 -0700</bug_when>
    <thetext>Created attachment 402245
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664036</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-18 16:04:49 -0700</bug_when>
    <thetext>Committed r263241: &lt;https://trac.webkit.org/changeset/263241&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402245.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401864</attachid>
            <date>2020-06-14 10:42:31 -0700</date>
            <delta_ts>2020-06-14 10:47:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213183-20200614104230.patch</filename>
            <type>text/plain</type>
            <size>7361</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmFhOTU0NTE3ZThmOWYwMmYwMzgyOTgwNjRkMmMxMTcy
MTcxNzE1Ny4uNDkwMGVmYTAxODJkOWUyMzdkZjk2ZTMyMjI1YjA2MjkyM2JmNWViMSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5
IEBACisyMDIwLTA2LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor
CisgICAgICAgIFtpT1NdIFR3byBLZXlib2FyZElucHV0VGVzdHMgYXJlIGZhaWxpbmcgb24gcmVj
ZW50IGlPUyBTREsgdmVyc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzE4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyNzM0ODM+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gcmVjZW50
IHZlcnNpb25zIG9mIHRoZSBpT1MgU0RLLCBpT1Mgc2ltdWxhdG9ycyB0aGF0IGFyZSBub3Qgc2hv
d24gb24tc2NyZWVuIGFyZSBub3QgYXV0b21hdGljYWxseSB0cmVhdGVkIGFzCisgICAgICAgIGlm
IHRoZSBoYXJkd2FyZSBrZXlib2FyZCBpcyBhdmFpbGFibGUgKHRoYXQgaXMsIGArW1VJSUtleWJv
YXJkIGlzSW5IYXJkd2FyZUtleWJvYXJkTW9kZV1gIHJldHVybnMgYE5PYCkuIFdoZW4KKyAgICAg
ICAgcnVubmluZyBBUEkgdGVzdHMgd2hpbGUgYFNpbXVsYXRvci5hcHBgIGlzIGFscmVhZHkgbGF1
bmNoZWQsIGFuIGlPUyBzaW11bGF0b3IgaXMgcHJlc2VudGVkIG9uLXNjcmVlbiwgd2hlcmVhcwor
ICAgICAgICB0aGUgc2ltdWxhdG9yIGlzIG5vdCB2aXNpYmxlIHdoZW4gcnVubmluZyBBUEkgdGVz
dHMgd2l0aG91dCBsYXVuY2hpbmcgYFNpbXVsYXRvci5hcHBgIGJlZm9yZWhhbmQuCisKKyAgICAg
ICAgVGhpcyBkaXNjcmVwYW5jeSBpcyBjYXVzaW5nIHR3byBpT1MgQVBJIHRlc3RzIHRvIGZhaWwg
KGkuZS4gYENhcmV0U2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXJgIGFu
ZAorICAgICAgICBgUmFuZ2VkU2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25k
ZXJgKSwgZHVlIHRvIHRoZSBmYWN0IHRoYXQgYC1bV0tXZWJWaWV3IGJlY29tZUZpcnN0UmVzcG9u
ZGVyXWAgbm8KKyAgICAgICAgbG9uZ2VyIGNhdXNlcyBhbiBpbnB1dCBzZXNzaW9uIHRvIGJlZ2lu
LCBzaW5jZSBgK1tVSUtleWJvYXJkIGlzSW5IYXJkd2FyZUtleWJvYXJkTW9kZV1gIG5vdyByZXR1
cm5zIGBOT2AuCisKKyAgICAgICAgSW50ZXJlc3RpbmdseSwgdGhlc2UgdGVzdHMgYWxyZWFkeSBh
dHRlbXB0IHRvIGNpcmN1bXZlbnQgdGhpcyBieSB1c2luZyBgd2ViVmlld1dpdGhBdXRvZm9jdXNl
ZElucHV0KClgLCB3aGljaAorICAgICAgICBjcmVhdGVzIGFuZCBsb2FkcyBhIGBXS1dlYlZpZXdg
IHdpdGggYSBzaW5nbGUgYXV0b2ZvY3VzaW5nIGlucHV0IGVsZW1lbnQsIHdpdGggYSBgX1dLSW5w
dXREZWxlZ2F0ZWAgdGhhdAorICAgICAgICB1bmNvbmRpdGlvbmFsbHkgYWxsb3dzIGlucHV0IHNl
c3Npb25zIHRvIGJlZ2luLiBIb3dldmVyLCB0aGlzIGRvZXNuJ3Qgd29yayBhcyBpbnRlbmRlZCBp
biB0aGVzZSB0ZXN0cywgYmVjYXVzZQorICAgICAgICBub3RoaW5nIGtlZXBzIHRoZSBkZWxlZ2F0
ZSAoYSBgVGVzdElucHV0RGVsZWdhdGVgKSBhbGl2ZSBwYXN0IHRoZSBzY29wZSBvZiB0aGUgY2Fs
bCB0bworICAgICAgICBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClgLiBTaW5jZSBgW1dL
V2ViVmlldyBfaW5wdXREZWxlZ2F0ZV1gIGlzIGEgd2VhayBwcm9wZXJ0eSwgdGhlIGlucHV0IGRl
bGVnYXRlCisgICAgICAgIHNpbXBseSBkaXNhcHBlYXJzIGFmdGVyIHdlIGZpbmlzaCB3YWl0aW5n
IGZvciB0aGUgbG9hZCB0byBmaW5pc2ggKGFuZCB0aGUgYXV0b2ZvY3VzZWQgaW5wdXQgZWxlbWVu
dCBiZWdpbnMgaXRzCisgICAgICAgIGlucHV0IHNlc3Npb24pLiBUaGlzIGNhdXNlcyB1cyB0byBl
cnJvbmVvdXNseSBmYWxsIGJhY2sgdG8gZGVmYXVsdCBiZWhhdmlvciAoaS5lLgorICAgICAgICBg
X1dLRm9jdXNTdGFydHNJbnB1dFNlc3Npb25Qb2xpY3lBdXRvYCkgZm9yIHN1YnNlcXVlbnQgY2Fs
bHMgdG8gc2hvdyB0aGUga2V5Ym9hcmQgZm9yIHRoZSBmb2N1c2VkIGVsZW1lbnQsIGFzIGlzCisg
ICAgICAgIHRoZSBjYXNlIHdoZW4gdGhlc2UgdHdvIEFQSSB0ZXN0cyBjYWxsIGAtYmVjb21lRmly
c3RSZXNwb25kZXJgLiBUaGUgZW5kIHJlc3VsdCBpcyB0aGF0IHRoZSBrZXlib2FyZCBkb2Vzbid0
CisgICAgICAgIGFwcGVhciBhbmQgdGV4dCBzZWxlY3Rpb24gdmlld3MgYXJlIG5vdCBjcmVhdGVk
IGFuZCBsYWlkIG91dCwgYnV0IG9ubHkgd2hlbiBBUEkgdGVzdHMgYXJlIHJ1biB3aXRob3V0IGhh
dmluZworICAgICAgICBsYXVuY2hlZCB0aGUgU2ltdWxhdG9yIGFwcCBiZWZvcmVoYW5kLgorCisg
ICAgICAgIFRvIGZpeCB0aGlzLCByZWZhY3RvciBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0
KClgIGludG8gYHdlYlZpZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKWAs
CisgICAgICAgIHdoaWNoIHJldHVybnMgYm90aCB0aGUgbmV3IGBXS1dlYlZpZXdgIGFzIHdlbGwg
YXMgdGhlIGBUZXN0SW5wdXREZWxlZ2F0ZWAgb2YgdGhlIHdlYiB2aWV3LiBUaGUgY2FsbCBzaXRl
IGlzIHRoZW4KKyAgICAgICAgcmVzcG9uc2libGUgZm9yIGtlZXBpbmcgdGhlIGlucHV0IGRlbGVn
YXRlIGFyb3VuZCBmb3IgYXMgbG9uZyBhcyBpdCBuZWVkcy4KKworICAgICAgICAqIFRlc3RXZWJL
aXRBUEkvVGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbToKKyAgICAgICAgKHdlYlZp
ZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQpOgorCiAyMDIwLTA2LTEzICBT
YW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHRlbmRlZCBDb2xvcjog
RXhwZXJpbWVudCB3aXRoIHN0cm9uZ2x5IHR5cGVkIENvbG9yQ29tcG9uZW50cwpkaWZmIC0tZ2l0
IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1t
IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1t
CmluZGV4IDdhNmRiMTkyYzg0NTE3OGQzYTU5OWE2MzYwNmVmYmU1MDdhOTkxYjAuLmQxNDg4ZWI1
MmUzMzhmOGUzODVkMzM4YjMzODkzYmYyZTJlNTMxM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX
ZWJLaXRBUEkvVGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQorKysgYi9Ub29scy9U
ZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0VGVzdHNJT1MubW0KQEAgLTIwMCwx
MCArMjAwLDEwIEBAIHN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhB
dXRvZm9jdXNlZElucHV0KGNvbnN0IFJldGFpblB0cjxUZXN0CiAgICAgcmV0dXJuIHdlYlZpZXc7
CiB9CiAKLXN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhBdXRvZm9j
dXNlZElucHV0KCkKK3N0YXRpYyBzdGQ6OnBhaXI8UmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+LCBS
ZXRhaW5QdHI8VGVzdElucHV0RGVsZWdhdGU+PiB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhB
dXRvZm9jdXNlZElucHV0KCkKIHsKICAgICBhdXRvIGlucHV0RGVsZWdhdGUgPSBhZG9wdE5TKFtU
ZXN0SW5wdXREZWxlZ2F0ZSBuZXddKTsKLSAgICByZXR1cm4gd2ViVmlld1dpdGhBdXRvZm9jdXNl
ZElucHV0KGlucHV0RGVsZWdhdGUpOworICAgIHJldHVybiB7IHdlYlZpZXdXaXRoQXV0b2ZvY3Vz
ZWRJbnB1dChpbnB1dERlbGVnYXRlKSwgaW5wdXREZWxlZ2F0ZSB9OwogfQogCiBuYW1lc3BhY2Ug
VGVzdFdlYktpdEFQSSB7CkBAIC0zMDksNyArMzA5LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVz
dHMsIEN1c3RvbUlucHV0Vmlld0FuZElucHV0QWNjZXNzb3J5VmlldykKIAogVEVTVChLZXlib2Fy
ZElucHV0VGVzdHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikKIHsKLSAg
ICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKKyAgICBhdXRv
IFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1
dG9mb2N1c2VkSW5wdXQoKTsKICAgICBib29sIGRvbmVXYWl0aW5nID0gZmFsc2U7CiAKICAgICBp
ZCA8VUlUZXh0SW5wdXRQcml2YXRlPiBjb250ZW50VmlldyA9IChpZCA8VUlUZXh0SW5wdXRQcml2
YXRlPilbd2ViVmlldyBmaXJzdFJlc3BvbmRlcl07CkBAIC0zMzAsNyArMzMwLDcgQEAgVEVTVChL
ZXlib2FyZElucHV0VGVzdHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikK
IAogVEVTVChLZXlib2FyZElucHV0VGVzdHMsIFJlc2lnbmluZ0ZpcnN0UmVzcG9uZGVyQ2FuY2Vs
c0tleUV2ZW50cykKIHsKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2Vk
SW5wdXQoKTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJ
bnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBhdXRvIGNvbnRlbnRWaWV3
ID0gW3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddOwogICAgIGF1dG8ga2V5RG93bkV2ZW50
ID0gYWRvcHROUyhbW1dlYkV2ZW50IGFsbG9jXSBpbml0V2l0aEtleUV2ZW50VHlwZTpXZWJFdmVu
dEtleURvd24gdGltZVN0YW1wOkNGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgpIGNoYXJhY3RlcnM6
QCJhIiBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6QCJhIiBtb2RpZmllcnM6MCBpc1JlcGVh
dGluZzpOTyB3aXRoRmxhZ3M6MCB3aXRoSW5wdXRNYW5hZ2VySGludDpuaWwga2V5Q29kZTowIGlz
VGFiS2V5Ok5PXSk7CiAKQEAgLTM3Miw3ICszNzIsNyBAQCBURVNUKEtleWJvYXJkSW5wdXRUZXN0
cywgQ2FyZXRTZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRh
aQogewogICAgIC8vIFRoaXMgZGlmZmVyZW5jZSBpbiBjYXJldCB3aWR0aCBpcyBkdWUgdG8gdGhl
IGZhY3QgdGhhdCB3ZSBkb24ndCB6b29tIGluIHRvIHRoZSBpbnB1dCBmaWVsZCBvbiBpUGFkLCBi
dXQgZG8gb24gaVBob25lLgogICAgIGF1dG8gZXhwZWN0ZWRDYXJldFJlY3QgPSBDR1JlY3RNYWtl
KDE2LCAxMywgVUlEZXZpY2UuY3VycmVudERldmljZS51c2VySW50ZXJmYWNlSWRpb20gPT0gVUlV
c2VySW50ZXJmYWNlSWRpb21QYWQgPyAzIDogMiwgMTUpOwotICAgIGF1dG8gd2ViVmlldyA9IHdl
YlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVs
ZWdhdGVdID0gd2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwog
ICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK
YXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwogICAgIFt3ZWJW
aWV3IHdhaXRGb3JDYXJldFZpZXdGcmFtZVRvQmVjb21lOmV4cGVjdGVkQ2FyZXRSZWN0XTsKIApA
QCAtMzg5LDcgKzM4OSw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBSYW5nZWRTZWxlY3Rp
b25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRhCiB7CiAgICAgTlNBcnJh
eSAqZXhwZWN0ZWRTZWxlY3Rpb25SZWN0cyA9IEBbIFtOU1ZhbHVlIHZhbHVlV2l0aENHUmVjdDpD
R1JlY3RNYWtlKDE2LCAxMywgMjQsIDE1KV0gXTsKIAotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZp
ZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdh
dGVdID0gd2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAg
IFtbd2ViVmlldyB0ZXh0SW5wdXRDb250ZW50Vmlld10gaW5zZXJ0VGV4dDpAImhlbGxvIl07CiAg
ICAgW3dlYlZpZXcgc2VsZWN0QWxsOm5pbF07CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIs
IFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVF
bGVtZW50LnRhZ05hbWUiXSk7CkBAIC00MDgsNyArNDA4LDcgQEAgVEVTVChLZXlib2FyZElucHV0
VGVzdHMsIENhcmV0U2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXIpCiB7
CiAgICAgLy8gVGhpcyBkaWZmZXJlbmNlIGluIGNhcmV0IHdpZHRoIGlzIGR1ZSB0byB0aGUgZmFj
dCB0aGF0IHdlIGRvbid0IHpvb20gaW4gdG8gdGhlIGlucHV0IGZpZWxkIG9uIGlQYWQsIGJ1dCBk
byBvbiBpUGhvbmUuCiAgICAgYXV0byBleHBlY3RlZENhcmV0UmVjdCA9IENHUmVjdE1ha2UoMTYs
IDEzLCBVSURldmljZS5jdXJyZW50RGV2aWNlLnVzZXJJbnRlcmZhY2VJZGlvbSA9PSBVSVVzZXJJ
bnRlcmZhY2VJZGlvbVBhZCA/IDMgOiAyLCAxNSk7Ci0gICAgYXV0byB3ZWJWaWV3ID0gd2ViVmll
d1dpdGhBdXRvZm9jdXNlZElucHV0KCk7CisgICAgYXV0byBbd2ViVmlldywgaW5wdXREZWxlZ2F0
ZV0gPSB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNlZElucHV0KCk7CiAgICAg
RVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFT
Y3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05hbWUiXSk7CiAgICAgW3dlYlZpZXcg
d2FpdEZvckNhcmV0Vmlld0ZyYW1lVG9CZWNvbWU6ZXhwZWN0ZWRDYXJldFJlY3RdOwogCkBAIC00
MjMsNyArNDIzLDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIFJhbmdlZFNlbGVjdGlvblJl
Y3RBZnRlclJlc3RvcmluZ0ZpcnN0UmVzcG9uZGVyKQogewogICAgIE5TQXJyYXkgKmV4cGVjdGVk
U2VsZWN0aW9uUmVjdHMgPSBAWyBbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6Q0dSZWN0TWFrZSgx
NiwgMTMsIDI0LCAxNSldIF07CiAKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9m
b2N1c2VkSW5wdXQoKTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZp
ZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBbW3dlYlZpZXcg
dGV4dElucHV0Q29udGVudFZpZXddIGluc2VydFRleHQ6QCJoZWxsbyJdOwogICAgIFt3ZWJWaWV3
IHNlbGVjdEFsbDpuaWxdOwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBz
dHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdO
YW1lIl0pOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401865</attachid>
            <date>2020-06-14 10:47:59 -0700</date>
            <delta_ts>2020-06-14 10:50:56 -0700</delta_ts>
            <desc>Typo fix</desc>
            <filename>bug-213183-20200614104758.patch</filename>
            <type>text/plain</type>
            <size>7295</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmFhOTU0NTE3ZThmOWYwMmYwMzgyOTgwNjRkMmMxMTcy
MTcxNzE1Ny4uOGE5ZmY0NTc4MGRlYTkxMDUxNDM4OTM4OGY4OTI0ODE5YmNiOTRiZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5
IEBACisyMDIwLTA2LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor
CisgICAgICAgIFtpT1NdIFR3byBLZXlib2FyZElucHV0VGVzdHMgYXJlIGZhaWxpbmcgb24gcmVj
ZW50IGlPUyBTREsgdmVyc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzE4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyNzM0ODM+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gcmVjZW50
IHZlcnNpb25zIG9mIHRoZSBpT1MgU0RLLCBpT1Mgc2ltdWxhdG9ycyB0aGF0IGFyZSBub3Qgc2hv
d24gb24tc2NyZWVuIGFyZSBub3QgYXV0b21hdGljYWxseSB0cmVhdGVkIGFzCisgICAgICAgIGlm
IHRoZSBoYXJkd2FyZSBrZXlib2FyZCBpc24ndCBhdmFpbGFibGUgKHRoYXQgaXMsIGArW1VJSUtl
eWJvYXJkIGlzSW5IYXJkd2FyZUtleWJvYXJkTW9kZV1gIHJldHVybnMgYE5PYCkuIFdoZW4KKyAg
ICAgICAgcnVubmluZyBBUEkgdGVzdHMgd2hpbGUgYFNpbXVsYXRvci5hcHBgIGlzIGFscmVhZHkg
bGF1bmNoZWQsIGFuIGlPUyBzaW11bGF0b3IgaXMgcHJlc2VudGVkIG9uLXNjcmVlbiwgd2hlcmVh
cworICAgICAgICB0aGUgc2ltdWxhdG9yIGlzIG5vdCB2aXNpYmxlIHdoZW4gcnVubmluZyBBUEkg
dGVzdHMgd2l0aG91dCBsYXVuY2hpbmcgYFNpbXVsYXRvci5hcHBgIGJlZm9yZWhhbmQuCisKKyAg
ICAgICAgVGhpcyBkaXNjcmVwYW5jeSBjYXVzZXMgdHdvIGlPUyBBUEkgdGVzdHMgdG8gZmFpbCAo
aS5lLiBgQ2FyZXRTZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcmAgYW5k
CisgICAgICAgIGBSYW5nZWRTZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRl
cmApLCBkdWUgdG8gdGhlIGZhY3QgdGhhdCBgLVtXS1dlYlZpZXcgYmVjb21lRmlyc3RSZXNwb25k
ZXJdYCBubworICAgICAgICBsb25nZXIgY2F1c2VzIGFuIGlucHV0IHNlc3Npb24gdG8gYmVnaW4u
CisKKyAgICAgICAgSW50ZXJlc3RpbmdseSwgdGhlc2UgdGVzdHMgYWxyZWFkeSBhdHRlbXB0IHRv
IGNpcmN1bXZlbnQgdGhpcyBieSB1c2luZyBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClg
LCB3aGljaAorICAgICAgICBjcmVhdGVzIGFuZCBsb2FkcyBhIGBXS1dlYlZpZXdgIHdpdGggYSBz
aW5nbGUgYXV0b2ZvY3VzaW5nIGlucHV0IGVsZW1lbnQsIHdpdGggYSBgX1dLSW5wdXREZWxlZ2F0
ZWAgdGhhdAorICAgICAgICB1bmNvbmRpdGlvbmFsbHkgYWxsb3dzIGlucHV0IHNlc3Npb25zIHRv
IGJlZ2luLiBIb3dldmVyLCB0aGlzIGRvZXNuJ3Qgd29yayBhcyBpbnRlbmRlZCBpbiB0aGVzZSB0
ZXN0cywgYmVjYXVzZQorICAgICAgICBub3RoaW5nIGtlZXBzIHRoZSBkZWxlZ2F0ZSAoYSBgVGVz
dElucHV0RGVsZWdhdGVgKSBhbGl2ZSBwYXN0IHRoZSBzY29wZSBvZiB0aGUgY2FsbCB0bworICAg
ICAgICBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClgLiBTaW5jZSBgW1dLV2ViVmlldyBf
aW5wdXREZWxlZ2F0ZV1gIGlzIGEgd2VhayBwcm9wZXJ0eSwgdGhlIGlucHV0IGRlbGVnYXRlCisg
ICAgICAgIHNpbXBseSBkaXNhcHBlYXJzIGFmdGVyIHdlIGZpbmlzaCB3YWl0aW5nIGZvciB0aGUg
bG9hZCB0byBmaW5pc2ggKGFuZCB0aGUgYXV0b2ZvY3VzZWQgaW5wdXQgZWxlbWVudCBiZWdpbnMg
aXRzCisgICAgICAgIGlucHV0IHNlc3Npb24pLiBUaGlzIGNhdXNlcyB1cyB0byBlcnJvbmVvdXNs
eSBmYWxsIGJhY2sgdG8gZGVmYXVsdCBiZWhhdmlvciAoaS5lLgorICAgICAgICBgX1dLRm9jdXNT
dGFydHNJbnB1dFNlc3Npb25Qb2xpY3lBdXRvYCkgZm9yIHN1YnNlcXVlbnQgY2FsbHMgdG8gc2hv
dyB0aGUga2V5Ym9hcmQgZm9yIHRoZSBmb2N1c2VkIGVsZW1lbnQsIGFzIGlzCisgICAgICAgIHRo
ZSBjYXNlIHdoZW4gdGhlc2UgdHdvIEFQSSB0ZXN0cyBjYWxsIGAtYmVjb21lRmlyc3RSZXNwb25k
ZXJgLiBUaGUgZW5kIHJlc3VsdCBpcyB0aGF0IHRoZSBrZXlib2FyZCBkb2Vzbid0CisgICAgICAg
IGFwcGVhciBhbmQgdGV4dCBzZWxlY3Rpb24gdmlld3MgYXJlIG5vdCBjcmVhdGVkIGFuZCBsYWlk
IG91dCwgYnV0IG9ubHkgd2hlbiBBUEkgdGVzdHMgYXJlIHJ1biB3aXRob3V0IGhhdmluZworICAg
ICAgICBsYXVuY2hlZCB0aGUgU2ltdWxhdG9yIGFwcCBiZWZvcmVoYW5kLgorCisgICAgICAgIFRv
IGZpeCB0aGlzLCByZWZhY3RvciBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClgIGludG8g
YHdlYlZpZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKWAsCisgICAgICAg
IHdoaWNoIHJldHVybnMgYm90aCB0aGUgbmV3IGBXS1dlYlZpZXdgIGFzIHdlbGwgYXMgdGhlIGBU
ZXN0SW5wdXREZWxlZ2F0ZWAgb2YgdGhlIHdlYiB2aWV3LiBUaGUgY2FsbCBzaXRlIGlzIHRoZW4K
KyAgICAgICAgcmVzcG9uc2libGUgZm9yIGtlZXBpbmcgdGhlIGlucHV0IGRlbGVnYXRlIGFyb3Vu
ZCBmb3IgYXMgbG9uZyBhcyBpdCBuZWVkcy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz
dHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbToKKyAgICAgICAgKHdlYlZpZXdBbmRJbnB1
dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQpOgorCiAyMDIwLTA2LTEzICBTYW0gV2Vpbmln
ICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHRlbmRlZCBDb2xvcjogRXhwZXJpbWVu
dCB3aXRoIHN0cm9uZ2x5IHR5cGVkIENvbG9yQ29tcG9uZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMv
VGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tIGIvVG9vbHMv
VGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCmluZGV4IDdh
NmRiMTkyYzg0NTE3OGQzYTU5OWE2MzYwNmVmYmU1MDdhOTkxYjAuLmQxNDg4ZWI1MmUzMzhmOGUz
ODVkMzM4YjMzODkzYmYyZTJlNTMxM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv
VGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0VGVzdHNJT1MubW0KQEAgLTIwMCwxMCArMjAwLDEw
IEBAIHN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhBdXRvZm9jdXNl
ZElucHV0KGNvbnN0IFJldGFpblB0cjxUZXN0CiAgICAgcmV0dXJuIHdlYlZpZXc7CiB9CiAKLXN0
YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0
KCkKK3N0YXRpYyBzdGQ6OnBhaXI8UmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+LCBSZXRhaW5QdHI8
VGVzdElucHV0RGVsZWdhdGU+PiB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNl
ZElucHV0KCkKIHsKICAgICBhdXRvIGlucHV0RGVsZWdhdGUgPSBhZG9wdE5TKFtUZXN0SW5wdXRE
ZWxlZ2F0ZSBuZXddKTsKLSAgICByZXR1cm4gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KGlu
cHV0RGVsZWdhdGUpOworICAgIHJldHVybiB7IHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dChp
bnB1dERlbGVnYXRlKSwgaW5wdXREZWxlZ2F0ZSB9OwogfQogCiBuYW1lc3BhY2UgVGVzdFdlYktp
dEFQSSB7CkBAIC0zMDksNyArMzA5LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIEN1c3Rv
bUlucHV0Vmlld0FuZElucHV0QWNjZXNzb3J5VmlldykKIAogVEVTVChLZXlib2FyZElucHV0VGVz
dHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBhdXRvIHdl
YlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKKyAgICBhdXRvIFt3ZWJWaWV3
LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2Vk
SW5wdXQoKTsKICAgICBib29sIGRvbmVXYWl0aW5nID0gZmFsc2U7CiAKICAgICBpZCA8VUlUZXh0
SW5wdXRQcml2YXRlPiBjb250ZW50VmlldyA9IChpZCA8VUlUZXh0SW5wdXRQcml2YXRlPilbd2Vi
VmlldyBmaXJzdFJlc3BvbmRlcl07CkBAIC0zMzAsNyArMzMwLDcgQEAgVEVTVChLZXlib2FyZElu
cHV0VGVzdHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikKIAogVEVTVChL
ZXlib2FyZElucHV0VGVzdHMsIFJlc2lnbmluZ0ZpcnN0UmVzcG9uZGVyQ2FuY2Vsc0tleUV2ZW50
cykKIHsKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsK
KyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERlbGVn
YXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBhdXRvIGNvbnRlbnRWaWV3ID0gW3dlYlZp
ZXcgdGV4dElucHV0Q29udGVudFZpZXddOwogICAgIGF1dG8ga2V5RG93bkV2ZW50ID0gYWRvcHRO
UyhbW1dlYkV2ZW50IGFsbG9jXSBpbml0V2l0aEtleUV2ZW50VHlwZTpXZWJFdmVudEtleURvd24g
dGltZVN0YW1wOkNGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgpIGNoYXJhY3RlcnM6QCJhIiBjaGFy
YWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6QCJhIiBtb2RpZmllcnM6MCBpc1JlcGVhdGluZzpOTyB3
aXRoRmxhZ3M6MCB3aXRoSW5wdXRNYW5hZ2VySGludDpuaWwga2V5Q29kZTowIGlzVGFiS2V5Ok5P
XSk7CiAKQEAgLTM3Miw3ICszNzIsNyBAQCBURVNUKEtleWJvYXJkSW5wdXRUZXN0cywgQ2FyZXRT
ZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRhaQogewogICAg
IC8vIFRoaXMgZGlmZmVyZW5jZSBpbiBjYXJldCB3aWR0aCBpcyBkdWUgdG8gdGhlIGZhY3QgdGhh
dCB3ZSBkb24ndCB6b29tIGluIHRvIHRoZSBpbnB1dCBmaWVsZCBvbiBpUGFkLCBidXQgZG8gb24g
aVBob25lLgogICAgIGF1dG8gZXhwZWN0ZWRDYXJldFJlY3QgPSBDR1JlY3RNYWtlKDE2LCAxMywg
VUlEZXZpY2UuY3VycmVudERldmljZS51c2VySW50ZXJmYWNlSWRpb20gPT0gVUlVc2VySW50ZXJm
YWNlSWRpb21QYWQgPyAzIDogMiwgMTUpOwotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdXaXRo
QXV0b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdhdGVdID0g
d2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAgIEVYUEVD
VF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0
OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwogICAgIFt3ZWJWaWV3IHdhaXRG
b3JDYXJldFZpZXdGcmFtZVRvQmVjb21lOmV4cGVjdGVkQ2FyZXRSZWN0XTsKIApAQCAtMzg5LDcg
KzM4OSw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBSYW5nZWRTZWxlY3Rpb25SZWN0QWZ0
ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRhCiB7CiAgICAgTlNBcnJheSAqZXhwZWN0
ZWRTZWxlY3Rpb25SZWN0cyA9IEBbIFtOU1ZhbHVlIHZhbHVlV2l0aENHUmVjdDpDR1JlY3RNYWtl
KDE2LCAxMywgMjQsIDE1KV0gXTsKIAotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdXaXRoQXV0
b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdhdGVdID0gd2Vi
Vmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAgIFtbd2ViVmll
dyB0ZXh0SW5wdXRDb250ZW50Vmlld10gaW5zZXJ0VGV4dDpAImhlbGxvIl07CiAgICAgW3dlYlZp
ZXcgc2VsZWN0QWxsOm5pbF07CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3
IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRh
Z05hbWUiXSk7CkBAIC00MDgsNyArNDA4LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIENh
cmV0U2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXIpCiB7CiAgICAgLy8g
VGhpcyBkaWZmZXJlbmNlIGluIGNhcmV0IHdpZHRoIGlzIGR1ZSB0byB0aGUgZmFjdCB0aGF0IHdl
IGRvbid0IHpvb20gaW4gdG8gdGhlIGlucHV0IGZpZWxkIG9uIGlQYWQsIGJ1dCBkbyBvbiBpUGhv
bmUuCiAgICAgYXV0byBleHBlY3RlZENhcmV0UmVjdCA9IENHUmVjdE1ha2UoMTYsIDEzLCBVSURl
dmljZS5jdXJyZW50RGV2aWNlLnVzZXJJbnRlcmZhY2VJZGlvbSA9PSBVSVVzZXJJbnRlcmZhY2VJ
ZGlvbVBhZCA/IDMgOiAyLCAxNSk7Ci0gICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld1dpdGhBdXRv
Zm9jdXNlZElucHV0KCk7CisgICAgYXV0byBbd2ViVmlldywgaW5wdXREZWxlZ2F0ZV0gPSB3ZWJW
aWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNlZElucHV0KCk7CiAgICAgRVhQRUNUX1dL
X1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJk
b2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05hbWUiXSk7CiAgICAgW3dlYlZpZXcgd2FpdEZvckNh
cmV0Vmlld0ZyYW1lVG9CZWNvbWU6ZXhwZWN0ZWRDYXJldFJlY3RdOwogCkBAIC00MjMsNyArNDIz
LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIFJhbmdlZFNlbGVjdGlvblJlY3RBZnRlclJl
c3RvcmluZ0ZpcnN0UmVzcG9uZGVyKQogewogICAgIE5TQXJyYXkgKmV4cGVjdGVkU2VsZWN0aW9u
UmVjdHMgPSBAWyBbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6Q0dSZWN0TWFrZSgxNiwgMTMsIDI0
LCAxNSldIF07CiAKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5w
dXQoKTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1
dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBbW3dlYlZpZXcgdGV4dElucHV0
Q29udGVudFZpZXddIGluc2VydFRleHQ6QCJoZWxsbyJdOwogICAgIFt3ZWJWaWV3IHNlbGVjdEFs
bDpuaWxdOwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2
YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401866</attachid>
            <date>2020-06-14 10:50:57 -0700</date>
            <delta_ts>2020-06-14 10:52:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213183-20200614105056.patch</filename>
            <type>text/plain</type>
            <size>7278</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmFhOTU0NTE3ZThmOWYwMmYwMzgyOTgwNjRkMmMxMTcy
MTcxNzE1Ny4uNWFmMjBhYTcyODEzNzVlZGUxYjE3NGMzYmViYWE3Y2I1ZTRkYzE1OCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5
IEBACisyMDIwLTA2LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor
CisgICAgICAgIFtpT1NdIFR3byBLZXlib2FyZElucHV0VGVzdHMgYXJlIGZhaWxpbmcgb24gcmVj
ZW50IGlPUyBTREsgdmVyc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzE4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyNzM0ODM+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gcmVjZW50
IHZlcnNpb25zIG9mIHRoZSBpT1MgU0RLLCBpT1Mgc2ltdWxhdG9ycyB0aGF0IGFyZSBub3Qgc2hv
d24gb24tc2NyZWVuIGFyZSB0cmVhdGVkIGFzIGlmIHRoZSBoYXJkd2FyZQorICAgICAgICBrZXli
b2FyZCBpcyBub3QgYXZhaWxhYmxlICh0aGF0IGlzLCBgK1tVSUlLZXlib2FyZCBpc0luSGFyZHdh
cmVLZXlib2FyZE1vZGVdYCByZXR1cm5zIGBOT2ApLiBXaGVuIHJ1bm5pbmcgQVBJCisgICAgICAg
IHRlc3RzIHdoaWxlIGBTaW11bGF0b3IuYXBwYCBpcyBhbHJlYWR5IGxhdW5jaGVkLCBhbiBpT1Mg
c2ltdWxhdG9yIGlzIHByZXNlbnRlZCBvbi1zY3JlZW4sIHdoZXJlYXMgdGhlIHNpbXVsYXRvcgor
ICAgICAgICBpcyBub3QgdmlzaWJsZSB3aGVuIHJ1bm5pbmcgQVBJIHRlc3RzIHdpdGhvdXQgbGF1
bmNoaW5nIGBTaW11bGF0b3IuYXBwYCBiZWZvcmVoYW5kLgorCisgICAgICAgIFRoaXMgZGlzY3Jl
cGFuY3kgY2F1c2VzIHR3byBpT1MgQVBJIHRlc3RzIHRvIGZhaWwgKGkuZS4gYENhcmV0U2VsZWN0
aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXJgIGFuZAorICAgICAgICBgUmFuZ2Vk
U2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXJgKSwgZHVlIHRvIHRoZSBm
YWN0IHRoYXQgYC1bV0tXZWJWaWV3IGJlY29tZUZpcnN0UmVzcG9uZGVyXWAgbm8KKyAgICAgICAg
bG9uZ2VyIGNhdXNlcyBhbiBpbnB1dCBzZXNzaW9uIHRvIGJlZ2luLgorCisgICAgICAgIEludGVy
ZXN0aW5nbHksIHRoZXNlIHRlc3RzIGFscmVhZHkgYXR0ZW1wdCB0byBjaXJjdW12ZW50IHRoaXMg
YnkgdXNpbmcgYHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpYCwgd2hpY2gKKyAgICAgICAg
Y3JlYXRlcyBhbmQgbG9hZHMgYSBgV0tXZWJWaWV3YCB3aXRoIGEgc2luZ2xlIGF1dG9mb2N1c2lu
ZyBpbnB1dCBlbGVtZW50LCB3aXRoIGEgYF9XS0lucHV0RGVsZWdhdGVgIHRoYXQKKyAgICAgICAg
dW5jb25kaXRpb25hbGx5IGFsbG93cyBpbnB1dCBzZXNzaW9ucyB0byBiZWdpbi4gSG93ZXZlciwg
dGhpcyBkb2Vzbid0IHdvcmsgYXMgaW50ZW5kZWQgaW4gdGhlc2UgdGVzdHMsIGJlY2F1c2UKKyAg
ICAgICAgbm90aGluZyBrZWVwcyB0aGUgZGVsZWdhdGUgKGEgYFRlc3RJbnB1dERlbGVnYXRlYCkg
YWxpdmUgcGFzdCB0aGUgc2NvcGUgb2YgdGhlIGNhbGwgdG8KKyAgICAgICAgYHdlYlZpZXdXaXRo
QXV0b2ZvY3VzZWRJbnB1dCgpYC4gU2luY2UgYFtXS1dlYlZpZXcgX2lucHV0RGVsZWdhdGVdYCBp
cyBhIHdlYWsgcHJvcGVydHksIHRoZSBpbnB1dCBkZWxlZ2F0ZQorICAgICAgICBzaW1wbHkgZGlz
YXBwZWFycyBhZnRlciB3ZSBmaW5pc2ggd2FpdGluZyBmb3IgdGhlIGxvYWQgdG8gZmluaXNoIChh
bmQgdGhlIGF1dG9mb2N1c2VkIGlucHV0IGVsZW1lbnQgYmVnaW5zIGl0cworICAgICAgICBpbnB1
dCBzZXNzaW9uKS4gVGhpcyBjYXVzZXMgdXMgdG8gZXJyb25lb3VzbHkgZmFsbCBiYWNrIHRvIGRl
ZmF1bHQgYmVoYXZpb3IgKGkuZS4KKyAgICAgICAgYF9XS0ZvY3VzU3RhcnRzSW5wdXRTZXNzaW9u
UG9saWN5QXV0b2ApIGZvciBzdWJzZXF1ZW50IGNhbGxzIHRvIHNob3cgdGhlIGtleWJvYXJkIGZv
ciB0aGUgZm9jdXNlZCBlbGVtZW50LCBhcyBpcworICAgICAgICB0aGUgY2FzZSB3aGVuIHRoZXNl
IHR3byBBUEkgdGVzdHMgY2FsbCBgLWJlY29tZUZpcnN0UmVzcG9uZGVyYC4gVGhlIGVuZCByZXN1
bHQgaXMgdGhhdCB0aGUga2V5Ym9hcmQgZG9lc24ndAorICAgICAgICBhcHBlYXIgYW5kIHRleHQg
c2VsZWN0aW9uIHZpZXdzIGFyZSBub3QgY3JlYXRlZCBhbmQgbGFpZCBvdXQsIGJ1dCBvbmx5IHdo
ZW4gQVBJIHRlc3RzIGFyZSBydW4gd2l0aG91dCBoYXZpbmcKKyAgICAgICAgbGF1bmNoZWQgdGhl
IFNpbXVsYXRvciBhcHAgYmVmb3JlaGFuZC4KKworICAgICAgICBUbyBmaXggdGhpcywgcmVmYWN0
b3IgYHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpYCBpbnRvIGB3ZWJWaWV3QW5kSW5wdXRE
ZWxlZ2F0ZVdpdGhBdXRvZm9jdXNlZElucHV0KClgLAorICAgICAgICB3aGljaCByZXR1cm5zIGJv
dGggdGhlIG5ldyBgV0tXZWJWaWV3YCBhcyB3ZWxsIGFzIHRoZSBgVGVzdElucHV0RGVsZWdhdGVg
IG9mIHRoZSB3ZWIgdmlldy4gVGhlIGNhbGwgc2l0ZSBpcyB0aGVuCisgICAgICAgIHJlc3BvbnNp
YmxlIGZvciBrZWVwaW5nIHRoZSBpbnB1dCBkZWxlZ2F0ZSBhcm91bmQgZm9yIGFzIGxvbmcgYXMg
aXQgbmVlZHMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElu
cHV0VGVzdHNJT1MubW06CisgICAgICAgICh3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRv
Zm9jdXNlZElucHV0KToKKwogMjAyMC0wNi0xMyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5j
b20+CiAKICAgICAgICAgRXh0ZW5kZWQgQ29sb3I6IEV4cGVyaW1lbnQgd2l0aCBzdHJvbmdseSB0
eXBlZCBDb2xvckNvbXBvbmVudHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQppbmRleCA3YTZkYjE5MmM4NDUxNzhkM2E1
OTlhNjM2MDZlZmJlNTA3YTk5MWIwLi5kMTQ4OGViNTJlMzM4ZjhlMzg1ZDMzOGIzMzg5M2JmMmUy
ZTUzMTNkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2Fy
ZElucHV0VGVzdHNJT1MubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5
Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCkBAIC0yMDAsMTAgKzIwMCwxMCBAQCBzdGF0aWMgUmV0YWlu
UHRyPFRlc3RXS1dlYlZpZXc+IHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dChjb25zdCBSZXRh
aW5QdHI8VGVzdAogICAgIHJldHVybiB3ZWJWaWV3OwogfQogCi1zdGF0aWMgUmV0YWluUHRyPFRl
c3RXS1dlYlZpZXc+IHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpCitzdGF0aWMgc3RkOjpw
YWlyPFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiwgUmV0YWluUHRyPFRlc3RJbnB1dERlbGVnYXRl
Pj4gd2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpCiB7CiAgICAg
YXV0byBpbnB1dERlbGVnYXRlID0gYWRvcHROUyhbVGVzdElucHV0RGVsZWdhdGUgbmV3XSk7Ci0g
ICAgcmV0dXJuIHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dChpbnB1dERlbGVnYXRlKTsKKyAg
ICByZXR1cm4geyB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoaW5wdXREZWxlZ2F0ZSksIGlu
cHV0RGVsZWdhdGUgfTsKIH0KIAogbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewpAQCAtMzA5LDcg
KzMwOSw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBDdXN0b21JbnB1dFZpZXdBbmRJbnB1
dEFjY2Vzc29yeVZpZXcpCiAKIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBDYW5IYW5kbGVLZXlF
dmVudEluQ29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld1dp
dGhBdXRvZm9jdXNlZElucHV0KCk7CisgICAgYXV0byBbd2ViVmlldywgaW5wdXREZWxlZ2F0ZV0g
PSB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNlZElucHV0KCk7CiAgICAgYm9v
bCBkb25lV2FpdGluZyA9IGZhbHNlOwogCiAgICAgaWQgPFVJVGV4dElucHV0UHJpdmF0ZT4gY29u
dGVudFZpZXcgPSAoaWQgPFVJVGV4dElucHV0UHJpdmF0ZT4pW3dlYlZpZXcgZmlyc3RSZXNwb25k
ZXJdOwpAQCAtMzMwLDcgKzMzMCw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBDYW5IYW5k
bGVLZXlFdmVudEluQ29tcGxldGlvbkhhbmRsZXIpCiAKIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3Rz
LCBSZXNpZ25pbmdGaXJzdFJlc3BvbmRlckNhbmNlbHNLZXlFdmVudHMpCiB7Ci0gICAgYXV0byB3
ZWJWaWV3ID0gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KCk7CisgICAgYXV0byBbd2ViVmll
dywgaW5wdXREZWxlZ2F0ZV0gPSB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNl
ZElucHV0KCk7CiAgICAgYXV0byBjb250ZW50VmlldyA9IFt3ZWJWaWV3IHRleHRJbnB1dENvbnRl
bnRWaWV3XTsKICAgICBhdXRvIGtleURvd25FdmVudCA9IGFkb3B0TlMoW1tXZWJFdmVudCBhbGxv
Y10gaW5pdFdpdGhLZXlFdmVudFR5cGU6V2ViRXZlbnRLZXlEb3duIHRpbWVTdGFtcDpDRkFic29s
dXRlVGltZUdldEN1cnJlbnQoKSBjaGFyYWN0ZXJzOkAiYSIgY2hhcmFjdGVyc0lnbm9yaW5nTW9k
aWZpZXJzOkAiYSIgbW9kaWZpZXJzOjAgaXNSZXBlYXRpbmc6Tk8gd2l0aEZsYWdzOjAgd2l0aElu
cHV0TWFuYWdlckhpbnQ6bmlsIGtleUNvZGU6MCBpc1RhYktleTpOT10pOwogCkBAIC0zNzIsNyAr
MzcyLDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIENhcmV0U2VsZWN0aW9uUmVjdEFmdGVy
UmVzdG9yaW5nRmlyc3RSZXNwb25kZXJXaXRoUmV0YWkKIHsKICAgICAvLyBUaGlzIGRpZmZlcmVu
Y2UgaW4gY2FyZXQgd2lkdGggaXMgZHVlIHRvIHRoZSBmYWN0IHRoYXQgd2UgZG9uJ3Qgem9vbSBp
biB0byB0aGUgaW5wdXQgZmllbGQgb24gaVBhZCwgYnV0IGRvIG9uIGlQaG9uZS4KICAgICBhdXRv
IGV4cGVjdGVkQ2FyZXRSZWN0ID0gQ0dSZWN0TWFrZSgxNiwgMTMsIFVJRGV2aWNlLmN1cnJlbnRE
ZXZpY2UudXNlckludGVyZmFjZUlkaW9tID09IFVJVXNlckludGVyZmFjZUlkaW9tUGFkID8gMyA6
IDIsIDE1KTsKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQo
KTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERl
bGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoIklOUFVU
IiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmFjdGl2
ZUVsZW1lbnQudGFnTmFtZSJdKTsKICAgICBbd2ViVmlldyB3YWl0Rm9yQ2FyZXRWaWV3RnJhbWVU
b0JlY29tZTpleHBlY3RlZENhcmV0UmVjdF07CiAKQEAgLTM4OSw3ICszODksNyBAQCBURVNUKEtl
eWJvYXJkSW5wdXRUZXN0cywgUmFuZ2VkU2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RS
ZXNwb25kZXJXaXRoUmV0YQogewogICAgIE5TQXJyYXkgKmV4cGVjdGVkU2VsZWN0aW9uUmVjdHMg
PSBAWyBbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6Q0dSZWN0TWFrZSgxNiwgMTMsIDI0LCAxNSld
IF07CiAKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsK
KyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERlbGVn
YXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBbW3dlYlZpZXcgdGV4dElucHV0Q29udGVu
dFZpZXddIGluc2VydFRleHQ6QCJoZWxsbyJdOwogICAgIFt3ZWJWaWV3IHNlbGVjdEFsbDpuaWxd
OwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRp
bmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwpAQCAtNDA4
LDcgKzQwOCw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBDYXJldFNlbGVjdGlvblJlY3RB
ZnRlclJlc3RvcmluZ0ZpcnN0UmVzcG9uZGVyKQogewogICAgIC8vIFRoaXMgZGlmZmVyZW5jZSBp
biBjYXJldCB3aWR0aCBpcyBkdWUgdG8gdGhlIGZhY3QgdGhhdCB3ZSBkb24ndCB6b29tIGluIHRv
IHRoZSBpbnB1dCBmaWVsZCBvbiBpUGFkLCBidXQgZG8gb24gaVBob25lLgogICAgIGF1dG8gZXhw
ZWN0ZWRDYXJldFJlY3QgPSBDR1JlY3RNYWtlKDE2LCAxMywgVUlEZXZpY2UuY3VycmVudERldmlj
ZS51c2VySW50ZXJmYWNlSWRpb20gPT0gVUlVc2VySW50ZXJmYWNlSWRpb21QYWQgPyAzIDogMiwg
MTUpOwotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwor
ICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdhdGVdID0gd2ViVmlld0FuZElucHV0RGVsZWdh
dGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBb
d2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxl
bWVudC50YWdOYW1lIl0pOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JDYXJldFZpZXdGcmFtZVRvQmVj
b21lOmV4cGVjdGVkQ2FyZXRSZWN0XTsKIApAQCAtNDIzLDcgKzQyMyw3IEBAIFRFU1QoS2V5Ym9h
cmRJbnB1dFRlc3RzLCBSYW5nZWRTZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3Bv
bmRlcikKIHsKICAgICBOU0FycmF5ICpleHBlY3RlZFNlbGVjdGlvblJlY3RzID0gQFsgW05TVmFs
dWUgdmFsdWVXaXRoQ0dSZWN0OkNHUmVjdE1ha2UoMTYsIDEzLCAyNCwgMTUpXSBdOwogCi0gICAg
YXV0byB3ZWJWaWV3ID0gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KCk7CisgICAgYXV0byBb
d2ViVmlldywgaW5wdXREZWxlZ2F0ZV0gPSB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRv
Zm9jdXNlZElucHV0KCk7CiAgICAgW1t3ZWJWaWV3IHRleHRJbnB1dENvbnRlbnRWaWV3XSBpbnNl
cnRUZXh0OkAiaGVsbG8iXTsKICAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKICAgICBFWFBF
Q1RfV0tfU1RSRVEoIklOUFVUIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw
dDpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQudGFnTmFtZSJdKTsK
</data>
<flag name="review"
          id="417296"
          type_id="1"
          status="+"
          setter="thorton"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401873</attachid>
            <date>2020-06-14 15:19:14 -0700</date>
            <delta_ts>2020-06-14 16:06:16 -0700</delta_ts>
            <desc>Highly speculative fix...</desc>
            <filename>bug-213183-20200614151914.patch</filename>
            <type>text/plain</type>
            <size>8324</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmFhOTU0NTE3ZThmOWYwMmYwMzgyOTgwNjRkMmMxMTcy
MTcxNzE1Ny4uYmJhZjQwZDZjZDk4YjJmYWVmZGUyYWVkNjY0ZTAzMzFlZDBjZmM2OCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1
IEBACisyMDIwLTA2LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor
CisgICAgICAgIFtpT1NdIFR3byBLZXlib2FyZElucHV0VGVzdHMgYXJlIGZhaWxpbmcgb24gcmVj
ZW50IGlPUyBTREsgdmVyc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzE4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQyNzM0ODM+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBPbiByZWNlbnQgdmVy
c2lvbnMgb2YgdGhlIGlPUyBTREssIGlPUyBzaW11bGF0b3JzIHRoYXQgYXJlIG5vdCBzaG93biBv
bi1zY3JlZW4gYXJlIHRyZWF0ZWQgYXMgaWYgdGhlIGhhcmR3YXJlCisgICAgICAgIGtleWJvYXJk
IGlzIG5vdCBhdmFpbGFibGUgKHRoYXQgaXMsIGArW1VJSUtleWJvYXJkIGlzSW5IYXJkd2FyZUtl
eWJvYXJkTW9kZV1gIHJldHVybnMgYE5PYCkuIFdoZW4gcnVubmluZyBBUEkKKyAgICAgICAgdGVz
dHMgd2hpbGUgYFNpbXVsYXRvci5hcHBgIGlzIGFscmVhZHkgbGF1bmNoZWQsIGFuIGlPUyBzaW11
bGF0b3IgaXMgcHJlc2VudGVkIG9uLXNjcmVlbiwgd2hlcmVhcyB0aGUgc2ltdWxhdG9yCisgICAg
ICAgIGlzIG5vdCB2aXNpYmxlIHdoZW4gcnVubmluZyBBUEkgdGVzdHMgd2l0aG91dCBsYXVuY2hp
bmcgYFNpbXVsYXRvci5hcHBgIGJlZm9yZWhhbmQuCisKKyAgICAgICAgVGhpcyBkaXNjcmVwYW5j
eSBjYXVzZXMgdHdvIGlPUyBBUEkgdGVzdHMgdG8gZmFpbCAoaS5lLiBgQ2FyZXRTZWxlY3Rpb25S
ZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcmAgYW5kCisgICAgICAgIGBSYW5nZWRTZWxl
Y3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcmApLCBkdWUgdG8gdGhlIGZhY3Qg
dGhhdCBgLVtXS1dlYlZpZXcgYmVjb21lRmlyc3RSZXNwb25kZXJdYCBubworICAgICAgICBsb25n
ZXIgY2F1c2VzIGFuIGlucHV0IHNlc3Npb24gdG8gYmVnaW4uCisKKyAgICAgICAgSW50ZXJlc3Rp
bmdseSwgdGhlc2UgdGVzdHMgYWxyZWFkeSBhdHRlbXB0IHRvIGNpcmN1bXZlbnQgdGhpcyBieSB1
c2luZyBgd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClgLCB3aGljaAorICAgICAgICBjcmVh
dGVzIGFuZCBsb2FkcyBhIGBXS1dlYlZpZXdgIHdpdGggYSBzaW5nbGUgYXV0b2ZvY3VzaW5nIGlu
cHV0IGVsZW1lbnQsIHdpdGggYSBgX1dLSW5wdXREZWxlZ2F0ZWAgdGhhdAorICAgICAgICB1bmNv
bmRpdGlvbmFsbHkgYWxsb3dzIGlucHV0IHNlc3Npb25zIHRvIGJlZ2luLiBIb3dldmVyLCB0aGlz
IGRvZXNuJ3Qgd29yayBhcyBpbnRlbmRlZCBpbiB0aGVzZSB0ZXN0cywgYmVjYXVzZQorICAgICAg
ICBub3RoaW5nIGtlZXBzIHRoZSBkZWxlZ2F0ZSAoYSBgVGVzdElucHV0RGVsZWdhdGVgKSBhbGl2
ZSBwYXN0IHRoZSBzY29wZSBvZiB0aGUgY2FsbCB0bworICAgICAgICBgd2ViVmlld1dpdGhBdXRv
Zm9jdXNlZElucHV0KClgLiBTaW5jZSBgW1dLV2ViVmlldyBfaW5wdXREZWxlZ2F0ZV1gIGlzIGEg
d2VhayBwcm9wZXJ0eSwgdGhlIGlucHV0IGRlbGVnYXRlCisgICAgICAgIHNpbXBseSBkaXNhcHBl
YXJzIGFmdGVyIHdlIGZpbmlzaCB3YWl0aW5nIGZvciB0aGUgbG9hZCB0byBmaW5pc2ggKGFuZCB0
aGUgYXV0b2ZvY3VzZWQgaW5wdXQgZWxlbWVudCBiZWdpbnMgaXRzCisgICAgICAgIGlucHV0IHNl
c3Npb24pLiBUaGlzIGNhdXNlcyB1cyB0byBlcnJvbmVvdXNseSBmYWxsIGJhY2sgdG8gZGVmYXVs
dCBiZWhhdmlvciAoaS5lLgorICAgICAgICBgX1dLRm9jdXNTdGFydHNJbnB1dFNlc3Npb25Qb2xp
Y3lBdXRvYCkgZm9yIHN1YnNlcXVlbnQgY2FsbHMgdG8gc2hvdyB0aGUga2V5Ym9hcmQgZm9yIHRo
ZSBmb2N1c2VkIGVsZW1lbnQsIGFzIGlzCisgICAgICAgIHRoZSBjYXNlIHdoZW4gdGhlc2UgdHdv
IEFQSSB0ZXN0cyBjYWxsIGAtYmVjb21lRmlyc3RSZXNwb25kZXJgLiBUaGUgZW5kIHJlc3VsdCBp
cyB0aGF0IHRoZSBrZXlib2FyZCBkb2Vzbid0CisgICAgICAgIGFwcGVhciBhbmQgdGV4dCBzZWxl
Y3Rpb24gdmlld3MgYXJlIG5vdCBjcmVhdGVkIGFuZCBsYWlkIG91dCwgYnV0IG9ubHkgd2hlbiBB
UEkgdGVzdHMgYXJlIHJ1biB3aXRob3V0IGhhdmluZworICAgICAgICBsYXVuY2hlZCB0aGUgU2lt
dWxhdG9yIGFwcCBiZWZvcmVoYW5kLgorCisgICAgICAgIFRvIGZpeCB0aGlzLCByZWZhY3RvciBg
d2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KClgIGludG8gYHdlYlZpZXdBbmRJbnB1dERlbGVn
YXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKWAsCisgICAgICAgIHdoaWNoIHJldHVybnMgYm90aCB0
aGUgbmV3IGBXS1dlYlZpZXdgIGFzIHdlbGwgYXMgdGhlIGBUZXN0SW5wdXREZWxlZ2F0ZWAgb2Yg
dGhlIHdlYiB2aWV3LiBUaGUgY2FsbCBzaXRlIGlzIHRoZW4KKyAgICAgICAgcmVzcG9uc2libGUg
Zm9yIGtlZXBpbmcgdGhlIGlucHV0IGRlbGVnYXRlIGFyb3VuZCBmb3IgYXMgbG9uZyBhcyBpdCBu
ZWVkcy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0tleWJvYXJkSW5wdXRU
ZXN0c0lPUy5tbToKKyAgICAgICAgKHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1dCk6CisKKyAg
ICAgICAgRHJpdmUtYnkgZml4OiBmaXggYSBwb3RlbnRpYWwgc3RhY2sgc21hc2hlciBieSB1c2lu
ZyBhbiBPYmplY3RpdmUtQyBibG9jayB3aGVuIHNldHRpbmcgdGhlIGlucHV0IGRlbGVnYXRlJ3MK
KyAgICAgICAgcG9saWN5IGhhbmRsZXIsIGFuZCBieSB1c2luZyBgX19ibG9ja2AgZm9yIHRoZSBg
ZG9uZVdhaXRpbmdgIGJvb2xlYW4gZmxhZy4gVGhpcyBpcyBub3cgYSBwcm9ibGVtIGJlY3Vhc2Ug
dGhpcworICAgICAgICBibG9jayBtYXkgYmUgaW52b2tlZCBtdWx0aXBsZSB0aW1lcy4KKworICAg
ICAgICAod2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCk6CisKIDIw
MjAtMDYtMTMgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIEV4dGVu
ZGVkIENvbG9yOiBFeHBlcmltZW50IHdpdGggc3Ryb25nbHkgdHlwZWQgQ29sb3JDb21wb25lbnRz
CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0
VGVzdHNJT1MubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0
VGVzdHNJT1MubW0KaW5kZXggN2E2ZGIxOTJjODQ1MTc4ZDNhNTk5YTYzNjA2ZWZiZTUwN2E5OTFi
MC4uYTAzOGUzZjM5OWExNjA1MTQ5NTBlZDcyYjQzNjk4YTUwYmM3YmM0MyAxMDA2NDQKLS0tIGEv
VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCisr
KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5t
bQpAQCAtMTg3LDkgKzE4Nyw5IEBAIHN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2Vi
Vmlld1dpdGhBdXRvZm9jdXNlZElucHV0KGNvbnN0IFJldGFpblB0cjxUZXN0CiB7CiAgICAgYXV0
byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6
Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKIAotICAgIGJvb2wgZG9uZVdhaXRpbmcgPSBm
YWxzZTsKLSAgICBbaW5wdXREZWxlZ2F0ZSBzZXRGb2N1c1N0YXJ0c0lucHV0U2Vzc2lvblBvbGlj
eUhhbmRsZXI6WyZdIChXS1dlYlZpZXcgKiwgaWQgPF9XS0ZvY3VzZWRFbGVtZW50SW5mbz4pIC0+
IF9XS0ZvY3VzU3RhcnRzSW5wdXRTZXNzaW9uUG9saWN5IHsKLSAgICAgICAgZG9uZVdhaXRpbmcg
PSB0cnVlOworICAgIF9fYmxvY2sgQk9PTCBkb25lV2FpdGluZyA9IE5POworICAgIFtpbnB1dERl
bGVnYXRlIHNldEZvY3VzU3RhcnRzSW5wdXRTZXNzaW9uUG9saWN5SGFuZGxlcjpeX1dLRm9jdXNT
dGFydHNJbnB1dFNlc3Npb25Qb2xpY3koV0tXZWJWaWV3ICosIGlkIDxfV0tGb2N1c2VkRWxlbWVu
dEluZm8+KSB7CisgICAgICAgIGRvbmVXYWl0aW5nID0gWUVTOwogICAgICAgICByZXR1cm4gX1dL
Rm9jdXNTdGFydHNJbnB1dFNlc3Npb25Qb2xpY3lBbGxvdzsKICAgICB9XTsKICAgICBbd2ViVmll
dyBfc2V0SW5wdXREZWxlZ2F0ZTppbnB1dERlbGVnYXRlLmdldCgpXTsKQEAgLTIwMCwxMCArMjAw
LDEwIEBAIHN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhBdXRvZm9j
dXNlZElucHV0KGNvbnN0IFJldGFpblB0cjxUZXN0CiAgICAgcmV0dXJuIHdlYlZpZXc7CiB9CiAK
LXN0YXRpYyBSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElu
cHV0KCkKK3N0YXRpYyBzdGQ6OnBhaXI8UmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+LCBSZXRhaW5Q
dHI8VGVzdElucHV0RGVsZWdhdGU+PiB3ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9j
dXNlZElucHV0KCkKIHsKICAgICBhdXRvIGlucHV0RGVsZWdhdGUgPSBhZG9wdE5TKFtUZXN0SW5w
dXREZWxlZ2F0ZSBuZXddKTsKLSAgICByZXR1cm4gd2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0
KGlucHV0RGVsZWdhdGUpOworICAgIHJldHVybiB7IHdlYlZpZXdXaXRoQXV0b2ZvY3VzZWRJbnB1
dChpbnB1dERlbGVnYXRlKSwgaW5wdXREZWxlZ2F0ZSB9OwogfQogCiBuYW1lc3BhY2UgVGVzdFdl
YktpdEFQSSB7CkBAIC0zMDksNyArMzA5LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIEN1
c3RvbUlucHV0Vmlld0FuZElucHV0QWNjZXNzb3J5VmlldykKIAogVEVTVChLZXlib2FyZElucHV0
VGVzdHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBhdXRv
IHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKKyAgICBhdXRvIFt3ZWJW
aWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1
c2VkSW5wdXQoKTsKICAgICBib29sIGRvbmVXYWl0aW5nID0gZmFsc2U7CiAKICAgICBpZCA8VUlU
ZXh0SW5wdXRQcml2YXRlPiBjb250ZW50VmlldyA9IChpZCA8VUlUZXh0SW5wdXRQcml2YXRlPilb
d2ViVmlldyBmaXJzdFJlc3BvbmRlcl07CkBAIC0zMzAsNyArMzMwLDcgQEAgVEVTVChLZXlib2Fy
ZElucHV0VGVzdHMsIENhbkhhbmRsZUtleUV2ZW50SW5Db21wbGV0aW9uSGFuZGxlcikKIAogVEVT
VChLZXlib2FyZElucHV0VGVzdHMsIFJlc2lnbmluZ0ZpcnN0UmVzcG9uZGVyQ2FuY2Vsc0tleUV2
ZW50cykKIHsKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2VkSW5wdXQo
KTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJbnB1dERl
bGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBhdXRvIGNvbnRlbnRWaWV3ID0gW3dl
YlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddOwogICAgIGF1dG8ga2V5RG93bkV2ZW50ID0gYWRv
cHROUyhbW1dlYkV2ZW50IGFsbG9jXSBpbml0V2l0aEtleUV2ZW50VHlwZTpXZWJFdmVudEtleURv
d24gdGltZVN0YW1wOkNGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgpIGNoYXJhY3RlcnM6QCJhIiBj
aGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6QCJhIiBtb2RpZmllcnM6MCBpc1JlcGVhdGluZzpO
TyB3aXRoRmxhZ3M6MCB3aXRoSW5wdXRNYW5hZ2VySGludDpuaWwga2V5Q29kZTowIGlzVGFiS2V5
Ok5PXSk7CiAKQEAgLTM3Miw3ICszNzIsNyBAQCBURVNUKEtleWJvYXJkSW5wdXRUZXN0cywgQ2Fy
ZXRTZWxlY3Rpb25SZWN0QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRhaQogewog
ICAgIC8vIFRoaXMgZGlmZmVyZW5jZSBpbiBjYXJldCB3aWR0aCBpcyBkdWUgdG8gdGhlIGZhY3Qg
dGhhdCB3ZSBkb24ndCB6b29tIGluIHRvIHRoZSBpbnB1dCBmaWVsZCBvbiBpUGFkLCBidXQgZG8g
b24gaVBob25lLgogICAgIGF1dG8gZXhwZWN0ZWRDYXJldFJlY3QgPSBDR1JlY3RNYWtlKDE2LCAx
MywgVUlEZXZpY2UuY3VycmVudERldmljZS51c2VySW50ZXJmYWNlSWRpb20gPT0gVUlVc2VySW50
ZXJmYWNlSWRpb21QYWQgPyAzIDogMiwgMTUpOwotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdX
aXRoQXV0b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdhdGVd
ID0gd2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAgIEVY
UEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2Ny
aXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0pOwogICAgIFt3ZWJWaWV3IHdh
aXRGb3JDYXJldFZpZXdGcmFtZVRvQmVjb21lOmV4cGVjdGVkQ2FyZXRSZWN0XTsKIApAQCAtMzg5
LDcgKzM4OSw3IEBAIFRFU1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBSYW5nZWRTZWxlY3Rpb25SZWN0
QWZ0ZXJSZXN0b3JpbmdGaXJzdFJlc3BvbmRlcldpdGhSZXRhCiB7CiAgICAgTlNBcnJheSAqZXhw
ZWN0ZWRTZWxlY3Rpb25SZWN0cyA9IEBbIFtOU1ZhbHVlIHZhbHVlV2l0aENHUmVjdDpDR1JlY3RN
YWtlKDE2LCAxMywgMjQsIDE1KV0gXTsKIAotICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdXaXRo
QXV0b2ZvY3VzZWRJbnB1dCgpOworICAgIGF1dG8gW3dlYlZpZXcsIGlucHV0RGVsZWdhdGVdID0g
d2ViVmlld0FuZElucHV0RGVsZWdhdGVXaXRoQXV0b2ZvY3VzZWRJbnB1dCgpOwogICAgIFtbd2Vi
VmlldyB0ZXh0SW5wdXRDb250ZW50Vmlld10gaW5zZXJ0VGV4dDpAImhlbGxvIl07CiAgICAgW3dl
YlZpZXcgc2VsZWN0QWxsOm5pbF07CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJW
aWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50
LnRhZ05hbWUiXSk7CkBAIC00MDgsNyArNDA4LDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMs
IENhcmV0U2VsZWN0aW9uUmVjdEFmdGVyUmVzdG9yaW5nRmlyc3RSZXNwb25kZXIpCiB7CiAgICAg
Ly8gVGhpcyBkaWZmZXJlbmNlIGluIGNhcmV0IHdpZHRoIGlzIGR1ZSB0byB0aGUgZmFjdCB0aGF0
IHdlIGRvbid0IHpvb20gaW4gdG8gdGhlIGlucHV0IGZpZWxkIG9uIGlQYWQsIGJ1dCBkbyBvbiBp
UGhvbmUuCiAgICAgYXV0byBleHBlY3RlZENhcmV0UmVjdCA9IENHUmVjdE1ha2UoMTYsIDEzLCBV
SURldmljZS5jdXJyZW50RGV2aWNlLnVzZXJJbnRlcmZhY2VJZGlvbSA9PSBVSVVzZXJJbnRlcmZh
Y2VJZGlvbVBhZCA/IDMgOiAyLCAxNSk7Ci0gICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld1dpdGhB
dXRvZm9jdXNlZElucHV0KCk7CisgICAgYXV0byBbd2ViVmlldywgaW5wdXREZWxlZ2F0ZV0gPSB3
ZWJWaWV3QW5kSW5wdXREZWxlZ2F0ZVdpdGhBdXRvZm9jdXNlZElucHV0KCk7CiAgICAgRVhQRUNU
X1dLX1NUUkVRKCJJTlBVVCIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6
QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LnRhZ05hbWUiXSk7CiAgICAgW3dlYlZpZXcgd2FpdEZv
ckNhcmV0Vmlld0ZyYW1lVG9CZWNvbWU6ZXhwZWN0ZWRDYXJldFJlY3RdOwogCkBAIC00MjMsNyAr
NDIzLDcgQEAgVEVTVChLZXlib2FyZElucHV0VGVzdHMsIFJhbmdlZFNlbGVjdGlvblJlY3RBZnRl
clJlc3RvcmluZ0ZpcnN0UmVzcG9uZGVyKQogewogICAgIE5TQXJyYXkgKmV4cGVjdGVkU2VsZWN0
aW9uUmVjdHMgPSBAWyBbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6Q0dSZWN0TWFrZSgxNiwgMTMs
IDI0LCAxNSldIF07CiAKLSAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aEF1dG9mb2N1c2Vk
SW5wdXQoKTsKKyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHdlYlZpZXdBbmRJ
bnB1dERlbGVnYXRlV2l0aEF1dG9mb2N1c2VkSW5wdXQoKTsKICAgICBbW3dlYlZpZXcgdGV4dElu
cHV0Q29udGVudFZpZXddIGluc2VydFRleHQ6QCJoZWxsbyJdOwogICAgIFt3ZWJWaWV3IHNlbGVj
dEFsbDpuaWxdOwogICAgIEVYUEVDVF9XS19TVFJFUSgiSU5QVVQiLCBbd2ViVmlldyBzdHJpbmdC
eUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC50YWdOYW1lIl0p
Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402245</attachid>
            <date>2020-06-18 15:44:43 -0700</date>
            <delta_ts>2020-06-18 16:04:50 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-213183-20200618154443.patch</filename>
            <type>text/plain</type>
            <size>1521</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2MzIzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE0IEBACisyMDIwLTA2LTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbaU9TXSBUd28gS2V5Ym9hcmRJbnB1dFRlc3RzIGFyZSBmYWlsaW5nIG9u
IHJlY2VudCBpT1MgU0RLIHZlcnNpb25zIChidWlsZC1maXgpCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxODMKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY0MjczNDgzPgorCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgorCisgICAgICAg
ICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tOgorICAg
ICAgICAod2ViVmlld1dpdGhBdXRvZm9jdXNlZElucHV0KTogYm9vbCBtYXkgbm90IGJlIHRoZSBz
YW1lIHR5cGUgYXMgQk9PTC4KKwogMjAyMC0wNi0xOCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFw
cGxlLmNvbT4KIAogICAgICAgICBjYWxsIHNraXAgd2hlbiBza2lwcGluZyBKZXRTdHJlYW0yIHdh
c20gdGVzdApJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1
dFRlc3RzSU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9z
L0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQkocmV2aXNpb24gMjYzMjMzKQorKysgVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCSh3b3JraW5nIGNv
cHkpCkBAIC0xODcsOSArMTg3LDkgQEAgc3RhdGljIFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiB3
ZWJWaWV3VwogewogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFs
bG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMzIwLCA1MDApXSk7CiAKLSAgICBf
X2Jsb2NrIEJPT0wgZG9uZVdhaXRpbmcgPSBOTzsKKyAgICBfX2Jsb2NrIGJvb2wgZG9uZVdhaXRp
bmcgPSBmYWxzZTsKICAgICBbaW5wdXREZWxlZ2F0ZSBzZXRGb2N1c1N0YXJ0c0lucHV0U2Vzc2lv
blBvbGljeUhhbmRsZXI6Xl9XS0ZvY3VzU3RhcnRzSW5wdXRTZXNzaW9uUG9saWN5KFdLV2ViVmll
dyAqLCBpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPikgewotICAgICAgICBkb25lV2FpdGluZyA9
IFlFUzsKKyAgICAgICAgZG9uZVdhaXRpbmcgPSB0cnVlOwogICAgICAgICByZXR1cm4gX1dLRm9j
dXNTdGFydHNJbnB1dFNlc3Npb25Qb2xpY3lBbGxvdzsKICAgICB9XTsKICAgICBbd2ViVmlldyBf
c2V0SW5wdXREZWxlZ2F0ZTppbnB1dERlbGVnYXRlLmdldCgpXTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>