<?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>237991</bug_id>
          
          <creation_ts>2022-03-16 17:26:29 -0700</creation_ts>
          <short_desc>Fix the build with the Monterey 12.3 SDK</short_desc>
          <delta_ts>2022-03-17 10:47:56 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>Safari 13</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>DUPLICATE</resolution>
          <dup_id>238010</dup_id>
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=238010</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Ryan Haddad">ryanhaddad</reporter>
          <assigned_to name="Ryan Haddad">ryanhaddad</assigned_to>
          <cc>eric.carlson</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>hi</cc>
    
    <cc>jbedard</cc>
    
    <cc>jer.noble</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>simon.fraser</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1852082</commentid>
    <comment_count>0</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-16 17:26:29 -0700</bug_when>
    <thetext>Fix the various build failures seen with the macOS Monterey 12.3 SDK</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852086</commentid>
    <comment_count>1</comment_count>
      <attachid>454919</attachid>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-16 17:33:44 -0700</bug_when>
    <thetext>Created attachment 454919
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852321</commentid>
    <comment_count>2</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-03-17 09:11:34 -0700</bug_when>
    <thetext>Looks like some of this was already fixed in bug 238010.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852323</commentid>
    <comment_count>3</comment_count>
      <attachid>454919</attachid>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-17 09:13:28 -0700</bug_when>
    <thetext>Comment on attachment 454919
Patch

I&apos;ve been told that though this built for me, I have used ASSERT_UNUSED incorrectly.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852324</commentid>
    <comment_count>4</comment_count>
      <attachid>454919</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-03-17 09:14:26 -0700</bug_when>
    <thetext>Comment on attachment 454919
Patch

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

&gt; Source/WebCore/platform/audio/mac/AudioOutputUnitAdaptorMac.cpp:58
&gt;      ASSERT(!result);
&gt; +    ASSERT_UNUSED(result, result);

This is not correct. Should be just one line,

ASSERT_UNUSED(result, !result);

I&apos;m surprised that we haven&apos;t seen this until now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852330</commentid>
    <comment_count>5</comment_count>
      <attachid>454919</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2022-03-17 09:40:15 -0700</bug_when>
    <thetext>Comment on attachment 454919
Patch

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

&gt; Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:380
&gt; +    ASSERT_UNUSED(status, status);

Per Alexey&apos;s comment above, shouldn&apos;t this be:
ASSERT_UNUSED(status, status == noErr);

&gt; Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:3543
&gt; +        ASSERT_UNUSED(valuesOK, valuesOK);

Should replace the above line, right?

&gt; Source/WebKit/Shared/cf/ArgumentCodersCF.cpp:654
&gt; +    ASSERT_UNUSED(numConvertedBytes, numConvertedBytes);

Should replace the above line, right?

&gt; Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:441
&gt; +    ASSERT_UNUSED(copied, copied);

Should replace the above line, right?

&gt; Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCloseAllMediaPresentations.mm:51
&gt; +    ASSERT_UNUSED(presentationModeChanged, presentationModeChanged);

Feels wrong to have this assertion here, right? Because this variable is used on the line right below this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852352</commentid>
    <comment_count>6</comment_count>
      <attachid>454989</attachid>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-17 10:21:02 -0700</bug_when>
    <thetext>Created attachment 454989
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852354</commentid>
    <comment_count>7</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-17 10:22:12 -0700</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #5)
&gt; Comment on attachment 454919 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=454919&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:380
&gt; &gt; +    ASSERT_UNUSED(status, status);
&gt; 
&gt; Per Alexey&apos;s comment above, shouldn&apos;t this be:
&gt; ASSERT_UNUSED(status, status == noErr);
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:3543
&gt; &gt; +        ASSERT_UNUSED(valuesOK, valuesOK);
&gt; 
&gt; Should replace the above line, right?
&gt; 
&gt; &gt; Source/WebKit/Shared/cf/ArgumentCodersCF.cpp:654
&gt; &gt; +    ASSERT_UNUSED(numConvertedBytes, numConvertedBytes);
&gt; 
&gt; Should replace the above line, right?
&gt; 
&gt; &gt; Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm:441
&gt; &gt; +    ASSERT_UNUSED(copied, copied);
&gt; 
&gt; Should replace the above line, right?
&gt; 
&gt; &gt; Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCloseAllMediaPresentations.mm:51
&gt; &gt; +    ASSERT_UNUSED(presentationModeChanged, presentationModeChanged);
&gt; 
&gt; Feels wrong to have this assertion here, right? Because this variable is
&gt; used on the line right below this.
I encountered a build failure without this, let me re-check with my corrected patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852357</commentid>
    <comment_count>8</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2022-03-17 10:28:43 -0700</bug_when>
    <thetext>Oh, most of these were fixed by https://bugs.webkit.org/show_bug.cgi?id=238010, duping.

*** This bug has been marked as a duplicate of bug 238010 ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852369</commentid>
    <comment_count>9</comment_count>
      <attachid>454989</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-03-17 10:47:56 -0700</bug_when>
    <thetext>Comment on attachment 454989
Patch

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

