<?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>212619</bug_id>
          
          <creation_ts>2020-06-01 16:49:08 -0700</creation_ts>
          <short_desc>[iOS] WKProcessAssertionBackgroundTaskManager incorrectly ignores expiration notifications for daemons</short_desc>
          <delta_ts>2020-06-02 22:30: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>WebKit2</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>
          <dependson>212615</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1658111</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-01 16:49:08 -0700</bug_when>
    <thetext>WKProcessAssertionBackgroundTaskManager incorrectly ignores expiration notifications for daemons, because it rely on visibility to make decisions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658117</commentid>
    <comment_count>1</comment_count>
      <attachid>400770</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-01 16:58:53 -0700</bug_when>
    <thetext>Created attachment 400770
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658118</commentid>
    <comment_count>2</comment_count>
      <attachid>400771</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-01 17:01:07 -0700</bug_when>
    <thetext>Created attachment 400771
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658310</commentid>
    <comment_count>3</comment_count>
      <attachid>400825</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-02 08:33:38 -0700</bug_when>
    <thetext>Created attachment 400825
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658319</commentid>
    <comment_count>4</comment_count>
      <attachid>400828</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-02 08:41:16 -0700</bug_when>
    <thetext>Created attachment 400828
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658323</commentid>
    <comment_count>5</comment_count>
      <attachid>400830</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-02 08:46:05 -0700</bug_when>
    <thetext>Created attachment 400830
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658519</commentid>
    <comment_count>6</comment_count>
      <attachid>400830</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-02 17:31:20 -0700</bug_when>
    <thetext>Comment on attachment 400830
Patch

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

&gt; Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm:53
&gt; +    return [[[RBSProcessHandle currentProcess] activeLimitations] runTime] != RBSProcessTimeLimitationNone;

It might be worth putting this inside a std::call_once, because this should never change, right?

&gt; Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm:241
&gt; +    auto remainingTime = [[[RBSProcessHandle currentProcess] activeLimitations] runTime];

Can we use dot syntax for any of this?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658520</commentid>
    <comment_count>7</comment_count>
      <attachid>400830</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-02 17:33:21 -0700</bug_when>
    <thetext>Comment on attachment 400830
Patch

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

&gt;&gt; Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm:53
&gt;&gt; +    return [[[RBSProcessHandle currentProcess] activeLimitations] runTime] != RBSProcessTimeLimitationNone;
&gt; 
&gt; It might be worth putting this inside a std::call_once, because this should never change, right?

It totally changes. For example, for applications, based on app visibility. The timer should only get started after the app gets backgrounded and thus this would return RBSProcessTimeLimitationNone when foreground and a positive value when background.

&gt;&gt; Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm:241
&gt;&gt; +    auto remainingTime = [[[RBSProcessHandle currentProcess] activeLimitations] runTime];
&gt; 
&gt; Can we use dot syntax for any of this?

ok</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658551</commentid>
    <comment_count>8</comment_count>
      <attachid>400875</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-02 18:50:03 -0700</bug_when>
    <thetext>Created attachment 400875
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658626</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-02 22:29:18 -0700</bug_when>
    <thetext>Committed r262477: &lt;https://trac.webkit.org/changeset/262477&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 400875.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1658628</commentid>
    <comment_count>10</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-02 22:30:16 -0700</bug_when>
    <thetext>&lt;rdar://problem/63909510&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400770</attachid>
            <date>2020-06-01 16:58:53 -0700</date>
            <delta_ts>2020-06-01 17:01:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200601165853.patch</filename>
            <type>text/plain</type>
            <size>9225</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxNGQyZWJlZWM0NTBhYzg5
ZjgzNGQ3ODQ4MWYwNjE1ZGJjYTk3NjUuLmE2Y2E5ZWEwOWFiMDdiMjkxZGViY2JkM2RmYzEwZWZi
ZjIwOTlmMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDEgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciB3
YXMgaW5jb3JyZWN0bHkgaWdub3JpbmcgcHJvY2VzcyBhc3NlcnRpb24gZXhwaXJhdGlvbiBub3Rp
ZmljYXRpb25zCisgICAgICAgIGZvciBkYWVtb25zLCBiZWNhdXNlIGl0IHdhcyByZWx5aW5nIG9u
IHZpc2liaWxpdHkgdG8gbWFrZSBkZWNpc2lvbnMuIEZvciBkYWVtb25zIChvciBWaWV3U2Vydmlj
ZXMpLCB3ZSB3b3VsZAorICAgICAgICBub3QgZ2V0IGFwcGxpY2F0aW9uIHZpc2liaWxpdHkgbm90
aWZpY2F0aW9ucyBhbmQgd291bGQgdGhlcmVmb3JlIGFsd2F5cyBhc3N1bWUgdGhlIGFwcCBpcyB2
aXNpYmxlLgorICAgICAgICBBcyBhIHJlc3VsdCwgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJh
dGlvbiB3b3VsZCB0aGluayBpdCByZWNlaXZlZCBhbiBvdXRkYXRlZCBleHBpcmF0aW9uIG5vdGlm
aWNhdGlvbiBmb3IKKyAgICAgICAgYSB2aXNpYmxlIGFwcCBhbmQgd291bGQgc2ltcGx5IHJlLXRh
a2UgdGhlIGFzc2VydGlvbiByaWdodCBhd2F5LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlz
c3VlLCB3ZSBub3cgcmVseSBvbiBhIFJ1bm5pbmdCb2FyZCBBUEkgdGhhdCBsZXRzIHVzIGtub3cg
aWYgdGhlIHN1c3BlbnNpb24gdGltZXIgaGFzIGJlZW4KKyAgICAgICAgc3RhcnRlZCBvciBub3Qg
KGFuZCBob3cgbXVjaCByZW1haW5zIG9uIHRoZSB0aW1lcikuIElmIHRoZSBzdXNwZW5zaW9uIHRp
bWVyIGlzIG5vdCBhY3RpdmUgd2hlbiBnZXQgcmVjZWl2ZQorICAgICAgICB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24sIHdlIGtub3cgaXQgaXMgYW4gb3V0ZGF0ZWQgbm90aWZpY2F0aW9uIGFu
ZCB3ZSBpZ25vcmUgaXQgKHJlbGVhc2UgYW5kIHJlLXRha2UKKyAgICAgICAgYXNzZXJ0aW9uIHJp
Z2h0IGF3YXkpLiBUaGlzIGNhbiBoYXBwZW4gaWYgd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJv
Y2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24gYmVmb3JlCisgICAgICAgIHN1c3BlbmRl
ZCBhbmQgdGh1cyBvbmx5IGdldCBpdCB1cG9uIHJlc3VtaW5nLiBJdCBjYW4gYWxzbyBoYXBwZW4g
aWYgdGhlIHVzZXIgcmUtYWN0aXZhdGVzIHRoZSBhcHAgcmlnaHQgYWZ0ZXIKKyAgICAgICAgdGhl
IGV4cGlyYXRpb24gbm90aWNlIGhhcyBiZWVuIHNlbnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z
cGkvaW9zL1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAoYXBwbGljYXRpb25IYXNBY3RpdmVS
dW5UaW1lTGltaXRhdGlvbik6CisgICAgICAgICgtW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91
bmRUYXNrTWFuYWdlciBpbml0XSk6CisgICAgICAgICgtW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tn
cm91bmRUYXNrTWFuYWdlciBfdXBkYXRlQmFja2dyb3VuZFRhc2tdKToKKyAgICAgICAgKC1bV0tQ
cm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIF9oYW5kbGVCYWNrZ3JvdW5kVGFz
a0V4cGlyYXRpb25dKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyIF9oYW5kbGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWRdKToK
KyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIF9yZWxl
YXNlQmFja2dyb3VuZFRhc2tdKToKKwogMjAyMC0wNi0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA
YXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aHJlYWQtc2FmZXR5IGlzc3VlIGluIFtXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhw
aXJhdGlvbl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9SdW5u
aW5nQm9hcmRTZXJ2aWNlc1NQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1J1
bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmgKaW5kZXggYzI0OWQ3ZjBmNjI3M2Y3NDI4ODY0NTYyOTdl
ZGU4NTcwOTk5ZTJkNy4uZGY0ZjU4NGQyNzJlNTQ1YzQ5NzZlMGQzZGE3Mzg3MDZiMTkxMmQ4ZSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1J1bm5pbmdCb2FyZFNl
cnZpY2VzU1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1J1bm5pbmdC
b2FyZFNlcnZpY2VzU1BJLmgKQEAgLTI5LDYgKzI5LDEyIEBACiAKICNpbXBvcnQgPFJ1bm5pbmdC
b2FyZFNlcnZpY2VzL1J1bm5pbmdCb2FyZFNlcnZpY2VzLmg+CiAKK2V4dGVybiBjb25zdCBOU1Rp
bWVJbnRlcnZhbCBSQlNQcm9jZXNzVGltZUxpbWl0YXRpb25Ob25lOworCitAaW50ZXJmYWNlIFJC
U1Byb2Nlc3NMaW1pdGF0aW9ucyA6IE5TT2JqZWN0CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVh
ZHdyaXRlLCBhc3NpZ24pIE5TVGltZUludGVydmFsIHJ1blRpbWU7CitAZW5kCisKICNlbHNlCiAK
IEBpbnRlcmZhY2UgUkJTQXR0cmlidXRlIDogTlNPYmplY3QKQEAgLTc2LDkgKzgyLDE3IEBAIHR5
cGVkZWYgTlNfRU5VTSh1aW50OF90LCBSQlNUYXNrU3RhdGUpIHsKIEBwcm9wZXJ0eSAobm9uYXRv
bWljLCByZWFkb25seSwgY29weSkgTlNTZXQ8TlNTdHJpbmcgKj4gKmVuZG93bWVudE5hbWVzcGFj
ZXM7CiBAZW5kCiAKK2V4dGVybiBjb25zdCBOU1RpbWVJbnRlcnZhbCBSQlNQcm9jZXNzVGltZUxp
bWl0YXRpb25Ob25lOworCitAaW50ZXJmYWNlIFJCU1Byb2Nlc3NMaW1pdGF0aW9ucyA6IE5TT2Jq
ZWN0CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZHdyaXRlLCBhc3NpZ24pIE5TVGltZUludGVy
dmFsIHJ1blRpbWU7CitAZW5kCisKIEBpbnRlcmZhY2UgUkJTUHJvY2Vzc0hhbmRsZSA6IE5TT2Jq
ZWN0CiArIChSQlNQcm9jZXNzSGFuZGxlICopaGFuZGxlRm9ySWRlbnRpZmllcjooUkJTUHJvY2Vz
c0lkZW50aWZpZXIgKilpZGVudGlmaWVyIGVycm9yOihOU0Vycm9yICoqKW91dEVycm9yOworKyAo
UkJTUHJvY2Vzc0hhbmRsZSAqKWN1cnJlbnRQcm9jZXNzOwogQHByb3BlcnR5IChub25hdG9taWMs
IHJlYWRvbmx5LCBzdHJvbmcpIFJCU1Byb2Nlc3NTdGF0ZSAqY3VycmVudFN0YXRlOworQHByb3Bl
cnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBzdHJvbmcsIG51bGxhYmxlKSBSQlNQcm9jZXNzTGlt
aXRhdGlvbnMgKmFjdGl2ZUxpbWl0YXRpb25zOwogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggMzA2
OTE2Y2Y5ZmRlMTAyNDk0OGUwYzQzZGQ4ODUxNmQ2MzJhMmI3ZC4uOWE5YTk5YTYwMmVjODcyZGIz
ZTkyZjFjN2QxNzNjZTczZTJiMzdiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KQEAgLTQ4LDYgKzQ4LDExIEBAIHVzaW5nIFdl
YktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOwogLy8gb24gdGhlIGV4cGlyYXRpb24gaGFuZGxl
ciBnZXR0aW5nIGNhbGxlZCkuCiBzdGF0aWMgY29uc3QgU2Vjb25kcyByZWxlYXNlQmFja2dyb3Vu
ZFRhc2tBZnRlckV4cGlyYXRpb25EZWxheSB7IDJfcyB9OwogCitzdGF0aWMgYm9vbCBhcHBsaWNh
dGlvbkhhc0FjdGl2ZVJ1blRpbWVMaW1pdGF0aW9uKCkKK3sKKyAgICByZXR1cm4gW1tbUkJTUHJv
Y2Vzc0hhbmRsZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1blRpbWVdICE9
IFJCU1Byb2Nlc3NUaW1lTGltaXRhdGlvbk5vbmU7Cit9CisKIEBpbnRlcmZhY2UgV0tQcm9jZXNz
QXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyCiAjaWYgSEFWRShSVU5OSU5HQk9BUkRfVklT
SUJJTElUWV9BU1NFUlRJT05TKQogICAgIDogTlNPYmplY3QgPFJCU0Fzc2VydGlvbk9ic2Vydmlu
Zz4KQEAgLTcxLDcgKzc2LDYgQEAgQGltcGxlbWVudGF0aW9uIFdLUHJvY2Vzc0Fzc2VydGlvbkJh
Y2tncm91bmRUYXNrTWFuYWdlcgogI2VuZGlmCiAKICAgICBXZWFrSGFzaFNldDxQcm9jZXNzQW5k
VUlBc3NlcnRpb24+IF9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91bmRUYXNrOwotICAgIEJPT0wg
X2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQ7CiAgICAgZGlzcGF0Y2hfYmxvY2tfdCBfcGVuZGlu
Z1Rhc2tSZWxlYXNlVGFzazsKIH0KIApAQCAtOTEsMTUgKzk1LDE0IEBAIC0gKGluc3RhbmNldHlw
ZSlpbml0CiAgICAgX2JhY2tncm91bmRUYXNrID0gVUlCYWNrZ3JvdW5kVGFza0ludmFsaWQ7CiAj
ZW5kaWYKIAorICAgIC8vIEZJWE1FOiBTdG9wIHJlbHlpbmcgb24gVUlBcHBsaWNhdGlvbiBub3Rp
ZmljYXRpb25zIGFzIHRoaXMgZG9lcyBub3Qgd29yayBhcyBleHBlY3RlZCBmb3IgZGFlbW9ucyBv
ciBWaWV3U2VydmljZXMuCisgICAgLy8gV2Ugc2hvdWxkIGxpa2VseSB1c2UgUHJvY2Vzc1Rhc2tT
dGF0ZU9ic2VydmVyIHRvIG1vbml0b3Igc3VzcGVuc2lvbiBzdGF0ZS4KICAgICBbW05TTm90aWZp
Y2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0
aW9uV2lsbEVudGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6W1VJQXBwbGljYXRpb24g
c2hhcmVkQXBwbGljYXRpb25dIHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24g
KikgewotICAgICAgICBfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCA9IE5POwogICAgICAgICBb
c2VsZiBfY2FuY2VsUGVuZGluZ1JlbGVhc2VUYXNrXTsKICAgICAgICAgW3NlbGYgX3VwZGF0ZUJh
Y2tncm91bmRUYXNrXTsKICAgICB9XTsKIAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVm
YXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXJGb3JOYW1lOlVJQXBwbGljYXRpb25EaWRFbnRlckJhY2tn
cm91bmROb3RpZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9u
XSBxdWV1ZTpuaWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAgICAgICAgX2Fw
cGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQgPSBZRVM7Ci0gICAgICAgIAogICAgICAgICBpZiAoIVtz
ZWxmIF9oYXNCYWNrZ3JvdW5kVGFza10pCiAgICAgICAgICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQ
b29sOjpub3RpZnlQcm9jZXNzUG9vbHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsKICAg
ICB9XTsKQEAgLTE4Miw4ICsxODUsOCBAQCAtIChCT09MKV9oYXNCYWNrZ3JvdW5kVGFzawogLSAo
dm9pZClfdXBkYXRlQmFja2dyb3VuZFRhc2sKIHsKICAgICBpZiAoIV9hc3NlcnRpb25zTmVlZGlu
Z0JhY2tncm91bmRUYXNrLmNvbXB1dGVzRW1wdHkoKSAmJiAhW3NlbGYgX2hhc0JhY2tncm91bmRU
YXNrXSkgewotICAgICAgICBpZiAoX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsKLSAgICAg
ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IElnbm9yZWQgcmVxdWVzdCB0byBzdGFy
dCBhIG5ldyBiYWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSB0aGUgYXBwbGljYXRpb24gaXMgYWxyZWFk
eSBpbiB0aGUgYmFja2dyb3VuZCIsIHNlbGYpOworICAgICAgICBpZiAoYXBwbGljYXRpb25IYXNB
Y3RpdmVSdW5UaW1lTGltaXRhdGlvbigpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJP
UihQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyOiBJZ25vcmVkIHJlcXVlc3QgdG8gc3RhcnQgYSBuZXcgYmFja2dyb3VuZCB0YXNr
IGJlY2F1c2UgUnVubmluZ0JvYXJkIGhhcyBhbHJlYWR5IHN0YXJ0ZWQgdGhlIGV4cGlyYXRpb24g
dGltZXIiLCBzZWxmKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBS
RUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFj
a2dyb3VuZFRhc2tNYW5hZ2VyOiBiZWdpbkJhY2tncm91bmRUYXNrV2l0aE5hbWUiLCBzZWxmKTsK
QEAgLTIyMyw3ICsyMjYsOSBAQCAtICh2b2lkKWFzc2VydGlvbjooUkJTQXNzZXJ0aW9uICopYXNz
ZXJ0aW9uIGRpZEludmFsaWRhdGVXaXRoRXJyb3I6KE5TRXJyb3IgKillcgogCiAtICh2b2lkKV9o
YW5kbGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb24KIHsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNz
U3VzcGVuc2lvbiwgIldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogQmFj
a2dyb3VuZCB0YXNrIGV4cGlyZWQgd2hpbGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2VydGlv
biAoaXNNYWluVGhyZWFkPyAlZCkuIiwgUnVuTG9vcDo6aXNNYWluKCkpOworICAgIGF1dG8gcmVt
YWluaW5nVGltZSA9IFtbW1JCU1Byb2Nlc3NIYW5kbGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxp
bWl0YXRpb25zXSBydW5UaW1lXTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogQmFja2dyb3VuZCB0YXNr
IGV4cGlyZWQgd2hpbGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2VydGlvbiAoaXNNYWluVGhy
ZWFkOiAlZCwgcmVtYWluaW5nVGltZTogJWcpLiIsIFJ1bkxvb3A6OmlzTWFpbigpLCByZW1haW5p
bmdUaW1lKTsKKwogICAgIGNhbGxPbk1haW5SdW5Mb29wQW5kV2FpdChbc2VsZl0gewogICAgICAg
ICBbc2VsZiBfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25NYWluVGhyZWFkXTsKICAg
ICB9KTsKQEAgLTIzMywxMiArMjM4LDEzIEBAIC0gKHZvaWQpX2hhbmRsZUJhY2tncm91bmRUYXNr
RXhwaXJhdGlvbk9uTWFpblRocmVhZAogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7
CiAKLSAgICAvLyBGSVhNRTogV2hpbGUgcmVseWluZyBvbiBfYXBwbGljYXRpb25Jc0JhY2tncm91
bmRlZCBpcyBhY2NlcHRhYmxlIGZvciBhcHBsaWNhdGlvbnMsIHRoaXMgaXMgaW5hY3VyYXRlIGlu
IHRoZSBjYXNlCi0gICAgLy8gb2YgZGFlbW9ucy4KLSAgICBpZiAoIV9hcHBsaWNhdGlvbklzQmFj
a2dyb3VuZGVkKSB7Ci0gICAgICAgIC8vIFdlJ3ZlIHJlY2VpdmVkIHRoZSBpbnZhbGlkYXRpb24g
d2FybmluZyBhZnRlciB0aGUgYXBwIGhhcyBiZWNvbWUgZm9yZWdyb3VuZCBhZ2Fpbi4gSW4gdGhp
cyBjYXNlLCB3ZSBzaG91bGQgbm90Ci0gICAgICAgIC8vIHdhcm4gY2xpZW50cyBvZiBpbW1pbmVu
dCBzdXNwZW5zaW9uLiBUbyBiZSBzYWZlIChhdm9pZCBwb3RlbnRpYWwga2lsbGluZyksIHdlIGVu
ZCB0aGUgdGFzayByaWdodCBhd2F5IGFuZCBjYWxsCi0gICAgICAgIC8vIF91cGRhdGVCYWNrZ3Jv
dW5kVGFzayBhc3luY2hyb25vdXNseSB0byBzdGFydCBhIG5ldyB0YXNrIGlmIG5lY2Vzc2FyeS4K
KyAgICBhdXRvIHJlbWFpbmluZ1RpbWUgPSBbW1tSQlNQcm9jZXNzSGFuZGxlIGN1cnJlbnRQcm9j
ZXNzXSBhY3RpdmVMaW1pdGF0aW9uc10gcnVuVGltZV07CisgICAgUkVMRUFTRV9MT0coUHJvY2Vz
c1N1c3BlbnNpb24sICJXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IF9o
YW5kbGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWQgKHJlbWFpbmluZ1RpbWU6
ICVnKS4iLCByZW1haW5pbmdUaW1lKTsKKworICAgIC8vIElmIHRoZXJlIGlzIG5vIHRpbWUgbGlt
aXRhdGlvbiwgdGhlbiBpdCBtZWFucyB0aGF0IHRoZSBwcm9jZXNzIGlzIG5vdyBhbGxvd2VkIHRv
IHJ1biBhZ2FpbiBhbmQgdGhlIGV4cGlyYXRpb24gbm90aWZpY2F0aW9uCisgICAgLy8gaXMgb3V0
ZGF0ZWQgKGUuZy4gd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJvY2VzcyB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24gYmVmb3JlIHN1c3BlbmRpbmcgYW5kIHRodXMgb25seSBwcm9jZXNzIGl0
CisgICAgLy8gdXBvbiByZXN1bWluZywgb3IgdGhlIHVzZXIgcmVhY3RpdmF0ZWQgdGhlIGFwcCBz
aG9ydGx5IGFmdGVyIGV4cGlyYXRpb24pLgorICAgIGlmIChyZW1haW5pbmdUaW1lID09IFJCU1By
b2Nlc3NUaW1lTGltaXRhdGlvbk5vbmUpIHsKICAgICAgICAgW3NlbGYgX3JlbGVhc2VCYWNrZ3Jv
dW5kVGFza107CiAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl
KCksIF57CiAgICAgICAgICAgICBbc2VsZiBfdXBkYXRlQmFja2dyb3VuZFRhc2tdOwpAQCAtMjU2
LDcgKzI2Miw3IEBAIC0gKHZvaWQpX3JlbGVhc2VCYWNrZ3JvdW5kVGFzawogICAgICAgICByZXR1
cm47CiAKICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNz
QXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBlbmRCYWNrZ3JvdW5kVGFzayIsIHNlbGYp
OwotICAgIGlmIChfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCkKKyAgICBpZiAoYXBwbGljYXRp
b25IYXNBY3RpdmVSdW5UaW1lTGltaXRhdGlvbigpKQogICAgICAgICBXZWJLaXQ6OldlYlByb2Nl
c3NQb29sOjpub3RpZnlQcm9jZXNzUG9vbHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsK
IAogI2lmIEhBVkUoUlVOTklOR0JPQVJEX1ZJU0lCSUxJVFlfQVNTRVJUSU9OUykK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400771</attachid>
            <date>2020-06-01 17:01:07 -0700</date>
            <delta_ts>2020-06-02 08:33:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200601170106.patch</filename>
            <type>text/plain</type>
            <size>9209</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxNGQyZWJlZWM0NTBhYzg5
