<?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>229716</bug_id>
          
          <creation_ts>2021-08-31 09:21:42 -0700</creation_ts>
          <short_desc>[COOP] html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html WPT test is failing</short_desc>
          <delta_ts>2021-09-02 11:37:16 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Page Loading</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>
          
          <blocked>228755</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>japhet</cc>
    
    <cc>mkwst</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1788937</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-08-31 09:21:42 -0700</bug_when>
    <thetext>html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html WPT test is failing:
FAIL coop-navigate-same-origin-csp-sandbox assert_equals: expected &quot;Success: no opener&quot; but got &quot;Error: have opener&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788940</commentid>
    <comment_count>1</comment_count>
      <attachid>436894</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-08-31 09:27:00 -0700</bug_when>
    <thetext>Created attachment 436894
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789077</commentid>
    <comment_count>2</comment_count>
      <attachid>436940</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-08-31 14:09:12 -0700</bug_when>
    <thetext>Created attachment 436940
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789153</commentid>
    <comment_count>3</comment_count>
      <attachid>436963</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-08-31 16:41:41 -0700</bug_when>
    <thetext>Created attachment 436963
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789322</commentid>
    <comment_count>4</comment_count>
      <attachid>437028</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-09-01 08:13:20 -0700</bug_when>
    <thetext>Created attachment 437028
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789323</commentid>
    <comment_count>5</comment_count>
      <attachid>437029</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-09-01 08:15:16 -0700</bug_when>
    <thetext>Created attachment 437029
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789336</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-09-01 09:01:56 -0700</bug_when>
    <thetext>&lt;rdar://problem/82630914&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789768</commentid>
    <comment_count>7</comment_count>
      <attachid>437029</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-09-02 10:23:04 -0700</bug_when>
    <thetext>Comment on attachment 437029
Patch

Patch is ready for review, all EWS is green.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789805</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-09-02 11:37:14 -0700</bug_when>
    <thetext>Committed r281941 (241250@main): &lt;https://commits.webkit.org/241250@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 437029.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436894</attachid>
            <date>2021-08-31 09:27:00 -0700</date>
            <delta_ts>2021-08-31 14:09:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229716-20210831092659.patch</filename>
            <type>text/plain</type>
            <size>10312</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI5YTkyYjVhMjA3YmI0
MmE4ZjczMzEyNGUwM2UxOTY5MjJkMDMxNi4uZDUwMzVkYzRmNWIxNzNlYzJkZjUxNmRkNjllNmI1
OGM2MTU3MjYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTMxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mt
b3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJv
eC5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBDT09QIGFsZ29yaXRobSBpcyByZWx5aW5nIG9uIHRoZSBy
ZXNwb25zZSBvcmlnaW4gZm9yIHNvbWUgb2YgdGhlIGNoZWNrcy4gV2Ugd2VyZSBjb21wdXRpbmcg
dGhlCisgICAgICAgIHJlc3BvbnNlIG9yaWdpbiB2aWEgYFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo
cmVzcG9uc2UudXJsKCkpYCwgd2hpY2ggd29ya2VkIGZpbmUgaW4gbW9zdCBjYXNlcy4KKyAgICAg
ICAgSG93ZXZlciwgdGhlIHJlc3BvbnNlIG1heSBjb250YWluIGEgQ1NQIGhlYWRlciwgd2hpY2gg
Y291bGQgc2V0IHNhbmRib3ggZmxhZ3MuIElmIHNhbmRib3ggZmxhZ3MKKyAgICAgICAgYXJlIHNl
dCwgdGhlIHJlc3BvbnNlIG9yaWdpbiBzaG91bGQgYmUgdW5pcXVlLCBub3QgdGhlIG9yaWdpbiBv
ZiB0aGUgcmVzcG9uc2UgVVJMLiBUaGlzIHBhdGNoIGZpeGVzCisgICAgICAgIHRoYXQuCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyBXUFQgdGVzdC4KKworICAg
ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h
ZGVyOjpkb0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKToKKyAgICAgICAgKiBs
b2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy
Ojpjb250ZW50U2VjdXJpdHlQb2xpY3kgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVu
dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAg
IChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnNhbmRib3hGbGFncyBjb25zdCk6CisK
IDIwMjEtMDgtMzEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBb
Q09PUF0gaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLXNhbWUtb3JpZ2luLWFs
bG93LXBvcHVwcy1kb2N1bWVudC13cml0ZS5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGUyMzA0YWIwZWJhOWEyNjE4
ZjgyNDU2ZDJlZGRmMzIyNDU5MjkxOGYuLmRlMGI5YWI3NTc1NmUyZDhiMjVlNWEwNTYxMzNlYjk0
Zjk1MzkyMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl
ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAt
NzU4LDcgKzc1OCw3IEBAIHN0YXRpYyBib29sIGNoZWNrSWZDT09QVmFsdWVzUmVxdWlyZUJyb3dz
aW5nQ29udGV4dEdyb3VwU3dpdGNoKGJvb2wgaXNJbml0aWFsQWJvCiAgICAgcmV0dXJuIHRydWU7
CiB9CiAKLXN0YXRpYyBzdGQ6OnR1cGxlPFJlZjxTZWN1cml0eU9yaWdpbj4sIENyb3NzT3JpZ2lu
T3BlbmVyUG9saWN5PiBjb21wdXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKGNvbnN0IFJlc291cmNl
UmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IHN0ZDo6
b3B0aW9uYWw8TmF2aWdhdGlvbkFjdGlvbjo6UmVxdWVzdGVyPiYgcmVxdWVzdGVyKQorc3RhdGlj
IHN0ZDo6dHVwbGU8UmVmPFNlY3VyaXR5T3JpZ2luPiwgQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3k+
IGNvbXB1dGVSZXNwb25zZU9yaWdpbkFuZENPT1AoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz
cG9uc2UsIGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3Qgc3RkOjpvcHRpb25hbDxOYXZp
Z2F0aW9uQWN0aW9uOjpSZXF1ZXN0ZXI+JiByZXF1ZXN0ZXIsIENvbnRlbnRTZWN1cml0eVBvbGlj
eSogcmVzcG9uc2VDU1ApCiB7CiAgICAgLy8gTm9uLWluaXRpYWwgZW1wdHkgZG9jdW1lbnRzIChh
Ym91dDpibGFuaykgc2hvdWxkIGluaGVyaXQgdGhlaXIgY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xp
Y3kgZnJvbSB0aGUgbmF2aWdhdGlvbidzIGluaXRpYXRvciB0b3AgbGV2ZWwgZG9jdW1lbnQsCiAg
ICAgLy8gaWYgdGhlIGluaXRpYXRvciBhbmQgaXRzIHRvcCBsZXZlbCBkb2N1bWVudCBhcmUgc2Ft
ZS1vcmlnaW4sIG9yIGRlZmF1bHQgKHVuc2FmZS1ub25lKSBvdGhlcndpc2UuCkBAIC03NjYsNyAr
NzY2LDkgQEAgc3RhdGljIHN0ZDo6dHVwbGU8UmVmPFNlY3VyaXR5T3JpZ2luPiwgQ3Jvc3NPcmln
aW5PcGVuZXJQb2xpY3k+IGNvbXB1dGVSZXNwb25zZU8KICAgICBpZiAoU2VjdXJpdHlQb2xpY3k6
OnNob3VsZEluaGVyaXRTZWN1cml0eU9yaWdpbkZyb21Pd25lcihyZXNwb25zZS51cmwoKSkgJiYg
cmVxdWVzdGVyKQogICAgICAgICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKG1ha2VSZWYocmVxdWVz
dGVyLT5zZWN1cml0eU9yaWdpbigpKSwgcmVxdWVzdGVyLT5zZWN1cml0eU9yaWdpbigpLmlzU2Ft
ZU9yaWdpbkFzKHJlcXVlc3Rlci0+dG9wT3JpZ2luKCkpID8gcmVxdWVzdGVyLT5jcm9zc09yaWdp
bk9wZW5lclBvbGljeSgpIDogQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3kgeyB9KTsKIAotICAgIHJl
dHVybiBzdGQ6Om1ha2VfdHVwbGUoU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNwb25zZS51cmwo
KSksIG9idGFpbkNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KHJlc3BvbnNlLCBkb2N1bWVudCkpOwor
ICAgIC8vIElmIHRoZSBIVFRQIHJlc3BvbnNlIGNvbnRhaW5zIGEgQ1NQIGhlYWRlciwgaXQgbWF5
IHNldCBzYW5kYm94IGZsYWdzLCB3aGljaCB3b3VsZCBjYXVzZSB0aGUgb3JpZ2luIHRvIGJlY29t
ZSB1bmlxdWUuCisgICAgYXV0byByZXNwb25zZU9yaWdpbiA9IHJlc3BvbnNlQ1NQICYmIHJlc3Bv
bnNlQ1NQLT5zYW5kYm94RmxhZ3MoKSAhPSBTYW5kYm94Tm9uZSA/IFNlY3VyaXR5T3JpZ2luOjpj
cmVhdGVVbmlxdWUoKSA6IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzcG9uc2UudXJsKCkpOwor
ICAgIHJldHVybiBzdGQ6Om1ha2VfdHVwbGUoV1RGTW92ZShyZXNwb25zZU9yaWdpbiksIG9idGFp
bkNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KHJlc3BvbnNlLCBkb2N1bWVudCkpOwogfQogCiAvLyBo
dHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9icm93c2luZy10aGUtd2ViLmh0
bWwjcHJvY2Vzcy1hLW5hdmlnYXRlLWZldGNoIChTdGVwIDEyLjUuNikKQEAgLTc3OSw3ICs3ODEs
MTMgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6ZG9Dcm9zc09yaWdpbk9wZW5lckhhbmRsaW5nT2ZS
ZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnMKICAgICBpZiAoIW1fZnJhbWUtPmRvY3VtZW50
KCkgfHwgIW1fZnJhbWUtPmRvY3VtZW50KCktPnNldHRpbmdzKCkuY3Jvc3NPcmlnaW5PcGVuZXJQ
b2xpY3lFbmFibGVkKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgYXV0byBbcmVzcG9u
c2VPcmlnaW4sIHJlc3BvbnNlQ09PUF0gPSBjb21wdXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKHJl
c3BvbnNlLCAqbV9mcmFtZS0+ZG9jdW1lbnQoKSwgbV90cmlnZ2VyaW5nQWN0aW9uLnJlcXVlc3Rl
cigpKTsKKyAgICBpZiAoIXJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6
Q29udGVudFNlY3VyaXR5UG9saWN5KS5pc051bGwoKSkgeworICAgICAgICBtX2NvbnRlbnRTZWN1
cml0eVBvbGljeSA9IG1ha2VVbmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihVUkwgeyByZXNw
b25zZS51cmwoKSB9LCBudWxscHRyKTsKKyAgICAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kt
PmRpZFJlY2VpdmVIZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyB7
IHJlc3BvbnNlIH0sIG1fcmVxdWVzdC5odHRwUmVmZXJyZXIoKSk7CisgICAgfSBlbHNlCisgICAg
ICAgIG1fY29udGVudFNlY3VyaXR5UG9saWN5ID0gbnVsbHB0cjsKKworICAgIGF1dG8gW3Jlc3Bv
bnNlT3JpZ2luLCByZXNwb25zZUNPT1BdID0gY29tcHV0ZVJlc3BvbnNlT3JpZ2luQW5kQ09PUChy
ZXNwb25zZSwgKm1fZnJhbWUtPmRvY3VtZW50KCksIG1fdHJpZ2dlcmluZ0FjdGlvbi5yZXF1ZXN0
ZXIoKSwgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCkpOwogCiAgICAgLy8gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2UvYnJvd3NpbmctdGhlLXdlYi5odG1sI3Byb2Nl
c3MtYS1uYXZpZ2F0ZS1mZXRjaCAoU3RlcCAxMi41LjYuMikKICAgICAvLyBJZiBzYW5kYm94Rmxh
Z3MgaXMgbm90IGVtcHR5IGFuZCByZXNwb25zZUNPT1AncyB2YWx1ZSBpcyBub3QgInVuc2FmZS1u
b25lIiwgdGhlbiBzZXQgcmVzcG9uc2UgdG8gYW4gYXBwcm9wcmlhdGUgbmV0d29yayBlcnJvciBh
bmQgYnJlYWsuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk
ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCmluZGV4IDQ4MmI1
NzVmZmIzZjc3YmQ2OGM4MmNjOGVhM2NlMmVkOTEzMDZlOTAuLjcxMjZlZDRlM2RiNTI0MTQ1YzAx
NWE0Y2M5MjNkMDc3YTlmOGVhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E
b2N1bWVudExvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl
ci5oCkBAIC00MjMsNiArNDIzLDcgQEAgcHVibGljOgogICAgIGJvb2wgbGFzdE5hdmlnYXRpb25X
YXNBcHBJbml0aWF0ZWQoKSBjb25zdCB7IHJldHVybiBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5p
dGlhdGVkOyB9CiAgICAgdm9pZCBzZXRMYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZChib29s
IGxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKSB7IG1fbGFzdE5hdmlnYXRpb25XYXNBcHBJ
bml0aWF0ZWQgPSBsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZDsgfQogCisgICAgQ29udGVu
dFNlY3VyaXR5UG9saWN5KiBjb250ZW50U2VjdXJpdHlQb2xpY3koKSBjb25zdCB7IHJldHVybiBt
X2NvbnRlbnRTZWN1cml0eVBvbGljeS5nZXQoKTsgfQogICAgIHN0ZDo6b3B0aW9uYWw8Q3Jvc3NP
cmlnaW5PcGVuZXJQb2xpY3k+IGNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KCkgY29uc3QgeyByZXR1
cm4gbV9jdXJyZW50Q29vcEVuZm9yY2VtZW50UmVzdWx0ID8gc3RkOjptYWtlX29wdGlvbmFsKG1f
Y3VycmVudENvb3BFbmZvcmNlbWVudFJlc3VsdC0+Y3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3kpIDog
c3RkOjpudWxsb3B0OyB9CiAKICAgICBib29sIGlzQ29udGludWluZ0xvYWRBZnRlclJlc3BvbnNl
UG9saWN5Q2hlY2soKSBjb25zdCB7IHJldHVybiBtX2lzQ29udGludWluZ0xvYWRBZnRlclJlc3Bv
bnNlUG9saWN5Q2hlY2s7IH0KQEAgLTYyOCw2ICs2MjksNyBAQCBwcml2YXRlOgogICAgIFNob3Vs
ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgbV9zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHsg
U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cgfTsKIAogICAgIHN0
ZDo6dW5pcXVlX3B0cjxBcHBsaWNhdGlvbkNhY2hlSG9zdD4gbV9hcHBsaWNhdGlvbkNhY2hlSG9z
dDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudFNlY3VyaXR5UG9saWN5PiBtX2NvbnRlbnRT
ZWN1cml0eVBvbGljeTsKIAogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICBzdGQ6
OnVuaXF1ZV9wdHI8Q29udGVudEZpbHRlcj4gbV9jb250ZW50RmlsdGVyOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZTE0NDAyMmU4MGY1YzRkZTRhN2IwMGZlZTAyYmEw
NDkyMTRjNWZmMC4uNWJhMzY1MGYzYjRhNTJiZDA4M2M3MDBlZGFiYzAzYmQ2MGQyM2ZjZCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC03NDksNyArNzQ5LDExIEBAIHZv
aWQgRnJhbWVMb2FkZXI6OmRpZEJlZ2luRG9jdW1lbnQoYm9vbCBkaXNwYXRjaCkKICAgICAgICAg
aWYgKCFkbnNQcmVmZXRjaENvbnRyb2wuaXNFbXB0eSgpKQogICAgICAgICAgICAgbV9mcmFtZS5k
b2N1bWVudCgpLT5wYXJzZUROU1ByZWZldGNoQ29udHJvbEhlYWRlcihkbnNQcmVmZXRjaENvbnRy
b2wpOwogCi0gICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5
KCktPmRpZFJlY2VpdmVIZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVy
cyhtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpKSwgcmVmZXJyZXIoKSwgQ29udGVudFNlY3Vy
aXR5UG9saWN5OjpSZXBvcnRQYXJzaW5nRXJyb3JzOjpObyk7CisgICAgICAgIC8vIFRoZSBEb2N1
bWVudExvYWRlciBtYXkgaGF2ZSBhbHJlYWR5IHBhcnNlZCB0aGUgQ1NQIGhlYWRlciB0byBkbyBz
b21lIGNoZWNrcy4gSWYgc28sIHJldXNlIHRoZSBhbHJlYWR5IHBhcnNlZCB2ZXJzaW9uIGluc3Rl
YWQgb2YgcGFyc2luZyBhZ2Fpbi4KKyAgICAgICAgaWYgKGF1dG8qIGNvbnRlbnRTZWN1cml0eVBv
bGljeSA9IG1fZG9jdW1lbnRMb2FkZXItPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpKQorICAgICAg
ICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVN0
YXRlRnJvbShjb250ZW50U2VjdXJpdHlQb2xpY3kpOworICAgICAgICBlbHNlCisgICAgICAgICAg
ICBtX2ZyYW1lLmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZl
SGVhZGVycyhDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9kb2N1bWVudExv
YWRlci0+cmVzcG9uc2UoKSksIHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVw
b3J0UGFyc2luZ0Vycm9yczo6Tm8pOwogCiAgICAgICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCkt
PnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCBtX2ZyYW1lLmRvY3VtZW50KCktPnVy
bCgpLnByb3RvY29sSXNCbG9iKCkpCiAgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnNl
dENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kob2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGlj
eShtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLCAqbV9mcmFtZS5kb2N1bWVudCgpKSk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3ku
aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4
IDUzZTA1NzU5Nzk2ZWU3MWMwMWJmM2I0YjI2MTkxODUyZjU2YjA5MDAuLmE1MzYxNGQwZTdkYjBi
MjcwZjdkOTUwYmJjYzVmZmM1YWNjOWFlYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
Y3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0xNzcsNiArMTc3LDggQEAgcHVibGljOgog
CiAgICAgdm9pZCBzZXREb2N1bWVudFVSTChVUkwmIGRvY3VtZW50VVJMKSB7IG1fZG9jdW1lbnRV
UkwgPSBkb2N1bWVudFVSTDsgfQogCisgICAgU2FuZGJveEZsYWdzIHNhbmRib3hGbGFncygpIGNv
bnN0IHsgcmV0dXJuIG1fc2FuZGJveEZsYWdzOyB9CisKIHByaXZhdGU6CiAgICAgdm9pZCBsb2dU
b0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwg
PSBTdHJpbmcoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSA9IFdURjo6
T3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBj
b250ZXh0Q29sdW1uID0gV1RGOjpPcmRpbmFsTnVtYmVyOjpiZWZvcmVGaXJzdCgpLCBKU0M6OkpT
R2xvYmFsT2JqZWN0KiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlQb2xpY3lUb1Nj
cmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IGJlYzc0Y2FkOTUzMTAyNGQ3ZWNjOGIxMTliMzg2NDg4Yzg1Nzk0MmYuLjg2Mjg5YWRiZWFhNDQ4
ZTk0NWFlOWVhYTdmNTAwODVkODc2YWVjMTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA4LTMxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs
ZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kv
Y29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveC5odG1sIFdQVCB0ZXN0IGlzIGZh
aWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
OTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl
YmFzZWxpbmUgV1BUIHRlc3QgdGhhdCBpcyBub3cgcGFzc2luZy4KKworICAgICAgICAqIHdlYi1w
bGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2aWdh
dGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA4LTMxICBD
aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0NPT1BdIGh0bWwvY3Jv
c3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1zYW1lLW9yaWdpbi1hbGxvdy1wb3B1cHMtZG9j
dW1lbnQtd3JpdGUuaHRtbCBXUFQgdGVzdCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY3Jvc3Mtb3JpZ2luLW9w
ZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveC1leHBlY3Rl
ZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv
Y3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3At
c2FuZGJveC1leHBlY3RlZC50eHQKaW5kZXggMWFiNjIwNzY2NDljMjI1ODFkMGY4OGYyNTNjOWMw
N2VhNWNiNWE3MC4uM2QwNjVkNTJmZjdkNzRiZThjZDBiNGFjYzQyZGI4OGIzMjIxN2E1NSAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1s
L2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3Nw
LXNhbmRib3gtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmln
YXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDMgQEAK
IAotRkFJTCBjb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94IGFzc2VydF9lcXVh
bHM6IGV4cGVjdGVkICJTdWNjZXNzOiBubyBvcGVuZXIiIGJ1dCBnb3QgIkVycm9yOiBoYXZlIG9w
ZW5lciIKK1BBU1MgY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveAogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436940</attachid>
            <date>2021-08-31 14:09:12 -0700</date>
            <delta_ts>2021-08-31 16:41:39 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229716-20210831140911.patch</filename>
            <type>text/plain</type>
            <size>12424</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY1ODRlM2U5ZjEwOTY5
