<?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>238928</bug_id>
          
          <creation_ts>2022-04-07 06:05:38 -0700</creation_ts>
          <short_desc>[JSC] Reduce Baseline JIT code size in debug builds</short_desc>
          <delta_ts>2022-04-12 00:53: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>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Geza Lore">glore</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>ews-watchlist</cc>
    
    <cc>keith_miller</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1859218</commentid>
    <comment_count>0</comment_count>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-07 06:05:38 -0700</bug_when>
    <thetext>[JSC] Reduce Baseline JIT code size in debug builds</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859225</commentid>
    <comment_count>1</comment_count>
      <attachid>456917</attachid>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-07 06:34:40 -0700</bug_when>
    <thetext>Created attachment 456917
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859313</commentid>
    <comment_count>2</comment_count>
      <attachid>456940</attachid>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-07 10:36:15 -0700</bug_when>
    <thetext>Created attachment 456940
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860095</commentid>
    <comment_count>3</comment_count>
      <attachid>456940</attachid>
    <who name="Yusuke Suzuki">ysuzuki</who>
    <bug_when>2022-04-10 01:45:41 -0700</bug_when>
    <thetext>Comment on attachment 456940
Patch

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

&gt; Source/JavaScriptCore/jit/JIT.cpp:682
&gt; +#if CPU(X86_64)
&gt; +    jit.subPtr(TrustedImm32(sizeof(void*)), expectedStackPointerGPR); // Call instruction pushed to stack
&gt; +#endif