ZjgzNGQ3ODQ4MWYwNjE1ZGJjYTk3NjUuLmY4M2U0ZDhjMjM4ZGMyYjA0YjM5ZGUwYmZhYjM5MGI5
ZTgxNGI2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDEgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciB3
YXMgaW5jb3JyZWN0bHkgaWdub3JpbmcgcHJvY2VzcyBhc3NlcnRpb24gZXhwaXJhdGlvbiBub3Rp
ZmljYXRpb25zCisgICAgICAgIGZvciBkYWVtb25zLCBiZWNhdXNlIGl0IHdhcyByZWx5aW5nIG9u
IHZpc2liaWxpdHkgdG8gbWFrZSBkZWNpc2lvbnMuIEZvciBkYWVtb25zIChvciBWaWV3U2Vydmlj
ZXMpLCB3ZSB3b3VsZAorICAgICAgICBub3QgZ2V0IGFwcGxpY2F0aW9uIHZpc2liaWxpdHkgbm90
aWZpY2F0aW9ucyBhbmQgd291bGQgdGhlcmVmb3JlIGFsd2F5cyBhc3N1bWUgdGhlIGFwcCBpcyB2
aXNpYmxlLgorICAgICAgICBBcyBhIHJlc3VsdCwgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJh
dGlvbiB3b3VsZCB0aGluayBpdCByZWNlaXZlZCBhbiBvdXRkYXRlZCBleHBpcmF0aW9uIG5vdGlm
aWNhdGlvbiBmb3IKKyAgICAgICAgYSB2aXNpYmxlIGFwcCBhbmQgd291bGQgc2ltcGx5IHJlLXRh
a2UgdGhlIGFzc2VydGlvbiByaWdodCBhd2F5LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlz
c3VlLCB3ZSBub3cgcmVseSBvbiBhIFJ1bm5pbmdCb2FyZCBBUEkgdGhhdCBsZXRzIHVzIGtub3cg
aWYgdGhlIHN1c3BlbnNpb24gdGltZXIgaGFzIGJlZW4KKyAgICAgICAgc3RhcnRlZCBvciBub3Qg
KGFuZCBob3cgbXVjaCByZW1haW5zIG9uIHRoZSB0aW1lcikuIElmIHRoZSBzdXNwZW5zaW9uIHRp
bWVyIGlzIG5vdCBhY3RpdmUgd2hlbiBnZXQgcmVjZWl2ZQorICAgICAgICB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24sIHdlIGtub3cgaXQgaXMgYW4gb3V0ZGF0ZWQgbm90aWZpY2F0aW9uIGFu
ZCB3ZSBpZ25vcmUgaXQgKHJlbGVhc2UgYW5kIHJlLXRha2UKKyAgICAgICAgYXNzZXJ0aW9uIHJp
Z2h0IGF3YXkpLiBUaGlzIGNhbiBoYXBwZW4gaWYgd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJv
Y2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24gYmVmb3JlCisgICAgICAgIHN1c3BlbmRl
ZCBhbmQgdGh1cyBvbmx5IGdldCBpdCB1cG9uIHJlc3VtaW5nLiBJdCBjYW4gYWxzbyBoYXBwZW4g
aWYgdGhlIHVzZXIgcmUtYWN0aXZhdGVzIHRoZSBhcHAgcmlnaHQgYWZ0ZXIKKyAgICAgICAgdGhl
IGV4cGlyYXRpb24gbm90aWNlIGhhcyBiZWVuIHNlbnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z
cGkvaW9zL1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRp
bWVMaW1pdGF0aW9uKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyIGluaXRdKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3Vu
ZFRhc2tNYW5hZ2VyIF91cGRhdGVCYWNrZ3JvdW5kVGFza10pOgorICAgICAgICAoLVtXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhw
aXJhdGlvbl0pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZF0pOgorICAg
ICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX3JlbGVhc2VC
YWNrZ3JvdW5kVGFza10pOgorCiAyMDIwLTA2LTAxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs
ZS5jb20+CiAKICAgICAgICAgRml4IHRocmVhZC1zYWZldHkgaXNzdWUgaW4gW1dLUHJvY2Vzc0Fz
c2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0
aW9uXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1J1bm5pbmdC
b2FyZFNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmlu
Z0JvYXJkU2VydmljZXNTUEkuaAppbmRleCBjMjQ5ZDdmMGY2MjczZjc0Mjg4NjQ1NjI5N2VkZTg1
NzA5OTllMmQ3Li5kZjRmNTg0ZDI3MmU1NDVjNDk3NmUwZDNkYTczODcwNmIxOTEyZDhlIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmluZ0JvYXJkU2Vydmlj
ZXNTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmluZ0JvYXJk
U2VydmljZXNTUEkuaApAQCAtMjksNiArMjksMTIgQEAKIAogI2ltcG9ydCA8UnVubmluZ0JvYXJk
U2VydmljZXMvUnVubmluZ0JvYXJkU2VydmljZXMuaD4KIAorZXh0ZXJuIGNvbnN0IE5TVGltZUlu
dGVydmFsIFJCU1Byb2Nlc3NUaW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZhY2UgUkJTUHJv
Y2Vzc0xpbWl0YXRpb25zIDogTlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3Jp
dGUsIGFzc2lnbikgTlNUaW1lSW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogI2Vsc2UKIAogQGlu
dGVyZmFjZSBSQlNBdHRyaWJ1dGUgOiBOU09iamVjdApAQCAtNzYsOSArODIsMTcgQEAgdHlwZWRl
ZiBOU19FTlVNKHVpbnQ4X3QsIFJCU1Rhc2tTdGF0ZSkgewogQHByb3BlcnR5IChub25hdG9taWMs
IHJlYWRvbmx5LCBjb3B5KSBOU1NldDxOU1N0cmluZyAqPiAqZW5kb3dtZW50TmFtZXNwYWNlczsK
IEBlbmQKIAorZXh0ZXJuIGNvbnN0IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NUaW1lTGltaXRh
dGlvbk5vbmU7CisKK0BpbnRlcmZhY2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDogTlNPYmplY3QK
K0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1lSW50ZXJ2YWwg
cnVuVGltZTsKK0BlbmQKKwogQGludGVyZmFjZSBSQlNQcm9jZXNzSGFuZGxlIDogTlNPYmplY3QK
ICsgKFJCU1Byb2Nlc3NIYW5kbGUgKiloYW5kbGVGb3JJZGVudGlmaWVyOihSQlNQcm9jZXNzSWRl
bnRpZmllciAqKWlkZW50aWZpZXIgZXJyb3I6KE5TRXJyb3IgKiopb3V0RXJyb3I7CisrIChSQlNQ
cm9jZXNzSGFuZGxlICopY3VycmVudFByb2Nlc3M7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVh
ZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc1N0YXRlICpjdXJyZW50U3RhdGU7CitAcHJvcGVydHkg
KG5vbmF0b21pYywgcmVhZG9ubHksIHN0cm9uZywgbnVsbGFibGUpIFJCU1Byb2Nlc3NMaW1pdGF0
aW9ucyAqYWN0aXZlTGltaXRhdGlvbnM7CiBAZW5kCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0gYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCAzMDY5MTZj
ZjlmZGUxMDI0OTQ4ZTBjNDNkZDg4NTE2ZDYzMmEyYjdkLi44MTI0N2QwODQxNDUwMWZiNjJmMTQ4
MTQ5ZTlmMjE5MGNkYzcwZjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p
b3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p
b3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtNDgsNiArNDgsMTEgQEAgdXNpbmcgV2ViS2l0
OjpQcm9jZXNzQW5kVUlBc3NlcnRpb247CiAvLyBvbiB0aGUgZXhwaXJhdGlvbiBoYW5kbGVyIGdl
dHRpbmcgY2FsbGVkKS4KIHN0YXRpYyBjb25zdCBTZWNvbmRzIHJlbGVhc2VCYWNrZ3JvdW5kVGFz
a0FmdGVyRXhwaXJhdGlvbkRlbGF5IHsgMl9zIH07CiAKK3N0YXRpYyBib29sIHByb2Nlc3NIYXNB
Y3RpdmVSdW5UaW1lTGltaXRhdGlvbigpCit7CisgICAgcmV0dXJuIFtbW1JCU1Byb2Nlc3NIYW5k
bGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxpbWl0YXRpb25zXSBydW5UaW1lXSAhPSBSQlNQcm9j
ZXNzVGltZUxpbWl0YXRpb25Ob25lOworfQorCiBAaW50ZXJmYWNlIFdLUHJvY2Vzc0Fzc2VydGlv
bkJhY2tncm91bmRUYXNrTWFuYWdlcgogI2lmIEhBVkUoUlVOTklOR0JPQVJEX1ZJU0lCSUxJVFlf
QVNTRVJUSU9OUykKICAgICA6IE5TT2JqZWN0IDxSQlNBc3NlcnRpb25PYnNlcnZpbmc+CkBAIC03
MSw3ICs3Niw2IEBAIEBpbXBsZW1lbnRhdGlvbiBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5k
VGFza01hbmFnZXIKICNlbmRpZgogCiAgICAgV2Vha0hhc2hTZXQ8UHJvY2Vzc0FuZFVJQXNzZXJ0
aW9uPiBfYXNzZXJ0aW9uc05lZWRpbmdCYWNrZ3JvdW5kVGFzazsKLSAgICBCT09MIF9hcHBsaWNh
dGlvbklzQmFja2dyb3VuZGVkOwogICAgIGRpc3BhdGNoX2Jsb2NrX3QgX3BlbmRpbmdUYXNrUmVs
ZWFzZVRhc2s7CiB9CiAKQEAgLTkxLDE1ICs5NSwxNCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdAog
ICAgIF9iYWNrZ3JvdW5kVGFzayA9IFVJQmFja2dyb3VuZFRhc2tJbnZhbGlkOwogI2VuZGlmCiAK
KyAgICAvLyBGSVhNRTogU3RvcCByZWx5aW5nIG9uIFVJQXBwbGljYXRpb24gbm90aWZpY2F0aW9u
cyBhcyB0aGlzIGRvZXMgbm90IHdvcmsgYXMgZXhwZWN0ZWQgZm9yIGRhZW1vbnMgb3IgVmlld1Nl
cnZpY2VzLgorICAgIC8vIFdlIHNob3VsZCBsaWtlbHkgdXNlIFByb2Nlc3NUYXNrU3RhdGVPYnNl
cnZlciB0byBtb25pdG9yIHN1c3BlbnNpb24gc3RhdGUuCiAgICAgW1tOU05vdGlmaWNhdGlvbkNl
bnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlckZvck5hbWU6VUlBcHBsaWNhdGlvbldpbGxF
bnRlckZvcmVncm91bmROb3RpZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFw
cGxpY2F0aW9uXSBxdWV1ZTpuaWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAg
ICAgICAgX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQgPSBOTzsKICAgICAgICAgW3NlbGYgX2Nh
bmNlbFBlbmRpbmdSZWxlYXNlVGFza107CiAgICAgICAgIFtzZWxmIF91cGRhdGVCYWNrZ3JvdW5k
VGFza107CiAgICAgfV07CiAKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50
ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kTm90
aWZpY2F0aW9uIG9iamVjdDpbVUlBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlvbl0gcXVldWU6
bmlsIHVzaW5nQmxvY2s6XihOU05vdGlmaWNhdGlvbiAqKSB7Ci0gICAgICAgIF9hcHBsaWNhdGlv
bklzQmFja2dyb3VuZGVkID0gWUVTOwotICAgICAgICAKICAgICAgICAgaWYgKCFbc2VsZiBfaGFz
QmFja2dyb3VuZFRhc2tdKQogICAgICAgICAgICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90
aWZ5UHJvY2Vzc1Bvb2xzQXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCk7CiAgICAgfV07CkBA
IC0xODIsOCArMTg1LDggQEAgLSAoQk9PTClfaGFzQmFja2dyb3VuZFRhc2sKIC0gKHZvaWQpX3Vw
ZGF0ZUJhY2tncm91bmRUYXNrCiB7CiAgICAgaWYgKCFfYXNzZXJ0aW9uc05lZWRpbmdCYWNrZ3Jv
dW5kVGFzay5jb21wdXRlc0VtcHR5KCkgJiYgIVtzZWxmIF9oYXNCYWNrZ3JvdW5kVGFza10pIHsK
LSAgICAgICAgaWYgKF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKSB7Ci0gICAgICAgICAgICBS
RUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0
aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBJZ25vcmVkIHJlcXVlc3QgdG8gc3RhcnQgYSBuZXcg
YmFja2dyb3VuZCB0YXNrIGJlY2F1c2UgdGhlIGFwcGxpY2F0aW9uIGlzIGFscmVhZHkgaW4gdGhl
IGJhY2tncm91bmQiLCBzZWxmKTsKKyAgICAgICAgaWYgKHByb2Nlc3NIYXNBY3RpdmVSdW5UaW1l
TGltaXRhdGlvbigpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3Vz
cGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBJ
Z25vcmVkIHJlcXVlc3QgdG8gc3RhcnQgYSBuZXcgYmFja2dyb3VuZCB0YXNrIGJlY2F1c2UgUnVu
bmluZ0JvYXJkIGhhcyBhbHJlYWR5IHN0YXJ0ZWQgdGhlIGV4cGlyYXRpb24gdGltZXIiLCBzZWxm
KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBSRUxFQVNFX0xPRyhQ
cm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tN
YW5hZ2VyOiBiZWdpbkJhY2tncm91bmRUYXNrV2l0aE5hbWUiLCBzZWxmKTsKQEAgLTIyMyw3ICsy
MjYsOSBAQCAtICh2b2lkKWFzc2VydGlvbjooUkJTQXNzZXJ0aW9uICopYXNzZXJ0aW9uIGRpZElu
dmFsaWRhdGVXaXRoRXJyb3I6KE5TRXJyb3IgKillcgogCiAtICh2b2lkKV9oYW5kbGVCYWNrZ3Jv
dW5kVGFza0V4cGlyYXRpb24KIHsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogQmFja2dyb3VuZCB0YXNr
IGV4cGlyZWQgd2hpbGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2VydGlvbiAoaXNNYWluVGhy
ZWFkPyAlZCkuIiwgUnVuTG9vcDo6aXNNYWluKCkpOworICAgIGF1dG8gcmVtYWluaW5nVGltZSA9
IFtbW1JCU1Byb2Nlc3NIYW5kbGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxpbWl0YXRpb25zXSBy
dW5UaW1lXTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIldLUHJvY2Vzc0Fz
c2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogQmFja2dyb3VuZCB0YXNrIGV4cGlyZWQgd2hp
bGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2VydGlvbiAoaXNNYWluVGhyZWFkOiAlZCwgcmVt
YWluaW5nVGltZTogJWcpLiIsIFJ1bkxvb3A6OmlzTWFpbigpLCByZW1haW5pbmdUaW1lKTsKKwog
ICAgIGNhbGxPbk1haW5SdW5Mb29wQW5kV2FpdChbc2VsZl0gewogICAgICAgICBbc2VsZiBfaGFu
ZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25NYWluVGhyZWFkXTsKICAgICB9KTsKQEAgLTIz
MywxMiArMjM4LDEzIEBAIC0gKHZvaWQpX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJhdGlvbk9u
TWFpblRocmVhZAogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKLSAgICAvLyBG
SVhNRTogV2hpbGUgcmVseWluZyBvbiBfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCBpcyBhY2Nl
cHRhYmxlIGZvciBhcHBsaWNhdGlvbnMsIHRoaXMgaXMgaW5hY3VyYXRlIGluIHRoZSBjYXNlCi0g
ICAgLy8gb2YgZGFlbW9ucy4KLSAgICBpZiAoIV9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKSB7
Ci0gICAgICAgIC8vIFdlJ3ZlIHJlY2VpdmVkIHRoZSBpbnZhbGlkYXRpb24gd2FybmluZyBhZnRl
ciB0aGUgYXBwIGhhcyBiZWNvbWUgZm9yZWdyb3VuZCBhZ2Fpbi4gSW4gdGhpcyBjYXNlLCB3ZSBz
aG91bGQgbm90Ci0gICAgICAgIC8vIHdhcm4gY2xpZW50cyBvZiBpbW1pbmVudCBzdXNwZW5zaW9u
LiBUbyBiZSBzYWZlIChhdm9pZCBwb3RlbnRpYWwga2lsbGluZyksIHdlIGVuZCB0aGUgdGFzayBy
aWdodCBhd2F5IGFuZCBjYWxsCi0gICAgICAgIC8vIF91cGRhdGVCYWNrZ3JvdW5kVGFzayBhc3lu
Y2hyb25vdXNseSB0byBzdGFydCBhIG5ldyB0YXNrIGlmIG5lY2Vzc2FyeS4KKyAgICBhdXRvIHJl
bWFpbmluZ1RpbWUgPSBbW1tSQlNQcm9jZXNzSGFuZGxlIGN1cnJlbnRQcm9jZXNzXSBhY3RpdmVM
aW1pdGF0aW9uc10gcnVuVGltZV07CisgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24s
ICJXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IF9oYW5kbGVCYWNrZ3Jv
dW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWQgKHJlbWFpbmluZ1RpbWU6ICVnKS4iLCByZW1h
aW5pbmdUaW1lKTsKKworICAgIC8vIElmIHRoZXJlIGlzIG5vIHRpbWUgbGltaXRhdGlvbiwgdGhl
biBpdCBtZWFucyB0aGF0IHRoZSBwcm9jZXNzIGlzIG5vdyBhbGxvd2VkIHRvIHJ1biBhZ2FpbiBh
bmQgdGhlIGV4cGlyYXRpb24gbm90aWZpY2F0aW9uCisgICAgLy8gaXMgb3V0ZGF0ZWQgKGUuZy4g
d2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJvY2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRp
b24gYmVmb3JlIHN1c3BlbmRpbmcgYW5kIHRodXMgb25seSBwcm9jZXNzIGl0CisgICAgLy8gdXBv
biByZXN1bWluZywgb3IgdGhlIHVzZXIgcmVhY3RpdmF0ZWQgdGhlIGFwcCBzaG9ydGx5IGFmdGVy
IGV4cGlyYXRpb24pLgorICAgIGlmIChyZW1haW5pbmdUaW1lID09IFJCU1Byb2Nlc3NUaW1lTGlt
aXRhdGlvbk5vbmUpIHsKICAgICAgICAgW3NlbGYgX3JlbGVhc2VCYWNrZ3JvdW5kVGFza107CiAg
ICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAg
ICAgICAgICBbc2VsZiBfdXBkYXRlQmFja2dyb3VuZFRhc2tdOwpAQCAtMjU2LDcgKzI2Miw3IEBA
IC0gKHZvaWQpX3JlbGVhc2VCYWNrZ3JvdW5kVGFzawogICAgICAgICByZXR1cm47CiAKICAgICBS
RUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFj
a2dyb3VuZFRhc2tNYW5hZ2VyOiBlbmRCYWNrZ3JvdW5kVGFzayIsIHNlbGYpOwotICAgIGlmIChf
YXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCkKKyAgICBpZiAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRp
bWVMaW1pdGF0aW9uKCkpCiAgICAgICAgIFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6Om5vdGlmeVBy
b2Nlc3NQb29sc0FwcGxpY2F0aW9uSXNBYm91dFRvU3VzcGVuZCgpOwogCiAjaWYgSEFWRShSVU5O
SU5HQk9BUkRfVklTSUJJTElUWV9BU1NFUlRJT05TKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400825</attachid>
            <date>2020-06-02 08:33:38 -0700</date>
            <delta_ts>2020-06-02 08:41:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200602083337.patch</filename>
            <type>text/plain</type>
            <size>9151</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU0NGI3MzMwOTczYzJkMGM1