YWI0YjdlZDRkYzY3NzkwMGJhN2Y1MWI3Yi4uN2ZjNDcxZjJhYzk3MDA5MmFhOGU4MzNlZGY2ZGIw
YjMyMjMxNGJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTMxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mt
b3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJv
eC5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBDT09QIGFsZ29yaXRobSBpcyByZWx5aW5nIG9uIHRoZSBy
ZXNwb25zZSBvcmlnaW4gZm9yIHNvbWUgb2YgdGhlIGNoZWNrcy4gV2Ugd2VyZSBjb21wdXRpbmcg
dGhlCisgICAgICAgIHJlc3BvbnNlIG9yaWdpbiB2aWEgYFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo
cmVzcG9uc2UudXJsKCkpYCwgd2hpY2ggd29ya2VkIGZpbmUgaW4gbW9zdCBjYXNlcy4KKyAgICAg
ICAgSG93ZXZlciwgdGhlIHJlc3BvbnNlIG1heSBjb250YWluIGEgQ1NQIGhlYWRlciwgd2hpY2gg
Y291bGQgc2V0IHNhbmRib3ggZmxhZ3MuIElmIHNhbmRib3ggZmxhZ3MKKyAgICAgICAgYXJlIHNl
dCwgdGhlIHJlc3BvbnNlIG9yaWdpbiBzaG91bGQgYmUgdW5pcXVlLCBub3QgdGhlIG9yaWdpbiBv
ZiB0aGUgcmVzcG9uc2UgVVJMLiBUaGlzIHBhdGNoIGZpeGVzCisgICAgICAgIHRoYXQuCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyBXUFQgdGVzdC4KKworICAg
ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h
ZGVyOjpkb0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKToKKyAgICAgICAgKiBs
b2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy
Ojpjb250ZW50U2VjdXJpdHlQb2xpY3kgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVu
dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAg
IChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnNhbmRib3hGbGFncyBjb25zdCk6CisK
IDIwMjEtMDgtMzEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg
IFJFR1JFU1NJT04gKHIyNzI5MDApOiB3cHQuZnlpIGxvYWRpbmcgcGVyZm9ybWFuY2UgaXMgdmVy
eSBzbG93IChyZWdyZXNzZWQsIGFuZCBzbG93ZXIgdGhhbiBvdGhlciBicm93c2VycykKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGUyMzA0YWIwZWJhOWEyNjE4
ZjgyNDU2ZDJlZGRmMzIyNDU5MjkxOGYuLjJlNzZhYjJlNmI2NWZkYWQzZGQ5ZDgwMmM2NTQwZGIx
MGViODE2ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl
ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAt
NzU4LDcgKzc1OCw3IEBAIHN0YXRpYyBib29sIGNoZWNrSWZDT09QVmFsdWVzUmVxdWlyZUJyb3dz
aW5nQ29udGV4dEdyb3VwU3dpdGNoKGJvb2wgaXNJbml0aWFsQWJvCiAgICAgcmV0dXJuIHRydWU7
CiB9CiAKLXN0YXRpYyBzdGQ6OnR1cGxlPFJlZjxTZWN1cml0eU9yaWdpbj4sIENyb3NzT3JpZ2lu
T3BlbmVyUG9saWN5PiBjb21wdXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKGNvbnN0IFJlc291cmNl
UmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IHN0ZDo6
b3B0aW9uYWw8TmF2aWdhdGlvbkFjdGlvbjo6UmVxdWVzdGVyPiYgcmVxdWVzdGVyKQorc3RhdGlj
IHN0ZDo6dHVwbGU8UmVmPFNlY3VyaXR5T3JpZ2luPiwgQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3k+
IGNvbXB1dGVSZXNwb25zZU9yaWdpbkFuZENPT1AoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz
cG9uc2UsIGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3Qgc3RkOjpvcHRpb25hbDxOYXZp
Z2F0aW9uQWN0aW9uOjpSZXF1ZXN0ZXI+JiByZXF1ZXN0ZXIsIENvbnRlbnRTZWN1cml0eVBvbGlj
eSogcmVzcG9uc2VDU1ApCiB7CiAgICAgLy8gTm9uLWluaXRpYWwgZW1wdHkgZG9jdW1lbnRzIChh
Ym91dDpibGFuaykgc2hvdWxkIGluaGVyaXQgdGhlaXIgY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xp
Y3kgZnJvbSB0aGUgbmF2aWdhdGlvbidzIGluaXRpYXRvciB0b3AgbGV2ZWwgZG9jdW1lbnQsCiAg
ICAgLy8gaWYgdGhlIGluaXRpYXRvciBhbmQgaXRzIHRvcCBsZXZlbCBkb2N1bWVudCBhcmUgc2Ft
ZS1vcmlnaW4sIG9yIGRlZmF1bHQgKHVuc2FmZS1ub25lKSBvdGhlcndpc2UuCkBAIC03NjYsNyAr
NzY2LDkgQEAgc3RhdGljIHN0ZDo6dHVwbGU8UmVmPFNlY3VyaXR5T3JpZ2luPiwgQ3Jvc3NPcmln
aW5PcGVuZXJQb2xpY3k+IGNvbXB1dGVSZXNwb25zZU8KICAgICBpZiAoU2VjdXJpdHlQb2xpY3k6
OnNob3VsZEluaGVyaXRTZWN1cml0eU9yaWdpbkZyb21Pd25lcihyZXNwb25zZS51cmwoKSkgJiYg
cmVxdWVzdGVyKQogICAgICAgICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKG1ha2VSZWYocmVxdWVz
dGVyLT5zZWN1cml0eU9yaWdpbigpKSwgcmVxdWVzdGVyLT5zZWN1cml0eU9yaWdpbigpLmlzU2Ft
ZU9yaWdpbkFzKHJlcXVlc3Rlci0+dG9wT3JpZ2luKCkpID8gcmVxdWVzdGVyLT5jcm9zc09yaWdp
bk9wZW5lclBvbGljeSgpIDogQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3kgeyB9KTsKIAotICAgIHJl
dHVybiBzdGQ6Om1ha2VfdHVwbGUoU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNwb25zZS51cmwo
KSksIG9idGFpbkNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KHJlc3BvbnNlLCBkb2N1bWVudCkpOwor
ICAgIC8vIElmIHRoZSBIVFRQIHJlc3BvbnNlIGNvbnRhaW5zIGEgQ1NQIGhlYWRlciwgaXQgbWF5
IHNldCBzYW5kYm94IGZsYWdzLCB3aGljaCB3b3VsZCBjYXVzZSB0aGUgb3JpZ2luIHRvIGJlY29t
ZSB1bmlxdWUuCisgICAgYXV0byByZXNwb25zZU9yaWdpbiA9IHJlc3BvbnNlQ1NQICYmIHJlc3Bv
bnNlQ1NQLT5zYW5kYm94RmxhZ3MoKSAhPSBTYW5kYm94Tm9uZSA/IFNlY3VyaXR5T3JpZ2luOjpj
cmVhdGVVbmlxdWUoKSA6IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzcG9uc2UudXJsKCkpOwor
ICAgIHJldHVybiBzdGQ6Om1ha2VfdHVwbGUoV1RGTW92ZShyZXNwb25zZU9yaWdpbiksIG9idGFp
bkNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KHJlc3BvbnNlLCBkb2N1bWVudCkpOwogfQogCiAvLyBo
dHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9icm93c2luZy10aGUtd2ViLmh0
bWwjcHJvY2Vzcy1hLW5hdmlnYXRlLWZldGNoIChTdGVwIDEyLjUuNikKQEAgLTc3OSw3ICs3ODEs
MTMgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6ZG9Dcm9zc09yaWdpbk9wZW5lckhhbmRsaW5nT2ZS
ZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnMKICAgICBpZiAoIW1fZnJhbWUtPmRvY3VtZW50
KCkgfHwgIW1fZnJhbWUtPmRvY3VtZW50KCktPnNldHRpbmdzKCkuY3Jvc3NPcmlnaW5PcGVuZXJQ
b2xpY3lFbmFibGVkKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgYXV0byBbcmVzcG9u
c2VPcmlnaW4sIHJlc3BvbnNlQ09PUF0gPSBjb21wdXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKHJl
c3BvbnNlLCAqbV9mcmFtZS0+ZG9jdW1lbnQoKSwgbV90cmlnZ2VyaW5nQWN0aW9uLnJlcXVlc3Rl
cigpKTsKKyAgICBpZiAoIXJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6
Q29udGVudFNlY3VyaXR5UG9saWN5KS5pc051bGwoKSkgeworICAgICAgICBtX2NvbnRlbnRTZWN1
cml0eVBvbGljeSA9IG1ha2VVbmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihVUkwgeyByZXNw
b25zZS51cmwoKSB9LCBudWxscHRyKTsKKyAgICAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kt
PmRpZFJlY2VpdmVIZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyB7
IHJlc3BvbnNlIH0sIG1fcmVxdWVzdC5odHRwUmVmZXJyZXIoKSwgQ29udGVudFNlY3VyaXR5UG9s
aWN5OjpSZXBvcnRQYXJzaW5nRXJyb3JzOjpObyk7CisgICAgfSBlbHNlCisgICAgICAgIG1fY29u
dGVudFNlY3VyaXR5UG9saWN5ID0gbnVsbHB0cjsKKworICAgIGF1dG8gW3Jlc3BvbnNlT3JpZ2lu
LCByZXNwb25zZUNPT1BdID0gY29tcHV0ZVJlc3BvbnNlT3JpZ2luQW5kQ09PUChyZXNwb25zZSwg
Km1fZnJhbWUtPmRvY3VtZW50KCksIG1fdHJpZ2dlcmluZ0FjdGlvbi5yZXF1ZXN0ZXIoKSwgbV9j
b250ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCkpOwogCiAgICAgLy8gaHR0cHM6Ly9odG1sLnNwZWMu
d2hhdHdnLm9yZy9tdWx0aXBhZ2UvYnJvd3NpbmctdGhlLXdlYi5odG1sI3Byb2Nlc3MtYS1uYXZp
Z2F0ZS1mZXRjaCAoU3RlcCAxMi41LjYuMikKICAgICAvLyBJZiBzYW5kYm94RmxhZ3MgaXMgbm90
IGVtcHR5IGFuZCByZXNwb25zZUNPT1AncyB2YWx1ZSBpcyBub3QgInVuc2FmZS1ub25lIiwgdGhl
biBzZXQgcmVzcG9uc2UgdG8gYW4gYXBwcm9wcmlhdGUgbmV0d29yayBlcnJvciBhbmQgYnJlYWsu
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaCBiL1Nv
dXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCmluZGV4IDQ4MmI1NzVmZmIzZjc3
YmQ2OGM4MmNjOGVhM2NlMmVkOTEzMDZlOTAuLjcxMjZlZDRlM2RiNTI0MTQ1YzAxNWE0Y2M5MjNk
MDc3YTlmOGVhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv
YWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCkBAIC00
MjMsNiArNDIzLDcgQEAgcHVibGljOgogICAgIGJvb2wgbGFzdE5hdmlnYXRpb25XYXNBcHBJbml0
aWF0ZWQoKSBjb25zdCB7IHJldHVybiBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkOyB9
CiAgICAgdm9pZCBzZXRMYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZChib29sIGxhc3ROYXZp
Z2F0aW9uV2FzQXBwSW5pdGlhdGVkKSB7IG1fbGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQg
PSBsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZDsgfQogCisgICAgQ29udGVudFNlY3VyaXR5
UG9saWN5KiBjb250ZW50U2VjdXJpdHlQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRT
ZWN1cml0eVBvbGljeS5nZXQoKTsgfQogICAgIHN0ZDo6b3B0aW9uYWw8Q3Jvc3NPcmlnaW5PcGVu
ZXJQb2xpY3k+IGNyb3NzT3JpZ2luT3BlbmVyUG9saWN5KCkgY29uc3QgeyByZXR1cm4gbV9jdXJy
ZW50Q29vcEVuZm9yY2VtZW50UmVzdWx0ID8gc3RkOjptYWtlX29wdGlvbmFsKG1fY3VycmVudENv
b3BFbmZvcmNlbWVudFJlc3VsdC0+Y3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3kpIDogc3RkOjpudWxs
b3B0OyB9CiAKICAgICBib29sIGlzQ29udGludWluZ0xvYWRBZnRlclJlc3BvbnNlUG9saWN5Q2hl
Y2soKSBjb25zdCB7IHJldHVybiBtX2lzQ29udGludWluZ0xvYWRBZnRlclJlc3BvbnNlUG9saWN5
Q2hlY2s7IH0KQEAgLTYyOCw2ICs2MjksNyBAQCBwcml2YXRlOgogICAgIFNob3VsZE9wZW5FeHRl
cm5hbFVSTHNQb2xpY3kgbV9zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHsgU2hvdWxkT3Bl
bkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cgfTsKIAogICAgIHN0ZDo6dW5pcXVl
X3B0cjxBcHBsaWNhdGlvbkNhY2hlSG9zdD4gbV9hcHBsaWNhdGlvbkNhY2hlSG9zdDsKKyAgICBz
dGQ6OnVuaXF1ZV9wdHI8Q29udGVudFNlY3VyaXR5UG9saWN5PiBtX2NvbnRlbnRTZWN1cml0eVBv
bGljeTsKIAogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICBzdGQ6OnVuaXF1ZV9w
dHI8Q29udGVudEZpbHRlcj4gbV9jb250ZW50RmlsdGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt
ZUxvYWRlci5jcHAKaW5kZXggZTE0NDAyMmU4MGY1YzRkZTRhN2IwMGZlZTAyYmEwNDkyMTRjNWZm
MC4uNjg3OTM3YmE2MGJkNDc2ZmIxMmFhZDlkMTM1OWE2MTJiYmRlNjI0OSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC03NDksNyArNzQ5LDExIEBAIHZvaWQgRnJhbWVM
b2FkZXI6OmRpZEJlZ2luRG9jdW1lbnQoYm9vbCBkaXNwYXRjaCkKICAgICAgICAgaWYgKCFkbnNQ
cmVmZXRjaENvbnRyb2wuaXNFbXB0eSgpKQogICAgICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgp
LT5wYXJzZUROU1ByZWZldGNoQ29udHJvbEhlYWRlcihkbnNQcmVmZXRjaENvbnRyb2wpOwogCi0g
ICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCktPmRpZFJl
Y2VpdmVIZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyhtX2RvY3Vt
ZW50TG9hZGVyLT5yZXNwb25zZSgpKSwgcmVmZXJyZXIoKSwgQ29udGVudFNlY3VyaXR5UG9saWN5
OjpSZXBvcnRQYXJzaW5nRXJyb3JzOjpObyk7CisgICAgICAgIC8vIFRoZSBEb2N1bWVudExvYWRl
ciBtYXkgaGF2ZSBhbHJlYWR5IHBhcnNlZCB0aGUgQ1NQIGhlYWRlciB0byBkbyBzb21lIGNoZWNr
cy4gSWYgc28sIHJldXNlIHRoZSBhbHJlYWR5IHBhcnNlZCB2ZXJzaW9uIGluc3RlYWQgb2YgcGFy
c2luZyBhZ2Fpbi4KKyAgICAgICAgaWYgKGF1dG8qIGNvbnRlbnRTZWN1cml0eVBvbGljeSA9IG1f
ZG9jdW1lbnRMb2FkZXItPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpKQorICAgICAgICAgICAgbV9m
cmFtZS5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVN0YXRlRnJvbShj
b250ZW50U2VjdXJpdHlQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2lu
Z0Vycm9yczo6Tm8pOworICAgICAgICBlbHNlCisgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50
KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2Vj
dXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSks
IHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6
Tm8pOwogCiAgICAgICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNJ
bkhUVFBGYW1pbHkoKSB8fCBtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNCbG9i
KCkpCiAgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnNldENyb3NzT3JpZ2luRW1iZWRk
ZXJQb2xpY3kob2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeShtX2RvY3VtZW50TG9hZGVy
LT5yZXNwb25zZSgpLCAqbV9mcmFtZS5kb2N1bWVudCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCA0MmE2ODUxZjM5Zjkx
NDQ3NzdmNTI4YjM5OGNlNGJhNjQ4YzAwMzU3Li4yYzcxMmU2OTljYjU2MDA0ZjUyNTZjNjNmODlk
MDNkOGRiYmU3NjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50
U2VjdXJpdHlQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRT
ZWN1cml0eVBvbGljeS5jcHAKQEAgLTkyLDEwICs5MiwxMSBAQCBDb250ZW50U2VjdXJpdHlQb2xp
Y3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeShVUkwmJiBwcm90ZWN0ZWRVUkwsIFNjcmlwdEV4ZWN1
dGlvbgogCiBDb250ZW50U2VjdXJpdHlQb2xpY3k6On5Db250ZW50U2VjdXJpdHlQb2xpY3koKSA9
IGRlZmF1bHQ7CiAKLXZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpjb3B5U3RhdGVGcm9tKGNv
bnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSogb3RoZXIpIAordm9pZCBDb250ZW50U2VjdXJpdHlQ
b2xpY3k6OmNvcHlTdGF0ZUZyb20oY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5KiBvdGhlciwg
UmVwb3J0UGFyc2luZ0Vycm9ycyByZXBvcnRQYXJzaW5nRXJyb3JzKQogewogICAgIGlmIChtX2hh
c0FQSVBvbGljeSkKICAgICAgICAgcmV0dXJuOworICAgIFNldEZvclNjb3BlPGJvb2w+IGlzUmVw
b3J0aW5nRW5hYmxlZChtX2lzUmVwb3J0aW5nRW5hYmxlZCwgcmVwb3J0UGFyc2luZ0Vycm9ycyA9
PSBSZXBvcnRQYXJzaW5nRXJyb3JzOjpZZXMpOwogICAgIEFTU0VSVChtX3BvbGljaWVzLmlzRW1w
dHkoKSk7CiAgICAgZm9yIChhdXRvJiBwb2xpY3kgOiBvdGhlci0+bV9wb2xpY2llcykKICAgICAg
ICAgZGlkUmVjZWl2ZUhlYWRlcihwb2xpY3ktPmhlYWRlcigpLCBwb2xpY3ktPmhlYWRlclR5cGUo
KSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpQb2xpY3lGcm9tOjpJbmhlcml0ZWQsIFN0cmluZyB7
IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5
UG9saWN5LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3ku
aAppbmRleCA1M2UwNTc1OTc5NmVlNzFjMDFiZjNiNGIyNjE5MTg1MmY1NmIwOTAwLi5jNjU1MmM3
MmQ5ZDQ0ZjljNjkzNTdlYzU4ZjE1NmMyYzE5ZWQ1ZTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaApAQCAtNjgsNyArNjgsOCBAQCBwdWJs
aWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgQ29udGVudFNlY3VyaXR5UG9saWN5KFVS
TCYmLCBDb250ZW50U2VjdXJpdHlQb2xpY3lDbGllbnQqID0gbnVsbHB0cik7CiAgICAgV0VCQ09S
RV9FWFBPUlQgfkNvbnRlbnRTZWN1cml0eVBvbGljeSgpOwogCi0gICAgdm9pZCBjb3B5U3RhdGVG
cm9tKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSopOworICAgIGVudW0gUmVwb3J0UGFyc2lu
Z0Vycm9ycyB7IE5vLCBZZXMgfTsKKyAgICB2b2lkIGNvcHlTdGF0ZUZyb20oY29uc3QgQ29udGVu
dFNlY3VyaXR5UG9saWN5KiwgUmVwb3J0UGFyc2luZ0Vycm9ycyA9IFJlcG9ydFBhcnNpbmdFcnJv
cnM6Olllcyk7CiAgICAgdm9pZCBjb3B5VXBncmFkZUluc2VjdXJlUmVxdWVzdFN0YXRlRnJvbShj
b25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3kmKTsKICAgICB2b2lkIGNyZWF0ZVBvbGljeUZvclBs
dWdpbkRvY3VtZW50RnJvbShjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3kmKTsKIApAQCAtODIs
NyArODMsNiBAQCBwdWJsaWM6CiAgICAgICAgIEluaGVyaXRlZEZvclBsdWdpbkRvY3VtZW50LAog
ICAgIH07CiAgICAgV0VCQ09SRV9FWFBPUlQgQ29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VI
ZWFkZXJzIHJlc3BvbnNlSGVhZGVycygpIGNvbnN0OwotICAgIGVudW0gUmVwb3J0UGFyc2luZ0Vy
cm9ycyB7IE5vLCBZZXMgfTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRpZFJlY2VpdmVIZWFk
ZXJzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyYsIFN0cmluZyYm
IHJlZmVycmVyLCBSZXBvcnRQYXJzaW5nRXJyb3JzID0gUmVwb3J0UGFyc2luZ0Vycm9yczo6WWVz
KTsKICAgICB2b2lkIGRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiwgQ29udGVudFNlY3Vy
aXR5UG9saWN5SGVhZGVyVHlwZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpQb2xpY3lGcm9tLCBT
dHJpbmcmJiByZWZlcnJlciwgaW50IGh0dHBTdGF0dXNDb2RlID0gMCk7CiAKQEAgLTE3Nyw2ICsx
NzcsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldERvY3VtZW50VVJMKFVSTCYgZG9jdW1lbnRV
UkwpIHsgbV9kb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMOyB9CiAKKyAgICBTYW5kYm94RmxhZ3Mg
c2FuZGJveEZsYWdzKCkgY29uc3QgeyByZXR1cm4gbV9zYW5kYm94RmxhZ3M7IH0KKwogcHJpdmF0
ZToKICAgICB2b2lkIGxvZ1RvQ29uc29sZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFN0
cmluZyYgY29udGV4dFVSTCA9IFN0cmluZygpLCBjb25zdCBXVEY6Ok9yZGluYWxOdW1iZXImIGNv
bnRleHRMaW5lID0gV1RGOjpPcmRpbmFsTnVtYmVyOjpiZWZvcmVGaXJzdCgpLCBjb25zdCBXVEY6
Ok9yZGluYWxOdW1iZXImIGNvbnRleHRDb2x1bW4gPSBXVEY6Ok9yZGluYWxOdW1iZXI6OmJlZm9y
ZUZpcnN0KCksIEpTQzo6SlNHbG9iYWxPYmplY3QqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgdm9p
ZCBhcHBseVBvbGljeVRvU2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cKaW5kZXggYzlkNTE0MWZhNzc1YTEwMmNjYWYzM2MwZDgyMTZmZGZkZGE5YmI3
MS4uYmFkNjkzOTY3N2Q4YTdiNGRhMjM3MDFjZjIyM2FmNzVlMTAwYmY4ZCAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDgtMzEgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbQ09PUF0gaHRtbC9jcm9zcy1vcmln
aW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94Lmh0
bWwgV1BUIHRlc3QgaXMgZmFpbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjI5NzE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgUmViYXNlbGluZSBXUFQgdGVzdCB0aGF0IGlzIG5vdyBwYXNzaW5nLgor
CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY3Jvc3Mtb3JpZ2luLW9wZW5lci1w
b2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveC1leHBlY3RlZC50eHQ6
CisKIDIwMjEtMDgtMzEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg
ICAgUmVzeW5jIHdlYi1wbGF0Zm9ybS10ZXN0cy9zaGFkb3ctZG9tCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY3Jvc3Mtb3JpZ2lu
LW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveC1leHBl
Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0
bWwvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1j
c3Atc2FuZGJveC1leHBlY3RlZC50eHQKaW5kZXggMWFiNjIwNzY2NDljMjI1ODFkMGY4OGYyNTNj
OWMwN2VhNWNiNWE3MC4uM2QwNjVkNTJmZjdkNzRiZThjZDBiNGFjYzQyZGI4OGIzMjIxN2E1NSAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9o
dG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4t
Y3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5h
dmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDMg
QEAKIAotRkFJTCBjb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94IGFzc2VydF9l
cXVhbHM6IGV4cGVjdGVkICJTdWNjZXNzOiBubyBvcGVuZXIiIGJ1dCBnb3QgIkVycm9yOiBoYXZl
IG9wZW5lciIKK1BBU1MgY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveAogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436963</attachid>
            <date>2021-08-31 16:41:41 -0700</date>
            <delta_ts>2021-09-01 08:13:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229716-20210831164140.patch</filename>
            <type>text/plain</type>
            <size>12572</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBjNjRiNmIxOTQ2Mjc3
ZTZlNmU4ZGE2ZTcwN2IwY2NlYWQ2NTliOC4uZmIzMjUyZDdlMGNlMzcwYzU3YzkzODA0NmRkZjM0
YWQ1MzEzNGRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTMxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mt
b3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJv
eC5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBDT09QIGFsZ29yaXRobSBpcyByZWx5aW5nIG9uIHRoZSBy
ZXNwb25zZSBvcmlnaW4gZm9yIHNvbWUgb2YgdGhlIGNoZWNrcy4gV2Ugd2VyZSBjb21wdXRpbmcg
dGhlCisgICAgICAgIHJlc3BvbnNlIG9yaWdpbiB2aWEgYFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo
cmVzcG9uc2UudXJsKCkpYCwgd2hpY2ggd29ya2VkIGZpbmUgaW4gbW9zdCBjYXNlcy4KKyAgICAg
ICAgSG93ZXZlciwgdGhlIHJlc3BvbnNlIG1heSBjb250YWluIGEgQ1NQIGhlYWRlciwgd2hpY2gg
Y291bGQgc2V0IHNhbmRib3ggZmxhZ3MuIElmIHNhbmRib3ggZmxhZ3MKKyAgICAgICAgYXJlIHNl
dCwgdGhlIHJlc3BvbnNlIG9yaWdpbiBzaG91bGQgYmUgdW5pcXVlLCBub3QgdGhlIG9yaWdpbiBv
ZiB0aGUgcmVzcG9uc2UgVVJMLiBUaGlzIHBhdGNoIGZpeGVzCisgICAgICAgIHRoYXQuCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyBXUFQgdGVzdC4KKworICAg
ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h
ZGVyOjpkb0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKToKKyAgICAgICAgKiBs
b2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy
Ojpjb250ZW50U2VjdXJpdHlQb2xpY3kgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVu
dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAg
IChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnNhbmRib3hGbGFncyBjb25zdCk6CisK
IDIwMjEtMDgtMzEgIE1hcmNvcyBDYWNlcmVzICA8bWFyY29zQG1hcmNvc2MuY29tPgogCiAgICAg
ICAgIFtQYXltZW50IFJlcXVlc3RdIENhbGxpbmcgUGF5bWVudFJlcXVlc3QncyBzaG93KCkgc2hv
dWxkIGNvbnN1bWUgdXNlciBhY3RpdmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50
TG9hZGVyLmNwcAppbmRleCBlMjMwNGFiMGViYTlhMjYxOGY4MjQ1NmQyZWRkZjMyMjQ1OTI5MThm
Li4yZTc2YWIyZTZiNjVmZGFkM2RkOWQ4MDJjNjU0MGRiMTBlYjgxNmZiIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTc1OCw3ICs3NTgsNyBAQCBzdGF0aWMg
Ym9vbCBjaGVja0lmQ09PUFZhbHVlc1JlcXVpcmVCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaChi
b29sIGlzSW5pdGlhbEFibwogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgc3RkOjp0dXBs
ZTxSZWY8U2VjdXJpdHlPcmlnaW4+LCBDcm9zc09yaWdpbk9wZW5lclBvbGljeT4gY29tcHV0ZVJl
c3BvbnNlT3JpZ2luQW5kQ09PUChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29u
c3QgRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpb25BY3Rp
b246OlJlcXVlc3Rlcj4mIHJlcXVlc3RlcikKK3N0YXRpYyBzdGQ6OnR1cGxlPFJlZjxTZWN1cml0
eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRlUmVzcG9uc2VPcmlnaW5B
bmRDT09QKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBEb2N1bWVudCYg
ZG9jdW1lbnQsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8TmF2aWdhdGlvbkFjdGlvbjo6UmVxdWVzdGVy
PiYgcmVxdWVzdGVyLCBDb250ZW50U2VjdXJpdHlQb2xpY3kqIHJlc3BvbnNlQ1NQKQogewogICAg
IC8vIE5vbi1pbml0aWFsIGVtcHR5IGRvY3VtZW50cyAoYWJvdXQ6YmxhbmspIHNob3VsZCBpbmhl
cml0IHRoZWlyIGNyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5IGZyb20gdGhlIG5hdmlnYXRpb24n
cyBpbml0aWF0b3IgdG9wIGxldmVsIGRvY3VtZW50LAogICAgIC8vIGlmIHRoZSBpbml0aWF0b3Ig
YW5kIGl0cyB0b3AgbGV2ZWwgZG9jdW1lbnQgYXJlIHNhbWUtb3JpZ2luLCBvciBkZWZhdWx0ICh1
bnNhZmUtbm9uZSkgb3RoZXJ3aXNlLgpAQCAtNzY2LDcgKzc2Niw5IEBAIHN0YXRpYyBzdGQ6OnR1
cGxlPFJlZjxTZWN1cml0eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRl
UmVzcG9uc2VPCiAgICAgaWYgKFNlY3VyaXR5UG9saWN5OjpzaG91bGRJbmhlcml0U2VjdXJpdHlP
cmlnaW5Gcm9tT3duZXIocmVzcG9uc2UudXJsKCkpICYmIHJlcXVlc3RlcikKICAgICAgICAgcmV0
dXJuIHN0ZDo6bWFrZV90dXBsZShtYWtlUmVmKHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKSks
IHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVPcmlnaW5BcyhyZXF1ZXN0ZXItPnRv
cE9yaWdpbigpKSA/IHJlcXVlc3Rlci0+Y3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3koKSA6IENyb3Nz
T3JpZ2luT3BlbmVyUG9saWN5IHsgfSk7CiAKLSAgICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKFNl
Y3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzcG9uc2UudXJsKCkpLCBvYnRhaW5Dcm9zc09yaWdpbk9w
ZW5lclBvbGljeShyZXNwb25zZSwgZG9jdW1lbnQpKTsKKyAgICAvLyBJZiB0aGUgSFRUUCByZXNw
b25zZSBjb250YWlucyBhIENTUCBoZWFkZXIsIGl0IG1heSBzZXQgc2FuZGJveCBmbGFncywgd2hp
Y2ggd291bGQgY2F1c2UgdGhlIG9yaWdpbiB0byBiZWNvbWUgdW5pcXVlLgorICAgIGF1dG8gcmVz
cG9uc2VPcmlnaW4gPSByZXNwb25zZUNTUCAmJiByZXNwb25zZUNTUC0+c2FuZGJveEZsYWdzKCkg
IT0gU2FuZGJveE5vbmUgPyBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCkgOiBTZWN1cml0
eU9yaWdpbjo6Y3JlYXRlKHJlc3BvbnNlLnVybCgpKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3R1
cGxlKFdURk1vdmUocmVzcG9uc2VPcmlnaW4pLCBvYnRhaW5Dcm9zc09yaWdpbk9wZW5lclBvbGlj
eShyZXNwb25zZSwgZG9jdW1lbnQpKTsKIH0KIAogLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdn
Lm9yZy9tdWx0aXBhZ2UvYnJvd3NpbmctdGhlLXdlYi5odG1sI3Byb2Nlc3MtYS1uYXZpZ2F0ZS1m
ZXRjaCAoU3RlcCAxMi41LjYpCkBAIC03NzksNyArNzgxLDEzIEBAIGJvb2wgRG9jdW1lbnRMb2Fk
ZXI6OmRvQ3Jvc3NPcmlnaW5PcGVuZXJIYW5kbGluZ09mUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VS
ZXNwb25zCiAgICAgaWYgKCFtX2ZyYW1lLT5kb2N1bWVudCgpIHx8ICFtX2ZyYW1lLT5kb2N1bWVu
dCgpLT5zZXR0aW5ncygpLmNyb3NzT3JpZ2luT3BlbmVyUG9saWN5RW5hYmxlZCgpKQogICAgICAg
ICByZXR1cm4gdHJ1ZTsKIAotICAgIGF1dG8gW3Jlc3BvbnNlT3JpZ2luLCByZXNwb25zZUNPT1Bd
ID0gY29tcHV0ZVJlc3BvbnNlT3JpZ2luQW5kQ09PUChyZXNwb25zZSwgKm1fZnJhbWUtPmRvY3Vt
ZW50KCksIG1fdHJpZ2dlcmluZ0FjdGlvbi5yZXF1ZXN0ZXIoKSk7CisgICAgaWYgKCFyZXNwb25z
ZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRTZWN1cml0eVBvbGljeSku
aXNOdWxsKCkpIHsKKyAgICAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtYWtlVW5pcXVl
PENvbnRlbnRTZWN1cml0eVBvbGljeT4oVVJMIHsgcmVzcG9uc2UudXJsKCkgfSwgbnVsbHB0cik7
CisgICAgICAgIG1fY29udGVudFNlY3VyaXR5UG9saWN5LT5kaWRSZWNlaXZlSGVhZGVycyhDb250
ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMgeyByZXNwb25zZSB9LCBtX3JlcXVlc3Qu
aHR0cFJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9y
czo6Tm8pOworICAgIH0gZWxzZQorICAgICAgICBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSA9IG51
bGxwdHI7CisKKyAgICBhdXRvIFtyZXNwb25zZU9yaWdpbiwgcmVzcG9uc2VDT09QXSA9IGNvbXB1
dGVSZXNwb25zZU9yaWdpbkFuZENPT1AocmVzcG9uc2UsICptX2ZyYW1lLT5kb2N1bWVudCgpLCBt
X3RyaWdnZXJpbmdBY3Rpb24ucmVxdWVzdGVyKCksIG1fY29udGVudFNlY3VyaXR5UG9saWN5Lmdl
dCgpKTsKIAogICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2Jy
b3dzaW5nLXRoZS13ZWIuaHRtbCNwcm9jZXNzLWEtbmF2aWdhdGUtZmV0Y2ggKFN0ZXAgMTIuNS42
LjIpCiAgICAgLy8gSWYgc2FuZGJveEZsYWdzIGlzIG5vdCBlbXB0eSBhbmQgcmVzcG9uc2VDT09Q
J3MgdmFsdWUgaXMgbm90ICJ1bnNhZmUtbm9uZSIsIHRoZW4gc2V0IHJlc3BvbnNlIHRvIGFuIGFw
cHJvcHJpYXRlIG5ldHdvcmsgZXJyb3IgYW5kIGJyZWFrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j
dW1lbnRMb2FkZXIuaAppbmRleCA0ODJiNTc1ZmZiM2Y3N2JkNjhjODJjYzhlYTNjZTJlZDkxMzA2
ZTkwLi43MTI2ZWQ0ZTNkYjUyNDE0NWMwMTVhNGNjOTIzZDA3N2E5ZjhlYTAzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaApAQCAtNDIzLDYgKzQyMyw3IEBAIHB1YmxpYzoK
ICAgICBib29sIGxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKCkgY29uc3QgeyByZXR1cm4g
bV9sYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZDsgfQogICAgIHZvaWQgc2V0TGFzdE5hdmln
YXRpb25XYXNBcHBJbml0aWF0ZWQoYm9vbCBsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCkg
eyBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkID0gbGFzdE5hdmlnYXRpb25XYXNBcHBJ
bml0aWF0ZWQ7IH0KIAorICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5
UG9saWN5KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCk7IH0K
ICAgICBzdGQ6Om9wdGlvbmFsPENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjcm9zc09yaWdpbk9w
ZW5lclBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudENvb3BFbmZvcmNlbWVudFJlc3Vs
dCA/IHN0ZDo6bWFrZV9vcHRpb25hbChtX2N1cnJlbnRDb29wRW5mb3JjZW1lbnRSZXN1bHQtPmNy
b3NzT3JpZ2luT3BlbmVyUG9saWN5KSA6IHN0ZDo6bnVsbG9wdDsgfQogCiAgICAgYm9vbCBpc0Nv
bnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrKCkgY29uc3QgeyByZXR1cm4gbV9p
c0NvbnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrOyB9CkBAIC02MjgsNiArNjI5
LDcgQEAgcHJpdmF0ZToKICAgICBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IG1fc2hvdWxk
T3BlbkV4dGVybmFsVVJMc1BvbGljeSB7IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNo
b3VsZE5vdEFsbG93IH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXBwbGljYXRpb25DYWNoZUhv
c3Q+IG1fYXBwbGljYXRpb25DYWNoZUhvc3Q7CisgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRT
ZWN1cml0eVBvbGljeT4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3k7CiAKICNpZiBFTkFCTEUoQ09O
VEVOVF9GSUxURVJJTkcpCiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRGaWx0ZXI+IG1fY29u
dGVudEZpbHRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl
ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGY4MWQ3
MThlMGFkMzBiZTkzY2VjOTQ1OTlmNWQwNWZlZThkNGFlY2EuLmM3MzkzZDEwMGQ4MGE3N2ZhNDFh
YjE0NDk3MWZlMDViN2FiNTU0NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G
cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw
cApAQCAtNzQ5LDcgKzc0OSwxMiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkaWRCZWdpbkRvY3VtZW50
KGJvb2wgZGlzcGF0Y2gpCiAgICAgICAgIGlmICghZG5zUHJlZmV0Y2hDb250cm9sLmlzRW1wdHko
KSkKICAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+cGFyc2VETlNQcmVmZXRjaENvbnRy
b2xIZWFkZXIoZG5zUHJlZmV0Y2hDb250cm9sKTsKIAotICAgICAgICBtX2ZyYW1lLmRvY3VtZW50
KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2Vj
dXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSks
IHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6
Tm8pOworICAgICAgICAvLyBUaGUgRG9jdW1lbnRMb2FkZXIgbWF5IGhhdmUgYWxyZWFkeSBwYXJz
ZWQgdGhlIENTUCBoZWFkZXIgdG8gZG8gc29tZSBjaGVja3MuIElmIHNvLCByZXVzZSB0aGUgYWxy
ZWFkeSBwYXJzZWQgdmVyc2lvbiBpbnN0ZWFkIG9mIHBhcnNpbmcgYWdhaW4uCisgICAgICAgIGlm
IChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtX2RvY3VtZW50TG9hZGVyLT5jb250ZW50
U2VjdXJpdHlQb2xpY3koKSkgeworICAgICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5jb250
ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVN0YXRlRnJvbShjb250ZW50U2VjdXJpdHlQb2xpY3ks
IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOworICAgICAg
ICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVVw
Z3JhZGVJbnNlY3VyZVJlcXVlc3RTdGF0ZUZyb20oKmNvbnRlbnRTZWN1cml0eVBvbGljeSk7Cisg
ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5jb250ZW50U2Vj
dXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcnMoQ29udGVudFNlY3VyaXR5UG9saWN5UmVz
cG9uc2VIZWFkZXJzKG1fZG9jdW1lbnRMb2FkZXItPnJlc3BvbnNlKCkpLCByZWZlcnJlcigpLCBD
b250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydFBhcnNpbmdFcnJvcnM6Ok5vKTsKIAogICAgICAg
ICBpZiAobV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkg
fHwgbV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKS5wcm90b2NvbElzQmxvYigpKQogICAgICAgICAg
ICAgbV9mcmFtZS5kb2N1bWVudCgpLT5zZXRDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5KG9idGFp
bkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSwg
Km1fZnJhbWUuZG9jdW1lbnQoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9j
c3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0Nv
bnRlbnRTZWN1cml0eVBvbGljeS5jcHAKaW5kZXggNDJhNjg1MWYzOWY5MTQ0Nzc3ZjUyOGIzOThj
ZTRiYTY0OGMwMDM1Ny4uMmM3MTJlNjk5Y2I1NjAwNGY1MjU2YzYzZjg5ZDAzZDhkYmJlNzY3ZSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3ku
Y3BwCkBAIC05MiwxMCArOTIsMTEgQEAgQ29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2Vj
dXJpdHlQb2xpY3koVVJMJiYgcHJvdGVjdGVkVVJMLCBTY3JpcHRFeGVjdXRpb24KIAogQ29udGVu
dFNlY3VyaXR5UG9saWN5Ojp+Q29udGVudFNlY3VyaXR5UG9saWN5KCkgPSBkZWZhdWx0OwogCi12
b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVN0YXRlRnJvbShjb25zdCBDb250ZW50U2Vj
dXJpdHlQb2xpY3kqIG90aGVyKSAKK3ZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpjb3B5U3Rh
dGVGcm9tKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSogb3RoZXIsIFJlcG9ydFBhcnNpbmdF
cnJvcnMgcmVwb3J0UGFyc2luZ0Vycm9ycykKIHsKICAgICBpZiAobV9oYXNBUElQb2xpY3kpCiAg
ICAgICAgIHJldHVybjsKKyAgICBTZXRGb3JTY29wZTxib29sPiBpc1JlcG9ydGluZ0VuYWJsZWQo
bV9pc1JlcG9ydGluZ0VuYWJsZWQsIHJlcG9ydFBhcnNpbmdFcnJvcnMgPT0gUmVwb3J0UGFyc2lu
Z0Vycm9yczo6WWVzKTsKICAgICBBU1NFUlQobV9wb2xpY2llcy5pc0VtcHR5KCkpOwogICAgIGZv
ciAoYXV0byYgcG9saWN5IDogb3RoZXItPm1fcG9saWNpZXMpCiAgICAgICAgIGRpZFJlY2VpdmVI
ZWFkZXIocG9saWN5LT5oZWFkZXIoKSwgcG9saWN5LT5oZWFkZXJUeXBlKCksIENvbnRlbnRTZWN1
cml0eVBvbGljeTo6UG9saWN5RnJvbTo6SW5oZXJpdGVkLCBTdHJpbmcgeyB9KTsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291
cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKaW5kZXggNTNlMDU3
NTk3OTZlZTcxYzAxYmYzYjRiMjYxOTE4NTJmNTZiMDkwMC4uYzY1NTJjNzJkOWQ0NGY5YzY5MzU3
ZWM1OGYxNTZjMmMxOWVkNWUyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3Av
Q29udGVudFNlY3VyaXR5UG9saWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29u
dGVudFNlY3VyaXR5UG9saWN5LmgKQEAgLTY4LDcgKzY4LDggQEAgcHVibGljOgogICAgIFdFQkNP
UkVfRVhQT1JUIGV4cGxpY2l0IENvbnRlbnRTZWN1cml0eVBvbGljeShVUkwmJiwgQ29udGVudFNl
Y3VyaXR5UG9saWN5Q2xpZW50KiA9IG51bGxwdHIpOwogICAgIFdFQkNPUkVfRVhQT1JUIH5Db250
ZW50U2VjdXJpdHlQb2xpY3koKTsKIAotICAgIHZvaWQgY29weVN0YXRlRnJvbShjb25zdCBDb250
ZW50U2VjdXJpdHlQb2xpY3kqKTsKKyAgICBlbnVtIFJlcG9ydFBhcnNpbmdFcnJvcnMgeyBObywg
WWVzIH07CisgICAgdm9pZCBjb3B5U3RhdGVGcm9tKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGlj
eSosIFJlcG9ydFBhcnNpbmdFcnJvcnMgPSBSZXBvcnRQYXJzaW5nRXJyb3JzOjpZZXMpOwogICAg
IHZvaWQgY29weVVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RTdGF0ZUZyb20oY29uc3QgQ29udGVudFNl
Y3VyaXR5UG9saWN5Jik7CiAgICAgdm9pZCBjcmVhdGVQb2xpY3lGb3JQbHVnaW5Eb2N1bWVudEZy
b20oY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5Jik7CiAKQEAgLTgyLDcgKzgzLDYgQEAgcHVi
bGljOgogICAgICAgICBJbmhlcml0ZWRGb3JQbHVnaW5Eb2N1bWVudCwKICAgICB9OwogICAgIFdF
QkNPUkVfRVhQT1JUIENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyByZXNwb25z
ZUhlYWRlcnMoKSBjb25zdDsKLSAgICBlbnVtIFJlcG9ydFBhcnNpbmdFcnJvcnMgeyBObywgWWVz
IH07CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkaWRSZWNlaXZlSGVhZGVycyhjb25zdCBDb250
ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMmLCBTdHJpbmcmJiByZWZlcnJlciwgUmVw
b3J0UGFyc2luZ0Vycm9ycyA9IFJlcG9ydFBhcnNpbmdFcnJvcnM6Olllcyk7CiAgICAgdm9pZCBk
aWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYsIENvbnRlbnRTZWN1cml0eVBvbGljeUhlYWRl
clR5cGUsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbSwgU3RyaW5nJiYgcmVmZXJy
ZXIsIGludCBodHRwU3RhdHVzQ29kZSA9IDApOwogCkBAIC0xNzcsNiArMTc3LDggQEAgcHVibGlj
OgogCiAgICAgdm9pZCBzZXREb2N1bWVudFVSTChVUkwmIGRvY3VtZW50VVJMKSB7IG1fZG9jdW1l
bnRVUkwgPSBkb2N1bWVudFVSTDsgfQogCisgICAgU2FuZGJveEZsYWdzIHNhbmRib3hGbGFncygp
IGNvbnN0IHsgcmV0dXJuIG1fc2FuZGJveEZsYWdzOyB9CisKIHByaXZhdGU6CiAgICAgdm9pZCBs
b2dUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRV
UkwgPSBTdHJpbmcoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSA9IFdU
Rjo6T3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVy
JiBjb250ZXh0Q29sdW1uID0gV1RGOjpPcmRpbmFsTnVtYmVyOjpiZWZvcmVGaXJzdCgpLCBKU0M6
OkpTR2xvYmFsT2JqZWN0KiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlQb2xpY3lU
b1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmlu
ZGV4IDRkY2U4OWI4ZGMzMTU5NGRlMDA3NjIxZWQ4ZDZkYjYzYjU5MGZkOTguLmY5N2Y5YzM1ZDVl
YmQzNWM0OGJiZWM0ZjIzMWIwZmU4NWE3M2QwZGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA4LTMxICBDaHJpcyBEdW1leiAgPGNkdW1lekBh
cHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xp
Y3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveC5odG1sIFdQVCB0ZXN0IGlz
IGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFJlYmFzZWxpbmUgV1BUIHRlc3QgdGhhdCBpcyBub3cgcGFzc2luZy4KKworICAgICAgICAqIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2
aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA4LTMx
ICBNYXJjb3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KIAogICAgICAgICBbUGF5bWVu
dCBSZXF1ZXN0XSBDYWxsaW5nIFBheW1lbnRSZXF1ZXN0J3Mgc2hvdygpIHNob3VsZCBjb25zdW1l
IHVzZXIgYWN0aXZhdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2
aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXIt
cG9saWN5L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0
CmluZGV4IDFhYjYyMDc2NjQ5YzIyNTgxZDBmODhmMjUzYzljMDdlYTVjYjVhNzAuLjNkMDY1ZDUy
ZmY3ZDc0YmU4Y2QwYjRhY2M0MmRiODhiMzIyMTdhNTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVy
LXBvbGljeS9jb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4
dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv
Y3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3At
c2FuZGJveC1leHBlY3RlZC50eHQKQEAgLTEsMyArMSwzIEBACiAKLUZBSUwgY29vcC1uYXZpZ2F0
ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJveCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiU3VjY2Vz
czogbm8gb3BlbmVyIiBidXQgZ290ICJFcnJvcjogaGF2ZSBvcGVuZXIiCitQQVNTIGNvb3AtbmF2
aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437028</attachid>
            <date>2021-09-01 08:13:20 -0700</date>
            <delta_ts>2021-09-01 08:15:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229716-20210901081319.patch</filename>
            <type>text/plain</type>
            <size>13461</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDZlN2QxNDY2MGZmNGEx
