<?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>237445</bug_id>
          
          <creation_ts>2022-03-03 13:56:21 -0800</creation_ts>
          <short_desc>[iOS] Books ASSERTs upon opening a book with a debug build of WebKit</short_desc>
          <delta_ts>2022-03-04 17:00:52 -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>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Myles C. Maxfield">mmaxfield</reporter>
          <assigned_to name="Myles C. Maxfield">mmaxfield</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>benjamin</cc>
    
    <cc>cdumez</cc>
    
    <cc>cgarcia</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>sihui_liu</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1848056</commentid>
    <comment_count>0</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-03 13:56:21 -0800</bug_when>
    <thetext>[iOS] Books crashes upon opening a book with a debug build of WebKit</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848058</commentid>
    <comment_count>1</comment_count>
      <attachid>453784</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-03 13:59:57 -0800</bug_when>
    <thetext>Created attachment 453784
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848061</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-03-03 14:08:05 -0800</bug_when>
    <thetext>&lt;rdar://problem/89776531&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848074</commentid>
    <comment_count>3</comment_count>
      <attachid>453784</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2022-03-03 14:53:25 -0800</bug_when>
    <thetext>Comment on attachment 453784
Patch

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

Please add a test.  Just call lookUpContentRuleListForIdentifier with @&quot;should-not-exist&quot; and wait for it to return an error.  That used to hit this assertion, right?

&gt; Source/WTF/ChangeLog:3
&gt; +        [iOS] Books crashes upon opening a book with a debug build of WebKit

I would say &quot;asserts&quot; instead of &quot;crashes&quot;

&gt; Source/WTF/wtf/FileSystem.cpp:446
&gt; +    std::optional&lt;FileSystem::MappedFileData&gt; mappedFileOptional;

This seems unnecessary.  Why not just add an early return if makeSafeToUseMemoryMapForPath returns false?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848090</commentid>
    <comment_count>4</comment_count>
      <attachid>453784</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-03 15:41:46 -0800</bug_when>
    <thetext>Comment on attachment 453784
Patch

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

&gt; Source/WTF/wtf/cocoa/FileSystemCocoa.mm:220
&gt; +    return !error &amp;&amp; success;

Can you add log to print error if it&apos;s not nil? 
What is the error Books gets? I wonder if there&apos;s other issue we should fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848148</commentid>
    <comment_count>5</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2022-03-03 18:39:52 -0800</bug_when>
    <thetext>Books gets this:
{Error Domain=NSPOSIXErrorDomain Code=2 &quot;No such file or directory&quot;}
Makes sense.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848348</commentid>
    <comment_count>6</comment_count>
      <attachid>453784</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-04 10:26:52 -0800</bug_when>
    <thetext>Comment on attachment 453784
Patch

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

&gt;&gt; Source/WTF/wtf/cocoa/FileSystemCocoa.mm:220
&gt;&gt; +    return !error &amp;&amp; success;
&gt; 
&gt; Can you add log to print error if it&apos;s not nil? 
&gt; What is the error Books gets? I wonder if there&apos;s other issue we should fix

Sure, I can add logging no problem.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848361</commentid>
    <comment_count>7</comment_count>
      <attachid>453860</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-04 11:42:33 -0800</bug_when>
    <thetext>Created attachment 453860
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848363</commentid>
    <comment_count>8</comment_count>
      <attachid>453862</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-04 11:45:33 -0800</bug_when>
    <thetext>Created attachment 453862
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848424</commentid>
    <comment_count>9</comment_count>
      <attachid>453875</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-04 15:01:18 -0800</bug_when>
    <thetext>Created attachment 453875
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848432</commentid>
    <comment_count>10</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2022-03-04 15:08:31 -0800</bug_when>
    <thetext>Committed r290850 (248083@trunk): &lt;https://commits.webkit.org/248083@trunk&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453784</attachid>
            <date>2022-03-03 13:59:57 -0800</date>
            <delta_ts>2022-03-03 14:53:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237445-20220303135956.patch</filename>
            <type>text/plain</type>
            <size>9382</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRkZmIwNDkwNGFjOGIyZWEwYTllYmM3
