<?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>227963</bug_id>
          
          <creation_ts>2021-07-14 12:14:36 -0700</creation_ts>
          <short_desc>definePropertyOnReceiver should check if receiver canPerformFastPutInline</short_desc>
          <delta_ts>2021-07-30 21:11:32 -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>JavaScriptCore</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="Tadeu Zagallo">tzagallo</reporter>
          <assigned_to name="Tadeu Zagallo">tzagallo</assigned_to>
          <cc>ashvayka</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>keith_miller</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1776997</commentid>
    <comment_count>0</comment_count>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-14 12:14:36 -0700</bug_when>
    <thetext>...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777000</commentid>
    <comment_count>1</comment_count>
      <attachid>433517</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-14 12:17:13 -0700</bug_when>
    <thetext>Created attachment 433517
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777016</commentid>
    <comment_count>2</comment_count>
      <attachid>433523</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-14 13:35:35 -0700</bug_when>
    <thetext>Created attachment 433523
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777026</commentid>
    <comment_count>3</comment_count>
      <attachid>433526</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-14 13:51:00 -0700</bug_when>
    <thetext>Created attachment 433526
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777066</commentid>
    <comment_count>4</comment_count>
      <attachid>433526</attachid>
    <who name="Yusuke Suzuki">ysuzuki</who>
    <bug_when>2021-07-14 15:22:37 -0700</bug_when>
    <thetext>Comment on attachment 433526
Patch

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

Add some comments :)

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:934
&gt; +            RELEASE_ASSERT(!(entry-&gt;value-&gt;attributes() &amp; PropertyAttribute::CustomValue));

This function is super hot. Please do not use RELEASE_ASSERT.

&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:342
&gt; +                RELEASE_ASSERT(!(currentAttributes &amp; PropertyAttribute::AccessorOrCustomAccessorOrValue));

This function is super hot. Please do not use RELEASE_ASSERT.

&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:402
&gt; +            RELEASE_ASSERT(!(currentAttributes &amp; PropertyAttribute::AccessorOrCustomAccessorOrValue));

Ditto.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778489</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-07-21 12:15:54 -0700</bug_when>
    <thetext>&lt;rdar://problem/80910723&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778767</commentid>
    <comment_count>6</comment_count>
      <attachid>434022</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-22 11:08:28 -0700</bug_when>
    <thetext>Created attachment 434022
WIP</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778864</commentid>
    <comment_count>7</comment_count>
      <attachid>434041</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-22 15:20:29 -0700</bug_when>
    <thetext>Created attachment 434041
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778883</commentid>
    <comment_count>8</comment_count>
      <attachid>434041</attachid>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-22 16:11:59 -0700</bug_when>
    <thetext>Comment on attachment 434041
