<?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>231814</bug_id>
          
          <creation_ts>2021-10-15 10:20:11 -0700</creation_ts>
          <short_desc>REGRESSION (r277658): WebKit::LocalConnection::createCredentialPrivateKey leaks an NSMutableDictionary</short_desc>
          <delta_ts>2021-10-19 09:24:55 -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>WebXR</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=231954</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>225897</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>jiewen_tan</cc>
    
    <cc>katherine_cheney</cc>
    
    <cc>pascoe</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1804881</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-15 10:20:11 -0700</bug_when>
    <thetext>WebKit::LocalConnection::createCredentialPrivateKey leaks an NSMutableDictionary when an LAContext object is passed to the method.

found by the clang static analyzer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804882</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-15 10:20:31 -0700</bug_when>
    <thetext>&lt;rdar://problem/84307054&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804883</commentid>
    <comment_count>2</comment_count>
      <attachid>441397</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-15 10:25:23 -0700</bug_when>
    <thetext>Created attachment 441397
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804885</commentid>
    <comment_count>3</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-15 10:29:43 -0700</bug_when>
    <thetext>This regressed here:

    Add nil checks for LAContexts before inserting them in the dictionaries.
    &lt;https://bugs.webkit.org/show_bug.cgi?id=225897&gt;
    &lt;https://trac.webkit.org/r277658&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805281</commentid>
    <comment_count>4</comment_count>
      <attachid>441397</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-16 11:13:29 -0700</bug_when>
    <thetext>Comment on attachment 441397
Patch v1

Marking cq+ since:
- ios-sim build is complete, but bubble did not turn green.
- mac-AS-debug-wk2 is failing due to some unrelated sandbox issue.
- api-mac is a day behind, and based on other tests passing, I don&apos;t think this patch will cause any issues.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805282</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-16 11:17:00 -0700</bug_when>
    <thetext>Committed r284319 (243115@main): &lt;https://commits.webkit.org/243115@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441397.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805294</commentid>
    <comment_count>6</comment_count>
      <attachid>441397</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-10-16 12:53:45 -0700</bug_when>
    <thetext>Comment on attachment 441397
Patch v1

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

&gt; Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalConnection.mm:180
&gt; +        privateKeyAttributes = adoptNS([privateKeyAttributes mutableCopy]);
&gt; +        ((NSMutableDictionary *)privateKeyAttributes.get())[(id)kSecUseAuthenticationContext] = context;

Not important for this patch, but coding style wise, I think we should write this without the NSMutableDictionary cast:

    auto mutableCopy = adoptNS([privateKeyAttributes mutableCopy]);
    mutableCopy.get()[(id)kSecUseAuthenticationContext] = context;
    privateKeyAttributes = WTFMove(mutableCopy);

Might have to be more specific about the type somewhere, but something roughly like that should work.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805408</commentid>
    <comment_count>7</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-17 13:13:15 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805409</commentid>
    <comment_count>8</comment_count>
      <attachid>441547</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-17 13:13:17 -0700</bug_when>
    <thetext>Created attachment 441547
Patch for follow-up comments</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805415</commentid>
    <comment_count>9</comment_count>
      <attachid>441547</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-17 13:56:03 -0700</bug_when>
    <thetext>Comment on attachment 441547
Patch for follow-up comments

Marking cq+ since this compiled on Cocoa platforms.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805420</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-17 14:19:40 -0700</bug_when>
    <thetext>Committed r284342 (243136@main): &lt;https://commits.webkit.org/243136@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441547.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805463</commentid>
    <comment_count>11</comment_count>
      <attachid>441547</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-10-17 21:25:08 -0700</bug_when>
    <thetext>Comment on attachment 441547
Patch for follow-up comments

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

&gt; Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalConnection.mm:181
&gt; +        privateKeyAttributes = mutableCopy;

No WTFMove? Seems like it would remove one retain/release cycle.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806013</commentid>
    <comment_count>12</comment_count>
      <attachid>441547</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-19 08:20:05 -0700</bug_when>
    <thetext>Comment on attachment 441547
