<?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>225864</bug_id>
          
          <creation_ts>2021-05-17 03:36:05 -0700</creation_ts>
          <short_desc>ASSERT(!toType.isArray()) failure in sh::CoerceSimple due to vector array dereference</short_desc>
          <delta_ts>2021-05-19 13:57:17 -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>ANGLE</component>
          <version>WebKit Local Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>macOS 10.15</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="Kimmo Kinnunen">kkinnunen</reporter>
          <assigned_to name="Kyle Piddington">kpiddington</assigned_to>
          <cc>dino</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>graouts</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1760716</commentid>
    <comment_count>0</comment_count>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-05-17 03:36:05 -0700</bug_when>
    <thetext>ASSERT(!toType.isArray()) failure in sh::CoerceSimple due to vector array dereference

https://playcanv.as/e/p/44MRmJRU/


#version 300 es
void main(){vec2 S[1];S;}


Process:               com.apple.WebKit.WebContent.Development [8288]
Path:                  /Users/USER/*/com.apple.WebKit.WebContent.Development
Identifier:            com.apple.WebKit.WebContent
Version:               612+ (612.1.13+)
Code Type:             X86-64 (Native)
Parent Process:        ??? [1]
Responsible:           MiniBrowser [6920]
User ID:               501

PlugIn Path:             /Users/USER/*/libANGLE-shared.dylib
PlugIn Identifier:       libANGLE-shared.dylib
PlugIn Version:          ??? (0)

Date/Time:             2021-05-17 12:50:57.808 +0300
OS Version:            macOS 11.3 (20E201)
Report Version:        12
Bridge OS Version:     6.0 (19P253)
Anonymous UUID:        ADEB2724-109F-6379-8A4B-657A6A37BBA8

Sleep/Wake UUID:       1C32DABA-8A49-4470-B6BB-977317E3EC81

Time Awake Since Boot: 57000 seconds
Time Since Wake:       1500 seconds

System Integrity Protection: enabled

Crashed Thread:        0  Dispatch queue: com.apple.main-thread

Exception Type:        EXC_BAD_INSTRUCTION (SIGILL)
Exception Codes:       0x0000000000000001, 0x0000000000000000
Exception Note:        EXC_CORPSE_NOTIFY

