<?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>222192</bug_id>
          
          <creation_ts>2021-02-19 12:42:19 -0800</creation_ts>
          <short_desc>Crash under Decoder::Decoder()</short_desc>
          <delta_ts>2021-02-19 22:56:14 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</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>bfulgham</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1731525</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 12:42:19 -0800</bug_when>
    <thetext>Crash under Decoder::Decoder():
Thread 5 Crashed:: Dispatch queue: com.apple.IPC.ReceiveQueue
0   libsystem_platform.dylib      	0x00007fff68833a0c _platform_memmove$VARIANT$Haswell + 268
1   com.apple.WebKit              	0x10909d1a8 IPC::Decoder::Decoder(unsigned char const*, unsigned long, void (*)(unsigned char const*, unsigned long), WTF::Vector&lt;IPC::Attachment, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc&gt;&amp;&amp;) + 60 (/Library/Caches/com.apple.xbs/Sources/WebKit2/WebKit2-7611.1.3.5/Platform/IPC/Decoder.cpp:44)
2   com.apple.WebKit              	0x10909d136 IPC::Decoder::create(unsigned char const*, unsigned long, void (*)(unsigned char const*, unsigned long), WTF::Vector&lt;IPC::Attachment, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc&gt;&amp;&amp;) + 64 (/Library/Caches/com.apple.xbs/Sources/WebKit2/WebKit2-7611.1.3.5/Platform/IPC/Decoder.cpp:61)
3   com.apple.WebKit              	0x10917ab31 invocation function for block in IPC::Connection::open() + 517 (/Library/Caches/com.apple.xbs/Sources/WebKit2/WebKit2-7611.1.3.5/Platform/IPC/cocoa/ConnectionCocoa.mm:420)
4   libdispatch.dylib             	0x7fff685e4658 _dispatch_client_callout + 8 (/AppleInternal/BuildRoot/Library/Caches/com.apple.xbs/Sources/libdispatch/libdispatch-1173.100.2/src/object.m:495)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731526</commentid>
    <comment_count>1</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 12:42:44 -0800</bug_when>
    <thetext>&lt;rdar://31392681&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731531</commentid>
    <comment_count>2</comment_count>
      <attachid>421016</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 12:49:25 -0800</bug_when>
    <thetext>Created attachment 421016
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731572</commentid>
    <comment_count>3</comment_count>
      <attachid>421016</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-02-19 13:37:04 -0800</bug_when>
    <thetext>Comment on attachment 421016
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731701</commentid>
    <comment_count>4</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 17:43:17 -0800</bug_when>
    <thetext>Hmm. Seems to be causing some crashes:

Thread 5 Crashed:
0   com.apple.JavaScriptCore      	0x0000000102cff616 bmalloc::Deallocator::deallocateSlowCase(void*) + 438
1   com.apple.JavaScriptCore      	0x0000000102cfcb75 bmalloc::Allocator::scavenge() + 117
2   com.apple.JavaScriptCore      	0x0000000102cfec5c bmalloc::PerThread&lt;bmalloc::PerHeapKind&lt;bmalloc::Cache&gt; &gt;::destructor(void*) + 76
3   libsystem_pthread.dylib       	0x00007fff69b3e009 _pthread_tsd_cleanup + 476
4   libsystem_pthread.dylib       	0x00007fff69b40512 _pthread_exit + 70
5   libsystem_pthread.dylib       	0x00007fff69b3dddd _pthread_wqthread_exit + 77
6   libsystem_pthread.dylib       	0x00007fff69b3cafc _pthread_wqthread + 481
7   libsystem_pthread.dylib       	0x00007fff69b3bb77 start_wqthread + 15

------------

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   com.apple.JavaScriptCore      	0x00000001085a8436 bmalloc::Deallocator::processObjectLog(std::__1::unique_lock&lt;bmalloc::Mutex&gt;&amp;) + 86
1   com.apple.JavaScriptCore      	0x00000001085a6147 bmalloc::Allocator::refillAllocatorSlowCase(bmalloc::BumpAllocator&amp;, unsigned long, bmalloc::FailureAction) + 167
2   com.apple.JavaScriptCore      	0x00000001085a6298 bmalloc::Allocator::allocateLogSizeClass(unsigned long, bmalloc::FailureAction) + 216
3   com.apple.WebKit              	0x000000010bf4597b WebKit::NetworkProcessProxy::getNetworkProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::NetworkProcessConnectionInfo const&amp;)&gt;&amp;&amp;) + 193
4   com.apple.WebKit              	0x000000010bfa511f WebKit::WebsiteDataStore::getNetworkProcessConnection(WebKit::WebProcessProxy&amp;, WTF::CompletionHandler&lt;void (WebKit::NetworkProcessConnectionInfo const&amp;)&gt;&amp;&amp;) + 155
5   com.apple.WebKit              	0x000000010c1f6ca3 WebKit::WebProcessProxy::didReceiveSyncWebProcessProxyMessage(IPC::Connection&amp;, IPC::Decoder&amp;, std::__1::unique_ptr&lt;IPC::Encoder, std::__1::default_delete&lt;IPC::Encoder&gt; &gt;&amp;) + 411
6   com.apple.WebKit              	0x000000010baff515 IPC::Connection::dispatchSyncMessage(IPC::Decoder&amp;) + 279


-----------


Thread 5 Crashed:: Dispatch queue: com.apple.IPC.ReceiveQueue
0   libsystem_platform.dylib      	0x00007fff69b34770 _platform_bzero$VARIANT$Ivybridge + 48
1   com.apple.JavaScriptCore      	0x000000010224cdfa WTF::fastZeroedMalloc(unsigned long) + 138
2   com.apple.WebKit              	0x00000001040c8c05 IPC::MachMessage::create(IPC::MessageName, unsigned long) + 37
3   com.apple.WebKit              	0x0000000103f85217 IPC::Connection::sendOutgoingMessage(std::__1::unique_ptr&lt;IPC::Encoder, std::__1::default_delete&lt;IPC::Encoder&gt; &gt;) + 201
4   com.apple.WebKit              	0x0000000103e79398 IPC::Connection::sendOutgoingMessages() + 194


I must have messaged up something really bad :S</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731723</commentid>
    <comment_count>5</comment_count>
      <attachid>421067</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 18:43:52 -0800</bug_when>
    <thetext>Created attachment 421067
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731725</commentid>
    <comment_count>6</comment_count>
      <attachid>421068</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 18:47:05 -0800</bug_when>
    <thetext>Created attachment 421068
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731726</commentid>
    <comment_count>7</comment_count>
      <attachid>421069</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 18:50:47 -0800</bug_when>
    <thetext>Created attachment 421069
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731732</commentid>
    <comment_count>8</comment_count>
      <attachid>421070</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 19:10:43 -0800</bug_when>
    <thetext>Created attachment 421070
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731752</commentid>
    <comment_count>9</comment_count>
      <attachid>421078</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-02-19 21:04:11 -0800</bug_when>
    <thetext>Created attachment 421078
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731770</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-02-19 22:56:12 -0800</bug_when>
    <thetext>Committed r273196: &lt;https://commits.webkit.org/r273196&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 421078.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421016</attachid>
            <date>2021-02-19 12:49:25 -0800</date>
            <delta_ts>2021-02-19 18:43:48 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219124925.patch</filename>
            <type>text/plain</type>
            <size>6443</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI0MzFhNTgwZjMxMjRmNTlm
NzVhODA3OWJjMzA5MjJmM2I5YjhlZTEuLjNiNjFiMzA0MWExY2RkNzg4NzgxZDQzOWE5YWMzZWQ0
ODYyZGU1NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBQZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAg
ICAgICAgIEFkZCBub3RpZnlkIG1lc3NhZ2UgZmlsdGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBD
L0RlY29kZXIuY3BwCmluZGV4IDgwYTBmNzVjNzA1NzJiZjRjMjQ4NTI2ZmVkMmZlZmIwOTdjZGM4
ZjkuLjQyYjk3Y2U1YzA5YmMwZGU0ZTc5YzdjNzU3YmZlNzE3NGM3ZjZkYjIgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRl
ICJBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIkRhdGFSZWZlcmVuY2UuaCIKKyNpbmNsdWRl
ICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVzc2FnZUZsYWdzLmgiCiAjaW5jbHVkZSA8c3RkaW8u
aD4KICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CkBAIC00MCwyMCArNDEsMzUgQEAgbmFt
ZXNwYWNlIElQQyB7CiAKIHN0YXRpYyBjb25zdCB1aW50OF90KiBjb3B5QnVmZmVyKGNvbnN0IHVp
bnQ4X3QqIGJ1ZmZlciwgc2l6ZV90IGJ1ZmZlclNpemUpCiB7Ci0gICAgYXV0byBidWZmZXJDb3B5
ID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KGZhc3RNYWxsb2MoYnVmZmVyU2l6ZSkpOwotICAgIG1l
bWNweShidWZmZXJDb3B5LCBidWZmZXIsIGJ1ZmZlclNpemUpOworICAgIHVpbnQ4X3QqIGJ1ZmZl
ckNvcHk7CisgICAgaWYgKCF0cnlGYXN0TWFsbG9jKGJ1ZmZlclNpemUpLmdldFZhbHVlKGJ1ZmZl
ckNvcHkpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywgIkRlY29kZXI6OmNvcHlC
dWZmZXI6IHRyeUZhc3RNYWxsb2MoJWx1KSBmYWlsZWQiLCBidWZmZXJTaXplKTsKKyAgICAgICAg
cmV0dXJuIG51bGxwdHI7CisgICAgfQogCisgICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwg
YnVmZmVyU2l6ZSk7CiAgICAgcmV0dXJuIGJ1ZmZlckNvcHk7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0
cjxEZWNvZGVyPiBEZWNvZGVyOjpjcmVhdGUoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3Qg
YnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6
ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+JiYgYXR0YWNobWVudHMpCiB7Ci0gICAgYXV0byBkZWNv
ZGVyID0gbWFrZVVuaXF1ZTxEZWNvZGVyPihidWZmZXIsIGJ1ZmZlclNpemUsIGJ1ZmZlckRlYWxs
b2NhdG9yLCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSk7CisgICAgQVNTRVJUKGJ1ZmZlcik7CisgICAg
aWYgKFVOTElLRUxZKCFidWZmZXIpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywg
IkRlY29kZXI6OmNyZWF0ZSgpIGNhbGxlZCB3aXRoIGEgbnVsbCBidWZmZXIgKGJ1ZmZlclNpemU6
ICVsdSkiLCBidWZmZXJTaXplKTsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisg
ICAgYXV0byogYnVmZmVyQ29weSA9IGJ1ZmZlckRlYWxsb2NhdG9yID8gYnVmZmVyIDogY29weUJ1
ZmZlcihidWZmZXIsIGJ1ZmZlclNpemUpOworICAgIEFTU0VSVChidWZmZXJDb3B5KTsKKyAgICBp
ZiAoVU5MSUtFTFkoIWJ1ZmZlckNvcHkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAg
IGF1dG8gZGVjb2RlciA9IG1ha2VVbmlxdWU8RGVjb2Rlcj4oYnVmZmVyQ29weSwgYnVmZmVyU2l6
ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNobWVudHMpKTsKICAgICByZXR1cm4g
ZGVjb2Rlci0+aXNWYWxpZCgpID8gV1RGTW92ZShkZWNvZGVyKSA6IG51bGxwdHI7CiB9CiAKIERl
Y29kZXI6OkRlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwg
dm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9y
PEF0dGFjaG1lbnQ+JiYgYXR0YWNobWVudHMpCi0gICAgOiBtX2J1ZmZlciB7IGJ1ZmZlckRlYWxs
b2NhdG9yID8gYnVmZmVyIDogY29weUJ1ZmZlcihidWZmZXIsIGJ1ZmZlclNpemUpIH0KKyAgICA6
IG1fYnVmZmVyIHsgYnVmZmVyfQogICAgICwgbV9idWZmZXJQb3MgeyBtX2J1ZmZlciB9CiAgICAg
LCBtX2J1ZmZlckVuZCB7IG1fYnVmZmVyICsgYnVmZmVyU2l6ZSB9CiAgICAgLCBtX2J1ZmZlckRl
YWxsb2NhdG9yIHsgYnVmZmVyRGVhbGxvY2F0b3IgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9Q
bGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNvY29hLm1tCmluZGV4IDNmNTE3MjMxODAxMjc4
MjUyZjA2ZmU1MjE5OTEyYjE0MDVmODkyNTQuLjA1OWU4MjkzOTZhNTI0OWYwODUzMzQ3ZWJjMGIz
ZWJiZWQzNDY0ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29h
L0Nvbm5lY3Rpb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9jb2Nv
YS9Db25uZWN0aW9uQ29jb2EubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAiRGF0YVJl
ZmVyZW5jZS5oIgogI2ltcG9ydCAiSW1wb3J0YW5jZUFzc2VydGlvbi5oIgorI2ltcG9ydCAiTG9n
Z2luZy5oIgogI2ltcG9ydCAiTWFjaE1lc3NhZ2UuaCIKICNpbXBvcnQgIk1hY2hQb3J0LmgiCiAj
aW1wb3J0ICJNYWNoVXRpbGl0aWVzLmgiCkBAIC00MTksOSArNDIwLDE0IEBAIHN0YXRpYyBzdGQ6
OnVuaXF1ZV9wdHI8RGVjb2Rlcj4gY3JlYXRlTWVzc2FnZURlY29kZXIobWFjaF9tc2dfaGVhZGVy
X3QqIGhlYWRlcikKICAgICBpZiAoIShoZWFkZXItPm1zZ2hfYml0cyAmIE1BQ0hfTVNHSF9CSVRT
X0NPTVBMRVgpKSB7CiAgICAgICAgIC8vIFdlIGhhdmUgYSBzaW1wbGUgbWVzc2FnZS4KICAgICAg
ICAgdWludDhfdCogYm9keSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlciArIDEp
OwotICAgICAgICBzaXplX3QgYm9keVNpemUgPSBoZWFkZXItPm1zZ2hfc2l6ZSAtIHNpemVvZiht
YWNoX21zZ19oZWFkZXJfdCk7CisgICAgICAgIGF1dG8gYm9keVNpemUgPSBDaGVja2VkU2l6ZSB7
IGhlYWRlci0+bXNnaF9zaXplIH0gLSBzaXplb2YobWFjaF9tc2dfaGVhZGVyX3QpOworICAgICAg
ICBpZiAoVU5MSUtFTFkoYm9keVNpemUuaGFzT3ZlcmZsb3dlZCgpKSkgeworICAgICAgICAgICAg
UkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiY3JlYXRlTWVzc2FnZURlY29kZXI6IE92ZXJmbG93IHdo
ZW4gY29tcHV0aW5nIGJvZHlTaXplIChoZWFkZXItPm1zZ2hfc2l6ZTogJWx1LCBzaXplb2YobWFj
aF9tc2dfaGVhZGVyX3QpOiAlbHUpIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVy
LT5tc2doX3NpemUpLCBzaXplb2YobWFjaF9tc2dfaGVhZGVyX3QpKTsKKyAgICAgICAgICAgIEFT
U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAg
IH0KIAotICAgICAgICByZXR1cm4gRGVjb2Rlcjo6Y3JlYXRlKGJvZHksIGJvZHlTaXplLCBudWxs
cHRyLCBWZWN0b3I8QXR0YWNobWVudD4geyB9KTsKKyAgICAgICAgcmV0dXJuIERlY29kZXI6OmNy
ZWF0ZShib2R5LCBib2R5U2l6ZS51bnNhZmVHZXQoKSwgbnVsbHB0ciwgVmVjdG9yPEF0dGFjaG1l
bnQ+IHsgfSk7CiAgICAgfQogCiAgICAgbWFjaF9tc2dfYm9keV90KiBib2R5ID0gcmVpbnRlcnBy
ZXRfY2FzdDxtYWNoX21zZ19ib2R5X3QqPihoZWFkZXIgKyAxKTsKQEAgLTQ2Niw5ICs0NzIsMTUg
QEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVyPiBjcmVhdGVNZXNzYWdlRGVjb2Rlciht
YWNoX21zZ19oZWFkZXJfdCogaGVhZGVyKQogICAgIH0KIAogICAgIHVpbnQ4X3QqIG1lc3NhZ2VC
b2R5ID0gZGVzY3JpcHRvckRhdGE7Ci0gICAgc2l6ZV90IG1lc3NhZ2VCb2R5U2l6ZSA9IGhlYWRl
ci0+bXNnaF9zaXplIC0gKGRlc2NyaXB0b3JEYXRhIC0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90
Kj4oaGVhZGVyKSk7CisgICAgQVNTRVJUKGRlc2NyaXB0b3JEYXRhID49IHJlaW50ZXJwcmV0X2Nh
c3Q8dWludDhfdCo+KGhlYWRlcikpOworICAgIGF1dG8gbWVzc2FnZUJvZHlTaXplID0gQ2hlY2tl
ZFNpemUgeyBoZWFkZXItPm1zZ2hfc2l6ZSB9IC0gc3RhdGljX2Nhc3Q8c2l6ZV90PihkZXNjcmlw
dG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpOworICAgIGlmIChV
TkxJS0VMWShtZXNzYWdlQm9keVNpemUuaGFzT3ZlcmZsb3dlZCgpKSkgeworICAgICAgICBSRUxF
QVNFX0xPR19GQVVMVChJUEMsICJjcmVhdGVNZXNzYWdlRGVjb2RlcjogT3ZlcmZsb3cgd2hlbiBj
b21wdXRpbmcgYm9keVNpemUgKGhlYWRlci0+bXNnaF9zaXplOiAlbHUsIChkZXNjcmlwdG9yRGF0
YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpOiAlbHUpIiwgc3RhdGljX2Nh
c3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVyLT5tc2doX3NpemUpLCBzdGF0aWNfY2FzdDx1bnNpZ25l
ZCBsb25nPihkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRl
cikpKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBudWxs
cHRyOworICAgIH0KIAotICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUobWVzc2FnZUJvZHksIG1l
c3NhZ2VCb2R5U2l6ZSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykpOworICAgIHJldHVy
biBEZWNvZGVyOjpjcmVhdGUobWVzc2FnZUJvZHksIG1lc3NhZ2VCb2R5U2l6ZS51bnNhZmVHZXQo
KSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykpOwogfQogCiAvLyBUaGUgcmVjZWl2ZSBi
dWZmZXIgc2l6ZSBzaG91bGQgYWx3YXlzIGluY2x1ZGUgdGhlIG1heGltdW0gdHJhaWxlciBzaXpl
Lgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421067</attachid>
            <date>2021-02-19 18:43:52 -0800</date>
            <delta_ts>2021-02-19 18:47:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219184349.patch</filename>
            <type>text/plain</type>
            <size>9420</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5NGU4YWEyZjZhNDAyNjk5