Patch for follow-up comments

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

&gt;&gt; Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalConnection.mm:181
&gt;&gt; +        privateKeyAttributes = mutableCopy;
&gt; 
&gt; No WTFMove? Seems like it would remove one retain/release cycle.

I reimplemented your patch (instead of copy-pasting the code), and simply missed the WTMove().

Filed this bug to track catching that in more places:
Bug 231954: clang-tidy checker to find places where WTFMove/std::move are missing with RetainPtr&lt;&gt;

Will post a follow-up patch in a bit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806015</commentid>
    <comment_count>13</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-19 08:23:04 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806016</commentid>
    <comment_count>14</comment_count>
      <attachid>441728</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-19 08:23:06 -0700</bug_when>
    <thetext>Created attachment 441728
Patch for follow-up comments #2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806020</commentid>
    <comment_count>15</comment_count>
      <attachid>441728</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-19 08:28:10 -0700</bug_when>
    <thetext>Comment on attachment 441728
Patch for follow-up comments #2

Adding cq+ since it compiles.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806056</commentid>
    <comment_count>16</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-19 09:24:53 -0700</bug_when>
    <thetext>Committed r284458 (243218@main): &lt;https://commits.webkit.org/243218@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441728.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441397</attachid>
            <date>2021-10-15 10:25:23 -0700</date>
            <delta_ts>2021-10-16 11:17:01 -0700</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-231814-20211015102522.patch</filename>
            <type>text/plain</type>
            <size>2639</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkZDdhMzExZTZlODFkM2Q5