ZDVkZjUyMjIyYTgyMjhjNTAuLjMwMTkxY2VhZjE2OWVlYzJmOTBlMzExYjlmZWUyZjZiOTAxNTE4
OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMDMgIE15bGVzIEMuIE1heGZpZWxkICA8
bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBCb29rcyBjcmFzaGVzIHVwb24g
b3BlbmluZyBhIGJvb2sgd2l0aCBhIGRlYnVnIGJ1aWxkIG9mIFdlYktpdAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDQ1CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbWFrZVNhZmVUb1VzZU1lbW9yeU1h
cEZvclBhdGgoKSBydW5zIGFuIEFTU0VSVCgpIHRoYXQgaXQgd2FzIHN1Y2Nlc3NmdWwuCisgICAg
ICAgIEhvd2V2ZXIsIGl0J3Mgbm90IGFsd2F5cyBzdWNjZXNzZnVsLCBzbyB0aGlzIEFTU0VSVCgp
IHdhcyBnZXR0aW5nIGhpdCB3aGVuCisgICAgICAgIHRyeWluZyB0byBvcGVuIGEgYm9vayBpbiBC
b29rcy4gU28sIHRoaXMgcGF0Y2ggbWFrZXMgdGhlIGZ1bmN0aW9uIHJldHVybiBhCisgICAgICAg
IGJvb2wgdG8gaW5kaWNhdGUgc3VjY2VzcywgYW5kIHVwZGF0ZXMgY2FsbGVycyB0byBkbyBzb21l
dGhpbmcgc2Vuc2libGUgaWYKKyAgICAgICAgaXQgZmFpbGVkLgorCisgICAgICAgICogd3RmL0Zp
bGVTeXN0ZW0uY3BwOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFrZVNhZmVUb1Vz
ZU1lbW9yeU1hcEZvclBhdGgpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFwVG9G
aWxlKToKKyAgICAgICAgKiB3dGYvRmlsZVN5c3RlbS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9G
aWxlU3lzdGVtQ29jb2EubW06CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjptYWtlU2Fm
ZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCk6CisKIDIwMjItMDMtMDIgIEFsZXggQ2hyaXN0ZW5zZW4g
IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgU1BJIF9XS0RhdGFUYXNr
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cKaW5kZXggMDA2YTAzODQ2ZTU0ZjY0YjdhNjZmZWY3MDQ1NWY2NDk3YjhlMGQ0Yy4u
ZTM3NWZmZmZjYmJlYzIxYzUyYWJiNjRmZjcyZTFjYjVjNDUxYzE0OSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDEzIEBACisyMDIyLTAzLTAzICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh
cHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQm9va3MgY3Jhc2hlcyB1cG9uIG9wZW5pbmcgYSBi
b29rIHdpdGggYSBkZWJ1ZyBidWlsZCBvZiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlOjpvcGVuKToKKwogMjAyMi0wMy0w
MiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T
XSBDb3B5IGNvbnRleHQgbWVudSBhY3Rpb24gc2hvdWxkIGJlIHRpdGxlZCAiQ29weSBMaW5rIiB3
aGVuIGxvbmcgcHJlc3NpbmcgYSBub24taW1hZ2UgbGluawpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAyY2QwMDljNmNm
NGNmMTg2YzI5MGQ4MmY5ZWY2Y2IzMjAyOGJjZmQ1Li5lZDA5NjkwZGY4NzM0YTg1OWQ3OWU5ZjI1
N2I0OTNiZmZlZThkNDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAzLTAzICBN
eWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10g
Qm9va3MgY3Jhc2hlcyB1cG9uIG9wZW5pbmcgYSBib29rIHdpdGggYSBkZWJ1ZyBidWlsZCBvZiBX
ZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz
NzQ0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlQmxvYlN0b3JhZ2UuY3BwOgorICAgICAg
ICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkJsb2JTdG9yYWdlOjphZGQpOgorICAgICAgICAqIFVJ
UHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwOgorICAgICAgICAoQVBJOjpv
cGVuQW5kTWFwQ29udGVudFJ1bGVMaXN0KToKKyAgICAgICAgKEFQSTo6Y29tcGlsZWRUb0ZpbGUp
OgorCiAyMDIyLTAzLTAyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAog
ICAgICAgICBbaU9TXSBTZWF0YmVsdCBzYW5kYm94IHByb2ZpbGUgZW50aXRsZW1lbnQgaXMgZGVw
cmVjYXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5jcHAgYi9Tb3Vy
Y2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcAppbmRleCAzODgzYWMyNjYzZDBhMjAyMzJjYjVlMDli
NGU0NTk2OGIwMDE2N2I5Li5lMmM4MGY4YzQ2MGY3NmYzZGZkM2JhMzk2YmE1ZjgzNGY0OGI2YjUw
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcAorKysgYi9Tb3VyY2Uv
V1RGL3d0Zi9GaWxlU3lzdGVtLmNwcApAQCAtNDE0LDggKzQxNCw5IEBAIGJvb2wgaXNTYWZlVG9V
c2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAK
LXZvaWQgbWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJikKK2Jvb2wg
bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJikKIHsKKyAgICByZXR1
cm4gdHJ1ZTsKIH0KICNlbmRpZgogCkBAIC00NDIsMTMgKzQ0MywxNSBAQCBNYXBwZWRGaWxlRGF0
YSBtYXBUb0ZpbGUoY29uc3QgU3RyaW5nJiBwYXRoLCBzaXplX3QgYnl0ZXNTaXplLCBGdW5jdGlv
bjx2b2lkKGNvbgogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIEZpbGVTeXN0ZW06
Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHBhdGgpOwotICAgIGJvb2wgc3VjY2VzczsK
LSAgICBGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSBtYXBwZWRGaWxlKGhhbmRsZSwgRmlsZVN5
c3RlbTo6RmlsZU9wZW5Nb2RlOjpSZWFkV3JpdGUsIEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVNb2Rl
OjpTaGFyZWQsIHN1Y2Nlc3MpOworICAgIHN0ZDo6b3B0aW9uYWw8RmlsZVN5c3RlbTo6TWFwcGVk
RmlsZURhdGE+IG1hcHBlZEZpbGVPcHRpb25hbDsKKyAgICBib29sIHN1Y2Nlc3MgPSBGaWxlU3lz
dGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChwYXRoKTsKKyAgICBpZiAoc3VjY2Vz
cykKKyAgICAgICAgbWFwcGVkRmlsZU9wdGlvbmFsID0gRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURh
dGEoaGFuZGxlLCBGaWxlU3lzdGVtOjpGaWxlT3Blbk1vZGU6OlJlYWRXcml0ZSwgRmlsZVN5c3Rl
bTo6TWFwcGVkRmlsZU1vZGU6OlNoYXJlZCwgc3VjY2Vzcyk7CiAgICAgaWYgKCFzdWNjZXNzKSB7
CiAgICAgICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShoYW5kbGUpOwogICAgICAgICByZXR1cm4g
eyB9OwogICAgIH0KKyAgICBhdXRvIG1hcHBlZEZpbGUgPSBXVEZNb3ZlKCptYXBwZWRGaWxlT3B0
aW9uYWwpOwogCiAgICAgdm9pZCogbWFwID0gY29uc3RfY2FzdDx2b2lkKj4obWFwcGVkRmlsZS5k
YXRhKCkpOwogICAgIHVpbnQ4X3QqIG1hcERhdGEgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4obWFw
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uaCBiL1NvdXJjZS9XVEYv
d3RmL0ZpbGVTeXN0ZW0uaAppbmRleCBjZTY4MTI4NjBhMDBmOTAyZjI5OTgzZjQ4Y2IxY2ExZWQx
OGI5MDk3Li45ZDU4MDg2YTA4NzU3ZThiYjdiZGVjMTk5N2Y1MzNjMGYwZmI3MWE4IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmgKKysrIGIvU291cmNlL1dURi93dGYvRmls
ZVN5c3RlbS5oCkBAIC0yMTQsNyArMjE0LDcgQEAgV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgZGVs
ZXRlTm9uRW1wdHlEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiBXVEZfRVhQT1JUX1BSSVZBVEUg
U3RyaW5nIHJlYWxQYXRoKGNvbnN0IFN0cmluZyYpOwogCiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9v
bCBpc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJik7Ci1XVEZfRVhQT1JU
X1BSSVZBVEUgdm9pZCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChjb25zdCBTdHJpbmcm
KTsKK1dURl9FWFBPUlRfUFJJVkFURSBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBtYWtlU2FmZVRv
VXNlTWVtb3J5TWFwRm9yUGF0aChjb25zdCBTdHJpbmcmKTsKIAogY2xhc3MgTWFwcGVkRmlsZURh
dGEgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU
Ri93dGYvY29jb2EvRmlsZVN5c3RlbUNvY29hLm1tIGIvU291cmNlL1dURi93dGYvY29jb2EvRmls
ZVN5c3RlbUNvY29hLm1tCmluZGV4IDg1NmE4OTI5ODBlZDJhNDc3ZmI0NGVlNzYxN2U1YjNjZGY1
NjE4MDguLmFhY2E4ODBhNTRlYmUyMjkzYzU3NmM3OTIzZGJmY2QzODFhNjE2NWMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL0ZpbGVTeXN0ZW1Db2NvYS5tbQorKysgYi9Tb3VyY2Uv
V1RGL3d0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2EubW0KQEAgLTIxMCwxNSArMjEwLDE0IEBAIGJv
b2wgaXNTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKICAgICBy
ZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChjb25z
dCBTdHJpbmcmIHBhdGgpCitib29sIG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0
IFN0cmluZyYgcGF0aCkKIHsKICAgICBpZiAoaXNTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHBh
dGgpKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIAogICAgIE5T
RXJyb3IgKmVycm9yID0gbmlsOwogICAgIEJPT0wgc3VjY2VzcyA9IFtbTlNGaWxlTWFuYWdlciBk
ZWZhdWx0TWFuYWdlcl0gc2V0QXR0cmlidXRlczpAeyBOU0ZpbGVQcm90ZWN0aW9uS2V5OiBOU0Zp
bGVQcm90ZWN0aW9uQ29tcGxldGVVbmxlc3NPcGVuIH0gb2ZJdGVtQXRQYXRoOnBhdGggZXJyb3I6
JmVycm9yXTsKLSAgICBBU1NFUlQoIWVycm9yKTsKLSAgICBBU1NFUlRfVU5VU0VEKHN1Y2Nlc3Ms
IHN1Y2Nlc3MpOworICAgIHJldHVybiAhZXJyb3IgJiYgc3VjY2VzczsKIH0KICNlbmRpZgogCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3Bw
IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAppbmRleCAw
MThhNThlMTkxMzBjZmQ0ODkyZDNiYWU2ZGUxN2Y4NTgwMWNlYTJmLi43MDVhOTI1ZmFkNTYyYzZj
NmMwNDkzMDMxYjI2YWVjMDQ5MTNiM2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKQEAgLTE2MSw3ICsxNjEsMTEgQEAgYm9vbCBTUUxpdGVE
YXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBPcGVuTW9kZSBvcGVuTW9kZSkK
ICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMoc2htRmlsZU5hbWUpKSB7CiAgICAg
ICAgICAgICBpZiAoIUZpbGVTeXN0ZW06OmlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChzaG1G
aWxlTmFtZSkpIHsKICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChTUUxEYXRhYmFz
ZSwgIk9wZW5lZCBhbiBTUUxpdGUgZGF0YWJhc2Ugd2l0aCBhIENsYXNzIEEgLXNobSBmaWxlLiBU
aGlzIG1heSB0cmlnZ2VyIGEgY3Jhc2ggd2hlbiB0aGUgdXNlciBsb2NrcyB0aGUgZGV2aWNlLiAo
JXMpIiwgc2htRmlsZU5hbWUubGF0aW4xKCkuZGF0YSgpKTsKLSAgICAgICAgICAgICAgICBGaWxl
U3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChzaG1GaWxlTmFtZSk7CisgICAg
ICAgICAgICAgICAgaWYgKCFGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0
aChzaG1GaWxlTmFtZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZCBu
b3QgbWFrZSBTUUxpdGUgc2htIGZpbGUgc2FmZSBmb3IgbWVtb3J5IG1hcHBpbmciKTsKKyAgICAg
ICAgICAgICAgICAgICAgY2xvc2UoU2hvdWxkU2V0RXJyb3JTdGF0ZTo6Tm8pOworICAgICAgICAg
ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg
fQogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVCbG9iU3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l
dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcAppbmRleCA3MGY4
MzU4NDczZTljMTZlZWI3OWFmMzdkZjYwMTQ4ZDQ1MjY1ZDM4Li4yODVkNTlhNTYxNmIyOWM5NzAy
NDdkYWZiZWZmNmU1MzE3MmY2ZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ
cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcApAQCAt
OTYsMTIgKzk2LDEzIEBAIEJsb2JTdG9yYWdlOjpCbG9iIEJsb2JTdG9yYWdlOjphZGQoY29uc3Qg
U3RyaW5nJiBwYXRoLCBjb25zdCBEYXRhJiBkYXRhKQogCiAgICAgYm9vbCBibG9iRXhpc3RzID0g
RmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhibG9iUGF0aCk7CiAgICAgaWYgKGJsb2JFeGlzdHMpIHsK
LSAgICAgICAgRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoYmxvYlBh
dGgpOwotICAgICAgICBhdXRvIGV4aXN0aW5nRGF0YSA9IG1hcEZpbGUoYmxvYlBhdGgpOwotICAg
ICAgICBpZiAoYnl0ZXNFcXVhbChleGlzdGluZ0RhdGEsIGRhdGEpKSB7Ci0gICAgICAgICAgICBp
ZiAoIUZpbGVTeXN0ZW06OmhhcmRMaW5rKGJsb2JQYXRoLCBwYXRoKSkKLSAgICAgICAgICAgICAg
ICBXVEZMb2dBbHdheXMoIkZhaWxlZCB0byBjcmVhdGUgaGFyZCBsaW5rIGZyb20gJXMgdG8gJXMi
LCBibG9iUGF0aC51dGY4KCkuZGF0YSgpLCBwYXRoLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAg
ICAgcmV0dXJuIHsgZXhpc3RpbmdEYXRhLCBoYXNoIH07CisgICAgICAgIGlmIChGaWxlU3lzdGVt
OjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChibG9iUGF0aCkpIHsKKyAgICAgICAgICAg
IGF1dG8gZXhpc3RpbmdEYXRhID0gbWFwRmlsZShibG9iUGF0aCk7CisgICAgICAgICAgICBpZiAo
Ynl0ZXNFcXVhbChleGlzdGluZ0RhdGEsIGRhdGEpKSB7CisgICAgICAgICAgICAgICAgaWYgKCFG
aWxlU3lzdGVtOjpoYXJkTGluayhibG9iUGF0aCwgcGF0aCkpCisgICAgICAgICAgICAgICAgICAg
IFdURkxvZ0Fsd2F5cygiRmFpbGVkIHRvIGNyZWF0ZSBoYXJkIGxpbmsgZnJvbSAlcyB0byAlcyIs
IGJsb2JQYXRoLnV0ZjgoKS5kYXRhKCksIHBhdGgudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAg
ICAgICAgcmV0dXJuIHsgZXhpc3RpbmdEYXRhLCBoYXNoIH07CisgICAgICAgICAgICB9CiAgICAg
ICAgIH0KICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShibG9iUGF0aCk7CiAgICAgfQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlz
dFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxp
c3RTdG9yZS5jcHAKaW5kZXggYjJkODYxMjBkMDVjY2M2NGMyZDQ3ODAwZWNkMWE2MjQxNTZlMmQ4
MS4uYjkwMWQyM2UyMGZlMGE3ZjU2NTdiZmJhOWZmMjhlYTE3ZGI0MDZlZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcAor
KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUu
Y3BwCkBAIC0yMjksNyArMjI5LDggQEAgc3RydWN0IE1hcHBlZERhdGEgewogCiBzdGF0aWMgc3Rk
OjpvcHRpb25hbDxNYXBwZWREYXRhPiBvcGVuQW5kTWFwQ29udGVudFJ1bGVMaXN0KGNvbnN0IFdU
Rjo6U3RyaW5nJiBwYXRoKQogewotICAgIEZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlN
YXBGb3JQYXRoKHBhdGgpOworICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9y
eU1hcEZvclBhdGgocGF0aCkpCisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgV2Vi
S2l0OjpOZXR3b3JrQ2FjaGU6OkRhdGEgZmlsZURhdGEgPSBtYXBGaWxlKGZpbGVTeXN0ZW1SZXBy
ZXNlbnRhdGlvbihwYXRoKS5kYXRhKCkpOwogICAgIGlmIChmaWxlRGF0YS5pc051bGwoKSkKICAg
ICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKQEAgLTQwOCw3ICs0MDksOCBAQCBzdGF0aWMgRXhw
ZWN0ZWQ8TWFwcGVkRGF0YSwgc3RkOjplcnJvcl9jb2RlPiBjb21waWxlZFRvRmlsZShXVEY6OlN0
cmluZyYmIGpzb24sCiAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChDb250ZW50UnVsZUxp
c3RTdG9yZTo6RXJyb3I6OkNvbXBpbGVGYWlsZWQpOwogICAgIH0KICAgICAKLSAgICBGaWxlU3lz
dGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChmaW5hbEZpbGVQYXRoKTsKKyAgICBp
ZiAoIUZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGZpbmFsRmlsZVBh
dGgpKQorICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoQ29udGVudFJ1bGVMaXN0U3RvcmU6
OkVycm9yOjpDb21waWxlRmFpbGVkKTsKICAgICAKICAgICByZXR1cm4ge3sgV1RGTW92ZShtZXRh
RGF0YSksIFdURk1vdmUobWFwcGVkRGF0YSkgfX07CiB9Cg==
</data>
<flag name="review"
          id="481243"
          type_id="1"
          status="+"
          setter="achristensen"
    />
    <flag name="commit-queue"
          id="481250"
          type_id="3"
          status="-"
          setter="achristensen"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453860</attachid>
            <date>2022-03-04 11:42:33 -0800</date>
            <delta_ts>2022-03-04 11:43:03 -0800</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-237445-20220304114232.patch</filename>
            <type>text/plain</type>
            <size>8239</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVmYWM3ZDgwZGQxZWIzOGM5
