<?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>226186</bug_id>
          
          <creation_ts>2021-05-24 13:28:01 -0700</creation_ts>
          <short_desc>Stop using UncheckedLock in html/canvas</short_desc>
          <delta_ts>2021-05-25 16:23:14 -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>WebCore Misc.</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="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>benjamin</cc>
    
    <cc>changseok</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>darin</cc>
    
    <cc>dino</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>graouts</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1763229</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-24 13:28:01 -0700</bug_when>
    <thetext>Stop using UncheckedLock in html/canvas. This is work towards phasing out UncheckedLock, in favor of the checked Lock type.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763241</commentid>
    <comment_count>1</comment_count>
      <attachid>429563</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-24 14:10:45 -0700</bug_when>
    <thetext>Created attachment 429563
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763242</commentid>
    <comment_count>2</comment_count>
      <attachid>429564</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-24 14:12:06 -0700</bug_when>
    <thetext>Created attachment 429564
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763244</commentid>
    <comment_count>3</comment_count>
      <attachid>429566</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-24 14:14:43 -0700</bug_when>
    <thetext>Created attachment 429566
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763269</commentid>
    <comment_count>4</comment_count>
      <attachid>429570</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-24 15:09:16 -0700</bug_when>
    <thetext>Created attachment 429570
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763547</commentid>
    <comment_count>5</comment_count>
      <attachid>429570</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-25 09:59:09 -0700</bug_when>
    <thetext>Comment on attachment 429570
Patch

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