&gt; Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCloseAllMediaPresentations.mm:51
&gt; +    ASSERT_UNUSED(presentationModeChanged, presentationModeChanged);

This should be UNUSED_VARIABLE. ASSERT_UNUSED would fail anyway, as we just set it to false above.

But looking further into the code, the real fix is to change an ASSERT below to ASSERT_UNUSED. And in fact, this was also done in r291403!</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454919</attachid>
            <date>2022-03-16 17:33:44 -0700</date>
            <delta_ts>2022-03-17 10:20:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237991-20220316173343.patch</filename>
            <type>text/plain</type>
            <size>9398</size>
            <attacher name="Ryan Haddad">ryanhaddad</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmNjEyZTEwYjhiN2Iz
ZGIzNDRmMWY2NDE5YmE0MzQzYzI3ZmJiMy4uZTE4NDgxMDNjY2RiMTI0NzUzZmI2YWYxMTExYjFh
YTc2ZjM4YTVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAzLTE2ICBSeWFu
IEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCB0aGUgYnVpbGQg
d2l0aCB0aGUgTW9udGVyZXkgMTIuMyBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIzNzk5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvT3V0cHV0VW5pdEFk
YXB0b3JNYWMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9PdXRwdXRVbml0QWRhcHRvcjo6
Y29uZmlndXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq
Yy9NZWRpYVNhbXBsZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBsZUFW
Rk9iakM6OmdldFJHQkFJbWFnZURhdGEgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo
aWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xh
eWVyQ0E6OmFwcGVuZFRvVW5jb21taXR0ZWRBbmltYXRpb25zKToKKwogMjAyMi0wMy0xNiAgRGV2
aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcGxlIFBheV0gdmVy
c2lvbiB2YWx1ZXMgYXJlIGluY29ycmVjdCwgY2F1c2luZyBpbmNvcnJlY3QgZmVhdHVyZSBkZXRl
Y3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IDBiYjlmOWNmZDhiY2Q4YzJmZWQ5OGFmMTViNTZi
OTU1ZDc5MWYwZjIuLjM5ZWYyNWMyNmU3ZDE2NTQ4NTViYzIzNzA3ZjljY2E3OTY5NWYwZmMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv
cmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIyLTAzLTE2ICBSeWFuIEhhZGRh
ZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCB0aGUgYnVpbGQgd2l0aCB0
aGUgTW9udGVyZXkgMTIuMyBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIzNzk5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogcGFsL3NwaS9jb2NvYS9QYXNzS2l0U1BJLmg6CisKIDIwMjItMDMtMTUg
IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2Vi
R1BVXSBNaWdyYXRlIGZyb20gV1RGOjpGdW5jdGlvbiB0byBXVEY6OkNvbXBsZXRpb25IYW5kbGVy
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh
bmdlTG9nCmluZGV4IGJlMTczM2VmMWE0NTkzZWJiYTdjYzIyZGYzNTc1NjY1ZTFiOTk1MTMuLjcw
NTZkZmM0YjY4YTM0YWM1YWNjMGFhOWFmOThjZmNlNmRmODBlNGUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTUgQEAKKzIwMjItMDMtMTYgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+
CisKKyAgICAgICAgRml4IHRoZSBidWlsZCB3aXRoIHRoZSBNb250ZXJleSAxMi4zIFNESworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTkxCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvY2Yv
QXJndW1lbnRDb2RlcnNDRi5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8Q0ZTdHJp
bmdSZWY+OjplbmNvZGUpOgorICAgICAgICAqIFNoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01h
Yy5tbToKKyAgICAgICAgKFdlYktpdDo6Y29tcGlsZUFuZENhY2hlU2FuZGJveFByb2ZpbGUpOgor
CiAyMDIyLTAzLTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg
ICAgIENvcmVJUEMgSGFyZGVuaW5nOiBBZGQgdXNlciBnZXN0dXJlIGNoZWNrIHdoZW4gc2F2aW5n
IGltYWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvUGFz
c0tpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvUGFzc0tpdFNQSS5o
CmluZGV4IDU5NTEzNjAwMjFlMmE5MTBiMmNjOTY1MWQwMTFlZGJkMWU4Nzc5NTUuLmQwNWVkMWUw
OTdiNzk5MDFmYjQyMjM0NTBiNDI2N2M3OWY4MjUzOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL1BBTC9wYWwvc3BpL2NvY29hL1Bhc3NLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q
QUwvcGFsL3NwaS9jb2NvYS9QYXNzS2l0U1BJLmgKQEAgLTMwNCwxMiArMzA0LDYgQEAgdHlwZWRl
ZiBOU1N0cmluZyAqIFBLUGF5bWVudE5ldHdvcmsgTlNfRVhURU5TSUJMRV9TVFJJTkdfRU5VTTsK
IEBlbmQKICNlbmRpZgogCi0jaWYgSEFWRShQQVNTS0lUX0RFRkFVTFRfU0hJUFBJTkdfTUVUSE9E
KQotQGludGVyZmFjZSBQS1NoaXBwaW5nTWV0aG9kcyA6IE5TT2JqZWN0Ci0tIChpbnN0YW5jZXR5
cGUpaW5pdFdpdGhNZXRob2RzOihOU0FycmF5PFBLU2hpcHBpbmdNZXRob2QgKj4gKiltZXRob2Rz
IGRlZmF1bHRNZXRob2Q6KG51bGxhYmxlIFBLU2hpcHBpbmdNZXRob2QgKilkZWZhdWx0TWV0aG9k
OwotQGVuZAotI2VuZGlmCi0KICNpZiBIQVZFKFBBU1NLSVRfU0hJUFBJTkdfTUVUSE9EX0RBVEVf
Q09NUE9ORU5UU19SQU5HRSkKIEBpbnRlcmZhY2UgUEtEYXRlQ29tcG9uZW50c1JhbmdlIDogTlNP
YmplY3QgPE5TQ29weWluZywgTlNTZWN1cmVDb2Rpbmc+CiAtIChudWxsYWJsZSBpbnN0YW5jZXR5
cGUpaW5pdFdpdGhTdGFydERhdGVDb21wb25lbnRzOihOU0RhdGVDb21wb25lbnRzICopc3RhcnRE
YXRlQ29tcG9uZW50cyBlbmREYXRlQ29tcG9uZW50czooTlNEYXRlQ29tcG9uZW50cyAqKWVuZERh
dGVDb21wb25lbnRzOwpAQCAtMzI2LDYgKzMyMCwxMiBAQCB0eXBlZGVmIE5TU3RyaW5nICogUEtQ
YXltZW50TmV0d29yayBOU19FWFRFTlNJQkxFX1NUUklOR19FTlVNOwogI2VuZGlmCiBAZW5kCiAK
KyNpZiBIQVZFKFBBU1NLSVRfREVGQVVMVF9TSElQUElOR19NRVRIT0QpCitAaW50ZXJmYWNlIFBL
U2hpcHBpbmdNZXRob2RzIDogTlNPYmplY3QKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aE1ldGhv
ZHM6KE5TQXJyYXk8UEtTaGlwcGluZ01ldGhvZCAqPiAqKW1ldGhvZHMgZGVmYXVsdE1ldGhvZDoo
bnVsbGFibGUgUEtTaGlwcGluZ01ldGhvZCAqKWRlZmF1bHRNZXRob2Q7CitAZW5kCisjZW5kaWYK
KwogI2lmIEhBVkUoUEFTU0tJVF9TSElQUElOR19DT05UQUNUX0VESVRJTkdfTU9ERSkKIHR5cGVk
ZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBQS1NoaXBwaW5nQ29udGFjdEVkaXRpbmdNb2RlKSB7CiAg
ICAgUEtTaGlwcGluZ0NvbnRhY3RFZGl0aW5nTW9kZUVuYWJsZWQgPSAxLApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvT3V0cHV0VW5pdEFkYXB0b3JN
YWMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvT3V0cHV0VW5p
dEFkYXB0b3JNYWMuY3BwCmluZGV4IDRhODNkYzk2NjI0ODBlNzM1YzI2NmQwNjgwMDlmM2UwYzQ5
ZjFhOGEuLmNhMzM0ZWZjNTczODYyMjg0MTY5OTBmNzkyNmFlMGNmYTY4YWNiNjQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb091dHB1dFVuaXRBZGFw
dG9yTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9P
dXRwdXRVbml0QWRhcHRvck1hYy5jcHAKQEAgLTU1LDYgKzU1LDcgQEAgdm9pZCBBdWRpb091dHB1
dFVuaXRBZGFwdG9yOjpjb25maWd1cmUoZmxvYXQgaGFyZHdhcmVTYW1wbGVSYXRlLCB1bnNpZ25l
ZCBudW1iZXIKIAogICAgIE9TU3RhdHVzIHJlc3VsdCA9IFBBTDo6QXVkaW9Db21wb25lbnRJbnN0
YW5jZU5ldyhjb21wLCAmbV9vdXRwdXRVbml0KTsKICAgICBBU1NFUlQoIXJlc3VsdCk7CisgICAg
QVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdCk7CiAKICAgICByZXN1bHQgPSBQQUw6OkF1ZGlv
VW5pdEluaXRpYWxpemUobV9vdXRwdXRVbml0KTsKICAgICBBU1NFUlQoIXJlc3VsdCk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq
Yy9NZWRpYVNhbXBsZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KaW5kZXggNWQ2NmEwNDI2
YjA0YWFlY2Q2NTc3ZGVjYzM0NmI3NzA3MGRmZWY1Ni4uOGQyMDViMWRiOWE5NDNiNzEwYjk0MmIz
M2Y3YWVjNDQzMzQxODUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxl
QVZGT2JqQy5tbQpAQCAtMzc3LDYgKzM3Nyw3IEBAIFJlZlB0cjxKU0M6OlVpbnQ4Q2xhbXBlZEFy
cmF5PiBNZWRpYVNhbXBsZUFWRk9iakM6OmdldFJHQkFJbWFnZURhdGEoKSBjb25zdAogICAgIGF1
dG8gcmdiYVBpeGVsQnVmZmVyID0gcGl4ZWxCdWZmZXJDb25mb3JtZXIuY29udmVydChwaXhlbEJ1
ZmZlcik7CiAgICAgYXV0byBzdGF0dXMgPSBDVlBpeGVsQnVmZmVyTG9ja0Jhc2VBZGRyZXNzKHJn
YmFQaXhlbEJ1ZmZlci5nZXQoKSwga0NWUGl4ZWxCdWZmZXJMb2NrX1JlYWRPbmx5KTsKICAgICBB
U1NFUlQoc3RhdHVzID09IG5vRXJyKTsKKyAgICBBU1NFUlRfVU5VU0VEKHN0YXR1cywgc3RhdHVz
KTsKIAogICAgIHZvaWQqIGRhdGEgPSBDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5l
KHJnYmFQaXhlbEJ1ZmZlci5nZXQoKSwgMCk7CiAgICAgc2l6ZV90IGJ5dGVMZW5ndGggPSBDVlBp
eGVsQnVmZmVyR2V0SGVpZ2h0KHBpeGVsQnVmZmVyKSAqIENWUGl4ZWxCdWZmZXJHZXRXaWR0aChw
aXhlbEJ1ZmZlcikgKiA0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggNzI4ZDNiZWEwYTE3MjM1MDE0ZjBm
MTJjZjNkNmQ3ZGExOTNjMzVhNS4uMmY4MmJmZjgzMDRhNjY4MzAzOGI1N2FkMTFmYWNmZmI2YmI1
MjhhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3Jh
cGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j
YS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC0zNTQwLDYgKzM1NDAsNyBAQCBib29sIEdyYXBoaWNz
TGF5ZXJDQTo6YXBwZW5kVG9VbmNvbW1pdHRlZEFuaW1hdGlvbnMoY29uc3QgS2V5ZnJhbWVWYWx1
ZUxpc3QmIHZhbAogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBBU1NFUlQodmFsdWVzT0sp
OworICAgICAgICBBU1NFUlRfVU5VU0VEKHZhbHVlc09LLCB2YWx1ZXNPSyk7CiAKICAgICAgICAg
bV9hbmltYXRpb25zLmFwcGVuZChMYXllclByb3BlcnR5QW5pbWF0aW9uKGNhQW5pbWF0aW9uLnJl
bGVhc2VOb25OdWxsKCksIGFuaW1hdGlvbk5hbWUsIHZhbHVlTGlzdC5wcm9wZXJ0eSgpLCBhbmlt
YXRpb25JbmRleCwgaW50ZXJuYWxGaWx0ZXJQcm9wZXJ0eUluZGV4LCB0aW1lT2Zmc2V0KSk7CiAg
ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvY2YvQXJndW1lbnRDb2RlcnND
Ri5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcAppbmRl
eCA4MTIwN2I5YjQyYTg2OGNlODFiNmQzYzBmMzYyZWY2Y2UzMWNmZmZiLi43YWQwNGZjYzg1OTJl
YmJiMzA5Yjg5ZTA4MTgzNjBjOTBkMGYzYjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No
YXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9j
Zi9Bcmd1bWVudENvZGVyc0NGLmNwcApAQCAtNjUxLDYgKzY1MSw3IEBAIHZvaWQgQXJndW1lbnRD
b2RlcjxDRlN0cmluZ1JlZj46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBDRlN0cmluZ1JlZiBz
dHJpbmcpCiAKICAgICBDRkluZGV4IG51bUNvbnZlcnRlZEJ5dGVzID0gQ0ZTdHJpbmdHZXRCeXRl
cyhzdHJpbmcsIHJhbmdlLCBlbmNvZGluZywgMCwgZmFsc2UsIDAsIDAsICZidWZmZXJMZW5ndGgp
OwogICAgIEFTU0VSVChudW1Db252ZXJ0ZWRCeXRlcyA9PSBsZW5ndGgpOworICAgIEFTU0VSVF9V
TlVTRUQobnVtQ29udmVydGVkQnl0ZXMsIG51bUNvbnZlcnRlZEJ5dGVzKTsKIAogICAgIFZlY3Rv
cjxVSW50OCwgMTI4PiBidWZmZXIoYnVmZmVyTGVuZ3RoKTsKICAgICBudW1Db252ZXJ0ZWRCeXRl
cyA9IENGU3RyaW5nR2V0Qnl0ZXMoc3RyaW5nLCByYW5nZSwgZW5jb2RpbmcsIDAsIGZhbHNlLCBi
dWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpLCAmYnVmZmVyTGVuZ3RoKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tIGIvU291cmNl
L1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KaW5kZXggYzdkYWM5YmQy
N2Q5MTFhY2RmMTcyODAyOGNkMGQ5NTFlN2RmY2FlMS4uYjIxNWM0YWRmODExZDllZDk2OGNiMzBi
YzM2ZjI2Njk3NTE4MGFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1
eGlsaWFyeVByb2Nlc3NNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGls
aWFyeVByb2Nlc3NNYWMubW0KQEAgLTQzOCw2ICs0MzgsNyBAQCBzdGF0aWMgU2FuZGJveFByb2Zp
bGVQdHIgY29tcGlsZUFuZENhY2hlU2FuZGJveFByb2ZpbGUoY29uc3QgU2FuZGJveEluZm8mIGlu
Zm8pCiAKICAgICBzaXplX3QgY29waWVkID0gc3RybGNweShjYWNoZWRIZWFkZXIuc2FuZGJveEJ1
aWxkSUQsIFNBTkRCT1hfQlVJTERfSUQsIHNpemVvZihjYWNoZWRIZWFkZXIuc2FuZGJveEJ1aWxk
SUQpKTsKICAgICBBU1NFUlQoY29waWVkID09IGd1aWRTaXplIC0gMSk7CisgICAgQVNTRVJUX1VO
VVNFRChjb3BpZWQsIGNvcGllZCk7CiAgICAgY29waWVkID0gc3RybGNweShjYWNoZWRIZWFkZXIu
b3NWZXJzaW9uLCBvc1ZlcnNpb24udXRmOCgpLmRhdGEoKSwgc2l6ZW9mKGNhY2hlZEhlYWRlci5v
c1ZlcnNpb24pKTsKICAgICBBU1NFUlQoY29waWVkIDwgdmVyc2lvblNpemUgLSAxKTsKIApkaWZm
IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc0NzEwNTEz
MzU3ZmY0ZTcyZGI0MzRhMDdkOTI1YTYwY2ZkNzE4MzMuLjQyZDYyMzEzYmEzOTIzNWU3YmRhYzVi
ZWUzNjA2MjFhMDU0NmY5M2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s
cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wMy0xNiAgUnlhbiBIYWRkYWQgIDxy
eWFuaGFkZGFkQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdGhlIGJ1aWxkIHdpdGggdGhlIE1v
bnRlcmV5IDEyLjMgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMzc5OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VB
bGxNZWRpYVByZXNlbnRhdGlvbnMubW06CisgICAgICAgIChsb2FkUGljdHVyZUluUGljdHVyZSk6
CisKIDIwMjItMDMtMTYgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAg
ICAgICAgIFtNZXJnZS1RdWV1ZV0gQWRkIHN0ZXAgdG8gbWFrZSBjb21tZW50IG9uIHB1bGwgcmVx
dWVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev
V0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW0gYi9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25z
Lm1tCmluZGV4IGQ1NjJiOGYwNjdjMTI0Yjk5MTg5YjkxOTI1YTllM2MwYzY3YjRiZWIuLjczZDNl
ODUzZWMzODI4MjEzMzYwMzNlNDBmZDE4ODY5MjQ3MzczYTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNl
bnRhdGlvbnMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X
S1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbQpAQCAtNDgsNiArNDgsNyBAQCBz
dGF0aWMgdm9pZCBsb2FkUGljdHVyZUluUGljdHVyZShSZXRhaW5QdHI8VGVzdFdLV2ViVmlldz4g
d2ViVmlldykKICAgICBbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9j
dW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8nKS5hZGRFdmVudExpc3RlbmVyKCd3ZWJraXRwcmVz
ZW50YXRpb25tb2RlY2hhbmdlZCcsIGV2ZW50ID0+IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFu
ZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ3ByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkJyk7
IH0pOyJdOwogCiAgICAgX19ibG9jayBib29sIHByZXNlbnRhdGlvbk1vZGVDaGFuZ2VkID0gZmFs
c2U7CisgICAgQVNTRVJUX1VOVVNFRChwcmVzZW50YXRpb25Nb2RlQ2hhbmdlZCwgcHJlc2VudGF0
aW9uTW9kZUNoYW5nZWQpOwogICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3Nh
Z2U6QCJwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIgYWN0aW9uOl57IHByZXNlbnRhdGlvbk1vZGVD
aGFuZ2VkID0gdHJ1ZTsgfV07CiAKICAgICBbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZh
U2NyaXB0V2l0aFVzZXJHZXN0dXJlOkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8nKS53
ZWJraXRTZXRQcmVzZW50YXRpb25Nb2RlKCdwaWN0dXJlLWluLXBpY3R1cmUnKSJdOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454989</attachid>
            <date>2022-03-17 10:21:02 -0700</date>
            <delta_ts>2022-03-17 10:47:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237991-20220317102101.patch</filename>
            <type>text/plain</type>
            <size>7711</size>
            <attacher name="Ryan Haddad">ryanhaddad</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmNjEyZTEwYjhiN2Iz
ZGIzNDRmMWY2NDE5YmE0MzQzYzI3ZmJiMy4uZTE4NDgxMDNjY2RiMTI0NzUzZmI2YWYxMTExYjFh
YTc2ZjM4YTVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAzLTE2ICBSeWFu
IEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCB0aGUgYnVpbGQg
d2l0aCB0aGUgTW9udGVyZXkgMTIuMyBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIzNzk5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvT3V0cHV0VW5pdEFk
YXB0b3JNYWMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9PdXRwdXRVbml0QWRhcHRvcjo6
Y29uZmlndXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq
Yy9NZWRpYVNhbXBsZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBsZUFW
Rk9iakM6OmdldFJHQkFJbWFnZURhdGEgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo
aWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xh
eWVyQ0E6OmFwcGVuZFRvVW5jb21taXR0ZWRBbmltYXRpb25zKToKKwogMjAyMi0wMy0xNiAgRGV2
aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcGxlIFBheV0gdmVy
c2lvbiB2YWx1ZXMgYXJlIGluY29ycmVjdCwgY2F1c2luZyBpbmNvcnJlY3QgZmVhdHVyZSBkZXRl
Y3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp
dC9DaGFuZ2VMb2cKaW5kZXggYmUxNzMzZWYxYTQ1OTNlYmJhN2NjMjJkZjM1NzU2NjVlMWI5OTUx
My4uNzA1NmRmYzRiNjhhMzRhYzVhY2MwYWE5YWY5OGNmY2U2ZGY4MGU0ZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNSBAQAorMjAyMi0wMy0xNiAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxl
LmNvbT4KKworICAgICAgICBGaXggdGhlIGJ1aWxkIHdpdGggdGhlIE1vbnRlcmV5IDEyLjMgU0RL
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc5OTEK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJl
ZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxD
RlN0cmluZ1JlZj46OmVuY29kZSk6CisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9j
ZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0Ojpjb21waWxlQW5kQ2FjaGVTYW5kYm94UHJvZmls
ZSk6CisKIDIwMjItMDMtMTYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAK
ICAgICAgICAgQ29yZUlQQyBIYXJkZW5pbmc6IEFkZCB1c2VyIGdlc3R1cmUgY2hlY2sgd2hlbiBz
YXZpbmcgaW1hZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9t
YWMvQXVkaW9PdXRwdXRVbml0QWRhcHRvck1hYy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9hdWRpby9tYWMvQXVkaW9PdXRwdXRVbml0QWRhcHRvck1hYy5jcHAKaW5kZXggNGE4M2RjOTY2
MjQ4MGU3MzVjMjY2ZDA2ODAwOWYzZTBjNDlmMWE4YS4uM2FhYmJlNzkzMmRhNGNkNTkwMWU1NzI1
MjlmMjdhMGRjN2RjZmMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vbWFjL0F1ZGlvT3V0cHV0VW5pdEFkYXB0b3JNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb091dHB1dFVuaXRBZGFwdG9yTWFjLmNwcApAQCAtNTQs
NyArNTQsNyBAQCB2b2lkIEF1ZGlvT3V0cHV0VW5pdEFkYXB0b3I6OmNvbmZpZ3VyZShmbG9hdCBo
YXJkd2FyZVNhbXBsZVJhdGUsIHVuc2lnbmVkIG51bWJlcgogICAgIEFTU0VSVChjb21wKTsKIAog
ICAgIE9TU3RhdHVzIHJlc3VsdCA9IFBBTDo6QXVkaW9Db21wb25lbnRJbnN0YW5jZU5ldyhjb21w
LCAmbV9vdXRwdXRVbml0KTsKLSAgICBBU1NFUlQoIXJlc3VsdCk7CisgICAgQVNTRVJUX1VOVVNF
RChyZXN1bHQsICFyZXN1bHQpOwogCiAgICAgcmVzdWx0ID0gUEFMOjpBdWRpb1VuaXRJbml0aWFs
aXplKG1fb3V0cHV0VW5pdCk7CiAgICAgQVNTRVJUKCFyZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1w
bGVBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0
aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCmluZGV4IDVkNjZhMDQyNmIwNGFhZWNkNjU3
N2RlY2MzNDZiNzcwNzBkZmVmNTYuLmJhYmM1OGQwMjQ0ZGE4NDk5ZDQ0NmJlODE3YTIyNTQwNGQz
ZDA0YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91
bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0K
QEAgLTM3Niw3ICszNzYsNyBAQCBSZWZQdHI8SlNDOjpVaW50OENsYW1wZWRBcnJheT4gTWVkaWFT
YW1wbGVBVkZPYmpDOjpnZXRSR0JBSW1hZ2VEYXRhKCkgY29uc3QKICAgICBhdXRvIHBpeGVsQnVm
ZmVyID0gc3RhdGljX2Nhc3Q8Q1ZQaXhlbEJ1ZmZlclJlZj4oUEFMOjpDTVNhbXBsZUJ1ZmZlckdl
dEltYWdlQnVmZmVyKG1fc2FtcGxlLmdldCgpKSk7CiAgICAgYXV0byByZ2JhUGl4ZWxCdWZmZXIg
PSBwaXhlbEJ1ZmZlckNvbmZvcm1lci5jb252ZXJ0KHBpeGVsQnVmZmVyKTsKICAgICBhdXRvIHN0
YXR1cyA9IENWUGl4ZWxCdWZmZXJMb2NrQmFzZUFkZHJlc3MocmdiYVBpeGVsQnVmZmVyLmdldCgp
LCBrQ1ZQaXhlbEJ1ZmZlckxvY2tfUmVhZE9ubHkpOwotICAgIEFTU0VSVChzdGF0dXMgPT0gbm9F
cnIpOworICAgIEFTU0VSVF9VTlVTRUQoc3RhdHVzLCBzdGF0dXMgPT0gbm9FcnIpOwogCiAgICAg
dm9pZCogZGF0YSA9IENWUGl4ZWxCdWZmZXJHZXRCYXNlQWRkcmVzc09mUGxhbmUocmdiYVBpeGVs
QnVmZmVyLmdldCgpLCAwKTsKICAgICBzaXplX3QgYnl0ZUxlbmd0aCA9IENWUGl4ZWxCdWZmZXJH
ZXRIZWlnaHQocGl4ZWxCdWZmZXIpICogQ1ZQaXhlbEJ1ZmZlckdldFdpZHRoKHBpeGVsQnVmZmVy
KSAqIDQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9H
cmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev
R3JhcGhpY3NMYXllckNBLmNwcAppbmRleCA3MjhkM2JlYTBhMTcyMzUwMTRmMGYxMmNmM2Q2ZDdk
YTE5M2MzNWE1Li4xYTM2YTllNDcxYmQ1YjM4OTdhZmQwOWM4NDI2M2I5MWRiMWViYzJmIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVy
Q0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz
TGF5ZXJDQS5jcHAKQEAgLTM1MzksNyArMzUzOSw3IEBAIGJvb2wgR3JhcGhpY3NMYXllckNBOjph
cHBlbmRUb1VuY29tbWl0dGVkQW5pbWF0aW9ucyhjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFs
CiAgICAgICAgICAgICB2YWx1ZXNPSyA9IHNldEZpbHRlckFuaW1hdGlvbkVuZHBvaW50cyh2YWx1
ZUxpc3QsIGFuaW1hdGlvbiwgY2FBbmltYXRpb24uZ2V0KCksIGFuaW1hdGlvbkluZGV4LCBpbnRl
cm5hbEZpbHRlclByb3BlcnR5SW5kZXgpOwogICAgICAgICB9CiAgICAgICAgIAotICAgICAgICBB
U1NFUlQodmFsdWVzT0spOworICAgICAgICBBU1NFUlRfVU5VU0VEKHZhbHVlc09LLCB2YWx1ZXNP
Syk7CiAKICAgICAgICAgbV9hbmltYXRpb25zLmFwcGVuZChMYXllclByb3BlcnR5QW5pbWF0aW9u
KGNhQW5pbWF0aW9uLnJlbGVhc2VOb25OdWxsKCksIGFuaW1hdGlvbk5hbWUsIHZhbHVlTGlzdC5w
cm9wZXJ0eSgpLCBhbmltYXRpb25JbmRleCwgaW50ZXJuYWxGaWx0ZXJQcm9wZXJ0eUluZGV4LCB0
aW1lT2Zmc2V0KSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvY2Yv
QXJndW1lbnRDb2RlcnNDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENv
ZGVyc0NGLmNwcAppbmRleCA4MTIwN2I5YjQyYTg2OGNlODFiNmQzYzBmMzYyZWY2Y2UzMWNmZmZi
Li5jNTBmNzFlYjEyYmRjNmVhZDhhNTM0MTYwYjEwY2UwY2JhNWFmOGY0IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcAorKysgYi9Tb3VyY2Uv
V2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcApAQCAtNjUwLDcgKzY1MCw3IEBA
IHZvaWQgQXJndW1lbnRDb2RlcjxDRlN0cmluZ1JlZj46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVy
LCBDRlN0cmluZ1JlZiBzdHJpbmcpCiAgICAgQ0ZJbmRleCBidWZmZXJMZW5ndGggPSAwOwogCiAg
ICAgQ0ZJbmRleCBudW1Db252ZXJ0ZWRCeXRlcyA9IENGU3RyaW5nR2V0Qnl0ZXMoc3RyaW5nLCBy
YW5nZSwgZW5jb2RpbmcsIDAsIGZhbHNlLCAwLCAwLCAmYnVmZmVyTGVuZ3RoKTsKLSAgICBBU1NF
UlQobnVtQ29udmVydGVkQnl0ZXMgPT0gbGVuZ3RoKTsKKyAgICBBU1NFUlRfVU5VU0VEKG51bUNv
bnZlcnRlZEJ5dGVzLCBudW1Db252ZXJ0ZWRCeXRlcyA9PSBsZW5ndGgpOwogCiAgICAgVmVjdG9y
PFVJbnQ4LCAxMjg+IGJ1ZmZlcihidWZmZXJMZW5ndGgpOwogICAgIG51bUNvbnZlcnRlZEJ5dGVz
ID0gQ0ZTdHJpbmdHZXRCeXRlcyhzdHJpbmcsIHJhbmdlLCBlbmNvZGluZywgMCwgZmFsc2UsIGJ1
ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCksICZidWZmZXJMZW5ndGgpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0gYi9Tb3VyY2Uv
V2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQppbmRleCBjN2RhYzliZDI3
ZDkxMWFjZGYxNzI4MDI4Y2QwZDk1MWU3ZGZjYWUxLi4zNDlkZDBkODdhYzcwMTI3YzlmMzYxODgx
ZTk5NGI4MmE1Y2IxYjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4
aWxpYXJ5UHJvY2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxp
YXJ5UHJvY2Vzc01hYy5tbQpAQCAtNDM3LDcgKzQzNyw3IEBAIHN0YXRpYyBTYW5kYm94UHJvZmls
ZVB0ciBjb21waWxlQW5kQ2FjaGVTYW5kYm94UHJvZmlsZShjb25zdCBTYW5kYm94SW5mbyYgaW5m
bykKICAgICB9OwogCiAgICAgc2l6ZV90IGNvcGllZCA9IHN0cmxjcHkoY2FjaGVkSGVhZGVyLnNh
bmRib3hCdWlsZElELCBTQU5EQk9YX0JVSUxEX0lELCBzaXplb2YoY2FjaGVkSGVhZGVyLnNhbmRi
b3hCdWlsZElEKSk7Ci0gICAgQVNTRVJUKGNvcGllZCA9PSBndWlkU2l6ZSAtIDEpOworICAgIEFT
U0VSVF9VTlVTRUQoY29waWVkLCBjb3BpZWQgPT0gZ3VpZFNpemUgLSAxKTsKICAgICBjb3BpZWQg
PSBzdHJsY3B5KGNhY2hlZEhlYWRlci5vc1ZlcnNpb24sIG9zVmVyc2lvbi51dGY4KCkuZGF0YSgp
LCBzaXplb2YoY2FjaGVkSGVhZGVyLm9zVmVyc2lvbikpOwogICAgIEFTU0VSVChjb3BpZWQgPCB2
ZXJzaW9uU2l6ZSAtIDEpOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D
aGFuZ2VMb2cKaW5kZXggNzQ3MTA1MTMzNTdmZjRlNzJkYjQzNGEwN2Q5MjVhNjBjZmQ3MTgzMy4u
NDJkNjIzMTNiYTM5MjM1ZTdiZGFjNWJlZTM2MDYyMWEwNTQ2ZjkzZSAxMDA2NDQKLS0tIGEvVG9v
bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIy
LTAzLTE2ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgorCisgICAgICAgIEZp
eCB0aGUgYnVpbGQgd2l0aCB0aGUgTW9udGVyZXkgMTIuMyBTREsKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzk5MQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL
aXRDb2NvYS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbToKKyAgICAgICAg
KGxvYWRQaWN0dXJlSW5QaWN0dXJlKToKKwogMjAyMi0wMy0xNiAgSm9uYXRoYW4gQmVkYXJkICA8
amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW01lcmdlLVF1ZXVlXSBBZGQgc3RlcCB0byBt
YWtlIGNvbW1lbnQgb24gcHVsbCByZXF1ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp
dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9u
cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xv
c2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW0KaW5kZXggZDU2MmI4ZjA2N2MxMjRiOTkxODliOTE5
MjVhOWUzYzBjNjdiNGJlYi4uNzNkM2U4NTNlYzM4MjgyMTMzNjAzM2U0MGZkMTg4NjkyNDczNzNh
MiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dl
YlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25z
Lm1tCkBAIC00OCw2ICs0OCw3IEBAIHN0YXRpYyB2b2lkIGxvYWRQaWN0dXJlSW5QaWN0dXJlKFJl
dGFpblB0cjxUZXN0V0tXZWJWaWV3PiB3ZWJWaWV3KQogICAgIFt3ZWJWaWV3IG9iamVjdEJ5RXZh
bHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCd2aWRlbycpLmFkZEV2
ZW50TGlzdGVuZXIoJ3dlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkJywgZXZlbnQgPT4geyB3
aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgncHJl
c2VudGF0aW9ubW9kZWNoYW5nZWQnKTsgfSk7Il07CiAKICAgICBfX2Jsb2NrIGJvb2wgcHJlc2Vu
dGF0aW9uTW9kZUNoYW5nZWQgPSBmYWxzZTsKKyAgICBBU1NFUlRfVU5VU0VEKHByZXNlbnRhdGlv
bk1vZGVDaGFuZ2VkLCBwcmVzZW50YXRpb25Nb2RlQ2hhbmdlZCk7CiAgICAgW3dlYlZpZXcgcGVy
Zm9ybUFmdGVyUmVjZWl2aW5nTWVzc2FnZTpAInByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIiBhY3Rp
b246XnsgcHJlc2VudGF0aW9uTW9kZUNoYW5nZWQgPSB0cnVlOyB9XTsKIAogICAgIFt3ZWJWaWV3
IG9iamVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHRXaXRoVXNlckdlc3R1cmU6QCJkb2N1bWVudC5x
dWVyeVNlbGVjdG9yKCd2aWRlbycpLndlYmtpdFNldFByZXNlbnRhdGlvbk1vZGUoJ3BpY3R1cmUt
aW4tcGljdHVyZScpIl07Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>