M2RiN2ZkNjFhODdiMjZhNDA1Y2FlNjQuLmU5OWQ3YTJlNTEwNTE2M2VmNTRlOWViZmY2NGQ1NDMw
YWUwNTVlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciB3
YXMgaW5jb3JyZWN0bHkgaWdub3JpbmcgcHJvY2VzcyBhc3NlcnRpb24gZXhwaXJhdGlvbiBub3Rp
ZmljYXRpb25zCisgICAgICAgIGZvciBkYWVtb25zLCBiZWNhdXNlIGl0IHdhcyByZWx5aW5nIG9u
IHZpc2liaWxpdHkgdG8gbWFrZSBkZWNpc2lvbnMuIEZvciBkYWVtb25zIChvciBWaWV3U2Vydmlj
ZXMpLCB3ZSB3b3VsZAorICAgICAgICBub3QgZ2V0IGFwcGxpY2F0aW9uIHZpc2liaWxpdHkgbm90
aWZpY2F0aW9ucyBhbmQgd291bGQgdGhlcmVmb3JlIGFsd2F5cyBhc3N1bWUgdGhlIGFwcCBpcyB2
aXNpYmxlLgorICAgICAgICBBcyBhIHJlc3VsdCwgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJh
dGlvbiB3b3VsZCB0aGluayBpdCByZWNlaXZlZCBhbiBvdXRkYXRlZCBleHBpcmF0aW9uIG5vdGlm
aWNhdGlvbiBmb3IKKyAgICAgICAgYSB2aXNpYmxlIGFwcCBhbmQgd291bGQgc2ltcGx5IHJlLXRh
a2UgdGhlIGFzc2VydGlvbiByaWdodCBhd2F5LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlz
c3VlLCB3ZSBub3cgcmVseSBvbiBhIFJ1bm5pbmdCb2FyZCBBUEkgdGhhdCBsZXRzIHVzIGtub3cg
aWYgdGhlIHN1c3BlbnNpb24gdGltZXIgaGFzIGJlZW4KKyAgICAgICAgc3RhcnRlZCBvciBub3Qg
KGFuZCBob3cgbXVjaCByZW1haW5zIG9uIHRoZSB0aW1lcikuIElmIHRoZSBzdXNwZW5zaW9uIHRp
bWVyIGlzIG5vdCBhY3RpdmUgd2hlbiBnZXQgcmVjZWl2ZQorICAgICAgICB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24sIHdlIGtub3cgaXQgaXMgYW4gb3V0ZGF0ZWQgbm90aWZpY2F0aW9uIGFu
ZCB3ZSBpZ25vcmUgaXQgKHJlbGVhc2UgYW5kIHJlLXRha2UKKyAgICAgICAgYXNzZXJ0aW9uIHJp
Z2h0IGF3YXkpLiBUaGlzIGNhbiBoYXBwZW4gaWYgd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJv
Y2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24gYmVmb3JlCisgICAgICAgIHN1c3BlbmRl
ZCBhbmQgdGh1cyBvbmx5IGdldCBpdCB1cG9uIHJlc3VtaW5nLiBJdCBjYW4gYWxzbyBoYXBwZW4g
aWYgdGhlIHVzZXIgcmUtYWN0aXZhdGVzIHRoZSBhcHAgcmlnaHQgYWZ0ZXIKKyAgICAgICAgdGhl
IGV4cGlyYXRpb24gbm90aWNlIGhhcyBiZWVuIHNlbnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z
cGkvaW9zL1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRp
bWVMaW1pdGF0aW9uKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyIGluaXRdKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3Vu
ZFRhc2tNYW5hZ2VyIF91cGRhdGVCYWNrZ3JvdW5kVGFza10pOgorICAgICAgICAoLVtXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhw
aXJhdGlvbl0pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZF0pOgorICAg
ICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX3JlbGVhc2VC
YWNrZ3JvdW5kVGFza10pOgorCiAyMDIwLTA2LTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn
YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF0gSW1wbGVtZW50IGRhdGEgbGlzdCBk
cm9wIGRvd24gbWVudQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9z
L1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p
b3MvUnVubmluZ0JvYXJkU2VydmljZXNTUEkuaAppbmRleCBjMjQ5ZDdmMGY2MjczZjc0Mjg4NjQ1
NjI5N2VkZTg1NzA5OTllMmQ3Li44NjdmNmM3MDMzZmNhYjAzMzY5ODIwNzZmNGU0NjUzN2FjZjEx
NTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmluZ0Jv
YXJkU2VydmljZXNTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVu
bmluZ0JvYXJkU2VydmljZXNTUEkuaApAQCAtMjksNiArMjksMTIgQEAKIAogI2ltcG9ydCA8UnVu
bmluZ0JvYXJkU2VydmljZXMvUnVubmluZ0JvYXJkU2VydmljZXMuaD4KIAorZXh0ZXJuIGNvbnN0
IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NUaW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZh
Y2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDogTlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj
LCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1lSW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogI2Vs
c2UKIAogQGludGVyZmFjZSBSQlNBdHRyaWJ1dGUgOiBOU09iamVjdApAQCAtNzYsOSArODIsMTcg
QEAgdHlwZWRlZiBOU19FTlVNKHVpbnQ4X3QsIFJCU1Rhc2tTdGF0ZSkgewogQHByb3BlcnR5IChu
b25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU1NldDxOU1N0cmluZyAqPiAqZW5kb3dtZW50TmFt
ZXNwYWNlczsKIEBlbmQKIAorZXh0ZXJuIGNvbnN0IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NU
aW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZhY2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDog
TlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1l
SW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogQGludGVyZmFjZSBSQlNQcm9jZXNzSGFuZGxlIDog
TlNPYmplY3QKICsgKFJCU1Byb2Nlc3NIYW5kbGUgKiloYW5kbGVGb3JJZGVudGlmaWVyOihSQlNQ
cm9jZXNzSWRlbnRpZmllciAqKWlkZW50aWZpZXIgZXJyb3I6KE5TRXJyb3IgKiopb3V0RXJyb3I7
CisrIChSQlNQcm9jZXNzSGFuZGxlICopY3VycmVudFByb2Nlc3M7CiBAcHJvcGVydHkgKG5vbmF0
b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc1N0YXRlICpjdXJyZW50U3RhdGU7CitA
cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc0xpbWl0YXRp
b25zICphY3RpdmVMaW1pdGF0aW9uczsKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCmluZGV4IDMwNjkxNmNm
OWZkZTEwMjQ5NDhlMGM0M2RkODg1MTZkNjMyYTJiN2QuLjgxMjQ3ZDA4NDE0NTAxZmI2MmYxNDgx
NDllOWYyMTkwY2RjNzBmNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCkBAIC00OCw2ICs0OCwxMSBAQCB1c2luZyBXZWJLaXQ6
OlByb2Nlc3NBbmRVSUFzc2VydGlvbjsKIC8vIG9uIHRoZSBleHBpcmF0aW9uIGhhbmRsZXIgZ2V0
dGluZyBjYWxsZWQpLgogc3RhdGljIGNvbnN0IFNlY29uZHMgcmVsZWFzZUJhY2tncm91bmRUYXNr
QWZ0ZXJFeHBpcmF0aW9uRGVsYXkgeyAyX3MgfTsKIAorc3RhdGljIGJvb2wgcHJvY2Vzc0hhc0Fj
dGl2ZVJ1blRpbWVMaW1pdGF0aW9uKCkKK3sKKyAgICByZXR1cm4gW1tbUkJTUHJvY2Vzc0hhbmRs
ZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1blRpbWVdICE9IFJCU1Byb2Nl
c3NUaW1lTGltaXRhdGlvbk5vbmU7Cit9CisKIEBpbnRlcmZhY2UgV0tQcm9jZXNzQXNzZXJ0aW9u
QmFja2dyb3VuZFRhc2tNYW5hZ2VyCiAjaWYgSEFWRShSVU5OSU5HQk9BUkRfVklTSUJJTElUWV9B
U1NFUlRJT05TKQogICAgIDogTlNPYmplY3QgPFJCU0Fzc2VydGlvbk9ic2VydmluZz4KQEAgLTcx
LDcgKzc2LDYgQEAgQGltcGxlbWVudGF0aW9uIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRU
YXNrTWFuYWdlcgogI2VuZGlmCiAKICAgICBXZWFrSGFzaFNldDxQcm9jZXNzQW5kVUlBc3NlcnRp
b24+IF9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91bmRUYXNrOwotICAgIEJPT0wgX2FwcGxpY2F0
aW9uSXNCYWNrZ3JvdW5kZWQ7CiAgICAgZGlzcGF0Y2hfYmxvY2tfdCBfcGVuZGluZ1Rhc2tSZWxl
YXNlVGFzazsKIH0KIApAQCAtOTEsMTUgKzk1LDE0IEBAIC0gKGluc3RhbmNldHlwZSlpbml0CiAg
ICAgX2JhY2tncm91bmRUYXNrID0gVUlCYWNrZ3JvdW5kVGFza0ludmFsaWQ7CiAjZW5kaWYKIAor
ICAgIC8vIEZJWE1FOiBTdG9wIHJlbHlpbmcgb24gVUlBcHBsaWNhdGlvbiBub3RpZmljYXRpb25z
IGFzIHRoaXMgZG9lcyBub3Qgd29yayBhcyBleHBlY3RlZCBmb3IgZGFlbW9ucyBvciBWaWV3U2Vy
dmljZXMuCisgICAgLy8gV2Ugc2hvdWxkIGxpa2VseSB1c2UgUHJvY2Vzc1Rhc2tTdGF0ZU9ic2Vy
dmVyIHRvIG1vbml0b3Igc3VzcGVuc2lvbiBzdGF0ZS4KICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu
dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uV2lsbEVu
dGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6W1VJQXBwbGljYXRpb24gc2hhcmVkQXBw
bGljYXRpb25dIHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24gKikgewotICAg
ICAgICBfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCA9IE5POwogICAgICAgICBbc2VsZiBfY2Fu
Y2VsUGVuZGluZ1JlbGVhc2VUYXNrXTsKICAgICAgICAgW3NlbGYgX3VwZGF0ZUJhY2tncm91bmRU
YXNrXTsKICAgICB9XTsKIAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRl
cl0gYWRkT2JzZXJ2ZXJGb3JOYW1lOlVJQXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmROb3Rp
ZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBxdWV1ZTpu
aWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAgICAgICAgX2FwcGxpY2F0aW9u
SXNCYWNrZ3JvdW5kZWQgPSBZRVM7Ci0gICAgICAgIAogICAgICAgICBpZiAoIVtzZWxmIF9oYXNC
YWNrZ3JvdW5kVGFza10pCiAgICAgICAgICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpub3Rp
ZnlQcm9jZXNzUG9vbHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsKICAgICB9XTsKQEAg
LTE4Miw4ICsxODUsOCBAQCAtIChCT09MKV9oYXNCYWNrZ3JvdW5kVGFzawogLSAodm9pZClfdXBk
YXRlQmFja2dyb3VuZFRhc2sKIHsKICAgICBpZiAoIV9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91
bmRUYXNrLmNvbXB1dGVzRW1wdHkoKSAmJiAhW3NlbGYgX2hhc0JhY2tncm91bmRUYXNrXSkgewot
ICAgICAgICBpZiAoX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsKLSAgICAgICAgICAgIFJF
TEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IElnbm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBi
YWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSB0aGUgYXBwbGljYXRpb24gaXMgYWxyZWFkeSBpbiB0aGUg
YmFja2dyb3VuZCIsIHNlbGYpOworICAgICAgICBpZiAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRpbWVM
aW1pdGF0aW9uKCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNw
ZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IEln
bm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBiYWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSBSdW5u
aW5nQm9hcmQgaGFzIGFscmVhZHkgc3RhcnRlZCB0aGUgZXhwaXJhdGlvbiB0aW1lciIsIHNlbGYp
OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIFJFTEVBU0VfTE9HKFBy
b2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXI6IGJlZ2luQmFja2dyb3VuZFRhc2tXaXRoTmFtZSIsIHNlbGYpOwpAQCAtMjIzLDcgKzIy
Niw5IEBAIC0gKHZvaWQpYXNzZXJ0aW9uOihSQlNBc3NlcnRpb24gKilhc3NlcnRpb24gZGlkSW52
YWxpZGF0ZVdpdGhFcnJvcjooTlNFcnJvciAqKWVyCiAKIC0gKHZvaWQpX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbgogewotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAi
V0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sg
ZXhwaXJlZCB3aGlsZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJl
YWQ/ICVkKS4iLCBSdW5Mb29wOjppc01haW4oKSk7CisgICAgYXV0byByZW1haW5pbmdUaW1lID0g
W1tbUkJTUHJvY2Vzc0hhbmRsZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1
blRpbWVdOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV0tQcm9jZXNzQXNz
ZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sgZXhwaXJlZCB3aGls
ZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJlYWQ6ICVkLCByZW1h
aW5pbmdUaW1lOiAlZykuIiwgUnVuTG9vcDo6aXNNYWluKCksIHJlbWFpbmluZ1RpbWUpOworCiAg
ICAgY2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFtzZWxmXSB7CiAgICAgICAgIFtzZWxmIF9oYW5k
bGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWRdOwogICAgIH0pOwpAQCAtMjMz
LDEyICsyMzgsMTMgQEAgLSAodm9pZClfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25N
YWluVGhyZWFkCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIC8vIEZJ
WE1FOiBXaGlsZSByZWx5aW5nIG9uIF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkIGlzIGFjY2Vw
dGFibGUgZm9yIGFwcGxpY2F0aW9ucywgdGhpcyBpcyBpbmFjdXJhdGUgaW4gdGhlIGNhc2UKLSAg
ICAvLyBvZiBkYWVtb25zLgotICAgIGlmICghX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsK
LSAgICAgICAgLy8gV2UndmUgcmVjZWl2ZWQgdGhlIGludmFsaWRhdGlvbiB3YXJuaW5nIGFmdGVy
IHRoZSBhcHAgaGFzIGJlY29tZSBmb3JlZ3JvdW5kIGFnYWluLiBJbiB0aGlzIGNhc2UsIHdlIHNo
b3VsZCBub3QKLSAgICAgICAgLy8gd2FybiBjbGllbnRzIG9mIGltbWluZW50IHN1c3BlbnNpb24u
IFRvIGJlIHNhZmUgKGF2b2lkIHBvdGVudGlhbCBraWxsaW5nKSwgd2UgZW5kIHRoZSB0YXNrIHJp
Z2h0IGF3YXkgYW5kIGNhbGwKLSAgICAgICAgLy8gX3VwZGF0ZUJhY2tncm91bmRUYXNrIGFzeW5j
aHJvbm91c2x5IHRvIHN0YXJ0IGEgbmV3IHRhc2sgaWYgbmVjZXNzYXJ5LgorICAgIGF1dG8gcmVt
YWluaW5nVGltZSA9IFtbW1JCU1Byb2Nlc3NIYW5kbGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxp
bWl0YXRpb25zXSBydW5UaW1lXTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZCAocmVtYWluaW5nVGltZTogJWcpLiIsIHJlbWFp
bmluZ1RpbWUpOworCisgICAgLy8gSWYgdGhlcmUgaXMgbm8gdGltZSBsaW1pdGF0aW9uLCB0aGVu
IGl0IG1lYW5zIHRoYXQgdGhlIHByb2Nlc3MgaXMgbm93IGFsbG93ZWQgdG8gcnVuIGFnYWluIGFu
ZCB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24KKyAgICAvLyBpcyBvdXRkYXRlZCAoZS5nLiB3
ZSBkaWQgbm90IGhhdmUgdGltZSB0byBwcm9jZXNzIHRoZSBleHBpcmF0aW9uIG5vdGlmaWNhdGlv
biBiZWZvcmUgc3VzcGVuZGluZyBhbmQgdGh1cyBvbmx5IHByb2Nlc3MgaXQKKyAgICAvLyB1cG9u
IHJlc3VtaW5nLCBvciB0aGUgdXNlciByZWFjdGl2YXRlZCB0aGUgYXBwIHNob3J0bHkgYWZ0ZXIg
ZXhwaXJhdGlvbikuCisgICAgaWYgKHJlbWFpbmluZ1RpbWUgPT0gUkJTUHJvY2Vzc1RpbWVMaW1p
dGF0aW9uTm9uZSkgewogICAgICAgICBbc2VsZiBfcmVsZWFzZUJhY2tncm91bmRUYXNrXTsKICAg
ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAg
ICAgICAgIFtzZWxmIF91cGRhdGVCYWNrZ3JvdW5kVGFza107CkBAIC0yNTYsNyArMjYyLDcgQEAg
LSAodm9pZClfcmVsZWFzZUJhY2tncm91bmRUYXNrCiAgICAgICAgIHJldHVybjsKIAogICAgIFJF
TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNr
Z3JvdW5kVGFza01hbmFnZXI6IGVuZEJhY2tncm91bmRUYXNrIiwgc2VsZik7Ci0gICAgaWYgKF9h
cHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKQorICAgIGlmIChwcm9jZXNzSGFzQWN0aXZlUnVuVGlt
ZUxpbWl0YXRpb24oKSkKICAgICAgICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90aWZ5UHJv
Y2Vzc1Bvb2xzQXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCk7CiAKICNpZiBIQVZFKFJVTk5J
TkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElPTlMpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400828</attachid>
            <date>2020-06-02 08:41:16 -0700</date>
            <delta_ts>2020-06-02 08:46:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200602084115.patch</filename>
            <type>text/plain</type>
            <size>10014</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU0NGI3MzMwOTczYzJkMGM1