NmQ0ZjIxZmZiNjY3NmFmMzRiZDI2OTkuLmE0NjMzOGQxZTI2ZDEzZjA3MDNjOGUzOTc3MzU0NDAy
YmYyNWU3MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDMtMDQgIE15bGVzIEMu
IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBCb29rcyBj
cmFzaGVzIHVwb24gb3BlbmluZyBhIGJvb2sgd2l0aCBhIGRlYnVnIGJ1aWxkIG9mIFdlYktpdAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDQ1CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICAqIE5ldHdv
cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6TmV0d29ya0NhY2hlOjpCbG9iU3RvcmFnZTo6YWRkKToKKyAgICAgICAgKiBVSVByb2Nl
c3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcDoKKyAgICAgICAgKEFQSTo6b3BlbkFu
ZE1hcENvbnRlbnRSdWxlTGlzdCk6CisgICAgICAgIChBUEk6OmNvbXBpbGVkVG9GaWxlKToKKwog
MjAyMi0wMy0wNCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAg
ICAgW2lPU10gSGFyZCBsaW5rIEFWUGljdHVyZUluUGljdHVyZUNvbnRyb2xsZXIKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwIGIvU291cmNlL1dURi93dGYvRmlsZVN5
c3RlbS5jcHAKaW5kZXggMzg4M2FjMjY2M2QwYTIwMjMyY2I1ZTA5YjRlNDU5NjhiMDAxNjdiOS4u
MGFiNTk4ZGIyNTRmZGQ4ODIwN2IzMjE0YWExYzA2OWU5MTA2MDM4NCAxMDA2NDQKLS0tIGEvU291
cmNlL1dURi93dGYvRmlsZVN5c3RlbS5jcHAKKysrIGIvU291cmNlL1dURi93dGYvRmlsZVN5c3Rl
bS5jcHAKQEAgLTQxNCw4ICs0MTQsOSBAQCBib29sIGlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0
aChjb25zdCBTdHJpbmcmKQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIG1ha2VTYWZlVG9V
c2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpCitib29sIG1ha2VTYWZlVG9Vc2VNZW1v
cnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpCiB7CisgICAgcmV0dXJuIHRydWU7CiB9CiAjZW5k
aWYKIApAQCAtNDQyLDcgKzQ0MywxMSBAQCBNYXBwZWRGaWxlRGF0YSBtYXBUb0ZpbGUoY29uc3Qg
U3RyaW5nJiBwYXRoLCBzaXplX3QgYnl0ZXNTaXplLCBGdW5jdGlvbjx2b2lkKGNvbgogICAgICAg
ICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIEZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1v
cnlNYXBGb3JQYXRoKHBhdGgpOworICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1l
bW9yeU1hcEZvclBhdGgocGF0aCkpIHsKKyAgICAgICAgRmlsZVN5c3RlbTo6Y2xvc2VGaWxlKGhh
bmRsZSk7CisgICAgICAgIHJldHVybiB7IH07CisgICAgfQorCiAgICAgYm9vbCBzdWNjZXNzOwog
ICAgIEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhIG1hcHBlZEZpbGUoaGFuZGxlLCBGaWxlU3lz
dGVtOjpGaWxlT3Blbk1vZGU6OlJlYWRXcml0ZSwgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZU1vZGU6
OlNoYXJlZCwgc3VjY2Vzcyk7CiAgICAgaWYgKCFzdWNjZXNzKSB7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmggYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmgKaW5k
ZXggY2U2ODEyODYwYTAwZjkwMmYyOTk4M2Y0OGNiMWNhMWVkMThiOTA5Ny4uOWQ1ODA4NmEwODc1
N2U4YmI3YmRlYzE5OTdmNTMzYzBmMGZiNzFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv
RmlsZVN5c3RlbS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uaApAQCAtMjE0LDcg
KzIxNCw3IEBAIFdURl9FWFBPUlRfUFJJVkFURSBib29sIGRlbGV0ZU5vbkVtcHR5RGlyZWN0b3J5
KGNvbnN0IFN0cmluZyYpOwogV1RGX0VYUE9SVF9QUklWQVRFIFN0cmluZyByZWFsUGF0aChjb25z
dCBTdHJpbmcmKTsKIAogV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNTYWZlVG9Vc2VNZW1vcnlN
YXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpOwotV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgbWFrZVNh
ZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJik7CitXVEZfRVhQT1JUX1BSSVZB
VEUgV0FSTl9VTlVTRURfUkVUVVJOIGJvb2wgbWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgo
Y29uc3QgU3RyaW5nJik7CiAKIGNsYXNzIE1hcHBlZEZpbGVEYXRhIHsKICAgICBXVEZfTUFLRV9G
QVNUX0FMTE9DQVRFRDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL0ZpbGVTeXN0
ZW1Db2NvYS5tbSBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL0ZpbGVTeXN0ZW1Db2NvYS5tbQppbmRl
eCA4NTZhODkyOTgwZWQyYTQ3N2ZiNDRlZTc2MTdlNWIzY2RmNTYxODA4Li4xYWRjZDI1M2YwMjcy
NGNmMzNjNjhkMGI1NzJiOWM4NGNkMWQ5NDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9j
b2NvYS9GaWxlU3lzdGVtQ29jb2EubW0KKysrIGIvU291cmNlL1dURi93dGYvY29jb2EvRmlsZVN5
c3RlbUNvY29hLm1tCkBAIC0yMTAsMTUgKzIxMCwxOCBAQCBib29sIGlzU2FmZVRvVXNlTWVtb3J5
TWFwRm9yUGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZv
aWQgbWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQorYm9v
bCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCiB7CiAg
ICAgaWYgKGlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChwYXRoKSkKLSAgICAgICAgcmV0dXJu
OworICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICBOU0Vycm9yICplcnJvciA9IG5pbDsK
ICAgICBCT09MIHN1Y2Nlc3MgPSBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHNldEF0
dHJpYnV0ZXM6QHsgTlNGaWxlUHJvdGVjdGlvbktleTogTlNGaWxlUHJvdGVjdGlvbkNvbXBsZXRl
VW5sZXNzT3BlbiB9IG9mSXRlbUF0UGF0aDpwYXRoIGVycm9yOiZlcnJvcl07Ci0gICAgQVNTRVJU
KCFlcnJvcik7Ci0gICAgQVNTRVJUX1VOVVNFRChzdWNjZXNzLCBzdWNjZXNzKTsKKyAgICBpZiAo
ZXJyb3IgfHwgIXN1Y2Nlc3MpIHsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJtYWtlU2FmZVRvVXNl
TWVtb3J5TWFwRm9yUGF0aCglcykgZmFpbGVkIHdpdGggZXJyb3IgJUAiLCBwYXRoLnV0ZjgoKS5k
YXRhKCksIGVycm9yKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4g
dHJ1ZTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9z
cWwvU1FMaXRlRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0
ZURhdGFiYXNlLmNwcAppbmRleCAyYzdhNDc4NWE0NjYwNGM5YzE5ZWQzNmU4ZjE1NGIwNzc3OTFl
MzA4Li4yNWVjNjYxNWIwZWMxZTkwOGQyN2JhMzE3ODg4OTkwYjMyZTJkZTdmIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKQEAgLTE2Myw3ICsx
NjMsOCBAQCBib29sIFNRTGl0ZURhdGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUs
IE9wZW5Nb2RlIG9wZW5Nb2RlKQogICAgICAgICBhdXRvIHNobUZpbGVOYW1lID0gbWFrZVN0cmlu
ZyhmaWxlbmFtZSwgIi1zaG0iX3MpOwogICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZUV4aXN0
cyhzaG1GaWxlTmFtZSkgJiYgIUZpbGVTeXN0ZW06OmlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0
aChzaG1GaWxlTmFtZSkpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKFNRTERhdGFi
YXNlLCAiT3BlbmVkIGFuIFNRTGl0ZSBkYXRhYmFzZSB3aXRoIGEgQ2xhc3MgQSAtc2htIGZpbGUu
IFRoaXMgbWF5IHRyaWdnZXIgYSBjcmFzaCB3aGVuIHRoZSB1c2VyIGxvY2tzIHRoZSBkZXZpY2Uu
ICglcykiLCBzaG1GaWxlTmFtZS5sYXRpbjEoKS5kYXRhKCkpOwotICAgICAgICAgICAgRmlsZVN5
c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoc2htRmlsZU5hbWUpOworICAgICAg
ICAgICAgaWYgKCFGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChzaG1G
aWxlTmFtZSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAg
fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv
cmtDYWNoZUJsb2JTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2Fj
aGUvTmV0d29ya0NhY2hlQmxvYlN0b3JhZ2UuY3BwCmluZGV4IDcwZjgzNTg0NzNlOWMxNmVlYjc5
YWYzN2RmNjAxNDhkNDUyNjVkMzguLjI4NWQ1OWE1NjE2YjI5Yzk3MDI0N2RhZmJlZmY2ZTUzMTcy
ZjZmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0
d29ya0NhY2hlQmxvYlN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvY2FjaGUvTmV0d29ya0NhY2hlQmxvYlN0b3JhZ2UuY3BwCkBAIC05NiwxMiArOTYsMTMgQEAg
QmxvYlN0b3JhZ2U6OkJsb2IgQmxvYlN0b3JhZ2U6OmFkZChjb25zdCBTdHJpbmcmIHBhdGgsIGNv
bnN0IERhdGEmIGRhdGEpCiAKICAgICBib29sIGJsb2JFeGlzdHMgPSBGaWxlU3lzdGVtOjpmaWxl
RXhpc3RzKGJsb2JQYXRoKTsKICAgICBpZiAoYmxvYkV4aXN0cykgewotICAgICAgICBGaWxlU3lz
dGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChibG9iUGF0aCk7Ci0gICAgICAgIGF1
dG8gZXhpc3RpbmdEYXRhID0gbWFwRmlsZShibG9iUGF0aCk7Ci0gICAgICAgIGlmIChieXRlc0Vx
dWFsKGV4aXN0aW5nRGF0YSwgZGF0YSkpIHsKLSAgICAgICAgICAgIGlmICghRmlsZVN5c3RlbTo6
aGFyZExpbmsoYmxvYlBhdGgsIHBhdGgpKQotICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygi
RmFpbGVkIHRvIGNyZWF0ZSBoYXJkIGxpbmsgZnJvbSAlcyB0byAlcyIsIGJsb2JQYXRoLnV0Zjgo
KS5kYXRhKCksIHBhdGgudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgICAgICByZXR1cm4geyBleGlz
dGluZ0RhdGEsIGhhc2ggfTsKKyAgICAgICAgaWYgKEZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VN
ZW1vcnlNYXBGb3JQYXRoKGJsb2JQYXRoKSkgeworICAgICAgICAgICAgYXV0byBleGlzdGluZ0Rh
dGEgPSBtYXBGaWxlKGJsb2JQYXRoKTsKKyAgICAgICAgICAgIGlmIChieXRlc0VxdWFsKGV4aXN0
aW5nRGF0YSwgZGF0YSkpIHsKKyAgICAgICAgICAgICAgICBpZiAoIUZpbGVTeXN0ZW06OmhhcmRM
aW5rKGJsb2JQYXRoLCBwYXRoKSkKKyAgICAgICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJG
YWlsZWQgdG8gY3JlYXRlIGhhcmQgbGluayBmcm9tICVzIHRvICVzIiwgYmxvYlBhdGgudXRmOCgp
LmRhdGEoKSwgcGF0aC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4geyBl
eGlzdGluZ0RhdGEsIGhhc2ggfTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBG
aWxlU3lzdGVtOjpkZWxldGVGaWxlKGJsb2JQYXRoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcAppbmRl
eCBiMmQ4NjEyMGQwNWNjYzY0YzJkNDc4MDBlY2QxYTYyNDE1NmUyZDgxLi5iOTAxZDIzZTIwZmUw
YTdmNTY1N2JmYmE5ZmYyOGVhMTdkYjQwNmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RTdG9yZS5jcHAKQEAgLTIyOSw3ICsy
MjksOCBAQCBzdHJ1Y3QgTWFwcGVkRGF0YSB7CiAKIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPE1hcHBl
ZERhdGE+IG9wZW5BbmRNYXBDb250ZW50UnVsZUxpc3QoY29uc3QgV1RGOjpTdHJpbmcmIHBhdGgp
CiB7Ci0gICAgRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgocGF0aCk7
CisgICAgaWYgKCFGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChwYXRo
KSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICBXZWJLaXQ6Ok5ldHdvcmtDYWNo
ZTo6RGF0YSBmaWxlRGF0YSA9IG1hcEZpbGUoZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGgp
LmRhdGEoKSk7CiAgICAgaWYgKGZpbGVEYXRhLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gc3Rk
OjpudWxsb3B0OwpAQCAtNDA4LDcgKzQwOSw4IEBAIHN0YXRpYyBFeHBlY3RlZDxNYXBwZWREYXRh
LCBzdGQ6OmVycm9yX2NvZGU+IGNvbXBpbGVkVG9GaWxlKFdURjo6U3RyaW5nJiYganNvbiwKICAg
ICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRlbnRSdWxlTGlzdFN0b3JlOjpFcnJvcjo6
Q29tcGlsZUZhaWxlZCk7CiAgICAgfQogICAgIAotICAgIEZpbGVTeXN0ZW06Om1ha2VTYWZlVG9V
c2VNZW1vcnlNYXBGb3JQYXRoKGZpbmFsRmlsZVBhdGgpOworICAgIGlmICghRmlsZVN5c3RlbTo6
bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoZmluYWxGaWxlUGF0aCkpCisgICAgICAgIHJl
dHVybiBtYWtlVW5leHBlY3RlZChDb250ZW50UnVsZUxpc3RTdG9yZTo6RXJyb3I6OkNvbXBpbGVG
YWlsZWQpOwogICAgIAogICAgIHJldHVybiB7eyBXVEZNb3ZlKG1ldGFEYXRhKSwgV1RGTW92ZSht
YXBwZWREYXRhKSB9fTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv
V1RGL0ZpbGVTeXN0ZW0uY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5
c3RlbS5jcHAKaW5kZXggODZlNWE0YjNmNjM4YTM4ZjBmMThjYTEyZDY2ZDUyOTEwMDJlMzI4NC4u
M2I3ZGQxMjU4MWU3YzAwMThhYjM3MjYyMjY2MGQ2ZmU1YWJiN2RmNyAxMDA2NDQKLS0tIGEvVG9v
bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKKysrIGIvVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKQEAgLTEsNiArMSw2IEBACiAvKgog
ICogQ29weXJpZ2h0IChDKSAyMDE1IENhbm9uIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAq
IENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD
b3B5cmlnaHQgKEMpIDIwMTctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg
KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg
d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg
dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgzMiw0ICs4MzIsMTUgQEAgVEVTVF9G
KEZpbGVTeXN0ZW1UZXN0LCByZWFkRW50aXJlRmlsZSkKICAgICBFWFBFQ1RfU1RSRVEoY29udGVu
dHMudXRmOCgpLmRhdGEoKSwgRmlsZVN5c3RlbVRlc3REYXRhKTsKIH0KIAorVEVTVF9GKEZpbGVT
eXN0ZW1UZXN0LCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCkKK3sKKyAgICBFWFBFQ1Rf
VFJVRShGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCh0ZW1wRmlsZVBh
dGgoKSkpOworICAgIGF1dG8gcmVzdWx0ID0gRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9y
eU1hcEZvclBhdGgoU3RyaW5nKCJUaGlzaXNub3RhcmVhbGZpbGUiLCBTdHJpbmc6OkNvbnN0cnVj
dEZyb21MaXRlcmFsKSk7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBFWFBFQ1RfRkFM
U0UocmVzdWx0KTsKKyNlbHNlCisgICAgRVhQRUNUX1RSVUUocmVzdWx0KTsKKyNlbmRpZgorfQor
CiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453862</attachid>
            <date>2022-03-04 11:45:33 -0800</date>
            <delta_ts>2022-03-04 14:58:36 -0800</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-237445-20220304114533.patch</filename>
            <type>text/plain</type>
            <size>10990</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRkZmIwNDkwNGFjOGIyZWEwYTllYmM3
