<?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>189767</bug_id>
          
          <creation_ts>2018-09-19 15:55:43 -0700</creation_ts>
          <short_desc>[WebVTT] Update the parser according to the new region syntax.</short_desc>
          <delta_ts>2023-09-08 15:42:22 -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>Media</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="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>ahmad.saleem792</cc>
    
    <cc>bfulgham</cc>
    
    <cc>commit-queue</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zcorpan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1461155</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-09-19 15:55:43 -0700</bug_when>
    <thetext>The syntax of WebVTT region declarations has changed. The previous declaration style can be found in https://www.w3.org/2013/07/webvtt.html. The new style is defined in https://w3c.github.io/webvtt/.

Example of the new syntax:

REGION
id=region_floating_point_anchor
regionanchor=41.133%,20.42%
viewportanchor=32.33%,32.44%

This is how this would have been written using the old syntax:

Region: id=region_floating_point_anchor regionanchor=41.133%,20.42% viewportanchor=32.33%,32.44%</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1461168</commentid>
    <comment_count>1</comment_count>
      <attachid>350158</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-09-19 16:27:56 -0700</bug_when>
    <thetext>Created attachment 350158
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1461169</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-09-19 16:28:33 -0700</bug_when>
    <thetext>&lt;rdar://problem/44621597&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1461350</commentid>
    <comment_count>3</comment_count>
      <attachid>350206</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-09-20 08:42:55 -0700</bug_when>
    <thetext>Created attachment 350206
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1461387</commentid>
    <comment_count>4</comment_count>
      <attachid>350217</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-09-20 09:32:32 -0700</bug_when>
    <thetext>Created attachment 350217
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1461408</commentid>
    <comment_count>5</comment_count>
      <attachid>350217</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-09-20 10:07:11 -0700</bug_when>
    <thetext>Comment on attachment 350217
Patch

Clearing flags on attachment: 350217

Committed r236265: &lt;https://trac.webkit.org/changeset/236265&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1466360</commentid>
    <comment_count>6</comment_count>
    <who name="Simon Pieters (:zcorpan)">zcorpan</who>
    <bug_when>2018-10-04 08:06:51 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #0)
&gt; Example of the new syntax:
&gt; 
&gt; REGION
&gt; id=region_floating_point_anchor
&gt; regionanchor=41.133%,20.42%
&gt; viewportanchor=32.33%,32.44%

The = should be :</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1976545</commentid>
    <comment_count>7</comment_count>
    <who name="Ahmad Saleem">ahmad.saleem792</who>
    <bug_when>2023-09-08 15:42:22 -0700</bug_when>
    <thetext>Landed: https://github.com/WebKit/WebKit/commit/26669c3d46a0b67d07ab8197299dbce49f16ab47

and didn&apos;t seem to back out.

Marking this as &apos;RESOLVED FIXED&apos;.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>350158</attachid>
            <date>2018-09-19 16:27:56 -0700</date>
            <delta_ts>2018-09-19 16:34:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-189767-20180919162755.patch</filename>
            <type>text/plain</type>
            <size>14360</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA5LTE5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViVlRUXSBVcGRhdGUg
dGhlIHBhcnNlciBhY2NvcmRpbmcgdG8gdGhlIG5ldyByZWdpb24gc3ludGF4LgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NzY3CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG1ham9yaXR5IG9mIHRo
ZSBjb2RlIGFkZGVkIGluIHRoaXMgcGF0Y2ggaXMgYWRvcHRlZCBmcm9tIHRoZSBDaHJvbWl1bSBw
cm9qZWN0LCB3aGljaCBoYXMgYWRkZWQKKyAgICAgICAgc3VwcG9ydCBmb3IgdGhlIG5ldyByZWdp
b24gc3ludGF4LiBUaGUgY29tcGxldGUgcGFyc2VyIHNwZWNpZmljYXRpb24gY2FuIGJlIGZvdW5k
IGF0CisgICAgICAgIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby93ZWJ2dHQvI2ZpbGUtcGFyc2luZy4g
T25lIHNtYWxsIGRpZmZlcmVuY2UgaW4gYmVoYXZpb3IgaXMgdGhhdCB0aGUgbmV3IHBhcnNlcgor
ICAgICAgICB3aWxsIG5vdCBhZGQgcmVnaW9ucyB3aXRoIGVtcHR5IGlkLgorCisgICAgICAgIE5v
IG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGh0bWwv
dHJhY2svV2ViVlRUUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6
Z2V0TmV3UmVnaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OnBhcnNlKToK
KyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y29sbGVjdFJlZ2lvblNldHRpbmdzKToK
KyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y29sbGVjdFdlYlZUVEJsb2NrKToKKyAg
ICAgICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y2hlY2tBbmRSZWNvdmVyQ3VlKToKKyAgICAg
ICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y2hlY2tBbmRDcmVhdGVSZWdpb24pOgorICAgICAg
ICAoV2ViQ29yZTo6V2ViVlRUUGFyc2VyOjpjaGVja0FuZFN0b3JlUmVnaW9uKToKKyAgICAgICAg
KFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y29sbGVjdE1ldGFkYXRhSGVhZGVyKTogRGVsZXRlZC4K
KyAgICAgICAgKFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y3JlYXRlTmV3UmVnaW9uKTogRGVsZXRl
ZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1dlYlZUVFBhcnNlci5oOgorCiAyMDE4LTA5LTE5ICBS
eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIz
NTkxNyk6IDIlIHJlZ3Jlc3Npb24gaW4gRHJvbWFlbyBDU1Mgc2VsZWN0b3Igb24gTWFjQm9va1By
bzExLDQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAJ
KHJldmlzaW9uIDIzNjIxMikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFy
c2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEsNiArNTEsNyBAQCBjb25zdCBkb3VibGUgc2Vj
b25kc1Blck1pbnV0ZSA9IDYwOwogY29uc3QgZG91YmxlIHNlY29uZHNQZXJNaWxsaXNlY29uZCA9
IDAuMDAxOwogY29uc3QgY2hhciogZmlsZUlkZW50aWZpZXIgPSAiV0VCVlRUIjsKIGNvbnN0IHVu
c2lnbmVkIGZpbGVJZGVudGlmaWVyTGVuZ3RoID0gNjsKK2NvbnN0IHVuc2lnbmVkIHJlZ2lvbklk
ZW50aWZpZXJMZW5ndGggPSA2OwogCiBib29sIFdlYlZUVFBhcnNlcjo6cGFyc2VGbG9hdFBlcmNl
bnRhZ2VWYWx1ZShWVFRTY2FubmVyJiB2YWx1ZVNjYW5uZXIsIGZsb2F0JiBwZXJjZW50YWdlKQog
ewpAQCAtMTAxLDggKzEwMiw3IEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpnZXROZXdDdWVzKFZlY3Rv
cjxSZWYKIAogdm9pZCBXZWJWVFRQYXJzZXI6OmdldE5ld1JlZ2lvbnMoVmVjdG9yPFJlZlB0cjxW
VFRSZWdpb24+PiYgb3V0cHV0UmVnaW9ucykKIHsKLSAgICBvdXRwdXRSZWdpb25zID0gbV9yZWdp
b25MaXN0OwotICAgIG1fcmVnaW9uTGlzdC5jbGVhcigpOworICAgIG91dHB1dFJlZ2lvbnMgPSBX
VEZNb3ZlKG1fcmVnaW9uTGlzdCk7CiB9CiAKIHZvaWQgV2ViVlRUUGFyc2VyOjpwYXJzZUZpbGVI
ZWFkZXIoU3RyaW5nJiYgZGF0YSkKQEAgLTE2NiwyMCArMTY2LDEyIEBAIHZvaWQgV2ViVlRUUGFy
c2VyOjpwYXJzZSgpCiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIEhlYWRlcjoK
LSAgICAgICAgICAgIGNvbGxlY3RNZXRhZGF0YUhlYWRlcigqbGluZSk7Ci0KLSAgICAgICAgICAg
IGlmIChsaW5lLT5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAvLyBTdGVwcyAxMC0xNCAt
IEFsbG93IGEgaGVhZGVyIChjb21tZW50IGFyZWEpIHVuZGVyIHRoZSBXRUJWVFQgbGluZS4KLSAg
ICAgICAgICAgICAgICBpZiAobV9jbGllbnQgJiYgbV9yZWdpb25MaXN0LnNpemUoKSkKLSAgICAg
ICAgICAgICAgICAgICAgbV9jbGllbnQtPm5ld1JlZ2lvbnNQYXJzZWQoKTsKLSAgICAgICAgICAg
ICAgICBtX3N0YXRlID0gSWQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9
Ci0gICAgICAgICAgICAvLyBTdGVwIDE1IC0gQnJlYWsgb3V0IG9mIGhlYWRlciBsb29wIGlmIHRo
ZSBsaW5lIGNvdWxkIGJlIGEgdGltZXN0YW1wIGxpbmUuCi0gICAgICAgICAgICBpZiAobGluZS0+
Y29udGFpbnMoIi0tPiIpKQotICAgICAgICAgICAgICAgIG1fc3RhdGUgPSByZWNvdmVyQ3VlKCps
aW5lKTsKKyAgICAgICAgICAgIC8vIFN0ZXBzIDExIC0gMTQgLSBDb2xsZWN0IFdlYlZUVCBibG9j
aworICAgICAgICAgICAgbV9zdGF0ZSA9IGNvbGxlY3RXZWJWVFRCbG9jaygqbGluZSk7CisgICAg
ICAgICAgICBicmVhazsKIAotICAgICAgICAgICAgLy8gU3RlcCAxNiAtIExpbmUgaXMgbm90IHRo
ZSBlbXB0eSBzdHJpbmcgYW5kIGRvZXMgbm90IGNvbnRhaW4gIi0tPiIuCisgICAgICAgIGNhc2Ug
UmVnaW9uOgorICAgICAgICAgICAgbV9zdGF0ZSA9IGNvbGxlY3RSZWdpb25TZXR0aW5ncygqbGlu
ZSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIElkOgpAQCAtMjQ5LDI4ICsy
NDEsOTAgQEAgYm9vbCBXZWJWVFRQYXJzZXI6Omhhc1JlcXVpcmVkRmlsZUlkZW50aQogICAgIHJl
dHVybiB0cnVlOwogfQogCi12b2lkIFdlYlZUVFBhcnNlcjo6Y29sbGVjdE1ldGFkYXRhSGVhZGVy
KGNvbnN0IFN0cmluZyYgbGluZSkKK1dlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJz
ZXI6OmNvbGxlY3RSZWdpb25TZXR0aW5ncyhjb25zdCBTdHJpbmcmIGxpbmUpCiB7Ci0gICAgLy8g
V2ViVlRUIGhlYWRlciBwYXJzaW5nIChXZWJWVFQgcGFyc2VyIGFsZ29yaXRobSBzdGVwIDEyKQot
ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBBdG9taWNTdHJpbmc+IHJlZ2lvbkhlYWRl
ck5hbWUoIlJlZ2lvbiIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOworICAg
IC8vIEVuZCBvZiByZWdpb24gYmxvY2sKKyAgICBpZiAoY2hlY2tBbmRTdG9yZVJlZ2lvbihsaW5l
KSkKKyAgICAgICAgcmV0dXJuIGNoZWNrQW5kUmVjb3ZlckN1ZShsaW5lKTsKKyAgICAKKyAgICBt
X2N1cnJlbnRSZWdpb24tPnNldFJlZ2lvblNldHRpbmdzKGxpbmUpOworICAgIHJldHVybiBSZWdp
b247Cit9CiAKLSAgICAvLyBTdGVwIDEyLjQgSWYgbGluZSBjb250YWlucyB0aGUgY2hhcmFjdGVy
ICI6IiAoQSBVKzAwM0EgQ09MT04pLCB0aGVuIHNldCBtZXRhZGF0YSdzCi0gICAgLy8gbmFtZSB0
byB0aGUgc3Vic3RyaW5nIG9mIGxpbmUgYmVmb3JlIHRoZSBmaXJzdCAiOiIgY2hhcmFjdGVyIGFu
ZAotICAgIC8vIG1ldGFkYXRhJ3MgdmFsdWUgdG8gdGhlIHN1YnN0cmluZyBhZnRlciB0aGlzIGNo
YXJhY3Rlci4KLSAgICBzaXplX3QgY29sb25Qb3NpdGlvbiA9IGxpbmUuZmluZCgnOicpOwotICAg
IGlmIChjb2xvblBvc2l0aW9uID09IG5vdEZvdW5kKQotICAgICAgICByZXR1cm47Ci0KLSAgICBT
dHJpbmcgaGVhZGVyTmFtZSA9IGxpbmUuc3Vic3RyaW5nKDAsIGNvbG9uUG9zaXRpb24pOwotCi0g
ICAgLy8gU3RlcCAxMi41IElmIG1ldGFkYXRhJ3MgbmFtZSBlcXVhbHMgIlJlZ2lvbiI6Ci0gICAg
aWYgKGhlYWRlck5hbWUgPT0gcmVnaW9uSGVhZGVyTmFtZSkgewotICAgICAgICBTdHJpbmcgaGVh
ZGVyVmFsdWUgPSBsaW5lLnN1YnN0cmluZyhjb2xvblBvc2l0aW9uICsgMSwgbGluZS5sZW5ndGgo
KSAtIDEpOwotICAgICAgICAvLyBTdGVwcyAxMi41LjEgLSAxMi41LjExIFJlZ2lvbiBjcmVhdGlv
bjogTGV0IHJlZ2lvbiBiZSBhIG5ldyB0ZXh0IHRyYWNrIHJlZ2lvbiBbLi4uXQotICAgICAgICBj
cmVhdGVOZXdSZWdpb24oaGVhZGVyVmFsdWUpOworV2ViVlRUUGFyc2VyOjpQYXJzZVN0YXRlIFdl
YlZUVFBhcnNlcjo6Y29sbGVjdFdlYlZUVEJsb2NrKGNvbnN0IFN0cmluZyYgbGluZSkKK3sKKyAg
ICAvLyBjb2xsZWN0IGEgV2ViVlRUIGJsb2NrIHBhcnNpbmcuIChXZWJWVFQgcGFyc2VyIGFsZ29y
aXRobSBzdGVwIDE0KQorICAgIAorICAgIC8vIElmIFJlZ2lvbiBzdXBwb3J0IGlzIGVuYWJsZWQu
CisgICAgaWYgKGNoZWNrQW5kQ3JlYXRlUmVnaW9uKGxpbmUpKQorICAgICAgICByZXR1cm4gUmVn
aW9uOworICAgIAorICAgIC8vIEhhbmRsZSBjdWUgYmxvY2suCisgICAgUGFyc2VTdGF0ZSBzdGF0
ZSA9IGNoZWNrQW5kUmVjb3ZlckN1ZShsaW5lKTsKKyAgICBpZiAoc3RhdGUgIT0gSGVhZGVyKSB7
CisgICAgICAgIGlmIChtX2NsaWVudCAmJiAhbV9yZWdpb25MaXN0LmlzRW1wdHkoKSkKKyAgICAg
ICAgICAgIG1fY2xpZW50LT5uZXdSZWdpb25zUGFyc2VkKCk7CisgICAgICAgIGlmICghbV9wcmV2
aW91c0xpbmUuaXNFbXB0eSgpICYmICFtX3ByZXZpb3VzTGluZS5jb250YWlucygiLS0+IikpCisg
ICAgICAgICAgICBtX2N1cnJlbnRJZCA9IEF0b21pY1N0cmluZyhtX3ByZXZpb3VzTGluZSk7Cisg
ICAgICAgIAorICAgICAgICByZXR1cm4gc3RhdGU7CisgICAgfQorICAgIAorICAgIC8vIHN0b3Jl
IHByZXZpb3VzIGxpbmUgZm9yIGN1ZSBpZC4KKyAgICAvLyBsZW5ndGggaXMgbW9yZSB0aGFuIDEg
bGluZSBjbGVhciBtX3ByZXZpb3VzTGluZV8gYW5kIGlnbm9yZSBsaW5lLgorICAgIGlmIChtX3By
ZXZpb3VzTGluZS5pc0VtcHR5KCkpCisgICAgICAgIG1fcHJldmlvdXNMaW5lID0gbGluZTsKKyAg
ICBlbHNlCisgICAgICAgIG1fcHJldmlvdXNMaW5lID0gIiI7CisKKyAgICByZXR1cm4gc3RhdGU7
Cit9CisKK1dlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNoZWNrQW5kUmVj
b3ZlckN1ZShjb25zdCBTdHJpbmcmIGxpbmUpCit7CisgICAgLy8gcGFyc2UgY3VlIHRpbWluZ3Mg
YW5kIHNldHRpbmdzCisgICAgaWYgKGxpbmUuY29udGFpbnMoIi0tPiIpKSB7CisgICAgICAgIFBh
cnNlU3RhdGUgc3RhdGUgPSByZWNvdmVyQ3VlKGxpbmUpOworICAgICAgICBpZiAoc3RhdGUgIT0g
QmFkQ3VlKQorICAgICAgICAgICAgcmV0dXJuIHN0YXRlOwogICAgIH0KKyAgICByZXR1cm4gSGVh
ZGVyOwogfQogCitib29sIFdlYlZUVFBhcnNlcjo6Y2hlY2tBbmRDcmVhdGVSZWdpb24oY29uc3Qg
U3RyaW5nJiBsaW5lKQoreworICAgIGlmIChtX3ByZXZpb3VzTGluZS5jb250YWlucygiLS0+Iikp
CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAvLyBsaW5lIHN0YXJ0cyB3aXRoIHRoZSBzdWJz
dHJpbmcgIlJFR0lPTiIgYW5kIHJlbWFpbmluZyBjaGFyYWN0ZXJzCisgICAgLy8gemVybyBvciBt
b3JlIFUrMDAyMCBTUEFDRSBjaGFyYWN0ZXJzIG9yIFUrMDAwOSBDSEFSQUNURVIgVEFCVUxBVElP
TgorICAgIC8vICh0YWIpIGNoYXJhY3RlcnMgZXhwZWN0ZWQgb3RoZXIgdGhhbiB0aGVzZSBjaGFy
ZWN0ZXJzIGl0IGlzIGludmFsaWQuCisgICAgaWYgKGxpbmUuc3RhcnRzV2l0aCgiUkVHSU9OIikg
JiYgbGluZS5zdWJzdHJpbmcocmVnaW9uSWRlbnRpZmllckxlbmd0aCkuaXNBbGxTcGVjaWFsQ2hh
cmFjdGVyczxpc0FTcGFjZT4oKSkgeworICAgICAgICBtX2N1cnJlbnRSZWdpb24gPSBWVFRSZWdp
b246OmNyZWF0ZSgqbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKKyAgICAgICAgcmV0dXJuIHRy
dWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBXZWJWVFRQYXJzZXI6OmNo
ZWNrQW5kU3RvcmVSZWdpb24oY29uc3QgU3RyaW5nJiBsaW5lKQoreworICAgIGlmICghbGluZS5p
c0VtcHR5KCkgJiYgIWxpbmUuY29udGFpbnMoIi0tPiIpKQorICAgICAgICByZXR1cm4gZmFsc2U7
CisgICAgCisgICAgaWYgKCFtX2N1cnJlbnRSZWdpb24tPmlkKCkuaXNFbXB0eSgpKSB7CisgICAg
ICAgIC8vIFN0ZXAgMTIuNS4xMCBJZiB0aGUgdGV4dCB0cmFjayBsaXN0IG9mIHJlZ2lvbnMgcmVn
aW9ucyBjb250YWlucyBhIHJlZ2lvbgorICAgICAgICAvLyB3aXRoIHRoZSBzYW1lIHJlZ2lvbiBp
ZGVudGlmaWVyIHZhbHVlIGFzIHJlZ2lvbiwgcmVtb3ZlIHRoYXQgcmVnaW9uLgorICAgICAgICBm
b3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcmVnaW9uTGlzdC5zaXplKCk7ICsraSkgeworICAgICAg
ICAgICAgaWYgKG1fcmVnaW9uTGlzdFtpXS0+aWQoKSA9PSBtX2N1cnJlbnRSZWdpb24tPmlkKCkp
IHsKKyAgICAgICAgICAgICAgICBtX3JlZ2lvbkxpc3QucmVtb3ZlKGkpOworICAgICAgICAgICAg
ICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIG1fcmVnaW9uTGlz
dC5hcHBlbmQobV9jdXJyZW50UmVnaW9uKTsKKyAgICB9CisgICAgbV9jdXJyZW50UmVnaW9uID0g
bnVsbHB0cjsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyAgICAKIFdlYlZUVFBhcnNlcjo6UGFyc2VT
dGF0ZSBXZWJWVFRQYXJzZXI6OmNvbGxlY3RDdWVJZChjb25zdCBTdHJpbmcmIGxpbmUpCiB7CiAg
ICAgaWYgKGxpbmUuY29udGFpbnMoIi0tPiIpKQpAQCAtNDIyLDI3ICs0NzYsNiBAQCB2b2lkIFdl
YlZUVFBhcnNlcjo6cmVzZXRDdWVWYWx1ZXMoKQogICAgIG1fY3VycmVudENvbnRlbnQuY2xlYXIo
KTsKIH0KIAotdm9pZCBXZWJWVFRQYXJzZXI6OmNyZWF0ZU5ld1JlZ2lvbihjb25zdCBTdHJpbmcm
IGhlYWRlclZhbHVlKQotewotICAgIGlmIChoZWFkZXJWYWx1ZS5pc0VtcHR5KCkpCi0gICAgICAg
IHJldHVybjsKLQotICAgIC8vIFN0ZXBzIDEyLjUuMSAtIDEyLjUuOSAtIENvbnN0cnVjdCBhbmQg
aW5pdGlhbGl6ZSBhIFdlYlZUVCBSZWdpb24gb2JqZWN0LgotICAgIFJlZlB0cjxWVFRSZWdpb24+
IHJlZ2lvbiA9IFZUVFJlZ2lvbjo6Y3JlYXRlKCptX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOwot
ICAgIHJlZ2lvbi0+c2V0UmVnaW9uU2V0dGluZ3MoaGVhZGVyVmFsdWUpOwotCi0gICAgLy8gU3Rl
cCAxMi41LjEwIElmIHRoZSB0ZXh0IHRyYWNrIGxpc3Qgb2YgcmVnaW9ucyByZWdpb25zIGNvbnRh
aW5zIGEgcmVnaW9uCi0gICAgLy8gd2l0aCB0aGUgc2FtZSByZWdpb24gaWRlbnRpZmllciB2YWx1
ZSBhcyByZWdpb24sIHJlbW92ZSB0aGF0IHJlZ2lvbi4KLSAgICBmb3IgKHNpemVfdCBpID0gMDsg
aSA8IG1fcmVnaW9uTGlzdC5zaXplKCk7ICsraSkKLSAgICAgICAgaWYgKG1fcmVnaW9uTGlzdFtp
XS0+aWQoKSA9PSByZWdpb24tPmlkKCkpIHsKLSAgICAgICAgICAgIG1fcmVnaW9uTGlzdC5yZW1v
dmUoaSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgLy8gU3RlcCAxMi41
LjExCi0gICAgbV9yZWdpb25MaXN0LmFwcGVuZChyZWdpb24pOwotfQotCiBib29sIFdlYlZUVFBh
cnNlcjo6Y29sbGVjdFRpbWVTdGFtcChjb25zdCBTdHJpbmcmIGxpbmUsIE1lZGlhVGltZSYgdGlt
ZVN0YW1wKQogewogICAgIGlmIChsaW5lLmlzRW1wdHkoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv
aHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaAkocmV2aXNpb24gMjM2MjEyKQorKysgU291cmNlL1dl
YkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDYg
KzEwMyw3IEBAIHB1YmxpYzoKICAgICAgICAgSWQsCiAgICAgICAgIFRpbWluZ3NBbmRTZXR0aW5n
cywKICAgICAgICAgQ3VlVGV4dCwKKyAgICAgICAgUmVnaW9uLAogICAgICAgICBCYWRDdWUsCiAg
ICAgICAgIEZpbmlzaGVkCiAgICAgfTsKQEAgLTExOCw2ICsxMTksMTQgQEAgcHVibGljOgogICAg
ICAgICAgICAgfHwgdGFnTmFtZSA9PSBydFRhZzsKICAgICB9CiAKKyAgICBzdGF0aWMgaW5saW5l
IGJvb2wgaXNBU3BhY2UoVUNoYXIgYykKKyAgICB7CisgICAgICAgIC8vIFdlYlZUVCBzcGFjZSBj
aGFyYWN0ZXJzIGFyZSBVKzAwMjAgU1BBQ0UsIFUrMDAwOSBDSEFSQUNURVIKKyAgICAgICAgLy8g
VEFCVUxBVElPTiAodGFiKSwgVSswMDBBIExJTkUgRkVFRCAoTEYpLCBVKzAwMEMgRk9STSBGRUVE
IChGRiksIGFuZAorICAgICAgICAvLyBVKzAwMEQgQ0FSUklBR0UgUkVUVVJOIChDUikuCisgICAg
ICAgIHJldHVybiBjID09ICcgJyB8fCBjID09ICdcdCcgfHwgYyA9PSAnXG4nIHx8IGMgPT0gJ1xm
JyB8fCBjID09ICdccic7CisgICAgfQorCiAgICAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRT
ZXR0aW5nRGVsaW1pdGVyKFVDaGFyIGMpCiAgICAgewogICAgICAgICAvLyAuLi4gYSBXZWJWVFQg
Y3VlIGNvbnNpc3RzIG9mIHplcm8gb3IgbW9yZSBvZiB0aGUgZm9sbG93aW5nIGNvbXBvbmVudHMs
IGluIGFueSBvcmRlciwgc2VwYXJhdGVkIGZyb20gZWFjaCBvdGhlciBieSBvbmUgb3IgbW9yZSAK
QEAgLTE1NywxMyArMTY2LDE1IEBAIHByaXZhdGU6CiAgICAgUGFyc2VTdGF0ZSBjb2xsZWN0Q3Vl
VGV4dChjb25zdCBTdHJpbmcmKTsKICAgICBQYXJzZVN0YXRlIHJlY292ZXJDdWUoY29uc3QgU3Ry
aW5nJik7CiAgICAgUGFyc2VTdGF0ZSBpZ25vcmVCYWRDdWUoY29uc3QgU3RyaW5nJik7Ci0KKyAg
ICBQYXJzZVN0YXRlIGNvbGxlY3RSZWdpb25TZXR0aW5ncyhjb25zdCBTdHJpbmcmKTsKKyAgICBQ
YXJzZVN0YXRlIGNvbGxlY3RXZWJWVFRCbG9jayhjb25zdCBTdHJpbmcmKTsKKyAgICBQYXJzZVN0
YXRlIGNoZWNrQW5kUmVjb3ZlckN1ZShjb25zdCBTdHJpbmcmIGxpbmUpOworICAgIGJvb2wgY2hl
Y2tBbmRDcmVhdGVSZWdpb24oY29uc3QgU3RyaW5nJiBsaW5lKTsKKyAgICBib29sIGNoZWNrQW5k
U3RvcmVSZWdpb24oY29uc3QgU3RyaW5nJiBsaW5lKTsKKyAgICAKICAgICB2b2lkIGNyZWF0ZU5l
d0N1ZSgpOwogICAgIHZvaWQgcmVzZXRDdWVWYWx1ZXMoKTsKIAotICAgIHZvaWQgY29sbGVjdE1l
dGFkYXRhSGVhZGVyKGNvbnN0IFN0cmluZyYpOwotICAgIHZvaWQgY3JlYXRlTmV3UmVnaW9uKGNv
bnN0IFN0cmluZyYgaGVhZGVyVmFsdWUpOwotCiAgICAgc3RhdGljIGJvb2wgY29sbGVjdFRpbWVT
dGFtcChWVFRTY2FubmVyJiBpbnB1dCwgTWVkaWFUaW1lJiB0aW1lU3RhbXApOwogCiAgICAgQnVm
ZmVyZWRMaW5lUmVhZGVyIG1fbGluZVJlYWRlcjsKQEAgLTE3Miw4ICsxODMsMTAgQEAgcHJpdmF0
ZToKICAgICBNZWRpYVRpbWUgbV9jdXJyZW50U3RhcnRUaW1lOwogICAgIE1lZGlhVGltZSBtX2N1
cnJlbnRFbmRUaW1lOwogICAgIFN0cmluZ0J1aWxkZXIgbV9jdXJyZW50Q29udGVudDsKKyAgICBT
dHJpbmcgbV9wcmV2aW91c0xpbmU7CiAgICAgU3RyaW5nIG1fY3VycmVudFNldHRpbmdzOwotCisg
ICAgUmVmUHRyPFZUVFJlZ2lvbj4gbV9jdXJyZW50UmVnaW9uOworICAgIAogICAgIFdlYlZUVFBh
cnNlckNsaWVudCogbV9jbGllbnQ7CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYlZUVEN1ZURhdGE+
PiBtX2N1ZWxpc3Q7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYyMTIpCisrKyBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0wOS0xOSAgUGVy
IEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYlZUVF0gVXBk
YXRlIHRoZSBwYXJzZXIgYWNjb3JkaW5nIHRvIHRoZSBuZXcgcmVnaW9uIHN5bnRheC4KKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTc2NworCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvdHJhY2sv
Y2FwdGlvbnMtd2VidnR0L2NhcHRpb25zLXJlZ2lvbnMudnR0OgorICAgICAgICAqIG1lZGlhL3Ry
YWNrL2NhcHRpb25zLXdlYnZ0dC9oZWFkZXItcmVnaW9ucy52dHQ6CisgICAgICAgICogbWVkaWEv
dHJhY2svcmVnaW9ucy13ZWJ2dHQvdnR0LXJlZ2lvbi1wYXJzZXItZXhwZWN0ZWQudHh0OgorICAg
ICAgICAqIG1lZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLmh0bWw6
CisKIDIwMTgtMDktMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg
ICAgIExheW91dCBUZXN0IHdlYnJ0Yy92aWRlby1tdXRlLmh0bWwgaXMgZmxha3kuCkluZGV4OiBM
YXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtcmVnaW9ucy52
dHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0
L2NhcHRpb25zLXJlZ2lvbnMudnR0CShyZXZpc2lvbiAyMzYyMTIpCisrKyBMYXlvdXRUZXN0cy9t
ZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtcmVnaW9ucy52dHQJKHdvcmtpbmcg
Y29weSkKQEAgLTEsNSArMSwxMSBAQAogV0VCVlRUIEZJTEUKLVJlZ2lvbjogaWQ9ZnJlZCB3aWR0
aD01MCUgaGVpZ2h0PTIgcmVnaW9uYW5jaG9yPTUwJSwxMDAlIHZpZXdwb3J0YW5jaG9yPTEwJSw0
MCUKKworUkVHSU9OCitpZD1mcmVkCit3aWR0aD01MCUKK2hlaWdodD0yCityZWdpb25hbmNob3I9
NTAlLDEwMCUKK3ZpZXdwb3J0YW5jaG9yPTEwJSw0MCUKIAogMQogMDA6MDA6MDAuMDAwIC0tPiAw
MDowMDowMS41MDAgcmVnaW9uOmZyZWQKQEAgLTE2LDQgKzIyLDQgQEAgQ3VlCiAKIDQKIDAwOjAw
OjAyLjAwMCAtLT4gMDA6MDA6MDMuMDAwIHJlZ2lvbjpmcmVkCi1Gb3VydGggY3VlIQpcIE5vIG5l
d2xpbmUgYXQgZW5kIG9mIGZpbGUKK0ZvdXJ0aCBjdWUhCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRp
YS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvaGVhZGVyLXJlZ2lvbnMudnR0Cj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9oZWFkZXItcmVnaW9ucy52
dHQJKHJldmlzaW9uIDIzNjIxMikKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25z
LXdlYnZ0dC9oZWFkZXItcmVnaW9ucy52dHQJKHdvcmtpbmcgY29weSkKQEAgLTEsMTAgKzEsMzEg
QEAKIFdFQlZUVCBGSUxFCi1SZWdpb246IGlkPXJlZ2lvbl93aXRob3V0X3NldHRpbmdzCi1SZWdp
b246IGlkPXJlZ2lvbl93aXRoX2FsbF9zZXR0aW5ncyB3aWR0aD0zMiUgaGVpZ2h0PTUgcmVnaW9u
YW5jaG9yPTQxJSwyMCUgdmlld3BvcnRhbmNob3I9MzElLDg0JSBzY3JvbGw9dXAKLVJlZ2lvbjog
aWQ9cmVnaW9uX2Zsb2F0aW5nX3BvaW50X2FuY2hvciByZWdpb25hbmNob3I9NDEuMTMzJSwyMC40
MiUgdmlld3BvcnRhbmNob3I9MzIuMzMlLDMyLjQ0JQotUmVnaW9uOiBpZD1ub3RfdW5pcXVlX2lk
IHdpZHRoPTQyJQotUmVnaW9uOiBpZD1ub3RfdW5pcXVlX2lkIHdpZHRoPTY3JQotUmVnaW9uOiBp
bnZhbGlkX3NldHRpbmdzIHZhbHVlcyBidXQgcmVnaW9uIHN0aWxsIGNyZWF0ZWQKKworUkVHSU9O
CitpZD1yZWdpb25fd2l0aG91dF9zZXR0aW5ncworCitSRUdJT04KK2lkPXJlZ2lvbl93aXRoX2Fs
bF9zZXR0aW5ncword2lkdGg9MzIlCitoZWlnaHQ9NQorcmVnaW9uYW5jaG9yPTQxJSwyMCUKK3Zp
ZXdwb3J0YW5jaG9yPTMxJSw4NCUKK3Njcm9sbD11cAorCitSRUdJT04KK2lkPXJlZ2lvbl9mbG9h
dGluZ19wb2ludF9hbmNob3IKK3JlZ2lvbmFuY2hvcj00MS4xMzMlLDIwLjQyJQordmlld3BvcnRh
bmNob3I9MzIuMzMlLDMyLjQ0JQorCitSRUdJT04KK2lkPW5vdF91bmlxdWVfaWQKK3dpZHRoPTQy
JQorCitSRUdJT04KK2lkPW5vdF91bmlxdWVfaWQKK3dpZHRoPTY3JQorCitSRUdJT04KK2ludmFs
aWRfc2V0dGluZ3MgdmFsdWVzIGJ1dCByZWdpb24gc3RpbGwgY3JlYXRlZAogOiBJbnZhbGlkIEhl
YWRlcgogCiAxCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92
dHQtcmVnaW9uLXBhcnNlci1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv
bWVkaWEvdHJhY2svcmVnaW9ucy13ZWJ2dHQvdnR0LXJlZ2lvbi1wYXJzZXItZXhwZWN0ZWQudHh0
CShyZXZpc2lvbiAyMzYyMTIpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdl
YnZ0dC92dHQtcmVnaW9uLXBhcnNlci1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEs
NyArMSw3IEBACiBUZXN0cyBwcm9wZXIgcGFyc2luZyBvZiB2YXJpb3VzIHJlZ2lvbnMgcHJlc2Vu
dCBpbiBXZWJWVFQgaGVhZGVyIGFyZWEuCiAKIAotRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3Nb
MF0ucmVnaW9ucy5sZW5ndGggPT0gJzUnKSBPSworRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3Nb
MF0ucmVnaW9ucy5sZW5ndGggPT0gJzQnKSBPSwogCiBFWFBFQ1RFRCAocmVnaW9uLmlkID09ICdy
ZWdpb25fd2l0aG91dF9zZXR0aW5ncycpIE9LCiAKQEAgLTIzLDcgKzIzLDUgQEAgRVhQRUNURUQg
KE1hdGgucm91bmQocmVnaW9uLnZpZXdwb3J0QW5jaAogRVhQRUNURUQgKHJlZ2lvbi5pZCA9PSAn
bm90X3VuaXF1ZV9pZCcpIE9LCiBFWFBFQ1RFRCAocmVnaW9uLndpZHRoID09ICc2NycpIE9LCiAK
LUVYUEVDVEVEIChyZWdpb24uaWQgPT0gJycpIE9LCi0KIEVORCBPRiBURVNUCiAKSW5kZXg6IExh
eW91dFRlc3RzL21lZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLmh0
bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svcmVnaW9ucy13ZWJ2dHQv
dnR0LXJlZ2lvbi1wYXJzZXIuaHRtbAkocmV2aXNpb24gMjM2MjEyKQorKysgTGF5b3V0VGVzdHMv
bWVkaWEvdHJhY2svcmVnaW9ucy13ZWJ2dHQvdnR0LXJlZ2lvbi1wYXJzZXIuaHRtbAkod29ya2lu
ZyBjb3B5KQpAQCAtMTYsNyArMTYsNyBAQAogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBm
aW5kTWVkaWFFbGVtZW50KCk7Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRU
cmFja3NbMF0ucmVnaW9ucy5sZW5ndGgiLCA1KTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi
dmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCIsIDQpOwogCiAgICAgICAgICAgICBj
b25zb2xlV3JpdGUoIiIpOwogICAgICAgICAgICAgcmVnaW9uID0gdmlkZW8udGV4dFRyYWNrc1sw
XS5yZWdpb25zWzBdOwpAQCAtNDcsMTAgKzQ3LDYgQEAKICAgICAgICAgICAgIHRlc3RFeHBlY3Rl
ZCgicmVnaW9uLndpZHRoIiwgNjcpOwogCiAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwot
ICAgICAgICAgICAgcmVnaW9uID0gdmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zWzRdOwotICAg
ICAgICAgICAgdGVzdEV4cGVjdGVkKCJyZWdpb24uaWQiLCAiIik7Ci0KLSAgICAgICAgICAgIGNv
bnNvbGVXcml0ZSgiIik7CiAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0KIAo=
</data>
<flag name="review"
          id="367644"
          type_id="1"
          status="+"
          setter="eric.carlson"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>350206</attachid>
            <date>2018-09-20 08:42:55 -0700</date>
            <delta_ts>2018-09-20 09:40:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-189767-20180920084254.patch</filename>
            <type>text/plain</type>
            <size>14338</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA5LTE5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViVlRUXSBVcGRhdGUg
dGhlIHBhcnNlciBhY2NvcmRpbmcgdG8gdGhlIG5ldyByZWdpb24gc3ludGF4LgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NzY3CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFRoZSBtYWpvcml0eSBvZiB0aGUg
Y29kZSBhZGRlZCBpbiB0aGlzIHBhdGNoIGlzIGFkb3B0ZWQgZnJvbSB0aGUgQ2hyb21pdW0gcHJv
amVjdCwgd2hpY2ggaGFzIGFkZGVkCisgICAgICAgIHN1cHBvcnQgZm9yIHRoZSBuZXcgcmVnaW9u
IHN5bnRheC4gVGhlIGNvbXBsZXRlIHBhcnNlciBzcGVjaWZpY2F0aW9uIGNhbiBiZSBmb3VuZCBh
dAorICAgICAgICBodHRwczovL3czYy5naXRodWIuaW8vd2VidnR0LyNmaWxlLXBhcnNpbmcuIE9u
ZSBzbWFsbCBkaWZmZXJlbmNlIGluIGJlaGF2aW9yIGlzIHRoYXQgdGhlIG5ldyBwYXJzZXIKKyAg
ICAgICAgd2lsbCBub3QgYWRkIHJlZ2lvbnMgd2l0aCBlbXB0eSBpZC4KKworICAgICAgICBObyBu
ZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBodG1sL3Ry
YWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6Omdl
dE5ld1JlZ2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViVlRUUGFyc2VyOjpwYXJzZSk6Cisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RSZWdpb25TZXR0aW5ncyk6Cisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RXZWJWVFRCbG9jayk6CisgICAg
ICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNoZWNrQW5kUmVjb3ZlckN1ZSk6CisgICAgICAg
IChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNoZWNrQW5kQ3JlYXRlUmVnaW9uKToKKyAgICAgICAg
KFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y2hlY2tBbmRTdG9yZVJlZ2lvbik6CisgICAgICAgIChX
ZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RNZXRhZGF0YUhlYWRlcik6IERlbGV0ZWQuCisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNyZWF0ZU5ld1JlZ2lvbik6IERlbGV0ZWQu
CisgICAgICAgICogaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaDoKKwogMjAxOC0wOS0xOSAgUnlv
c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMzU5
MTcpOiAyJSByZWdyZXNzaW9uIGluIERyb21hZW8gQ1NTIHNlbGVjdG9yIG9uIE1hY0Jvb2tQcm8x
MSw0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCShy
ZXZpc2lvbiAyMzYyMTIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNl
ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgY29uc3QgZG91YmxlIHNlY29u
ZHNQZXJNaW51dGUgPSA2MDsKIGNvbnN0IGRvdWJsZSBzZWNvbmRzUGVyTWlsbGlzZWNvbmQgPSAw
LjAwMTsKIGNvbnN0IGNoYXIqIGZpbGVJZGVudGlmaWVyID0gIldFQlZUVCI7CiBjb25zdCB1bnNp
Z25lZCBmaWxlSWRlbnRpZmllckxlbmd0aCA9IDY7Citjb25zdCB1bnNpZ25lZCByZWdpb25JZGVu
dGlmaWVyTGVuZ3RoID0gNjsKIAogYm9vbCBXZWJWVFRQYXJzZXI6OnBhcnNlRmxvYXRQZXJjZW50
YWdlVmFsdWUoVlRUU2Nhbm5lciYgdmFsdWVTY2FubmVyLCBmbG9hdCYgcGVyY2VudGFnZSkKIHsK
QEAgLTEwMSw4ICsxMDIsNyBAQCB2b2lkIFdlYlZUVFBhcnNlcjo6Z2V0TmV3Q3VlcyhWZWN0b3I8
UmVmCiAKIHZvaWQgV2ViVlRUUGFyc2VyOjpnZXROZXdSZWdpb25zKFZlY3RvcjxSZWZQdHI8VlRU
UmVnaW9uPj4mIG91dHB1dFJlZ2lvbnMpCiB7Ci0gICAgb3V0cHV0UmVnaW9ucyA9IG1fcmVnaW9u
TGlzdDsKLSAgICBtX3JlZ2lvbkxpc3QuY2xlYXIoKTsKKyAgICBvdXRwdXRSZWdpb25zID0gV1RG
TW92ZShtX3JlZ2lvbkxpc3QpOwogfQogCiB2b2lkIFdlYlZUVFBhcnNlcjo6cGFyc2VGaWxlSGVh
ZGVyKFN0cmluZyYmIGRhdGEpCkBAIC0xNjYsMjAgKzE2NiwxMiBAQCB2b2lkIFdlYlZUVFBhcnNl
cjo6cGFyc2UoKQogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBIZWFkZXI6Ci0g
ICAgICAgICAgICBjb2xsZWN0TWV0YWRhdGFIZWFkZXIoKmxpbmUpOwotCi0gICAgICAgICAgICBp
ZiAobGluZS0+aXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgLy8gU3RlcHMgMTAtMTQgLSBB
bGxvdyBhIGhlYWRlciAoY29tbWVudCBhcmVhKSB1bmRlciB0aGUgV0VCVlRUIGxpbmUuCi0gICAg
ICAgICAgICAgICAgaWYgKG1fY2xpZW50ICYmIG1fcmVnaW9uTGlzdC5zaXplKCkpCi0gICAgICAg
ICAgICAgICAgICAgIG1fY2xpZW50LT5uZXdSZWdpb25zUGFyc2VkKCk7Ci0gICAgICAgICAgICAg
ICAgbV9zdGF0ZSA9IElkOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQot
ICAgICAgICAgICAgLy8gU3RlcCAxNSAtIEJyZWFrIG91dCBvZiBoZWFkZXIgbG9vcCBpZiB0aGUg
bGluZSBjb3VsZCBiZSBhIHRpbWVzdGFtcCBsaW5lLgotICAgICAgICAgICAgaWYgKGxpbmUtPmNv
bnRhaW5zKCItLT4iKSkKLSAgICAgICAgICAgICAgICBtX3N0YXRlID0gcmVjb3ZlckN1ZSgqbGlu
ZSk7CisgICAgICAgICAgICAvLyBTdGVwcyAxMSAtIDE0IC0gQ29sbGVjdCBXZWJWVFQgYmxvY2sK
KyAgICAgICAgICAgIG1fc3RhdGUgPSBjb2xsZWN0V2ViVlRUQmxvY2soKmxpbmUpOworICAgICAg
ICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAgIC8vIFN0ZXAgMTYgLSBMaW5lIGlzIG5vdCB0aGUg
ZW1wdHkgc3RyaW5nIGFuZCBkb2VzIG5vdCBjb250YWluICItLT4iLgorICAgICAgICBjYXNlIFJl
Z2lvbjoKKyAgICAgICAgICAgIG1fc3RhdGUgPSBjb2xsZWN0UmVnaW9uU2V0dGluZ3MoKmxpbmUp
OwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBJZDoKQEAgLTI0OSwyOCArMjQx
LDkwIEBAIGJvb2wgV2ViVlRUUGFyc2VyOjpoYXNSZXF1aXJlZEZpbGVJZGVudGkKICAgICByZXR1
cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJWVFRQYXJzZXI6OmNvbGxlY3RNZXRhZGF0YUhlYWRlcihj
b25zdCBTdHJpbmcmIGxpbmUpCitXZWJWVFRQYXJzZXI6OlBhcnNlU3RhdGUgV2ViVlRUUGFyc2Vy
Ojpjb2xsZWN0UmVnaW9uU2V0dGluZ3MoY29uc3QgU3RyaW5nJiBsaW5lKQogewotICAgIC8vIFdl
YlZUVCBoZWFkZXIgcGFyc2luZyAoV2ViVlRUIHBhcnNlciBhbGdvcml0aG0gc3RlcCAxMikKLSAg
ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbWljU3RyaW5nPiByZWdpb25IZWFkZXJO
YW1lKCJSZWdpb24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKKyAgICAv
LyBFbmQgb2YgcmVnaW9uIGJsb2NrCisgICAgaWYgKGNoZWNrQW5kU3RvcmVSZWdpb24obGluZSkp
CisgICAgICAgIHJldHVybiBjaGVja0FuZFJlY292ZXJDdWUobGluZSk7CisgICAgCisgICAgbV9j
dXJyZW50UmVnaW9uLT5zZXRSZWdpb25TZXR0aW5ncyhsaW5lKTsKKyAgICByZXR1cm4gUmVnaW9u
OworfQogCi0gICAgLy8gU3RlcCAxMi40IElmIGxpbmUgY29udGFpbnMgdGhlIGNoYXJhY3RlciAi
OiIgKEEgVSswMDNBIENPTE9OKSwgdGhlbiBzZXQgbWV0YWRhdGEncwotICAgIC8vIG5hbWUgdG8g
dGhlIHN1YnN0cmluZyBvZiBsaW5lIGJlZm9yZSB0aGUgZmlyc3QgIjoiIGNoYXJhY3RlciBhbmQK
LSAgICAvLyBtZXRhZGF0YSdzIHZhbHVlIHRvIHRoZSBzdWJzdHJpbmcgYWZ0ZXIgdGhpcyBjaGFy
YWN0ZXIuCi0gICAgc2l6ZV90IGNvbG9uUG9zaXRpb24gPSBsaW5lLmZpbmQoJzonKTsKLSAgICBp
ZiAoY29sb25Qb3NpdGlvbiA9PSBub3RGb3VuZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU3Ry
aW5nIGhlYWRlck5hbWUgPSBsaW5lLnN1YnN0cmluZygwLCBjb2xvblBvc2l0aW9uKTsKLQotICAg
IC8vIFN0ZXAgMTIuNSBJZiBtZXRhZGF0YSdzIG5hbWUgZXF1YWxzICJSZWdpb24iOgotICAgIGlm
IChoZWFkZXJOYW1lID09IHJlZ2lvbkhlYWRlck5hbWUpIHsKLSAgICAgICAgU3RyaW5nIGhlYWRl
clZhbHVlID0gbGluZS5zdWJzdHJpbmcoY29sb25Qb3NpdGlvbiArIDEsIGxpbmUubGVuZ3RoKCkg
LSAxKTsKLSAgICAgICAgLy8gU3RlcHMgMTIuNS4xIC0gMTIuNS4xMSBSZWdpb24gY3JlYXRpb246
IExldCByZWdpb24gYmUgYSBuZXcgdGV4dCB0cmFjayByZWdpb24gWy4uLl0KLSAgICAgICAgY3Jl
YXRlTmV3UmVnaW9uKGhlYWRlclZhbHVlKTsKK1dlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJW
VFRQYXJzZXI6OmNvbGxlY3RXZWJWVFRCbG9jayhjb25zdCBTdHJpbmcmIGxpbmUpCit7CisgICAg
Ly8gY29sbGVjdCBhIFdlYlZUVCBibG9jayBwYXJzaW5nLiAoV2ViVlRUIHBhcnNlciBhbGdvcml0
aG0gc3RlcCAxNCkKKyAgICAKKyAgICAvLyBJZiBSZWdpb24gc3VwcG9ydCBpcyBlbmFibGVkLgor
ICAgIGlmIChjaGVja0FuZENyZWF0ZVJlZ2lvbihsaW5lKSkKKyAgICAgICAgcmV0dXJuIFJlZ2lv
bjsKKyAgICAKKyAgICAvLyBIYW5kbGUgY3VlIGJsb2NrLgorICAgIFBhcnNlU3RhdGUgc3RhdGUg
PSBjaGVja0FuZFJlY292ZXJDdWUobGluZSk7CisgICAgaWYgKHN0YXRlICE9IEhlYWRlcikgewor
ICAgICAgICBpZiAobV9jbGllbnQgJiYgIW1fcmVnaW9uTGlzdC5pc0VtcHR5KCkpCisgICAgICAg
ICAgICBtX2NsaWVudC0+bmV3UmVnaW9uc1BhcnNlZCgpOworICAgICAgICBpZiAoIW1fcHJldmlv
dXNMaW5lLmlzRW1wdHkoKSAmJiAhbV9wcmV2aW91c0xpbmUuY29udGFpbnMoIi0tPiIpKQorICAg
ICAgICAgICAgbV9jdXJyZW50SWQgPSBtX3ByZXZpb3VzTGluZTsKKyAgICAgICAgCisgICAgICAg
IHJldHVybiBzdGF0ZTsKKyAgICB9CisgICAgCisgICAgLy8gc3RvcmUgcHJldmlvdXMgbGluZSBm
b3IgY3VlIGlkLgorICAgIC8vIGxlbmd0aCBpcyBtb3JlIHRoYW4gMSBsaW5lIGNsZWFyIG1fcHJl
dmlvdXNMaW5lXyBhbmQgaWdub3JlIGxpbmUuCisgICAgaWYgKG1fcHJldmlvdXNMaW5lLmlzRW1w
dHkoKSkKKyAgICAgICAgbV9wcmV2aW91c0xpbmUgPSBsaW5lOworICAgIGVsc2UKKyAgICAgICAg
bV9wcmV2aW91c0xpbmUgPSBlbXB0eVN0cmluZygpOworCisgICAgcmV0dXJuIHN0YXRlOworfQor
CitXZWJWVFRQYXJzZXI6OlBhcnNlU3RhdGUgV2ViVlRUUGFyc2VyOjpjaGVja0FuZFJlY292ZXJD
dWUoY29uc3QgU3RyaW5nJiBsaW5lKQoreworICAgIC8vIHBhcnNlIGN1ZSB0aW1pbmdzIGFuZCBz
ZXR0aW5ncworICAgIGlmIChsaW5lLmNvbnRhaW5zKCItLT4iKSkgeworICAgICAgICBQYXJzZVN0
YXRlIHN0YXRlID0gcmVjb3ZlckN1ZShsaW5lKTsKKyAgICAgICAgaWYgKHN0YXRlICE9IEJhZEN1
ZSkKKyAgICAgICAgICAgIHJldHVybiBzdGF0ZTsKICAgICB9CisgICAgcmV0dXJuIEhlYWRlcjsK
IH0KIAorYm9vbCBXZWJWVFRQYXJzZXI6OmNoZWNrQW5kQ3JlYXRlUmVnaW9uKGNvbnN0IFN0cmlu
ZyYgbGluZSkKK3sKKyAgICBpZiAobV9wcmV2aW91c0xpbmUuY29udGFpbnMoIi0tPiIpKQorICAg
ICAgICByZXR1cm4gZmFsc2U7CisgICAgLy8gbGluZSBzdGFydHMgd2l0aCB0aGUgc3Vic3RyaW5n
ICJSRUdJT04iIGFuZCByZW1haW5pbmcgY2hhcmFjdGVycworICAgIC8vIHplcm8gb3IgbW9yZSBV
KzAwMjAgU1BBQ0UgY2hhcmFjdGVycyBvciBVKzAwMDkgQ0hBUkFDVEVSIFRBQlVMQVRJT04KKyAg
ICAvLyAodGFiKSBjaGFyYWN0ZXJzIGV4cGVjdGVkIG90aGVyIHRoYW4gdGhlc2UgY2hhcmVjdGVy
cyBpdCBpcyBpbnZhbGlkLgorICAgIGlmIChsaW5lLnN0YXJ0c1dpdGgoIlJFR0lPTiIpICYmIGxp
bmUuc3Vic3RyaW5nKHJlZ2lvbklkZW50aWZpZXJMZW5ndGgpLmlzQWxsU3BlY2lhbENoYXJhY3Rl
cnM8aXNBU3BhY2U+KCkpIHsKKyAgICAgICAgbV9jdXJyZW50UmVnaW9uID0gVlRUUmVnaW9uOjpj
cmVhdGUoKm1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgIHJldHVybiB0cnVlOwor
ICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgV2ViVlRUUGFyc2VyOjpjaGVja0Fu
ZFN0b3JlUmVnaW9uKGNvbnN0IFN0cmluZyYgbGluZSkKK3sKKyAgICBpZiAoIWxpbmUuaXNFbXB0
eSgpICYmICFsaW5lLmNvbnRhaW5zKCItLT4iKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg
IAorICAgIGlmICghbV9jdXJyZW50UmVnaW9uLT5pZCgpLmlzRW1wdHkoKSkgeworICAgICAgICAv
LyBTdGVwIDEyLjUuMTAgSWYgdGhlIHRleHQgdHJhY2sgbGlzdCBvZiByZWdpb25zIHJlZ2lvbnMg
Y29udGFpbnMgYSByZWdpb24KKyAgICAgICAgLy8gd2l0aCB0aGUgc2FtZSByZWdpb24gaWRlbnRp
ZmllciB2YWx1ZSBhcyByZWdpb24sIHJlbW92ZSB0aGF0IHJlZ2lvbi4KKyAgICAgICAgZm9yIChh
dXRvIHJlZ2lvbiA6IG1fcmVnaW9uTGlzdCkgeworICAgICAgICAgICAgaWYgKHJlZ2lvbi0+aWQo
KSA9PSBtX2N1cnJlbnRSZWdpb24tPmlkKCkpIHsKKyAgICAgICAgICAgICAgICBtX3JlZ2lvbkxp
c3QucmVtb3ZlRmlyc3QocmVnaW9uKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg
ICAgIH0KKyAgICAgICAgfQorICAgICAgICBtX3JlZ2lvbkxpc3QuYXBwZW5kKG1fY3VycmVudFJl
Z2lvbik7CisgICAgfQorICAgIG1fY3VycmVudFJlZ2lvbiA9IG51bGxwdHI7CisgICAgcmV0dXJu
IHRydWU7Cit9CisgICAgCiBXZWJWVFRQYXJzZXI6OlBhcnNlU3RhdGUgV2ViVlRUUGFyc2VyOjpj
b2xsZWN0Q3VlSWQoY29uc3QgU3RyaW5nJiBsaW5lKQogewogICAgIGlmIChsaW5lLmNvbnRhaW5z
KCItLT4iKSkKQEAgLTQyMiwyNyArNDc2LDYgQEAgdm9pZCBXZWJWVFRQYXJzZXI6OnJlc2V0Q3Vl
VmFsdWVzKCkKICAgICBtX2N1cnJlbnRDb250ZW50LmNsZWFyKCk7CiB9CiAKLXZvaWQgV2ViVlRU
UGFyc2VyOjpjcmVhdGVOZXdSZWdpb24oY29uc3QgU3RyaW5nJiBoZWFkZXJWYWx1ZSkKLXsKLSAg
ICBpZiAoaGVhZGVyVmFsdWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBT
dGVwcyAxMi41LjEgLSAxMi41LjkgLSBDb25zdHJ1Y3QgYW5kIGluaXRpYWxpemUgYSBXZWJWVFQg
UmVnaW9uIG9iamVjdC4KLSAgICBSZWZQdHI8VlRUUmVnaW9uPiByZWdpb24gPSBWVFRSZWdpb246
OmNyZWF0ZSgqbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKLSAgICByZWdpb24tPnNldFJlZ2lv
blNldHRpbmdzKGhlYWRlclZhbHVlKTsKLQotICAgIC8vIFN0ZXAgMTIuNS4xMCBJZiB0aGUgdGV4
dCB0cmFjayBsaXN0IG9mIHJlZ2lvbnMgcmVnaW9ucyBjb250YWlucyBhIHJlZ2lvbgotICAgIC8v
IHdpdGggdGhlIHNhbWUgcmVnaW9uIGlkZW50aWZpZXIgdmFsdWUgYXMgcmVnaW9uLCByZW1vdmUg
dGhhdCByZWdpb24uCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3JlZ2lvbkxpc3Quc2l6
ZSgpOyArK2kpCi0gICAgICAgIGlmIChtX3JlZ2lvbkxpc3RbaV0tPmlkKCkgPT0gcmVnaW9uLT5p
ZCgpKSB7Ci0gICAgICAgICAgICBtX3JlZ2lvbkxpc3QucmVtb3ZlKGkpOwotICAgICAgICAgICAg
YnJlYWs7Ci0gICAgICAgIH0KLQotICAgIC8vIFN0ZXAgMTIuNS4xMQotICAgIG1fcmVnaW9uTGlz
dC5hcHBlbmQocmVnaW9uKTsKLX0KLQogYm9vbCBXZWJWVFRQYXJzZXI6OmNvbGxlY3RUaW1lU3Rh
bXAoY29uc3QgU3RyaW5nJiBsaW5lLCBNZWRpYVRpbWUmIHRpbWVTdGFtcCkKIHsKICAgICBpZiAo
bGluZS5pc0VtcHR5KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBh
cnNlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFy
c2VyLmgJKHJldmlzaW9uIDIzNjIxMikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2Vi
VlRUUGFyc2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw2ICsxMDMsNyBAQCBwdWJsaWM6CiAg
ICAgICAgIElkLAogICAgICAgICBUaW1pbmdzQW5kU2V0dGluZ3MsCiAgICAgICAgIEN1ZVRleHQs
CisgICAgICAgIFJlZ2lvbiwKICAgICAgICAgQmFkQ3VlLAogICAgICAgICBGaW5pc2hlZAogICAg
IH07CkBAIC0xMTgsNiArMTE5LDE0IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHx8IHRhZ05hbWUg
PT0gcnRUYWc7CiAgICAgfQogCisgICAgc3RhdGljIGlubGluZSBib29sIGlzQVNwYWNlKFVDaGFy
IGMpCisgICAgeworICAgICAgICAvLyBXZWJWVFQgc3BhY2UgY2hhcmFjdGVycyBhcmUgVSswMDIw
IFNQQUNFLCBVKzAwMDkgQ0hBUkFDVEVSCisgICAgICAgIC8vIFRBQlVMQVRJT04gKHRhYiksIFUr
MDAwQSBMSU5FIEZFRUQgKExGKSwgVSswMDBDIEZPUk0gRkVFRCAoRkYpLCBhbmQKKyAgICAgICAg
Ly8gVSswMDBEIENBUlJJQUdFIFJFVFVSTiAoQ1IpLgorICAgICAgICByZXR1cm4gYyA9PSAnICcg
fHwgYyA9PSAnXHQnIHx8IGMgPT0gJ1xuJyB8fCBjID09ICdcZicgfHwgYyA9PSAnXHInOworICAg
IH0KKwogICAgIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1ZhbGlkU2V0dGluZ0RlbGltaXRlcihVQ2hh
ciBjKQogICAgIHsKICAgICAgICAgLy8gLi4uIGEgV2ViVlRUIGN1ZSBjb25zaXN0cyBvZiB6ZXJv
IG9yIG1vcmUgb2YgdGhlIGZvbGxvd2luZyBjb21wb25lbnRzLCBpbiBhbnkgb3JkZXIsIHNlcGFy
YXRlZCBmcm9tIGVhY2ggb3RoZXIgYnkgb25lIG9yIG1vcmUgCkBAIC0xNTcsMTMgKzE2NiwxNSBA
QCBwcml2YXRlOgogICAgIFBhcnNlU3RhdGUgY29sbGVjdEN1ZVRleHQoY29uc3QgU3RyaW5nJik7
CiAgICAgUGFyc2VTdGF0ZSByZWNvdmVyQ3VlKGNvbnN0IFN0cmluZyYpOwogICAgIFBhcnNlU3Rh
dGUgaWdub3JlQmFkQ3VlKGNvbnN0IFN0cmluZyYpOwotCisgICAgUGFyc2VTdGF0ZSBjb2xsZWN0
UmVnaW9uU2V0dGluZ3MoY29uc3QgU3RyaW5nJik7CisgICAgUGFyc2VTdGF0ZSBjb2xsZWN0V2Vi
VlRUQmxvY2soY29uc3QgU3RyaW5nJik7CisgICAgUGFyc2VTdGF0ZSBjaGVja0FuZFJlY292ZXJD
dWUoY29uc3QgU3RyaW5nJiBsaW5lKTsKKyAgICBib29sIGNoZWNrQW5kQ3JlYXRlUmVnaW9uKGNv
bnN0IFN0cmluZyYgbGluZSk7CisgICAgYm9vbCBjaGVja0FuZFN0b3JlUmVnaW9uKGNvbnN0IFN0
cmluZyYgbGluZSk7CisgICAgCiAgICAgdm9pZCBjcmVhdGVOZXdDdWUoKTsKICAgICB2b2lkIHJl
c2V0Q3VlVmFsdWVzKCk7CiAKLSAgICB2b2lkIGNvbGxlY3RNZXRhZGF0YUhlYWRlcihjb25zdCBT
dHJpbmcmKTsKLSAgICB2b2lkIGNyZWF0ZU5ld1JlZ2lvbihjb25zdCBTdHJpbmcmIGhlYWRlclZh
bHVlKTsKLQogICAgIHN0YXRpYyBib29sIGNvbGxlY3RUaW1lU3RhbXAoVlRUU2Nhbm5lciYgaW5w
dXQsIE1lZGlhVGltZSYgdGltZVN0YW1wKTsKIAogICAgIEJ1ZmZlcmVkTGluZVJlYWRlciBtX2xp
bmVSZWFkZXI7CkBAIC0xNzIsOCArMTgzLDEwIEBAIHByaXZhdGU6CiAgICAgTWVkaWFUaW1lIG1f
Y3VycmVudFN0YXJ0VGltZTsKICAgICBNZWRpYVRpbWUgbV9jdXJyZW50RW5kVGltZTsKICAgICBT
dHJpbmdCdWlsZGVyIG1fY3VycmVudENvbnRlbnQ7CisgICAgU3RyaW5nIG1fcHJldmlvdXNMaW5l
OwogICAgIFN0cmluZyBtX2N1cnJlbnRTZXR0aW5nczsKLQorICAgIFJlZlB0cjxWVFRSZWdpb24+
IG1fY3VycmVudFJlZ2lvbjsKKyAgICAKICAgICBXZWJWVFRQYXJzZXJDbGllbnQqIG1fY2xpZW50
OwogCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJWVFRDdWVEYXRhPj4gbV9jdWVsaXN0OwpJbmRleDog
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv
ZwkocmV2aXNpb24gMjM2MjEyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDktMTkgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJWVFRdIFVwZGF0ZSB0aGUgcGFyc2VyIGFjY29y
ZGluZyB0byB0aGUgbmV3IHJlZ2lvbiBzeW50YXguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBFcmlj
IENhcmxzb24uCisKKyAgICAgICAgKiBtZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlv
bnMtcmVnaW9ucy52dHQ6CisgICAgICAgICogbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2hl
YWRlci1yZWdpb25zLnZ0dDoKKyAgICAgICAgKiBtZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92
dHQtcmVnaW9uLXBhcnNlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVkaWEvdHJhY2svcmVn
aW9ucy13ZWJ2dHQvdnR0LXJlZ2lvbi1wYXJzZXIuaHRtbDoKKwogMjAxOC0wOS0xOSAgWW91ZW5u
IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IFRlc3Qgd2VicnRj
L3ZpZGVvLW11dGUuaHRtbCBpcyBmbGFreS4KSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNr
L2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1yZWdpb25zLnZ0dAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv
dXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtcmVnaW9ucy52dHQJ
KHJldmlzaW9uIDIzNjIxMikKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdl
YnZ0dC9jYXB0aW9ucy1yZWdpb25zLnZ0dAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDExIEBA
CiBXRUJWVFQgRklMRQotUmVnaW9uOiBpZD1mcmVkIHdpZHRoPTUwJSBoZWlnaHQ9MiByZWdpb25h
bmNob3I9NTAlLDEwMCUgdmlld3BvcnRhbmNob3I9MTAlLDQwJQorCitSRUdJT04KK2lkPWZyZWQK
K3dpZHRoPTUwJQoraGVpZ2h0PTIKK3JlZ2lvbmFuY2hvcj01MCUsMTAwJQordmlld3BvcnRhbmNo
b3I9MTAlLDQwJQogCiAxCiAwMDowMDowMC4wMDAgLS0+IDAwOjAwOjAxLjUwMCByZWdpb246ZnJl
ZApAQCAtMTYsNCArMjIsNCBAQCBDdWUKIAogNAogMDA6MDA6MDIuMDAwIC0tPiAwMDowMDowMy4w
MDAgcmVnaW9uOmZyZWQKLUZvdXJ0aCBjdWUhClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQor
Rm91cnRoIGN1ZSEKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0
dC9oZWFkZXItcmVnaW9ucy52dHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJh
Y2svY2FwdGlvbnMtd2VidnR0L2hlYWRlci1yZWdpb25zLnZ0dAkocmV2aXNpb24gMjM2MjEyKQor
KysgTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2hlYWRlci1yZWdpb25z
LnZ0dAkod29ya2luZyBjb3B5KQpAQCAtMSwxMCArMSwzMSBAQAogV0VCVlRUIEZJTEUKLVJlZ2lv
bjogaWQ9cmVnaW9uX3dpdGhvdXRfc2V0dGluZ3MKLVJlZ2lvbjogaWQ9cmVnaW9uX3dpdGhfYWxs
X3NldHRpbmdzIHdpZHRoPTMyJSBoZWlnaHQ9NSByZWdpb25hbmNob3I9NDElLDIwJSB2aWV3cG9y
dGFuY2hvcj0zMSUsODQlIHNjcm9sbD11cAotUmVnaW9uOiBpZD1yZWdpb25fZmxvYXRpbmdfcG9p
bnRfYW5jaG9yIHJlZ2lvbmFuY2hvcj00MS4xMzMlLDIwLjQyJSB2aWV3cG9ydGFuY2hvcj0zMi4z
MyUsMzIuNDQlCi1SZWdpb246IGlkPW5vdF91bmlxdWVfaWQgd2lkdGg9NDIlCi1SZWdpb246IGlk
PW5vdF91bmlxdWVfaWQgd2lkdGg9NjclCi1SZWdpb246IGludmFsaWRfc2V0dGluZ3MgdmFsdWVz
IGJ1dCByZWdpb24gc3RpbGwgY3JlYXRlZAorCitSRUdJT04KK2lkPXJlZ2lvbl93aXRob3V0X3Nl
dHRpbmdzCisKK1JFR0lPTgoraWQ9cmVnaW9uX3dpdGhfYWxsX3NldHRpbmdzCit3aWR0aD0zMiUK
K2hlaWdodD01CityZWdpb25hbmNob3I9NDElLDIwJQordmlld3BvcnRhbmNob3I9MzElLDg0JQor
c2Nyb2xsPXVwCisKK1JFR0lPTgoraWQ9cmVnaW9uX2Zsb2F0aW5nX3BvaW50X2FuY2hvcgorcmVn
aW9uYW5jaG9yPTQxLjEzMyUsMjAuNDIlCit2aWV3cG9ydGFuY2hvcj0zMi4zMyUsMzIuNDQlCisK
K1JFR0lPTgoraWQ9bm90X3VuaXF1ZV9pZAord2lkdGg9NDIlCisKK1JFR0lPTgoraWQ9bm90X3Vu
aXF1ZV9pZAord2lkdGg9NjclCisKK1JFR0lPTgoraW52YWxpZF9zZXR0aW5ncyB2YWx1ZXMgYnV0
IHJlZ2lvbiBzdGlsbCBjcmVhdGVkCiA6IEludmFsaWQgSGVhZGVyCiAKIDEKSW5kZXg6IExheW91
dFRlc3RzL21lZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLWV4cGVj
dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdl
YnZ0dC92dHQtcmVnaW9uLXBhcnNlci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIzNjIxMikKKysr
IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2Vy
LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAKIFRlc3RzIHByb3Bl
ciBwYXJzaW5nIG9mIHZhcmlvdXMgcmVnaW9ucyBwcmVzZW50IGluIFdlYlZUVCBoZWFkZXIgYXJl
YS4KIAogCi1FWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCA9PSAn
NScpIE9LCitFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCA9PSAn
NCcpIE9LCiAKIEVYUEVDVEVEIChyZWdpb24uaWQgPT0gJ3JlZ2lvbl93aXRob3V0X3NldHRpbmdz
JykgT0sKIApAQCAtMjMsNyArMjMsNSBAQCBFWFBFQ1RFRCAoTWF0aC5yb3VuZChyZWdpb24udmll
d3BvcnRBbmNoCiBFWFBFQ1RFRCAocmVnaW9uLmlkID09ICdub3RfdW5pcXVlX2lkJykgT0sKIEVY
UEVDVEVEIChyZWdpb24ud2lkdGggPT0gJzY3JykgT0sKIAotRVhQRUNURUQgKHJlZ2lvbi5pZCA9
PSAnJykgT0sKLQogRU5EIE9GIFRFU1QKIApJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2sv
cmVnaW9ucy13ZWJ2dHQvdnR0LXJlZ2lvbi1wYXJzZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv
dXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92dHQtcmVnaW9uLXBhcnNlci5odG1s
CShyZXZpc2lvbiAyMzYyMTIpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdl
YnZ0dC92dHQtcmVnaW9uLXBhcnNlci5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNiw3ICsxNiw3
IEBACiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKLSAg
ICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0
aCIsIDUpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzBdLnJl
Z2lvbnMubGVuZ3RoIiwgNCk7CiAKICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CiAgICAg
ICAgICAgICByZWdpb24gPSB2aWRlby50ZXh0VHJhY2tzWzBdLnJlZ2lvbnNbMF07CkBAIC00Nywx
MCArNDcsNiBAQAogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJyZWdpb24ud2lkdGgiLCA2Nyk7
CiAKICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7Ci0gICAgICAgICAgICByZWdpb24gPSB2
aWRlby50ZXh0VHJhY2tzWzBdLnJlZ2lvbnNbNF07Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo
InJlZ2lvbi5pZCIsICIiKTsKLQotICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKICAgICAg
ICAgICAgIGVuZFRlc3QoKTsKICAgICAgICAgfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>350217</attachid>
            <date>2018-09-20 09:32:32 -0700</date>
            <delta_ts>2018-09-20 10:07:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-189767-20180920093232.patch</filename>
            <type>text/plain</type>
            <size>14380</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjI1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA5LTE5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViVlRUXSBVcGRhdGUg
dGhlIHBhcnNlciBhY2NvcmRpbmcgdG8gdGhlIG5ldyByZWdpb24gc3ludGF4LgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NzY3CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFRoZSBtYWpvcml0eSBvZiB0aGUg
Y29kZSBhZGRlZCBpbiB0aGlzIHBhdGNoIGlzIGFkb3B0ZWQgZnJvbSB0aGUgQ2hyb21pdW0gcHJv
amVjdCwgd2hpY2ggaGFzIGFkZGVkCisgICAgICAgIHN1cHBvcnQgZm9yIHRoZSBuZXcgcmVnaW9u
IHN5bnRheC4gVGhlIGNvbXBsZXRlIHBhcnNlciBzcGVjaWZpY2F0aW9uIGNhbiBiZSBmb3VuZCBh
dAorICAgICAgICBodHRwczovL3czYy5naXRodWIuaW8vd2VidnR0LyNmaWxlLXBhcnNpbmcuIE9u
ZSBzbWFsbCBkaWZmZXJlbmNlIGluIGJlaGF2aW9yIGlzIHRoYXQgdGhlIG5ldyBwYXJzZXIKKyAg
ICAgICAgd2lsbCBub3QgYWRkIHJlZ2lvbnMgd2l0aCBlbXB0eSBpZC4KKworICAgICAgICBObyBu
ZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBodG1sL3Ry
YWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6Omdl
dE5ld1JlZ2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViVlRUUGFyc2VyOjpwYXJzZSk6Cisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RSZWdpb25TZXR0aW5ncyk6Cisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RXZWJWVFRCbG9jayk6CisgICAg
ICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNoZWNrQW5kUmVjb3ZlckN1ZSk6CisgICAgICAg
IChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNoZWNrQW5kQ3JlYXRlUmVnaW9uKToKKyAgICAgICAg
KFdlYkNvcmU6OldlYlZUVFBhcnNlcjo6Y2hlY2tBbmRTdG9yZVJlZ2lvbik6CisgICAgICAgIChX
ZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbGxlY3RNZXRhZGF0YUhlYWRlcik6IERlbGV0ZWQuCisg
ICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNyZWF0ZU5ld1JlZ2lvbik6IERlbGV0ZWQu
CisgICAgICAgICogaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaDoKKwogMjAxOC0wOS0yMCAgQWxp
Y2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW01TRV0gVXNl
IHNvbWUgdG9sZXJhbmNlIHdoZW4gZGVjaWRpbmcgd2hldGhlciBhIGZyYW1lIHNob3VsZCBiZSBh
cHBlbmRlZCB0byB0aGUgZGVjb2RlIHF1ZXVlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3Ry
YWNrL1dlYlZUVFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90
cmFjay9XZWJWVFRQYXJzZXIuY3BwCShyZXZpc2lvbiAyMzYyNTgpCisrKyBTb3VyY2UvV2ViQ29y
ZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUx
LDcgQEAgY29uc3QgZG91YmxlIHNlY29uZHNQZXJNaW51dGUgPSA2MDsKIGNvbnN0IGRvdWJsZSBz
ZWNvbmRzUGVyTWlsbGlzZWNvbmQgPSAwLjAwMTsKIGNvbnN0IGNoYXIqIGZpbGVJZGVudGlmaWVy
ID0gIldFQlZUVCI7CiBjb25zdCB1bnNpZ25lZCBmaWxlSWRlbnRpZmllckxlbmd0aCA9IDY7Citj
b25zdCB1bnNpZ25lZCByZWdpb25JZGVudGlmaWVyTGVuZ3RoID0gNjsKIAogYm9vbCBXZWJWVFRQ
YXJzZXI6OnBhcnNlRmxvYXRQZXJjZW50YWdlVmFsdWUoVlRUU2Nhbm5lciYgdmFsdWVTY2FubmVy
LCBmbG9hdCYgcGVyY2VudGFnZSkKIHsKQEAgLTEwMSw4ICsxMDIsNyBAQCB2b2lkIFdlYlZUVFBh
cnNlcjo6Z2V0TmV3Q3VlcyhWZWN0b3I8UmVmCiAKIHZvaWQgV2ViVlRUUGFyc2VyOjpnZXROZXdS
ZWdpb25zKFZlY3RvcjxSZWZQdHI8VlRUUmVnaW9uPj4mIG91dHB1dFJlZ2lvbnMpCiB7Ci0gICAg
b3V0cHV0UmVnaW9ucyA9IG1fcmVnaW9uTGlzdDsKLSAgICBtX3JlZ2lvbkxpc3QuY2xlYXIoKTsK
KyAgICBvdXRwdXRSZWdpb25zID0gV1RGTW92ZShtX3JlZ2lvbkxpc3QpOwogfQogCiB2b2lkIFdl
YlZUVFBhcnNlcjo6cGFyc2VGaWxlSGVhZGVyKFN0cmluZyYmIGRhdGEpCkBAIC0xNjYsMjAgKzE2
NiwxMiBAQCB2b2lkIFdlYlZUVFBhcnNlcjo6cGFyc2UoKQogICAgICAgICAgICAgYnJlYWs7CiAK
ICAgICAgICAgY2FzZSBIZWFkZXI6Ci0gICAgICAgICAgICBjb2xsZWN0TWV0YWRhdGFIZWFkZXIo
KmxpbmUpOwotCi0gICAgICAgICAgICBpZiAobGluZS0+aXNFbXB0eSgpKSB7Ci0gICAgICAgICAg
ICAgICAgLy8gU3RlcHMgMTAtMTQgLSBBbGxvdyBhIGhlYWRlciAoY29tbWVudCBhcmVhKSB1bmRl
ciB0aGUgV0VCVlRUIGxpbmUuCi0gICAgICAgICAgICAgICAgaWYgKG1fY2xpZW50ICYmIG1fcmVn
aW9uTGlzdC5zaXplKCkpCi0gICAgICAgICAgICAgICAgICAgIG1fY2xpZW50LT5uZXdSZWdpb25z
UGFyc2VkKCk7Ci0gICAgICAgICAgICAgICAgbV9zdGF0ZSA9IElkOwotICAgICAgICAgICAgICAg
IGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gU3RlcCAxNSAtIEJyZWFrIG91
dCBvZiBoZWFkZXIgbG9vcCBpZiB0aGUgbGluZSBjb3VsZCBiZSBhIHRpbWVzdGFtcCBsaW5lLgot
ICAgICAgICAgICAgaWYgKGxpbmUtPmNvbnRhaW5zKCItLT4iKSkKLSAgICAgICAgICAgICAgICBt
X3N0YXRlID0gcmVjb3ZlckN1ZSgqbGluZSk7CisgICAgICAgICAgICAvLyBTdGVwcyAxMSAtIDE0
IC0gQ29sbGVjdCBXZWJWVFQgYmxvY2sKKyAgICAgICAgICAgIG1fc3RhdGUgPSBjb2xsZWN0V2Vi
VlRUQmxvY2soKmxpbmUpOworICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAgIC8vIFN0
ZXAgMTYgLSBMaW5lIGlzIG5vdCB0aGUgZW1wdHkgc3RyaW5nIGFuZCBkb2VzIG5vdCBjb250YWlu
ICItLT4iLgorICAgICAgICBjYXNlIFJlZ2lvbjoKKyAgICAgICAgICAgIG1fc3RhdGUgPSBjb2xs
ZWN0UmVnaW9uU2V0dGluZ3MoKmxpbmUpOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg
Y2FzZSBJZDoKQEAgLTI0OSwyOCArMjQxLDg5IEBAIGJvb2wgV2ViVlRUUGFyc2VyOjpoYXNSZXF1
aXJlZEZpbGVJZGVudGkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJWVFRQYXJzZXI6
OmNvbGxlY3RNZXRhZGF0YUhlYWRlcihjb25zdCBTdHJpbmcmIGxpbmUpCitXZWJWVFRQYXJzZXI6
OlBhcnNlU3RhdGUgV2ViVlRUUGFyc2VyOjpjb2xsZWN0UmVnaW9uU2V0dGluZ3MoY29uc3QgU3Ry
aW5nJiBsaW5lKQogewotICAgIC8vIFdlYlZUVCBoZWFkZXIgcGFyc2luZyAoV2ViVlRUIHBhcnNl
ciBhbGdvcml0aG0gc3RlcCAxMikKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRv
bWljU3RyaW5nPiByZWdpb25IZWFkZXJOYW1lKCJSZWdpb24iLCBBdG9taWNTdHJpbmc6OkNvbnN0
cnVjdEZyb21MaXRlcmFsKTsKKyAgICAvLyBFbmQgb2YgcmVnaW9uIGJsb2NrCisgICAgaWYgKGNo
ZWNrQW5kU3RvcmVSZWdpb24obGluZSkpCisgICAgICAgIHJldHVybiBjaGVja0FuZFJlY292ZXJD
dWUobGluZSk7CisgICAgCisgICAgbV9jdXJyZW50UmVnaW9uLT5zZXRSZWdpb25TZXR0aW5ncyhs
aW5lKTsKKyAgICByZXR1cm4gUmVnaW9uOworfQogCi0gICAgLy8gU3RlcCAxMi40IElmIGxpbmUg
Y29udGFpbnMgdGhlIGNoYXJhY3RlciAiOiIgKEEgVSswMDNBIENPTE9OKSwgdGhlbiBzZXQgbWV0
YWRhdGEncwotICAgIC8vIG5hbWUgdG8gdGhlIHN1YnN0cmluZyBvZiBsaW5lIGJlZm9yZSB0aGUg
Zmlyc3QgIjoiIGNoYXJhY3RlciBhbmQKLSAgICAvLyBtZXRhZGF0YSdzIHZhbHVlIHRvIHRoZSBz
dWJzdHJpbmcgYWZ0ZXIgdGhpcyBjaGFyYWN0ZXIuCi0gICAgc2l6ZV90IGNvbG9uUG9zaXRpb24g
PSBsaW5lLmZpbmQoJzonKTsKLSAgICBpZiAoY29sb25Qb3NpdGlvbiA9PSBub3RGb3VuZCkKLSAg
ICAgICAgcmV0dXJuOwotCi0gICAgU3RyaW5nIGhlYWRlck5hbWUgPSBsaW5lLnN1YnN0cmluZygw
LCBjb2xvblBvc2l0aW9uKTsKLQotICAgIC8vIFN0ZXAgMTIuNSBJZiBtZXRhZGF0YSdzIG5hbWUg
ZXF1YWxzICJSZWdpb24iOgotICAgIGlmIChoZWFkZXJOYW1lID09IHJlZ2lvbkhlYWRlck5hbWUp
IHsKLSAgICAgICAgU3RyaW5nIGhlYWRlclZhbHVlID0gbGluZS5zdWJzdHJpbmcoY29sb25Qb3Np
dGlvbiArIDEsIGxpbmUubGVuZ3RoKCkgLSAxKTsKLSAgICAgICAgLy8gU3RlcHMgMTIuNS4xIC0g
MTIuNS4xMSBSZWdpb24gY3JlYXRpb246IExldCByZWdpb24gYmUgYSBuZXcgdGV4dCB0cmFjayBy
ZWdpb24gWy4uLl0KLSAgICAgICAgY3JlYXRlTmV3UmVnaW9uKGhlYWRlclZhbHVlKTsKK1dlYlZU
VFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNvbGxlY3RXZWJWVFRCbG9jayhjb25z
dCBTdHJpbmcmIGxpbmUpCit7CisgICAgLy8gY29sbGVjdCBhIFdlYlZUVCBibG9jayBwYXJzaW5n
LiAoV2ViVlRUIHBhcnNlciBhbGdvcml0aG0gc3RlcCAxNCkKKyAgICAKKyAgICBpZiAoY2hlY2tB
bmRDcmVhdGVSZWdpb24obGluZSkpCisgICAgICAgIHJldHVybiBSZWdpb247CisgICAgCisgICAg
Ly8gSGFuZGxlIGN1ZSBibG9jay4KKyAgICBQYXJzZVN0YXRlIHN0YXRlID0gY2hlY2tBbmRSZWNv
dmVyQ3VlKGxpbmUpOworICAgIGlmIChzdGF0ZSAhPSBIZWFkZXIpIHsKKyAgICAgICAgaWYgKG1f
Y2xpZW50ICYmICFtX3JlZ2lvbkxpc3QuaXNFbXB0eSgpKQorICAgICAgICAgICAgbV9jbGllbnQt
Pm5ld1JlZ2lvbnNQYXJzZWQoKTsKKyAgICAgICAgaWYgKCFtX3ByZXZpb3VzTGluZS5pc0VtcHR5
KCkgJiYgIW1fcHJldmlvdXNMaW5lLmNvbnRhaW5zKCItLT4iKSkKKyAgICAgICAgICAgIG1fY3Vy
cmVudElkID0gbV9wcmV2aW91c0xpbmU7CisgICAgICAgIAorICAgICAgICByZXR1cm4gc3RhdGU7
CisgICAgfQorICAgIAorICAgIC8vIHN0b3JlIHByZXZpb3VzIGxpbmUgZm9yIGN1ZSBpZC4KKyAg
ICAvLyBsZW5ndGggaXMgbW9yZSB0aGFuIDEgbGluZSBjbGVhciBtX3ByZXZpb3VzTGluZSBhbmQg
aWdub3JlIGxpbmUuCisgICAgaWYgKG1fcHJldmlvdXNMaW5lLmlzRW1wdHkoKSkKKyAgICAgICAg
bV9wcmV2aW91c0xpbmUgPSBsaW5lOworICAgIGVsc2UKKyAgICAgICAgbV9wcmV2aW91c0xpbmUg
PSBlbXB0eVN0cmluZygpOworCisgICAgcmV0dXJuIHN0YXRlOworfQorCitXZWJWVFRQYXJzZXI6
OlBhcnNlU3RhdGUgV2ViVlRUUGFyc2VyOjpjaGVja0FuZFJlY292ZXJDdWUoY29uc3QgU3RyaW5n
JiBsaW5lKQoreworICAgIC8vIHBhcnNlIGN1ZSB0aW1pbmdzIGFuZCBzZXR0aW5ncworICAgIGlm
IChsaW5lLmNvbnRhaW5zKCItLT4iKSkgeworICAgICAgICBQYXJzZVN0YXRlIHN0YXRlID0gcmVj
b3ZlckN1ZShsaW5lKTsKKyAgICAgICAgaWYgKHN0YXRlICE9IEJhZEN1ZSkKKyAgICAgICAgICAg
IHJldHVybiBzdGF0ZTsKICAgICB9CisgICAgcmV0dXJuIEhlYWRlcjsKIH0KIAorYm9vbCBXZWJW
VFRQYXJzZXI6OmNoZWNrQW5kQ3JlYXRlUmVnaW9uKGNvbnN0IFN0cmluZyYgbGluZSkKK3sKKyAg
ICBpZiAobV9wcmV2aW91c0xpbmUuY29udGFpbnMoIi0tPiIpKQorICAgICAgICByZXR1cm4gZmFs
c2U7CisgICAgLy8gbGluZSBzdGFydHMgd2l0aCB0aGUgc3Vic3RyaW5nICJSRUdJT04iIGFuZCBy
ZW1haW5pbmcgY2hhcmFjdGVycworICAgIC8vIHplcm8gb3IgbW9yZSBVKzAwMjAgU1BBQ0UgY2hh
cmFjdGVycyBvciBVKzAwMDkgQ0hBUkFDVEVSIFRBQlVMQVRJT04KKyAgICAvLyAodGFiKSBjaGFy
YWN0ZXJzIGV4cGVjdGVkIG90aGVyIHRoYW4gdGhlc2UgY2hhcmVjdGVycyBpdCBpcyBpbnZhbGlk
LgorICAgIGlmIChsaW5lLnN0YXJ0c1dpdGgoIlJFR0lPTiIpICYmIGxpbmUuc3Vic3RyaW5nKHJl
Z2lvbklkZW50aWZpZXJMZW5ndGgpLmlzQWxsU3BlY2lhbENoYXJhY3RlcnM8aXNBU3BhY2U+KCkp
IHsKKyAgICAgICAgbV9jdXJyZW50UmVnaW9uID0gVlRUUmVnaW9uOjpjcmVhdGUoKm1fc2NyaXB0
RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1
cm4gZmFsc2U7Cit9CisKK2Jvb2wgV2ViVlRUUGFyc2VyOjpjaGVja0FuZFN0b3JlUmVnaW9uKGNv
bnN0IFN0cmluZyYgbGluZSkKK3sKKyAgICBpZiAoIWxpbmUuaXNFbXB0eSgpICYmICFsaW5lLmNv
bnRhaW5zKCItLT4iKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIGlmICghbV9j
dXJyZW50UmVnaW9uLT5pZCgpLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBJZiB0aGUgdGV4dCB0
cmFjayBsaXN0IG9mIHJlZ2lvbnMgcmVnaW9ucyBjb250YWlucyBhIHJlZ2lvbgorICAgICAgICAv
LyB3aXRoIHRoZSBzYW1lIHJlZ2lvbiBpZGVudGlmaWVyIHZhbHVlIGFzIHJlZ2lvbiwgcmVtb3Zl
IHRoYXQgcmVnaW9uLgorICAgICAgICBmb3IgKGF1dG8gcmVnaW9uIDogbV9yZWdpb25MaXN0KSB7
CisgICAgICAgICAgICBpZiAocmVnaW9uLT5pZCgpID09IG1fY3VycmVudFJlZ2lvbi0+aWQoKSkg
eworICAgICAgICAgICAgICAgIG1fcmVnaW9uTGlzdC5yZW1vdmVGaXJzdChyZWdpb24pOworICAg
ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIG1f
cmVnaW9uTGlzdC5hcHBlbmQobV9jdXJyZW50UmVnaW9uKTsKKyAgICB9CisgICAgbV9jdXJyZW50
UmVnaW9uID0gbnVsbHB0cjsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyAgICAKIFdlYlZUVFBhcnNl
cjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNvbGxlY3RDdWVJZChjb25zdCBTdHJpbmcmIGxp
bmUpCiB7CiAgICAgaWYgKGxpbmUuY29udGFpbnMoIi0tPiIpKQpAQCAtNDIyLDI3ICs0NzUsNiBA
QCB2b2lkIFdlYlZUVFBhcnNlcjo6cmVzZXRDdWVWYWx1ZXMoKQogICAgIG1fY3VycmVudENvbnRl
bnQuY2xlYXIoKTsKIH0KIAotdm9pZCBXZWJWVFRQYXJzZXI6OmNyZWF0ZU5ld1JlZ2lvbihjb25z
dCBTdHJpbmcmIGhlYWRlclZhbHVlKQotewotICAgIGlmIChoZWFkZXJWYWx1ZS5pc0VtcHR5KCkp
Ci0gICAgICAgIHJldHVybjsKLQotICAgIC8vIFN0ZXBzIDEyLjUuMSAtIDEyLjUuOSAtIENvbnN0
cnVjdCBhbmQgaW5pdGlhbGl6ZSBhIFdlYlZUVCBSZWdpb24gb2JqZWN0LgotICAgIFJlZlB0cjxW
VFRSZWdpb24+IHJlZ2lvbiA9IFZUVFJlZ2lvbjo6Y3JlYXRlKCptX3NjcmlwdEV4ZWN1dGlvbkNv
bnRleHQpOwotICAgIHJlZ2lvbi0+c2V0UmVnaW9uU2V0dGluZ3MoaGVhZGVyVmFsdWUpOwotCi0g
ICAgLy8gU3RlcCAxMi41LjEwIElmIHRoZSB0ZXh0IHRyYWNrIGxpc3Qgb2YgcmVnaW9ucyByZWdp
b25zIGNvbnRhaW5zIGEgcmVnaW9uCi0gICAgLy8gd2l0aCB0aGUgc2FtZSByZWdpb24gaWRlbnRp
ZmllciB2YWx1ZSBhcyByZWdpb24sIHJlbW92ZSB0aGF0IHJlZ2lvbi4KLSAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IG1fcmVnaW9uTGlzdC5zaXplKCk7ICsraSkKLSAgICAgICAgaWYgKG1fcmVn
aW9uTGlzdFtpXS0+aWQoKSA9PSByZWdpb24tPmlkKCkpIHsKLSAgICAgICAgICAgIG1fcmVnaW9u
TGlzdC5yZW1vdmUoaSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgLy8g
U3RlcCAxMi41LjExCi0gICAgbV9yZWdpb25MaXN0LmFwcGVuZChyZWdpb24pOwotfQotCiBib29s
IFdlYlZUVFBhcnNlcjo6Y29sbGVjdFRpbWVTdGFtcChjb25zdCBTdHJpbmcmIGxpbmUsIE1lZGlh
VGltZSYgdGltZVN0YW1wKQogewogICAgIGlmIChsaW5lLmlzRW1wdHkoKSkKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaAkocmV2aXNpb24gMjM2MjU4KQorKysg
U291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaAkod29ya2luZyBjb3B5KQpA
QCAtMTAzLDYgKzEwMyw3IEBAIHB1YmxpYzoKICAgICAgICAgSWQsCiAgICAgICAgIFRpbWluZ3NB
bmRTZXR0aW5ncywKICAgICAgICAgQ3VlVGV4dCwKKyAgICAgICAgUmVnaW9uLAogICAgICAgICBC
YWRDdWUsCiAgICAgICAgIEZpbmlzaGVkCiAgICAgfTsKQEAgLTExOCw2ICsxMTksMTQgQEAgcHVi
bGljOgogICAgICAgICAgICAgfHwgdGFnTmFtZSA9PSBydFRhZzsKICAgICB9CiAKKyAgICBzdGF0
aWMgaW5saW5lIGJvb2wgaXNBU3BhY2UoVUNoYXIgYykKKyAgICB7CisgICAgICAgIC8vIFdlYlZU
VCBzcGFjZSBjaGFyYWN0ZXJzIGFyZSBVKzAwMjAgU1BBQ0UsIFUrMDAwOSBDSEFSQUNURVIKKyAg
ICAgICAgLy8gVEFCVUxBVElPTiAodGFiKSwgVSswMDBBIExJTkUgRkVFRCAoTEYpLCBVKzAwMEMg
Rk9STSBGRUVEIChGRiksIGFuZAorICAgICAgICAvLyBVKzAwMEQgQ0FSUklBR0UgUkVUVVJOIChD
UikuCisgICAgICAgIHJldHVybiBjID09ICcgJyB8fCBjID09ICdcdCcgfHwgYyA9PSAnXG4nIHx8
IGMgPT0gJ1xmJyB8fCBjID09ICdccic7CisgICAgfQorCiAgICAgc3RhdGljIGlubGluZSBib29s
IGlzVmFsaWRTZXR0aW5nRGVsaW1pdGVyKFVDaGFyIGMpCiAgICAgewogICAgICAgICAvLyAuLi4g
YSBXZWJWVFQgY3VlIGNvbnNpc3RzIG9mIHplcm8gb3IgbW9yZSBvZiB0aGUgZm9sbG93aW5nIGNv
bXBvbmVudHMsIGluIGFueSBvcmRlciwgc2VwYXJhdGVkIGZyb20gZWFjaCBvdGhlciBieSBvbmUg
b3IgbW9yZSAKQEAgLTE1NywxMyArMTY2LDE1IEBAIHByaXZhdGU6CiAgICAgUGFyc2VTdGF0ZSBj
b2xsZWN0Q3VlVGV4dChjb25zdCBTdHJpbmcmKTsKICAgICBQYXJzZVN0YXRlIHJlY292ZXJDdWUo
Y29uc3QgU3RyaW5nJik7CiAgICAgUGFyc2VTdGF0ZSBpZ25vcmVCYWRDdWUoY29uc3QgU3RyaW5n
Jik7Ci0KKyAgICBQYXJzZVN0YXRlIGNvbGxlY3RSZWdpb25TZXR0aW5ncyhjb25zdCBTdHJpbmcm
KTsKKyAgICBQYXJzZVN0YXRlIGNvbGxlY3RXZWJWVFRCbG9jayhjb25zdCBTdHJpbmcmKTsKKyAg
ICBQYXJzZVN0YXRlIGNoZWNrQW5kUmVjb3ZlckN1ZShjb25zdCBTdHJpbmcmIGxpbmUpOworICAg
IGJvb2wgY2hlY2tBbmRDcmVhdGVSZWdpb24oY29uc3QgU3RyaW5nJiBsaW5lKTsKKyAgICBib29s
IGNoZWNrQW5kU3RvcmVSZWdpb24oY29uc3QgU3RyaW5nJiBsaW5lKTsKKyAgICAKICAgICB2b2lk
IGNyZWF0ZU5ld0N1ZSgpOwogICAgIHZvaWQgcmVzZXRDdWVWYWx1ZXMoKTsKIAotICAgIHZvaWQg
Y29sbGVjdE1ldGFkYXRhSGVhZGVyKGNvbnN0IFN0cmluZyYpOwotICAgIHZvaWQgY3JlYXRlTmV3
UmVnaW9uKGNvbnN0IFN0cmluZyYgaGVhZGVyVmFsdWUpOwotCiAgICAgc3RhdGljIGJvb2wgY29s
bGVjdFRpbWVTdGFtcChWVFRTY2FubmVyJiBpbnB1dCwgTWVkaWFUaW1lJiB0aW1lU3RhbXApOwog
CiAgICAgQnVmZmVyZWRMaW5lUmVhZGVyIG1fbGluZVJlYWRlcjsKQEAgLTE3Miw4ICsxODMsMTAg
QEAgcHJpdmF0ZToKICAgICBNZWRpYVRpbWUgbV9jdXJyZW50U3RhcnRUaW1lOwogICAgIE1lZGlh
VGltZSBtX2N1cnJlbnRFbmRUaW1lOwogICAgIFN0cmluZ0J1aWxkZXIgbV9jdXJyZW50Q29udGVu
dDsKKyAgICBTdHJpbmcgbV9wcmV2aW91c0xpbmU7CiAgICAgU3RyaW5nIG1fY3VycmVudFNldHRp
bmdzOwotCisgICAgUmVmUHRyPFZUVFJlZ2lvbj4gbV9jdXJyZW50UmVnaW9uOworICAgIAogICAg
IFdlYlZUVFBhcnNlckNsaWVudCogbV9jbGllbnQ7CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYlZU
VEN1ZURhdGE+PiBtX2N1ZWxpc3Q7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYyNTgpCisrKyBMYXlv
dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0w
OS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dl
YlZUVF0gVXBkYXRlIHRoZSBwYXJzZXIgYWNjb3JkaW5nIHRvIHRoZSBuZXcgcmVnaW9uIHN5bnRh
eC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTc2
NworCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIG1lZGlh
L3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1yZWdpb25zLnZ0dDoKKyAgICAgICAgKiBt
ZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvaGVhZGVyLXJlZ2lvbnMudnR0OgorICAgICAgICAq
IG1lZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLWV4cGVjdGVkLnR4
dDoKKyAgICAgICAgKiBtZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92dHQtcmVnaW9uLXBhcnNl
ci5odG1sOgorCiAyMDE4LTA5LTE5ICBZYWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0
YXRob21lLmNvbT4KIAogICAgICAgICBbRU1FXVtXUEVdIEFkZCBXZWJNIGluaXREYXRhIGluIHRo
ZSBleHBlY3RlZCByZXN1bHQgb2YgY2xlYXJrZXktZ2VuZXJhdGUtcmVxdWVzdC1kaXNhbGxvd2Vk
LWlucHV0IHRlc3QKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0
dC9jYXB0aW9ucy1yZWdpb25zLnZ0dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90
cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtcmVnaW9ucy52dHQJKHJldmlzaW9uIDIzNjI1
OCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1y
ZWdpb25zLnZ0dAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDExIEBACiBXRUJWVFQgRklMRQot
UmVnaW9uOiBpZD1mcmVkIHdpZHRoPTUwJSBoZWlnaHQ9MiByZWdpb25hbmNob3I9NTAlLDEwMCUg
dmlld3BvcnRhbmNob3I9MTAlLDQwJQorCitSRUdJT04KK2lkPWZyZWQKK3dpZHRoPTUwJQoraGVp
Z2h0PTIKK3JlZ2lvbmFuY2hvcj01MCUsMTAwJQordmlld3BvcnRhbmNob3I9MTAlLDQwJQogCiAx
CiAwMDowMDowMC4wMDAgLS0+IDAwOjAwOjAxLjUwMCByZWdpb246ZnJlZApAQCAtMTYsNCArMjIs
NCBAQCBDdWUKIAogNAogMDA6MDA6MDIuMDAwIC0tPiAwMDowMDowMy4wMDAgcmVnaW9uOmZyZWQK
LUZvdXJ0aCBjdWUhClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorRm91cnRoIGN1ZSEKSW5k
ZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9oZWFkZXItcmVnaW9u
cy52dHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2Vi
dnR0L2hlYWRlci1yZWdpb25zLnZ0dAkocmV2aXNpb24gMjM2MjU4KQorKysgTGF5b3V0VGVzdHMv
bWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2hlYWRlci1yZWdpb25zLnZ0dAkod29ya2luZyBj
b3B5KQpAQCAtMSwxMCArMSwzMSBAQAogV0VCVlRUIEZJTEUKLVJlZ2lvbjogaWQ9cmVnaW9uX3dp
dGhvdXRfc2V0dGluZ3MKLVJlZ2lvbjogaWQ9cmVnaW9uX3dpdGhfYWxsX3NldHRpbmdzIHdpZHRo
PTMyJSBoZWlnaHQ9NSByZWdpb25hbmNob3I9NDElLDIwJSB2aWV3cG9ydGFuY2hvcj0zMSUsODQl
IHNjcm9sbD11cAotUmVnaW9uOiBpZD1yZWdpb25fZmxvYXRpbmdfcG9pbnRfYW5jaG9yIHJlZ2lv
bmFuY2hvcj00MS4xMzMlLDIwLjQyJSB2aWV3cG9ydGFuY2hvcj0zMi4zMyUsMzIuNDQlCi1SZWdp
b246IGlkPW5vdF91bmlxdWVfaWQgd2lkdGg9NDIlCi1SZWdpb246IGlkPW5vdF91bmlxdWVfaWQg
d2lkdGg9NjclCi1SZWdpb246IGludmFsaWRfc2V0dGluZ3MgdmFsdWVzIGJ1dCByZWdpb24gc3Rp
bGwgY3JlYXRlZAorCitSRUdJT04KK2lkPXJlZ2lvbl93aXRob3V0X3NldHRpbmdzCisKK1JFR0lP
TgoraWQ9cmVnaW9uX3dpdGhfYWxsX3NldHRpbmdzCit3aWR0aD0zMiUKK2hlaWdodD01CityZWdp
b25hbmNob3I9NDElLDIwJQordmlld3BvcnRhbmNob3I9MzElLDg0JQorc2Nyb2xsPXVwCisKK1JF
R0lPTgoraWQ9cmVnaW9uX2Zsb2F0aW5nX3BvaW50X2FuY2hvcgorcmVnaW9uYW5jaG9yPTQxLjEz
MyUsMjAuNDIlCit2aWV3cG9ydGFuY2hvcj0zMi4zMyUsMzIuNDQlCisKK1JFR0lPTgoraWQ9bm90
X3VuaXF1ZV9pZAord2lkdGg9NDIlCisKK1JFR0lPTgoraWQ9bm90X3VuaXF1ZV9pZAord2lkdGg9
NjclCisKK1JFR0lPTgoraW52YWxpZF9zZXR0aW5ncyB2YWx1ZXMgYnV0IHJlZ2lvbiBzdGlsbCBj
cmVhdGVkCiA6IEludmFsaWQgSGVhZGVyCiAKIDEKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3Ry
YWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLWV4cGVjdGVkLnR4dAo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92dHQtcmVnaW9u
LXBhcnNlci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIzNjI1OCkKKysrIExheW91dFRlc3RzL21l
ZGlhL3RyYWNrL3JlZ2lvbnMtd2VidnR0L3Z0dC1yZWdpb24tcGFyc2VyLWV4cGVjdGVkLnR4dAko
d29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAKIFRlc3RzIHByb3BlciBwYXJzaW5nIG9mIHZh
cmlvdXMgcmVnaW9ucyBwcmVzZW50IGluIFdlYlZUVCBoZWFkZXIgYXJlYS4KIAogCi1FWFBFQ1RF
RCAodmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCA9PSAnNScpIE9LCitFWFBFQ1RF
RCAodmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCA9PSAnNCcpIE9LCiAKIEVYUEVD
VEVEIChyZWdpb24uaWQgPT0gJ3JlZ2lvbl93aXRob3V0X3NldHRpbmdzJykgT0sKIApAQCAtMjMs
NyArMjMsNSBAQCBFWFBFQ1RFRCAoTWF0aC5yb3VuZChyZWdpb24udmlld3BvcnRBbmNoCiBFWFBF
Q1RFRCAocmVnaW9uLmlkID09ICdub3RfdW5pcXVlX2lkJykgT0sKIEVYUEVDVEVEIChyZWdpb24u
d2lkdGggPT0gJzY3JykgT0sKIAotRVhQRUNURUQgKHJlZ2lvbi5pZCA9PSAnJykgT0sKLQogRU5E
IE9GIFRFU1QKIApJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svcmVnaW9ucy13ZWJ2dHQv
dnR0LXJlZ2lvbi1wYXJzZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90
cmFjay9yZWdpb25zLXdlYnZ0dC92dHQtcmVnaW9uLXBhcnNlci5odG1sCShyZXZpc2lvbiAyMzYy
NTgpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9yZWdpb25zLXdlYnZ0dC92dHQtcmVnaW9u
LXBhcnNlci5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNiw3ICsxNiw3IEBACiAgICAgICAgICAg
ICB9CiAKICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKLSAgICAgICAgICAgIHRlc3RF
eHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1swXS5yZWdpb25zLmxlbmd0aCIsIDUpOworICAgICAg
ICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzBdLnJlZ2lvbnMubGVuZ3RoIiwg
NCk7CiAKICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CiAgICAgICAgICAgICByZWdpb24g
PSB2aWRlby50ZXh0VHJhY2tzWzBdLnJlZ2lvbnNbMF07CkBAIC00NywxMCArNDcsNiBAQAogICAg
ICAgICAgICAgdGVzdEV4cGVjdGVkKCJyZWdpb24ud2lkdGgiLCA2Nyk7CiAKICAgICAgICAgICAg
IGNvbnNvbGVXcml0ZSgiIik7Ci0gICAgICAgICAgICByZWdpb24gPSB2aWRlby50ZXh0VHJhY2tz
WzBdLnJlZ2lvbnNbNF07Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInJlZ2lvbi5pZCIsICIi
KTsKLQotICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKICAgICAgICAgICAgIGVuZFRlc3Qo
KTsKICAgICAgICAgfQogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>