<?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>223536</bug_id>
          
          <creation_ts>2021-03-19 14:02:18 -0700</creation_ts>
          <short_desc>Crash in DocumentLoader::urlForHistory</short_desc>
          <delta_ts>2022-03-28 15:54:06 -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>Page Loading</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="Ali Juma">ajuma</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>cgarcia</cc>
    
    <cc>darin</cc>
    
    <cc>ews-feeder</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>gpoo</cc>
    
    <cc>japhet</cc>
    
    <cc>rbuis</cc>
    
    <cc>rniwa</cc>
    
    <cc>rohitrao</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1741881</commentid>
    <comment_count>0</comment_count>
      <attachid>423773</attachid>
    <who name="Ali Juma">ajuma</who>
    <bug_when>2021-03-19 14:02:18 -0700</bug_when>
    <thetext>Created attachment 423773
Minimal test case

Filing this as a security bug since it was found using a fuzzer; there&apos;s no disclosure deadline for this bug.

This reproduces in an ASan build of WebKitTestRunner.

Stack:
=================================================================
==60651==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000160 (pc 0x0001cb35843d bp 0x7ffeec11d630 sp 0x7ffeec11d630 T0)
==60651==The signal is caused by a READ memory access.
==60651==Hint: address points to the zero page.
    #0 0x1cb35843c in WTF::RefPtr&lt;WebCore::SharedBuffer, WTF::RawPtrTraits&lt;WebCore::SharedBuffer&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::SharedBuffer&gt; &gt;::operator void (WTF::RefPtr&lt;WebCore::SharedBuffer, WTF::RawPtrTraits&lt;WebCore::SharedBuffer&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::SharedBuffer&gt; &gt;::*)() const() const (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x395043c)
    #1 0x1cb358268 in WebCore::SubstituteData::isValid() const (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x3950268)
    #2 0x1cbc75bbe in WebCore::DocumentLoader::urlForHistory() const (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x426dbbe)
    #3 0x1cbcff641 in WebCore::FrameLoader::HistoryController::updateForStandardLoad(WebCore::FrameLoader::HistoryController::HistoryUpdateType) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42f7641)
    #4 0x1cbcfd4ff in WebCore::FrameLoader::transitionToCommitted(WebCore::CachedPage*) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42f54ff)
    #5 0x1cbcfbac2 in WebCore::FrameLoader::commitProvisionalLoad() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42f3ac2)
    #6 0x1cbc68975 in WebCore::DocumentLoader::finishedLoading() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x4260975)
    #7 0x1cbc77354 in WebCore::DocumentLoader::maybeLoadEmpty() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x426f354)
    #8 0x1cbc7769d in WebCore::DocumentLoader::startLoadingMainResource() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x426f69d)
    #9 0x1cbd2d8eb in WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&amp;, WebCore::FormState*, WebCore::NavigationPolicyDecision, WebCore::AllowNavigationToInvalidURL)::$_11::operator()() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x43258eb)
    #10 0x1c7a97fee in WTF::CompletionHandler&lt;void ()&gt;::operator()() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x8ffee)
    #11 0x1cbcf6e44 in WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&amp;, WebCore::FormState*, WebCore::NavigationPolicyDecision, WebCore::AllowNavigationToInvalidURL) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42eee44)
    #12 0x1cbd2a595 in WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, WebCore::FrameLoadType, WTF::RefPtr&lt;WebCore::FormState, WTF::RawPtrTraits&lt;WebCore::FormState&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::FormState&gt; &gt;&amp;&amp;, WebCore::AllowNavigationToInvalidURL, WTF::CompletionHandler&lt;void ()&gt;&amp;&amp;)::$_8::operator()(WebCore::ResourceRequest const&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x4322595)
    #13 0x1cbd58980 in WTF::CompletionHandler&lt;void (WebCore::ResourceRequest&amp;&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision)&gt;::operator()(WebCore::ResourceRequest&amp;&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x4350980)
    #14 0x1cbd6b359 in WebCore::FrameLoader::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest&amp;&amp;, WebCore::ResourceResponse const&amp;, WebCore::DocumentLoader*, WTF::RefPtr&lt;WebCore::FormState, WTF::RawPtrTraits&lt;WebCore::FormState&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::FormState&gt; &gt;&amp;&amp;, WTF::CompletionHandler&lt;void (WebCore::ResourceRequest&amp;&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision)&gt;&amp;&amp;, WebCore::PolicyDecisionMode)::$_3::operator()(WebCore::PolicyAction, WebCore::PolicyCheckIdentifier) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x4363359)
    #15 0x1cbd698d8 in WTF::Detail::CallableWrapper&lt;WebCore::FrameLoader::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest&amp;&amp;, WebCore::ResourceResponse const&amp;, WebCore::DocumentLoader*, WTF::RefPtr&lt;WebCore::FormState, WTF::RawPtrTraits&lt;WebCore::FormState&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::FormState&gt; &gt;&amp;&amp;, WTF::CompletionHandler&lt;void (WebCore::ResourceRequest&amp;&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision)&gt;&amp;&amp;, WebCore::PolicyDecisionMode)::$_3, void, WebCore::PolicyAction, WebCore::PolicyCheckIdentifier&gt;::call(WebCore::PolicyAction, WebCore::PolicyCheckIdentifier) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x43618d8)
    #16 0x1ba25ebee in WTF::Function&lt;void (WebCore::PolicyAction, WebCore::PolicyCheckIdentifier)&gt;::operator()(WebCore::PolicyAction, WebCore::PolicyCheckIdentifier) const (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x225ebee)
    #17 0x1ba261467 in WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(WebCore::NavigationAction const&amp;, WebCore::ResourceRequest const&amp;, WebCore::ResourceResponse const&amp;, WebCore::FormState*, WebCore::PolicyDecisionMode, WebCore::PolicyCheckIdentifier, WTF::Function&lt;void (WebCore::PolicyAction, WebCore::PolicyCheckIdentifier)&gt;&amp;&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x2261467)
    #18 0x1cbd57d17 in WebCore::FrameLoader::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest&amp;&amp;, WebCore::ResourceResponse const&amp;, WebCore::DocumentLoader*, WTF::RefPtr&lt;WebCore::FormState, WTF::RawPtrTraits&lt;WebCore::FormState&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::FormState&gt; &gt;&amp;&amp;, WTF::CompletionHandler&lt;void (WebCore::ResourceRequest&amp;&amp;, WTF::WeakPtr&lt;WebCore::FormState, WTF::EmptyCounter&gt;&amp;&amp;, WebCore::NavigationPolicyDecision)&gt;&amp;&amp;, WebCore::PolicyDecisionMode) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x434fd17)
    #19 0x1cbcf5774 in WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, WebCore::FrameLoadType, WTF::RefPtr&lt;WebCore::FormState, WTF::RawPtrTraits&lt;WebCore::FormState&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::FormState&gt; &gt;&amp;&amp;, WebCore::AllowNavigationToInvalidURL, WTF::CompletionHandler&lt;void ()&gt;&amp;&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42ed774)
    #20 0x1cbcee285 in WebCore::FrameLoader::load(WebCore::DocumentLoader&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42e6285)
    #21 0x1cbcf4062 in WebCore::FrameLoader::load(WebCore::FrameLoadRequest&amp;&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x42ec062)
    #22 0x1ba50f515 in WebKit::WebPage::loadRequest(WebKit::LoadParameters&amp;&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x250f515)
    #23 0x1ba59bb69 in void IPC::handleMessage&lt;Messages::WebPage::LoadRequest, WebKit::WebPage, void (WebKit::WebPage::*)(WebKit::LoadParameters&amp;&amp;)&gt;(IPC::Decoder&amp;, WebKit::WebPage*, void (WebKit::WebPage::*)(WebKit::LoadParameters&amp;&amp;)) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x259bb69)
    #24 0x1ba595542 in WebKit::WebPage::didReceiveWebPageMessage(IPC::Connection&amp;, IPC::Decoder&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x2595542)
    #25 0x1b85b6d3a in IPC::MessageReceiverMap::dispatchMessage(IPC::Connection&amp;, IPC::Decoder&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x5b6d3a)
    #26 0x1b9d94ab5 in WebKit::WebProcess::didReceiveMessage(IPC::Connection&amp;, IPC::Decoder&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x1d94ab5)
    #27 0x1b808c399 in IPC::Connection::dispatchMessage(IPC::Decoder&amp;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x8c399)
    #28 0x1b808cdf6 in IPC::Connection::dispatchMessage(std::__1::unique_ptr&lt;IPC::Decoder, std::__1::default_delete&lt;IPC::Decoder&gt; &gt;) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x8cdf6)
    #29 0x1b808d9bb in IPC::Connection::dispatchOneIncomingMessage() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0x8d9bb)
    #30 0x1e59062ec in WTF::RunLoop::performWork() (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/JavaScriptCore.framework/Versions/A/JavaScriptCore:x86_64+0xce2ec)
    #31 0x1e5909995 in WTF::RunLoop::performWork(void*) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/JavaScriptCore.framework/Versions/A/JavaScriptCore:x86_64+0xd1995)
    #32 0x7fff2dfce883 in __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ (/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:x86_64+0x84883)
    #33 0x7fff2dfce822 in __CFRunLoopDoSource0 (/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:x86_64+0x84822)
    #34 0x7fff2dfce63c in __CFRunLoopDoSources0 (/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:x86_64+0x8463c)
    #35 0x7fff2dfcd358 in __CFRunLoopRun (/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:x86_64+0x83358)
    #36 0x7fff2dfcc952 in CFRunLoopRunSpecific (/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:x86_64+0x82952)
    #37 0x7fff3068a1c7 in -[NSRunLoop(NSRunLoop) runMode:beforeDate:] (/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation:x86_64+0x601c7)
    #38 0x7fff3073cc6e in -[NSRunLoop(NSRunLoop) run] (/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation:x86_64+0x112c6e)
    #39 0x7fff681a94e9 in _xpc_objc_main.cold.4 (/usr/lib/system/libxpc.dylib:x86_64+0x164e9)
    #40 0x7fff681a942f in _xpc_objc_main (/usr/lib/system/libxpc.dylib:x86_64+0x1642f)
    #41 0x7fff681a8f62 in xpc_main (/usr/lib/system/libxpc.dylib:x86_64+0x15f62)
    #42 0x1b8ef6923 in WebKit::XPCServiceMain(int, char const**) (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebKit.framework/Versions/A/WebKit:x86_64+0xef6923)
    #43 0x7fff67f57cc8 in start (/usr/lib/system/libdyld.dylib:x86_64+0x1acc8)
==60651==Register values:
rax = 0x000000000000002c  rbx = 0x0000000000000000  rcx = 0x000010000000002c  rdx = 0x00001c2400006dcc
rdi = 0x0000000000000160  rsi = 0x0000000000000000  rbp = 0x00007ffeec11d630  rsp = 0x00007ffeec11d630
 r8 = 0x000000000000000f   r9 = 0x0000000000000001  r10 = 0x0000000000000030  r11 = 0x00000000000a0006
r12 = 0x00001fffdd823ad0  r13 = 0x00007ffeec11d6a0  r14 = 0x00007ffeec11d6a0  r15 = 0x0000000000000160
AddressSanitizer can not provide additional info.
SUMMARY: AddressSanitizer: SEGV (/Users/chrome-bot/clusterfuzz/bot/builds/chrome-ios-webkit-to-fuzz_ios-webkit-to-fuzz_cb292771138f3c7c4bb12f2df778e2b1c42b4cd7/revisions/WebKitMacOS/WebCore.framework/Versions/A/WebCore:x86_64+0x395043c) in WTF::RefPtr&lt;WebCore::SharedBuffer, WTF::RawPtrTraits&lt;WebCore::SharedBuffer&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::SharedBuffer&gt; &gt;::operator void (WTF::RefPtr&lt;WebCore::SharedBuffer, WTF::RawPtrTraits&lt;WebCore::SharedBuffer&gt;, WTF::DefaultRefDerefTraits&lt;WebCore::SharedBuffer&gt; &gt;::*)() const() const</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1741882</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-03-19 14:02:28 -0700</bug_when>
    <thetext>&lt;rdar://problem/75635444&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748434</commentid>
    <comment_count>2</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-08 12:51:16 -0700</bug_when>
    <thetext>Reduced test:
&lt;script id=&quot;script&quot;&gt;
function jsfuzzer() {
 document.createElement(&quot;audio&quot;).load(); 
 window.stop(); 
}
function eventhandler() {
 script.appendChild(iframe); 
 document.onreadystatechange = eventhandler;
}
&lt;/script&gt;
&lt;body onload=jsfuzzer()&gt;
&lt;iframe id=&quot;iframe&quot; onload=&quot;eventhandler()&quot; srcdoc=&quot;foo&quot;&gt;&lt;/iframe&gt;
&lt;/body&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748830</commentid>
    <comment_count>3</comment_count>
      <attachid>425643</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-09 13:02:59 -0700</bug_when>
    <thetext>Created attachment 425643
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748832</commentid>
    <comment_count>4</comment_count>
      <attachid>425643</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-09 13:06:08 -0700</bug_when>
    <thetext>Comment on attachment 425643
Patch

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

&gt; Source/WebCore/loader/HistoryController.cpp:386
&gt; +    auto historyURL = frameLoader.documentLoader() ? m_frame.loader().documentLoader()-&gt;urlForHistory() : URL { };

m_frame.loader() -&gt; frameLoader</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748840</commentid>
    <comment_count>5</comment_count>
      <attachid>425645</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-09 13:15:14 -0700</bug_when>
    <thetext>Created attachment 425645
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748909</commentid>
    <comment_count>6</comment_count>
      <attachid>425645</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-09 16:47:03 -0700</bug_when>
    <thetext>Comment on attachment 425645
Patch

Hm... new assertion failure in fast/loader/crash-replacing-location-before-load.html seems like a real regression.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1748970</commentid>
    <comment_count>7</comment_count>
      <attachid>425679</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-10 00:56:58 -0700</bug_when>
    <thetext>Created attachment 425679
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1749065</commentid>
    <comment_count>8</comment_count>
      <attachid>425679</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-10 21:30:07 -0700</bug_when>
    <thetext>Comment on attachment 425679
Patch

New test is hitting this assertion:

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   com.apple.JavaScriptCore      	0x000000010f96e39e WTFCrash + 14 (Assertions.cpp:305)
1   com.apple.WebKitLegacy        	0x000000014b15f0eb WTFCrashWithInfo(int, char const*, char const*, int) + 27
2   com.apple.WebKitLegacy        	0x000000014b341898 -[WebHTMLView setDataSource:] + 104 (WebHTMLView.mm:4669)
3   com.apple.WebKitLegacy        	0x000000014b2fa436 WebFrameLoaderClient::transitionToCommittedForNewPage() + 1526 (WebFrameLoaderClient.mm:1474)
4   com.apple.WebCore             	0x0000000134cf0f8e WebCore::FrameLoader::transitionToCommitted(WebCore::CachedPage*) + 1982
5   com.apple.WebCore             	0x0000000134cefc37 WebCore::FrameLoader::commitProvisionalLoad() + 1191
6   com.apple.WebCore             	0x0000000134c625bc WebCore::DocumentLoader::commitIfReady() + 60 (DocumentLoader.cpp:400)
7   com.apple.WebCore             	0x0000000134c62d80 WebCore::DocumentLoader::finishedLoading() + 304 (DocumentLoader.cpp:465)
8   com.apple.WebCore             	0x0000000134c6e901 WebCore::DocumentLoader::maybeLoadEmpty() + 1073 (DocumentLoader.cpp:1891)
9   com.apple.WebCore             	0x0000000134c6ea85 WebCore::DocumentLoader::startLoadingMainResource() + 357 (DocumentLoader.cpp:1904)
10  com.apple.WebCore             	0x0000000134d1e96c WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&amp;, WebCore::FormState*, WebCore::NavigationPolicyDecision, WebCore::AllowNavigationToInvalidURL)::$_11::operator()() + 1612</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750050</commentid>
    <comment_count>9</comment_count>
      <attachid>425962</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-14 02:27:59 -0700</bug_when>
    <thetext>Created attachment 425962
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750121</commentid>
    <comment_count>10</comment_count>
      <attachid>425986</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-14 08:33:17 -0700</bug_when>
    <thetext>Created attachment 425986
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750379</commentid>
    <comment_count>11</comment_count>
      <attachid>425986</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-14 15:30:51 -0700</bug_when>
    <thetext>Comment on attachment 425986
Patch