ZDMyZjI2ZGZiMDEwOTRhODljNDljNWFhYi4uMjM1ZmQ1N2FjZmM2ZjY3MWI2NmI5ZjkwOWQwMGZh
MWRmOTAxMTBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTA5LTAxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mt
b3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJv
eC5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBDT09QIGFsZ29yaXRobSBpcyByZWx5aW5nIG9uIHRoZSBy
ZXNwb25zZSBvcmlnaW4gZm9yIHNvbWUgb2YgdGhlIGNoZWNrcy4gV2Ugd2VyZSBjb21wdXRpbmcg
dGhlCisgICAgICAgIHJlc3BvbnNlIG9yaWdpbiB2aWEgYFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo
cmVzcG9uc2UudXJsKCkpYCwgd2hpY2ggd29ya2VkIGZpbmUgaW4gbW9zdCBjYXNlcy4KKyAgICAg
ICAgSG93ZXZlciwgdGhlIHJlc3BvbnNlIG1heSBjb250YWluIGEgQ1NQIGhlYWRlciwgd2hpY2gg
Y291bGQgc2V0IHNhbmRib3ggZmxhZ3MuIElmIHNhbmRib3ggZmxhZ3MKKyAgICAgICAgYXJlIHNl
dCwgdGhlIHJlc3BvbnNlIG9yaWdpbiBzaG91bGQgYmUgdW5pcXVlLCBub3QgdGhlIG9yaWdpbiBv
ZiB0aGUgcmVzcG9uc2UgVVJMLiBUaGlzIHBhdGNoIGZpeGVzCisgICAgICAgIHRoYXQuCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyBXUFQgdGVzdC4KKworICAg
ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h
ZGVyOjpkb0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKToKKyAgICAgICAgKiBs
b2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy
Ojpjb250ZW50U2VjdXJpdHlQb2xpY3kgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVu
dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVN0YXRlRnJvbSk6CisgICAg
ICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXJzKToK
KyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaDoKKyAgICAgICAgKFdl
YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6c2FuZGJveEZsYWdzIGNvbnN0KToKKwogMjAy
MS0wOS0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jl
c3Npb24ocjI3MjYwNykgUmVtb3ZhbCBvZiBhbGVydCgpL2NvbmZpcm0oKSBpbiB0aGlyZC1wYXJ0
eSBpZnJhbWVzIGJyZWFrcyBTYWxlc2ZvcmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50
TG9hZGVyLmNwcAppbmRleCBhNjAxMTQ3MzI4MzhkMmVmZTJmMGI3MTBjMzliZTMwNWM3ZGFhN2Nm
Li5mNzAwZjRiZWU2NDI2M2I5ZWQ1ZTVkNDVjYjc5MTNlODBlYzMxMWI4IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTc1OCw3ICs3NTgsNyBAQCBzdGF0aWMg
Ym9vbCBjaGVja0lmQ09PUFZhbHVlc1JlcXVpcmVCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaChi
b29sIGlzSW5pdGlhbEFibwogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgc3RkOjp0dXBs
ZTxSZWY8U2VjdXJpdHlPcmlnaW4+LCBDcm9zc09yaWdpbk9wZW5lclBvbGljeT4gY29tcHV0ZVJl
c3BvbnNlT3JpZ2luQW5kQ09PUChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29u
c3QgRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpb25BY3Rp
b246OlJlcXVlc3Rlcj4mIHJlcXVlc3RlcikKK3N0YXRpYyBzdGQ6OnR1cGxlPFJlZjxTZWN1cml0
eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRlUmVzcG9uc2VPcmlnaW5B
bmRDT09QKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBEb2N1bWVudCYg
ZG9jdW1lbnQsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8TmF2aWdhdGlvbkFjdGlvbjo6UmVxdWVzdGVy
PiYgcmVxdWVzdGVyLCBDb250ZW50U2VjdXJpdHlQb2xpY3kqIHJlc3BvbnNlQ1NQKQogewogICAg
IC8vIE5vbi1pbml0aWFsIGVtcHR5IGRvY3VtZW50cyAoYWJvdXQ6YmxhbmspIHNob3VsZCBpbmhl
cml0IHRoZWlyIGNyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5IGZyb20gdGhlIG5hdmlnYXRpb24n
cyBpbml0aWF0b3IgdG9wIGxldmVsIGRvY3VtZW50LAogICAgIC8vIGlmIHRoZSBpbml0aWF0b3Ig
YW5kIGl0cyB0b3AgbGV2ZWwgZG9jdW1lbnQgYXJlIHNhbWUtb3JpZ2luLCBvciBkZWZhdWx0ICh1
bnNhZmUtbm9uZSkgb3RoZXJ3aXNlLgpAQCAtNzY2LDcgKzc2Niw5IEBAIHN0YXRpYyBzdGQ6OnR1
cGxlPFJlZjxTZWN1cml0eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRl
UmVzcG9uc2VPCiAgICAgaWYgKFNlY3VyaXR5UG9saWN5OjpzaG91bGRJbmhlcml0U2VjdXJpdHlP
cmlnaW5Gcm9tT3duZXIocmVzcG9uc2UudXJsKCkpICYmIHJlcXVlc3RlcikKICAgICAgICAgcmV0
dXJuIHN0ZDo6bWFrZV90dXBsZShtYWtlUmVmKHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKSks
IHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVPcmlnaW5BcyhyZXF1ZXN0ZXItPnRv
cE9yaWdpbigpKSA/IHJlcXVlc3Rlci0+Y3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3koKSA6IENyb3Nz
T3JpZ2luT3BlbmVyUG9saWN5IHsgfSk7CiAKLSAgICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKFNl
Y3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzcG9uc2UudXJsKCkpLCBvYnRhaW5Dcm9zc09yaWdpbk9w
ZW5lclBvbGljeShyZXNwb25zZSwgZG9jdW1lbnQpKTsKKyAgICAvLyBJZiB0aGUgSFRUUCByZXNw
b25zZSBjb250YWlucyBhIENTUCBoZWFkZXIsIGl0IG1heSBzZXQgc2FuZGJveCBmbGFncywgd2hp
Y2ggd291bGQgY2F1c2UgdGhlIG9yaWdpbiB0byBiZWNvbWUgdW5pcXVlLgorICAgIGF1dG8gcmVz
cG9uc2VPcmlnaW4gPSByZXNwb25zZUNTUCAmJiByZXNwb25zZUNTUC0+c2FuZGJveEZsYWdzKCkg
IT0gU2FuZGJveE5vbmUgPyBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCkgOiBTZWN1cml0
eU9yaWdpbjo6Y3JlYXRlKHJlc3BvbnNlLnVybCgpKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3R1
cGxlKFdURk1vdmUocmVzcG9uc2VPcmlnaW4pLCBvYnRhaW5Dcm9zc09yaWdpbk9wZW5lclBvbGlj
eShyZXNwb25zZSwgZG9jdW1lbnQpKTsKIH0KIAogLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdn
Lm9yZy9tdWx0aXBhZ2UvYnJvd3NpbmctdGhlLXdlYi5odG1sI3Byb2Nlc3MtYS1uYXZpZ2F0ZS1m
ZXRjaCAoU3RlcCAxMi41LjYpCkBAIC03NzksNyArNzgxLDEzIEBAIGJvb2wgRG9jdW1lbnRMb2Fk
ZXI6OmRvQ3Jvc3NPcmlnaW5PcGVuZXJIYW5kbGluZ09mUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VS
ZXNwb25zCiAgICAgaWYgKCFtX2ZyYW1lLT5kb2N1bWVudCgpIHx8ICFtX2ZyYW1lLT5kb2N1bWVu
dCgpLT5zZXR0aW5ncygpLmNyb3NzT3JpZ2luT3BlbmVyUG9saWN5RW5hYmxlZCgpKQogICAgICAg
ICByZXR1cm4gdHJ1ZTsKIAotICAgIGF1dG8gW3Jlc3BvbnNlT3JpZ2luLCByZXNwb25zZUNPT1Bd
ID0gY29tcHV0ZVJlc3BvbnNlT3JpZ2luQW5kQ09PUChyZXNwb25zZSwgKm1fZnJhbWUtPmRvY3Vt
ZW50KCksIG1fdHJpZ2dlcmluZ0FjdGlvbi5yZXF1ZXN0ZXIoKSk7CisgICAgaWYgKCFyZXNwb25z
ZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRTZWN1cml0eVBvbGljeSku
aXNOdWxsKCkpIHsKKyAgICAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtYWtlVW5pcXVl
PENvbnRlbnRTZWN1cml0eVBvbGljeT4oVVJMIHsgcmVzcG9uc2UudXJsKCkgfSwgbnVsbHB0cik7
CisgICAgICAgIG1fY29udGVudFNlY3VyaXR5UG9saWN5LT5kaWRSZWNlaXZlSGVhZGVycyhDb250
ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMgeyByZXNwb25zZSB9LCBtX3JlcXVlc3Qu
aHR0cFJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9y
czo6Tm8pOworICAgIH0gZWxzZQorICAgICAgICBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSA9IG51
bGxwdHI7CisKKyAgICBhdXRvIFtyZXNwb25zZU9yaWdpbiwgcmVzcG9uc2VDT09QXSA9IGNvbXB1
dGVSZXNwb25zZU9yaWdpbkFuZENPT1AocmVzcG9uc2UsICptX2ZyYW1lLT5kb2N1bWVudCgpLCBt
X3RyaWdnZXJpbmdBY3Rpb24ucmVxdWVzdGVyKCksIG1fY29udGVudFNlY3VyaXR5UG9saWN5Lmdl
dCgpKTsKIAogICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2Jy
b3dzaW5nLXRoZS13ZWIuaHRtbCNwcm9jZXNzLWEtbmF2aWdhdGUtZmV0Y2ggKFN0ZXAgMTIuNS42
LjIpCiAgICAgLy8gSWYgc2FuZGJveEZsYWdzIGlzIG5vdCBlbXB0eSBhbmQgcmVzcG9uc2VDT09Q
J3MgdmFsdWUgaXMgbm90ICJ1bnNhZmUtbm9uZSIsIHRoZW4gc2V0IHJlc3BvbnNlIHRvIGFuIGFw
cHJvcHJpYXRlIG5ldHdvcmsgZXJyb3IgYW5kIGJyZWFrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j
dW1lbnRMb2FkZXIuaAppbmRleCA0ODJiNTc1ZmZiM2Y3N2JkNjhjODJjYzhlYTNjZTJlZDkxMzA2
ZTkwLi43MTI2ZWQ0ZTNkYjUyNDE0NWMwMTVhNGNjOTIzZDA3N2E5ZjhlYTAzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaApAQCAtNDIzLDYgKzQyMyw3IEBAIHB1YmxpYzoK
ICAgICBib29sIGxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKCkgY29uc3QgeyByZXR1cm4g
bV9sYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZDsgfQogICAgIHZvaWQgc2V0TGFzdE5hdmln
YXRpb25XYXNBcHBJbml0aWF0ZWQoYm9vbCBsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCkg
eyBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkID0gbGFzdE5hdmlnYXRpb25XYXNBcHBJ
bml0aWF0ZWQ7IH0KIAorICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5
UG9saWN5KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCk7IH0K
ICAgICBzdGQ6Om9wdGlvbmFsPENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjcm9zc09yaWdpbk9w
ZW5lclBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudENvb3BFbmZvcmNlbWVudFJlc3Vs
dCA/IHN0ZDo6bWFrZV9vcHRpb25hbChtX2N1cnJlbnRDb29wRW5mb3JjZW1lbnRSZXN1bHQtPmNy
b3NzT3JpZ2luT3BlbmVyUG9saWN5KSA6IHN0ZDo6bnVsbG9wdDsgfQogCiAgICAgYm9vbCBpc0Nv
bnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrKCkgY29uc3QgeyByZXR1cm4gbV9p
c0NvbnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrOyB9CkBAIC02MjgsNiArNjI5
LDcgQEAgcHJpdmF0ZToKICAgICBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IG1fc2hvdWxk
T3BlbkV4dGVybmFsVVJMc1BvbGljeSB7IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNo
b3VsZE5vdEFsbG93IH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXBwbGljYXRpb25DYWNoZUhv
c3Q+IG1fYXBwbGljYXRpb25DYWNoZUhvc3Q7CisgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRT
ZWN1cml0eVBvbGljeT4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3k7CiAKICNpZiBFTkFCTEUoQ09O
VEVOVF9GSUxURVJJTkcpCiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRGaWx0ZXI+IG1fY29u
dGVudEZpbHRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl
ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDM4ZTZi
NjcxNDA2NTM3MzEzNDM0ZjU2NjQ2YzkxNWEwNWM0MmRiNWMuLjdiYWQwYTQ4NTk1OTEyNmE3YTJi
NGE1YTgxOTk2YTA4MDg5ZGQ0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G
cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw
cApAQCAtNzQ5LDcgKzc0OSwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkaWRCZWdpbkRvY3VtZW50
KGJvb2wgZGlzcGF0Y2gpCiAgICAgICAgIGlmICghZG5zUHJlZmV0Y2hDb250cm9sLmlzRW1wdHko
KSkKICAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+cGFyc2VETlNQcmVmZXRjaENvbnRy
b2xIZWFkZXIoZG5zUHJlZmV0Y2hDb250cm9sKTsKIAotICAgICAgICBtX2ZyYW1lLmRvY3VtZW50
KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2Vj
dXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSks
IHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6
Tm8pOworICAgICAgICAvLyBUaGUgRG9jdW1lbnRMb2FkZXIgbWF5IGhhdmUgYWxyZWFkeSBwYXJz
ZWQgdGhlIENTUCBoZWFkZXIgdG8gZG8gc29tZSBjaGVja3MuIElmIHNvLCByZXVzZSB0aGUgYWxy
ZWFkeSBwYXJzZWQgdmVyc2lvbiBpbnN0ZWFkIG9mIHBhcnNpbmcgYWdhaW4uCisgICAgICAgIGlm
IChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtX2RvY3VtZW50TG9hZGVyLT5jb250ZW50
U2VjdXJpdHlQb2xpY3koKSkKKyAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+Y29udGVu
dFNlY3VyaXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXJzKCpjb250ZW50U2VjdXJpdHlQb2xp
Y3ksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOworICAg
ICAgICBlbHNlCisgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0
eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25z
ZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSksIHJlZmVycmVyKCksIENvbnRl
bnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOwogCiAgICAgICAgIGlm
IChtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCBt
X2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNCbG9iKCkpCiAgICAgICAgICAgICBt
X2ZyYW1lLmRvY3VtZW50KCktPnNldENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kob2J0YWluQ3Jv
c3NPcmlnaW5FbWJlZGRlclBvbGljeShtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLCAqbV9m
cmFtZS5kb2N1bWVudCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9D
b250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVu
dFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCA0MmE2ODUxZjM5ZjkxNDQ3NzdmNTI4YjM5OGNlNGJh
NjQ4YzAwMzU3Li5lNzIyOGNiOGEzYjhiMmRmNTcyZGVkNDE2NDFhMTdjZDJhY2MxYWUwIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAK
QEAgLTkyLDcgKzkyLDcgQEAgQ29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2VjdXJpdHlQ
b2xpY3koVVJMJiYgcHJvdGVjdGVkVVJMLCBTY3JpcHRFeGVjdXRpb24KIAogQ29udGVudFNlY3Vy
aXR5UG9saWN5Ojp+Q29udGVudFNlY3VyaXR5UG9saWN5KCkgPSBkZWZhdWx0OwogCi12b2lkIENv
bnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVN0YXRlRnJvbShjb25zdCBDb250ZW50U2VjdXJpdHlQ
b2xpY3kqIG90aGVyKSAKK3ZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpjb3B5U3RhdGVGcm9t
KGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSogb3RoZXIpCiB7CiAgICAgaWYgKG1faGFzQVBJ
UG9saWN5KQogICAgICAgICByZXR1cm47CkBAIC0xNzMsNiArMTczLDE3IEBAIHZvaWQgQ29udGVu
dFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVycyhjb25zdCBDb250ZW50U2VjdXJpdHlQ
b2xpY3lSZXNwb25zCiAgICAgbV9odHRwU3RhdHVzQ29kZSA9IGhlYWRlcnMubV9odHRwU3RhdHVz
Q29kZTsKIH0KIAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXJz
KGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSYgb3RoZXIsIFJlcG9ydFBhcnNpbmdFcnJvcnMg
cmVwb3J0UGFyc2luZ0Vycm9ycykKK3sKKyAgICBTZXRGb3JTY29wZTxib29sPiBpc1JlcG9ydGlu
Z0VuYWJsZWQobV9pc1JlcG9ydGluZ0VuYWJsZWQsIHJlcG9ydFBhcnNpbmdFcnJvcnMgPT0gUmVw
b3J0UGFyc2luZ0Vycm9yczo6WWVzKTsKKyAgICBmb3IgKGF1dG8mIHBvbGljeSA6IG90aGVyLm1f
cG9saWNpZXMpCisgICAgICAgIGRpZFJlY2VpdmVIZWFkZXIocG9saWN5LT5oZWFkZXIoKSwgcG9s
aWN5LT5oZWFkZXJUeXBlKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbTo6SFRU
UEhlYWRlciwgU3RyaW5nIHsgfSk7CisgICAgbV9yZWZlcnJlciA9IG90aGVyLm1fcmVmZXJyZXI7
CisgICAgbV9odHRwU3RhdHVzQ29kZSA9IG90aGVyLm1faHR0cFN0YXR1c0NvZGU7CisgICAgbV91
cGdyYWRlSW5zZWN1cmVSZXF1ZXN0cyA9IG90aGVyLm1fdXBncmFkZUluc2VjdXJlUmVxdWVzdHM7
CisgICAgbV9pbnNlY3VyZU5hdmlnYXRpb25SZXF1ZXN0c1RvVXBncmFkZS5hZGQob3RoZXIubV9p
bnNlY3VyZU5hdmlnYXRpb25SZXF1ZXN0c1RvVXBncmFkZS5iZWdpbigpLCBvdGhlci5tX2luc2Vj
dXJlTmF2aWdhdGlvblJlcXVlc3RzVG9VcGdyYWRlLmVuZCgpKTsKK30KKwogdm9pZCBDb250ZW50
U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiBoZWFkZXIsIENv
bnRlbnRTZWN1cml0eVBvbGljeUhlYWRlclR5cGUgdHlwZSwgQ29udGVudFNlY3VyaXR5UG9saWN5
OjpQb2xpY3lGcm9tIHBvbGljeUZyb20sIFN0cmluZyYmIHJlZmVycmVyLCBpbnQgaHR0cFN0YXR1
c0NvZGUpCiB7CiAgICAgaWYgKG1faGFzQVBJUG9saWN5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmggYi9Tb3VyY2UvV2ViQ29yZS9w
YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAppbmRleCA1M2UwNTc1OTc5NmVlNzFjMDFi
ZjNiNGIyNjE5MTg1MmY1NmIwOTAwLi4xMjRkMWIxZTY3N2FhZDNiMmNjZWI1ODZmMzVkNTY0ZDVk
NzJiMjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJp
dHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQ
b2xpY3kuaApAQCAtNjgsNiArNjgsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhw
bGljaXQgQ29udGVudFNlY3VyaXR5UG9saWN5KFVSTCYmLCBDb250ZW50U2VjdXJpdHlQb2xpY3lD
bGllbnQqID0gbnVsbHB0cik7CiAgICAgV0VCQ09SRV9FWFBPUlQgfkNvbnRlbnRTZWN1cml0eVBv
bGljeSgpOwogCisgICAgZW51bSBSZXBvcnRQYXJzaW5nRXJyb3JzIHsgTm8sIFllcyB9OwogICAg
IHZvaWQgY29weVN0YXRlRnJvbShjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3kqKTsKICAgICB2
b2lkIGNvcHlVcGdyYWRlSW5zZWN1cmVSZXF1ZXN0U3RhdGVGcm9tKGNvbnN0IENvbnRlbnRTZWN1
cml0eVBvbGljeSYpOwogICAgIHZvaWQgY3JlYXRlUG9saWN5Rm9yUGx1Z2luRG9jdW1lbnRGcm9t
KGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSYpOwpAQCAtODIsOCArODMsOCBAQCBwdWJsaWM6
CiAgICAgICAgIEluaGVyaXRlZEZvclBsdWdpbkRvY3VtZW50LAogICAgIH07CiAgICAgV0VCQ09S
RV9FWFBPUlQgQ29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzIHJlc3BvbnNlSGVh
ZGVycygpIGNvbnN0OwotICAgIGVudW0gUmVwb3J0UGFyc2luZ0Vycm9ycyB7IE5vLCBZZXMgfTsK
ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRpZFJlY2VpdmVIZWFkZXJzKGNvbnN0IENvbnRlbnRT
ZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyYsIFN0cmluZyYmIHJlZmVycmVyLCBSZXBvcnRQ
YXJzaW5nRXJyb3JzID0gUmVwb3J0UGFyc2luZ0Vycm9yczo6WWVzKTsKKyAgICB2b2lkIGRpZFJl
Y2VpdmVIZWFkZXJzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSYsIFJlcG9ydFBhcnNpbmdF
cnJvcnMgPSBSZXBvcnRQYXJzaW5nRXJyb3JzOjpZZXMpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUhl
YWRlcihjb25zdCBTdHJpbmcmLCBDb250ZW50U2VjdXJpdHlQb2xpY3lIZWFkZXJUeXBlLCBDb250
ZW50U2VjdXJpdHlQb2xpY3k6OlBvbGljeUZyb20sIFN0cmluZyYmIHJlZmVycmVyLCBpbnQgaHR0
cFN0YXR1c0NvZGUgPSAwKTsKIAogICAgIGJvb2wgYWxsb3dTY3JpcHRXaXRoTm9uY2UoY29uc3Qg
U3RyaW5nJiBub25jZSwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZhbHNl
KSBjb25zdDsKQEAgLTE3Nyw2ICsxNzgsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldERvY3Vt
ZW50VVJMKFVSTCYgZG9jdW1lbnRVUkwpIHsgbV9kb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMOyB9
CiAKKyAgICBTYW5kYm94RmxhZ3Mgc2FuZGJveEZsYWdzKCkgY29uc3QgeyByZXR1cm4gbV9zYW5k
Ym94RmxhZ3M7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIGxvZ1RvQ29uc29sZShjb25zdCBTdHJp
bmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCA9IFN0cmluZygpLCBjb25zdCBX
VEY6Ok9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lID0gV1RGOjpPcmRpbmFsTnVtYmVyOjpiZWZv
cmVGaXJzdCgpLCBjb25zdCBXVEY6Ok9yZGluYWxOdW1iZXImIGNvbnRleHRDb2x1bW4gPSBXVEY6
Ok9yZGluYWxOdW1iZXI6OmJlZm9yZUZpcnN0KCksIEpTQzo6SlNHbG9iYWxPYmplY3QqID0gbnVs
bHB0cikgY29uc3Q7CiAgICAgdm9pZCBhcHBseVBvbGljeVRvU2NyaXB0RXhlY3V0aW9uQ29udGV4
dCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMTk1NDY5ODU2MDA1NjRiY2Jl
YTA5NTRjYjI0MGRjZTJhOTQxYjg1Mi4uOGIzNDQ5N2RjZjc3ZjlhMmUzMTNhNjQ2YmJmYjQyOTA2
ZjVkYTc2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK
KzIwMjEtMDktMDEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBb
Q09PUF0gaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmlnYXRlLXNhbWUt
b3JpZ2luLWNzcC1zYW5kYm94Lmh0bWwgV1BUIHRlc3QgaXMgZmFpbGluZworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzE2CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlbGluZSBXUFQgdGVzdCB0
aGF0IGlzIG5vdyBwYXNzaW5nLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv
Y3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3At
c2FuZGJveC1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDktMDEgIE15bGVzIEMuIE1heGZpZWxkICA8
bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBkb2N1bWVudC5mb250cy5zaXplIG5lZWRz
IHRvIHVwZGF0ZSBzdHlsZSBzbyBpdCBkb2Vzbid0IHJldHVybiBzdGFsZSB2YWx1ZXMKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9j
cm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1z
YW5kYm94LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmlnYXRlLXNh
bWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4dAppbmRleCAxYWI2MjA3NjY0OWMyMjU4
MWQwZjg4ZjI1M2M5YzA3ZWE1Y2I1YTcwLi4zZDA2NWQ1MmZmN2Q3NGJlOGNkMGI0YWNjNDJkYjg4
YjMyMjE3YTU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2h0bWwvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1z
YW1lLW9yaWdpbi1jc3Atc2FuZGJveC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9s
aWN5L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0CkBA
IC0xLDMgKzEsMyBAQAogCi1GQUlMIGNvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRi
b3ggYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIlN1Y2Nlc3M6IG5vIG9wZW5lciIgYnV0IGdvdCAi
RXJyb3I6IGhhdmUgb3BlbmVyIgorUEFTUyBjb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1z
YW5kYm94CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437029</attachid>
            <date>2021-09-01 08:15:16 -0700</date>
            <delta_ts>2021-09-02 11:37:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229716-20210901081515.patch</filename>
            <type>text/plain</type>
            <size>12626</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDZlN2QxNDY2MGZmNGEx