Patch

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

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:881
&gt; +        if (slot.attributes() &amp; PropertyAttribute::CustomValue) {

I think we can avoid adding this.
RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;. WebIDL&apos;s `window.%Constructor%` and `window.%Constructor%.prototype.constructor` don&apos;t have a setter.
As for RegExpConstructor, its properties will be converted very soon (please follow https://bugs.webkit.org/show_bug.cgi?id=220233).

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:914
&gt; +    if (!receiver-&gt;canPerformFastPutInline(vm, propertyName))

We can make this way more targeted to underline the CustomValue issue an because Accessor / CustomAccessor are handled correctly by putDirectInternal(). Like:
    if (!receiver-&gt;structure(vm)-&gt;hasCustomGetterSetterProperties()) {
        unsigned attributes;
        if (receiver-&gt;getDirectOffset(vm, propertyName, attributes) != invalidOffset &amp;&amp; (attributes &amp; PropertyAttribute::CustomValue))
            return definePropertyOnReceiverSlow(globalObject, propertyName, value, receiver, slot.isStrictMode());
    }

The snippet can be improved to avoid structure lookups.

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:928
&gt; +    ASSERT(this-&gt;canPerformFastPutInline(vm, propertyName));

This won&apos;t hold if you apply previous comment.

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:-931
&gt; -            putDirect(vm, propertyName, value, attributesForStructure(entry-&gt;value-&gt;attributes()) &amp; ~PropertyAttribute::CustomValue, slot);

This won&apos;t be needed if you apply the comment before previous.

&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:-285
&gt; -    // FIXME: For a failure due to non-extensible structure, the error message is misleading.

There are quite a few FIXMEs like this; maybe we should tackle all of them in separate change to keep this (very tricky) patch simpler.

&gt; JSTests/stress/reflect-set-custom-value.js:1
&gt; +({...RegExp});

This test is very tricky.
Once https://bugs.webkit.org/show_bug.cgi?id=220233 is fixed, this test won&apos;t be testing anything useful.
Can we make another test utilizing JSDollarVM&apos;s StaticCustomValue and friends instead?
Maybe we could even simplify how we reach the state that currently causes a crash.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778884</commentid>
    <comment_count>9</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-22 16:14:01 -0700</bug_when>
    <thetext>&gt; RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;.

Or maybe it won&apos;t because &quot;lastIndex&quot; is not on structure. Hmm...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778886</commentid>
    <comment_count>10</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-22 16:18:25 -0700</bug_when>
    <thetext>definePropertyOnReceiver() performs [[DefineOwnProperty]], and semantically it should not invoke canPerformFastPutInline() or putInlineSlow(), which are for [[Set]].</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778887</commentid>
    <comment_count>11</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-22 16:21:10 -0700</bug_when>
    <thetext>(In reply to Alexey Shvayka from comment #9)
&gt; &gt; RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;.
&gt; 
&gt; Or maybe it won&apos;t because &quot;lastIndex&quot; is not on structure. Hmm...

I think we are good for &quot;lastIndex&quot;. For Reflect.set,

    if (slot.isTaintedByOpaqueObject() || slot.context() == PutPropertySlot::ReflectSet) {
        if (receiver-&gt;methodTable(vm)-&gt;defineOwnProperty != JSObject::defineOwnProperty)
            return definePropertyOnReceiverSlow(globalObject, propertyName, value, receiver, slot.isStrictMode());
    }

path should be taken. For regular set, RegExpObject::put() will preserve correctness.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778889</commentid>
    <comment_count>12</comment_count>
      <attachid>434041</attachid>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-22 16:23:39 -0700</bug_when>
    <thetext>Comment on attachment 434041
Patch

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

&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:881
&gt;&gt; +        if (slot.attributes() &amp; PropertyAttribute::CustomValue) {
&gt; 
&gt; I think we can avoid adding this.
&gt; RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;. WebIDL&apos;s `window.%Constructor%` and `window.%Constructor%.prototype.constructor` don&apos;t have a setter.
&gt; As for RegExpConstructor, its properties will be converted very soon (please follow https://bugs.webkit.org/show_bug.cgi?id=220233).

Removing this may require adjusting some Reflect.set(RegExp, ...) tests, but this is very doable and we aren&apos;t currently aligned with other engines either way.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778890</commentid>
    <comment_count>13</comment_count>
      <attachid>434041</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-22 16:33:17 -0700</bug_when>
    <thetext>Comment on attachment 434041
Patch

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

&gt;&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:881
&gt;&gt;&gt; +        if (slot.attributes() &amp; PropertyAttribute::CustomValue) {
&gt;&gt; 
&gt;&gt; I think we can avoid adding this.
&gt;&gt; RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;. WebIDL&apos;s `window.%Constructor%` and `window.%Constructor%.prototype.constructor` don&apos;t have a setter.
&gt;&gt; As for RegExpConstructor, its properties will be converted very soon (please follow https://bugs.webkit.org/show_bug.cgi?id=220233).
&gt; 
&gt; Removing this may require adjusting some Reflect.set(RegExp, ...) tests, but this is very doable and we aren&apos;t currently aligned with other engines either way.

It&apos;s a simple condition, so we can just remove this when the other patch lands? Currently this will cause a crash, and I don&apos;t think we want to keep it in its current state on trunk. I can add a FIXME if that helps.

&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:914
&gt;&gt; +    if (!receiver-&gt;canPerformFastPutInline(vm, propertyName))
&gt; 
&gt; We can make this way more targeted to underline the CustomValue issue an because Accessor / CustomAccessor are handled correctly by putDirectInternal(). Like:
&gt;     if (!receiver-&gt;structure(vm)-&gt;hasCustomGetterSetterProperties()) {
&gt;         unsigned attributes;
&gt;         if (receiver-&gt;getDirectOffset(vm, propertyName, attributes) != invalidOffset &amp;&amp; (attributes &amp; PropertyAttribute::CustomValue))
&gt;             return definePropertyOnReceiverSlow(globalObject, propertyName, value, receiver, slot.isStrictMode());
&gt;     }
&gt; 
&gt; The snippet can be improved to avoid structure lookups.

Sounds good, I&apos;ll give it a try.

&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:-931
&gt;&gt; -            putDirect(vm, propertyName, value, attributesForStructure(entry-&gt;value-&gt;attributes()) &amp; ~PropertyAttribute::CustomValue, slot);
&gt; 
&gt; This won&apos;t be needed if you apply the comment before previous.

I think it&apos;s still relevant. We never want to end up here with a custom value.

&gt;&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:-285
&gt;&gt; -    // FIXME: For a failure due to non-extensible structure, the error message is misleading.
&gt; 
&gt; There are quite a few FIXMEs like this; maybe we should tackle all of them in separate change to keep this (very tricky) patch simpler.

I see... these should have had a bug to make it easier to track them. If I don&apos;t fix this particular instance, it breaks a couple tests, but I guess I can skip the tests in the mean time.

&gt;&gt; JSTests/stress/reflect-set-custom-value.js:1
&gt;&gt; +({...RegExp});
&gt; 
&gt; This test is very tricky.
&gt; Once https://bugs.webkit.org/show_bug.cgi?id=220233 is fixed, this test won&apos;t be testing anything useful.
&gt; Can we make another test utilizing JSDollarVM&apos;s StaticCustomValue and friends instead?
&gt; Maybe we could even simplify how we reach the state that currently causes a crash.

Sounds good, I&apos;ll write a new test</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779276</commentid>
    <comment_count>14</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-23 18:00:09 -0700</bug_when>
    <thetext>(In reply to Tadeu Zagallo from comment #13)
&gt; Comment on attachment 434041 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=434041&amp;action=review
&gt; 
&gt; &gt;&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:881
&gt; &gt;&gt;&gt; +        if (slot.attributes() &amp; PropertyAttribute::CustomValue) {
&gt; &gt;&gt; 
&gt; &gt;&gt; I think we can avoid adding this.
&gt; &gt;&gt; RegExpObject::defineOwnProperty() will take care of &quot;lastIndex&quot;. WebIDL&apos;s `window.%Constructor%` and `window.%Constructor%.prototype.constructor` don&apos;t have a setter.
&gt; &gt;&gt; As for RegExpConstructor, its properties will be converted very soon (please follow https://bugs.webkit.org/show_bug.cgi?id=220233).
&gt; &gt; 
&gt; &gt; Removing this may require adjusting some Reflect.set(RegExp, ...) tests, but this is very doable and we aren&apos;t currently aligned with other engines either way.
&gt; 
&gt; It&apos;s a simple condition, so we can just remove this when the other patch
&gt; lands? Currently this will cause a crash, and I don&apos;t think we want to keep
&gt; it in its current state on trunk. I can add a FIXME if that helps.

I&apos;ve tried removing this piece of code from the patch (attachment 434041), applied on top of r280256, and no crash is observed when running JSTests/stress/reflect-set-custom-value.js via `run-javascriptcore-tests`. I believe the crash is due to non-cleared CustomValue attribute, and not due to custom setter not called.

&gt; &gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:-931
&gt; &gt;&gt; -            putDirect(vm, propertyName, value, attributesForStructure(entry-&gt;value-&gt;attributes()) &amp; ~PropertyAttribute::CustomValue, slot);
&gt; &gt; 
&gt; &gt; This won&apos;t be needed if you apply the comment before previous.
&gt; 
&gt; I think it&apos;s still relevant. We never want to end up here with a custom value.

Yeah, sorry, I&apos;ve worded poorly.
We can&apos;t remove `putDirect(... ~PropertyAttribute::CustomValue)` bit, yet we won&apos;t need to change it to an ASSERT.

&gt; &gt;&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:-285
&gt; &gt;&gt; -    // FIXME: For a failure due to non-extensible structure, the error message is misleading.
&gt; &gt; 
&gt; &gt; There are quite a few FIXMEs like this; maybe we should tackle all of them in separate change to keep this (very tricky) patch simpler.
&gt; 
&gt; I see... these should have had a bug to make it easier to track them.

Agreed, it&apos;s totally my fault: I didn&apos;t file the bug, hoping to do a quick follow-up.

&gt; If I don&apos;t fix this particular instance, it breaks a couple tests, but I guess I can skip the tests in the mean time.

JSObject::putInlineFast() is kinda hot; is it possible that adding a code to a branch that rarely executes can hit inlining threshold somewhere?
In a future, maybe we should return the failure reason from putDirectInternal() or even expand ReadonlyPropertyWriteError to say about non-extensible structure?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780604</commentid>
    <comment_count>15</comment_count>
      <attachid>434579</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-29 15:37:34 -0700</bug_when>
    <thetext>Created attachment 434579
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780629</commentid>
    <comment_count>16</comment_count>
      <attachid>434579</attachid>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-29 16:32:49 -0700</bug_when>
    <thetext>Comment on attachment 434579
Patch

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

r=me with comments. Nicely done!

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:884
&gt; +                return customSetter(globalObject, JSValue::encode(receiver), JSValue::encode(value), propertyName);

1. After r280256, custom properties are called in realm of their holder, like `customSetter(receiver-&gt;globalObject(vm), ...`.
2. `customSetter` can declare a throw scope, causing unchecked scope error in --debug. I suggest `RELEASE_AND_RETURN(scope, customSetter...`.

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:942
&gt; +            ASSERT(!(entry-&gt;value-&gt;attributes() &amp; PropertyAttribute::CustomValue));

I&apos;ve took a brief look and it seems like this ASSERT will hold for putInlineFastReplacingStaticPropertyIfNeeded() called by JSObject::putInlineForJSObject(). Nice!

&gt; Source/JavaScriptCore/runtime/JSObjectInlines.h:-285
&gt; -    // FIXME: For a failure due to non-extensible structure, the error message is misleading.

Maybe we should keep this FIXME as it&apos;s not yet resolved?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780658</commentid>
    <comment_count>17</comment_count>
      <attachid>434594</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-29 17:15:09 -0700</bug_when>
    <thetext>Created attachment 434594
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780660</commentid>
    <comment_count>18</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-29 17:15:44 -0700</bug_when>
    <thetext>Tools/Scripts/svn-apply failed to apply attachment 434594 to trunk.
Please resolve the conflicts and upload a new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780666</commentid>
    <comment_count>19</comment_count>
      <attachid>434596</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-29 17:55:54 -0700</bug_when>
    <thetext>Created attachment 434596
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780676</commentid>
    <comment_count>20</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-29 19:00:45 -0700</bug_when>
    <thetext>Committed r280463 (240098@main): &lt;https://commits.webkit.org/240098@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434596.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780887</commentid>
    <comment_count>21</comment_count>
      <attachid>434596</attachid>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-30 10:58:09 -0700</bug_when>
    <thetext>Comment on attachment 434596
Patch for landing

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

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:940
&gt; +            ASSERT(!(entry-&gt;value-&gt;attributes() &amp; PropertyAttribute::CustomValue));

This ASSERT appears to be failing: please see https://build.webkit.org/#/builders/100/builds/630.
I suggest we revert the change to putInlineFastReplacingStaticPropertyIfNeeded() because definePropertyOnReceiver() handles CustomValues properties only on structure.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780889</commentid>
    <comment_count>22</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-30 11:04:27 -0700</bug_when>
    <thetext>(In reply to Alexey Shvayka from comment #21)
&gt; This ASSERT appears to be failing: please see
&gt; https://build.webkit.org/#/builders/100/builds/630.
&gt; I suggest we revert the change to
&gt; putInlineFastReplacingStaticPropertyIfNeeded() because
&gt; definePropertyOnReceiver() handles CustomValues properties only on structure.

Also, it would be nice if we could come up with a test that is currently crashing; this might be an issue similar to the fixed one, but for non-reified CustomValue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781007</commentid>
    <comment_count>23</comment_count>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-30 17:03:40 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781008</commentid>
    <comment_count>24</comment_count>
      <attachid>434676</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-30 17:03:41 -0700</bug_when>
    <thetext>Created attachment 434676
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781019</commentid>
    <comment_count>25</comment_count>
      <attachid>434676</attachid>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-30 17:34:50 -0700</bug_when>
    <thetext>Comment on attachment 434676
Patch

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

Thank you for the fix! I&apos;ve failed to see this case during review.
r=me with a comment.

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:939
&gt; +            if (entry-&gt;value-&gt;attributes() &amp; PropertyAttribute::CustomValue) {

I hope we would remove this in near feature as there is no use cases for calling the setter except JSDollarVM.cpp.

&gt; Source/JavaScriptCore/runtime/JSObject.cpp:942
&gt; +                    RELEASE_AND_RETURN(scope, customSetter(globalObject, JSValue::encode(this), JSValue::encode(value), propertyName));

For consistency: `... customSetter(structure-&gt;globalObject(), ...`</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781020</commentid>
    <comment_count>26</comment_count>
      <attachid>434676</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-30 17:37:37 -0700</bug_when>
    <thetext>Comment on attachment 434676
Patch

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

Thanks for the review!

&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:939
&gt;&gt; +            if (entry-&gt;value-&gt;attributes() &amp; PropertyAttribute::CustomValue) {
&gt; 
&gt; I hope we would remove this in near feature as there is no use cases for calling the setter except JSDollarVM.cpp.

absolutely, that&apos;d be great.

&gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:942
&gt;&gt; +                    RELEASE_AND_RETURN(scope, customSetter(globalObject, JSValue::encode(this), JSValue::encode(value), propertyName));
&gt; 
&gt; For consistency: `... customSetter(structure-&gt;globalObject(), ...`

I thought about it, but somehow got confused and thought it wasn&apos;t necessary... thanks for catching it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781021</commentid>
    <comment_count>27</comment_count>
      <attachid>434678</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-30 17:39:38 -0700</bug_when>
    <thetext>Created attachment 434678
Patch for landing (2)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781024</commentid>
    <comment_count>28</comment_count>
      <attachid>434679</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2021-07-30 17:48:39 -0700</bug_when>
    <thetext>Created attachment 434679
Patch for landing (2)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781025</commentid>
    <comment_count>29</comment_count>
    <who name="Alexey Shvayka">ashvayka</who>
    <bug_when>2021-07-30 17:52:53 -0700</bug_when>
    <thetext>(In reply to Tadeu Zagallo from comment #26)
&gt; &gt;&gt; Source/JavaScriptCore/runtime/JSObject.cpp:942
&gt; &gt;&gt; +                    RELEASE_AND_RETURN(scope, customSetter(globalObject, JSValue::encode(this), JSValue::encode(value), propertyName));
&gt; &gt; 
&gt; &gt; For consistency: `... customSetter(structure-&gt;globalObject(), ...`
&gt; 
&gt; I thought about it, but somehow got confused and thought it wasn&apos;t
&gt; necessary... thanks for catching it.

Yeah, it might seem that way, yet `globalObject` coming from put() override is lexical so the [[Set]] errors are thrown in expected realm.

In WebCore, `lexicalGlobalObject` naming is used to avoid confusion.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781029</commentid>
    <comment_count>30</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-30 18:29:46 -0700</bug_when>
    <thetext>Patch 434678 does not build</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781031</commentid>
    <comment_count>31</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-30 18:33:52 -0700</bug_when>
    <thetext>Committed r280505 (240137@main): &lt;https://commits.webkit.org/240137@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434679.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433517</attachid>
            <date>2021-07-14 12:17:13 -0700</date>
            <delta_ts>2021-07-14 13:35:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210714121712.patch</filename>
            <type>text/plain</type>
            <size>6542</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx
MDg4NmU5NDM1ZjA5ZDc3M2YxNjVlYzJiZDY5NDA3MWZjNDExZmQyLi5mNjE4OTA1ODBiZmNkYzE3
ZmYyZmJmNGIwYTNkZjNmMzg4ODhkMzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNCBAQAorMjAyMS0wNy0xNCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHJlY2VpdmVyIGBjYW5QZXJm
b3JtRmFzdFB1dElubGluZWAsIGFuZCBpZiB0aGF0IGlzCisgICAgICAgIGZhbHNlIHdlIHNob3Vs
ZCB1c2UgYHB1dElubGluZVNsb3dgIGluc3RlYWQsIHdoaWNoIHdpbGwgY29ycmVjdGx5IGhhbmRs
ZSBjdXN0b20gdmFsdWVzLgorCisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6CisgICAg
ICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIpOgorICAgICAgICAo
SlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVk
ZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAgICAgIChKU0M6
OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisKIDIwMjEtMDYtMjkgIFlpamlhIEh1YW5n
ICA8eWlqaWFfaHVhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIG5ldyBwYXR0ZXJuIHRv
IGluc3RydWN0aW9uIHNlbGVjdG9yIHRvIHVzZSBTQlggYW5kIFNCRklaIHN1cHBvcnRlZCBieSBB
Uk02NApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3Qu
Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCmluZGV4IDBi
MTljY2I2NDcwOTdlNzRhMmIwNWE3ODRhODdjNTlhMTk4MTM0M2EuLjc0ZDc1ODg5OWZhNjBmOGFi
OTljMzRhMDU5ZDdlNzZjMmU3MDljYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ydW50aW1lL0pTT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt
ZS9KU09iamVjdC5jcHAKQEAgLTkwNiw2ICs5MDYsOCBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlO
YQogICAgICAgICAgICAgcmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFs
T2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUo
KSk7CiAgICAgfQogCisgICAgaWYgKCFyZWNlaXZlci0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUo
dm0sIHByb3BlcnR5TmFtZSkpCisgICAgICAgIHJldHVybiByZWNlaXZlci0+cHV0SW5saW5lU2xv
dyhnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIGlmIChVTkxJ
S0VMWShyZWNlaXZlci0+aGFzTm9uUmVpZmllZFN0YXRpY1Byb3BlcnRpZXModm0pKSkKICAgICAg
ICAgcmV0dXJuIHJlY2VpdmVyLT5wdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJ
Zk5lZWRlZChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIHJl
dHVybiByZWNlaXZlci0+cHV0SW5saW5lRmFzdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwg
dmFsdWUsIHNsb3QpOwpAQCAtOTEzLDExICs5MTUsMTIgQEAgYm9vbCBKU09iamVjdDo6ZGVmaW5l
UHJvcGVydHlPblJlY2VpdmVyKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5
TmEKIAogYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5
SWZOZWVkZWQoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYW1lIHByb3Bl
cnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQogewotICAgIEFT
U0VSVCghcGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKTsKLQogICAgIFZNJiB2bSA9IGdsb2JhbE9i
amVjdC0+dm0oKTsKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAK
KyAgICBBU1NFUlQoIXBhcnNlSW5kZXgocHJvcGVydHlOYW1lKSk7CisgICAgQVNTRVJUKHRoaXMt
PmNhblBlcmZvcm1GYXN0UHV0SW5saW5lKHZtLCBwcm9wZXJ0eU5hbWUpKTsKKwogICAgIFN0cnVj
dHVyZSogc3RydWN0dXJlID0gdGhpcy0+c3RydWN0dXJlKHZtKTsKICAgICBBU1NFUlQoc3RydWN0
dXJlLT5oYXNOb25SZWlmaWVkU3RhdGljUHJvcGVydGllcygpKTsKICAgICBpZiAoIWlzVmFsaWRP
ZmZzZXQoc3RydWN0dXJlLT5nZXQodm0sIHByb3BlcnR5TmFtZSkpKSB7CkBAIC05MjgsNyArOTMx
LDggQEAgYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5
SWZOZWVkZWQoSlNHbG9iYWxPYmplY3QqIGdsb2IKICAgICAgICAgICAgICAgICByZXR1cm4gdHlw
ZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5
UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEF2b2lk
IFB1dE1vZGVQdXQgYmVjYXVzZSBpdCBmYWlscyBmb3Igbm9uLWV4dGVuc2libGUgc3RydWN0dXJl
cy4KLSAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmli
dXRlc0ZvclN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSkgJiB+UHJvcGVydHlB
dHRyaWJ1dGU6OkN1c3RvbVZhbHVlLCBzbG90KTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJU
KCEoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkgJiBDdXN0b21WYWx1ZSkpOworICAgICAgICAg
ICAgcHV0RGlyZWN0KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0
dXJlKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpKSwgc2xvdCk7CiAgICAgICAgICAgICByZXR1
cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1
bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKaW5kZXggZGFhOWQ4M2IwOGMzYWYwZWY5M2EwMGNiNTAx
MDVjODE5ODVjOGZjZi4uMWJlYzEwZGIzYzVhNmJiNGRlM2JlMzdlNjBjN2UzN2FjNGRkZjEwMCAx
MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVz
LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgK
QEAgLTMzOCw4ICszMzgsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJl
Y3RJbnRlcm5hbChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAg
IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAgICAg
ICAgICAgIGlmIChtb2RlID09IFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmlidXRl
cyAhPSBjdXJyZW50QXR0cmlidXRlcyB8fCAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRl
OjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZhbHVlKSkpCiAgICAgICAgICAgICAgICAgc2V0
U3RydWN0dXJlKHZtLCBTdHJ1Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0
cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBhdHRyaWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNlCisg
ICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghKGN1cnJl
bnRBdHRyaWJ1dGVzICYgUHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nv
ck9yVmFsdWUpKTsKICAgICAgICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVydHkodGhp
cywgb2Zmc2V0KTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg
ICAgICAgIH0KQEAgLTM5Nyw4ICszOTksMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0
OjpwdXREaXJlY3RJbnRlcm5hbChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAg
ICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDM0Mgog
ICAgICAgICBpZiAobW9kZSA9PSBQdXRNb2RlRGVmaW5lT3duUHJvcGVydHkgJiYgKGF0dHJpYnV0
ZXMgIT0gY3VycmVudEF0dHJpYnV0ZXMgfHwgKGF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJpYnV0
ZTo6QWNjZXNzb3JPckN1c3RvbUFjY2Vzc29yT3JWYWx1ZSkpKQogICAgICAgICAgICAgc2V0U3Ry
dWN0dXJlKHZtLCBTdHJ1Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0cnVj
dHVyZSwgcHJvcGVydHlOYW1lLCBhdHRyaWJ1dGVzLCAmZGVmZXJyZWRXYXRjaHBvaW50RmlyZSkp
OwotICAgICAgICBlbHNlCisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NF
UlQoIShjdXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3Vz
dG9tQWNjZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVy
dHkodGhpcywgb2Zmc2V0KTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVybiB0cnVlOwogICAg
IH0KZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5k
ZXggNTA0YmU4ZDA5NWJkZDk4OTVmYmUyODk0N2ZkMTM3NDZmNzA3MGE3NC4uMzRiM2E2ZjU3OWRm
ZWU5Mzk1ODA2YWE3NDc2ZDRkNDJmOWYwYzRmOSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNy0xNCAg
VGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KKworICAgICAgICBkZWZpbmVQcm9w
ZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJlY2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0
SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
Mjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFs
dWUuanM6IEFkZGVkLgorCiAyMDIxLTA2LTI1ICBHdWlsbGF1bWUgRW1vbnQgIDxndWlqZW1vbnRA
aWdhbGlhLmNvbT4KIAogICAgICAgICBVbnNraXAgc3RyZXNzL2NhbGwtYXBwbHktZXhwb25lbnRp
YWwtYnl0ZWNvZGUtc2l6ZS5qcyBvbiBtb3N0IHBsYXRmb3JtcwpkaWZmIC0tZ2l0IGEvSlNUZXN0
cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcmVm
bGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ3NTE2NzNlNTAzNzk3YzhkYThi
MzJhZDM0YzE4Y2IxMTczOGIwMWYKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9y
ZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMKQEAgLTAsMCArMSw2IEBACisoey4uLlJlZ0V4cH0p
OworbGV0IGMgPSB7fTsKK1JlZmxlY3Quc2V0KGMsICckXycsICdmb28nLCBSZWdFeHApOworbGV0
IGEgPSBbXTsKK2EuX19wcm90b19fID0gUmVnRXhwOworYS4kXyA9ICcnOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433523</attachid>
            <date>2021-07-14 13:35:35 -0700</date>
            <delta_ts>2021-07-14 13:52:25 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210714133534.patch</filename>
            <type>text/plain</type>
            <size>6689</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li44ZDE2ODM0YzY5NDliZmI3
MDIyODMxZjNmZjAyZmMzMTc0NDE0ZDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNiBAQAorMjAyMS0wNy0xNCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHJlY2VpdmVyIGBjYW5QZXJm
b3JtRmFzdFB1dElubGluZWAsIGFuZCBpZiB0aGF0IGlzCisgICAgICAgIGZhbHNlIHdlIHNob3Vs
ZCB1c2UgYHB1dElubGluZVNsb3dgIGluc3RlYWQsIHdoaWNoIHdpbGwgY29ycmVjdGx5IGhhbmRs
ZSBjdXN0b20gdmFsdWVzLgorICAgICAgICBJIGFsc28gYWRkZWQgYXNzZXJ0aW9ucyB0byBwdXRJ
bmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZCBhbmQgcHV0RGlyZWN0SW50
ZXJuYWwKKyAgICAgICAgdG8gbWFrZSBzdXJlIHdlIGRvbid0IGFjY2lkZW50YWxseSBvdmVyd3Jp
dGUgY3VzdG9tIHZhbHVlcyBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogcnVudGltZS9KU09i
amVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2
ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRp
Y1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6
CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisKIDIwMjEtMDct
MTQgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ29u
dmVydCBzbWFsbCBKSVQgcG9vbCB0ZXN0cyBpbnRvIGV4ZWN1dGFibGUgZnV6emluZwpkaWZmIC0t
Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCmluZGV4IGUwYWEwZjNhZTM5OTZh
MmYyMzk2MTU0NmMwMzhmMzRlZDdlNGE0ODQuLjQwOTBkMzg4NDk2OWM5YjQzMDZlMjcxYjkyMDU5
YjkwMGMzODJhZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5j
cHAKQEAgLTkwNiw2ICs5MDYsOCBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVj
ZWl2ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogICAgICAgICAg
ICAgcmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFsT2JqZWN0LCBwcm9w
ZXJ0eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUoKSk7CiAgICAgfQog
CisgICAgaWYgKCFyZWNlaXZlci0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3BlcnR5
TmFtZSkpCisgICAgICAgIHJldHVybiByZWNlaXZlci0+cHV0SW5saW5lU2xvdyhnbG9iYWxPYmpl
Y3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIGlmIChVTkxJS0VMWShyZWNlaXZl
ci0+aGFzTm9uUmVpZmllZFN0YXRpY1Byb3BlcnRpZXModm0pKSkKICAgICAgICAgcmV0dXJuIHJl
Y2VpdmVyLT5wdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZChnbG9i
YWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIHJldHVybiByZWNlaXZl
ci0+cHV0SW5saW5lRmFzdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3Qp
OwpAQCAtOTEzLDExICs5MTUsMTIgQEAgYm9vbCBKU09iamVjdDo6ZGVmaW5lUHJvcGVydHlPblJl
Y2VpdmVyKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmEKIAogYm9vbCBK
U09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQoSlNH
bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgSlNW
YWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQogewotICAgIEFTU0VSVCghcGFyc2VJ
bmRleChwcm9wZXJ0eU5hbWUpKTsKLQogICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsK
ICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKKyAgICBBU1NFUlQo
IXBhcnNlSW5kZXgocHJvcGVydHlOYW1lKSk7CisgICAgQVNTRVJUKHRoaXMtPmNhblBlcmZvcm1G
YXN0UHV0SW5saW5lKHZtLCBwcm9wZXJ0eU5hbWUpKTsKKwogICAgIFN0cnVjdHVyZSogc3RydWN0
dXJlID0gdGhpcy0+c3RydWN0dXJlKHZtKTsKICAgICBBU1NFUlQoc3RydWN0dXJlLT5oYXNOb25S
ZWlmaWVkU3RhdGljUHJvcGVydGllcygpKTsKICAgICBpZiAoIWlzVmFsaWRPZmZzZXQoc3RydWN0
dXJlLT5nZXQodm0sIHByb3BlcnR5TmFtZSkpKSB7CkBAIC05MjgsNyArOTMxLDggQEAgYm9vbCBK
U09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQoSlNH
bG9iYWxPYmplY3QqIGdsb2IKICAgICAgICAgICAgICAgICByZXR1cm4gdHlwZUVycm9yKGdsb2Jh
bE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0
ZUVycm9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEF2b2lkIFB1dE1vZGVQdXQg
YmVjYXVzZSBpdCBmYWlscyBmb3Igbm9uLWV4dGVuc2libGUgc3RydWN0dXJlcy4KLSAgICAgICAg
ICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0ZvclN0cnVj
dHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSkgJiB+UHJvcGVydHlBdHRyaWJ1dGU6OkN1
c3RvbVZhbHVlLCBzbG90KTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCEoZW50cnktPnZh
bHVlLT5hdHRyaWJ1dGVzKCkgJiBDdXN0b21WYWx1ZSkpOworICAgICAgICAgICAgcHV0RGlyZWN0
KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52
YWx1ZS0+YXR0cmlidXRlcygpKSwgc2xvdCk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAg
ICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l
L0pTT2JqZWN0SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl
Y3RJbmxpbmVzLmgKaW5kZXggMzI3NTM0NDBiZjkxOTBiYjkxNGZiY2I3YjExODBiY2M2M2IzOWRl
MS4uODYyZWI3Nzk1ZTVhZWEzZDRkOWJkNTFkMmEyZjg4ODYzZjEzYTMwNSAxMDA2NDQKLS0tIGEv
U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKKysrIGIvU291
cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKQEAgLTMzOCw4ICsz
MzgsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbChW
TSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAgICAgICAgICAgIGlmICht
b2RlID09IFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmlidXRlcyAhPSBjdXJyZW50
QXR0cmlidXRlcyB8fCAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9y
Q3VzdG9tQWNjZXNzb3JPclZhbHVlKSkpCiAgICAgICAgICAgICAgICAgc2V0U3RydWN0dXJlKHZt
LCBTdHJ1Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0cnVjdHVyZSwgcHJv
cGVydHlOYW1lLCBhdHRyaWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBl
bHNlIHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghKGN1cnJlbnRBdHRyaWJ1dGVz
ICYgUHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKTsK
ICAgICAgICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVydHkodGhpcywgb2Zmc2V0KTsK
KyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KQEAg
LTM5Niw4ICszOTgsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJ
bnRlcm5hbChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8v
IFRoaXMgYWxsb3dzIGFkYXB0aXZlIHdhdGNocG9pbnRzIHRvIG9ic2VydmUgaWYgdGhlIG5ldyBz
dHJ1Y3R1cmUgaXMgdGhlIG9uZSB3ZSB3YW50LgogICAgICAgICAgICAgRGVmZXJyZWRTdHJ1Y3R1
cmVUcmFuc2l0aW9uV2F0Y2hwb2ludEZpcmUgZGVmZXJyZWRXYXRjaHBvaW50RmlyZSh2bSwgc3Ry
dWN0dXJlKTsKICAgICAgICAgICAgIHNldFN0cnVjdHVyZSh2bSwgU3RydWN0dXJlOjphdHRyaWJ1
dGVDaGFuZ2VUcmFuc2l0aW9uKHZtLCBzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgYXR0cmlidXRl
cywgJmRlZmVycmVkV2F0Y2hwb2ludEZpcmUpKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIH0g
ZWxzZSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghKGN1cnJlbnRBdHRyaWJ1dGVzICYg
UHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKTsKICAg
ICAgICAgICAgIHNsb3Quc2V0RXhpc3RpbmdQcm9wZXJ0eSh0aGlzLCBvZmZzZXQpOworICAgICAg
ICB9CiAKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9D
aGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCAzZDg5MTI0ZWEwNjVkNTcyMDMxMjg2
YzJhM2MzOGYwODc2ZmVjZmIxLi5mOTIyMjliM2QxOThhZTM0OTNlYjk0MmY2ZWRhZjljMDg1MmQ5
MGY2IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTE0ICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9A
YXBwbGUuY29tPgorCisgICAgICAgIGRlZmluZVByb3BlcnR5T25SZWNlaXZlciBzaG91bGQgY2hl
Y2sgaWYgcmVjZWl2ZXIgY2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworICAgICAgICA8cmRhcjovLzgw
MjU5NzEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogc3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qczogQWRkZWQuCisKIDIwMjEtMDct
MTQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENoZWNrIGZvciBv
dXQgb2YgbWVtb3J5IGluIEpTQzo6Z2xvYmFsRnVuY0VzY2FwZSgpIGFuZCBKU0M6Omdsb2JhbEZ1
bmNVbmVzY2FwZSgpLgpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3Vz
dG9tLXZhbHVlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpz
Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAuLjQ3NTE2NzNlNTAzNzk3YzhkYThiMzJhZDM0YzE4Y2IxMTczOGIwMWYKLS0t
IC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUu
anMKQEAgLTAsMCArMSw2IEBACisoey4uLlJlZ0V4cH0pOworbGV0IGMgPSB7fTsKK1JlZmxlY3Qu
c2V0KGMsICckXycsICdmb28nLCBSZWdFeHApOworbGV0IGEgPSBbXTsKK2EuX19wcm90b19fID0g
UmVnRXhwOworYS4kXyA9ICcnOwo=
</data>
<flag name="commit-queue"
          id="455804"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433526</attachid>
            <date>2021-07-14 13:51:00 -0700</date>
            <delta_ts>2021-07-22 11:08:26 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210714135059.patch</filename>
            <type>text/plain</type>
            <size>6708</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li44ZDE2ODM0YzY5NDliZmI3
MDIyODMxZjNmZjAyZmMzMTc0NDE0ZDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNiBAQAorMjAyMS0wNy0xNCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHJlY2VpdmVyIGBjYW5QZXJm
b3JtRmFzdFB1dElubGluZWAsIGFuZCBpZiB0aGF0IGlzCisgICAgICAgIGZhbHNlIHdlIHNob3Vs
ZCB1c2UgYHB1dElubGluZVNsb3dgIGluc3RlYWQsIHdoaWNoIHdpbGwgY29ycmVjdGx5IGhhbmRs
ZSBjdXN0b20gdmFsdWVzLgorICAgICAgICBJIGFsc28gYWRkZWQgYXNzZXJ0aW9ucyB0byBwdXRJ
bmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZCBhbmQgcHV0RGlyZWN0SW50
ZXJuYWwKKyAgICAgICAgdG8gbWFrZSBzdXJlIHdlIGRvbid0IGFjY2lkZW50YWxseSBvdmVyd3Jp
dGUgY3VzdG9tIHZhbHVlcyBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogcnVudGltZS9KU09i
amVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2
ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRp
Y1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6
CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisKIDIwMjEtMDct
MTQgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ29u
dmVydCBzbWFsbCBKSVQgcG9vbCB0ZXN0cyBpbnRvIGV4ZWN1dGFibGUgZnV6emluZwpkaWZmIC0t
Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCmluZGV4IGUwYWEwZjNhZTM5OTZh
MmYyMzk2MTU0NmMwMzhmMzRlZDdlNGE0ODQuLjMzMjgxOGM4YzRmMWZmYWRjMTJmMmM4YzJjOTU5
MTk3ZTFjMDJjNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5j
cHAKQEAgLTkwNiw2ICs5MDYsOCBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVj
ZWl2ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogICAgICAgICAg
ICAgcmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFsT2JqZWN0LCBwcm9w
ZXJ0eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUoKSk7CiAgICAgfQog
CisgICAgaWYgKCFyZWNlaXZlci0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3BlcnR5
TmFtZSkpCisgICAgICAgIHJldHVybiByZWNlaXZlci0+cHV0SW5saW5lU2xvdyhnbG9iYWxPYmpl
Y3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIGlmIChVTkxJS0VMWShyZWNlaXZl
ci0+aGFzTm9uUmVpZmllZFN0YXRpY1Byb3BlcnRpZXModm0pKSkKICAgICAgICAgcmV0dXJuIHJl
Y2VpdmVyLT5wdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZChnbG9i
YWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogICAgIHJldHVybiByZWNlaXZl
ci0+cHV0SW5saW5lRmFzdChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3Qp
OwpAQCAtOTEzLDExICs5MTUsMTIgQEAgYm9vbCBKU09iamVjdDo6ZGVmaW5lUHJvcGVydHlPblJl
Y2VpdmVyKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmEKIAogYm9vbCBK
U09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQoSlNH
bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgSlNW
YWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQogewotICAgIEFTU0VSVCghcGFyc2VJ
bmRleChwcm9wZXJ0eU5hbWUpKTsKLQogICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsK
ICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKKyAgICBBU1NFUlQo
IXBhcnNlSW5kZXgocHJvcGVydHlOYW1lKSk7CisgICAgQVNTRVJUKHRoaXMtPmNhblBlcmZvcm1G
YXN0UHV0SW5saW5lKHZtLCBwcm9wZXJ0eU5hbWUpKTsKKwogICAgIFN0cnVjdHVyZSogc3RydWN0
dXJlID0gdGhpcy0+c3RydWN0dXJlKHZtKTsKICAgICBBU1NFUlQoc3RydWN0dXJlLT5oYXNOb25S
ZWlmaWVkU3RhdGljUHJvcGVydGllcygpKTsKICAgICBpZiAoIWlzVmFsaWRPZmZzZXQoc3RydWN0
dXJlLT5nZXQodm0sIHByb3BlcnR5TmFtZSkpKSB7CkBAIC05MjgsNyArOTMxLDggQEAgYm9vbCBK
U09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQoSlNH
bG9iYWxPYmplY3QqIGdsb2IKICAgICAgICAgICAgICAgICByZXR1cm4gdHlwZUVycm9yKGdsb2Jh
bE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0
ZUVycm9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEF2b2lkIFB1dE1vZGVQdXQg
YmVjYXVzZSBpdCBmYWlscyBmb3Igbm9uLWV4dGVuc2libGUgc3RydWN0dXJlcy4KLSAgICAgICAg
ICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0ZvclN0cnVj
dHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSkgJiB+UHJvcGVydHlBdHRyaWJ1dGU6OkN1
c3RvbVZhbHVlLCBzbG90KTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCEoZW50cnktPnZh
bHVlLT5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUpKTsKKyAg
ICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0Zv
clN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSksIHNsb3QpOwogICAgICAgICAg
ICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCmluZGV4IDMyNzUzNDQwYmY5MTkwYmI5MTRm
YmNiN2IxMTgwYmNjNjNiMzlkZTEuLjg2MmViNzc5NWU1YWVhM2Q0ZDliZDUxZDJhMmY4ODg2M2Yx
M2EzMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0
SW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5s
aW5lcy5oCkBAIC0zMzgsOCArMzM4LDEwIEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6
cHV0RGlyZWN0SW50ZXJuYWwoVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lCiAgICAg
ICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MzQy
CiAgICAgICAgICAgICBpZiAobW9kZSA9PSBQdXRNb2RlRGVmaW5lT3duUHJvcGVydHkgJiYgKGF0
dHJpYnV0ZXMgIT0gY3VycmVudEF0dHJpYnV0ZXMgfHwgKGF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0
dHJpYnV0ZTo6QWNjZXNzb3JPckN1c3RvbUFjY2Vzc29yT3JWYWx1ZSkpKQogICAgICAgICAgICAg
ICAgIHNldFN0cnVjdHVyZSh2bSwgU3RydWN0dXJlOjphdHRyaWJ1dGVDaGFuZ2VUcmFuc2l0aW9u
KHZtLCBzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcykpOwotICAgICAgICAgICAg
ZWxzZQorICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQo
IShjdXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9t
QWNjZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICAgICAgc2xvdC5zZXRFeGlzdGluZ1Byb3Bl
cnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHJldHVybiB0
cnVlOwogICAgICAgICB9CkBAIC0zOTYsOCArMzk4LDEwIEBAIEFMV0FZU19JTkxJTkUgYm9vbCBK
U09iamVjdDo6cHV0RGlyZWN0SW50ZXJuYWwoVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlO
YW1lCiAgICAgICAgICAgICAvLyBUaGlzIGFsbG93cyBhZGFwdGl2ZSB3YXRjaHBvaW50cyB0byBv
YnNlcnZlIGlmIHRoZSBuZXcgc3RydWN0dXJlIGlzIHRoZSBvbmUgd2Ugd2FudC4KICAgICAgICAg
ICAgIERlZmVycmVkU3RydWN0dXJlVHJhbnNpdGlvbldhdGNocG9pbnRGaXJlIGRlZmVycmVkV2F0
Y2hwb2ludEZpcmUodm0sIHN0cnVjdHVyZSk7CiAgICAgICAgICAgICBzZXRTdHJ1Y3R1cmUodm0s
IFN0cnVjdHVyZTo6YXR0cmlidXRlQ2hhbmdlVHJhbnNpdGlvbih2bSwgc3RydWN0dXJlLCBwcm9w
ZXJ0eU5hbWUsIGF0dHJpYnV0ZXMsICZkZWZlcnJlZFdhdGNocG9pbnRGaXJlKSk7Ci0gICAgICAg
IH0gZWxzZQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIShj
dXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNj
ZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVydHkodGhp
cywgb2Zmc2V0KTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlm
ZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2Q4
OTEyNGVhMDY1ZDU3MjAzMTI4NmMyYTNjMzhmMDg3NmZlY2ZiMS4uZjkyMjI5YjNkMTk4YWUzNDkz
ZWI5NDJmNmVkYWY5YzA4NTJkOTBmNiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysr
IGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNy0xNCAgVGFkZXUg
WmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9u
UmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJlY2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5l
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMK
KyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanM6
IEFkZGVkLgorCiAyMDIxLTA3LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog
ICAgICAgICBDaGVjayBmb3Igb3V0IG9mIG1lbW9yeSBpbiBKU0M6Omdsb2JhbEZ1bmNFc2NhcGUo
KSBhbmQgSlNDOjpnbG9iYWxGdW5jVW5lc2NhcGUoKS4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3Ry
ZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcyBiL0pTVGVzdHMvc3RyZXNzL3JlZmxlY3Qt
c2V0LWN1c3RvbS12YWx1ZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NzUxNjczZTUwMzc5N2M4ZGE4YjMyYWQz
NGMxOGNiMTE3MzhiMDFmCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVj
dC1zZXQtY3VzdG9tLXZhbHVlLmpzCkBAIC0wLDAgKzEsNiBAQAorKHsuLi5SZWdFeHB9KTsKK2xl
dCBjID0ge307CitSZWZsZWN0LnNldChjLCAnJF8nLCAnZm9vJywgUmVnRXhwKTsKK2xldCBhID0g
W107CithLl9fcHJvdG9fXyA9IFJlZ0V4cDsKK2EuJF8gPSAnJzsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434022</attachid>
            <date>2021-07-22 11:08:28 -0700</date>
            <delta_ts>2021-07-22 15:20:27 -0700</delta_ts>
            <desc>WIP</desc>
            <filename>bug-227963-20210722110828.patch</filename>
            <type>text/plain</type>
            <size>7427</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li44ZDE2ODM0YzY5NDliZmI3
MDIyODMxZjNmZjAyZmMzMTc0NDE0ZDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNiBAQAorMjAyMS0wNy0xNCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHJlY2VpdmVyIGBjYW5QZXJm
b3JtRmFzdFB1dElubGluZWAsIGFuZCBpZiB0aGF0IGlzCisgICAgICAgIGZhbHNlIHdlIHNob3Vs
ZCB1c2UgYHB1dElubGluZVNsb3dgIGluc3RlYWQsIHdoaWNoIHdpbGwgY29ycmVjdGx5IGhhbmRs
ZSBjdXN0b20gdmFsdWVzLgorICAgICAgICBJIGFsc28gYWRkZWQgYXNzZXJ0aW9ucyB0byBwdXRJ
bmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZCBhbmQgcHV0RGlyZWN0SW50
ZXJuYWwKKyAgICAgICAgdG8gbWFrZSBzdXJlIHdlIGRvbid0IGFjY2lkZW50YWxseSBvdmVyd3Jp
dGUgY3VzdG9tIHZhbHVlcyBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogcnVudGltZS9KU09i
amVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2
ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRp
Y1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6
CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisKIDIwMjEtMDct
MTQgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ29u
dmVydCBzbWFsbCBKSVQgcG9vbCB0ZXN0cyBpbnRvIGV4ZWN1dGFibGUgZnV6emluZwpkaWZmIC0t
Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCmluZGV4IGUwYWEwZjNhZTM5OTZh
MmYyMzk2MTU0NmMwMzhmMzRlZDdlNGE0ODQuLmY5M2FkNDM0NzhkYTBkOWY1NWJlMzJiZDNlNTVi
ZWYzZDI4YjdlOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5j
cHAKQEAgLTg3OCw2ICs4NzgsOCBAQCBzdGF0aWMgTkVWRVJfSU5MSU5FIGJvb2wgZGVmaW5lUHJv
cGVydHlPblJlY2VpdmVyU2xvdyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgICAgICAv
LyBGSVhNRTogRm9yIGFuIGFjY2Vzc29yIHdpdGggc2V0dGVyLCB0aGUgZXJyb3IgbWVzc2FnZSBp
cyBtaXNsZWFkaW5nLgogICAgICAgICBpZiAoc2xvdC5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0
dHJpYnV0ZTo6UmVhZE9ubHlPckFjY2Vzc29yT3JDdXN0b21BY2Nlc3NvcikKICAgICAgICAgICAg
IHJldHVybiB0eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2hvdWxkVGhyb3csIFJlYWRv
bmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgaWYgKHNsb3QuYXR0cmlidXRlcygpICYg
UHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlKQorICAgICAgICAgICAgcmV0dXJuIHNsb3Qu
Y3VzdG9tU2V0dGVyKCkoZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlOjplbmNvZGUocmVjZWl2ZXIpLCBK
U1ZhbHVlOjplbmNvZGUodmFsdWUpLCBwcm9wZXJ0eU5hbWUpOwogICAgICAgICBkZXNjcmlwdG9y
LnNldFZhbHVlKHZhbHVlKTsKICAgICB9IGVsc2UKICAgICAgICAgZGVzY3JpcHRvci5zZXREZXNj
cmlwdG9yKHZhbHVlLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlBdHRyaWJ1dGU6Ok5v
bmUpKTsKQEAgLTkwNiw2ICs5MDgsOSBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9u
UmVjZWl2ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogICAgICAg
ICAgICAgcmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFsT2JqZWN0LCBw
cm9wZXJ0eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUoKSk7CiAgICAg
fQogCisgICAgaWYgKCFyZWNlaXZlci0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3Bl
cnR5TmFtZSkpCisgICAgICAgIHJldHVybiBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93KGds
b2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgcmVjZWl2ZXIsIHNsb3QuaXNTdHJpY3RN
b2RlKCkpOworCiAgICAgaWYgKFVOTElLRUxZKHJlY2VpdmVyLT5oYXNOb25SZWlmaWVkU3RhdGlj
UHJvcGVydGllcyh2bSkpKQogICAgICAgICByZXR1cm4gcmVjZWl2ZXItPnB1dElubGluZUZhc3RS
ZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1l
LCB2YWx1ZSwgc2xvdCk7CiAgICAgcmV0dXJuIHJlY2VpdmVyLT5wdXRJbmxpbmVGYXN0KGdsb2Jh
bE9iamVjdCwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CkBAIC05MTMsMTEgKzkxOCwxMiBA
QCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIoSlNHbG9iYWxPYmplY3Qq
IGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogCiBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0
UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq
ZWN0LCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9wZXJ0
eVNsb3QmIHNsb3QpCiB7Ci0gICAgQVNTRVJUKCFwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpOwot
CiAgICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOwogICAgIGF1dG8gc2NvcGUgPSBERUNM
QVJFX1RIUk9XX1NDT1BFKHZtKTsKIAorICAgIEFTU0VSVCghcGFyc2VJbmRleChwcm9wZXJ0eU5h
bWUpKTsKKyAgICBBU1NFUlQodGhpcy0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3Bl
cnR5TmFtZSkpOworCiAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSB0aGlzLT5zdHJ1Y3R1cmUo
dm0pOwogICAgIEFTU0VSVChzdHJ1Y3R1cmUtPmhhc05vblJlaWZpZWRTdGF0aWNQcm9wZXJ0aWVz
KCkpOwogICAgIGlmICghaXNWYWxpZE9mZnNldChzdHJ1Y3R1cmUtPmdldCh2bSwgcHJvcGVydHlO
YW1lKSkpIHsKQEAgLTkyOCw3ICs5MzQsOCBAQCBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0
UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZChKU0dsb2JhbE9iamVjdCogZ2xvYgogICAg
ICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2xvdC5p
c1N0cmljdE1vZGUoKSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICAgICAg
fQogICAgICAgICAgICAgLy8gQXZvaWQgUHV0TW9kZVB1dCBiZWNhdXNlIGl0IGZhaWxzIGZvciBu
b24tZXh0ZW5zaWJsZSBzdHJ1Y3R1cmVzLgotICAgICAgICAgICAgcHV0RGlyZWN0KHZtLCBwcm9w
ZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52YWx1ZS0+YXR0
cmlidXRlcygpKSAmIH5Qcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUsIHNsb3QpOworICAg
ICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSAmIFBy
b3BlcnR5QXR0cmlidXRlOjpDdXN0b21WYWx1ZSkpOworICAgICAgICAgICAgcHV0RGlyZWN0KHZt
LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52YWx1
ZS0+YXR0cmlidXRlcygpKSwgc2xvdCk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAg
ICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJ
bmxpbmVzLmgKaW5kZXggMzI3NTM0NDBiZjkxOTBiYjkxNGZiY2I3YjExODBiY2M2M2IzOWRlMS4u
ODYyZWI3Nzk1ZTVhZWEzZDRkOWJkNTFkMmEyZjg4ODYzZjEzYTMwNSAxMDA2NDQKLS0tIGEvU291
cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKKysrIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKQEAgLTMzOCw4ICszMzgs
MTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbChWTSYg
dm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAgICAgICAgICAgIGlmIChtb2Rl
ID09IFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmlidXRlcyAhPSBjdXJyZW50QXR0
cmlidXRlcyB8fCAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3Vz
dG9tQWNjZXNzb3JPclZhbHVlKSkpCiAgICAgICAgICAgICAgICAgc2V0U3RydWN0dXJlKHZtLCBT
dHJ1Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0cnVjdHVyZSwgcHJvcGVy
dHlOYW1lLCBhdHRyaWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBlbHNl
IHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghKGN1cnJlbnRBdHRyaWJ1dGVzICYg
UHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKTsKICAg
ICAgICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVydHkodGhpcywgb2Zmc2V0KTsKKyAg
ICAgICAgICAgIH0KIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KQEAgLTM5
Niw4ICszOTgsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRl
cm5hbChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIFRo
aXMgYWxsb3dzIGFkYXB0aXZlIHdhdGNocG9pbnRzIHRvIG9ic2VydmUgaWYgdGhlIG5ldyBzdHJ1
Y3R1cmUgaXMgdGhlIG9uZSB3ZSB3YW50LgogICAgICAgICAgICAgRGVmZXJyZWRTdHJ1Y3R1cmVU
cmFuc2l0aW9uV2F0Y2hwb2ludEZpcmUgZGVmZXJyZWRXYXRjaHBvaW50RmlyZSh2bSwgc3RydWN0
dXJlKTsKICAgICAgICAgICAgIHNldFN0cnVjdHVyZSh2bSwgU3RydWN0dXJlOjphdHRyaWJ1dGVD
aGFuZ2VUcmFuc2l0aW9uKHZtLCBzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcywg
JmRlZmVycmVkV2F0Y2hwb2ludEZpcmUpKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIH0gZWxz
ZSB7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghKGN1cnJlbnRBdHRyaWJ1dGVzICYgUHJv
cGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKTsKICAgICAg
ICAgICAgIHNsb3Quc2V0RXhpc3RpbmdQcm9wZXJ0eSh0aGlzLCBvZmZzZXQpOworICAgICAgICB9
CiAKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFu
Z2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCAzZDg5MTI0ZWEwNjVkNTcyMDMxMjg2YzJh
M2MzOGYwODc2ZmVjZmIxLi5mOTIyMjliM2QxOThhZTM0OTNlYjk0MmY2ZWRhZjljMDg1MmQ5MGY2
IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTE0ICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBw
bGUuY29tPgorCisgICAgICAgIGRlZmluZVByb3BlcnR5T25SZWNlaXZlciBzaG91bGQgY2hlY2sg
aWYgcmVjZWl2ZXIgY2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworICAgICAgICA8cmRhcjovLzgwMjU5
NzEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
c3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qczogQWRkZWQuCisKIDIwMjEtMDctMTQg
IE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENoZWNrIGZvciBvdXQg
b2YgbWVtb3J5IGluIEpTQzo6Z2xvYmFsRnVuY0VzY2FwZSgpIGFuZCBKU0M6Omdsb2JhbEZ1bmNV
bmVzY2FwZSgpLgpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9t
LXZhbHVlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLjQ3NTE2NzNlNTAzNzk3YzhkYThiMzJhZDM0YzE4Y2IxMTczOGIwMWYKLS0tIC9k
ZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMK
QEAgLTAsMCArMSw2IEBACisoey4uLlJlZ0V4cH0pOworbGV0IGMgPSB7fTsKK1JlZmxlY3Quc2V0
KGMsICckXycsICdmb28nLCBSZWdFeHApOworbGV0IGEgPSBbXTsKK2EuX19wcm90b19fID0gUmVn
RXhwOworYS4kXyA9ICcnOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434041</attachid>
            <date>2021-07-22 15:20:29 -0700</date>
            <delta_ts>2021-07-29 15:37:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210722152028.patch</filename>
            <type>text/plain</type>
            <size>10520</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li5iZWFjN2QyN2E1OTJiODk3
OTYzMzU5NDllNGRmZjZlOWMyZmI2NmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwzMiBAQAorMjAyMS0wNy0yMiAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHJlY2VpdmVyIGBjYW5QZXJm
b3JtRmFzdFB1dElubGluZWAsIGFuZCBpZiB0aGUgY2hlY2sKKyAgICAgICAgZmFpbHMgd2Ugbm93
IGNhbGwgYGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3dgLCB3aGljaCBoYXMgYmVlbiB1cGRh
dGVkIHRvIGhhbmRsZSBjdXN0b20gdmFsdWVzCisgICAgICAgIGNvcnJlY3RseS4KKyAgICAgICAg
SSBhbHNvIGhhZCB0byB1cGRhdGUgYHB1dElubGluZUZhc3RgIGFuZCBhIGNvdXBsZSB0ZXN0cywg
c2luY2Ugd2UgZW5kZWQgdXAgc2hvd2luZyB0aGUgcmlnaHQKKyAgICAgICAgZXJyb3IgbWVzc2Fn
ZSB3aGVuIGdvaW5nIHRocm91Z2ggZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyU2xvdyB3aGVuIHRo
ZSBvYmplY3QgaXMgbm90IGV4dGVuc2libGUsCisgICAgICAgIGJ1dCBwdXRJbmxpbmVGYXN0IHdv
dWxkIHN0aWxsIHNob3cgdGhlIGluY29ycmVjdCBtZXNzYWdlIChhcyBpZiB0aGUgcHJvcGVydHkg
d2FzIHJlYWQtb25seSkuCisgICAgICAgIExhc3QgSSBhZGRlZCBhc3NlcnRpb25zIHRvIHB1dElu
bGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkIGFuZCBwdXREaXJlY3RJbnRl
cm5hbAorICAgICAgICB0byBtYWtlIHN1cmUgd2UgZG9uJ3QgYWNjaWRlbnRhbGx5IG92ZXJ3cml0
ZSBjdXN0b20gdmFsdWVzIGluIHRoZSBmdXR1cmUuCisKKyAgICAgICAgKiBydW50aW1lL0pTT2Jq
ZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6ZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyU2xvdyk6Cisg
ICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIpOgorICAgICAg
ICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZO
ZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAgICAgIChK
U0M6OkpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0KToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1
dERpcmVjdEludGVybmFsKToKKwogMjAyMS0wNy0xNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWls
bGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDb252ZXJ0IHNtYWxsIEpJVCBwb29sIHRlc3RzIGlu
dG8gZXhlY3V0YWJsZSBmdXp6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
cnVudGltZS9KU09iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09i
amVjdC5jcHAKaW5kZXggZTBhYTBmM2FlMzk5NmEyZjIzOTYxNTQ2YzAzOGYzNGVkN2U0YTQ4NC4u
MWFmZjU1Y2MyNGE4NjY1ZjM0YmRiYTY3MDBlNmQ5YzhjY2JkM2EwNSAxMDA2NDQKLS0tIGEvU291
cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcApAQCAtODc4LDYgKzg3OCwxMSBAQCBzdGF0
aWMgTkVWRVJfSU5MSU5FIGJvb2wgZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyU2xvdyhKU0dsb2Jh
bE9iamVjdCogZ2xvYmFsT2JqZQogICAgICAgICAvLyBGSVhNRTogRm9yIGFuIGFjY2Vzc29yIHdp
dGggc2V0dGVyLCB0aGUgZXJyb3IgbWVzc2FnZSBpcyBtaXNsZWFkaW5nLgogICAgICAgICBpZiAo
c2xvdC5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9ubHlPckFjY2Vzc29y
T3JDdXN0b21BY2Nlc3NvcikKICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZ2xvYmFsT2Jq
ZWN0LCBzY29wZSwgc2hvdWxkVGhyb3csIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAg
ICAgICAgaWYgKHNsb3QuYXR0cmlidXRlcygpICYgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZh
bHVlKSB7CisgICAgICAgICAgICBQdXRQcm9wZXJ0eVNsb3Q6OlB1dFZhbHVlRnVuYyBjdXN0b21T
ZXR0ZXIgPSBzbG90LmN1c3RvbVNldHRlcigpOworICAgICAgICAgICAgaWYgKGN1c3RvbVNldHRl
cikKKyAgICAgICAgICAgICAgICByZXR1cm4gY3VzdG9tU2V0dGVyKGdsb2JhbE9iamVjdCwgSlNW
YWx1ZTo6ZW5jb2RlKHJlY2VpdmVyKSwgSlNWYWx1ZTo6ZW5jb2RlKHZhbHVlKSwgcHJvcGVydHlO
YW1lKTsKKyAgICAgICAgfQogICAgICAgICBkZXNjcmlwdG9yLnNldFZhbHVlKHZhbHVlKTsKICAg
ICB9IGVsc2UKICAgICAgICAgZGVzY3JpcHRvci5zZXREZXNjcmlwdG9yKHZhbHVlLCBzdGF0aWNf
Y2FzdDx1bnNpZ25lZD4oUHJvcGVydHlBdHRyaWJ1dGU6Ok5vbmUpKTsKQEAgLTkwNiw2ICs5MTEs
OSBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIoSlNHbG9iYWxPYmpl
Y3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogICAgICAgICAgICAgcmV0dXJuIGRlZmluZVBy
b3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBy
ZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUoKSk7CiAgICAgfQogCisgICAgaWYgKCFyZWNlaXZl
ci0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3BlcnR5TmFtZSkpCisgICAgICAgIHJl
dHVybiBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93KGdsb2JhbE9iamVjdCwgcHJvcGVydHlO
YW1lLCB2YWx1ZSwgcmVjZWl2ZXIsIHNsb3QuaXNTdHJpY3RNb2RlKCkpOworCiAgICAgaWYgKFVO
TElLRUxZKHJlY2VpdmVyLT5oYXNOb25SZWlmaWVkU3RhdGljUHJvcGVydGllcyh2bSkpKQogICAg
ICAgICByZXR1cm4gcmVjZWl2ZXItPnB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0
eUlmTmVlZGVkKGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CiAgICAg
cmV0dXJuIHJlY2VpdmVyLT5wdXRJbmxpbmVGYXN0KGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1l
LCB2YWx1ZSwgc2xvdCk7CkBAIC05MTMsMTEgKzkyMSwxMiBAQCBib29sIEpTT2JqZWN0OjpkZWZp
bmVQcm9wZXJ0eU9uUmVjZWl2ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVy
dHlOYQogCiBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVy
dHlJZk5lZWRlZChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0eU5hbWUgcHJv
cGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9wZXJ0eVNsb3QmIHNsb3QpCiB7Ci0gICAg
QVNTRVJUKCFwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpOwotCiAgICAgVk0mIHZtID0gZ2xvYmFs
T2JqZWN0LT52bSgpOwogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsK
IAorICAgIEFTU0VSVCghcGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKTsKKyAgICBBU1NFUlQodGhp
cy0+Y2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUodm0sIHByb3BlcnR5TmFtZSkpOworCiAgICAgU3Ry
dWN0dXJlKiBzdHJ1Y3R1cmUgPSB0aGlzLT5zdHJ1Y3R1cmUodm0pOwogICAgIEFTU0VSVChzdHJ1
Y3R1cmUtPmhhc05vblJlaWZpZWRTdGF0aWNQcm9wZXJ0aWVzKCkpOwogICAgIGlmICghaXNWYWxp
ZE9mZnNldChzdHJ1Y3R1cmUtPmdldCh2bSwgcHJvcGVydHlOYW1lKSkpIHsKQEAgLTkyOCw3ICs5
MzcsOCBAQCBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVy
dHlJZk5lZWRlZChKU0dsb2JhbE9iamVjdCogZ2xvYgogICAgICAgICAgICAgICAgIHJldHVybiB0
eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2xvdC5pc1N0cmljdE1vZGUoKSwgUmVhZG9u
bHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8gQXZv
aWQgUHV0TW9kZVB1dCBiZWNhdXNlIGl0IGZhaWxzIGZvciBub24tZXh0ZW5zaWJsZSBzdHJ1Y3R1
cmVzLgotICAgICAgICAgICAgcHV0RGlyZWN0KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRy
aWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpKSAmIH5Qcm9wZXJ0
eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUsIHNsb3QpOworICAgICAgICAgICAgQVNTRVJUKCEoZW50
cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUp
KTsKKyAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmli
dXRlc0ZvclN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSksIHNsb3QpOwogICAg
ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaCBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCmluZGV4IDMyNzUzNDQwYmY5MTkw
YmI5MTRmYmNiN2IxMTgwYmNjNjNiMzlkZTEuLjc5YWQ0ZjEyNjJjZDZhZWZhNTIzYzFkYTIzYmNk
MDQ1MTE1NzAxYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0SW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq
ZWN0SW5saW5lcy5oCkBAIC0yODIsOSArMjgyLDExIEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09i
amVjdDo6cHV0SW5saW5lRmFzdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0
CiAgICAgVk0mIHZtID0gZ2V0Vk0oZ2xvYmFsT2JqZWN0KTsKICAgICBhdXRvIHNjb3BlID0gREVD
TEFSRV9USFJPV19TQ09QRSh2bSk7CiAKLSAgICAvLyBGSVhNRTogRm9yIGEgZmFpbHVyZSBkdWUg
dG8gbm9uLWV4dGVuc2libGUgc3RydWN0dXJlLCB0aGUgZXJyb3IgbWVzc2FnZSBpcyBtaXNsZWFk
aW5nLgotICAgIGlmICghcHV0RGlyZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHByb3BlcnR5
TmFtZSwgdmFsdWUsIDAsIHNsb3QpKQorICAgIGlmICghcHV0RGlyZWN0SW50ZXJuYWw8UHV0TW9k
ZVB1dD4odm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNsb3QpKSB7CisgICAgICAgIGlmICgh
aXNTdHJ1Y3R1cmVFeHRlbnNpYmxlKHZtKSkKKyAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3Io
Z2xvYmFsT2JqZWN0LCBzY29wZSwgc2xvdC5pc1N0cmljdE1vZGUoKSwgTm9uRXh0ZW5zaWJsZU9i
amVjdFByb3BlcnR5RGVmaW5lRXJyb3IpOwogICAgICAgICByZXR1cm4gdHlwZUVycm9yKGdsb2Jh
bE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0
ZUVycm9yKTsKKyAgICB9CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTMzOCw4ICszNDAsMTAg
QEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbChWTSYgdm0s
IFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAgICAgICAgICAgIGlmIChtb2RlID09
IFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmlidXRlcyAhPSBjdXJyZW50QXR0cmli
dXRlcyB8fCAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9t
QWNjZXNzb3JPclZhbHVlKSkpCiAgICAgICAgICAgICAgICAgc2V0U3RydWN0dXJlKHZtLCBTdHJ1
Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0cnVjdHVyZSwgcHJvcGVydHlO
YW1lLCBhdHRyaWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBlbHNlIHsK
KyAgICAgICAgICAgICAgICBBU1NFUlQoIShjdXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0
cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICAg
ICAgc2xvdC5zZXRFeGlzdGluZ1Byb3BlcnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAgICAgICB9
CiAKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CkBAIC0zOTYsOCArNDAwLDEw
IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0SW50ZXJuYWwoVk0mIHZt
LCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lCiAgICAgICAgICAgICAvLyBUaGlzIGFsbG93cyBh
ZGFwdGl2ZSB3YXRjaHBvaW50cyB0byBvYnNlcnZlIGlmIHRoZSBuZXcgc3RydWN0dXJlIGlzIHRo
ZSBvbmUgd2Ugd2FudC4KICAgICAgICAgICAgIERlZmVycmVkU3RydWN0dXJlVHJhbnNpdGlvbldh
dGNocG9pbnRGaXJlIGRlZmVycmVkV2F0Y2hwb2ludEZpcmUodm0sIHN0cnVjdHVyZSk7CiAgICAg
ICAgICAgICBzZXRTdHJ1Y3R1cmUodm0sIFN0cnVjdHVyZTo6YXR0cmlidXRlQ2hhbmdlVHJhbnNp
dGlvbih2bSwgc3RydWN0dXJlLCBwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMsICZkZWZlcnJlZFdh
dGNocG9pbnRGaXJlKSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICB9IGVsc2UgeworICAgICAg
ICAgICAgQVNTRVJUKCEoY3VycmVudEF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6QWNj
ZXNzb3JPckN1c3RvbUFjY2Vzc29yT3JWYWx1ZSkpOwogICAgICAgICAgICAgc2xvdC5zZXRFeGlz
dGluZ1Byb3BlcnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAgIH0KIAogICAgICAgICByZXR1cm4g
dHJ1ZTsKICAgICB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hh
bmdlTG9nCmluZGV4IDNkODkxMjRlYTA2NWQ1NzIwMzEyODZjMmEzYzM4ZjA4NzZmZWNmYjEuLjAw
MTk1ZDVjYTk5Mjc2MWE4MzUzM2RkMjQwMGMyMmM0NWFmYWI2MDYgMTAwNjQ0Ci0tLSBhL0pTVGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw
MjEtMDctMjIgIFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAg
ZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyIHNob3VsZCBjaGVjayBpZiByZWNlaXZlciBjYW5QZXJm
b3JtRmFzdFB1dElubGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjI3OTYzCisgICAgICAgIDxyZGFyOi8vODAyNTk3MTA+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvY3VzdG9tLWdldC1z
ZXQtcHJvdG8tY2hhaW4tcHV0LmpzOgorICAgICAgICAobGV0Lm9iamVjdC5vZi5nZXRPYmplY3Rz
KToKKyAgICAgICAgKiBzdHJlc3MvcHV0LW5vbi1yZWlmaWVkLXN0YXRpYy1mdW5jdGlvbi1vci1j
dXN0b20uanM6CisgICAgICAgICogc3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qczog
QWRkZWQuCisKIDIwMjEtMDctMTQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg
ICAgICAgIENoZWNrIGZvciBvdXQgb2YgbWVtb3J5IGluIEpTQzo6Z2xvYmFsRnVuY0VzY2FwZSgp
IGFuZCBKU0M6Omdsb2JhbEZ1bmNVbmVzY2FwZSgpLgpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJl
c3MvY3VzdG9tLWdldC1zZXQtcHJvdG8tY2hhaW4tcHV0LmpzIGIvSlNUZXN0cy9zdHJlc3MvY3Vz
dG9tLWdldC1zZXQtcHJvdG8tY2hhaW4tcHV0LmpzCmluZGV4IDJjNmIxNTg3YTQ0ZmYxNDI3NDU3
OGE5Y2RlOTcwYmY0NmEzMmE5ZWIuLjE5ZjkzMDU5ZmUyNTliNzBlZThjOTMyZTQyOGYzYTM1ZGYz
ODNiNmEgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2N1c3RvbS1nZXQtc2V0LXByb3RvLWNo
YWluLXB1dC5qcworKysgYi9KU1Rlc3RzL3N0cmVzcy9jdXN0b20tZ2V0LXNldC1wcm90by1jaGFp
bi1wdXQuanMKQEAgLTEyMSw3ICsxMjEsNyBAQCBmdW5jdGlvbiBnZXRCYXNlcygpIHsKICAgICBm
b3IgKGxldCBvYmplY3Qgb2YgZ2V0T2JqZWN0cygpKSB7CiAgICAgICAgIE9iamVjdC5wcmV2ZW50
RXh0ZW5zaW9ucyhvYmplY3QpOwogICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IDEwMDsgKytp
KSB7Ci0gICAgICAgICAgICBzaG91bGRUaHJvdygoKSA9PiB7IG9iamVjdC5jdXN0b21WYWx1ZUds
b2JhbE9iamVjdCA9IHt9OyB9LCAiVHlwZUVycm9yOiBBdHRlbXB0ZWQgdG8gYXNzaWduIHRvIHJl
YWRvbmx5IHByb3BlcnR5LiIpOworICAgICAgICAgICAgc2hvdWxkVGhyb3coKCkgPT4geyBvYmpl
Y3QuY3VzdG9tVmFsdWVHbG9iYWxPYmplY3QgPSB7fTsgfSwgIlR5cGVFcnJvcjogQXR0ZW1wdGlu
ZyB0byBkZWZpbmUgcHJvcGVydHkgb24gb2JqZWN0IHRoYXQgaXMgbm90IGV4dGVuc2libGUuIik7
CiAgICAgICAgICAgICBhc3NlcnQoIVJlZmxlY3Quc2V0KG9iamVjdCwgImN1c3RvbVZhbHVlR2xv
YmFsT2JqZWN0Iiwge30pKTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL0pTVGVzdHMv
c3RyZXNzL3B1dC1ub24tcmVpZmllZC1zdGF0aWMtZnVuY3Rpb24tb3ItY3VzdG9tLmpzIGIvSlNU
ZXN0cy9zdHJlc3MvcHV0LW5vbi1yZWlmaWVkLXN0YXRpYy1mdW5jdGlvbi1vci1jdXN0b20uanMK
aW5kZXggNWMxZjNhYzc1NzI2NDk3NWRhYzM5NTFmNDg5NWY5YjIyNGY5MWZkOS4uMDE3MDBiYWM4
OGNjZmRhZGVjMGFkOWI5YWY3NjdmNDhjMmY0ZDVjZiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9zdHJl
c3MvcHV0LW5vbi1yZWlmaWVkLXN0YXRpYy1mdW5jdGlvbi1vci1jdXN0b20uanMKKysrIGIvSlNU
ZXN0cy9zdHJlc3MvcHV0LW5vbi1yZWlmaWVkLXN0YXRpYy1mdW5jdGlvbi1vci1jdXN0b20uanMK
QEAgLTEyNSw3ICsxMjUsNyBAQCBmb3IgKGNvbnN0IFtvYmplY3QsIGtleV0gb2YgdGVzdENhc2Vz
KCkpIHsKICAgICBjb25zdCBoZWlyID0gT2JqZWN0LmNyZWF0ZShvYmplY3QpOwogICAgIE9iamVj
dC5wcmV2ZW50RXh0ZW5zaW9ucyhoZWlyKTsKIAotICAgIHNob3VsZFRocm93KCgpID0+IHsgaGVp
cltrZXldID0gdGVzdFZhbHVlOyB9LCAiVHlwZUVycm9yOiBBdHRlbXB0ZWQgdG8gYXNzaWduIHRv
IHJlYWRvbmx5IHByb3BlcnR5LiIsIGtleSk7CisgICAgc2hvdWxkVGhyb3coKCkgPT4geyBoZWly
W2tleV0gPSB0ZXN0VmFsdWU7IH0sICJUeXBlRXJyb3I6IEF0dGVtcHRpbmcgdG8gZGVmaW5lIHBy
b3BlcnR5IG9uIG9iamVjdCB0aGF0IGlzIG5vdCBleHRlbnNpYmxlLiIsIGtleSk7CiAgICAgYXNz
ZXJ0KGhlaXJba2V5XSAhPT0gdGVzdFZhbHVlLCBrZXkpOwogICAgIGFzc2VydChvYmplY3Rba2V5
XSAhPT0gdGVzdFZhbHVlLCBrZXkpOwogfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcmVm
bGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3Vz
dG9tLXZhbHVlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ3NTE2NzNlNTAzNzk3YzhkYThiMzJhZDM0YzE4Y2Ix
MTczOGIwMWYKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1j
dXN0b20tdmFsdWUuanMKQEAgLTAsMCArMSw2IEBACisoey4uLlJlZ0V4cH0pOworbGV0IGMgPSB7
fTsKK1JlZmxlY3Quc2V0KGMsICckXycsICdmb28nLCBSZWdFeHApOworbGV0IGEgPSBbXTsKK2Eu
X19wcm90b19fID0gUmVnRXhwOworYS4kXyA9ICcnOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434579</attachid>
            <date>2021-07-29 15:37:34 -0700</date>
            <delta_ts>2021-07-29 17:15:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210729153733.patch</filename>
            <type>text/plain</type>
            <size>7668</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li4wZWM4YTdlZmZhODZhYmU5
YWI0YTk5YzVlY2VkZWUxZTllMmQ3OWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyOCBAQAorMjAyMS0wNy0yOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHByb3BlcnR5IG1pZ2h0IGJl
IGEgY3VzdG9tIHZhbHVlLCBhbmQgaWYgdGhhdCdzIHRoZSBjYXNlCisgICAgICAgIHdlIG5vdyBj
YWxsIGBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93YCwgd2hpY2ggaGFzIGJlZW4gdXBkYXRl
ZCB0byBoYW5kbGUgY3VzdG9tIHZhbHVlcyBjb3JyZWN0bHkuCisgICAgICAgIEkgYWxzbyBhZGRl
ZCBhc3NlcnRpb25zIHRvIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVl
ZGVkIGFuZCBwdXREaXJlY3RJbnRlcm5hbAorICAgICAgICB0byBtYWtlIHN1cmUgd2UgZG9uJ3Qg
YWNjaWRlbnRhbGx5IG92ZXJ3cml0ZSBjdXN0b20gdmFsdWVzIGluIHRoZSBmdXR1cmUuCisKKyAg
ICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6ZGVmaW5lUHJvcGVy
dHlPblJlY2VpdmVyU2xvdyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0
eU9uUmVjZWl2ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxh
Y2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJ
bmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0KToKKyAgICAg
ICAgKEpTQzo6SlNPYmplY3Q6OnB1dERpcmVjdEludGVybmFsKToKKwogMjAyMS0wNy0xNCAgS2Vp
dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDb252ZXJ0IHNt
YWxsIEpJVCBwb29sIHRlc3RzIGludG8gZXhlY3V0YWJsZSBmdXp6aW5nCmRpZmYgLS1naXQgYS9T
b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNj
cmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKaW5kZXggZTBhYTBmM2FlMzk5NmEyZjIzOTYx
NTQ2YzAzOGYzNGVkN2U0YTQ4NC4uNWQ0YmU0YTYyM2Q5NzcxYjg1MGJhOWJlNDYyMGE4MzI0NDg5
ODFkNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3Qu
Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcApAQCAt
ODc4LDYgKzg3OCwxMSBAQCBzdGF0aWMgTkVWRVJfSU5MSU5FIGJvb2wgZGVmaW5lUHJvcGVydHlP
blJlY2VpdmVyU2xvdyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgICAgICAvLyBGSVhN
RTogRm9yIGFuIGFjY2Vzc29yIHdpdGggc2V0dGVyLCB0aGUgZXJyb3IgbWVzc2FnZSBpcyBtaXNs
ZWFkaW5nLgogICAgICAgICBpZiAoc2xvdC5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0
ZTo6UmVhZE9ubHlPckFjY2Vzc29yT3JDdXN0b21BY2Nlc3NvcikKICAgICAgICAgICAgIHJldHVy
biB0eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2hvdWxkVGhyb3csIFJlYWRvbmx5UHJv
cGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgaWYgKHNsb3QuYXR0cmlidXRlcygpICYgUHJvcGVy
dHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlKSB7CisgICAgICAgICAgICBQdXRQcm9wZXJ0eVNsb3Q6
OlB1dFZhbHVlRnVuYyBjdXN0b21TZXR0ZXIgPSBzbG90LmN1c3RvbVNldHRlcigpOworICAgICAg
ICAgICAgaWYgKGN1c3RvbVNldHRlcikKKyAgICAgICAgICAgICAgICByZXR1cm4gY3VzdG9tU2V0
dGVyKGdsb2JhbE9iamVjdCwgSlNWYWx1ZTo6ZW5jb2RlKHJlY2VpdmVyKSwgSlNWYWx1ZTo6ZW5j
b2RlKHZhbHVlKSwgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgfQogICAgICAgICBkZXNjcmlwdG9y
LnNldFZhbHVlKHZhbHVlKTsKICAgICB9IGVsc2UKICAgICAgICAgZGVzY3JpcHRvci5zZXREZXNj
cmlwdG9yKHZhbHVlLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlBdHRyaWJ1dGU6Ok5v
bmUpKTsKQEAgLTkwNiw2ICs5MTEsMTIgQEAgYm9vbCBKU09iamVjdDo6ZGVmaW5lUHJvcGVydHlP
blJlY2VpdmVyKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmEKICAgICAg
ICAgICAgIHJldHVybiBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93KGdsb2JhbE9iamVjdCwg
cHJvcGVydHlOYW1lLCB2YWx1ZSwgcmVjZWl2ZXIsIHNsb3QuaXNTdHJpY3RNb2RlKCkpOwogICAg
IH0KIAorICAgIGlmIChyZWNlaXZlci0+c3RydWN0dXJlKHZtKS0+aGFzQ3VzdG9tR2V0dGVyU2V0
dGVyUHJvcGVydGllcygpKSB7CisgICAgICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXM7CisgICAgICAg
IGlmIChyZWNlaXZlci0+Z2V0RGlyZWN0T2Zmc2V0KHZtLCBwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0
ZXMpICE9IGludmFsaWRPZmZzZXQgJiYgKGF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6
Q3VzdG9tVmFsdWUpKQorICAgICAgICAgICAgcmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZl
clNsb3coZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5p
c1N0cmljdE1vZGUoKSk7CisgICAgfQorCiAgICAgaWYgKFVOTElLRUxZKHJlY2VpdmVyLT5oYXNO
b25SZWlmaWVkU3RhdGljUHJvcGVydGllcyh2bSkpKQogICAgICAgICByZXR1cm4gcmVjZWl2ZXIt
PnB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKGdsb2JhbE9iamVj
dCwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CiAgICAgcmV0dXJuIHJlY2VpdmVyLT5wdXRJ
bmxpbmVGYXN0KGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgc2xvdCk7CkBAIC05
MjgsNyArOTM5LDggQEAgYm9vbCBKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRp
Y1Byb3BlcnR5SWZOZWVkZWQoSlNHbG9iYWxPYmplY3QqIGdsb2IKICAgICAgICAgICAgICAgICBy
ZXR1cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCks
IFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg
IC8vIEF2b2lkIFB1dE1vZGVQdXQgYmVjYXVzZSBpdCBmYWlscyBmb3Igbm9uLWV4dGVuc2libGUg
c3RydWN0dXJlcy4KLSAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1
ZSwgYXR0cmlidXRlc0ZvclN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSkgJiB+
UHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlLCBzbG90KTsKKyAgICAgICAgICAgIEFTU0VS
VCghKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpICYgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3Rv
bVZhbHVlKSk7CisgICAgICAgICAgICBwdXREaXJlY3Qodm0sIHByb3BlcnR5TmFtZSwgdmFsdWUs
IGF0dHJpYnV0ZXNGb3JTdHJ1Y3R1cmUoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkpLCBzbG90
KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0
IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmggYi9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAppbmRleCAzMjc1MzQ0
MGJmOTE5MGJiOTE0ZmJjYjdiMTE4MGJjYzYzYjM5ZGUxLi4xMDcxZTJkNGQyNzAxM2NiZDQ2Zjdi
MzdhNWNjZTVkOWI2N2E1NWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu
dGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt
ZS9KU09iamVjdElubGluZXMuaApAQCAtMjgyLDcgKzI4Miw2IEBAIEFMV0FZU19JTkxJTkUgYm9v
bCBKU09iamVjdDo6cHV0SW5saW5lRmFzdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQ
cm9wZXJ0CiAgICAgVk0mIHZtID0gZ2V0Vk0oZ2xvYmFsT2JqZWN0KTsKICAgICBhdXRvIHNjb3Bl
ID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKLSAgICAvLyBGSVhNRTogRm9yIGEgZmFpbHVy
ZSBkdWUgdG8gbm9uLWV4dGVuc2libGUgc3RydWN0dXJlLCB0aGUgZXJyb3IgbWVzc2FnZSBpcyBt
aXNsZWFkaW5nLgogICAgIGlmICghcHV0RGlyZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHBy
b3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNsb3QpKQogICAgICAgICByZXR1cm4gdHlwZUVycm9yKGds
b2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlX
cml0ZUVycm9yKTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTMzOCw4ICszMzcsMTAgQEAgQUxXQVlT
X0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbChWTSYgdm0sIFByb3BlcnR5
TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAgICAgICAgICAgIGlmIChtb2RlID09IFB1dE1vZGVE
ZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmlidXRlcyAhPSBjdXJyZW50QXR0cmlidXRlcyB8fCAo
YXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JP
clZhbHVlKSkpCiAgICAgICAgICAgICAgICAgc2V0U3RydWN0dXJlKHZtLCBTdHJ1Y3R1cmU6OmF0
dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0sIHN0cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBhdHRy
aWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAg
ICAgICAgICBBU1NFUlQoIShjdXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpB
Y2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICAgICAgc2xvdC5z
ZXRFeGlzdGluZ1Byb3BlcnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAgICAgICB9CiAKICAgICAg
ICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CkBAIC0zOTYsOCArMzk3LDEwIEBAIEFMV0FZ
U19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0SW50ZXJuYWwoVk0mIHZtLCBQcm9wZXJ0
eU5hbWUgcHJvcGVydHlOYW1lCiAgICAgICAgICAgICAvLyBUaGlzIGFsbG93cyBhZGFwdGl2ZSB3
YXRjaHBvaW50cyB0byBvYnNlcnZlIGlmIHRoZSBuZXcgc3RydWN0dXJlIGlzIHRoZSBvbmUgd2Ug
d2FudC4KICAgICAgICAgICAgIERlZmVycmVkU3RydWN0dXJlVHJhbnNpdGlvbldhdGNocG9pbnRG
aXJlIGRlZmVycmVkV2F0Y2hwb2ludEZpcmUodm0sIHN0cnVjdHVyZSk7CiAgICAgICAgICAgICBz
ZXRTdHJ1Y3R1cmUodm0sIFN0cnVjdHVyZTo6YXR0cmlidXRlQ2hhbmdlVHJhbnNpdGlvbih2bSwg
c3RydWN0dXJlLCBwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMsICZkZWZlcnJlZFdhdGNocG9pbnRG
aXJlKSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgQVNT
RVJUKCEoY3VycmVudEF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3JPckN1
c3RvbUFjY2Vzc29yT3JWYWx1ZSkpOwogICAgICAgICAgICAgc2xvdC5zZXRFeGlzdGluZ1Byb3Bl
cnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg
ICB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmlu
ZGV4IDNkODkxMjRlYTA2NWQ1NzIwMzEyODZjMmEzYzM4ZjA4NzZmZWNmYjEuLmFmZjhmNDUwM2Ex
MDY0NmM1ZTA5ZTFjMmFhYzAzOWNjMTNlMDk0ODAgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdl
TG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDctMjkg
IFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgZGVmaW5lUHJv
cGVydHlPblJlY2VpdmVyIHNob3VsZCBjaGVjayBpZiByZWNlaXZlciBjYW5QZXJmb3JtRmFzdFB1
dElubGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI3OTYzCisgICAgICAgIDxyZGFyOi8vODAyNTk3MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZh
bHVlLmpzOiBBZGRlZC4KKwogMjAyMS0wNy0xNCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5j
b20+CiAKICAgICAgICAgQ2hlY2sgZm9yIG91dCBvZiBtZW1vcnkgaW4gSlNDOjpnbG9iYWxGdW5j
RXNjYXBlKCkgYW5kIEpTQzo6Z2xvYmFsRnVuY1VuZXNjYXBlKCkuCmRpZmYgLS1naXQgYS9KU1Rl
c3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMgYi9KU1Rlc3RzL3N0cmVzcy9y
ZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGJjZjBiNzBhODYyMWFiNTE2
NTg2MzFlMzhlZTU0ZjlkM2I4NzQ5OQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNz
L3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcwpAQCAtMCwwICsxLDMgQEAKK2NvbnN0IHRlc3RH
ZXR0ZXJTZXR0ZXIgPSAkdm0uY3JlYXRlQ3VzdG9tVGVzdEdldHRlclNldHRlcigpOworUmVmbGVj
dC5zZXQoe30sICdjdXN0b21WYWx1ZScsICdmb28nLCB0ZXN0R2V0dGVyU2V0dGVyKTsKK3Rlc3RH
ZXR0ZXJTZXR0ZXIuY3VzdG9tVmFsdWUgPSA0MjsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434594</attachid>
            <date>2021-07-29 17:15:09 -0700</date>
            <delta_ts>2021-07-29 17:55:52 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-227963-20210729171508.patch</filename>
            <type>text/plain</type>
            <size>7755</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2
M2FhNmEyMDU1N2ZlNDllYjE5YzMyNTY1OTQwZDFkMDM1NGU0ZDQ3Li5lYjQzMjQzY2E4MjUyODZm
ZGM4ODQwYmE2ZWM3ODZmMGMxNDhkNjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNyBAQAorMjAyMS0wNy0yOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgU2h2YXlrYS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHByb3BlcnR5IG1pZ2h0IGJl
IGEgY3VzdG9tIHZhbHVlLCBhbmQgaWYgdGhhdCdzIHRoZSBjYXNlCisgICAgICAgIHdlIG5vdyBj
YWxsIGBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93YCwgd2hpY2ggaGFzIGJlZW4gdXBkYXRl
ZCB0byBoYW5kbGUgY3VzdG9tIHZhbHVlcyBjb3JyZWN0bHkuCisgICAgICAgIEkgYWxzbyBhZGRl
ZCBhc3NlcnRpb25zIHRvIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVl
ZGVkIGFuZCBwdXREaXJlY3RJbnRlcm5hbAorICAgICAgICB0byBtYWtlIHN1cmUgd2UgZG9uJ3Qg
YWNjaWRlbnRhbGx5IG92ZXJ3cml0ZSBjdXN0b20gdmFsdWVzIGluIHRoZSBmdXR1cmUuCisKKyAg
ICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6ZGVmaW5lUHJvcGVy
dHlPblJlY2VpdmVyU2xvdyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0
eU9uUmVjZWl2ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxh
Y2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJ
bmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisK
IDIwMjEtMDctMTQgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAg
ICAgICAgQ29udmVydCBzbWFsbCBKSVQgcG9vbCB0ZXN0cyBpbnRvIGV4ZWN1dGFibGUgZnV6emlu
ZwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3Bw
IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCmluZGV4IGUwYWEw
ZjNhZTM5OTZhMmYyMzk2MTU0NmMwMzhmMzRlZDdlNGE0ODQuLjU0MjBmYTE2ZDk3Y2IwNzBkZmRl
MzdkMjY4NDA0YzM0MTdkNzZiNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y
dW50aW1lL0pTT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K
U09iamVjdC5jcHAKQEAgLTg3OCw2ICs4NzgsMTEgQEAgc3RhdGljIE5FVkVSX0lOTElORSBib29s
IGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamUK
ICAgICAgICAgLy8gRklYTUU6IEZvciBhbiBhY2Nlc3NvciB3aXRoIHNldHRlciwgdGhlIGVycm9y
IG1lc3NhZ2UgaXMgbWlzbGVhZGluZy4KICAgICAgICAgaWYgKHNsb3QuYXR0cmlidXRlcygpICYg
UHJvcGVydHlBdHRyaWJ1dGU6OlJlYWRPbmx5T3JBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3IpCiAg
ICAgICAgICAgICByZXR1cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNob3VsZFRo
cm93LCBSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgIGlmIChzbG90LmF0dHJp
YnV0ZXMoKSAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21WYWx1ZSkgeworICAgICAgICAgICAg
UHV0UHJvcGVydHlTbG90OjpQdXRWYWx1ZUZ1bmMgY3VzdG9tU2V0dGVyID0gc2xvdC5jdXN0b21T
ZXR0ZXIoKTsKKyAgICAgICAgICAgIGlmIChjdXN0b21TZXR0ZXIpCisgICAgICAgICAgICAgICAg
UkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBjdXN0b21TZXR0ZXIocmVjZWl2ZXItPmdsb2JhbE9i
amVjdCh2bSksIEpTVmFsdWU6OmVuY29kZShyZWNlaXZlciksIEpTVmFsdWU6OmVuY29kZSh2YWx1
ZSksIHByb3BlcnR5TmFtZSkpOworICAgICAgICB9CiAgICAgICAgIGRlc2NyaXB0b3Iuc2V0VmFs
dWUodmFsdWUpOwogICAgIH0gZWxzZQogICAgICAgICBkZXNjcmlwdG9yLnNldERlc2NyaXB0b3Io
dmFsdWUsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9wZXJ0eUF0dHJpYnV0ZTo6Tm9uZSkpOwpA
QCAtOTA2LDYgKzkxMSwxMiBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2
ZXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydHlOYQogICAgICAgICAgICAg
cmV0dXJuIGRlZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3coZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0
eU5hbWUsIHZhbHVlLCByZWNlaXZlciwgc2xvdC5pc1N0cmljdE1vZGUoKSk7CiAgICAgfQogCisg
ICAgaWYgKHJlY2VpdmVyLT5zdHJ1Y3R1cmUodm0pLT5oYXNDdXN0b21HZXR0ZXJTZXR0ZXJQcm9w
ZXJ0aWVzKCkpIHsKKyAgICAgICAgdW5zaWduZWQgYXR0cmlidXRlczsKKyAgICAgICAgaWYgKHJl
Y2VpdmVyLT5nZXREaXJlY3RPZmZzZXQodm0sIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcykgIT0g
aW52YWxpZE9mZnNldCAmJiAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21W
YWx1ZSkpCisgICAgICAgICAgICByZXR1cm4gZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyU2xvdyhn
bG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHJlY2VpdmVyLCBzbG90LmlzU3RyaWN0
TW9kZSgpKTsKKyAgICB9CisKICAgICBpZiAoVU5MSUtFTFkocmVjZWl2ZXItPmhhc05vblJlaWZp
ZWRTdGF0aWNQcm9wZXJ0aWVzKHZtKSkpCiAgICAgICAgIHJldHVybiByZWNlaXZlci0+cHV0SW5s
aW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQoZ2xvYmFsT2JqZWN0LCBwcm9w
ZXJ0eU5hbWUsIHZhbHVlLCBzbG90KTsKICAgICByZXR1cm4gcmVjZWl2ZXItPnB1dElubGluZUZh
c3QoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KTsKQEAgLTkyOCw3ICs5
MzksOCBAQCBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVy
dHlJZk5lZWRlZChKU0dsb2JhbE9iamVjdCogZ2xvYgogICAgICAgICAgICAgICAgIHJldHVybiB0
eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2xvdC5pc1N0cmljdE1vZGUoKSwgUmVhZG9u
bHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8gQXZv
aWQgUHV0TW9kZVB1dCBiZWNhdXNlIGl0IGZhaWxzIGZvciBub24tZXh0ZW5zaWJsZSBzdHJ1Y3R1
cmVzLgotICAgICAgICAgICAgcHV0RGlyZWN0KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRy
aWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpKSAmIH5Qcm9wZXJ0
eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUsIHNsb3QpOworICAgICAgICAgICAgQVNTRVJUKCEoZW50
cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUp
KTsKKyAgICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmli
dXRlc0ZvclN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSksIHNsb3QpOwogICAg
ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaCBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCmluZGV4IDMyNzUzNDQwYmY5MTkw
YmI5MTRmYmNiN2IxMTgwYmNjNjNiMzlkZTEuLjQ3NDA0ZDI3ZjhmZWI5NTRjZjJiNDNlODRjMTBl
ZTM2NDc3NDIyNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT
T2JqZWN0SW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq
ZWN0SW5saW5lcy5oCkBAIC0yODIsNyArMjgyLDcgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2Jq
ZWN0OjpwdXRJbmxpbmVGYXN0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnQK
ICAgICBWTSYgdm0gPSBnZXRWTShnbG9iYWxPYmplY3QpOwogICAgIGF1dG8gc2NvcGUgPSBERUNM
QVJFX1RIUk9XX1NDT1BFKHZtKTsKIAotICAgIC8vIEZJWE1FOiBGb3IgYSBmYWlsdXJlIGR1ZSB0
byBub24tZXh0ZW5zaWJsZSBzdHJ1Y3R1cmUsIHRoZSBlcnJvciBtZXNzYWdlIGlzIG1pc2xlYWRp
bmcuCisgICAgLy8gRklYTUU6IEZvciBhIGZhaWx1cmUgZHVlIHRvIG5vbi1leHRlbnNpYmxlIHN0
cnVjdHVyZSwgdGhlIGVycm9yIG1lc3NhZ2UgaXMgbWlzbGVhZGluZwogICAgIGlmICghcHV0RGly
ZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNsb3Qp
KQogICAgICAgICByZXR1cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNT
dHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICByZXR1cm4gdHJ1
ZTsKQEAgLTMzOCw4ICszMzgsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXRE
aXJlY3RJbnRlcm5hbChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAg
ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQzNDIKICAg
ICAgICAgICAgIGlmIChtb2RlID09IFB1dE1vZGVEZWZpbmVPd25Qcm9wZXJ0eSAmJiAoYXR0cmli
dXRlcyAhPSBjdXJyZW50QXR0cmlidXRlcyB8fCAoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmli
dXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZhbHVlKSkpCiAgICAgICAgICAgICAgICAg
c2V0U3RydWN0dXJlKHZtLCBTdHJ1Y3R1cmU6OmF0dHJpYnV0ZUNoYW5nZVRyYW5zaXRpb24odm0s
IHN0cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBhdHRyaWJ1dGVzKSk7Ci0gICAgICAgICAgICBlbHNl
CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBBU1NFUlQoIShjdXJyZW50QXR0
cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZh
bHVlKSk7CiAgICAgICAgICAgICAgICAgc2xvdC5zZXRFeGlzdGluZ1Byb3BlcnR5KHRoaXMsIG9m
ZnNldCk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAg
ICB9CkBAIC0zOTYsOCArMzk4LDEwIEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6cHV0
RGlyZWN0SW50ZXJuYWwoVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lCiAgICAgICAg
ICAgICAvLyBUaGlzIGFsbG93cyBhZGFwdGl2ZSB3YXRjaHBvaW50cyB0byBvYnNlcnZlIGlmIHRo
ZSBuZXcgc3RydWN0dXJlIGlzIHRoZSBvbmUgd2Ugd2FudC4KICAgICAgICAgICAgIERlZmVycmVk
U3RydWN0dXJlVHJhbnNpdGlvbldhdGNocG9pbnRGaXJlIGRlZmVycmVkV2F0Y2hwb2ludEZpcmUo
dm0sIHN0cnVjdHVyZSk7CiAgICAgICAgICAgICBzZXRTdHJ1Y3R1cmUodm0sIFN0cnVjdHVyZTo6
YXR0cmlidXRlQ2hhbmdlVHJhbnNpdGlvbih2bSwgc3RydWN0dXJlLCBwcm9wZXJ0eU5hbWUsIGF0
dHJpYnV0ZXMsICZkZWZlcnJlZFdhdGNocG9pbnRGaXJlKSk7Ci0gICAgICAgIH0gZWxzZQorICAg
ICAgICB9IGVsc2UgeworICAgICAgICAgICAgQVNTRVJUKCEoY3VycmVudEF0dHJpYnV0ZXMgJiBQ
cm9wZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3JPckN1c3RvbUFjY2Vzc29yT3JWYWx1ZSkpOwogICAg
ICAgICAgICAgc2xvdC5zZXRFeGlzdGluZ1Byb3BlcnR5KHRoaXMsIG9mZnNldCk7CisgICAgICAg
IH0KIAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0No
YW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDNkODkxMjRlYTA2NWQ1NzIwMzEyODZj
MmEzYzM4ZjA4NzZmZWNmYjEuLjAzNTUyYzgwM2FkZWRmMmJkYTQ3NjQwZTA4ODNhMDM4NjljMzIx
MjggMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDctMjkgIFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0Bh
cHBsZS5jb20+CisKKyAgICAgICAgZGVmaW5lUHJvcGVydHlPblJlY2VpdmVyIHNob3VsZCBjaGVj
ayBpZiByZWNlaXZlciBjYW5QZXJmb3JtRmFzdFB1dElubGluZQorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3OTYzCisgICAgICAgIDxyZGFyOi8vODAy
NTk3MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFNodmF5a2EuCisKKyAgICAgICAg
KiBzdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzOiBBZGRlZC4KKwogMjAyMS0wNy0x
NCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hlY2sgZm9yIG91
dCBvZiBtZW1vcnkgaW4gSlNDOjpnbG9iYWxGdW5jRXNjYXBlKCkgYW5kIEpTQzo6Z2xvYmFsRnVu
Y1VuZXNjYXBlKCkuCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0
b20tdmFsdWUuanMgYi9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMK
bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMC4uZGJjZjBiNzBhODYyMWFiNTE2NTg2MzFlMzhlZTU0ZjlkM2I4NzQ5OQotLS0g
L2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5q
cwpAQCAtMCwwICsxLDMgQEAKK2NvbnN0IHRlc3RHZXR0ZXJTZXR0ZXIgPSAkdm0uY3JlYXRlQ3Vz
dG9tVGVzdEdldHRlclNldHRlcigpOworUmVmbGVjdC5zZXQoe30sICdjdXN0b21WYWx1ZScsICdm
b28nLCB0ZXN0R2V0dGVyU2V0dGVyKTsKK3Rlc3RHZXR0ZXJTZXR0ZXIuY3VzdG9tVmFsdWUgPSA0
MjsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434596</attachid>
            <date>2021-07-29 17:55:54 -0700</date>
            <delta_ts>2021-07-29 19:00:45 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-227963-20210729175553.patch</filename>
            <type>text/plain</type>
            <size>7708</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5
NThiYWZjMTEzNjViODYzOGIwMzkwNzllMWE2Zjg3MzI3NmY5NThmLi4yZGNiZWFmMTI4NDRiNmMw
MWY0ZTc4NWUyNGI2ZWM4YTZmYzk0Mjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNyBAQAorMjAyMS0wNy0yOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJl
Y2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4K
KworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgU2h2YXlrYS4KKworICAgICAgICBkZWZpbmVQ
cm9wZXJ0eU9uUmVjZWl2ZXIgaGFzIGEgZmFzdCBwYXRoIGlmIHRoZSBzbG90IGlzIG5vdCBvcGFx
dWUgYW5kIHRoZSByZWNlaXZlciBkb2Vzbid0CisgICAgICAgIGhhdmUgYSBjdXN0b20gZGVmaW5l
T3duUHJvcGVydHkgaW1wbGVtZW50YXRpb24sIGluIHdoaWNoIGNhc2UgaXQgY2FsbHMgcHV0SW5s
aW5lRmFzdCAoYW5kCisgICAgICAgIHRyYW5zaXRpdmVseSBwdXREaXJlY3RJbnRlcm5hbDxQdXRN
b2RlUHV0PikuIFRoZSBpc3N1ZSBpcyB0aGF0IHB1dERpcmVjdEludGVybmFsIGRvZXMgbm90Cisg
ICAgICAgIGhhbmRsZSBjdXN0b21WYWx1ZXMgY29ycmVjdGx5OiBpdCBqdXN0IG92ZXJ3cml0ZXMg
dGhlIHByb3BlcnR5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIGF0dHJpYnV0ZXMuCisgICAgICAgIFRv
IGZpeCB0aGF0LCB3ZSBzaG91bGQgZmlyc3QgY2hlY2sgaWYgdGhlIHByb3BlcnR5IG1pZ2h0IGJl
IGEgY3VzdG9tIHZhbHVlLCBhbmQgaWYgdGhhdCdzIHRoZSBjYXNlCisgICAgICAgIHdlIG5vdyBj
YWxsIGBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93YCwgd2hpY2ggaGFzIGJlZW4gdXBkYXRl
ZCB0byBoYW5kbGUgY3VzdG9tIHZhbHVlcyBjb3JyZWN0bHkuCisgICAgICAgIEkgYWxzbyBhZGRl
ZCBhc3NlcnRpb25zIHRvIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVl
ZGVkIGFuZCBwdXREaXJlY3RJbnRlcm5hbAorICAgICAgICB0byBtYWtlIHN1cmUgd2UgZG9uJ3Qg
YWNjaWRlbnRhbGx5IG92ZXJ3cml0ZSBjdXN0b20gdmFsdWVzIGluIHRoZSBmdXR1cmUuCisKKyAg
ICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6ZGVmaW5lUHJvcGVy
dHlPblJlY2VpdmVyU2xvdyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVQcm9wZXJ0
eU9uUmVjZWl2ZXIpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxh
Y2luZ1N0YXRpY1Byb3BlcnR5SWZOZWVkZWQpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJ
bmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5hbCk6CisK
IDIwMjEtMDctMjkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog
ICAgICAgICBBZGQgV2ViR1BVIHRvIHdlYmtpdC5vcmcvc3RhdHVzCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKaW5kZXggNmYyZGQyZmRkNGQ5Y2UxZWZkY2FlZWEw
OWM0Njc2OWRmMDYyNGZjZS4uNDQzMjExYWQ0NDA2YTBiMmE2M2UxNjZkMjhiZDgwNThkYTcwNTI1
ZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3Bw
CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcApAQCAtODc0
LDYgKzg3NCwxMiBAQCBzdGF0aWMgTkVWRVJfSU5MSU5FIGJvb2wgZGVmaW5lUHJvcGVydHlPblJl
Y2VpdmVyU2xvdyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgICAgICBpZiAoc2xvdC5h
dHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9ubHlPckFjY2Vzc29yT3JDdXN0
b21BY2Nlc3NvcikKICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBz
Y29wZSwgc2hvdWxkVGhyb3csIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKIAorICAgICAg
ICBpZiAoc2xvdC5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUp
IHsKKyAgICAgICAgICAgIFB1dFByb3BlcnR5U2xvdDo6UHV0VmFsdWVGdW5jIGN1c3RvbVNldHRl
ciA9IHNsb3QuY3VzdG9tU2V0dGVyKCk7CisgICAgICAgICAgICBpZiAoY3VzdG9tU2V0dGVyKQor
ICAgICAgICAgICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgY3VzdG9tU2V0dGVyKHJl
Y2VpdmVyLT5nbG9iYWxPYmplY3Qodm0pLCBKU1ZhbHVlOjplbmNvZGUocmVjZWl2ZXIpLCBKU1Zh
bHVlOjplbmNvZGUodmFsdWUpLCBwcm9wZXJ0eU5hbWUpKTsKKyAgICAgICAgfQorCiAgICAgICAg
IFByb3BlcnR5RGVzY3JpcHRvciBkZXNjcmlwdG9yOwogICAgICAgICBkZXNjcmlwdG9yLnNldFZh
bHVlKHZhbHVlKTsKICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCByZWNlaXZlci0+
bWV0aG9kVGFibGUodm0pLT5kZWZpbmVPd25Qcm9wZXJ0eShyZWNlaXZlciwgZ2xvYmFsT2JqZWN0
LCBwcm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IsIHNob3VsZFRocm93KSk7CkBAIC05MDMsNiArOTA5
LDEyIEBAIGJvb2wgSlNPYmplY3Q6OmRlZmluZVByb3BlcnR5T25SZWNlaXZlcihKU0dsb2JhbE9i
amVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0eU5hCiAgICAgICAgICAgICByZXR1cm4gZGVmaW5l
UHJvcGVydHlPblJlY2VpdmVyU2xvdyhnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUs
IHJlY2VpdmVyLCBzbG90LmlzU3RyaWN0TW9kZSgpKTsKICAgICB9CiAKKyAgICBpZiAocmVjZWl2
ZXItPnN0cnVjdHVyZSh2bSktPmhhc0N1c3RvbUdldHRlclNldHRlclByb3BlcnRpZXMoKSkgewor
ICAgICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzOworICAgICAgICBpZiAocmVjZWl2ZXItPmdldERp
cmVjdE9mZnNldCh2bSwgcHJvcGVydHlOYW1lLCBhdHRyaWJ1dGVzKSAhPSBpbnZhbGlkT2Zmc2V0
ICYmIChhdHRyaWJ1dGVzICYgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlKSkKKyAgICAg
ICAgICAgIHJldHVybiBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXJTbG93KGdsb2JhbE9iamVjdCwg
cHJvcGVydHlOYW1lLCB2YWx1ZSwgcmVjZWl2ZXIsIHNsb3QuaXNTdHJpY3RNb2RlKCkpOworICAg
IH0KKwogICAgIGlmIChVTkxJS0VMWShyZWNlaXZlci0+aGFzTm9uUmVpZmllZFN0YXRpY1Byb3Bl
cnRpZXModm0pKSkKICAgICAgICAgcmV0dXJuIHJlY2VpdmVyLT5wdXRJbmxpbmVGYXN0UmVwbGFj
aW5nU3RhdGljUHJvcGVydHlJZk5lZWRlZChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFs
dWUsIHNsb3QpOwogICAgIHJldHVybiByZWNlaXZlci0+cHV0SW5saW5lRmFzdChnbG9iYWxPYmpl
Y3QsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwpAQCAtOTI1LDcgKzkzNyw4IEBAIGJvb2wg
SlNPYmplY3Q6OnB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKEpT
R2xvYmFsT2JqZWN0KiBnbG9iCiAgICAgICAgICAgICAgICAgcmV0dXJuIHR5cGVFcnJvcihnbG9i
YWxPYmplY3QsIHNjb3BlLCBzbG90LmlzU3RyaWN0TW9kZSgpLCBSZWFkb25seVByb3BlcnR5V3Jp
dGVFcnJvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBBdm9pZCBQdXRNb2RlUHV0
IGJlY2F1c2UgaXQgZmFpbHMgZm9yIG5vbi1leHRlbnNpYmxlIHN0cnVjdHVyZXMuCi0gICAgICAg
ICAgICBwdXREaXJlY3Qodm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIGF0dHJpYnV0ZXNGb3JTdHJ1
Y3R1cmUoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkpICYgflByb3BlcnR5QXR0cmlidXRlOjpD
dXN0b21WYWx1ZSwgc2xvdCk7CisgICAgICAgICAgICBBU1NFUlQoIShlbnRyeS0+dmFsdWUtPmF0
dHJpYnV0ZXMoKSAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21WYWx1ZSkpOworICAgICAgICAg
ICAgcHV0RGlyZWN0KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0
dXJlKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpKSwgc2xvdCk7CiAgICAgICAgICAgICByZXR1
cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1
bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKaW5kZXggMTFjM2YzYWIyZTA2YjhkYTA1MzRjNzRmODRj
Y2ZhNjNlYWQwYTA1Ni4uNmUxYmIxYjU5ZjFlZTEwMTk5NWRiYjhlMzBlZTkzMjFkMWViNWEyMiAx
MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVz
LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgK
QEAgLTI4Miw3ICsyODIsNyBAQCBBTFdBWVNfSU5MSU5FIGJvb2wgSlNPYmplY3Q6OnB1dElubGlu
ZUZhc3QoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydAogICAgIFZNJiB2bSA9
IGdldFZNKGdsb2JhbE9iamVjdCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NP
UEUodm0pOwogCi0gICAgLy8gRklYTUU6IEZvciBhIGZhaWx1cmUgZHVlIHRvIG5vbi1leHRlbnNp
YmxlIHN0cnVjdHVyZSwgdGhlIGVycm9yIG1lc3NhZ2UgaXMgbWlzbGVhZGluZy4KKyAgICAvLyBG
SVhNRTogRm9yIGEgZmFpbHVyZSBkdWUgdG8gbm9uLWV4dGVuc2libGUgc3RydWN0dXJlLCB0aGUg
ZXJyb3IgbWVzc2FnZSBpcyBtaXNsZWFkaW5nCiAgICAgaWYgKCFwdXREaXJlY3RJbnRlcm5hbDxQ
dXRNb2RlUHV0Pih2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCkpCiAgICAgICAgIHJl
dHVybiB0eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc2xvdC5pc1N0cmljdE1vZGUoKSwg
UmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgIHJldHVybiB0cnVlOwpAQCAtMzQ1LDgg
KzM0NSwxMCBAQCBBTFdBWVNfSU5MSU5FIGJvb2wgSlNPYmplY3Q6OnB1dERpcmVjdEludGVybmFs
KFZNJiB2bSwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZQogICAgICAgICAgICAgLy8gaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDM0MgogICAgICAgICAgICAgaWYg
KG1vZGUgPT0gUHV0TW9kZURlZmluZU93blByb3BlcnR5ICYmIChhdHRyaWJ1dGVzICE9IGN1cnJl
bnRBdHRyaWJ1dGVzIHx8IChhdHRyaWJ1dGVzICYgUHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29y
T3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKSkKICAgICAgICAgICAgICAgICBzZXRTdHJ1Y3R1cmUo
dm0sIFN0cnVjdHVyZTo6YXR0cmlidXRlQ2hhbmdlVHJhbnNpdGlvbih2bSwgc3RydWN0dXJlLCBw
cm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMpKTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVsc2UgeworICAgICAgICAgICAgICAgIEFTU0VSVCghKGN1cnJlbnRBdHRyaWJ1dGVzICYgUHJv
cGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yT3JDdXN0b21BY2Nlc3Nvck9yVmFsdWUpKTsKICAgICAg
ICAgICAgICAgICBzbG90LnNldEV4aXN0aW5nUHJvcGVydHkodGhpcywgb2Zmc2V0KTsKKyAgICAg
ICAgICAgIH0KIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KQEAgLTQwMyw4
ICs0MDUsMTAgQEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3RJbnRlcm5h
bChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUKICAgICAgICAgICAgIC8vIFRoaXMg
YWxsb3dzIGFkYXB0aXZlIHdhdGNocG9pbnRzIHRvIG9ic2VydmUgaWYgdGhlIG5ldyBzdHJ1Y3R1
cmUgaXMgdGhlIG9uZSB3ZSB3YW50LgogICAgICAgICAgICAgRGVmZXJyZWRTdHJ1Y3R1cmVUcmFu
c2l0aW9uV2F0Y2hwb2ludEZpcmUgZGVmZXJyZWRXYXRjaHBvaW50RmlyZSh2bSwgc3RydWN0dXJl
KTsKICAgICAgICAgICAgIHNldFN0cnVjdHVyZSh2bSwgU3RydWN0dXJlOjphdHRyaWJ1dGVDaGFu
Z2VUcmFuc2l0aW9uKHZtLCBzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcywgJmRl
ZmVycmVkV2F0Y2hwb2ludEZpcmUpKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIH0gZWxzZSB7
CisgICAgICAgICAgICBBU1NFUlQoIShjdXJyZW50QXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmli
dXRlOjpBY2Nlc3Nvck9yQ3VzdG9tQWNjZXNzb3JPclZhbHVlKSk7CiAgICAgICAgICAgICBzbG90
LnNldEV4aXN0aW5nUHJvcGVydHkodGhpcywgb2Zmc2V0KTsKKyAgICAgICAgfQogCiAgICAgICAg
IHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNU
ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmQ5MGMzZDdiMDIyZDk1ZGJmODA0NGEwZDJjZjQ5YjI0MTI3
ZGZjOC4uN2VhOTE2ODg5Y2M3NTAxYjgwZjIxZWFiY2U1NmY4ZTBjZDhmZTUwZiAxMDA2NDQKLS0t
IGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
MyBAQAorMjAyMS0wNy0yOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KKwor
ICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNoZWNrIGlmIHJlY2VpdmVy
IGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjc5NjMKKyAgICAgICAgPHJkYXI6Ly84MDI1OTcxMD4KKworICAg
ICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgU2h2YXlrYS4KKworICAgICAgICAqIHN0cmVzcy9yZWZs
ZWN0LXNldC1jdXN0b20tdmFsdWUuanM6IEFkZGVkLgorCiAyMDIxLTA3LTI4ICBZdXN1a2UgU3V6
dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gWWFyciBzaG91bGQgcGVy
Zm9ybSBCb3llck1vb3JlIHNlYXJjaApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcmVmbGVj
dC1zZXQtY3VzdG9tLXZhbHVlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9t
LXZhbHVlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRiY2YwYjcwYTg2MjFhYjUxNjU4NjMxZTM4ZWU1NGY5ZDNi
ODc0OTkKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0
b20tdmFsdWUuanMKQEAgLTAsMCArMSwzIEBACitjb25zdCB0ZXN0R2V0dGVyU2V0dGVyID0gJHZt
LmNyZWF0ZUN1c3RvbVRlc3RHZXR0ZXJTZXR0ZXIoKTsKK1JlZmxlY3Quc2V0KHt9LCAnY3VzdG9t
VmFsdWUnLCAnZm9vJywgdGVzdEdldHRlclNldHRlcik7Cit0ZXN0R2V0dGVyU2V0dGVyLmN1c3Rv
bVZhbHVlID0gNDI7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434676</attachid>
            <date>2021-07-30 17:03:41 -0700</date>
            <delta_ts>2021-07-30 17:38:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227963-20210730170340.patch</filename>
            <type>text/plain</type>
            <size>7079</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi
MzhmM2NjZmJlODM1ZmZjOGQ2ZThhZjU0ZGNkYTQzNzc0N2FmYjJkLi4zOGFkY2MzZTBlMTQxMDY5
MGY5MjBiNWE2MmZhNjk3MTk2NjBiODVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOSBAQAorMjAyMS0wNy0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRl
ZCBzaG91bGQgaGFuZGxlIGN1c3RvbSB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgIEZvbGxvdyB1cCBhZnRlciByMjgwNDYzOiBhcyBpdCB0dXJu
cyBvdXQsIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkIGFsc28g
bmVlZHMgdG8gaGFuZGxlCisgICAgICAgIGN1c3RvbSB2YWx1ZXMsIHNpbWlsYXIgdG8gaG93IGRl
ZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3cgd2FzIHVwZGF0ZWQuIFRoaXMgZnVuY3Rpb24gd2ls
bCBiZSBjYWxsZWQgd2hlbiB0aGUKKyAgICAgICAgdGFyZ2V0IHByb3BlcnR5IG9mIHRoZSByZWNl
aXZlciBpcyBhIGN1c3RvbSB2YWx1ZSBhbmQgaXNuJ3QgcmVpZmllZC4gVGhlIHByZXZpb3VzIHRl
c3QgY2FzZSB3YXMgZXhwYW5kZWQgdG8KKyAgICAgICAgdGVzdCBib3RoIHRoZSByZWlmaWVkIGFu
ZCBub24tcmVpZmllZCBjYXNlcy4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgor
ICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3Bl
cnR5SWZOZWVkZWQpOgorICAgICAgICAqIHRvb2xzL0pTRG9sbGFyVk0uY3BwOgorCiAyMDIxLTA3
LTMwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10g
VXNlIFVDUFVSZWdpc3RlciBhcmd1bWVudCB0byByZW1vdmUgemVybyBleHRlbnNpb24gaW4gSklU
IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0
LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAppbmRleCA0
NDMyMTFhZDQ0MDZhMGIyYTYzZTE2NmQyOGJkODA1OGRhNzA1MjVkLi5iNmM4M2NiYzdkMDc4NGY3
MDMzYTI4OTY3ODI0YTQxY2RlM2JmNDhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp
bWUvSlNPYmplY3QuY3BwCkBAIC05MzYsOSArOTM2LDEzIEBAIGJvb2wgSlNPYmplY3Q6OnB1dElu
bGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKEpTR2xvYmFsT2JqZWN0KiBn
bG9iCiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEZvciBhbiBhY2Nlc3NvciB3aXRoIHNldHRl
ciwgdGhlIGVycm9yIG1lc3NhZ2UgaXMgbWlzbGVhZGluZy4KICAgICAgICAgICAgICAgICByZXR1
cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJl
YWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlm
IChlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21W
YWx1ZSkgeworICAgICAgICAgICAgICAgIFB1dFZhbHVlRnVuYyBjdXN0b21TZXR0ZXIgPSBlbnRy
eS0+dmFsdWUtPnByb3BlcnR5UHV0dGVyKCk7CisgICAgICAgICAgICAgICAgaWYgKGN1c3RvbVNl
dHRlcikKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBjdXN0
b21TZXR0ZXIoZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlOjplbmNvZGUodGhpcyksIEpTVmFsdWU6OmVu
Y29kZSh2YWx1ZSksIHByb3BlcnR5TmFtZSkpOworICAgICAgICAgICAgfQogICAgICAgICAgICAg
Ly8gQXZvaWQgUHV0TW9kZVB1dCBiZWNhdXNlIGl0IGZhaWxzIGZvciBub24tZXh0ZW5zaWJsZSBz
dHJ1Y3R1cmVzLgotICAgICAgICAgICAgQVNTRVJUKCEoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVz
KCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUpKTsKLSAgICAgICAgICAgIHB1dERp
cmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0ZvclN0cnVjdHVyZShlbnRy
eS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSksIHNsb3QpOworICAgICAgICAgICAgcHV0RGlyZWN0KHZt
LCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0dXJlKGVudHJ5LT52YWx1
ZS0+YXR0cmlidXRlcygpKSAmIH5Qcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUsIHNsb3Qp
OwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xsYXJWTS5jcHAgYi9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xsYXJWTS5jcHAKaW5kZXggOWY4OGU0MjBlNWZiYjE1N2Rk
YjAzYjlmMjIzZWE5Yjc4ZDUzNTllMC4uMWQ0NzRmYjRkOGYyODUwZDQ1ZWYwZDAzMzNkNzQ5ODll
NGExMDM2NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFy
Vk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9KU0RvbGxhclZNLmNwcApA
QCAtODAwLDYgKzgwMCw3IEBAIHB1YmxpYzoKIAogc3RhdGljIEpTQ19ERUNMQVJFX0NVU1RPTV9H
RVRURVIodGVzdFN0YXRpY1ZhbHVlR2V0dGVyKTsKIHN0YXRpYyBKU0NfREVDTEFSRV9DVVNUT01f
U0VUVEVSKHRlc3RTdGF0aWNWYWx1ZVB1dHRlcik7CitzdGF0aWMgSlNDX0RFQ0xBUkVfQ1VTVE9N
X1NFVFRFUih0ZXN0U3RhdGljVmFsdWVQdXR0ZXJTZXRGbGFnKTsKIAogSlNDX0RFRklORV9DVVNU
T01fR0VUVEVSKHRlc3RTdGF0aWNWYWx1ZUdldHRlciwgKEpTR2xvYmFsT2JqZWN0KiwgRW5jb2Rl
ZEpTVmFsdWUsIFByb3BlcnR5TmFtZSkpCiB7CkBAIC04MjAsMjUgKzgyMSwzOSBAQCBKU0NfREVG
SU5FX0NVU1RPTV9TRVRURVIodGVzdFN0YXRpY1ZhbHVlUHV0dGVyLCAoSlNHbG9iYWxPYmplY3Qq
IGdsb2JhbE9iamVjdCwgRQogICAgIHJldHVybiB0aGlzT2JqZWN0LT5wdXREaXJlY3Qodm0sIFBy
b3BlcnR5TmFtZShJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAidGVzdFN0YXRpY1ZhbHVlIikp
LCBKU1ZhbHVlOjpkZWNvZGUodmFsdWUpKTsKIH0KIAorSlNDX0RFRklORV9DVVNUT01fU0VUVEVS
KHRlc3RTdGF0aWNWYWx1ZVB1dHRlclNldEZsYWcsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq
ZWN0LCBFbmNvZGVkSlNWYWx1ZSB0aGlzVmFsdWUsIEVuY29kZWRKU1ZhbHVlLCBQcm9wZXJ0eU5h
bWUpKQoreworICAgIERvbGxhclZNQXNzZXJ0U2NvcGUgYXNzZXJ0U2NvcGU7CisgICAgVk0mIHZt
ID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1ND
T1BFKHZtKTsKKworICAgIEpTT2JqZWN0KiB0aGlzT2JqZWN0ID0ganNEeW5hbWljQ2FzdDxKU09i
amVjdCo+KHZtLCBKU1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSk7CisgICAgaWYgKCF0aGlzT2Jq
ZWN0KQorICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3Bl
KTsKKworICAgIHJldHVybiB0aGlzT2JqZWN0LT5wdXREaXJlY3Qodm0sIFByb3BlcnR5TmFtZShJ
ZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAidGVzdFN0YXRpY1ZhbHVlU2V0dGVyQ2FsbGVkIikp
LCBqc0Jvb2xlYW4odHJ1ZSkpOworfQorCiBzdGF0aWMgY29uc3Qgc3RydWN0IENvbXBhY3RIYXNo
SW5kZXggc3RhdGljQ3VzdG9tVmFsdWVUYWJsZUluZGV4WzhdID0gewogICAgIHsgMSwgLTEgfSwK
ICAgICB7IC0xLCAtMSB9LAogICAgIHsgLTEsIC0xIH0sCiAgICAgeyAtMSwgLTEgfSwKLSAgICB7
IC0xLCAtMSB9LAorICAgIHsgMywgLTEgfSwKICAgICB7IDIsIC0xIH0sCiAgICAgeyAwLCAtMSB9
LAogICAgIHsgLTEsIC0xIH0sCiB9OwogCi1zdGF0aWMgY29uc3Qgc3RydWN0IEhhc2hUYWJsZVZh
bHVlIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1ZXNbM10gPSB7CitzdGF0aWMgY29uc3Qgc3Ry
dWN0IEhhc2hUYWJsZVZhbHVlIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1ZXNbNF0gPSB7CiAg
ICAgeyAidGVzdFN0YXRpY1ZhbHVlIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KFByb3BlcnR5QXR0
cmlidXRlOjpDdXN0b21WYWx1ZSksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2Fz
dDxHZXRWYWx1ZUZ1bmM+KHRlc3RTdGF0aWNWYWx1ZUdldHRlciksIChpbnRwdHJfdClzdGF0aWNf
Y2FzdDxQdXRWYWx1ZUZ1bmM+KHRlc3RTdGF0aWNWYWx1ZVB1dHRlcikgfSB9LAogICAgIHsgInRl
c3RTdGF0aWNWYWx1ZU5vU2V0dGVyIiwgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlIHwg
UHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3Rh
dGljX2Nhc3Q8R2V0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVHZXR0ZXIpLCAwIH0gfSwKICAg
ICB7ICJ0ZXN0U3RhdGljVmFsdWVSZWFkT25seSIsIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21W
YWx1ZSB8IFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSB8IFByb3BlcnR5QXR0cmlidXRlOjpS
ZWFkT25seSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0PEdldFZhbHVlRnVu
Yz4odGVzdFN0YXRpY1ZhbHVlR2V0dGVyKSwgMCB9IH0sCisgICAgeyAidGVzdFN0YXRpY1ZhbHVl
U2V0RmxhZyIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9t
VmFsdWUpLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8R2V0VmFsdWVGdW5j
Pih0ZXN0U3RhdGljVmFsdWVHZXR0ZXIpLCAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UHV0VmFsdWVG
dW5jPih0ZXN0U3RhdGljVmFsdWVQdXR0ZXJTZXRGbGFnKSB9IH0sCiB9OwogCiBzdGF0aWMgY29u
c3Qgc3RydWN0IEhhc2hUYWJsZSBzdGF0aWNDdXN0b21WYWx1ZVRhYmxlID0KLSAgICB7IDMsIDcs
IHRydWUsIG51bGxwdHIsIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1ZXMsIHN0YXRpY0N1c3Rv
bVZhbHVlVGFibGVJbmRleCB9OworICAgIHsgNCwgNywgdHJ1ZSwgbnVsbHB0ciwgc3RhdGljQ3Vz
dG9tVmFsdWVUYWJsZVZhbHVlcywgc3RhdGljQ3VzdG9tVmFsdWVUYWJsZUluZGV4IH07CiAKIGNs
YXNzIFN0YXRpY0N1c3RvbVZhbHVlIDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgewogICAgIHVz
aW5nIEJhc2UgPSBKU05vbkZpbmFsT2JqZWN0OwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VM
b2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCA2NDNkYmI5MjQzNTZkNmY4NTFiMTNmNzk0NDI0
ZWM3ODA0Yzk5YzFjLi42MGRjYzc3NGRjZWVkZDgxNjBmMGZiNzNjMzgwMWYwYmMwYzIyMGQ0IDEw
MDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDEyIEBACisyMDIxLTA3LTMwICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUu
Y29tPgorCisgICAgICAgIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVl
ZGVkIHNob3VsZCBoYW5kbGUgY3VzdG9tIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3OTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVl
LmpzOgorCiAyMDIxLTA3LTI5ICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgog
CiAgICAgICAgIGRlZmluZVByb3BlcnR5T25SZWNlaXZlciBzaG91bGQgY2hlY2sgaWYgcmVjZWl2
ZXIgY2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3Jl
ZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcyBiL0pTVGVzdHMvc3RyZXNzL3JlZmxlY3Qtc2V0LWN1
c3RvbS12YWx1ZS5qcwppbmRleCBkYmNmMGI3MGE4NjIxYWI1MTY1ODYzMWUzOGVlNTRmOWQzYjg3
NDk5Li5iOTBhMmExN2IyZGY0YTM1ZTNiNTRiYjNiYmY3NzE2MTYyYTJlZDc0IDEwMDY0NAotLS0g
YS9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMKKysrIGIvSlNUZXN0
cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzCkBAIC0xLDMgKzEsMTQgQEAKLWNv
bnN0IHRlc3RHZXR0ZXJTZXR0ZXIgPSAkdm0uY3JlYXRlQ3VzdG9tVGVzdEdldHRlclNldHRlcigp
OwotUmVmbGVjdC5zZXQoe30sICdjdXN0b21WYWx1ZScsICdmb28nLCB0ZXN0R2V0dGVyU2V0dGVy
KTsKLXRlc3RHZXR0ZXJTZXR0ZXIuY3VzdG9tVmFsdWUgPSA0MjsKK3sKKyAgICAvLyByZWlmaWVk
CisgICAgY29uc3QgdGVzdEdldHRlclNldHRlciA9ICR2bS5jcmVhdGVDdXN0b21UZXN0R2V0dGVy
U2V0dGVyKCk7CisgICAgUmVmbGVjdC5zZXQoe30sICdjdXN0b21WYWx1ZScsICdmb28nLCB0ZXN0
R2V0dGVyU2V0dGVyKTsKKyAgICB0ZXN0R2V0dGVyU2V0dGVyLmN1c3RvbVZhbHVlID0gNDI7Cit9
CisKK3sKKyAgICAvLyBub24tcmVpZmllZAorICAgIGxldCB0ZXN0ZXIgPSAkdm0uY3JlYXRlU3Rh
dGljQ3VzdG9tVmFsdWUoKTsKKyAgICBSZWZsZWN0LnNldCh7fSwgInRlc3RTdGF0aWNWYWx1ZVNl
dEZsYWciLCAnZm9vJywgdGVzdGVyKTsKKyAgICBpZiAoIXRlc3Rlci50ZXN0U3RhdGljVmFsdWVT
ZXR0ZXJDYWxsZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignQ3VzdG9tIHZhbHVlIG92ZXJy
aWRlbicpOworfQo=
</data>
<flag name="review"
          id="457220"
          type_id="1"
          status="+"
          setter="ashvayka"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434678</attachid>
            <date>2021-07-30 17:39:38 -0700</date>
            <delta_ts>2021-07-30 17:48:36 -0700</delta_ts>
            <desc>Patch for landing (2)</desc>
            <filename>bug-227963-20210730173937.patch</filename>
            <type>text/plain</type>
            <size>7094</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi
MzhmM2NjZmJlODM1ZmZjOGQ2ZThhZjU0ZGNkYTQzNzc0N2FmYjJkLi5mMGNmNDBjNDNlMjc5Y2E0
YmNmNDhkNDlmYzBiZDdiZTIyZDZmNzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOSBAQAorMjAyMS0wNy0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRl
ZCBzaG91bGQgaGFuZGxlIGN1c3RvbSB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhl
eSBTaHZheWthLgorCisgICAgICAgIEZvbGxvdyB1cCBhZnRlciByMjgwNDYzOiBhcyBpdCB0dXJu
cyBvdXQsIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkIGFsc28g
bmVlZHMgdG8gaGFuZGxlCisgICAgICAgIGN1c3RvbSB2YWx1ZXMsIHNpbWlsYXIgdG8gaG93IGRl
ZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3cgd2FzIHVwZGF0ZWQuIFRoaXMgZnVuY3Rpb24gd2ls
bCBiZSBjYWxsZWQgd2hlbiB0aGUKKyAgICAgICAgdGFyZ2V0IHByb3BlcnR5IG9mIHRoZSByZWNl
aXZlciBpcyBhIGN1c3RvbSB2YWx1ZSBhbmQgaXNuJ3QgcmVpZmllZC4gVGhlIHByZXZpb3VzIHRl
c3QgY2FzZSB3YXMgZXhwYW5kZWQgdG8KKyAgICAgICAgdGVzdCBib3RoIHRoZSByZWlmaWVkIGFu
ZCBub24tcmVpZmllZCBjYXNlcy4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgor
ICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3Bl
cnR5SWZOZWVkZWQpOgorICAgICAgICAqIHRvb2xzL0pTRG9sbGFyVk0uY3BwOgorCiAyMDIxLTA3
LTMwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10g
VXNlIFVDUFVSZWdpc3RlciBhcmd1bWVudCB0byByZW1vdmUgemVybyBleHRlbnNpb24gaW4gSklU
IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0
LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAppbmRleCA0
NDMyMTFhZDQ0MDZhMGIyYTYzZTE2NmQyOGJkODA1OGRhNzA1MjVkLi5jN2Y1NzBkNDg4M2RlMGY4
MTc4ODE2OTJmZTliNzdiODllNDMwMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp
bWUvSlNPYmplY3QuY3BwCkBAIC05MzYsOSArOTM2LDEzIEBAIGJvb2wgSlNPYmplY3Q6OnB1dElu
bGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKEpTR2xvYmFsT2JqZWN0KiBn
bG9iCiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEZvciBhbiBhY2Nlc3NvciB3aXRoIHNldHRl
ciwgdGhlIGVycm9yIG1lc3NhZ2UgaXMgbWlzbGVhZGluZy4KICAgICAgICAgICAgICAgICByZXR1
cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJl
YWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlm
IChlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21W
YWx1ZSkgeworICAgICAgICAgICAgICAgIFB1dFZhbHVlRnVuYyBjdXN0b21TZXR0ZXIgPSBlbnRy
eS0+dmFsdWUtPnByb3BlcnR5UHV0dGVyKCk7CisgICAgICAgICAgICAgICAgaWYgKGN1c3RvbVNl
dHRlcikKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBjdXN0
b21TZXR0ZXIoc3RydWN0dXJlLT5nbG9iYWxPYmplY3Qodm0pLCBKU1ZhbHVlOjplbmNvZGUodGhp
cyksIEpTVmFsdWU6OmVuY29kZSh2YWx1ZSksIHByb3BlcnR5TmFtZSkpOworICAgICAgICAgICAg
fQogICAgICAgICAgICAgLy8gQXZvaWQgUHV0TW9kZVB1dCBiZWNhdXNlIGl0IGZhaWxzIGZvciBu
b24tZXh0ZW5zaWJsZSBzdHJ1Y3R1cmVzLgotICAgICAgICAgICAgQVNTRVJUKCEoZW50cnktPnZh
bHVlLT5hdHRyaWJ1dGVzKCkgJiBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUpKTsKLSAg
ICAgICAgICAgIHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0Zv
clN0cnVjdHVyZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSksIHNsb3QpOworICAgICAgICAg
ICAgcHV0RGlyZWN0KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBhdHRyaWJ1dGVzRm9yU3RydWN0
dXJlKGVudHJ5LT52YWx1ZS0+YXR0cmlidXRlcygpKSAmIH5Qcm9wZXJ0eUF0dHJpYnV0ZTo6Q3Vz
dG9tVmFsdWUsIHNsb3QpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAg
ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xsYXJWTS5j
cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xsYXJWTS5jcHAKaW5kZXggOWY4
OGU0MjBlNWZiYjE1N2RkYjAzYjlmMjIzZWE5Yjc4ZDUzNTllMC4uMWQ0NzRmYjRkOGYyODUwZDQ1
ZWYwZDAzMzNkNzQ5ODllNGExMDM2NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl
L3Rvb2xzL0pTRG9sbGFyVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9K
U0RvbGxhclZNLmNwcApAQCAtODAwLDYgKzgwMCw3IEBAIHB1YmxpYzoKIAogc3RhdGljIEpTQ19E
RUNMQVJFX0NVU1RPTV9HRVRURVIodGVzdFN0YXRpY1ZhbHVlR2V0dGVyKTsKIHN0YXRpYyBKU0Nf
REVDTEFSRV9DVVNUT01fU0VUVEVSKHRlc3RTdGF0aWNWYWx1ZVB1dHRlcik7CitzdGF0aWMgSlND
X0RFQ0xBUkVfQ1VTVE9NX1NFVFRFUih0ZXN0U3RhdGljVmFsdWVQdXR0ZXJTZXRGbGFnKTsKIAog
SlNDX0RFRklORV9DVVNUT01fR0VUVEVSKHRlc3RTdGF0aWNWYWx1ZUdldHRlciwgKEpTR2xvYmFs
T2JqZWN0KiwgRW5jb2RlZEpTVmFsdWUsIFByb3BlcnR5TmFtZSkpCiB7CkBAIC04MjAsMjUgKzgy
MSwzOSBAQCBKU0NfREVGSU5FX0NVU1RPTV9TRVRURVIodGVzdFN0YXRpY1ZhbHVlUHV0dGVyLCAo
SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgRQogICAgIHJldHVybiB0aGlzT2JqZWN0LT5w
dXREaXJlY3Qodm0sIFByb3BlcnR5TmFtZShJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAidGVz
dFN0YXRpY1ZhbHVlIikpLCBKU1ZhbHVlOjpkZWNvZGUodmFsdWUpKTsKIH0KIAorSlNDX0RFRklO
RV9DVVNUT01fU0VUVEVSKHRlc3RTdGF0aWNWYWx1ZVB1dHRlclNldEZsYWcsIChKU0dsb2JhbE9i
amVjdCogZ2xvYmFsT2JqZWN0LCBFbmNvZGVkSlNWYWx1ZSB0aGlzVmFsdWUsIEVuY29kZWRKU1Zh
bHVlLCBQcm9wZXJ0eU5hbWUpKQoreworICAgIERvbGxhclZNQXNzZXJ0U2NvcGUgYXNzZXJ0U2Nv
cGU7CisgICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBE
RUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKworICAgIEpTT2JqZWN0KiB0aGlzT2JqZWN0ID0ganNE
eW5hbWljQ2FzdDxKU09iamVjdCo+KHZtLCBKU1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSk7Cisg
ICAgaWYgKCF0aGlzT2JqZWN0KQorICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9i
YWxPYmplY3QsIHNjb3BlKTsKKworICAgIHJldHVybiB0aGlzT2JqZWN0LT5wdXREaXJlY3Qodm0s
IFByb3BlcnR5TmFtZShJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAidGVzdFN0YXRpY1ZhbHVl
U2V0dGVyQ2FsbGVkIikpLCBqc0Jvb2xlYW4odHJ1ZSkpOworfQorCiBzdGF0aWMgY29uc3Qgc3Ry
dWN0IENvbXBhY3RIYXNoSW5kZXggc3RhdGljQ3VzdG9tVmFsdWVUYWJsZUluZGV4WzhdID0gewog
ICAgIHsgMSwgLTEgfSwKICAgICB7IC0xLCAtMSB9LAogICAgIHsgLTEsIC0xIH0sCiAgICAgeyAt
MSwgLTEgfSwKLSAgICB7IC0xLCAtMSB9LAorICAgIHsgMywgLTEgfSwKICAgICB7IDIsIC0xIH0s
CiAgICAgeyAwLCAtMSB9LAogICAgIHsgLTEsIC0xIH0sCiB9OwogCi1zdGF0aWMgY29uc3Qgc3Ry
dWN0IEhhc2hUYWJsZVZhbHVlIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1ZXNbM10gPSB7Citz
dGF0aWMgY29uc3Qgc3RydWN0IEhhc2hUYWJsZVZhbHVlIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVW
YWx1ZXNbNF0gPSB7CiAgICAgeyAidGVzdFN0YXRpY1ZhbHVlIiwgc3RhdGljX2Nhc3Q8dW5zaWdu
ZWQ+KFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21WYWx1ZSksIE5vSW50cmluc2ljLCB7IChpbnRw
dHJfdClzdGF0aWNfY2FzdDxHZXRWYWx1ZUZ1bmM+KHRlc3RTdGF0aWNWYWx1ZUdldHRlciksIChp
bnRwdHJfdClzdGF0aWNfY2FzdDxQdXRWYWx1ZUZ1bmM+KHRlc3RTdGF0aWNWYWx1ZVB1dHRlcikg
fSB9LAogICAgIHsgInRlc3RTdGF0aWNWYWx1ZU5vU2V0dGVyIiwgUHJvcGVydHlBdHRyaWJ1dGU6
OkN1c3RvbVZhbHVlIHwgUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtLCBOb0ludHJpbnNpYywg
eyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8R2V0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVHZXR0
ZXIpLCAwIH0gfSwKICAgICB7ICJ0ZXN0U3RhdGljVmFsdWVSZWFkT25seSIsIFByb3BlcnR5QXR0
cmlidXRlOjpDdXN0b21WYWx1ZSB8IFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSB8IFByb3Bl
cnR5QXR0cmlidXRlOjpSZWFkT25seSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19j
YXN0PEdldFZhbHVlRnVuYz4odGVzdFN0YXRpY1ZhbHVlR2V0dGVyKSwgMCB9IH0sCisgICAgeyAi
dGVzdFN0YXRpY1ZhbHVlU2V0RmxhZyIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihQcm9wZXJ0eUF0
dHJpYnV0ZTo6Q3VzdG9tVmFsdWUpLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nh
c3Q8R2V0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVHZXR0ZXIpLCAoaW50cHRyX3Qpc3RhdGlj
X2Nhc3Q8UHV0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVQdXR0ZXJTZXRGbGFnKSB9IH0sCiB9
OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IEhhc2hUYWJsZSBzdGF0aWNDdXN0b21WYWx1ZVRhYmxl
ID0KLSAgICB7IDMsIDcsIHRydWUsIG51bGxwdHIsIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1
ZXMsIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVJbmRleCB9OworICAgIHsgNCwgNywgdHJ1ZSwgbnVs
bHB0ciwgc3RhdGljQ3VzdG9tVmFsdWVUYWJsZVZhbHVlcywgc3RhdGljQ3VzdG9tVmFsdWVUYWJs
ZUluZGV4IH07CiAKIGNsYXNzIFN0YXRpY0N1c3RvbVZhbHVlIDogcHVibGljIEpTTm9uRmluYWxP
YmplY3QgewogICAgIHVzaW5nIEJhc2UgPSBKU05vbkZpbmFsT2JqZWN0OwpkaWZmIC0tZ2l0IGEv
SlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCA2NDNkYmI5MjQzNTZk
NmY4NTFiMTNmNzk0NDI0ZWM3ODA0Yzk5YzFjLi4wYzUwNzc0NTU0MWI3NzNlZTFhMTQ4NTY3Yjg3
ZDI4NGVjZDEyZjEwIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA3LTMwICBUYWRldSBaYWdhbGxvICA8
dHphZ2FsbG9AYXBwbGUuY29tPgorCisgICAgICAgIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0
aWNQcm9wZXJ0eUlmTmVlZGVkIHNob3VsZCBoYW5kbGUgY3VzdG9tIHZhbHVlcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3OTYzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgQWxleGV5IFNodmF5a2EuCisKKyAgICAgICAgKiBzdHJlc3MvcmVmbGVjdC1z
ZXQtY3VzdG9tLXZhbHVlLmpzOgorCiAyMDIxLTA3LTI5ICBUYWRldSBaYWdhbGxvICA8dHphZ2Fs
bG9AYXBwbGUuY29tPgogCiAgICAgICAgIGRlZmluZVByb3BlcnR5T25SZWNlaXZlciBzaG91bGQg
Y2hlY2sgaWYgcmVjZWl2ZXIgY2FuUGVyZm9ybUZhc3RQdXRJbmxpbmUKZGlmZiAtLWdpdCBhL0pT
VGVzdHMvc3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcyBiL0pTVGVzdHMvc3RyZXNz
L3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcwppbmRleCBkYmNmMGI3MGE4NjIxYWI1MTY1ODYz
MWUzOGVlNTRmOWQzYjg3NDk5Li5iOTBhMmExN2IyZGY0YTM1ZTNiNTRiYjNiYmY3NzE2MTYyYTJl
ZDc0IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUu
anMKKysrIGIvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpzCkBAIC0x
LDMgKzEsMTQgQEAKLWNvbnN0IHRlc3RHZXR0ZXJTZXR0ZXIgPSAkdm0uY3JlYXRlQ3VzdG9tVGVz
dEdldHRlclNldHRlcigpOwotUmVmbGVjdC5zZXQoe30sICdjdXN0b21WYWx1ZScsICdmb28nLCB0
ZXN0R2V0dGVyU2V0dGVyKTsKLXRlc3RHZXR0ZXJTZXR0ZXIuY3VzdG9tVmFsdWUgPSA0MjsKK3sK
KyAgICAvLyByZWlmaWVkCisgICAgY29uc3QgdGVzdEdldHRlclNldHRlciA9ICR2bS5jcmVhdGVD
dXN0b21UZXN0R2V0dGVyU2V0dGVyKCk7CisgICAgUmVmbGVjdC5zZXQoe30sICdjdXN0b21WYWx1
ZScsICdmb28nLCB0ZXN0R2V0dGVyU2V0dGVyKTsKKyAgICB0ZXN0R2V0dGVyU2V0dGVyLmN1c3Rv
bVZhbHVlID0gNDI7Cit9CisKK3sKKyAgICAvLyBub24tcmVpZmllZAorICAgIGxldCB0ZXN0ZXIg
PSAkdm0uY3JlYXRlU3RhdGljQ3VzdG9tVmFsdWUoKTsKKyAgICBSZWZsZWN0LnNldCh7fSwgInRl
c3RTdGF0aWNWYWx1ZVNldEZsYWciLCAnZm9vJywgdGVzdGVyKTsKKyAgICBpZiAoIXRlc3Rlci50
ZXN0U3RhdGljVmFsdWVTZXR0ZXJDYWxsZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignQ3Vz
dG9tIHZhbHVlIG92ZXJyaWRlbicpOworfQo=
</data>
<flag name="commit-queue"
          id="457224"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434679</attachid>
            <date>2021-07-30 17:48:39 -0700</date>
            <delta_ts>2021-07-30 21:11:32 -0700</delta_ts>
            <desc>Patch for landing (2)</desc>
            <filename>bug-227963-20210730174838.patch</filename>
            <type>text/plain</type>
            <size>7092</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi
MzhmM2NjZmJlODM1ZmZjOGQ2ZThhZjU0ZGNkYTQzNzc0N2FmYjJkLi5mMGNmNDBjNDNlMjc5Y2E0
YmNmNDhkNDlmYzBiZDdiZTIyZDZmNzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOSBAQAorMjAyMS0wNy0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGljUHJvcGVydHlJZk5lZWRl
ZCBzaG91bGQgaGFuZGxlIGN1c3RvbSB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhl
eSBTaHZheWthLgorCisgICAgICAgIEZvbGxvdyB1cCBhZnRlciByMjgwNDYzOiBhcyBpdCB0dXJu
cyBvdXQsIHB1dElubGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkIGFsc28g
bmVlZHMgdG8gaGFuZGxlCisgICAgICAgIGN1c3RvbSB2YWx1ZXMsIHNpbWlsYXIgdG8gaG93IGRl
ZmluZVByb3BlcnR5T25SZWNlaXZlclNsb3cgd2FzIHVwZGF0ZWQuIFRoaXMgZnVuY3Rpb24gd2ls
bCBiZSBjYWxsZWQgd2hlbiB0aGUKKyAgICAgICAgdGFyZ2V0IHByb3BlcnR5IG9mIHRoZSByZWNl
aXZlciBpcyBhIGN1c3RvbSB2YWx1ZSBhbmQgaXNuJ3QgcmVpZmllZC4gVGhlIHByZXZpb3VzIHRl
c3QgY2FzZSB3YXMgZXhwYW5kZWQgdG8KKyAgICAgICAgdGVzdCBib3RoIHRoZSByZWlmaWVkIGFu
ZCBub24tcmVpZmllZCBjYXNlcy4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgor
ICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lRmFzdFJlcGxhY2luZ1N0YXRpY1Byb3Bl
cnR5SWZOZWVkZWQpOgorICAgICAgICAqIHRvb2xzL0pTRG9sbGFyVk0uY3BwOgorCiAyMDIxLTA3
LTMwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10g
VXNlIFVDUFVSZWdpc3RlciBhcmd1bWVudCB0byByZW1vdmUgemVybyBleHRlbnNpb24gaW4gSklU
IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0
LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAppbmRleCA0
NDMyMTFhZDQ0MDZhMGIyYTYzZTE2NmQyOGJkODA1OGRhNzA1MjVkLi40ZTVmNmJiYTVhMWRkMTdj
NzNlZTdlNGViM2M5OGMzNzQ2YThiMzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvcnVudGltZS9KU09iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp
bWUvSlNPYmplY3QuY3BwCkBAIC05MzYsOSArOTM2LDEzIEBAIGJvb2wgSlNPYmplY3Q6OnB1dElu
bGluZUZhc3RSZXBsYWNpbmdTdGF0aWNQcm9wZXJ0eUlmTmVlZGVkKEpTR2xvYmFsT2JqZWN0KiBn
bG9iCiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEZvciBhbiBhY2Nlc3NvciB3aXRoIHNldHRl
ciwgdGhlIGVycm9yIG1lc3NhZ2UgaXMgbWlzbGVhZGluZy4KICAgICAgICAgICAgICAgICByZXR1
cm4gdHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJl
YWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlm
IChlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSAmIFByb3BlcnR5QXR0cmlidXRlOjpDdXN0b21W
YWx1ZSkgeworICAgICAgICAgICAgICAgIFB1dFZhbHVlRnVuYyBjdXN0b21TZXR0ZXIgPSBlbnRy
eS0+dmFsdWUtPnByb3BlcnR5UHV0dGVyKCk7CisgICAgICAgICAgICAgICAgaWYgKGN1c3RvbVNl
dHRlcikKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBjdXN0
b21TZXR0ZXIoc3RydWN0dXJlLT5nbG9iYWxPYmplY3QoKSwgSlNWYWx1ZTo6ZW5jb2RlKHRoaXMp
LCBKU1ZhbHVlOjplbmNvZGUodmFsdWUpLCBwcm9wZXJ0eU5hbWUpKTsKKyAgICAgICAgICAgIH0K
ICAgICAgICAgICAgIC8vIEF2b2lkIFB1dE1vZGVQdXQgYmVjYXVzZSBpdCBmYWlscyBmb3Igbm9u
LWV4dGVuc2libGUgc3RydWN0dXJlcy4KLSAgICAgICAgICAgIEFTU0VSVCghKGVudHJ5LT52YWx1
ZS0+YXR0cmlidXRlcygpICYgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbVZhbHVlKSk7Ci0gICAg
ICAgICAgICBwdXREaXJlY3Qodm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIGF0dHJpYnV0ZXNGb3JT
dHJ1Y3R1cmUoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkpLCBzbG90KTsKKyAgICAgICAgICAg
IHB1dERpcmVjdCh2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cmlidXRlc0ZvclN0cnVjdHVy
ZShlbnRyeS0+dmFsdWUtPmF0dHJpYnV0ZXMoKSkgJiB+UHJvcGVydHlBdHRyaWJ1dGU6OkN1c3Rv
bVZhbHVlLCBzbG90KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAg
fQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk0uY3Bw
IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk0uY3BwCmluZGV4IDlmODhl
NDIwZTVmYmIxNTdkZGIwM2I5ZjIyM2VhOWI3OGQ1MzU5ZTAuLjFkNDc0ZmI0ZDhmMjg1MGQ0NWVm
MGQwMzMzZDc0OTg5ZTRhMTAzNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90
b29scy9KU0RvbGxhclZNLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNE
b2xsYXJWTS5jcHAKQEAgLTgwMCw2ICs4MDAsNyBAQCBwdWJsaWM6CiAKIHN0YXRpYyBKU0NfREVD
TEFSRV9DVVNUT01fR0VUVEVSKHRlc3RTdGF0aWNWYWx1ZUdldHRlcik7CiBzdGF0aWMgSlNDX0RF
Q0xBUkVfQ1VTVE9NX1NFVFRFUih0ZXN0U3RhdGljVmFsdWVQdXR0ZXIpOworc3RhdGljIEpTQ19E
RUNMQVJFX0NVU1RPTV9TRVRURVIodGVzdFN0YXRpY1ZhbHVlUHV0dGVyU2V0RmxhZyk7CiAKIEpT
Q19ERUZJTkVfQ1VTVE9NX0dFVFRFUih0ZXN0U3RhdGljVmFsdWVHZXR0ZXIsIChKU0dsb2JhbE9i
amVjdCosIEVuY29kZWRKU1ZhbHVlLCBQcm9wZXJ0eU5hbWUpKQogewpAQCAtODIwLDI1ICs4MjEs
MzkgQEAgSlNDX0RFRklORV9DVVNUT01fU0VUVEVSKHRlc3RTdGF0aWNWYWx1ZVB1dHRlciwgKEpT
R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEUKICAgICByZXR1cm4gdGhpc09iamVjdC0+cHV0
RGlyZWN0KHZtLCBQcm9wZXJ0eU5hbWUoSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInRlc3RT
dGF0aWNWYWx1ZSIpKSwgSlNWYWx1ZTo6ZGVjb2RlKHZhbHVlKSk7CiB9CiAKK0pTQ19ERUZJTkVf
Q1VTVE9NX1NFVFRFUih0ZXN0U3RhdGljVmFsdWVQdXR0ZXJTZXRGbGFnLCAoSlNHbG9iYWxPYmpl
Y3QqIGdsb2JhbE9iamVjdCwgRW5jb2RlZEpTVmFsdWUgdGhpc1ZhbHVlLCBFbmNvZGVkSlNWYWx1
ZSwgUHJvcGVydHlOYW1lKSkKK3sKKyAgICBEb2xsYXJWTUFzc2VydFNjb3BlIGFzc2VydFNjb3Bl
OworICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVD
TEFSRV9USFJPV19TQ09QRSh2bSk7CisKKyAgICBKU09iamVjdCogdGhpc09iamVjdCA9IGpzRHlu
YW1pY0Nhc3Q8SlNPYmplY3QqPih2bSwgSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1ZSkpOworICAg
IGlmICghdGhpc09iamVjdCkKKyAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFs
T2JqZWN0LCBzY29wZSk7CisKKyAgICByZXR1cm4gdGhpc09iamVjdC0+cHV0RGlyZWN0KHZtLCBQ
cm9wZXJ0eU5hbWUoSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInRlc3RTdGF0aWNWYWx1ZVNl
dHRlckNhbGxlZCIpKSwganNCb29sZWFuKHRydWUpKTsKK30KKwogc3RhdGljIGNvbnN0IHN0cnVj
dCBDb21wYWN0SGFzaEluZGV4IHN0YXRpY0N1c3RvbVZhbHVlVGFibGVJbmRleFs4XSA9IHsKICAg
ICB7IDEsIC0xIH0sCiAgICAgeyAtMSwgLTEgfSwKICAgICB7IC0xLCAtMSB9LAogICAgIHsgLTEs
IC0xIH0sCi0gICAgeyAtMSwgLTEgfSwKKyAgICB7IDMsIC0xIH0sCiAgICAgeyAyLCAtMSB9LAog
ICAgIHsgMCwgLTEgfSwKICAgICB7IC0xLCAtMSB9LAogfTsKIAotc3RhdGljIGNvbnN0IHN0cnVj
dCBIYXNoVGFibGVWYWx1ZSBzdGF0aWNDdXN0b21WYWx1ZVRhYmxlVmFsdWVzWzNdID0geworc3Rh
dGljIGNvbnN0IHN0cnVjdCBIYXNoVGFibGVWYWx1ZSBzdGF0aWNDdXN0b21WYWx1ZVRhYmxlVmFs
dWVzWzRdID0gewogICAgIHsgInRlc3RTdGF0aWNWYWx1ZSIsIHN0YXRpY19jYXN0PHVuc2lnbmVk
PihQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tVmFsdWUpLCBOb0ludHJpbnNpYywgeyAoaW50cHRy
X3Qpc3RhdGljX2Nhc3Q8R2V0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVHZXR0ZXIpLCAoaW50
cHRyX3Qpc3RhdGljX2Nhc3Q8UHV0VmFsdWVGdW5jPih0ZXN0U3RhdGljVmFsdWVQdXR0ZXIpIH0g
fSwKICAgICB7ICJ0ZXN0U3RhdGljVmFsdWVOb1NldHRlciIsIFByb3BlcnR5QXR0cmlidXRlOjpD
dXN0b21WYWx1ZSB8IFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSwgTm9JbnRyaW5zaWMsIHsg
KGludHB0cl90KXN0YXRpY19jYXN0PEdldFZhbHVlRnVuYz4odGVzdFN0YXRpY1ZhbHVlR2V0dGVy
KSwgMCB9IH0sCiAgICAgeyAidGVzdFN0YXRpY1ZhbHVlUmVhZE9ubHkiLCBQcm9wZXJ0eUF0dHJp
YnV0ZTo6Q3VzdG9tVmFsdWUgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0gfCBQcm9wZXJ0
eUF0dHJpYnV0ZTo6UmVhZE9ubHksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2Fz
dDxHZXRWYWx1ZUZ1bmM+KHRlc3RTdGF0aWNWYWx1ZUdldHRlciksIDAgfSB9LAorICAgIHsgInRl
c3RTdGF0aWNWYWx1ZVNldEZsYWciLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlBdHRy
aWJ1dGU6OkN1c3RvbVZhbHVlKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0
PEdldFZhbHVlRnVuYz4odGVzdFN0YXRpY1ZhbHVlR2V0dGVyKSwgKGludHB0cl90KXN0YXRpY19j
YXN0PFB1dFZhbHVlRnVuYz4odGVzdFN0YXRpY1ZhbHVlUHV0dGVyU2V0RmxhZykgfSB9LAogfTsK
IAogc3RhdGljIGNvbnN0IHN0cnVjdCBIYXNoVGFibGUgc3RhdGljQ3VzdG9tVmFsdWVUYWJsZSA9
Ci0gICAgeyAzLCA3LCB0cnVlLCBudWxscHRyLCBzdGF0aWNDdXN0b21WYWx1ZVRhYmxlVmFsdWVz
LCBzdGF0aWNDdXN0b21WYWx1ZVRhYmxlSW5kZXggfTsKKyAgICB7IDQsIDcsIHRydWUsIG51bGxw
dHIsIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVWYWx1ZXMsIHN0YXRpY0N1c3RvbVZhbHVlVGFibGVJ
bmRleCB9OwogCiBjbGFzcyBTdGF0aWNDdXN0b21WYWx1ZSA6IHB1YmxpYyBKU05vbkZpbmFsT2Jq
ZWN0IHsKICAgICB1c2luZyBCYXNlID0gSlNOb25GaW5hbE9iamVjdDsKZGlmZiAtLWdpdCBhL0pT
VGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjQzZGJiOTI0MzU2ZDZm
ODUxYjEzZjc5NDQyNGVjNzgwNGM5OWMxYy4uMGM1MDc3NDU1NDFiNzczZWUxYTE0ODU2N2I4N2Qy
ODRlY2QxMmYxMCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNy0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6
YWdhbGxvQGFwcGxlLmNvbT4KKworICAgICAgICBwdXRJbmxpbmVGYXN0UmVwbGFjaW5nU3RhdGlj
UHJvcGVydHlJZk5lZWRlZCBzaG91bGQgaGFuZGxlIGN1c3RvbSB2YWx1ZXMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2MworCisgICAgICAgIFJl
dmlld2VkIGJ5IEFsZXhleSBTaHZheWthLgorCisgICAgICAgICogc3RyZXNzL3JlZmxlY3Qtc2V0
LWN1c3RvbS12YWx1ZS5qczoKKwogMjAyMS0wNy0yOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxv
QGFwcGxlLmNvbT4KIAogICAgICAgICBkZWZpbmVQcm9wZXJ0eU9uUmVjZWl2ZXIgc2hvdWxkIGNo
ZWNrIGlmIHJlY2VpdmVyIGNhblBlcmZvcm1GYXN0UHV0SW5saW5lCmRpZmYgLS1naXQgYS9KU1Rl
c3RzL3N0cmVzcy9yZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMgYi9KU1Rlc3RzL3N0cmVzcy9y
ZWZsZWN0LXNldC1jdXN0b20tdmFsdWUuanMKaW5kZXggZGJjZjBiNzBhODYyMWFiNTE2NTg2MzFl
MzhlZTU0ZjlkM2I4NzQ5OS4uYjkwYTJhMTdiMmRmNGEzNWUzYjU0YmIzYmJmNzcxNjE2MmEyZWQ3
NCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9zdHJlc3MvcmVmbGVjdC1zZXQtY3VzdG9tLXZhbHVlLmpz
CisrKyBiL0pTVGVzdHMvc3RyZXNzL3JlZmxlY3Qtc2V0LWN1c3RvbS12YWx1ZS5qcwpAQCAtMSwz
ICsxLDE0IEBACi1jb25zdCB0ZXN0R2V0dGVyU2V0dGVyID0gJHZtLmNyZWF0ZUN1c3RvbVRlc3RH
ZXR0ZXJTZXR0ZXIoKTsKLVJlZmxlY3Quc2V0KHt9LCAnY3VzdG9tVmFsdWUnLCAnZm9vJywgdGVz
dEdldHRlclNldHRlcik7Ci10ZXN0R2V0dGVyU2V0dGVyLmN1c3RvbVZhbHVlID0gNDI7Cit7Cisg
ICAgLy8gcmVpZmllZAorICAgIGNvbnN0IHRlc3RHZXR0ZXJTZXR0ZXIgPSAkdm0uY3JlYXRlQ3Vz
dG9tVGVzdEdldHRlclNldHRlcigpOworICAgIFJlZmxlY3Quc2V0KHt9LCAnY3VzdG9tVmFsdWUn
LCAnZm9vJywgdGVzdEdldHRlclNldHRlcik7CisgICAgdGVzdEdldHRlclNldHRlci5jdXN0b21W
YWx1ZSA9IDQyOworfQorCit7CisgICAgLy8gbm9uLXJlaWZpZWQKKyAgICBsZXQgdGVzdGVyID0g
JHZtLmNyZWF0ZVN0YXRpY0N1c3RvbVZhbHVlKCk7CisgICAgUmVmbGVjdC5zZXQoe30sICJ0ZXN0
U3RhdGljVmFsdWVTZXRGbGFnIiwgJ2ZvbycsIHRlc3Rlcik7CisgICAgaWYgKCF0ZXN0ZXIudGVz
dFN0YXRpY1ZhbHVlU2V0dGVyQ2FsbGVkKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ0N1c3Rv
bSB2YWx1ZSBvdmVycmlkZW4nKTsKK30K
</data>
<flag name="commit-queue"
          id="457241"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>