Zjc1ZjkyZTVmNWM4YzZkMGQ0N2MxNTIuLmZlODJiMTEzMDVhMzkxY2QwZDNiNWUxYzY3NDk4OTIw
MTM0ZmIyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgogCiAgICAgICAgIEFkZCBiYWNrIG9sZCBtZWRpYSBwbGF5YmFjayBBUEkgYnV0IGRl
cHJlY2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIu
Y3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5jcHAKaW5kZXggODBhMGY3
NWM3MDU3MmJmNGMyNDg1MjZmZWQyZmVmYjA5N2NkYzhmOS4uZWZmOTQxYmM4OWZiYzY5YWE0NTMx
NjM3YTFiZjk1YzA0Y2VmM2ZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9J
UEMvRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5j
cHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW5j
bHVkZSAiRGF0YVJlZmVyZW5jZS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJN
ZXNzYWdlRmxhZ3MuaCIKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJF
eHRyYXMuaD4KQEAgLTQwLDIwICs0MSwzNSBAQCBuYW1lc3BhY2UgSVBDIHsKIAogc3RhdGljIGNv
bnN0IHVpbnQ4X3QqIGNvcHlCdWZmZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVm
ZmVyU2l6ZSkKIHsKLSAgICBhdXRvIGJ1ZmZlckNvcHkgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4o
ZmFzdE1hbGxvYyhidWZmZXJTaXplKSk7Ci0gICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwg
YnVmZmVyU2l6ZSk7CisgICAgdWludDhfdCogYnVmZmVyQ29weTsKKyAgICBpZiAoIXRyeUZhc3RN
YWxsb2MoYnVmZmVyU2l6ZSkuZ2V0VmFsdWUoYnVmZmVyQ29weSkpIHsKKyAgICAgICAgUkVMRUFT
RV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y29weUJ1ZmZlcjogdHJ5RmFzdE1hbGxvYyglbHUp
IGZhaWxlZCIsIGJ1ZmZlclNpemUpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAK
KyAgICBtZW1jcHkoYnVmZmVyQ29weSwgYnVmZmVyLCBidWZmZXJTaXplKTsKICAgICByZXR1cm4g
YnVmZmVyQ29weTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IERlY29kZXI6OmNyZWF0
ZShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVy
RGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4m
JiBhdHRhY2htZW50cykKIHsKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+
KGJ1ZmZlciwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNobWVu
dHMpKTsKLSAgICByZXR1cm4gZGVjb2Rlci0+aXNWYWxpZCgpID8gV1RGTW92ZShkZWNvZGVyKSA6
IG51bGxwdHI7CisgICAgQVNTRVJUKGJ1ZmZlcik7CisgICAgaWYgKFVOTElLRUxZKCFidWZmZXIp
KSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywgIkRlY29kZXI6OmNyZWF0ZSgpIGNh
bGxlZCB3aXRoIGEgbnVsbCBidWZmZXIgKGJ1ZmZlclNpemU6ICVsdSkiLCBidWZmZXJTaXplKTsK
KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisgICAgYXV0byogYnVmZmVyQ29weSA9
IGJ1ZmZlckRlYWxsb2NhdG9yID8gYnVmZmVyIDogY29weUJ1ZmZlcihidWZmZXIsIGJ1ZmZlclNp
emUpOworICAgIEFTU0VSVChidWZmZXJDb3B5KTsKKyAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlckNv
cHkpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGF1dG8gZGVjb2RlciA9IHN0ZDo6
dW5pcXVlX3B0cjxEZWNvZGVyPihuZXcgRGVjb2RlcihidWZmZXJDb3B5LCBidWZmZXJTaXplLCBi
dWZmZXJEZWFsbG9jYXRvciwgV1RGTW92ZShhdHRhY2htZW50cykpKTsKKyAgICByZXR1cm4gZGVj
b2Rlci0+aXNWYWxpZCgpID8gZGVjb2RlciA6IG51bGxwdHI7CiB9CiAKIERlY29kZXI6OkRlY29k
ZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZl
ckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+
JiYgYXR0YWNobWVudHMpCi0gICAgOiBtX2J1ZmZlciB7IGJ1ZmZlckRlYWxsb2NhdG9yID8gYnVm
ZmVyIDogY29weUJ1ZmZlcihidWZmZXIsIGJ1ZmZlclNpemUpIH0KKyAgICA6IG1fYnVmZmVyIHsg
YnVmZmVyIH0KICAgICAsIG1fYnVmZmVyUG9zIHsgbV9idWZmZXIgfQogICAgICwgbV9idWZmZXJF
bmQgeyBtX2J1ZmZlciArIGJ1ZmZlclNpemUgfQogICAgICwgbV9idWZmZXJEZWFsbG9jYXRvciB7
IGJ1ZmZlckRlYWxsb2NhdG9yIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v
SVBDL0RlY29kZXIuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuaAppbmRl
eCA2Njk4NWJjMzg3ZDc0MzkxMzcwMWIxMTdiOTE4MDBiOWEyNzcxYWI4Li41MjkxYTQ2ZGQ1OTU1
OWY0Y2I5MmIzNjc2ZjkzNDExNjk3NDVkNGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1Bs
YXRmb3JtL0lQQy9EZWNvZGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVj
b2Rlci5oCkBAIC01MCw3ICs1MCw2IEBAIGNsYXNzIERlY29kZXIgewogICAgIFdURl9NQUtFX0ZB
U1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rl
cj4gY3JlYXRlKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZlciwgc2l6ZV90IGJ1ZmZlclNpemUsIHZvaWQg
KCpidWZmZXJEZWFsbG9jYXRvcikoY29uc3QgdWludDhfdCosIHNpemVfdCksIFZlY3RvcjxBdHRh
Y2htZW50PiYmKTsKLSAgICBleHBsaWNpdCBEZWNvZGVyKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZlciwg
c2l6ZV90IGJ1ZmZlclNpemUsIHZvaWQgKCpidWZmZXJEZWFsbG9jYXRvcikoY29uc3QgdWludDhf
dCosIHNpemVfdCksIFZlY3RvcjxBdHRhY2htZW50PiYmKTsKICAgICB+RGVjb2RlcigpOwogCiAg
ICAgRGVjb2Rlcihjb25zdCBEZWNvZGVyJikgPSBkZWxldGU7CkBAIC0xNDEsNiArMTQwLDggQEAg
cHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKKyAgICBEZWNvZGVyKGNvbnN0IHVpbnQ4X3QqIGJ1
ZmZlciwgc2l6ZV90IGJ1ZmZlclNpemUsIHZvaWQgKCpidWZmZXJEZWFsbG9jYXRvcikoY29uc3Qg
dWludDhfdCosIHNpemVfdCksIFZlY3RvcjxBdHRhY2htZW50PiYmKTsKKwogICAgIGVudW0gQ29u
c3RydWN0V2l0aG91dEhlYWRlclRhZyB7IENvbnN0cnVjdFdpdGhvdXRIZWFkZXIgfTsKICAgICBE
ZWNvZGVyKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZlciwgc2l6ZV90IGJ1ZmZlclNpemUsIENvbnN0cnVj
dFdpdGhvdXRIZWFkZXJUYWcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt
L0lQQy9jb2NvYS9Db25uZWN0aW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQ
Qy9jb2NvYS9Db25uZWN0aW9uQ29jb2EubW0KaW5kZXggM2Y1MTcyMzE4MDEyNzgyNTJmMDZmZTUy
MTk5MTJiMTQwNWY4OTI1NC4uMDU5ZTgyOTM5NmE1MjQ5ZjA4NTMzNDdlYmMwYjNlYmJlZDM0NjQ4
NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlv
bkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rp
b25Db2NvYS5tbQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW1wb3J0ICJEYXRhUmVmZXJlbmNlLmgi
CiAjaW1wb3J0ICJJbXBvcnRhbmNlQXNzZXJ0aW9uLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAj
aW1wb3J0ICJNYWNoTWVzc2FnZS5oIgogI2ltcG9ydCAiTWFjaFBvcnQuaCIKICNpbXBvcnQgIk1h
Y2hVdGlsaXRpZXMuaCIKQEAgLTQxOSw5ICs0MjAsMTQgQEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0
cjxEZWNvZGVyPiBjcmVhdGVNZXNzYWdlRGVjb2RlcihtYWNoX21zZ19oZWFkZXJfdCogaGVhZGVy
KQogICAgIGlmICghKGhlYWRlci0+bXNnaF9iaXRzICYgTUFDSF9NU0dIX0JJVFNfQ09NUExFWCkp
IHsKICAgICAgICAgLy8gV2UgaGF2ZSBhIHNpbXBsZSBtZXNzYWdlLgogICAgICAgICB1aW50OF90
KiBib2R5ID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyICsgMSk7Ci0gICAgICAg
IHNpemVfdCBib2R5U2l6ZSA9IGhlYWRlci0+bXNnaF9zaXplIC0gc2l6ZW9mKG1hY2hfbXNnX2hl
YWRlcl90KTsKKyAgICAgICAgYXV0byBib2R5U2l6ZSA9IENoZWNrZWRTaXplIHsgaGVhZGVyLT5t
c2doX3NpemUgfSAtIHNpemVvZihtYWNoX21zZ19oZWFkZXJfdCk7CisgICAgICAgIGlmIChVTkxJ
S0VMWShib2R5U2l6ZS5oYXNPdmVyZmxvd2VkKCkpKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xP
R19GQVVMVChJUEMsICJjcmVhdGVNZXNzYWdlRGVjb2RlcjogT3ZlcmZsb3cgd2hlbiBjb21wdXRp
bmcgYm9keVNpemUgKGhlYWRlci0+bXNnaF9zaXplOiAlbHUsIHNpemVvZihtYWNoX21zZ19oZWFk
ZXJfdCk6ICVsdSkiLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihoZWFkZXItPm1zZ2hfc2l6
ZSksIHNpemVvZihtYWNoX21zZ19oZWFkZXJfdCkpOworICAgICAgICAgICAgQVNTRVJUX05PVF9S
RUFDSEVEKCk7CisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgfQogCi0gICAg
ICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUoYm9keSwgYm9keVNpemUsIG51bGxwdHIsIFZlY3Rv
cjxBdHRhY2htZW50PiB7IH0pOworICAgICAgICByZXR1cm4gRGVjb2Rlcjo6Y3JlYXRlKGJvZHks
IGJvZHlTaXplLnVuc2FmZUdldCgpLCBudWxscHRyLCBWZWN0b3I8QXR0YWNobWVudD4geyB9KTsK
ICAgICB9CiAKICAgICBtYWNoX21zZ19ib2R5X3QqIGJvZHkgPSByZWludGVycHJldF9jYXN0PG1h
Y2hfbXNnX2JvZHlfdCo+KGhlYWRlciArIDEpOwpAQCAtNDY2LDkgKzQ3MiwxNSBAQCBzdGF0aWMg
c3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IGNyZWF0ZU1lc3NhZ2VEZWNvZGVyKG1hY2hfbXNnX2hl
YWRlcl90KiBoZWFkZXIpCiAgICAgfQogCiAgICAgdWludDhfdCogbWVzc2FnZUJvZHkgPSBkZXNj
cmlwdG9yRGF0YTsKLSAgICBzaXplX3QgbWVzc2FnZUJvZHlTaXplID0gaGVhZGVyLT5tc2doX3Np
emUgLSAoZGVzY3JpcHRvckRhdGEgLSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIp
KTsKKyAgICBBU1NFUlQoZGVzY3JpcHRvckRhdGEgPj0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90
Kj4oaGVhZGVyKSk7CisgICAgYXV0byBtZXNzYWdlQm9keVNpemUgPSBDaGVja2VkU2l6ZSB7IGhl
YWRlci0+bXNnaF9zaXplIH0gLSBzdGF0aWNfY2FzdDxzaXplX3Q+KGRlc2NyaXB0b3JEYXRhIC0g
cmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyKSk7CisgICAgaWYgKFVOTElLRUxZKG1l
c3NhZ2VCb2R5U2l6ZS5oYXNPdmVyZmxvd2VkKCkpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0ZB
VUxUKElQQywgImNyZWF0ZU1lc3NhZ2VEZWNvZGVyOiBPdmVyZmxvdyB3aGVuIGNvbXB1dGluZyBi
b2R5U2l6ZSAoaGVhZGVyLT5tc2doX3NpemU6ICVsdSwgKGRlc2NyaXB0b3JEYXRhIC0gcmVpbnRl
cnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyKSk6ICVsdSkiLCBzdGF0aWNfY2FzdDx1bnNpZ25l
ZCBsb25nPihoZWFkZXItPm1zZ2hfc2l6ZSksIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KGRl
c2NyaXB0b3JEYXRhIC0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyKSkpOworICAg
ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAg
fQogCi0gICAgcmV0dXJuIERlY29kZXI6OmNyZWF0ZShtZXNzYWdlQm9keSwgbWVzc2FnZUJvZHlT
aXplLCBudWxscHRyLCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSk7CisgICAgcmV0dXJuIERlY29kZXI6
OmNyZWF0ZShtZXNzYWdlQm9keSwgbWVzc2FnZUJvZHlTaXplLnVuc2FmZUdldCgpLCBudWxscHRy
LCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSk7CiB9CiAKIC8vIFRoZSByZWNlaXZlIGJ1ZmZlciBzaXpl
IHNob3VsZCBhbHdheXMgaW5jbHVkZSB0aGUgbWF4aW11bSB0cmFpbGVyIHNpemUuCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcCBi
L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCmluZGV4
IGM1N2FiMzY5N2FmNTFlOGE2NGZmOTNkYjBmNWU3NjNlNDg0MDgwYTUuLjdiMDRjMDU0M2E5YTA4
M2MwMGI0MWU1Njc2ZTllMDI1Mjk4NTk1ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxh
dGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxh
dGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCkBAIC0yMzcsNyArMjM3LDEwIEBAIGJv
b2wgQ29ubmVjdGlvbjo6cHJvY2Vzc01lc3NhZ2UoKQogICAgIGlmIChtZXNzYWdlSW5mby5pc0Jv
ZHlPdXRPZkxpbmUoKSkKICAgICAgICAgbWVzc2FnZUJvZHkgPSByZWludGVycHJldF9jYXN0PHVp
bnQ4X3QqPihvb2xNZXNzYWdlQm9keS0+ZGF0YSgpKTsKIAotICAgIGF1dG8gZGVjb2RlciA9IG1h
a2VVbmlxdWU8RGVjb2Rlcj4obWVzc2FnZUJvZHksIG1lc3NhZ2VJbmZvLmJvZHlTaXplKCksIG51
bGxwdHIsIFdURk1vdmUoYXR0YWNobWVudHMpKTsKKyAgICBhdXRvIGRlY29kZXIgPSBEZWNvZGVy
OjpjcmVhdGUobWVzc2FnZUJvZHksIG1lc3NhZ2VJbmZvLmJvZHlTaXplKCksIG51bGxwdHIsIFdU
Rk1vdmUoYXR0YWNobWVudHMpKTsKKyAgICBBU1NFUlQoZGVjb2Rlcik7CisgICAgaWYgKCFkZWNv
ZGVyKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBwcm9jZXNzSW5jb21pbmdNZXNzYWdl
KFdURk1vdmUoZGVjb2RlcikpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz
c1Byb3h5LmNwcAppbmRleCA4NTFjYmM5MWY0NTc1MjRjNGViOTNhMjM4NzdkMzM0MGJmMDUxNjIy
Li4xNmI3YTY0NjY0MTkyMTYzOWY3OGY5NjZlNzQ3ZTVkMTJmYzI0N2IyIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM5Niw3ICszOTYsMTEgQEAg
Ym9vbCBXZWJQcm9jZXNzUHJveHk6OnNob3VsZFNlbmRQZW5kaW5nTWVzc2FnZShjb25zdCBQZW5k
aW5nTWVzc2FnZSYgbWVzc2FnZSkKICAgICBpZiAobWVzc2FnZS5lbmNvZGVyLT5tZXNzYWdlTmFt
ZSgpID09IElQQzo6TWVzc2FnZU5hbWU6OldlYlBhZ2VfTG9hZFJlcXVlc3RXYWl0aW5nRm9yUHJv
Y2Vzc0xhdW5jaCkgewogICAgICAgICBhdXRvIGJ1ZmZlciA9IG1lc3NhZ2UuZW5jb2Rlci0+YnVm
ZmVyKCk7CiAgICAgICAgIGF1dG8gYnVmZmVyU2l6ZSA9IG1lc3NhZ2UuZW5jb2Rlci0+YnVmZmVy
U2l6ZSgpOwotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpEZWNvZGVyPiBkZWNvZGVyID0g
bWFrZVVuaXF1ZTxJUEM6OkRlY29kZXI+KGJ1ZmZlciwgYnVmZmVyU2l6ZSwgbnVsbHB0ciwgVmVj
dG9yPElQQzo6QXR0YWNobWVudD4geyB9KTsKKyAgICAgICAgYXV0byBkZWNvZGVyID0gSVBDOjpE
ZWNvZGVyOjpjcmVhdGUoYnVmZmVyLCBidWZmZXJTaXplLCBudWxscHRyLCB7IH0pOworICAgICAg
ICBBU1NFUlQoZGVjb2Rlcik7CisgICAgICAgIGlmICghZGVjb2RlcikKKyAgICAgICAgICAgIHJl
dHVybiBmYWxzZTsKKwogICAgICAgICBMb2FkUGFyYW1ldGVycyBsb2FkUGFyYW1ldGVyczsKICAg
ICAgICAgVVJMIHJlc291cmNlRGlyZWN0b3J5VVJMOwogICAgICAgICBXZWJQYWdlUHJveHlJZGVu
dGlmaWVyIHBhZ2VJRDsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421068</attachid>
            <date>2021-02-19 18:47:05 -0800</date>
            <delta_ts>2021-02-19 18:50:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219184704.patch</filename>
            <type>text/plain</type>
            <size>9368</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5NGU4YWEyZjZhNDAyNjk5