M2RiN2ZkNjFhODdiMjZhNDA1Y2FlNjQuLmU5OWQ3YTJlNTEwNTE2M2VmNTRlOWViZmY2NGQ1NDMw
YWUwNTVlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciB3
YXMgaW5jb3JyZWN0bHkgaWdub3JpbmcgcHJvY2VzcyBhc3NlcnRpb24gZXhwaXJhdGlvbiBub3Rp
ZmljYXRpb25zCisgICAgICAgIGZvciBkYWVtb25zLCBiZWNhdXNlIGl0IHdhcyByZWx5aW5nIG9u
IHZpc2liaWxpdHkgdG8gbWFrZSBkZWNpc2lvbnMuIEZvciBkYWVtb25zIChvciBWaWV3U2Vydmlj
ZXMpLCB3ZSB3b3VsZAorICAgICAgICBub3QgZ2V0IGFwcGxpY2F0aW9uIHZpc2liaWxpdHkgbm90
aWZpY2F0aW9ucyBhbmQgd291bGQgdGhlcmVmb3JlIGFsd2F5cyBhc3N1bWUgdGhlIGFwcCBpcyB2
aXNpYmxlLgorICAgICAgICBBcyBhIHJlc3VsdCwgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJh
dGlvbiB3b3VsZCB0aGluayBpdCByZWNlaXZlZCBhbiBvdXRkYXRlZCBleHBpcmF0aW9uIG5vdGlm
aWNhdGlvbiBmb3IKKyAgICAgICAgYSB2aXNpYmxlIGFwcCBhbmQgd291bGQgc2ltcGx5IHJlLXRh
a2UgdGhlIGFzc2VydGlvbiByaWdodCBhd2F5LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlz
c3VlLCB3ZSBub3cgcmVseSBvbiBhIFJ1bm5pbmdCb2FyZCBBUEkgdGhhdCBsZXRzIHVzIGtub3cg
aWYgdGhlIHN1c3BlbnNpb24gdGltZXIgaGFzIGJlZW4KKyAgICAgICAgc3RhcnRlZCBvciBub3Qg
KGFuZCBob3cgbXVjaCByZW1haW5zIG9uIHRoZSB0aW1lcikuIElmIHRoZSBzdXNwZW5zaW9uIHRp
bWVyIGlzIG5vdCBhY3RpdmUgd2hlbiBnZXQgcmVjZWl2ZQorICAgICAgICB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24sIHdlIGtub3cgaXQgaXMgYW4gb3V0ZGF0ZWQgbm90aWZpY2F0aW9uIGFu
ZCB3ZSBpZ25vcmUgaXQgKHJlbGVhc2UgYW5kIHJlLXRha2UKKyAgICAgICAgYXNzZXJ0aW9uIHJp
Z2h0IGF3YXkpLiBUaGlzIGNhbiBoYXBwZW4gaWYgd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJv
Y2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24gYmVmb3JlCisgICAgICAgIHN1c3BlbmRl
ZCBhbmQgdGh1cyBvbmx5IGdldCBpdCB1cG9uIHJlc3VtaW5nLiBJdCBjYW4gYWxzbyBoYXBwZW4g
aWYgdGhlIHVzZXIgcmUtYWN0aXZhdGVzIHRoZSBhcHAgcmlnaHQgYWZ0ZXIKKyAgICAgICAgdGhl
IGV4cGlyYXRpb24gbm90aWNlIGhhcyBiZWVuIHNlbnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z
cGkvaW9zL1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRp
bWVMaW1pdGF0aW9uKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyIGluaXRdKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3Vu
ZFRhc2tNYW5hZ2VyIF91cGRhdGVCYWNrZ3JvdW5kVGFza10pOgorICAgICAgICAoLVtXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhw
aXJhdGlvbl0pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZF0pOgorICAg
ICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX3JlbGVhc2VC
YWNrZ3JvdW5kVGFza10pOgorCiAyMDIwLTA2LTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn
YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF0gSW1wbGVtZW50IGRhdGEgbGlzdCBk
cm9wIGRvd24gbWVudQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9z
L1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p
b3MvUnVubmluZ0JvYXJkU2VydmljZXNTUEkuaAppbmRleCBjMjQ5ZDdmMGY2MjczZjc0Mjg4NjQ1
NjI5N2VkZTg1NzA5OTllMmQ3Li44NjdmNmM3MDMzZmNhYjAzMzY5ODIwNzZmNGU0NjUzN2FjZjEx
NTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmluZ0Jv
YXJkU2VydmljZXNTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVu
bmluZ0JvYXJkU2VydmljZXNTUEkuaApAQCAtMjksNiArMjksMTIgQEAKIAogI2ltcG9ydCA8UnVu
bmluZ0JvYXJkU2VydmljZXMvUnVubmluZ0JvYXJkU2VydmljZXMuaD4KIAorZXh0ZXJuIGNvbnN0
IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NUaW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZh
Y2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDogTlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj
LCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1lSW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogI2Vs
c2UKIAogQGludGVyZmFjZSBSQlNBdHRyaWJ1dGUgOiBOU09iamVjdApAQCAtNzYsOSArODIsMTcg
QEAgdHlwZWRlZiBOU19FTlVNKHVpbnQ4X3QsIFJCU1Rhc2tTdGF0ZSkgewogQHByb3BlcnR5IChu
b25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU1NldDxOU1N0cmluZyAqPiAqZW5kb3dtZW50TmFt
ZXNwYWNlczsKIEBlbmQKIAorZXh0ZXJuIGNvbnN0IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NU
aW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZhY2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDog
TlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1l
SW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogQGludGVyZmFjZSBSQlNQcm9jZXNzSGFuZGxlIDog
TlNPYmplY3QKICsgKFJCU1Byb2Nlc3NIYW5kbGUgKiloYW5kbGVGb3JJZGVudGlmaWVyOihSQlNQ
cm9jZXNzSWRlbnRpZmllciAqKWlkZW50aWZpZXIgZXJyb3I6KE5TRXJyb3IgKiopb3V0RXJyb3I7
CisrIChSQlNQcm9jZXNzSGFuZGxlICopY3VycmVudFByb2Nlc3M7CiBAcHJvcGVydHkgKG5vbmF0
b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc1N0YXRlICpjdXJyZW50U3RhdGU7CitA
cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc0xpbWl0YXRp
b25zICphY3RpdmVMaW1pdGF0aW9uczsKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCmluZGV4IDMwNjkxNmNm
OWZkZTEwMjQ5NDhlMGM0M2RkODg1MTZkNjMyYTJiN2QuLjgxMjQ3ZDA4NDE0NTAxZmI2MmYxNDgx
NDllOWYyMTkwY2RjNzBmNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCkBAIC00OCw2ICs0OCwxMSBAQCB1c2luZyBXZWJLaXQ6
OlByb2Nlc3NBbmRVSUFzc2VydGlvbjsKIC8vIG9uIHRoZSBleHBpcmF0aW9uIGhhbmRsZXIgZ2V0
dGluZyBjYWxsZWQpLgogc3RhdGljIGNvbnN0IFNlY29uZHMgcmVsZWFzZUJhY2tncm91bmRUYXNr
QWZ0ZXJFeHBpcmF0aW9uRGVsYXkgeyAyX3MgfTsKIAorc3RhdGljIGJvb2wgcHJvY2Vzc0hhc0Fj
dGl2ZVJ1blRpbWVMaW1pdGF0aW9uKCkKK3sKKyAgICByZXR1cm4gW1tbUkJTUHJvY2Vzc0hhbmRs
ZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1blRpbWVdICE9IFJCU1Byb2Nl
c3NUaW1lTGltaXRhdGlvbk5vbmU7Cit9CisKIEBpbnRlcmZhY2UgV0tQcm9jZXNzQXNzZXJ0aW9u
QmFja2dyb3VuZFRhc2tNYW5hZ2VyCiAjaWYgSEFWRShSVU5OSU5HQk9BUkRfVklTSUJJTElUWV9B
U1NFUlRJT05TKQogICAgIDogTlNPYmplY3QgPFJCU0Fzc2VydGlvbk9ic2VydmluZz4KQEAgLTcx
LDcgKzc2LDYgQEAgQGltcGxlbWVudGF0aW9uIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRU
YXNrTWFuYWdlcgogI2VuZGlmCiAKICAgICBXZWFrSGFzaFNldDxQcm9jZXNzQW5kVUlBc3NlcnRp
b24+IF9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91bmRUYXNrOwotICAgIEJPT0wgX2FwcGxpY2F0
aW9uSXNCYWNrZ3JvdW5kZWQ7CiAgICAgZGlzcGF0Y2hfYmxvY2tfdCBfcGVuZGluZ1Rhc2tSZWxl
YXNlVGFzazsKIH0KIApAQCAtOTEsMTUgKzk1LDE0IEBAIC0gKGluc3RhbmNldHlwZSlpbml0CiAg
ICAgX2JhY2tncm91bmRUYXNrID0gVUlCYWNrZ3JvdW5kVGFza0ludmFsaWQ7CiAjZW5kaWYKIAor
ICAgIC8vIEZJWE1FOiBTdG9wIHJlbHlpbmcgb24gVUlBcHBsaWNhdGlvbiBub3RpZmljYXRpb25z
IGFzIHRoaXMgZG9lcyBub3Qgd29yayBhcyBleHBlY3RlZCBmb3IgZGFlbW9ucyBvciBWaWV3U2Vy
dmljZXMuCisgICAgLy8gV2Ugc2hvdWxkIGxpa2VseSB1c2UgUHJvY2Vzc1Rhc2tTdGF0ZU9ic2Vy
dmVyIHRvIG1vbml0b3Igc3VzcGVuc2lvbiBzdGF0ZS4KICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu
dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uV2lsbEVu
dGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6W1VJQXBwbGljYXRpb24gc2hhcmVkQXBw
bGljYXRpb25dIHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24gKikgewotICAg
ICAgICBfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCA9IE5POwogICAgICAgICBbc2VsZiBfY2Fu
Y2VsUGVuZGluZ1JlbGVhc2VUYXNrXTsKICAgICAgICAgW3NlbGYgX3VwZGF0ZUJhY2tncm91bmRU
YXNrXTsKICAgICB9XTsKIAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRl
cl0gYWRkT2JzZXJ2ZXJGb3JOYW1lOlVJQXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmROb3Rp
ZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBxdWV1ZTpu
aWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAgICAgICAgX2FwcGxpY2F0aW9u
SXNCYWNrZ3JvdW5kZWQgPSBZRVM7Ci0gICAgICAgIAogICAgICAgICBpZiAoIVtzZWxmIF9oYXNC
YWNrZ3JvdW5kVGFza10pCiAgICAgICAgICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpub3Rp
ZnlQcm9jZXNzUG9vbHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsKICAgICB9XTsKQEAg
LTE4Miw4ICsxODUsOCBAQCAtIChCT09MKV9oYXNCYWNrZ3JvdW5kVGFzawogLSAodm9pZClfdXBk
YXRlQmFja2dyb3VuZFRhc2sKIHsKICAgICBpZiAoIV9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91
bmRUYXNrLmNvbXB1dGVzRW1wdHkoKSAmJiAhW3NlbGYgX2hhc0JhY2tncm91bmRUYXNrXSkgewot
ICAgICAgICBpZiAoX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsKLSAgICAgICAgICAgIFJF
TEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IElnbm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBi
YWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSB0aGUgYXBwbGljYXRpb24gaXMgYWxyZWFkeSBpbiB0aGUg
YmFja2dyb3VuZCIsIHNlbGYpOworICAgICAgICBpZiAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRpbWVM
aW1pdGF0aW9uKCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNw
ZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IEln
bm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBiYWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSBSdW5u
aW5nQm9hcmQgaGFzIGFscmVhZHkgc3RhcnRlZCB0aGUgZXhwaXJhdGlvbiB0aW1lciIsIHNlbGYp
OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIFJFTEVBU0VfTE9HKFBy
b2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXI6IGJlZ2luQmFja2dyb3VuZFRhc2tXaXRoTmFtZSIsIHNlbGYpOwpAQCAtMjIzLDcgKzIy
Niw5IEBAIC0gKHZvaWQpYXNzZXJ0aW9uOihSQlNBc3NlcnRpb24gKilhc3NlcnRpb24gZGlkSW52
YWxpZGF0ZVdpdGhFcnJvcjooTlNFcnJvciAqKWVyCiAKIC0gKHZvaWQpX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbgogewotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAi
V0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sg
ZXhwaXJlZCB3aGlsZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJl
YWQ/ICVkKS4iLCBSdW5Mb29wOjppc01haW4oKSk7CisgICAgYXV0byByZW1haW5pbmdUaW1lID0g
W1tbUkJTUHJvY2Vzc0hhbmRsZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1
blRpbWVdOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV0tQcm9jZXNzQXNz
ZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sgZXhwaXJlZCB3aGls
ZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJlYWQ6ICVkLCByZW1h
aW5pbmdUaW1lOiAlZykuIiwgUnVuTG9vcDo6aXNNYWluKCksIHJlbWFpbmluZ1RpbWUpOworCiAg
ICAgY2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFtzZWxmXSB7CiAgICAgICAgIFtzZWxmIF9oYW5k
bGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWRdOwogICAgIH0pOwpAQCAtMjMz
LDEyICsyMzgsMTMgQEAgLSAodm9pZClfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25N
YWluVGhyZWFkCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIC8vIEZJ
WE1FOiBXaGlsZSByZWx5aW5nIG9uIF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkIGlzIGFjY2Vw
dGFibGUgZm9yIGFwcGxpY2F0aW9ucywgdGhpcyBpcyBpbmFjdXJhdGUgaW4gdGhlIGNhc2UKLSAg
ICAvLyBvZiBkYWVtb25zLgotICAgIGlmICghX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsK
LSAgICAgICAgLy8gV2UndmUgcmVjZWl2ZWQgdGhlIGludmFsaWRhdGlvbiB3YXJuaW5nIGFmdGVy
IHRoZSBhcHAgaGFzIGJlY29tZSBmb3JlZ3JvdW5kIGFnYWluLiBJbiB0aGlzIGNhc2UsIHdlIHNo
b3VsZCBub3QKLSAgICAgICAgLy8gd2FybiBjbGllbnRzIG9mIGltbWluZW50IHN1c3BlbnNpb24u
IFRvIGJlIHNhZmUgKGF2b2lkIHBvdGVudGlhbCBraWxsaW5nKSwgd2UgZW5kIHRoZSB0YXNrIHJp
Z2h0IGF3YXkgYW5kIGNhbGwKLSAgICAgICAgLy8gX3VwZGF0ZUJhY2tncm91bmRUYXNrIGFzeW5j
aHJvbm91c2x5IHRvIHN0YXJ0IGEgbmV3IHRhc2sgaWYgbmVjZXNzYXJ5LgorICAgIGF1dG8gcmVt
YWluaW5nVGltZSA9IFtbW1JCU1Byb2Nlc3NIYW5kbGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxp
bWl0YXRpb25zXSBydW5UaW1lXTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZCAocmVtYWluaW5nVGltZTogJWcpLiIsIHJlbWFp
bmluZ1RpbWUpOworCisgICAgLy8gSWYgdGhlcmUgaXMgbm8gdGltZSBsaW1pdGF0aW9uLCB0aGVu
IGl0IG1lYW5zIHRoYXQgdGhlIHByb2Nlc3MgaXMgbm93IGFsbG93ZWQgdG8gcnVuIGFnYWluIGFu
ZCB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24KKyAgICAvLyBpcyBvdXRkYXRlZCAoZS5nLiB3
ZSBkaWQgbm90IGhhdmUgdGltZSB0byBwcm9jZXNzIHRoZSBleHBpcmF0aW9uIG5vdGlmaWNhdGlv
biBiZWZvcmUgc3VzcGVuZGluZyBhbmQgdGh1cyBvbmx5IHByb2Nlc3MgaXQKKyAgICAvLyB1cG9u
IHJlc3VtaW5nLCBvciB0aGUgdXNlciByZWFjdGl2YXRlZCB0aGUgYXBwIHNob3J0bHkgYWZ0ZXIg
ZXhwaXJhdGlvbikuCisgICAgaWYgKHJlbWFpbmluZ1RpbWUgPT0gUkJTUHJvY2Vzc1RpbWVMaW1p
dGF0aW9uTm9uZSkgewogICAgICAgICBbc2VsZiBfcmVsZWFzZUJhY2tncm91bmRUYXNrXTsKICAg
ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAg
ICAgICAgIFtzZWxmIF91cGRhdGVCYWNrZ3JvdW5kVGFza107CkBAIC0yNTYsNyArMjYyLDcgQEAg
LSAodm9pZClfcmVsZWFzZUJhY2tncm91bmRUYXNrCiAgICAgICAgIHJldHVybjsKIAogICAgIFJF
TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNr
Z3JvdW5kVGFza01hbmFnZXI6IGVuZEJhY2tncm91bmRUYXNrIiwgc2VsZik7Ci0gICAgaWYgKF9h
cHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKQorICAgIGlmIChwcm9jZXNzSGFzQWN0aXZlUnVuVGlt
ZUxpbWl0YXRpb24oKSkKICAgICAgICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90aWZ5UHJv
Y2Vzc1Bvb2xzQXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCk7CiAKICNpZiBIQVZFKFJVTk5J
TkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElPTlMpCmRpZmYgLS1naXQgYS9XZWJLaXRMaWJyYXJp
ZXMvV2ViS2l0UHJpdmF0ZUZyYW1ld29ya1N0dWJzL2lPUy8xMy9SdW5uaW5nQm9hcmRTZXJ2aWNl
cy5mcmFtZXdvcmsvUnVubmluZ0JvYXJkU2VydmljZXMudGJkIGIvV2ViS2l0TGlicmFyaWVzL1dl
YktpdFByaXZhdGVGcmFtZXdvcmtTdHVicy9pT1MvMTMvUnVubmluZ0JvYXJkU2VydmljZXMuZnJh
bWV3b3JrL1J1bm5pbmdCb2FyZFNlcnZpY2VzLnRiZAppbmRleCA5YzU2ZWI5YmM4YjZhOWJkZDNk
ODNhOTIyMWExMGExN2M4MGNjZDhlLi42YTA4NjI3NTg0MDY3ZGFhN2IwODc0MGY0NzgwM2MyYWUy
YjIzOGQyIDEwMDY0NAotLS0gYS9XZWJLaXRMaWJyYXJpZXMvV2ViS2l0UHJpdmF0ZUZyYW1ld29y
a1N0dWJzL2lPUy8xMy9SdW5uaW5nQm9hcmRTZXJ2aWNlcy5mcmFtZXdvcmsvUnVubmluZ0JvYXJk
U2VydmljZXMudGJkCisrKyBiL1dlYktpdExpYnJhcmllcy9XZWJLaXRQcml2YXRlRnJhbWV3b3Jr
U3R1YnMvaU9TLzEzL1J1bm5pbmdCb2FyZFNlcnZpY2VzLmZyYW1ld29yay9SdW5uaW5nQm9hcmRT
ZXJ2aWNlcy50YmQKQEAgLTUsNSArNSw2IEBAIG9iamMtY29uc3RyYWludDogbm9uZQogcGxhdGZv
cm06IGlvcwogZXhwb3J0czoKICAgLSBhcmNoczogICAgICAgICAgIFsgeDg2XzY0LCBhcm02NCwg
YXJtNjRlIF0KKyAgICBzeW1ib2xzOiAgICAgICAgIFsgUkJTUHJvY2Vzc1RpbWVMaW1pdGF0aW9u
Tm9uZSBdCiAgICAgb2JqYy1jbGFzc2VzOiAgICBbIFJCU0F0dHJpYnV0ZSwgUkJTRG9tYWluQXR0
cmlidXRlLCBSQlNUYXJnZXQsIFJCU0Fzc2VydGlvbiwgUkJTUHJvY2Vzc0lkZW50aWZpZXIsIFJC
U1Byb2Nlc3NTdGF0ZSwgUkJTUHJvY2Vzc0hhbmRsZSBdCiAuLi4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400830</attachid>
            <date>2020-06-02 08:46:05 -0700</date>
            <delta_ts>2020-06-02 18:50:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200602084604.patch</filename>
            <type>text/plain</type>
            <size>10015</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU0NGI3MzMwOTczYzJkMGM1