ZDVkZjUyMjIyYTgyMjhjNTAuLjdlOTY3ODM2ZWQxYzBhNDUwNmYzODgxNzA4MzdiMDIxMjkxMmE3
MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDMtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8
bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBCb29rcyBBU1NFUlRzIHVwb24g
b3BlbmluZyBhIGJvb2sgd2l0aCBhIGRlYnVnIGJ1aWxkIG9mIFdlYktpdAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDQ1CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS84OTc3NjUzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVu
c2VuLgorCisgICAgICAgIG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKCkgcnVucyBhbiBB
U1NFUlQoKSB0aGF0IGl0IHdhcyBzdWNjZXNzZnVsLgorICAgICAgICBIb3dldmVyLCBpdCdzIG5v
dCBhbHdheXMgc3VjY2Vzc2Z1bCwgc28gdGhpcyBBU1NFUlQoKSB3YXMgZ2V0dGluZyBoaXQgd2hl
bgorICAgICAgICB0cnlpbmcgdG8gb3BlbiBhIGJvb2sgaW4gQm9va3MuIFNvLCB0aGlzIHBhdGNo
IG1ha2VzIHRoZSBmdW5jdGlvbiByZXR1cm4gYQorICAgICAgICBib29sIHRvIGluZGljYXRlIHN1
Y2Nlc3MsIGFuZCB1cGRhdGVzIGNhbGxlcnMgdG8gZG8gc29tZXRoaW5nIHNlbnNpYmxlIGlmCisg
ICAgICAgIGl0IGZhaWxlZC4KKworICAgICAgICBUZXN0OiBGaWxlU3lzdGVtVGVzdC5tYWtlU2Fm
ZVRvVXNlTWVtb3J5TWFwRm9yUGF0aAorCisgICAgICAgICogd3RmL0ZpbGVTeXN0ZW0uY3BwOgor
ICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBh
dGgpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFwVG9GaWxlKToKKyAgICAgICAg
KiB3dGYvRmlsZVN5c3RlbS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2Eu
bW06CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFw
Rm9yUGF0aCk6CisKIDIwMjItMDMtMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A
d2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgU1BJIF9XS0RhdGFUYXNrCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
YmM0ODA0MzVhMTMxYTg4MTk3ZTIyYzNkZTdhZGQ4YjU5YmExYjUyMS4uZjI5NTI5OTczNmExY2Uy
ZGVmMmM1ZTliZTE4YTkwZWE3ZmM0YzViZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIyLTAzLTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAg
ICAgICAgW2lPU10gQm9va3MgQVNTRVJUcyB1cG9uIG9wZW5pbmcgYSBib29rIHdpdGggYSBkZWJ1
ZyBidWlsZCBvZiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIzNzQ0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODk3NzY1MzE+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICAqIHBsYXRmb3Jt
L3NxbC9TUUxpdGVEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVEYXRhYmFz
ZTo6b3Blbik6CisKIDIwMjItMDMtMDQgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+
CiAKICAgICAgICAgSURCIHNlcmlhbGl6YXRpb24gdGhyZWFkIHNob3VsZCBwYXNzIGlzb2xhdGVk
IGNvcHkgb2YgSW5kZXhJRFRvSW5kZXhLZXlNYXAgdG8gc3RvcmFnZSB0aHJlYWQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k
ZXggNWZhYzdkODBkZDFlYjM4Yzk2ZDRmMjFmZmI2Njc2YWYzNGJkMjY5OS4uYzY2YjIxMDZlZGUy
ZTk1MWQ1M2Q0YTMyMmVmYzM3OWNkNDRkZTJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAor
MjAyMi0wMy0wNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtpT1NdIEJvb2tzIEFTU0VSVHMgdXBvbiBvcGVuaW5nIGEgYm9vayB3aXRoIGEgZGVi
dWcgYnVpbGQgb2YgV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzc0NDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5Nzc2NTMxPgorCisg
ICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBOZXR3b3Jr
UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVCbG9iU3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJL
aXQ6Ok5ldHdvcmtDYWNoZTo6QmxvYlN0b3JhZ2U6OmFkZCk6CisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9BUElDb250ZW50UnVsZUxpc3RTdG9yZS5jcHA6CisgICAgICAgIChBUEk6Om9wZW5BbmRN
YXBDb250ZW50UnVsZUxpc3QpOgorICAgICAgICAoQVBJOjpjb21waWxlZFRvRmlsZSk6CisKIDIw
MjItMDMtMDQgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAg
IFtpT1NdIEhhcmQgbGluayBBVlBpY3R1cmVJblBpY3R1cmVDb250cm9sbGVyCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0
ZW0uY3BwCmluZGV4IDM4ODNhYzI2NjNkMGEyMDIzMmNiNWUwOWI0ZTQ1OTY4YjAwMTY3YjkuLjBh
YjU5OGRiMjU0ZmRkODgyMDdiMzIxNGFhMWMwNjllOTEwNjAzODQgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0u
Y3BwCkBAIC00MTQsOCArNDE0LDkgQEAgYm9vbCBpc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgo
Y29uc3QgU3RyaW5nJikKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBtYWtlU2FmZVRvVXNl
TWVtb3J5TWFwRm9yUGF0aChjb25zdCBTdHJpbmcmKQorYm9vbCBtYWtlU2FmZVRvVXNlTWVtb3J5
TWFwRm9yUGF0aChjb25zdCBTdHJpbmcmKQogeworICAgIHJldHVybiB0cnVlOwogfQogI2VuZGlm
CiAKQEAgLTQ0Miw3ICs0NDMsMTEgQEAgTWFwcGVkRmlsZURhdGEgbWFwVG9GaWxlKGNvbnN0IFN0
cmluZyYgcGF0aCwgc2l6ZV90IGJ5dGVzU2l6ZSwgRnVuY3Rpb248dm9pZChjb24KICAgICAgICAg
cmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5
TWFwRm9yUGF0aChwYXRoKTsKKyAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1v
cnlNYXBGb3JQYXRoKHBhdGgpKSB7CisgICAgICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShoYW5k
bGUpOworICAgICAgICByZXR1cm4geyB9OworICAgIH0KKwogICAgIGJvb2wgc3VjY2VzczsKICAg
ICBGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0YSBtYXBwZWRGaWxlKGhhbmRsZSwgRmlsZVN5c3Rl
bTo6RmlsZU9wZW5Nb2RlOjpSZWFkV3JpdGUsIEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVNb2RlOjpT
aGFyZWQsIHN1Y2Nlc3MpOwogICAgIGlmICghc3VjY2VzcykgewpkaWZmIC0tZ2l0IGEvU291cmNl
L1dURi93dGYvRmlsZVN5c3RlbS5oIGIvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oCmluZGV4
IGNlNjgxMjg2MGEwMGY5MDJmMjk5ODNmNDhjYjFjYTFlZDE4YjkwOTcuLjlkNTgwODZhMDg3NTdl
OGJiN2JkZWMxOTk3ZjUzM2MwZjBmYjcxYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0Zp
bGVTeXN0ZW0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmgKQEAgLTIxNCw3ICsy
MTQsNyBAQCBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBkZWxldGVOb25FbXB0eURpcmVjdG9yeShj
b25zdCBTdHJpbmcmKTsKIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgcmVhbFBhdGgoY29uc3Qg
U3RyaW5nJik7CiAKIFdURl9FWFBPUlRfUFJJVkFURSBib29sIGlzU2FmZVRvVXNlTWVtb3J5TWFw
Rm9yUGF0aChjb25zdCBTdHJpbmcmKTsKLVdURl9FWFBPUlRfUFJJVkFURSB2b2lkIG1ha2VTYWZl
VG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpOworV1RGX0VYUE9SVF9QUklWQVRF
IFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNv
bnN0IFN0cmluZyYpOwogCiBjbGFzcyBNYXBwZWRGaWxlRGF0YSB7CiAgICAgV1RGX01BS0VfRkFT
VF9BTExPQ0FURUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9GaWxlU3lzdGVt
Q29jb2EubW0gYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2EubW0KaW5kZXgg
ODU2YTg5Mjk4MGVkMmE0NzdmYjQ0ZWU3NjE3ZTViM2NkZjU2MTgwOC4uMWFkY2QyNTNmMDI3MjRj
ZjMzYzY4ZDBiNTcyYjljODRjZDFkOTQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY29j
b2EvRmlsZVN5c3RlbUNvY29hLm1tCisrKyBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL0ZpbGVTeXN0
ZW1Db2NvYS5tbQpAQCAtMjEwLDE1ICsyMTAsMTggQEAgYm9vbCBpc1NhZmVUb1VzZU1lbW9yeU1h
cEZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lk
IG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKK2Jvb2wg
bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogewogICAg
IGlmIChpc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgocGF0aCkpCi0gICAgICAgIHJldHVybjsK
KyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7CiAg
ICAgQk9PTCBzdWNjZXNzID0gW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBzZXRBdHRy
aWJ1dGVzOkB7IE5TRmlsZVByb3RlY3Rpb25LZXk6IE5TRmlsZVByb3RlY3Rpb25Db21wbGV0ZVVu
bGVzc09wZW4gfSBvZkl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJyb3JdOwotICAgIEFTU0VSVCgh
ZXJyb3IpOwotICAgIEFTU0VSVF9VTlVTRUQoc3VjY2Vzcywgc3VjY2Vzcyk7CisgICAgaWYgKGVy
cm9yIHx8ICFzdWNjZXNzKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygibWFrZVNhZmVUb1VzZU1l
bW9yeU1hcEZvclBhdGgoJXMpIGZhaWxlZCB3aXRoIGVycm9yICVAIiwgcGF0aC51dGY4KCkuZGF0
YSgpLCBlcnJvcik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRy
dWU7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3Fs
L1NRTGl0ZURhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVE
YXRhYmFzZS5jcHAKaW5kZXggMmM3YTQ3ODVhNDY2MDRjOWMxOWVkMzZlOGYxNTRiMDc3NzkxZTMw
OC4uMjVlYzY2MTViMGVjMWU5MDhkMjdiYTMxNzg4ODk5MGIzMmUyZGU3ZiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCkBAIC0xNjMsNyArMTYz
LDggQEAgYm9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBP
cGVuTW9kZSBvcGVuTW9kZSkKICAgICAgICAgYXV0byBzaG1GaWxlTmFtZSA9IG1ha2VTdHJpbmco
ZmlsZW5hbWUsICItc2htIl9zKTsKICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMo
c2htRmlsZU5hbWUpICYmICFGaWxlU3lzdGVtOjppc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgo
c2htRmlsZU5hbWUpKSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChTUUxEYXRhYmFz
ZSwgIk9wZW5lZCBhbiBTUUxpdGUgZGF0YWJhc2Ugd2l0aCBhIENsYXNzIEEgLXNobSBmaWxlLiBU
aGlzIG1heSB0cmlnZ2VyIGEgY3Jhc2ggd2hlbiB0aGUgdXNlciBsb2NrcyB0aGUgZGV2aWNlLiAo
JXMpIiwgc2htRmlsZU5hbWUubGF0aW4xKCkuZGF0YSgpKTsKLSAgICAgICAgICAgIEZpbGVTeXN0
ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHNobUZpbGVOYW1lKTsKKyAgICAgICAg
ICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoc2htRmls
ZU5hbWUpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAgIH0K
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr
Q2FjaGVCbG9iU3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl
L05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcAppbmRleCA3MGY4MzU4NDczZTljMTZlZWI3OWFm
MzdkZjYwMTQ4ZDQ1MjY1ZDM4Li4yODVkNTlhNTYxNmIyOWM5NzAyNDdkYWZiZWZmNmU1MzE3MmY2
ZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv
cmtDYWNoZUJsb2JTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcApAQCAtOTYsMTIgKzk2LDEzIEBAIEJs
b2JTdG9yYWdlOjpCbG9iIEJsb2JTdG9yYWdlOjphZGQoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25z
dCBEYXRhJiBkYXRhKQogCiAgICAgYm9vbCBibG9iRXhpc3RzID0gRmlsZVN5c3RlbTo6ZmlsZUV4
aXN0cyhibG9iUGF0aCk7CiAgICAgaWYgKGJsb2JFeGlzdHMpIHsKLSAgICAgICAgRmlsZVN5c3Rl
bTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoYmxvYlBhdGgpOwotICAgICAgICBhdXRv
IGV4aXN0aW5nRGF0YSA9IG1hcEZpbGUoYmxvYlBhdGgpOwotICAgICAgICBpZiAoYnl0ZXNFcXVh
bChleGlzdGluZ0RhdGEsIGRhdGEpKSB7Ci0gICAgICAgICAgICBpZiAoIUZpbGVTeXN0ZW06Omhh
cmRMaW5rKGJsb2JQYXRoLCBwYXRoKSkKLSAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkZh
aWxlZCB0byBjcmVhdGUgaGFyZCBsaW5rIGZyb20gJXMgdG8gJXMiLCBibG9iUGF0aC51dGY4KCku
ZGF0YSgpLCBwYXRoLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgcmV0dXJuIHsgZXhpc3Rp
bmdEYXRhLCBoYXNoIH07CisgICAgICAgIGlmIChGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVt
b3J5TWFwRm9yUGF0aChibG9iUGF0aCkpIHsKKyAgICAgICAgICAgIGF1dG8gZXhpc3RpbmdEYXRh
ID0gbWFwRmlsZShibG9iUGF0aCk7CisgICAgICAgICAgICBpZiAoYnl0ZXNFcXVhbChleGlzdGlu
Z0RhdGEsIGRhdGEpKSB7CisgICAgICAgICAgICAgICAgaWYgKCFGaWxlU3lzdGVtOjpoYXJkTGlu
ayhibG9iUGF0aCwgcGF0aCkpCisgICAgICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRmFp
bGVkIHRvIGNyZWF0ZSBoYXJkIGxpbmsgZnJvbSAlcyB0byAlcyIsIGJsb2JQYXRoLnV0ZjgoKS5k
YXRhKCksIHBhdGgudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgZXhp
c3RpbmdEYXRhLCBoYXNoIH07CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgRmls
ZVN5c3RlbTo6ZGVsZXRlRmlsZShibG9iUGF0aCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcCBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RTdG9yZS5jcHAKaW5kZXgg
YjJkODYxMjBkMDVjY2M2NGMyZDQ3ODAwZWNkMWE2MjQxNTZlMmQ4MS4uYjkwMWQyM2UyMGZlMGE3
ZjU2NTdiZmJhOWZmMjhlYTE3ZGI0MDZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwCkBAIC0yMjksNyArMjI5
LDggQEAgc3RydWN0IE1hcHBlZERhdGEgewogCiBzdGF0aWMgc3RkOjpvcHRpb25hbDxNYXBwZWRE
YXRhPiBvcGVuQW5kTWFwQ29udGVudFJ1bGVMaXN0KGNvbnN0IFdURjo6U3RyaW5nJiBwYXRoKQog
ewotICAgIEZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHBhdGgpOwor
ICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgocGF0aCkp
CisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgV2ViS2l0OjpOZXR3b3JrQ2FjaGU6
OkRhdGEgZmlsZURhdGEgPSBtYXBGaWxlKGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihwYXRoKS5k
YXRhKCkpOwogICAgIGlmIChmaWxlRGF0YS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6
bnVsbG9wdDsKQEAgLTQwOCw3ICs0MDksOCBAQCBzdGF0aWMgRXhwZWN0ZWQ8TWFwcGVkRGF0YSwg
c3RkOjplcnJvcl9jb2RlPiBjb21waWxlZFRvRmlsZShXVEY6OlN0cmluZyYmIGpzb24sCiAgICAg
ICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChDb250ZW50UnVsZUxpc3RTdG9yZTo6RXJyb3I6OkNv
bXBpbGVGYWlsZWQpOwogICAgIH0KICAgICAKLSAgICBGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNl
TWVtb3J5TWFwRm9yUGF0aChmaW5hbEZpbGVQYXRoKTsKKyAgICBpZiAoIUZpbGVTeXN0ZW06Om1h
a2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGZpbmFsRmlsZVBhdGgpKQorICAgICAgICByZXR1
cm4gbWFrZVVuZXhwZWN0ZWQoQ29udGVudFJ1bGVMaXN0U3RvcmU6OkVycm9yOjpDb21waWxlRmFp
bGVkKTsKICAgICAKICAgICByZXR1cm4ge3sgV1RGTW92ZShtZXRhRGF0YSksIFdURk1vdmUobWFw
cGVkRGF0YSkgfX07CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu
Z2VMb2cKaW5kZXggMTAzODc2YmQ5ZThiOGY3NjViZTVhZDI0MGU2NjVjNmZhY2IxZTNjNS4uYjE0
NzU1NjQxZjY4NWI0YzdjNzE1NjdiYWRiNDI3ODA1YmY4YmNmNCAxMDA2NDQKLS0tIGEvVG9vbHMv
Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAz
LTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAg
W2lPU10gQm9va3MgQVNTRVJUcyB1cG9uIG9wZW5pbmcgYSBib29rIHdpdGggYSBkZWJ1ZyBidWls
ZCBvZiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTIzNzQ0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODk3NzY1MzE+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv
VGVzdHMvV1RGL0ZpbGVTeXN0ZW0uY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9G
KToKKwogMjAyMi0wMy0wNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAK
ICAgICAgICAgW2lPU10gVW5hYmxlIHRvIHNjcm9sbCB0byBhIGZvdW5kIHRleHQgcmFuZ2Ugd2hl
biB0aGVyZSBpcyBhbiBleGlzdGluZyBzZWxlY3Rpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX
ZWJLaXRBUEkvVGVzdHMvV1RGL0ZpbGVTeXN0ZW0uY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U
ZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKaW5kZXggODZlNWE0YjNmNjM4YTM4ZjBmMThjYTEyZDY2
ZDUyOTEwMDJlMzI4NC4uM2I3ZGQxMjU4MWU3YzAwMThhYjM3MjYyMjY2MGQ2ZmU1YWJiN2RmNyAx
MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAK
KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKQEAgLTEs
NiArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDE1IENhbm9uIEluYy4gQWxsIHJpZ2h0
cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMg
cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdo
dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k
IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt
aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgzMiw0ICs4
MzIsMTUgQEAgVEVTVF9GKEZpbGVTeXN0ZW1UZXN0LCByZWFkRW50aXJlRmlsZSkKICAgICBFWFBF
Q1RfU1RSRVEoY29udGVudHMudXRmOCgpLmRhdGEoKSwgRmlsZVN5c3RlbVRlc3REYXRhKTsKIH0K
IAorVEVTVF9GKEZpbGVTeXN0ZW1UZXN0LCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCkK
K3sKKyAgICBFWFBFQ1RfVFJVRShGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9y
UGF0aCh0ZW1wRmlsZVBhdGgoKSkpOworICAgIGF1dG8gcmVzdWx0ID0gRmlsZVN5c3RlbTo6bWFr
ZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoU3RyaW5nKCJUaGlzaXNub3RhcmVhbGZpbGUiLCBT
dHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK
KyAgICBFWFBFQ1RfRkFMU0UocmVzdWx0KTsKKyNlbHNlCisgICAgRVhQRUNUX1RSVUUocmVzdWx0
KTsKKyNlbmRpZgorfQorCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==
</data>
<flag name="commit-queue"
          id="481360"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453875</attachid>
            <date>2022-03-04 15:01:18 -0800</date>
            <delta_ts>2022-03-04 17:00:52 -0800</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-237445-20220304150117.patch</filename>
            <type>text/plain</type>
            <size>11081</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRkZmIwNDkwNGFjOGIyZWEwYTllYmM3