Zjc1ZjkyZTVmNWM4YzZkMGQ0N2MxNTIuLmZlODJiMTEzMDVhMzkxY2QwZDNiNWUxYzY3NDk4OTIw
MTM0ZmIyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgogCiAgICAgICAgIEFkZCBiYWNrIG9sZCBtZWRpYSBwbGF5YmFjayBBUEkgYnV0IGRl
cHJlY2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIu
Y3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5jcHAKaW5kZXggODBhMGY3
NWM3MDU3MmJmNGMyNDg1MjZmZWQyZmVmYjA5N2NkYzhmOS4uZjljYWVkNzVjMDg0M2I3MzA1MzQz
NGFkNDFmMTg3OTFiM2UwNDUzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9J
UEMvRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5j
cHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW5j
bHVkZSAiRGF0YVJlZmVyZW5jZS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJN
ZXNzYWdlRmxhZ3MuaCIKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJF
eHRyYXMuaD4KQEAgLTQwLDIwICs0MSwzNSBAQCBuYW1lc3BhY2UgSVBDIHsKIAogc3RhdGljIGNv
bnN0IHVpbnQ4X3QqIGNvcHlCdWZmZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVm
ZmVyU2l6ZSkKIHsKLSAgICBhdXRvIGJ1ZmZlckNvcHkgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4o
ZmFzdE1hbGxvYyhidWZmZXJTaXplKSk7Ci0gICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwg
YnVmZmVyU2l6ZSk7CisgICAgdWludDhfdCogYnVmZmVyQ29weTsKKyAgICBpZiAoIXRyeUZhc3RN
YWxsb2MoYnVmZmVyU2l6ZSkuZ2V0VmFsdWUoYnVmZmVyQ29weSkpIHsKKyAgICAgICAgUkVMRUFT
RV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y29weUJ1ZmZlcjogdHJ5RmFzdE1hbGxvYyglbHUp
IGZhaWxlZCIsIGJ1ZmZlclNpemUpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAK
KyAgICBtZW1jcHkoYnVmZmVyQ29weSwgYnVmZmVyLCBidWZmZXJTaXplKTsKICAgICByZXR1cm4g
YnVmZmVyQ29weTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IERlY29kZXI6OmNyZWF0
ZShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVy
RGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4m
JiBhdHRhY2htZW50cykKIHsKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+
KGJ1ZmZlciwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNobWVu
dHMpKTsKKyAgICBBU1NFUlQoYnVmZmVyKTsKKyAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlcikpIHsK
KyAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y3JlYXRlKCkgY2FsbGVk
IHdpdGggYSBudWxsIGJ1ZmZlciAoYnVmZmVyU2l6ZTogJWx1KSIsIGJ1ZmZlclNpemUpOworICAg
ICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBhdXRvKiBidWZmZXJDb3B5ID0gYnVm
ZmVyRGVhbGxvY2F0b3IgPyBidWZmZXIgOiBjb3B5QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSk7
CisgICAgQVNTRVJUKGJ1ZmZlckNvcHkpOworICAgIGlmIChVTkxJS0VMWSghYnVmZmVyQ29weSkp
CisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgYXV0byBkZWNvZGVyID0gc3RkOjp1bmlx
dWVfcHRyPERlY29kZXI+KG5ldyBEZWNvZGVyKGJ1ZmZlckNvcHksIGJ1ZmZlclNpemUsIGJ1ZmZl
ckRlYWxsb2NhdG9yLCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSkpOwogICAgIHJldHVybiBkZWNvZGVy
LT5pc1ZhbGlkKCkgPyBXVEZNb3ZlKGRlY29kZXIpIDogbnVsbHB0cjsKIH0KIAogRGVjb2Rlcjo6
RGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgq
YnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNo
bWVudD4mJiBhdHRhY2htZW50cykKLSAgICA6IG1fYnVmZmVyIHsgYnVmZmVyRGVhbGxvY2F0b3Ig
PyBidWZmZXIgOiBjb3B5QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSkgfQorICAgIDogbV9idWZm
ZXIgeyBidWZmZXIgfQogICAgICwgbV9idWZmZXJQb3MgeyBtX2J1ZmZlciB9CiAgICAgLCBtX2J1
ZmZlckVuZCB7IG1fYnVmZmVyICsgYnVmZmVyU2l6ZSB9CiAgICAgLCBtX2J1ZmZlckRlYWxsb2Nh
dG9yIHsgYnVmZmVyRGVhbGxvY2F0b3IgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0
Zm9ybS9JUEMvRGVjb2Rlci5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5o
CmluZGV4IDY2OTg1YmMzODdkNzQzOTEzNzAxYjExN2I5MTgwMGI5YTI3NzFhYjguLjUyOTFhNDZk
ZDU5NTU5ZjRjYjkyYjM2NzZmOTM0MTE2OTc0NWQ0ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQ
Qy9EZWNvZGVyLmgKQEAgLTUwLDcgKzUwLDYgQEAgY2xhc3MgRGVjb2RlciB7CiAgICAgV1RGX01B
S0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxE
ZWNvZGVyPiBjcmVhdGUoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwg
dm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9y
PEF0dGFjaG1lbnQ+JiYpOwotICAgIGV4cGxpY2l0IERlY29kZXIoY29uc3QgdWludDhfdCogYnVm
ZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1
aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+JiYpOwogICAgIH5EZWNvZGVyKCk7
CiAKICAgICBEZWNvZGVyKGNvbnN0IERlY29kZXImKSA9IGRlbGV0ZTsKQEAgLTE0MSw2ICsxNDAs
OCBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgorICAgIERlY29kZXIoY29uc3QgdWludDhf
dCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShj
b25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+JiYpOworCiAgICAgZW51
bSBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyVGFnIHsgQ29uc3RydWN0V2l0aG91dEhlYWRlciB9Owog
ICAgIERlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgQ29u
c3RydWN0V2l0aG91dEhlYWRlclRhZyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxh
dGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv
cm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbQppbmRleCAzZjUxNzIzMTgwMTI3ODI1MmYw
NmZlNTIxOTkxMmIxNDA1Zjg5MjU0Li4wNTllODI5Mzk2YTUyNDlmMDg1MzM0N2ViYzBiM2ViYmVk
MzQ2NDg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9jb2NvYS9Db25u
ZWN0aW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29u
bmVjdGlvbkNvY29hLm1tCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbXBvcnQgIkRhdGFSZWZlcmVu
Y2UuaCIKICNpbXBvcnQgIkltcG9ydGFuY2VBc3NlcnRpb24uaCIKKyNpbXBvcnQgIkxvZ2dpbmcu
aCIKICNpbXBvcnQgIk1hY2hNZXNzYWdlLmgiCiAjaW1wb3J0ICJNYWNoUG9ydC5oIgogI2ltcG9y
dCAiTWFjaFV0aWxpdGllcy5oIgpAQCAtNDE5LDkgKzQyMCwxNCBAQCBzdGF0aWMgc3RkOjp1bmlx
dWVfcHRyPERlY29kZXI+IGNyZWF0ZU1lc3NhZ2VEZWNvZGVyKG1hY2hfbXNnX2hlYWRlcl90KiBo
ZWFkZXIpCiAgICAgaWYgKCEoaGVhZGVyLT5tc2doX2JpdHMgJiBNQUNIX01TR0hfQklUU19DT01Q
TEVYKSkgewogICAgICAgICAvLyBXZSBoYXZlIGEgc2ltcGxlIG1lc3NhZ2UuCiAgICAgICAgIHVp
bnQ4X3QqIGJvZHkgPSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIgKyAxKTsKLSAg
ICAgICAgc2l6ZV90IGJvZHlTaXplID0gaGVhZGVyLT5tc2doX3NpemUgLSBzaXplb2YobWFjaF9t
c2dfaGVhZGVyX3QpOworICAgICAgICBhdXRvIGJvZHlTaXplID0gQ2hlY2tlZFNpemUgeyBoZWFk
ZXItPm1zZ2hfc2l6ZSB9IC0gc2l6ZW9mKG1hY2hfbXNnX2hlYWRlcl90KTsKKyAgICAgICAgaWYg
KFVOTElLRUxZKGJvZHlTaXplLmhhc092ZXJmbG93ZWQoKSkpIHsKKyAgICAgICAgICAgIFJFTEVB
U0VfTE9HX0ZBVUxUKElQQywgImNyZWF0ZU1lc3NhZ2VEZWNvZGVyOiBPdmVyZmxvdyB3aGVuIGNv
bXB1dGluZyBib2R5U2l6ZSAoaGVhZGVyLT5tc2doX3NpemU6ICVsdSwgc2l6ZW9mKG1hY2hfbXNn
X2hlYWRlcl90KTogJWx1KSIsIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KGhlYWRlci0+bXNn
aF9zaXplKSwgc2l6ZW9mKG1hY2hfbXNnX2hlYWRlcl90KSk7CisgICAgICAgICAgICBBU1NFUlRf
Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICB9CiAK
LSAgICAgICAgcmV0dXJuIERlY29kZXI6OmNyZWF0ZShib2R5LCBib2R5U2l6ZSwgbnVsbHB0ciwg
VmVjdG9yPEF0dGFjaG1lbnQ+IHsgfSk7CisgICAgICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUo
Ym9keSwgYm9keVNpemUudW5zYWZlR2V0KCksIG51bGxwdHIsIFZlY3RvcjxBdHRhY2htZW50PiB7
IH0pOwogICAgIH0KIAogICAgIG1hY2hfbXNnX2JvZHlfdCogYm9keSA9IHJlaW50ZXJwcmV0X2Nh
c3Q8bWFjaF9tc2dfYm9keV90Kj4oaGVhZGVyICsgMSk7CkBAIC00NjYsOSArNDcyLDE1IEBAIHN0
YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4gY3JlYXRlTWVzc2FnZURlY29kZXIobWFjaF9t
c2dfaGVhZGVyX3QqIGhlYWRlcikKICAgICB9CiAKICAgICB1aW50OF90KiBtZXNzYWdlQm9keSA9
IGRlc2NyaXB0b3JEYXRhOwotICAgIHNpemVfdCBtZXNzYWdlQm9keVNpemUgPSBoZWFkZXItPm1z
Z2hfc2l6ZSAtIChkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhl
YWRlcikpOworICAgIEFTU0VSVChkZXNjcmlwdG9yRGF0YSA+PSByZWludGVycHJldF9jYXN0PHVp
bnQ4X3QqPihoZWFkZXIpKTsKKyAgICBhdXRvIG1lc3NhZ2VCb2R5U2l6ZSA9IENoZWNrZWRTaXpl
IHsgaGVhZGVyLT5tc2doX3NpemUgfSAtIHN0YXRpY19jYXN0PHNpemVfdD4oZGVzY3JpcHRvckRh
dGEgLSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIpKTsKKyAgICBpZiAoVU5MSUtF
TFkobWVzc2FnZUJvZHlTaXplLmhhc092ZXJmbG93ZWQoKSkpIHsKKyAgICAgICAgUkVMRUFTRV9M
T0dfRkFVTFQoSVBDLCAiY3JlYXRlTWVzc2FnZURlY29kZXI6IE92ZXJmbG93IHdoZW4gY29tcHV0
aW5nIGJvZHlTaXplIChoZWFkZXItPm1zZ2hfc2l6ZTogJWx1LCAoZGVzY3JpcHRvckRhdGEgLSBy
ZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIpKTogJWx1KSIsIHN0YXRpY19jYXN0PHVu
c2lnbmVkIGxvbmc+KGhlYWRlci0+bXNnaF9zaXplKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9u
Zz4oZGVzY3JpcHRvckRhdGEgLSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIpKSk7
CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsK
KyAgICB9CiAKLSAgICByZXR1cm4gRGVjb2Rlcjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBtZXNzYWdl
Qm9keVNpemUsIG51bGxwdHIsIFdURk1vdmUoYXR0YWNobWVudHMpKTsKKyAgICByZXR1cm4gRGVj
b2Rlcjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBtZXNzYWdlQm9keVNpemUudW5zYWZlR2V0KCksIG51
bGxwdHIsIFdURk1vdmUoYXR0YWNobWVudHMpKTsKIH0KIAogLy8gVGhlIHJlY2VpdmUgYnVmZmVy
IHNpemUgc2hvdWxkIGFsd2F5cyBpbmNsdWRlIHRoZSBtYXhpbXVtIHRyYWlsZXIgc2l6ZS4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXgu
Y3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAK
aW5kZXggYzU3YWIzNjk3YWY1MWU4YTY0ZmY5M2RiMGY1ZTc2M2U0ODQwODBhNS4uN2IwNGMwNTQz
YTlhMDgzYzAwYjQxZTU2NzZlOWUwMjUyOTg1OTVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKKysrIGIvU291cmNlL1dlYktp
dC9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKQEAgLTIzNyw3ICsyMzcsMTAg
QEAgYm9vbCBDb25uZWN0aW9uOjpwcm9jZXNzTWVzc2FnZSgpCiAgICAgaWYgKG1lc3NhZ2VJbmZv
LmlzQm9keU91dE9mTGluZSgpKQogICAgICAgICBtZXNzYWdlQm9keSA9IHJlaW50ZXJwcmV0X2Nh
c3Q8dWludDhfdCo+KG9vbE1lc3NhZ2VCb2R5LT5kYXRhKCkpOwogCi0gICAgYXV0byBkZWNvZGVy
ID0gbWFrZVVuaXF1ZTxEZWNvZGVyPihtZXNzYWdlQm9keSwgbWVzc2FnZUluZm8uYm9keVNpemUo
KSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykpOworICAgIGF1dG8gZGVjb2RlciA9IERl
Y29kZXI6OmNyZWF0ZShtZXNzYWdlQm9keSwgbWVzc2FnZUluZm8uYm9keVNpemUoKSwgbnVsbHB0
ciwgV1RGTW92ZShhdHRhY2htZW50cykpOworICAgIEFTU0VSVChkZWNvZGVyKTsKKyAgICBpZiAo
IWRlY29kZXIpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHByb2Nlc3NJbmNvbWluZ01l
c3NhZ2UoV1RGTW92ZShkZWNvZGVyKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ
cm9jZXNzUHJveHkuY3BwCmluZGV4IDg1MWNiYzkxZjQ1NzUyNGM0ZWI5M2EyMzg3N2QzMzQwYmYw
NTE2MjIuLjE2YjdhNjQ2NjQxOTIxNjM5Zjc4Zjk2NmU3NDdlNWQxMmZjMjQ3YjIgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzk2LDcgKzM5Niwx
MSBAQCBib29sIFdlYlByb2Nlc3NQcm94eTo6c2hvdWxkU2VuZFBlbmRpbmdNZXNzYWdlKGNvbnN0
IFBlbmRpbmdNZXNzYWdlJiBtZXNzYWdlKQogICAgIGlmIChtZXNzYWdlLmVuY29kZXItPm1lc3Nh
Z2VOYW1lKCkgPT0gSVBDOjpNZXNzYWdlTmFtZTo6V2ViUGFnZV9Mb2FkUmVxdWVzdFdhaXRpbmdG
b3JQcm9jZXNzTGF1bmNoKSB7CiAgICAgICAgIGF1dG8gYnVmZmVyID0gbWVzc2FnZS5lbmNvZGVy
LT5idWZmZXIoKTsKICAgICAgICAgYXV0byBidWZmZXJTaXplID0gbWVzc2FnZS5lbmNvZGVyLT5i
dWZmZXJTaXplKCk7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkRlY29kZXI+IGRlY29k
ZXIgPSBtYWtlVW5pcXVlPElQQzo6RGVjb2Rlcj4oYnVmZmVyLCBidWZmZXJTaXplLCBudWxscHRy
LCBWZWN0b3I8SVBDOjpBdHRhY2htZW50PiB7IH0pOworICAgICAgICBhdXRvIGRlY29kZXIgPSBJ
UEM6OkRlY29kZXI6OmNyZWF0ZShidWZmZXIsIGJ1ZmZlclNpemUsIG51bGxwdHIsIHsgfSk7Cisg
ICAgICAgIEFTU0VSVChkZWNvZGVyKTsKKyAgICAgICAgaWYgKCFkZWNvZGVyKQorICAgICAgICAg
ICAgcmV0dXJuIGZhbHNlOworCiAgICAgICAgIExvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJz
OwogICAgICAgICBVUkwgcmVzb3VyY2VEaXJlY3RvcnlVUkw7CiAgICAgICAgIFdlYlBhZ2VQcm94
eUlkZW50aWZpZXIgcGFnZUlEOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421069</attachid>
            <date>2021-02-19 18:50:47 -0800</date>
            <delta_ts>2021-02-19 19:10:41 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219185046.patch</filename>
            <type>text/plain</type>
            <size>9454</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5NGU4YWEyZjZhNDAyNjk5
