<?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>192694</bug_id>
          
          <creation_ts>2018-12-13 22:44:34 -0800</creation_ts>
          <short_desc>[PSON] WebsitePolicies are lost on process-swap</short_desc>
          <delta_ts>2018-12-14 12:59:39 -0800</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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1487853</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-12-13 22:44:34 -0800</bug_when>
    <thetext>WebsitePolicies are lost on process-swap.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1487854</commentid>
    <comment_count>1</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-12-13 22:44:51 -0800</bug_when>
    <thetext>&lt;rdar://problem/46715748&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1487855</commentid>
    <comment_count>2</comment_count>
      <attachid>357302</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-12-13 22:51:40 -0800</bug_when>
    <thetext>Created attachment 357302
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1487935</commentid>
    <comment_count>3</comment_count>
      <attachid>357302</attachid>
    <who name="Brady Eidson">beidson</who>
    <bug_when>2018-12-14 09:35:32 -0800</bug_when>
    <thetext>Comment on attachment 357302
Patch

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

&gt; Source/WebKit/ChangeLog:11
&gt; +        that it is continueing a load and it will therefore not re-trigger a decidePolicyForNavigationAction.

continuing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1487936</commentid>
    <comment_count>4</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-12-14 09:40:59 -0800</bug_when>
    <thetext>Committed r239210: &lt;https://trac.webkit.org/changeset/239210&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1488013</commentid>
    <comment_count>5</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-12-14 12:59:39 -0800</bug_when>
    <thetext>Follow-up assertion fix in &lt;https://trac.webkit.org/changeset/239228&gt;.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>357302</attachid>
            <date>2018-12-13 22:51:40 -0800</date>
            <delta_ts>2018-12-14 09:35:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-192694-20181213225136.patch</filename>
            <type>text/plain</type>
            <size>25474</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmYmFiZWExZTJmOTMzOWQ2