NTE4NTJiZWYxOTRhN2IyMjg3YWZjNTcuLjY2NWRjZDczZmVkNjgyOWRlNzlkNmExZDM0MmJmNmI4
ODg0MDY3ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTAtMTUgIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQ6OkxvY2FsQ29ubmVj
dGlvbjo6Y3JlYXRlQ3JlZGVudGlhbFByaXZhdGVLZXkgbGVha3MgYW4gTlNNdXRhYmxlRGljdGlv
bmFyeQorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjMxODE0PgorICAgICAgICA8cmRh
cjovL3Byb2JsZW0vODQzMDcwNTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxD
b25uZWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpMb2NhbENvbm5lY3Rpb246OmNyZWF0ZUNy
ZWRlbnRpYWxQcml2YXRlS2V5IGNvbnN0KToKKyAgICAgICAgLSBVc2UgUmV0YWluUHRyPD4gYW5k
IGFkb3B0TlMgdG8gZml4IHRoZSBsZWFrLgorCiAyMDIxLTEwLTE0ICBEYXZpZCBLaWx6ZXIgIDxk
ZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlLWFmdGVyLW1vdmUgb2YgbV9zb2NrZXRz
IGluIE5ldHdvcmtSVENQcm92aWRlcjo6Y2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxDb25uZWN0aW9uLm1tIGIv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxDb25u
ZWN0aW9uLm1tCmluZGV4IDM1OGYxMTZmYTU3YTM0Y2Q5MGFlYzNiNTA1OTU5MjE4NTVlYjFiOTcu
LjU3OTc1NjI3ZjZiZmNmN2M4MzUzYTYzNjlmMjAyMmI0MzZkMjJkYmUgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQ29ubmVj
dGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9D
b2NvYS9Mb2NhbENvbm5lY3Rpb24ubW0KQEAgLTE2Nyw3ICsxNjcsNyBAQCB2b2lkIExvY2FsQ29u
bmVjdGlvbjo6dmVyaWZ5VXNlcihTZWNBY2Nlc3NDb250cm9sUmVmIGFjY2Vzc0NvbnRyb2wsIExB
Q29udGV4dCAqYwogCiBSZXRhaW5QdHI8U2VjS2V5UmVmPiBMb2NhbENvbm5lY3Rpb246OmNyZWF0
ZUNyZWRlbnRpYWxQcml2YXRlS2V5KExBQ29udGV4dCAqY29udGV4dCwgU2VjQWNjZXNzQ29udHJv
bFJlZiBhY2Nlc3NDb250cm9sUmVmLCBjb25zdCBTdHJpbmcmIHNlY0F0dHJMYWJlbCwgTlNEYXRh
ICpzZWNBdHRyQXBwbGljYXRpb25UYWcpIGNvbnN0CiB7Ci0gICAgTlNEaWN0aW9uYXJ5ICpwcml2
YXRlS2V5QXR0cmlidXRlcyA9IEB7CisgICAgUmV0YWluUHRyIHByaXZhdGVLZXlBdHRyaWJ1dGVz
ID0gQHsKICAgICAgICAgKGlkKWtTZWNBdHRyQWNjZXNzQ29udHJvbDogKGlkKWFjY2Vzc0NvbnRy
b2xSZWYsCiAgICAgICAgIChpZClrU2VjQXR0cklzUGVybWFuZW50OiBAWUVTLAogICAgICAgICAo
aWQpa1NlY0F0dHJBY2Nlc3NHcm91cDogKGlkKVN0cmluZyhMb2NhbEF1dGhlbnRpY2F0aW9yQWNj
ZXNzR3JvdXApLApAQCAtMTc2LDE1ICsxNzYsMTUgQEAgUmV0YWluUHRyPFNlY0tleVJlZj4gTG9j
YWxDb25uZWN0aW9uOjpjcmVhdGVDcmVkZW50aWFsUHJpdmF0ZUtleShMQUNvbnRleHQgKmNvbnQK
ICAgICB9OwogCiAgICAgaWYgKGNvbnRleHQpIHsKLSAgICAgICAgcHJpdmF0ZUtleUF0dHJpYnV0
ZXMgPSBbcHJpdmF0ZUtleUF0dHJpYnV0ZXMgbXV0YWJsZUNvcHldOwotICAgICAgICAoKE5TTXV0
YWJsZURpY3Rpb25hcnkgKilwcml2YXRlS2V5QXR0cmlidXRlcylbKGlkKWtTZWNVc2VBdXRoZW50
aWNhdGlvbkNvbnRleHRdID0gY29udGV4dDsKKyAgICAgICAgcHJpdmF0ZUtleUF0dHJpYnV0ZXMg
PSBhZG9wdE5TKFtwcml2YXRlS2V5QXR0cmlidXRlcyBtdXRhYmxlQ29weV0pOworICAgICAgICAo
KE5TTXV0YWJsZURpY3Rpb25hcnkgKilwcml2YXRlS2V5QXR0cmlidXRlcy5nZXQoKSlbKGlkKWtT
ZWNVc2VBdXRoZW50aWNhdGlvbkNvbnRleHRdID0gY29udGV4dDsKICAgICB9CiAKICAgICBOU0Rp
Y3Rpb25hcnkgKmF0dHJpYnV0ZXMgPSBAewogICAgICAgICAoaWQpa1NlY0F0dHJUb2tlbklEOiAo
aWQpa1NlY0F0dHJUb2tlbklEU2VjdXJlRW5jbGF2ZSwKICAgICAgICAgKGlkKWtTZWNBdHRyS2V5
VHlwZTogKGlkKWtTZWNBdHRyS2V5VHlwZUVDU0VDUHJpbWVSYW5kb20sCiAgICAgICAgIChpZClr
U2VjQXR0cktleVNpemVJbkJpdHM6IEAyNTYsCi0gICAgICAgIChpZClrU2VjUHJpdmF0ZUtleUF0
dHJzOiBwcml2YXRlS2V5QXR0cmlidXRlcywKKyAgICAgICAgKGlkKWtTZWNQcml2YXRlS2V5QXR0
cnM6IHByaXZhdGVLZXlBdHRyaWJ1dGVzLmdldCgpLAogICAgIH07CiAKICAgICBMT0NBTF9DT05O
RUNUSU9OX0FERElUSU9OUwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441547</attachid>
            <date>2021-10-17 13:13:17 -0700</date>
            <delta_ts>2021-10-17 14:19:41 -0700</delta_ts>
            <desc>Patch for follow-up comments</desc>
            <filename>bug-231814-20211017131316.patch</filename>
            <type>text/plain</type>
            <size>1893</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdkZTU3YjU2ODA2YjcwNmY4