&gt; Source/WTF/wtf/Lock.h:183
&gt; +class WTF_CAPABILITY_SCOPED_LOCK Locker&lt;Lock&gt; : public AbstractLocker {

Note that these changes to Locker&lt;Lock&gt; to more closely match the generic Locker&lt;T&gt; will be required to stop using UncheckedLock in JSC too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763718</commentid>
    <comment_count>6</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-25 15:59:24 -0700</bug_when>
    <thetext>ping review? I&apos;d love to make some progress phasing out UncheckedLock.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763740</commentid>
    <comment_count>7</comment_count>
      <attachid>429570</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-25 16:19:29 -0700</bug_when>
    <thetext>Comment on attachment 429570
Patch

Clearing flags on attachment: 429570

Committed r278057 (238141@main): &lt;https://commits.webkit.org/238141@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763741</commentid>
    <comment_count>8</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-05-25 16:19:32 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1763744</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-05-25 16:23:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/78482248&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429563</attachid>
            <date>2021-05-24 14:10:45 -0700</date>
            <delta_ts>2021-05-24 14:12:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226186-20210524141044.patch</filename>
            <type>text/plain</type>
            <size>11246</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGEzNjZiYThiMWEyOWQzMDA1NmUzYWUy
YzljZDU5MzdiNDBjYjVhNGMuLjQ5OGIwMzJjNDRmOTkyMDgzNmU1ODNkZjg1NDAwMTM2MTQ1MWE3
MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6
QGFwcGxlLmNvbT4KKworICAgICAgICBTdG9wIHVzaW5nIFVuY2hlY2tlZExvY2sgaW4gaHRtbC9j
YW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
NjE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFs
bG93IGNvbnZlcnRpbmcgYSBMb2NrZXI8TG9jaz4gdG8gYW4gQWJzdHJhY3RMb2NrZXIgdHlwZS4g
VGhpcyBhbGxvd3MgcG9ydGluZworICAgICAgICBjb2RlIGZyb20gVW5jaGVja2VkTG9jayB0byBM
b2NrIGV2ZW4gaWYgc2FpZCBjb2RlIGlzIHBhc3NpbmcgdGhlIExvY2tlcjxMb2NrPgorICAgICAg
ICBhcyBwYXJhbWV0ZXIgYXJvdW5kIGFzIGFuIEFic3RyYWN0TG9ja2VyLiBUaGlzIGlzIHZlcnkg
Y29tbW9uIGluIEpTQyBhbmQgaW4KKyAgICAgICAgaHRtbC9jYW52YXMuCisKKyAgICAgICAgQWxz
byBtYWtlIERyb3BMb2NrRm9yU2NvcGUgd29yayB3aXRoIExvY2tlcjxMb2NrPiB0byBoZWxwIHBv
cnQgY29kZSBvdmVyLgorCisgICAgICAgICogd3RmL0xvY2suaDoKKwogMjAyMS0wNS0yNCAgS2Vp
dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByZXZlcnQgcjI3NjYxMCBiZWNhdXNlIGl0IGNhdXNlcyBhIDElIFBMVCByZWdyZXNzaW9uLgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCmluZGV4IDU5ZGNmM2VhOGFjYTc1YjIyYTQ0YWY3Mzc0ODI3MDQwYjBlNmI0NmQuLmNl
OGQ5ZDJiOGY4YjY2OTk0YjdlNTI3M2Q3ZjFiNmE3MTNmZmY1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMyBAQAorMjAyMS0wNS0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor
CisgICAgICAgIFN0b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBodG1sL2NhbnZhcworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTg2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNo
ZWNrZWRMb2NrIGluIGh0bWwvY2FudmFzLiBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHBoYXNpbmcg
b3V0CisgICAgICAgIFVuY2hlY2tlZExvY2ssIGluIGZhdm9yIG9mIHRoZSBjaGVja2VkIExvY2su
IFRlY2huaWNhbGx5LCB0aGUgY29kZSBzdGlsbAorICAgICAgICBkb2Vzbid0IGRvIG11Y2ggdGhy
ZWFkLXNhZmV0eSBhbmFseXNpcyBhZnRlciB0aGlzIGNoYW5nZS4gSXQgaXMgdmVyeSBkaWZmaWN1
bHQKKyAgICAgICAgdG8gYWRvcHQgdGhyZWFkLXNhZmV0eSBhbmFseXNpcyBoZXJlIGJlY2F1c2Ug
dGhlIGNhbGwgc2l0ZXMgZG9uJ3QgYWx3YXlzIGxvY2sKKyAgICAgICAgKHRoZXJlIGFyZSBjYXNl
cyB3aGVyZSBubyBsb2NraW5nIGlzIG5lZWRlZCkuIEl0IGlzIGFsc28gaGFyZCB0byBnZXQgYSBy
ZWZlcmVuY2UKKyAgICAgICAgdG8gdGhlIHZhcmlvdXMgbG9ja3MgdG8gbWFrZSBXVEZfUkVRVUlS
RVNfTE9DSygpIHdvcmsuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdD
b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRl
bGV0ZVZlcnRleEFycmF5KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91
cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhM
b2NrRm9yQUNvbnRleHQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3Vw
Lmg6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldlYkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4
dCk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0Lmg6CisgICAgICAg
ICogaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJH
TFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jayk6CisgICAgICAgICogaHRtbC9jYW52YXMv
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMU2hhcmVkT2JqZWN0Ojpv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFNo
YXJlZE9iamVjdC5oOgorCiAyMDIxLTA1LTI0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA
d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3Nzk0MC4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvY2suaCBiL1NvdXJjZS9XVEYvd3RmL0xvY2suaApp
bmRleCAyOGM4ODNmNTAzZDgwODY4OGM4YWRhMDg1OTdiZDQ2OTNhZjY5OTQ2Li4zZWIxMmJhZWRh
NmJkZjZhNjRiZGUwMjQ4OTU1MzViMDFlNmYxN2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0
Zi9Mb2NrLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9jay5oCkBAIC0xODQsMjEgKzE4NCw0NSBA
QCBjbGFzcyBXVEZfQ0FQQUJJTElUWV9TQ09QRURfTE9DSyBMb2NrZXI8TG9jaz4gewogcHVibGlj
OgogICAgIGV4cGxpY2l0IExvY2tlcihMb2NrJiBsb2NrKSBXVEZfQUNRVUlSRVNfTE9DSyhsb2Nr
KQogICAgICAgICA6IG1fbG9jayhsb2NrKQorICAgICAgICAsIG1faXNMb2NrZWQodHJ1ZSkKICAg
ICB7CiAgICAgICAgIG1fbG9jay5sb2NrKCk7CiAgICAgfQogICAgIExvY2tlcihBZG9wdExvY2tU
YWcsIExvY2smIGxvY2spIFdURl9SRVFVSVJFU19MT0NLKGxvY2spCiAgICAgICAgIDogbV9sb2Nr
KGxvY2spCisgICAgICAgICwgbV9pc0xvY2tlZCh0cnVlKQogICAgIHsKICAgICB9CiAgICAgfkxv
Y2tlcigpIFdURl9SRUxFQVNFU19MT0NLKCkKICAgICB7Ci0gICAgICAgIG1fbG9jay51bmxvY2so
KTsKKyAgICAgICAgaWYgKG1faXNMb2NrZWQpCisgICAgICAgICAgICBtX2xvY2sudW5sb2NrKCk7
CiAgICAgfQogICAgIExvY2tlcihjb25zdCBMb2NrZXI8TG9jaz4mKSA9IGRlbGV0ZTsKICAgICBM
b2NrZXImIG9wZXJhdG9yPShjb25zdCBMb2NrZXI8TG9jaz4mKSA9IGRlbGV0ZTsKKworICAgIC8v
IFN1cHBvcnRzIHBhdHRlcm4gd2hlcmUgYW4gQWJzdHJhY3RMb2NrZXIgaXMgcGFzc2VkIGluIGEg
cGFyYW1ldGVyIHRvIGluZGljYXRlIHRoZSBjYWxsZXIgaG9sZHMgdGhlIGxvY2suCisgICAgb3Bl
cmF0b3IgQWJzdHJhY3RMb2NrZXIoKSBjb25zdCB7IHJldHVybiBBYnN0cmFjdExvY2tlciB7IE5v
TG9ja2luZ05lY2Vzc2FyeSB9OyB9CisKIHByaXZhdGU6CisgICAgLy8gU3VwcG9ydCBEcm9wTG9j
a0ZvclNjb3BlIGV2ZW4gdGhvdWdoIGl0IGRvZXNuJ3Qgc3VwcG9ydCB0aHJlYWQgc2FmZXR5IGFu
YWx5c2lzLgorICAgIHRlbXBsYXRlPHR5cGVuYW1lPgorICAgIGZyaWVuZCBjbGFzcyBEcm9wTG9j
a0ZvclNjb3BlOworCisgICAgdm9pZCBsb2NrKCkgV1RGX0FDUVVJUkVTX0xPQ0sobV9sb2NrKQor
ICAgIHsKKyAgICAgICAgQVNTRVJUKCFtX2lzTG9ja2VkKTsKKyAgICAgICAgbV9sb2NrLmxvY2so
KTsKKyAgICB9CisKKyAgICB2b2lkIHVubG9jaygpIFdURl9SRUxFQVNFU19MT0NLKG1fbG9jaykK
KyAgICB7CisgICAgICAgIEFTU0VSVChtX2lzTG9ja2VkKTsKKyAgICAgICAgbV9sb2NrLnVubG9j
aygpOworICAgIH0KKwogICAgIExvY2smIG1fbG9jazsKKyAgICBib29sIG1faXNMb2NrZWQgeyBm
YWxzZSB9OwogfTsKIAogTG9ja2VyKExvY2smKSAtPiBMb2NrZXI8TG9jaz47CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdDb250ZXh0LmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCmlu
ZGV4IGViMmQzYWE4ZDYzN2U0ZDRiYTYzYTEzODE4MGEwN2RiMjljNDA2ZjUuLmJlOWQ5MzNkM2Iy
OGRiNTY2NDc2YWM0OTFmNGExYmIyNGZmZDMyNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yNjMzLDkgKzI2
MzMsOCBAQCB2b2lkIFdlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRlbGV0ZVZlcnRleEFycmF5KFdl
YkdMVmVydGV4QXJyYXlPYmplY3QqIGFycmF5T2JqZQogCiAgICAgaWYgKCFhcnJheU9iamVjdC0+
aXNEZWZhdWx0T2JqZWN0KCkgJiYgYXJyYXlPYmplY3QgPT0gbV9ib3VuZFZlcnRleEFycmF5T2Jq
ZWN0KSB7CiAgICAgICAgIC8vIGJpbmRWZXJ0ZXhBcnJheSBncmFicyB0aGUgbG9jayBpbnRlcm5h
bGx5LgotICAgICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKKyAgICAgICAgRHJvcExvY2tGb3JT
Y29wZSBub0xvY2tTY29wZShsb2NrZXIpOwogICAgICAgICBiaW5kVmVydGV4QXJyYXkobnVsbHB0
cik7IC8vIFRoZSBkZWZhdWx0IFZBTyB3YXMgcmVtb3ZlZCBpbiBPcGVuR0wgMy4zIGJ1dCBub3Qg
ZnJvbSBXZWJHTCAyOyBiaW5kIHRoZSBkZWZhdWx0IGZvciBXZWJHTCB0byB1c2UuCi0gICAgICAg
IGxvY2tlciA9IExvY2tlciB7IG9iamVjdEdyYXBoTG9jaygpIH07CiAgICAgfQogCiAgICAgYXJy
YXlPYmplY3QtPmRlbGV0ZU9iamVjdChsb2NrZXIsIGdyYXBoaWNzQ29udGV4dEdMKCkpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3Bw
IGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3BwCmluZGV4
IDE0YzJhMDg5OTdkOTAxZGExNDBhNGIwMzc4NDhlNzQxNDQzZjY1MjUuLjk3MTQxMmY1ZjQ1MzRk
MWI5NzI3MzBiNzhhYzI3MDc2YzU5ZThkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0
bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5jcHAKQEAgLTU1LDcgKzU1LDcgQEAgR3JhcGhpY3ND
b250ZXh0R0wmIFdlYkdMQ29udGV4dEdyb3VwOjpnZXRBR3JhcGhpY3NDb250ZXh0R0woKQogICAg
IHJldHVybiAqKCptX2NvbnRleHRzLmJlZ2luKCkpLT5ncmFwaGljc0NvbnRleHRHTCgpOwogfQog
Ci1VbmNoZWNrZWRMb2NrJiBXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhMb2NrRm9yQUNv
bnRleHQoKQorTG9jayYgV2ViR0xDb250ZXh0R3JvdXA6Om9iamVjdEdyYXBoTG9ja0ZvckFDb250
ZXh0KCkKIHsKICAgICBBU1NFUlQoIW1fY29udGV4dHMuaXNFbXB0eSgpKTsKICAgICAvLyBTaW5j
ZSB0aGUgV0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIG5ldmVyIHNoaXBwZWQsIGFuZCBp
cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3Jv
dXAuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmgKaW5k
ZXggYjZhZmUwYWY5N2ViZGZmYWMxYTFjZDAwNDNmZmJmNzljY2QxNzc4ZC4uODU1Y2U3MjM5ODZm
ZTA3NzU5OGYyNDY4MWFlODA4NmM4MWVkZmEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
aHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAog
ICAgIGJvb2wgaGFzQUNvbnRleHQoKSBjb25zdDsKICAgICBHcmFwaGljc0NvbnRleHRHTCYgZ2V0
QUdyYXBoaWNzQ29udGV4dEdMKCk7Ci0gICAgVW5jaGVja2VkTG9jayYgb2JqZWN0R3JhcGhMb2Nr
Rm9yQUNvbnRleHQoKTsKKyAgICBMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JBQ29udGV4dCgpOwog
CiAgICAgdm9pZCBsb3NlQ29udGV4dEdyb3VwKFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6Okxv
c3RDb250ZXh0TW9kZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz
L1dlYkdMQ29udGV4dE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH
TENvbnRleHRPYmplY3QuY3BwCmluZGV4IDI0MzU0ZDA1YjgxYmM4NTIyYmU3N2QzYmI4ZjRjY2U0
N2ViMzYzZjUuLjM0MTNhYTM4OTkyNjljYWU1ZmUwNWNjYzBmZDVkMzZiYzcxNjNjMDQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcApA
QCAtNTQsNyArNTQsNyBAQCB2b2lkIFdlYkdMQ29udGV4dE9iamVjdDo6ZGV0YWNoQ29udGV4dChj
b25zdCBBYnN0cmFjdExvY2tlciYgbG9ja2VyKQogICAgIH0KIH0KIAotVW5jaGVja2VkTG9jayYg
V2ViR0xDb250ZXh0T2JqZWN0OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdl
YkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpCiB7CiAgICAgLy8g
U2hvdWxkIG5vdCBjYWxsIHRoaXMgaWYgdGhlIG9iamVjdCBvciBjb250ZXh0IGhhcyBiZWVuIGRl
bGV0ZWQuCiAgICAgQVNTRVJUKG1fY29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL2NhbnZhcy9XZWJHTENvbnRleHRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv
Y2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5oCmluZGV4IDBlYTc5OWZmYmIzYThhYWUwMTEzZDlh
NTVjZTNlNjNiYmEyYzhlYWYuLmUyZDg5NmJmM2I1ZDI4NGZhNWJjZDY1NjU5NWUwNDNlNjM0MmE0
OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9i
amVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVj
dC5oCkBAIC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dChj
b25zdCBXVEY6OkFic3RyYWN0TG9ja2VyJik7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RH
cmFwaExvY2tGb3JDb250ZXh0KCkgb3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2Nr
Rm9yQ29udGV4dCgpIG92ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xDb250ZXh0T2Jq
ZWN0KFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTE9iamVjdC5oCmluZGV4IDY0NTEwYjlkNjFjN2RkMTdiN2EwMDIyNzYzMWRjMWQ1MWYz
YjJkZDIuLmQ2NzIwZTcyNzZlYTJhZTk0MmM5ZGI4YTQzMGUxYmJhNWU4MjRmM2IgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmgKKysrIGIvU291cmNl
L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaApAQCAtNjcsNyArNjcsNyBAQCBwdWJs
aWM6CiAgICAgLy8gV0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIHNwZWNpZmljYXRpb24g
bmV2ZXIgc2hpcHBlZCAoYW5kCiAgICAgLy8gaXMgdW5saWtlbHkgdG8pLCB0aGlzIGJhc2ljYWxs
eSByZXR1cm5zIHRoZSBzYW1lIHJlc3VsdCBmb3IKICAgICAvLyBib3RoIGNvbnRleHQgb2JqZWN0
cyBhbmQgc2hhcmVkIG9iamVjdHMuCi0gICAgdmlydHVhbCBVbmNoZWNrZWRMb2NrJiBvYmplY3RH
cmFwaExvY2tGb3JDb250ZXh0KCkgPSAwOworICAgIHZpcnR1YWwgTG9jayYgb2JqZWN0R3JhcGhM
b2NrRm9yQ29udGV4dCgpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIFdlYkdMT2JqZWN0KCkgPSBk
ZWZhdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k
ZXJpbmdDb250ZXh0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl
bmRlcmluZ0NvbnRleHRCYXNlLmNwcAppbmRleCAzOWMzMmU4NDQ5YTZiOGQ0MGZhYmFmMDRmZTkw
NmMwYzU0MjBiMGM1Li41MTU1NDg4ZDdlZDFkYTk1MGQ1YWY2NzhkNDZkMjM0MGI4YmE5Y2VlIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRl
eHRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlLmNwcApAQCAtNzk5MCw3ICs3OTkwLDcgQEAgdm9pZCBXZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlOjphZGRNZW1iZXJzVG9PcGFxdWVSb290cyhKU0M6OkFic3RyYWN0U2xvdFZp
c2l0b3IKICAgICAvLyByb290cyBmb3IgZXh0ZW5zaW9ucy4KIH0KIAotVW5jaGVja2VkTG9jayYg
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6b2JqZWN0R3JhcGhMb2NrKCkKK0xvY2smIFdlYkdM
UmVuZGVyaW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jaygpCiB7CiAgICAgcmV0dXJuIG1f
b2JqZWN0R3JhcGhMb2NrOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oCmluZGV4IGQ3Y2JlZWQzMmNiYzBiNzk3YzEw
NjhmZDU5N2QxM2VkOGU0YzE5NzMuLjFjMzFlODc4ZjcxMTRlMzVlNjZkNzg3YTRkODQzOWVkZjhk
OGIzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl
bmRlcmluZ0NvbnRleHRCYXNlLmgKQEAgLTQyNiw3ICs0MjYsNyBAQCBwdWJsaWM6CiAgICAgLy8g
Y3VycmVudGx5IGxhdGNoZWQgaW50byB0aGUgY29udGV4dCAtIHdpdGhvdXQgdHJhdmVyc2luZyBh
bGwgb2YKICAgICAvLyB0aGUgbGF0Y2hlZCBvYmplY3RzIHRvIGZpbmQgdGhlIGN1cnJlbnQgb25l
LCB3aGljaCB3b3VsZCBiZQogICAgIC8vIHByb2hpYml0aXZlbHkgZXhwZW5zaXZlLgotICAgIFVu
Y2hlY2tlZExvY2smIG9iamVjdEdyYXBoTG9jaygpOworICAgIExvY2smIG9iamVjdEdyYXBoTG9j
aygpIFdURl9SRVRVUk5TX0xPQ0sobV9vYmplY3RHcmFwaExvY2spOwogCiBwcm90ZWN0ZWQ6CiAg
ICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZShDYW52YXNCYXNlJiwgV2ViR0xDb250ZXh0QXR0
cmlidXRlcyk7CkBAIC01NDAsNyArNTQwLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUmVmUHRyPEdy
YXBoaWNzQ29udGV4dEdMPiBtX2NvbnRleHQ7CiAgICAgUmVmUHRyPFdlYkdMQ29udGV4dEdyb3Vw
PiBtX2NvbnRleHRHcm91cDsKLSAgICBVbmNoZWNrZWRMb2NrIG1fb2JqZWN0R3JhcGhMb2NrOwor
ICAgIExvY2sgbV9vYmplY3RHcmFwaExvY2s7CiAKICAgICBib29sIG1fcmVzdG9yZUFsbG93ZWQg
eyBmYWxzZSB9OwogICAgIFN1c3BlbmRhYmxlVGltZXIgbV9yZXN0b3JlVGltZXI7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAKaW5kZXggMGFi
OGNiMjQxYTFiM2YzODhmZWYzODI5OTc2Y2VjZjZkNDg3ZDM3OC4uYmQxYmQwZWM0OTVlZjY5YTg1
NGYzNDRmMmI5M2VmYmZiM2RmNDlhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9j
YW52YXMvV2ViR0xTaGFyZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu
dmFzL1dlYkdMU2hhcmVkT2JqZWN0LmNwcApAQCAtODIsNyArODIsNyBAQCBHcmFwaGljc0NvbnRl
eHRHTCogV2ViR0xTaGFyZWRPYmplY3Q6OmdldEFHcmFwaGljc0NvbnRleHRHTCgpIGNvbnN0CiAg
ICAgcmV0dXJuIG1fY29udGV4dEdyb3VwID8gJm1fY29udGV4dEdyb3VwLT5nZXRBR3JhcGhpY3ND
b250ZXh0R0woKSA6IG51bGxwdHI7CiB9CiAKLVVuY2hlY2tlZExvY2smIFdlYkdMU2hhcmVkT2Jq
ZWN0OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdlYkdMU2hhcmVkT2JqZWN0
OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKIHsKICAgICAvLyBTaG91bGQgbm90IGNhbGwg
dGhpcyBpZiB0aGUgb2JqZWN0IG9yIGNvbnRleHQgaGFzIGJlZW4gZGVsZXRlZC4KICAgICBBU1NF
UlQobV9jb250ZXh0R3JvdXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xTaGFyZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmgKaW5kZXggZjUzZGIxOWIwNjkyMjkwNmJkY2NiMTZjMzkzNzM4NjE1ZjE3
NjU3OS4uMGNiOTM1NGEyMjNiY2Y5NzRjNDM5NmRmNDhhZWY1ZDhiNDIyYTgyYiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFyZWRPYmplY3QuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5oCkBAIC01OSw3ICs1
OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dEdyb3VwV2l0aG91dERlbGV0
aW5nT2JqZWN0KCk7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JDb250
ZXh0KCkgb3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpIG92
ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xTaGFyZWRPYmplY3QoV2ViR0xSZW5kZXJp
bmdDb250ZXh0QmFzZSYpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429564</attachid>
            <date>2021-05-24 14:12:06 -0700</date>
            <delta_ts>2021-05-24 14:14:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226186-20210524141206.patch</filename>
            <type>text/plain</type>
            <size>11303</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGEzNjZiYThiMWEyOWQzMDA1NmUzYWUy
YzljZDU5MzdiNDBjYjVhNGMuLjQ5OGIwMzJjNDRmOTkyMDgzNmU1ODNkZjg1NDAwMTM2MTQ1MWE3
MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6
QGFwcGxlLmNvbT4KKworICAgICAgICBTdG9wIHVzaW5nIFVuY2hlY2tlZExvY2sgaW4gaHRtbC9j
YW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
NjE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFs
bG93IGNvbnZlcnRpbmcgYSBMb2NrZXI8TG9jaz4gdG8gYW4gQWJzdHJhY3RMb2NrZXIgdHlwZS4g
VGhpcyBhbGxvd3MgcG9ydGluZworICAgICAgICBjb2RlIGZyb20gVW5jaGVja2VkTG9jayB0byBM
b2NrIGV2ZW4gaWYgc2FpZCBjb2RlIGlzIHBhc3NpbmcgdGhlIExvY2tlcjxMb2NrPgorICAgICAg
ICBhcyBwYXJhbWV0ZXIgYXJvdW5kIGFzIGFuIEFic3RyYWN0TG9ja2VyLiBUaGlzIGlzIHZlcnkg
Y29tbW9uIGluIEpTQyBhbmQgaW4KKyAgICAgICAgaHRtbC9jYW52YXMuCisKKyAgICAgICAgQWxz
byBtYWtlIERyb3BMb2NrRm9yU2NvcGUgd29yayB3aXRoIExvY2tlcjxMb2NrPiB0byBoZWxwIHBv
cnQgY29kZSBvdmVyLgorCisgICAgICAgICogd3RmL0xvY2suaDoKKwogMjAyMS0wNS0yNCAgS2Vp
dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByZXZlcnQgcjI3NjYxMCBiZWNhdXNlIGl0IGNhdXNlcyBhIDElIFBMVCByZWdyZXNzaW9uLgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCmluZGV4IDU5ZGNmM2VhOGFjYTc1YjIyYTQ0YWY3Mzc0ODI3MDQwYjBlNmI0NmQuLmNl
OGQ5ZDJiOGY4YjY2OTk0YjdlNTI3M2Q3ZjFiNmE3MTNmZmY1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMyBAQAorMjAyMS0wNS0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor
CisgICAgICAgIFN0b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBodG1sL2NhbnZhcworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTg2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNo
ZWNrZWRMb2NrIGluIGh0bWwvY2FudmFzLiBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHBoYXNpbmcg
b3V0CisgICAgICAgIFVuY2hlY2tlZExvY2ssIGluIGZhdm9yIG9mIHRoZSBjaGVja2VkIExvY2su
IFRlY2huaWNhbGx5LCB0aGUgY29kZSBzdGlsbAorICAgICAgICBkb2Vzbid0IGRvIG11Y2ggdGhy
ZWFkLXNhZmV0eSBhbmFseXNpcyBhZnRlciB0aGlzIGNoYW5nZS4gSXQgaXMgdmVyeSBkaWZmaWN1
bHQKKyAgICAgICAgdG8gYWRvcHQgdGhyZWFkLXNhZmV0eSBhbmFseXNpcyBoZXJlIGJlY2F1c2Ug
dGhlIGNhbGwgc2l0ZXMgZG9uJ3QgYWx3YXlzIGxvY2sKKyAgICAgICAgKHRoZXJlIGFyZSBjYXNl
cyB3aGVyZSBubyBsb2NraW5nIGlzIG5lZWRlZCkuIEl0IGlzIGFsc28gaGFyZCB0byBnZXQgYSBy
ZWZlcmVuY2UKKyAgICAgICAgdG8gdGhlIHZhcmlvdXMgbG9ja3MgdG8gbWFrZSBXVEZfUkVRVUlS
RVNfTE9DSygpIHdvcmsuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdD
b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRl
bGV0ZVZlcnRleEFycmF5KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91
cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhM
b2NrRm9yQUNvbnRleHQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3Vw
Lmg6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldlYkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4
dCk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0Lmg6CisgICAgICAg
ICogaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJH
TFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jayk6CisgICAgICAgICogaHRtbC9jYW52YXMv
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMU2hhcmVkT2JqZWN0Ojpv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFNo
YXJlZE9iamVjdC5oOgorCiAyMDIxLTA1LTI0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA
d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3Nzk0MC4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvY2suaCBiL1NvdXJjZS9XVEYvd3RmL0xvY2suaApp
bmRleCAyOGM4ODNmNTAzZDgwODY4OGM4YWRhMDg1OTdiZDQ2OTNhZjY5OTQ2Li5mYWQ4NTVkYjA1
NDQyMTIxMmFmOTYzYzA3NWNjZDY3MzlmN2EzYjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0
Zi9Mb2NrLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9jay5oCkBAIC0xODQsMjEgKzE4NCw0NyBA
QCBjbGFzcyBXVEZfQ0FQQUJJTElUWV9TQ09QRURfTE9DSyBMb2NrZXI8TG9jaz4gewogcHVibGlj
OgogICAgIGV4cGxpY2l0IExvY2tlcihMb2NrJiBsb2NrKSBXVEZfQUNRVUlSRVNfTE9DSyhsb2Nr
KQogICAgICAgICA6IG1fbG9jayhsb2NrKQorICAgICAgICAsIG1faXNMb2NrZWQodHJ1ZSkKICAg
ICB7CiAgICAgICAgIG1fbG9jay5sb2NrKCk7CiAgICAgfQogICAgIExvY2tlcihBZG9wdExvY2tU
YWcsIExvY2smIGxvY2spIFdURl9SRVFVSVJFU19MT0NLKGxvY2spCiAgICAgICAgIDogbV9sb2Nr
KGxvY2spCisgICAgICAgICwgbV9pc0xvY2tlZCh0cnVlKQogICAgIHsKICAgICB9CiAgICAgfkxv
Y2tlcigpIFdURl9SRUxFQVNFU19MT0NLKCkKICAgICB7Ci0gICAgICAgIG1fbG9jay51bmxvY2so
KTsKKyAgICAgICAgaWYgKG1faXNMb2NrZWQpCisgICAgICAgICAgICBtX2xvY2sudW5sb2NrKCk7
CiAgICAgfQogICAgIExvY2tlcihjb25zdCBMb2NrZXI8TG9jaz4mKSA9IGRlbGV0ZTsKICAgICBM
b2NrZXImIG9wZXJhdG9yPShjb25zdCBMb2NrZXI8TG9jaz4mKSA9IGRlbGV0ZTsKKworICAgIC8v
IFN1cHBvcnRzIHBhdHRlcm4gd2hlcmUgYW4gQWJzdHJhY3RMb2NrZXIgaXMgcGFzc2VkIGluIGEg
cGFyYW1ldGVyIHRvIGluZGljYXRlIHRoZSBjYWxsZXIgaG9sZHMgdGhlIGxvY2suCisgICAgb3Bl
cmF0b3IgQWJzdHJhY3RMb2NrZXIoKSBjb25zdCB7IHJldHVybiBBYnN0cmFjdExvY2tlciB7IE5v
TG9ja2luZ05lY2Vzc2FyeSB9OyB9CisKIHByaXZhdGU6CisgICAgLy8gU3VwcG9ydCBEcm9wTG9j
a0ZvclNjb3BlIGV2ZW4gdGhvdWdoIGl0IGRvZXNuJ3Qgc3VwcG9ydCB0aHJlYWQgc2FmZXR5IGFu
YWx5c2lzLgorICAgIHRlbXBsYXRlPHR5cGVuYW1lPgorICAgIGZyaWVuZCBjbGFzcyBEcm9wTG9j
a0ZvclNjb3BlOworCisgICAgdm9pZCBsb2NrKCkgV1RGX0FDUVVJUkVTX0xPQ0sobV9sb2NrKQor
ICAgIHsKKyAgICAgICAgQVNTRVJUKCFtX2lzTG9ja2VkKTsKKyAgICAgICAgbV9sb2NrLmxvY2so
KTsKKyAgICAgICAgbV9pc0xvY2tlZCA9IHRydWU7CisgICAgfQorCisgICAgdm9pZCB1bmxvY2so
KSBXVEZfUkVMRUFTRVNfTE9DSyhtX2xvY2spCisgICAgeworICAgICAgICBBU1NFUlQobV9pc0xv
Y2tlZCk7CisgICAgICAgIG1faXNMb2NrZWQgPSBmYWxzZTsKKyAgICAgICAgbV9sb2NrLnVubG9j
aygpOworICAgIH0KKwogICAgIExvY2smIG1fbG9jazsKKyAgICBib29sIG1faXNMb2NrZWQgeyBm
YWxzZSB9OwogfTsKIAogTG9ja2VyKExvY2smKSAtPiBMb2NrZXI8TG9jaz47CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdDb250ZXh0LmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCmlu
ZGV4IGViMmQzYWE4ZDYzN2U0ZDRiYTYzYTEzODE4MGEwN2RiMjljNDA2ZjUuLmJlOWQ5MzNkM2Iy
OGRiNTY2NDc2YWM0OTFmNGExYmIyNGZmZDMyNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yNjMzLDkgKzI2
MzMsOCBAQCB2b2lkIFdlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRlbGV0ZVZlcnRleEFycmF5KFdl
YkdMVmVydGV4QXJyYXlPYmplY3QqIGFycmF5T2JqZQogCiAgICAgaWYgKCFhcnJheU9iamVjdC0+
aXNEZWZhdWx0T2JqZWN0KCkgJiYgYXJyYXlPYmplY3QgPT0gbV9ib3VuZFZlcnRleEFycmF5T2Jq
ZWN0KSB7CiAgICAgICAgIC8vIGJpbmRWZXJ0ZXhBcnJheSBncmFicyB0aGUgbG9jayBpbnRlcm5h
bGx5LgotICAgICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKKyAgICAgICAgRHJvcExvY2tGb3JT
Y29wZSBub0xvY2tTY29wZShsb2NrZXIpOwogICAgICAgICBiaW5kVmVydGV4QXJyYXkobnVsbHB0
cik7IC8vIFRoZSBkZWZhdWx0IFZBTyB3YXMgcmVtb3ZlZCBpbiBPcGVuR0wgMy4zIGJ1dCBub3Qg
ZnJvbSBXZWJHTCAyOyBiaW5kIHRoZSBkZWZhdWx0IGZvciBXZWJHTCB0byB1c2UuCi0gICAgICAg
IGxvY2tlciA9IExvY2tlciB7IG9iamVjdEdyYXBoTG9jaygpIH07CiAgICAgfQogCiAgICAgYXJy
YXlPYmplY3QtPmRlbGV0ZU9iamVjdChsb2NrZXIsIGdyYXBoaWNzQ29udGV4dEdMKCkpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3Bw
IGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3BwCmluZGV4
IDE0YzJhMDg5OTdkOTAxZGExNDBhNGIwMzc4NDhlNzQxNDQzZjY1MjUuLjk3MTQxMmY1ZjQ1MzRk
MWI5NzI3MzBiNzhhYzI3MDc2YzU5ZThkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0
bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5jcHAKQEAgLTU1LDcgKzU1LDcgQEAgR3JhcGhpY3ND
b250ZXh0R0wmIFdlYkdMQ29udGV4dEdyb3VwOjpnZXRBR3JhcGhpY3NDb250ZXh0R0woKQogICAg
IHJldHVybiAqKCptX2NvbnRleHRzLmJlZ2luKCkpLT5ncmFwaGljc0NvbnRleHRHTCgpOwogfQog
Ci1VbmNoZWNrZWRMb2NrJiBXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhMb2NrRm9yQUNv
bnRleHQoKQorTG9jayYgV2ViR0xDb250ZXh0R3JvdXA6Om9iamVjdEdyYXBoTG9ja0ZvckFDb250
ZXh0KCkKIHsKICAgICBBU1NFUlQoIW1fY29udGV4dHMuaXNFbXB0eSgpKTsKICAgICAvLyBTaW5j
ZSB0aGUgV0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIG5ldmVyIHNoaXBwZWQsIGFuZCBp
cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3Jv
dXAuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmgKaW5k
ZXggYjZhZmUwYWY5N2ViZGZmYWMxYTFjZDAwNDNmZmJmNzljY2QxNzc4ZC4uODU1Y2U3MjM5ODZm
ZTA3NzU5OGYyNDY4MWFlODA4NmM4MWVkZmEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
aHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAog
ICAgIGJvb2wgaGFzQUNvbnRleHQoKSBjb25zdDsKICAgICBHcmFwaGljc0NvbnRleHRHTCYgZ2V0
QUdyYXBoaWNzQ29udGV4dEdMKCk7Ci0gICAgVW5jaGVja2VkTG9jayYgb2JqZWN0R3JhcGhMb2Nr
Rm9yQUNvbnRleHQoKTsKKyAgICBMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JBQ29udGV4dCgpOwog
CiAgICAgdm9pZCBsb3NlQ29udGV4dEdyb3VwKFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6Okxv
c3RDb250ZXh0TW9kZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz
L1dlYkdMQ29udGV4dE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH
TENvbnRleHRPYmplY3QuY3BwCmluZGV4IDI0MzU0ZDA1YjgxYmM4NTIyYmU3N2QzYmI4ZjRjY2U0
N2ViMzYzZjUuLjM0MTNhYTM4OTkyNjljYWU1ZmUwNWNjYzBmZDVkMzZiYzcxNjNjMDQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcApA
QCAtNTQsNyArNTQsNyBAQCB2b2lkIFdlYkdMQ29udGV4dE9iamVjdDo6ZGV0YWNoQ29udGV4dChj
b25zdCBBYnN0cmFjdExvY2tlciYgbG9ja2VyKQogICAgIH0KIH0KIAotVW5jaGVja2VkTG9jayYg
V2ViR0xDb250ZXh0T2JqZWN0OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdl
YkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpCiB7CiAgICAgLy8g
U2hvdWxkIG5vdCBjYWxsIHRoaXMgaWYgdGhlIG9iamVjdCBvciBjb250ZXh0IGhhcyBiZWVuIGRl
bGV0ZWQuCiAgICAgQVNTRVJUKG1fY29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL2NhbnZhcy9XZWJHTENvbnRleHRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv
Y2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5oCmluZGV4IDBlYTc5OWZmYmIzYThhYWUwMTEzZDlh
NTVjZTNlNjNiYmEyYzhlYWYuLmUyZDg5NmJmM2I1ZDI4NGZhNWJjZDY1NjU5NWUwNDNlNjM0MmE0
OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9i
amVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVj
dC5oCkBAIC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dChj
b25zdCBXVEY6OkFic3RyYWN0TG9ja2VyJik7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RH
cmFwaExvY2tGb3JDb250ZXh0KCkgb3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2Nr
Rm9yQ29udGV4dCgpIG92ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xDb250ZXh0T2Jq
ZWN0KFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTE9iamVjdC5oCmluZGV4IDY0NTEwYjlkNjFjN2RkMTdiN2EwMDIyNzYzMWRjMWQ1MWYz
YjJkZDIuLmQ2NzIwZTcyNzZlYTJhZTk0MmM5ZGI4YTQzMGUxYmJhNWU4MjRmM2IgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmgKKysrIGIvU291cmNl
L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaApAQCAtNjcsNyArNjcsNyBAQCBwdWJs
aWM6CiAgICAgLy8gV0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIHNwZWNpZmljYXRpb24g
bmV2ZXIgc2hpcHBlZCAoYW5kCiAgICAgLy8gaXMgdW5saWtlbHkgdG8pLCB0aGlzIGJhc2ljYWxs
eSByZXR1cm5zIHRoZSBzYW1lIHJlc3VsdCBmb3IKICAgICAvLyBib3RoIGNvbnRleHQgb2JqZWN0
cyBhbmQgc2hhcmVkIG9iamVjdHMuCi0gICAgdmlydHVhbCBVbmNoZWNrZWRMb2NrJiBvYmplY3RH
cmFwaExvY2tGb3JDb250ZXh0KCkgPSAwOworICAgIHZpcnR1YWwgTG9jayYgb2JqZWN0R3JhcGhM
b2NrRm9yQ29udGV4dCgpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIFdlYkdMT2JqZWN0KCkgPSBk
ZWZhdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k
ZXJpbmdDb250ZXh0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl
bmRlcmluZ0NvbnRleHRCYXNlLmNwcAppbmRleCAzOWMzMmU4NDQ5YTZiOGQ0MGZhYmFmMDRmZTkw
NmMwYzU0MjBiMGM1Li41MTU1NDg4ZDdlZDFkYTk1MGQ1YWY2NzhkNDZkMjM0MGI4YmE5Y2VlIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRl
eHRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlLmNwcApAQCAtNzk5MCw3ICs3OTkwLDcgQEAgdm9pZCBXZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlOjphZGRNZW1iZXJzVG9PcGFxdWVSb290cyhKU0M6OkFic3RyYWN0U2xvdFZp
c2l0b3IKICAgICAvLyByb290cyBmb3IgZXh0ZW5zaW9ucy4KIH0KIAotVW5jaGVja2VkTG9jayYg
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6b2JqZWN0R3JhcGhMb2NrKCkKK0xvY2smIFdlYkdM
UmVuZGVyaW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jaygpCiB7CiAgICAgcmV0dXJuIG1f
b2JqZWN0R3JhcGhMb2NrOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oCmluZGV4IGQ3Y2JlZWQzMmNiYzBiNzk3YzEw
NjhmZDU5N2QxM2VkOGU0YzE5NzMuLjFjMzFlODc4ZjcxMTRlMzVlNjZkNzg3YTRkODQzOWVkZjhk
OGIzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl
bmRlcmluZ0NvbnRleHRCYXNlLmgKQEAgLTQyNiw3ICs0MjYsNyBAQCBwdWJsaWM6CiAgICAgLy8g
Y3VycmVudGx5IGxhdGNoZWQgaW50byB0aGUgY29udGV4dCAtIHdpdGhvdXQgdHJhdmVyc2luZyBh
bGwgb2YKICAgICAvLyB0aGUgbGF0Y2hlZCBvYmplY3RzIHRvIGZpbmQgdGhlIGN1cnJlbnQgb25l
LCB3aGljaCB3b3VsZCBiZQogICAgIC8vIHByb2hpYml0aXZlbHkgZXhwZW5zaXZlLgotICAgIFVu
Y2hlY2tlZExvY2smIG9iamVjdEdyYXBoTG9jaygpOworICAgIExvY2smIG9iamVjdEdyYXBoTG9j
aygpIFdURl9SRVRVUk5TX0xPQ0sobV9vYmplY3RHcmFwaExvY2spOwogCiBwcm90ZWN0ZWQ6CiAg
ICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZShDYW52YXNCYXNlJiwgV2ViR0xDb250ZXh0QXR0
cmlidXRlcyk7CkBAIC01NDAsNyArNTQwLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUmVmUHRyPEdy
YXBoaWNzQ29udGV4dEdMPiBtX2NvbnRleHQ7CiAgICAgUmVmUHRyPFdlYkdMQ29udGV4dEdyb3Vw
PiBtX2NvbnRleHRHcm91cDsKLSAgICBVbmNoZWNrZWRMb2NrIG1fb2JqZWN0R3JhcGhMb2NrOwor
ICAgIExvY2sgbV9vYmplY3RHcmFwaExvY2s7CiAKICAgICBib29sIG1fcmVzdG9yZUFsbG93ZWQg
eyBmYWxzZSB9OwogICAgIFN1c3BlbmRhYmxlVGltZXIgbV9yZXN0b3JlVGltZXI7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAKaW5kZXggMGFi
OGNiMjQxYTFiM2YzODhmZWYzODI5OTc2Y2VjZjZkNDg3ZDM3OC4uYmQxYmQwZWM0OTVlZjY5YTg1
NGYzNDRmMmI5M2VmYmZiM2RmNDlhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9j
YW52YXMvV2ViR0xTaGFyZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu
dmFzL1dlYkdMU2hhcmVkT2JqZWN0LmNwcApAQCAtODIsNyArODIsNyBAQCBHcmFwaGljc0NvbnRl
eHRHTCogV2ViR0xTaGFyZWRPYmplY3Q6OmdldEFHcmFwaGljc0NvbnRleHRHTCgpIGNvbnN0CiAg
ICAgcmV0dXJuIG1fY29udGV4dEdyb3VwID8gJm1fY29udGV4dEdyb3VwLT5nZXRBR3JhcGhpY3ND
b250ZXh0R0woKSA6IG51bGxwdHI7CiB9CiAKLVVuY2hlY2tlZExvY2smIFdlYkdMU2hhcmVkT2Jq
ZWN0OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdlYkdMU2hhcmVkT2JqZWN0
OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKIHsKICAgICAvLyBTaG91bGQgbm90IGNhbGwg
dGhpcyBpZiB0aGUgb2JqZWN0IG9yIGNvbnRleHQgaGFzIGJlZW4gZGVsZXRlZC4KICAgICBBU1NF
UlQobV9jb250ZXh0R3JvdXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xTaGFyZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmgKaW5kZXggZjUzZGIxOWIwNjkyMjkwNmJkY2NiMTZjMzkzNzM4NjE1ZjE3
NjU3OS4uMGNiOTM1NGEyMjNiY2Y5NzRjNDM5NmRmNDhhZWY1ZDhiNDIyYTgyYiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFyZWRPYmplY3QuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5oCkBAIC01OSw3ICs1
OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dEdyb3VwV2l0aG91dERlbGV0
aW5nT2JqZWN0KCk7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JDb250
ZXh0KCkgb3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpIG92
ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xTaGFyZWRPYmplY3QoV2ViR0xSZW5kZXJp
bmdDb250ZXh0QmFzZSYpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429566</attachid>
            <date>2021-05-24 14:14:43 -0700</date>
            <delta_ts>2021-05-24 15:09:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226186-20210524141443.patch</filename>
            <type>text/plain</type>
            <size>10727</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGEzNjZiYThiMWEyOWQzMDA1NmUzYWUy
YzljZDU5MzdiNDBjYjVhNGMuLjQ5OGIwMzJjNDRmOTkyMDgzNmU1ODNkZjg1NDAwMTM2MTQ1MWE3
MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6
QGFwcGxlLmNvbT4KKworICAgICAgICBTdG9wIHVzaW5nIFVuY2hlY2tlZExvY2sgaW4gaHRtbC9j
YW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
NjE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFs
bG93IGNvbnZlcnRpbmcgYSBMb2NrZXI8TG9jaz4gdG8gYW4gQWJzdHJhY3RMb2NrZXIgdHlwZS4g
VGhpcyBhbGxvd3MgcG9ydGluZworICAgICAgICBjb2RlIGZyb20gVW5jaGVja2VkTG9jayB0byBM
b2NrIGV2ZW4gaWYgc2FpZCBjb2RlIGlzIHBhc3NpbmcgdGhlIExvY2tlcjxMb2NrPgorICAgICAg
ICBhcyBwYXJhbWV0ZXIgYXJvdW5kIGFzIGFuIEFic3RyYWN0TG9ja2VyLiBUaGlzIGlzIHZlcnkg
Y29tbW9uIGluIEpTQyBhbmQgaW4KKyAgICAgICAgaHRtbC9jYW52YXMuCisKKyAgICAgICAgQWxz
byBtYWtlIERyb3BMb2NrRm9yU2NvcGUgd29yayB3aXRoIExvY2tlcjxMb2NrPiB0byBoZWxwIHBv
cnQgY29kZSBvdmVyLgorCisgICAgICAgICogd3RmL0xvY2suaDoKKwogMjAyMS0wNS0yNCAgS2Vp
dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByZXZlcnQgcjI3NjYxMCBiZWNhdXNlIGl0IGNhdXNlcyBhIDElIFBMVCByZWdyZXNzaW9uLgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCmluZGV4IDU5ZGNmM2VhOGFjYTc1YjIyYTQ0YWY3Mzc0ODI3MDQwYjBlNmI0NmQuLmNl
OGQ5ZDJiOGY4YjY2OTk0YjdlNTI3M2Q3ZjFiNmE3MTNmZmY1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMyBAQAorMjAyMS0wNS0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor
CisgICAgICAgIFN0b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBodG1sL2NhbnZhcworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTg2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNo
ZWNrZWRMb2NrIGluIGh0bWwvY2FudmFzLiBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHBoYXNpbmcg
b3V0CisgICAgICAgIFVuY2hlY2tlZExvY2ssIGluIGZhdm9yIG9mIHRoZSBjaGVja2VkIExvY2su
IFRlY2huaWNhbGx5LCB0aGUgY29kZSBzdGlsbAorICAgICAgICBkb2Vzbid0IGRvIG11Y2ggdGhy
ZWFkLXNhZmV0eSBhbmFseXNpcyBhZnRlciB0aGlzIGNoYW5nZS4gSXQgaXMgdmVyeSBkaWZmaWN1
bHQKKyAgICAgICAgdG8gYWRvcHQgdGhyZWFkLXNhZmV0eSBhbmFseXNpcyBoZXJlIGJlY2F1c2Ug
dGhlIGNhbGwgc2l0ZXMgZG9uJ3QgYWx3YXlzIGxvY2sKKyAgICAgICAgKHRoZXJlIGFyZSBjYXNl
cyB3aGVyZSBubyBsb2NraW5nIGlzIG5lZWRlZCkuIEl0IGlzIGFsc28gaGFyZCB0byBnZXQgYSBy
ZWZlcmVuY2UKKyAgICAgICAgdG8gdGhlIHZhcmlvdXMgbG9ja3MgdG8gbWFrZSBXVEZfUkVRVUlS
RVNfTE9DSygpIHdvcmsuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdD
b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRl
bGV0ZVZlcnRleEFycmF5KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91
cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhM
b2NrRm9yQUNvbnRleHQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3Vw
Lmg6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldlYkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4
dCk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0Lmg6CisgICAgICAg
ICogaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJH
TFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jayk6CisgICAgICAgICogaHRtbC9jYW52YXMv
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMU2hhcmVkT2JqZWN0Ojpv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFNo
YXJlZE9iamVjdC5oOgorCiAyMDIxLTA1LTI0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA
d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3Nzk0MC4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvY2suaCBiL1NvdXJjZS9XVEYvd3RmL0xvY2suaApp
bmRleCAyOGM4ODNmNTAzZDgwODY4OGM4YWRhMDg1OTdiZDQ2OTNhZjY5OTQ2Li40YmJiNGNlNDEx
NGIzODAwMTIyOWM5ODBkNmFiYTkwYTg1NTkxOGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0
Zi9Mb2NrLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9jay5oCkBAIC0xOTcsNyArMTk3LDI3IEBA
IHB1YmxpYzoKICAgICB9CiAgICAgTG9ja2VyKGNvbnN0IExvY2tlcjxMb2NrPiYpID0gZGVsZXRl
OwogICAgIExvY2tlciYgb3BlcmF0b3I9KGNvbnN0IExvY2tlcjxMb2NrPiYpID0gZGVsZXRlOwor
CisgICAgLy8gU3VwcG9ydHMgcGF0dGVybiB3aGVyZSBhbiBBYnN0cmFjdExvY2tlciBpcyBwYXNz
ZWQgaW4gYSBwYXJhbWV0ZXIgdG8gaW5kaWNhdGUgdGhlIGNhbGxlciBob2xkcyB0aGUgbG9jay4K
KyAgICBvcGVyYXRvciBBYnN0cmFjdExvY2tlcigpIGNvbnN0IHsgcmV0dXJuIEFic3RyYWN0TG9j
a2VyIHsgTm9Mb2NraW5nTmVjZXNzYXJ5IH07IH0KKwogcHJpdmF0ZToKKyAgICAvLyBTdXBwb3J0
IERyb3BMb2NrRm9yU2NvcGUgZXZlbiB0aG91Z2ggaXQgZG9lc24ndCBzdXBwb3J0IHRocmVhZCBz
YWZldHkgYW5hbHlzaXMuCisgICAgdGVtcGxhdGU8dHlwZW5hbWU+CisgICAgZnJpZW5kIGNsYXNz
IERyb3BMb2NrRm9yU2NvcGU7CisKKyAgICB2b2lkIGxvY2soKSBXVEZfQUNRVUlSRVNfTE9DSyht
X2xvY2spCisgICAgeworICAgICAgICBtX2xvY2subG9jaygpOworICAgICAgICBjb21waWxlckZl
bmNlKCk7CisgICAgfQorCisgICAgdm9pZCB1bmxvY2soKSBXVEZfUkVMRUFTRVNfTE9DSyhtX2xv
Y2spCisgICAgeworICAgICAgICBjb21waWxlckZlbmNlKCk7CisgICAgICAgIG1fbG9jay51bmxv
Y2soKTsKKyAgICB9CisKICAgICBMb2NrJiBtX2xvY2s7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IGVi
MmQzYWE4ZDYzN2U0ZDRiYTYzYTEzODE4MGEwN2RiMjljNDA2ZjUuLmJlOWQ5MzNkM2IyOGRiNTY2
NDc2YWM0OTFmNGExYmIyNGZmZDMyNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv
Y2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvY2FudmFzL1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yNjMzLDkgKzI2MzMsOCBA
QCB2b2lkIFdlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRlbGV0ZVZlcnRleEFycmF5KFdlYkdMVmVy
dGV4QXJyYXlPYmplY3QqIGFycmF5T2JqZQogCiAgICAgaWYgKCFhcnJheU9iamVjdC0+aXNEZWZh
dWx0T2JqZWN0KCkgJiYgYXJyYXlPYmplY3QgPT0gbV9ib3VuZFZlcnRleEFycmF5T2JqZWN0KSB7
CiAgICAgICAgIC8vIGJpbmRWZXJ0ZXhBcnJheSBncmFicyB0aGUgbG9jayBpbnRlcm5hbGx5Lgot
ICAgICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKKyAgICAgICAgRHJvcExvY2tGb3JTY29wZSBu
b0xvY2tTY29wZShsb2NrZXIpOwogICAgICAgICBiaW5kVmVydGV4QXJyYXkobnVsbHB0cik7IC8v
IFRoZSBkZWZhdWx0IFZBTyB3YXMgcmVtb3ZlZCBpbiBPcGVuR0wgMy4zIGJ1dCBub3QgZnJvbSBX
ZWJHTCAyOyBiaW5kIHRoZSBkZWZhdWx0IGZvciBXZWJHTCB0byB1c2UuCi0gICAgICAgIGxvY2tl
ciA9IExvY2tlciB7IG9iamVjdEdyYXBoTG9jaygpIH07CiAgICAgfQogCiAgICAgYXJyYXlPYmpl
Y3QtPmRlbGV0ZU9iamVjdChsb2NrZXIsIGdyYXBoaWNzQ29udGV4dEdMKCkpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3BwIGIvU291
cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuY3BwCmluZGV4IDE0YzJh
MDg5OTdkOTAxZGExNDBhNGIwMzc4NDhlNzQxNDQzZjY1MjUuLjk3MTQxMmY1ZjQ1MzRkMWI5NzI3
MzBiNzhhYzI3MDc2YzU5ZThkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu
dmFzL1dlYkdMQ29udGV4dEdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTENvbnRleHRHcm91cC5jcHAKQEAgLTU1LDcgKzU1LDcgQEAgR3JhcGhpY3NDb250ZXh0
R0wmIFdlYkdMQ29udGV4dEdyb3VwOjpnZXRBR3JhcGhpY3NDb250ZXh0R0woKQogICAgIHJldHVy
biAqKCptX2NvbnRleHRzLmJlZ2luKCkpLT5ncmFwaGljc0NvbnRleHRHTCgpOwogfQogCi1VbmNo
ZWNrZWRMb2NrJiBXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhMb2NrRm9yQUNvbnRleHQo
KQorTG9jayYgV2ViR0xDb250ZXh0R3JvdXA6Om9iamVjdEdyYXBoTG9ja0ZvckFDb250ZXh0KCkK
IHsKICAgICBBU1NFUlQoIW1fY29udGV4dHMuaXNFbXB0eSgpKTsKICAgICAvLyBTaW5jZSB0aGUg
V0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIG5ldmVyIHNoaXBwZWQsIGFuZCBpcwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAuaCBi
L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmgKaW5kZXggYjZh
ZmUwYWY5N2ViZGZmYWMxYTFjZDAwNDNmZmJmNzljY2QxNzc4ZC4uODU1Y2U3MjM5ODZmZTA3NzU5
OGYyNDY4MWFlODA4NmM4MWVkZmEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9j
YW52YXMvV2ViR0xDb250ZXh0R3JvdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTENvbnRleHRHcm91cC5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogICAgIGJv
b2wgaGFzQUNvbnRleHQoKSBjb25zdDsKICAgICBHcmFwaGljc0NvbnRleHRHTCYgZ2V0QUdyYXBo
aWNzQ29udGV4dEdMKCk7Ci0gICAgVW5jaGVja2VkTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9yQUNv
bnRleHQoKTsKKyAgICBMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JBQ29udGV4dCgpOwogCiAgICAg
dm9pZCBsb3NlQ29udGV4dEdyb3VwKFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6Okxvc3RDb250
ZXh0TW9kZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM
Q29udGV4dE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTENvbnRl
eHRPYmplY3QuY3BwCmluZGV4IDI0MzU0ZDA1YjgxYmM4NTIyYmU3N2QzYmI4ZjRjY2U0N2ViMzYz
ZjUuLjM0MTNhYTM4OTkyNjljYWU1ZmUwNWNjYzBmZDVkMzZiYzcxNjNjMDQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcApAQCAtNTQs
NyArNTQsNyBAQCB2b2lkIFdlYkdMQ29udGV4dE9iamVjdDo6ZGV0YWNoQ29udGV4dChjb25zdCBB
YnN0cmFjdExvY2tlciYgbG9ja2VyKQogICAgIH0KIH0KIAotVW5jaGVja2VkTG9jayYgV2ViR0xD
b250ZXh0T2JqZWN0OjpvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdlYkdMQ29u
dGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpCiB7CiAgICAgLy8gU2hvdWxk
IG5vdCBjYWxsIHRoaXMgaWYgdGhlIG9iamVjdCBvciBjb250ZXh0IGhhcyBiZWVuIGRlbGV0ZWQu
CiAgICAgQVNTRVJUKG1fY29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz
L1dlYkdMQ29udGV4dE9iamVjdC5oCmluZGV4IDBlYTc5OWZmYmIzYThhYWUwMTEzZDlhNTVjZTNl
NjNiYmEyYzhlYWYuLmUyZDg5NmJmM2I1ZDI4NGZhNWJjZDY1NjU5NWUwNDNlNjM0MmE0OGQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5oCkBA
IC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dChjb25zdCBX
VEY6OkFic3RyYWN0TG9ja2VyJik7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExv
Y2tGb3JDb250ZXh0KCkgb3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9yQ29u
dGV4dCgpIG92ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xDb250ZXh0T2JqZWN0KFdl
YkdMUmVuZGVyaW5nQ29udGV4dEJhc2UmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0
bWwvY2FudmFzL1dlYkdMT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH
TE9iamVjdC5oCmluZGV4IDY0NTEwYjlkNjFjN2RkMTdiN2EwMDIyNzYzMWRjMWQ1MWYzYjJkZDIu
LmQ2NzIwZTcyNzZlYTJhZTk0MmM5ZGI4YTQzMGUxYmJhNWU4MjRmM2IgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNv
cmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaApAQCAtNjcsNyArNjcsNyBAQCBwdWJsaWM6CiAg
ICAgLy8gV0VCR0xfc2hhcmVkX29iamVjdHMgZXh0ZW5zaW9uIHNwZWNpZmljYXRpb24gbmV2ZXIg
c2hpcHBlZCAoYW5kCiAgICAgLy8gaXMgdW5saWtlbHkgdG8pLCB0aGlzIGJhc2ljYWxseSByZXR1
cm5zIHRoZSBzYW1lIHJlc3VsdCBmb3IKICAgICAvLyBib3RoIGNvbnRleHQgb2JqZWN0cyBhbmQg
c2hhcmVkIG9iamVjdHMuCi0gICAgdmlydHVhbCBVbmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExv
Y2tGb3JDb250ZXh0KCkgPSAwOworICAgIHZpcnR1YWwgTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9y
Q29udGV4dCgpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIFdlYkdMT2JqZWN0KCkgPSBkZWZhdWx0
OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdD
b250ZXh0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlLmNwcAppbmRleCAzOWMzMmU4NDQ5YTZiOGQ0MGZhYmFmMDRmZTkwNmMwYzU0
MjBiMGM1Li41MTU1NDg4ZDdlZDFkYTk1MGQ1YWY2NzhkNDZkMjM0MGI4YmE5Y2VlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNl
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRl
eHRCYXNlLmNwcApAQCAtNzk5MCw3ICs3OTkwLDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRl
eHRCYXNlOjphZGRNZW1iZXJzVG9PcGFxdWVSb290cyhKU0M6OkFic3RyYWN0U2xvdFZpc2l0b3IK
ICAgICAvLyByb290cyBmb3IgZXh0ZW5zaW9ucy4KIH0KIAotVW5jaGVja2VkTG9jayYgV2ViR0xS
ZW5kZXJpbmdDb250ZXh0QmFzZTo6b2JqZWN0R3JhcGhMb2NrKCkKK0xvY2smIFdlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jaygpCiB7CiAgICAgcmV0dXJuIG1fb2JqZWN0
R3JhcGhMb2NrOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi
R0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi
R0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oCmluZGV4IGQ3Y2JlZWQzMmNiYzBiNzk3YzEwNjhmZDU5
N2QxM2VkOGU0YzE5NzMuLjFjMzFlODc4ZjcxMTRlMzVlNjZkNzg3YTRkODQzOWVkZjhkOGIzYTMg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u
dGV4dEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu
Z0NvbnRleHRCYXNlLmgKQEAgLTQyNiw3ICs0MjYsNyBAQCBwdWJsaWM6CiAgICAgLy8gY3VycmVu
dGx5IGxhdGNoZWQgaW50byB0aGUgY29udGV4dCAtIHdpdGhvdXQgdHJhdmVyc2luZyBhbGwgb2YK
ICAgICAvLyB0aGUgbGF0Y2hlZCBvYmplY3RzIHRvIGZpbmQgdGhlIGN1cnJlbnQgb25lLCB3aGlj
aCB3b3VsZCBiZQogICAgIC8vIHByb2hpYml0aXZlbHkgZXhwZW5zaXZlLgotICAgIFVuY2hlY2tl
ZExvY2smIG9iamVjdEdyYXBoTG9jaygpOworICAgIExvY2smIG9iamVjdEdyYXBoTG9jaygpIFdU
Rl9SRVRVUk5TX0xPQ0sobV9vYmplY3RHcmFwaExvY2spOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2Vi
R0xSZW5kZXJpbmdDb250ZXh0QmFzZShDYW52YXNCYXNlJiwgV2ViR0xDb250ZXh0QXR0cmlidXRl
cyk7CkBAIC01NDAsNyArNTQwLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUmVmUHRyPEdyYXBoaWNz
Q29udGV4dEdMPiBtX2NvbnRleHQ7CiAgICAgUmVmUHRyPFdlYkdMQ29udGV4dEdyb3VwPiBtX2Nv
bnRleHRHcm91cDsKLSAgICBVbmNoZWNrZWRMb2NrIG1fb2JqZWN0R3JhcGhMb2NrOworICAgIExv
Y2sgbV9vYmplY3RHcmFwaExvY2s7CiAKICAgICBib29sIG1fcmVzdG9yZUFsbG93ZWQgeyBmYWxz
ZSB9OwogICAgIFN1c3BlbmRhYmxlVGltZXIgbV9yZXN0b3JlVGltZXI7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAKaW5kZXggMGFiOGNiMjQx
YTFiM2YzODhmZWYzODI5OTc2Y2VjZjZkNDg3ZDM3OC4uYmQxYmQwZWM0OTVlZjY5YTg1NGYzNDRm
MmI5M2VmYmZiM2RmNDlhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv
V2ViR0xTaGFyZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl
YkdMU2hhcmVkT2JqZWN0LmNwcApAQCAtODIsNyArODIsNyBAQCBHcmFwaGljc0NvbnRleHRHTCog
V2ViR0xTaGFyZWRPYmplY3Q6OmdldEFHcmFwaGljc0NvbnRleHRHTCgpIGNvbnN0CiAgICAgcmV0
dXJuIG1fY29udGV4dEdyb3VwID8gJm1fY29udGV4dEdyb3VwLT5nZXRBR3JhcGhpY3NDb250ZXh0
R0woKSA6IG51bGxwdHI7CiB9CiAKLVVuY2hlY2tlZExvY2smIFdlYkdMU2hhcmVkT2JqZWN0Ojpv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkKK0xvY2smIFdlYkdMU2hhcmVkT2JqZWN0OjpvYmpl
Y3RHcmFwaExvY2tGb3JDb250ZXh0KCkKIHsKICAgICAvLyBTaG91bGQgbm90IGNhbGwgdGhpcyBp
ZiB0aGUgb2JqZWN0IG9yIGNvbnRleHQgaGFzIGJlZW4gZGVsZXRlZC4KICAgICBBU1NFUlQobV9j
b250ZXh0R3JvdXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi
R0xTaGFyZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMU2hhcmVk
T2JqZWN0LmgKaW5kZXggZjUzZGIxOWIwNjkyMjkwNmJkY2NiMTZjMzkzNzM4NjE1ZjE3NjU3OS4u
MGNiOTM1NGEyMjNiY2Y5NzRjNDM5NmRmNDhhZWY1ZDhiNDIyYTgyYiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFyZWRPYmplY3QuaAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5oCkBAIC01OSw3ICs1OSw3IEBA
IHB1YmxpYzoKIAogICAgIHZvaWQgZGV0YWNoQ29udGV4dEdyb3VwV2l0aG91dERlbGV0aW5nT2Jq
ZWN0KCk7CiAKLSAgICBVbmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkg
b3ZlcnJpZGU7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4dCgpIG92ZXJyaWRl
OwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViR0xTaGFyZWRPYmplY3QoV2ViR0xSZW5kZXJpbmdDb250
ZXh0QmFzZSYpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429570</attachid>
            <date>2021-05-24 15:09:16 -0700</date>
            <delta_ts>2021-05-25 16:19:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226186-20210524150915.patch</filename>
            <type>text/plain</type>
            <size>10933</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGEzNjZiYThiMWEyOWQzMDA1NmUzYWUy
YzljZDU5MzdiNDBjYjVhNGMuLjQ5OGIwMzJjNDRmOTkyMDgzNmU1ODNkZjg1NDAwMTM2MTQ1MWE3
MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6
QGFwcGxlLmNvbT4KKworICAgICAgICBTdG9wIHVzaW5nIFVuY2hlY2tlZExvY2sgaW4gaHRtbC9j
YW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
NjE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFs
bG93IGNvbnZlcnRpbmcgYSBMb2NrZXI8TG9jaz4gdG8gYW4gQWJzdHJhY3RMb2NrZXIgdHlwZS4g
VGhpcyBhbGxvd3MgcG9ydGluZworICAgICAgICBjb2RlIGZyb20gVW5jaGVja2VkTG9jayB0byBM
b2NrIGV2ZW4gaWYgc2FpZCBjb2RlIGlzIHBhc3NpbmcgdGhlIExvY2tlcjxMb2NrPgorICAgICAg
ICBhcyBwYXJhbWV0ZXIgYXJvdW5kIGFzIGFuIEFic3RyYWN0TG9ja2VyLiBUaGlzIGlzIHZlcnkg
Y29tbW9uIGluIEpTQyBhbmQgaW4KKyAgICAgICAgaHRtbC9jYW52YXMuCisKKyAgICAgICAgQWxz
byBtYWtlIERyb3BMb2NrRm9yU2NvcGUgd29yayB3aXRoIExvY2tlcjxMb2NrPiB0byBoZWxwIHBv
cnQgY29kZSBvdmVyLgorCisgICAgICAgICogd3RmL0xvY2suaDoKKwogMjAyMS0wNS0yNCAgS2Vp
dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByZXZlcnQgcjI3NjYxMCBiZWNhdXNlIGl0IGNhdXNlcyBhIDElIFBMVCByZWdyZXNzaW9uLgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh
bmdlTG9nCmluZGV4IDU5ZGNmM2VhOGFjYTc1YjIyYTQ0YWY3Mzc0ODI3MDQwYjBlNmI0NmQuLmNl
OGQ5ZDJiOGY4YjY2OTk0YjdlNTI3M2Q3ZjFiNmE3MTNmZmY1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMyBAQAorMjAyMS0wNS0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor
CisgICAgICAgIFN0b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBodG1sL2NhbnZhcworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTg2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNo
ZWNrZWRMb2NrIGluIGh0bWwvY2FudmFzLiBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHBoYXNpbmcg
b3V0CisgICAgICAgIFVuY2hlY2tlZExvY2ssIGluIGZhdm9yIG9mIHRoZSBjaGVja2VkIExvY2su
IFRlY2huaWNhbGx5LCB0aGUgY29kZSBzdGlsbAorICAgICAgICBkb2Vzbid0IGRvIG11Y2ggdGhy
ZWFkLXNhZmV0eSBhbmFseXNpcyBhZnRlciB0aGlzIGNoYW5nZS4gSXQgaXMgdmVyeSBkaWZmaWN1
bHQKKyAgICAgICAgdG8gYWRvcHQgdGhyZWFkLXNhZmV0eSBhbmFseXNpcyBoZXJlIGJlY2F1c2Ug
dGhlIGNhbGwgc2l0ZXMgZG9uJ3QgYWx3YXlzIGxvY2sKKyAgICAgICAgKHRoZXJlIGFyZSBjYXNl
cyB3aGVyZSBubyBsb2NraW5nIGlzIG5lZWRlZCkuIEl0IGlzIGFsc28gaGFyZCB0byBnZXQgYSBy
ZWZlcmVuY2UKKyAgICAgICAgdG8gdGhlIHZhcmlvdXMgbG9ja3MgdG8gbWFrZSBXVEZfUkVRVUlS
RVNfTE9DSygpIHdvcmsuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJpbmdD
b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmRl
bGV0ZVZlcnRleEFycmF5KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91
cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTENvbnRleHRHcm91cDo6b2JqZWN0R3JhcGhM
b2NrRm9yQUNvbnRleHQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3Vw
Lmg6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldlYkdMQ29udGV4dE9iamVjdDo6b2JqZWN0R3JhcGhMb2NrRm9yQ29udGV4
dCk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0Lmg6CisgICAgICAg
ICogaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJH
TFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVy
aW5nQ29udGV4dEJhc2U6Om9iamVjdEdyYXBoTG9jayk6CisgICAgICAgICogaHRtbC9jYW52YXMv
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM
U2hhcmVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMU2hhcmVkT2JqZWN0Ojpv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFNo
YXJlZE9iamVjdC5oOgorCiAyMDIxLTA1LTI0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA
d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3Nzk0MC4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvY2suaCBiL1NvdXJjZS9XVEYvd3RmL0xvY2suaApp
bmRleCAyOGM4ODNmNTAzZDgwODY4OGM4YWRhMDg1OTdiZDQ2OTNhZjY5OTQ2Li4wYzYyZDZkMWFh
ODQ0YmQ1YTRkYjljNzY0ZjRjYzY1Y2ViNDFkYWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0
Zi9Mb2NrLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9jay5oCkBAIC0xODAsNyArMTgwLDcgQEAg
aW5saW5lIHZvaWQgYXNzZXJ0SXNIZWxkKGNvbnN0IExvY2smIGxvY2spIFdURl9BU1NFUlRTX0FD
UVVJUkVEX0xPQ0sobG9jaykgeyBBU1MKIC8vIE5vbi1tb3ZhYmxlIHNpbXBsZSBzY29wZWQgbG9j
ayBob2xkZXIuCiAvLyBFeGFtcGxlOiBMb2NrZXIgbG9ja2VyIHsgbV9sb2NrIH07CiB0ZW1wbGF0
ZSA8PgotY2xhc3MgV1RGX0NBUEFCSUxJVFlfU0NPUEVEX0xPQ0sgTG9ja2VyPExvY2s+IHsKK2Ns
YXNzIFdURl9DQVBBQklMSVRZX1NDT1BFRF9MT0NLIExvY2tlcjxMb2NrPiA6IHB1YmxpYyBBYnN0
cmFjdExvY2tlciB7CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgTG9ja2VyKExvY2smIGxvY2spIFdU
Rl9BQ1FVSVJFU19MT0NLKGxvY2spCiAgICAgICAgIDogbV9sb2NrKGxvY2spCkBAIC0xOTcsNyAr
MTk3LDI0IEBAIHB1YmxpYzoKICAgICB9CiAgICAgTG9ja2VyKGNvbnN0IExvY2tlcjxMb2NrPiYp
ID0gZGVsZXRlOwogICAgIExvY2tlciYgb3BlcmF0b3I9KGNvbnN0IExvY2tlcjxMb2NrPiYpID0g
ZGVsZXRlOworCiBwcml2YXRlOgorICAgIC8vIFN1cHBvcnQgRHJvcExvY2tGb3JTY29wZSBldmVu
IHRob3VnaCBpdCBkb2Vzbid0IHN1cHBvcnQgdGhyZWFkIHNhZmV0eSBhbmFseXNpcy4KKyAgICB0
ZW1wbGF0ZTx0eXBlbmFtZT4KKyAgICBmcmllbmQgY2xhc3MgRHJvcExvY2tGb3JTY29wZTsKKwor
ICAgIHZvaWQgbG9jaygpIFdURl9BQ1FVSVJFU19MT0NLKG1fbG9jaykKKyAgICB7CisgICAgICAg
IG1fbG9jay5sb2NrKCk7CisgICAgICAgIGNvbXBpbGVyRmVuY2UoKTsKKyAgICB9CisKKyAgICB2
b2lkIHVubG9jaygpIFdURl9SRUxFQVNFU19MT0NLKG1fbG9jaykKKyAgICB7CisgICAgICAgIGNv
bXBpbGVyRmVuY2UoKTsKKyAgICAgICAgbV9sb2NrLnVubG9jaygpOworICAgIH0KKwogICAgIExv
Y2smIG1fbG9jazsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz
L1dlYkdMMlJlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv
V2ViR0wyUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggZWIyZDNhYThkNjM3ZTRkNGJhNjNhMTM4
MTgwYTA3ZGIyOWM0MDZmNS4uYmU5ZDkzM2QzYjI4ZGI1NjY0NzZhYzQ5MWY0YTFiYjI0ZmZkMzI0
OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0wyUmVuZGVyaW5n
Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0wyUmVuZGVy
aW5nQ29udGV4dC5jcHAKQEAgLTI2MzMsOSArMjYzMyw4IEBAIHZvaWQgV2ViR0wyUmVuZGVyaW5n
Q29udGV4dDo6ZGVsZXRlVmVydGV4QXJyYXkoV2ViR0xWZXJ0ZXhBcnJheU9iamVjdCogYXJyYXlP
YmplCiAKICAgICBpZiAoIWFycmF5T2JqZWN0LT5pc0RlZmF1bHRPYmplY3QoKSAmJiBhcnJheU9i
amVjdCA9PSBtX2JvdW5kVmVydGV4QXJyYXlPYmplY3QpIHsKICAgICAgICAgLy8gYmluZFZlcnRl
eEFycmF5IGdyYWJzIHRoZSBsb2NrIGludGVybmFsbHkuCi0gICAgICAgIGxvY2tlci51bmxvY2tF
YXJseSgpOworICAgICAgICBEcm9wTG9ja0ZvclNjb3BlIG5vTG9ja1Njb3BlKGxvY2tlcik7CiAg
ICAgICAgIGJpbmRWZXJ0ZXhBcnJheShudWxscHRyKTsgLy8gVGhlIGRlZmF1bHQgVkFPIHdhcyBy
ZW1vdmVkIGluIE9wZW5HTCAzLjMgYnV0IG5vdCBmcm9tIFdlYkdMIDI7IGJpbmQgdGhlIGRlZmF1
bHQgZm9yIFdlYkdMIHRvIHVzZS4KLSAgICAgICAgbG9ja2VyID0gTG9ja2VyIHsgb2JqZWN0R3Jh
cGhMb2NrKCkgfTsKICAgICB9CiAKICAgICBhcnJheU9iamVjdC0+ZGVsZXRlT2JqZWN0KGxvY2tl
ciwgZ3JhcGhpY3NDb250ZXh0R0woKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s
L2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTENvbnRleHRHcm91cC5jcHAKaW5kZXggMTRjMmEwODk5N2Q5MDFkYTE0MGE0YjAzNzg0
OGU3NDE0NDNmNjUyNS4uOTcxNDEyZjVmNDUzNGQxYjk3MjczMGI3OGFjMjcwNzZjNTllOGQwYiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0R3JvdXAu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmNw
cApAQCAtNTUsNyArNTUsNyBAQCBHcmFwaGljc0NvbnRleHRHTCYgV2ViR0xDb250ZXh0R3JvdXA6
OmdldEFHcmFwaGljc0NvbnRleHRHTCgpCiAgICAgcmV0dXJuICooKm1fY29udGV4dHMuYmVnaW4o
KSktPmdyYXBoaWNzQ29udGV4dEdMKCk7CiB9CiAKLVVuY2hlY2tlZExvY2smIFdlYkdMQ29udGV4
dEdyb3VwOjpvYmplY3RHcmFwaExvY2tGb3JBQ29udGV4dCgpCitMb2NrJiBXZWJHTENvbnRleHRH
cm91cDo6b2JqZWN0R3JhcGhMb2NrRm9yQUNvbnRleHQoKQogewogICAgIEFTU0VSVCghbV9jb250
ZXh0cy5pc0VtcHR5KCkpOwogICAgIC8vIFNpbmNlIHRoZSBXRUJHTF9zaGFyZWRfb2JqZWN0cyBl
eHRlbnNpb24gbmV2ZXIgc2hpcHBlZCwgYW5kIGlzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91cC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9j
YW52YXMvV2ViR0xDb250ZXh0R3JvdXAuaAppbmRleCBiNmFmZTBhZjk3ZWJkZmZhYzFhMWNkMDA0
M2ZmYmY3OWNjZDE3NzhkLi44NTVjZTcyMzk4NmZlMDc3NTk4ZjI0NjgxYWU4MDg2YzgxZWRmYTAz
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTENvbnRleHRHcm91
cC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dEdyb3VwLmgK
QEAgLTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNBQ29udGV4dCgpIGNvbnN0
OwogICAgIEdyYXBoaWNzQ29udGV4dEdMJiBnZXRBR3JhcGhpY3NDb250ZXh0R0woKTsKLSAgICBV
bmNoZWNrZWRMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JBQ29udGV4dCgpOworICAgIExvY2smIG9i
amVjdEdyYXBoTG9ja0ZvckFDb250ZXh0KCk7CiAKICAgICB2b2lkIGxvc2VDb250ZXh0R3JvdXAo
V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6TG9zdENvbnRleHRNb2RlKTsKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9iamVjdC5jcHAKaW5kZXggMjQz
NTRkMDViODFiYzg1MjJiZTc3ZDNiYjhmNGNjZTQ3ZWIzNjNmNS4uMzQxM2FhMzg5OTI2OWNhZTVm
ZTA1Y2NjMGZkNWQzNmJjNzE2M2MwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9j
YW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh
bnZhcy9XZWJHTENvbnRleHRPYmplY3QuY3BwCkBAIC01NCw3ICs1NCw3IEBAIHZvaWQgV2ViR0xD
b250ZXh0T2JqZWN0OjpkZXRhY2hDb250ZXh0KGNvbnN0IEFic3RyYWN0TG9ja2VyJiBsb2NrZXIp
CiAgICAgfQogfQogCi1VbmNoZWNrZWRMb2NrJiBXZWJHTENvbnRleHRPYmplY3Q6Om9iamVjdEdy
YXBoTG9ja0ZvckNvbnRleHQoKQorTG9jayYgV2ViR0xDb250ZXh0T2JqZWN0OjpvYmplY3RHcmFw
aExvY2tGb3JDb250ZXh0KCkKIHsKICAgICAvLyBTaG91bGQgbm90IGNhbGwgdGhpcyBpZiB0aGUg
b2JqZWN0IG9yIGNvbnRleHQgaGFzIGJlZW4gZGVsZXRlZC4KICAgICBBU1NFUlQobV9jb250ZXh0
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQ29udGV4dE9i
amVjdC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmgK
aW5kZXggMGVhNzk5ZmZiYjNhOGFhZTAxMTNkOWE1NWNlM2U2M2JiYTJjOGVhZi4uZTJkODk2YmYz
YjVkMjg0ZmE1YmNkNjU2NTk1ZTA0M2U2MzQyYTQ4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvaHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv
aHRtbC9jYW52YXMvV2ViR0xDb250ZXh0T2JqZWN0LmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGlj
OgogCiAgICAgdm9pZCBkZXRhY2hDb250ZXh0KGNvbnN0IFdURjo6QWJzdHJhY3RMb2NrZXImKTsK
IAotICAgIFVuY2hlY2tlZExvY2smIG9iamVjdEdyYXBoTG9ja0ZvckNvbnRleHQoKSBvdmVycmlk
ZTsKKyAgICBMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkgb3ZlcnJpZGU7CiAKIHBy
b3RlY3RlZDoKICAgICBXZWJHTENvbnRleHRPYmplY3QoV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFz
ZSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3Qu
aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmgKaW5kZXggNjQ1MTBi
OWQ2MWM3ZGQxN2I3YTAwMjI3NjMxZGMxZDUxZjNiMmRkMi4uZDY3MjBlNzI3NmVhMmFlOTQyYzlk
YjhhNDMwZTFiYmE1ZTgyNGYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52
YXMvV2ViR0xPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9i
amVjdC5oCkBAIC02Nyw3ICs2Nyw3IEBAIHB1YmxpYzoKICAgICAvLyBXRUJHTF9zaGFyZWRfb2Jq
ZWN0cyBleHRlbnNpb24gc3BlY2lmaWNhdGlvbiBuZXZlciBzaGlwcGVkIChhbmQKICAgICAvLyBp
cyB1bmxpa2VseSB0byksIHRoaXMgYmFzaWNhbGx5IHJldHVybnMgdGhlIHNhbWUgcmVzdWx0IGZv
cgogICAgIC8vIGJvdGggY29udGV4dCBvYmplY3RzIGFuZCBzaGFyZWQgb2JqZWN0cy4KLSAgICB2
aXJ0dWFsIFVuY2hlY2tlZExvY2smIG9iamVjdEdyYXBoTG9ja0ZvckNvbnRleHQoKSA9IDA7Cisg
ICAgdmlydHVhbCBMb2NrJiBvYmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkgPSAwOwogCiBwcm90
ZWN0ZWQ6CiAgICAgV2ViR0xPYmplY3QoKSA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwCmluZGV4
IDM5YzMyZTg0NDlhNmI4ZDQwZmFiYWYwNGZlOTA2YzBjNTQyMGIwYzUuLjUxNTU0ODhkN2VkMWRh
OTUwZDVhZjY3OGQ0NmQyMzQwYjhiYTljZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0
bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwCkBAIC03OTkwLDcg
Kzc5OTAsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6OmFkZE1lbWJlcnNUb09w
YXF1ZVJvb3RzKEpTQzo6QWJzdHJhY3RTbG90VmlzaXRvcgogICAgIC8vIHJvb3RzIGZvciBleHRl
bnNpb25zLgogfQogCi1VbmNoZWNrZWRMb2NrJiBXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjpv
YmplY3RHcmFwaExvY2soKQorTG9jayYgV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6b2JqZWN0
R3JhcGhMb2NrKCkKIHsKICAgICByZXR1cm4gbV9vYmplY3RHcmFwaExvY2s7CiB9CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNl
LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNl
LmgKaW5kZXggZDdjYmVlZDMyY2JjMGI3OTdjMTA2OGZkNTk3ZDEzZWQ4ZTRjMTk3My4uMWMzMWU4
NzhmNzExNGUzNWU2NmQ3ODdhNGQ4NDM5ZWRmOGQ4YjNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuaApAQCAtNDI2
LDcgKzQyNiw3IEBAIHB1YmxpYzoKICAgICAvLyBjdXJyZW50bHkgbGF0Y2hlZCBpbnRvIHRoZSBj
b250ZXh0IC0gd2l0aG91dCB0cmF2ZXJzaW5nIGFsbCBvZgogICAgIC8vIHRoZSBsYXRjaGVkIG9i
amVjdHMgdG8gZmluZCB0aGUgY3VycmVudCBvbmUsIHdoaWNoIHdvdWxkIGJlCiAgICAgLy8gcHJv
aGliaXRpdmVseSBleHBlbnNpdmUuCi0gICAgVW5jaGVja2VkTG9jayYgb2JqZWN0R3JhcGhMb2Nr
KCk7CisgICAgTG9jayYgb2JqZWN0R3JhcGhMb2NrKCkgV1RGX1JFVFVSTlNfTE9DSyhtX29iamVj
dEdyYXBoTG9jayk7CiAKIHByb3RlY3RlZDoKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNl
KENhbnZhc0Jhc2UmLCBXZWJHTENvbnRleHRBdHRyaWJ1dGVzKTsKQEAgLTU0MCw3ICs1NDAsNyBA
QCBwcm90ZWN0ZWQ6CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0R0w+IG1fY29udGV4dDsK
ICAgICBSZWZQdHI8V2ViR0xDb250ZXh0R3JvdXA+IG1fY29udGV4dEdyb3VwOwotICAgIFVuY2hl
Y2tlZExvY2sgbV9vYmplY3RHcmFwaExvY2s7CisgICAgTG9jayBtX29iamVjdEdyYXBoTG9jazsK
IAogICAgIGJvb2wgbV9yZXN0b3JlQWxsb3dlZCB7IGZhbHNlIH07CiAgICAgU3VzcGVuZGFibGVU
aW1lciBtX3Jlc3RvcmVUaW1lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu
dmFzL1dlYkdMU2hhcmVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl
YkdMU2hhcmVkT2JqZWN0LmNwcAppbmRleCAwYWI4Y2IyNDFhMWIzZjM4OGZlZjM4Mjk5NzZjZWNm
NmQ0ODdkMzc4Li5iZDFiZDBlYzQ5NWVmNjlhODU0ZjM0NGYyYjkzZWZiZmIzZGY0OWEyIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFyZWRPYmplY3QuY3BwCkBA
IC04Miw3ICs4Miw3IEBAIEdyYXBoaWNzQ29udGV4dEdMKiBXZWJHTFNoYXJlZE9iamVjdDo6Z2V0
QUdyYXBoaWNzQ29udGV4dEdMKCkgY29uc3QKICAgICByZXR1cm4gbV9jb250ZXh0R3JvdXAgPyAm
bV9jb250ZXh0R3JvdXAtPmdldEFHcmFwaGljc0NvbnRleHRHTCgpIDogbnVsbHB0cjsKIH0KIAot
VW5jaGVja2VkTG9jayYgV2ViR0xTaGFyZWRPYmplY3Q6Om9iamVjdEdyYXBoTG9ja0ZvckNvbnRl
eHQoKQorTG9jayYgV2ViR0xTaGFyZWRPYmplY3Q6Om9iamVjdEdyYXBoTG9ja0ZvckNvbnRleHQo
KQogewogICAgIC8vIFNob3VsZCBub3QgY2FsbCB0aGlzIGlmIHRoZSBvYmplY3Qgb3IgY29udGV4
dCBoYXMgYmVlbiBkZWxldGVkLgogICAgIEFTU0VSVChtX2NvbnRleHRHcm91cCk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYXJlZE9iamVjdC5oIGIvU291
cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFyZWRPYmplY3QuaAppbmRleCBmNTNkYjE5
YjA2OTIyOTA2YmRjY2IxNmMzOTM3Mzg2MTVmMTc2NTc5Li4wY2I5MzU0YTIyM2JjZjk3NGM0Mzk2
ZGY0OGFlZjVkOGI0MjJhODJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh
cy9XZWJHTFNoYXJlZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl
YkdMU2hhcmVkT2JqZWN0LmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBk
ZXRhY2hDb250ZXh0R3JvdXBXaXRob3V0RGVsZXRpbmdPYmplY3QoKTsKIAotICAgIFVuY2hlY2tl
ZExvY2smIG9iamVjdEdyYXBoTG9ja0ZvckNvbnRleHQoKSBvdmVycmlkZTsKKyAgICBMb2NrJiBv
YmplY3RHcmFwaExvY2tGb3JDb250ZXh0KCkgb3ZlcnJpZGU7CiAKIHByb3RlY3RlZDoKICAgICBX
ZWJHTFNoYXJlZE9iamVjdChXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlJik7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>