<?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>238618</bug_id>
          
          <creation_ts>2022-03-31 11:06:57 -0700</creation_ts>
          <short_desc>RemoteRenderingBackendProxy fails to maintain correct state when gpu process crashes and upon deletion</short_desc>
          <delta_ts>2022-04-26 05:41:24 -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>Canvas</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=238624</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>
          
          <blocked>237674</blocked>
    
    <blocked>238516</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Kimmo Kinnunen">kkinnunen</reporter>
          <assigned_to name="Kimmo Kinnunen">kkinnunen</assigned_to>
          <cc>dino</cc>
    
    <cc>Morningstar</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1856874</commentid>
    <comment_count>0</comment_count>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2022-03-31 11:06:57 -0700</bug_when>
    <thetext>RemoteRenderingBackendProxy fails to maintain correct state when gpu process crashes and upon deletion</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1856879</commentid>
    <comment_count>1</comment_count>
      <attachid>456257</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2022-03-31 11:18:23 -0700</bug_when>
    <thetext>Created attachment 456257
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1856906</commentid>
    <comment_count>2</comment_count>
      <attachid>456257</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-03-31 12:12:04 -0700</bug_when>
    <thetext>Comment on attachment 456257
Patch

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

&gt; Source/WebKit/ChangeLog:3
&gt; +        RemoteRenderingBackendProxy fails to maintain correct state when gpu process crashes and upon deletion

But this doesn&apos;t fix the issue where the GPU Process crashes while we&apos;re blocked on the m_wakeUpSemaphore, right?

&gt; Source/WebKit/Platform/IPC/MessageReceiveQueueMap.cpp:64
&gt; +            ALWAYS_LOG_WITH_STREAM(stream &lt;&lt; &quot;MessageReceiveQueueMap::addImpl - adding duplicate any id receiver &quot; &lt;&lt; static_cast&lt;uint8_t&gt;(receiverName));

When debugging I wanted a TextStream&amp; operator&lt;&lt;(TextStream&amp;, ReceiverName). Maybe we should add one, or do some kind of IPC::description() thing that makes them easy to print.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1856912</commentid>
    <comment_count>3</comment_count>
      <attachid>456268</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2022-03-31 12:17:06 -0700</bug_when>
    <thetext>Created attachment 456268
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1856915</commentid>
    <comment_count>4</comment_count>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2022-03-31 12:23:36 -0700</bug_when>
    <thetext>&gt; But this doesn&apos;t fix the issue where the GPU Process crashes while we&apos;re blocked on the m_wakeUpSemaphore, right?

No, this doesn&apos;t address it. Will work on it next week.

&gt;&gt; Source/WebKit/Platform/IPC/MessageReceiveQueueMap.cpp:64
&gt;&gt; +            ALWAYS_LOG_WITH_STREAM(stream &lt;&lt; &quot;MessageReceiveQueueMap::addImpl - adding duplicate any id receiver &quot; &lt;&lt; static_cast&lt;uint8_t&gt;(receiverName));

In fact this was a botched hunk that belonged to previous patch.

&gt; When debugging I wanted a TextStream&amp; operator&lt;&lt;(TextStream&amp;, ReceiverName). Maybe we should add one, or do some kind of IPC::description() thing that makes them easy to print.

Added bug 238624, can do that tomorrow.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1857816</commentid>
    <comment_count>5</comment_count>
      <attachid>456558</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2022-04-04 04:42:32 -0700</bug_when>
    <thetext>Created attachment 456558
For landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1857865</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-04-04 08:46:48 -0700</bug_when>
    <thetext>Committed r292289 (249187@main): &lt;https://commits.webkit.org/249187@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 456558.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1857866</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-04-04 08:47:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/91241701&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1862001</commentid>
    <comment_count>8</comment_count>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2022-04-15 18:22:05 -0700</bug_when>
    <thetext>*** Bug 237295 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>456257</attachid>
            <date>2022-03-31 11:18:23 -0700</date>
            <delta_ts>2022-03-31 12:17:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238618-20220331211822.patch</filename>
            <type>text/plain</type>
            <size>7604</size>
            <attacher name="Kimmo Kinnunen">kkinnunen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU4MjdlMzgzYTVjMjgyNTcw