You can use prologueStackPointerDelta() and sizeof(CallerFrameAndPC) to compute it for all architectures.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860239</commentid>
    <comment_count>4</comment_count>
      <attachid>457240</attachid>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-11 02:55:41 -0700</bug_when>
    <thetext>Created attachment 457240
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860240</commentid>
    <comment_count>5</comment_count>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-11 02:56:17 -0700</bug_when>
    <thetext>(In reply to Yusuke Suzuki from comment #3)
&gt; Comment on attachment 456940 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=456940&amp;action=review
&gt; 
&gt; &gt; Source/JavaScriptCore/jit/JIT.cpp:682
&gt; &gt; +#if CPU(X86_64)
&gt; &gt; +    jit.subPtr(TrustedImm32(sizeof(void*)), expectedStackPointerGPR); // Call instruction pushed to stack
&gt; &gt; +#endif
&gt; 
&gt; You can use prologueStackPointerDelta() and sizeof(CallerFrameAndPC) to
&gt; compute it for all architectures.

Neat, thanks. r?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860252</commentid>
    <comment_count>6</comment_count>
      <attachid>457245</attachid>
    <who name="Geza Lore">glore</who>
    <bug_when>2022-04-11 04:34:41 -0700</bug_when>
    <thetext>Created attachment 457245
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860300</commentid>
    <comment_count>7</comment_count>
      <attachid>457245</attachid>
    <who name="Saam Barati">saam</who>
    <bug_when>2022-04-11 09:07:55 -0700</bug_when>
    <thetext>Comment on attachment 457245
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860615</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-04-12 00:52:39 -0700</bug_when>
    <thetext>Committed r292767 (249551@main): &lt;https://commits.webkit.org/249551@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 457245.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1860616</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-04-12 00:53:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/91612747&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>456917</attachid>
            <date>2022-04-07 06:34:40 -0700</date>
            <delta_ts>2022-04-07 10:36:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238928-20220407133438.patch</filename>
            <type>text/plain</type>
            <size>7357</size>
            <attacher name="Geza Lore">glore</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3
ODM3YTMxZGEzNjk4NmIxMDYxNTU0ZTgzOTA3ZmY0Njc1MzkwODMxLi41NWYyZGEzMjY0N2M3YTFl
YTcxMjVjZTc4MjMwMjMwNDYwN2JkNjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyOSBAQAorMjAyMi0wNC0wNyAgR2V6YSBMb3JlICA8Z2xvcmVAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBbSlNDXSBSZWR1Y2UgQmFzZWxpbmUgSklUIGNvZGUgc2l6ZSBpbiBkZWJ1ZyBidWls
ZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODky
OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBC
YXNlbGluZSBKSVQgdXNlZCB0byBlbWl0IGEgc3Vic3RhbnRpYWwgYnV0IGlkZW50aWNhbCBzZXF1
ZW5jZSB0bworICAgICAgICBjaGVjayBwaW5uZWQgcmVnaXN0ZXJzIGFuZCB0aGUgU1AgYXQgdGhl
IGJlZ2lubmluZyBvZiBldmVyeSBieXRlY29kZS4KKyAgICAgICAgVGhpcyBjYXVzZWQgbGFyZ2Ug
Y29kZSBibG9hdCBhbmQgbWFkZSBpdCBzb21ld2hhdCBkaWZmaWN1bHQgdG8gdXNlCisgICAgICAg
IGRlYnVnIGJ1aWxkcyBvbiByZXNvdXJjZSBjb25zdHJhaW5lZCBwbGF0Zm9ybXMuIFRyeWluZyB0
byBhbGxldmlhdGUKKyAgICAgICAgdGhpcyBieSBlbWl0dGluZyB0aGUgc2VxdWVuY2Ugb25seSBv
bmNlIGFzIGEgc3ViLWZ1bmN0aW9uLCBhZnRlciB0aGUKKyAgICAgICAgc2xvdyBwYXRoIHNlY3Rp
b24gKGJ1dCBiZWZvcmUgdGhlIHN0YWNrIG92ZXJmbG93IGNoZWNrKSwgYW5kIGNhbGxpbmcKKyAg
ICAgICAgaXQgZnJvbSB0aGUgb3BzIGluc3RlYWQuIFRoZSBzb3VyY2Ugb3Agb2YgYSBmYXVsdGlu
ZyBieXRlY29kZSBpcworICAgICAgICBlYXNpbHkgdmlzaWJsZSBpbiB0aGUgbGluayByZWdpc3Rl
ciAob3Igb24gdGhlIHN0YWNrIG9uIHg4NikuCisKKyAgICAgICAgVGhpcyBzYXZlcyAyNSUgQmFz
ZWxpbmUgSklUIGNvZGUgc2l6ZSAoYW5kIDEwJSBvdmVyYWxsKSBvbiBhIGRlYnVnCisgICAgICAg
IGJ1aWxkIHdpdGggSmV0U3RyZWFtMi4KKworICAgICAgICAqIGppdC9KSVQuY3BwOgorICAgICAg
ICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlTWFpblBhc3MpOgorICAgICAgICAoSlNDOjpKSVQ6
OmVtaXRDb25zaXN0ZW5jeUNoZWNrKToKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlQW5kTGlu
a1dpdGhvdXRGaW5hbGl6aW5nKToKKyAgICAgICAgKEpTQzo6SklUOjpsaW5rKToKKyAgICAgICAg
KiBqaXQvSklULmg6CisKIDIwMjItMDQtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp
YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gUmVtb3RlSW5zcGVjdG9yIGFkZCBz
dXBwb3J0IGZvciBJUHY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ
VC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKaW5kZXggNzExMjc2ZTVl
NmQ3ZjljOWI5NWQ1OGY3OTEwNjYwMzI3ODUxZjc1NC4uNmFmM2Y0ZjVmZGRlYmUyOGMyNjMwMWZm
M2U4Zjg1YzcxYWY5ZmJhYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K
SVQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcApAQCAtMTQzLDE3
ICsxNDMsNiBAQCB2b2lkIEpJVDo6ZW1pdFZhclJlYWRPbmx5Q2hlY2soUmVzb2x2ZVR5cGUgcmVz
b2x2ZVR5cGUsIEdQUlJlZyBzY3JhdGNoR1BSKQogICAgIH0KIH0KIAotdm9pZCBKSVQ6OmFzc2Vy
dFN0YWNrUG9pbnRlck9mZnNldCgpCi17Ci0gICAgaWYgKCFBU1NFUlRfRU5BQkxFRCkKLSAgICAg
ICAgcmV0dXJuOwotICAgIAotICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zm
c2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFt
ZVJlZ2lzdGVyLCByZWdUMCk7Ci0gICAgSnVtcCBvayA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDAs
IHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKLSAgICBicmVha3BvaW50KCk7Ci0gICAgb2subGluayh0
aGlzKTsKLX0KLQogdm9pZCBKSVQ6OnJlc2V0U1AoKQogewogICAgIGFkZFB0cihUcnVzdGVkSW1t
MzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJl
Z2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CkBAIC0y
NDgsMTkgKzIzNyw4IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZU1haW5QYXNzKCkKICAgICAg
ICAgfQogCiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICAgICAgaWYgKG9wY29kZUlEICE9IG9wX2Nh
dGNoKSB7Ci0gICAgICAgICAgICBsb2FkUHRyKGFkZHJlc3NGb3IoQ2FsbEZyYW1lU2xvdDo6Y29k
ZUJsb2NrKSwgcmVnVDApOwotICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2Rl
QmxvY2s6Om9mZnNldE9mTWV0YWRhdGFUYWJsZSgpKSwgcmVnVDEpOwotICAgICAgICAgICAgbG9h
ZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2RlQmxvY2s6Om9mZnNldE9mQmFzZWxpbmVKSVREYXRhKCkp
LCByZWdUMik7Ci0KLSAgICAgICAgICAgIGF1dG8gbWV0YWRhdGFPSyA9IGJyYW5jaFB0cihFcXVh
bCwgcmVnVDEsIHNfbWV0YWRhdGFHUFIpOwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAg
ICAgICAgICAgbWV0YWRhdGFPSy5saW5rKHRoaXMpOwotCi0gICAgICAgICAgICBhdXRvIGNvbnN0
YW50c09LID0gYnJhbmNoUHRyKEVxdWFsLCByZWdUMiwgc19jb25zdGFudHNHUFIpOwotICAgICAg
ICAgICAgYnJlYWtwb2ludCgpOwotICAgICAgICAgICAgY29uc3RhbnRzT0subGluayh0aGlzKTsK
LSAgICAgICAgfQorICAgICAgICBpZiAob3Bjb2RlSUQgIT0gb3BfY2F0Y2gpCisgICAgICAgICAg
ICBtX2NvbnNpc3RlbmN5Q2hlY2tDYWxscy5hcHBlbmQobmVhckNhbGwoKSk7CiAjZW5kaWYKIAog
ICAgICAgICBpZiAoVU5MSUtFTFkobV9jb21waWxhdGlvbikpIHsKQEAgLTI4MSw5ICsyNTksNiBA
QCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcygpCiAgICAgICAgICAgICB9KTsKICAg
ICAgICAgfQogCi0gICAgICAgIGlmIChvcGNvZGVJRCAhPSBvcF9jYXRjaCkKLSAgICAgICAgICAg
IGFzc2VydFN0YWNrUG9pbnRlck9mZnNldCgpOwotCiAgICAgICAgIHN3aXRjaCAob3Bjb2RlSUQp
IHsKICAgICAgICAgREVGSU5FX1NMT1dfT1AobGVzcykKICAgICAgICAgREVGSU5FX1NMT1dfT1Ao
bGVzc2VxKQpAQCAtNjg4LDYgKzY2Myw0MyBAQCB2b2lkIEpJVDo6ZW1pdFJlc3RvcmVDYWxsZWVT
YXZlcygpCiAgICAgQmFzZTo6ZW1pdFJlc3RvcmVDYWxsZWVTYXZlc0ZvcigmUmVnaXN0ZXJBdE9m
ZnNldExpc3Q6OmxsaW50QmFzZWxpbmVDYWxsZWVTYXZlUmVnaXN0ZXJzKCkpOwogfQogCisjaWYg
QVNTRVJUX0VOQUJMRUQKK3ZvaWQgSklUOjplbWl0Q29uc2lzdGVuY3lDaGVjaygpCit7CisgICAg
Y29uc3RleHByIEdQUlJlZyBleHBlY3RlZFN0YWNrUG9pbnRlckdQUiA9IHJlZ1QwOworICAgIGNv
bnN0ZXhwciBHUFJSZWcgZXhwZWN0ZWRNZXRhZGF0YUdQUiA9IHJlZ1QxOworICAgIGNvbnN0ZXhw
ciBHUFJSZWcgZXhwZWN0ZWRDb25zdGFudHNHUFIgPSByZWdUMjsKKworICAgIEFTU0VSVCghbV9j
b25zaXN0ZW5jeUNoZWNrTGFiZWwuaXNTZXQoKSk7CisgICAgbV9jb25zaXN0ZW5jeUNoZWNrTGFi
ZWwgPSBsYWJlbCgpOworCisgICAgdGFnUmV0dXJuQWRkcmVzcygpOworCisgICAgYWRkUHRyKFRy
dXN0ZWRJbW0zMihzdGFja1BvaW50ZXJPZmZzZXRGb3IobV91bmxpbmtlZENvZGVCbG9jaykgKiBz
aXplb2YoUmVnaXN0ZXIpKSwgY2FsbEZyYW1lUmVnaXN0ZXIsIGV4cGVjdGVkU3RhY2tQb2ludGVy
R1BSKTsKKyNpZiBDUFUoWDg2XzY0KQorICAgIHN1YlB0cihUcnVzdGVkSW1tMzIoc2l6ZW9mKHZv
aWQqKSksIGV4cGVjdGVkU3RhY2tQb2ludGVyR1BSKTsgLy8gQ2FsbCBpbnN0cnVjdGlvbiBwdXNo
ZWQgdG8gc3RhY2sKKyNlbmRpZgorCisgICAgbG9hZFB0cihhZGRyZXNzRm9yKENhbGxGcmFtZVNs
b3Q6OmNvZGVCbG9jayksIGV4cGVjdGVkQ29uc3RhbnRzR1BSKTsKKyAgICBsb2FkUHRyKEFkZHJl
c3MoZXhwZWN0ZWRDb25zdGFudHNHUFIsIENvZGVCbG9jazo6b2Zmc2V0T2ZNZXRhZGF0YVRhYmxl
KCkpLCBleHBlY3RlZE1ldGFkYXRhR1BSKTsKKyAgICBsb2FkUHRyKEFkZHJlc3MoZXhwZWN0ZWRD
b25zdGFudHNHUFIsIENvZGVCbG9jazo6b2Zmc2V0T2ZCYXNlbGluZUpJVERhdGEoKSksIGV4cGVj
dGVkQ29uc3RhbnRzR1BSKTsKKworICAgIGF1dG8gc3RhY2tQb2ludGVyT0sgPSBicmFuY2hQdHIo
RXF1YWwsIGV4cGVjdGVkU3RhY2tQb2ludGVyR1BSLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7Cisg
ICAgYnJlYWtwb2ludCgpOworICAgIHN0YWNrUG9pbnRlck9LLmxpbmsodGhpcyk7CisKKyAgICBh
dXRvIG1ldGFkYXRhT0sgPSBicmFuY2hQdHIoRXF1YWwsIGV4cGVjdGVkTWV0YWRhdGFHUFIsIHNf
bWV0YWRhdGFHUFIpOworICAgIGJyZWFrcG9pbnQoKTsKKyAgICBtZXRhZGF0YU9LLmxpbmsodGhp
cyk7CisKKyAgICBhdXRvIGNvbnN0YW50c09LID0gYnJhbmNoUHRyKEVxdWFsLCBleHBlY3RlZENv
bnN0YW50c0dQUiwgc19jb25zdGFudHNHUFIpOworICAgIGJyZWFrcG9pbnQoKTsKKyAgICBjb25z
dGFudHNPSy5saW5rKHRoaXMpOworCisgICAgcmV0KCk7Cit9CisjZW5kaWYKKwogdm9pZCBKSVQ6
OmNvbXBpbGVBbmRMaW5rV2l0aG91dEZpbmFsaXppbmcoSklUQ29tcGlsYXRpb25FZmZvcnQgZWZm
b3J0KQogewogICAgIERGRzo6Q2FwYWJpbGl0eUxldmVsIGxldmVsID0gbV9wcm9maWxlZENvZGVC
bG9jay0+Y2FwYWJpbGl0eUxldmVsKCk7CkBAIC03OTEsNiArODAzLDEwIEBAIHZvaWQgSklUOjpj
b21waWxlQW5kTGlua1dpdGhvdXRGaW5hbGl6aW5nKEpJVENvbXBpbGF0aW9uRWZmb3J0IGVmZm9y
dCkKICAgICAgICAgbV9kaXNhc3NlbWJsZXItPnNldEVuZE9mU2xvd1BhdGgobGFiZWwoKSk7CiAg
ICAgbV9wY1RvQ29kZU9yaWdpbk1hcEJ1aWxkZXIuYXBwZW5kSXRlbShsYWJlbCgpLCBQQ1RvQ29k
ZU9yaWdpbk1hcEJ1aWxkZXI6OmRlZmF1bHRDb2RlT3JpZ2luKCkpOwogCisjaWYgQVNTRVJUX0VO
QUJMRUQKKyAgICBlbWl0Q29uc2lzdGVuY3lDaGVjaygpOworI2VuZGlmCisKICAgICBzdGFja092
ZXJmbG93LmxpbmsodGhpcyk7CiAgICAgbV9ieXRlY29kZUluZGV4ID0gQnl0ZWNvZGVJbmRleCgw
KTsKICAgICBpZiAobWF4RnJhbWVFeHRlbnRGb3JTbG93UGF0aENhbGwpCkBAIC05MDMsNiArOTE5
LDEyIEBAIHZvaWQgSklUOjpsaW5rKCkKICAgICAgICAgICAgIHBhdGNoQnVmZmVyLmxpbmsocmVj
b3JkLmZyb20sIHJlY29yZC5jYWxsZWUpOwogICAgIH0KIAorI2lmIEFTU0VSVF9FTkFCTEVECisg
ICAgY29uc3QgYXV0byBjb25zaXN0ZW5jeUNoZWNrID0gcGF0Y2hCdWZmZXIubG9jYXRpb25PZjxK
U0ludGVybmFsUHRyVGFnPihtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbCk7CisgICAgZm9yIChhdXRv
JiBjYWxsIDogbV9jb25zaXN0ZW5jeUNoZWNrQ2FsbHMpCisgICAgICAgIHBhdGNoQnVmZmVyLmxp
bms8SlNJbnRlcm5hbFB0clRhZz4oY2FsbCwgY29uc2lzdGVuY3lDaGVjayk7CisjZW5kaWYKKwog
ICAgIGF1dG8gZmluYWxpemVJQ3MgPSBbJl0gKGF1dG8mIGdlbmVyYXRvcnMpIHsKICAgICAgICAg
Zm9yIChhdXRvJiBnZW4gOiBnZW5lcmF0b3JzKSB7CiAgICAgICAgICAgICBnZW4ubV91bmxpbmtl
ZFN0dWJJbmZvLT5zdGFydCA9IHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8SklUU3R1YlJvdXRpbmVQ
dHJUYWc+KGdlbi5tX3N0YXJ0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q
aXQvSklULmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCmluZGV4IGRhYTJjNTIx
ODM2ZWUyNmMwODMzODdmZDUyOTRiNjdlMjg2ZjViNGYuLjc2N2QwNjNlZTYzYzMxNmIzNTdhMzZm
YTVkZmQyMjI1MzMzMmZmZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv
SklULmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaApAQCAtMzg4LDggKzM4
OCw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTbG93T3Bl
cmF0aW9uPgogICAgICAgICB2b2lkIGVtaXRfY29tcGFyZUFuZEp1bXBTbG93SW1wbChWaXJ0dWFs
UmVnaXN0ZXIgb3AxLCBWaXJ0dWFsUmVnaXN0ZXIgb3AyLCB1bnNpZ25lZCB0YXJnZXQsIHNpemVf
dCBpbnN0cnVjdGlvblNpemUsIERvdWJsZUNvbmRpdGlvbiwgU2xvd09wZXJhdGlvbiwgYm9vbCBp
bnZlcnQsIFZlY3RvcjxTbG93Q2FzZUVudHJ5Pjo6aXRlcmF0b3ImKTsKIAotICAgICAgICB2b2lk
IGFzc2VydFN0YWNrUG9pbnRlck9mZnNldCgpOwotCiAgICAgICAgIHZvaWQgZW1pdF9vcF9hZGQo
Y29uc3QgSlNJbnN0cnVjdGlvbiopOwogICAgICAgICB2b2lkIGVtaXRfb3BfYml0YW5kKGNvbnN0
IEpTSW5zdHJ1Y3Rpb24qKTsKICAgICAgICAgdm9pZCBlbWl0X29wX2JpdG9yKGNvbnN0IEpTSW5z
dHJ1Y3Rpb24qKTsKQEAgLTg4NCw2ICs4ODIsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg
IHZvaWQgZW1pdFNhdmVDYWxsZWVTYXZlcygpOwogICAgICAgICB2b2lkIGVtaXRSZXN0b3JlQ2Fs
bGVlU2F2ZXMoKTsKIAorI2lmIEFTU0VSVF9FTkFCTEVECisgICAgICAgIHZvaWQgZW1pdENvbnNp
c3RlbmN5Q2hlY2soKTsKKyNlbmRpZgorCiAgICAgICAgIHN0YXRpYyBib29sIHJlcG9ydENvbXBp
bGVUaW1lcygpOwogICAgICAgICBzdGF0aWMgYm9vbCBjb21wdXRlQ29tcGlsZVRpbWVzKCk7CiAK
QEAgLTkyMSw2ICs5MjMsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgSnVtcExpc3Qg
bV9leGNlcHRpb25DaGVja3M7CiAgICAgICAgIEp1bXBMaXN0IG1fZXhjZXB0aW9uQ2hlY2tzV2l0
aENhbGxGcmFtZVJvbGxiYWNrOworI2lmIEFTU0VSVF9FTkFCTEVECisgICAgICAgIExhYmVsIG1f
Y29uc2lzdGVuY3lDaGVja0xhYmVsOworICAgICAgICBWZWN0b3I8Q2FsbD4gbV9jb25zaXN0ZW5j
eUNoZWNrQ2FsbHM7CisjZW5kaWYKIAogICAgICAgICB1bnNpZ25lZCBtX2dldEJ5SWRJbmRleCB7
IFVJTlRfTUFYIH07CiAgICAgICAgIHVuc2lnbmVkIG1fZ2V0QnlWYWxJbmRleCB7IFVJTlRfTUFY
IH07Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>456940</attachid>
            <date>2022-04-07 10:36:15 -0700</date>
            <delta_ts>2022-04-11 02:55:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238928-20220407173614.patch</filename>
            <type>text/plain</type>
            <size>8285</size>
            <attacher name="Geza Lore">glore</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy
MWMyZTQ4MDk4NDljN2NmNTIyNTM0YjI1ZmI3YjIxMzdhMWFjMmQ3Li5jNWQwNTAyZTI5YmQwOTlm
ZDY5ZTU5YTkwNjY4MjE4MjJkMzdiZWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMSBAQAorMjAyMi0wNC0wNyAgR2V6YSBMb3JlICA8Z2xvcmVAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBbSlNDXSBSZWR1Y2UgQmFzZWxpbmUgSklUIGNvZGUgc2l6ZSBpbiBkZWJ1ZyBidWls
ZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODky
OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBC
YXNlbGluZSBKSVQgdXNlZCB0byBlbWl0IGEgc3Vic3RhbnRpYWwgYnV0IGlkZW50aWNhbCBzZXF1
ZW5jZSB0bworICAgICAgICBjaGVjayBwaW5uZWQgcmVnaXN0ZXJzIGFuZCB0aGUgU1AgYXQgdGhl
IGJlZ2lubmluZyBvZiBldmVyeSBieXRlY29kZS4KKyAgICAgICAgVGhpcyBjYXVzZWQgbGFyZ2Ug
Y29kZSBibG9hdCBhbmQgbWFkZSBpdCBzb21ld2hhdCBkaWZmaWN1bHQgdG8gdXNlCisgICAgICAg
IGRlYnVnIGJ1aWxkcyBvbiByZXNvdXJjZSBjb25zdHJhaW5lZCBwbGF0Zm9ybXMuIFRyeWluZyB0
byBhbGxldmlhdGUKKyAgICAgICAgdGhpcyBieSBlbWl0dGluZyBhIHNtYWxsIGRpc3BhdGNoZXIg
YWZ0ZXIgdGhlIHNsb3cgcGF0aCBzZWN0aW9uIChidXQKKyAgICAgICAgYmVmb3JlIHRoZSBzdGFj
ayBvdmVyZmxvdyBjaGVjayksIHdoaWNoIHRoZW4gdGFpbC1jYWxscyBhIHNoYXJlZAorICAgICAg
ICB0aHVuay4gVGhlIG9wY29kZXMgdGhlbiBjYWxsIHRoaXMgdmVyeSBzbWFsbCBkaXNwYXRjaGVy
LiBUaGUgc291cmNlIG9wCisgICAgICAgIG9mIGEgZmF1bHRpbmcgYnl0ZWNvZGUgaXMgZWFzaWx5
IHZpc2libGUgaW4gdGhlIGxpbmsgcmVnaXN0ZXIgKG9yIG9uCisgICAgICAgIHRoZSBzdGFjayBv
biB4ODYpLgorCisgICAgICAgIFRoaXMgc2F2ZXMgMzQlIEJhc2VsaW5lIEpJVCBjb2RlIHNpemUg
KGFuZCAxNCUgb3ZlcmFsbCkgb24gYSBkZWJ1ZworICAgICAgICBidWlsZCB3aXRoIEpldFN0cmVh
bTIuIEFsc28gZml4ZXMgYWxsIGNvZGUtc2l6ZSByZWxhdGVkIHRlc3QgZmFpbHVyZXMKKyAgICAg
ICAgb24gdGhlIEFSTXY3IGRlYnVnIGJ1aWxkLgorCisgICAgICAgICogaml0L0pJVC5jcHA6Cisg
ICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcyk6CisgICAgICAgIChKU0M6
OkpJVDo6ZW1pdENvbnNpc3RlbmN5Q2hlY2spOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVB
bmRMaW5rV2l0aG91dEZpbmFsaXppbmcpOgorICAgICAgICAoSlNDOjpKSVQ6OmxpbmspOgorICAg
ICAgICAqIGppdC9KSVQuaDoKKwogMjAyMi0wNC0wNyAgR2V6YSBMb3JlICA8Z2xvcmVAaWdhbGlh
LmNvbT4KIAogICAgICAgICBbSlNDXVtBUk12N10gU3VwcG9ydCBwcm9wZXIgbmVhciBjYWxscyBh
bmQgSlVNUF9JU0xBTkRTCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ
VC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKaW5kZXggNzExMjc2ZTVl
NmQ3ZjljOWI5NWQ1OGY3OTEwNjYwMzI3ODUxZjc1NC4uMjcwMDk4ZjY5OGZkY2FhYjRkYWNjZjY1
NGYyMGQ0YmZkZmZlMTBmMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K
SVQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcApAQCAtMTQzLDE3
ICsxNDMsNiBAQCB2b2lkIEpJVDo6ZW1pdFZhclJlYWRPbmx5Q2hlY2soUmVzb2x2ZVR5cGUgcmVz
b2x2ZVR5cGUsIEdQUlJlZyBzY3JhdGNoR1BSKQogICAgIH0KIH0KIAotdm9pZCBKSVQ6OmFzc2Vy
dFN0YWNrUG9pbnRlck9mZnNldCgpCi17Ci0gICAgaWYgKCFBU1NFUlRfRU5BQkxFRCkKLSAgICAg
ICAgcmV0dXJuOwotICAgIAotICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zm
c2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFt
ZVJlZ2lzdGVyLCByZWdUMCk7Ci0gICAgSnVtcCBvayA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDAs
IHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKLSAgICBicmVha3BvaW50KCk7Ci0gICAgb2subGluayh0
aGlzKTsKLX0KLQogdm9pZCBKSVQ6OnJlc2V0U1AoKQogewogICAgIGFkZFB0cihUcnVzdGVkSW1t
MzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJl
Z2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CkBAIC0y
NDgsMTkgKzIzNyw4IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZU1haW5QYXNzKCkKICAgICAg
ICAgfQogCiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICAgICAgaWYgKG9wY29kZUlEICE9IG9wX2Nh
dGNoKSB7Ci0gICAgICAgICAgICBsb2FkUHRyKGFkZHJlc3NGb3IoQ2FsbEZyYW1lU2xvdDo6Y29k
ZUJsb2NrKSwgcmVnVDApOwotICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2Rl
QmxvY2s6Om9mZnNldE9mTWV0YWRhdGFUYWJsZSgpKSwgcmVnVDEpOwotICAgICAgICAgICAgbG9h
ZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2RlQmxvY2s6Om9mZnNldE9mQmFzZWxpbmVKSVREYXRhKCkp
LCByZWdUMik7Ci0KLSAgICAgICAgICAgIGF1dG8gbWV0YWRhdGFPSyA9IGJyYW5jaFB0cihFcXVh
bCwgcmVnVDEsIHNfbWV0YWRhdGFHUFIpOwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAg
ICAgICAgICAgbWV0YWRhdGFPSy5saW5rKHRoaXMpOwotCi0gICAgICAgICAgICBhdXRvIGNvbnN0
YW50c09LID0gYnJhbmNoUHRyKEVxdWFsLCByZWdUMiwgc19jb25zdGFudHNHUFIpOwotICAgICAg
ICAgICAgYnJlYWtwb2ludCgpOwotICAgICAgICAgICAgY29uc3RhbnRzT0subGluayh0aGlzKTsK
LSAgICAgICAgfQorICAgICAgICBpZiAob3Bjb2RlSUQgIT0gb3BfY2F0Y2gpCisgICAgICAgICAg
ICBtX2NvbnNpc3RlbmN5Q2hlY2tDYWxscy5hcHBlbmQobmVhckNhbGwoKSk7CiAjZW5kaWYKIAog
ICAgICAgICBpZiAoVU5MSUtFTFkobV9jb21waWxhdGlvbikpIHsKQEAgLTI4MSw5ICsyNTksNiBA
QCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcygpCiAgICAgICAgICAgICB9KTsKICAg
ICAgICAgfQogCi0gICAgICAgIGlmIChvcGNvZGVJRCAhPSBvcF9jYXRjaCkKLSAgICAgICAgICAg
IGFzc2VydFN0YWNrUG9pbnRlck9mZnNldCgpOwotCiAgICAgICAgIHN3aXRjaCAob3Bjb2RlSUQp
IHsKICAgICAgICAgREVGSU5FX1NMT1dfT1AobGVzcykKICAgICAgICAgREVGSU5FX1NMT1dfT1Ao
bGVzc2VxKQpAQCAtNjg4LDYgKzY2Myw1NyBAQCB2b2lkIEpJVDo6ZW1pdFJlc3RvcmVDYWxsZWVT
YXZlcygpCiAgICAgQmFzZTo6ZW1pdFJlc3RvcmVDYWxsZWVTYXZlc0ZvcigmUmVnaXN0ZXJBdE9m
ZnNldExpc3Q6OmxsaW50QmFzZWxpbmVDYWxsZWVTYXZlUmVnaXN0ZXJzKCkpOwogfQogCisjaWYg
QVNTRVJUX0VOQUJMRUQKK01hY3JvQXNzZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gSklU
Ojpjb25zaXN0ZW5jeUNoZWNrR2VuZXJhdG9yKFZNJikKK3sKKyAgICBDQ2FsbEhlbHBlcnMgaml0
OworCisgICAgY29uc3RleHByIEdQUlJlZyBzdGFja09mZnNldEdQUiA9IHJlZ1QwOyAvLyBJbmNv
bWluZworICAgIGNvbnN0ZXhwciBHUFJSZWcgZXhwZWN0ZWRTdGFja1BvaW50ZXJHUFIgPSByZWdU
MTsKKyAgICBjb25zdGV4cHIgR1BSUmVnIGV4cGVjdGVkTWV0YWRhdGFHUFIgPSByZWdUMjsKKyAg
ICBjb25zdGV4cHIgR1BSUmVnIGV4cGVjdGVkQ29uc3RhbnRzR1BSID0gcmVnVDM7CisKKyAgICBq
aXQudGFnUmV0dXJuQWRkcmVzcygpOworCisgICAgaml0Lm11bDMyKFRydXN0ZWRJbW0zMihzaXpl
b2YoUmVnaXN0ZXIpKSwgc3RhY2tPZmZzZXRHUFIsIHN0YWNrT2Zmc2V0R1BSKTsKKyAgICBqaXQu
c3ViUHRyKGNhbGxGcmFtZVJlZ2lzdGVyLCBzdGFja09mZnNldEdQUiwgZXhwZWN0ZWRTdGFja1Bv
aW50ZXJHUFIpOworI2lmIENQVShYODZfNjQpCisgICAgaml0LnN1YlB0cihUcnVzdGVkSW1tMzIo
c2l6ZW9mKHZvaWQqKSksIGV4cGVjdGVkU3RhY2tQb2ludGVyR1BSKTsgLy8gQ2FsbCBpbnN0cnVj
dGlvbiBwdXNoZWQgdG8gc3RhY2sKKyNlbmRpZgorCisgICAgaml0LmxvYWRQdHIoYWRkcmVzc0Zv
cihDYWxsRnJhbWVTbG90Ojpjb2RlQmxvY2spLCBleHBlY3RlZENvbnN0YW50c0dQUik7CisgICAg
aml0LmxvYWRQdHIoQWRkcmVzcyhleHBlY3RlZENvbnN0YW50c0dQUiwgQ29kZUJsb2NrOjpvZmZz
ZXRPZk1ldGFkYXRhVGFibGUoKSksIGV4cGVjdGVkTWV0YWRhdGFHUFIpOworICAgIGppdC5sb2Fk
UHRyKEFkZHJlc3MoZXhwZWN0ZWRDb25zdGFudHNHUFIsIENvZGVCbG9jazo6b2Zmc2V0T2ZCYXNl
bGluZUpJVERhdGEoKSksIGV4cGVjdGVkQ29uc3RhbnRzR1BSKTsKKworICAgIGF1dG8gc3RhY2tQ
b2ludGVyT0sgPSBqaXQuYnJhbmNoUHRyKEVxdWFsLCBleHBlY3RlZFN0YWNrUG9pbnRlckdQUiwg
c3RhY2tQb2ludGVyUmVnaXN0ZXIpOworICAgIGppdC5icmVha3BvaW50KCk7CisgICAgc3RhY2tQ
b2ludGVyT0subGluaygmaml0KTsKKworICAgIGF1dG8gbWV0YWRhdGFPSyA9IGppdC5icmFuY2hQ
dHIoRXF1YWwsIGV4cGVjdGVkTWV0YWRhdGFHUFIsIHNfbWV0YWRhdGFHUFIpOworICAgIGppdC5i
cmVha3BvaW50KCk7CisgICAgbWV0YWRhdGFPSy5saW5rKCZqaXQpOworCisgICAgYXV0byBjb25z
dGFudHNPSyA9IGppdC5icmFuY2hQdHIoRXF1YWwsIGV4cGVjdGVkQ29uc3RhbnRzR1BSLCBzX2Nv
bnN0YW50c0dQUik7CisgICAgaml0LmJyZWFrcG9pbnQoKTsKKyAgICBjb25zdGFudHNPSy5saW5r
KCZqaXQpOworCisgICAgaml0LnJldCgpOworCisgICAgTGlua0J1ZmZlciBwYXRjaEJ1ZmZlcihq
aXQsIEdMT0JBTF9USFVOS19JRCwgTGlua0J1ZmZlcjo6UHJvZmlsZTo6RXh0cmFDVElUaHVuayk7
CisgICAgcmV0dXJuIEZJTkFMSVpFX0NPREUocGF0Y2hCdWZmZXIsIEpJVFRodW5rUHRyVGFnLCAi
QmFzZWxpbmU6IGdlbmVyYXRlQ29uc2lzdGVuY3lDaGVjayIpOworfQorCit2b2lkIEpJVDo6ZW1p
dENvbnNpc3RlbmN5Q2hlY2soKQoreworICAgIEFTU0VSVCghbV9jb25zaXN0ZW5jeUNoZWNrTGFi
ZWwuaXNTZXQoKSk7CisgICAgbV9jb25zaXN0ZW5jeUNoZWNrTGFiZWwgPSBsYWJlbCgpOworICAg
IG1vdmUoVHJ1c3RlZEltbTMyKC1zdGFja1BvaW50ZXJPZmZzZXRGb3IobV91bmxpbmtlZENvZGVC
bG9jaykpLCByZWdUMCk7CisgICAgbV9ieXRlY29kZUluZGV4ID0gQnl0ZWNvZGVJbmRleCgwKTsK
KyAgICBlbWl0TmFrZWROZWFyVGFpbENhbGwodm0oKS5nZXRDVElTdHViKGNvbnNpc3RlbmN5Q2hl
Y2tHZW5lcmF0b3IpLnJldGFnZ2VkQ29kZTxOb1B0clRhZz4oKSk7CisgICAgbV9ieXRlY29kZUlu
ZGV4ID0gQnl0ZWNvZGVJbmRleCgpOyAvLyBSZXNldCB0aGlzLCBpbiBvcmRlciB0byBndWFyZCBp
dHMgdXNlIHdpdGggQVNTRVJUcy4KK30KKyNlbmRpZgorCiB2b2lkIEpJVDo6Y29tcGlsZUFuZExp
bmtXaXRob3V0RmluYWxpemluZyhKSVRDb21waWxhdGlvbkVmZm9ydCBlZmZvcnQpCiB7CiAgICAg
REZHOjpDYXBhYmlsaXR5TGV2ZWwgbGV2ZWwgPSBtX3Byb2ZpbGVkQ29kZUJsb2NrLT5jYXBhYmls
aXR5TGV2ZWwoKTsKQEAgLTc5MSw2ICs4MTcsMTAgQEAgdm9pZCBKSVQ6OmNvbXBpbGVBbmRMaW5r
V2l0aG91dEZpbmFsaXppbmcoSklUQ29tcGlsYXRpb25FZmZvcnQgZWZmb3J0KQogICAgICAgICBt
X2Rpc2Fzc2VtYmxlci0+c2V0RW5kT2ZTbG93UGF0aChsYWJlbCgpKTsKICAgICBtX3BjVG9Db2Rl
T3JpZ2luTWFwQnVpbGRlci5hcHBlbmRJdGVtKGxhYmVsKCksIFBDVG9Db2RlT3JpZ2luTWFwQnVp
bGRlcjo6ZGVmYXVsdENvZGVPcmlnaW4oKSk7CiAKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGVt
aXRDb25zaXN0ZW5jeUNoZWNrKCk7CisjZW5kaWYKKwogICAgIHN0YWNrT3ZlcmZsb3cubGluayh0
aGlzKTsKICAgICBtX2J5dGVjb2RlSW5kZXggPSBCeXRlY29kZUluZGV4KDApOwogICAgIGlmICht
YXhGcmFtZUV4dGVudEZvclNsb3dQYXRoQ2FsbCkKQEAgLTkwMyw2ICs5MzMsMTIgQEAgdm9pZCBK
SVQ6OmxpbmsoKQogICAgICAgICAgICAgcGF0Y2hCdWZmZXIubGluayhyZWNvcmQuZnJvbSwgcmVj
b3JkLmNhbGxlZSk7CiAgICAgfQogCisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICBjb25zdCBhdXRv
IGNvbnNpc3RlbmN5Q2hlY2sgPSBwYXRjaEJ1ZmZlci5sb2NhdGlvbk9mPEpTSW50ZXJuYWxQdHJU
YWc+KG1fY29uc2lzdGVuY3lDaGVja0xhYmVsKTsKKyAgICBmb3IgKGF1dG8mIGNhbGwgOiBtX2Nv
bnNpc3RlbmN5Q2hlY2tDYWxscykKKyAgICAgICAgcGF0Y2hCdWZmZXIubGluazxKU0ludGVybmFs
UHRyVGFnPihjYWxsLCBjb25zaXN0ZW5jeUNoZWNrKTsKKyNlbmRpZgorCiAgICAgYXV0byBmaW5h
bGl6ZUlDcyA9IFsmXSAoYXV0byYgZ2VuZXJhdG9ycykgewogICAgICAgICBmb3IgKGF1dG8mIGdl
biA6IGdlbmVyYXRvcnMpIHsKICAgICAgICAgICAgIGdlbi5tX3VubGlua2VkU3R1YkluZm8tPnN0
YXJ0ID0gcGF0Y2hCdWZmZXIubG9jYXRpb25PZjxKSVRTdHViUm91dGluZVB0clRhZz4oZ2VuLm1f
c3RhcnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaCBiL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgKaW5kZXggZGFhMmM1MjE4MzZlZTI2YzA4MzM4
N2ZkNTI5NGI2N2UyODZmNWI0Zi4uYjlmMzc2OTU2NTAxYzM4MzE1NGFlZjdiYWUzODM2ZTk5OWJm
MThmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAorKysgYi9T
b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCkBAIC0zODgsOCArMzg4LDYgQEAgbmFtZXNw
YWNlIEpTQyB7CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNsb3dPcGVyYXRpb24+CiAgICAg
ICAgIHZvaWQgZW1pdF9jb21wYXJlQW5kSnVtcFNsb3dJbXBsKFZpcnR1YWxSZWdpc3RlciBvcDEs
IFZpcnR1YWxSZWdpc3RlciBvcDIsIHVuc2lnbmVkIHRhcmdldCwgc2l6ZV90IGluc3RydWN0aW9u
U2l6ZSwgRG91YmxlQ29uZGl0aW9uLCBTbG93T3BlcmF0aW9uLCBib29sIGludmVydCwgVmVjdG9y
PFNsb3dDYXNlRW50cnk+OjppdGVyYXRvciYpOwogCi0gICAgICAgIHZvaWQgYXNzZXJ0U3RhY2tQ
b2ludGVyT2Zmc2V0KCk7Ci0KICAgICAgICAgdm9pZCBlbWl0X29wX2FkZChjb25zdCBKU0luc3Ry
dWN0aW9uKik7CiAgICAgICAgIHZvaWQgZW1pdF9vcF9iaXRhbmQoY29uc3QgSlNJbnN0cnVjdGlv
biopOwogICAgICAgICB2b2lkIGVtaXRfb3BfYml0b3IoY29uc3QgSlNJbnN0cnVjdGlvbiopOwpA
QCAtODg0LDYgKzg4MiwxMSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9pZCBlbWl0U2F2
ZUNhbGxlZVNhdmVzKCk7CiAgICAgICAgIHZvaWQgZW1pdFJlc3RvcmVDYWxsZWVTYXZlcygpOwog
CisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICAgICAgc3RhdGljIE1hY3JvQXNzZW1ibGVyQ29kZVJl
ZjxKSVRUaHVua1B0clRhZz4gY29uc2lzdGVuY3lDaGVja0dlbmVyYXRvcihWTSYpOworICAgICAg
ICB2b2lkIGVtaXRDb25zaXN0ZW5jeUNoZWNrKCk7CisjZW5kaWYKKwogICAgICAgICBzdGF0aWMg
Ym9vbCByZXBvcnRDb21waWxlVGltZXMoKTsKICAgICAgICAgc3RhdGljIGJvb2wgY29tcHV0ZUNv
bXBpbGVUaW1lcygpOwogCkBAIC05MjEsNiArOTI0LDEwIEBAIG5hbWVzcGFjZSBKU0MgewogCiAg
ICAgICAgIEp1bXBMaXN0IG1fZXhjZXB0aW9uQ2hlY2tzOwogICAgICAgICBKdW1wTGlzdCBtX2V4
Y2VwdGlvbkNoZWNrc1dpdGhDYWxsRnJhbWVSb2xsYmFjazsKKyNpZiBBU1NFUlRfRU5BQkxFRAor
ICAgICAgICBMYWJlbCBtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbDsKKyAgICAgICAgVmVjdG9yPENh
bGw+IG1fY29uc2lzdGVuY3lDaGVja0NhbGxzOworI2VuZGlmCiAKICAgICAgICAgdW5zaWduZWQg
bV9nZXRCeUlkSW5kZXggeyBVSU5UX01BWCB9OwogICAgICAgICB1bnNpZ25lZCBtX2dldEJ5VmFs
SW5kZXggeyBVSU5UX01BWCB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457240</attachid>
            <date>2022-04-11 02:55:41 -0700</date>
            <delta_ts>2022-04-11 04:34:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238928-20220411105540.patch</filename>
            <type>text/plain</type>
            <size>8392</size>
            <attacher name="Geza Lore">glore</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3
Njc2YmQyNTVlMGJlYWFhYzE1NDlhN2U3OTc1ZDIyZTVkNWU3ZjJlLi40ZWQ3ZGE0NGRhYWQ3ZmZl
MmNhOWZkNjlmNDM2ZjBjZDE4YWEzYmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMSBAQAorMjAyMi0wNC0xMSAgR2V6YSBMb3JlICA8Z2xvcmVAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBbSlNDXSBSZWR1Y2UgQmFzZWxpbmUgSklUIGNvZGUgc2l6ZSBpbiBkZWJ1ZyBidWls
ZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODky
OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBC
YXNlbGluZSBKSVQgdXNlZCB0byBlbWl0IGEgc3Vic3RhbnRpYWwgYnV0IGlkZW50aWNhbCBzZXF1
ZW5jZSB0bworICAgICAgICBjaGVjayBwaW5uZWQgcmVnaXN0ZXJzIGFuZCB0aGUgU1AgYXQgdGhl
IGJlZ2lubmluZyBvZiBldmVyeSBieXRlY29kZS4KKyAgICAgICAgVGhpcyBjYXVzZWQgbGFyZ2Ug
Y29kZSBibG9hdCBhbmQgbWFkZSBpdCBzb21ld2hhdCBkaWZmaWN1bHQgdG8gdXNlCisgICAgICAg
IGRlYnVnIGJ1aWxkcyBvbiByZXNvdXJjZSBjb25zdHJhaW5lZCBwbGF0Zm9ybXMuIFRyeWluZyB0
byBhbGxldmlhdGUKKyAgICAgICAgdGhpcyBieSBlbWl0dGluZyBhIHNtYWxsIGRpc3BhdGNoZXIg
YWZ0ZXIgdGhlIHNsb3cgcGF0aCBzZWN0aW9uIChidXQKKyAgICAgICAgYmVmb3JlIHRoZSBzdGFj
ayBvdmVyZmxvdyBjaGVjayksIHdoaWNoIHRoZW4gdGFpbC1jYWxscyBhIHNoYXJlZAorICAgICAg
ICB0aHVuay4gVGhlIG9wY29kZXMgdGhlbiBjYWxsIHRoaXMgdmVyeSBzbWFsbCBkaXNwYXRjaGVy
LiBUaGUgc291cmNlIG9wCisgICAgICAgIG9mIGEgZmF1bHRpbmcgYnl0ZWNvZGUgaXMgZWFzaWx5
IHZpc2libGUgaW4gdGhlIGxpbmsgcmVnaXN0ZXIgKG9yIG9uCisgICAgICAgIHRoZSBzdGFjayBv
biB4ODYpLgorCisgICAgICAgIFRoaXMgc2F2ZXMgMzQlIEJhc2VsaW5lIEpJVCBjb2RlIHNpemUg
KGFuZCAxNCUgb3ZlcmFsbCkgb24gYSBkZWJ1ZworICAgICAgICBidWlsZCB3aXRoIEpldFN0cmVh
bTIuIEFsc28gZml4ZXMgYWxsIGNvZGUtc2l6ZSByZWxhdGVkIHRlc3QgZmFpbHVyZXMKKyAgICAg
ICAgb24gdGhlIEFSTXY3IGRlYnVnIGJ1aWxkLgorCisgICAgICAgICogaml0L0pJVC5jcHA6Cisg
ICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcyk6CisgICAgICAgIChKU0M6
OkpJVDo6ZW1pdENvbnNpc3RlbmN5Q2hlY2spOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVB
bmRMaW5rV2l0aG91dEZpbmFsaXppbmcpOgorICAgICAgICAoSlNDOjpKSVQ6OmxpbmspOgorICAg
ICAgICAqIGppdC9KSVQuaDoKKwogMjAyMi0wNC0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw
bGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgV2F0Y2hPUyBidWlsZCBmaXguCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvaml0L0pJVC5jcHAKaW5kZXggNzExMjc2ZTVlNmQ3ZjljOWI5NWQ1OGY3OTEwNjYwMzI3
ODUxZjc1NC4uOTc0MWZjOGZmZjAwM2YwZjE1NTJlYTc1NTdkYzk2MTVkNDgzYTllOSAxMDA2NDQK
LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9qaXQvSklULmNwcApAQCAtMTQzLDE3ICsxNDMsNiBAQCB2b2lkIEpJVDo6ZW1p
dFZhclJlYWRPbmx5Q2hlY2soUmVzb2x2ZVR5cGUgcmVzb2x2ZVR5cGUsIEdQUlJlZyBzY3JhdGNo
R1BSKQogICAgIH0KIH0KIAotdm9pZCBKSVQ6OmFzc2VydFN0YWNrUG9pbnRlck9mZnNldCgpCi17
Ci0gICAgaWYgKCFBU1NFUlRfRU5BQkxFRCkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGFk
ZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxv
Y2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCByZWdUMCk7Ci0gICAg
SnVtcCBvayA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDAsIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsK
LSAgICBicmVha3BvaW50KCk7Ci0gICAgb2subGluayh0aGlzKTsKLX0KLQogdm9pZCBKSVQ6OnJl
c2V0U1AoKQogewogICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9y
KG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lz
dGVyLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CkBAIC0yNDgsMTkgKzIzNyw4IEBAIHZvaWQgSklU
Ojpwcml2YXRlQ29tcGlsZU1haW5QYXNzKCkKICAgICAgICAgfQogCiAjaWYgQVNTRVJUX0VOQUJM
RUQKLSAgICAgICAgaWYgKG9wY29kZUlEICE9IG9wX2NhdGNoKSB7Ci0gICAgICAgICAgICBsb2Fk
UHRyKGFkZHJlc3NGb3IoQ2FsbEZyYW1lU2xvdDo6Y29kZUJsb2NrKSwgcmVnVDApOwotICAgICAg
ICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2RlQmxvY2s6Om9mZnNldE9mTWV0YWRhdGFU
YWJsZSgpKSwgcmVnVDEpOwotICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2Rl
QmxvY2s6Om9mZnNldE9mQmFzZWxpbmVKSVREYXRhKCkpLCByZWdUMik7Ci0KLSAgICAgICAgICAg
IGF1dG8gbWV0YWRhdGFPSyA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDEsIHNfbWV0YWRhdGFHUFIp
OwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAgICAgICAgICAgbWV0YWRhdGFPSy5saW5r
KHRoaXMpOwotCi0gICAgICAgICAgICBhdXRvIGNvbnN0YW50c09LID0gYnJhbmNoUHRyKEVxdWFs
LCByZWdUMiwgc19jb25zdGFudHNHUFIpOwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAg
ICAgICAgICAgY29uc3RhbnRzT0subGluayh0aGlzKTsKLSAgICAgICAgfQorICAgICAgICBpZiAo
b3Bjb2RlSUQgIT0gb3BfY2F0Y2gpCisgICAgICAgICAgICBtX2NvbnNpc3RlbmN5Q2hlY2tDYWxs
cy5hcHBlbmQobmVhckNhbGwoKSk7CiAjZW5kaWYKIAogICAgICAgICBpZiAoVU5MSUtFTFkobV9j
b21waWxhdGlvbikpIHsKQEAgLTI4MSw5ICsyNTksNiBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBp
bGVNYWluUGFzcygpCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChv
cGNvZGVJRCAhPSBvcF9jYXRjaCkKLSAgICAgICAgICAgIGFzc2VydFN0YWNrUG9pbnRlck9mZnNl
dCgpOwotCiAgICAgICAgIHN3aXRjaCAob3Bjb2RlSUQpIHsKICAgICAgICAgREVGSU5FX1NMT1df
T1AobGVzcykKICAgICAgICAgREVGSU5FX1NMT1dfT1AobGVzc2VxKQpAQCAtNjg4LDYgKzY2Myw1
NyBAQCB2b2lkIEpJVDo6ZW1pdFJlc3RvcmVDYWxsZWVTYXZlcygpCiAgICAgQmFzZTo6ZW1pdFJl
c3RvcmVDYWxsZWVTYXZlc0ZvcigmUmVnaXN0ZXJBdE9mZnNldExpc3Q6OmxsaW50QmFzZWxpbmVD
YWxsZWVTYXZlUmVnaXN0ZXJzKCkpOwogfQogCisjaWYgQVNTRVJUX0VOQUJMRUQKK01hY3JvQXNz
ZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gSklUOjpjb25zaXN0ZW5jeUNoZWNrR2VuZXJh
dG9yKFZNJikKK3sKKyAgICBDQ2FsbEhlbHBlcnMgaml0OworCisgICAgY29uc3RleHByIEdQUlJl
ZyBzdGFja09mZnNldEdQUiA9IHJlZ1QwOyAvLyBJbmNvbWluZworICAgIGNvbnN0ZXhwciBHUFJS
ZWcgZXhwZWN0ZWRTdGFja1BvaW50ZXJHUFIgPSByZWdUMTsKKyAgICBjb25zdGV4cHIgR1BSUmVn
IGV4cGVjdGVkTWV0YWRhdGFHUFIgPSByZWdUMjsKKyAgICBjb25zdGV4cHIgR1BSUmVnIGV4cGVj
dGVkQ29uc3RhbnRzR1BSID0gcmVnVDM7CisKKyAgICBqaXQudGFnUmV0dXJuQWRkcmVzcygpOwor
CisgICAgaml0Lm11bDMyKFRydXN0ZWRJbW0zMihzaXplb2YoUmVnaXN0ZXIpKSwgc3RhY2tPZmZz
ZXRHUFIsIHN0YWNrT2Zmc2V0R1BSKTsKKyAgICBqaXQuc3ViUHRyKGNhbGxGcmFtZVJlZ2lzdGVy
LCBzdGFja09mZnNldEdQUiwgZXhwZWN0ZWRTdGFja1BvaW50ZXJHUFIpOworICAgIC8vIEZpeCB1
cCBpbiBjYXNlIHRoZSBjYWxsIHNlcXVlbmNlIChmcm9tIHRoZSBvcCkgY2hhbmdlZCB0aGUgc3Rh
Y2sgcG9pbnRlciwgZS5nLjogbGlrZSBvbiB4ODYKKyAgICBpZiBjb25zdGV4cHIgKGNvbnN0IHNp
emVfdCBkZWx0YSA9IHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSAtIHByb2xvZ3VlU3RhY2tQb2lu
dGVyRGVsdGEoKSkKKyAgICAgICAgaml0LnN1YlB0cihUcnVzdGVkSW1tMzIoZGVsdGEpLCBleHBl
Y3RlZFN0YWNrUG9pbnRlckdQUik7CisKKyAgICBqaXQubG9hZFB0cihhZGRyZXNzRm9yKENhbGxG
cmFtZVNsb3Q6OmNvZGVCbG9jayksIGV4cGVjdGVkQ29uc3RhbnRzR1BSKTsKKyAgICBqaXQubG9h
ZFB0cihBZGRyZXNzKGV4cGVjdGVkQ29uc3RhbnRzR1BSLCBDb2RlQmxvY2s6Om9mZnNldE9mTWV0
YWRhdGFUYWJsZSgpKSwgZXhwZWN0ZWRNZXRhZGF0YUdQUik7CisgICAgaml0LmxvYWRQdHIoQWRk
cmVzcyhleHBlY3RlZENvbnN0YW50c0dQUiwgQ29kZUJsb2NrOjpvZmZzZXRPZkJhc2VsaW5lSklU
RGF0YSgpKSwgZXhwZWN0ZWRDb25zdGFudHNHUFIpOworCisgICAgYXV0byBzdGFja1BvaW50ZXJP
SyA9IGppdC5icmFuY2hQdHIoRXF1YWwsIGV4cGVjdGVkU3RhY2tQb2ludGVyR1BSLCBzdGFja1Bv
aW50ZXJSZWdpc3Rlcik7CisgICAgaml0LmJyZWFrcG9pbnQoKTsKKyAgICBzdGFja1BvaW50ZXJP
Sy5saW5rKCZqaXQpOworCisgICAgYXV0byBtZXRhZGF0YU9LID0gaml0LmJyYW5jaFB0cihFcXVh
bCwgZXhwZWN0ZWRNZXRhZGF0YUdQUiwgc19tZXRhZGF0YUdQUik7CisgICAgaml0LmJyZWFrcG9p
bnQoKTsKKyAgICBtZXRhZGF0YU9LLmxpbmsoJmppdCk7CisKKyAgICBhdXRvIGNvbnN0YW50c09L
ID0gaml0LmJyYW5jaFB0cihFcXVhbCwgZXhwZWN0ZWRDb25zdGFudHNHUFIsIHNfY29uc3RhbnRz
R1BSKTsKKyAgICBqaXQuYnJlYWtwb2ludCgpOworICAgIGNvbnN0YW50c09LLmxpbmsoJmppdCk7
CisKKyAgICBqaXQucmV0KCk7CisKKyAgICBMaW5rQnVmZmVyIHBhdGNoQnVmZmVyKGppdCwgR0xP
QkFMX1RIVU5LX0lELCBMaW5rQnVmZmVyOjpQcm9maWxlOjpFeHRyYUNUSVRodW5rKTsKKyAgICBy
ZXR1cm4gRklOQUxJWkVfQ09ERShwYXRjaEJ1ZmZlciwgSklUVGh1bmtQdHJUYWcsICJCYXNlbGlu
ZTogZ2VuZXJhdGVDb25zaXN0ZW5jeUNoZWNrIik7Cit9CisKK3ZvaWQgSklUOjplbWl0Q29uc2lz
dGVuY3lDaGVjaygpCit7CisgICAgQVNTRVJUKCFtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbC5pc1Nl
dCgpKTsKKyAgICBtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbCA9IGxhYmVsKCk7CisgICAgbW92ZShU
cnVzdGVkSW1tMzIoLXN0YWNrUG9pbnRlck9mZnNldEZvcihtX3VubGlua2VkQ29kZUJsb2NrKSks
IHJlZ1QwKTsKKyAgICBtX2J5dGVjb2RlSW5kZXggPSBCeXRlY29kZUluZGV4KDApOworICAgIGVt
aXROYWtlZE5lYXJUYWlsQ2FsbCh2bSgpLmdldENUSVN0dWIoY29uc2lzdGVuY3lDaGVja0dlbmVy
YXRvcikucmV0YWdnZWRDb2RlPE5vUHRyVGFnPigpKTsKKyAgICBtX2J5dGVjb2RlSW5kZXggPSBC
eXRlY29kZUluZGV4KCk7IC8vIFJlc2V0IHRoaXMsIGluIG9yZGVyIHRvIGd1YXJkIGl0cyB1c2Ug
d2l0aCBBU1NFUlRzLgorfQorI2VuZGlmCisKIHZvaWQgSklUOjpjb21waWxlQW5kTGlua1dpdGhv
dXRGaW5hbGl6aW5nKEpJVENvbXBpbGF0aW9uRWZmb3J0IGVmZm9ydCkKIHsKICAgICBERkc6OkNh
cGFiaWxpdHlMZXZlbCBsZXZlbCA9IG1fcHJvZmlsZWRDb2RlQmxvY2stPmNhcGFiaWxpdHlMZXZl
bCgpOwpAQCAtNzkxLDYgKzgxNywxMCBAQCB2b2lkIEpJVDo6Y29tcGlsZUFuZExpbmtXaXRob3V0
RmluYWxpemluZyhKSVRDb21waWxhdGlvbkVmZm9ydCBlZmZvcnQpCiAgICAgICAgIG1fZGlzYXNz
ZW1ibGVyLT5zZXRFbmRPZlNsb3dQYXRoKGxhYmVsKCkpOwogICAgIG1fcGNUb0NvZGVPcmlnaW5N
YXBCdWlsZGVyLmFwcGVuZEl0ZW0obGFiZWwoKSwgUENUb0NvZGVPcmlnaW5NYXBCdWlsZGVyOjpk
ZWZhdWx0Q29kZU9yaWdpbigpKTsKIAorI2lmIEFTU0VSVF9FTkFCTEVECisgICAgZW1pdENvbnNp
c3RlbmN5Q2hlY2soKTsKKyNlbmRpZgorCiAgICAgc3RhY2tPdmVyZmxvdy5saW5rKHRoaXMpOwog
ICAgIG1fYnl0ZWNvZGVJbmRleCA9IEJ5dGVjb2RlSW5kZXgoMCk7CiAgICAgaWYgKG1heEZyYW1l
RXh0ZW50Rm9yU2xvd1BhdGhDYWxsKQpAQCAtOTAzLDYgKzkzMywxMiBAQCB2b2lkIEpJVDo6bGlu
aygpCiAgICAgICAgICAgICBwYXRjaEJ1ZmZlci5saW5rKHJlY29yZC5mcm9tLCByZWNvcmQuY2Fs
bGVlKTsKICAgICB9CiAKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGNvbnN0IGF1dG8gY29uc2lz
dGVuY3lDaGVjayA9IHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8SlNJbnRlcm5hbFB0clRhZz4obV9j
b25zaXN0ZW5jeUNoZWNrTGFiZWwpOworICAgIGZvciAoYXV0byYgY2FsbCA6IG1fY29uc2lzdGVu
Y3lDaGVja0NhbGxzKQorICAgICAgICBwYXRjaEJ1ZmZlci5saW5rPEpTSW50ZXJuYWxQdHJUYWc+
KGNhbGwsIGNvbnNpc3RlbmN5Q2hlY2spOworI2VuZGlmCisKICAgICBhdXRvIGZpbmFsaXplSUNz
ID0gWyZdIChhdXRvJiBnZW5lcmF0b3JzKSB7CiAgICAgICAgIGZvciAoYXV0byYgZ2VuIDogZ2Vu
ZXJhdG9ycykgewogICAgICAgICAgICAgZ2VuLm1fdW5saW5rZWRTdHViSW5mby0+c3RhcnQgPSBw
YXRjaEJ1ZmZlci5sb2NhdGlvbk9mPEpJVFN0dWJSb3V0aW5lUHRyVGFnPihnZW4ubV9zdGFydCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oIGIvU291cmNlL0ph
dmFTY3JpcHRDb3JlL2ppdC9KSVQuaAppbmRleCBkYWEyYzUyMTgzNmVlMjZjMDgzMzg3ZmQ1Mjk0
YjY3ZTI4NmY1YjRmLi5iOWYzNzY5NTY1MDFjMzgzMTU0YWVmN2JhZTM4MzZlOTk5YmYxOGYxIDEw
MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCisrKyBiL1NvdXJjZS9K
YXZhU2NyaXB0Q29yZS9qaXQvSklULmgKQEAgLTM4OCw4ICszODgsNiBAQCBuYW1lc3BhY2UgSlND
IHsKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2xvd09wZXJhdGlvbj4KICAgICAgICAgdm9p
ZCBlbWl0X2NvbXBhcmVBbmRKdW1wU2xvd0ltcGwoVmlydHVhbFJlZ2lzdGVyIG9wMSwgVmlydHVh
bFJlZ2lzdGVyIG9wMiwgdW5zaWduZWQgdGFyZ2V0LCBzaXplX3QgaW5zdHJ1Y3Rpb25TaXplLCBE
b3VibGVDb25kaXRpb24sIFNsb3dPcGVyYXRpb24sIGJvb2wgaW52ZXJ0LCBWZWN0b3I8U2xvd0Nh
c2VFbnRyeT46Oml0ZXJhdG9yJik7CiAKLSAgICAgICAgdm9pZCBhc3NlcnRTdGFja1BvaW50ZXJP
ZmZzZXQoKTsKLQogICAgICAgICB2b2lkIGVtaXRfb3BfYWRkKGNvbnN0IEpTSW5zdHJ1Y3Rpb24q
KTsKICAgICAgICAgdm9pZCBlbWl0X29wX2JpdGFuZChjb25zdCBKU0luc3RydWN0aW9uKik7CiAg
ICAgICAgIHZvaWQgZW1pdF9vcF9iaXRvcihjb25zdCBKU0luc3RydWN0aW9uKik7CkBAIC04ODQs
NiArODgyLDExIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2b2lkIGVtaXRTYXZlQ2FsbGVl
U2F2ZXMoKTsKICAgICAgICAgdm9pZCBlbWl0UmVzdG9yZUNhbGxlZVNhdmVzKCk7CiAKKyNpZiBB
U1NFUlRfRU5BQkxFRAorICAgICAgICBzdGF0aWMgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFRo
dW5rUHRyVGFnPiBjb25zaXN0ZW5jeUNoZWNrR2VuZXJhdG9yKFZNJik7CisgICAgICAgIHZvaWQg
ZW1pdENvbnNpc3RlbmN5Q2hlY2soKTsKKyNlbmRpZgorCiAgICAgICAgIHN0YXRpYyBib29sIHJl
cG9ydENvbXBpbGVUaW1lcygpOwogICAgICAgICBzdGF0aWMgYm9vbCBjb21wdXRlQ29tcGlsZVRp
bWVzKCk7CiAKQEAgLTkyMSw2ICs5MjQsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAg
SnVtcExpc3QgbV9leGNlcHRpb25DaGVja3M7CiAgICAgICAgIEp1bXBMaXN0IG1fZXhjZXB0aW9u
Q2hlY2tzV2l0aENhbGxGcmFtZVJvbGxiYWNrOworI2lmIEFTU0VSVF9FTkFCTEVECisgICAgICAg
IExhYmVsIG1fY29uc2lzdGVuY3lDaGVja0xhYmVsOworICAgICAgICBWZWN0b3I8Q2FsbD4gbV9j
b25zaXN0ZW5jeUNoZWNrQ2FsbHM7CisjZW5kaWYKIAogICAgICAgICB1bnNpZ25lZCBtX2dldEJ5
SWRJbmRleCB7IFVJTlRfTUFYIH07CiAgICAgICAgIHVuc2lnbmVkIG1fZ2V0QnlWYWxJbmRleCB7
IFVJTlRfTUFYIH07Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457245</attachid>
            <date>2022-04-11 04:34:41 -0700</date>
            <delta_ts>2022-04-12 00:52:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238928-20220411113440.patch</filename>
            <type>text/plain</type>
            <size>8386</size>
            <attacher name="Geza Lore">glore</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3
Njc2YmQyNTVlMGJlYWFhYzE1NDlhN2U3OTc1ZDIyZTVkNWU3ZjJlLi40ZWQ3ZGE0NGRhYWQ3ZmZl
MmNhOWZkNjlmNDM2ZjBjZDE4YWEzYmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMSBAQAorMjAyMi0wNC0xMSAgR2V6YSBMb3JlICA8Z2xvcmVAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBbSlNDXSBSZWR1Y2UgQmFzZWxpbmUgSklUIGNvZGUgc2l6ZSBpbiBkZWJ1ZyBidWls
ZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODky
OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBC
YXNlbGluZSBKSVQgdXNlZCB0byBlbWl0IGEgc3Vic3RhbnRpYWwgYnV0IGlkZW50aWNhbCBzZXF1
ZW5jZSB0bworICAgICAgICBjaGVjayBwaW5uZWQgcmVnaXN0ZXJzIGFuZCB0aGUgU1AgYXQgdGhl
IGJlZ2lubmluZyBvZiBldmVyeSBieXRlY29kZS4KKyAgICAgICAgVGhpcyBjYXVzZWQgbGFyZ2Ug
Y29kZSBibG9hdCBhbmQgbWFkZSBpdCBzb21ld2hhdCBkaWZmaWN1bHQgdG8gdXNlCisgICAgICAg
IGRlYnVnIGJ1aWxkcyBvbiByZXNvdXJjZSBjb25zdHJhaW5lZCBwbGF0Zm9ybXMuIFRyeWluZyB0
byBhbGxldmlhdGUKKyAgICAgICAgdGhpcyBieSBlbWl0dGluZyBhIHNtYWxsIGRpc3BhdGNoZXIg
YWZ0ZXIgdGhlIHNsb3cgcGF0aCBzZWN0aW9uIChidXQKKyAgICAgICAgYmVmb3JlIHRoZSBzdGFj
ayBvdmVyZmxvdyBjaGVjayksIHdoaWNoIHRoZW4gdGFpbC1jYWxscyBhIHNoYXJlZAorICAgICAg
ICB0aHVuay4gVGhlIG9wY29kZXMgdGhlbiBjYWxsIHRoaXMgdmVyeSBzbWFsbCBkaXNwYXRjaGVy
LiBUaGUgc291cmNlIG9wCisgICAgICAgIG9mIGEgZmF1bHRpbmcgYnl0ZWNvZGUgaXMgZWFzaWx5
IHZpc2libGUgaW4gdGhlIGxpbmsgcmVnaXN0ZXIgKG9yIG9uCisgICAgICAgIHRoZSBzdGFjayBv
biB4ODYpLgorCisgICAgICAgIFRoaXMgc2F2ZXMgMzQlIEJhc2VsaW5lIEpJVCBjb2RlIHNpemUg
KGFuZCAxNCUgb3ZlcmFsbCkgb24gYSBkZWJ1ZworICAgICAgICBidWlsZCB3aXRoIEpldFN0cmVh
bTIuIEFsc28gZml4ZXMgYWxsIGNvZGUtc2l6ZSByZWxhdGVkIHRlc3QgZmFpbHVyZXMKKyAgICAg
ICAgb24gdGhlIEFSTXY3IGRlYnVnIGJ1aWxkLgorCisgICAgICAgICogaml0L0pJVC5jcHA6Cisg
ICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVNYWluUGFzcyk6CisgICAgICAgIChKU0M6
OkpJVDo6ZW1pdENvbnNpc3RlbmN5Q2hlY2spOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVB
bmRMaW5rV2l0aG91dEZpbmFsaXppbmcpOgorICAgICAgICAoSlNDOjpKSVQ6OmxpbmspOgorICAg
ICAgICAqIGppdC9KSVQuaDoKKwogMjAyMi0wNC0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw
bGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgV2F0Y2hPUyBidWlsZCBmaXguCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvaml0L0pJVC5jcHAKaW5kZXggNzExMjc2ZTVlNmQ3ZjljOWI5NWQ1OGY3OTEwNjYwMzI3
ODUxZjc1NC4uMTg4MWQxYzg3ZGFmMjYzYjk3NWFmYTAyZjEyNmIwNTJjYjgwODQ4NCAxMDA2NDQK
LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9qaXQvSklULmNwcApAQCAtMTQzLDE3ICsxNDMsNiBAQCB2b2lkIEpJVDo6ZW1p
dFZhclJlYWRPbmx5Q2hlY2soUmVzb2x2ZVR5cGUgcmVzb2x2ZVR5cGUsIEdQUlJlZyBzY3JhdGNo
R1BSKQogICAgIH0KIH0KIAotdm9pZCBKSVQ6OmFzc2VydFN0YWNrUG9pbnRlck9mZnNldCgpCi17
Ci0gICAgaWYgKCFBU1NFUlRfRU5BQkxFRCkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGFk
ZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKG1fdW5saW5rZWRDb2RlQmxv
Y2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCByZWdUMCk7Ci0gICAg
SnVtcCBvayA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDAsIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsK
LSAgICBicmVha3BvaW50KCk7Ci0gICAgb2subGluayh0aGlzKTsKLX0KLQogdm9pZCBKSVQ6OnJl
c2V0U1AoKQogewogICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9y
KG1fdW5saW5rZWRDb2RlQmxvY2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lz
dGVyLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CkBAIC0yNDgsMTkgKzIzNyw4IEBAIHZvaWQgSklU
Ojpwcml2YXRlQ29tcGlsZU1haW5QYXNzKCkKICAgICAgICAgfQogCiAjaWYgQVNTRVJUX0VOQUJM
RUQKLSAgICAgICAgaWYgKG9wY29kZUlEICE9IG9wX2NhdGNoKSB7Ci0gICAgICAgICAgICBsb2Fk
UHRyKGFkZHJlc3NGb3IoQ2FsbEZyYW1lU2xvdDo6Y29kZUJsb2NrKSwgcmVnVDApOwotICAgICAg
ICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2RlQmxvY2s6Om9mZnNldE9mTWV0YWRhdGFU
YWJsZSgpKSwgcmVnVDEpOwotICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBDb2Rl
QmxvY2s6Om9mZnNldE9mQmFzZWxpbmVKSVREYXRhKCkpLCByZWdUMik7Ci0KLSAgICAgICAgICAg
IGF1dG8gbWV0YWRhdGFPSyA9IGJyYW5jaFB0cihFcXVhbCwgcmVnVDEsIHNfbWV0YWRhdGFHUFIp
OwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAgICAgICAgICAgbWV0YWRhdGFPSy5saW5r
KHRoaXMpOwotCi0gICAgICAgICAgICBhdXRvIGNvbnN0YW50c09LID0gYnJhbmNoUHRyKEVxdWFs
LCByZWdUMiwgc19jb25zdGFudHNHUFIpOwotICAgICAgICAgICAgYnJlYWtwb2ludCgpOwotICAg
ICAgICAgICAgY29uc3RhbnRzT0subGluayh0aGlzKTsKLSAgICAgICAgfQorICAgICAgICBpZiAo
b3Bjb2RlSUQgIT0gb3BfY2F0Y2gpCisgICAgICAgICAgICBtX2NvbnNpc3RlbmN5Q2hlY2tDYWxs
cy5hcHBlbmQobmVhckNhbGwoKSk7CiAjZW5kaWYKIAogICAgICAgICBpZiAoVU5MSUtFTFkobV9j
b21waWxhdGlvbikpIHsKQEAgLTI4MSw5ICsyNTksNiBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBp
bGVNYWluUGFzcygpCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChv
cGNvZGVJRCAhPSBvcF9jYXRjaCkKLSAgICAgICAgICAgIGFzc2VydFN0YWNrUG9pbnRlck9mZnNl
dCgpOwotCiAgICAgICAgIHN3aXRjaCAob3Bjb2RlSUQpIHsKICAgICAgICAgREVGSU5FX1NMT1df
T1AobGVzcykKICAgICAgICAgREVGSU5FX1NMT1dfT1AobGVzc2VxKQpAQCAtNjg4LDYgKzY2Myw1
NyBAQCB2b2lkIEpJVDo6ZW1pdFJlc3RvcmVDYWxsZWVTYXZlcygpCiAgICAgQmFzZTo6ZW1pdFJl
c3RvcmVDYWxsZWVTYXZlc0ZvcigmUmVnaXN0ZXJBdE9mZnNldExpc3Q6OmxsaW50QmFzZWxpbmVD
YWxsZWVTYXZlUmVnaXN0ZXJzKCkpOwogfQogCisjaWYgQVNTRVJUX0VOQUJMRUQKK01hY3JvQXNz
ZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gSklUOjpjb25zaXN0ZW5jeUNoZWNrR2VuZXJh
dG9yKFZNJikKK3sKKyAgICBDQ2FsbEhlbHBlcnMgaml0OworCisgICAgY29uc3RleHByIEdQUlJl
ZyBzdGFja09mZnNldEdQUiA9IHJlZ1QwOyAvLyBJbmNvbWluZworICAgIGNvbnN0ZXhwciBHUFJS
ZWcgZXhwZWN0ZWRTdGFja1BvaW50ZXJHUFIgPSByZWdUMTsKKyAgICBjb25zdGV4cHIgR1BSUmVn
IGV4cGVjdGVkTWV0YWRhdGFHUFIgPSByZWdUMjsKKyAgICBjb25zdGV4cHIgR1BSUmVnIGV4cGVj
dGVkQ29uc3RhbnRzR1BSID0gcmVnVDM7CisKKyAgICBqaXQudGFnUmV0dXJuQWRkcmVzcygpOwor
CisgICAgaml0Lm11bDMyKFRydXN0ZWRJbW0zMihzaXplb2YoUmVnaXN0ZXIpKSwgc3RhY2tPZmZz
ZXRHUFIsIHN0YWNrT2Zmc2V0R1BSKTsKKyAgICBqaXQuc3ViUHRyKGNhbGxGcmFtZVJlZ2lzdGVy
LCBzdGFja09mZnNldEdQUiwgZXhwZWN0ZWRTdGFja1BvaW50ZXJHUFIpOworICAgIC8vIEZpeCB1
cCBpbiBjYXNlIHRoZSBjYWxsIHNlcXVlbmNlIChmcm9tIHRoZSBvcCkgY2hhbmdlZCB0aGUgc3Rh
Y2sgcG9pbnRlciwgZS5nLjogbGlrZSBvbiB4ODYKKyAgICBpZiAoY29uc3RleHByIHNpemVfdCBk
ZWx0YSA9IHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSAtIHByb2xvZ3VlU3RhY2tQb2ludGVyRGVs
dGEoKSkKKyAgICAgICAgaml0LnN1YlB0cihUcnVzdGVkSW1tMzIoZGVsdGEpLCBleHBlY3RlZFN0
YWNrUG9pbnRlckdQUik7CisKKyAgICBqaXQubG9hZFB0cihhZGRyZXNzRm9yKENhbGxGcmFtZVNs
b3Q6OmNvZGVCbG9jayksIGV4cGVjdGVkQ29uc3RhbnRzR1BSKTsKKyAgICBqaXQubG9hZFB0cihB
ZGRyZXNzKGV4cGVjdGVkQ29uc3RhbnRzR1BSLCBDb2RlQmxvY2s6Om9mZnNldE9mTWV0YWRhdGFU
YWJsZSgpKSwgZXhwZWN0ZWRNZXRhZGF0YUdQUik7CisgICAgaml0LmxvYWRQdHIoQWRkcmVzcyhl
eHBlY3RlZENvbnN0YW50c0dQUiwgQ29kZUJsb2NrOjpvZmZzZXRPZkJhc2VsaW5lSklURGF0YSgp
KSwgZXhwZWN0ZWRDb25zdGFudHNHUFIpOworCisgICAgYXV0byBzdGFja1BvaW50ZXJPSyA9IGpp
dC5icmFuY2hQdHIoRXF1YWwsIGV4cGVjdGVkU3RhY2tQb2ludGVyR1BSLCBzdGFja1BvaW50ZXJS
ZWdpc3Rlcik7CisgICAgaml0LmJyZWFrcG9pbnQoKTsKKyAgICBzdGFja1BvaW50ZXJPSy5saW5r
KCZqaXQpOworCisgICAgYXV0byBtZXRhZGF0YU9LID0gaml0LmJyYW5jaFB0cihFcXVhbCwgZXhw
ZWN0ZWRNZXRhZGF0YUdQUiwgc19tZXRhZGF0YUdQUik7CisgICAgaml0LmJyZWFrcG9pbnQoKTsK
KyAgICBtZXRhZGF0YU9LLmxpbmsoJmppdCk7CisKKyAgICBhdXRvIGNvbnN0YW50c09LID0gaml0
LmJyYW5jaFB0cihFcXVhbCwgZXhwZWN0ZWRDb25zdGFudHNHUFIsIHNfY29uc3RhbnRzR1BSKTsK
KyAgICBqaXQuYnJlYWtwb2ludCgpOworICAgIGNvbnN0YW50c09LLmxpbmsoJmppdCk7CisKKyAg
ICBqaXQucmV0KCk7CisKKyAgICBMaW5rQnVmZmVyIHBhdGNoQnVmZmVyKGppdCwgR0xPQkFMX1RI
VU5LX0lELCBMaW5rQnVmZmVyOjpQcm9maWxlOjpFeHRyYUNUSVRodW5rKTsKKyAgICByZXR1cm4g
RklOQUxJWkVfQ09ERShwYXRjaEJ1ZmZlciwgSklUVGh1bmtQdHJUYWcsICJCYXNlbGluZTogZ2Vu
ZXJhdGVDb25zaXN0ZW5jeUNoZWNrIik7Cit9CisKK3ZvaWQgSklUOjplbWl0Q29uc2lzdGVuY3lD
aGVjaygpCit7CisgICAgQVNTRVJUKCFtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbC5pc1NldCgpKTsK
KyAgICBtX2NvbnNpc3RlbmN5Q2hlY2tMYWJlbCA9IGxhYmVsKCk7CisgICAgbW92ZShUcnVzdGVk
SW1tMzIoLXN0YWNrUG9pbnRlck9mZnNldEZvcihtX3VubGlua2VkQ29kZUJsb2NrKSksIHJlZ1Qw
KTsKKyAgICBtX2J5dGVjb2RlSW5kZXggPSBCeXRlY29kZUluZGV4KDApOworICAgIGVtaXROYWtl
ZE5lYXJUYWlsQ2FsbCh2bSgpLmdldENUSVN0dWIoY29uc2lzdGVuY3lDaGVja0dlbmVyYXRvciku
cmV0YWdnZWRDb2RlPE5vUHRyVGFnPigpKTsKKyAgICBtX2J5dGVjb2RlSW5kZXggPSBCeXRlY29k
ZUluZGV4KCk7IC8vIFJlc2V0IHRoaXMsIGluIG9yZGVyIHRvIGd1YXJkIGl0cyB1c2Ugd2l0aCBB
U1NFUlRzLgorfQorI2VuZGlmCisKIHZvaWQgSklUOjpjb21waWxlQW5kTGlua1dpdGhvdXRGaW5h
bGl6aW5nKEpJVENvbXBpbGF0aW9uRWZmb3J0IGVmZm9ydCkKIHsKICAgICBERkc6OkNhcGFiaWxp
dHlMZXZlbCBsZXZlbCA9IG1fcHJvZmlsZWRDb2RlQmxvY2stPmNhcGFiaWxpdHlMZXZlbCgpOwpA
QCAtNzkxLDYgKzgxNywxMCBAQCB2b2lkIEpJVDo6Y29tcGlsZUFuZExpbmtXaXRob3V0RmluYWxp
emluZyhKSVRDb21waWxhdGlvbkVmZm9ydCBlZmZvcnQpCiAgICAgICAgIG1fZGlzYXNzZW1ibGVy
LT5zZXRFbmRPZlNsb3dQYXRoKGxhYmVsKCkpOwogICAgIG1fcGNUb0NvZGVPcmlnaW5NYXBCdWls
ZGVyLmFwcGVuZEl0ZW0obGFiZWwoKSwgUENUb0NvZGVPcmlnaW5NYXBCdWlsZGVyOjpkZWZhdWx0
Q29kZU9yaWdpbigpKTsKIAorI2lmIEFTU0VSVF9FTkFCTEVECisgICAgZW1pdENvbnNpc3RlbmN5
Q2hlY2soKTsKKyNlbmRpZgorCiAgICAgc3RhY2tPdmVyZmxvdy5saW5rKHRoaXMpOwogICAgIG1f
Ynl0ZWNvZGVJbmRleCA9IEJ5dGVjb2RlSW5kZXgoMCk7CiAgICAgaWYgKG1heEZyYW1lRXh0ZW50
Rm9yU2xvd1BhdGhDYWxsKQpAQCAtOTAzLDYgKzkzMywxMiBAQCB2b2lkIEpJVDo6bGluaygpCiAg
ICAgICAgICAgICBwYXRjaEJ1ZmZlci5saW5rKHJlY29yZC5mcm9tLCByZWNvcmQuY2FsbGVlKTsK
ICAgICB9CiAKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGNvbnN0IGF1dG8gY29uc2lzdGVuY3lD
aGVjayA9IHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8SlNJbnRlcm5hbFB0clRhZz4obV9jb25zaXN0
ZW5jeUNoZWNrTGFiZWwpOworICAgIGZvciAoYXV0byYgY2FsbCA6IG1fY29uc2lzdGVuY3lDaGVj
a0NhbGxzKQorICAgICAgICBwYXRjaEJ1ZmZlci5saW5rPEpTSW50ZXJuYWxQdHJUYWc+KGNhbGws
IGNvbnNpc3RlbmN5Q2hlY2spOworI2VuZGlmCisKICAgICBhdXRvIGZpbmFsaXplSUNzID0gWyZd
IChhdXRvJiBnZW5lcmF0b3JzKSB7CiAgICAgICAgIGZvciAoYXV0byYgZ2VuIDogZ2VuZXJhdG9y
cykgewogICAgICAgICAgICAgZ2VuLm1fdW5saW5rZWRTdHViSW5mby0+c3RhcnQgPSBwYXRjaEJ1
ZmZlci5sb2NhdGlvbk9mPEpJVFN0dWJSb3V0aW5lUHRyVGFnPihnZW4ubV9zdGFydCk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oIGIvU291cmNlL0phdmFTY3Jp
cHRDb3JlL2ppdC9KSVQuaAppbmRleCBkYWEyYzUyMTgzNmVlMjZjMDgzMzg3ZmQ1Mjk0YjY3ZTI4
NmY1YjRmLi5iOWYzNzY5NTY1MDFjMzgzMTU0YWVmN2JhZTM4MzZlOTk5YmYxOGYxIDEwMDY0NAot
LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny
aXB0Q29yZS9qaXQvSklULmgKQEAgLTM4OCw4ICszODgsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAg
ICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2xvd09wZXJhdGlvbj4KICAgICAgICAgdm9pZCBlbWl0
X2NvbXBhcmVBbmRKdW1wU2xvd0ltcGwoVmlydHVhbFJlZ2lzdGVyIG9wMSwgVmlydHVhbFJlZ2lz
dGVyIG9wMiwgdW5zaWduZWQgdGFyZ2V0LCBzaXplX3QgaW5zdHJ1Y3Rpb25TaXplLCBEb3VibGVD
b25kaXRpb24sIFNsb3dPcGVyYXRpb24sIGJvb2wgaW52ZXJ0LCBWZWN0b3I8U2xvd0Nhc2VFbnRy
eT46Oml0ZXJhdG9yJik7CiAKLSAgICAgICAgdm9pZCBhc3NlcnRTdGFja1BvaW50ZXJPZmZzZXQo
KTsKLQogICAgICAgICB2b2lkIGVtaXRfb3BfYWRkKGNvbnN0IEpTSW5zdHJ1Y3Rpb24qKTsKICAg
ICAgICAgdm9pZCBlbWl0X29wX2JpdGFuZChjb25zdCBKU0luc3RydWN0aW9uKik7CiAgICAgICAg
IHZvaWQgZW1pdF9vcF9iaXRvcihjb25zdCBKU0luc3RydWN0aW9uKik7CkBAIC04ODQsNiArODgy
LDExIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2b2lkIGVtaXRTYXZlQ2FsbGVlU2F2ZXMo
KTsKICAgICAgICAgdm9pZCBlbWl0UmVzdG9yZUNhbGxlZVNhdmVzKCk7CiAKKyNpZiBBU1NFUlRf
RU5BQkxFRAorICAgICAgICBzdGF0aWMgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFRodW5rUHRy
VGFnPiBjb25zaXN0ZW5jeUNoZWNrR2VuZXJhdG9yKFZNJik7CisgICAgICAgIHZvaWQgZW1pdENv
bnNpc3RlbmN5Q2hlY2soKTsKKyNlbmRpZgorCiAgICAgICAgIHN0YXRpYyBib29sIHJlcG9ydENv
bXBpbGVUaW1lcygpOwogICAgICAgICBzdGF0aWMgYm9vbCBjb21wdXRlQ29tcGlsZVRpbWVzKCk7
CiAKQEAgLTkyMSw2ICs5MjQsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgSnVtcExp
c3QgbV9leGNlcHRpb25DaGVja3M7CiAgICAgICAgIEp1bXBMaXN0IG1fZXhjZXB0aW9uQ2hlY2tz
V2l0aENhbGxGcmFtZVJvbGxiYWNrOworI2lmIEFTU0VSVF9FTkFCTEVECisgICAgICAgIExhYmVs
IG1fY29uc2lzdGVuY3lDaGVja0xhYmVsOworICAgICAgICBWZWN0b3I8Q2FsbD4gbV9jb25zaXN0
ZW5jeUNoZWNrQ2FsbHM7CisjZW5kaWYKIAogICAgICAgICB1bnNpZ25lZCBtX2dldEJ5SWRJbmRl
eCB7IFVJTlRfTUFYIH07CiAgICAgICAgIHVuc2lnbmVkIG1fZ2V0QnlWYWxJbmRleCB7IFVJTlRf
TUFYIH07Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>