<?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>235045</bug_id>
          
          <creation_ts>2022-01-10 12:48:23 -0800</creation_ts>
          <short_desc>[Cocoa] Inspector Extensions: tabIconURLs with custom scheme URLs are incorrectly loaded</short_desc>
          <delta_ts>2022-01-11 13:58:28 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Web Inspector</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Blaze Burg">bburg</reporter>
          <assigned_to name="Blaze Burg">bburg</assigned_to>
          <cc>bburg</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>inspector-bugzilla-changes</cc>
    
    <cc>joepeck</cc>
    
    <cc>pangle</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1829597</commentid>
    <comment_count>0</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2022-01-10 12:48:23 -0800</bug_when>
    <thetext>It looks like the conversion from NSURL -&gt; API::URL -&gt; WTF::URL -&gt; WTF::String -&gt; JSValue is not going as expected.

Since we don&apos;t examine or modify the URL, it suffices to convert it to NSURL -&gt; WTF::String -&gt; JSValue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829598</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-01-10 12:48:48 -0800</bug_when>
    <thetext>&lt;rdar://problem/87357027&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829599</commentid>
    <comment_count>2</comment_count>
      <attachid>448788</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2022-01-10 12:52:59 -0800</bug_when>
    <thetext>Created attachment 448788
Patch v1.0</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829619</commentid>
    <comment_count>3</comment_count>
    <who name="Devin Rousso">hi</who>
    <bug_when>2022-01-10 13:32:21 -0800</bug_when>
    <thetext>(In reply to BJ Burg from comment #0)
&gt; It looks like the conversion from NSURL -&gt; API::URL -&gt; WTF::URL -&gt; WTF::String -&gt; JSValue is not going as expected.
This seems like a bug, no?  Or is this expected?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829637</commentid>
    <comment_count>4</comment_count>
      <attachid>448802</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2022-01-10 14:41:00 -0800</bug_when>
    <thetext>Created attachment 448802
Patch v1.1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829644</commentid>
    <comment_count>5</comment_count>
      <attachid>448802</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-01-10 15:04:18 -0800</bug_when>
    <thetext>Comment on attachment 448802
Patch v1.1

Looks good.

Please note that using the URL class’s relative URL resolution doesn’t necessarily handle all the edge cases correctly and functions like Document::completeURL end up having to add special cases. So please think further on that point, for things like empty string.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829906</commentid>
    <comment_count>6</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2022-01-11 13:50:47 -0800</bug_when>
    <thetext>(In reply to Darin Adler from comment #5)
&gt; Comment on attachment 448802 [details]
&gt; Patch v1.1
&gt; 
&gt; Looks good.
&gt; 
&gt; Please note that using the URL class’s relative URL resolution doesn’t
&gt; necessarily handle all the edge cases correctly and functions like
&gt; Document::completeURL end up having to add special cases. So please think
&gt; further on that point, for things like empty string.

Good point. In this case the code that provides the NSURL via ensures that the URL is non-nil and is not the empty string.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829907</commentid>
    <comment_count>7</comment_count>
      <attachid>448802</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2022-01-11 13:51:15 -0800</bug_when>
    <thetext>Comment on attachment 448802
Patch v1.1

ios-wk2 and wincairo failures look to be infrastructure issues.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1829911</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-11 13:58:25 -0800</bug_when>
    <thetext>Committed r287895 (245933@main): &lt;https://commits.webkit.org/245933@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 448802.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>448788</attachid>
            <date>2022-01-10 12:52:59 -0800</date>
            <delta_ts>2022-01-10 14:40:59 -0800</delta_ts>
            <desc>Patch v1.0</desc>
            <filename>bug-235045-20220110125259.patch</filename>
            <type>text/plain</type>
            <size>14592</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3Njc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZkMzNhZjdhODI5MDNiMDMx
MzA1YmY5ZjM2ODNkMDY0NWU5Y2MxNWIuLjg5MjdjYTk5NDNmYWIyZDJlMGYyZTQxZDM2MGMzY2Jk
MGQ4OWNjMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjItMDEtMTAgIEJKIEJ1cmcg
IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBJbnNwZWN0b3IgRXh0ZW5zaW9u
czogdGFiSWNvblVSTHMgd2l0aCBjdXN0b20gc2NoZW1lIFVSTHMgYXJlIGluY29ycmVjdGx5IGxv
YWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1
MDQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzM1NzAyNz4KKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IGRpcmVjdGx5IGZyb20gTlNV
UkwgKiB0byBXVEY6OlN0cmluZyBiZWZvcmUgc2VuZGluZyBvdmVyIElQQy4KKyAgICAgICAgRG9u
J3QgdXNlIEFQSTo6U3RyaW5nIG9yIFdURjo6VVJMIHNpbmNlIHdlIGRvbid0IG5lZWQgdG8gbW9k
aWZ5IG9yIGluc3BlY3QgdGhlIFVSTC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJSW5z
cGVjdG9yRXh0ZW5zaW9uLmNwcDoKKyAgICAgICAgKEFQSTo6SW5zcGVjdG9yRXh0ZW5zaW9uOjpj
cmVhdGVUYWIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJSW5zcGVjdG9yRXh0ZW5zaW9u
Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnNwZWN0b3JFeHRlbnNpb24u
bW06CisgICAgICAgICgtW19XS0luc3BlY3RvckV4dGVuc2lvbiBjcmVhdGVUYWJXaXRoTmFtZTp0
YWJJY29uVVJMOnNvdXJjZVVSTDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKiBVSVBy
b2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlclByb3h5LmNw
cDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyUHJv
eHk6OmNyZWF0ZVRhYkZvckV4dGVuc2lvbik6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3Rv
ci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXJQcm94eS5oOgorICAgICAgICAqIFdl
YlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlci5jcHA6
CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlcjo6Y3Jl
YXRlVGFiRm9yRXh0ZW5zaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luc3BlY3Rvci9XZWJJ
bnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0lu
c3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXIubWVzc2FnZXMuaW46CisK
IDIwMjEtMTAtMzAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog
ICAgICAgICBbR1BVIFByb2Nlc3NdIFNtYWxsIEltYWdlQnVmZmVycyBjYXVzZSB0aGUgd2ViIHBy
b2Nlc3MgdG8gY3Jhc2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B
UElJbnNwZWN0b3JFeHRlbnNpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ
SUluc3BlY3RvckV4dGVuc2lvbi5jcHAKaW5kZXggODJjOGFhYTM2MzY0YmY3YTU5NmZhMGUyYzYw
NmRhYjg1MGVhNGE2Yy4uM2VlOTM5MTg2ODkzMDIwMjI5Mzk5OWYwZWFkOGE4ZGRmM2RjNmVkYyAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUluc3BlY3RvckV4dGVu
c2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUluc3BlY3RvckV4
dGVuc2lvbi5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdm9pZCBJbnNwZWN0b3JFeHRlbnNpb246OnNl
dENsaWVudChVbmlxdWVSZWY8SW5zcGVjdG9yRXh0ZW5zaW9uQ2xpZW50PiYmIGNsaWVudCkKICAg
ICBtX2NsaWVudCA9IGNsaWVudC5tb3ZlVG9VbmlxdWVQdHIoKTsKIH0KIAotdm9pZCBJbnNwZWN0
b3JFeHRlbnNpb246OmNyZWF0ZVRhYihjb25zdCBXVEY6OlN0cmluZyYgdGFiTmFtZSwgY29uc3Qg
V1RGOjpVUkwmIHRhYkljb25VUkwsIGNvbnN0IFdURjo6VVJMJiBzb3VyY2VVUkwsIFdURjo6Q29t
cGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxJbnNwZWN0b3I6OkV4dGVuc2lvblRhYklELCBJ
bnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIElu
c3BlY3RvckV4dGVuc2lvbjo6Y3JlYXRlVGFiKGNvbnN0IFdURjo6U3RyaW5nJiB0YWJOYW1lLCBj
b25zdCBXVEY6OlN0cmluZyYgdGFiSWNvblVSTCwgY29uc3QgV1RGOjpTdHJpbmcmIHNvdXJjZVVS
TCwgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPEluc3BlY3Rvcjo6RXh0ZW5z
aW9uVGFiSUQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+KT4mJiBjb21wbGV0aW9uSGFuZGxl
cikKIHsKICAgICBpZiAoIW1fZXh0ZW5zaW9uQ29udHJvbGxlclByb3h5KSB7CiAgICAgICAgIGNv
bXBsZXRpb25IYW5kbGVyKG1ha2VVbmV4cGVjdGVkKEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I6
OkNvbnRleHREZXN0cm95ZWQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L0FQSS9BUElJbnNwZWN0b3JFeHRlbnNpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ
SS9BUElJbnNwZWN0b3JFeHRlbnNpb24uaAppbmRleCBiYzNmODgwMTYzMTdkMGEzYjU5YzI2YjVl
MGYyNTY5YWUxYTAwNzk2Li5iZWMzMTA1YTIxYWExYzY2ZThlMjIxODE0MWUwMTJmMzQyNTQ3NTA4
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJSW5zcGVjdG9yRXh0
ZW5zaW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUluc3BlY3RvckV4
dGVuc2lvbi5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFdURjo6U3Ry
aW5nJiBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAKLSAgICB2
b2lkIGNyZWF0ZVRhYihjb25zdCBXVEY6OlN0cmluZyYgdGFiTmFtZSwgY29uc3QgV1RGOjpVUkwm
IHRhYkljb25VUkwsIGNvbnN0IFdURjo6VVJMJiBzb3VyY2VVUkwsIFdURjo6Q29tcGxldGlvbkhh
bmRsZXI8dm9pZChFeHBlY3RlZDxJbnNwZWN0b3I6OkV4dGVuc2lvblRhYklELCBJbnNwZWN0b3I6
OkV4dGVuc2lvbkVycm9yPik+JiYpOworICAgIHZvaWQgY3JlYXRlVGFiKGNvbnN0IFdURjo6U3Ry
aW5nJiB0YWJOYW1lLCBjb25zdCBXVEY6OlN0cmluZyYgdGFiSWNvblVSTCwgY29uc3QgV1RGOjpT
dHJpbmcmIHNvdXJjZVVSTCwgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPElu
c3BlY3Rvcjo6RXh0ZW5zaW9uVGFiSUQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+KT4mJik7
CiAgICAgdm9pZCBldmFsdWF0ZVNjcmlwdChjb25zdCBXVEY6OlN0cmluZyYgc2NyaXB0U291cmNl
LCBjb25zdCBzdGQ6Om9wdGlvbmFsPFdURjo6VVJMPiYgZnJhbWVVUkwsIGNvbnN0IHN0ZDo6b3B0
aW9uYWw8V1RGOjpVUkw+JiBjb250ZXh0U2VjdXJpdHlPcmlnaW4sIGNvbnN0IHN0ZDo6b3B0aW9u
YWw8Ym9vbD4mIHVzZUNvbnRlbnRTY3JpcHRDb250ZXh0LCBXVEY6OkNvbXBsZXRpb25IYW5kbGVy
PHZvaWQoSW5zcGVjdG9yOjpFeHRlbnNpb25FdmFsdWF0aW9uUmVzdWx0KT4mJik7CiAgICAgdm9p
ZCByZWxvYWRJZ25vcmluZ0NhY2hlKGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIGlnbm9yZUNh
Y2hlLCBjb25zdCBzdGQ6Om9wdGlvbmFsPFdURjo6U3RyaW5nPiYgdXNlckFnZW50LCBjb25zdCBz
dGQ6Om9wdGlvbmFsPFdURjo6U3RyaW5nPiYgaW5qZWN0ZWRTY3JpcHQsIFdURjo6Q29tcGxldGlv
bkhhbmRsZXI8dm9pZChJbnNwZWN0b3I6OkV4dGVuc2lvbkV2YWx1YXRpb25SZXN1bHQpPiYmKTsK
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0luc3Bl
Y3RvckV4dGVuc2lvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJ
bnNwZWN0b3JFeHRlbnNpb24ubW0KaW5kZXggNTgwZTcxOGRkMTY4YTAxOTUwMjQ4NTJkNDBjYzQ1
YzJjMTgyNjcxMi4uYWQ3MzJlMzZiZjU2ZmZjMTM3MTIxNTQ3Yjk4MzBkMGNhNWZlZWY2OCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0luc3BlY3RvckV4
dGVuc2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLSW5z
cGVjdG9yRXh0ZW5zaW9uLm1tCkBAIC03Miw3ICs3Miw3IEBAIC0gKHZvaWQpc2V0RGVsZWdhdGU6
KGlkPF9XS0luc3BlY3RvckV4dGVuc2lvbkRlbGVnYXRlPilkZWxlZ2F0ZQogCiAtICh2b2lkKWNy
ZWF0ZVRhYldpdGhOYW1lOihOU1N0cmluZyAqKXRhYk5hbWUgdGFiSWNvblVSTDooTlNVUkwgKil0
YWJJY29uVVJMIHNvdXJjZVVSTDooTlNVUkwgKilzb3VyY2VVUkwgY29tcGxldGlvbkhhbmRsZXI6
KHZvaWQoXikoTlNFcnJvciAqLCBOU1N0cmluZyAqKSljb21wbGV0aW9uSGFuZGxlcgogewotICAg
IF9leHRlbnNpb24tPmNyZWF0ZVRhYih0YWJOYW1lLCB0YWJJY29uVVJMLCBzb3VyY2VVUkwsIFtw
cm90ZWN0ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpLCBjYXB0dXJlZEJsb2NrID0gbWFrZUJsb2Nr
UHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKEV4cGVjdGVkPEluc3BlY3Rvcjo6RXh0ZW5zaW9uVGFi
SUQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+IHJlc3VsdCkgbXV0YWJsZSB7CisgICAgX2V4
dGVuc2lvbi0+Y3JlYXRlVGFiKHRhYk5hbWUsIHRhYkljb25VUkwuYWJzb2x1dGVTdHJpbmcsIHNv
dXJjZVVSTC5hYnNvbHV0ZVN0cmluZywgW3Byb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZiks
IGNhcHR1cmVkQmxvY2sgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpXSAoRXhwZWN0
ZWQ8SW5zcGVjdG9yOjpFeHRlbnNpb25UYWJJRCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4g
cmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgICAgIGNh
cHR1cmVkQmxvY2soW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpX
S0Vycm9yVW5rbm93biB1c2VySW5mbzpAeyBOU0xvY2FsaXplZEZhaWx1cmVSZWFzb25FcnJvcktl
eTogSW5zcGVjdG9yOjpleHRlbnNpb25FcnJvclRvU3RyaW5nKHJlc3VsdC5lcnJvcigpKX1dLCBu
aWwpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlclByb3h5LmNw
cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4dGVu
c2lvbkNvbnRyb2xsZXJQcm94eS5jcHAKaW5kZXggZTg4NjYwOGQxODZmNjYzYzVlOWRkZWFlNGQ4
MzNiMGFjYzU4NjYwYi4uMDJlYzYxOWQ4NDk5MjM3NGQ3M2IwZmJjNmYwZGI2MjgwNzg0MTMwNCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3Rv
clVJRXh0ZW5zaW9uQ29udHJvbGxlclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyUHJveHkuY3Bw
CkBAIC0xNDUsNyArMTQ1LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xs
ZXJQcm94eTo6dW5yZWdpc3RlckV4dGVuc2lvbihjb25zdCBJbnNwZWN0b3IKICAgICB9KTsKIH0K
IAotdm9pZCBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXJQcm94eTo6Y3JlYXRlVGFi
Rm9yRXh0ZW5zaW9uKGNvbnN0IEluc3BlY3Rvcjo6RXh0ZW5zaW9uSUQmIGV4dGVuc2lvbklELCBj
b25zdCBTdHJpbmcmIHRhYk5hbWUsIGNvbnN0IFVSTCYgdGFiSWNvblVSTCwgY29uc3QgVVJMJiBz
b3VyY2VVUkwsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxJbnNwZWN0b3I6
OkV4dGVuc2lvblRhYklELCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYgY29tcGxldGlv
bkhhbmRsZXIpCit2b2lkIFdlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlclByb3h5Ojpj
cmVhdGVUYWJGb3JFeHRlbnNpb24oY29uc3QgSW5zcGVjdG9yOjpFeHRlbnNpb25JRCYgZXh0ZW5z
aW9uSUQsIGNvbnN0IFN0cmluZyYgdGFiTmFtZSwgY29uc3QgU3RyaW5nJiB0YWJJY29uVVJMLCBj
b25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVj
dGVkPEluc3BlY3Rvcjo6RXh0ZW5zaW9uVGFiSUQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+
KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICB3aGVuRnJvbnRlbmRIYXNMb2FkZWQoW3dl
YWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIGV4dGVuc2lvbklELCB0YWJOYW1lLCB0YWJJY29u
VVJMLCBzb3VyY2VVUkwsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFu
ZGxlcildICgpIG11dGFibGUgewogICAgICAgICBpZiAoIXdlYWtUaGlzIHx8ICF3ZWFrVGhpcy0+
bV9pbnNwZWN0b3JQYWdlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9J
bnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyUHJveHkuaCBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRy
b2xsZXJQcm94eS5oCmluZGV4IDU3MWFmNjI3NDk3OGFiYjFhNWVmN2Y0YTMzOGYzYWM4NTJlMjNi
M2MuLjBmMTk4YTE0OGFmZjJiYjIyZjNlNWYzNzg3MDY4MzA2OTU3MThiN2EgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lv
bkNvbnRyb2xsZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rv
ci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXJQcm94eS5oCkBAIC01Nyw3ICs1Nyw3
IEBAIHB1YmxpYzoKICAgICAvLyBBUEkuCiAgICAgdm9pZCByZWdpc3RlckV4dGVuc2lvbihjb25z
dCBJbnNwZWN0b3I6OkV4dGVuc2lvbklEJiwgY29uc3QgU3RyaW5nJiBleHRlbnNpb25CdW5kbGVJ
ZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCBXVEY6OkNvbXBsZXRpb25IYW5k
bGVyPHZvaWQoRXhwZWN0ZWQ8UmVmUHRyPEFQSTo6SW5zcGVjdG9yRXh0ZW5zaW9uPiwgSW5zcGVj
dG9yOjpFeHRlbnNpb25FcnJvcj4pPiYmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJFeHRlbnNpb24o
Y29uc3QgSW5zcGVjdG9yOjpFeHRlbnNpb25JRCYsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9p
ZChFeHBlY3RlZDx2b2lkLCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYpOwotICAgIHZv
aWQgY3JlYXRlVGFiRm9yRXh0ZW5zaW9uKGNvbnN0IEluc3BlY3Rvcjo6RXh0ZW5zaW9uSUQmLCBj
b25zdCBTdHJpbmcmIHRhYk5hbWUsIGNvbnN0IFVSTCYgdGFiSWNvblVSTCwgY29uc3QgVVJMJiBz
b3VyY2VVUkwsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxJbnNwZWN0b3I6
OkV4dGVuc2lvblRhYklELCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYpOworICAgIHZv
aWQgY3JlYXRlVGFiRm9yRXh0ZW5zaW9uKGNvbnN0IEluc3BlY3Rvcjo6RXh0ZW5zaW9uSUQmLCBj
b25zdCBTdHJpbmcmIHRhYk5hbWUsIGNvbnN0IFN0cmluZyYgdGFiSWNvblVSTCwgY29uc3QgU3Ry
aW5nJiBzb3VyY2VVUkwsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxJbnNw
ZWN0b3I6OkV4dGVuc2lvblRhYklELCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYpOwog
ICAgIHZvaWQgZXZhbHVhdGVTY3JpcHRGb3JFeHRlbnNpb24oY29uc3QgSW5zcGVjdG9yOjpFeHRl
bnNpb25JRCYsIGNvbnN0IFN0cmluZyYgc2NyaXB0U291cmNlLCBjb25zdCBzdGQ6Om9wdGlvbmFs
PFVSTD4mIGZyYW1lVVJMLCBjb25zdCBzdGQ6Om9wdGlvbmFsPFVSTD4mIGNvbnRleHRTZWN1cml0
eU9yaWdpbiwgY29uc3Qgc3RkOjpvcHRpb25hbDxib29sPiYgdXNlQ29udGVudFNjcmlwdENvbnRl
eHQsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChJbnNwZWN0b3I6OkV4dGVuc2lvbkV2YWx1
YXRpb25SZXN1bHQpPiYmKTsKICAgICB2b2lkIHJlbG9hZEZvckV4dGVuc2lvbihjb25zdCBJbnNw
ZWN0b3I6OkV4dGVuc2lvbklEJiwgY29uc3Qgc3RkOjpvcHRpb25hbDxib29sPiYgaWdub3JlQ2Fj
aGUsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiYgdXNlckFnZW50LCBjb25zdCBzdGQ6Om9w
dGlvbmFsPFN0cmluZz4mIGluamVjdGVkU2NyaXB0LCBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZv
aWQoSW5zcGVjdG9yOjpFeHRlbnNpb25FdmFsdWF0aW9uUmVzdWx0KT4mJik7CiAgICAgdm9pZCBz
aG93RXh0ZW5zaW9uVGFiKGNvbnN0IEluc3BlY3Rvcjo6RXh0ZW5zaW9uVGFiSUQmLCBDb21wbGV0
aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPHZvaWQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+
KT4mJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5zcGVjdG9yL1dl
Ykluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlci5jcHAKaW5k
ZXggNDdjZTM2M2MwYThmYWNjNThiMGNjNzljZGVlY2I5NmM1ZDQzNGJlNi4uN2IwYjJmMTZkOTgx
OWQ5MmFhMGIzNzA2OTdjYTA0MmFhMTRlOTg2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXIuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlF
eHRlbnNpb25Db250cm9sbGVyLmNwcApAQCAtMTcxLDcgKzE3MSw3IEBAIEpTQzo6SlNPYmplY3Qq
IFdlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlcjo6dW53cmFwRXZhbHVhdGlvblJlc3Vs
dEFzT2JqZWN0CiAgICAgcmV0dXJuIHZhbHVlT3JFeGNlcHRpb24udmFsdWUoKS5nZXRPYmplY3Qo
KTsKIH0KIAotdm9pZCBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXI6OmNyZWF0ZVRh
YkZvckV4dGVuc2lvbihjb25zdCBJbnNwZWN0b3I6OkV4dGVuc2lvbklEJiBleHRlbnNpb25JRCwg
Y29uc3QgU3RyaW5nJiB0YWJOYW1lLCBjb25zdCBVUkwmIHRhYkljb25VUkwsIGNvbnN0IFVSTCYg
c291cmNlVVJMLCBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8SW5zcGVjdG9y
OjpFeHRlbnNpb25UYWJJRCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4pPiYmIGNvbXBsZXRp
b25IYW5kbGVyKQordm9pZCBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXI6OmNyZWF0
ZVRhYkZvckV4dGVuc2lvbihjb25zdCBJbnNwZWN0b3I6OkV4dGVuc2lvbklEJiBleHRlbnNpb25J
RCwgY29uc3QgU3RyaW5nJiB0YWJOYW1lLCBjb25zdCBTdHJpbmcmIHRhYkljb25VUkwsIGNvbnN0
IFN0cmluZyYgc291cmNlVVJMLCBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8
SW5zcGVjdG9yOjpFeHRlbnNpb25UYWJJRCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4pPiYm
IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICghbV9mcm9udGVuZENsaWVudCkgewogICAg
ICAgICBjb21wbGV0aW9uSGFuZGxlcihtYWtlVW5leHBlY3RlZChJbnNwZWN0b3I6OkV4dGVuc2lv
bkVycm9yOjpJbnZhbGlkUmVxdWVzdCkpOwpAQCAtMTgxLDggKzE4MSw4IEBAIHZvaWQgV2ViSW5z
cGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyOjpjcmVhdGVUYWJGb3JFeHRlbnNpb24oY29uc3Qg
SW5zcGVjdG9yOjpFCiAgICAgVmVjdG9yPFJlZjxKU09OOjpWYWx1ZT4+IGFyZ3VtZW50cyB7CiAg
ICAgICAgIEpTT046OlZhbHVlOjpjcmVhdGUoZXh0ZW5zaW9uSUQpLAogICAgICAgICBKU09OOjpW
YWx1ZTo6Y3JlYXRlKHRhYk5hbWUpLAotICAgICAgICBKU09OOjpWYWx1ZTo6Y3JlYXRlKHRhYklj
b25VUkwuc3RyaW5nKCkpLAotICAgICAgICBKU09OOjpWYWx1ZTo6Y3JlYXRlKHNvdXJjZVVSTC5z
dHJpbmcoKSksCisgICAgICAgIEpTT046OlZhbHVlOjpjcmVhdGUodGFiSWNvblVSTCksCisgICAg
ICAgIEpTT046OlZhbHVlOjpjcmVhdGUoc291cmNlVVJMKSwKICAgICB9OwogICAgIG1fZnJvbnRl
bmRDbGllbnQtPmZyb250ZW5kQVBJRGlzcGF0Y2hlcigpLmRpc3BhdGNoQ29tbWFuZFdpdGhSZXN1
bHRBc3luYygiY3JlYXRlVGFiRm9yRXh0ZW5zaW9uIl9zLCBXVEZNb3ZlKGFyZ3VtZW50cyksIFt3
ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo
Y29tcGxldGlvbkhhbmRsZXIpXShJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXI6OkV2YWx1
YXRpb25SZXN1bHQmJiByZXN1bHQpIG11dGFibGUgewogICAgICAgICBpZiAoIXdlYWtUaGlzIHx8
ICFyZXN1bHQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0
b3IvV2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlci5oCmlu
ZGV4IGJkMDdhMTA0YTIzOTI1NDIyZWZlOWExNTQxNzI2OGE3NDgxMzAxOTYuLmYzY2EzMzIyNjA0
NTUwZThkOTMzOTIwMTJkODA4OGQ0NGRjY2VjOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyLmgK
KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSUV4
dGVuc2lvbkNvbnRyb2xsZXIuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAgICAgLy8gV2Vi
SW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyIElQQyBtZXNzYWdlcy4KICAgICB2b2lkIHJl
Z2lzdGVyRXh0ZW5zaW9uKGNvbnN0IEluc3BlY3Rvcjo6RXh0ZW5zaW9uSUQmLCBjb25zdCBTdHJp
bmcmIGV4dGVuc2lvbkJ1bmRsZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUs
IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8dm9pZCwgSW5zcGVjdG9yOjpFeHRlbnNp
b25FcnJvcj4pPiYmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJFeHRlbnNpb24oY29uc3QgSW5zcGVj
dG9yOjpFeHRlbnNpb25JRCYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoRXhwZWN0ZWQ8dm9pZCwg
SW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4pPiYmKTsKLSAgICB2b2lkIGNyZWF0ZVRhYkZvckV4
dGVuc2lvbihjb25zdCBJbnNwZWN0b3I6OkV4dGVuc2lvbklEJiwgY29uc3QgU3RyaW5nJiB0YWJO
YW1lLCBjb25zdCBVUkwmIHRhYkljb25VUkwsIGNvbnN0IFVSTCYgc291cmNlVVJMLCBDb21wbGV0
aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPEluc3BlY3Rvcjo6RXh0ZW5zaW9uVGFiSUQsIEluc3Bl
Y3Rvcjo6RXh0ZW5zaW9uRXJyb3I+KT4mJik7CisgICAgdm9pZCBjcmVhdGVUYWJGb3JFeHRlbnNp
b24oY29uc3QgSW5zcGVjdG9yOjpFeHRlbnNpb25JRCYsIGNvbnN0IFN0cmluZyYgdGFiTmFtZSwg
Y29uc3QgU3RyaW5nJiB0YWJJY29uVVJMLCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgQ29tcGxl
dGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxJbnNwZWN0b3I6OkV4dGVuc2lvblRhYklELCBJbnNw
ZWN0b3I6OkV4dGVuc2lvbkVycm9yPik+JiYpOwogICAgIHZvaWQgZXZhbHVhdGVTY3JpcHRGb3JF
eHRlbnNpb24oY29uc3QgSW5zcGVjdG9yOjpFeHRlbnNpb25JRCYsIGNvbnN0IFN0cmluZyYgc2Ny
aXB0U291cmNlLCBjb25zdCBzdGQ6Om9wdGlvbmFsPFVSTD4mIGZyYW1lVVJMLCBjb25zdCBzdGQ6
Om9wdGlvbmFsPFVSTD4mIGNvbnRleHRTZWN1cml0eU9yaWdpbiwgY29uc3Qgc3RkOjpvcHRpb25h
bDxib29sPiYgdXNlQ29udGVudFNjcmlwdENvbnRleHQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo
Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3Qgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpF
eGNlcHRpb25EZXRhaWxzPiYsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8SW5zcGVjdG9yOjpFeHRlbnNp
b25FcnJvcj4mKT4mJik7CiAgICAgdm9pZCByZWxvYWRGb3JFeHRlbnNpb24oY29uc3QgSW5zcGVj
dG9yOjpFeHRlbnNpb25JRCYsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIGlnbm9yZUNhY2hl
LCBjb25zdCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4mIHVzZXJBZ2VudCwgY29uc3Qgc3RkOjpvcHRp
b25hbDxTdHJpbmc+JiBpbmplY3RlZFNjcmlwdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25z
dCBzdGQ6Om9wdGlvbmFsPEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+Jik+JiYpOwogICAgIHZv
aWQgc2hvd0V4dGVuc2lvblRhYihjb25zdCBJbnNwZWN0b3I6OkV4dGVuc2lvblRhYklEJiwgQ29t
cGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDx2b2lkLCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVy
cm9yPik+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luc3BlY3Rv
ci9XZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJv
bGxlci5tZXNzYWdlcy5pbgppbmRleCBlNDg3MmM0N2U3YjYxYjk3ZjA4YjBhOThiMjEzZDYzZDkz
YjA3NzFmLi43NDU0NjI1MWExMjc4Njk5MmI3OGIxNGE4OGMzM2YyZTJlOTQwOWM0IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0
ZW5zaW9uQ29udHJvbGxlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlci5tZXNzYWdlcy5p
bgpAQCAtMjYsNyArMjYsNyBAQCBtZXNzYWdlcyAtPiBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNv
bnRyb2xsZXIgTm90UmVmQ291bnRlZCB7CiAgICAgUmVnaXN0ZXJFeHRlbnNpb24oU3RyaW5nIGV4
dGVuc2lvbklELCBTdHJpbmcgZXh0ZW5zaW9uQnVuZGxlSWRlbnRpZmllciwgU3RyaW5nIGRpc3Bs
YXlOYW1lKSAtPiAoRXhwZWN0ZWQ8dm9pZCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4gcmVz
dWx0KSBBc3luYwogICAgIFVucmVnaXN0ZXJFeHRlbnNpb24oU3RyaW5nIGV4dGVuc2lvbklEKSAt
PiAoRXhwZWN0ZWQ8dm9pZCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4gcmVzdWx0KSBBc3lu
YwogCi0gICAgQ3JlYXRlVGFiRm9yRXh0ZW5zaW9uKFN0cmluZyBleHRlbnNpb25JRCwgU3RyaW5n
IHRhYk5hbWUsIFVSTCB0YWJJY29uVVJMLCBVUkwgc291cmNlVVJMKSAtPiAoRXhwZWN0ZWQ8U3Ry
aW5nLCBJbnNwZWN0b3I6OkV4dGVuc2lvbkVycm9yPiByZXN1bHQpIEFzeW5jCisgICAgQ3JlYXRl
VGFiRm9yRXh0ZW5zaW9uKFN0cmluZyBleHRlbnNpb25JRCwgU3RyaW5nIHRhYk5hbWUsIFN0cmlu
ZyB0YWJJY29uVVJMLCBTdHJpbmcgc291cmNlVVJMKSAtPiAoRXhwZWN0ZWQ8U3RyaW5nLCBJbnNw
ZWN0b3I6OkV4dGVuc2lvbkVycm9yPiByZXN1bHQpIEFzeW5jCiAgICAgRXZhbHVhdGVTY3JpcHRG
b3JFeHRlbnNpb24oU3RyaW5nIGV4dGVuc2lvbklELCBTdHJpbmcgc2NyaXB0U291cmNlLCBzdGQ6
Om9wdGlvbmFsPFVSTD4gZnJhbWVVUkwsIHN0ZDo6b3B0aW9uYWw8VVJMPiBjb250ZXh0U2VjdXJp
dHlPcmlnaW4sIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gdXNlQ29udGVudFNjcmlwdENvbnRleHQpIC0+
IChJUEM6OkRhdGFSZWZlcmVuY2UgcmVzdWx0RGF0YSwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpF
eGNlcHRpb25EZXRhaWxzPiBkZXRhaWxzLCBzdGQ6Om9wdGlvbmFsPEluc3BlY3Rvcjo6RXh0ZW5z
aW9uRXJyb3I+IGVycm9yKSBBc3luYwogICAgIFJlbG9hZEZvckV4dGVuc2lvbihTdHJpbmcgZXh0
ZW5zaW9uSUQsIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gaWdub3JlQ2FjaGUsIHN0ZDo6b3B0aW9uYWw8
U3RyaW5nPiB1c2VyQWdlbnQsIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBpbmplY3RlZFNjcmlwdCkg
LT4gKHN0ZDo6b3B0aW9uYWw8SW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4gZXJyb3IpIEFzeW5j
CiAgICAgU2hvd0V4dGVuc2lvblRhYihTdHJpbmcgZXh0ZW5zaW9uVGFiSWRlbnRpZmllcikgLT4g
KEV4cGVjdGVkPHZvaWQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+IHJlc3VsdCkgQXN5bmMK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>448802</attachid>
            <date>2022-01-10 14:41:00 -0800</date>
            <delta_ts>2022-01-11 13:58:26 -0800</delta_ts>
            <desc>Patch v1.1</desc>
            <filename>bug-235045-20220110144100.patch</filename>
            <type>text/plain</type>
            <size>2243</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA2NDBlODdjZmYwZTBlMTk3
YWJlOTFiZmY3YWJhY2RiZTZkMWViY2MuLjY0NGM5ZmQzNWUwMjE1NWQ4MmQ3ZWU5NGQwNmYzZTk4
OGU2NzllYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDEtMTAgIEJKIEJ1cmcg
IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBJbnNwZWN0b3IgRXh0ZW5zaW9u
czogdGFiSWNvblVSTHMgd2l0aCBjdXN0b20gc2NoZW1lIFVSTHMgYXJlIGluY29ycmVjdGx5IGxv
YWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1
MDQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzM1NzAyNz4KKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL
SW5zcGVjdG9yRXh0ZW5zaW9uLm1tOgorICAgICAgICAoLVtfV0tJbnNwZWN0b3JFeHRlbnNpb24g
Y3JlYXRlVGFiV2l0aE5hbWU6dGFiSWNvblVSTDpzb3VyY2VVUkw6Y29tcGxldGlvbkhhbmRsZXI6
XSk6CisgICAgICAgIENvbnN0cnVjdCBhIFdURjo6VVJMIGZyb20gdGhlIC5iYXNlVVJMIGFuZCB0
aGUgLnJlbGF0aXZlUGF0aCBvZiB0aGUgTlNVUkwuCisKIDIwMjItMDEtMTAgIEFsZXggQ2hyaXN0
ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBTdGFydCB1c2luZyBD
KysyMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0lu
c3BlY3RvckV4dGVuc2lvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f
V0tJbnNwZWN0b3JFeHRlbnNpb24ubW0KaW5kZXggNTgwZTcxOGRkMTY4YTAxOTUwMjQ4NTJkNDBj
YzQ1YzJjMTgyNjcxMi4uZDg0NjVhMWE1MGQzOWFiMDQzYTM2OGQ0OGVmMmYwOTQwZDQyNzQ0NiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0luc3BlY3Rv
ckV4dGVuc2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL
SW5zcGVjdG9yRXh0ZW5zaW9uLm1tCkBAIC03Miw3ICs3Miw3IEBAIC0gKHZvaWQpc2V0RGVsZWdh
dGU6KGlkPF9XS0luc3BlY3RvckV4dGVuc2lvbkRlbGVnYXRlPilkZWxlZ2F0ZQogCiAtICh2b2lk
KWNyZWF0ZVRhYldpdGhOYW1lOihOU1N0cmluZyAqKXRhYk5hbWUgdGFiSWNvblVSTDooTlNVUkwg
Kil0YWJJY29uVVJMIHNvdXJjZVVSTDooTlNVUkwgKilzb3VyY2VVUkwgY29tcGxldGlvbkhhbmRs
ZXI6KHZvaWQoXikoTlNFcnJvciAqLCBOU1N0cmluZyAqKSljb21wbGV0aW9uSGFuZGxlcgogewot
ICAgIF9leHRlbnNpb24tPmNyZWF0ZVRhYih0YWJOYW1lLCB0YWJJY29uVVJMLCBzb3VyY2VVUkws
IFtwcm90ZWN0ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpLCBjYXB0dXJlZEJsb2NrID0gbWFrZUJs
b2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKEV4cGVjdGVkPEluc3BlY3Rvcjo6RXh0ZW5zaW9u
VGFiSUQsIEluc3BlY3Rvcjo6RXh0ZW5zaW9uRXJyb3I+IHJlc3VsdCkgbXV0YWJsZSB7CisgICAg
X2V4dGVuc2lvbi0+Y3JlYXRlVGFiKHRhYk5hbWUsIHsgdGFiSWNvblVSTC5iYXNlVVJMLCB0YWJJ
Y29uVVJMLnJlbGF0aXZlU3RyaW5nIH0sIHsgdGFiSWNvblVSTC5iYXNlVVJMLCBzb3VyY2VVUkwu
cmVsYXRpdmVTdHJpbmcgfSwgW3Byb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIGNhcHR1
cmVkQmxvY2sgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpXSAoRXhwZWN0ZWQ8SW5z
cGVjdG9yOjpFeHRlbnNpb25UYWJJRCwgSW5zcGVjdG9yOjpFeHRlbnNpb25FcnJvcj4gcmVzdWx0
KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgICAgIGNhcHR1cmVk
QmxvY2soW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29kZTpXS0Vycm9y
VW5rbm93biB1c2VySW5mbzpAeyBOU0xvY2FsaXplZEZhaWx1cmVSZWFzb25FcnJvcktleTogSW5z
cGVjdG9yOjpleHRlbnNpb25FcnJvclRvU3RyaW5nKHJlc3VsdC5lcnJvcigpKX1dLCBuaWwpOwog
ICAgICAgICAgICAgcmV0dXJuOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>