NTQzMjQ2MjllOTA5MzQwOTk5YmQ5YWYuLjg0NzVhNDc0NzUyNTBlYjZkN2QwMDYxMGZkMmU2OGEx
NTQwNjA2YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTAtMTcgIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBGb2xsb3ctdXA6IFdlYktpdDo6
TG9jYWxDb25uZWN0aW9uOjpjcmVhdGVDcmVkZW50aWFsUHJpdmF0ZUtleSBsZWFrcyBhbiBOU011
dGFibGVEaWN0aW9uYXJ5CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8yMzE4MTQ+Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDMwNzA1ND4KKworICAgICAgICBVbnJldmlld2VkIGZv
bGxvdy11cCB0byBhZGRyZXNzIERhcmluJ3MgY29tbWVudHMuCisKKyAgICAgICAgKiBVSVByb2Nl
c3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxDb25uZWN0aW9uLm1tOgorICAgICAgICAo
V2ViS2l0OjpMb2NhbENvbm5lY3Rpb246OmNyZWF0ZUNyZWRlbnRpYWxQcml2YXRlS2V5IGNvbnN0
KToKKyAgICAgICAgLSBSZW1vdmUgbmVlZCBmb3IgQy1zdHlsZSBjYXN0IGJ5IHVzaW5nIGEgbG9j
YWwgdmFyaWFibGUgZm9yIHRoZQorICAgICAgICAgIG11dGFibGUgY29weSBvZiB0aGUgTlNEaWN0
aW9uYXJ5LgorCiAyMDIxLTEwLTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+
CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI4MjIzMCk6IFdlYktpdDo6cmVnaXN0ZXJTY2hlZHVs
ZWRBY3Rpdml0eUhhbmRsZXIoKSBsZWFrcyBhbiB4cGNfb2JqZWN0X3QKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQ29ubmVj
dGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29h
L0xvY2FsQ29ubmVjdGlvbi5tbQppbmRleCA1Nzk3NTYyN2Y2YmZjZjdjODM1M2E2MzY5ZjIwMjJi
NDM2ZDIyZGJlLi44YTE2MjkzNDU3M2IzZjc2ZjRlYWMzMjI0MTk2YWU2YzUzYmNkNDA1IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9M
b2NhbENvbm5lY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu
dGljYXRpb24vQ29jb2EvTG9jYWxDb25uZWN0aW9uLm1tCkBAIC0xNzYsOCArMTc2LDkgQEAgUmV0
YWluUHRyPFNlY0tleVJlZj4gTG9jYWxDb25uZWN0aW9uOjpjcmVhdGVDcmVkZW50aWFsUHJpdmF0
ZUtleShMQUNvbnRleHQgKmNvbnQKICAgICB9OwogCiAgICAgaWYgKGNvbnRleHQpIHsKLSAgICAg
ICAgcHJpdmF0ZUtleUF0dHJpYnV0ZXMgPSBhZG9wdE5TKFtwcml2YXRlS2V5QXR0cmlidXRlcyBt
dXRhYmxlQ29weV0pOwotICAgICAgICAoKE5TTXV0YWJsZURpY3Rpb25hcnkgKilwcml2YXRlS2V5
QXR0cmlidXRlcy5nZXQoKSlbKGlkKWtTZWNVc2VBdXRoZW50aWNhdGlvbkNvbnRleHRdID0gY29u
dGV4dDsKKyAgICAgICAgYXV0byBtdXRhYmxlQ29weSA9IGFkb3B0TlMoW3ByaXZhdGVLZXlBdHRy
aWJ1dGVzIG11dGFibGVDb3B5XSk7CisgICAgICAgIG11dGFibGVDb3B5LmdldCgpWyhpZClrU2Vj
VXNlQXV0aGVudGljYXRpb25Db250ZXh0XSA9IGNvbnRleHQ7CisgICAgICAgIHByaXZhdGVLZXlB
dHRyaWJ1dGVzID0gbXV0YWJsZUNvcHk7CiAgICAgfQogCiAgICAgTlNEaWN0aW9uYXJ5ICphdHRy
aWJ1dGVzID0gQHsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441728</attachid>
            <date>2021-10-19 08:23:06 -0700</date>
            <delta_ts>2021-10-19 09:24:54 -0700</delta_ts>
            <desc>Patch for follow-up comments #2</desc>
            <filename>bug-231814-20211019082305.patch</filename>
            <type>text/plain</type>
            <size>1969</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ0ODE5YTlhZWMzMzEwZDlm