ZDVkZjUyMjIyYTgyMjhjNTAuLjdlOTY3ODM2ZWQxYzBhNDUwNmYzODgxNzA4MzdiMDIxMjkxMmE3
MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDMtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8
bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBCb29rcyBBU1NFUlRzIHVwb24g
b3BlbmluZyBhIGJvb2sgd2l0aCBhIGRlYnVnIGJ1aWxkIG9mIFdlYktpdAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDQ1CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS84OTc3NjUzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVu
c2VuLgorCisgICAgICAgIG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKCkgcnVucyBhbiBB
U1NFUlQoKSB0aGF0IGl0IHdhcyBzdWNjZXNzZnVsLgorICAgICAgICBIb3dldmVyLCBpdCdzIG5v
dCBhbHdheXMgc3VjY2Vzc2Z1bCwgc28gdGhpcyBBU1NFUlQoKSB3YXMgZ2V0dGluZyBoaXQgd2hl
bgorICAgICAgICB0cnlpbmcgdG8gb3BlbiBhIGJvb2sgaW4gQm9va3MuIFNvLCB0aGlzIHBhdGNo
IG1ha2VzIHRoZSBmdW5jdGlvbiByZXR1cm4gYQorICAgICAgICBib29sIHRvIGluZGljYXRlIHN1
Y2Nlc3MsIGFuZCB1cGRhdGVzIGNhbGxlcnMgdG8gZG8gc29tZXRoaW5nIHNlbnNpYmxlIGlmCisg
ICAgICAgIGl0IGZhaWxlZC4KKworICAgICAgICBUZXN0OiBGaWxlU3lzdGVtVGVzdC5tYWtlU2Fm
ZVRvVXNlTWVtb3J5TWFwRm9yUGF0aAorCisgICAgICAgICogd3RmL0ZpbGVTeXN0ZW0uY3BwOgor
ICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBh
dGgpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFwVG9GaWxlKToKKyAgICAgICAg
KiB3dGYvRmlsZVN5c3RlbS5oOgorICAgICAgICAqIHd0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2Eu
bW06CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFw
Rm9yUGF0aCk6CisKIDIwMjItMDMtMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A
d2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgU1BJIF9XS0RhdGFUYXNrCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
NDBlN2MzMWY0Mzk1ODE1YTM5OGI2NDRjNGJmNThiOWI4M2MyNmJjMi4uNTFlMmZmNzQ3ZDA5Nzdl
Mjc4YjJjMmVjNDc3MjIxMjY4YzZmYjY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIyLTAzLTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAg
ICAgICAgW2lPU10gQm9va3MgQVNTRVJUcyB1cG9uIG9wZW5pbmcgYSBib29rIHdpdGggYSBkZWJ1
ZyBidWlsZCBvZiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIzNzQ0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODk3NzY1MzE+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICAqIHBsYXRmb3Jt
L3NxbC9TUUxpdGVEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVEYXRhYmFz
ZTo6b3Blbik6CisKIDIwMjItMDMtMDQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K
IAogICAgICAgICBMb2FkIGV2ZW50IG5ldmVyIGZpcmluZyBhZnRlciBmb3JtIGlzIHN1Ym1pdHRl
ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZwppbmRleCAzYjdiOGJmM2U5MzdkOWZkYTMzNzA2OWY0MTdmNzUxMGIyZDM3YjQ0Li4z
NDM0MmFiNjI0NDIxMzg3ODY1YTcyMTdkNTU3NjkwMDc1MmNlNGUwIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE3IEBACisyMDIyLTAzLTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs
ZS5jb20+CisKKyAgICAgICAgW2lPU10gQm9va3MgQVNTRVJUcyB1cG9uIG9wZW5pbmcgYSBib29r
IHdpdGggYSBkZWJ1ZyBidWlsZCBvZiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODk3
NzY1MzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAg
ICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JTdG9yYWdlLmNwcDoKKyAg
ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpCbG9iU3RvcmFnZTo6YWRkKToKKyAgICAgICAg
KiBVSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcDoKKyAgICAgICAgKEFQ
STo6b3BlbkFuZE1hcENvbnRlbnRSdWxlTGlzdCk6CisgICAgICAgIChBUEk6OmNvbXBpbGVkVG9G
aWxlKToKKwogMjAyMi0wMy0wNCAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CiAKICAg
ICAgICAgW1dlYkF1dGhuXSBEb24ndCB1c2UgZGVjaWRlUG9saWN5Rm9yTG9jYWxBdXRoZW50aWNh
dG9yIGZvciBXZWIgQXV0aGVudGljYXRpb24gTW9kZXJuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG
L3d0Zi9GaWxlU3lzdGVtLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCmluZGV4
IDM4ODNhYzI2NjNkMGEyMDIzMmNiNWUwOWI0ZTQ1OTY4YjAwMTY3YjkuLjBhYjU5OGRiMjU0ZmRk
ODgyMDdiMzIxNGFhMWMwNjllOTEwNjAzODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0Zp
bGVTeXN0ZW0uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCkBAIC00MTQs
OCArNDE0LDkgQEAgYm9vbCBpc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5n
JikKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9y
UGF0aChjb25zdCBTdHJpbmcmKQorYm9vbCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChj
b25zdCBTdHJpbmcmKQogeworICAgIHJldHVybiB0cnVlOwogfQogI2VuZGlmCiAKQEAgLTQ0Miw3
ICs0NDMsMTEgQEAgTWFwcGVkRmlsZURhdGEgbWFwVG9GaWxlKGNvbnN0IFN0cmluZyYgcGF0aCwg
c2l6ZV90IGJ5dGVzU2l6ZSwgRnVuY3Rpb248dm9pZChjb24KICAgICAgICAgcmV0dXJuIHsgfTsK
ICAgICB9CiAKLSAgICBGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChw
YXRoKTsKKyAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRo
KHBhdGgpKSB7CisgICAgICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShoYW5kbGUpOworICAgICAg
ICByZXR1cm4geyB9OworICAgIH0KKwogICAgIGJvb2wgc3VjY2VzczsKICAgICBGaWxlU3lzdGVt
OjpNYXBwZWRGaWxlRGF0YSBtYXBwZWRGaWxlKGhhbmRsZSwgRmlsZVN5c3RlbTo6RmlsZU9wZW5N
b2RlOjpSZWFkV3JpdGUsIEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVNb2RlOjpTaGFyZWQsIHN1Y2Nl
c3MpOwogICAgIGlmICghc3VjY2VzcykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvRmls
ZVN5c3RlbS5oIGIvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oCmluZGV4IGNlNjgxMjg2MGEw
MGY5MDJmMjk5ODNmNDhjYjFjYTFlZDE4YjkwOTcuLjlkNTgwODZhMDg3NTdlOGJiN2JkZWMxOTk3
ZjUzM2MwZjBmYjcxYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uaAor
KysgYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmgKQEAgLTIxNCw3ICsyMTQsNyBAQCBXVEZf
RVhQT1JUX1BSSVZBVEUgYm9vbCBkZWxldGVOb25FbXB0eURpcmVjdG9yeShjb25zdCBTdHJpbmcm
KTsKIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgcmVhbFBhdGgoY29uc3QgU3RyaW5nJik7CiAK
IFdURl9FWFBPUlRfUFJJVkFURSBib29sIGlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChjb25z
dCBTdHJpbmcmKTsKLVdURl9FWFBPUlRfUFJJVkFURSB2b2lkIG1ha2VTYWZlVG9Vc2VNZW1vcnlN
YXBGb3JQYXRoKGNvbnN0IFN0cmluZyYpOworV1RGX0VYUE9SVF9QUklWQVRFIFdBUk5fVU5VU0VE
X1JFVFVSTiBib29sIG1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYp
OwogCiBjbGFzcyBNYXBwZWRGaWxlRGF0YSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2EubW0gYi9T
b3VyY2UvV1RGL3d0Zi9jb2NvYS9GaWxlU3lzdGVtQ29jb2EubW0KaW5kZXggODU2YTg5Mjk4MGVk
MmE0NzdmYjQ0ZWU3NjE3ZTViM2NkZjU2MTgwOC4uMWFkY2QyNTNmMDI3MjRjZjMzYzY4ZDBiNTcy
YjljODRjZDFkOTQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY29jb2EvRmlsZVN5c3Rl
bUNvY29hLm1tCisrKyBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL0ZpbGVTeXN0ZW1Db2NvYS5tbQpA
QCAtMjEwLDE1ICsyMTAsMTggQEAgYm9vbCBpc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoY29u
c3QgU3RyaW5nJiBwYXRoKQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIG1ha2VTYWZlVG9V
c2VNZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKK2Jvb2wgbWFrZVNhZmVUb1Vz
ZU1lbW9yeU1hcEZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogewogICAgIGlmIChpc1NhZmVU
b1VzZU1lbW9yeU1hcEZvclBhdGgocGF0aCkpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0
dXJuIHRydWU7CiAgICAgCiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7CiAgICAgQk9PTCBzdWNj
ZXNzID0gW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBzZXRBdHRyaWJ1dGVzOkB7IE5T
RmlsZVByb3RlY3Rpb25LZXk6IE5TRmlsZVByb3RlY3Rpb25Db21wbGV0ZVVubGVzc09wZW4gfSBv
Zkl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJyb3JdOwotICAgIEFTU0VSVCghZXJyb3IpOwotICAg
IEFTU0VSVF9VTlVTRUQoc3VjY2Vzcywgc3VjY2Vzcyk7CisgICAgaWYgKGVycm9yIHx8ICFzdWNj
ZXNzKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygibWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBh
dGgoJXMpIGZhaWxlZCB3aXRoIGVycm9yICVAIiwgcGF0aC51dGY4KCkuZGF0YSgpLCBlcnJvcik7
CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7CiB9CiAjZW5k
aWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFi
YXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAK
aW5kZXggMmM3YTQ3ODVhNDY2MDRjOWMxOWVkMzZlOGYxNTRiMDc3NzkxZTMwOC4uMjVlYzY2MTVi
MGVjMWU5MDhkMjdiYTMxNzg4ODk5MGIzMmUyZGU3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCkBAIC0xNjMsNyArMTYzLDggQEAgYm9vbCBT
UUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBPcGVuTW9kZSBvcGVu
TW9kZSkKICAgICAgICAgYXV0byBzaG1GaWxlTmFtZSA9IG1ha2VTdHJpbmcoZmlsZW5hbWUsICIt
c2htIl9zKTsKICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMoc2htRmlsZU5hbWUp
ICYmICFGaWxlU3lzdGVtOjppc1NhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoc2htRmlsZU5hbWUp
KSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChTUUxEYXRhYmFzZSwgIk9wZW5lZCBh
biBTUUxpdGUgZGF0YWJhc2Ugd2l0aCBhIENsYXNzIEEgLXNobSBmaWxlLiBUaGlzIG1heSB0cmln
Z2VyIGEgY3Jhc2ggd2hlbiB0aGUgdXNlciBsb2NrcyB0aGUgZGV2aWNlLiAoJXMpIiwgc2htRmls
ZU5hbWUubGF0aW4xKCkuZGF0YSgpKTsKLSAgICAgICAgICAgIEZpbGVTeXN0ZW06Om1ha2VTYWZl
VG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHNobUZpbGVOYW1lKTsKKyAgICAgICAgICAgIGlmICghRmls
ZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgoc2htRmlsZU5hbWUpKQorICAg
ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVCbG9iU3Rv
cmFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo
ZUJsb2JTdG9yYWdlLmNwcAppbmRleCA3MGY4MzU4NDczZTljMTZlZWI3OWFmMzdkZjYwMTQ4ZDQ1
MjY1ZDM4Li4yODVkNTlhNTYxNmIyOWM5NzAyNDdkYWZiZWZmNmU1MzE3MmY2ZjNiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUJsb2JT
dG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv
cmtDYWNoZUJsb2JTdG9yYWdlLmNwcApAQCAtOTYsMTIgKzk2LDEzIEBAIEJsb2JTdG9yYWdlOjpC
bG9iIEJsb2JTdG9yYWdlOjphZGQoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBEYXRhJiBkYXRh
KQogCiAgICAgYm9vbCBibG9iRXhpc3RzID0gRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhibG9iUGF0
aCk7CiAgICAgaWYgKGJsb2JFeGlzdHMpIHsKLSAgICAgICAgRmlsZVN5c3RlbTo6bWFrZVNhZmVU
b1VzZU1lbW9yeU1hcEZvclBhdGgoYmxvYlBhdGgpOwotICAgICAgICBhdXRvIGV4aXN0aW5nRGF0
YSA9IG1hcEZpbGUoYmxvYlBhdGgpOwotICAgICAgICBpZiAoYnl0ZXNFcXVhbChleGlzdGluZ0Rh
dGEsIGRhdGEpKSB7Ci0gICAgICAgICAgICBpZiAoIUZpbGVTeXN0ZW06OmhhcmRMaW5rKGJsb2JQ
YXRoLCBwYXRoKSkKLSAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkZhaWxlZCB0byBjcmVh
dGUgaGFyZCBsaW5rIGZyb20gJXMgdG8gJXMiLCBibG9iUGF0aC51dGY4KCkuZGF0YSgpLCBwYXRo
LnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgcmV0dXJuIHsgZXhpc3RpbmdEYXRhLCBoYXNo
IH07CisgICAgICAgIGlmIChGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0
aChibG9iUGF0aCkpIHsKKyAgICAgICAgICAgIGF1dG8gZXhpc3RpbmdEYXRhID0gbWFwRmlsZShi
bG9iUGF0aCk7CisgICAgICAgICAgICBpZiAoYnl0ZXNFcXVhbChleGlzdGluZ0RhdGEsIGRhdGEp
KSB7CisgICAgICAgICAgICAgICAgaWYgKCFGaWxlU3lzdGVtOjpoYXJkTGluayhibG9iUGF0aCwg
cGF0aCkpCisgICAgICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRmFpbGVkIHRvIGNyZWF0
ZSBoYXJkIGxpbmsgZnJvbSAlcyB0byAlcyIsIGJsb2JQYXRoLnV0ZjgoKS5kYXRhKCksIHBhdGgu
dXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgZXhpc3RpbmdEYXRhLCBo
YXNoIH07CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgRmlsZVN5c3RlbTo6ZGVs
ZXRlRmlsZShibG9iUGF0aCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RTdG9yZS5jcHAKaW5kZXggYjJkODYxMjBkMDVj
Y2M2NGMyZDQ3ODAwZWNkMWE2MjQxNTZlMmQ4MS4uYjkwMWQyM2UyMGZlMGE3ZjU2NTdiZmJhOWZm
MjhlYTE3ZGI0MDZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ
SUNvbnRlbnRSdWxlTGlzdFN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B
UEkvQVBJQ29udGVudFJ1bGVMaXN0U3RvcmUuY3BwCkBAIC0yMjksNyArMjI5LDggQEAgc3RydWN0
IE1hcHBlZERhdGEgewogCiBzdGF0aWMgc3RkOjpvcHRpb25hbDxNYXBwZWREYXRhPiBvcGVuQW5k
TWFwQ29udGVudFJ1bGVMaXN0KGNvbnN0IFdURjo6U3RyaW5nJiBwYXRoKQogewotICAgIEZpbGVT
eXN0ZW06Om1ha2VTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQYXRoKHBhdGgpOworICAgIGlmICghRmls
ZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1lbW9yeU1hcEZvclBhdGgocGF0aCkpCisgICAgICAgIHJl
dHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkRhdGEgZmlsZURh
dGEgPSBtYXBGaWxlKGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihwYXRoKS5kYXRhKCkpOwogICAg
IGlmIChmaWxlRGF0YS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKQEAg
LTQwOCw3ICs0MDksOCBAQCBzdGF0aWMgRXhwZWN0ZWQ8TWFwcGVkRGF0YSwgc3RkOjplcnJvcl9j
b2RlPiBjb21waWxlZFRvRmlsZShXVEY6OlN0cmluZyYmIGpzb24sCiAgICAgICAgIHJldHVybiBt
YWtlVW5leHBlY3RlZChDb250ZW50UnVsZUxpc3RTdG9yZTo6RXJyb3I6OkNvbXBpbGVGYWlsZWQp
OwogICAgIH0KICAgICAKLSAgICBGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9y
UGF0aChmaW5hbEZpbGVQYXRoKTsKKyAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VTYWZlVG9Vc2VN
ZW1vcnlNYXBGb3JQYXRoKGZpbmFsRmlsZVBhdGgpKQorICAgICAgICByZXR1cm4gbWFrZVVuZXhw
ZWN0ZWQoQ29udGVudFJ1bGVMaXN0U3RvcmU6OkVycm9yOjpDb21waWxlRmFpbGVkKTsKICAgICAK
ICAgICByZXR1cm4ge3sgV1RGTW92ZShtZXRhRGF0YSksIFdURk1vdmUobWFwcGVkRGF0YSkgfX07
CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg
MTAzODc2YmQ5ZThiOGY3NjViZTVhZDI0MGU2NjVjNmZhY2IxZTNjNS4uYjE0NzU1NjQxZjY4NWI0
YzdjNzE1NjdiYWRiNDI3ODA1YmY4YmNmNCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr
KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTA0ICBNeWxlcyBD
LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQm9va3Mg
QVNTRVJUcyB1cG9uIG9wZW5pbmcgYSBib29rIHdpdGggYSBkZWJ1ZyBidWlsZCBvZiBXZWJLaXQK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ0NQor
ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODk3NzY1MzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
QWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0Zp
bGVTeXN0ZW0uY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKwogMjAyMi0w
My0wNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lP
U10gVW5hYmxlIHRvIHNjcm9sbCB0byBhIGZvdW5kIHRleHQgcmFuZ2Ugd2hlbiB0aGVyZSBpcyBh
biBleGlzdGluZyBzZWxlY3Rpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvV1RGL0ZpbGVTeXN0ZW0uY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmls
ZVN5c3RlbS5jcHAKaW5kZXggODZlNWE0YjNmNjM4YTM4ZjBmMThjYTEyZDY2ZDUyOTEwMDJlMzI4
NC4uNDllYTk2OTBiZjVkOTMzNTcyMDNhYTEzMWIyZDBlZGI2ZGZlYzM0NyAxMDA2NDQKLS0tIGEv
VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKKysrIGIvVG9vbHMv
VGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRmlsZVN5c3RlbS5jcHAKQEAgLTEsNiArMSw2IEBACiAv
KgogICogQ29weXJpZ2h0IChDKSAyMDE1IENhbm9uIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K
LSAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg
KiBDb3B5cmlnaHQgKEMpIDIwMTctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt
cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk
ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgzMiw0ICs4MzIsMTYgQEAgVEVT
VF9GKEZpbGVTeXN0ZW1UZXN0LCByZWFkRW50aXJlRmlsZSkKICAgICBFWFBFQ1RfU1RSRVEoY29u
dGVudHMudXRmOCgpLmRhdGEoKSwgRmlsZVN5c3RlbVRlc3REYXRhKTsKIH0KIAorVEVTVF9GKEZp
bGVTeXN0ZW1UZXN0LCBtYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCkKK3sKKyAgICBFWFBF
Q1RfVFJVRShGaWxlU3lzdGVtOjptYWtlU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aCh0ZW1wRmls
ZVBhdGgoKSkpOworICAgIGF1dG8gcmVzdWx0ID0gRmlsZVN5c3RlbTo6bWFrZVNhZmVUb1VzZU1l
bW9yeU1hcEZvclBhdGgoU3RyaW5nKCJUaGlzaXNub3RhcmVhbGZpbGUiLCBTdHJpbmc6OkNvbnN0
cnVjdEZyb21MaXRlcmFsKSk7CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgIVBMQVRGT1JN
KElPU19GQU1JTFlfU0lNVUxBVE9SKQorICAgIC8vIE5TRmlsZVByb3RlY3Rpb25LZXkgb25seSBh
Y3R1YWxseSBtZWFucyBhbnl0aGluZyBvbi1kZXZpY2UuCisgICAgRVhQRUNUX0ZBTFNFKHJlc3Vs
dCk7CisjZWxzZQorICAgIEVYUEVDVF9UUlVFKHJlc3VsdCk7CisjZW5kaWYKK30KKwogfSAvLyBu
YW1lc3BhY2UgVGVzdFdlYktpdEFQSQo=
</data>
<flag name="commit-queue"
          id="481375"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>