M2RiN2ZkNjFhODdiMjZhNDA1Y2FlNjQuLmU5OWQ3YTJlNTEwNTE2M2VmNTRlOWViZmY2NGQ1NDMw
YWUwNTVlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciB3
YXMgaW5jb3JyZWN0bHkgaWdub3JpbmcgcHJvY2VzcyBhc3NlcnRpb24gZXhwaXJhdGlvbiBub3Rp
ZmljYXRpb25zCisgICAgICAgIGZvciBkYWVtb25zLCBiZWNhdXNlIGl0IHdhcyByZWx5aW5nIG9u
IHZpc2liaWxpdHkgdG8gbWFrZSBkZWNpc2lvbnMuIEZvciBkYWVtb25zIChvciBWaWV3U2Vydmlj
ZXMpLCB3ZSB3b3VsZAorICAgICAgICBub3QgZ2V0IGFwcGxpY2F0aW9uIHZpc2liaWxpdHkgbm90
aWZpY2F0aW9ucyBhbmQgd291bGQgdGhlcmVmb3JlIGFsd2F5cyBhc3N1bWUgdGhlIGFwcCBpcyB2
aXNpYmxlLgorICAgICAgICBBcyBhIHJlc3VsdCwgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJh
dGlvbiB3b3VsZCB0aGluayBpdCByZWNlaXZlZCBhbiBvdXRkYXRlZCBleHBpcmF0aW9uIG5vdGlm
aWNhdGlvbiBmb3IKKyAgICAgICAgYSB2aXNpYmxlIGFwcCBhbmQgd291bGQgc2ltcGx5IHJlLXRh
a2UgdGhlIGFzc2VydGlvbiByaWdodCBhd2F5LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlz
c3VlLCB3ZSBub3cgcmVseSBvbiBhIFJ1bm5pbmdCb2FyZCBBUEkgdGhhdCBsZXRzIHVzIGtub3cg
aWYgdGhlIHN1c3BlbnNpb24gdGltZXIgaGFzIGJlZW4KKyAgICAgICAgc3RhcnRlZCBvciBub3Qg
KGFuZCBob3cgbXVjaCByZW1haW5zIG9uIHRoZSB0aW1lcikuIElmIHRoZSBzdXNwZW5zaW9uIHRp
bWVyIGlzIG5vdCBhY3RpdmUgd2hlbiBnZXQgcmVjZWl2ZQorICAgICAgICB0aGUgZXhwaXJhdGlv
biBub3RpZmljYXRpb24sIHdlIGtub3cgaXQgaXMgYW4gb3V0ZGF0ZWQgbm90aWZpY2F0aW9uIGFu
ZCB3ZSBpZ25vcmUgaXQgKHJlbGVhc2UgYW5kIHJlLXRha2UKKyAgICAgICAgYXNzZXJ0aW9uIHJp
Z2h0IGF3YXkpLiBUaGlzIGNhbiBoYXBwZW4gaWYgd2UgZGlkIG5vdCBoYXZlIHRpbWUgdG8gcHJv
Y2VzcyB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24gYmVmb3JlCisgICAgICAgIHN1c3BlbmRl
ZCBhbmQgdGh1cyBvbmx5IGdldCBpdCB1cG9uIHJlc3VtaW5nLiBJdCBjYW4gYWxzbyBoYXBwZW4g
aWYgdGhlIHVzZXIgcmUtYWN0aXZhdGVzIHRoZSBhcHAgcmlnaHQgYWZ0ZXIKKyAgICAgICAgdGhl
IGV4cGlyYXRpb24gbm90aWNlIGhhcyBiZWVuIHNlbnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z
cGkvaW9zL1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRp
bWVMaW1pdGF0aW9uKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRh
c2tNYW5hZ2VyIGluaXRdKToKKyAgICAgICAgKC1bV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3Vu
ZFRhc2tNYW5hZ2VyIF91cGRhdGVCYWNrZ3JvdW5kVGFza10pOgorICAgICAgICAoLVtXS1Byb2Nl
c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhw
aXJhdGlvbl0pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXIgX2hhbmRsZUJhY2tncm91bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZF0pOgorICAg
ICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgX3JlbGVhc2VC
YWNrZ3JvdW5kVGFza10pOgorCiAyMDIwLTA2LTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn
YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF0gSW1wbGVtZW50IGRhdGEgbGlzdCBk
cm9wIGRvd24gbWVudQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9z
L1J1bm5pbmdCb2FyZFNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p
b3MvUnVubmluZ0JvYXJkU2VydmljZXNTUEkuaAppbmRleCBjMjQ5ZDdmMGY2MjczZjc0Mjg4NjQ1
NjI5N2VkZTg1NzA5OTllMmQ3Li44NjdmNmM3MDMzZmNhYjAzMzY5ODIwNzZmNGU0NjUzN2FjZjEx
NTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVubmluZ0Jv
YXJkU2VydmljZXNTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUnVu
bmluZ0JvYXJkU2VydmljZXNTUEkuaApAQCAtMjksNiArMjksMTIgQEAKIAogI2ltcG9ydCA8UnVu
bmluZ0JvYXJkU2VydmljZXMvUnVubmluZ0JvYXJkU2VydmljZXMuaD4KIAorZXh0ZXJuIGNvbnN0
IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NUaW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZh
Y2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDogTlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj
LCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1lSW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogI2Vs
c2UKIAogQGludGVyZmFjZSBSQlNBdHRyaWJ1dGUgOiBOU09iamVjdApAQCAtNzYsOSArODIsMTcg
QEAgdHlwZWRlZiBOU19FTlVNKHVpbnQ4X3QsIFJCU1Rhc2tTdGF0ZSkgewogQHByb3BlcnR5IChu
b25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU1NldDxOU1N0cmluZyAqPiAqZW5kb3dtZW50TmFt
ZXNwYWNlczsKIEBlbmQKIAorZXh0ZXJuIGNvbnN0IE5TVGltZUludGVydmFsIFJCU1Byb2Nlc3NU
aW1lTGltaXRhdGlvbk5vbmU7CisKK0BpbnRlcmZhY2UgUkJTUHJvY2Vzc0xpbWl0YXRpb25zIDog
TlNPYmplY3QKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkd3JpdGUsIGFzc2lnbikgTlNUaW1l
SW50ZXJ2YWwgcnVuVGltZTsKK0BlbmQKKwogQGludGVyZmFjZSBSQlNQcm9jZXNzSGFuZGxlIDog
TlNPYmplY3QKICsgKFJCU1Byb2Nlc3NIYW5kbGUgKiloYW5kbGVGb3JJZGVudGlmaWVyOihSQlNQ
cm9jZXNzSWRlbnRpZmllciAqKWlkZW50aWZpZXIgZXJyb3I6KE5TRXJyb3IgKiopb3V0RXJyb3I7
CisrIChSQlNQcm9jZXNzSGFuZGxlICopY3VycmVudFByb2Nlc3M7CiBAcHJvcGVydHkgKG5vbmF0
b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc1N0YXRlICpjdXJyZW50U3RhdGU7CitA
cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIHN0cm9uZykgUkJTUHJvY2Vzc0xpbWl0YXRp
b25zICphY3RpdmVMaW1pdGF0aW9uczsKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCmluZGV4IDMwNjkxNmNm
OWZkZTEwMjQ5NDhlMGM0M2RkODg1MTZkNjMyYTJiN2QuLjgxMjQ3ZDA4NDE0NTAxZmI2MmYxNDgx
NDllOWYyMTkwY2RjNzBmNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCkBAIC00OCw2ICs0OCwxMSBAQCB1c2luZyBXZWJLaXQ6
OlByb2Nlc3NBbmRVSUFzc2VydGlvbjsKIC8vIG9uIHRoZSBleHBpcmF0aW9uIGhhbmRsZXIgZ2V0
dGluZyBjYWxsZWQpLgogc3RhdGljIGNvbnN0IFNlY29uZHMgcmVsZWFzZUJhY2tncm91bmRUYXNr
QWZ0ZXJFeHBpcmF0aW9uRGVsYXkgeyAyX3MgfTsKIAorc3RhdGljIGJvb2wgcHJvY2Vzc0hhc0Fj
dGl2ZVJ1blRpbWVMaW1pdGF0aW9uKCkKK3sKKyAgICByZXR1cm4gW1tbUkJTUHJvY2Vzc0hhbmRs
ZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1blRpbWVdICE9IFJCU1Byb2Nl
c3NUaW1lTGltaXRhdGlvbk5vbmU7Cit9CisKIEBpbnRlcmZhY2UgV0tQcm9jZXNzQXNzZXJ0aW9u
QmFja2dyb3VuZFRhc2tNYW5hZ2VyCiAjaWYgSEFWRShSVU5OSU5HQk9BUkRfVklTSUJJTElUWV9B
U1NFUlRJT05TKQogICAgIDogTlNPYmplY3QgPFJCU0Fzc2VydGlvbk9ic2VydmluZz4KQEAgLTcx
LDcgKzc2LDYgQEAgQGltcGxlbWVudGF0aW9uIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRU
YXNrTWFuYWdlcgogI2VuZGlmCiAKICAgICBXZWFrSGFzaFNldDxQcm9jZXNzQW5kVUlBc3NlcnRp
b24+IF9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91bmRUYXNrOwotICAgIEJPT0wgX2FwcGxpY2F0
aW9uSXNCYWNrZ3JvdW5kZWQ7CiAgICAgZGlzcGF0Y2hfYmxvY2tfdCBfcGVuZGluZ1Rhc2tSZWxl
YXNlVGFzazsKIH0KIApAQCAtOTEsMTUgKzk1LDE0IEBAIC0gKGluc3RhbmNldHlwZSlpbml0CiAg
ICAgX2JhY2tncm91bmRUYXNrID0gVUlCYWNrZ3JvdW5kVGFza0ludmFsaWQ7CiAjZW5kaWYKIAor
ICAgIC8vIEZJWE1FOiBTdG9wIHJlbHlpbmcgb24gVUlBcHBsaWNhdGlvbiBub3RpZmljYXRpb25z
IGFzIHRoaXMgZG9lcyBub3Qgd29yayBhcyBleHBlY3RlZCBmb3IgZGFlbW9ucyBvciBWaWV3U2Vy
dmljZXMuCisgICAgLy8gV2Ugc2hvdWxkIGxpa2VseSB1c2UgUHJvY2Vzc1Rhc2tTdGF0ZU9ic2Vy
dmVyIHRvIG1vbml0b3Igc3VzcGVuc2lvbiBzdGF0ZS4KICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu
dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uV2lsbEVu
dGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiBvYmplY3Q6W1VJQXBwbGljYXRpb24gc2hhcmVkQXBw
bGljYXRpb25dIHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24gKikgewotICAg
ICAgICBfYXBwbGljYXRpb25Jc0JhY2tncm91bmRlZCA9IE5POwogICAgICAgICBbc2VsZiBfY2Fu
Y2VsUGVuZGluZ1JlbGVhc2VUYXNrXTsKICAgICAgICAgW3NlbGYgX3VwZGF0ZUJhY2tncm91bmRU
YXNrXTsKICAgICB9XTsKIAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRl
cl0gYWRkT2JzZXJ2ZXJGb3JOYW1lOlVJQXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmROb3Rp
ZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXSBxdWV1ZTpu
aWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAgICAgICAgX2FwcGxpY2F0aW9u
SXNCYWNrZ3JvdW5kZWQgPSBZRVM7Ci0gICAgICAgIAogICAgICAgICBpZiAoIVtzZWxmIF9oYXNC
YWNrZ3JvdW5kVGFza10pCiAgICAgICAgICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpub3Rp
ZnlQcm9jZXNzUG9vbHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsKICAgICB9XTsKQEAg
LTE4Miw4ICsxODUsOCBAQCAtIChCT09MKV9oYXNCYWNrZ3JvdW5kVGFzawogLSAodm9pZClfdXBk
YXRlQmFja2dyb3VuZFRhc2sKIHsKICAgICBpZiAoIV9hc3NlcnRpb25zTmVlZGluZ0JhY2tncm91
bmRUYXNrLmNvbXB1dGVzRW1wdHkoKSAmJiAhW3NlbGYgX2hhc0JhY2tncm91bmRUYXNrXSkgewot
ICAgICAgICBpZiAoX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsKLSAgICAgICAgICAgIFJF
TEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IElnbm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBi
YWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSB0aGUgYXBwbGljYXRpb24gaXMgYWxyZWFkeSBpbiB0aGUg
YmFja2dyb3VuZCIsIHNlbGYpOworICAgICAgICBpZiAocHJvY2Vzc0hhc0FjdGl2ZVJ1blRpbWVM
aW1pdGF0aW9uKCkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNw
ZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXI6IEln
bm9yZWQgcmVxdWVzdCB0byBzdGFydCBhIG5ldyBiYWNrZ3JvdW5kIHRhc2sgYmVjYXVzZSBSdW5u
aW5nQm9hcmQgaGFzIGFscmVhZHkgc3RhcnRlZCB0aGUgZXhwaXJhdGlvbiB0aW1lciIsIHNlbGYp
OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIFJFTEVBU0VfTE9HKFBy
b2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01h
bmFnZXI6IGJlZ2luQmFja2dyb3VuZFRhc2tXaXRoTmFtZSIsIHNlbGYpOwpAQCAtMjIzLDcgKzIy
Niw5IEBAIC0gKHZvaWQpYXNzZXJ0aW9uOihSQlNBc3NlcnRpb24gKilhc3NlcnRpb24gZGlkSW52
YWxpZGF0ZVdpdGhFcnJvcjooTlNFcnJvciAqKWVyCiAKIC0gKHZvaWQpX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbgogewotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAi
V0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sg
ZXhwaXJlZCB3aGlsZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJl
YWQ/ICVkKS4iLCBSdW5Mb29wOjppc01haW4oKSk7CisgICAgYXV0byByZW1haW5pbmdUaW1lID0g
W1tbUkJTUHJvY2Vzc0hhbmRsZSBjdXJyZW50UHJvY2Vzc10gYWN0aXZlTGltaXRhdGlvbnNdIHJ1
blRpbWVdOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV0tQcm9jZXNzQXNz
ZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sgZXhwaXJlZCB3aGls
ZSBob2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJlYWQ6ICVkLCByZW1h
aW5pbmdUaW1lOiAlZykuIiwgUnVuTG9vcDo6aXNNYWluKCksIHJlbWFpbmluZ1RpbWUpOworCiAg
ICAgY2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFtzZWxmXSB7CiAgICAgICAgIFtzZWxmIF9oYW5k
bGVCYWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWRdOwogICAgIH0pOwpAQCAtMjMz
LDEyICsyMzgsMTMgQEAgLSAodm9pZClfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25N
YWluVGhyZWFkCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIC8vIEZJ
WE1FOiBXaGlsZSByZWx5aW5nIG9uIF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkIGlzIGFjY2Vw
dGFibGUgZm9yIGFwcGxpY2F0aW9ucywgdGhpcyBpcyBpbmFjdXJhdGUgaW4gdGhlIGNhc2UKLSAg
ICAvLyBvZiBkYWVtb25zLgotICAgIGlmICghX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsK
LSAgICAgICAgLy8gV2UndmUgcmVjZWl2ZWQgdGhlIGludmFsaWRhdGlvbiB3YXJuaW5nIGFmdGVy
IHRoZSBhcHAgaGFzIGJlY29tZSBmb3JlZ3JvdW5kIGFnYWluLiBJbiB0aGlzIGNhc2UsIHdlIHNo
b3VsZCBub3QKLSAgICAgICAgLy8gd2FybiBjbGllbnRzIG9mIGltbWluZW50IHN1c3BlbnNpb24u
IFRvIGJlIHNhZmUgKGF2b2lkIHBvdGVudGlhbCBraWxsaW5nKSwgd2UgZW5kIHRoZSB0YXNrIHJp
Z2h0IGF3YXkgYW5kIGNhbGwKLSAgICAgICAgLy8gX3VwZGF0ZUJhY2tncm91bmRUYXNrIGFzeW5j
aHJvbm91c2x5IHRvIHN0YXJ0IGEgbmV3IHRhc2sgaWYgbmVjZXNzYXJ5LgorICAgIGF1dG8gcmVt
YWluaW5nVGltZSA9IFtbW1JCU1Byb2Nlc3NIYW5kbGUgY3VycmVudFByb2Nlc3NdIGFjdGl2ZUxp
bWl0YXRpb25zXSBydW5UaW1lXTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogX2hhbmRsZUJhY2tncm91
bmRUYXNrRXhwaXJhdGlvbk9uTWFpblRocmVhZCAocmVtYWluaW5nVGltZTogJWcpLiIsIHJlbWFp
bmluZ1RpbWUpOworCisgICAgLy8gSWYgdGhlcmUgaXMgbm8gdGltZSBsaW1pdGF0aW9uLCB0aGVu
IGl0IG1lYW5zIHRoYXQgdGhlIHByb2Nlc3MgaXMgbm93IGFsbG93ZWQgdG8gcnVuIGFnYWluIGFu
ZCB0aGUgZXhwaXJhdGlvbiBub3RpZmljYXRpb24KKyAgICAvLyBpcyBvdXRkYXRlZCAoZS5nLiB3
ZSBkaWQgbm90IGhhdmUgdGltZSB0byBwcm9jZXNzIHRoZSBleHBpcmF0aW9uIG5vdGlmaWNhdGlv
biBiZWZvcmUgc3VzcGVuZGluZyBhbmQgdGh1cyBvbmx5IHByb2Nlc3MgaXQKKyAgICAvLyB1cG9u
IHJlc3VtaW5nLCBvciB0aGUgdXNlciByZWFjdGl2YXRlZCB0aGUgYXBwIHNob3J0bHkgYWZ0ZXIg
ZXhwaXJhdGlvbikuCisgICAgaWYgKHJlbWFpbmluZ1RpbWUgPT0gUkJTUHJvY2Vzc1RpbWVMaW1p
dGF0aW9uTm9uZSkgewogICAgICAgICBbc2VsZiBfcmVsZWFzZUJhY2tncm91bmRUYXNrXTsKICAg
ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAg
ICAgICAgIFtzZWxmIF91cGRhdGVCYWNrZ3JvdW5kVGFza107CkBAIC0yNTYsNyArMjYyLDcgQEAg
LSAodm9pZClfcmVsZWFzZUJhY2tncm91bmRUYXNrCiAgICAgICAgIHJldHVybjsKIAogICAgIFJF
TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXS1Byb2Nlc3NBc3NlcnRpb25CYWNr
Z3JvdW5kVGFza01hbmFnZXI6IGVuZEJhY2tncm91bmRUYXNrIiwgc2VsZik7Ci0gICAgaWYgKF9h
cHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKQorICAgIGlmIChwcm9jZXNzSGFzQWN0aXZlUnVuVGlt
ZUxpbWl0YXRpb24oKSkKICAgICAgICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90aWZ5UHJv
Y2Vzc1Bvb2xzQXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCk7CiAKICNpZiBIQVZFKFJVTk5J
TkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElPTlMpCmRpZmYgLS1naXQgYS9XZWJLaXRMaWJyYXJp
ZXMvV2ViS2l0UHJpdmF0ZUZyYW1ld29ya1N0dWJzL2lPUy8xMy9SdW5uaW5nQm9hcmRTZXJ2aWNl
cy5mcmFtZXdvcmsvUnVubmluZ0JvYXJkU2VydmljZXMudGJkIGIvV2ViS2l0TGlicmFyaWVzL1dl
YktpdFByaXZhdGVGcmFtZXdvcmtTdHVicy9pT1MvMTMvUnVubmluZ0JvYXJkU2VydmljZXMuZnJh
bWV3b3JrL1J1bm5pbmdCb2FyZFNlcnZpY2VzLnRiZAppbmRleCA5YzU2ZWI5YmM4YjZhOWJkZDNk
ODNhOTIyMWExMGExN2M4MGNjZDhlLi5kYmIzZTQxOTlhNWQwZjlhZDAwNDA2Zjc0NjlkYzFlYzM4
N2NkMTdiIDEwMDY0NAotLS0gYS9XZWJLaXRMaWJyYXJpZXMvV2ViS2l0UHJpdmF0ZUZyYW1ld29y
a1N0dWJzL2lPUy8xMy9SdW5uaW5nQm9hcmRTZXJ2aWNlcy5mcmFtZXdvcmsvUnVubmluZ0JvYXJk
U2VydmljZXMudGJkCisrKyBiL1dlYktpdExpYnJhcmllcy9XZWJLaXRQcml2YXRlRnJhbWV3b3Jr
U3R1YnMvaU9TLzEzL1J1bm5pbmdCb2FyZFNlcnZpY2VzLmZyYW1ld29yay9SdW5uaW5nQm9hcmRT
ZXJ2aWNlcy50YmQKQEAgLTUsNSArNSw2IEBAIG9iamMtY29uc3RyYWludDogbm9uZQogcGxhdGZv
cm06IGlvcwogZXhwb3J0czoKICAgLSBhcmNoczogICAgICAgICAgIFsgeDg2XzY0LCBhcm02NCwg
YXJtNjRlIF0KKyAgICBzeW1ib2xzOiAgICAgICAgIFsgX1JCU1Byb2Nlc3NUaW1lTGltaXRhdGlv
bk5vbmUgXQogICAgIG9iamMtY2xhc3NlczogICAgWyBSQlNBdHRyaWJ1dGUsIFJCU0RvbWFpbkF0
dHJpYnV0ZSwgUkJTVGFyZ2V0LCBSQlNBc3NlcnRpb24sIFJCU1Byb2Nlc3NJZGVudGlmaWVyLCBS
QlNQcm9jZXNzU3RhdGUsIFJCU1Byb2Nlc3NIYW5kbGUgXQogLi4uCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400875</attachid>
            <date>2020-06-02 18:50:03 -0700</date>
            <delta_ts>2020-06-02 22:29:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212619-20200602185002.patch</filename>
            <type>text/plain</type>
            <size>10008</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzOTFjNzIyNTE0ZDEwZDQ5