This seems fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751055</commentid>
    <comment_count>12</comment_count>
      <attachid>426219</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-16 06:46:31 -0700</bug_when>
    <thetext>Created attachment 426219
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751448</commentid>
    <comment_count>13</comment_count>
      <attachid>426341</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-04-17 12:31:20 -0700</bug_when>
    <thetext>Created attachment 426341
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753962</commentid>
    <comment_count>14</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-04-24 16:12:41 -0700</bug_when>
    <thetext>Looks like fast/loader/commit-provisional-load-crash.html is timing out on Windows?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786720</commentid>
    <comment_count>15</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-24 05:34:42 -0700</bug_when>
    <thetext>(In reply to Ryosuke Niwa from comment #14)
&gt; Looks like fast/loader/commit-provisional-load-crash.html is timing out on
&gt; Windows?

This is probably better checked by someone at Apple, I don&apos;t have much windows expertise. OTOH there was a windows specific bug that destabilized many network related tests, so if people think this is one of those cases, I could add the test
as skipped on Win? Of course this supposed the approach taken by the patch is okay.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835462</commentid>
    <comment_count>16</comment_count>
      <attachid>450389</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-31 02:04:17 -0800</bug_when>
    <thetext>Created attachment 450389
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835486</commentid>
    <comment_count>17</comment_count>
      <attachid>450398</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-31 03:25:36 -0800</bug_when>
    <thetext>Created attachment 450398
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835518</commentid>
    <comment_count>18</comment_count>
      <attachid>450406</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-31 06:30:03 -0800</bug_when>
    <thetext>Created attachment 450406
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835526</commentid>
    <comment_count>19</comment_count>
      <attachid>450408</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-31 07:15:46 -0800</bug_when>
    <thetext>Created attachment 450408
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835547</commentid>
    <comment_count>20</comment_count>
      <attachid>450412</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-31 09:01:51 -0800</bug_when>
    <thetext>Created attachment 450412
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835920</commentid>
    <comment_count>21</comment_count>
      <attachid>450517</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-02-01 04:43:53 -0800</bug_when>
    <thetext>Created attachment 450517
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836001</commentid>
    <comment_count>22</comment_count>
      <attachid>450517</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2022-02-01 09:08:07 -0800</bug_when>
    <thetext>Comment on attachment 450517
Patch

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

&gt; Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:542
&gt; +{

It seems like this should send a WebPageProxy message so that the UIProcess can clear m_provisionalURL, like you do in WebKitLegacy. Or is that not needed for some reason?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836858</commentid>
    <comment_count>23</comment_count>
      <attachid>450517</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-02-03 04:12:03 -0800</bug_when>
    <thetext>Comment on attachment 450517
Patch

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

&gt; Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm:678
&gt; +    m_webFrame-&gt;_private-&gt;provisionalURL = nullptr;

Related to Brent’s question: How is this tested? What test will fail if we remove this line of code?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1837433</commentid>
    <comment_count>24</comment_count>
      <attachid>450901</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-02-04 08:28:13 -0800</bug_when>
    <thetext>Created attachment 450901
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1837450</commentid>
    <comment_count>25</comment_count>
      <attachid>450901</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-02-04 09:01:37 -0800</bug_when>
    <thetext>Comment on attachment 450901
Patch

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

&gt; Source/WebCore/loader/FrameLoader.cpp:1830
&gt; +    m_inStopForBackForwardCache = true;

Can this function be re-re-entered? Should we add an assertion or early return for that case?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1838050</commentid>
    <comment_count>26</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-07 03:14:09 -0800</bug_when>
    <thetext>Committed r289203 (246889@main): &lt;https://commits.webkit.org/246889@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 450901.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1838364</commentid>
    <comment_count>27</comment_count>
      <attachid>450901</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-02-07 14:33:00 -0800</bug_when>
    <thetext>Comment on attachment 450901
Patch

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

&gt;&gt; Source/WebCore/loader/FrameLoader.cpp:1830
&gt;&gt; +    m_inStopForBackForwardCache = true;
&gt; 
&gt; Can this function be re-re-entered? Should we add an assertion or early return for that case?

Ah I missed this, will have a look tomorrow.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1839704</commentid>
    <comment_count>28</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-02-10 09:01:09 -0800</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1839705</commentid>
    <comment_count>29</comment_count>
      <attachid>451548</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-02-10 09:01:13 -0800</bug_when>
    <thetext>Created attachment 451548
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1855128</commentid>
    <comment_count>30</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-03-25 09:50:11 -0700</bug_when>
    <thetext>ping for review :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1855812</commentid>
    <comment_count>31</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-03-28 15:54:00 -0700</bug_when>
    <thetext>Committed r292002 (248953@main): &lt;https://commits.webkit.org/248953@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 451548.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>423773</attachid>
            <date>2021-03-19 14:02:18 -0700</date>
            <delta_ts>2021-03-19 14:02:18 -0700</delta_ts>
            <desc>Minimal test case</desc>
            <filename>documentLoaderUrlForHistory.html</filename>
            <type>text/html</type>
            <size>1933</size>
            <attacher name="Ali Juma">ajuma</attacher>
            
              <data encoding="base64">PHNjcmlwdD4KZnVuY3Rpb24gR2V0VmFyaWFibGUoZnV6emVydmFycywgdmFyX3R5cGUpIHsgaWYo
ZnV6emVydmFyc1t2YXJfdHlwZV0pIHsgcmV0dXJuIGZ1enplcnZhcnNbdmFyX3R5cGVdOyB9IGVs
c2UgeyByZXR1cm4gbnVsbDsgfX0KZnVuY3Rpb24gU2V0VmFyaWFibGUoZnV6emVydmFycywgdmFy
X25hbWUsIHZhcl90eXBlKSB7IGZ1enplcnZhcnNbdmFyX3R5cGVdID0gdmFyX25hbWU7IH0KZnVu
Y3Rpb24ganNmdXp6ZXIoKSB7CiAvKiBuZXd2YXJ7dmFyMDAwNDg6SFRNTEF1ZGlvRWxlbWVudH0g
Ki8gdmFyIHZhcjAwMDQ4ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXVkaW8iKTsgCiB2YXIw
MDA0OC5sb2FkKCk7IAogLyogbmV3dmFye3ZhcjAwMDEzOldpbmRvd30gKi8gdmFyIHZhcjAwMDEz
ID0gd2luZG93LndpbmRvdzsgCiB2YXIwMDAxMy5zdG9wKCk7IAp9CmZ1bmN0aW9uIGV2ZW50aGFu
ZGxlcjUoKSB7CnZhciBmdXp6ZXJ2YXJzID0ge307ClNldFZhcmlhYmxlKGZ1enplcnZhcnMsIGRv
Y3VtZW50LCAnRG9jdW1lbnQnKTsKIC8qIG5ld3Zhcnt2YXIwMDE0ODpFdmVudEhhbmRsZXJ9ICov
IHZhciB2YXIwMDE0OCA9IHN2Z3ZhcjAwMDE1Lm9uZXJyb3I7IAogU2V0VmFyaWFibGUoZnV6emVy
dmFycywgdmFyMDAxNDgsICdFdmVudEhhbmRsZXInKTsgICAKIHZhcjAwMTkxID0gR2V0VmFyaWFi
bGUoZnV6emVydmFycywgJ0RvY3VtZW50Jyk7ICAKIHZhcjAwMjQ4ID0gR2V0VmFyaWFibGUoZnV6
emVydmFycywgJ0V2ZW50SGFuZGxlcicpOyAgCiBkb2N1bWVudC5hbGxbOTglZG9jdW1lbnQuYWxs
Lmxlbmd0aF0uYXBwZW5kQ2hpbGQoaHRtbHZhcjAwMDA2KTsgCiB2YXIwMDE5MS5vbnJlYWR5c3Rh
dGVjaGFuZ2UgPSB2YXIwMDI0ODsgCn0KPC9zY3JpcHQ+Cjxib2R5IG9ubG9hZD1qc2Z1enplcigp
Pgo8aWZyYW1lIGlkPSJodG1sdmFyMDAwMDYiIG9ubG9hZD0iZXZlbnRoYW5kbGVyNSgpIiBzcmNk
b2M9IiozIHo1Xk5zb1YjeFN4RiIgY2xhc3M9ImNsYXNzNCIgYWxsb3dmdWxsc2NyZWVuPSJ0cnVl
IiB3aWR0aD0iMCIgZm9ybT0iaHRtbHZhcjAwMDA3IiByYWRpb2dyb3VwPSJncm91cCIgbGFuZz0i
a24iIHNlYW1sZXNzPSJzZWFtbGVzcyIgYWNjdW11bGF0ZT0ic3VtIj5fRUtlLn4wPC9pZnJhbWU+
DQo8bWFya2VyIGlkPSJzdmd2YXIwMDAxMyIgc3Ryb2tlLW9wYWNpdHk9IjAuNTY3ODM3ODI2OTI2
MDMxOCIgb3ZlcmZsb3c9ImF1dG8iIG92ZXJmbG93PSJhdXRvIiBmaWxsPSJ1cmwoI3N2Z3ZhcjAw
MDA5KSIgZmlsbC1vcGFjaXR5PSIwLjA0MTY0OTQ2NjY3MjYwMzcyIiBjbGlwPSJ1cmwoI3N2Z3Zh
cjAwMDAyKSIgdGFiaW5kZXg9IjEwNzM3NDE4MjQiIGludGVyY2VwdD0iMC4wMjI0NzU0NTUwNDM1
MzM0MzIiIGZvbnQtcmVuZGVyaW5nPSJvcHRpbWl6ZUxlZ2liaWxpdHkiIG9yZGVyPSIwIC0xIj4N
Cjxmb250LWZhY2UgaWQ9InN2Z3ZhcjAwMDE0IiBoYW5naW5nPSIwIiBwYW5vc2UtMT0iNjU1MzYg
NTUgMSAxIDEgMSAwIDcgMTAgMTAiIHBhbm9zZS0xPSIwIC0xIDQ3IC0xIC0xIDUgNzEgMCAwIDEi
IGhhbmdpbmc9IjAiIHVuaWNvZGUtcmFuZ2U9IlUrODM5ZS1VKzY0YzAiIG1hc2stdHlwZT0ibHVt
aW5hbmNlIiBjb2xvcj0iQXBwV29ya3NwYWNlIiB4bGluazp0eXBlPSJzaW1wbGUiIG9ubW91c2Vv
dmVyPSJldmVudGhhbmRsZXIyKCkiIGR4PSIxLDEsLTEsLTEsOSI+DQo8Zm9udC1mYWNlLXNyYyBp
ZD0ic3ZndmFyMDAwMTUiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiBnbHlwaC1vcmllbnRhdGlv
bi1ob3Jpem9udGFsPSItMSIgaz0iMSIgaGFuZ2luZz0iMTciIHZhbHVlcz0iODEgLTE7IDU1IDA7
IDEiIGZpbHRlcj0ibm9uZSIgcG9pbnRzPSI1IiBrZXlUaW1lcz0iMTswIiBvbmVycm9yPSJldmVu
dGhhbmRsZXI1KCkiIGNvbnRlbnRTY3JpcHRUeXBlPSJ0ZXh0L2VjbWFzY3JpcHQiIC8+DQ==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425643</attachid>
            <date>2021-04-09 13:02:59 -0700</date>
            <delta_ts>2021-04-09 13:15:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210409220257.patch</filename>
            <type>text/plain</type>
            <size>5015</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYzMDA5NDcwNTVhOWQx
N2E4Y2U5N2RlZDFjYTI3NWM3NDgwODg3MS4uMDlhZWE2MzM1MDY4MWU5YjQ0Mzg5MGJhMjNhMzc1
NDQ3NzVlM2Q0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTnVsbCBjaGVjayBEb2N1bWVudExv
YWRlciBpbiB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIE51bGwgY2hlY2sgRG9jdW1lbnRMb2FkZXIgaW4gdXBkYXRl
Rm9yU3RhbmRhcmRMb2FkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92
aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKKworICAgICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJv
bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xs
ZXI6OnVwZGF0ZUZvclN0YW5kYXJkTG9hZCk6CisKIDIwMjEtMDQtMDggIENocmlzIER1bWV6ICA8
Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBPZmZsaW5lQXVkaW9Db250ZXh0IG9iamVjdHMg
YXJlIGxlYWtpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29u
dHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3Bw
CmluZGV4IDAzYjI0ZTg4ODNkMDhlZmM3ZDhhMWRmOGFkNWUxNTFiYWVhNDU3NzYuLmU4YWUyZWRl
NGI5MTdhN2RjM2QxYTBlMWYxMmVkNTg3MmVjNDhhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcApAQCAtMzgzLDIyICszODMsMjQgQEAgdm9pZCBGcmFt
ZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclN0YW5kYXJkTG9hZChIaXN0b3J5
VXBkYXRlVHlwZSB1cGQKICAgICBGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIgPSBtX2ZyYW1lLmxv
YWRlcigpOwogCiAgICAgYm9vbCB1c2VzRXBoZW1lcmFsU2Vzc2lvbiA9IG1fZnJhbWUucGFnZSgp
ID8gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwotICAgIGNv
bnN0IFVSTCYgaGlzdG9yeVVSTCA9IGZyYW1lTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPnVybEZv
ckhpc3RvcnkoKTsKKyAgICBhdXRvIGhpc3RvcnlVUkwgPSBmcmFtZUxvYWRlci5kb2N1bWVudExv
YWRlcigpID8gbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT51cmxGb3JIaXN0b3J5
KCkgOiBVUkwgeyB9OwogCi0gICAgaWYgKCFmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5p
c0NsaWVudFJlZGlyZWN0KCkpIHsKLSAgICAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1wdHkoKSkg
ewotICAgICAgICAgICAgaWYgKHVwZGF0ZVR5cGUgIT0gVXBkYXRlQWxsRXhjZXB0QmFja0Zvcndh
cmRMaXN0KQotICAgICAgICAgICAgICAgIHVwZGF0ZUJhY2tGb3J3YXJkTGlzdENsaXBwZWRBdFRh
cmdldCh0cnVlKTsKLSAgICAgICAgICAgIGlmICghdXNlc0VwaGVtZXJhbFNlc3Npb24pIHsKLSAg
ICAgICAgICAgICAgICBmcmFtZUxvYWRlci5jbGllbnQoKS51cGRhdGVHbG9iYWxIaXN0b3J5KCk7
Ci0gICAgICAgICAgICAgICAgZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+c2V0RGlkQ3Jl
YXRlR2xvYmFsSGlzdG9yeUVudHJ5KHRydWUpOwotICAgICAgICAgICAgICAgIGlmIChmcmFtZUxv
YWRlci5kb2N1bWVudExvYWRlcigpLT51bnJlYWNoYWJsZVVSTCgpLmlzRW1wdHkoKSkKLSAgICAg
ICAgICAgICAgICAgICAgZnJhbWVMb2FkZXIuY2xpZW50KCkudXBkYXRlR2xvYmFsSGlzdG9yeVJl
ZGlyZWN0TGlua3MoKTsKKyAgICBpZiAoZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKSkgewor
ICAgICAgICBpZiAoIWZyYW1lTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPmlzQ2xpZW50UmVkaXJl
Y3QoKSkgeworICAgICAgICAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1wdHkoKSkgeworICAgICAg
ICAgICAgICAgIGlmICh1cGRhdGVUeXBlICE9IFVwZGF0ZUFsbEV4Y2VwdEJhY2tGb3J3YXJkTGlz
dCkKKyAgICAgICAgICAgICAgICAgICAgdXBkYXRlQmFja0ZvcndhcmRMaXN0Q2xpcHBlZEF0VGFy
Z2V0KHRydWUpOworICAgICAgICAgICAgICAgIGlmICghdXNlc0VwaGVtZXJhbFNlc3Npb24pIHsK
KyAgICAgICAgICAgICAgICAgICAgZnJhbWVMb2FkZXIuY2xpZW50KCkudXBkYXRlR2xvYmFsSGlz
dG9yeSgpOworICAgICAgICAgICAgICAgICAgICBmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigp
LT5zZXREaWRDcmVhdGVHbG9iYWxIaXN0b3J5RW50cnkodHJ1ZSk7CisgICAgICAgICAgICAgICAg
ICAgIGlmIChmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT51bnJlYWNoYWJsZVVSTCgpLmlz
RW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmNsaWVudCgpLnVw
ZGF0ZUdsb2JhbEhpc3RvcnlSZWRpcmVjdExpbmtzKCk7CisgICAgICAgICAgICAgICAgfQogICAg
ICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gVGhlIGNsaWVudCBy
ZWRpcmVjdCByZXBsYWNlcyB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0uCisgICAgICAgICAgICB1
cGRhdGVDdXJyZW50SXRlbSgpOwogICAgICAgICB9Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8g
VGhlIGNsaWVudCByZWRpcmVjdCByZXBsYWNlcyB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0uCi0g
ICAgICAgIHVwZGF0ZUN1cnJlbnRJdGVtKCk7CiAgICAgfQogCiAgICAgaWYgKCFoaXN0b3J5VVJM
LmlzRW1wdHkoKSAmJiAhdXNlc0VwaGVtZXJhbFNlc3Npb24pIHsKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ODNmYjFiYjdh
ODdjMzZiYjY1Y2FlODM0Y2U5ZjE5ZjU4MTlmMjBmLi44MWM3MTA5MjAwNjFjZWNkNjVlN2RjNzM4
MzUwZGVhYTUzMTdiYzM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDQtMDkgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBOdWxsIGNoZWNrIERvY3VtZW50TG9h
ZGVyIGluIHVwZGF0ZUZvclN0YW5kYXJkTG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIHRoaXMuCisKKyAgICAgICAgKiBmYXN0
L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVk
LgorICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0
bWw6IEFkZGVkLgorCiAyMDIxLTA0LTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+
CiAKICAgICAgICAgT2ZmbGluZUF1ZGlvQ29udGV4dCBvYmplY3RzIGFyZSBsZWFraW5nCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlz
aW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0
YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRiOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDIgQEAKKworVGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JB
U0guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9u
YWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zp
c2lvbmFsLWxvYWQtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMGZjMGEyYzQ4M2YxNTk4YzRhNjkw
NjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9s
b2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApAQCAtMCwwICsxLDE3IEBA
Cis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgaWQ9InNjcmlwdCI+CitpZiAod2luZG93LnRlc3RS
dW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitmdW5jdGlvbiBydW5UZXN0KCkg
eworICBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5z
dG9wKCk7IAorfQorZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hp
bGQoaWZyYW1lKTsgCisgIGRvY3VtZW50Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxl
cjsKK30KKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9Imlm
cmFtZSIgb25sb2FkPSJldmVudGhhbmRsZXIoKSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+
VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425645</attachid>
            <date>2021-04-09 13:15:14 -0700</date>
            <delta_ts>2021-04-10 00:56:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210409221512.patch</filename>
            <type>text/plain</type>
            <size>5010</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYzMDA5NDcwNTVhOWQx
N2E4Y2U5N2RlZDFjYTI3NWM3NDgwODg3MS4uMDlhZWE2MzM1MDY4MWU5YjQ0Mzg5MGJhMjNhMzc1
NDQ3NzVlM2Q0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTnVsbCBjaGVjayBEb2N1bWVudExv
YWRlciBpbiB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIE51bGwgY2hlY2sgRG9jdW1lbnRMb2FkZXIgaW4gdXBkYXRl
Rm9yU3RhbmRhcmRMb2FkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92
aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKKworICAgICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJv
bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xs
ZXI6OnVwZGF0ZUZvclN0YW5kYXJkTG9hZCk6CisKIDIwMjEtMDQtMDggIENocmlzIER1bWV6ICA8
Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBPZmZsaW5lQXVkaW9Db250ZXh0IG9iamVjdHMg
YXJlIGxlYWtpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29u
dHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3Bw
CmluZGV4IDAzYjI0ZTg4ODNkMDhlZmM3ZDhhMWRmOGFkNWUxNTFiYWVhNDU3NzYuLjJkNmY0Mzdk
MjI5MTNjYjhlZTdlNzcxOGUyYmZjNTBhZGVlODRiMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcApAQCAtMzgzLDIyICszODMsMjQgQEAgdm9pZCBGcmFt
ZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclN0YW5kYXJkTG9hZChIaXN0b3J5
VXBkYXRlVHlwZSB1cGQKICAgICBGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIgPSBtX2ZyYW1lLmxv
YWRlcigpOwogCiAgICAgYm9vbCB1c2VzRXBoZW1lcmFsU2Vzc2lvbiA9IG1fZnJhbWUucGFnZSgp
ID8gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwotICAgIGNv
bnN0IFVSTCYgaGlzdG9yeVVSTCA9IGZyYW1lTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPnVybEZv
ckhpc3RvcnkoKTsKKyAgICBhdXRvIGhpc3RvcnlVUkwgPSBmcmFtZUxvYWRlci5kb2N1bWVudExv
YWRlcigpID8gZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpIDog
VVJMIHsgfTsKIAotICAgIGlmICghZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGll
bnRSZWRpcmVjdCgpKSB7Ci0gICAgICAgIGlmICghaGlzdG9yeVVSTC5pc0VtcHR5KCkpIHsKLSAg
ICAgICAgICAgIGlmICh1cGRhdGVUeXBlICE9IFVwZGF0ZUFsbEV4Y2VwdEJhY2tGb3J3YXJkTGlz
dCkKLSAgICAgICAgICAgICAgICB1cGRhdGVCYWNrRm9yd2FyZExpc3RDbGlwcGVkQXRUYXJnZXQo
dHJ1ZSk7Ci0gICAgICAgICAgICBpZiAoIXVzZXNFcGhlbWVyYWxTZXNzaW9uKSB7Ci0gICAgICAg
ICAgICAgICAgZnJhbWVMb2FkZXIuY2xpZW50KCkudXBkYXRlR2xvYmFsSGlzdG9yeSgpOwotICAg
ICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmRvY3VtZW50TG9hZGVyKCktPnNldERpZENyZWF0ZUds
b2JhbEhpc3RvcnlFbnRyeSh0cnVlKTsKLSAgICAgICAgICAgICAgICBpZiAoZnJhbWVMb2FkZXIu
ZG9jdW1lbnRMb2FkZXIoKS0+dW5yZWFjaGFibGVVUkwoKS5pc0VtcHR5KCkpCi0gICAgICAgICAg
ICAgICAgICAgIGZyYW1lTG9hZGVyLmNsaWVudCgpLnVwZGF0ZUdsb2JhbEhpc3RvcnlSZWRpcmVj
dExpbmtzKCk7CisgICAgaWYgKGZyYW1lTG9hZGVyLmRvY3VtZW50TG9hZGVyKCkpIHsKKyAgICAg
ICAgaWYgKCFmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0KCkp
IHsKKyAgICAgICAgICAgIGlmICghaGlzdG9yeVVSTC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAg
ICAgICBpZiAodXBkYXRlVHlwZSAhPSBVcGRhdGVBbGxFeGNlcHRCYWNrRm9yd2FyZExpc3QpCisg
ICAgICAgICAgICAgICAgICAgIHVwZGF0ZUJhY2tGb3J3YXJkTGlzdENsaXBwZWRBdFRhcmdldCh0
cnVlKTsKKyAgICAgICAgICAgICAgICBpZiAoIXVzZXNFcGhlbWVyYWxTZXNzaW9uKSB7CisgICAg
ICAgICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmNsaWVudCgpLnVwZGF0ZUdsb2JhbEhpc3Rvcnko
KTsKKyAgICAgICAgICAgICAgICAgICAgZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+c2V0
RGlkQ3JlYXRlR2xvYmFsSGlzdG9yeUVudHJ5KHRydWUpOworICAgICAgICAgICAgICAgICAgICBp
ZiAoZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+dW5yZWFjaGFibGVVUkwoKS5pc0VtcHR5
KCkpCisgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZUxvYWRlci5jbGllbnQoKS51cGRhdGVH
bG9iYWxIaXN0b3J5UmVkaXJlY3RMaW5rcygpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAg
ICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIFRoZSBjbGllbnQgcmVkaXJl
Y3QgcmVwbGFjZXMgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtLgorICAgICAgICAgICAgdXBkYXRl
Q3VycmVudEl0ZW0oKTsKICAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIFRoZSBj
bGllbnQgcmVkaXJlY3QgcmVwbGFjZXMgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtLgotICAgICAg
ICB1cGRhdGVDdXJyZW50SXRlbSgpOwogICAgIH0KIAogICAgIGlmICghaGlzdG9yeVVSTC5pc0Vt
cHR5KCkgJiYgIXVzZXNFcGhlbWVyYWxTZXNzaW9uKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODgzZmIxYmI3YTg3YzM2
YmI2NWNhZTgzNGNlOWYxOWY1ODE5ZjIwZi4uODFjNzEwOTIwMDYxY2VjZDY1ZTdkYzczODM1MGRl
YWE1MzE3YmMzNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTA5ICBSb2IgQnVpcyAg
PHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTnVsbCBjaGVjayBEb2N1bWVudExvYWRlciBp
biB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgorCisgICAgICAgICogZmFzdC9sb2Fk
ZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sOiBB
ZGRlZC4KKwogMjAyMS0wNC0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg
ICAgICAgIE9mZmxpbmVBdWRpb0NvbnRleHQgb2JqZWN0cyBhcmUgbGVha2luZwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2gt
ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ0NmVjNmU0NzM0ZTRlNGI2NjBk
ZGUxM2YzZjBkZGRkODg3YjU0YjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0
L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAs
MCArMSwyIEBACisKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNILgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxv
YWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25h
bC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjBmYzBhMmM0ODNmMTU5OGM0YTY5MDY4MzMy
ZTNkYmY5MDQzZmI0MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVy
L2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPCFE
T0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVubmVy
KQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAg
ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXVkaW8iKS5sb2FkKCk7IAorICB3aW5kb3cuc3RvcCgp
OyAKK30KK2Z1bmN0aW9uIGV2ZW50aGFuZGxlcigpIHsKKyAgc2NyaXB0LmFwcGVuZENoaWxkKGlm
cmFtZSk7IAorICBkb2N1bWVudC5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBldmVudGhhbmRsZXI7Cit9
Cis8L3NjcmlwdD4KKzxib2R5IG9ubG9hZD1ydW5UZXN0KCk+Cis8aWZyYW1lIGlkPSJpZnJhbWUi
IG9ubG9hZD0iZXZlbnRoYW5kbGVyKCkiIHNyY2RvYz0iZm9vIj48L2lmcmFtZT4KKzxwPlRoaXMg
dGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNILjwvcD4KKzwvYm9keT4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425679</attachid>
            <date>2021-04-10 00:56:58 -0700</date>
            <delta_ts>2021-04-14 02:27:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210410095657.patch</filename>
            <type>text/plain</type>
            <size>5732</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBkMjExNTRiZmY2ZTg2
NWFhYjlhYzYzYzVjNWUxM2VlNjA1OGQzMS4uMzZlMzg1ZDRiYjY2ZDU3NDYxMjJmZjNmZmIxZjQ4
OWEwMzc1Yjc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTnVsbCBjaGVjayBEb2N1bWVudExv
YWRlciBpbiB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIE51bGwgY2hlY2sgRG9jdW1lbnRMb2FkZXIgaW4gdXBkYXRl
Rm9yU3RhbmRhcmRMb2FkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92
aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKKworICAgICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJv
bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xs
ZXI6OnVwZGF0ZUZvclN0YW5kYXJkTG9hZCk6CisKIDIwMjEtMDQtMDkgIEFudG9pbmUgUXVpbnQg
IDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgY2FsYygpIHNpbXBsaWZpY2F0aW9uIGZv
ciBhIG11bHRpcGxpY2F0aW9uIHNob3VsZCBhcHBseSB0aGUgbXVsdGlwbGljYXRpb24gdG8gZWFj
aCB2YWx1ZSBvZiBhbiBhZGRpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy
L0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29u
dHJvbGxlci5jcHAKaW5kZXggMDNiMjRlODg4M2QwOGVmYzdkOGExZGY4YWQ1ZTE1MWJhZWE0NTc3
Ni4uN2Y4OTQ2NjVmZWVhNTE5NTAzNzcwNzA2YmIwOTVlYmJlZjU4YzI2YSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCkBAIC0zNzgsMjcgKzM3OCwyOSBA
QCB2b2lkIEZyYW1lTG9hZGVyOjpIaXN0b3J5Q29udHJvbGxlcjo6dXBkYXRlRm9yUmVsb2FkKCkK
IAogdm9pZCBGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclN0YW5kYXJk
TG9hZChIaXN0b3J5VXBkYXRlVHlwZSB1cGRhdGVUeXBlKQogewotICAgIExPRyhIaXN0b3J5LCAi
SGlzdG9yeUNvbnRyb2xsZXIgJXAgdXBkYXRlRm9yU3RhbmRhcmRMb2FkOiBVcGRhdGluZyBIaXN0
b3J5IGZvciBzdGFuZGFyZCBsb2FkIGluIGZyYW1lICVwIChtYWluIGZyYW1lICVkKSAlcyIsIHRo
aXMsICZtX2ZyYW1lLCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksIG1fZnJhbWUubG9hZGVyKCkuZG9j
dW1lbnRMb2FkZXIoKS0+dXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOworICAgIExPRyhI
aXN0b3J5LCAiSGlzdG9yeUNvbnRyb2xsZXIgJXAgdXBkYXRlRm9yU3RhbmRhcmRMb2FkOiBVcGRh
dGluZyBIaXN0b3J5IGZvciBzdGFuZGFyZCBsb2FkIGluIGZyYW1lICVwIChtYWluIGZyYW1lICVk
KSAlcyIsIHRoaXMsICZtX2ZyYW1lLCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksIG1fZnJhbWUubG9h
ZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSA/IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIo
KS0+dXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkgOiAiIik7CiAKICAgICBGcmFtZUxvYWRl
ciYgZnJhbWVMb2FkZXIgPSBtX2ZyYW1lLmxvYWRlcigpOwogCiAgICAgYm9vbCB1c2VzRXBoZW1l
cmFsU2Vzc2lvbiA9IG1fZnJhbWUucGFnZSgpID8gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVy
YWxTZXNzaW9uKCkgOiB0cnVlOwotICAgIGNvbnN0IFVSTCYgaGlzdG9yeVVSTCA9IGZyYW1lTG9h
ZGVyLmRvY3VtZW50TG9hZGVyKCktPnVybEZvckhpc3RvcnkoKTsKKyAgICBhdXRvIGhpc3RvcnlV
UkwgPSBmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpID8gZnJhbWVMb2FkZXIuZG9jdW1lbnRM
b2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpIDogVVJMIHsgfTsKIAotICAgIGlmICghZnJhbWVMb2Fk
ZXIuZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRpcmVjdCgpKSB7Ci0gICAgICAgIGlmICgh
aGlzdG9yeVVSTC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGlmICh1cGRhdGVUeXBlICE9IFVw
ZGF0ZUFsbEV4Y2VwdEJhY2tGb3J3YXJkTGlzdCkKLSAgICAgICAgICAgICAgICB1cGRhdGVCYWNr
Rm9yd2FyZExpc3RDbGlwcGVkQXRUYXJnZXQodHJ1ZSk7Ci0gICAgICAgICAgICBpZiAoIXVzZXNF
cGhlbWVyYWxTZXNzaW9uKSB7Ci0gICAgICAgICAgICAgICAgZnJhbWVMb2FkZXIuY2xpZW50KCku
dXBkYXRlR2xvYmFsSGlzdG9yeSgpOwotICAgICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmRvY3Vt
ZW50TG9hZGVyKCktPnNldERpZENyZWF0ZUdsb2JhbEhpc3RvcnlFbnRyeSh0cnVlKTsKLSAgICAg
ICAgICAgICAgICBpZiAoZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+dW5yZWFjaGFibGVV
UkwoKS5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmNsaWVudCgp
LnVwZGF0ZUdsb2JhbEhpc3RvcnlSZWRpcmVjdExpbmtzKCk7CisgICAgaWYgKGZyYW1lTG9hZGVy
LmRvY3VtZW50TG9hZGVyKCkpIHsKKyAgICAgICAgaWYgKCFmcmFtZUxvYWRlci5kb2N1bWVudExv
YWRlcigpLT5pc0NsaWVudFJlZGlyZWN0KCkpIHsKKyAgICAgICAgICAgIGlmICghaGlzdG9yeVVS
TC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAodXBkYXRlVHlwZSAhPSBVcGRhdGVB
bGxFeGNlcHRCYWNrRm9yd2FyZExpc3QpCisgICAgICAgICAgICAgICAgICAgIHVwZGF0ZUJhY2tG
b3J3YXJkTGlzdENsaXBwZWRBdFRhcmdldCh0cnVlKTsKKyAgICAgICAgICAgICAgICBpZiAoIXVz
ZXNFcGhlbWVyYWxTZXNzaW9uKSB7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lTG9hZGVyLmNs
aWVudCgpLnVwZGF0ZUdsb2JhbEhpc3RvcnkoKTsKKyAgICAgICAgICAgICAgICAgICAgZnJhbWVM
b2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+c2V0RGlkQ3JlYXRlR2xvYmFsSGlzdG9yeUVudHJ5KHRy
dWUpOworICAgICAgICAgICAgICAgICAgICBpZiAoZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIo
KS0+dW5yZWFjaGFibGVVUkwoKS5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgICAgICAgICBm
cmFtZUxvYWRlci5jbGllbnQoKS51cGRhdGVHbG9iYWxIaXN0b3J5UmVkaXJlY3RMaW5rcygpOwor
ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAg
ICAgICAgIC8vIFRoZSBjbGllbnQgcmVkaXJlY3QgcmVwbGFjZXMgdGhlIGN1cnJlbnQgaGlzdG9y
eSBpdGVtLgorICAgICAgICAgICAgdXBkYXRlQ3VycmVudEl0ZW0oKTsKICAgICAgICAgfQotICAg
IH0gZWxzZSB7Ci0gICAgICAgIC8vIFRoZSBjbGllbnQgcmVkaXJlY3QgcmVwbGFjZXMgdGhlIGN1
cnJlbnQgaGlzdG9yeSBpdGVtLgotICAgICAgICB1cGRhdGVDdXJyZW50SXRlbSgpOwogICAgIH0K
IAogICAgIGlmICghaGlzdG9yeVVSTC5pc0VtcHR5KCkgJiYgIXVzZXNFcGhlbWVyYWxTZXNzaW9u
KSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKaW5kZXggYjExNmI2Y2UwNzA5M2ZkNTFjYzBlYmMyNDE1ZDQ3NTEzMzNlYzUyOS4uZDUw
MzJkYzJkNjg0NDM2M2U0ZGQ1NTQ2NzM2M2FmMWU4MDFhOWFkNCAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1
IEBACisyMDIxLTA0LTEwICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg
TnVsbCBjaGVjayBEb2N1bWVudExvYWRlciBpbiB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0
aGlzLgorCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJv
dmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMS0wNC0wOSAgQW50b2luZSBR
dWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBjYWxjKCkgc2ltcGxpZmljYXRp
b24gZm9yIGEgbXVsdGlwbGljYXRpb24gc2hvdWxkIGFwcGx5IHRoZSBtdWx0aXBsaWNhdGlvbiB0
byBlYWNoIHZhbHVlIG9mIGFuIGFkZGl0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0
L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlv
dXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3Rl
ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRi
OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92
aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKKworVGhpcyB0
ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5
b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApu
ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwLi4yMGZjMGEyYzQ4M2YxNTk4YzRhNjkwNjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAv
ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbApAQCAtMCwwICsxLDE3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3Jp
cHQgaWQ9InNjcmlwdCI+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5k
dW1wQXNUZXh0KCk7CitmdW5jdGlvbiBydW5UZXN0KCkgeworICBkb2N1bWVudC5jcmVhdGVFbGVt
ZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5zdG9wKCk7IAorfQorZnVuY3Rpb24gZXZl
bnRoYW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hpbGQoaWZyYW1lKTsgCisgIGRvY3VtZW50
Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxlcjsKK30KKzwvc2NyaXB0PgorPGJvZHkg
b25sb2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9ImlmcmFtZSIgb25sb2FkPSJldmVudGhhbmRs
ZXIoKSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYg
aXQgZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425962</attachid>
            <date>2021-04-14 02:27:59 -0700</date>
            <delta_ts>2021-04-14 08:33:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210414112757.patch</filename>
            <type>text/plain</type>
            <size>1314</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz
MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uY2ExYTM4MTZhNjdlOTE2MWFhYjJjNjRhMTM4YjBi
ZmE2OTUzYjhhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTnVsbCBjaGVjayBEb2N1bWVudExv
YWRlciBpbiB1cGRhdGVGb3JTdGFuZGFyZExvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIFdJUC4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl
ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0
dGVkKToKKwogMjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5j
b20+CiAKICAgICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dl
YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkNzNmY2E1ODlmYzMyMzkzZjIwNjJm
Y2QyY2ZmOTVlNTlhMWNmYmZmLi5kNjIxOThmNThkZjRhNmQ1YzI2MmU3ODU1YmI4NjRlZWY4OWMy
YjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTIxMTQsNyArMjEx
NCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdl
KiBjYWNoZWRQYWdlKQogICAgIEFTU0VSVChtX2NsaWVudC0+aGFzV2ViVmlldygpKTsKICAgICBB
U1NFUlQobV9zdGF0ZSA9PSBGcmFtZVN0YXRlOjpQcm92aXNpb25hbCk7CiAKLSAgICBpZiAobV9z
dGF0ZSAhPSBGcmFtZVN0YXRlOjpQcm92aXNpb25hbCkKKyAgICBpZiAobV9zdGF0ZSAhPSBGcmFt
ZVN0YXRlOjpQcm92aXNpb25hbCB8fCAhbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQogICAg
ICAgICByZXR1cm47CiAKICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkp
IHsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425986</attachid>
            <date>2021-04-14 08:33:17 -0700</date>
            <delta_ts>2021-04-16 06:46:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210414173316.patch</filename>
            <type>text/plain</type>
            <size>3335</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzAzNzMzNjlkOGZhMzgy
MWZiYmUxYzgzOGIxOGQyNDY3NmMxZjdlZC4uZjk1MWNlZGRjYmQ4NDY1NTZjNmJlNzM2MTEwMTM0
ZGNlZmU2YTZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIgaW4gCisgICAgICAgIEZyYW1l
TG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC9sb2Fk
ZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbAorCisgICAgICAgICogbG9hZGVy
L0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp0cmFuc2l0
aW9uVG9Db21taXR0ZWQpOgorCiAyMDIxLTA0LTE0ICBGcsOpZMOpcmljIFdhbmcgIDxmd2FuZ0Bp
Z2FsaWEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFJlbmRlckJsb2NrOjphZGRPdmVyZmxvd0Zy
b21DaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZDczZmNh
NTg5ZmMzMjM5M2YyMDYyZmNkMmNmZjk1ZTU5YTFjZmJmZi4uZDYyMTk4ZjU4ZGY0YTZkNWMyNjJl
Nzg1NWJiODY0ZWVmODljMmIzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CkBAIC0yMTE0LDcgKzIxMTQsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21t
aXR0ZWQoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSkKICAgICBBU1NFUlQobV9jbGllbnQtPmhhc1dl
YlZpZXcoKSk7CiAgICAgQVNTRVJUKG1fc3RhdGUgPT0gRnJhbWVTdGF0ZTo6UHJvdmlzaW9uYWwp
OwogCi0gICAgaWYgKG1fc3RhdGUgIT0gRnJhbWVTdGF0ZTo6UHJvdmlzaW9uYWwpCisgICAgaWYg
KG1fc3RhdGUgIT0gRnJhbWVTdGF0ZTo6UHJvdmlzaW9uYWwgfHwgIW1fcHJvdmlzaW9uYWxEb2N1
bWVudExvYWRlcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9
IG1fZnJhbWUudmlldygpKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTVjMzQzMmNkZDE3MTBjOWFiNTVhYTRkNDY5ODZk
YmY4YmMxZWI3MS4uM2YyYzcwNTYxNTY1MTFhYWY5OWM3OGU3NGI3Y2MxM2ZkZWVkZWIzNyAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTE0ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBmb3IgdGhp
cy4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNo
LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zp
c2lvbmFsLWxvYWQtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjEtMDQtMTQgIEZyw6lkw6lyaWMg
V2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gUmVuZGVyQmxvY2s6
OmFkZE92ZXJmbG93RnJvbUNoaWxkcmVuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xv
YWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50
eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRiOAot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKKworVGhpcyB0ZXN0
IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5b3V0
VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi4yMGZjMGEyYzQ4M2YxNTk4YzRhNjkwNjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxv
YWQtY3Jhc2guaHRtbApAQCAtMCwwICsxLDE3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQg
aWQ9InNjcmlwdCI+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1w
QXNUZXh0KCk7CitmdW5jdGlvbiBydW5UZXN0KCkgeworICBkb2N1bWVudC5jcmVhdGVFbGVtZW50
KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5zdG9wKCk7IAorfQorZnVuY3Rpb24gZXZlbnRo
YW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hpbGQoaWZyYW1lKTsgCisgIGRvY3VtZW50Lm9u
cmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxlcjsKK30KKzwvc2NyaXB0PgorPGJvZHkgb25s
b2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9ImlmcmFtZSIgb25sb2FkPSJldmVudGhhbmRsZXIo
KSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQg
ZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426219</attachid>
            <date>2021-04-16 06:46:31 -0700</date>
            <delta_ts>2021-04-17 12:31:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210416154628.patch</filename>
            <type>text/plain</type>
            <size>12959</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz
MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uM2Q2NDE5NDg3NWViMTJmMTAxYzVjNjFlNDJhODg5
YjY0Y2Q5NmUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA0LTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5j
b20+CiAKICAgICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
CmluZGV4IDhlNGRjY2IxNzY3YzJkYmNiY2ZkZmJlZGYyOGIyYzhjMmU3ZDEzZmEuLjAzMDQ4YzVk
NDNiMGVhZjA5MTRjOGNiYjJhNmJiMTM2ZDYxZTllNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg
QEAKKzIwMjEtMDQtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBD
aGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAg
KiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAg
ICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJv
dmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy
YW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMjEtMDQtMTMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y
bWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIENhcHR1cmVEZXZpY2UgbW9u
aXRvciB1c2VkIGZyb20gVUlQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5
L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXgg
Y2I3MThkZGQ0OWJlNTcwNDBiZjY2M2RlNGFkMGE1OGNlZGM1YmM2Mi4uYTc5YzczMjFhY2UyMWNh
YTJkNTcyYzNiNDhlNzY4NDljNjIzN2IxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2Fj
eS9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+
CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbnVwIGxvYWRlciBzdGF0
ZSBvbiBwcm92aXNpb25hbAorICAgICAgICBsb2FkIGNhbmNlbGF0aW9uLgorCisgICAgICAgICog
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVy
Q2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6CisKIDIwMjEtMDQtMTIg
IFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBpc3N1
ZXMgaGlkZGVuIGJ5IHVuaWZpZWQgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRl
eCBiNTdjMmIxZjA2OGVkMjg1Mjk0ODNlYmFjOTBjYmM3MDUzMmU0MzkyLi5hMTI3NTQ2MmNiMDNk
ZWJiMmMwOGE4YjVkZjA5MjNiMWQxNWFlNWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDQtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFu
Z2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6
CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNp
b25hbExvYWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50
Lmg6CisKIDIwMjEtMDMtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJlbW92ZSBFTkFCTEVfSU5ERVhFRF9EQVRBQkFTRSAmIEVOQUJMRV9JTkRFWEVEX0RBVEFC
QVNFX0lOX1dPUktFUlMsIGl0IHNlZW1zIGxpa2UgaXQgaXMgb24gZm9yIGFsbCBwb3J0cwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggODk1
MmYwZjk4NjMwZmE5ODdiMTEwZTlmMDg1OTFhNjk5MjE3MTVlZi4uMzAxYzZlZjU1OWUzMzI4Mzdj
YWFjMGI5ZDMxOWMxNDllYmI5YzlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy
L0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w
dHlGcmFtZUxvYWRlckNsaWVudC5oCkBAIC04Niw2ICs4Niw3IEBAIGNsYXNzIFdFQkNPUkVfRVhQ
T1JUIEVtcHR5RnJhbWVMb2FkZXJDbGllbnQgOiBwdWJsaWMgRnJhbWVMb2FkZXJDbGllbnQgewog
ICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UoKSBmaW5hbCB7IH0KICAgICB2
b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZFN0
YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWwgeyB9CisgICAgdm9pZCBkaXNwYXRjaERpZENhbmNl
bFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsIHsgfQogICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFsIHsgfQogICAgIHZvaWQgZGlz
cGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFs
PFVzZWRMZWdhY3lUTFM+KSBmaW5hbCB7IH0KICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zp
c2lvbmFsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiwgV2lsbENvbnRpbnVlTG9hZGluZykgZmlu
YWwgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkNzNmY2E1ODlm
YzMyMzkzZjIwNjJmY2QyY2ZmOTVlNTlhMWNmYmZmLi45N2I1ZmY1NDAxN2NmZDQwMmNjZGRjMzU0
MzU1M2QzNGIyODJlOTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM
b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAg
LTIxMTcsNiArMjExNywxMCBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0
ZWQoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSkKICAgICBpZiAobV9zdGF0ZSAhPSBGcmFtZVN0YXRl
OjpQcm92aXNpb25hbCkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCFtX3Byb3Zpc2lvbmFs
RG9jdW1lbnRMb2FkZXIpIHsKKyAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkQ2FuY2VsUHJv
dmlzaW9uYWxMb2FkKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKEZyYW1lVmll
dyogdmlldyA9IG1fZnJhbWUudmlldygpKSB7CiAgICAgICAgIGlmIChTY3JvbGxBbmltYXRvciog
c2Nyb2xsQW5pbWF0b3IgPSB2aWV3LT5leGlzdGluZ1Njcm9sbEFuaW1hdG9yKCkpCiAgICAgICAg
ICAgICBzY3JvbGxBbmltYXRvci0+Y2FuY2VsQW5pbWF0aW9ucygpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAzNGU1MTVhZTMyZTZiOTUyNjk2N2M5NmY3
N2RiNjdlYTkzNGMyZjEyLi4xZWNhZTE5YTM1OGUzZGM5ZThkZmVkYjEyNTkyNzVlN2ZkMWE1YTE3
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMTcyLDYg
KzE3Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSA9
IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKSB7IH0KICAgICB2
aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpID0gMDsKKyAgICB2
aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSA9IDA7CiAgICAg
dmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJl
Y3Rpb24mKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRp
b25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwog
ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVz
b3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRpbmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j
cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk
ZXJDbGllbnQuY3BwCmluZGV4IDM0Y2FlOWFkNTYxYjliN2RhZGE3Mzk5Y2E5ZDE0NGI2ZGY0NWYw
ZTguLjExNGFmOTczZGQzYWU3ZGFiMmRkYmY1MjMyYWQwMDNhZDg1MDYwODQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs
aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl
YkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTMyLDYgKzUzMiwxMCBAQCB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQ
YWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk
Rm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBtX2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFs
TG9hZGVyLnJlcXVlc3QoKSwgcHJvdmlzaW9uYWxMb2FkZXIubmF2aWdhdGlvbklEKCksIHVybCwg
dW5yZWFjaGFibGVVUkwsIFVzZXJEYXRhKFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnRyYW5zZm9y
bU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdldCgpKSkpOwogfQogCit2b2lkIFdl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7
Cit9CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0bGVMZW5ndGggPSAxMDAwOyAv
LyBDbG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVjb21tZW5kYXRpb24gZm9yIFRp
dGxlIGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNl
aXZlVGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll
bnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv
YWRlckNsaWVudC5oCmluZGV4IDk3MzZkZjViZTcyYWNjZjI1YzlmM2RkMWRjMzcxODMyZDY3NDY1
MGIuLmE4MDg2NWJiYWQzYWQ2ODcxNWI3NTg5YWMyYzQ4MzU2NzFkODZiOGYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs
aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG
cmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTQsNiArMTE0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk
IGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRj
aFdpbGxDbG9zZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFs
TG9hZCgpIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQo
KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6
OlN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0
TG9hZChPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxXZWJD
b3JlOjpVc2VkTGVnYWN5VExTPikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92
aXNpb25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxD
b250aW51ZUxvYWRpbmcpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9t
YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggNjM1
MWMyZWEwNjY1NzM5Y2Q3MWUwYzQ3ZTM3YTQ3YWQwNjExNDM3OC4uNjMxOTVlMzc5MDg5ZGNkNmEz
OWIyYmQyMWY4NmQ2Y2FlNzdjN2M1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t
YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0x
MTYsNiArMTE2LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3Nl
KCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmlu
YWw7CisgICAgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwog
ICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0
aERpcmVjdGlvbiYpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlv
bmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFsPFdlYkNvcmU6OlVzZWRM
ZWdhY3lUTFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9h
ZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENvbnRpbnVlTG9h
ZGluZykgZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IGMzYWI2Mjg1NDFl
YjIzYjZmMTZkMTRkNjBkOTBmNGE5NjExZmE1YTcuLmE2NTU1ODBlNTMzNWRlMzg0NTFlNTQxNWQ5
Mjc2YjIwYzdiMDAxNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNv
cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCkBAIC02NzksNiAr
Njc5LDExIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92
aXNpb25hbExvYWQoKQogICAgICAgICBDYWxsRnJhbWVMb2FkRGVsZWdhdGUoaW1wbGVtZW50YXRp
b25zLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lRnVuYywgd2ViVmlldywgQHNlbGVj
dG9yKHdlYlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTopLCBtX3dlYkZyYW1l
LmdldCgpKTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5j
ZWxQcm92aXNpb25hbExvYWQoKQoreworICAgIG1fd2ViRnJhbWUtPl9wcml2YXRlLT5wcm92aXNp
b25hbFVSTCA9IG51bGxwdHI7Cit9CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0
bGVMZW5ndGggPSAxMDAwOyAvLyBDbG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVj
b21tZW5kYXRpb24gZm9yIFRpdGxlIGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu
dDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVj
dGlvbiYgdGl0bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggMGU2NjkwODI3
ZjgwYWIxN2UzZTMwYjdlMmE4OTI1ZDEzN2M2NmQzNS4uNDgwNzYyMzEzZTczYzZmMTE0NTc0ZWQ1
Nzc1ZTgwMjgxMDA3ODJmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2Vi
Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDI0
LDYgKzQyNCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICAgICAgZnJhbWVMb2FkRGVsZWdhdGUtPmRpZFN0YXJ0UHJv
dmlzaW9uYWxMb2FkRm9yRnJhbWUod2ViVmlldywgbV93ZWJGcmFtZSk7CiB9CiAKK3ZvaWQgV2Vi
RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sK
K30KKwogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUo
Y29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCiB7CiAgICAgV2ViVmlldyogd2ViVmll
dyA9IG1fd2ViRnJhbWUtPndlYlZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmluZGV4
IDQ1OWNlMjc4NWE1ZTQzMGU5OWI4YjNhZWJiYjQ0NmYzNmYyNDNjZmYuLjc4Njg0NGRlNDU0MWI4
ZWVlY2VmYTRkNWM2NWI2ZDQ2NjdiZDNlMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNl
L1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaApA
QCAtOTAsNiArOTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0
aGluUGFnZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBvdmVycmlk
ZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBvdmVycmlkZTsK
KyAgICB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CiAg
ICAgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRo
RGlyZWN0aW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0
aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiwgT3B0aW9uYWw8V2ViQ29yZTo6VXNl
ZExlZ2FjeVRMUz4pIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9u
YWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBXZWJDb3JlOjpXaWxsQ29udGlu
dWVMb2FkaW5nKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmYmQyMjNmNDM3NzAyNDNkOGMxN2NjMDFlMzc0
M2M4MDIyNmViZDQyLi42ZjMzNGI1MjI1NWQ3YjQyY2IxZjE5MmU5ZjMwYmYzYTlhZmVhZWE2IDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDQtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlh
LmNvbT4KKworICAgICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0
aGlzLgorCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJv
dmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMS0wNC0xMyAgQ29tbWl0IFF1
ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2
ZXJ0aW5nIHIyNzU4NDkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21t
aXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0
L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRiOAotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2Fk
LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKKworVGhpcyB0ZXN0IGhhcyBQQVNT
RUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xv
YWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz
dC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4y
MGZjMGEyYzQ4M2YxNTk4YzRhNjkwNjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2gu
aHRtbApAQCAtMCwwICsxLDE3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgaWQ9InNjcmlw
dCI+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7
CitmdW5jdGlvbiBydW5UZXN0KCkgeworICBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhdWRpbyIp
LmxvYWQoKTsgCisgIHdpbmRvdy5zdG9wKCk7IAorfQorZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkg
eworICBzY3JpcHQuYXBwZW5kQ2hpbGQoaWZyYW1lKTsgCisgIGRvY3VtZW50Lm9ucmVhZHlzdGF0
ZWNoYW5nZSA9IGV2ZW50aGFuZGxlcjsKK30KKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPXJ1blRl
c3QoKT4KKzxpZnJhbWUgaWQ9ImlmcmFtZSIgb25sb2FkPSJldmVudGhhbmRsZXIoKSIgc3JjZG9j
PSJmb28iPjwvaWZyYW1lPgorPHA+VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3Qg
Q1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426341</attachid>
            <date>2021-04-17 12:31:20 -0700</date>
            <delta_ts>2022-01-31 02:04:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20210417213117.patch</filename>
            <type>text/plain</type>
            <size>13018</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz
MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uM2Q2NDE5NDg3NWViMTJmMTAxYzVjNjFlNDJhODg5
YjY0Y2Q5NmUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA0LTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5j
b20+CiAKICAgICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
CmluZGV4IDhlNGRjY2IxNzY3YzJkYmNiY2ZkZmJlZGYyOGIyYzhjMmU3ZDEzZmEuLjAzMDQ4YzVk
NDNiMGVhZjA5MTRjOGNiYjJhNmJiMTM2ZDYxZTllNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg
QEAKKzIwMjEtMDQtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBD
aGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAg
KiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAg
ICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJv
dmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy
YW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMjEtMDQtMTMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y
bWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIENhcHR1cmVEZXZpY2UgbW9u
aXRvciB1c2VkIGZyb20gVUlQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5
L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXgg
Y2I3MThkZGQ0OWJlNTcwNDBiZjY2M2RlNGFkMGE1OGNlZGM1YmM2Mi4uYTc5YzczMjFhY2UyMWNh
YTJkNTcyYzNiNDhlNzY4NDljNjIzN2IxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2Fj
eS9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+
CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbnVwIGxvYWRlciBzdGF0
ZSBvbiBwcm92aXNpb25hbAorICAgICAgICBsb2FkIGNhbmNlbGF0aW9uLgorCisgICAgICAgICog
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVy
Q2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6CisKIDIwMjEtMDQtMTIg
IFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBpc3N1
ZXMgaGlkZGVuIGJ5IHVuaWZpZWQgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRl
eCBiNTdjMmIxZjA2OGVkMjg1Mjk0ODNlYmFjOTBjYmM3MDUzMmU0MzkyLi5hMTI3NTQ2MmNiMDNk
ZWJiMmMwOGE4YjVkZjA5MjNiMWQxNWFlNWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDQtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIEFQSSBjaGFu
Z2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6
CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNp
b25hbExvYWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50
Lmg6CisKIDIwMjEtMDMtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJlbW92ZSBFTkFCTEVfSU5ERVhFRF9EQVRBQkFTRSAmIEVOQUJMRV9JTkRFWEVEX0RBVEFC
QVNFX0lOX1dPUktFUlMsIGl0IHNlZW1zIGxpa2UgaXQgaXMgb24gZm9yIGFsbCBwb3J0cwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggODk1
MmYwZjk4NjMwZmE5ODdiMTEwZTlmMDg1OTFhNjk5MjE3MTVlZi4uMzAxYzZlZjU1OWUzMzI4Mzdj
YWFjMGI5ZDMxOWMxNDllYmI5YzlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy
L0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w
dHlGcmFtZUxvYWRlckNsaWVudC5oCkBAIC04Niw2ICs4Niw3IEBAIGNsYXNzIFdFQkNPUkVfRVhQ
T1JUIEVtcHR5RnJhbWVMb2FkZXJDbGllbnQgOiBwdWJsaWMgRnJhbWVMb2FkZXJDbGllbnQgewog
ICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UoKSBmaW5hbCB7IH0KICAgICB2
b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZFN0
YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWwgeyB9CisgICAgdm9pZCBkaXNwYXRjaERpZENhbmNl
bFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsIHsgfQogICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFsIHsgfQogICAgIHZvaWQgZGlz
cGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFs
PFVzZWRMZWdhY3lUTFM+KSBmaW5hbCB7IH0KICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zp
c2lvbmFsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiwgV2lsbENvbnRpbnVlTG9hZGluZykgZmlu
YWwgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkNzNmY2E1ODlm
YzMyMzkzZjIwNjJmY2QyY2ZmOTVlNTlhMWNmYmZmLi45N2I1ZmY1NDAxN2NmZDQwMmNjZGRjMzU0
MzU1M2QzNGIyODJlOTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM
b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAg
LTIxMTcsNiArMjExNywxMCBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0
ZWQoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSkKICAgICBpZiAobV9zdGF0ZSAhPSBGcmFtZVN0YXRl
OjpQcm92aXNpb25hbCkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCFtX3Byb3Zpc2lvbmFs
RG9jdW1lbnRMb2FkZXIpIHsKKyAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkQ2FuY2VsUHJv
dmlzaW9uYWxMb2FkKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKEZyYW1lVmll
dyogdmlldyA9IG1fZnJhbWUudmlldygpKSB7CiAgICAgICAgIGlmIChTY3JvbGxBbmltYXRvciog
c2Nyb2xsQW5pbWF0b3IgPSB2aWV3LT5leGlzdGluZ1Njcm9sbEFuaW1hdG9yKCkpCiAgICAgICAg
ICAgICBzY3JvbGxBbmltYXRvci0+Y2FuY2VsQW5pbWF0aW9ucygpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAzNGU1MTVhZTMyZTZiOTUyNjk2N2M5NmY3
N2RiNjdlYTkzNGMyZjEyLi4xZWNhZTE5YTM1OGUzZGM5ZThkZmVkYjEyNTkyNzVlN2ZkMWE1YTE3
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMTcyLDYg
KzE3Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSA9
IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKSB7IH0KICAgICB2
aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpID0gMDsKKyAgICB2
aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSA9IDA7CiAgICAg
dmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJl
Y3Rpb24mKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRp
b25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwog
ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVz
b3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRpbmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j
cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk
ZXJDbGllbnQuY3BwCmluZGV4IDM0Y2FlOWFkNTYxYjliN2RhZGE3Mzk5Y2E5ZDE0NGI2ZGY0NWYw
ZTguLjExNGFmOTczZGQzYWU3ZGFiMmRkYmY1MjMyYWQwMDNhZDg1MDYwODQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs
aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl
YkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTMyLDYgKzUzMiwxMCBAQCB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQ
YWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk
Rm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBtX2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFs
TG9hZGVyLnJlcXVlc3QoKSwgcHJvdmlzaW9uYWxMb2FkZXIubmF2aWdhdGlvbklEKCksIHVybCwg
dW5yZWFjaGFibGVVUkwsIFVzZXJEYXRhKFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnRyYW5zZm9y
bU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdldCgpKSkpOwogfQogCit2b2lkIFdl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7
Cit9CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0bGVMZW5ndGggPSAxMDAwOyAv
LyBDbG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVjb21tZW5kYXRpb24gZm9yIFRp
dGxlIGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNl
aXZlVGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll
bnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv
YWRlckNsaWVudC5oCmluZGV4IDk3MzZkZjViZTcyYWNjZjI1YzlmM2RkMWRjMzcxODMyZDY3NDY1
MGIuLmE4MDg2NWJiYWQzYWQ2ODcxNWI3NTg5YWMyYzQ4MzU2NzFkODZiOGYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs
aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG
cmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTQsNiArMTE0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk
IGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRj
aFdpbGxDbG9zZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFs
TG9hZCgpIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQo
KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6
OlN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0
TG9hZChPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxXZWJD
b3JlOjpVc2VkTGVnYWN5VExTPikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92
aXNpb25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxD
b250aW51ZUxvYWRpbmcpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9t
YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggNjM1
MWMyZWEwNjY1NzM5Y2Q3MWUwYzQ3ZTM3YTQ3YWQwNjExNDM3OC4uNjMxOTVlMzc5MDg5ZGNkNmEz
OWIyYmQyMWY4NmQ2Y2FlNzdjN2M1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t
YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0x
MTYsNiArMTE2LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3Nl
KCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmlu
YWw7CisgICAgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwog
ICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0
aERpcmVjdGlvbiYpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlv
bmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFsPFdlYkNvcmU6OlVzZWRM
ZWdhY3lUTFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9h
ZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENvbnRpbnVlTG9h
ZGluZykgZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IGMzYWI2Mjg1NDFl
YjIzYjZmMTZkMTRkNjBkOTBmNGE5NjExZmE1YTcuLmE2NTU1ODBlNTMzNWRlMzg0NTFlNTQxNWQ5
Mjc2YjIwYzdiMDAxNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNv
cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCkBAIC02NzksNiAr
Njc5LDExIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92
aXNpb25hbExvYWQoKQogICAgICAgICBDYWxsRnJhbWVMb2FkRGVsZWdhdGUoaW1wbGVtZW50YXRp
b25zLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lRnVuYywgd2ViVmlldywgQHNlbGVj
dG9yKHdlYlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTopLCBtX3dlYkZyYW1l
LmdldCgpKTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5j
ZWxQcm92aXNpb25hbExvYWQoKQoreworICAgIG1fd2ViRnJhbWUtPl9wcml2YXRlLT5wcm92aXNp
b25hbFVSTCA9IG51bGxwdHI7Cit9CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0
bGVMZW5ndGggPSAxMDAwOyAvLyBDbG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVj
b21tZW5kYXRpb24gZm9yIFRpdGxlIGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu
dDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVj
dGlvbiYgdGl0bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggMGU2NjkwODI3
ZjgwYWIxN2UzZTMwYjdlMmE4OTI1ZDEzN2M2NmQzNS4uYTAxNDA0ZjBjYzcxYWQyYmE5YTk3NGVk
N2U5NTI0MDdlZjU1ZTdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2Vi
Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDI0
LDYgKzQyNCwxMiBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICAgICAgZnJhbWVMb2FkRGVsZWdhdGUtPmRpZFN0YXJ0UHJv
dmlzaW9uYWxMb2FkRm9yRnJhbWUod2ViVmlldywgbV93ZWJGcmFtZSk7CiB9CiAKK3ZvaWQgV2Vi
RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sK
KyAgICBSZXNvdXJjZUVycm9yIGR1bW15OworICAgIGRpc3BhdGNoRGlkRmFpbExvYWQoZHVtbXkp
OworfQorCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRs
ZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aXRsZSkKIHsKICAgICBXZWJWaWV3KiB3ZWJW
aWV3ID0gbV93ZWJGcmFtZS0+d2ViVmlldygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl
Z2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5k
ZXggNDU5Y2UyNzg1YTVlNDMwZTk5YjhiM2FlYmJiNDQ2ZjM2ZjI0M2NmZi4uNzg2ODQ0ZGU0NTQx
YjhlZWVjZWZhNGQ1YzY1YjZkNDY2N2JkM2UyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExl
Z2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
CkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVX
aXRoaW5QYWdlKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIG92ZXJy
aWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIG92ZXJyaWRl
OworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBvdmVycmlkZTsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dp
dGhEaXJlY3Rpb24mKSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChP
cHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxXZWJDb3JlOjpV
c2VkTGVnYWN5VExTPikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNp
b25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250
aW51ZUxvYWRpbmcpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZiZDIyM2Y0Mzc3MDI0M2Q4YzE3Y2MwMWUz
NzQzYzgwMjI2ZWJkNDIuLjZmMzM0YjUyMjU1ZDdiNDJjYjFmMTkyZTlmMzBiZjNhOWFmZWFlYTYg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wNC0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2Fs
aWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9y
IHRoaXMuCisKKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1w
cm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA0LTEzICBDb21taXQg
UXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBy
ZXZlcnRpbmcgcjI3NTg0OS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Nv
bW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh
c3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi40NDZlYzZlNDczNGU0ZTRiNjYwZGRlMTNmM2YwZGRkZDg4N2I1NGI4Ci0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxv
YWQtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorCitUaGlzIHRlc3QgaGFzIFBB
U1NFRCBpZiBpdCBkb2VzIG5vdCBDUkFTSC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv
bG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9m
YXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LjIwZmMwYTJjNDgzZjE1OThjNGE2OTA2ODMzMmUzZGJmOTA0M2ZiNDAKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFz
aC5odG1sCkBAIC0wLDAgKzEsMTcgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdCBpZD0ic2Ny
aXB0Ij4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQo
KTsKK2Z1bmN0aW9uIHJ1blRlc3QoKSB7CisgIGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImF1ZGlv
IikubG9hZCgpOyAKKyAgd2luZG93LnN0b3AoKTsgCit9CitmdW5jdGlvbiBldmVudGhhbmRsZXIo
KSB7CisgIHNjcmlwdC5hcHBlbmRDaGlsZChpZnJhbWUpOyAKKyAgZG9jdW1lbnQub25yZWFkeXN0
YXRlY2hhbmdlID0gZXZlbnRoYW5kbGVyOworfQorPC9zY3JpcHQ+Cis8Ym9keSBvbmxvYWQ9cnVu
VGVzdCgpPgorPGlmcmFtZSBpZD0iaWZyYW1lIiBvbmxvYWQ9ImV2ZW50aGFuZGxlcigpIiBzcmNk
b2M9ImZvbyI+PC9pZnJhbWU+Cis8cD5UaGlzIHRlc3QgaGFzIFBBU1NFRCBpZiBpdCBkb2VzIG5v
dCBDUkFTSC48L3A+Cis8L2JvZHk+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450389</attachid>
            <date>2022-01-31 02:04:17 -0800</date>
            <delta_ts>2022-01-31 03:25:30 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220131100415.patch</filename>
            <type>text/plain</type>
            <size>12938</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MjdiMGUyMjY5Y2Zh
ZDVhODEzNDg5NDRhMWM1NzQ4NmE3OTU5YS4uMjZmOTc1NTBiNTczMDFjYzg3YWY3Mzg5MDM1MDgz
MWQ2ODM5NDQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXVEZdIEFkZCBHZW5lcmljSGFzaEtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NGE2ODA3Njdl
MWVkNmZmYzJlYmM2NzU1ODJhMDYxN2JmOTdlNDZiLi5jOTVlNzBmZmYzMWM1NmYzNzNlY2UxYWQ3
NDlkNTc5Mjg2YTVmYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
OgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIERlbGV0ZSBjb2RlIGZvciBrZXlnZW4gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nCmluZGV4IGE4ZWM1ZGVkZTEyMWZkNzAwOGY0YmY2ZGU3YTQ2ZDA3NmMxMDdhYTIuLjQ2ZTk3
N2YyYzRiNTdjYTVmZmRmNjIxODNhMTVhYWIwMDZlYzlmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBs
b2FkZXIgc3RhdGUgb24gcHJvdmlzaW9uYWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg
ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG
cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAy
MDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERl
bGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNGZjNjQwY2E2MGE0NzZkYmY0YjNiZGRjNjA3ZTQy
M2M4NzEwYzA5My4uZmFkN2VhNTA2ZDQ3OTIyZmYxYTQwYWIyMWM2Y2Y5NjM5YjlhYWU4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2Ug
Zm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt
cHR5RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxMTZhMTdkMWY1YzllNjQ3ZTFmMTQxYTEwMDg2
YjA3OTgzOTNmM2VhLi41YmFjYjRmNmQ3OTNlNGE3ZTMwMGZhMmZkOTgzOGVlM2Q4YmYyOTI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKQEAg
LTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRo
aW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAg
IHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOworICAgIHZvaWQg
ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0luc2VjdXJl
Q29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImLCBXaWxs
Q29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CmluZGV4IDMxZmI4YTVkZjZhMDkxYTM0MzAyNmE5OTZkNTc1MWM3NTYyZmMxNmUuLjczZTZiMzEw
YmQ2MTg3MzNmZDQ0ZThlMDk1NWIxOTZkMWJkZDZhODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcApAQCAtMjEzOSw2ICsyMTM5LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy
YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIGlmIChtX3N0
YXRlICE9IEZyYW1lU3RhdGU6OlByb3Zpc2lvbmFsKQogICAgICAgICByZXR1cm47CiAKKyAgICBp
ZiAoIW1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgeworICAgICAgICBtX2NsaWVudC0+ZGlz
cGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K
ICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkpIHsKICAgICAgICAgaWYg
KFNjcm9sbEFuaW1hdG9yKiBzY3JvbGxBbmltYXRvciA9IHZpZXctPmV4aXN0aW5nU2Nyb2xsQW5p
bWF0b3IoKSkKICAgICAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT5jYW5jZWxBbmltYXRpb25zKCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDM1MmE0YzRm
YjUwNGY3Y2Q0ZDJlYzQwNmU2YmMyOTExYTU1ZmQwOTQuLjk1MzJmNzYwNTQyZjVmNzE4MTk4MDI3
NDQ2NzdiMjUyMmU2ZDA0OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt
ZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs
aWVudC5oCkBAIC0xNzMsNiArMTczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNw
YXRjaFdpbGxDbG9zZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
SWNvbigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFs
TG9hZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29u
c3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE
aWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRp
b25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZh
aWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRp
bmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDI4ZWM4ZTIzOGNh
NWJmZGYwZGM1MjZmNTZkNmVmYjE4OTAwYWNiZDAuLjExNDZlYzNjZWI2ODg3NDRiYzQ2MGMzYjlk
MTNiZDljZTU3MTM1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTM4
LDYgKzUzOCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv
eHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBt
X2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFsTG9hZGVyLT5yZXF1ZXN0KCksIHByb3Zpc2lvbmFs
TG9hZGVyLT5uYXZpZ2F0aW9uSUQoKSwgdXJsLCB1bnJlYWNoYWJsZVVSTCwgVXNlckRhdGEoV2Vi
UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n
ZXQoKSkuZ2V0KCkpKSk7CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo
RGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sKK30KKwogc3RhdGljIGNvbnN0ZXhwciB1bnNp
Z25lZCBtYXhUaXRsZUxlbmd0aCA9IDEwMDA7IC8vIENsb3Nlc3QgcG93ZXIgb2YgMTAgYWJvdmUg
dGhlIFczQyByZWNvbW1lbmRhdGlvbiBmb3IgVGl0bGUgbGVuZ3RoLgogCiB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGly
ZWN0aW9uJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMWQzMGJjMzkz
ODNhZmZmMmNhOWMyODc1M2RkMmQ3ZWMyYjI2NDkxZS4uZTk2MzM0NjI3NTc4MGY3NjMyMDg5NWM1
ZDJkY2UwZGU5OWViMmU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTExNCw2
ICsxMTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBh
Z2UoKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggOGRmOTkzZjJkNzc1YjZjOTNkMmU4
ZjA5OTBmNzJmODVmNjE4ZTU4ZS4uZGU4ODdkYjIxYmI2ODExNjRiYTgwNDZiOTliZjlmYmI3NjNk
ZDZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTgsNiArMTE4LDcgQEAgcHJp
dmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRleCA4N2E1ZDY1N2Y3YjczM2QwN2M1
ZGI2MDFmNjk4MWY5MDQ5NzcxMzkzLi44YjdmYWJmNDZhNDU2YTA1MjhmYmE0YmJkNjQ2NWNkYzk1
NTlhZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtNjczLDYgKzY3MywxMSBA
QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkKICAgICAgICAgQ2FsbEZyYW1lTG9hZERlbGVnYXRlKGltcGxlbWVudGF0aW9ucy0+ZGlk
U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZUZ1bmMsIHdlYlZpZXcsIEBzZWxlY3Rvcih3ZWJW
aWV3OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6KSwgbV93ZWJGcmFtZS5nZXQoKSk7
CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlz
aW9uYWxMb2FkKCkKK3sKKyAgICBtX3dlYkZyYW1lLT5fcHJpdmF0ZS0+cHJvdmlzaW9uYWxVUkwg
PSBudWxscHRyOworfQorCiBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1heFRpdGxlTGVuZ3Ro
ID0gMTAwMDsgLy8gQ2xvc2VzdCBwb3dlciBvZiAxMCBhYm92ZSB0aGUgVzNDIHJlY29tbWVuZGF0
aW9uIGZvciBUaXRsZSBsZW5ndGguCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh
dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mIHRp
dGxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29y
ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDEyNzBlNTdkZDk1YjBkMDAw
M2I1ZTU2NzdkNDc0MmExMjU1MmQ4NTMuLmQ2NTIyODNkNDU4MjQ3NzMwNjJjZDUwYTA0YzQwZTJh
YjE0NTQ4MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBw
b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTQxOCw2ICs0MTgs
MTIgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lv
bmFsTG9hZCgpCiAgICAgICAgIGZyYW1lTG9hZERlbGVnYXRlLT5kaWRTdGFydFByb3Zpc2lvbmFs
TG9hZEZvckZyYW1lKHdlYlZpZXcsIG1fd2ViRnJhbWUpOwogfQogCit2b2lkIFdlYkZyYW1lTG9h
ZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7CisgICAgUmVz
b3VyY2VFcnJvciBkdW1teTsKKyAgICBkaXNwYXRjaERpZEZhaWxMb2FkKGR1bW15KTsKK30KKwog
dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3Qg
U3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCiB7CiAgICAgV2ViVmlldyogd2ViVmlldyA9IG1f
d2ViRnJhbWUtPndlYlZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDc5MjZm
ZDM2NzE4MDllODM4NDdhNDgwMzFhOGI5MGM2MzhmYWY3ZTQuLmZkNGU4NzE2NDhkNDJlNTQwNWZj
NmJiMTczNjBlZDM5MGM4NGZlNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktp
dExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtODMs
NiArODMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGluUGFn
ZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBvdmVycmlkZTsKICAg
ICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBvdmVycmlkZTsKKyAgICB2
b2lkIGRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRoRGlyZWN0
aW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoc3RkOjpvcHRp
b25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6
OlVzZWRMZWdhY3lUTFM+KSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zp
c2lvbmFsTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENv
bnRpbnVlTG9hZGluZykgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDA1N2MxMGRkNjUyNmE4NWNjODUwYmE0
OWY3ZTg4NjllZGYzOGEzZi4uOGY1ODkxODQzZmUxZmNkNDg2YjIzNTExYjU1NWI0MTk5OGIyYjk0
YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAxLTMxICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBm
b3IgdGhpcy4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2Fk
LWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0
LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMzAgIEtpbW1v
IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgTGF5b3V0
VGVzdHMvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIHRvIDIwMjEtNi0yNCB2ZXJzaW9uCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlz
aW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0
YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRiOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDIgQEAKKworVGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JB
U0guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9u
YWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zp
c2lvbmFsLWxvYWQtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMGZjMGEyYzQ4M2YxNTk4YzRhNjkw
NjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9s
b2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApAQCAtMCwwICsxLDE3IEBA
Cis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgaWQ9InNjcmlwdCI+CitpZiAod2luZG93LnRlc3RS
dW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitmdW5jdGlvbiBydW5UZXN0KCkg
eworICBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5z
dG9wKCk7IAorfQorZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hp
bGQoaWZyYW1lKTsgCisgIGRvY3VtZW50Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxl
cjsKK30KKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9Imlm
cmFtZSIgb25sb2FkPSJldmVudGhhbmRsZXIoKSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+
VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450398</attachid>
            <date>2022-01-31 03:25:36 -0800</date>
            <delta_ts>2022-01-31 06:29:56 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220131112534.patch</filename>
            <type>text/plain</type>
            <size>12879</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MjdiMGUyMjY5Y2Zh
ZDVhODEzNDg5NDRhMWM1NzQ4NmE3OTU5YS4uMjZmOTc1NTBiNTczMDFjYzg3YWY3Mzg5MDM1MDgz
MWQ2ODM5NDQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXVEZdIEFkZCBHZW5lcmljSGFzaEtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NGE2ODA3Njdl
MWVkNmZmYzJlYmM2NzU1ODJhMDYxN2JmOTdlNDZiLi5jOTVlNzBmZmYzMWM1NmYzNzNlY2UxYWQ3
NDlkNTc5Mjg2YTVmYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
OgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIERlbGV0ZSBjb2RlIGZvciBrZXlnZW4gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nCmluZGV4IGE4ZWM1ZGVkZTEyMWZkNzAwOGY0YmY2ZGU3YTQ2ZDA3NmMxMDdhYTIuLjQ2ZTk3
N2YyYzRiNTdjYTVmZmRmNjIxODNhMTVhYWIwMDZlYzlmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBs
b2FkZXIgc3RhdGUgb24gcHJvdmlzaW9uYWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg
ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG
cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAy
MDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERl
bGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNGZjNjQwY2E2MGE0NzZkYmY0YjNiZGRjNjA3ZTQy
M2M4NzEwYzA5My4uZmFkN2VhNTA2ZDQ3OTIyZmYxYTQwYWIyMWM2Y2Y5NjM5YjlhYWU4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2Ug
Zm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt
cHR5RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxMTZhMTdkMWY1YzllNjQ3ZTFmMTQxYTEwMDg2
YjA3OTgzOTNmM2VhLi41YmFjYjRmNmQ3OTNlNGE3ZTMwMGZhMmZkOTgzOGVlM2Q4YmYyOTI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKQEAg
LTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRo
aW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAg
IHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOworICAgIHZvaWQg
ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0luc2VjdXJl
Q29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImLCBXaWxs
Q29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CmluZGV4IDMxZmI4YTVkZjZhMDkxYTM0MzAyNmE5OTZkNTc1MWM3NTYyZmMxNmUuLjczZTZiMzEw
YmQ2MTg3MzNmZDQ0ZThlMDk1NWIxOTZkMWJkZDZhODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcApAQCAtMjEzOSw2ICsyMTM5LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy
YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIGlmIChtX3N0
YXRlICE9IEZyYW1lU3RhdGU6OlByb3Zpc2lvbmFsKQogICAgICAgICByZXR1cm47CiAKKyAgICBp
ZiAoIW1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgeworICAgICAgICBtX2NsaWVudC0+ZGlz
cGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K
ICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkpIHsKICAgICAgICAgaWYg
KFNjcm9sbEFuaW1hdG9yKiBzY3JvbGxBbmltYXRvciA9IHZpZXctPmV4aXN0aW5nU2Nyb2xsQW5p
bWF0b3IoKSkKICAgICAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT5jYW5jZWxBbmltYXRpb25zKCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDM1MmE0YzRm
YjUwNGY3Y2Q0ZDJlYzQwNmU2YmMyOTExYTU1ZmQwOTQuLjk1MzJmNzYwNTQyZjVmNzE4MTk4MDI3
NDQ2NzdiMjUyMmU2ZDA0OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt
ZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs
aWVudC5oCkBAIC0xNzMsNiArMTczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNw
YXRjaFdpbGxDbG9zZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
SWNvbigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFs
TG9hZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29u
c3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE
aWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRp
b25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZh
aWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRp
bmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDI4ZWM4ZTIzOGNh
NWJmZGYwZGM1MjZmNTZkNmVmYjE4OTAwYWNiZDAuLjExNDZlYzNjZWI2ODg3NDRiYzQ2MGMzYjlk
MTNiZDljZTU3MTM1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTM4
LDYgKzUzOCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv
eHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBt
X2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFsTG9hZGVyLT5yZXF1ZXN0KCksIHByb3Zpc2lvbmFs
TG9hZGVyLT5uYXZpZ2F0aW9uSUQoKSwgdXJsLCB1bnJlYWNoYWJsZVVSTCwgVXNlckRhdGEoV2Vi
UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n
ZXQoKSkuZ2V0KCkpKSk7CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo
RGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sKK30KKwogc3RhdGljIGNvbnN0ZXhwciB1bnNp
Z25lZCBtYXhUaXRsZUxlbmd0aCA9IDEwMDA7IC8vIENsb3Nlc3QgcG93ZXIgb2YgMTAgYWJvdmUg
dGhlIFczQyByZWNvbW1lbmRhdGlvbiBmb3IgVGl0bGUgbGVuZ3RoLgogCiB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGly
ZWN0aW9uJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMWQzMGJjMzkz
ODNhZmZmMmNhOWMyODc1M2RkMmQ3ZWMyYjI2NDkxZS4uZTk2MzM0NjI3NTc4MGY3NjMyMDg5NWM1
ZDJkY2UwZGU5OWViMmU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTExNCw2
ICsxMTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBh
Z2UoKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggOGRmOTkzZjJkNzc1YjZjOTNkMmU4
ZjA5OTBmNzJmODVmNjE4ZTU4ZS4uZGU4ODdkYjIxYmI2ODExNjRiYTgwNDZiOTliZjlmYmI3NjNk
ZDZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTgsNiArMTE4LDcgQEAgcHJp
dmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRleCA4N2E1ZDY1N2Y3YjczM2QwN2M1
ZGI2MDFmNjk4MWY5MDQ5NzcxMzkzLi44YjdmYWJmNDZhNDU2YTA1MjhmYmE0YmJkNjQ2NWNkYzk1
NTlhZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtNjczLDYgKzY3MywxMSBA
QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkKICAgICAgICAgQ2FsbEZyYW1lTG9hZERlbGVnYXRlKGltcGxlbWVudGF0aW9ucy0+ZGlk
U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZUZ1bmMsIHdlYlZpZXcsIEBzZWxlY3Rvcih3ZWJW
aWV3OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6KSwgbV93ZWJGcmFtZS5nZXQoKSk7
CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlz
aW9uYWxMb2FkKCkKK3sKKyAgICBtX3dlYkZyYW1lLT5fcHJpdmF0ZS0+cHJvdmlzaW9uYWxVUkwg
PSBudWxscHRyOworfQorCiBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1heFRpdGxlTGVuZ3Ro
ID0gMTAwMDsgLy8gQ2xvc2VzdCBwb3dlciBvZiAxMCBhYm92ZSB0aGUgVzNDIHJlY29tbWVuZGF0
aW9uIGZvciBUaXRsZSBsZW5ndGguCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh
dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mIHRp
dGxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29y
ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDEyNzBlNTdkZDk1YjBkMDAw
M2I1ZTU2NzdkNDc0MmExMjU1MmQ4NTMuLmQzYmY0OGE5OWIxMGNkNjE4Zjg0ODUxNjJiYTE0YmY0
MDdjYmFjODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBw
b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTQxOCw2ICs0MTgs
MTAgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lv
bmFsTG9hZCgpCiAgICAgICAgIGZyYW1lTG9hZERlbGVnYXRlLT5kaWRTdGFydFByb3Zpc2lvbmFs
TG9hZEZvckZyYW1lKHdlYlZpZXcsIG1fd2ViRnJhbWUpOwogfQogCit2b2lkIFdlYkZyYW1lTG9h
ZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7Cit9CisKIHZv
aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0
cmluZ1dpdGhEaXJlY3Rpb24mIHRpdGxlKQogewogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBtX3dl
YkZyYW1lLT53ZWJWaWV3KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2Fj
eS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCA3OTI2ZmQz
NjcxODA5ZTgzODQ3YTQ4MDMxYThiOTBjNjM4ZmFmN2U0Li5mZDRlODcxNjQ4ZDQyZTU0MDVmYzZi
YjE3MzYwZWQzOTBjODRmZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTgzLDYg
KzgzLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2Uo
KSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgb3ZlcnJpZGU7CiAgICAg
dm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CisgICAgdm9p
ZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIG92ZXJyaWRlOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlv
biYpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9u
YWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpV
c2VkTGVnYWN5VExTPikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNp
b25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250
aW51ZUxvYWRpbmcpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQwNTdjMTBkZDY1MjZhODVjYzg1MGJhNDlm
N2U4ODY5ZWRmMzhhM2YuLjhmNTg5MTg0M2ZlMWZjZDQ4NmIyMzUxMWI1NTViNDE5OThiMmI5NGEg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2Fs
aWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9y
IHRoaXMuCisKKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1w
cm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAxLTMwICBLaW1tbyBL
aW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIExheW91dFRl
c3RzL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyB0byAyMDIxLTYtMjQgdmVyc2lvbgpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lv
bmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ0NmVjNmU0NzM0ZTRlNGI2
NjBkZGUxM2YzZjBkZGRkODg3YjU0YjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m
YXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSwyIEBACisKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNI
LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjBmYzBhMmM0ODNmMTU5OGM0YTY5MDY4
MzMyZTNkYmY5MDQzZmI0MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h
ZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxNyBAQAor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVu
bmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworZnVuY3Rpb24gcnVuVGVzdCgpIHsK
KyAgZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXVkaW8iKS5sb2FkKCk7IAorICB3aW5kb3cuc3Rv
cCgpOyAKK30KK2Z1bmN0aW9uIGV2ZW50aGFuZGxlcigpIHsKKyAgc2NyaXB0LmFwcGVuZENoaWxk
KGlmcmFtZSk7IAorICBkb2N1bWVudC5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBldmVudGhhbmRsZXI7
Cit9Cis8L3NjcmlwdD4KKzxib2R5IG9ubG9hZD1ydW5UZXN0KCk+Cis8aWZyYW1lIGlkPSJpZnJh
bWUiIG9ubG9hZD0iZXZlbnRoYW5kbGVyKCkiIHNyY2RvYz0iZm9vIj48L2lmcmFtZT4KKzxwPlRo
aXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNILjwvcD4KKzwvYm9keT4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450406</attachid>
            <date>2022-01-31 06:30:03 -0800</date>
            <delta_ts>2022-01-31 07:15:40 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220131143001.patch</filename>
            <type>text/plain</type>
            <size>12881</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MjdiMGUyMjY5Y2Zh
ZDVhODEzNDg5NDRhMWM1NzQ4NmE3OTU5YS4uMjZmOTc1NTBiNTczMDFjYzg3YWY3Mzg5MDM1MDgz
MWQ2ODM5NDQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXVEZdIEFkZCBHZW5lcmljSGFzaEtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NGE2ODA3Njdl
MWVkNmZmYzJlYmM2NzU1ODJhMDYxN2JmOTdlNDZiLi5jOTVlNzBmZmYzMWM1NmYzNzNlY2UxYWQ3
NDlkNTc5Mjg2YTVmYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
OgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIERlbGV0ZSBjb2RlIGZvciBrZXlnZW4gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nCmluZGV4IGE4ZWM1ZGVkZTEyMWZkNzAwOGY0YmY2ZGU3YTQ2ZDA3NmMxMDdhYTIuLjQ2ZTk3
N2YyYzRiNTdjYTVmZmRmNjIxODNhMTVhYWIwMDZlYzlmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBs
b2FkZXIgc3RhdGUgb24gcHJvdmlzaW9uYWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg
ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG
cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAy
MDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERl
bGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNGZjNjQwY2E2MGE0NzZkYmY0YjNiZGRjNjA3ZTQy
M2M4NzEwYzA5My4uZmFkN2VhNTA2ZDQ3OTIyZmYxYTQwYWIyMWM2Y2Y5NjM5YjlhYWU4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2Ug
Zm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt
cHR5RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxMTZhMTdkMWY1YzllNjQ3ZTFmMTQxYTEwMDg2
YjA3OTgzOTNmM2VhLi41YmFjYjRmNmQ3OTNlNGE3ZTMwMGZhMmZkOTgzOGVlM2Q4YmYyOTI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKQEAg
LTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRo
aW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAg
IHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOworICAgIHZvaWQg
ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0luc2VjdXJl
Q29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImLCBXaWxs
Q29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CmluZGV4IDMxZmI4YTVkZjZhMDkxYTM0MzAyNmE5OTZkNTc1MWM3NTYyZmMxNmUuLjVmMGQxYjAy
MTcwMWI2NzgyZjBjY2UwZDA1N2E1ZDcyYzJhNGFkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcApAQCAtMjEzOSw2ICsyMTM5LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy
YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIGlmIChtX3N0
YXRlICE9IEZyYW1lU3RhdGU6OlByb3Zpc2lvbmFsKQogICAgICAgICByZXR1cm47CiAKKyAgICBp
ZiAoIW1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgeworICAgICAgICAvL21fY2xpZW50LT5k
aXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpOworICAgICAgICByZXR1cm47CisgICAg
fQogICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX2ZyYW1lLnZpZXcoKSkgewogICAgICAgICBp
ZiAoU2Nyb2xsQW5pbWF0b3IqIHNjcm9sbEFuaW1hdG9yID0gdmlldy0+ZXhpc3RpbmdTY3JvbGxB
bmltYXRvcigpKQogICAgICAgICAgICAgc2Nyb2xsQW5pbWF0b3ItPmNhbmNlbEFuaW1hdGlvbnMo
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5o
IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMzUyYTRj
NGZiNTA0ZjdjZDRkMmVjNDA2ZTZiYzI5MTFhNTVmZDA5NC4uOTUzMmY3NjA1NDJmNWY3MTgxOTgw
Mjc0NDY3N2IyNTIyZTZkMDQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy
Q2xpZW50LmgKQEAgLTE3Myw2ICsxNzMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRp
c3BhdGNoV2lsbENsb3NlKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJlY2Vp
dmVJY29uKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25h
bExvYWQoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9u
YWxMb2FkKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShj
b25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj
aERpZENvbW1pdExvYWQoc3RkOjpvcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9w
dGlvbmFsPFVzZWRMZWdhY3lUTFM+KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlk
RmFpbFByb3Zpc2lvbmFsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiwgV2lsbENvbnRpbnVlTG9h
ZGluZykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggMjhlYzhlMjM4
Y2E1YmZkZjBkYzUyNmY1NmQ2ZWZiMTg5MDBhY2JkMC4uMTE0NmVjM2NlYjY4ODc0NGJjNDYwYzNi
OWQxM2JkOWNlNTcxMzVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC01
MzgsNiArNTM4LDEwIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkU3Rh
cnRQcm92aXNpb25hbExvYWQoKQogICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQ
cm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCks
IG1fZnJhbWUtPmluZm8oKSwgcHJvdmlzaW9uYWxMb2FkZXItPnJlcXVlc3QoKSwgcHJvdmlzaW9u
YWxMb2FkZXItPm5hdmlnYXRpb25JRCgpLCB1cmwsIHVucmVhY2hhYmxlVVJMLCBVc2VyRGF0YShX
ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRh
LmdldCgpKS5nZXQoKSkpKTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0
Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKQoreworfQorCiBzdGF0aWMgY29uc3RleHByIHVu
c2lnbmVkIG1heFRpdGxlTGVuZ3RoID0gMTAwMDsgLy8gQ2xvc2VzdCBwb3dlciBvZiAxMCBhYm92
ZSB0aGUgVzNDIHJlY29tbWVuZGF0aW9uIGZvciBUaXRsZSBsZW5ndGguCiAKIHZvaWQgV2ViRnJh
bWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhE
aXJlY3Rpb24mIHRpdGxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxZDMwYmMz
OTM4M2FmZmYyY2E5YzI4NzUzZGQyZDdlYzJiMjY0OTFlLi5lOTYzMzQ2Mjc1NzgwZjc2MzIwODk1
YzVkMmRjZTBkZTk5ZWIyZTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMTE0
LDYgKzExNCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGlu
UGFnZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBmaW5hbDsKICAgICB2
b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBmaW5hbDsKKyAgICB2b2lkIGRp
c3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRj
aERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRoRGlyZWN0aW9uJikgZmlu
YWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoc3RkOjpvcHRpb25hbDxXZWJDb3Jl
OjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlVzZWRMZWdhY3lU
TFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25z
dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENvbnRpbnVlTG9hZGluZykg
ZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29y
ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCA4ZGY5OTNmMmQ3NzViNmM5M2Qy
ZThmMDk5MGY3MmY4NWY2MThlNThlLi5kZTg4N2RiMjFiYjY4MTE2NGJhODA0NmI5OWJmOWZiYjc2
M2RkNmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTExOCw2ICsxMTgsNyBAQCBw
cml2YXRlOgogICAgIAogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBmaW5hbDsKICAgICB2
b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBmaW5hbDsKKyAgICB2b2lkIGRp
c3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRj
aERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRoRGlyZWN0aW9uJikgZmlu
YWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoc3RkOjpvcHRpb25hbDxXZWJDb3Jl
OjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlVzZWRMZWdhY3lU
TFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25z
dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENvbnRpbnVlTG9hZGluZykg
ZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNv
cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IDg3YTVkNjU3ZjdiNzMzZDA3
YzVkYjYwMWY2OTgxZjkwNDk3NzEzOTMuLjhiN2ZhYmY0NmE0NTZhMDUyOGZiYTRiYmQ2NDY1Y2Rj
OTU1OWFkNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBw
b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCkBAIC02NzMsNiArNjczLDEx
IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25h
bExvYWQoKQogICAgICAgICBDYWxsRnJhbWVMb2FkRGVsZWdhdGUoaW1wbGVtZW50YXRpb25zLT5k
aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lRnVuYywgd2ViVmlldywgQHNlbGVjdG9yKHdl
YlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTopLCBtX3dlYkZyYW1lLmdldCgp
KTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92
aXNpb25hbExvYWQoKQoreworICAgIG1fd2ViRnJhbWUtPl9wcml2YXRlLT5wcm92aXNpb25hbFVS
TCA9IG51bGxwdHI7Cit9CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0bGVMZW5n
dGggPSAxMDAwOyAvLyBDbG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVjb21tZW5k
YXRpb24gZm9yIFRpdGxlIGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlz
cGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYg
dGl0bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggMTI3MGU1N2RkOTViMGQw
MDAzYjVlNTY3N2Q0NzQyYTEyNTUyZDg1My4uZDNiZjQ4YTk5YjEwY2Q2MThmODQ4NTE2MmJhMTRi
ZjQwN2NiYWM4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1
cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv
d2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDE4LDYgKzQx
OCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlz
aW9uYWxMb2FkKCkKICAgICAgICAgZnJhbWVMb2FkRGVsZWdhdGUtPmRpZFN0YXJ0UHJvdmlzaW9u
YWxMb2FkRm9yRnJhbWUod2ViVmlldywgbV93ZWJGcmFtZSk7CiB9CiAKK3ZvaWQgV2ViRnJhbWVM
b2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sKK30KKwog
dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3Qg
U3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCiB7CiAgICAgV2ViVmlldyogd2ViVmlldyA9IG1f
d2ViRnJhbWUtPndlYlZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDc5MjZm
ZDM2NzE4MDllODM4NDdhNDgwMzFhOGI5MGM2MzhmYWY3ZTQuLmZkNGU4NzE2NDhkNDJlNTQwNWZj
NmJiMTczNjBlZDM5MGM4NGZlNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktp
dExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtODMs
NiArODMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGluUGFn
ZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBvdmVycmlkZTsKICAg
ICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBvdmVycmlkZTsKKyAgICB2
b2lkIGRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRoRGlyZWN0
aW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoc3RkOjpvcHRp
b25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6
OlVzZWRMZWdhY3lUTFM+KSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zp
c2lvbmFsTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENv
bnRpbnVlTG9hZGluZykgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDA1N2MxMGRkNjUyNmE4NWNjODUwYmE0
OWY3ZTg4NjllZGYzOGEzZi4uOGY1ODkxODQzZmUxZmNkNDg2YjIzNTExYjU1NWI0MTk5OGIyYjk0
YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAxLTMxICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBm
b3IgdGhpcy4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2Fk
LWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0
LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMzAgIEtpbW1v
IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgTGF5b3V0
VGVzdHMvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIHRvIDIwMjEtNi0yNCB2ZXJzaW9uCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlz
aW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDQ2ZWM2ZTQ3MzRlNGU0
YjY2MGRkZTEzZjNmMGRkZGQ4ODdiNTRiOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDIgQEAKKworVGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JB
U0guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9u
YWwtbG9hZC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zp
c2lvbmFsLWxvYWQtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMGZjMGEyYzQ4M2YxNTk4YzRhNjkw
NjgzMzJlM2RiZjkwNDNmYjQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9s
b2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbApAQCAtMCwwICsxLDE3IEBA
Cis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgaWQ9InNjcmlwdCI+CitpZiAod2luZG93LnRlc3RS
dW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitmdW5jdGlvbiBydW5UZXN0KCkg
eworICBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5z
dG9wKCk7IAorfQorZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hp
bGQoaWZyYW1lKTsgCisgIGRvY3VtZW50Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxl
cjsKK30KKzwvc2NyaXB0PgorPGJvZHkgb25sb2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9Imlm
cmFtZSIgb25sb2FkPSJldmVudGhhbmRsZXIoKSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+
VGhpcyB0ZXN0IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450408</attachid>
            <date>2022-01-31 07:15:46 -0800</date>
            <delta_ts>2022-01-31 09:01:46 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220131151545.patch</filename>
            <type>text/plain</type>
            <size>12929</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MjdiMGUyMjY5Y2Zh
ZDVhODEzNDg5NDRhMWM1NzQ4NmE3OTU5YS4uMjZmOTc1NTBiNTczMDFjYzg3YWY3Mzg5MDM1MDgz
MWQ2ODM5NDQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXVEZdIEFkZCBHZW5lcmljSGFzaEtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NGE2ODA3Njdl
MWVkNmZmYzJlYmM2NzU1ODJhMDYxN2JmOTdlNDZiLi5jOTVlNzBmZmYzMWM1NmYzNzNlY2UxYWQ3
NDlkNTc5Mjg2YTVmYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
OgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIERlbGV0ZSBjb2RlIGZvciBrZXlnZW4gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nCmluZGV4IGE4ZWM1ZGVkZTEyMWZkNzAwOGY0YmY2ZGU3YTQ2ZDA3NmMxMDdhYTIuLjQ2ZTk3
N2YyYzRiNTdjYTVmZmRmNjIxODNhMTVhYWIwMDZlYzlmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBs
b2FkZXIgc3RhdGUgb24gcHJvdmlzaW9uYWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg
ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG
cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAy
MDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERl
bGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNGZjNjQwY2E2MGE0NzZkYmY0YjNiZGRjNjA3ZTQy
M2M4NzEwYzA5My4uZmFkN2VhNTA2ZDQ3OTIyZmYxYTQwYWIyMWM2Y2Y5NjM5YjlhYWU4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2Ug
Zm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt
cHR5RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxMTZhMTdkMWY1YzllNjQ3ZTFmMTQxYTEwMDg2
YjA3OTgzOTNmM2VhLi41YmFjYjRmNmQ3OTNlNGE3ZTMwMGZhMmZkOTgzOGVlM2Q4YmYyOTI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKQEAg
LTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRo
aW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAg
IHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOworICAgIHZvaWQg
ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0luc2VjdXJl
Q29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImLCBXaWxs
Q29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CmluZGV4IDMxZmI4YTVkZjZhMDkxYTM0MzAyNmE5OTZkNTc1MWM3NTYyZmMxNmUuLjczZTZiMzEw
YmQ2MTg3MzNmZDQ0ZThlMDk1NWIxOTZkMWJkZDZhODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcApAQCAtMjEzOSw2ICsyMTM5LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy
YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIGlmIChtX3N0
YXRlICE9IEZyYW1lU3RhdGU6OlByb3Zpc2lvbmFsKQogICAgICAgICByZXR1cm47CiAKKyAgICBp
ZiAoIW1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgeworICAgICAgICBtX2NsaWVudC0+ZGlz
cGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K
ICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkpIHsKICAgICAgICAgaWYg
KFNjcm9sbEFuaW1hdG9yKiBzY3JvbGxBbmltYXRvciA9IHZpZXctPmV4aXN0aW5nU2Nyb2xsQW5p
bWF0b3IoKSkKICAgICAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT5jYW5jZWxBbmltYXRpb25zKCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDM1MmE0YzRm
YjUwNGY3Y2Q0ZDJlYzQwNmU2YmMyOTExYTU1ZmQwOTQuLjk1MzJmNzYwNTQyZjVmNzE4MTk4MDI3
NDQ2NzdiMjUyMmU2ZDA0OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt
ZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs
aWVudC5oCkBAIC0xNzMsNiArMTczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNw
YXRjaFdpbGxDbG9zZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
SWNvbigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFs
TG9hZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29u
c3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE
aWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRp
b25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZh
aWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRp
bmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDI4ZWM4ZTIzOGNh
NWJmZGYwZGM1MjZmNTZkNmVmYjE4OTAwYWNiZDAuLjExNDZlYzNjZWI2ODg3NDRiYzQ2MGMzYjlk
MTNiZDljZTU3MTM1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTM4
LDYgKzUzOCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv
eHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBt
X2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFsTG9hZGVyLT5yZXF1ZXN0KCksIHByb3Zpc2lvbmFs
TG9hZGVyLT5uYXZpZ2F0aW9uSUQoKSwgdXJsLCB1bnJlYWNoYWJsZVVSTCwgVXNlckRhdGEoV2Vi
UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n
ZXQoKSkuZ2V0KCkpKSk7CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo
RGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sKK30KKwogc3RhdGljIGNvbnN0ZXhwciB1bnNp
Z25lZCBtYXhUaXRsZUxlbmd0aCA9IDEwMDA7IC8vIENsb3Nlc3QgcG93ZXIgb2YgMTAgYWJvdmUg
dGhlIFczQyByZWNvbW1lbmRhdGlvbiBmb3IgVGl0bGUgbGVuZ3RoLgogCiB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGly
ZWN0aW9uJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMWQzMGJjMzkz
ODNhZmZmMmNhOWMyODc1M2RkMmQ3ZWMyYjI2NDkxZS4uZTk2MzM0NjI3NTc4MGY3NjMyMDg5NWM1
ZDJkY2UwZGU5OWViMmU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTExNCw2
ICsxMTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBh
Z2UoKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggOGRmOTkzZjJkNzc1YjZjOTNkMmU4
ZjA5OTBmNzJmODVmNjE4ZTU4ZS4uZGU4ODdkYjIxYmI2ODExNjRiYTgwNDZiOTliZjlmYmI3NjNk
ZDZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTgsNiArMTE4LDcgQEAgcHJp
dmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRleCA4N2E1ZDY1N2Y3YjczM2QwN2M1
ZGI2MDFmNjk4MWY5MDQ5NzcxMzkzLi44YjdmYWJmNDZhNDU2YTA1MjhmYmE0YmJkNjQ2NWNkYzk1
NTlhZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtNjczLDYgKzY3MywxMSBA
QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkKICAgICAgICAgQ2FsbEZyYW1lTG9hZERlbGVnYXRlKGltcGxlbWVudGF0aW9ucy0+ZGlk
U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZUZ1bmMsIHdlYlZpZXcsIEBzZWxlY3Rvcih3ZWJW
aWV3OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6KSwgbV93ZWJGcmFtZS5nZXQoKSk7
CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlz
aW9uYWxMb2FkKCkKK3sKKyAgICBtX3dlYkZyYW1lLT5fcHJpdmF0ZS0+cHJvdmlzaW9uYWxVUkwg
PSBudWxscHRyOworfQorCiBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1heFRpdGxlTGVuZ3Ro
ID0gMTAwMDsgLy8gQ2xvc2VzdCBwb3dlciBvZiAxMCBhYm92ZSB0aGUgVzNDIHJlY29tbWVuZGF0
aW9uIGZvciBUaXRsZSBsZW5ndGguCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh
dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mIHRp
dGxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29y
ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDEyNzBlNTdkZDk1YjBkMDAw
M2I1ZTU2NzdkNDc0MmExMjU1MmQ4NTMuLmQzYmY0OGE5OWIxMGNkNjE4Zjg0ODUxNjJiYTE0YmY0
MDdjYmFjODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBw
b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTQxOCw2ICs0MTgs
MTAgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lv
bmFsTG9hZCgpCiAgICAgICAgIGZyYW1lTG9hZERlbGVnYXRlLT5kaWRTdGFydFByb3Zpc2lvbmFs
TG9hZEZvckZyYW1lKHdlYlZpZXcsIG1fd2ViRnJhbWUpOwogfQogCit2b2lkIFdlYkZyYW1lTG9h
ZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7Cit9CisKIHZv
aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0
cmluZ1dpdGhEaXJlY3Rpb24mIHRpdGxlKQogewogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBtX3dl
YkZyYW1lLT53ZWJWaWV3KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2Fj
eS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCA3OTI2ZmQz
NjcxODA5ZTgzODQ3YTQ4MDMxYThiOTBjNjM4ZmFmN2U0Li5mZDRlODcxNjQ4ZDQyZTU0MDVmYzZi
YjE3MzYwZWQzOTBjODRmZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTgzLDYg
KzgzLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2Uo
KSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgb3ZlcnJpZGU7CiAgICAg
dm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CisgICAgdm9p
ZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIG92ZXJyaWRlOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlv
biYpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9u
YWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpV
c2VkTGVnYWN5VExTPikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNp
b25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250
aW51ZUxvYWRpbmcpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQwNTdjMTBkZDY1MjZhODVjYzg1MGJhNDlm
N2U4ODY5ZWRmMzhhM2YuLjhmNTg5MTg0M2ZlMWZjZDQ4NmIyMzUxMWI1NTViNDE5OThiMmI5NGEg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2Fs
aWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9y
IHRoaXMuCisKKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1j
cmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1w
cm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAxLTMwICBLaW1tbyBL
aW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIExheW91dFRl
c3RzL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyB0byAyMDIxLTYtMjQgdmVyc2lvbgpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lv
bmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ0NmVjNmU0NzM0ZTRlNGI2
NjBkZGUxM2YzZjBkZGRkODg3YjU0YjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m
YXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSwyIEBACisKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNI
LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTM1ODYyNjJhOTBhYzdjOGRmNDQ3ZmVi
MmE1YTJlMzhlMDQwY2Y5NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h
ZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxOSBAQAor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVu
bmVyKSB7CisgICAgdGVzdFJ1bm5lci5kdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCk7CisgICAg
dGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cit9CitmdW5jdGlvbiBydW5UZXN0KCkgeworICBkb2N1
bWVudC5jcmVhdGVFbGVtZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5zdG9wKCk7IAor
fQorZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBzY3JpcHQuYXBwZW5kQ2hpbGQoaWZyYW1l
KTsgCisgIGRvY3VtZW50Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGV2ZW50aGFuZGxlcjsKK30KKzwv
c2NyaXB0PgorPGJvZHkgb25sb2FkPXJ1blRlc3QoKT4KKzxpZnJhbWUgaWQ9ImlmcmFtZSIgb25s
b2FkPSJldmVudGhhbmRsZXIoKSIgc3JjZG9jPSJmb28iPjwvaWZyYW1lPgorPHA+VGhpcyB0ZXN0
IGhhcyBQQVNTRUQgaWYgaXQgZG9lcyBub3QgQ1JBU0guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450412</attachid>
            <date>2022-01-31 09:01:51 -0800</date>
            <delta_ts>2022-02-01 04:43:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220131170150.patch</filename>
            <type>text/plain</type>
            <size>13036</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MjdiMGUyMjY5Y2Zh
ZDVhODEzNDg5NDRhMWM1NzQ4NmE3OTU5YS4uMjZmOTc1NTBiNTczMDFjYzg3YWY3Mzg5MDM1MDgz
MWQ2ODM5NDQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXVEZdIEFkZCBHZW5lcmljSGFzaEtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NGE2ODA3Njdl
MWVkNmZmYzJlYmM2NzU1ODJhMDYxN2JmOTdlNDZiLi5jOTVlNzBmZmYzMWM1NmYzNzNlY2UxYWQ3
NDlkNTc5Mjg2YTVmYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o
OgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIERlbGV0ZSBjb2RlIGZvciBrZXlnZW4gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl
TG9nCmluZGV4IGE4ZWM1ZGVkZTEyMWZkNzAwOGY0YmY2ZGU3YTQ2ZDA3NmMxMDdhYTIuLjQ2ZTk3
N2YyYzRiNTdjYTVmZmRmNjIxODNhMTVhYWIwMDZlYzlmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0zMSAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBs
b2FkZXIgc3RhdGUgb24gcHJvdmlzaW9uYWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAg
ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG
cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAy
MDIyLTAxLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERl
bGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0
TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNGZjNjQwY2E2MGE0NzZkYmY0YjNiZGRjNjA3ZTQy
M2M4NzEwYzA5My4uZmFkN2VhNTA2ZDQ3OTIyZmYxYTQwYWIyMWM2Y2Y5NjM5YjlhYWU4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTMxICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJv
dmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMwICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2Ug
Zm9yIGVuYWJsaW5nIGtleWdlbiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt
cHR5RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCAxMTZhMTdkMWY1YzllNjQ3ZTFmMTQxYTEwMDg2
YjA3OTgzOTNmM2VhLi41YmFjYjRmNmQ3OTNlNGE3ZTMwMGZhMmZkOTgzOGVlM2Q4YmYyOTI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKQEAg
LTg0LDYgKzg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUG9wU3RhdGVXaXRo
aW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAg
IHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOworICAgIHZvaWQg
ZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsK
ICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0luc2VjdXJl
Q29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImLCBXaWxs
Q29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw
CmluZGV4IDMxZmI4YTVkZjZhMDkxYTM0MzAyNmE5OTZkNTc1MWM3NTYyZmMxNmUuLjczZTZiMzEw
YmQ2MTg3MzNmZDQ0ZThlMDk1NWIxOTZkMWJkZDZhODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy
YW1lTG9hZGVyLmNwcApAQCAtMjEzOSw2ICsyMTM5LDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy
YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIGlmIChtX3N0
YXRlICE9IEZyYW1lU3RhdGU6OlByb3Zpc2lvbmFsKQogICAgICAgICByZXR1cm47CiAKKyAgICBp
ZiAoIW1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgeworICAgICAgICBtX2NsaWVudC0+ZGlz
cGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K
ICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkpIHsKICAgICAgICAgaWYg
KFNjcm9sbEFuaW1hdG9yKiBzY3JvbGxBbmltYXRvciA9IHZpZXctPmV4aXN0aW5nU2Nyb2xsQW5p
bWF0b3IoKSkKICAgICAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT5jYW5jZWxBbmltYXRpb25zKCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDM1MmE0YzRm
YjUwNGY3Y2Q0ZDJlYzQwNmU2YmMyOTExYTU1ZmQwOTQuLjk1MzJmNzYwNTQyZjVmNzE4MTk4MDI3
NDQ2NzdiMjUyMmU2ZDA0OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt
ZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs
aWVudC5oCkBAIC0xNzMsNiArMTczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNw
YXRjaFdpbGxDbG9zZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZl
SWNvbigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFs
TG9hZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29u
c3QgU3RyaW5nV2l0aERpcmVjdGlvbiYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE
aWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRp
b25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZh
aWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRp
bmcpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw
cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDI4ZWM4ZTIzOGNh
NWJmZGYwZGM1MjZmNTZkNmVmYjE4OTAwYWNiZDAuLjExNDZlYzNjZWI2ODg3NDRiYzQ2MGMzYjlk
MTNiZDljZTU3MTM1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTM4
LDYgKzUzOCwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0
UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv
eHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBt
X2ZyYW1lLT5pbmZvKCksIHByb3Zpc2lvbmFsTG9hZGVyLT5yZXF1ZXN0KCksIHByb3Zpc2lvbmFs
TG9hZGVyLT5uYXZpZ2F0aW9uSUQoKSwgdXJsLCB1bnJlYWNoYWJsZVVSTCwgVXNlckRhdGEoV2Vi
UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n
ZXQoKSkuZ2V0KCkpKSk7CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo
RGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCkKK3sKK30KKwogc3RhdGljIGNvbnN0ZXhwciB1bnNp
Z25lZCBtYXhUaXRsZUxlbmd0aCA9IDEwMDA7IC8vIENsb3Nlc3QgcG93ZXIgb2YgMTAgYWJvdmUg
dGhlIFczQyByZWNvbW1lbmRhdGlvbiBmb3IgVGl0bGUgbGVuZ3RoLgogCiB2b2lkIFdlYkZyYW1l
TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGly
ZWN0aW9uJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMWQzMGJjMzkz
ODNhZmZmMmNhOWMyODc1M2RkMmQ3ZWMyYjI2NDkxZS4uZTk2MzM0NjI3NTc4MGY3NjMyMDg5NWM1
ZDJkY2UwZGU5OWViMmU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTExNCw2
ICsxMTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBh
Z2UoKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVT
dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggOGRmOTkzZjJkNzc1YjZjOTNkMmU4
ZjA5OTBmNzJmODVmNjE4ZTU4ZS4uZGU4ODdkYjIxYmI2ODExNjRiYTgwNDZiOTliZjlmYmI3NjNk
ZDZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJD
b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0xMTgsNiArMTE4LDcgQEAgcHJp
dmF0ZToKICAgICAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CisgICAgdm9pZCBkaXNw
YXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE
aWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFs
OwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6
SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExT
PikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg
V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIGZp
bmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3Jl
U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRleCA4N2E1ZDY1N2Y3YjczM2QwN2M1
ZGI2MDFmNjk4MWY5MDQ5NzcxMzkzLi44YjdmYWJmNDZhNDU2YTA1MjhmYmE0YmJkNjQ2NWNkYzk1
NTlhZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y
dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtNjczLDYgKzY3MywxMSBA
QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM
b2FkKCkKICAgICAgICAgQ2FsbEZyYW1lTG9hZERlbGVnYXRlKGltcGxlbWVudGF0aW9ucy0+ZGlk
U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZUZ1bmMsIHdlYlZpZXcsIEBzZWxlY3Rvcih3ZWJW
aWV3OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6KSwgbV93ZWJGcmFtZS5nZXQoKSk7
CiB9CiAKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlz
aW9uYWxMb2FkKCkKK3sKKyAgICBtX3dlYkZyYW1lLT5fcHJpdmF0ZS0+cHJvdmlzaW9uYWxVUkwg
PSBudWxscHRyOworfQorCiBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG1heFRpdGxlTGVuZ3Ro
ID0gMTAwMDsgLy8gQ2xvc2VzdCBwb3dlciBvZiAxMCBhYm92ZSB0aGUgVzNDIHJlY29tbWVuZGF0
aW9uIGZvciBUaXRsZSBsZW5ndGguCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh
dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mIHRp
dGxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQv
V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29y
ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDEyNzBlNTdkZDk1YjBkMDAw
M2I1ZTU2NzdkNDc0MmExMjU1MmQ4NTMuLmQzYmY0OGE5OWIxMGNkNjE4Zjg0ODUxNjJiYTE0YmY0
MDdjYmFjODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBw
b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp
bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTQxOCw2ICs0MTgs
MTAgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lv
bmFsTG9hZCgpCiAgICAgICAgIGZyYW1lTG9hZERlbGVnYXRlLT5kaWRTdGFydFByb3Zpc2lvbmFs
TG9hZEZvckZyYW1lKHdlYlZpZXcsIG1fd2ViRnJhbWUpOwogfQogCit2b2lkIFdlYkZyYW1lTG9h
ZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7Cit9CisKIHZv
aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0
cmluZ1dpdGhEaXJlY3Rpb24mIHRpdGxlKQogewogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBtX3dl
YkZyYW1lLT53ZWJWaWV3KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2Fj
eS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCA3OTI2ZmQz
NjcxODA5ZTgzODQ3YTQ4MDMxYThiOTBjNjM4ZmFmN2U0Li5mZDRlODcxNjQ4ZDQyZTU0MDVmYzZi
YjE3MzYwZWQzOTBjODRmZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9X
ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTgzLDYg
KzgzLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2Uo
KSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgb3ZlcnJpZGU7CiAgICAg
dm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7CisgICAgdm9p
ZCBkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpIG92ZXJyaWRlOwogICAgIHZvaWQg
ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlv
biYpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKHN0ZDo6b3B0aW9u
YWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50Piwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpV
c2VkTGVnYWN5VExTPikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNp
b25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250
aW51ZUxvYWRpbmcpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQwNTdjMTBkZDY1MjZhODVjYzg1MGJhNDlm
N2U4ODY5ZWRmMzhhM2YuLjIxMWU5M2JlZmE4OTI4ZmJiNjMyNWRlODQ5NGNiZjgwZDA2YzFkNWYg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorICAgIDIwMjItMDEtMzEgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzUzNgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0
IGZvciB0aGlzLgorCisgICAgICAgICogZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxv
YWQtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9jb21t
aXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0zMCAgS2lt
bW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBMYXlv
dXRUZXN0cy9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMgdG8gMjAyMS02LTI0IHZlcnNpb24KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2Fk
LWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92
aXNpb25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ODJlYTMxMjNkODE2
MWQ3ZTcyODQzYWZhOGM0ZjU0NzQ5Zjc4ZWY0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0
CkBAIC0wLDAgKzEgQEAKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNI
LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmUyMDM2YWExOWZiZTZhZTM2MWJjOWY0
NWI4OTUyYWE2NmRkZTA4MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h
ZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyNSBAQAor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVu
bmVyKSB7CisgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgdGVzdFJ1bm5lci5k
dW1wQXNUZXh0KCk7Cit9CitmdW5jdGlvbiBydW5UZXN0KCkgeworICBkb2N1bWVudC5jcmVhdGVF
bGVtZW50KCJhdWRpbyIpLmxvYWQoKTsgCisgIHdpbmRvdy5zdG9wKCk7IAorfQorbGV0IG51bSA9
IDA7CitmdW5jdGlvbiBldmVudGhhbmRsZXIoKSB7CisgIG51bSsrOworICBpZiAobnVtIDwgMTAw
MCkgeworICAgIHNjcmlwdC5hcHBlbmRDaGlsZChpZnJhbWUpOyAKKyAgICBkb2N1bWVudC5vbnJl
YWR5c3RhdGVjaGFuZ2UgPSBldmVudGhhbmRsZXI7CisgIH0gZWxzZSBpZiAod2luZG93LnRlc3RS
dW5uZXIpIHsKKyAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgfQorfQorPC9zY3JpcHQ+
Cis8Ym9keSBvbmxvYWQ9cnVuVGVzdCgpPgorPGlmcmFtZSBpZD0iaWZyYW1lIiBvbmxvYWQ9ImV2
ZW50aGFuZGxlcigpIiBzcmNkb2M9ImZvbyI+PC9pZnJhbWU+Cis8cD5UaGlzIHRlc3QgaGFzIFBB
U1NFRCBpZiBpdCBkb2VzIG5vdCBDUkFTSC48L3A+Cis8L2JvZHk+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450517</attachid>
            <date>2022-02-01 04:43:53 -0800</date>
            <delta_ts>2022-02-04 08:28:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220201124351.patch</filename>
            <type>text/plain</type>
            <size>13044</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM4NzU3NjYxNmZkYWI5
YzE0MTJlYjU0YTBiMTllM2EyYTY2NWE3Mi4uZDAzOTFkYWI4ZDI5NWU3ZGVmNjU5YzcxMTYwNTJm
NmQ5MTY2ODZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTAxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIG51bGwgcHJvdmlz
aW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBDaGVjayBmb3IgbnVsbCBwcm92aXNpb25hbCBsb2FkZXIuIEFsc28gcHJvdmlkZQorICAg
ICAgICBBUEkgdG8gaGFuZGxlIGEgcHJvdmlzaW9uYWwgbG9hZCBjYW5jZWxhdGlvbi4KKworICAg
ICAgICBUZXN0OiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1s
CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq
IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6
dHJhbnNpdGlvblRvQ29tbWl0dGVkKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXJDbGll
bnQuaDoKKwogMjAyMi0wMi0wMSAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAg
ICAgIEVudGlyZWx5IHJlbW92ZSBzdXBwb3J0IGZvciAtYXBwbGUtdHJhaWxpbmctd29yZApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZwppbmRleCAwODc3MDI0OTI5OWM3ZTZjNjNiN2E2NTkzZmZmNmE3YWI4N2NjNjUxLi42NzdhZjUy
ZmJmNDQ5ZjdjOGU0NmIyZDA5NWRkMmUzNGFjNzkwMGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2
IEBACisyMDIyLTAyLTAxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg
Q2hlY2sgZm9yIG51bGwgcHJvdmlzaW9uYWwgbG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGFwdCB0byBBUEkgY2hhbmdlLgorCisgICAgICAg
ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6Cisg
ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFBy
b3Zpc2lvbmFsTG9hZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG
cmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIyLTAxLTMxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t
YXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIEZvbnRDYXNjYWRlOjpmb250TWV0
cmljcygpIGFuZCBSZW5kZXJTdHlsZTo6Zm9udE1ldHJpY3MoKSB0byBmb250TWV0cmljc09mUHJp
bWFyeUZvbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n
IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGNlMmQxNjkzZmU5YmE5
MzQ2MmQ1NTc3NzhjNTQ2MzJkYTY4ODE0MDQuLjEyZmViNDMyYTY5N2JiZDJmNjU5YTc0NWQxNDJi
OTM3MWMyNGEzOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA
QAorMjAyMi0wMi0wMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIENo
ZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBsb2FkZXIgc3RhdGUgb24gcHJvdmlzaW9u
YWwKKyAgICAgICAgbG9hZCBjYW5jZWxhdGlvbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0
L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJh
bWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0
Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQpOgorCiAyMDIyLTAxLTMxICBNeWxlcyBDLiBNYXhm
aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIEZvbnRDYXNjYWRl
Ojpmb250TWV0cmljcygpIGFuZCBSZW5kZXJTdHlsZTo6Zm9udE1ldHJpY3MoKSB0byBmb250TWV0
cmljc09mUHJpbWFyeUZvbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4v
Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCmluZGV4IDRmYzY0
MGNhNjBhNDc2ZGJmNGIzYmRkYzYwN2U0MjNjODcxMGMwOTMuLjk4MDE2ODQ1OGFmMjU3MTNiOTE1
M2FkNDdmODAzZGYxZjU0NGFjZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNiBAQAorMjAyMi0wMi0wMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisg
ICAgICAgIENoZWNrIGZvciBudWxsIHByb3Zpc2lvbmFsIGxvYWRlcgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTM2CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRhcHQgdG8gQVBJIGNoYW5nZS4KKwor
ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg
ICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9h
ZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKwog
MjAyMi0wMS0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBE
ZWxldGUgcnVudGltZSBwcmVmZXJlbmNlIGZvciBlbmFibGluZyBrZXlnZW4gZWxlbWVudApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggMTE2
YTE3ZDFmNWM5ZTY0N2UxZjE0MWExMDA4NmIwNzk4MzkzZjNlYS4uNWJhY2I0ZjZkNzkzZTRhN2Uz
MDBmYTJmZDk4MzhlZTNkOGJmMjkyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy
L0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w
dHlGcmFtZUxvYWRlckNsaWVudC5oCkBAIC04NCw2ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgdm9p
ZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGluUGFnZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0
Y2hXaWxsQ2xvc2UoKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25h
bExvYWQoKSBmaW5hbDsKKyAgICB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2Fk
KCkgZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJp
bmdXaXRoRGlyZWN0aW9uJikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQo
c3RkOjpvcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBzdGQ6Om9wdGlvbmFsPFVzZWRMZWdh
Y3lUTFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChj
b25zdCBSZXNvdXJjZUVycm9yJiwgV2lsbENvbnRpbnVlTG9hZGluZykgZmluYWw7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNv
cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzMWZiOGE1ZGY2YTA5MWEzNDMwMjZhOTk2
ZDU3NTFjNzU2MmZjMTZlLi43M2U2YjMxMGJkNjE4NzMzZmQ0NGU4ZTA5NTViMTk2ZDFiZGQ2YTg3
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTIxMzksNiArMjEzOSwx
MCBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSog
Y2FjaGVkUGFnZSkKICAgICBpZiAobV9zdGF0ZSAhPSBGcmFtZVN0YXRlOjpQcm92aXNpb25hbCkK
ICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCFtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIp
IHsKKyAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkQ2FuY2VsUHJvdmlzaW9uYWxMb2FkKCk7
CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IG1fZnJh
bWUudmlldygpKSB7CiAgICAgICAgIGlmIChTY3JvbGxBbmltYXRvciogc2Nyb2xsQW5pbWF0b3Ig
PSB2aWV3LT5leGlzdGluZ1Njcm9sbEFuaW1hdG9yKCkpCiAgICAgICAgICAgICBzY3JvbGxBbmlt
YXRvci0+Y2FuY2VsQW5pbWF0aW9ucygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk
ZXJDbGllbnQuaAppbmRleCAzNTJhNGM0ZmI1MDRmN2NkNGQyZWM0MDZlNmJjMjkxMWE1NWZkMDk0
Li45NTMyZjc2MDU0MmY1ZjcxODE5ODAyNzQ0Njc3YjI1MjJlNmQwNDlkIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMTczLDYgKzE3Myw3IEBAIHB1Ymxp
YzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSA9IDA7CiAgICAgdmlydHVh
bCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlz
cGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlz
cGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRp
c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSA9IDA7CiAg
ICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPEhhc0lu
c2VjdXJlQ29udGVudD4sIHN0ZDo6b3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pID0gMDsKICAgICB2
aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNl
RXJyb3ImLCBXaWxsQ29udGludWVMb2FkaW5nKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp
ZW50LmNwcAppbmRleCAyOGVjOGUyMzhjYTViZmRmMGRjNTI2ZjU2ZDZlZmIxODkwMGFjYmQwLi4x
MTQ2ZWMzY2ViNjg4NzQ0YmM0NjBjM2I5ZDEzYmQ5Y2U1NzEzNWEzIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt
ZUxvYWRlckNsaWVudC5jcHAKQEAgLTUzOCw2ICs1MzgsMTAgQEAgdm9pZCBXZWJGcmFtZUxvYWRl
ckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgd2ViUGFnZS0+
c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy
YW1lKG1fZnJhbWUtPmZyYW1lSUQoKSwgbV9mcmFtZS0+aW5mbygpLCBwcm92aXNpb25hbExvYWRl
ci0+cmVxdWVzdCgpLCBwcm92aXNpb25hbExvYWRlci0+bmF2aWdhdGlvbklEKCksIHVybCwgdW5y
ZWFjaGFibGVVUkwsIFVzZXJEYXRhKFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnRyYW5zZm9ybU9i
amVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdldCgpKSkpOwogfQogCit2b2lkIFdlYkZy
YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7Cit9
CisKIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbWF4VGl0bGVMZW5ndGggPSAxMDAwOyAvLyBD
bG9zZXN0IHBvd2VyIG9mIDEwIGFib3ZlIHRoZSBXM0MgcmVjb21tZW5kYXRpb24gZm9yIFRpdGxl
IGxlbmd0aC4KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNlaXZl
VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUpCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu
aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl
ckNsaWVudC5oCmluZGV4IDFkMzBiYzM5MzgzYWZmZjJjYTljMjg3NTNkZDJkN2VjMmIyNjQ5MWUu
LmU5NjMzNDYyNzU3ODBmNzYzMjA4OTVjNWQyZGNlMGRlOTllYjJlODcgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu
dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt
ZUxvYWRlckNsaWVudC5oCkBAIC0xMTQsNiArMTE0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRp
c3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaFdp
bGxDbG9zZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9h
ZCgpIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBm
aW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0
cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9h
ZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4sIHN0ZDo6b3B0aW9u
YWw8V2ViQ29yZTo6VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRG
YWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBXZWJDb3Jl
OjpXaWxsQ29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2Uv
V2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmlu
ZGV4IDhkZjk5M2YyZDc3NWI2YzkzZDJlOGYwOTkwZjcyZjg1ZjYxOGU1OGUuLmRlODg3ZGIyMWJi
NjgxMTY0YmE4MDQ2Yjk5YmY5ZmJiNzYzZGQ2YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291
cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu
aApAQCAtMTE4LDYgKzExOCw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAgdm9pZCBkaXNwYXRjaFdp
bGxDbG9zZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9h
ZCgpIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExvYWQoKSBm
aW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0
cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9h
ZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4sIHN0ZDo6b3B0aW9u
YWw8V2ViQ29yZTo6VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRG
YWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBXZWJDb3Jl
OjpXaWxsQ29udGludWVMb2FkaW5nKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvU291cmNl
L1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0K
aW5kZXggODdhNWQ2NTdmN2I3MzNkMDdjNWRiNjAxZjY5ODFmOTA0OTc3MTM5My4uOGI3ZmFiZjQ2
YTQ1NmEwNTI4ZmJhNGJiZDY0NjVjZGM5NTU5YWQ3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIv
U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll
bnQubW0KQEAgLTY3Myw2ICs2NzMsMTEgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlz
cGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgICAgIENhbGxGcmFtZUxvYWREZWxl
Z2F0ZShpbXBsZW1lbnRhdGlvbnMtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVGdW5j
LCB3ZWJWaWV3LCBAc2VsZWN0b3Iod2ViVmlldzpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy
YW1lOiksIG1fd2ViRnJhbWUuZ2V0KCkpOwogfQogCit2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50
OjpkaXNwYXRjaERpZENhbmNlbFByb3Zpc2lvbmFsTG9hZCgpCit7CisgICAgbV93ZWJGcmFtZS0+
X3ByaXZhdGUtPnByb3Zpc2lvbmFsVVJMID0gbnVsbHB0cjsKK30KKwogc3RhdGljIGNvbnN0ZXhw
ciB1bnNpZ25lZCBtYXhUaXRsZUxlbmd0aCA9IDEwMDA7IC8vIENsb3Nlc3QgcG93ZXIgb2YgMTAg
YWJvdmUgdGhlIFczQyByZWNvbW1lbmRhdGlvbiBmb3IgVGl0bGUgbGVuZ3RoLgogCiB2b2lkIFdl
YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3Jl
OjpTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM
ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJj
ZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw
cAppbmRleCAxMjcwZTU3ZGQ5NWIwZDAwMDNiNWU1Njc3ZDQ3NDJhMTI1NTJkODUzLi5kM2JmNDhh
OTliMTBjZDYxOGY4NDg1MTYyYmExNGJmNDA3Y2JhYzgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysr
IGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD
bGllbnQuY3BwCkBAIC00MTgsNiArNDE4LDEwIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6
OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKQogICAgICAgICBmcmFtZUxvYWREZWxl
Z2F0ZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh3ZWJWaWV3LCBtX3dlYkZyYW1l
KTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDYW5jZWxQcm92
aXNpb25hbExvYWQoKQoreworfQorCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRj
aERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJiB0aXRsZSkKIHsKICAg
ICBXZWJWaWV3KiB3ZWJWaWV3ID0gbV93ZWJGcmFtZS0+d2ViVmlldygpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll
bnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h
ZGVyQ2xpZW50LmgKaW5kZXggNzkyNmZkMzY3MTgwOWU4Mzg0N2E0ODAzMWE4YjkwYzYzOGZhZjdl
NC4uZmQ0ZTg3MTY0OGQ0MmU1NDA1ZmM2YmIxNzM2MGVkMzkwYzg0ZmU0YyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll
bnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt
ZUxvYWRlckNsaWVudC5oCkBAIC04Myw2ICs4Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3Bh
dGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaFdp
bGxDbG9zZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFs
TG9hZCgpIG92ZXJyaWRlOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxQcm92aXNpb25hbExv
YWQoKSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdl
YkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mKSBvdmVycmlkZTsKICAgICB2b2lkIGRpc3BhdGNo
RGlkQ29tbWl0TG9hZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4s
IHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6VXNlZExlZ2FjeVRMUz4pIG92ZXJyaWRlOwogICAgIHZv
aWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNl
RXJyb3ImLCBXZWJDb3JlOjpXaWxsQ29udGludWVMb2FkaW5nKSBvdmVycmlkZTsKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBl
YmNiZDU2ODhmZWNkZWMwMmE2ZDkxYWRhOWZiN2YzNmMzYWZiYjBkLi4yMWRlOGJmNjM1ZjdkZjkx
Y2JkZjBmZTJhZGEwMjBjNWVjOTE1NTk0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDEt
MzEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBDaGVjayBmb3IgbnVs
bCBwcm92aXNpb25hbCBsb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgorCisgICAgICAgICogZmFzdC9sb2FkZXIv
Y29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBmYXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC5odG1sOiBBZGRl
ZC4KKwogMjAyMi0wMi0wMSAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAgICAg
IEVudGlyZWx5IHJlbW92ZSBzdXBwb3J0IGZvciAtYXBwbGUtdHJhaWxpbmctd29yZApkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lv
bmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ0NmVjNmU0NzM0ZTRlNGI2
NjBkZGUxM2YzZjBkZGRkODg3YjU0YjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m
YXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSwyIEBACisKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNI
LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzViZWExZWY1OGE2NDJhMjM2OTRiNmE1
YWNhZDIwODBiOGM4MDU5MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h
ZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyMSBAQAor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVu
bmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworZnVuY3Rpb24gcnVuVGVzdCgpIHsK
KyAgZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXVkaW8iKS5sb2FkKCk7IAorICB3aW5kb3cuc3Rv
cCgpOyAKK30KK2xldCBudW0gPSAwOworZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBpZiAo
bnVtIDwgMikgeworICAgIG51bSsrOworICAgIHNjcmlwdC5hcHBlbmRDaGlsZChpZnJhbWUpOyAK
KyAgfQorICBkb2N1bWVudC5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBldmVudGhhbmRsZXI7Cit9Cis8
L3NjcmlwdD4KKzxib2R5IG9ubG9hZD1ydW5UZXN0KCk+Cis8aWZyYW1lIGlkPSJpZnJhbWUiIG9u
bG9hZD0iZXZlbnRoYW5kbGVyKCkiIHNyY2RvYz0iZm9vIj48L2lmcmFtZT4KKzxwPlRoaXMgdGVz
dCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNILjwvcD4KKzwvYm9keT4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450901</attachid>
            <date>2022-02-04 08:28:13 -0800</date>
            <delta_ts>2022-02-10 09:01:02 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220204162812.patch</filename>
            <type>text/plain</type>
            <size>4779</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQ3ODQxMTQyMmM1NDFi
NGViODc1OTVhMzUwMjNjY2E1MmQ1MTZlZi4uZDM5OGU0YTkyNTgxOTZkM2E0NDZlNTdkMmQxNTc3
OGE3NTYwNGIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQmFpbCBvdXQgZWFybHkgaW4gc3Rv
cEZvclVzZXJDYW5jZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyMzUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEJhaWwgb3V0IGVhcmx5IGluIHN0b3BGb3JVc2VyQ2FuY2VsIGluIGNhc2UKKyAgICAg
ICAgdGhlIGZyYW1lIGlzIGFscmVhZHkgaW4gdGhlIHByb2Nlc3Mgb2Ygc3RvcHBpbmcuCisKKyAg
ICAgICAgVGVzdDogZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRt
bAorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkZyYW1lTG9hZGVyOjpzdG9wRm9yQmFja0ZvcndhcmRDYWNoZSk6CisgICAgICAgIChXZWJDb3Jl
OjpGcmFtZUxvYWRlcjo6c3RvcEZvclVzZXJDYW5jZWwpOgorICAgICAgICAqIGxvYWRlci9GcmFt
ZUxvYWRlci5oOgorCiAyMDIyLTAyLTA0ICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2Fs
aWEuY29tPgogCiAgICAgICAgIEZpeCBmb3Igbm9uLXVuaWZpZWQgYnVpbGRzIGFmdGVyIHIyODY4
MjEgKDI0NTA1NkBtYWluKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l
TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXgg
MzFmYjhhNWRmNmEwOTFhMzQzMDI2YTk5NmQ1NzUxYzc1NjJmYzE2ZS4uZmEyN2EzMDA0ZmU2NjJk
NWEwMDg0YTgyMmFjZmExOTAwMjg1NDk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk
ZXIuY3BwCkBAIC0xODI3LDYgKzE4MjcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wQWxsTG9h
ZGVycyhDbGVhclByb3Zpc2lvbmFsSXRlbSBjbGVhclByb3Zpc2lvbmFsSXRlbSwgU3RvcAogCiB2
b2lkIEZyYW1lTG9hZGVyOjpzdG9wRm9yQmFja0ZvcndhcmRDYWNoZSgpCiB7CisgICAgbV9pblN0
b3BGb3JCYWNrRm9yd2FyZENhY2hlID0gdHJ1ZTsKICAgICAvLyBTdG9wIHByb3Zpc2lvbmFsIGxv
YWRzIGluIHN1YmZyYW1lcyAoVGhlIG9uZSBpbiB0aGUgbWFpbiBmcmFtZSBpcyBhYm91dCB0byBi
ZSBjb21taXR0ZWQpLgogICAgIGlmICghbV9mcmFtZS5pc01haW5GcmFtZSgpKSB7CiAgICAgICAg
IGlmIChtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIpCkBAIC0xODQ2LDYgKzE4NDcsNyBAQCB2
b2lkIEZyYW1lTG9hZGVyOjpzdG9wRm9yQmFja0ZvcndhcmRDYWNoZSgpCiAgICAgLy8gcnVubmlu
ZyBzY3JpcHQsIHdoaWNoIGNvdWxkIHNjaGVkdWxlIG5ldyBuYXZpZ2F0aW9ucy4KICAgICBwb2xp
Y3lDaGVja2VyKCkuc3RvcENoZWNrKCk7CiAgICAgbV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVy
KCkuY2FuY2VsKCk7CisgICAgbV9pblN0b3BGb3JCYWNrRm9yd2FyZENhY2hlID0gZmFsc2U7CiB9
CiAKIHZvaWQgRnJhbWVMb2FkZXI6OnN0b3BBbGxMb2FkZXJzQW5kQ2hlY2tDb21wbGV0ZW5lc3Mo
KQpAQCAtMTg2Myw2ICsxODY1LDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcEFsbExvYWRlcnNB
bmRDaGVja0NvbXBsZXRlbmVzcygpCiAKIHZvaWQgRnJhbWVMb2FkZXI6OnN0b3BGb3JVc2VyQ2Fu
Y2VsKGJvb2wgZGVmZXJDaGVja0xvYWRDb21wbGV0ZSkKIHsKKyAgICBpZiAobV9pblN0b3BGb3JC
YWNrRm9yd2FyZENhY2hlKQorICAgICAgICByZXR1cm47CiAgICAgLy8gQ2FsbGluZyBzdG9wQWxs
TG9hZGVycyBjYW4gY2F1c2UgdGhlIGZyYW1lIHRvIGJlIGRlYWxsb2NhdGVkLCBpbmNsdWRpbmcg
dGhlIGZyYW1lIGxvYWRlci4KICAgICBSZWY8RnJhbWU+IHByb3RlY3RlZEZyYW1lKG1fZnJhbWUp
OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1Nv
dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDZjN2Y1MDhjZTJlNmNhMTIy
Y2ExZmRmNGM1NWEzMzE3NDBhMzc5ZDYuLjhjYTBjNjQ3NDEyZWQxNjc2NGMzM2M5ZTA0YzgyY2I5
NjgxMThiY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC01MDQsNiArNTA0
LDggQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IG1fcmVxdWVzdGVkSGlzdG9y
eUl0ZW07CiAKICAgICBib29sIG1fYWx3YXlzQWxsb3dMb2NhbFdlYmFyY2hpdmUgeyBmYWxzZSB9
OworCisgICAgYm9vbCBtX2luU3RvcEZvckJhY2tGb3J3YXJkQ2FjaGUgeyBmYWxzZSB9OwogfTsK
IAogLy8gVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgYnkgY3JlYXRlV2luZG93KCkgaW4gSlNET01X
aW5kb3dCYXNlLmNwcCwgZm9yIGV4YW1wbGUsIGZvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI2ZDdhMGQ5YjBhNjIxNGQ1
ODYxMDIwYTM1NzBhMTRhMDE0NWY1MGYuLjQ1N2U1M2EzMTgwOGNkNmYyZTRjZDhiNGQzNWVjOTVk
OTgyOTdjZWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMi0wMi0wNCAgUm9iIEJ1aXMgIDxy
YnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEJhaWwgb3V0IGVhcmx5IGluIHN0b3BGb3JVc2Vy
Q2FuY2VsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB
ZGQgdGVzdCBmb3IgdGhpcy4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2Fk
ZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjItMDIt
MDMgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBU
d28gYm9wb21vZm8gdG9uZSBtYXJrcyBhcmUgbm90IG1vdmVkIHRvIHRoZSBjb3JyZWN0IHBsYWNl
IGluIHZlcnRpY2FsIHRleHQgd2l0aCBhIHBhcnRpY3VsYXIgYm9wb21vZm8gZm9udApkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFsLWxvYWQtY3Jh
c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lv
bmFsLWxvYWQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ0NmVjNmU0NzM0ZTRlNGI2
NjBkZGUxM2YzZjBkZGRkODg3YjU0YjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m
YXN0L2xvYWRlci9jb21taXQtcHJvdmlzaW9uYWwtbG9hZC1jcmFzaC1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSwyIEBACisKK1RoaXMgdGVzdCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNI
LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY29tbWl0LXByb3Zpc2lvbmFs
LWxvYWQtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NvbW1pdC1wcm92aXNp
b25hbC1sb2FkLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzViZWExZWY1OGE2NDJhMjM2OTRiNmE1
YWNhZDIwODBiOGM4MDU5MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h
ZGVyL2NvbW1pdC1wcm92aXNpb25hbC1sb2FkLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyMSBAQAor
PCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IGlkPSJzY3JpcHQiPgoraWYgKHdpbmRvdy50ZXN0UnVu
bmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworZnVuY3Rpb24gcnVuVGVzdCgpIHsK
KyAgZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXVkaW8iKS5sb2FkKCk7IAorICB3aW5kb3cuc3Rv
cCgpOyAKK30KK2xldCBudW0gPSAwOworZnVuY3Rpb24gZXZlbnRoYW5kbGVyKCkgeworICBpZiAo
bnVtIDwgMikgeworICAgIG51bSsrOworICAgIHNjcmlwdC5hcHBlbmRDaGlsZChpZnJhbWUpOyAK
KyAgfQorICBkb2N1bWVudC5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBldmVudGhhbmRsZXI7Cit9Cis8
L3NjcmlwdD4KKzxib2R5IG9ubG9hZD1ydW5UZXN0KCk+Cis8aWZyYW1lIGlkPSJpZnJhbWUiIG9u
bG9hZD0iZXZlbnRoYW5kbGVyKCkiIHNyY2RvYz0iZm9vIj48L2lmcmFtZT4KKzxwPlRoaXMgdGVz
dCBoYXMgUEFTU0VEIGlmIGl0IGRvZXMgbm90IENSQVNILjwvcD4KKzwvYm9keT4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>451548</attachid>
            <date>2022-02-10 09:01:13 -0800</date>
            <delta_ts>2022-03-28 15:54:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-223536-20220210170112.patch</filename>
            <type>text/plain</type>
            <size>1851</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJlZmJiMGE1MjAyMmIz
Njk0NzI5YjBjM2EyZTYzMDJmOGVhOTMzOS4uZGEzNDY5ZWVmOWM5ZWZjNmIyM2I2ZDQ3ZWU3ZjVj
MDZiZTg2NGIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgZm9yIHJlLWVudHJhbmN5
IGluIHN0b3BGb3JCYWNrRm9yd2FyZENhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBDaGVjayBmb3IgcmUtZW50cmFuY3kgaW4gc3RvcEZvckJhY2tG
b3J3YXJkQ2FjaGUuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnN0b3BGb3JCYWNrRm9yd2FyZENhY2hlKToKKwogMjAy
Mi0wMi0xMCAgR2F2aW4gUGhpbGxpcHMgIDxnYXZpbi5wQGFwcGxlLmNvbT4KIAogICAgICAgICBJ
bnRyb2R1Y2UgU2lnbmVkUHRyVHJhaXRzIHdoaWNoIGVuYWJsZXMgUmVmIHBvaW50ZXJzIHRvIGJl
IHByb3RlY3RlZCB3aXRoIFB0clRhZ3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk
ZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw
cAppbmRleCBmYTI3YTMwMDRmZTY2MmQ1YTAwODRhODIyYWNmYTE5MDAyODU0OTYxLi40NjU2Y2Ex
ZWE1ZTdmMzQ5ZGY2Y2YwMDc4N2RjMDkwNzViYWFjODJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G
cmFtZUxvYWRlci5jcHAKQEAgLTE4MjcsNyArMTgyNyw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnN0
b3BBbGxMb2FkZXJzKENsZWFyUHJvdmlzaW9uYWxJdGVtIGNsZWFyUHJvdmlzaW9uYWxJdGVtLCBT
dG9wCiAKIHZvaWQgRnJhbWVMb2FkZXI6OnN0b3BGb3JCYWNrRm9yd2FyZENhY2hlKCkKIHsKLSAg
ICBtX2luU3RvcEZvckJhY2tGb3J3YXJkQ2FjaGUgPSB0cnVlOworICAgIEFTU0VSVCghbV9pblN0
b3BGb3JCYWNrRm9yd2FyZENhY2hlKTsKKyAgICBTZXRGb3JTY29wZTxib29sPiBpblN0b3BGb3JC
YWNrRm9yd2FyZENhY2hlIHsgbV9pblN0b3BGb3JCYWNrRm9yd2FyZENhY2hlLCB0cnVlIH07CiAg
ICAgLy8gU3RvcCBwcm92aXNpb25hbCBsb2FkcyBpbiBzdWJmcmFtZXMgKFRoZSBvbmUgaW4gdGhl
IG1haW4gZnJhbWUgaXMgYWJvdXQgdG8gYmUgY29tbWl0dGVkKS4KICAgICBpZiAoIW1fZnJhbWUu
aXNNYWluRnJhbWUoKSkgewogICAgICAgICBpZiAobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVy
KQpAQCAtMTg0Nyw3ICsxODQ4LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcEZvckJhY2tGb3J3
YXJkQ2FjaGUoKQogICAgIC8vIHJ1bm5pbmcgc2NyaXB0LCB3aGljaCBjb3VsZCBzY2hlZHVsZSBu
ZXcgbmF2aWdhdGlvbnMuCiAgICAgcG9saWN5Q2hlY2tlcigpLnN0b3BDaGVjaygpOwogICAgIG1f
ZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLmNhbmNlbCgpOwotICAgIG1faW5TdG9wRm9yQmFj
a0ZvcndhcmRDYWNoZSA9IGZhbHNlOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wQWxsTG9h
ZGVyc0FuZENoZWNrQ29tcGxldGVuZXNzKCkK
</data>

          </attachment>
      

    </bug>

</bugzilla>