YzI3M2I3ZDIwNDhjYzUyN2IyZWUzNWIuLjNkMGJkYTY0YTkxZWVmMTI0YTlkZWVlZjA1N2YyZDk0
YTI4YWM4NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDMtMzEgIEtpbW1vIEtp
bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdC
YWNrZW5kUHJveHkgZmFpbHMgdG8gbWFpbnRhaW4gY29ycmVjdCBzdGF0ZSB3aGVuIGdwdSBwcm9j
ZXNzIGNyYXNoZXMgYW5kIHVwb24gZGVsZXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODYxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6bV9uZWVk
c1dha2VVcFNlbWFwaG9yZUZvckRpc3BsYXlMaXN0U3RyZWFtCisgICAgICAgIHdhcyBub3QgcmVz
ZXQgd2hlbiBwcm94eSB3b3VsZCBjb25uZWN0IHRvIGEgbmV3IGdwdSBwcm9jZXNzIGFmdGVyIGEg
Y3Jhc2guCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6flJlbW90ZVJlbmRl
cmluZ0JhY2tlbmRQcm94eSgpIHdvdWxkIG5vdAorICAgICAgICByZW1vdmUgdGhlIEdQVUNvbm5l
Y3Rpb246OkNsaWVudCByZWdpc3RyYXRpb24uCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvTWVz
c2FnZVJlY2VpdmVRdWV1ZU1hcC5jcHA6CisgICAgICAgIChJUEM6Ok1lc3NhZ2VSZWNlaXZlUXVl
dWVNYXA6OnJlbW92ZSk6CisgICAgICAgICogUGxhdGZvcm0vSVBDL1N0cmVhbUNsaWVudENvbm5l
Y3Rpb24uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJp
bmdCYWNrZW5kUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNr
ZW5kUHJveHk6On5SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpOgorICAgICAgICAoV2ViS2l0
OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xv
c2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmRpc2Nv
bm5lY3RHUFVQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu
ZFByb3h5OjpzdHJlYW1Db25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVy
aW5nQmFja2VuZFByb3h5OjpkaWRDcmVhdGVXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0
cmVhbSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5n
QmFja2VuZFByb3h5Lmg6CisKIDIwMjItMDMtMzEgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVu
QGFwcGxlLmNvbT4KIAogICAgICAgICBJUEM6OkNvbm5lY3Rpb24gc2hvdWxkIHN1cHBvcnQgZGl2
ZXJ0aW5nIGFsbCBtZXNzYWdlcyB0byBhIG1lc3NhZ2UgcXVldWUgaW4gb3RoZXIgdGhyZWFkCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9NZXNzYWdlUmVjZWl2ZVF1ZXVl
TWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL01lc3NhZ2VSZWNlaXZlUXVldWVN
YXAuY3BwCmluZGV4IDNkYzQ2M2RlNjM3ODhjYzQyNTQ2ZDBlNTFlMWIwN2Q0OTczMjc0ZGIuLmRl
MmQ0MTZkNDk5M2QxZGY5ODk1NTI4ZjE5NmViNjBmMWY1MTVjNGIgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvUGxhdGZvcm0vSVBDL01lc3NhZ2VSZWNlaXZlUXVldWVNYXAuY3BwCisrKyBiL1Nv
dXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL01lc3NhZ2VSZWNlaXZlUXVldWVNYXAuY3BwCkBAIC01
OSw3ICs1OSwxMCBAQCB2b2lkIE1lc3NhZ2VSZWNlaXZlUXVldWVNYXA6OnJlbW92ZShSZWNlaXZl
ck1hdGNoZXIgbWF0Y2hlcikKICAgICB1aW50OF90IHJlY2VpdmVyTmFtZSA9IHN0YXRpY19jYXN0
PHVpbnQ4X3Q+KCptYXRjaGVyLnJlY2VpdmVyTmFtZSk7CiAgICAgaWYgKCFtYXRjaGVyLmRlc3Rp
bmF0aW9uSUQpIHsKICAgICAgICAgYXV0byByZXN1bHQgPSBtX2FueUlEUXVldWVzLnJlbW92ZShy
ZWNlaXZlck5hbWUpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVzdWx0KTsKKyAg
ICAgICAgaWYgKHJlc3VsdCkgeworICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJl
IGFuIGFzc2VydGlvbi4gU2VlIHdlYmtpdC5vcmcvYi8yMzc2NzQgYW5kIHdlYmtpdC5vcmcvYi8y
MzgzOTEuCisgICAgICAgICAgICBBTFdBWVNfTE9HX1dJVEhfU1RSRUFNKHN0cmVhbSA8PCAiTWVz
c2FnZVJlY2VpdmVRdWV1ZU1hcDo6YWRkSW1wbCAtIGFkZGluZyBkdXBsaWNhdGUgYW55IGlkIHJl
Y2VpdmVyICIgPDwgc3RhdGljX2Nhc3Q8dWludDhfdD4ocmVjZWl2ZXJOYW1lKSk7CisgICAgICAg
IH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBhdXRvIHJlc3VsdCA9IG1fcXVldWVzLnJl
bW92ZShzdGQ6Om1ha2VfcGFpcihyZWNlaXZlck5hbWUsICptYXRjaGVyLmRlc3RpbmF0aW9uSUQp
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL1N0cmVhbUNsaWVudENv
bm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL1N0cmVhbUNsaWVudENvbm5l
Y3Rpb24uaAppbmRleCBiYjdiM2E2ZWI4YTZkY2IyOWEwYzM4NTUzZmYzM2Y1Nzg3ZjJhY2I4Li4w
YTYxMDExYTBiMTQxMWI3ZDczMGU0MzQyZGUyNzc0MzgxYWExN2IwIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9TdHJlYW1DbGllbnRDb25uZWN0aW9uLmgKKysrIGIvU291
cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvU3RyZWFtQ2xpZW50Q29ubmVjdGlvbi5oCkBAIC02MSw2
ICs2MSw3IEBAIHB1YmxpYzoKIAogICAgIFN0cmVhbUNvbm5lY3Rpb25CdWZmZXImIHN0cmVhbUJ1
ZmZlcigpIHsgcmV0dXJuIG1fYnVmZmVyOyB9CiAgICAgdm9pZCBzZXRXYWtlVXBTZW1hcGhvcmUo
SVBDOjpTZW1hcGhvcmUmJik7CisgICAgYm9vbCBoYXNXYWtlVXBTZW1hcGhvcmUoKSBjb25zdCB7
IHJldHVybiBtX3dha2VVcFNlbWFwaG9yZS5oYXNfdmFsdWUoKTsgfQogCiAgICAgdm9pZCBzZXRX
YWtlVXBNZXNzYWdlSHlzdGVyZXNpcyh1bnNpZ25lZCBoeXN0ZXJlc2lzKQogICAgIHsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVy
aW5nQmFja2VuZFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhp
Y3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAppbmRleCA2Yjk0NzhkZWQ1MjFlMzNh
NDg1MGM2YmRkYTg5ZjQwNzc2YTY2MTcwLi4yYjk4MjBkNzQ3M2E1YjA3ZWY4ZTU4ODgyYWQ5MTYx
MWViOGM2ZDM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo
aWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCkBA
IC02MywxMiArNjMsOCBAQCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6On5SZW1vdGVSZW5k
ZXJpbmdCYWNrZW5kUHJveHkoKQogewogICAgIGlmICghbV9ncHVQcm9jZXNzQ29ubmVjdGlvbikK
ICAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gVW4tcmVnaXN0ZXIgaXRzZWxmIGFzIGEgTWVzc2Fn
ZVJlY2VpdmVyLgotICAgIG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24tPm1lc3NhZ2VSZWNlaXZlck1h
cCgpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcigqdGhpcyk7Ci0KLSAgICAvLyBSZWxlYXNlIHRoZSBS
ZW1vdGVSZW5kZXJpbmdCYWNrZW5kLgogICAgIG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24tPmNvbm5l
Y3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpSZWxlYXNl
UmVuZGVyaW5nQmFja2VuZChyZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcigpKSwgMCwgSVBDOjpT
ZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwor
ICAgIGRpc2Nvbm5lY3RHUFVQcm9jZXNzKCk7CiB9CiAKIEdQVVByb2Nlc3NDb25uZWN0aW9uJiBS
ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkK
QEAgLTkwLDE5ICs4NiwyNyBAQCBJUEM6OkNvbm5lY3Rpb24mIFJlbW90ZVJlbmRlcmluZ0JhY2tl
bmRQcm94eTo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb24oKQogICAgIHJldHVybiBlbnN1cmVHUFVQcm9j
ZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKTsKIH0KIAotdm9pZCBSZW1vdGVSZW5kZXJpbmdC
YWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5l
Y3Rpb24mIHByZXZpb3VzQ29ubmVjdGlvbikKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy
b3h5OjpncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJikK
IHsKLSAgICBwcmV2aW91c0Nvbm5lY3Rpb24ucmVtb3ZlQ2xpZW50KCp0aGlzKTsKLSAgICBwcmV2
aW91c0Nvbm5lY3Rpb24ubWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVy
KCp0aGlzKTsKLSAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9uID0gbnVsbHB0cjsKLQorICAgIGlm
ICghbV9ncHVQcm9jZXNzQ29ubmVjdGlvbikKKyAgICAgICAgcmV0dXJuOworICAgIGRpc2Nvbm5l
Y3RHUFVQcm9jZXNzKCk7CisgICAgLy8gTm90ZTogVGhlIGNhY2hlIHdpbGwgY2FsbCBiYWNrIHRv
IHRoaXMgdG8gc2V0dXAgYSBuZXcgY29ubmVjdGlvbi4KICAgICBtX3JlbW90ZVJlc291cmNlQ2Fj
aGVQcm94eS5yZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCk7Cit9CisKK3ZvaWQgUmVt
b3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpkaXNjb25uZWN0R1BVUHJvY2VzcygpCit7CisgICAg
bV9ncHVQcm9jZXNzQ29ubmVjdGlvbi0+cmVtb3ZlQ2xpZW50KCp0aGlzKTsKKyAgICBtX2dwdVBy
b2Nlc3NDb25uZWN0aW9uLT5tZXNzYWdlUmVjZWl2ZXJNYXAoKS5yZW1vdmVNZXNzYWdlUmVjZWl2
ZXIoKnRoaXMpOworICAgIG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24gPSBudWxscHRyOwogCiAgICAg
aWYgKG1fZGVzdHJveUdldFBpeGVsQnVmZmVyU2hhcmVkTWVtb3J5VGltZXIuaXNBY3RpdmUoKSkK
ICAgICAgICAgbV9kZXN0cm95R2V0UGl4ZWxCdWZmZXJTaGFyZWRNZW1vcnlUaW1lci5zdG9wKCk7
CiAgICAgbV9nZXRQaXhlbEJ1ZmZlclNoYXJlZE1lbW9yeSA9IG51bGxwdHI7CiAgICAgbV9yZW5k
ZXJpbmdVcGRhdGVJRCA9IHsgfTsKICAgICBtX2RpZFJlbmRlcmluZ1VwZGF0ZUlEID0geyB9Owor
ICAgIG1fc3RyZWFtQ29ubmVjdGlvbiA9IG51bGxwdHI7CiB9CiAKIFJlbW90ZVJlbmRlcmluZ0Jh
Y2tlbmRQcm94eTo6RGlkUmVjZWl2ZUJhY2tlbmRDcmVhdGlvblJlc3VsdCBSZW1vdGVSZW5kZXJp
bmdCYWNrZW5kUHJveHk6OndhaXRGb3JEaWRDcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmQoKQpAQCAt
NDE1LDcgKzQxOSw3IEBAIFJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyIFJlbW90ZVJlbmRlcmlu
Z0JhY2tlbmRQcm94eTo6ZW5zdXJlQmFja2VuZENyZWF0ZWQoKQogSVBDOjpTdHJlYW1DbGllbnRD
b25uZWN0aW9uJiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnN0cmVhbUNvbm5lY3Rpb24o
KQogewogICAgIGVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCk7Ci0gICAgaWYgKFVOTElLRUxZ
KG1fbmVlZHNXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbSkpCisgICAgaWYgKFVO
TElLRUxZKCFtX3N0cmVhbUNvbm5lY3Rpb24tPmhhc1dha2VVcFNlbWFwaG9yZSgpKSkKICAgICAg
ICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24oKS53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxN
ZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpEaWRDcmVhdGVXYWtlVXBTZW1h
cGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbT4ocmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIoKSwg
M19zLCBJUEM6OldhaXRGb3JPcHRpb246OkludGVycnVwdFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJy
aXZlcyk7CiAgICAgcmV0dXJuICptX3N0cmVhbUNvbm5lY3Rpb247CiB9CkBAIC00MjYsOSArNDMw
LDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmRpZENyZWF0ZVdha2VVcFNl
bWFwaG9yZUZvckRpc3BsYXlMaXN0U3RyZWFtKEkKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE
KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KICAgICBtX3N0cmVhbUNvbm5lY3Rpb24tPnNl
dFdha2VVcFNlbWFwaG9yZShXVEZNb3ZlKHNlbWFwaG9yZSkpOwotICAgIG1fbmVlZHNXYWtlVXBT
ZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbSA9IGZhbHNlOwogfQogCiBib29sIFJlbW90ZVJl
bmRlcmluZ0JhY2tlbmRQcm94eTo6aXNDYWNoZWQoY29uc3QgSW1hZ2VCdWZmZXImIGltYWdlQnVm
ZmVyKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw
aGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmgKaW5kZXggY2I4
NTg4YzgzZTE1OTZiODljMjExMGEyYjNlNDM4NGFkMTIzODg1OC4uZDhlNTkxZmQzNmEzYmZkMjI0
ZjQyNjg4YTYxMWI0Y2JmMzI0ZDRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ
cm94eS5oCkBAIC0xNjEsNiArMTYxLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGdwdVByb2Nlc3ND
b25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mKSBmaW5hbDsKIAogICAgIEdQ
VVByb2Nlc3NDb25uZWN0aW9uJiBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOworICAgIHZv
aWQgZGlzY29ubmVjdEdQVVByb2Nlc3MoKTsKICAgICBJUEM6OkNvbm5lY3Rpb24mIGdwdVByb2Nl
c3NDb25uZWN0aW9uKCk7CiAKICAgICAvLyBSZXR1cm5zIHN0ZDo6bnVsbG9wdCBpZiBubyB1cGRh
dGUgaXMgbmVlZGVkIG9yIGFsbG9jYXRpb24gZmFpbGVkLgpAQCAtMTgyLDggKzE4Myw2IEBAIHBy
aXZhdGU6CiAKICAgICBSZW5kZXJpbmdVcGRhdGVJRCBtX3JlbmRlcmluZ1VwZGF0ZUlEOwogICAg
IFJlbmRlcmluZ1VwZGF0ZUlEIG1fZGlkUmVuZGVyaW5nVXBkYXRlSUQ7Ci0KLSAgICBib29sIG1f
bmVlZHNXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbSB7IHRydWUgfTsKIH07CiAK
IH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>456268</attachid>
            <date>2022-03-31 12:17:06 -0700</date>
            <delta_ts>2022-04-04 04:42:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238618-20220331221704.patch</filename>
            <type>text/plain</type>
            <size>6573</size>
            <attacher name="Kimmo Kinnunen">kkinnunen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ0NzJiODcwN2E3Y2YyNDY2