Zjc1ZjkyZTVmNWM4YzZkMGQ0N2MxNTIuLmZlODJiMTEzMDVhMzkxY2QwZDNiNWUxYzY3NDk4OTIw
MTM0ZmIyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgogCiAgICAgICAgIEFkZCBiYWNrIG9sZCBtZWRpYSBwbGF5YmFjayBBUEkgYnV0IGRl
cHJlY2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIu
Y3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5jcHAKaW5kZXggODBhMGY3
NWM3MDU3MmJmNGMyNDg1MjZmZWQyZmVmYjA5N2NkYzhmOS4uNDAwMTBlNTEzNmI2NWJlNjRkYWVl
NGE0N2JmY2E2ZWUyNTc3Y2ZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9J
UEMvRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5j
cHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW5j
bHVkZSAiRGF0YVJlZmVyZW5jZS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJN
ZXNzYWdlRmxhZ3MuaCIKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJF
eHRyYXMuaD4KQEAgLTQwLDIwICs0MSwzOSBAQCBuYW1lc3BhY2UgSVBDIHsKIAogc3RhdGljIGNv
bnN0IHVpbnQ4X3QqIGNvcHlCdWZmZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVm
ZmVyU2l6ZSkKIHsKLSAgICBhdXRvIGJ1ZmZlckNvcHkgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4o
ZmFzdE1hbGxvYyhidWZmZXJTaXplKSk7Ci0gICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwg
YnVmZmVyU2l6ZSk7CisgICAgdWludDhfdCogYnVmZmVyQ29weTsKKyAgICBpZiAoIXRyeUZhc3RN
YWxsb2MoYnVmZmVyU2l6ZSkuZ2V0VmFsdWUoYnVmZmVyQ29weSkpIHsKKyAgICAgICAgUkVMRUFT
RV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y29weUJ1ZmZlcjogdHJ5RmFzdE1hbGxvYyglbHUp
IGZhaWxlZCIsIGJ1ZmZlclNpemUpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAK
KyAgICBtZW1jcHkoYnVmZmVyQ29weSwgYnVmZmVyLCBidWZmZXJTaXplKTsKICAgICByZXR1cm4g
YnVmZmVyQ29weTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IERlY29kZXI6OmNyZWF0
ZShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVy
RGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4m
JiBhdHRhY2htZW50cykKIHsKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+
KGJ1ZmZlciwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNobWVu
dHMpKTsKKyAgICBBU1NFUlQoYnVmZmVyKTsKKyAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlcikpIHsK
KyAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y3JlYXRlKCkgY2FsbGVk
IHdpdGggYSBudWxsIGJ1ZmZlciAoYnVmZmVyU2l6ZTogJWx1KSIsIGJ1ZmZlclNpemUpOworICAg
ICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBjb25zdCB1aW50OF90KiBidWZmZXJD
b3B5OworICAgIGlmICghYnVmZmVyRGVhbGxvY2F0b3IpIHsKKyAgICAgICAgYnVmZmVyQ29weSA9
IGNvcHlCdWZmZXIoYnVmZmVyLCBidWZmZXJTaXplKTsKKyAgICAgICAgQVNTRVJUKGJ1ZmZlckNv
cHkpOworICAgICAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlckNvcHkpKQorICAgICAgICAgICAgcmV0
dXJuIG51bGxwdHI7CisgICAgfSBlbHNlCisgICAgICAgIGJ1ZmZlckNvcHkgPSBidWZmZXI7CisK
KyAgICBhdXRvIGRlY29kZXIgPSBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4obmV3IERlY29kZXIo
YnVmZmVyQ29weSwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNo
bWVudHMpKSk7CiAgICAgcmV0dXJuIGRlY29kZXItPmlzVmFsaWQoKSA/IFdURk1vdmUoZGVjb2Rl
cikgOiBudWxscHRyOwogfQogCiBEZWNvZGVyOjpEZWNvZGVyKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZl
ciwgc2l6ZV90IGJ1ZmZlclNpemUsIHZvaWQgKCpidWZmZXJEZWFsbG9jYXRvcikoY29uc3QgdWlu
dDhfdCosIHNpemVfdCksIFZlY3RvcjxBdHRhY2htZW50PiYmIGF0dGFjaG1lbnRzKQotICAgIDog
bV9idWZmZXIgeyBidWZmZXJEZWFsbG9jYXRvciA/IGJ1ZmZlciA6IGNvcHlCdWZmZXIoYnVmZmVy
LCBidWZmZXJTaXplKSB9CisgICAgOiBtX2J1ZmZlciB7IGJ1ZmZlciB9CiAgICAgLCBtX2J1ZmZl
clBvcyB7IG1fYnVmZmVyIH0KICAgICAsIG1fYnVmZmVyRW5kIHsgbV9idWZmZXIgKyBidWZmZXJT
aXplIH0KICAgICAsIG1fYnVmZmVyRGVhbGxvY2F0b3IgeyBidWZmZXJEZWFsbG9jYXRvciB9CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmggYi9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmgKaW5kZXggNjY5ODViYzM4N2Q3NDM5MTM3MDFi
MTE3YjkxODAwYjlhMjc3MWFiOC4uNTI5MWE0NmRkNTk1NTlmNGNiOTJiMzY3NmY5MzQxMTY5NzQ1
ZDRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oCisr
KyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuaApAQCAtNTAsNyArNTAsNiBA
QCBjbGFzcyBEZWNvZGVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoK
ICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IGNyZWF0ZShjb25zdCB1aW50OF90
KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNv
bnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4mJik7Ci0gICAgZXhwbGlj
aXQgRGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lk
ICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0
YWNobWVudD4mJik7CiAgICAgfkRlY29kZXIoKTsKIAogICAgIERlY29kZXIoY29uc3QgRGVjb2Rl
ciYpID0gZGVsZXRlOwpAQCAtMTQxLDYgKzE0MCw4IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZh
dGU6CisgICAgRGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXpl
LCB2b2lkICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0
b3I8QXR0YWNobWVudD4mJik7CisKICAgICBlbnVtIENvbnN0cnVjdFdpdGhvdXRIZWFkZXJUYWcg
eyBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyIH07CiAgICAgRGVjb2Rlcihjb25zdCB1aW50OF90KiBi
dWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyVGFnKTsKIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNv
Y29hLm1tIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNvY29h
Lm1tCmluZGV4IDNmNTE3MjMxODAxMjc4MjUyZjA2ZmU1MjE5OTEyYjE0MDVmODkyNTQuLjA1OWU4
MjkzOTZhNTI0OWYwODUzMzQ3ZWJjMGIzZWJiZWQzNDY0ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbQorKysgYi9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL0lQQy9jb2NvYS9Db25uZWN0aW9uQ29jb2EubW0KQEAgLTI4LDYgKzI4
LDcgQEAKIAogI2ltcG9ydCAiRGF0YVJlZmVyZW5jZS5oIgogI2ltcG9ydCAiSW1wb3J0YW5jZUFz
c2VydGlvbi5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiTWFjaE1lc3NhZ2UuaCIK
ICNpbXBvcnQgIk1hY2hQb3J0LmgiCiAjaW1wb3J0ICJNYWNoVXRpbGl0aWVzLmgiCkBAIC00MTks
OSArNDIwLDE0IEBAIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4gY3JlYXRlTWVzc2Fn
ZURlY29kZXIobWFjaF9tc2dfaGVhZGVyX3QqIGhlYWRlcikKICAgICBpZiAoIShoZWFkZXItPm1z
Z2hfYml0cyAmIE1BQ0hfTVNHSF9CSVRTX0NPTVBMRVgpKSB7CiAgICAgICAgIC8vIFdlIGhhdmUg
YSBzaW1wbGUgbWVzc2FnZS4KICAgICAgICAgdWludDhfdCogYm9keSA9IHJlaW50ZXJwcmV0X2Nh
c3Q8dWludDhfdCo+KGhlYWRlciArIDEpOwotICAgICAgICBzaXplX3QgYm9keVNpemUgPSBoZWFk
ZXItPm1zZ2hfc2l6ZSAtIHNpemVvZihtYWNoX21zZ19oZWFkZXJfdCk7CisgICAgICAgIGF1dG8g
Ym9keVNpemUgPSBDaGVja2VkU2l6ZSB7IGhlYWRlci0+bXNnaF9zaXplIH0gLSBzaXplb2YobWFj
aF9tc2dfaGVhZGVyX3QpOworICAgICAgICBpZiAoVU5MSUtFTFkoYm9keVNpemUuaGFzT3ZlcmZs
b3dlZCgpKSkgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiY3JlYXRlTWVz
c2FnZURlY29kZXI6IE92ZXJmbG93IHdoZW4gY29tcHV0aW5nIGJvZHlTaXplIChoZWFkZXItPm1z
Z2hfc2l6ZTogJWx1LCBzaXplb2YobWFjaF9tc2dfaGVhZGVyX3QpOiAlbHUpIiwgc3RhdGljX2Nh
c3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVyLT5tc2doX3NpemUpLCBzaXplb2YobWFjaF9tc2dfaGVh
ZGVyX3QpKTsKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAg
cmV0dXJuIG51bGxwdHI7CisgICAgICAgIH0KIAotICAgICAgICByZXR1cm4gRGVjb2Rlcjo6Y3Jl
YXRlKGJvZHksIGJvZHlTaXplLCBudWxscHRyLCBWZWN0b3I8QXR0YWNobWVudD4geyB9KTsKKyAg
ICAgICAgcmV0dXJuIERlY29kZXI6OmNyZWF0ZShib2R5LCBib2R5U2l6ZS51bnNhZmVHZXQoKSwg
bnVsbHB0ciwgVmVjdG9yPEF0dGFjaG1lbnQ+IHsgfSk7CiAgICAgfQogCiAgICAgbWFjaF9tc2df
Ym9keV90KiBib2R5ID0gcmVpbnRlcnByZXRfY2FzdDxtYWNoX21zZ19ib2R5X3QqPihoZWFkZXIg
KyAxKTsKQEAgLTQ2Niw5ICs0NzIsMTUgQEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVy
PiBjcmVhdGVNZXNzYWdlRGVjb2RlcihtYWNoX21zZ19oZWFkZXJfdCogaGVhZGVyKQogICAgIH0K
IAogICAgIHVpbnQ4X3QqIG1lc3NhZ2VCb2R5ID0gZGVzY3JpcHRvckRhdGE7Ci0gICAgc2l6ZV90
IG1lc3NhZ2VCb2R5U2l6ZSA9IGhlYWRlci0+bXNnaF9zaXplIC0gKGRlc2NyaXB0b3JEYXRhIC0g
cmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyKSk7CisgICAgQVNTRVJUKGRlc2NyaXB0
b3JEYXRhID49IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpOworICAgIGF1dG8g
bWVzc2FnZUJvZHlTaXplID0gQ2hlY2tlZFNpemUgeyBoZWFkZXItPm1zZ2hfc2l6ZSB9IC0gc3Rh
dGljX2Nhc3Q8c2l6ZV90PihkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhf
dCo+KGhlYWRlcikpOworICAgIGlmIChVTkxJS0VMWShtZXNzYWdlQm9keVNpemUuaGFzT3ZlcmZs
b3dlZCgpKSkgeworICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChJUEMsICJjcmVhdGVNZXNzYWdl
RGVjb2RlcjogT3ZlcmZsb3cgd2hlbiBjb21wdXRpbmcgYm9keVNpemUgKGhlYWRlci0+bXNnaF9z
aXplOiAlbHUsIChkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhl
YWRlcikpOiAlbHUpIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVyLT5tc2doX3Np
emUpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJw
cmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE
KCk7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KIAotICAgIHJldHVybiBEZWNvZGVy
OjpjcmVhdGUobWVzc2FnZUJvZHksIG1lc3NhZ2VCb2R5U2l6ZSwgbnVsbHB0ciwgV1RGTW92ZShh
dHRhY2htZW50cykpOworICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUobWVzc2FnZUJvZHksIG1l
c3NhZ2VCb2R5U2l6ZS51bnNhZmVHZXQoKSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykp
OwogfQogCiAvLyBUaGUgcmVjZWl2ZSBidWZmZXIgc2l6ZSBzaG91bGQgYWx3YXlzIGluY2x1ZGUg
dGhlIG1heGltdW0gdHJhaWxlciBzaXplLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0
Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt
L0lQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAppbmRleCBjNTdhYjM2OTdhZjUxZThhNjRmZjkz
ZGIwZjVlNzYzZTQ4NDA4MGE1Li43YjA0YzA1NDNhOWEwODNjMDBiNDFlNTY3NmU5ZTAyNTI5ODU5
NWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rp
b25Vbml4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rp
b25Vbml4LmNwcApAQCAtMjM3LDcgKzIzNywxMCBAQCBib29sIENvbm5lY3Rpb246OnByb2Nlc3NN
ZXNzYWdlKCkKICAgICBpZiAobWVzc2FnZUluZm8uaXNCb2R5T3V0T2ZMaW5lKCkpCiAgICAgICAg
IG1lc3NhZ2VCb2R5ID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4ob29sTWVzc2FnZUJvZHkt
PmRhdGEoKSk7CiAKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+KG1lc3Nh
Z2VCb2R5LCBtZXNzYWdlSW5mby5ib2R5U2l6ZSgpLCBudWxscHRyLCBXVEZNb3ZlKGF0dGFjaG1l
bnRzKSk7CisgICAgYXV0byBkZWNvZGVyID0gRGVjb2Rlcjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBt
ZXNzYWdlSW5mby5ib2R5U2l6ZSgpLCBudWxscHRyLCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSk7Cisg
ICAgQVNTRVJUKGRlY29kZXIpOworICAgIGlmICghZGVjb2RlcikKKyAgICAgICAgcmV0dXJuIGZh
bHNlOwogCiAgICAgcHJvY2Vzc0luY29taW5nTWVzc2FnZShXVEZNb3ZlKGRlY29kZXIpKTsKIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggODUxY2Jj
OTFmNDU3NTI0YzRlYjkzYTIzODc3ZDMzNDBiZjA1MTYyMi4uMTZiN2E2NDY2NDE5MjE2MzlmNzhm
OTY2ZTc0N2U1ZDEyZmMyNDdiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j
ZXNzUHJveHkuY3BwCkBAIC0zOTYsNyArMzk2LDExIEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5Ojpz
aG91bGRTZW5kUGVuZGluZ01lc3NhZ2UoY29uc3QgUGVuZGluZ01lc3NhZ2UmIG1lc3NhZ2UpCiAg
ICAgaWYgKG1lc3NhZ2UuZW5jb2Rlci0+bWVzc2FnZU5hbWUoKSA9PSBJUEM6Ok1lc3NhZ2VOYW1l
OjpXZWJQYWdlX0xvYWRSZXF1ZXN0V2FpdGluZ0ZvclByb2Nlc3NMYXVuY2gpIHsKICAgICAgICAg
YXV0byBidWZmZXIgPSBtZXNzYWdlLmVuY29kZXItPmJ1ZmZlcigpOwogICAgICAgICBhdXRvIGJ1
ZmZlclNpemUgPSBtZXNzYWdlLmVuY29kZXItPmJ1ZmZlclNpemUoKTsKLSAgICAgICAgc3RkOjp1
bmlxdWVfcHRyPElQQzo6RGVjb2Rlcj4gZGVjb2RlciA9IG1ha2VVbmlxdWU8SVBDOjpEZWNvZGVy
PihidWZmZXIsIGJ1ZmZlclNpemUsIG51bGxwdHIsIFZlY3RvcjxJUEM6OkF0dGFjaG1lbnQ+IHsg
fSk7CisgICAgICAgIGF1dG8gZGVjb2RlciA9IElQQzo6RGVjb2Rlcjo6Y3JlYXRlKGJ1ZmZlciwg
YnVmZmVyU2l6ZSwgbnVsbHB0ciwgeyB9KTsKKyAgICAgICAgQVNTRVJUKGRlY29kZXIpOworICAg
ICAgICBpZiAoIWRlY29kZXIpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAgICAg
TG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CiAgICAgICAgIFVSTCByZXNvdXJjZURpcmVj
dG9yeVVSTDsKICAgICAgICAgV2ViUGFnZVByb3h5SWRlbnRpZmllciBwYWdlSUQ7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421070</attachid>
            <date>2021-02-19 19:10:43 -0800</date>
            <delta_ts>2021-02-19 21:04:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219191042.patch</filename>
            <type>text/plain</type>
            <size>10904</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5NGU4YWEyZjZhNDAyNjk5