YjFkZGNiNGY2MGY2MmZhZTFiYjdkZGQuLjY1ZDFlYjk5NDhlOWE0YWFhNDk5NWZlMjBiNzE5OTEy
NzY0ZWFmN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMTItMTMgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbUFNPTl0gV2Vic2l0ZVBvbGljaWVz
IGFyZSBsb3N0IG9uIHByb2Nlc3Mtc3dhcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNjk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjcxNTc0
OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBj
YXNlIG9mIHByb2Nlc3Mtc3dhcCBvbiBuYXZpZ2F0aW9uLCBpbnN0ZWFkIG9mIHNlbmRpbmcgdGhl
IHdlYnNpdGVQb2xpY2llcyB0byB0aGUgb2xkCisgICAgICAgIHByb2Nlc3MsIHNlbmQgdGhlbSB0
byB0aGUgbmV3IHByb2Nlc3MgYXMgd2UgdHJpZ2dlciB0aGUgbmF2aWdhdGlvbi4gV2UgdGVsbCB0
aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgdGhhdCBpdCBpcyBjb250aW51ZWluZyBhIGxvYWQgYW5k
IGl0IHdpbGwgdGhlcmVmb3JlIG5vdCByZS10cmlnZ2VyIGEgZGVjaWRlUG9saWN5Rm9yTmF2aWdh
dGlvbkFjdGlvbi4KKworICAgICAgICAqIFNoYXJlZC9Mb2FkUGFyYW1ldGVycy5jcHA6CisgICAg
ICAgIChXZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2Vi
S2l0OjpMb2FkUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvTG9hZFBhcmFt
ZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg
KFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCk6Cisg
ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRl
bSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdh
dGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdh
dGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRl
bSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9s
aWN5RGVjaXNpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2
aWdhdGlvbkluTmV3UHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o
OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6V2ViUGFnZTo6bG9hZFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjps
b2FkRGF0YUltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkRGF0YSk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRBbHRlcm5hdGVIVE1MKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUGFnZTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh
Z2U6OmNyZWF0ZURvY3VtZW50TG9hZGVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz
LmluOgorCiAyMDE4LTEyLTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+
CiAKICAgICAgICAgW2lPU10gV2ViIEluc3BlY3RvcjogT2NjYXNpb25hbCBVSVByb2Nlc3MgY3Jh
c2hlcyB1bmRlciBXZWJQYWdlUHJveHk6OnNob3dJbnNwZWN0b3JJbmRpY2F0aW9uCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Mb2FkUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2Vi
S2l0L1NoYXJlZC9Mb2FkUGFyYW1ldGVycy5jcHAKaW5kZXggMmNlNjhjYjcxMjgxMzVhNTBkOWNh
NzYzYjdjNDJkM2EzOTA3MjUxYS4uNDYyNDllNzkxMjQ1ZmU2OTkwYTk1NzA0Nzc2MTVlOWNlZGIy
ZmMyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvTG9hZFBhcmFtZXRlcnMuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0xvYWRQYXJhbWV0ZXJzLmNwcApAQCAtNDksNiAr
NDksNyBAQCB2b2lkIExvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVy
KSBjb25zdAogICAgIGVuY29kZXIgPDwgYmFzZVVSTFN0cmluZzsKICAgICBlbmNvZGVyIDw8IHVu
cmVhY2hhYmxlVVJMU3RyaW5nOwogICAgIGVuY29kZXIgPDwgcHJvdmlzaW9uYWxMb2FkRXJyb3JV
UkxTdHJpbmc7CisgICAgZW5jb2RlciA8PCB3ZWJzaXRlUG9saWNpZXM7CiAgICAgZW5jb2RlciA8
PCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OwogICAgIGVuY29kZXIgPDwgc2hvdWxkVHJl
YXRBc0NvbnRpbnVpbmdMb2FkOwogICAgIGVuY29kZXIgPDwgdXNlckRhdGE7CkBAIC0xMDUsNiAr
MTA2LDEyIEBAIGJvb2wgTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29k
ZXIsIExvYWRQYXJhbWV0ZXJzJiBkYXRhKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZGF0YS5w
cm92aXNpb25hbExvYWRFcnJvclVSTFN0cmluZykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAor
ICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPj4gd2Vi
c2l0ZVBvbGljaWVzOworICAgIGRlY29kZXIgPj4gd2Vic2l0ZVBvbGljaWVzOworICAgIGlmICgh
d2Vic2l0ZVBvbGljaWVzKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgZGF0YS53ZWJzaXRl
UG9saWNpZXMgPSBXVEZNb3ZlKCp3ZWJzaXRlUG9saWNpZXMpOworCiAgICAgaWYgKCFkZWNvZGVy
LmRlY29kZShkYXRhLnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kpKQogICAgICAgICByZXR1
cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0xvYWRQYXJhbWV0
ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Mb2FkUGFyYW1ldGVycy5oCmluZGV4IDgyZGZl
YWExZGFlNmQzMWFiMzU0MGI4YTAxZjMzZGRlMGEwZTA2YmUuLmVlZjFhNjEwMDQwYTZhZTVkMmRk
MmQ0YTE5OTI2NDA2NzA2NDUxNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0xv
YWRQYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvTG9hZFBhcmFtZXRlcnMu
aApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIkRhdGFSZWZlcmVuY2UuaCIKICNpbmNsdWRl
ICJTYW5kYm94RXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiVXNlckRhdGEuaCIKKyNpbmNsdWRlICJX
ZWJzaXRlUG9saWNpZXNEYXRhLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVz
Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlcXVlc3QuaD4KIApAQCAtNjAsNiArNjEs
OCBAQCBzdHJ1Y3QgTG9hZFBhcmFtZXRlcnMgewogICAgIFN0cmluZyB1bnJlYWNoYWJsZVVSTFN0
cmluZzsKICAgICBTdHJpbmcgcHJvdmlzaW9uYWxMb2FkRXJyb3JVUkxTdHJpbmc7CiAKKyAgICBz
dGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+IHdlYnNpdGVQb2xpY2llczsKKwogICAg
IHVpbnQ2NF90IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7CiAgICAgYm9vbCBzaG91bGRU
cmVhdEFzQ29udGludWluZ0xvYWQgeyBmYWxzZSB9OwogICAgIFVzZXJEYXRhIHVzZXJEYXRhOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMDRiMDM4ZWUyY2Y5
ZWJmODAxNjA0Mzk0YmNiY2FhZDdlZjJhOGY2NC4uY2IyMjUxMDk3NjdlYzNmOWNkNDliOGVmYzgy
Njk5M2Y0MmEyOWE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw
CkBAIC04NTksNyArODU5LDcgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5
OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCgpCiAgICAgYXV0byBuYXZpZ2F0aW9uID0g
bV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZVJlbG9hZE5hdmlnYXRpb24oKTsKIAogICAgIC8vIFdl
IGFsbG93IHN0YWxlIGNvbnRlbnQgd2hlbiByZWxvYWRpbmcgYSBXZWJQcm9jZXNzIHRoYXQncyBi
ZWVuIGtpbGxlZCBvciBjcmFzaGVkLgotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi
UGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbV9i
YWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1JRCgpLCBGcmFtZUxvYWRUeXBlOjpJ
bmRleGVkQmFja0ZvcndhcmQsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6Tm8pLCBtX3Bh
Z2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0Zv
cndhcmRJdGVtKG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBtX2JhY2tGb3J3YXJkTGlzdC0+
Y3VycmVudEl0ZW0oKS0+aXRlbUlEKCksIEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNrRm9yd2Fy
ZCwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpObywgc3RkOjpudWxsb3B0KSwgbV9wYWdl
SUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAKICAg
ICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKQEAgLTg3OCw3ICs4NzgsNyBAQCBSZWZQdHI8
QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0
ZW0oV2ViQmFja0ZvcndhcgogCiAgICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3Rh
dGUtPmNyZWF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbihpdGVtLCBtX2JhY2tGb3J3YXJkTGlzdC0+
Y3VycmVudEl0ZW0oKSwgRnJhbWVMb2FkVHlwZTo6SW5kZXhlZEJhY2tGb3J3YXJkKTsKIAotICAg
IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShu
YXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgaXRlbS5pdGVtSUQoKSwgRnJhbWVMb2FkVHlwZTo6
SW5kZXhlZEJhY2tGb3J3YXJkLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKSwgbV9w
YWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tG
b3J3YXJkSXRlbShuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgaXRlbS5pdGVtSUQoKSwgRnJh
bWVMb2FkVHlwZTo6SW5kZXhlZEJhY2tGb3J3YXJkLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv
YWQ6Ok5vLCBzdGQ6Om51bGxvcHQpLCBtX3BhZ2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZXNwb25z
aXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIAogICAgIHJldHVybiBXVEZNb3ZlKG5hdmlnYXRpb24p
OwpAQCAtMTA0OSw3ICsxMDQ5LDcgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVBy
b3h5Ojpsb2FkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTaG8KICAgICByZXR1
cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1
ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXJjZVJl
cXVlc3QmJiByZXF1ZXN0LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5F
eHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0Nv
bnRpbnVpbmdMb2FkIHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCkKK3ZvaWQgV2ViUGFnZVBy
b3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlv
biwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj
eSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFNo
b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBzaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIHN0
ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7CiAg
ICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKIApAQCAtMTA2Nyw2ICsxMDY3LDcgQEAgdm9pZCBXZWJQ
YWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZp
Z2F0aW9uLCBSZXNvdXIKICAgICBsb2FkUGFyYW1ldGVycy5zaG91bGRPcGVuRXh0ZXJuYWxVUkxz
UG9saWN5ID0gKHVpbnQ2NF90KXNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7CiAgICAgbG9h
ZFBhcmFtZXRlcnMudXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0
c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZFRy
ZWF0QXNDb250aW51aW5nTG9hZCA9IHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCA9PSBTaG91
bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllczsKKyAgICBsb2FkUGFyYW1ldGVycy53ZWJzaXRl
UG9saWNpZXMgPSBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcyk7CiAgICAgbG9hZFBhcmFtZXRlcnMu
bG9ja0hpc3RvcnkgPSBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCk7CiAgICAgbG9hZFBhcmFtZXRl
cnMubG9ja0JhY2tGb3J3YXJkTGlzdCA9IG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgp
OwogICAgIGxvYWRQYXJhbWV0ZXJzLmNsaWVudFJlZGlyZWN0U291cmNlRm9ySGlzdG9yeSA9IG5h
dmlnYXRpb24uY2xpZW50UmVkaXJlY3RTb3VyY2VGb3JIaXN0b3J5KCk7CkBAIC0xMTMzLDcgKzEx
MzQsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWREYXRhKGNv
bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgYwogICAgIHJldHVybiBXVEZNb3ZlKG5hdmln
YXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihB
UEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0
YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3Qg
U3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCit2b2lkIFdlYlBhZ2VQcm94
eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNv
bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29u
c3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCog
dXNlckRhdGEsIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9s
aWNpZXMpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKIApAQCAtMTE1MSw2ICsxMTUyLDcg
QEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0
aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEMKICAgICBsb2FkUGFyYW1ldGVycy5lbmNvZGluZ05h
bWUgPSBlbmNvZGluZzsKICAgICBsb2FkUGFyYW1ldGVycy5iYXNlVVJMU3RyaW5nID0gYmFzZVVS
TDsKICAgICBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSA9IFVzZXJEYXRhKHByb2Nlc3MoKS50cmFu
c2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSk7CisgICAgbG9hZFBhcmFtZXRl
cnMud2Vic2l0ZVBvbGljaWVzID0gV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpOwogICAgIGFkZFBs
YXRmb3JtTG9hZFBhcmFtZXRlcnMobG9hZFBhcmFtZXRlcnMpOwogCiAgICAgbV9wcm9jZXNzLT5h
c3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKCp0aGlzLCBiYXNlVVJMKTsKQEAgLTEzMjksNyArMTMz
MSw3IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3
YXJkSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtCiAgICAgaWYgKCFtX2JhY2tGb3J3YXJkTGlz
dC0+Y3VycmVudEl0ZW0oKS0+aXRlbUlzSW5TYW1lRG9jdW1lbnQoaXRlbSkpCiAgICAgICAgIG5h
dmlnYXRpb24gPSBtX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlQmFja0ZvcndhcmROYXZpZ2F0aW9u
KGl0ZW0sIG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLCBmcmFtZUxvYWRUeXBlKTsK
IAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJk
SXRlbShuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCBpdGVtLml0
ZW1JRCgpLCBmcmFtZUxvYWRUeXBlLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKSwg
bV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0Jh
Y2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAw
LCBpdGVtLml0ZW1JRCgpLCBmcmFtZUxvYWRUeXBlLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv
YWQ6Ok5vLCBzdGQ6Om51bGxvcHQpLCBtX3BhZ2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZXNwb25z
aXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIAogICAgIHJldHVybiBuYXZpZ2F0aW9uOwpAQCAtMjYz
OCwxMCArMjY0MCwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9s
aWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQQogICAgICAgICB9IGVsc2UK
ICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiJXAg
LSBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24sIGtlZXAgdXNp
bmcgcHJvY2VzcyAlaSBmb3IgbmF2aWdhdGlvbiwgcmVhc29uOiAle3B1YmxpY31zIiwgdGhpcywg
cHJvY2Vzc0lkZW50aWZpZXIoKSwgcmVhc29uLnV0ZjgoKS5kYXRhKCkpOwogCi0gICAgICAgIHJl
Y2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLnB0cigpLCBXVEZN
b3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOworICAgICAgICBib29sIHNob3VsZFByb2Nlc3NT
d2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKTsKKyAgICAgICAg
cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24ucHRyKCksIHNo
b3VsZFByb2Nlc3NTd2FwID8gc3RkOjpudWxsb3B0IDogV1RGTW92ZShkYXRhKSwgV1RGTW92ZShz
ZW5kZXIpKTsKIAotICAgICAgICBpZiAocHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnBy
b2Nlc3MoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZp
Z2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2wo
KS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHIs
IFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp
ZW50KTsKKyAgICAgICAgaWYgKHNob3VsZFByb2Nlc3NTd2FwKQorICAgICAgICAgICAgY29udGlu
dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIGRlc3RpbmF0aW9uU3VzcGVuZGVk
UGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5h
dGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0ciwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlv
biksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOwogICAgIH0p
OwogfQogCkBAIC0yNjc3LDcgKzI2ODAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQ
b2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6Ok5hdmlnYXRpb24qCiAgICAg
c2VuZGVyLT5zZW5kKGFjdGlvbiwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25J
RCgpIDogMCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9p
ZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmln
YXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYg
c3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nl
c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKK3Zv
aWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZp
Z2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYm
IHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9j
ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIHN0
ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7CiAg
ICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBp
biBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRp
b24ubG9nZ2luZ1N0cmluZygpKTsKIApAQCAtMjcwOSw3ICsyNzEyLDcgQEAgdm9pZCBXZWJQYWdl
UHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5h
dmlnYXRpb24sIHMKICAgICAgICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOwogICAg
ICAgICB9KTsKICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRh
dGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdl
SUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNr
Rm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS0+aXRlbUlEKCksICpu
YXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBTaG91bGRUcmVhdEFzQ29udGlu
dWluZ0xvYWQ6OlllcyksIG1fcGFnZUlEKTsKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh
Z2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklE
KCksIGl0ZW0tPml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUo
KSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGlj
aWVzKSksIG1fcGFnZUlEKTsKICAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVy
KCkuc3RhcnQoKTsKIAogICAgICAgICByZXR1cm47CkBAIC0yNzI0LDkgKzI3MjcsOSBAQCB2b2lk
IFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdh
dGlvbiYgbmF2aWdhdGlvbiwgcwogICAgIC8vIEZJWE1FOiBXb3JrIG91dCB0aW1pbmcgb2YgcmVz
cG9uZGluZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBkZWxlZ2F0ZSwgZXRjCiAgICAgQVNTRVJUKCFu
YXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNFbXB0eSgpKTsKICAgICBpZiAoYXV0byYgc3Vi
c3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0aXR1dGVEYXRhKCkpCi0gICAgICAgIGxvYWRE
YXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5k
YXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+
TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VV
UkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSk7CisgICAgICAgIGxvYWREYXRhV2l0
aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCks
IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5
cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1
YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsK
ICAgICBlbHNlCi0gICAgICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwg
UmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6
OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVz
LCBudWxscHRyLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olllcyk7CisgICAgICAgIGxv
YWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2
aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVS
THNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91bGRUcmVh
dEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIAogICAg
IEFTU0VSVCghbV9tYWluRnJhbWUpOwogICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0g
W3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQgPSBuYXZp
Z2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVudFJlcXVl
c3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5jdXJyZW50
UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi
UGFnZVByb3h5LmgKaW5kZXggZDk2NDczZTg5MzJmN2Y0M2VjM2ViYThiNjI2Y2RhYTk3ZmFiMWIx
OC4uZWM0NzYzYzQxYjkyZjFiOGM5ZjNiYzhiMmU4MmI1Y2NjMmNjYTQwNSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTE1NzYsOCArMTU3Niw4IEBAIHByaXZhdGU6
CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxv
YWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dp
dGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRo
TmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBj
b25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJp
bmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwotICAgIHZvaWQg
bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNv
dXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJ
OjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQp
OworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25z
dCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJp
bmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0
YSA9IG51bGxwdHIsIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IHN0ZDo6
bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh
dGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0
ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRy
ZWF0QXNDb250aW51aW5nTG9hZCwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm
ID0gc3RkOjpudWxsb3B0KTsKIAogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Np
b24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsK
ICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3Ry
aW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25z
dCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3QgU3Ry
aW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKQEAgLTE4OTMsNyAr
MTg5Myw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHJlcG9ydFBhZ2VMb2FkUmVzdWx0KGNvbnN0
IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImID0geyB9KTsKIAotICAgIHZvaWQgY29udGludWVOYXZp
Z2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNw
ZW5kZWRQYWdlUHJveHk+JiYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIFByb2Nlc3NTd2FwUmVx
dWVzdGVkQnlDbGllbnQpOworICAgIHZvaWQgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNz
KEFQSTo6TmF2aWdhdGlvbiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYs
IFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIHN0
ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJik7CiAKICAgICB2b2lkIHNldE5lZWRz
Rm9udEF0dHJpYnV0ZXMoYm9vbCk7CiAgICAgdm9pZCB1cGRhdGVGb250QXR0cmlidXRlc0FmdGVy
RWRpdG9yU3RhdGVDaGFuZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5jcHAKaW5kZXggYjI4ZjA0MGUxYjI1YzM4MTNhZTVhMGFkNmFlYzVhZGU4NWViMzdi
ZS4uMTc2MmE3YjhmOGQ3ZWFkZjE1MzEyMmNjODA3NWQ5NTdmNjAxMjAxMiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTEzNTMsNiArMTM1Myw3
IEBAIHZvaWQgV2ViUGFnZTo6bG9hZFJlcXVlc3QoTG9hZFBhcmFtZXRlcnMmJiBsb2FkUGFyYW1l
dGVycykKICAgICBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIgc3RvcHBlcjsKIAogICAgIG1f
cGVuZGluZ05hdmlnYXRpb25JRCA9IGxvYWRQYXJhbWV0ZXJzLm5hdmlnYXRpb25JRDsKKyAgICBt
X3BlbmRpbmdXZWJzaXRlUG9saWNpZXMgPSBXVEZNb3ZlKGxvYWRQYXJhbWV0ZXJzLndlYnNpdGVQ
b2xpY2llcyk7CiAKICAgICBtX3NhbmRib3hFeHRlbnNpb25UcmFja2VyLmJlZ2luTG9hZChtX21h
aW5GcmFtZS5nZXQoKSwgV1RGTW92ZShsb2FkUGFyYW1ldGVycy5zYW5kYm94RXh0ZW5zaW9uSGFu
ZGxlKSk7CiAKQEAgLTEzNzQsMTMgKzEzNzUsMTUgQEAgdm9pZCBXZWJQYWdlOjpsb2FkUmVxdWVz
dChMb2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogICAgIGNvcmVQYWdlKCktPnVzZXJJ
bnB1dEJyaWRnZSgpLmxvYWRSZXF1ZXN0KFdURk1vdmUoZnJhbWVMb2FkUmVxdWVzdCkpOwogCiAg
ICAgQVNTRVJUKCFtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVCghbV9wZW5kaW5n
V2Vic2l0ZVBvbGljaWVzKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpsb2FkRGF0YUltcGwodWludDY0
X3QgbmF2aWdhdGlvbklELCBSZWY8U2hhcmVkQnVmZmVyPiYmIHNoYXJlZEJ1ZmZlciwgY29uc3Qg
U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFVSTCYg
YmFzZVVSTCwgY29uc3QgVVJMJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJE
YXRhKQordm9pZCBXZWJQYWdlOjpsb2FkRGF0YUltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBz
dGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzLCBSZWY8
U2hhcmVkQnVmZmVyPiYmIHNoYXJlZEJ1ZmZlciwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29u
c3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFVSTCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1
bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIFNlbmRTdG9w
UmVzcG9uc2l2ZW5lc3NUaW1lciBzdG9wcGVyOwogCiAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklE
ID0gbmF2aWdhdGlvbklEOworICAgIG1fcGVuZGluZ1dlYnNpdGVQb2xpY2llcyA9IFdURk1vdmUo
d2Vic2l0ZVBvbGljaWVzKTsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGJhc2VVUkwp
OwogICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UoVVJMKCksIE1JTUVUeXBlLCBzaGFyZWRC
dWZmZXItPnNpemUoKSwgZW5jb2RpbmdOYW1lKTsKQEAgLTE0MDAsMTAgKzE0MDMsMTAgQEAgdm9p
ZCBXZWJQYWdlOjpsb2FkRGF0YShMb2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogCiAg
ICAgYXV0byBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9j
YXN0PGNvbnN0IGNoYXIqPihsb2FkUGFyYW1ldGVycy5kYXRhLmRhdGEoKSksIGxvYWRQYXJhbWV0
ZXJzLmRhdGEuc2l6ZSgpKTsKICAgICBVUkwgYmFzZVVSTCA9IGxvYWRQYXJhbWV0ZXJzLmJhc2VV
UkxTdHJpbmcuaXNFbXB0eSgpID8gV1RGOjpibGFua1VSTCgpIDogVVJMKFVSTCgpLCBsb2FkUGFy
YW1ldGVycy5iYXNlVVJMU3RyaW5nKTsKLSAgICBsb2FkRGF0YUltcGwobG9hZFBhcmFtZXRlcnMu
bmF2aWdhdGlvbklELCBXVEZNb3ZlKHNoYXJlZEJ1ZmZlciksIGxvYWRQYXJhbWV0ZXJzLk1JTUVU
eXBlLCBsb2FkUGFyYW1ldGVycy5lbmNvZGluZ05hbWUsIGJhc2VVUkwsIFVSTCgpLCBsb2FkUGFy
YW1ldGVycy51c2VyRGF0YSk7CisgICAgbG9hZERhdGFJbXBsKGxvYWRQYXJhbWV0ZXJzLm5hdmln
YXRpb25JRCwgV1RGTW92ZShsb2FkUGFyYW1ldGVycy53ZWJzaXRlUG9saWNpZXMpLCBXVEZNb3Zl
KHNoYXJlZEJ1ZmZlciksIGxvYWRQYXJhbWV0ZXJzLk1JTUVUeXBlLCBsb2FkUGFyYW1ldGVycy5l
bmNvZGluZ05hbWUsIGJhc2VVUkwsIFVSTCgpLCBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSk7CiB9
CiAKLXZvaWQgV2ViUGFnZTo6bG9hZEFsdGVybmF0ZUhUTUwoY29uc3QgTG9hZFBhcmFtZXRlcnMm
IGxvYWRQYXJhbWV0ZXJzKQordm9pZCBXZWJQYWdlOjpsb2FkQWx0ZXJuYXRlSFRNTChMb2FkUGFy
YW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogewogICAgIHBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQ
YXJhbWV0ZXJzKGxvYWRQYXJhbWV0ZXJzKTsKIApAQCAtMTQxMiw3ICsxNDE1LDcgQEAgdm9pZCBX
ZWJQYWdlOjpsb2FkQWx0ZXJuYXRlSFRNTChjb25zdCBMb2FkUGFyYW1ldGVycyYgbG9hZFBhcmFt
ZXRlcnMpCiAgICAgVVJMIHByb3Zpc2lvbmFsTG9hZEVycm9yVVJMID0gbG9hZFBhcmFtZXRlcnMu
cHJvdmlzaW9uYWxMb2FkRXJyb3JVUkxTdHJpbmcuaXNFbXB0eSgpID8gVVJMKCkgOiBVUkwoVVJM
KCksIGxvYWRQYXJhbWV0ZXJzLnByb3Zpc2lvbmFsTG9hZEVycm9yVVJMU3RyaW5nKTsKICAgICBh
dXRvIHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8
Y29uc3QgY2hhcio+KGxvYWRQYXJhbWV0ZXJzLmRhdGEuZGF0YSgpKSwgbG9hZFBhcmFtZXRlcnMu
ZGF0YS5zaXplKCkpOwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc2V0
UHJvdmlzaW9uYWxMb2FkRXJyb3JCZWluZ0hhbmRsZWRVUkwocHJvdmlzaW9uYWxMb2FkRXJyb3JV
UkwpOyAgICAKLSAgICBsb2FkRGF0YUltcGwobG9hZFBhcmFtZXRlcnMubmF2aWdhdGlvbklELCBX
VEZNb3ZlKHNoYXJlZEJ1ZmZlciksIGxvYWRQYXJhbWV0ZXJzLk1JTUVUeXBlLCBsb2FkUGFyYW1l
dGVycy5lbmNvZGluZ05hbWUsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCBsb2FkUGFyYW1ldGVy
cy51c2VyRGF0YSk7CisgICAgbG9hZERhdGFJbXBsKGxvYWRQYXJhbWV0ZXJzLm5hdmlnYXRpb25J
RCwgV1RGTW92ZShsb2FkUGFyYW1ldGVycy53ZWJzaXRlUG9saWNpZXMpLCBXVEZNb3ZlKHNoYXJl
ZEJ1ZmZlciksIGxvYWRQYXJhbWV0ZXJzLk1JTUVUeXBlLCBsb2FkUGFyYW1ldGVycy5lbmNvZGlu
Z05hbWUsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSk7
CiAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5zZXRQcm92aXNpb25hbExv
YWRFcnJvckJlaW5nSGFuZGxlZFVSTCh7IH0pOwogfQogCkBAIC0xNDc1LDcgKzE0NzgsNyBAQCB2
b2lkIFdlYlBhZ2U6OnJlbG9hZCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQzMl90IHJlbG9h
ZE9wdGlvbnMsIFNhbmRib3hFeHRlbgogICAgIH0KIH0KIAotdm9pZCBXZWJQYWdlOjpnb1RvQmFj
a0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgQmFja0ZvcndhcmRJdGVt
SWRlbnRpZmllciYgYmFja0ZvcndhcmRJdGVtSUQsIEZyYW1lTG9hZFR5cGUgYmFja0ZvcndhcmRU
eXBlLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdM
b2FkKQordm9pZCBXZWJQYWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRp
b25JRCwgY29uc3QgQmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciYgYmFja0ZvcndhcmRJdGVtSUQs
IEZyYW1lTG9hZFR5cGUgYmFja0ZvcndhcmRUeXBlLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv
YWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xp
Y2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQogewogICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5l
c3NUaW1lciBzdG9wcGVyOwogCkBAIC0xNDkwLDYgKzE0OTMsNyBAQCB2b2lkIFdlYlBhZ2U6Omdv
VG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBCYWNrRm9yd2Fy
ZEl0ZW1JZAogCiAgICAgQVNTRVJUKCFtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpOwogICAgIG1fcGVu
ZGluZ05hdmlnYXRpb25JRCA9IG5hdmlnYXRpb25JRDsKKyAgICBtX3BlbmRpbmdXZWJzaXRlUG9s
aWNpZXMgPSBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcyk7CiAKICAgICBtX3BhZ2UtPmdvVG9JdGVt
KCppdGVtLCBiYWNrRm9yd2FyZFR5cGUsIHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCk7CiB9
CkBAIC01OTc5LDYgKzU5ODMsOSBAQCBSZWY8RG9jdW1lbnRMb2FkZXI+IFdlYlBhZ2U6OmNyZWF0
ZURvY3VtZW50TG9hZGVyKEZyYW1lJiBmcmFtZSwgY29uc3QgUmVzb3VyY2VSZQogICAgICAgICAg
ICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChtX3BlbmRpbmdOYXZpZ2F0aW9uSUQp
OwogICAgICAgICAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gMDsKICAgICAgICAgfQorCisg
ICAgICAgIGlmIChhdXRvIHBlbmRpbmdXZWJzaXRlUG9saWNpZXMgPSBXVEZNb3ZlKG1fcGVuZGlu
Z1dlYnNpdGVQb2xpY2llcykpCisgICAgICAgICAgICBXZWJzaXRlUG9saWNpZXNEYXRhOjphcHBs
eVRvRG9jdW1lbnRMb2FkZXIoV1RGTW92ZSgqcGVuZGluZ1dlYnNpdGVQb2xpY2llcyksIGRvY3Vt
ZW50TG9hZGVyKTsKICAgICB9CiAKICAgICByZXR1cm4gV1RGTW92ZShkb2N1bWVudExvYWRlcik7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgg
Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMDk5YjJj
NWZhMDlkNjQyZWQ0YWU0YzUyMDFmYzQ3YTFhMWRhOTEyZi4uZTg3M2M4NzY0NmIzNzc2OWJlMDMw
YTk5Y2RjZDA4Njg1MDY0OTFkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L1dlYlBhZ2UuaApAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlz
dFByb3h5LmgiCiAjaW5jbHVkZSAiV2ViVVJMU2NoZW1lSGFuZGxlci5oIgogI2luY2x1ZGUgIldl
YlVzZXJDb250ZW50Q29udHJvbGxlci5oIgorI2luY2x1ZGUgIldlYnNpdGVQb2xpY2llc0RhdGEu
aCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JGcm9udGVuZENoYW5uZWwuaD4K
ICNpbmNsdWRlIDxXZWJDb3JlL0FjdGl2aXR5U3RhdGUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Rp
Y3Rpb25hcnlQb3B1cEluZm8uaD4KQEAgLTExOTQsMTcgKzExOTUsMTcgQEAgcHJpdmF0ZToKIAog
ICAgIFN0cmluZyBzb3VyY2VGb3JGcmFtZShXZWJGcmFtZSopOwogCi0gICAgdm9pZCBsb2FkRGF0
YUltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBSZWY8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYm
LCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwgY29u
c3QgVVJMJiBiYXNlVVJMLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFVzZXJEYXRhJik7
CisgICAgdm9pZCBsb2FkRGF0YUltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBzdGQ6Om9wdGlv
bmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYsIFJlZjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+JiYs
IGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBjb25z
dCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgZmFpbGluZ1VSTCwgY29uc3QgVXNlckRhdGEmKTsK
IAogICAgIC8vIEFjdGlvbnMKICAgICB2b2lkIHRyeUNsb3NlKCk7CiAgICAgdm9pZCBwbGF0Zm9y
bURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyhjb25zdCBMb2FkUGFyYW1ldGVycyYpOwogICAgIHZv
aWQgbG9hZFJlcXVlc3QoTG9hZFBhcmFtZXRlcnMmJik7CiAgICAgdm9pZCBsb2FkRGF0YShMb2Fk
UGFyYW1ldGVycyYmKTsKLSAgICB2b2lkIGxvYWRBbHRlcm5hdGVIVE1MKGNvbnN0IExvYWRQYXJh
bWV0ZXJzJik7CisgICAgdm9pZCBsb2FkQWx0ZXJuYXRlSFRNTChMb2FkUGFyYW1ldGVycyYmKTsK
ICAgICB2b2lkIG5hdmlnYXRlVG9QREZMaW5rV2l0aFNpbXVsYXRlZENsaWNrKGNvbnN0IFN0cmlu
ZyYgdXJsLCBXZWJDb3JlOjpJbnRQb2ludCBkb2N1bWVudFBvaW50LCBXZWJDb3JlOjpJbnRQb2lu
dCBzY3JlZW5Qb2ludCk7CiAgICAgdm9pZCByZWxvYWQodWludDY0X3QgbmF2aWdhdGlvbklELCB1
aW50MzJfdCByZWxvYWRPcHRpb25zLCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmJik7Ci0gICAg
dm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgV2Vi
Q29yZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciYsIFdlYkNvcmU6OkZyYW1lTG9hZFR5cGUs
IFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCk7CisgICAgdm9pZCBnb1RvQmFj
a0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgV2ViQ29yZTo6QmFja0Zv
cndhcmRJdGVtSWRlbnRpZmllciYsIFdlYkNvcmU6OkZyYW1lTG9hZFR5cGUsIFdlYkNvcmU6OlNo
b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE
YXRhPiYmKTsKICAgICB2b2lkIHRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOwogICAgIHZvaWQg
c2V0SW5pdGlhbEZvY3VzKGJvb2wgZm9yd2FyZCwgYm9vbCBpc0tleWJvYXJkRXZlbnRWYWxpZCwg
Y29uc3QgV2ViS2V5Ym9hcmRFdmVudCYsIENhbGxiYWNrSUQpOwogICAgIHZvaWQgdXBkYXRlSXNJ
bldpbmRvdyhib29sIGlzSW5pdGlhbFN0YXRlID0gZmFsc2UpOwpAQCAtMTc0OCw2ICsxNzQ5LDcg
QEAgcHJpdmF0ZToKICAgICBQQUw6Okh5c3RlcmVzaXNBY3Rpdml0eSBtX3VzZXJBY3Rpdml0eUh5
c3RlcmVzaXM7CiAKICAgICB1aW50NjRfdCBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgeyAwIH07Cisg
ICAgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiBtX3BlbmRpbmdXZWJzaXRlUG9s
aWNpZXM7CiAKICAgICBib29sIG1fbWFpbkZyYW1lUHJvZ3Jlc3NDb21wbGV0ZWQgeyBmYWxzZSB9
OwogICAgIGJvb2wgbV9zaG91bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVudHMgeyB0cnVlIH07
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l
c3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz
YWdlcy5pbgppbmRleCA2ZjkxN2JjOGIyY2U2NzY4NjM1OGViOWYyZDVjYTcwNWJhNjJiMTY2Li5i
NWI4ZTdkYTQ3ZGMyNDZiMGRmNWFkMTFiZmMyNDgwMWZkY2YwNjdmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTE0
NSw3ICsxNDUsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBT
Y3JvbGxCeSh1aW50MzJfdCBzY3JvbGxEaXJlY3Rpb24sIHVpbnQzMl90IHNjcm9sbEdyYW51bGFy
aXR5KQogICAgIENlbnRlclNlbGVjdGlvbkluVmlzaWJsZUFyZWEoKQogCi0gICAgR29Ub0JhY2tG
b3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHN0cnVjdCBXZWJDb3JlOjpCYWNrRm9y
d2FyZEl0ZW1JZGVudGlmaWVyIGJhY2tGb3J3YXJkSXRlbUlELCBlbnVtOnVpbnQ4X3QgV2ViQ29y
ZTo6RnJhbWVMb2FkVHlwZSBiYWNrRm9yd2FyZFR5cGUsIGVudW06Ym9vbCBXZWJDb3JlOjpTaG91
bGRUcmVhdEFzQ29udGludWluZ0xvYWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkKQorICAg
IEdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCBzdHJ1Y3QgV2ViQ29y
ZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciBiYWNrRm9yd2FyZEl0ZW1JRCwgZW51bTp1aW50
OF90IFdlYkNvcmU6OkZyYW1lTG9hZFR5cGUgYmFja0ZvcndhcmRUeXBlLCBlbnVtOmJvb2wgV2Vi
Q29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkIHNob3VsZFRyZWF0QXNDb250aW51aW5n
TG9hZCwgc3RkOjpvcHRpb25hbDxXZWJLaXQ6OldlYnNpdGVQb2xpY2llc0RhdGE+IHdlYnNpdGVQ
b2xpY2llcykKICAgICBUcnlSZXN0b3JlU2Nyb2xsUG9zaXRpb24oKQogCiAgICAgTG9hZFVSTElu
RnJhbWUoVVJMIHVybCwgdWludDY0X3QgZnJhbWVJRCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n
ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5MDc4ZWExNWU1NzE4ODY5NWY4NWViNDQ2ZjQ4
Yzc5YzFhZGZkYTA5Li40YzNhNDA3NDJhYjEwMDEwYmM1YjVmYTNjMTBiODk0ZjMwYTIwYzdkIDEw
MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTUgQEAKKzIwMTgtMTItMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwor
ICAgICAgICBbUFNPTl0gV2Vic2l0ZVBvbGljaWVzIGFyZSBsb3N0IG9uIHByb2Nlc3Mtc3dhcAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNjk0Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjcxNTc0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRlbmQgZXhpc3RpbmcgQVBJIHRlc3QgdG8gcmVw
cm9kdWNlIHRoZSBpc3N1ZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0
Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tOgorCiAyMDE4LTEyLTEzICBEb24gT2xtc3RlYWQgIDxk
b24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQ2hhbmdlZCBteSBz
dGF0dXMgdG8gYSByZXZpZXdlci4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U
ZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlUG9saWNpZXMubW0KaW5kZXggODhjNGFmNGMwNDM0NWM0
NGNhMGQzOTk0N2I4ZDgxOWM1MThmZjFiNS4uMmU4OWUzNjA4YmQ1OTI3M2RkMTM4ZjM0ZDk1Mjll
MmUyYWIwYmU0OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD
b2NvYS9XZWJzaXRlUG9saWNpZXMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X
ZWJLaXRDb2NvYS9XZWJzaXRlUG9saWNpZXMubW0KQEAgLTk3Miw2ICs5NzIsMTUgQEAgVEVTVChX
ZWJLaXQsIFdlYnNpdGVQb2xpY2llc0N1c3RvbVVzZXJBZ2VudCkKICAgICB3aGlsZSAobG9hZENv
dW50ICE9IDlVKQogICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOwog
ICAgIGxvYWRDb3VudCA9IDA7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0
V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInRlc3Q6Ly93d3cuZ29vZ2xlLmNvbS9tYWlu
Lmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0
V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZpbmlzaGVkTmF2aWdhdGlvbik7CisgICAgZmluaXNoZWRO
YXZpZ2F0aW9uID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEoMVUsIGxvYWRDb3VudCk7CisgICAg
bG9hZENvdW50ID0gMDsKIH0KIAogQGludGVyZmFjZSBQb3BVcFBvbGljaWVzRGVsZWdhdGUgOiBO
U09iamVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGUsIFdLVUlEZWxlZ2F0ZVByaXZhdGU+Cg==
</data>
<flag name="review"
          id="374209"
          type_id="1"
          status="+"
          setter="beidson"
    />
          </attachment>
      

    </bug>

</bugzilla>