MWNhZTI4YTRhZGNhMDE5NjRjMWI5MDMuLjg2NmE1ODZiZGM0NGY4NzI3MWMwM2ZhNjQzZjQzZDVj
ODNkYjI3ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDMtMzEgIEtpbW1vIEtp
bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdC
YWNrZW5kUHJveHkgZmFpbHMgdG8gbWFpbnRhaW4gY29ycmVjdCBzdGF0ZSB3aGVuIGdwdSBwcm9j
ZXNzIGNyYXNoZXMgYW5kIHVwb24gZGVsZXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODYxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6bV9uZWVk
c1dha2VVcFNlbWFwaG9yZUZvckRpc3BsYXlMaXN0U3RyZWFtCisgICAgICAgIHdhcyBub3QgcmVz
ZXQgd2hlbiBwcm94eSB3b3VsZCBjb25uZWN0IHRvIGEgbmV3IGdwdSBwcm9jZXNzIGFmdGVyIGEg
Y3Jhc2guCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6flJlbW90ZVJlbmRl
cmluZ0JhY2tlbmRQcm94eSgpIHdvdWxkIG5vdAorICAgICAgICByZW1vdmUgdGhlIEdQVUNvbm5l
Y3Rpb246OkNsaWVudCByZWdpc3RyYXRpb24uCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvTWVz
c2FnZVJlY2VpdmVRdWV1ZU1hcC5jcHA6CisgICAgICAgIChJUEM6Ok1lc3NhZ2VSZWNlaXZlUXVl
dWVNYXA6OnJlbW92ZSk6CisgICAgICAgICogUGxhdGZvcm0vSVBDL1N0cmVhbUNsaWVudENvbm5l
Y3Rpb24uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJp
bmdCYWNrZW5kUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNr
ZW5kUHJveHk6On5SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpOgorICAgICAgICAoV2ViS2l0
OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xv
c2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmRpc2Nv
bm5lY3RHUFVQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu
ZFByb3h5OjpzdHJlYW1Db25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVy
aW5nQmFja2VuZFByb3h5OjpkaWRDcmVhdGVXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0
cmVhbSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5n
QmFja2VuZFByb3h5Lmg6CisKIDIwMjItMDMtMzEgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVu
QGFwcGxlLmNvbT4KIAogICAgICAgICBJUEM6OkNvbm5lY3Rpb24gc2hvdWxkIHN1cHBvcnQgZGl2
ZXJ0aW5nIGFsbCBtZXNzYWdlcyB0byBhIG1lc3NhZ2UgcXVldWUgaW4gb3RoZXIgdGhyZWFkCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9TdHJlYW1DbGllbnRDb25uZWN0
aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9TdHJlYW1DbGllbnRDb25uZWN0aW9u
LmgKaW5kZXggYmI3YjNhNmViOGE2ZGNiMjlhMGMzODU1M2ZmMzNmNTc4N2YyYWNiOC4uMGE2MTAx
MWEwYjE0MTFiN2Q3MzBlNDM0MmRlMjc3NDM4MWFhMTdiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9QbGF0Zm9ybS9JUEMvU3RyZWFtQ2xpZW50Q29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9X
ZWJLaXQvUGxhdGZvcm0vSVBDL1N0cmVhbUNsaWVudENvbm5lY3Rpb24uaApAQCAtNjEsNiArNjEs
NyBAQCBwdWJsaWM6CiAKICAgICBTdHJlYW1Db25uZWN0aW9uQnVmZmVyJiBzdHJlYW1CdWZmZXIo
KSB7IHJldHVybiBtX2J1ZmZlcjsgfQogICAgIHZvaWQgc2V0V2FrZVVwU2VtYXBob3JlKElQQzo6
U2VtYXBob3JlJiYpOworICAgIGJvb2wgaGFzV2FrZVVwU2VtYXBob3JlKCkgY29uc3QgeyByZXR1
cm4gbV93YWtlVXBTZW1hcGhvcmUuaGFzX3ZhbHVlKCk7IH0KIAogICAgIHZvaWQgc2V0V2FrZVVw
TWVzc2FnZUh5c3RlcmVzaXModW5zaWduZWQgaHlzdGVyZXNpcykKICAgICB7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0Jh
Y2tlbmRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl
bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKaW5kZXggNmI5NDc4ZGVkNTIxZTMzYTQ4NTBj
NmJkZGE4OWY0MDc3NmE2NjE3MC4uMmI5ODIwZDc0NzNhNWIwN2VmOGU1ODg4MmFkOTE2MTFlYjhj
NmQzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9S
ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcApAQCAtNjMs
MTIgKzYzLDggQEAgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp+UmVtb3RlUmVuZGVyaW5n
QmFja2VuZFByb3h5KCkKIHsKICAgICBpZiAoIW1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24pCiAgICAg
ICAgIHJldHVybjsKLQotICAgIC8vIFVuLXJlZ2lzdGVyIGl0c2VsZiBhcyBhIE1lc3NhZ2VSZWNl
aXZlci4KLSAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9uLT5tZXNzYWdlUmVjZWl2ZXJNYXAoKS5y
ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoKnRoaXMpOwotCi0gICAgLy8gUmVsZWFzZSB0aGUgUmVtb3Rl
UmVuZGVyaW5nQmFja2VuZC4KICAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9uLT5jb25uZWN0aW9u
KCkuc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UmVsZWFzZVJlbmRl
cmluZ0JhY2tlbmQocmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIoKSksIDAsIElQQzo6U2VuZE9w
dGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKKyAgICBk
aXNjb25uZWN0R1BVUHJvY2VzcygpOwogfQogCiBHUFVQcm9jZXNzQ29ubmVjdGlvbiYgUmVtb3Rl
UmVuZGVyaW5nQmFja2VuZFByb3h5OjplbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpCkBAIC05
MCwxOSArODYsMjcgQEAgSVBDOjpDb25uZWN0aW9uJiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv
eHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uKCkKICAgICByZXR1cm4gZW5zdXJlR1BVUHJvY2Vzc0Nv
bm5lY3Rpb24oKS5jb25uZWN0aW9uKCk7CiB9CiAKLXZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2Vu
ZFByb3h5OjpncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9u
JiBwcmV2aW91c0Nvbm5lY3Rpb24pCit2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6
Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZShHUFVQcm9jZXNzQ29ubmVjdGlvbiYpCiB7Ci0g
ICAgcHJldmlvdXNDb25uZWN0aW9uLnJlbW92ZUNsaWVudCgqdGhpcyk7Ci0gICAgcHJldmlvdXND
b25uZWN0aW9uLm1lc3NhZ2VSZWNlaXZlck1hcCgpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcigqdGhp
cyk7Ci0gICAgbV9ncHVQcm9jZXNzQ29ubmVjdGlvbiA9IG51bGxwdHI7Ci0KKyAgICBpZiAoIW1f
Z3B1UHJvY2Vzc0Nvbm5lY3Rpb24pCisgICAgICAgIHJldHVybjsKKyAgICBkaXNjb25uZWN0R1BV
UHJvY2VzcygpOworICAgIC8vIE5vdGU6IFRoZSBjYWNoZSB3aWxsIGNhbGwgYmFjayB0byB0aGlz
IHRvIHNldHVwIGEgbmV3IGNvbm5lY3Rpb24uCiAgICAgbV9yZW1vdGVSZXNvdXJjZUNhY2hlUHJv
eHkucmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCgpOworfQorCit2b2lkIFJlbW90ZVJl
bmRlcmluZ0JhY2tlbmRQcm94eTo6ZGlzY29ubmVjdEdQVVByb2Nlc3MoKQoreworICAgIG1fZ3B1
UHJvY2Vzc0Nvbm5lY3Rpb24tPnJlbW92ZUNsaWVudCgqdGhpcyk7CisgICAgbV9ncHVQcm9jZXNz
Q29ubmVjdGlvbi0+bWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0
aGlzKTsKKyAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9uID0gbnVsbHB0cjsKIAogICAgIGlmICht
X2Rlc3Ryb3lHZXRQaXhlbEJ1ZmZlclNoYXJlZE1lbW9yeVRpbWVyLmlzQWN0aXZlKCkpCiAgICAg
ICAgIG1fZGVzdHJveUdldFBpeGVsQnVmZmVyU2hhcmVkTWVtb3J5VGltZXIuc3RvcCgpOwogICAg
IG1fZ2V0UGl4ZWxCdWZmZXJTaGFyZWRNZW1vcnkgPSBudWxscHRyOwogICAgIG1fcmVuZGVyaW5n
VXBkYXRlSUQgPSB7IH07CiAgICAgbV9kaWRSZW5kZXJpbmdVcGRhdGVJRCA9IHsgfTsKKyAgICBt
X3N0cmVhbUNvbm5lY3Rpb24gPSBudWxscHRyOwogfQogCiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k
UHJveHk6OkRpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1bHQgUmVtb3RlUmVuZGVyaW5nQmFj
a2VuZFByb3h5Ojp3YWl0Rm9yRGlkQ3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kKCkKQEAgLTQxNSw3
ICs0MTksNyBAQCBSZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciBSZW1vdGVSZW5kZXJpbmdCYWNr
ZW5kUHJveHk6OmVuc3VyZUJhY2tlbmRDcmVhdGVkKCkKIElQQzo6U3RyZWFtQ2xpZW50Q29ubmVj
dGlvbiYgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpzdHJlYW1Db25uZWN0aW9uKCkKIHsK
ICAgICBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOwotICAgIGlmIChVTkxJS0VMWShtX25l
ZWRzV2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RTdHJlYW0pKQorICAgIGlmIChVTkxJS0VM
WSghbV9zdHJlYW1Db25uZWN0aW9uLT5oYXNXYWtlVXBTZW1hcGhvcmUoKSkpCiAgICAgICAgIGdw
dVByb2Nlc3NDb25uZWN0aW9uKCkud2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2Fn
ZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkQ3JlYXRlV2FrZVVwU2VtYXBob3Jl
Rm9yRGlzcGxheUxpc3RTdHJlYW0+KHJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKCksIDNfcywg
SVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2ZXMp
OwogICAgIHJldHVybiAqbV9zdHJlYW1Db25uZWN0aW9uOwogfQpAQCAtNDI2LDkgKzQzMCw3IEBA
IHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpkaWRDcmVhdGVXYWtlVXBTZW1hcGhv
cmVGb3JEaXNwbGF5TGlzdFN0cmVhbShJCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog
ICAgICAgICByZXR1cm47CiAgICAgfQotCiAgICAgbV9zdHJlYW1Db25uZWN0aW9uLT5zZXRXYWtl
VXBTZW1hcGhvcmUoV1RGTW92ZShzZW1hcGhvcmUpKTsKLSAgICBtX25lZWRzV2FrZVVwU2VtYXBo
b3JlRm9yRGlzcGxheUxpc3RTdHJlYW0gPSBmYWxzZTsKIH0KIAogYm9vbCBSZW1vdGVSZW5kZXJp
bmdCYWNrZW5kUHJveHk6OmlzQ2FjaGVkKGNvbnN0IEltYWdlQnVmZmVyJiBpbWFnZUJ1ZmZlcikg
Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv
UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
R1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oCmluZGV4IGNiODU4OGM4
M2UxNTk2Yjg5YzIxMTBhMmIzZTQzODRhZDEyMzg4NTguLmQ4ZTU5MWZkMzZhM2JmZDIyNGY0MjY4
OGE2MTFiNGNiZjMyNGQ0YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H
UFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmgKKysrIGIvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHku
aApAQCAtMTYxLDYgKzE2MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBncHVQcm9jZXNzQ29ubmVj
dGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJikgZmluYWw7CiAKICAgICBHUFVQcm9j
ZXNzQ29ubmVjdGlvbiYgZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKTsKKyAgICB2b2lkIGRp
c2Nvbm5lY3RHUFVQcm9jZXNzKCk7CiAgICAgSVBDOjpDb25uZWN0aW9uJiBncHVQcm9jZXNzQ29u
bmVjdGlvbigpOwogCiAgICAgLy8gUmV0dXJucyBzdGQ6Om51bGxvcHQgaWYgbm8gdXBkYXRlIGlz
IG5lZWRlZCBvciBhbGxvY2F0aW9uIGZhaWxlZC4KQEAgLTE4Miw4ICsxODMsNiBAQCBwcml2YXRl
OgogCiAgICAgUmVuZGVyaW5nVXBkYXRlSUQgbV9yZW5kZXJpbmdVcGRhdGVJRDsKICAgICBSZW5k
ZXJpbmdVcGRhdGVJRCBtX2RpZFJlbmRlcmluZ1VwZGF0ZUlEOwotCi0gICAgYm9vbCBtX25lZWRz
V2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RTdHJlYW0geyB0cnVlIH07CiB9OwogCiB9IC8v
IG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>456558</attachid>
            <date>2022-04-04 04:42:32 -0700</date>
            <delta_ts>2022-04-04 08:46:49 -0700</delta_ts>
            <desc>For landing</desc>
            <filename>bug-238618-20220404144231.patch</filename>
            <type>text/plain</type>
            <size>6530</size>
            <attacher name="Kimmo Kinnunen">kkinnunen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ0MTdiMWUyMjk1NTcxYzU0