MTc3ZTZiMmZkNjFkMTg2ZWY3NjM0ZDEuLjJiZTQ4YmQ5NGM2ZGUxMWU1ZjA0MjFkMDQ1NDYyZjVk
YzE0M2RmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTAtMTkgIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBGb2xsb3ctdXAgIzI6IFdlYktp
dDo6TG9jYWxDb25uZWN0aW9uOjpjcmVhdGVDcmVkZW50aWFsUHJpdmF0ZUtleSBsZWFrcyBhbiBO
U011dGFibGVEaWN0aW9uYXJ5CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8yMzE4MTQ+
CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDMwNzA1ND4KKworICAgICAgICBVbnJldmlld2Vk
IGZvbGxvdy11cCB0byBhZGRyZXNzIERhcmluJ3MgY29tbWVudC4KKworICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbENvbm5lY3Rpb24ubW06CisgICAgICAg
IChXZWJLaXQ6OkxvY2FsQ29ubmVjdGlvbjo6Y3JlYXRlQ3JlZGVudGlhbFByaXZhdGVLZXkgY29u
c3QpOgorICAgICAgICAtIFVzZSBXVEZNb3ZlKCkgdG8gYXZvaWQgcmVmIGNvdW50IGNodXJuLgor
CiAyMDIxLTEwLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAg
ICAgQnVnIDIzMTg4MjogV2ViS2l0OjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXRUQ0NJ
ZGVudGl0eSgpIGxlYWtzIGEgdGNjX2lkZW50aXR5X3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQ29ubmVjdGlvbi5tbSBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQ29u
bmVjdGlvbi5tbQppbmRleCA4YTE2MjkzNDU3M2IzZjc2ZjRlYWMzMjI0MTk2YWU2YzUzYmNkNDA1
Li5hMDVmMzA1MjIyOTkzOGUzZjFiMGE5MmYxNzQzN2VmMzllYWJmYzUwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbENvbm5l
Y3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v
Q29jb2EvTG9jYWxDb25uZWN0aW9uLm1tCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo
dCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg
KEMpIDIwMTg9MjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk
aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3
aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg
Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE3OCw3ICsxNzgsNyBAQCBSZXRhaW5QdHI8U2VjS2V5
UmVmPiBMb2NhbENvbm5lY3Rpb246OmNyZWF0ZUNyZWRlbnRpYWxQcml2YXRlS2V5KExBQ29udGV4
dCAqY29udAogICAgIGlmIChjb250ZXh0KSB7CiAgICAgICAgIGF1dG8gbXV0YWJsZUNvcHkgPSBh
ZG9wdE5TKFtwcml2YXRlS2V5QXR0cmlidXRlcyBtdXRhYmxlQ29weV0pOwogICAgICAgICBtdXRh
YmxlQ29weS5nZXQoKVsoaWQpa1NlY1VzZUF1dGhlbnRpY2F0aW9uQ29udGV4dF0gPSBjb250ZXh0
OwotICAgICAgICBwcml2YXRlS2V5QXR0cmlidXRlcyA9IG11dGFibGVDb3B5OworICAgICAgICBw
cml2YXRlS2V5QXR0cmlidXRlcyA9IFdURk1vdmUobXV0YWJsZUNvcHkpOwogICAgIH0KIAogICAg
IE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyA9IEB7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>