Termination Signal:    Illegal instruction: 4
Termination Reason:    Namespace SIGNAL, Code 0x4
Terminating Process:   exc handler [8288]

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   libANGLE-shared.dylib         	0x00000003b8b0222e gl::LogMessage::~LogMessage() + 238 (debug.cpp:199)
1   libANGLE-shared.dylib         	0x00000003b8b01b05 gl::LogMessage::~LogMessage() + 21 (debug.cpp:175)
2   libANGLE-shared.dylib         	0x00000003b89bdf19 sh::CoerceSimple(sh::TType const&amp;, sh::TIntermTyped&amp;, bool) + 1545 (AstHelpers.cpp:480)
3   libANGLE-shared.dylib         	0x00000003b89a4119 (anonymous namespace)::Rewriter::visitAggregatePost(sh::TIntermAggregate&amp;) + 537 (AddExplicitTypeCasts.cpp:53)
4   libANGLE-shared.dylib         	0x00000003b8ddeef6 sh::TIntermRebuild::traversePost(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 1542 (IntermRebuild.cpp:504)
5   libANGLE-shared.dylib         	0x00000003b8ddd659 sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 585 (IntermRebuild.cpp:328)
6   libANGLE-shared.dylib         	0x00000003b8de14a1 sh::TIntermTyped* sh::TIntermRebuild::traverseAnyAs&lt;sh::TIntermTyped&gt;(sh::TIntermNode&amp;) + 33 (IntermRebuild.cpp:233)
7   libANGLE-shared.dylib         	0x00000003b8ddf652 sh::TIntermRebuild::traverseBinaryChildren(sh::TIntermBinary&amp;) + 706 (IntermRebuild.cpp:573)
8   libANGLE-shared.dylib         	0x00000003b8dde624 sh::TIntermRebuild::traverseChildren(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 708 (IntermRebuild.cpp:422)
9   libANGLE-shared.dylib         	0x00000003b8ddd5fe sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 494 (IntermRebuild.cpp:322)
10  libANGLE-shared.dylib         	0x00000003b8ddd979 sh::TIntermRebuild::traverseAggregateBaseChildren(sh::TIntermAggregateBase&amp;) + 761 (IntermRebuild.cpp:266)
11  libANGLE-shared.dylib         	0x00000003b8de0ce6 sh::TIntermRebuild::traverseDeclarationChildren(sh::TIntermDeclaration&amp;) + 38 (IntermRebuild.cpp:541)
12  libANGLE-shared.dylib         	0x00000003b8dde803 sh::TIntermRebuild::traverseChildren(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 1187 (IntermRebuild.cpp:443)
13  libANGLE-shared.dylib         	0x00000003b8ddd5fe sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 494 (IntermRebuild.cpp:322)
14  libANGLE-shared.dylib         	0x00000003b8ddd979 sh::TIntermRebuild::traverseAggregateBaseChildren(sh::TIntermAggregateBase&amp;) + 761 (IntermRebuild.cpp:266)
15  libANGLE-shared.dylib         	0x00000003b8de0a66 sh::TIntermRebuild::traverseBlockChildren(sh::TIntermBlock&amp;) + 38 (IntermRebuild.cpp:532)
16  libANGLE-shared.dylib         	0x00000003b8dde7a5 sh::TIntermRebuild::traverseChildren(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 1093 (IntermRebuild.cpp:438)
17  libANGLE-shared.dylib         	0x00000003b8ddd5fe sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 494 (IntermRebuild.cpp:322)
18  libANGLE-shared.dylib         	0x00000003b8de15f1 sh::TIntermBlock* sh::TIntermRebuild::traverseAnyAs&lt;sh::TIntermBlock&gt;(sh::TIntermNode&amp;) + 33 (IntermRebuild.cpp:233)
19  libANGLE-shared.dylib         	0x00000003b8de091c sh::TIntermRebuild::traverseFunctionDefinitionChildren(sh::TIntermFunctionDefinition&amp;) + 796 (IntermRebuild.cpp:736)
20  libANGLE-shared.dylib         	0x00000003b8dde747 sh::TIntermRebuild::traverseChildren(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 999 (IntermRebuild.cpp:434)
21  libANGLE-shared.dylib         	0x00000003b8ddd5fe sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 494 (IntermRebuild.cpp:322)
22  libANGLE-shared.dylib         	0x00000003b8ddd979 sh::TIntermRebuild::traverseAggregateBaseChildren(sh::TIntermAggregateBase&amp;) + 761 (IntermRebuild.cpp:266)
23  libANGLE-shared.dylib         	0x00000003b8de0a66 sh::TIntermRebuild::traverseBlockChildren(sh::TIntermBlock&amp;) + 38 (IntermRebuild.cpp:532)
24  libANGLE-shared.dylib         	0x00000003b8dde7a5 sh::TIntermRebuild::traverseChildren(sh::NodeType, sh::TIntermNode const&amp;, sh::TIntermNode&amp;, sh::TIntermRebuild::VisitBits) + 1093 (IntermRebuild.cpp:438)
25  libANGLE-shared.dylib         	0x00000003b8ddd5fe sh::TIntermRebuild::traverseAny(sh::TIntermNode&amp;) + 494 (IntermRebuild.cpp:322)
26  libANGLE-shared.dylib         	0x00000003b8de15f1 sh::TIntermBlock* sh::TIntermRebuild::traverseAnyAs&lt;sh::TIntermBlock&gt;(sh::TIntermNode&amp;) + 33 (IntermRebuild.cpp:233)
27  libANGLE-shared.dylib         	0x00000003b8ddd2a0 bool sh::TIntermRebuild::rebuildInPlaceImpl&lt;sh::TIntermBlock&gt;(sh::TIntermBlock&amp;) + 32 (IntermRebuild.cpp:209)
28  libANGLE-shared.dylib         	0x00000003b8ddd1ad sh::TIntermRebuild::rebuildInPlace(sh::TIntermBlock&amp;) + 29 (IntermRebuild.cpp:198)
29  libANGLE-shared.dylib         	0x00000003b8ddd154 sh::TIntermRebuild::rebuildRoot(sh::TIntermBlock&amp;) + 36 (IntermRebuild.cpp:184)
30  libANGLE-shared.dylib         	0x00000003b89a3d9c sh::AddExplicitTypeCasts(sh::TCompiler&amp;, sh::TIntermBlock&amp;, sh::SymbolEnv&amp;, bool) + 76 (AddExplicitTypeCasts.cpp:91)
31  libANGLE-shared.dylib         	0x00000003b91f3d68 sh::TranslatorMetalDirect::translateImpl(sh::TIntermBlock&amp;, unsigned long long) + 5976 (TranslatorMetalDirect.cpp:1457)
32  libANGLE-shared.dylib         	0x00000003b91f6bcc sh::TranslatorMetalDirect::translate(sh::TIntermBlock*, unsigned long long, sh::PerformanceDiagnostics*) + 316 (TranslatorMetalDirect.cpp:1552)
33  libANGLE-shared.dylib         	0x00000003b8a31efe sh::TCompiler::compile(char const* const*, unsigned long, unsigned long long) + 286 (Compiler.cpp:981)
34  libANGLE-shared.dylib         	0x00000003b910cbb4 sh::Compile(void*, char const* const*, unsigned long, unsigned long long) + 340 (ShaderLang.cpp:336)
35  libANGLE-shared.dylib         	0x00000003b910aa80 rx::TranslateTask::operator()() + 288 (ShaderImpl.cpp:52)
36  libANGLE-shared.dylib         	0x00000003b92baa9f angle::SingleThreadedWorkerPool::postWorkerTask(std::__1::shared_ptr&lt;angle::Closure&gt;) + 47 (WorkerThread.cpp:68)
37  libANGLE-shared.dylib         	0x00000003b92bbe14 angle::WorkerThreadPool::PostWorkerTask(std::__1::shared_ptr&lt;angle::WorkerThreadPool&gt;, std::__1::shared_ptr&lt;angle::Closure&gt;) + 84 (WorkerThread.cpp:348)
38  libANGLE-shared.dylib         	0x00000003b910fec2 rx::ShaderMtl::compileImplMtl(gl::Context const*, gl::ShCompilerInstance*, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; const&amp;, unsigned long long) + 242 (ShaderMtl.mm:99)
39  libANGLE-shared.dylib         	0x00000003b9110399 rx::ShaderMtl::compile(gl::Context const*, gl::ShCompilerInstance*, unsigned long long) + 521 (ShaderMtl.mm:147)
40  libANGLE-shared.dylib         	0x00000003b90f232f gl::Shader::compile(gl::Context const*) + 1663 (Shader.cpp:367)
41  libANGLE-shared.dylib         	0x00000003b8a6fc19 gl::Context::compileShader(gl::ShaderProgramID) + 73 (Context.cpp:6183)
42  libANGLE-shared.dylib         	0x00000003b8bc5416 gl::CompileShader(unsigned int) + 134 (entry_points_gles_2_0_autogen.cpp:541)
43  com.apple.WebCore             	0x0000000391e530a4 WebCore::GraphicsContextGLOpenGL::compileShader(unsigned int) + 148 (GraphicsContextGLANGLE.cpp:918)
44  com.apple.WebCore             	0x00000003953bafae WebCore::WebGLRenderingContextBase::compileShader(WebCore::WebGLShader&amp;) + 126 (WebGLRenderingContextBase.cpp:1756)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760717</commentid>
    <comment_count>1</comment_count>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-05-17 03:36:32 -0700</bug_when>
    <thetext>Possibly the reason for
&lt;rdar://77968214&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760718</commentid>
    <comment_count>2</comment_count>
      <attachid>428818</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-05-17 03:42:58 -0700</bug_when>
    <thetext>Created attachment 428818
Test to fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760719</commentid>
    <comment_count>3</comment_count>
      <attachid>428819</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-05-17 03:57:22 -0700</bug_when>
    <thetext>Created attachment 428819
Test to fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760965</commentid>
    <comment_count>4</comment_count>
      <attachid>428897</attachid>
    <who name="Kyle Piddington">kpiddington</who>
    <bug_when>2021-05-17 17:24:41 -0700</bug_when>
    <thetext>Created attachment 428897
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760966</commentid>
    <comment_count>5</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-05-17 17:25:47 -0700</bug_when>
    <thetext>Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1761062</commentid>
    <comment_count>6</comment_count>
      <attachid>428897</attachid>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-05-17 23:54:24 -0700</bug_when>
    <thetext>Comment on attachment 428897
Patch

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

&gt; Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/AddExplicitTypeCasts.cpp:44
&gt;              }

You still need to Tools/Scripts/prepare-ChangeLog -b 225864 -g HEAD to get the ANGLE/ChangeLog edits

&gt; Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/AddExplicitTypeCasts.cpp:47
&gt; +                //1 element arrays need to be accounted for.

It&apos;s really an issue with arrays of any arity?
(got the crash/assert with other numbers, too).

&gt; Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ProgramMtl.mm:1274
&gt;          bool hasDepthSampler = false;

Are these related to the array assert or are these in fact fixing some other bug?

&gt; LayoutTests/ChangeLog:10
&gt; +        WIP: adds just the tests.

Might want to remove this line</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1761659</commentid>
    <comment_count>7</comment_count>
      <attachid>429086</attachid>
    <who name="Kyle Piddington">kpiddington</who>
    <bug_when>2021-05-19 12:48:34 -0700</bug_when>
    <thetext>Created attachment 429086
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1761687</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-05-19 13:56:46 -0700</bug_when>
    <thetext>Committed r277749 (237919@main): &lt;https://commits.webkit.org/237919@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 429086.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1761688</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-05-19 13:57:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/78223139&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428818</attachid>
            <date>2021-05-17 03:42:58 -0700</date>
            <delta_ts>2021-05-17 03:57:18 -0700</delta_ts>
            <desc>Test to fix</desc>
            <filename>bug-225864-20210517134257.patch</filename>
            <type>text/plain</type>
            <size>2143</size>
            <attacher name="Kimmo Kinnunen">kkinnunen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTc3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmIwNjJiY2I2YzlhMzRhNzhhNWU4
ODc2NWNjNzZjY2NiZjRiMzVkZC4uNzM4YWFlNWE2NGNjMjMwNjFhNmIzMDAxOGMyOGZlYmMyODg2
YTNlYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTE3ICBLaW1tbyBLaW5udW5lbiAg
PGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKCF0b1R5cGUuaXNBcnJheSgp
KSBmYWlsdXJlIGluIHNoOjpDb2VyY2VTaW1wbGUgZHVlIHRvIHZlY3RvciBhcnJheSBkZXJlZmVy
ZW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
ODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQ
OiBhZGRzIGp1c3QgdGhlIHRlc3RzLgorCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvc2hh
ZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg
ICAqIGZhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2guaHRt
bDogQWRkZWQuCisKIDIwMjEtMDUtMTYgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxl
LmNvbT4KIAogICAgICAgICBNYWtlIE1hdGhNTCBXUFRzIHdhaXQgZm9yIGFsbCBmb250IGxvYWRz
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFy
cmF5LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz
L3dlYmdsL3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLmM2ZGYzODUyNTdmZmMzNzIyNWIxM2Y3OWJmM2FkMzMyMzY2Y2MzZWIKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFycmF5
LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK0NPTlNPTEUgTUVT
U0FHRTogQ291bGQgbm90IGNvbXBpbGUgV2ViR0wgcHJvZ3JhbS4gSW5mbzoKKwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1u
by1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1h
cnJheS1kZXJlZi1uby1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjMxMTY3MTZhYjhmODViNTBkNGJi
N2FjNjcwYzY0YzQ5ZjBjNjhmNWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0
L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFycmF5LWRlcmVmLW5vLWNyYXNoLmh0bWwKQEAgLTAs
MCArMSwxNiBAQAorPGJvZHk+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICB0
ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKK2xldCBjID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi
Y2FudmFzIik7CitsZXQgZ2wgPSBjLmdldENvbnRleHQoIndlYmdsMiIpOworbGV0IHZzID0gZ2wu
Y3JlYXRlU2hhZGVyKGdsLlZFUlRFWF9TSEFERVIpOworZ2wuc2hhZGVyU291cmNlKHZzLCAiI3Zl
cnNpb24gMzAwIGVzXG52b2lkIG1haW4oKXt2ZWMyIFNbMV07Uzt9Iik7CitnbC5jb21waWxlU2hh
ZGVyKHZzKTsKK2lmICghZ2wuZ2V0U2hhZGVyUGFyYW1ldGVyKHZzLCBnbC5DT01QSUxFX1NUQVRV
UykgKSB7CisgICAgbGV0IGluZm8gPSBnbC5nZXRTaGFkZXJJbmZvTG9nKHZzKTsKKyAgICB0aHJv
dyAnQ291bGQgbm90IGNvbXBpbGUgV2ViR0wgcHJvZ3JhbS4gSW5mbzonICsgaW5mbzsKK30KK2Rv
Y3VtZW50LmJvZHkuaW5uZXJIVE1MICs9ICJQQVNTLCBubyBjcmFzaC4iCis8L3NjcmlwdD4KKzwv
Ym9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428819</attachid>
            <date>2021-05-17 03:57:22 -0700</date>
            <delta_ts>2021-05-17 17:24:39 -0700</delta_ts>
            <desc>Test to fix</desc>
            <filename>bug-225864-20210517135721.patch</filename>
            <type>text/plain</type>
            <size>2099</size>
            <attacher name="Kimmo Kinnunen">kkinnunen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTc3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmIwNjJiY2I2YzlhMzRhNzhhNWU4
ODc2NWNjNzZjY2NiZjRiMzVkZC4uNzM4YWFlNWE2NGNjMjMwNjFhNmIzMDAxOGMyOGZlYmMyODg2
YTNlYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTE3ICBLaW1tbyBLaW5udW5lbiAg
PGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKCF0b1R5cGUuaXNBcnJheSgp
KSBmYWlsdXJlIGluIHNoOjpDb2VyY2VTaW1wbGUgZHVlIHRvIHZlY3RvciBhcnJheSBkZXJlZmVy
ZW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
ODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQ
OiBhZGRzIGp1c3QgdGhlIHRlc3RzLgorCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvc2hh
ZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg
ICAqIGZhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2guaHRt
bDogQWRkZWQuCisKIDIwMjEtMDUtMTYgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxl
LmNvbT4KIAogICAgICAgICBNYWtlIE1hdGhNTCBXUFRzIHdhaXQgZm9yIGFsbCBmb250IGxvYWRz
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFy
cmF5LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz
L3dlYmdsL3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLjkwMjJjOWYyMTMzOGQ2MTM1MjQ0N2UwYzk0ZDkxMDVmYzNiMjM4MWMKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFycmF5
LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTLCBubyBjcmFz
aC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMt
YXJyYXktZGVyZWYtbm8tY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmds
L3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0
NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMTE2NzE2
YWI4Zjg1YjUwZDRiYjdhYzY3MGM2NGM0OWYwYzY4ZjVhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5
b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFz
aC5odG1sCkBAIC0wLDAgKzEsMTYgQEAKKzxib2R5PgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVz
dFJ1bm5lcikKKyAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitsZXQgYyA9IGRvY3VtZW50LmNy
ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOworbGV0IGdsID0gYy5nZXRDb250ZXh0KCJ3ZWJnbDIiKTsK
K2xldCB2cyA9IGdsLmNyZWF0ZVNoYWRlcihnbC5WRVJURVhfU0hBREVSKTsKK2dsLnNoYWRlclNv
dXJjZSh2cywgIiN2ZXJzaW9uIDMwMCBlc1xudm9pZCBtYWluKCl7dmVjMiBTWzFdO1M7fSIpOwor
Z2wuY29tcGlsZVNoYWRlcih2cyk7CitpZiAoIWdsLmdldFNoYWRlclBhcmFtZXRlcih2cywgZ2wu
Q09NUElMRV9TVEFUVVMpICkgeworICAgIGxldCBpbmZvID0gZ2wuZ2V0U2hhZGVySW5mb0xvZyh2
cyk7CisgICAgdGhyb3cgJ0NvdWxkIG5vdCBjb21waWxlIFdlYkdMIHByb2dyYW0uIEluZm86JyAr
IGluZm87Cit9Citkb2N1bWVudC5ib2R5LmlubmVySFRNTCArPSAiUEFTUywgbm8gY3Jhc2guIgor
PC9zY3JpcHQ+Cis8L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428897</attachid>
            <date>2021-05-17 17:24:41 -0700</date>
            <delta_ts>2021-05-19 12:48:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225864-20210517172440.patch</filename>
            <type>text/plain</type>
            <size>6084</size>
            <attacher name="Kyle Piddington">kpiddington</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQWRk
RXhwbGljaXRUeXBlQ2FzdHMuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBp
bGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0FkZEV4cGxpY2l0VHlwZUNhc3Rz
LmNwcAppbmRleCA4NGQxNzFkMmQzYzRhMTMxNzJlOGZhNjcyZTBlODdmYTgzODc2M2RkLi4wOGY4
ZTg5NDEzNDA4YjkzNDdlMDUyYjZmODNjODkyZjc2OGI4ZGU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxE
aXJlY3QvQWRkRXhwbGljaXRUeXBlQ2FzdHMuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO
R0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9BZGRFeHBs
aWNpdFR5cGVDYXN0cy5jcHAKQEAgLTQ0LDcgKzQ0LDggQEAgY2xhc3MgUmV3cml0ZXIgOiBwdWJs
aWMgVEludGVybVJlYnVpbGQKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGVsc2UgaWYgKHJl
dFR5cGUuaXNWZWN0b3IoKSkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBpZiAoYXJn
Q291bnQgPT0gMSkKKyAgICAgICAgICAgICAgICAvLzEgZWxlbWVudCBhcnJheXMgbmVlZCB0byBi
ZSBhY2NvdW50ZWQgZm9yLgorICAgICAgICAgICAgICAgIGlmIChhcmdDb3VudCA9PSAxICYmICFy
ZXRUeXBlLmlzQXJyYXkoKSkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAg
IFRJbnRlcm1UeXBlZCAmYXJnICAgPSBHZXRBcmcoY2FsbE5vZGUsIDApOwogICAgICAgICAgICAg
ICAgICAgICBjb25zdCBUVHlwZSBhcmdUeXBlID0gYXJnLmdldFR5cGUoKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9n
cmFtTXRsLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVy
L21ldGFsL1Byb2dyYW1NdGwubW0KaW5kZXggZmNhZWQ4NTllMGQzYTQ4ZmUxMjA5NmQwMDgzNzNj
NTI3NTUwMTgyNy4uOWVjNDIxNTBhOTE5YTJmNWViZTdiYzliNTdiZWMyZTEyMWZhYTBiNyAxMDA2
NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l
dGFsL1Byb2dyYW1NdGwubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO
R0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0KQEAgLTI4Miw2ICsyODIsNyBAQCB2b2lk
IFByb2dyYW1NdGw6OnJlc2V0KENvbnRleHRNdGwgKmNvbnRleHQpCiAgICAgZm9yIChnbDo6U2hh
ZGVyVHlwZSBzaGFkZXJUeXBlIDogZ2w6OkFsbFNoYWRlclR5cGVzKCkpCiAgICAgewogICAgICAg
ICBtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tzaGFkZXJUeXBlXS5yZXNldCgpOworICAgICAgICBt
Q3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRlclR5cGVdID0gbnVsbHB0cjsKICAgICB9CiAgICAg
bU1zbFhmYk9ubHlWZXJ0ZXhTaGFkZXJJbmZvLnJlc2V0KCk7CiAKQEAgLTcxNCw2ICs3MTUsNyBA
QCBhbmdsZTo6UmVzdWx0IFByb2dyYW1NdGw6OmdldFNwZWNpYWxpemVkU2hhZGVyKG10bDo6Q29u
dGV4dCAqY29udGV4dCwKICAgICB9CiAKICAgICAvLyBTdG9yZSByZWZlcmVuY2UgdG8gdGhlIHRy
YW5zbGF0ZWQgc291cmNlIGZvciBlYXNpbHkgcXVlcnlpbmcgbWFwcGVkIGJpbmRpbmdzIGxhdGVy
LgorICAgIEFTU0VSVCh0cmFuc2xhdGVkTXNsSW5mbyk7CiAgICAgc2hhZGVyVmFyaWFudC0+dHJh
bnNsYXRlZFNyY0luZm8gPSB0cmFuc2xhdGVkTXNsSW5mbzsKIAogICAgIC8vIEluaXRpYWxpemUg
YXJndW1lbnQgYnVmZmVyIGVuY29kZXIgaWYgcmVxdWlyZWQKQEAgLTExNzksNiArMTE4MSw3IEBA
IGFuZ2xlOjpSZXN1bHQgUHJvZ3JhbU10bDo6c2V0dXBEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpn
bENvbnRleHQsCiAgICAgICAgICAgICBwaXBlbGluZURlc2MucmFzdGVyaXphdGlvbkVuYWJsZWQo
KQogICAgICAgICAgICAgICAgID8gJm1GcmFnbWVudFNoYWRlclZhcmlhbnRzW3BpcGVsaW5lRGVz
Yy5lbXVsYXRlQ292ZXJhZ2VNYXNrXQogICAgICAgICAgICAgICAgIDogbnVsbHB0cjsKKyAgICAg
ICAgCiAgICAgfQogCiAgICAgQU5HTEVfVFJZKGNvbW1pdFVuaWZvcm1zKGNvbnRleHQsIGNtZEVu
Y29kZXIpKTsKQEAgLTEyNjcsOCArMTI3MCw3IEBAIGFuZ2xlOjpSZXN1bHQgUHJvZ3JhbU10bDo6
dXBkYXRlVGV4dHVyZXMoY29uc3QgZ2w6OkNvbnRleHQgKmdsQ29udGV4dCwKICAgICAgICAgfQog
CiAgICAgICAgIGNvbnN0IG10bDo6VHJhbnNsYXRlZFNoYWRlckluZm8gJnNoYWRlckluZm8gPQot
ICAgICAgICAgICAgKm1DdXJyZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlwZV0tPnRyYW5zbGF0
ZWRTcmNJbmZvOwotCisgICAgICAgICAgICBtQ3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRlclR5
cGVdLT50cmFuc2xhdGVkU3JjSW5mbyA/ICptQ3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRlclR5
cGVdLT50cmFuc2xhdGVkU3JjSW5mbyA6IG1Nc2xTaGFkZXJUcmFuc2xhdGVJbmZvW3NoYWRlclR5
cGVdOwogICAgICAgICBib29sIGhhc0RlcHRoU2FtcGxlciA9IGZhbHNlOwogCiAgICAgICAgIGZv
ciAodWludDMyX3QgdGV4dHVyZUluZGV4ID0gMDsgdGV4dHVyZUluZGV4IDwgbVN0YXRlLmdldFNh
bXBsZXJCaW5kaW5ncygpLnNpemUoKTsKQEAgLTEzNDQsNyArMTM0Niw5IEBAIGFuZ2xlOjpSZXN1
bHQgUHJvZ3JhbU10bDo6dXBkYXRlVW5pZm9ybUJ1ZmZlcnMoQ29udGV4dE10bCAqY29udGV4dCwK
IAogICAgIGZvciAoZ2w6OlNoYWRlclR5cGUgc2hhZGVyVHlwZSA6IGdsOjpBbGxHTEVTMlNoYWRl
clR5cGVzKCkpCiAgICAgewotICAgICAgICBpZiAobUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFk
ZXJUeXBlXS0+dHJhbnNsYXRlZFNyY0luZm8tPmhhc1VCT0FyZ3VtZW50QnVmZmVyKQorICAgICAg
ICBjb25zdCBtdGw6OlRyYW5zbGF0ZWRTaGFkZXJJbmZvICZzaGFkZXJJbmZvID0KKyAgICAgICAg
ICAgIG1DdXJyZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlwZV0tPnRyYW5zbGF0ZWRTcmNJbmZv
ID8gKm1DdXJyZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlwZV0tPnRyYW5zbGF0ZWRTcmNJbmZv
IDogbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bc2hhZGVyVHlwZV07CisgICAgICAgIGlmIChzaGFk
ZXJJbmZvLmhhc1VCT0FyZ3VtZW50QnVmZmVyKQogICAgICAgICB7CiAgICAgICAgICAgICBBTkdM
RV9UUlkoCiAgICAgICAgICAgICAgICAgZW5jb2RlVW5pZm9ybUJ1ZmZlcnNJbmZvQXJndW1lbnRC
dWZmZXIoY29udGV4dCwgY21kRW5jb2RlciwgYmxvY2tzLCBzaGFkZXJUeXBlKSk7CkBAIC0xNDgw
LDYgKzE0ODQsNyBAQCBhbmdsZTo6UmVzdWx0IFByb2dyYW1NdGw6OmVuY29kZVVuaWZvcm1CdWZm
ZXJzSW5mb0FyZ3VtZW50QnVmZmVyKAogICAgIGdsOjpTaGFkZXJUeXBlIHNoYWRlclR5cGUpCiB7
CiAgICAgY29uc3QgZ2w6OlN0YXRlICZnbFN0YXRlID0gY29udGV4dC0+Z2V0U3RhdGUoKTsKKyAg
ICBBU1NFUlQobUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFkZXJUeXBlXS0+dHJhbnNsYXRlZFNy
Y0luZm8pOwogICAgIGNvbnN0IG10bDo6VHJhbnNsYXRlZFNoYWRlckluZm8gJnNoYWRlckluZm8g
PQogICAgICAgICAqbUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFkZXJUeXBlXS0+dHJhbnNsYXRl
ZFNyY0luZm87CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwppbmRleCA2MTg0MDk4MTYwNGFlYWVkZjQ4ZWE2YjIwZTE4OTM3N2RhMzc4
NTZhLi45Zjg4NjNkODhkMjQ0NjQyMTkwODYxN2NiZmNhMTNmZjQ3MmUwMzUwIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTcgQEAKKzIwMjEtMDUtMTcgIEt5bGUgUGlkZGluZ3RvbiA8a3BpZGRpbmd0b25AYXBw
bGUuY29tPiAKKworICAgICAgICBBU1NFUlQoIXRvVHlwZS5pc0FycmF5KCkpIGZhaWx1cmUgaW4g
c2g6OkNvZXJjZVNpbXBsZSBkdWUgdG8gdmVjdG9yIGFycmF5IGRlcmVmZXJlbmNlCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4NjQKKyAgICAgICAg
PHJkYXI6Ly83Nzk2ODIxND4KKworICAgICAgICBGaXhlZCBwcm9ncmFtIHRyYW5zbGF0aW9uIGVy
cm9yLCBhZGRpdGlvbmFsIGlzc3VlcyB3aXRoIHByZWxvYWRlZCB0cmFuc2Zvcm0gZmVlZGJhY2sg
c2hhZGVycworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX
SVA6IGFkZHMganVzdCB0aGUgdGVzdHMuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC9z
aGFkZXItdmVjLWFycmF5LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg
ICAgICogZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC5o
dG1sOiBBZGRlZC4KKwogMjAyMS0wNS0xNyAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2Fs
aWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRlc3QgZ2FyZGVuaW5nLiBTZXZl
cmFsIE9mZnNjcmVlbkNhbnZhcyB0ZXN0cyBhcmUgZmFpbGluZyBzaW5jZSByMjc3NTQzLgpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1k
ZXJlZi1uby1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJn
bC9zaGFkZXItdmVjLWFycmF5LWRlcmVmLW5vLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt
b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
Li45MDIyYzlmMjEzMzhkNjEzNTI0NDdlMGM5NGQ5MTA1ZmMzYjIzODFjCi0tLSAvZGV2L251bGwK
KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJl
Zi1uby1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorUEFTUywgbm8gY3Jhc2guCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFycmF5
LWRlcmVmLW5vLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFk
ZXItdmVjLWFycmF5LWRlcmVmLW5vLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzExNjcxNmFiOGY4
NWI1MGQ0YmI3YWM2NzBjNjRjNDlmMGM2OGY1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2Zhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMtYXJyYXktZGVyZWYtbm8tY3Jhc2guaHRt
bApAQCAtMCwwICsxLDE2IEBACis8Ym9keT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5u
ZXIpCisgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworbGV0IGMgPSBkb2N1bWVudC5jcmVhdGVF
bGVtZW50KCJjYW52YXMiKTsKK2xldCBnbCA9IGMuZ2V0Q29udGV4dCgid2ViZ2wyIik7CitsZXQg
dnMgPSBnbC5jcmVhdGVTaGFkZXIoZ2wuVkVSVEVYX1NIQURFUik7CitnbC5zaGFkZXJTb3VyY2Uo
dnMsICIjdmVyc2lvbiAzMDAgZXNcbnZvaWQgbWFpbigpe3ZlYzIgU1sxXTtTO30iKTsKK2dsLmNv
bXBpbGVTaGFkZXIodnMpOworaWYgKCFnbC5nZXRTaGFkZXJQYXJhbWV0ZXIodnMsIGdsLkNPTVBJ
TEVfU1RBVFVTKSApIHsKKyAgICBsZXQgaW5mbyA9IGdsLmdldFNoYWRlckluZm9Mb2codnMpOwor
ICAgIHRocm93ICdDb3VsZCBub3QgY29tcGlsZSBXZWJHTCBwcm9ncmFtLiBJbmZvOicgKyBpbmZv
OworfQorZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgKz0gIlBBU1MsIG5vIGNyYXNoLiIKKzwvc2Ny
aXB0PgorPC9ib2R5PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429086</attachid>
            <date>2021-05-19 12:48:34 -0700</date>
            <delta_ts>2021-05-19 13:56:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225864-20210519124833.patch</filename>
            <type>text/plain</type>
            <size>6661</size>
            <attacher name="Kyle Piddington">kpiddington</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k
ZXggMzgyNmZhY2I3OGNlN2VmOTEyNDg0N2JkYWMzYTUxMGY4YTBkMzVkMi4uYzRlNjI4MGI5MmU3
YzEyOTY3OTc0NDkxZWI3NDY2ZDlkN2UyZDEyNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy
dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA1LTE5ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu
Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKCF0b1R5cGUuaXNBcnJheSgpKSBmYWls
dXJlIGluIHNoOjpDb2VyY2VTaW1wbGUgZHVlIHRvIHZlY3RvciBhcnJheSBkZXJlZmVyZW5jZQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODY0Cisg
ICAgICAgIDxyZGFyOi8vNzc5NjgyMTQ+IAorCisgICAgICAgIFJldmlld2VkIGJ5IERlYW4gSmFj
a3Nvbi4KKworICAgICAgICBGaXhlZCBwcm9ncmFtIHRyYW5zbGF0aW9uIGVycm9yLCBhZGRpdGlv
bmFsIGlzc3VlcyB3aXRoIHRyYW5zZm9ybSBmZWVkYmFjayBzaGFkZXJzCisKKyAgICAgICAgKiBz
cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQWRkRXhwbGljaXRU
eXBlQ2FzdHMuY3BwOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9n
cmFtTXRsLm1tOgorICAgICAgICAocng6OlByb2dyYW1NdGw6OnJlc2V0KToKKwogMjAyMS0wNS0x
OSAgS3lsZSBQaWRkaW5ndG9uICA8a3BpZGRpbmd0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtB
TkdMRSBNZXRhbF0gU3VwcG9ydCBQcm92b2tpbmcgVmVydGV4IEVtdWxhdGlvbiwgUGFzcyBGcmFn
bWVudCBPdXRwdXQgdGVzdCBzdWl0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO
R0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9BZGRFeHBs
aWNpdFR5cGVDYXN0cy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIv
dHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQWRkRXhwbGljaXRUeXBlQ2FzdHMuY3Bw
CmluZGV4IDg0ZDE3MWQyZDNjNGExMzE3MmU4ZmE2NzJlMGU4N2ZhODM4NzYzZGQuLjA4ZjhlODk0
MTM0MDhiOTM0N2UwNTJiNmY4M2M4OTJmNzY4YjhkZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly
ZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVj
dC9BZGRFeHBsaWNpdFR5cGVDYXN0cy5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv
c3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0FkZEV4cGxpY2l0
VHlwZUNhc3RzLmNwcApAQCAtNDQsNyArNDQsOCBAQCBjbGFzcyBSZXdyaXRlciA6IHB1YmxpYyBU
SW50ZXJtUmVidWlsZAogICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZSBpZiAocmV0VHlw
ZS5pc1ZlY3RvcigpKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGlmIChhcmdDb3Vu
dCA9PSAxKQorICAgICAgICAgICAgICAgIC8vMSBlbGVtZW50IGFycmF5cyBuZWVkIHRvIGJlIGFj
Y291bnRlZCBmb3IuCisgICAgICAgICAgICAgICAgaWYgKGFyZ0NvdW50ID09IDEgJiYgIXJldFR5
cGUuaXNBcnJheSgpKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgVElu
dGVybVR5cGVkICZhcmcgICA9IEdldEFyZyhjYWxsTm9kZSwgMCk7CiAgICAgICAgICAgICAgICAg
ICAgIGNvbnN0IFRUeXBlIGFyZ1R5cGUgPSBhcmcuZ2V0VHlwZSgpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1N
dGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0
YWwvUHJvZ3JhbU10bC5tbQppbmRleCBjYjk0YmM5ZGFhNTI1NWI0MmZlOWY0MGJkNDI2MzZmNGI0
NmQ4N2Q0Li5iM2M2ZTg5ZTdjNzhhYWRhNmNhNGJjZjU4NmQyMWU4MWFjYjhiODU1IDEwMDY0NAot
LS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv
UHJvZ3JhbU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv
cmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQpAQCAtMjQ3LDYgKzI0Nyw3IEBAIHZvaWQgUHJv
Z3JhbU10bDo6cmVzZXQoQ29udGV4dE10bCAqY29udGV4dCkKICAgICBmb3IgKGdsOjpTaGFkZXJU
eXBlIHNoYWRlclR5cGUgOiBnbDo6QWxsU2hhZGVyVHlwZXMoKSkKICAgICB7CiAgICAgICAgIG1N
c2xTaGFkZXJUcmFuc2xhdGVJbmZvW3NoYWRlclR5cGVdLnJlc2V0KCk7CisgICAgICAgIG1DdXJy
ZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlwZV0gPSBudWxscHRyOwogICAgIH0KICAgICBtTXNs
WGZiT25seVZlcnRleFNoYWRlckluZm8ucmVzZXQoKTsKIApAQCAtMTE2NCw2ICsxMTY1LDcgQEAg
YW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjpzZXR1cERyYXcoY29uc3QgZ2w6OkNvbnRleHQgKmds
Q29udGV4dCwKICAgICAgICAgICAgIHBpcGVsaW5lRGVzYy5yYXN0ZXJpemF0aW9uRW5hYmxlZCgp
CiAgICAgICAgICAgICAgICAgPyAmbUZyYWdtZW50U2hhZGVyVmFyaWFudHNbcGlwZWxpbmVEZXNj
LmVtdWxhdGVDb3ZlcmFnZU1hc2tdCiAgICAgICAgICAgICAgICAgOiBudWxscHRyOworICAgICAg
ICAKICAgICB9CiAKICAgICBBTkdMRV9UUlkoY29tbWl0VW5pZm9ybXMoY29udGV4dCwgY21kRW5j
b2RlcikpOwpAQCAtMTI1Nyw4ICsxMjU5LDcgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjp1
cGRhdGVUZXh0dXJlcyhjb25zdCBnbDo6Q29udGV4dCAqZ2xDb250ZXh0LAogICAgICAgICB9CiAK
ICAgICAgICAgY29uc3QgbXRsOjpUcmFuc2xhdGVkU2hhZGVySW5mbyAmc2hhZGVySW5mbyA9Ci0g
ICAgICAgICAgICAqbUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFkZXJUeXBlXS0+dHJhbnNsYXRl
ZFNyY0luZm87Ci0KKyAgICAgICAgICAgIG1DdXJyZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlw
ZV0tPnRyYW5zbGF0ZWRTcmNJbmZvID8gKm1DdXJyZW50U2hhZGVyVmFyaWFudHNbc2hhZGVyVHlw
ZV0tPnRyYW5zbGF0ZWRTcmNJbmZvIDogbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bc2hhZGVyVHlw
ZV07CiAgICAgICAgIGJvb2wgaGFzRGVwdGhTYW1wbGVyID0gZmFsc2U7CiAKICAgICAgICAgZm9y
ICh1aW50MzJfdCB0ZXh0dXJlSW5kZXggPSAwOyB0ZXh0dXJlSW5kZXggPCBtU3RhdGUuZ2V0U2Ft
cGxlckJpbmRpbmdzKCkuc2l6ZSgpOwpAQCAtMTMzNCw3ICsxMzM1LDkgQEAgYW5nbGU6OlJlc3Vs
dCBQcm9ncmFtTXRsOjp1cGRhdGVVbmlmb3JtQnVmZmVycyhDb250ZXh0TXRsICpjb250ZXh0LAog
CiAgICAgZm9yIChnbDo6U2hhZGVyVHlwZSBzaGFkZXJUeXBlIDogZ2w6OkFsbEdMRVMyU2hhZGVy
VHlwZXMoKSkKICAgICB7Ci0gICAgICAgIGlmIChtQ3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRl
clR5cGVdLT50cmFuc2xhdGVkU3JjSW5mby0+aGFzVUJPQXJndW1lbnRCdWZmZXIpCisgICAgICAg
IGNvbnN0IG10bDo6VHJhbnNsYXRlZFNoYWRlckluZm8gJnNoYWRlckluZm8gPQorICAgICAgICAg
ICAgbUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFkZXJUeXBlXS0+dHJhbnNsYXRlZFNyY0luZm8g
PyAqbUN1cnJlbnRTaGFkZXJWYXJpYW50c1tzaGFkZXJUeXBlXS0+dHJhbnNsYXRlZFNyY0luZm8g
OiBtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tzaGFkZXJUeXBlXTsKKyAgICAgICAgaWYgKHNoYWRl
ckluZm8uaGFzVUJPQXJndW1lbnRCdWZmZXIpCiAgICAgICAgIHsKICAgICAgICAgICAgIEFOR0xF
X1RSWSgKICAgICAgICAgICAgICAgICBlbmNvZGVVbmlmb3JtQnVmZmVyc0luZm9Bcmd1bWVudEJ1
ZmZlcihjb250ZXh0LCBjbWRFbmNvZGVyLCBibG9ja3MsIHNoYWRlclR5cGUpKTsKQEAgLTE0NzAs
NiArMTQ3Myw3IEBAIGFuZ2xlOjpSZXN1bHQgUHJvZ3JhbU10bDo6ZW5jb2RlVW5pZm9ybUJ1ZmZl
cnNJbmZvQXJndW1lbnRCdWZmZXIoCiAgICAgZ2w6OlNoYWRlclR5cGUgc2hhZGVyVHlwZSkKIHsK
ICAgICBjb25zdCBnbDo6U3RhdGUgJmdsU3RhdGUgPSBjb250ZXh0LT5nZXRTdGF0ZSgpOworICAg
IEFTU0VSVChtQ3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRlclR5cGVdLT50cmFuc2xhdGVkU3Jj
SW5mbyk7CiAgICAgY29uc3QgbXRsOjpUcmFuc2xhdGVkU2hhZGVySW5mbyAmc2hhZGVySW5mbyA9
CiAgICAgICAgICptQ3VycmVudFNoYWRlclZhcmlhbnRzW3NoYWRlclR5cGVdLT50cmFuc2xhdGVk
U3JjSW5mbzsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IDU3ZGM0NWI1NjA1ODRlYzNiNzNlZDBjOWZlOTRhNmMxMTIzMTVj
ZjcuLjZiYjljM2I0NTVjNDRhY2M3OTZhMDg3MTk0YWFiYzRjMjlkZWZiYTEgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNiBAQAorMjAyMS0wNS0xOSAgS3lsZSBQaWRkaW5ndG9uIDxrcGlkZGluZ3RvbkBhcHBs
ZS5jb20+IAorCisgICAgICAgIEFTU0VSVCghdG9UeXBlLmlzQXJyYXkoKSkgZmFpbHVyZSBpbiBz
aDo6Q29lcmNlU2ltcGxlIGR1ZSB0byB2ZWN0b3IgYXJyYXkgZGVyZWZlcmVuY2UKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg2NAorICAgICAgICA8
cmRhcjovLzc3OTY4MjE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IERlYW4gSmFja3Nvbi4KKwor
ICAgICAgICBGaXhlZCBwcm9ncmFtIHRyYW5zbGF0aW9uIGVycm9yLCBhZGRpdGlvbmFsIGlzc3Vl
cyB3aXRoIHByZWxvYWRlZCB0cmFuc2Zvcm0gZmVlZGJhY2sgc2hhZGVycworCisgICAgICAgICog
ZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC1leHBlY3Rl
ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMtYXJy
YXktZGVyZWYtbm8tY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjEtMDUtMTkgIEt5bGUgUGlkZGlu
Z3RvbiAgPGtwaWRkaW5ndG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbQU5HTEUgTWV0YWxdIFN1
cHBvcnQgcHJvdm9raW5nIHZlcnRleCBlbXVsYXRpb24sIHBhc3MgZnJhZ21lbnRPdXRwdXQgdGVz
dHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMt
YXJyYXktZGVyZWYtbm8tY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52
YXMvd2ViZ2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC1leHBlY3RlZC50eHQKbmV3
IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMC4uOTAyMmM5ZjIxMzM4ZDYxMzUyNDQ3ZTBjOTRkOTEwNWZjM2IyMzgxYwotLS0gL2Rl
di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3NoYWRlci12ZWMtYXJy
YXktZGVyZWYtbm8tY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1BBU1MsIG5vIGNy
YXNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvc2hhZGVyLXZl
Yy1hcnJheS1kZXJlZi1uby1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2Vi
Z2wvc2hhZGVyLXZlYy1hcnJheS1kZXJlZi1uby1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjMxMTY3
MTZhYjhmODViNTBkNGJiN2FjNjcwYzY0YzQ5ZjBjNjhmNWEKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9zaGFkZXItdmVjLWFycmF5LWRlcmVmLW5vLWNy
YXNoLmh0bWwKQEAgLTAsMCArMSwxNiBAQAorPGJvZHk+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50
ZXN0UnVubmVyKQorICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKK2xldCBjID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgiY2FudmFzIik7CitsZXQgZ2wgPSBjLmdldENvbnRleHQoIndlYmdsMiIp
OworbGV0IHZzID0gZ2wuY3JlYXRlU2hhZGVyKGdsLlZFUlRFWF9TSEFERVIpOworZ2wuc2hhZGVy
U291cmNlKHZzLCAiI3ZlcnNpb24gMzAwIGVzXG52b2lkIG1haW4oKXt2ZWMyIFNbMV07Uzt9Iik7
CitnbC5jb21waWxlU2hhZGVyKHZzKTsKK2lmICghZ2wuZ2V0U2hhZGVyUGFyYW1ldGVyKHZzLCBn
bC5DT01QSUxFX1NUQVRVUykgKSB7CisgICAgbGV0IGluZm8gPSBnbC5nZXRTaGFkZXJJbmZvTG9n
KHZzKTsKKyAgICB0aHJvdyAnQ291bGQgbm90IGNvbXBpbGUgV2ViR0wgcHJvZ3JhbS4gSW5mbzon
ICsgaW5mbzsKK30KK2RvY3VtZW50LmJvZHkuaW5uZXJIVE1MICs9ICJQQVNTLCBubyBjcmFzaC4i
Cis8L3NjcmlwdD4KKzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>