ODdlYTcwOTRhODBiODA1MThiODhlYTUuLmNmYmI3ZmQ0OTVjMDYwNmU3YjAxNDk5NDhhMjhiMTg4
NzEyMjI1MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDYtMDIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBXS1Byb2Nlc3NBc3NlcnRp
b25CYWNrZ3JvdW5kVGFza01hbmFnZXIgaW5jb3JyZWN0bHkgaWdub3JlcyBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMgZm9yIGRhZW1vbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMjYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0
ZW5zZW4uCisKKyAgICAgICAgV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2Vy
IHdhcyBpbmNvcnJlY3RseSBpZ25vcmluZyBwcm9jZXNzIGFzc2VydGlvbiBleHBpcmF0aW9uIG5v
dGlmaWNhdGlvbnMKKyAgICAgICAgZm9yIGRhZW1vbnMsIGJlY2F1c2UgaXQgd2FzIHJlbHlpbmcg
b24gdmlzaWJpbGl0eSB0byBtYWtlIGRlY2lzaW9ucy4gRm9yIGRhZW1vbnMgKG9yIFZpZXdTZXJ2
aWNlcyksIHdlIHdvdWxkCisgICAgICAgIG5vdCBnZXQgYXBwbGljYXRpb24gdmlzaWJpbGl0eSBu
b3RpZmljYXRpb25zIGFuZCB3b3VsZCB0aGVyZWZvcmUgYWx3YXlzIGFzc3VtZSB0aGUgYXBwIGlz
IHZpc2libGUuCisgICAgICAgIEFzIGEgcmVzdWx0LCBfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBp
cmF0aW9uIHdvdWxkIHRoaW5rIGl0IHJlY2VpdmVkIGFuIG91dGRhdGVkIGV4cGlyYXRpb24gbm90
aWZpY2F0aW9uIGZvcgorICAgICAgICBhIHZpc2libGUgYXBwIGFuZCB3b3VsZCBzaW1wbHkgcmUt
dGFrZSB0aGUgYXNzZXJ0aW9uIHJpZ2h0IGF3YXkuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUg
aXNzdWUsIHdlIG5vdyByZWx5IG9uIGEgUnVubmluZ0JvYXJkIEFQSSB0aGF0IGxldHMgdXMga25v
dyBpZiB0aGUgc3VzcGVuc2lvbiB0aW1lciBoYXMgYmVlbgorICAgICAgICBzdGFydGVkIG9yIG5v
dCAoYW5kIGhvdyBtdWNoIHJlbWFpbnMgb24gdGhlIHRpbWVyKS4gSWYgdGhlIHN1c3BlbnNpb24g
dGltZXIgaXMgbm90IGFjdGl2ZSB3aGVuIGdldCByZWNlaXZlCisgICAgICAgIHRoZSBleHBpcmF0
aW9uIG5vdGlmaWNhdGlvbiwgd2Uga25vdyBpdCBpcyBhbiBvdXRkYXRlZCBub3RpZmljYXRpb24g
YW5kIHdlIGlnbm9yZSBpdCAocmVsZWFzZSBhbmQgcmUtdGFrZQorICAgICAgICBhc3NlcnRpb24g
cmlnaHQgYXdheSkuIFRoaXMgY2FuIGhhcHBlbiBpZiB3ZSBkaWQgbm90IGhhdmUgdGltZSB0byBw
cm9jZXNzIHRoZSBleHBpcmF0aW9uIG5vdGlmaWNhdGlvbiBiZWZvcmUKKyAgICAgICAgc3VzcGVu
ZGVkIGFuZCB0aHVzIG9ubHkgZ2V0IGl0IHVwb24gcmVzdW1pbmcuIEl0IGNhbiBhbHNvIGhhcHBl
biBpZiB0aGUgdXNlciByZS1hY3RpdmF0ZXMgdGhlIGFwcCByaWdodCBhZnRlcgorICAgICAgICB0
aGUgZXhwaXJhdGlvbiBub3RpY2UgaGFzIGJlZW4gc2VudC4KKworICAgICAgICAqIFBsYXRmb3Jt
L3NwaS9pb3MvUnVubmluZ0JvYXJkU2VydmljZXNTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv
aW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW06CisgICAgICAgIChwcm9jZXNzSGFzQWN0aXZlUnVu
VGltZUxpbWl0YXRpb24pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5k
VGFza01hbmFnZXIgaW5pdF0pOgorICAgICAgICAoLVtXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3Jv
dW5kVGFza01hbmFnZXIgX3VwZGF0ZUJhY2tncm91bmRUYXNrXSk6CisgICAgICAgICgtW1dLUHJv
Y2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBfaGFuZGxlQmFja2dyb3VuZFRhc2tF
eHBpcmF0aW9uXSk6CisgICAgICAgICgtW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNr
TWFuYWdlciBfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25NYWluVGhyZWFkXSk6Cisg
ICAgICAgICgtW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBfcmVsZWFz
ZUJhY2tncm91bmRUYXNrXSk6CisKIDIwMjAtMDYtMDIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2MTM4Nyk6IEludHJvZHVjZWQg
c2FuZGJveCB2aW9sYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3Nw
aS9pb3MvUnVubmluZ0JvYXJkU2VydmljZXNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v
c3BpL2lvcy9SdW5uaW5nQm9hcmRTZXJ2aWNlc1NQSS5oCmluZGV4IGMyNDlkN2YwZjYyNzNmNzQy
ODg2NDU2Mjk3ZWRlODU3MDk5OWUyZDcuLjg2N2Y2YzcwMzNmY2FiMDMzNjk4MjA3NmY0ZTQ2NTM3
YWNmMTE1MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9SdW5u
aW5nQm9hcmRTZXJ2aWNlc1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv
cy9SdW5uaW5nQm9hcmRTZXJ2aWNlc1NQSS5oCkBAIC0yOSw2ICsyOSwxMiBAQAogCiAjaW1wb3J0
IDxSdW5uaW5nQm9hcmRTZXJ2aWNlcy9SdW5uaW5nQm9hcmRTZXJ2aWNlcy5oPgogCitleHRlcm4g
Y29uc3QgTlNUaW1lSW50ZXJ2YWwgUkJTUHJvY2Vzc1RpbWVMaW1pdGF0aW9uTm9uZTsKKworQGlu
dGVyZmFjZSBSQlNQcm9jZXNzTGltaXRhdGlvbnMgOiBOU09iamVjdAorQHByb3BlcnR5IChub25h
dG9taWMsIHJlYWR3cml0ZSwgYXNzaWduKSBOU1RpbWVJbnRlcnZhbCBydW5UaW1lOworQGVuZAor
CiAjZWxzZQogCiBAaW50ZXJmYWNlIFJCU0F0dHJpYnV0ZSA6IE5TT2JqZWN0CkBAIC03Niw5ICs4
MiwxNyBAQCB0eXBlZGVmIE5TX0VOVU0odWludDhfdCwgUkJTVGFza1N0YXRlKSB7CiBAcHJvcGVy
dHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGNvcHkpIE5TU2V0PE5TU3RyaW5nICo+ICplbmRvd21l
bnROYW1lc3BhY2VzOwogQGVuZAogCitleHRlcm4gY29uc3QgTlNUaW1lSW50ZXJ2YWwgUkJTUHJv
Y2Vzc1RpbWVMaW1pdGF0aW9uTm9uZTsKKworQGludGVyZmFjZSBSQlNQcm9jZXNzTGltaXRhdGlv
bnMgOiBOU09iamVjdAorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWR3cml0ZSwgYXNzaWduKSBO
U1RpbWVJbnRlcnZhbCBydW5UaW1lOworQGVuZAorCiBAaW50ZXJmYWNlIFJCU1Byb2Nlc3NIYW5k
bGUgOiBOU09iamVjdAogKyAoUkJTUHJvY2Vzc0hhbmRsZSAqKWhhbmRsZUZvcklkZW50aWZpZXI6
KFJCU1Byb2Nlc3NJZGVudGlmaWVyICopaWRlbnRpZmllciBlcnJvcjooTlNFcnJvciAqKilvdXRF
cnJvcjsKKysgKFJCU1Byb2Nlc3NIYW5kbGUgKiljdXJyZW50UHJvY2VzczsKIEBwcm9wZXJ0eSAo
bm9uYXRvbWljLCByZWFkb25seSwgc3Ryb25nKSBSQlNQcm9jZXNzU3RhdGUgKmN1cnJlbnRTdGF0
ZTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgc3Ryb25nKSBSQlNQcm9jZXNzTGlt
aXRhdGlvbnMgKmFjdGl2ZUxpbWl0YXRpb25zOwogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggMzA2
OTE2Y2Y5ZmRlMTAyNDk0OGUwYzQzZGQ4ODUxNmQ2MzJhMmI3ZC4uZmI3ZDljMzVhYWYxNzY0YWNk
OTk0OWZkOTg1MjAyMGYxMGVhMWQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KQEAgLTQ4LDYgKzQ4LDExIEBAIHVzaW5nIFdl
YktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOwogLy8gb24gdGhlIGV4cGlyYXRpb24gaGFuZGxl
ciBnZXR0aW5nIGNhbGxlZCkuCiBzdGF0aWMgY29uc3QgU2Vjb25kcyByZWxlYXNlQmFja2dyb3Vu
ZFRhc2tBZnRlckV4cGlyYXRpb25EZWxheSB7IDJfcyB9OwogCitzdGF0aWMgYm9vbCBwcm9jZXNz
SGFzQWN0aXZlUnVuVGltZUxpbWl0YXRpb24oKQoreworICAgIHJldHVybiBbUkJTUHJvY2Vzc0hh
bmRsZSBjdXJyZW50UHJvY2Vzc10uYWN0aXZlTGltaXRhdGlvbnMucnVuVGltZSAhPSBSQlNQcm9j
ZXNzVGltZUxpbWl0YXRpb25Ob25lOworfQorCiBAaW50ZXJmYWNlIFdLUHJvY2Vzc0Fzc2VydGlv
bkJhY2tncm91bmRUYXNrTWFuYWdlcgogI2lmIEhBVkUoUlVOTklOR0JPQVJEX1ZJU0lCSUxJVFlf
QVNTRVJUSU9OUykKICAgICA6IE5TT2JqZWN0IDxSQlNBc3NlcnRpb25PYnNlcnZpbmc+CkBAIC03
MSw3ICs3Niw2IEBAIEBpbXBsZW1lbnRhdGlvbiBXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5k
VGFza01hbmFnZXIKICNlbmRpZgogCiAgICAgV2Vha0hhc2hTZXQ8UHJvY2Vzc0FuZFVJQXNzZXJ0
aW9uPiBfYXNzZXJ0aW9uc05lZWRpbmdCYWNrZ3JvdW5kVGFzazsKLSAgICBCT09MIF9hcHBsaWNh
dGlvbklzQmFja2dyb3VuZGVkOwogICAgIGRpc3BhdGNoX2Jsb2NrX3QgX3BlbmRpbmdUYXNrUmVs
ZWFzZVRhc2s7CiB9CiAKQEAgLTkxLDE1ICs5NSwxNCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdAog
ICAgIF9iYWNrZ3JvdW5kVGFzayA9IFVJQmFja2dyb3VuZFRhc2tJbnZhbGlkOwogI2VuZGlmCiAK
KyAgICAvLyBGSVhNRTogU3RvcCByZWx5aW5nIG9uIFVJQXBwbGljYXRpb24gbm90aWZpY2F0aW9u
cyBhcyB0aGlzIGRvZXMgbm90IHdvcmsgYXMgZXhwZWN0ZWQgZm9yIGRhZW1vbnMgb3IgVmlld1Nl
cnZpY2VzLgorICAgIC8vIFdlIHNob3VsZCBsaWtlbHkgdXNlIFByb2Nlc3NUYXNrU3RhdGVPYnNl
cnZlciB0byBtb25pdG9yIHN1c3BlbnNpb24gc3RhdGUuCiAgICAgW1tOU05vdGlmaWNhdGlvbkNl
bnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlckZvck5hbWU6VUlBcHBsaWNhdGlvbldpbGxF
bnRlckZvcmVncm91bmROb3RpZmljYXRpb24gb2JqZWN0OltVSUFwcGxpY2F0aW9uIHNoYXJlZEFw
cGxpY2F0aW9uXSBxdWV1ZTpuaWwgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICopIHsKLSAg
ICAgICAgX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQgPSBOTzsKICAgICAgICAgW3NlbGYgX2Nh
bmNlbFBlbmRpbmdSZWxlYXNlVGFza107CiAgICAgICAgIFtzZWxmIF91cGRhdGVCYWNrZ3JvdW5k
VGFza107CiAgICAgfV07CiAKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50
ZXJdIGFkZE9ic2VydmVyRm9yTmFtZTpVSUFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kTm90
aWZpY2F0aW9uIG9iamVjdDpbVUlBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlvbl0gcXVldWU6
bmlsIHVzaW5nQmxvY2s6XihOU05vdGlmaWNhdGlvbiAqKSB7Ci0gICAgICAgIF9hcHBsaWNhdGlv
bklzQmFja2dyb3VuZGVkID0gWUVTOwotICAgICAgICAKICAgICAgICAgaWYgKCFbc2VsZiBfaGFz
QmFja2dyb3VuZFRhc2tdKQogICAgICAgICAgICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bm90
aWZ5UHJvY2Vzc1Bvb2xzQXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCk7CiAgICAgfV07CkBA
IC0xODIsOCArMTg1LDggQEAgLSAoQk9PTClfaGFzQmFja2dyb3VuZFRhc2sKIC0gKHZvaWQpX3Vw
ZGF0ZUJhY2tncm91bmRUYXNrCiB7CiAgICAgaWYgKCFfYXNzZXJ0aW9uc05lZWRpbmdCYWNrZ3Jv
dW5kVGFzay5jb21wdXRlc0VtcHR5KCkgJiYgIVtzZWxmIF9oYXNCYWNrZ3JvdW5kVGFza10pIHsK
LSAgICAgICAgaWYgKF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkKSB7Ci0gICAgICAgICAgICBS
RUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0
aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBJZ25vcmVkIHJlcXVlc3QgdG8gc3RhcnQgYSBuZXcg
YmFja2dyb3VuZCB0YXNrIGJlY2F1c2UgdGhlIGFwcGxpY2F0aW9uIGlzIGFscmVhZHkgaW4gdGhl
IGJhY2tncm91bmQiLCBzZWxmKTsKKyAgICAgICAgaWYgKHByb2Nlc3NIYXNBY3RpdmVSdW5UaW1l
TGltaXRhdGlvbigpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3Vz
cGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBJ
Z25vcmVkIHJlcXVlc3QgdG8gc3RhcnQgYSBuZXcgYmFja2dyb3VuZCB0YXNrIGJlY2F1c2UgUnVu
bmluZ0JvYXJkIGhhcyBhbHJlYWR5IHN0YXJ0ZWQgdGhlIGV4cGlyYXRpb24gdGltZXIiLCBzZWxm
KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBSRUxFQVNFX0xPRyhQ
cm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tN
YW5hZ2VyOiBiZWdpbkJhY2tncm91bmRUYXNrV2l0aE5hbWUiLCBzZWxmKTsKQEAgLTIyMyw3ICsy
MjYsOSBAQCAtICh2b2lkKWFzc2VydGlvbjooUkJTQXNzZXJ0aW9uICopYXNzZXJ0aW9uIGRpZElu
dmFsaWRhdGVXaXRoRXJyb3I6KE5TRXJyb3IgKillcgogCiAtICh2b2lkKV9oYW5kbGVCYWNrZ3Jv
dW5kVGFza0V4cGlyYXRpb24KIHsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg
IldLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlcjogQmFja2dyb3VuZCB0YXNr
IGV4cGlyZWQgd2hpbGUgaG9sZGluZyBXZWJLaXQgUHJvY2Vzc0Fzc2VydGlvbiAoaXNNYWluVGhy
ZWFkPyAlZCkuIiwgUnVuTG9vcDo6aXNNYWluKCkpOworICAgIGF1dG8gcmVtYWluaW5nVGltZSA9
IFtSQlNQcm9jZXNzSGFuZGxlIGN1cnJlbnRQcm9jZXNzXS5hY3RpdmVMaW1pdGF0aW9ucy5ydW5U
aW1lOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV0tQcm9jZXNzQXNzZXJ0
aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBCYWNrZ3JvdW5kIHRhc2sgZXhwaXJlZCB3aGlsZSBo
b2xkaW5nIFdlYktpdCBQcm9jZXNzQXNzZXJ0aW9uIChpc01haW5UaHJlYWQ6ICVkLCByZW1haW5p
bmdUaW1lOiAlZykuIiwgUnVuTG9vcDo6aXNNYWluKCksIHJlbWFpbmluZ1RpbWUpOworCiAgICAg
Y2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFtzZWxmXSB7CiAgICAgICAgIFtzZWxmIF9oYW5kbGVC
YWNrZ3JvdW5kVGFza0V4cGlyYXRpb25Pbk1haW5UaHJlYWRdOwogICAgIH0pOwpAQCAtMjMzLDEy
ICsyMzgsMTMgQEAgLSAodm9pZClfaGFuZGxlQmFja2dyb3VuZFRhc2tFeHBpcmF0aW9uT25NYWlu
VGhyZWFkCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIC8vIEZJWE1F
OiBXaGlsZSByZWx5aW5nIG9uIF9hcHBsaWNhdGlvbklzQmFja2dyb3VuZGVkIGlzIGFjY2VwdGFi
bGUgZm9yIGFwcGxpY2F0aW9ucywgdGhpcyBpcyBpbmFjdXJhdGUgaW4gdGhlIGNhc2UKLSAgICAv
LyBvZiBkYWVtb25zLgotICAgIGlmICghX2FwcGxpY2F0aW9uSXNCYWNrZ3JvdW5kZWQpIHsKLSAg
ICAgICAgLy8gV2UndmUgcmVjZWl2ZWQgdGhlIGludmFsaWRhdGlvbiB3YXJuaW5nIGFmdGVyIHRo
ZSBhcHAgaGFzIGJlY29tZSBmb3JlZ3JvdW5kIGFnYWluLiBJbiB0aGlzIGNhc2UsIHdlIHNob3Vs
ZCBub3QKLSAgICAgICAgLy8gd2FybiBjbGllbnRzIG9mIGltbWluZW50IHN1c3BlbnNpb24uIFRv
IGJlIHNhZmUgKGF2b2lkIHBvdGVudGlhbCBraWxsaW5nKSwgd2UgZW5kIHRoZSB0YXNrIHJpZ2h0
IGF3YXkgYW5kIGNhbGwKLSAgICAgICAgLy8gX3VwZGF0ZUJhY2tncm91bmRUYXNrIGFzeW5jaHJv
bm91c2x5IHRvIHN0YXJ0IGEgbmV3IHRhc2sgaWYgbmVjZXNzYXJ5LgorICAgIGF1dG8gcmVtYWlu
aW5nVGltZSA9IFtSQlNQcm9jZXNzSGFuZGxlIGN1cnJlbnRQcm9jZXNzXS5hY3RpdmVMaW1pdGF0
aW9ucy5ydW5UaW1lOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV0tQcm9j
ZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyOiBfaGFuZGxlQmFja2dyb3VuZFRhc2tF
eHBpcmF0aW9uT25NYWluVGhyZWFkIChyZW1haW5pbmdUaW1lOiAlZykuIiwgcmVtYWluaW5nVGlt
ZSk7CisKKyAgICAvLyBJZiB0aGVyZSBpcyBubyB0aW1lIGxpbWl0YXRpb24sIHRoZW4gaXQgbWVh
bnMgdGhhdCB0aGUgcHJvY2VzcyBpcyBub3cgYWxsb3dlZCB0byBydW4gYWdhaW4gYW5kIHRoZSBl
eHBpcmF0aW9uIG5vdGlmaWNhdGlvbgorICAgIC8vIGlzIG91dGRhdGVkIChlLmcuIHdlIGRpZCBu
b3QgaGF2ZSB0aW1lIHRvIHByb2Nlc3MgdGhlIGV4cGlyYXRpb24gbm90aWZpY2F0aW9uIGJlZm9y
ZSBzdXNwZW5kaW5nIGFuZCB0aHVzIG9ubHkgcHJvY2VzcyBpdAorICAgIC8vIHVwb24gcmVzdW1p
bmcsIG9yIHRoZSB1c2VyIHJlYWN0aXZhdGVkIHRoZSBhcHAgc2hvcnRseSBhZnRlciBleHBpcmF0
aW9uKS4KKyAgICBpZiAocmVtYWluaW5nVGltZSA9PSBSQlNQcm9jZXNzVGltZUxpbWl0YXRpb25O
b25lKSB7CiAgICAgICAgIFtzZWxmIF9yZWxlYXNlQmFja2dyb3VuZFRhc2tdOwogICAgICAgICBk
aXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewogICAgICAgICAgICAg
W3NlbGYgX3VwZGF0ZUJhY2tncm91bmRUYXNrXTsKQEAgLTI1Niw3ICsyNjIsNyBAQCAtICh2b2lk
KV9yZWxlYXNlQmFja2dyb3VuZFRhc2sKICAgICAgICAgcmV0dXJuOwogCiAgICAgUkVMRUFTRV9M
T0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRU
YXNrTWFuYWdlcjogZW5kQmFja2dyb3VuZFRhc2siLCBzZWxmKTsKLSAgICBpZiAoX2FwcGxpY2F0
aW9uSXNCYWNrZ3JvdW5kZWQpCisgICAgaWYgKHByb2Nlc3NIYXNBY3RpdmVSdW5UaW1lTGltaXRh
dGlvbigpKQogICAgICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpub3RpZnlQcm9jZXNzUG9v
bHNBcHBsaWNhdGlvbklzQWJvdXRUb1N1c3BlbmQoKTsKIAogI2lmIEhBVkUoUlVOTklOR0JPQVJE
X1ZJU0lCSUxJVFlfQVNTRVJUSU9OUykKZGlmZiAtLWdpdCBhL1dlYktpdExpYnJhcmllcy9XZWJL
aXRQcml2YXRlRnJhbWV3b3JrU3R1YnMvaU9TLzEzL1J1bm5pbmdCb2FyZFNlcnZpY2VzLmZyYW1l
d29yay9SdW5uaW5nQm9hcmRTZXJ2aWNlcy50YmQgYi9XZWJLaXRMaWJyYXJpZXMvV2ViS2l0UHJp
dmF0ZUZyYW1ld29ya1N0dWJzL2lPUy8xMy9SdW5uaW5nQm9hcmRTZXJ2aWNlcy5mcmFtZXdvcmsv
UnVubmluZ0JvYXJkU2VydmljZXMudGJkCmluZGV4IDljNTZlYjliYzhiNmE5YmRkM2Q4M2E5MjIx
YTEwYTE3YzgwY2NkOGUuLmRiYjNlNDE5OWE1ZDBmOWFkMDA0MDZmNzQ2OWRjMWVjMzg3Y2QxN2Ig
MTAwNjQ0Ci0tLSBhL1dlYktpdExpYnJhcmllcy9XZWJLaXRQcml2YXRlRnJhbWV3b3JrU3R1YnMv
aU9TLzEzL1J1bm5pbmdCb2FyZFNlcnZpY2VzLmZyYW1ld29yay9SdW5uaW5nQm9hcmRTZXJ2aWNl
cy50YmQKKysrIGIvV2ViS2l0TGlicmFyaWVzL1dlYktpdFByaXZhdGVGcmFtZXdvcmtTdHVicy9p
T1MvMTMvUnVubmluZ0JvYXJkU2VydmljZXMuZnJhbWV3b3JrL1J1bm5pbmdCb2FyZFNlcnZpY2Vz
LnRiZApAQCAtNSw1ICs1LDYgQEAgb2JqYy1jb25zdHJhaW50OiBub25lCiBwbGF0Zm9ybTogaW9z
CiBleHBvcnRzOgogICAtIGFyY2hzOiAgICAgICAgICAgWyB4ODZfNjQsIGFybTY0LCBhcm02NGUg
XQorICAgIHN5bWJvbHM6ICAgICAgICAgWyBfUkJTUHJvY2Vzc1RpbWVMaW1pdGF0aW9uTm9uZSBd
CiAgICAgb2JqYy1jbGFzc2VzOiAgICBbIFJCU0F0dHJpYnV0ZSwgUkJTRG9tYWluQXR0cmlidXRl
LCBSQlNUYXJnZXQsIFJCU0Fzc2VydGlvbiwgUkJTUHJvY2Vzc0lkZW50aWZpZXIsIFJCU1Byb2Nl
c3NTdGF0ZSwgUkJTUHJvY2Vzc0hhbmRsZSBdCiAuLi4K
</data>

          </attachment>
      

    </bug>

</bugzilla>