Zjc1ZjkyZTVmNWM4YzZkMGQ0N2MxNTIuLmZlODJiMTEzMDVhMzkxY2QwZDNiNWUxYzY3NDk4OTIw
MTM0ZmIyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgogCiAgICAgICAgIEFkZCBiYWNrIG9sZCBtZWRpYSBwbGF5YmFjayBBUEkgYnV0IGRl
cHJlY2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIu
Y3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5jcHAKaW5kZXggODBhMGY3
NWM3MDU3MmJmNGMyNDg1MjZmZWQyZmVmYjA5N2NkYzhmOS4uNDAwMTBlNTEzNmI2NWJlNjRkYWVl
NGE0N2JmY2E2ZWUyNTc3Y2ZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9J
UEMvRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5j
cHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW5j
bHVkZSAiRGF0YVJlZmVyZW5jZS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJN
ZXNzYWdlRmxhZ3MuaCIKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJF
eHRyYXMuaD4KQEAgLTQwLDIwICs0MSwzOSBAQCBuYW1lc3BhY2UgSVBDIHsKIAogc3RhdGljIGNv
bnN0IHVpbnQ4X3QqIGNvcHlCdWZmZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVm
ZmVyU2l6ZSkKIHsKLSAgICBhdXRvIGJ1ZmZlckNvcHkgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4o
ZmFzdE1hbGxvYyhidWZmZXJTaXplKSk7Ci0gICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwg
YnVmZmVyU2l6ZSk7CisgICAgdWludDhfdCogYnVmZmVyQ29weTsKKyAgICBpZiAoIXRyeUZhc3RN
YWxsb2MoYnVmZmVyU2l6ZSkuZ2V0VmFsdWUoYnVmZmVyQ29weSkpIHsKKyAgICAgICAgUkVMRUFT
RV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y29weUJ1ZmZlcjogdHJ5RmFzdE1hbGxvYyglbHUp
IGZhaWxlZCIsIGJ1ZmZlclNpemUpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAK
KyAgICBtZW1jcHkoYnVmZmVyQ29weSwgYnVmZmVyLCBidWZmZXJTaXplKTsKICAgICByZXR1cm4g
YnVmZmVyQ29weTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IERlY29kZXI6OmNyZWF0
ZShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVy
RGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4m
JiBhdHRhY2htZW50cykKIHsKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+
KGJ1ZmZlciwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNobWVu
dHMpKTsKKyAgICBBU1NFUlQoYnVmZmVyKTsKKyAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlcikpIHsK
KyAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiRGVjb2Rlcjo6Y3JlYXRlKCkgY2FsbGVk
IHdpdGggYSBudWxsIGJ1ZmZlciAoYnVmZmVyU2l6ZTogJWx1KSIsIGJ1ZmZlclNpemUpOworICAg
ICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBjb25zdCB1aW50OF90KiBidWZmZXJD
b3B5OworICAgIGlmICghYnVmZmVyRGVhbGxvY2F0b3IpIHsKKyAgICAgICAgYnVmZmVyQ29weSA9
IGNvcHlCdWZmZXIoYnVmZmVyLCBidWZmZXJTaXplKTsKKyAgICAgICAgQVNTRVJUKGJ1ZmZlckNv
cHkpOworICAgICAgICBpZiAoVU5MSUtFTFkoIWJ1ZmZlckNvcHkpKQorICAgICAgICAgICAgcmV0
dXJuIG51bGxwdHI7CisgICAgfSBlbHNlCisgICAgICAgIGJ1ZmZlckNvcHkgPSBidWZmZXI7CisK
KyAgICBhdXRvIGRlY29kZXIgPSBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4obmV3IERlY29kZXIo
YnVmZmVyQ29weSwgYnVmZmVyU2l6ZSwgYnVmZmVyRGVhbGxvY2F0b3IsIFdURk1vdmUoYXR0YWNo
bWVudHMpKSk7CiAgICAgcmV0dXJuIGRlY29kZXItPmlzVmFsaWQoKSA/IFdURk1vdmUoZGVjb2Rl
cikgOiBudWxscHRyOwogfQogCiBEZWNvZGVyOjpEZWNvZGVyKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZl
ciwgc2l6ZV90IGJ1ZmZlclNpemUsIHZvaWQgKCpidWZmZXJEZWFsbG9jYXRvcikoY29uc3QgdWlu
dDhfdCosIHNpemVfdCksIFZlY3RvcjxBdHRhY2htZW50PiYmIGF0dGFjaG1lbnRzKQotICAgIDog
bV9idWZmZXIgeyBidWZmZXJEZWFsbG9jYXRvciA/IGJ1ZmZlciA6IGNvcHlCdWZmZXIoYnVmZmVy
LCBidWZmZXJTaXplKSB9CisgICAgOiBtX2J1ZmZlciB7IGJ1ZmZlciB9CiAgICAgLCBtX2J1ZmZl
clBvcyB7IG1fYnVmZmVyIH0KICAgICAsIG1fYnVmZmVyRW5kIHsgbV9idWZmZXIgKyBidWZmZXJT
aXplIH0KICAgICAsIG1fYnVmZmVyRGVhbGxvY2F0b3IgeyBidWZmZXJEZWFsbG9jYXRvciB9CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmggYi9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmgKaW5kZXggNjY5ODViYzM4N2Q3NDM5MTM3MDFi
MTE3YjkxODAwYjlhMjc3MWFiOC4uNTI5MWE0NmRkNTk1NTlmNGNiOTJiMzY3NmY5MzQxMTY5NzQ1
ZDRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oCisr
KyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuaApAQCAtNTAsNyArNTAsNiBA
QCBjbGFzcyBEZWNvZGVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoK
ICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IGNyZWF0ZShjb25zdCB1aW50OF90
KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNv
bnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4mJik7Ci0gICAgZXhwbGlj
aXQgRGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lk
ICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0
YWNobWVudD4mJik7CiAgICAgfkRlY29kZXIoKTsKIAogICAgIERlY29kZXIoY29uc3QgRGVjb2Rl
ciYpID0gZGVsZXRlOwpAQCAtMTQxLDYgKzE0MCw4IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZh
dGU6CisgICAgRGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXpl
LCB2b2lkICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpLCBWZWN0
b3I8QXR0YWNobWVudD4mJik7CisKICAgICBlbnVtIENvbnN0cnVjdFdpdGhvdXRIZWFkZXJUYWcg
eyBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyIH07CiAgICAgRGVjb2Rlcihjb25zdCB1aW50OF90KiBi
dWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyVGFnKTsKIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNv
Y29hLm1tIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNvY29h
Lm1tCmluZGV4IDNmNTE3MjMxODAxMjc4MjUyZjA2ZmU1MjE5OTEyYjE0MDVmODkyNTQuLjA1OWU4
MjkzOTZhNTI0OWYwODUzMzQ3ZWJjMGIzZWJiZWQzNDY0ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbQorKysgYi9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL0lQQy9jb2NvYS9Db25uZWN0aW9uQ29jb2EubW0KQEAgLTI4LDYgKzI4
LDcgQEAKIAogI2ltcG9ydCAiRGF0YVJlZmVyZW5jZS5oIgogI2ltcG9ydCAiSW1wb3J0YW5jZUFz
c2VydGlvbi5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiTWFjaE1lc3NhZ2UuaCIK
ICNpbXBvcnQgIk1hY2hQb3J0LmgiCiAjaW1wb3J0ICJNYWNoVXRpbGl0aWVzLmgiCkBAIC00MTks
OSArNDIwLDE0IEBAIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4gY3JlYXRlTWVzc2Fn
ZURlY29kZXIobWFjaF9tc2dfaGVhZGVyX3QqIGhlYWRlcikKICAgICBpZiAoIShoZWFkZXItPm1z
Z2hfYml0cyAmIE1BQ0hfTVNHSF9CSVRTX0NPTVBMRVgpKSB7CiAgICAgICAgIC8vIFdlIGhhdmUg
YSBzaW1wbGUgbWVzc2FnZS4KICAgICAgICAgdWludDhfdCogYm9keSA9IHJlaW50ZXJwcmV0X2Nh
c3Q8dWludDhfdCo+KGhlYWRlciArIDEpOwotICAgICAgICBzaXplX3QgYm9keVNpemUgPSBoZWFk
ZXItPm1zZ2hfc2l6ZSAtIHNpemVvZihtYWNoX21zZ19oZWFkZXJfdCk7CisgICAgICAgIGF1dG8g
Ym9keVNpemUgPSBDaGVja2VkU2l6ZSB7IGhlYWRlci0+bXNnaF9zaXplIH0gLSBzaXplb2YobWFj
aF9tc2dfaGVhZGVyX3QpOworICAgICAgICBpZiAoVU5MSUtFTFkoYm9keVNpemUuaGFzT3ZlcmZs
b3dlZCgpKSkgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiY3JlYXRlTWVz
c2FnZURlY29kZXI6IE92ZXJmbG93IHdoZW4gY29tcHV0aW5nIGJvZHlTaXplIChoZWFkZXItPm1z
Z2hfc2l6ZTogJWx1LCBzaXplb2YobWFjaF9tc2dfaGVhZGVyX3QpOiAlbHUpIiwgc3RhdGljX2Nh
c3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVyLT5tc2doX3NpemUpLCBzaXplb2YobWFjaF9tc2dfaGVh
ZGVyX3QpKTsKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAg
cmV0dXJuIG51bGxwdHI7CisgICAgICAgIH0KIAotICAgICAgICByZXR1cm4gRGVjb2Rlcjo6Y3Jl
YXRlKGJvZHksIGJvZHlTaXplLCBudWxscHRyLCBWZWN0b3I8QXR0YWNobWVudD4geyB9KTsKKyAg
ICAgICAgcmV0dXJuIERlY29kZXI6OmNyZWF0ZShib2R5LCBib2R5U2l6ZS51bnNhZmVHZXQoKSwg
bnVsbHB0ciwgVmVjdG9yPEF0dGFjaG1lbnQ+IHsgfSk7CiAgICAgfQogCiAgICAgbWFjaF9tc2df
Ym9keV90KiBib2R5ID0gcmVpbnRlcnByZXRfY2FzdDxtYWNoX21zZ19ib2R5X3QqPihoZWFkZXIg
KyAxKTsKQEAgLTQ2Niw5ICs0NzIsMTUgQEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVy
PiBjcmVhdGVNZXNzYWdlRGVjb2RlcihtYWNoX21zZ19oZWFkZXJfdCogaGVhZGVyKQogICAgIH0K
IAogICAgIHVpbnQ4X3QqIG1lc3NhZ2VCb2R5ID0gZGVzY3JpcHRvckRhdGE7Ci0gICAgc2l6ZV90
IG1lc3NhZ2VCb2R5U2l6ZSA9IGhlYWRlci0+bXNnaF9zaXplIC0gKGRlc2NyaXB0b3JEYXRhIC0g
cmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4oaGVhZGVyKSk7CisgICAgQVNTRVJUKGRlc2NyaXB0
b3JEYXRhID49IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpOworICAgIGF1dG8g
bWVzc2FnZUJvZHlTaXplID0gQ2hlY2tlZFNpemUgeyBoZWFkZXItPm1zZ2hfc2l6ZSB9IC0gc3Rh
dGljX2Nhc3Q8c2l6ZV90PihkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhf
dCo+KGhlYWRlcikpOworICAgIGlmIChVTkxJS0VMWShtZXNzYWdlQm9keVNpemUuaGFzT3ZlcmZs
b3dlZCgpKSkgeworICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChJUEMsICJjcmVhdGVNZXNzYWdl
RGVjb2RlcjogT3ZlcmZsb3cgd2hlbiBjb21wdXRpbmcgYm9keVNpemUgKGhlYWRlci0+bXNnaF9z
aXplOiAlbHUsIChkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhl
YWRlcikpOiAlbHUpIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oaGVhZGVyLT5tc2doX3Np
emUpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihkZXNjcmlwdG9yRGF0YSAtIHJlaW50ZXJw
cmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE
KCk7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KIAotICAgIHJldHVybiBEZWNvZGVy
OjpjcmVhdGUobWVzc2FnZUJvZHksIG1lc3NhZ2VCb2R5U2l6ZSwgbnVsbHB0ciwgV1RGTW92ZShh
dHRhY2htZW50cykpOworICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUobWVzc2FnZUJvZHksIG1l
c3NhZ2VCb2R5U2l6ZS51bnNhZmVHZXQoKSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykp
OwogfQogCiAvLyBUaGUgcmVjZWl2ZSBidWZmZXIgc2l6ZSBzaG91bGQgYWx3YXlzIGluY2x1ZGUg
dGhlIG1heGltdW0gdHJhaWxlciBzaXplLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0
Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt
L0lQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAppbmRleCBjNTdhYjM2OTdhZjUxZThhNjRmZjkz
ZGIwZjVlNzYzZTQ4NDA4MGE1Li43YjA0YzA1NDNhOWEwODNjMDBiNDFlNTY3NmU5ZTAyNTI5ODU5
NWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rp
b25Vbml4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nvbm5lY3Rp
b25Vbml4LmNwcApAQCAtMjM3LDcgKzIzNywxMCBAQCBib29sIENvbm5lY3Rpb246OnByb2Nlc3NN
ZXNzYWdlKCkKICAgICBpZiAobWVzc2FnZUluZm8uaXNCb2R5T3V0T2ZMaW5lKCkpCiAgICAgICAg
IG1lc3NhZ2VCb2R5ID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4ob29sTWVzc2FnZUJvZHkt
PmRhdGEoKSk7CiAKLSAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+KG1lc3Nh
Z2VCb2R5LCBtZXNzYWdlSW5mby5ib2R5U2l6ZSgpLCBudWxscHRyLCBXVEZNb3ZlKGF0dGFjaG1l
bnRzKSk7CisgICAgYXV0byBkZWNvZGVyID0gRGVjb2Rlcjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBt
ZXNzYWdlSW5mby5ib2R5U2l6ZSgpLCBudWxscHRyLCBXVEZNb3ZlKGF0dGFjaG1lbnRzKSk7Cisg
ICAgQVNTRVJUKGRlY29kZXIpOworICAgIGlmICghZGVjb2RlcikKKyAgICAgICAgcmV0dXJuIGZh
bHNlOwogCiAgICAgcHJvY2Vzc0luY29taW5nTWVzc2FnZShXVEZNb3ZlKGRlY29kZXIpKTsKIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGVnYWN5U2Vzc2lvblN0YXRlQ29k
aW5nTm9uZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVD
b2RpbmdOb25lLmNwcAppbmRleCA3NjJmNTVlZDVjOWViOWViZDg5MTEzMmQ2NTkzNGFlYTdiYjYy
ZWUyLi4xZDUyZDQzMDA4YWEzMjJlNzViYzQ0OWYwMzdkYmE1MWIyZjZjNmY4IDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdOb25lLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdO
b25lLmNwcApAQCAtNDgsMjIgKzQ4LDI0IEBAIFJlZlB0cjxBUEk6OkRhdGE+IGVuY29kZUxlZ2Fj
eVNlc3Npb25TdGF0ZShjb25zdCBTZXNzaW9uU3RhdGUmIHNlc3Npb25TdGF0ZSkKIAogYm9vbCBk
ZWNvZGVMZWdhY3lTZXNzaW9uU3RhdGUoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IGRhdGFT
aXplLCBTZXNzaW9uU3RhdGUmIHNlc3Npb25TdGF0ZSkKIHsKLSAgICBJUEM6OkRlY29kZXIgZGVj
b2RlcihkYXRhLCBkYXRhU2l6ZSwgbnVsbHB0ciwgVmVjdG9yPElQQzo6QXR0YWNobWVudD4oKSk7
CisgICAgYXV0byBkZWNvZGVyID0gSVBDOjpEZWNvZGVyOjpjcmVhdGUoZGF0YSwgZGF0YVNpemUs
IG51bGxwdHIsIFZlY3RvcjxJUEM6OkF0dGFjaG1lbnQ+KCkpOworICAgIGlmICghZGVjb2RlcikK
KyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgT3B0aW9uYWw8QmFja0ZvcndhcmRMaXN0U3Rh
dGU+IGJhY2tGb3J3YXJkTGlzdFN0YXRlOwotICAgIGRlY29kZXIgPj4gYmFja0ZvcndhcmRMaXN0
U3RhdGU7CisgICAgKmRlY29kZXIgPj4gYmFja0ZvcndhcmRMaXN0U3RhdGU7CiAgICAgaWYgKCFi
YWNrRm9yd2FyZExpc3RTdGF0ZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHNlc3Npb25T
dGF0ZS5iYWNrRm9yd2FyZExpc3RTdGF0ZSA9IFdURk1vdmUoKmJhY2tGb3J3YXJkTGlzdFN0YXRl
KTsKIAogICAgIE9wdGlvbmFsPHVpbnQ2NF90PiByZW5kZXJUcmVlU2l6ZTsKLSAgICBkZWNvZGVy
ID4+IHJlbmRlclRyZWVTaXplOworICAgICpkZWNvZGVyID4+IHJlbmRlclRyZWVTaXplOwogICAg
IGlmICghcmVuZGVyVHJlZVNpemUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBzZXNzaW9u
U3RhdGUucmVuZGVyVHJlZVNpemUgPSAqcmVuZGVyVHJlZVNpemU7CiAKICAgICBPcHRpb25hbDxV
Ukw+IHByb3Zpc2lvbmFsVVJMOwotICAgIGRlY29kZXIgPj4gcHJvdmlzaW9uYWxVUkw7CisgICAg
KmRlY29kZXIgPj4gcHJvdmlzaW9uYWxVUkw7CiAgICAgaWYgKCFwcm92aXNpb25hbFVSTCkKICAg
ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHNlc3Npb25TdGF0ZS5wcm92aXNpb25hbFVSTCA9IFdU
Rk1vdmUoKnByb3Zpc2lvbmFsVVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j
ZXNzUHJveHkuY3BwCmluZGV4IDg1MWNiYzkxZjQ1NzUyNGM0ZWI5M2EyMzg3N2QzMzQwYmYwNTE2
MjIuLjE2YjdhNjQ2NjQxOTIxNjM5Zjc4Zjk2NmU3NDdlNWQxMmZjMjQ3YjIgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzk2LDcgKzM5NiwxMSBA
QCBib29sIFdlYlByb2Nlc3NQcm94eTo6c2hvdWxkU2VuZFBlbmRpbmdNZXNzYWdlKGNvbnN0IFBl
bmRpbmdNZXNzYWdlJiBtZXNzYWdlKQogICAgIGlmIChtZXNzYWdlLmVuY29kZXItPm1lc3NhZ2VO
YW1lKCkgPT0gSVBDOjpNZXNzYWdlTmFtZTo6V2ViUGFnZV9Mb2FkUmVxdWVzdFdhaXRpbmdGb3JQ
cm9jZXNzTGF1bmNoKSB7CiAgICAgICAgIGF1dG8gYnVmZmVyID0gbWVzc2FnZS5lbmNvZGVyLT5i
dWZmZXIoKTsKICAgICAgICAgYXV0byBidWZmZXJTaXplID0gbWVzc2FnZS5lbmNvZGVyLT5idWZm
ZXJTaXplKCk7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkRlY29kZXI+IGRlY29kZXIg
PSBtYWtlVW5pcXVlPElQQzo6RGVjb2Rlcj4oYnVmZmVyLCBidWZmZXJTaXplLCBudWxscHRyLCBW
ZWN0b3I8SVBDOjpBdHRhY2htZW50PiB7IH0pOworICAgICAgICBhdXRvIGRlY29kZXIgPSBJUEM6
OkRlY29kZXI6OmNyZWF0ZShidWZmZXIsIGJ1ZmZlclNpemUsIG51bGxwdHIsIHsgfSk7CisgICAg
ICAgIEFTU0VSVChkZWNvZGVyKTsKKyAgICAgICAgaWYgKCFkZWNvZGVyKQorICAgICAgICAgICAg
cmV0dXJuIGZhbHNlOworCiAgICAgICAgIExvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzOwog
ICAgICAgICBVUkwgcmVzb3VyY2VEaXJlY3RvcnlVUkw7CiAgICAgICAgIFdlYlBhZ2VQcm94eUlk
ZW50aWZpZXIgcGFnZUlEOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421078</attachid>
            <date>2021-02-19 21:04:11 -0800</date>
            <delta_ts>2021-02-19 22:56:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222192-20210219210410.patch</filename>
            <type>text/plain</type>
            <size>11798</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5NDM2ZGZlZmQzNTY1ZTgw
