<?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>215788</bug_id>
          
          <creation_ts>2020-08-24 17:54:55 -0700</creation_ts>
          <short_desc>Clean up deprecated and unused SPI to set HSTS storage on ProcessPoolConfiguration</short_desc>
          <delta_ts>2020-08-25 11:07:18 -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>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>215802</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Alex Christensen">achristensen</reporter>
          <assigned_to name="Alex Christensen">achristensen</assigned_to>
          <cc>berto</cc>
    
    <cc>cdumez</cc>
    
    <cc>cgarcia</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gustavo</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1682516</commentid>
    <comment_count>0</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-24 17:54:55 -0700</bug_when>
    <thetext>Clean up deprecated and unused SPI to set HSTS storage on ProcessPoolConfiguration</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682521</commentid>
    <comment_count>1</comment_count>
      <attachid>407152</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-24 17:59:52 -0700</bug_when>
    <thetext>Created attachment 407152
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682544</commentid>
    <comment_count>2</comment_count>
      <attachid>407161</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-24 19:37:59 -0700</bug_when>
    <thetext>Created attachment 407161
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682547</commentid>
    <comment_count>3</comment_count>
      <attachid>407161</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-24 19:46:00 -0700</bug_when>
    <thetext>Comment on attachment 407161
Patch

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

&gt; Source/WebCore/platform/network/soup/SoupNetworkSession.cpp:-193
&gt; -    if (m_sessionID.isEphemeral() || hstsStorageDirectory().isNull())

I guess this wasn&apos;t dead code, but it needs to come through the NetworkSessionCreationParameters instead of the NetworkProcessCreationParameters now.  Could someone implement that for GTK/WPE?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682691</commentid>
    <comment_count>4</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-25 10:17:16 -0700</bug_when>
    <thetext>Soup part of this was done well in r266112</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682693</commentid>
    <comment_count>5</comment_count>
      <attachid>407204</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-08-25 10:20:50 -0700</bug_when>
    <thetext>Created attachment 407204
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682710</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-08-25 11:06:48 -0700</bug_when>
    <thetext>Committed r266133: &lt;https://trac.webkit.org/changeset/266133&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 407204.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1682711</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-08-25 11:07:18 -0700</bug_when>
    <thetext>&lt;rdar://problem/67747536&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407152</attachid>
            <date>2020-08-24 17:59:52 -0700</date>
            <delta_ts>2020-08-24 19:37:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215788-20200824175950.patch</filename>
            <type>text/plain</type>
            <size>10040</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjY2MDk0KQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA4
LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg
ICAgQ2xlYW4gdXAgZGVwcmVjYXRlZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdl
IG9uIFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oOgorCiAyMDIw
LTA4LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgTWFrZSBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBTUEkgZm9yIEhTVFMg
c3RvcmFnZSB0byByZXBsYWNlIF9XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oc3RzU3RvcmFn
ZURpcmVjdG9yeQpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3b3Jr
U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3
b3JrU1BJLmgJKHJldmlzaW9uIDI2NjA5MCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3Bp
L2NmL0NGTmV0d29ya1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOTIsMTAgKzM5Miw2IEBAIHZv
aWQgX0NGVVJMUmVxdWVzdENyZWF0ZUFyY2hpdmVMaXN0KENGQWwKIENGTXV0YWJsZVVSTFJlcXVl
c3RSZWYgX0NGVVJMUmVxdWVzdENyZWF0ZUZyb21BcmNoaXZlTGlzdChDRkFsbG9jYXRvclJlZiwg
Q0ZJbmRleCB2ZXJzaW9uLCBDRlR5cGVSZWYqIG9iamVjdHMsIENGSW5kZXggb2JqZWN0Q291bnQs
IENGRGljdGlvbmFyeVJlZiBwcm90b2NvbFByb3BlcnRpZXMpOwogdm9pZCBDRlVSTFJlcXVlc3RT
ZXRQcm94eVNldHRpbmdzKENGTXV0YWJsZVVSTFJlcXVlc3RSZWYsIENGRGljdGlvbmFyeVJlZik7
CiAKLSNpZiBIQVZFKEhTVFNfU1RPUkFHRV9QQVRIKQotdm9pZCBfQ0ZOZXR3b3JrU2V0SFNUU1N0
b3JhZ2VQYXRoKENGU3RyaW5nUmVmKTsKLSNlbmRpZgotCiBDRk5fRVhQT1JUIGNvbnN0IENGU3Ry
aW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5OwogQ0ZOX0VYUE9SVCBjb25zdCBD
RlN0cmluZ1JlZiBrQ0ZTdHJlYW1Qcm9wZXJ0eUNPTk5FQ1RQcm94eUhvc3Q7CiBDRk5fRVhQT1JU
IGNvbnN0IENGU3RyaW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5UG9ydDsKSW5k
ZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
Q2hhbmdlTG9nCShyZXZpc2lvbiAyNjYwOTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwko
d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA4LTI0ICBBbGV4IENocmlzdGVu
c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgZGVwcmVj
YXRlZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdlIG9uIFByb2Nlc3NQb29sQ29u
ZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWZ0ZXIgcmRhcjovL3Byb2JsZW0vNjUwNDc5NzEgdGhpcyBpcyBubyBsb25nZXIgbmVlZGVk
IGJlY2F1c2UgdGhlIHJlcGxhY2VtZW50IG9uIFdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u
IGhhcyBiZWVuIGFkb3B0ZWQuCisgICAgICAgIFRoZSBzZWxlY3RvciBvbiBfV0tQcm9jZXNzUG9v
bENvbmZpZ3VyYXRpb24gaGFkIGFscmVhZHkgYmVlbiBkZXByZWNhdGVkLCBhbmQgaXMgbGVmdCBm
b3Igbm93IHRvIGFsbG93IGVhc2llciBkZWJ1Z2dpbmcgd2l0aCBPU2VzIHRoYXQgdXNlIGl0IHN0
aWxsLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFy
YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz
cy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr
UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3NDb2NvYSk6CisgICAgICAg
ICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAg
ICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OmNvcHkpOgorICAgICAgICAqIFVJUHJv
Y2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmg6CisgICAgICAgICogVUlQcm9j
ZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgt
W19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBzZXRIU1RTU3RvcmFnZURpcmVjdG9yeTpdKToK
KyAgICAgICAgKC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGhzdHNTdG9yYWdlRGlyZWN0
b3J5XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAg
KFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAyMC0w
OC0yNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBV
bnJldmlld2VkLCBmaXggdGhlIGludGVybmFsIGlPUyAxMy40IGJ1aWxkCkluZGV4OiBTb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNw
cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j
ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjY2MDkwKQorKysgU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJ
KHdvcmtpbmcgY29weSkKQEAgLTc0LDggKzc0LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0
aW9uUGFyYW1ldGVyczo6ZQogI2VuZGlmCiAgICAgZW5jb2RlciA8PCBzaG91bGRFbmFibGVJVFBE
YXRhYmFzZTsKICAgICBlbmNvZGVyIDw8IGVuYWJsZUFkQ2xpY2tBdHRyaWJ1dGlvbkRlYnVnTW9k
ZTsKLSAgICBlbmNvZGVyIDw8IGhzdHNTdG9yYWdlRGlyZWN0b3J5OwotICAgIGVuY29kZXIgPDwg
aHN0c1N0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiB9CiAKIGJvb2wgTmV0d29ya1By
b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIE5l
dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiByZXN1bHQpCkBAIC0xNjcsMTIgKzE2NSw2
IEBAIGJvb2wgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmQKICAgICBpZiAoIWRl
Y29kZXIuZGVjb2RlKHJlc3VsdC5lbmFibGVBZENsaWNrQXR0cmlidXRpb25EZWJ1Z01vZGUpKQog
ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5o
c3RzU3RvcmFnZURpcmVjdG9yeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmICgh
ZGVjb2Rlci5kZWNvZGUocmVzdWx0LmhzdHNTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxl
KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKSW5kZXg6
IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2NjA5MCkKKysrIFNvdXJj
ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu
aAkod29ya2luZyBjb3B5KQpAQCAtOTMsOCArOTMsNiBAQCBzdHJ1Y3QgTmV0d29ya1Byb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnMgCiAjZW5kaWYKICAgICBib29sIHNob3VsZEVuYWJsZUlUUERhdGFi
YXNlIHsgZmFsc2UgfTsKICAgICBib29sIGVuYWJsZUFkQ2xpY2tBdHRyaWJ1dGlvbkRlYnVnTW9k
ZSB7IGZhbHNlIH07Ci0gICAgU3RyaW5nIGhzdHNTdG9yYWdlRGlyZWN0b3J5OwotICAgIFNhbmRi
b3hFeHRlbnNpb246OkhhbmRsZSBoc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsK
IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3Jr
UHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbQkocmV2
aXNpb24gMjY2MDkwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3
b3JrUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03NCwxMyArNzQsNiBAQCB2b2lk
IE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOCiAgICAgV2ViQ29yZTo6c2V0QXBw
bGljYXRpb25CdW5kbGVJZGVudGlmaWVyKHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRp
Zmllcik7CiAgICAgc2V0QXBwbGljYXRpb25TREtWZXJzaW9uKHBhcmFtZXRlcnMudWlQcm9jZXNz
U0RLVmVyc2lvbik7CiAKLSNpZiBIQVZFKEhTVFNfU1RPUkFHRV9QQVRIKQotICAgIGlmICghcGFy
YW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeS5pc051bGwoKSkgewotICAgICAgICBTYW5kYm94
RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVj
dG9yeUV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgICAgIF9DRk5ldHdvcmtTZXRIU1RTU3RvcmFnZVBh
dGgocGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeS5jcmVhdGVDRlN0cmluZygpLmdldCgp
KTsKLSAgICB9Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgU2FuZGJv
eEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURp
cmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBl
cm1hbmVudGx5KHBhcmFtZXRlcnMuY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9uSGFu
ZGxlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJ
KHJldmlzaW9uIDI2NjA5MCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ
b29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTQwLDEwICs1NDAsNiBAQCBOZXR3b3JrUHJvY2Vz
c1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zCiAjZW5kaWYKICNlbmRpZgogCi0gICAgcGFyYW1l
dGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeSA9IG1fY29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VE
aXJlY3RvcnkoKTsKLSAgICBpZiAoIXBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnkuaXNO
dWxsKCkpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0
ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmhz
dHNTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLQogICAgIHBhcmFtZXRlcnMudXJs
U2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZSA9IGNvcHlUb1ZlY3RvcihMZWdhY3lHbG9iYWxTZXR0
aW5nczo6c2luZ2xldG9uKCkuc2NoZW1lc1RvUmVnaXN0ZXJBc1NlY3VyZSgpKTsKICAgICBwYXJh
bWV0ZXJzLnVybFNjaGVtZXNSZWdpc3RlcmVkQXNCeXBhc3NpbmdDb250ZW50U2VjdXJpdHlQb2xp
Y3kgPSBjb3B5VG9WZWN0b3IoTGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNjaGVt
ZXNUb1JlZ2lzdGVyQXNCeXBhc3NpbmdDb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CiAgICAgcGFy
YW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZEFzTG9jYWwgPSBjb3B5VG9WZWN0b3IoTGVnYWN5
R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNjaGVtZXNUb1JlZ2lzdGVyQXNMb2NhbCgpKTsK
SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3Vy
YXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQ
cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCShyZXZpc2lvbiAyNjYwOTApCisrKyBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtNjgsNyArNjgsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u
PiBQcm9jZXNzUG9vCiAgICAgY29weS0+bV91c2VzQmFja0ZvcndhcmRDYWNoZSA9IHRoaXMtPm1f
dXNlc0JhY2tGb3J3YXJkQ2FjaGU7CiAgICAgY29weS0+bV9jdXN0b21XZWJDb250ZW50U2Vydmlj
ZUJ1bmRsZUlkZW50aWZpZXIgPSB0aGlzLT5tX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxl
SWRlbnRpZmllcjsKICAgICBjb3B5LT5tX3VzZXNTaW5nbGVXZWJQcm9jZXNzID0gbV91c2VzU2lu
Z2xlV2ViUHJvY2VzczsKLSAgICBjb3B5LT5tX2hzdHNTdG9yYWdlRGlyZWN0b3J5ID0gbV9oc3Rz
U3RvcmFnZURpcmVjdG9yeTsKICNpZiBQTEFURk9STShHVEspICYmICFVU0UoR1RLNCkKICAgICBj
b3B5LT5tX3VzZVN5c3RlbUFwcGVhcmFuY2VGb3JTY3JvbGxiYXJzID0gbV91c2VTeXN0ZW1BcHBl
YXJhbmNlRm9yU2Nyb2xsYmFyczsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaAkocmV2
aXNpb24gMjY2MDkwKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQ
b29sQ29uZmlndXJhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsOSArMTMxLDYgQEAgcHVi
bGljOgogICAgIGNvbnN0IFdURjo6U3RyaW5nJiBjdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRs
ZUlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVu
ZGxlSWRlbnRpZmllcjsgfQogICAgIHZvaWQgc2V0Q3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5k
bGVJZGVudGlmaWVyKGNvbnN0IFdURjo6U3RyaW5nJiBjdXN0b21XZWJDb250ZW50U2VydmljZUJ1
bmRsZUlkZW50aWZpZXIpIHsgbV9jdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZp
ZXIgPSBjdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXI7IH0KIAotICAgIGNv
bnN0IFdURjo6U3RyaW5nJiBoc3RzU3RvcmFnZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1f
aHN0c1N0b3JhZ2VEaXJlY3Rvcnk7IH0KLSAgICB2b2lkIHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5
KFdURjo6U3RyaW5nJiYgZGlyZWN0b3J5KSB7IG1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBXVEZN
b3ZlKGRpcmVjdG9yeSk7IH0KLQogI2lmIFBMQVRGT1JNKEdUSykgJiYgIVVTRShHVEs0KQogICAg
IGJvb2wgdXNlU3lzdGVtQXBwZWFyYW5jZUZvclNjcm9sbGJhcnMoKSBjb25zdCB7IHJldHVybiBt
X3VzZVN5c3RlbUFwcGVhcmFuY2VGb3JTY3JvbGxiYXJzOyB9CiAgICAgdm9pZCBzZXRVc2VTeXN0
ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFycyhib29sIHVzZVN5c3RlbUFwcGVhcmFuY2VGb3JTY3Jv
bGxiYXJzKSB7IG1fdXNlU3lzdGVtQXBwZWFyYW5jZUZvclNjcm9sbGJhcnMgPSB1c2VTeXN0ZW1B
cHBlYXJhbmNlRm9yU2Nyb2xsYmFyczsgfQpAQCAtMTc2LDcgKzE3Myw2IEBAIHByaXZhdGU6CiAg
ICAgYm9vbCBtX3Nob3VsZENvbmZpZ3VyZUpTQ0ZvclRlc3RpbmcgeyBmYWxzZSB9OwogICAgIGJv
b2wgbV9pc0pJVEVuYWJsZWQgeyB0cnVlIH07CiAgICAgYm9vbCBtX3VzZXNTaW5nbGVXZWJQcm9j
ZXNzIHsgZmFsc2UgfTsKLSAgICBXVEY6OlN0cmluZyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5Owog
I2lmIFBMQVRGT1JNKEdUSykgJiYgIVVTRShHVEs0KQogICAgIGJvb2wgbV91c2VTeXN0ZW1BcHBl
YXJhbmNlRm9yU2Nyb2xsYmFycyB7IGZhbHNlIH07CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQ
b29sQ29uZmlndXJhdGlvbi5tbQkocmV2aXNpb24gMjY2MDkwKQorKysgU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQkod29ya2lu
ZyBjb3B5KQpAQCAtMzAzLDE2ICszMDMsMTEgQEAgLSAodm9pZClzZXRKSVRFbmFibGVkOihCT09M
KWVuYWJsZWQKIAogLSAodm9pZClzZXRIU1RTU3RvcmFnZURpcmVjdG9yeTooTlNVUkwgKilkaXJl
Y3RvcnkKIHsKLSAgICBpZiAoZGlyZWN0b3J5ICYmICFbZGlyZWN0b3J5IGlzRmlsZVVSTF0pCi0g
ICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3Jt
YXQ6QCIlQCBpcyBub3QgYSBmaWxlIFVSTCIsIGRpcmVjdG9yeV07Ci0KLSAgICAvLyBGSVhNRTog
TW92ZSB0aGlzIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG9uY2UgcmRhcjov
L3Byb2JsZW0vNTAxMDk2MzEgaXMgZml4ZWQuCi0gICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlv
bi0+c2V0SFNUU1N0b3JhZ2VEaXJlY3RvcnkoZGlyZWN0b3J5LnBhdGgpOwogfQogCiAtIChOU1VS
TCAqKWhzdHNTdG9yYWdlRGlyZWN0b3J5CiB7Ci0gICAgcmV0dXJuIFtOU1VSTCBmaWxlVVJMV2l0
aFBhdGg6X3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3RvcnkoKSBp
c0RpcmVjdG9yeTpZRVNdOworICAgIHJldHVybiBuaWw7CiB9CiAKICNpZiBQTEFURk9STShJT1Nf
RkFNSUxZKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407161</attachid>
            <date>2020-08-24 19:37:59 -0700</date>
            <delta_ts>2020-08-25 10:20:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215788-20200824193758.patch</filename>
            <type>text/plain</type>
            <size>13741</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjY2MDk0KQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA4
LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg
ICAgQ2xlYW4gdXAgZGVwcmVjYXRlZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdl
IG9uIFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oOgorCiAyMDIw
LTA4LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgTWFrZSBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBTUEkgZm9yIEhTVFMg
c3RvcmFnZSB0byByZXBsYWNlIF9XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oc3RzU3RvcmFn
ZURpcmVjdG9yeQpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3b3Jr
U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3
b3JrU1BJLmgJKHJldmlzaW9uIDI2NjA5NCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3Bp
L2NmL0NGTmV0d29ya1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOTIsMTAgKzM5Miw2IEBAIHZv
aWQgX0NGVVJMUmVxdWVzdENyZWF0ZUFyY2hpdmVMaXN0KENGQWwKIENGTXV0YWJsZVVSTFJlcXVl
c3RSZWYgX0NGVVJMUmVxdWVzdENyZWF0ZUZyb21BcmNoaXZlTGlzdChDRkFsbG9jYXRvclJlZiwg
Q0ZJbmRleCB2ZXJzaW9uLCBDRlR5cGVSZWYqIG9iamVjdHMsIENGSW5kZXggb2JqZWN0Q291bnQs
IENGRGljdGlvbmFyeVJlZiBwcm90b2NvbFByb3BlcnRpZXMpOwogdm9pZCBDRlVSTFJlcXVlc3RT
ZXRQcm94eVNldHRpbmdzKENGTXV0YWJsZVVSTFJlcXVlc3RSZWYsIENGRGljdGlvbmFyeVJlZik7
CiAKLSNpZiBIQVZFKEhTVFNfU1RPUkFHRV9QQVRIKQotdm9pZCBfQ0ZOZXR3b3JrU2V0SFNUU1N0
b3JhZ2VQYXRoKENGU3RyaW5nUmVmKTsKLSNlbmRpZgotCiBDRk5fRVhQT1JUIGNvbnN0IENGU3Ry
aW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5OwogQ0ZOX0VYUE9SVCBjb25zdCBD
RlN0cmluZ1JlZiBrQ0ZTdHJlYW1Qcm9wZXJ0eUNPTk5FQ1RQcm94eUhvc3Q7CiBDRk5fRVhQT1JU
IGNvbnN0IENGU3RyaW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5UG9ydDsKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Np
b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291
cC9Tb3VwTmV0d29ya1Nlc3Npb24uY3BwCShyZXZpc2lvbiAyNjYwOTQpCisrKyBTb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNzaW9uLmNwcAkod29ya2lu
ZyBjb3B5KQpAQCAtNTgsMTIgKzU4LDYgQEAgc3RhdGljIFNvdXBOZXR3b3JrUHJveHlTZXR0aW5n
cyYgcHJveHlTZQogICAgIHJldHVybiBzZXR0aW5ncy5nZXQoKTsKIH0KIAotc3RhdGljIENTdHJp
bmcmIGhzdHNTdG9yYWdlRGlyZWN0b3J5KCkKLXsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8
Q1N0cmluZz4gZGlyZWN0b3J5OwotICAgIHJldHVybiBkaXJlY3RvcnkuZ2V0KCk7Ci19Ci0KICNp
ZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAogaW5saW5lIHN0YXRpYyB2
b2lkIHNvdXBMb2dQcmludGVyKFNvdXBMb2dnZXIqLCBTb3VwTG9nZ2VyTG9nTGV2ZWwsIGNoYXIg
ZGlyZWN0aW9uLCBjb25zdCBjaGFyKiBkYXRhLCBncG9pbnRlcikKIHsKQEAgLTE3OCwzMCArMTcy
LDEzIEBAIFNvdXBDb29raWVKYXIqIFNvdXBOZXR3b3JrU2Vzc2lvbjo6Y29va2kKICAgICByZXR1
cm4gU09VUF9DT09LSUVfSkFSKHNvdXBfc2Vzc2lvbl9nZXRfZmVhdHVyZShtX3NvdXBTZXNzaW9u
LmdldCgpLCBTT1VQX1RZUEVfQ09PS0lFX0pBUikpOwogfQogCi12b2lkIFNvdXBOZXR3b3JrU2Vz
c2lvbjo6c2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IENTdHJpbmcmIGRpcmVjdG9yeSkK
LXsKLSAgICBoc3RzU3RvcmFnZURpcmVjdG9yeSgpID0gZGlyZWN0b3J5OwotfQotCiB2b2lkIFNv
dXBOZXR3b3JrU2Vzc2lvbjo6c2V0dXBIU1RTRW5mb3JjZXIoKQogewogI2lmIFNPVVBfQ0hFQ0tf
VkVSU0lPTigyLCA2NywgMSkKICAgICBpZiAoc291cF9zZXNzaW9uX2hhc19mZWF0dXJlKG1fc291
cFNlc3Npb24uZ2V0KCksIFNPVVBfVFlQRV9IU1RTX0VORk9SQ0VSKSkKICAgICAgICAgc291cF9z
ZXNzaW9uX3JlbW92ZV9mZWF0dXJlX2J5X3R5cGUobV9zb3VwU2Vzc2lvbi5nZXQoKSwgU09VUF9U
WVBFX0hTVFNfRU5GT1JDRVIpOwogCi0gICAgR1JlZlB0cjxTb3VwSFNUU0VuZm9yY2VyPiBlbmZv
cmNlcjsKLSAgICBpZiAobV9zZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSB8fCBoc3RzU3RvcmFnZURp
cmVjdG9yeSgpLmlzTnVsbCgpKQotICAgICAgICBlbmZvcmNlciA9IGFkb3B0R1JlZihzb3VwX2hz
dHNfZW5mb3JjZXJfbmV3KCkpOwotICAgIGVsc2UgewotICAgICAgICBpZiAoRmlsZVN5c3RlbTo6
bWFrZUFsbERpcmVjdG9yaWVzKGhzdHNTdG9yYWdlRGlyZWN0b3J5KCkuZGF0YSgpKSkgewotICAg
ICAgICAgICAgQ1N0cmluZyBzdG9yYWdlUGF0aCA9IEZpbGVTeXN0ZW06OmZpbGVTeXN0ZW1SZXBy
ZXNlbnRhdGlvbihoc3RzU3RvcmFnZURpcmVjdG9yeSgpLmRhdGEoKSk7Ci0gICAgICAgICAgICBH
VW5pcXVlUHRyPGNoYXI+IGRiRmlsZW5hbWUoZ19idWlsZF9maWxlbmFtZShzdG9yYWdlUGF0aC5k
YXRhKCksICJoc3RzLXN0b3JhZ2Uuc3FsaXRlIiwgbnVsbHB0cikpOwotICAgICAgICAgICAgZW5m
b3JjZXIgPSBhZG9wdEdSZWYoc291cF9oc3RzX2VuZm9yY2VyX2RiX25ldyhkYkZpbGVuYW1lLmdl
dCgpKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihO
ZXR3b3JrLCAiVW5hYmxlIHRvIGNyZWF0ZSB0aGUgSFNUUyBzdG9yYWdlIGRpcmVjdG9yeSBcIiVz
XCIuIFVzaW5nIGEgbWVtb3J5IGVuZm9yY2VyIGluc3RlYWQuIiwgaHN0c1N0b3JhZ2VEaXJlY3Rv
cnkoKS5kYXRhKCkpOwotICAgICAgICAgICAgZW5mb3JjZXIgPSBhZG9wdEdSZWYoc291cF9oc3Rz
X2VuZm9yY2VyX25ldygpKTsKLSAgICAgICAgfQotICAgIH0KKyAgICBHUmVmUHRyPFNvdXBIU1RT
RW5mb3JjZXI+IGVuZm9yY2VyID0gYWRvcHRHUmVmKHNvdXBfaHN0c19lbmZvcmNlcl9uZXcoKSk7
CiAgICAgc291cF9zZXNzaW9uX2FkZF9mZWF0dXJlKG1fc291cFNlc3Npb24uZ2V0KCksIFNPVVBf
U0VTU0lPTl9GRUFUVVJFKGVuZm9yY2VyLmdldCgpKSk7CiAjZW5kaWYKIH0KSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24uaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdv
cmtTZXNzaW9uLmgJKHJldmlzaW9uIDI2NjA5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24uaAkod29ya2luZyBjb3B5KQpAQCAtNTcs
NyArNTcsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb29raWVKYXIoU291cENvb2tpZUphciop
OwogICAgIFNvdXBDb29raWVKYXIqIGNvb2tpZUphcigpIGNvbnN0OwogCi0gICAgc3RhdGljIHZv
aWQgc2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IENTdHJpbmcmIGhzdHNTdG9yYWdlRGly
ZWN0b3J5KTsKICAgICB2b2lkIHNldHVwSFNUU0VuZm9yY2VyKCk7CiAKICAgICBzdGF0aWMgdm9p
ZCBjbGVhck9sZFNvdXBDYWNoZShjb25zdCBTdHJpbmcmIGNhY2hlRGlyZWN0b3J5KTsKSW5kZXg6
IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjYwOTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA4LTI0ICBBbGV4IENocmlzdGVuc2Vu
ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgZGVwcmVjYXRl
ZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdlIG9uIFByb2Nlc3NQb29sQ29uZmln
dXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
QWZ0ZXIgcmRhcjovL3Byb2JsZW0vNjUwNDc5NzEgdGhpcyBpcyBubyBsb25nZXIgbmVlZGVkIGJl
Y2F1c2UgdGhlIHJlcGxhY2VtZW50IG9uIFdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGhh
cyBiZWVuIGFkb3B0ZWQuCisgICAgICAgIFRoZSBzZWxlY3RvciBvbiBfV0tQcm9jZXNzUG9vbENv
bmZpZ3VyYXRpb24gaGFkIGFscmVhZHkgYmVlbiBkZXByZWNhdGVkLCBhbmQgaXMgbGVmdCBmb3Ig
bm93IHRvIGFsbG93IGVhc2llciBkZWJ1Z2dpbmcgd2l0aCBPU2VzIHRoYXQgdXNlIGl0IHN0aWxs
LgorICAgICAgICBBbHNvIHJlbW92ZSBzb21lIGRlYWQgY29kZSBmcm9tIHRoZSBsaWJzb3VwIG5l
dHdvcmtpbmcgYmFja2VuZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j
ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nl
c3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6Ok5l
dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIE5ldHdv
cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICog
TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzQ29j
b2EpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Byb2Nlc3NTb3VwLmNw
cDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5l
dHdvcmtQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29u
ZmlndXJhdGlvbi5jcHA6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6
Y29weSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRp
b24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmln
dXJhdGlvbi5tbToKKyAgICAgICAgKC1bX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHNldEhT
VFNTdG9yYWdlRGlyZWN0b3J5Ol0pOgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3Vy
YXRpb24gaHN0c1N0b3JhZ2VEaXJlY3RvcnldKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJv
Y2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0
d29ya1Byb2Nlc3MpOgorCiAyMDIwLTA4LTI0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA
YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCB0aGUgaW50ZXJuYWwgaU9TIDEz
LjQgYnVpbGQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl
c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lv
biAyNjYwOTQpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNz
Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzQsOCArNzQsNiBAQCB2
b2lkIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplCiAjZW5kaWYKICAgICBlbmNv
ZGVyIDw8IHNob3VsZEVuYWJsZUlUUERhdGFiYXNlOwogICAgIGVuY29kZXIgPDwgZW5hYmxlQWRD
bGlja0F0dHJpYnV0aW9uRGVidWdNb2RlOwotICAgIGVuY29kZXIgPDwgaHN0c1N0b3JhZ2VEaXJl
Y3Rvcnk7Ci0gICAgZW5jb2RlciA8PCBoc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRs
ZTsKIH0KIAogYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKElQ
Qzo6RGVjb2RlciYgZGVjb2RlciwgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHJl
c3VsdCkKQEAgLTE2NywxMiArMTY1LDYgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFy
YW1ldGVyczo6ZAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmVuYWJsZUFkQ2xpY2tB
dHRyaWJ1dGlvbkRlYnVnTW9kZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICgh
ZGVjb2Rlci5kZWNvZGUocmVzdWx0LmhzdHNTdG9yYWdlRGlyZWN0b3J5KSkKLSAgICAgICAgcmV0
dXJuIGZhbHNlOwotCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaHN0c1N0b3JhZ2VE
aXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBy
ZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2
aXNpb24gMjY2MDk0KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC05Myw4ICs5Myw2IEBA
IHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyAKICNlbmRpZgogICAgIGJv
b2wgc2hvdWxkRW5hYmxlSVRQRGF0YWJhc2UgeyBmYWxzZSB9OwogICAgIGJvb2wgZW5hYmxlQWRD
bGlja0F0dHJpYnV0aW9uRGVidWdNb2RlIHsgZmFsc2UgfTsKLSAgICBTdHJpbmcgaHN0c1N0b3Jh
Z2VEaXJlY3Rvcnk7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhzdHNTdG9yYWdlRGly
ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4
OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3
b3JrUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNjYwOTQpCisrKyBTb3VyY2UvV2ViS2l0L05l
dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkK
QEAgLTc0LDEzICs3NCw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6
ZU4KICAgICBXZWJDb3JlOjpzZXRBcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIocGFyYW1ldGVy
cy51aVByb2Nlc3NCdW5kbGVJZGVudGlmaWVyKTsKICAgICBzZXRBcHBsaWNhdGlvblNES1ZlcnNp
b24ocGFyYW1ldGVycy51aVByb2Nlc3NTREtWZXJzaW9uKTsKIAotI2lmIEhBVkUoSFNUU19TVE9S
QUdFX1BBVEgpCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5LmlzTnVs
bCgpKSB7Ci0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJh
bWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICAgICAgX0NG
TmV0d29ya1NldEhTVFNTdG9yYWdlUGF0aChwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5
LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpOwotICAgIH0KLSNlbmRpZgotCiAjaWYgUExBVEZPUk0o
SU9TX0ZBTUlMWSkKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFy
YW1ldGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBTYW5k
Ym94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5jb250YWluZXJDYWNo
ZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3Jr
UHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzU291cC5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzU291cC5jcHAJKHJldmlz
aW9uIDI2NjA5NCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3Jr
UHJvY2Vzc1NvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzksOCArMTM5LDYgQEAgdm9pZCBO
ZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTgogCiAgICAgc2V0SWdub3JlVExTRXJy
b3JzKHBhcmFtZXRlcnMuaWdub3JlVExTRXJyb3JzKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5o
c3RzU3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNvdXBOZXR3b3JrU2Vzc2lv
bjo6c2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3Rv
cnkudXRmOCgpKTsKICAgICBmb3JFYWNoTmV0d29ya1Nlc3Npb24oW10oY29uc3QgYXV0byYgc2Vz
c2lvbikgewogICAgICAgICBzdGF0aWNfY2FzdDxjb25zdCBOZXR3b3JrU2Vzc2lvblNvdXAmPihz
ZXNzaW9uKS5zb3VwTmV0d29ya1Nlc3Npb24oKS5zZXR1cEhTVFNFbmZvcmNlcigpOwogICAgIH0p
OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkocmV2
aXNpb24gMjY2MDk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu
Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDAsMTAgKzU0MCw2IEBAIE5ldHdvcmtQcm9jZXNzUHJv
eHkmIFdlYlByb2Nlc3NQb29sOjplbnMKICNlbmRpZgogI2VuZGlmCiAKLSAgICBwYXJhbWV0ZXJz
LmhzdHNTdG9yYWdlRGlyZWN0b3J5ID0gbV9jb25maWd1cmF0aW9uLT5oc3RzU3RvcmFnZURpcmVj
dG9yeSgpOwotICAgIGlmICghcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeS5pc051bGwo
KSkKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGly
ZWN0b3J5KHBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuaHN0c1N0
b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotCiAgICAgcGFyYW1ldGVycy51cmxTY2hl
bWVzUmVnaXN0ZXJlZEFzU2VjdXJlID0gY29weVRvVmVjdG9yKExlZ2FjeUdsb2JhbFNldHRpbmdz
OjpzaW5nbGV0b24oKS5zY2hlbWVzVG9SZWdpc3RlckFzU2VjdXJlKCkpOwogICAgIHBhcmFtZXRl
cnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc0J5cGFzc2luZ0NvbnRlbnRTZWN1cml0eVBvbGljeSA9
IGNvcHlUb1ZlY3RvcihMZWdhY3lHbG9iYWxTZXR0aW5nczo6c2luZ2xldG9uKCkuc2NoZW1lc1Rv
UmVnaXN0ZXJBc0J5cGFzc2luZ0NvbnRlbnRTZWN1cml0eVBvbGljeSgpKTsKICAgICBwYXJhbWV0
ZXJzLnVybFNjaGVtZXNSZWdpc3RlcmVkQXNMb2NhbCA9IGNvcHlUb1ZlY3RvcihMZWdhY3lHbG9i
YWxTZXR0aW5nczo6c2luZ2xldG9uKCkuc2NoZW1lc1RvUmVnaXN0ZXJBc0xvY2FsKCkpOwpJbmRl
eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlv
bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nl
c3NQb29sQ29uZmlndXJhdGlvbi5jcHAJKHJldmlzaW9uIDI2NjA5NCkKKysrIFNvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCSh3b3JraW5n
IGNvcHkpCkBAIC02OCw3ICs2OCw2IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IFBy
b2Nlc3NQb28KICAgICBjb3B5LT5tX3VzZXNCYWNrRm9yd2FyZENhY2hlID0gdGhpcy0+bV91c2Vz
QmFja0ZvcndhcmRDYWNoZTsKICAgICBjb3B5LT5tX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVu
ZGxlSWRlbnRpZmllciA9IHRoaXMtPm1fY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVu
dGlmaWVyOwogICAgIGNvcHktPm1fdXNlc1NpbmdsZVdlYlByb2Nlc3MgPSBtX3VzZXNTaW5nbGVX
ZWJQcm9jZXNzOwotICAgIGNvcHktPm1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBtX2hzdHNTdG9y
YWdlRGlyZWN0b3J5OwogI2lmIFBMQVRGT1JNKEdUSykgJiYgIVVTRShHVEs0KQogICAgIGNvcHkt
Pm1fdXNlU3lzdGVtQXBwZWFyYW5jZUZvclNjcm9sbGJhcnMgPSBtX3VzZVN5c3RlbUFwcGVhcmFu
Y2VGb3JTY3JvbGxiYXJzOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B
UEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCShyZXZpc2lv
biAyNjYwOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xD
b25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMSw5ICsxMzEsNiBAQCBwdWJsaWM6
CiAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGN1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRl
bnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fY3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJ
ZGVudGlmaWVyOyB9CiAgICAgdm9pZCBzZXRDdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlk
ZW50aWZpZXIoY29uc3QgV1RGOjpTdHJpbmcmIGN1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxl
SWRlbnRpZmllcikgeyBtX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllciA9
IGN1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcjsgfQogCi0gICAgY29uc3Qg
V1RGOjpTdHJpbmcmIGhzdHNTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV9oc3Rz
U3RvcmFnZURpcmVjdG9yeTsgfQotICAgIHZvaWQgc2V0SFNUU1N0b3JhZ2VEaXJlY3RvcnkoV1RG
OjpTdHJpbmcmJiBkaXJlY3RvcnkpIHsgbV9oc3RzU3RvcmFnZURpcmVjdG9yeSA9IFdURk1vdmUo
ZGlyZWN0b3J5KTsgfQotCiAjaWYgUExBVEZPUk0oR1RLKSAmJiAhVVNFKEdUSzQpCiAgICAgYm9v
bCB1c2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFycygpIGNvbnN0IHsgcmV0dXJuIG1fdXNl
U3lzdGVtQXBwZWFyYW5jZUZvclNjcm9sbGJhcnM7IH0KICAgICB2b2lkIHNldFVzZVN5c3RlbUFw
cGVhcmFuY2VGb3JTY3JvbGxiYXJzKGJvb2wgdXNlU3lzdGVtQXBwZWFyYW5jZUZvclNjcm9sbGJh
cnMpIHsgbV91c2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFycyA9IHVzZVN5c3RlbUFwcGVh
cmFuY2VGb3JTY3JvbGxiYXJzOyB9CkBAIC0xNzYsNyArMTczLDYgQEAgcHJpdmF0ZToKICAgICBi
b29sIG1fc2hvdWxkQ29uZmlndXJlSlNDRm9yVGVzdGluZyB7IGZhbHNlIH07CiAgICAgYm9vbCBt
X2lzSklURW5hYmxlZCB7IHRydWUgfTsKICAgICBib29sIG1fdXNlc1NpbmdsZVdlYlByb2Nlc3Mg
eyBmYWxzZSB9OwotICAgIFdURjo6U3RyaW5nIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7CiAjaWYg
UExBVEZPUk0oR1RLKSAmJiAhVVNFKEdUSzQpCiAgICAgYm9vbCBtX3VzZVN5c3RlbUFwcGVhcmFu
Y2VGb3JTY3JvbGxiYXJzIHsgZmFsc2UgfTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xD
b25maWd1cmF0aW9uLm1tCShyZXZpc2lvbiAyNjYwOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tCSh3b3JraW5nIGNv
cHkpCkBAIC0zMDMsMTYgKzMwMywxMSBAQCAtICh2b2lkKXNldEpJVEVuYWJsZWQ6KEJPT0wpZW5h
YmxlZAogCiAtICh2b2lkKXNldEhTVFNTdG9yYWdlRGlyZWN0b3J5OihOU1VSTCAqKWRpcmVjdG9y
eQogewotICAgIGlmIChkaXJlY3RvcnkgJiYgIVtkaXJlY3RvcnkgaXNGaWxlVVJMXSkKLSAgICAg
ICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpA
IiVAIGlzIG5vdCBhIGZpbGUgVVJMIiwgZGlyZWN0b3J5XTsKLQotICAgIC8vIEZJWE1FOiBNb3Zl
IHRoaXMgdG8gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gb25jZSByZGFyOi8vcHJv
YmxlbS81MDEwOTYzMSBpcyBmaXhlZC4KLSAgICBfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLT5z
ZXRIU1RTU3RvcmFnZURpcmVjdG9yeShkaXJlY3RvcnkucGF0aCk7CiB9CiAKIC0gKE5TVVJMICop
aHN0c1N0b3JhZ2VEaXJlY3RvcnkKIHsKLSAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRoUGF0
aDpfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLT5oc3RzU3RvcmFnZURpcmVjdG9yeSgpIGlzRGly
ZWN0b3J5OllFU107CisgICAgcmV0dXJuIG5pbDsKIH0KIAogI2lmIFBMQVRGT1JNKElPU19GQU1J
TFkpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407204</attachid>
            <date>2020-08-25 10:20:50 -0700</date>
            <delta_ts>2020-08-25 11:06:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215788-20200825102049.patch</filename>
            <type>text/plain</type>
            <size>10190</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjY2MTI4KQorKysgU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA4
LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg
ICAgQ2xlYW4gdXAgZGVwcmVjYXRlZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdl
IG9uIFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oOgorCiAyMDIw
LTA4LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgTWFrZSBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBTUEkgZm9yIEhTVFMg
c3RvcmFnZSB0byByZXBsYWNlIF9XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oc3RzU3RvcmFn
ZURpcmVjdG9yeQpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3b3Jr
U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3
b3JrU1BJLmgJKHJldmlzaW9uIDI2NjEyOCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3Bp
L2NmL0NGTmV0d29ya1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOTIsMTAgKzM5Miw2IEBAIHZv
aWQgX0NGVVJMUmVxdWVzdENyZWF0ZUFyY2hpdmVMaXN0KENGQWwKIENGTXV0YWJsZVVSTFJlcXVl
c3RSZWYgX0NGVVJMUmVxdWVzdENyZWF0ZUZyb21BcmNoaXZlTGlzdChDRkFsbG9jYXRvclJlZiwg
Q0ZJbmRleCB2ZXJzaW9uLCBDRlR5cGVSZWYqIG9iamVjdHMsIENGSW5kZXggb2JqZWN0Q291bnQs
IENGRGljdGlvbmFyeVJlZiBwcm90b2NvbFByb3BlcnRpZXMpOwogdm9pZCBDRlVSTFJlcXVlc3RT
ZXRQcm94eVNldHRpbmdzKENGTXV0YWJsZVVSTFJlcXVlc3RSZWYsIENGRGljdGlvbmFyeVJlZik7
CiAKLSNpZiBIQVZFKEhTVFNfU1RPUkFHRV9QQVRIKQotdm9pZCBfQ0ZOZXR3b3JrU2V0SFNUU1N0
b3JhZ2VQYXRoKENGU3RyaW5nUmVmKTsKLSNlbmRpZgotCiBDRk5fRVhQT1JUIGNvbnN0IENGU3Ry
aW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5OwogQ0ZOX0VYUE9SVCBjb25zdCBD
RlN0cmluZ1JlZiBrQ0ZTdHJlYW1Qcm9wZXJ0eUNPTk5FQ1RQcm94eUhvc3Q7CiBDRk5fRVhQT1JU
IGNvbnN0IENGU3RyaW5nUmVmIGtDRlN0cmVhbVByb3BlcnR5Q09OTkVDVFByb3h5UG9ydDsKSW5k
ZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
Q2hhbmdlTG9nCShyZXZpc2lvbiAyNjYxMjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwko
d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA4LTI1ICBBbGV4IENocmlzdGVu
c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgZGVwcmVj
YXRlZCBhbmQgdW51c2VkIFNQSSB0byBzZXQgSFNUUyBzdG9yYWdlIG9uIFByb2Nlc3NQb29sQ29u
ZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE1Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWZ0ZXIgcmRhcjovL3Byb2JsZW0vNjUwNDc5NzEgdGhpcyBpcyBubyBsb25nZXIgbmVlZGVk
IGJlY2F1c2UgdGhlIHJlcGxhY2VtZW50IG9uIFdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u
IGhhcyBiZWVuIGFkb3B0ZWQuCisgICAgICAgIFRoZSBzZWxlY3RvciBvbiBfV0tQcm9jZXNzUG9v
bENvbmZpZ3VyYXRpb24gaGFkIGFscmVhZHkgYmVlbiBkZXByZWNhdGVkLCBhbmQgaXMgbGVmdCBm
b3Igbm93IHRvIGFsbG93IGVhc2llciBkZWJ1Z2dpbmcgd2l0aCBPU2VzIHRoYXQgdXNlIGl0IHN0
aWxsLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFy
YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz
cy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr
UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3NDb2NvYSk6CisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1NvdXAuY3BwOgorICAgICAgICAo
V2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3Mp
OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNw
cDoKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpjb3B5KToKKyAgICAg
ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oOgorICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1tOgor
ICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gc2V0SFNUU1N0b3JhZ2VEaXJl
Y3Rvcnk6XSk6CisgICAgICAgICgtW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBoc3RzU3Rv
cmFnZURpcmVjdG9yeV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6
CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6
CisKIDIwMjAtMDgtMjUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAK
ICAgICAgICAgW21hY09TXSBVcGRhdGUgYXVkaW8gYXJiaXRyYXRpb24gbWFuYWdlciB3aGVuIGF1
ZGlvIHRyYW5zcG9ydCBjaGFuZ2VzCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz
LmNwcAkocmV2aXNpb24gMjY2MTI4KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O
ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0
LDggKzc0LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZQogI2Vu
ZGlmCiAgICAgZW5jb2RlciA8PCBzaG91bGRFbmFibGVJVFBEYXRhYmFzZTsKICAgICBlbmNvZGVy
IDw8IGVuYWJsZUFkQ2xpY2tBdHRyaWJ1dGlvbkRlYnVnTW9kZTsKLSAgICBlbmNvZGVyIDw8IGhz
dHNTdG9yYWdlRGlyZWN0b3J5OwotICAgIGVuY29kZXIgPDwgaHN0c1N0b3JhZ2VEaXJlY3RvcnlF
eHRlbnNpb25IYW5kbGU7CiB9CiAKIGJvb2wgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl
cnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25Q
YXJhbWV0ZXJzJiByZXN1bHQpCkBAIC0xNjcsMTIgKzE2NSw2IEBAIGJvb2wgTmV0d29ya1Byb2Nl
c3NDcmVhdGlvblBhcmFtZXRlcnM6OmQKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5l
bmFibGVBZENsaWNrQXR0cmlidXRpb25EZWJ1Z01vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7
CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5oc3RzU3RvcmFnZURpcmVjdG9yeSkp
Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0
LmhzdHNTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkKLSAgICAgICAgcmV0dXJuIGZh
bHNlOwotCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29y
a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh
bWV0ZXJzLmgJKHJldmlzaW9uIDI2NjEyOCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAt
OTMsOCArOTMsNiBAQCBzdHJ1Y3QgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgCiAj
ZW5kaWYKICAgICBib29sIHNob3VsZEVuYWJsZUlUUERhdGFiYXNlIHsgZmFsc2UgfTsKICAgICBi
b29sIGVuYWJsZUFkQ2xpY2tBdHRyaWJ1dGlvbkRlYnVnTW9kZSB7IGZhbHNlIH07Ci0gICAgU3Ry
aW5nIGhzdHNTdG9yYWdlRGlyZWN0b3J5OwotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBo
c3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNl
IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr
UHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24gMjY2MTI4KQorKysgU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCSh3
b3JraW5nIGNvcHkpCkBAIC03NCwxMyArNzQsNiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0
Zm9ybUluaXRpYWxpemVOCiAgICAgV2ViQ29yZTo6c2V0QXBwbGljYXRpb25CdW5kbGVJZGVudGlm
aWVyKHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcik7CiAgICAgc2V0QXBwbGlj
YXRpb25TREtWZXJzaW9uKHBhcmFtZXRlcnMudWlQcm9jZXNzU0RLVmVyc2lvbik7CiAKLSNpZiBI
QVZFKEhTVFNfU1RPUkFHRV9QQVRIKQotICAgIGlmICghcGFyYW1ldGVycy5oc3RzU3RvcmFnZURp
cmVjdG9yeS5pc051bGwoKSkgewotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVy
bWFuZW50bHkocGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7
Ci0gICAgICAgIF9DRk5ldHdvcmtTZXRIU1RTU3RvcmFnZVBhdGgocGFyYW1ldGVycy5oc3RzU3Rv
cmFnZURpcmVjdG9yeS5jcmVhdGVDRlN0cmluZygpLmdldCgpKTsKLSAgICB9Ci0jZW5kaWYKLQog
I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBl
cm1hbmVudGx5KHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRs
ZSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMu
Y29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKSW5kZXg6IFNvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI2NjEyOCkKKysr
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5
KQpAQCAtNTQwLDEwICs1NDAsNiBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9v
bDo6ZW5zCiAjZW5kaWYKICNlbmRpZgogCi0gICAgcGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVj
dG9yeSA9IG1fY29uZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3RvcnkoKTsKLSAgICBpZiAo
IXBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnkuaXNOdWxsKCkpCi0gICAgICAgIFNhbmRi
b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJz
LmhzdHNTdG9yYWdlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5RXh0
ZW5zaW9uSGFuZGxlKTsKLQogICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc1Nl
Y3VyZSA9IGNvcHlUb1ZlY3RvcihMZWdhY3lHbG9iYWxTZXR0aW5nczo6c2luZ2xldG9uKCkuc2No
ZW1lc1RvUmVnaXN0ZXJBc1NlY3VyZSgpKTsKICAgICBwYXJhbWV0ZXJzLnVybFNjaGVtZXNSZWdp
c3RlcmVkQXNCeXBhc3NpbmdDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBjb3B5VG9WZWN0b3IoTGVn
YWN5R2xvYmFsU2V0dGluZ3M6OnNpbmdsZXRvbigpLnNjaGVtZXNUb1JlZ2lzdGVyQXNCeXBhc3Np
bmdDb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CiAgICAgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVn
aXN0ZXJlZEFzTG9jYWwgPSBjb3B5VG9WZWN0b3IoTGVnYWN5R2xvYmFsU2V0dGluZ3M6OnNpbmds
ZXRvbigpLnNjaGVtZXNUb1JlZ2lzdGVyQXNMb2NhbCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRp
b24uY3BwCShyZXZpc2lvbiAyNjYxMjgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv
QVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjgsNyAr
NjgsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uPiBQcm9jZXNzUG9vCiAgICAgY29w
eS0+bV91c2VzQmFja0ZvcndhcmRDYWNoZSA9IHRoaXMtPm1fdXNlc0JhY2tGb3J3YXJkQ2FjaGU7
CiAgICAgY29weS0+bV9jdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIgPSB0
aGlzLT5tX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcjsKICAgICBjb3B5
LT5tX3VzZXNTaW5nbGVXZWJQcm9jZXNzID0gbV91c2VzU2luZ2xlV2ViUHJvY2VzczsKLSAgICBj
b3B5LT5tX2hzdHNTdG9yYWdlRGlyZWN0b3J5ID0gbV9oc3RzU3RvcmFnZURpcmVjdG9yeTsKICNp
ZiBQTEFURk9STShHVEspICYmICFVU0UoR1RLNCkKICAgICBjb3B5LT5tX3VzZVN5c3RlbUFwcGVh
cmFuY2VGb3JTY3JvbGxiYXJzID0gbV91c2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFyczsK
ICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29s
Q29uZmlndXJhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ
SS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaAkocmV2aXNpb24gMjY2MTI4KQorKysgU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCSh3
b3JraW5nIGNvcHkpCkBAIC0xMzEsOSArMTMxLDYgQEAgcHVibGljOgogICAgIGNvbnN0IFdURjo6
U3RyaW5nJiBjdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIoKSBjb25zdCB7
IHJldHVybiBtX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcjsgfQogICAg
IHZvaWQgc2V0Q3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKGNvbnN0IFdU
Rjo6U3RyaW5nJiBjdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIpIHsgbV9j
dXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIgPSBjdXN0b21XZWJDb250ZW50
U2VydmljZUJ1bmRsZUlkZW50aWZpZXI7IH0KIAotICAgIGNvbnN0IFdURjo6U3RyaW5nJiBoc3Rz
U3RvcmFnZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1faHN0c1N0b3JhZ2VEaXJlY3Rvcnk7
IH0KLSAgICB2b2lkIHNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KFdURjo6U3RyaW5nJiYgZGlyZWN0
b3J5KSB7IG1faHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBXVEZNb3ZlKGRpcmVjdG9yeSk7IH0KLQog
I2lmIFBMQVRGT1JNKEdUSykgJiYgIVVTRShHVEs0KQogICAgIGJvb2wgdXNlU3lzdGVtQXBwZWFy
YW5jZUZvclNjcm9sbGJhcnMoKSBjb25zdCB7IHJldHVybiBtX3VzZVN5c3RlbUFwcGVhcmFuY2VG
b3JTY3JvbGxiYXJzOyB9CiAgICAgdm9pZCBzZXRVc2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xs
YmFycyhib29sIHVzZVN5c3RlbUFwcGVhcmFuY2VGb3JTY3JvbGxiYXJzKSB7IG1fdXNlU3lzdGVt
QXBwZWFyYW5jZUZvclNjcm9sbGJhcnMgPSB1c2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFy
czsgfQpAQCAtMTc2LDcgKzE3Myw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3Nob3VsZENvbmZp
Z3VyZUpTQ0ZvclRlc3RpbmcgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc0pJVEVuYWJsZWQgeyB0
cnVlIH07CiAgICAgYm9vbCBtX3VzZXNTaW5nbGVXZWJQcm9jZXNzIHsgZmFsc2UgfTsKLSAgICBX
VEY6OlN0cmluZyBtX2hzdHNTdG9yYWdlRGlyZWN0b3J5OwogI2lmIFBMQVRGT1JNKEdUSykgJiYg
IVVTRShHVEs0KQogICAgIGJvb2wgbV91c2VTeXN0ZW1BcHBlYXJhbmNlRm9yU2Nyb2xsYmFycyB7
IGZhbHNlIH07CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv
YS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQko
cmV2aXNpb24gMjY2MTI4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X
S1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAzLDE2ICsz
MDMsMTEgQEAgLSAodm9pZClzZXRKSVRFbmFibGVkOihCT09MKWVuYWJsZWQKIAogLSAodm9pZClz
ZXRIU1RTU3RvcmFnZURpcmVjdG9yeTooTlNVUkwgKilkaXJlY3RvcnkKIHsKLSAgICBpZiAoZGly
ZWN0b3J5ICYmICFbZGlyZWN0b3J5IGlzRmlsZVVSTF0pCi0gICAgICAgIFtOU0V4Y2VwdGlvbiBy
YWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIlQCBpcyBub3QgYSBmaWxl
IFVSTCIsIGRpcmVjdG9yeV07Ci0KLSAgICAvLyBGSVhNRTogTW92ZSB0aGlzIHRvIF9XS1dlYnNp
dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG9uY2UgcmRhcjovL3Byb2JsZW0vNTAxMDk2MzEgaXMg
Zml4ZWQuCi0gICAgX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+c2V0SFNUU1N0b3JhZ2VEaXJl
Y3RvcnkoZGlyZWN0b3J5LnBhdGgpOwogfQogCiAtIChOU1VSTCAqKWhzdHNTdG9yYWdlRGlyZWN0
b3J5CiB7Ci0gICAgcmV0dXJuIFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6X3Byb2Nlc3NQb29sQ29u
ZmlndXJhdGlvbi0+aHN0c1N0b3JhZ2VEaXJlY3RvcnkoKSBpc0RpcmVjdG9yeTpZRVNdOworICAg
IHJldHVybiBuaWw7CiB9CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>