ZDMyZjI2ZGZiMDEwOTRhODljNDljNWFhYi4uMjM1ZmQ1N2FjZmM2ZjY3MWI2NmI5ZjkwOWQwMGZh
MWRmOTAxMTBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTA5LTAxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIGh0bWwvY3Jvc3Mt
b3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2FuZGJv
eC5odG1sIFdQVCB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyOTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBDT09QIGFsZ29yaXRobSBpcyByZWx5aW5nIG9uIHRoZSBy
ZXNwb25zZSBvcmlnaW4gZm9yIHNvbWUgb2YgdGhlIGNoZWNrcy4gV2Ugd2VyZSBjb21wdXRpbmcg
dGhlCisgICAgICAgIHJlc3BvbnNlIG9yaWdpbiB2aWEgYFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo
cmVzcG9uc2UudXJsKCkpYCwgd2hpY2ggd29ya2VkIGZpbmUgaW4gbW9zdCBjYXNlcy4KKyAgICAg
ICAgSG93ZXZlciwgdGhlIHJlc3BvbnNlIG1heSBjb250YWluIGEgQ1NQIGhlYWRlciwgd2hpY2gg
Y291bGQgc2V0IHNhbmRib3ggZmxhZ3MuIElmIHNhbmRib3ggZmxhZ3MKKyAgICAgICAgYXJlIHNl
dCwgdGhlIHJlc3BvbnNlIG9yaWdpbiBzaG91bGQgYmUgdW5pcXVlLCBub3QgdGhlIG9yaWdpbiBv
ZiB0aGUgcmVzcG9uc2UgVVJMLiBUaGlzIHBhdGNoIGZpeGVzCisgICAgICAgIHRoYXQuCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyBXUFQgdGVzdC4KKworICAg
ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlUmVzcG9uc2VPcmlnaW5BbmRDT09QKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h
ZGVyOjpkb0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKToKKyAgICAgICAgKiBs
b2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy
Ojpjb250ZW50U2VjdXJpdHlQb2xpY3kgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv
YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVu
dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6Y29weVN0YXRlRnJvbSk6CisgICAg
ICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXJzKToK
KyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaDoKKyAgICAgICAgKFdl
YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6c2FuZGJveEZsYWdzIGNvbnN0KToKKwogMjAy
MS0wOS0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jl
c3Npb24ocjI3MjYwNykgUmVtb3ZhbCBvZiBhbGVydCgpL2NvbmZpcm0oKSBpbiB0aGlyZC1wYXJ0
eSBpZnJhbWVzIGJyZWFrcyBTYWxlc2ZvcmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50
TG9hZGVyLmNwcAppbmRleCBhNjAxMTQ3MzI4MzhkMmVmZTJmMGI3MTBjMzliZTMwNWM3ZGFhN2Nm
Li5mNzAwZjRiZWU2NDI2M2I5ZWQ1ZTVkNDVjYjc5MTNlODBlYzMxMWI4IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTc1OCw3ICs3NTgsNyBAQCBzdGF0aWMg
Ym9vbCBjaGVja0lmQ09PUFZhbHVlc1JlcXVpcmVCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaChi
b29sIGlzSW5pdGlhbEFibwogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgc3RkOjp0dXBs
ZTxSZWY8U2VjdXJpdHlPcmlnaW4+LCBDcm9zc09yaWdpbk9wZW5lclBvbGljeT4gY29tcHV0ZVJl
c3BvbnNlT3JpZ2luQW5kQ09PUChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29u
c3QgRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpb25BY3Rp
b246OlJlcXVlc3Rlcj4mIHJlcXVlc3RlcikKK3N0YXRpYyBzdGQ6OnR1cGxlPFJlZjxTZWN1cml0
eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRlUmVzcG9uc2VPcmlnaW5B
bmRDT09QKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBEb2N1bWVudCYg
ZG9jdW1lbnQsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8TmF2aWdhdGlvbkFjdGlvbjo6UmVxdWVzdGVy
PiYgcmVxdWVzdGVyLCBDb250ZW50U2VjdXJpdHlQb2xpY3kqIHJlc3BvbnNlQ1NQKQogewogICAg
IC8vIE5vbi1pbml0aWFsIGVtcHR5IGRvY3VtZW50cyAoYWJvdXQ6YmxhbmspIHNob3VsZCBpbmhl
cml0IHRoZWlyIGNyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5IGZyb20gdGhlIG5hdmlnYXRpb24n
cyBpbml0aWF0b3IgdG9wIGxldmVsIGRvY3VtZW50LAogICAgIC8vIGlmIHRoZSBpbml0aWF0b3Ig
YW5kIGl0cyB0b3AgbGV2ZWwgZG9jdW1lbnQgYXJlIHNhbWUtb3JpZ2luLCBvciBkZWZhdWx0ICh1
bnNhZmUtbm9uZSkgb3RoZXJ3aXNlLgpAQCAtNzY2LDcgKzc2Niw5IEBAIHN0YXRpYyBzdGQ6OnR1
cGxlPFJlZjxTZWN1cml0eU9yaWdpbj4sIENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjb21wdXRl
UmVzcG9uc2VPCiAgICAgaWYgKFNlY3VyaXR5UG9saWN5OjpzaG91bGRJbmhlcml0U2VjdXJpdHlP
cmlnaW5Gcm9tT3duZXIocmVzcG9uc2UudXJsKCkpICYmIHJlcXVlc3RlcikKICAgICAgICAgcmV0
dXJuIHN0ZDo6bWFrZV90dXBsZShtYWtlUmVmKHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKSks
IHJlcXVlc3Rlci0+c2VjdXJpdHlPcmlnaW4oKS5pc1NhbWVPcmlnaW5BcyhyZXF1ZXN0ZXItPnRv
cE9yaWdpbigpKSA/IHJlcXVlc3Rlci0+Y3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3koKSA6IENyb3Nz
T3JpZ2luT3BlbmVyUG9saWN5IHsgfSk7CiAKLSAgICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKFNl
Y3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzcG9uc2UudXJsKCkpLCBvYnRhaW5Dcm9zc09yaWdpbk9w
ZW5lclBvbGljeShyZXNwb25zZSwgZG9jdW1lbnQpKTsKKyAgICAvLyBJZiB0aGUgSFRUUCByZXNw
b25zZSBjb250YWlucyBhIENTUCBoZWFkZXIsIGl0IG1heSBzZXQgc2FuZGJveCBmbGFncywgd2hp
Y2ggd291bGQgY2F1c2UgdGhlIG9yaWdpbiB0byBiZWNvbWUgdW5pcXVlLgorICAgIGF1dG8gcmVz
cG9uc2VPcmlnaW4gPSByZXNwb25zZUNTUCAmJiByZXNwb25zZUNTUC0+c2FuZGJveEZsYWdzKCkg
IT0gU2FuZGJveE5vbmUgPyBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCkgOiBTZWN1cml0
eU9yaWdpbjo6Y3JlYXRlKHJlc3BvbnNlLnVybCgpKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3R1
cGxlKFdURk1vdmUocmVzcG9uc2VPcmlnaW4pLCBvYnRhaW5Dcm9zc09yaWdpbk9wZW5lclBvbGlj
eShyZXNwb25zZSwgZG9jdW1lbnQpKTsKIH0KIAogLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdn
Lm9yZy9tdWx0aXBhZ2UvYnJvd3NpbmctdGhlLXdlYi5odG1sI3Byb2Nlc3MtYS1uYXZpZ2F0ZS1m
ZXRjaCAoU3RlcCAxMi41LjYpCkBAIC03NzksNyArNzgxLDEzIEBAIGJvb2wgRG9jdW1lbnRMb2Fk
ZXI6OmRvQ3Jvc3NPcmlnaW5PcGVuZXJIYW5kbGluZ09mUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VS
ZXNwb25zCiAgICAgaWYgKCFtX2ZyYW1lLT5kb2N1bWVudCgpIHx8ICFtX2ZyYW1lLT5kb2N1bWVu
dCgpLT5zZXR0aW5ncygpLmNyb3NzT3JpZ2luT3BlbmVyUG9saWN5RW5hYmxlZCgpKQogICAgICAg
ICByZXR1cm4gdHJ1ZTsKIAotICAgIGF1dG8gW3Jlc3BvbnNlT3JpZ2luLCByZXNwb25zZUNPT1Bd
ID0gY29tcHV0ZVJlc3BvbnNlT3JpZ2luQW5kQ09PUChyZXNwb25zZSwgKm1fZnJhbWUtPmRvY3Vt
ZW50KCksIG1fdHJpZ2dlcmluZ0FjdGlvbi5yZXF1ZXN0ZXIoKSk7CisgICAgaWYgKCFyZXNwb25z
ZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRTZWN1cml0eVBvbGljeSku
aXNOdWxsKCkpIHsKKyAgICAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtYWtlVW5pcXVl
PENvbnRlbnRTZWN1cml0eVBvbGljeT4oVVJMIHsgcmVzcG9uc2UudXJsKCkgfSwgbnVsbHB0cik7
CisgICAgICAgIG1fY29udGVudFNlY3VyaXR5UG9saWN5LT5kaWRSZWNlaXZlSGVhZGVycyhDb250
ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMgeyByZXNwb25zZSB9LCBtX3JlcXVlc3Qu
aHR0cFJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9y
czo6Tm8pOworICAgIH0gZWxzZQorICAgICAgICBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSA9IG51
bGxwdHI7CisKKyAgICBhdXRvIFtyZXNwb25zZU9yaWdpbiwgcmVzcG9uc2VDT09QXSA9IGNvbXB1
dGVSZXNwb25zZU9yaWdpbkFuZENPT1AocmVzcG9uc2UsICptX2ZyYW1lLT5kb2N1bWVudCgpLCBt
X3RyaWdnZXJpbmdBY3Rpb24ucmVxdWVzdGVyKCksIG1fY29udGVudFNlY3VyaXR5UG9saWN5Lmdl
dCgpKTsKIAogICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2Jy
b3dzaW5nLXRoZS13ZWIuaHRtbCNwcm9jZXNzLWEtbmF2aWdhdGUtZmV0Y2ggKFN0ZXAgMTIuNS42
LjIpCiAgICAgLy8gSWYgc2FuZGJveEZsYWdzIGlzIG5vdCBlbXB0eSBhbmQgcmVzcG9uc2VDT09Q
J3MgdmFsdWUgaXMgbm90ICJ1bnNhZmUtbm9uZSIsIHRoZW4gc2V0IHJlc3BvbnNlIHRvIGFuIGFw
cHJvcHJpYXRlIG5ldHdvcmsgZXJyb3IgYW5kIGJyZWFrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j
dW1lbnRMb2FkZXIuaAppbmRleCA0ODJiNTc1ZmZiM2Y3N2JkNjhjODJjYzhlYTNjZTJlZDkxMzA2
ZTkwLi43MTI2ZWQ0ZTNkYjUyNDE0NWMwMTVhNGNjOTIzZDA3N2E5ZjhlYTAzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaApAQCAtNDIzLDYgKzQyMyw3IEBAIHB1YmxpYzoK
ICAgICBib29sIGxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKCkgY29uc3QgeyByZXR1cm4g
bV9sYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZDsgfQogICAgIHZvaWQgc2V0TGFzdE5hdmln
YXRpb25XYXNBcHBJbml0aWF0ZWQoYm9vbCBsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCkg
eyBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkID0gbGFzdE5hdmlnYXRpb25XYXNBcHBJ
bml0aWF0ZWQ7IH0KIAorICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5
UG9saWN5KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCk7IH0K
ICAgICBzdGQ6Om9wdGlvbmFsPENyb3NzT3JpZ2luT3BlbmVyUG9saWN5PiBjcm9zc09yaWdpbk9w
ZW5lclBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudENvb3BFbmZvcmNlbWVudFJlc3Vs
dCA/IHN0ZDo6bWFrZV9vcHRpb25hbChtX2N1cnJlbnRDb29wRW5mb3JjZW1lbnRSZXN1bHQtPmNy
b3NzT3JpZ2luT3BlbmVyUG9saWN5KSA6IHN0ZDo6bnVsbG9wdDsgfQogCiAgICAgYm9vbCBpc0Nv
bnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrKCkgY29uc3QgeyByZXR1cm4gbV9p
c0NvbnRpbnVpbmdMb2FkQWZ0ZXJSZXNwb25zZVBvbGljeUNoZWNrOyB9CkBAIC02MjgsNiArNjI5
LDcgQEAgcHJpdmF0ZToKICAgICBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IG1fc2hvdWxk
T3BlbkV4dGVybmFsVVJMc1BvbGljeSB7IFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNo
b3VsZE5vdEFsbG93IH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXBwbGljYXRpb25DYWNoZUhv
c3Q+IG1fYXBwbGljYXRpb25DYWNoZUhvc3Q7CisgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRT
ZWN1cml0eVBvbGljeT4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3k7CiAKICNpZiBFTkFCTEUoQ09O
VEVOVF9GSUxURVJJTkcpCiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnRGaWx0ZXI+IG1fY29u
dGVudEZpbHRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl
ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDM4ZTZi
NjcxNDA2NTM3MzEzNDM0ZjU2NjQ2YzkxNWEwNWM0MmRiNWMuLjdiYWQwYTQ4NTk1OTEyNmE3YTJi
NGE1YTgxOTk2YTA4MDg5ZGQ0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G
cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw
cApAQCAtNzQ5LDcgKzc0OSwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkaWRCZWdpbkRvY3VtZW50
KGJvb2wgZGlzcGF0Y2gpCiAgICAgICAgIGlmICghZG5zUHJlZmV0Y2hDb250cm9sLmlzRW1wdHko
KSkKICAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+cGFyc2VETlNQcmVmZXRjaENvbnRy
b2xIZWFkZXIoZG5zUHJlZmV0Y2hDb250cm9sKTsKIAotICAgICAgICBtX2ZyYW1lLmRvY3VtZW50
KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2Vj
dXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSks
IHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6
Tm8pOworICAgICAgICAvLyBUaGUgRG9jdW1lbnRMb2FkZXIgbWF5IGhhdmUgYWxyZWFkeSBwYXJz
ZWQgdGhlIENTUCBoZWFkZXIgdG8gZG8gc29tZSBjaGVja3MuIElmIHNvLCByZXVzZSB0aGUgYWxy
ZWFkeSBwYXJzZWQgdmVyc2lvbiBpbnN0ZWFkIG9mIHBhcnNpbmcgYWdhaW4uCisgICAgICAgIGlm
IChhdXRvKiBjb250ZW50U2VjdXJpdHlQb2xpY3kgPSBtX2RvY3VtZW50TG9hZGVyLT5jb250ZW50
U2VjdXJpdHlQb2xpY3koKSkKKyAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+Y29udGVu
dFNlY3VyaXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXJzKCpjb250ZW50U2VjdXJpdHlQb2xp
Y3ksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOworICAg
ICAgICBlbHNlCisgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0
eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25z
ZUhlYWRlcnMobV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSksIHJlZmVycmVyKCksIENvbnRl
bnRTZWN1cml0eVBvbGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOwogCiAgICAgICAgIGlm
IChtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCBt
X2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXNCbG9iKCkpCiAgICAgICAgICAgICBt
X2ZyYW1lLmRvY3VtZW50KCktPnNldENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kob2J0YWluQ3Jv
c3NPcmlnaW5FbWJlZGRlclBvbGljeShtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLCAqbV9m
cmFtZS5kb2N1bWVudCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9D
b250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVu
dFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCA0MmE2ODUxZjM5ZjkxNDQ3NzdmNTI4YjM5OGNlNGJh
NjQ4YzAwMzU3Li43YWJmOGFjYTYwMjJlNTQ3Y2ExNTVhNzMzNzBkNDNkMjYwNjg1OGU1IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAK
QEAgLTE3Myw2ICsxNzMsMTcgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2Vp
dmVIZWFkZXJzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnMKICAgICBtX2h0dHBT
dGF0dXNDb2RlID0gaGVhZGVycy5tX2h0dHBTdGF0dXNDb2RlOwogfQogCit2b2lkIENvbnRlbnRT
ZWN1cml0eVBvbGljeTo6ZGlkUmVjZWl2ZUhlYWRlcnMoY29uc3QgQ29udGVudFNlY3VyaXR5UG9s
aWN5JiBvdGhlciwgUmVwb3J0UGFyc2luZ0Vycm9ycyByZXBvcnRQYXJzaW5nRXJyb3JzKQorewor
ICAgIFNldEZvclNjb3BlPGJvb2w+IGlzUmVwb3J0aW5nRW5hYmxlZChtX2lzUmVwb3J0aW5nRW5h
YmxlZCwgcmVwb3J0UGFyc2luZ0Vycm9ycyA9PSBSZXBvcnRQYXJzaW5nRXJyb3JzOjpZZXMpOwor
ICAgIGZvciAoYXV0byYgcG9saWN5IDogb3RoZXIubV9wb2xpY2llcykKKyAgICAgICAgZGlkUmVj
ZWl2ZUhlYWRlcihwb2xpY3ktPmhlYWRlcigpLCBwb2xpY3ktPmhlYWRlclR5cGUoKSwgQ29udGVu
dFNlY3VyaXR5UG9saWN5OjpQb2xpY3lGcm9tOjpIVFRQSGVhZGVyLCBTdHJpbmcgeyB9KTsKKyAg
ICBtX3JlZmVycmVyID0gb3RoZXIubV9yZWZlcnJlcjsKKyAgICBtX2h0dHBTdGF0dXNDb2RlID0g
b3RoZXIubV9odHRwU3RhdHVzQ29kZTsKKyAgICBtX3VwZ3JhZGVJbnNlY3VyZVJlcXVlc3RzID0g
b3RoZXIubV91cGdyYWRlSW5zZWN1cmVSZXF1ZXN0czsKKyAgICBtX2luc2VjdXJlTmF2aWdhdGlv
blJlcXVlc3RzVG9VcGdyYWRlLmFkZChvdGhlci5tX2luc2VjdXJlTmF2aWdhdGlvblJlcXVlc3Rz
VG9VcGdyYWRlLmJlZ2luKCksIG90aGVyLm1faW5zZWN1cmVOYXZpZ2F0aW9uUmVxdWVzdHNUb1Vw
Z3JhZGUuZW5kKCkpOworfQorCiB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6ZGlkUmVjZWl2
ZUhlYWRlcihjb25zdCBTdHJpbmcmIGhlYWRlciwgQ29udGVudFNlY3VyaXR5UG9saWN5SGVhZGVy
VHlwZSB0eXBlLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlBvbGljeUZyb20gcG9saWN5RnJvbSwg
U3RyaW5nJiYgcmVmZXJyZXIsIGludCBodHRwU3RhdHVzQ29kZSkKIHsKICAgICBpZiAobV9oYXNB
UElQb2xpY3kpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2Vj
dXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBv
bGljeS5oCmluZGV4IDUzZTA1NzU5Nzk2ZWU3MWMwMWJmM2I0YjI2MTkxODUyZjU2YjA5MDAuLjBm
YzMwMGJkOTIwYzhmOTI0Y2VhMmIyOTIxZWYwMDc5YjdlNDcwYWIgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC04NCw2ICs4NCw3IEBA
IHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25z
ZUhlYWRlcnMgcmVzcG9uc2VIZWFkZXJzKCkgY29uc3Q7CiAgICAgZW51bSBSZXBvcnRQYXJzaW5n
RXJyb3JzIHsgTm8sIFllcyB9OwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZGlkUmVjZWl2ZUhl
YWRlcnMoY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzJiwgU3RyaW5n
JiYgcmVmZXJyZXIsIFJlcG9ydFBhcnNpbmdFcnJvcnMgPSBSZXBvcnRQYXJzaW5nRXJyb3JzOjpZ
ZXMpOworICAgIHZvaWQgZGlkUmVjZWl2ZUhlYWRlcnMoY29uc3QgQ29udGVudFNlY3VyaXR5UG9s
aWN5JiwgUmVwb3J0UGFyc2luZ0Vycm9ycyA9IFJlcG9ydFBhcnNpbmdFcnJvcnM6Olllcyk7CiAg
ICAgdm9pZCBkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYsIENvbnRlbnRTZWN1cml0eVBv
bGljeUhlYWRlclR5cGUsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbSwgU3RyaW5n
JiYgcmVmZXJyZXIsIGludCBodHRwU3RhdHVzQ29kZSA9IDApOwogCiAgICAgYm9vbCBhbGxvd1Nj
cmlwdFdpdGhOb25jZShjb25zdCBTdHJpbmcmIG5vbmNlLCBib29sIG92ZXJyaWRlQ29udGVudFNl
Y3VyaXR5UG9saWN5ID0gZmFsc2UpIGNvbnN0OwpAQCAtMTc3LDYgKzE3OCw4IEBAIHB1YmxpYzoK
IAogICAgIHZvaWQgc2V0RG9jdW1lbnRVUkwoVVJMJiBkb2N1bWVudFVSTCkgeyBtX2RvY3VtZW50
VVJMID0gZG9jdW1lbnRVUkw7IH0KIAorICAgIFNhbmRib3hGbGFncyBzYW5kYm94RmxhZ3MoKSBj
b25zdCB7IHJldHVybiBtX3NhbmRib3hGbGFnczsgfQorCiBwcml2YXRlOgogICAgIHZvaWQgbG9n
VG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBjb250ZXh0VVJM
ID0gU3RyaW5nKCksIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUgPSBXVEY6
Ok9yZGluYWxOdW1iZXI6OmJlZm9yZUZpcnN0KCksIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYg
Y29udGV4dENvbHVtbiA9IFdURjo6T3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgSlNDOjpK
U0dsb2JhbE9iamVjdCogPSBudWxscHRyKSBjb25zdDsKICAgICB2b2lkIGFwcGx5UG9saWN5VG9T
Y3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRl
eCAxOTU0Njk4NTYwMDU2NGJjYmVhMDk1NGNiMjQwZGNlMmE5NDFiODUyLi44YjM0NDk3ZGNmNzdm
OWEyZTMxM2E2NDZiYmZiNDI5MDZmNWRhNzZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wOS0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw
bGUuY29tPgorCisgICAgICAgIFtDT09QXSBodG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5
L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3guaHRtbCBXUFQgdGVzdCBpcyBm
YWlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
Mjk3MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS
ZWJhc2VsaW5lIFdQVCB0ZXN0IHRoYXQgaXMgbm93IHBhc3NpbmcuCisKKyAgICAgICAgKiB3ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9jb29wLW5hdmln
YXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wOS0wMSAg
TXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIGRvY3Vt
ZW50LmZvbnRzLnNpemUgbmVlZHMgdG8gdXBkYXRlIHN0eWxlIHNvIGl0IGRvZXNuJ3QgcmV0dXJu
IHN0YWxlIHZhbHVlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L2Nvb3AtbmF2aWdh
dGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9s
aWN5L2Nvb3AtbmF2aWdhdGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gtZXhwZWN0ZWQudHh0Cmlu
ZGV4IDFhYjYyMDc2NjQ5YzIyNTgxZDBmODhmMjUzYzljMDdlYTVjYjVhNzAuLjNkMDY1ZDUyZmY3
ZDc0YmU4Y2QwYjRhY2M0MmRiODhiMzIyMTdhNTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBv
bGljeS9jb29wLW5hdmlnYXRlLXNhbWUtb3JpZ2luLWNzcC1zYW5kYm94LWV4cGVjdGVkLnR4dAor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY3Jv
c3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvY29vcC1uYXZpZ2F0ZS1zYW1lLW9yaWdpbi1jc3Atc2Fu
ZGJveC1leHBlY3RlZC50eHQKQEAgLTEsMyArMSwzIEBACiAKLUZBSUwgY29vcC1uYXZpZ2F0ZS1z
YW1lLW9yaWdpbi1jc3Atc2FuZGJveCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiU3VjY2Vzczog
bm8gb3BlbmVyIiBidXQgZ290ICJFcnJvcjogaGF2ZSBvcGVuZXIiCitQQVNTIGNvb3AtbmF2aWdh
dGUtc2FtZS1vcmlnaW4tY3NwLXNhbmRib3gKIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>