ODBiM2E5MThjNzEzZGYzMGEwMWNiN2EuLjBlODk0OTUzNzA5YTdlYzUxNDYzZDU2MTg5MWZiM2Nl
OTg4YWY4NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDItMTkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCB1bmRlciBEZWNvZGVyOjpE
ZWNvZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMjE5MgorICAgICAgICA8cmRhcjovLzMxMzkyNjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5
IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIFdlIGFyZSBzb21ldGltZXMgY3Jhc2hpbmcgdW5k
ZXIgRGVjb2RlcidzIGNvcHlCdWZmZXIoKSwgaW5zaWRlIHRoZSBtZW1jcHkoKQorICAgICAgICBj
YWxsLCB3aXRoIGEgbnVsbCBhZGRyZXNzLiBJIGhhdmUgbm8gaWRlYSBob3cgdGhpcyBpcyBoYXBw
ZW5pbmcgYW5kIHRoaXMKKyAgICAgICAgY29kZSBoYXMgbm90IGNoYW5nZWQgaW4gYSBsb25nIHRp
bWUgc28gSSBoYXZlIG1hZGUgdGhlIGZvbGxvd2luZyBoYXJkZW5pbmc6CisgICAgICAgIDEuIFVw
ZGF0ZSBjb3B5QnVmZmVyKCkgdG8gdXNlIHRyeUZhc3RNYWxsb2MoKSBpbnN0ZWFkIG9mIGZhc3RN
YWxsb2MoKS4gTG9nCisgICAgICAgICAgIGFuZCByZXR1cm4gbnVsbCBpZiB0cnlGYXN0TWFsbG9j
KCkgZmFpbGVkIGluc3RlYWQgb2YgY2FsbGluZyBtZW1jcHkoKS4KKyAgICAgICAgMi4gVXBkYXRl
IERlY29kZXI6OmNyZWF0ZSgpIHRvIGxvZyBhbmQgcmV0dXJuIGVhcmx5IGlmIHRoZSBpbnB1dCBi
dWZmZXIKKyAgICAgICAgICAgaXMgbnVsbC4KKyAgICAgICAgMy4gVXBkYXRlIENvbm5lY3Rpb24n
cyBjcmVhdGVNZXNzYWdlRGVjb2RlcigpIHRvIHVzZSBDaGVja2VkU2l6ZSB3aGVuCisgICAgICAg
ICAgIGNvbXB1dGluZyB0aGUgYm9keVNpemUgdGhhdCBpcyBiZWluZyBwYXNzZWQgdG8gRGVjb2Rl
cjo6Y3JlYXRlKCkuIElmCisgICAgICAgICAgIHdlIG92ZXJmbG93LCBsb2cgYW5kIHJldHVybiBu
dWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gaWRlYSBob3cgdGhpcyBjYW4gaGFwcGVu
IGluIHByYWN0aWNlLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwOgorICAg
ICAgICAoSVBDOjpjb3B5QnVmZmVyKToKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6Y3JlYXRlKToK
KyAgICAgICAgKElQQzo6RGVjb2Rlcjo6RGVjb2Rlcik6CisgICAgICAgICogUGxhdGZvcm0vSVBD
L2NvY29hL0Nvbm5lY3Rpb25Db2NvYS5tbToKKyAgICAgICAgKElQQzo6Y3JlYXRlTWVzc2FnZURl
Y29kZXIpOgorCiAyMDIxLTAyLTE5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu
Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBzb21lIGludGVybmFsIGJ1aWxkcyBhZnRl
ciByMjczMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVy
LmNwcCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuY3BwCmluZGV4IDgwYTBm
NzVjNzA1NzJiZjRjMjQ4NTI2ZmVkMmZlZmIwOTdjZGM4ZjkuLjQwMDEwZTUxMzZiNjViZTY0ZGFl
ZTRhNDdiZmNhNmVlMjU3N2NmYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v
SVBDL0RlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIu
Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJBcmd1bWVudENvZGVycy5oIgogI2lu
Y2x1ZGUgIkRhdGFSZWZlcmVuY2UuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAi
TWVzc2FnZUZsYWdzLmgiCiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRlIDx3dGYvU3RkTGli
RXh0cmFzLmg+CkBAIC00MCwyMCArNDEsMzkgQEAgbmFtZXNwYWNlIElQQyB7CiAKIHN0YXRpYyBj
b25zdCB1aW50OF90KiBjb3B5QnVmZmVyKGNvbnN0IHVpbnQ4X3QqIGJ1ZmZlciwgc2l6ZV90IGJ1
ZmZlclNpemUpCiB7Ci0gICAgYXV0byBidWZmZXJDb3B5ID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+
KGZhc3RNYWxsb2MoYnVmZmVyU2l6ZSkpOwotICAgIG1lbWNweShidWZmZXJDb3B5LCBidWZmZXIs
IGJ1ZmZlclNpemUpOworICAgIHVpbnQ4X3QqIGJ1ZmZlckNvcHk7CisgICAgaWYgKCF0cnlGYXN0
TWFsbG9jKGJ1ZmZlclNpemUpLmdldFZhbHVlKGJ1ZmZlckNvcHkpKSB7CisgICAgICAgIFJFTEVB
U0VfTE9HX0ZBVUxUKElQQywgIkRlY29kZXI6OmNvcHlCdWZmZXI6IHRyeUZhc3RNYWxsb2MoJWx1
KSBmYWlsZWQiLCBidWZmZXJTaXplKTsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQog
CisgICAgbWVtY3B5KGJ1ZmZlckNvcHksIGJ1ZmZlciwgYnVmZmVyU2l6ZSk7CiAgICAgcmV0dXJu
IGJ1ZmZlckNvcHk7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVyPiBEZWNvZGVyOjpjcmVh
dGUoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZl
ckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+
JiYgYXR0YWNobWVudHMpCiB7Ci0gICAgYXV0byBkZWNvZGVyID0gbWFrZVVuaXF1ZTxEZWNvZGVy
PihidWZmZXIsIGJ1ZmZlclNpemUsIGJ1ZmZlckRlYWxsb2NhdG9yLCBXVEZNb3ZlKGF0dGFjaG1l
bnRzKSk7CisgICAgQVNTRVJUKGJ1ZmZlcik7CisgICAgaWYgKFVOTElLRUxZKCFidWZmZXIpKSB7
CisgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywgIkRlY29kZXI6OmNyZWF0ZSgpIGNhbGxl
ZCB3aXRoIGEgbnVsbCBidWZmZXIgKGJ1ZmZlclNpemU6ICVsdSkiLCBidWZmZXJTaXplKTsKKyAg
ICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisgICAgY29uc3QgdWludDhfdCogYnVmZmVy
Q29weTsKKyAgICBpZiAoIWJ1ZmZlckRlYWxsb2NhdG9yKSB7CisgICAgICAgIGJ1ZmZlckNvcHkg
PSBjb3B5QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSk7CisgICAgICAgIEFTU0VSVChidWZmZXJD
b3B5KTsKKyAgICAgICAgaWYgKFVOTElLRUxZKCFidWZmZXJDb3B5KSkKKyAgICAgICAgICAgIHJl
dHVybiBudWxscHRyOworICAgIH0gZWxzZQorICAgICAgICBidWZmZXJDb3B5ID0gYnVmZmVyOwor
CisgICAgYXV0byBkZWNvZGVyID0gc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+KG5ldyBEZWNvZGVy
KGJ1ZmZlckNvcHksIGJ1ZmZlclNpemUsIGJ1ZmZlckRlYWxsb2NhdG9yLCBXVEZNb3ZlKGF0dGFj
aG1lbnRzKSkpOwogICAgIHJldHVybiBkZWNvZGVyLT5pc1ZhbGlkKCkgPyBXVEZNb3ZlKGRlY29k
ZXIpIDogbnVsbHB0cjsKIH0KIAogRGVjb2Rlcjo6RGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZm
ZXIsIHNpemVfdCBidWZmZXJTaXplLCB2b2lkICgqYnVmZmVyRGVhbGxvY2F0b3IpKGNvbnN0IHVp
bnQ4X3QqLCBzaXplX3QpLCBWZWN0b3I8QXR0YWNobWVudD4mJiBhdHRhY2htZW50cykKLSAgICA6
IG1fYnVmZmVyIHsgYnVmZmVyRGVhbGxvY2F0b3IgPyBidWZmZXIgOiBjb3B5QnVmZmVyKGJ1ZmZl
ciwgYnVmZmVyU2l6ZSkgfQorICAgIDogbV9idWZmZXIgeyBidWZmZXIgfQogICAgICwgbV9idWZm
ZXJQb3MgeyBtX2J1ZmZlciB9CiAgICAgLCBtX2J1ZmZlckVuZCB7IG1fYnVmZmVyICsgYnVmZmVy
U2l6ZSB9CiAgICAgLCBtX2J1ZmZlckRlYWxsb2NhdG9yIHsgYnVmZmVyRGVhbGxvY2F0b3IgfQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oIGIvU291cmNl
L1dlYktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oCmluZGV4IDY2OTg1YmMzODdkNzQzOTEzNzAx
YjExN2I5MTgwMGI5YTI3NzFhYjguLjUyOTFhNDZkZDU5NTU5ZjRjYjkyYjM2NzZmOTM0MTE2OTc0
NWQ0ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0RlY29kZXIuaAor
KysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9EZWNvZGVyLmgKQEAgLTUwLDcgKzUwLDYg
QEAgY2xhc3MgRGVjb2RlciB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6
CiAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxEZWNvZGVyPiBjcmVhdGUoY29uc3QgdWludDhf
dCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShj
b25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0dGFjaG1lbnQ+JiYpOwotICAgIGV4cGxp
Y2l0IERlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgdm9p
ZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVjdG9yPEF0
dGFjaG1lbnQ+JiYpOwogICAgIH5EZWNvZGVyKCk7CiAKICAgICBEZWNvZGVyKGNvbnN0IERlY29k
ZXImKSA9IGRlbGV0ZTsKQEAgLTE0MSw2ICsxNDAsOCBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2
YXRlOgorICAgIERlY29kZXIoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6
ZSwgdm9pZCAoKmJ1ZmZlckRlYWxsb2NhdG9yKShjb25zdCB1aW50OF90Kiwgc2l6ZV90KSwgVmVj
dG9yPEF0dGFjaG1lbnQ+JiYpOworCiAgICAgZW51bSBDb25zdHJ1Y3RXaXRob3V0SGVhZGVyVGFn
IHsgQ29uc3RydWN0V2l0aG91dEhlYWRlciB9OwogICAgIERlY29kZXIoY29uc3QgdWludDhfdCog
YnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSwgQ29uc3RydWN0V2l0aG91dEhlYWRlclRhZyk7CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25D
b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL2NvY29hL0Nvbm5lY3Rpb25Db2Nv
YS5tbQppbmRleCAzZjUxNzIzMTgwMTI3ODI1MmYwNmZlNTIxOTkxMmIxNDA1Zjg5MjU0Li4wNTll
ODI5Mzk2YTUyNDlmMDg1MzM0N2ViYzBiM2ViYmVkMzQ2NDg2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL0lQQy9jb2NvYS9Db25uZWN0aW9uQ29jb2EubW0KKysrIGIvU291cmNl
L1dlYktpdC9QbGF0Zm9ybS9JUEMvY29jb2EvQ29ubmVjdGlvbkNvY29hLm1tCkBAIC0yOCw2ICsy
OCw3IEBACiAKICNpbXBvcnQgIkRhdGFSZWZlcmVuY2UuaCIKICNpbXBvcnQgIkltcG9ydGFuY2VB
c3NlcnRpb24uaCIKKyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIk1hY2hNZXNzYWdlLmgi
CiAjaW1wb3J0ICJNYWNoUG9ydC5oIgogI2ltcG9ydCAiTWFjaFV0aWxpdGllcy5oIgpAQCAtNDE5
LDkgKzQyMCwxNCBAQCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IGNyZWF0ZU1lc3Nh
Z2VEZWNvZGVyKG1hY2hfbXNnX2hlYWRlcl90KiBoZWFkZXIpCiAgICAgaWYgKCEoaGVhZGVyLT5t
c2doX2JpdHMgJiBNQUNIX01TR0hfQklUU19DT01QTEVYKSkgewogICAgICAgICAvLyBXZSBoYXZl
IGEgc2ltcGxlIG1lc3NhZ2UuCiAgICAgICAgIHVpbnQ4X3QqIGJvZHkgPSByZWludGVycHJldF9j
YXN0PHVpbnQ4X3QqPihoZWFkZXIgKyAxKTsKLSAgICAgICAgc2l6ZV90IGJvZHlTaXplID0gaGVh
ZGVyLT5tc2doX3NpemUgLSBzaXplb2YobWFjaF9tc2dfaGVhZGVyX3QpOworICAgICAgICBhdXRv
IGJvZHlTaXplID0gQ2hlY2tlZFNpemUgeyBoZWFkZXItPm1zZ2hfc2l6ZSB9IC0gc2l6ZW9mKG1h
Y2hfbXNnX2hlYWRlcl90KTsKKyAgICAgICAgaWYgKFVOTElLRUxZKGJvZHlTaXplLmhhc092ZXJm
bG93ZWQoKSkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywgImNyZWF0ZU1l
c3NhZ2VEZWNvZGVyOiBPdmVyZmxvdyB3aGVuIGNvbXB1dGluZyBib2R5U2l6ZSAoaGVhZGVyLT5t
c2doX3NpemU6ICVsdSwgc2l6ZW9mKG1hY2hfbXNnX2hlYWRlcl90KTogJWx1KSIsIHN0YXRpY19j
YXN0PHVuc2lnbmVkIGxvbmc+KGhlYWRlci0+bXNnaF9zaXplKSwgc2l6ZW9mKG1hY2hfbXNnX2hl
YWRlcl90KSk7CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAg
IHJldHVybiBudWxscHRyOworICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIERlY29kZXI6OmNy
ZWF0ZShib2R5LCBib2R5U2l6ZSwgbnVsbHB0ciwgVmVjdG9yPEF0dGFjaG1lbnQ+IHsgfSk7Cisg
ICAgICAgIHJldHVybiBEZWNvZGVyOjpjcmVhdGUoYm9keSwgYm9keVNpemUudW5zYWZlR2V0KCks
IG51bGxwdHIsIFZlY3RvcjxBdHRhY2htZW50PiB7IH0pOwogICAgIH0KIAogICAgIG1hY2hfbXNn
X2JvZHlfdCogYm9keSA9IHJlaW50ZXJwcmV0X2Nhc3Q8bWFjaF9tc2dfYm9keV90Kj4oaGVhZGVy
ICsgMSk7CkBAIC00NjYsOSArNDcyLDE1IEBAIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rl
cj4gY3JlYXRlTWVzc2FnZURlY29kZXIobWFjaF9tc2dfaGVhZGVyX3QqIGhlYWRlcikKICAgICB9
CiAKICAgICB1aW50OF90KiBtZXNzYWdlQm9keSA9IGRlc2NyaXB0b3JEYXRhOwotICAgIHNpemVf
dCBtZXNzYWdlQm9keVNpemUgPSBoZWFkZXItPm1zZ2hfc2l6ZSAtIChkZXNjcmlwdG9yRGF0YSAt
IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGhlYWRlcikpOworICAgIEFTU0VSVChkZXNjcmlw
dG9yRGF0YSA+PSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIpKTsKKyAgICBhdXRv
IG1lc3NhZ2VCb2R5U2l6ZSA9IENoZWNrZWRTaXplIHsgaGVhZGVyLT5tc2doX3NpemUgfSAtIHN0
YXRpY19jYXN0PHNpemVfdD4oZGVzY3JpcHRvckRhdGEgLSByZWludGVycHJldF9jYXN0PHVpbnQ4
X3QqPihoZWFkZXIpKTsKKyAgICBpZiAoVU5MSUtFTFkobWVzc2FnZUJvZHlTaXplLmhhc092ZXJm
bG93ZWQoKSkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAiY3JlYXRlTWVzc2Fn
ZURlY29kZXI6IE92ZXJmbG93IHdoZW4gY29tcHV0aW5nIGJvZHlTaXplIChoZWFkZXItPm1zZ2hf
c2l6ZTogJWx1LCAoZGVzY3JpcHRvckRhdGEgLSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPiho
ZWFkZXIpKTogJWx1KSIsIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KGhlYWRlci0+bXNnaF9z
aXplKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oZGVzY3JpcHRvckRhdGEgLSByZWludGVy
cHJldF9jYXN0PHVpbnQ4X3QqPihoZWFkZXIpKSk7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF
RCgpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAKLSAgICByZXR1cm4gRGVjb2Rl
cjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBtZXNzYWdlQm9keVNpemUsIG51bGxwdHIsIFdURk1vdmUo
YXR0YWNobWVudHMpKTsKKyAgICByZXR1cm4gRGVjb2Rlcjo6Y3JlYXRlKG1lc3NhZ2VCb2R5LCBt
ZXNzYWdlQm9keVNpemUudW5zYWZlR2V0KCksIG51bGxwdHIsIFdURk1vdmUoYXR0YWNobWVudHMp
KTsKIH0KIAogLy8gVGhlIHJlY2VpdmUgYnVmZmVyIHNpemUgc2hvdWxkIGFsd2F5cyBpbmNsdWRl
IHRoZSBtYXhpbXVtIHRyYWlsZXIgc2l6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxh
dGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwIGIvU291cmNlL1dlYktpdC9QbGF0Zm9y
bS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKaW5kZXggYzU3YWIzNjk3YWY1MWU4YTY0ZmY5
M2RiMGY1ZTc2M2U0ODQwODBhNS4uN2IwNGMwNTQzYTlhMDgzYzAwYjQxZTU2NzZlOWUwMjUyOTg1
OTVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0
aW9uVW5peC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0
aW9uVW5peC5jcHAKQEAgLTIzNyw3ICsyMzcsMTAgQEAgYm9vbCBDb25uZWN0aW9uOjpwcm9jZXNz
TWVzc2FnZSgpCiAgICAgaWYgKG1lc3NhZ2VJbmZvLmlzQm9keU91dE9mTGluZSgpKQogICAgICAg
ICBtZXNzYWdlQm9keSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KG9vbE1lc3NhZ2VCb2R5
LT5kYXRhKCkpOwogCi0gICAgYXV0byBkZWNvZGVyID0gbWFrZVVuaXF1ZTxEZWNvZGVyPihtZXNz
YWdlQm9keSwgbWVzc2FnZUluZm8uYm9keVNpemUoKSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2ht
ZW50cykpOworICAgIGF1dG8gZGVjb2RlciA9IERlY29kZXI6OmNyZWF0ZShtZXNzYWdlQm9keSwg
bWVzc2FnZUluZm8uYm9keVNpemUoKSwgbnVsbHB0ciwgV1RGTW92ZShhdHRhY2htZW50cykpOwor
ICAgIEFTU0VSVChkZWNvZGVyKTsKKyAgICBpZiAoIWRlY29kZXIpCisgICAgICAgIHJldHVybiBm
YWxzZTsKIAogICAgIHByb2Nlc3NJbmNvbWluZ01lc3NhZ2UoV1RGTW92ZShkZWNvZGVyKSk7CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3dpbi9Db25uZWN0aW9uV2lu
LmNwcCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3dpbi9Db25uZWN0aW9uV2luLmNwcApp
bmRleCA1YWRmZDgyYmVjYTQ2ZGIwMjQ0N2U4YmNiNmQzODRjMmMwMTU2YTYwLi42ZTdlZWZiMjE0
ZjgwOWVjNWU3MDA1NjMyMzU2NzljNmE5YTIxYTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1BsYXRmb3JtL0lQQy93aW4vQ29ubmVjdGlvbldpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9Q
bGF0Zm9ybS9JUEMvd2luL0Nvbm5lY3Rpb25XaW4uY3BwCkBAIC0xMzksOCArMTM5LDEwIEBAIHZv
aWQgQ29ubmVjdGlvbjo6cmVhZEV2ZW50SGFuZGxlcigpCiAKICAgICAgICAgaWYgKCFtX3JlYWRC
dWZmZXIuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAvLyBXZSBoYXZlIGEgbWVzc2FnZSwgbGV0
J3MgZGlzcGF0Y2ggaXQuCi0gICAgICAgICAgICBWZWN0b3I8QXR0YWNobWVudD4gYXR0YWNobWVu
dHMoMCk7Ci0gICAgICAgICAgICBhdXRvIGRlY29kZXIgPSBtYWtlVW5pcXVlPERlY29kZXI+KG1f
cmVhZEJ1ZmZlci5kYXRhKCksIG1fcmVhZEJ1ZmZlci5zaXplKCksIG51bGxwdHIsIFdURk1vdmUo
YXR0YWNobWVudHMpKTsKKyAgICAgICAgICAgIGF1dG8gZGVjb2RlciA9IERlY29kZXI6OmNyZWF0
ZShtX3JlYWRCdWZmZXIuZGF0YSgpLCBtX3JlYWRCdWZmZXIuc2l6ZSgpLCBudWxscHRyLCB7IH0p
OworICAgICAgICAgICAgQVNTRVJUKGRlY29kZXIpOworICAgICAgICAgICAgaWYgKCFkZWNvZGVy
KQorICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHByb2Nlc3NJbmNvbWluZ01l
c3NhZ2UoV1RGTW92ZShkZWNvZGVyKSk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nTm9uZS5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdOb25lLmNwcAppbmRl
eCA3NjJmNTVlZDVjOWViOWViZDg5MTEzMmQ2NTkzNGFlYTdiYjYyZWUyLi4xZDUyZDQzMDA4YWEz
MjJlNzViYzQ0OWYwMzdkYmE1MWIyZjZjNmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdOb25lLmNwcAorKysgYi9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdOb25lLmNwcApAQCAtNDgsMjIg
KzQ4LDI0IEBAIFJlZlB0cjxBUEk6OkRhdGE+IGVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShjb25z
dCBTZXNzaW9uU3RhdGUmIHNlc3Npb25TdGF0ZSkKIAogYm9vbCBkZWNvZGVMZWdhY3lTZXNzaW9u
U3RhdGUoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IGRhdGFTaXplLCBTZXNzaW9uU3RhdGUm
IHNlc3Npb25TdGF0ZSkKIHsKLSAgICBJUEM6OkRlY29kZXIgZGVjb2RlcihkYXRhLCBkYXRhU2l6
ZSwgbnVsbHB0ciwgVmVjdG9yPElQQzo6QXR0YWNobWVudD4oKSk7CisgICAgYXV0byBkZWNvZGVy
ID0gSVBDOjpEZWNvZGVyOjpjcmVhdGUoZGF0YSwgZGF0YVNpemUsIG51bGxwdHIsIFZlY3RvcjxJ
UEM6OkF0dGFjaG1lbnQ+KCkpOworICAgIGlmICghZGVjb2RlcikKKyAgICAgICAgcmV0dXJuIGZh
bHNlOwogCiAgICAgT3B0aW9uYWw8QmFja0ZvcndhcmRMaXN0U3RhdGU+IGJhY2tGb3J3YXJkTGlz
dFN0YXRlOwotICAgIGRlY29kZXIgPj4gYmFja0ZvcndhcmRMaXN0U3RhdGU7CisgICAgKmRlY29k
ZXIgPj4gYmFja0ZvcndhcmRMaXN0U3RhdGU7CiAgICAgaWYgKCFiYWNrRm9yd2FyZExpc3RTdGF0
ZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHNlc3Npb25TdGF0ZS5iYWNrRm9yd2FyZExp
c3RTdGF0ZSA9IFdURk1vdmUoKmJhY2tGb3J3YXJkTGlzdFN0YXRlKTsKIAogICAgIE9wdGlvbmFs
PHVpbnQ2NF90PiByZW5kZXJUcmVlU2l6ZTsKLSAgICBkZWNvZGVyID4+IHJlbmRlclRyZWVTaXpl
OworICAgICpkZWNvZGVyID4+IHJlbmRlclRyZWVTaXplOwogICAgIGlmICghcmVuZGVyVHJlZVNp
emUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBzZXNzaW9uU3RhdGUucmVuZGVyVHJlZVNp
emUgPSAqcmVuZGVyVHJlZVNpemU7CiAKICAgICBPcHRpb25hbDxVUkw+IHByb3Zpc2lvbmFsVVJM
OwotICAgIGRlY29kZXIgPj4gcHJvdmlzaW9uYWxVUkw7CisgICAgKmRlY29kZXIgPj4gcHJvdmlz
aW9uYWxVUkw7CiAgICAgaWYgKCFwcm92aXNpb25hbFVSTCkKICAgICAgICAgcmV0dXJuIGZhbHNl
OwogICAgIHNlc3Npb25TdGF0ZS5wcm92aXNpb25hbFVSTCA9IFdURk1vdmUoKnByb3Zpc2lvbmFs
VVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94
eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4
IDg1MWNiYzkxZjQ1NzUyNGM0ZWI5M2EyMzg3N2QzMzQwYmYwNTE2MjIuLjE2YjdhNjQ2NjQxOTIx
NjM5Zjc4Zjk2NmU3NDdlNWQxMmZjMjQ3YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzk2LDcgKzM5NiwxMSBAQCBib29sIFdlYlByb2Nlc3NQ
cm94eTo6c2hvdWxkU2VuZFBlbmRpbmdNZXNzYWdlKGNvbnN0IFBlbmRpbmdNZXNzYWdlJiBtZXNz
YWdlKQogICAgIGlmIChtZXNzYWdlLmVuY29kZXItPm1lc3NhZ2VOYW1lKCkgPT0gSVBDOjpNZXNz
YWdlTmFtZTo6V2ViUGFnZV9Mb2FkUmVxdWVzdFdhaXRpbmdGb3JQcm9jZXNzTGF1bmNoKSB7CiAg
ICAgICAgIGF1dG8gYnVmZmVyID0gbWVzc2FnZS5lbmNvZGVyLT5idWZmZXIoKTsKICAgICAgICAg
YXV0byBidWZmZXJTaXplID0gbWVzc2FnZS5lbmNvZGVyLT5idWZmZXJTaXplKCk7Ci0gICAgICAg
IHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkRlY29kZXI+IGRlY29kZXIgPSBtYWtlVW5pcXVlPElQQzo6
RGVjb2Rlcj4oYnVmZmVyLCBidWZmZXJTaXplLCBudWxscHRyLCBWZWN0b3I8SVBDOjpBdHRhY2ht
ZW50PiB7IH0pOworICAgICAgICBhdXRvIGRlY29kZXIgPSBJUEM6OkRlY29kZXI6OmNyZWF0ZShi
dWZmZXIsIGJ1ZmZlclNpemUsIG51bGxwdHIsIHsgfSk7CisgICAgICAgIEFTU0VSVChkZWNvZGVy
KTsKKyAgICAgICAgaWYgKCFkZWNvZGVyKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCiAg
ICAgICAgIExvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzOwogICAgICAgICBVUkwgcmVzb3Vy
Y2VEaXJlY3RvcnlVUkw7CiAgICAgICAgIFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlEOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>