N2VmNWNhYTU5ZjUwMDYwNjVlYjgwYzQuLjhiMjg0MWFhZDM4N2M5NmZhOGQ3NThiMjc3NWNmN2I1
MTY4MjgxMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDQtMDQgIEtpbW1vIEtp
bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdC
YWNrZW5kUHJveHkgZmFpbHMgdG8gbWFpbnRhaW4gY29ycmVjdCBzdGF0ZSB3aGVuIGdwdSBwcm9j
ZXNzIGNyYXNoZXMgYW5kIHVwb24gZGVsZXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODYxOAorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u
IEZyYXNlci4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6Om1fbmVlZHNX
YWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbQorICAgICAgICB3YXMgbm90IHJlc2V0
IHdoZW4gcHJveHkgd291bGQgY29ubmVjdCB0byBhIG5ldyBncHUgcHJvY2VzcyBhZnRlciBhIGNy
YXNoLgorICAgICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6On5SZW1vdGVSZW5kZXJp
bmdCYWNrZW5kUHJveHkoKSB3b3VsZCBub3QKKyAgICAgICAgcmVtb3ZlIHRoZSBHUFVDb25uZWN0
aW9uOjpDbGllbnQgcmVnaXN0cmF0aW9uLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL01lc3Nh
Z2VSZWNlaXZlUXVldWVNYXAuY3BwOgorICAgICAgICAoSVBDOjpNZXNzYWdlUmVjZWl2ZVF1ZXVl
TWFwOjpyZW1vdmUpOgorICAgICAgICAqIFBsYXRmb3JtL0lQQy9TdHJlYW1DbGllbnRDb25uZWN0
aW9uLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5n
QmFja2VuZFByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu
ZFByb3h5Ojp+UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KToKKyAgICAgICAgKFdlYktpdDo6
UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3Nl
KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpkaXNjb25u
ZWN0R1BVUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ
cm94eTo6c3RyZWFtQ29ubmVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmlu
Z0JhY2tlbmRQcm94eTo6ZGlkQ3JlYXRlV2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RTdHJl
YW0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0Jh
Y2tlbmRQcm94eS5oOgorCiAyMDIyLTA0LTA0ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBh
cHBsZS5jb20+CiAKICAgICAgICAgU3RyZWFtQ2xpZW50Q29ubmVjdGlvbiBzaG91bGQgaGF2ZSB3
YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Q
bGF0Zm9ybS9JUEMvU3RyZWFtQ2xpZW50Q29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9QbGF0
Zm9ybS9JUEMvU3RyZWFtQ2xpZW50Q29ubmVjdGlvbi5oCmluZGV4IGY5Zjc4OTc5MTkxZTdlNGE4
ZTUzMDFjZDU0NTIwZDJlMmFhNzlhYzAuLjJiNDdlMjVlY2JjMTE4MjQ5MWQyZGZkZTcyODBkN2Jj
MzA1MTFlNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL1N0cmVhbUNs
aWVudENvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9TdHJlYW1D
bGllbnRDb25uZWN0aW9uLmgKQEAgLTYxLDYgKzYxLDcgQEAgcHVibGljOgogCiAgICAgU3RyZWFt
Q29ubmVjdGlvbkJ1ZmZlciYgc3RyZWFtQnVmZmVyKCkgeyByZXR1cm4gbV9idWZmZXI7IH0KICAg
ICB2b2lkIHNldFdha2VVcFNlbWFwaG9yZShJUEM6OlNlbWFwaG9yZSYmKTsKKyAgICBib29sIGhh
c1dha2VVcFNlbWFwaG9yZSgpIGNvbnN0IHsgcmV0dXJuIG1fd2FrZVVwU2VtYXBob3JlLmhhc192
YWx1ZSgpOyB9CiAKICAgICB2b2lkIHNldFdha2VVcE1lc3NhZ2VIeXN0ZXJlc2lzKHVuc2lnbmVk
IGh5c3RlcmVzaXMpCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwIGIvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHku
Y3BwCmluZGV4IGU2YTVlODJlOGFmMjEwZTMyMzIxMmEyNGFjOTQxMjExNDRkYTIwYjguLjgzMjc2
NjMzY2I1NzdkOTU4YjQ0NDVhYTc0Yjk3MTE0NDUwNzE0M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5
LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJl
bmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKQEAgLTYzLDEyICs2Myw4IEBAIFJlbW90ZVJlbmRlcmlu
Z0JhY2tlbmRQcm94eTo6flJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSgpCiB7CiAgICAgaWYg
KCFtX2dwdVByb2Nlc3NDb25uZWN0aW9uKQogICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBVbi1y
ZWdpc3RlciBpdHNlbGYgYXMgYSBNZXNzYWdlUmVjZWl2ZXIuCi0gICAgbV9ncHVQcm9jZXNzQ29u
bmVjdGlvbi0+bWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0aGlz
KTsKLQotICAgIC8vIFJlbGVhc2UgdGhlIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQuCiAgICAgbV9n
cHVQcm9jZXNzQ29ubmVjdGlvbi0+Y29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OkdQVUNvbm5l
Y3Rpb25Ub1dlYlByb2Nlc3M6OlJlbGVhc2VSZW5kZXJpbmdCYWNrZW5kKHJlbmRlcmluZ0JhY2tl
bmRJZGVudGlmaWVyKCkpLCAwLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5X
aGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CisgICAgZGlzY29ubmVjdEdQVVByb2Nlc3MoKTsKIH0K
IAogR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZW5z
dXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKQpAQCAtODUsMTkgKzgxLDI3IEBAIEdQVVByb2Nlc3ND
b25uZWN0aW9uJiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmVuc3VyZUdQVVByb2Nlc3ND
b25uZWN0aW9uKCkKICAgICByZXR1cm4gKm1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb247CiB9CiAKLXZv
aWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENs
b3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJiBwcmV2aW91c0Nvbm5lY3Rpb24pCit2b2lkIFJlbW90
ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZShHUFVQ
cm9jZXNzQ29ubmVjdGlvbiYpCiB7Ci0gICAgcHJldmlvdXNDb25uZWN0aW9uLnJlbW92ZUNsaWVu
dCgqdGhpcyk7Ci0gICAgcHJldmlvdXNDb25uZWN0aW9uLm1lc3NhZ2VSZWNlaXZlck1hcCgpLnJl
bW92ZU1lc3NhZ2VSZWNlaXZlcigqdGhpcyk7Ci0gICAgbV9ncHVQcm9jZXNzQ29ubmVjdGlvbiA9
IG51bGxwdHI7Ci0KKyAgICBpZiAoIW1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24pCisgICAgICAgIHJl
dHVybjsKKyAgICBkaXNjb25uZWN0R1BVUHJvY2VzcygpOworICAgIC8vIE5vdGU6IFRoZSBjYWNo
ZSB3aWxsIGNhbGwgYmFjayB0byB0aGlzIHRvIHNldHVwIGEgbmV3IGNvbm5lY3Rpb24uCiAgICAg
bV9yZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkucmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3ll
ZCgpOworfQorCit2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZGlzY29ubmVjdEdQ
VVByb2Nlc3MoKQoreworICAgIG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24tPnJlbW92ZUNsaWVudCgq
dGhpcyk7CisgICAgbV9ncHVQcm9jZXNzQ29ubmVjdGlvbi0+bWVzc2FnZVJlY2VpdmVyTWFwKCku
cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0aGlzKTsKKyAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9u
ID0gbnVsbHB0cjsKIAogICAgIGlmIChtX2Rlc3Ryb3lHZXRQaXhlbEJ1ZmZlclNoYXJlZE1lbW9y
eVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fZGVzdHJveUdldFBpeGVsQnVmZmVyU2hhcmVk
TWVtb3J5VGltZXIuc3RvcCgpOwogICAgIG1fZ2V0UGl4ZWxCdWZmZXJTaGFyZWRNZW1vcnkgPSBu
dWxscHRyOwogICAgIG1fcmVuZGVyaW5nVXBkYXRlSUQgPSB7IH07CiAgICAgbV9kaWRSZW5kZXJp
bmdVcGRhdGVJRCA9IHsgfTsKKyAgICBtX3N0cmVhbUNvbm5lY3Rpb24gPSBudWxscHRyOwogfQog
CiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OkRpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25S
ZXN1bHQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3YWl0Rm9yRGlkQ3JlYXRlSW1hZ2VC
dWZmZXJCYWNrZW5kKCkKQEAgLTQxMSw3ICs0MTUsNyBAQCBSZW5kZXJpbmdCYWNrZW5kSWRlbnRp
ZmllciBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmVuc3VyZUJhY2tlbmRDcmVhdGVkKCkK
IElQQzo6U3RyZWFtQ2xpZW50Q29ubmVjdGlvbiYgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5
OjpzdHJlYW1Db25uZWN0aW9uKCkKIHsKICAgICBlbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigp
OwotICAgIGlmIChVTkxJS0VMWShtX25lZWRzV2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RT
dHJlYW0pKQorICAgIGlmIChVTkxJS0VMWSghbV9zdHJlYW1Db25uZWN0aW9uLT5oYXNXYWtlVXBT
ZW1hcGhvcmUoKSkpCiAgICAgICAgIG1fc3RyZWFtQ29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3Bh
dGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlk
Q3JlYXRlV2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RTdHJlYW0+KHJlbmRlcmluZ0JhY2tl
bmRJZGVudGlmaWVyKCksIDNfcywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5n
SWZTeW5jTWVzc2FnZUFycml2ZXMpOwogICAgIHJldHVybiAqbV9zdHJlYW1Db25uZWN0aW9uOwog
fQpAQCAtNDIyLDkgKzQyNiw3IEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojpk
aWRDcmVhdGVXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbShJCiAgICAgICAgIEFT
U0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQotCiAgICAgbV9zdHJl
YW1Db25uZWN0aW9uLT5zZXRXYWtlVXBTZW1hcGhvcmUoV1RGTW92ZShzZW1hcGhvcmUpKTsKLSAg
ICBtX25lZWRzV2FrZVVwU2VtYXBob3JlRm9yRGlzcGxheUxpc3RTdHJlYW0gPSBmYWxzZTsKIH0K
IAogYm9vbCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmlzQ2FjaGVkKGNvbnN0IEltYWdl
QnVmZmVyJiBpbWFnZUJ1ZmZlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmggYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ
cm94eS5oCmluZGV4IDY3Mzg0NDU0ZjNhMjU3Zjc3NWQzNmUzNjc1NjM0ZjgwMTU0NjE1MjUuLjFk
MDBmNGY5NmNlNDhlY2M0NjI0ZDM4MmM1MGUyOTFmM2U3YzcxMmEgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy
b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVS
ZW5kZXJpbmdCYWNrZW5kUHJveHkuaApAQCAtMTU5LDcgKzE1OSw3IEBAIHByaXZhdGU6CiAKICAg
ICAvLyBHUFVQcm9jZXNzQ29ubmVjdGlvbjo6Q2xpZW50CiAgICAgdm9pZCBncHVQcm9jZXNzQ29u
bmVjdGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJikgZmluYWw7Ci0KKyAgICB2b2lk
IGRpc2Nvbm5lY3RHUFVQcm9jZXNzKCk7CiAgICAgR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mIGVuc3Vy
ZUdQVVByb2Nlc3NDb25uZWN0aW9uKCk7CiAKICAgICAvLyBSZXR1cm5zIHN0ZDo6bnVsbG9wdCBp
ZiBubyB1cGRhdGUgaXMgbmVlZGVkIG9yIGFsbG9jYXRpb24gZmFpbGVkLgpAQCAtMTgxLDggKzE4
MSw2IEBAIHByaXZhdGU6CiAKICAgICBSZW5kZXJpbmdVcGRhdGVJRCBtX3JlbmRlcmluZ1VwZGF0
ZUlEOwogICAgIFJlbmRlcmluZ1VwZGF0ZUlEIG1fZGlkUmVuZGVyaW5nVXBkYXRlSUQ7Ci0KLSAg
ICBib29sIG1fbmVlZHNXYWtlVXBTZW1hcGhvcmVGb3JEaXNwbGF5TGlzdFN0cmVhbSB7IHRydWUg
fTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>