<?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>225124</bug_id>
          
          <creation_ts>2021-04-27 14:43:39 -0700</creation_ts>
          <short_desc>Move ExceptionExpectation into its own .h file.</short_desc>
          <delta_ts>2021-04-27 15:54:19 -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="Mark Lam">mark.lam</reporter>
          <assigned_to name="Mark Lam">mark.lam</assigned_to>
          <cc>annulen</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>keith_miller</cc>
    
    <cc>msaboff</cc>
    
    <cc>rmorisset</cc>
    
    <cc>ryuan.choi</cc>
    
    <cc>saam</cc>
    
    <cc>sergio</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1754791</commentid>
    <comment_count>0</comment_count>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 14:43:39 -0700</bug_when>
    <thetext>Patch coming.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754793</commentid>
    <comment_count>1</comment_count>
      <attachid>427198</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 14:46:23 -0700</bug_when>
    <thetext>Created attachment 427198
proposed patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754799</commentid>
    <comment_count>2</comment_count>
      <attachid>427200</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:05:29 -0700</bug_when>
    <thetext>Created attachment 427200
proposed patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754805</commentid>
    <comment_count>3</comment_count>
      <attachid>427201</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:18:14 -0700</bug_when>
    <thetext>Created attachment 427201
proposed patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754806</commentid>
    <comment_count>4</comment_count>
      <attachid>427202</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:24:15 -0700</bug_when>
    <thetext>Created attachment 427202
proposed patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754811</commentid>
    <comment_count>5</comment_count>
      <attachid>427202</attachid>
    <who name="Robin Morisset">rmorisset</who>
    <bug_when>2021-04-27 15:41:35 -0700</bug_when>
    <thetext>Comment on attachment 427202
proposed patch.

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

&gt; Source/JavaScriptCore/ChangeLog:3
&gt; +        Move ExceptionExpectation into its own .h file.

What is the goal of this?

&gt; Source/JavaScriptCore/runtime/ExceptionHelpers.h:-39
&gt; -enum class ExceptionExpectation {

Should we not #include &quot;ExceptionExpectation&quot; if it is used in this file?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754813</commentid>
    <comment_count>6</comment_count>
      <attachid>427202</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:43:19 -0700</bug_when>
    <thetext>Comment on attachment 427202
proposed patch.

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

&gt;&gt; Source/JavaScriptCore/ChangeLog:3
&gt;&gt; +        Move ExceptionExpectation into its own .h file.
&gt; 
&gt; What is the goal of this?

It belongs in its own file instead of some other header file.  I was previously lazy and just stashed it in ExceptionHelpers.h.  Just making it right now.

&gt;&gt; Source/JavaScriptCore/runtime/ExceptionHelpers.h:-39
&gt;&gt; -enum class ExceptionExpectation {
&gt; 
&gt; Should we not #include &quot;ExceptionExpectation&quot; if it is used in this file?

It&apos;s not used in this file.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754814</commentid>
    <comment_count>7</comment_count>
      <attachid>427202</attachid>
    <who name="Robin Morisset">rmorisset</who>
    <bug_when>2021-04-27 15:44:19 -0700</bug_when>
    <thetext>Comment on attachment 427202
proposed patch.

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754817</commentid>
    <comment_count>8</comment_count>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:50:13 -0700</bug_when>
    <thetext>Oops, my uploaded patch was missing this bit:

@@ -463,9 +463,10 @@ bool JSGenericTypedArrayView&lt;Adaptor&gt;::g
         return false;
 
     JSValue value;
-    if constexpr (Adaptor::canConvertToJSQuickly)
+    if constexpr (Adaptor::canConvertToJSQuickly) {
+        UNUSED_VARIABLE(scope);
         value = thisObject-&gt;getIndexQuickly(propertyName);
-    else {
+    } else {
         auto nativeValue = thisObject-&gt;getIndexQuicklyAsNativeValue(propertyName);
         value = Adaptor::toJSValue(globalObject, nativeValue);
         RETURN_IF_EXCEPTION(scope, false);

Talked to Robin offline, and he ok&apos;ed me to include it for landing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754821</commentid>
    <comment_count>9</comment_count>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 15:53:36 -0700</bug_when>
    <thetext>Thanks for the review.  Landed in r276676: &lt;http://trac.webkit.org/r276676&gt;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754823</commentid>
    <comment_count>10</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-27 15:54:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/77235155&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427198</attachid>
            <date>2021-04-27 14:46:23 -0700</date>
            <delta_ts>2021-04-27 15:05:29 -0700</delta_ts>
            <desc>proposed patch.</desc>
            <filename>bug-225124.patch</filename>
            <type>text/plain</type>
            <size>7388</size>
            <attacher name="Mark Lam">mark.lam</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNl
L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA
CisyMDIxLTA0LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN
b3ZlIEV4Y2VwdGlvbkV4cGVjdGF0aW9ucyBpbnRvIGl0cyBvd24gLmggZmlsZS4KKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTEyNAorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6
CisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAg
ICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oOiBBZGRlZC4KKyAgICAgICAg
KiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaDoKKyAgICAgICAgKiBydW50aW1lL0hhc2hNYXBJ
bXBsSW5saW5lcy5oOgorCiAyMDIxLTA0LTI3ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo
QGdtYWlsLmNvbT4KIAogICAgICAgICBbSlNDXSBSZW1vdmUgZGVmYXVsdFZhbHVlKCkgZnJvbSB0
aGUgbWV0aG9kIHRhYmxlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ01ha2VMaXN0cy50
eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CShy
ZXZpc2lvbiAyNzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ01ha2VMaXN0cy50eHQJ
KHdvcmtpbmcgY29weSkKQEAgLTg5Niw2ICs4OTYsNyBAQCBzZXQoSmF2YVNjcmlwdENvcmVfUFJJ
VkFURV9GUkFNRVdPUktfSEVBCiAgICAgcnVudGltZS9FdmFsRXhlY3V0YWJsZS5oCiAgICAgcnVu
dGltZS9FeGNlcHRpb24uaAogICAgIHJ1bnRpbWUvRXhjZXB0aW9uRXZlbnRMb2NhdGlvbi5oCisg
ICAgcnVudGltZS9FeGNlcHRpb25FeHBlY3RhdGlvbi5oCiAgICAgcnVudGltZS9FeGNlcHRpb25I
ZWxwZXJzLmgKICAgICBydW50aW1lL0V4Y2VwdGlvblNjb3BlLmgKICAgICBydW50aW1lL0V4ZWN1
dGFibGVCYXNlLmgKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54
Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0
Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAy
NzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9q
L3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMjAxNiw2ICsyMDE2LDcgQEAKIAkJ
RkVGNUI0MjcyNjI4QUJEOTAwMTZFNzc2IC8qIEpTV2Vha01hcElubGluZXMuaCBpbiBIZWFkZXJz
ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRjVCNDI2MjYyOEFCRDkwMDE2
RTc3NiAvKiBKU1dlYWtNYXBJbmxpbmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo
UHJpdmF0ZSwgKTsgfTsgfTsKIAkJRkVGNUI0MjkyNjI4QjUyNDAwMTZFNzc2IC8qIEpTU2V0SW5s
aW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkVG
NUI0MjgyNjI4QjUyNDAwMTZFNzc2IC8qIEpTU2V0SW5saW5lcy5oICovOyBzZXR0aW5ncyA9IHtB
VFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUZFRjVCNDJDMjYyOENCQzgwMDE2RTc3
NiAvKiBWTVRyYXBzSW5saW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gRkVGNUI0MkIyNjI4Q0JDODAwMTZFNzc2IC8qIFZNVHJhcHNJbmxpbmVzLmgg
Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJRkVGNUI0
MzAyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oIGluIEhlYWRlcnMg
Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkVGNUI0MkYyNjJBMzM4QjAwMTZF
Nzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVT
ID0gKFByaXZhdGUsICk7IH07IH07CiAJCUZFRkQ2RkM2MUQ1RTc5OTIwMDhGMkYwQiAvKiBKU1N0
cmluZ0lubGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IEZFRkQ2RkM1MUQ1RTc5NzAwMDhGMkYwQiAvKiBKU1N0cmluZ0lubGluZXMuaCAqLzsgc2V0
dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogLyogRW5kIFBCWEJ1aWxk
RmlsZSBzZWN0aW9uICovCiAKQEAgLTU0MjcsNiArNTQyOCw3IEBACiAJCUZFRjVCNDI2MjYyOEFC
RDkwMDE2RTc3NiAvKiBKU1dlYWtNYXBJbmxpbmVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy
ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu
aDsgcGF0aCA9IEpTV2Vha01hcElubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK
IAkJRkVGNUI0MjgyNjI4QjUyNDAwMTZFNzc2IC8qIEpTU2V0SW5saW5lcy5oICovID0ge2lzYSA9
IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g
c291cmNlY29kZS5jLmg7IHBhdGggPSBKU1NldElubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJRkVGNUI0MkIyNjI4Q0JDODAwMTZFNzc2IC8qIFZNVHJhcHNJbmxpbmVzLmgg
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du
RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFZNVHJhcHNJbmxpbmVzLmg7IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUZFRjVCNDJGMjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNl
cHRpb25FeHBlY3RhdGlvbnMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j
b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRXhj
ZXB0aW9uRXhwZWN0YXRpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFRkQ2
RkM1MUQ1RTc5NzAwMDhGMkYwQiAvKiBKU1N0cmluZ0lubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuYy5oOyBwYXRoID0gSlNTdHJpbmdJbmxpbmVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw
PiI7IH07CiAvKiBFbmQgUEJYRmlsZVJlZmVyZW5jZSBzZWN0aW9uICovCiAKQEAgLTczNDUsNiAr
NzM0Nyw3IEBACiAJCQkJRkUxQzBGRkMxQjE5M0U5ODAwQjUzRkNBIC8qIEV4Y2VwdGlvbi5oICov
LAogCQkJCUZFODBDMTlBMUQ3NzY4RkQwMDg1MTBDMCAvKiBFeGNlcHRpb25FdmVudExvY2F0aW9u
LmNwcCAqLywKIAkJCQlGRTYwMjlEODFENkUxRTMzMDAzMDIwNEQgLyogRXhjZXB0aW9uRXZlbnRM
b2NhdGlvbi5oICovLAorCQkJCUZFRjVCNDJGMjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNlcHRpb25F
eHBlY3RhdGlvbnMuaCAqLywKIAkJCQkwRjEyREUwRDE5NzlENUZEMDAwNkZGNEUgLyogRXhjZXB0
aW9uRnV6ei5jcHAgKi8sCiAJCQkJMEYxMkRFMEUxOTc5RDVGRDAwMDZGRjRFIC8qIEV4Y2VwdGlv
bkZ1enouaCAqLywKIAkJCQkxNDI5RDg3NzBFRDIxQUNEMDBCODk2MTkgLyogRXhjZXB0aW9uSGVs
cGVycy5jcHAgKi8sCkBAIC0xMDc0NCw2ICsxMDc0Nyw3IEBACiAJCQkJQURFODAyOUExRTA4RjFE
RTAwNThERTc4IC8qIFdlYkFzc2VtYmx5TGlua0Vycm9yQ29uc3RydWN0b3IuaCBpbiBIZWFkZXJz
ICovLAogCQkJCUFERTgwMjlDMUUwOEYxREUwMDU4REU3OCAvKiBXZWJBc3NlbWJseUxpbmtFcnJv
clByb3RvdHlwZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUQyRkNCRjUxREI1OERBRDAwQjNFNzM2
IC8qIFdlYkFzc2VtYmx5TWVtb3J5Q29uc3RydWN0b3IuaCBpbiBIZWFkZXJzICovLAorCQkJCUZF
RjVCNDMwMjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNlcHRpb25FeHBlY3RhdGlvbnMuaCBpbiBIZWFk
ZXJzICovLAogCQkJCUFEMkZDQzFBMURCNTlDQjIwMEIzRTczNiAvKiBXZWJBc3NlbWJseU1lbW9y
eUNvbnN0cnVjdG9yLmx1dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUQyRkNCRjcxREI1OERBRDAw
QjNFNzM2IC8qIFdlYkFzc2VtYmx5TWVtb3J5UHJvdG90eXBlLmggaW4gSGVhZGVycyAqLywKIAkJ
CQlBRDJGQ0MxQjFEQjU5Q0IyMDBCM0U3MzYgLyogV2ViQXNzZW1ibHlNZW1vcnlQcm90b3R5cGUu
bHV0LmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l
L0V4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oCShub25leGlzdGVudCkKKysrIFNv
dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9ucy5oCSh3b3Jr
aW5nIGNvcHkpCkBAIC0wLDAgKzEsMzUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjEgQXBw
bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1
c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp
Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp
b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11
c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m
IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp
YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0
CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n
IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl
cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB
UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVT
UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBU
SEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg
Rk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5U
IFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBE
SVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBD
T05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICog
UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us
IERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIg
Q0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O
VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5D
RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0Yg
VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI
IERBTUFHRS4gCisgKi8KKworI3ByYWdtYSBvbmNlCisKK25hbWVzcGFjZSBKU0MgeworCitlbnVt
IGNsYXNzIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIHsKKyAgICBDYW5UaHJvdywKKyAgICBTaG91bGRO
b3RUaHJvdworfTsKKworfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw
dENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph
dmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCShyZXZpc2lvbiAyNzY2Njgp
CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgJKHdv
cmtpbmcgY29weSkKQEAgLTM2LDExICszNiw2IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1lbnVt
IGNsYXNzIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIHsKLSAgICBDYW5UaHJvdywKLSAgICBTaG91bGRO
b3RUaHJvdwotfTsKLQogdHlwZWRlZiBKU09iamVjdCogKCpFcnJvckZhY3RvcnkpKEpTR2xvYmFs
T2JqZWN0KiwgY29uc3QgU3RyaW5nJiwgRXJyb3JJbnN0YW5jZTo6U291cmNlQXBwZW5kZXIpOwog
CiBTdHJpbmcgZGVmYXVsdFNvdXJjZUFwcGVuZGVyKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmlu
ZyYsIFJ1bnRpbWVUeXBlLCBFcnJvckluc3RhbmNlOjpTb3VyY2VUZXh0V2hlcmVFcnJvck9jY3Vy
cmVkKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsSW5s
aW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hN
YXBJbXBsSW5saW5lcy5oCShyZXZpc2lvbiAyNzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv
cmUvcnVudGltZS9IYXNoTWFwSW1wbElubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMjUsNiAr
MjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkV4Y2VwdGlvbkV4cGVjdGF0aW9u
cy5oIgogI2luY2x1ZGUgIkhhc2hNYXBJbXBsLmgiCiAjaW5jbHVkZSAiSlNDSlNWYWx1ZUlubGlu
ZXMuaCIKICNpbmNsdWRlICJWTVRyYXBzSW5saW5lcy5oIgo=
</data>
<flag name="commit-queue"
          id="447716"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427200</attachid>
            <date>2021-04-27 15:05:29 -0700</date>
            <delta_ts>2021-04-27 15:18:14 -0700</delta_ts>
            <desc>proposed patch.</desc>
            <filename>bug-225124.patch</filename>
            <type>text/plain</type>
            <size>7376</size>
            <attacher name="Mark Lam">mark.lam</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNl
L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA
CisyMDIxLTA0LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN
b3ZlIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIGludG8gaXRzIG93biAuaCBmaWxlLgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTI0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDoK
KyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAg
ICAgICAqIHJ1bnRpbWUvRXhjZXB0aW9uRXhwZWN0YXRpb24uaDogQWRkZWQuCisgICAgICAgICog
cnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmg6CisgICAgICAgICogcnVudGltZS9IYXNoTWFwSW1w
bElubGluZXMuaDoKKwogMjAyMS0wNC0yNyAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBn
bWFpbC5jb20+CiAKICAgICAgICAgW0pTQ10gUmVtb3ZlIGRlZmF1bHRWYWx1ZSgpIGZyb20gdGhl
IG1ldGhvZCB0YWJsZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAkocmV2
aXNpb24gMjc2NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CSh3
b3JraW5nIGNvcHkpCkBAIC04OTYsNiArODk2LDcgQEAgc2V0KEphdmFTY3JpcHRDb3JlX1BSSVZB
VEVfRlJBTUVXT1JLX0hFQQogICAgIHJ1bnRpbWUvRXZhbEV4ZWN1dGFibGUuaAogICAgIHJ1bnRp
bWUvRXhjZXB0aW9uLmgKICAgICBydW50aW1lL0V4Y2VwdGlvbkV2ZW50TG9jYXRpb24uaAorICAg
IHJ1bnRpbWUvRXhjZXB0aW9uRXhwZWN0YXRpb24uaAogICAgIHJ1bnRpbWUvRXhjZXB0aW9uSGVs
cGVycy5oCiAgICAgcnVudGltZS9FeGNlcHRpb25TY29wZS5oCiAgICAgcnVudGltZS9FeGVjdXRh
YmxlQmFzZS5oCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNv
ZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv
cmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMjc2
NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9w
cm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTIwMTYsNiArMjAxNiw3IEBACiAJCUZF
RjVCNDI3MjYyOEFCRDkwMDE2RTc3NiAvKiBKU1dlYWtNYXBJbmxpbmVzLmggaW4gSGVhZGVycyAq
LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUY1QjQyNjI2MjhBQkQ5MDAxNkU3
NzYgLyogSlNXZWFrTWFwSW5saW5lcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFBy
aXZhdGUsICk7IH07IH07CiAJCUZFRjVCNDI5MjYyOEI1MjQwMDE2RTc3NiAvKiBKU1NldElubGlu
ZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRjVC
NDI4MjYyOEI1MjQwMDE2RTc3NiAvKiBKU1NldElubGluZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRU
UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRUY1QjQyQzI2MjhDQkM4MDAxNkU3NzYg
LyogVk1UcmFwc0lubGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg
ZmlsZVJlZiA9IEZFRjVCNDJCMjYyOENCQzgwMDE2RTc3NiAvKiBWTVRyYXBzSW5saW5lcy5oICov
OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCUZFRjVCNDMw
MjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNlcHRpb25FeHBlY3RhdGlvbi5oIGluIEhlYWRlcnMgKi8g
PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkVGNUI0MkYyNjJBMzM4QjAwMTZFNzc2
IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo
UHJpdmF0ZSwgKTsgfTsgfTsKIAkJRkVGRDZGQzYxRDVFNzk5MjAwOEYyRjBCIC8qIEpTU3RyaW5n
SW5saW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g
RkVGRDZGQzUxRDVFNzk3MDAwOEYyRjBCIC8qIEpTU3RyaW5nSW5saW5lcy5oICovOyBzZXR0aW5n
cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAvKiBFbmQgUEJYQnVpbGRGaWxl
IHNlY3Rpb24gKi8KIApAQCAtNTQyNyw2ICs1NDI4LDcgQEAKIAkJRkVGNUI0MjYyNjI4QUJEOTAw
MTZFNzc2IC8qIEpTV2Vha01hcElubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw
YXRoID0gSlNXZWFrTWFwSW5saW5lcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlG
RUY1QjQyODI2MjhCNTI0MDAxNkU3NzYgLyogSlNTZXRJbmxpbmVzLmggKi8gPSB7aXNhID0gUEJY
RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy
Y2Vjb2RlLmMuaDsgcGF0aCA9IEpTU2V0SW5saW5lcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i
OyB9OwogCQlGRUY1QjQyQjI2MjhDQkM4MDAxNkU3NzYgLyogVk1UcmFwc0lubGluZXMuaCAqLyA9
IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl
VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVk1UcmFwc0lubGluZXMuaDsgc291cmNlVHJl
ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRkVGNUI0MkYyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlv
bkV4cGVjdGF0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n
ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEV4Y2VwdGlv
bkV4cGVjdGF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFRkQ2RkM1MUQ1
RTc5NzAwMDhGMkYwQiAvKiBKU1N0cmluZ0lubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Yy5oOyBwYXRoID0gSlNTdHJpbmdJbmxpbmVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07
CiAvKiBFbmQgUEJYRmlsZVJlZmVyZW5jZSBzZWN0aW9uICovCiAKQEAgLTczNDUsNiArNzM0Nyw3
IEBACiAJCQkJRkUxQzBGRkMxQjE5M0U5ODAwQjUzRkNBIC8qIEV4Y2VwdGlvbi5oICovLAogCQkJ
CUZFODBDMTlBMUQ3NzY4RkQwMDg1MTBDMCAvKiBFeGNlcHRpb25FdmVudExvY2F0aW9uLmNwcCAq
LywKIAkJCQlGRTYwMjlEODFENkUxRTMzMDAzMDIwNEQgLyogRXhjZXB0aW9uRXZlbnRMb2NhdGlv
bi5oICovLAorCQkJCUZFRjVCNDJGMjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNlcHRpb25FeHBlY3Rh
dGlvbi5oICovLAogCQkJCTBGMTJERTBEMTk3OUQ1RkQwMDA2RkY0RSAvKiBFeGNlcHRpb25GdXp6
LmNwcCAqLywKIAkJCQkwRjEyREUwRTE5NzlENUZEMDAwNkZGNEUgLyogRXhjZXB0aW9uRnV6ei5o
ICovLAogCQkJCTE0MjlEODc3MEVEMjFBQ0QwMEI4OTYxOSAvKiBFeGNlcHRpb25IZWxwZXJzLmNw
cCAqLywKQEAgLTEwNzQ0LDYgKzEwNzQ3LDcgQEAKIAkJCQlBREU4MDI5QTFFMDhGMURFMDA1OERF
NzggLyogV2ViQXNzZW1ibHlMaW5rRXJyb3JDb25zdHJ1Y3Rvci5oIGluIEhlYWRlcnMgKi8sCiAJ
CQkJQURFODAyOUMxRTA4RjFERTAwNThERTc4IC8qIFdlYkFzc2VtYmx5TGlua0Vycm9yUHJvdG90
eXBlLmggaW4gSGVhZGVycyAqLywKIAkJCQlBRDJGQ0JGNTFEQjU4REFEMDBCM0U3MzYgLyogV2Vi
QXNzZW1ibHlNZW1vcnlDb25zdHJ1Y3Rvci5oIGluIEhlYWRlcnMgKi8sCisJCQkJRkVGNUI0MzAy
NjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmggaW4gSGVhZGVycyAqLywK
IAkJCQlBRDJGQ0MxQTFEQjU5Q0IyMDBCM0U3MzYgLyogV2ViQXNzZW1ibHlNZW1vcnlDb25zdHJ1
Y3Rvci5sdXQuaCBpbiBIZWFkZXJzICovLAogCQkJCUFEMkZDQkY3MURCNThEQUQwMEIzRTczNiAv
KiBXZWJBc3NlbWJseU1lbW9yeVByb3RvdHlwZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUQyRkND
MUIxREI1OUNCMjAwQjNFNzM2IC8qIFdlYkFzc2VtYmx5TWVtb3J5UHJvdG90eXBlLmx1dC5oIGlu
IEhlYWRlcnMgKi8sCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRp
b25FeHBlY3RhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50
aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9uLmgJKG5vbmV4aXN0ZW50KQorKysgU291cmNlL0phdmFT
Y3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uRXhwZWN0YXRpb24uaAkod29ya2luZyBjb3B5KQpA
QCAtMCwwICsxLDM1IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxs
IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj
ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl
IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl
IG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0
aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z
IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g
YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90
aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy
IGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp
ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ
REVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElF
RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBM
SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJ
Q1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM
RSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ
UkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB
TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5U
IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgor
ICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg
T04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ
Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX
SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdB
UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAor
ICovCisKKyNwcmFnbWEgb25jZQorCituYW1lc3BhY2UgSlNDIHsKKworZW51bSBjbGFzcyBFeGNl
cHRpb25FeHBlY3RhdGlvbiB7CisgICAgQ2FuVGhyb3csCisgICAgU2hvdWxkTm90VGhyb3cKK307
CisKK30gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp
bWUvRXhjZXB0aW9uSGVscGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaAkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCSh3b3JraW5nIGNvcHkp
CkBAIC0zNiwxMSArMzYsNiBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAotZW51bSBjbGFzcyBFeGNl
cHRpb25FeHBlY3RhdGlvbiB7Ci0gICAgQ2FuVGhyb3csCi0gICAgU2hvdWxkTm90VGhyb3cKLX07
Ci0KIHR5cGVkZWYgSlNPYmplY3QqICgqRXJyb3JGYWN0b3J5KShKU0dsb2JhbE9iamVjdCosIGNv
bnN0IFN0cmluZyYsIEVycm9ySW5zdGFuY2U6OlNvdXJjZUFwcGVuZGVyKTsKIAogU3RyaW5nIGRl
ZmF1bHRTb3VyY2VBcHBlbmRlcihjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBSdW50aW1l
VHlwZSwgRXJyb3JJbnN0YW5jZTo6U291cmNlVGV4dFdoZXJlRXJyb3JPY2N1cnJlZCk7CkluZGV4
OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IYXNoTWFwSW1wbElubGluZXMuaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IYXNoTWFwSW1wbElubGlu
ZXMuaAkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv
SGFzaE1hcEltcGxJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDcgQEAKIAog
I3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlICJFeGNlcHRpb25FeHBlY3RhdGlvbi5oIgogI2luY2x1
ZGUgIkhhc2hNYXBJbXBsLmgiCiAjaW5jbHVkZSAiSlNDSlNWYWx1ZUlubGluZXMuaCIKICNpbmNs
dWRlICJWTVRyYXBzSW5saW5lcy5oIgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427201</attachid>
            <date>2021-04-27 15:18:14 -0700</date>
            <delta_ts>2021-04-27 15:24:15 -0700</delta_ts>
            <desc>proposed patch.</desc>
            <filename>bug-225124.patch</filename>
            <type>text/plain</type>
            <size>7812</size>
            <attacher name="Mark Lam">mark.lam</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc2NjcxKQorKysgU291cmNl
L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA
CisyMDIxLTA0LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN
b3ZlIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIGludG8gaXRzIG93biAuaCBmaWxlLgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTI0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBmaXhlZCBzb21lIGNv
bXBpbGVyIHdhcm5pbmdzLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICog
SmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBydW50
aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9uLmg6IEFkZGVkLgorICAgICAgICAqIHJ1bnRpbWUvRXhj
ZXB0aW9uSGVscGVycy5oOgorICAgICAgICAqIHJ1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmg6
CisgICAgICAgIChKU0M6OmpzTWFwSGFzaEltcGwpOgorCiAyMDIxLTA0LTI3ICBBbGV4ZXkgU2h2
YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBbSlNDXSBSZW1vdmUgZGVm
YXVsdFZhbHVlKCkgZnJvbSB0aGUgbWV0aG9kIHRhYmxlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ01ha2VMaXN0cy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl
L0NNYWtlTGlzdHMudHh0CShyZXZpc2lvbiAyNzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ01ha2VMaXN0cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTg5Niw2ICs4OTYsNyBAQCBzZXQo
SmF2YVNjcmlwdENvcmVfUFJJVkFURV9GUkFNRVdPUktfSEVBCiAgICAgcnVudGltZS9FdmFsRXhl
Y3V0YWJsZS5oCiAgICAgcnVudGltZS9FeGNlcHRpb24uaAogICAgIHJ1bnRpbWUvRXhjZXB0aW9u
RXZlbnRMb2NhdGlvbi5oCisgICAgcnVudGltZS9FeGNlcHRpb25FeHBlY3RhdGlvbi5oCiAgICAg
cnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgKICAgICBydW50aW1lL0V4Y2VwdGlvblNjb3BlLmgK
ICAgICBydW50aW1lL0V4ZWN1dGFibGVCYXNlLmgKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w
Ynhwcm9qCShyZXZpc2lvbiAyNzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNj
cmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMjAx
Niw2ICsyMDE2LDcgQEAKIAkJRkVGNUI0MjcyNjI4QUJEOTAwMTZFNzc2IC8qIEpTV2Vha01hcElu
bGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZF
RjVCNDI2MjYyOEFCRDkwMDE2RTc3NiAvKiBKU1dlYWtNYXBJbmxpbmVzLmggKi87IHNldHRpbmdz
ID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJRkVGNUI0MjkyNjI4QjUyNDAw
MTZFNzc2IC8qIEpTU2V0SW5saW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG
aWxlOyBmaWxlUmVmID0gRkVGNUI0MjgyNjI4QjUyNDAwMTZFNzc2IC8qIEpTU2V0SW5saW5lcy5o
ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUZFRjVC
NDJDMjYyOENCQzgwMDE2RTc3NiAvKiBWTVRyYXBzSW5saW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkVGNUI0MkIyNjI4Q0JDODAwMTZFNzc2IC8q
IFZNVHJhcHNJbmxpbmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwg
KTsgfTsgfTsKKwkJRkVGNUI0MzAyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0
aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUY1
QjQyRjI2MkEzMzhCMDAxNkU3NzYgLyogRXhjZXB0aW9uRXhwZWN0YXRpb24uaCAqLzsgc2V0dGlu
Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRUZENkZDNjFENUU3OTky
MDA4RjJGMEIgLyogSlNTdHJpbmdJbmxpbmVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC
dWlsZEZpbGU7IGZpbGVSZWYgPSBGRUZENkZDNTFENUU3OTcwMDA4RjJGMEIgLyogSlNTdHJpbmdJ
bmxpbmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK
IC8qIEVuZCBQQlhCdWlsZEZpbGUgc2VjdGlvbiAqLwogCkBAIC01NDI3LDYgKzU0MjgsNyBAQAog
CQlGRUY1QjQyNjI2MjhBQkQ5MDAxNkU3NzYgLyogSlNXZWFrTWFwSW5saW5lcy5oICovID0ge2lz
YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl
ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1dlYWtNYXBJbmxpbmVzLmg7IHNvdXJjZVRyZWUg
PSAiPGdyb3VwPiI7IH07CiAJCUZFRjVCNDI4MjYyOEI1MjQwMDE2RTc3NiAvKiBKU1NldElubGlu
ZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0
S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNTZXRJbmxpbmVzLmg7IHNv
dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFRjVCNDJCMjYyOENCQzgwMDE2RTc3NiAvKiBW
TVRyYXBzSW5saW5lcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu
ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBWTVRyYXBz
SW5saW5lcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlGRUY1QjQyRjI2MkEzMzhC
MDAxNkU3NzYgLyogRXhjZXB0aW9uRXhwZWN0YXRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Yy5oOyBwYXRoID0gRXhjZXB0aW9uRXhwZWN0YXRpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+
IjsgfTsKIAkJRkVGRDZGQzUxRDVFNzk3MDAwOEYyRjBCIC8qIEpTU3RyaW5nSW5saW5lcy5oICov
ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp
bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1N0cmluZ0lubGluZXMuaDsgc291cmNl
VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIC8qIEVuZCBQQlhGaWxlUmVmZXJlbmNlIHNlY3Rpb24gKi8K
IApAQCAtNzM0NSw2ICs3MzQ3LDcgQEAKIAkJCQlGRTFDMEZGQzFCMTkzRTk4MDBCNTNGQ0EgLyog
RXhjZXB0aW9uLmggKi8sCiAJCQkJRkU4MEMxOUExRDc3NjhGRDAwODUxMEMwIC8qIEV4Y2VwdGlv
bkV2ZW50TG9jYXRpb24uY3BwICovLAogCQkJCUZFNjAyOUQ4MUQ2RTFFMzMwMDMwMjA0RCAvKiBF
eGNlcHRpb25FdmVudExvY2F0aW9uLmggKi8sCisJCQkJRkVGNUI0MkYyNjJBMzM4QjAwMTZFNzc2
IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmggKi8sCiAJCQkJMEYxMkRFMEQxOTc5RDVGRDAwMDZG
RjRFIC8qIEV4Y2VwdGlvbkZ1enouY3BwICovLAogCQkJCTBGMTJERTBFMTk3OUQ1RkQwMDA2RkY0
RSAvKiBFeGNlcHRpb25GdXp6LmggKi8sCiAJCQkJMTQyOUQ4NzcwRUQyMUFDRDAwQjg5NjE5IC8q
IEV4Y2VwdGlvbkhlbHBlcnMuY3BwICovLApAQCAtMTA3NDQsNiArMTA3NDcsNyBAQAogCQkJCUFE
RTgwMjlBMUUwOEYxREUwMDU4REU3OCAvKiBXZWJBc3NlbWJseUxpbmtFcnJvckNvbnN0cnVjdG9y
LmggaW4gSGVhZGVycyAqLywKIAkJCQlBREU4MDI5QzFFMDhGMURFMDA1OERFNzggLyogV2ViQXNz
ZW1ibHlMaW5rRXJyb3JQcm90b3R5cGUuaCBpbiBIZWFkZXJzICovLAogCQkJCUFEMkZDQkY1MURC
NThEQUQwMEIzRTczNiAvKiBXZWJBc3NlbWJseU1lbW9yeUNvbnN0cnVjdG9yLmggaW4gSGVhZGVy
cyAqLywKKwkJCQlGRUY1QjQzMDI2MkEzMzhCMDAxNkU3NzYgLyogRXhjZXB0aW9uRXhwZWN0YXRp
b24uaCBpbiBIZWFkZXJzICovLAogCQkJCUFEMkZDQzFBMURCNTlDQjIwMEIzRTczNiAvKiBXZWJB
c3NlbWJseU1lbW9yeUNvbnN0cnVjdG9yLmx1dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUQyRkNC
RjcxREI1OERBRDAwQjNFNzM2IC8qIFdlYkFzc2VtYmx5TWVtb3J5UHJvdG90eXBlLmggaW4gSGVh
ZGVycyAqLywKIAkJCQlBRDJGQ0MxQjFEQjU5Q0IyMDBCM0U3MzYgLyogV2ViQXNzZW1ibHlNZW1v
cnlQcm90b3R5cGUubHV0LmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uRXhwZWN0YXRpb24uaAkobm9uZXhpc3Rl
bnQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25FeHBlY3RhdGlv
bi5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp
IDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0
aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor
ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu
ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj
ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp
cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu
IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg
Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg
Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv
dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI
SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQor
ICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J
VEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E
IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElO
IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg
Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBM
QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T
UyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p
IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRI
RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcg
TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT
RQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU
WSBPRiBTVUNIIERBTUFHRS4gCisgKi8KKworI3ByYWdtYSBvbmNlCisKK25hbWVzcGFjZSBKU0Mg
eworCitlbnVtIGNsYXNzIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIHsKKyAgICBDYW5UaHJvdywKKyAg
ICBTaG91bGROb3RUaHJvdworfTsKKworfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2Uv
SmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCShyZXZpc2lv
biAyNzY2NjgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxw
ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDExICszNiw2IEBACiAKIG5hbWVzcGFjZSBKU0Mg
ewogCi1lbnVtIGNsYXNzIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIHsKLSAgICBDYW5UaHJvdywKLSAg
ICBTaG91bGROb3RUaHJvdwotfTsKLQogdHlwZWRlZiBKU09iamVjdCogKCpFcnJvckZhY3Rvcnkp
KEpTR2xvYmFsT2JqZWN0KiwgY29uc3QgU3RyaW5nJiwgRXJyb3JJbnN0YW5jZTo6U291cmNlQXBw
ZW5kZXIpOwogCiBTdHJpbmcgZGVmYXVsdFNvdXJjZUFwcGVuZGVyKGNvbnN0IFN0cmluZyYsIGNv
bnN0IFN0cmluZyYsIFJ1bnRpbWVUeXBlLCBFcnJvckluc3RhbmNlOjpTb3VyY2VUZXh0V2hlcmVF
cnJvck9jY3VycmVkKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hN
YXBJbXBsSW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50
aW1lL0hhc2hNYXBJbXBsSW5saW5lcy5oCShyZXZpc2lvbiAyNzY2NjgpCisrKyBTb3VyY2UvSmF2
YVNjcmlwdENvcmUvcnVudGltZS9IYXNoTWFwSW1wbElubGluZXMuaAkod29ya2luZyBjb3B5KQpA
QCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkV4Y2VwdGlvbkV4
cGVjdGF0aW9uLmgiCiAjaW5jbHVkZSAiSGFzaE1hcEltcGwuaCIKICNpbmNsdWRlICJKU0NKU1Zh
bHVlSW5saW5lcy5oIgogI2luY2x1ZGUgIlZNVHJhcHNJbmxpbmVzLmgiCkBAIC05Niw3ICs5Nyw3
IEBAIEFMV0FZU19JTkxJTkUgdWludDMyX3QganNNYXBIYXNoSW1wbChKU0cKICAgICAgICAgaWYg
Y29uc3RleHByIChleHBlY3Rpb24gPT0gRXhjZXB0aW9uRXhwZWN0YXRpb246OkNhblRocm93KQog
ICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgVUlOVF9NQVgpOwogICAgICAg
ICBlbHNlCi0gICAgICAgICAgICBFWENFUFRJT05fQVNTRVJUKCFzY29wZS5leGNlcHRpb24oKSk7
CisgICAgICAgICAgICBFWENFUFRJT05fQVNTRVJUX1VOVVNFRChzY29wZSwgIXNjb3BlLmV4Y2Vw
dGlvbigpKTsKICAgICAgICAgcmV0dXJuIHd0ZlN0cmluZy5pbXBsKCktPmhhc2goKTsKICAgICB9
CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427202</attachid>
            <date>2021-04-27 15:24:15 -0700</date>
            <delta_ts>2021-04-27 15:44:19 -0700</delta_ts>
            <desc>proposed patch.</desc>
            <filename>bug-225124.patch</filename>
            <type>text/plain</type>
            <size>8607</size>
            <attacher name="Mark Lam">mark.lam</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc2NjcxKQorKysgU291cmNl
L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA
CisyMDIxLTA0LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN
b3ZlIEV4Y2VwdGlvbkV4cGVjdGF0aW9uIGludG8gaXRzIG93biAuaCBmaWxlLgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTI0CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBmaXhlZCBzb21lIGNv
bXBpbGVyIHdhcm5pbmdzLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICog
SmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBydW50
aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9uLmg6IEFkZGVkLgorICAgICAgICAqIHJ1bnRpbWUvRXhj
ZXB0aW9uSGVscGVycy5oOgorICAgICAgICAqIHJ1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmg6
CisgICAgICAgIChKU0M6OmpzTWFwSGFzaEltcGwpOgorICAgICAgICAqIHJ1bnRpbWUvSlNHZW5l
cmljVHlwZWRBcnJheVZpZXdJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpTR2VuZXJpY1R5cGVk
QXJyYXlWaWV3PEFkYXB0b3I+OjpzZXRXaXRoU3BlY2lmaWNUeXBlKToKKwogMjAyMS0wNC0yNyAg
QWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CiAKICAgICAgICAgW0pTQ10g
UmVtb3ZlIGRlZmF1bHRWYWx1ZSgpIGZyb20gdGhlIG1ldGhvZCB0YWJsZQpJbmRleDogU291cmNl
L0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh
U2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNlL0ph
dmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC04OTYsNiArODk2
LDcgQEAgc2V0KEphdmFTY3JpcHRDb3JlX1BSSVZBVEVfRlJBTUVXT1JLX0hFQQogICAgIHJ1bnRp
bWUvRXZhbEV4ZWN1dGFibGUuaAogICAgIHJ1bnRpbWUvRXhjZXB0aW9uLmgKICAgICBydW50aW1l
L0V4Y2VwdGlvbkV2ZW50TG9jYXRpb24uaAorICAgIHJ1bnRpbWUvRXhjZXB0aW9uRXhwZWN0YXRp
b24uaAogICAgIHJ1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCiAgICAgcnVudGltZS9FeGNlcHRp
b25TY29wZS5oCiAgICAgcnVudGltZS9FeGVjdXRhYmxlQmFzZS5oCkluZGV4OiBTb3VyY2UvSmF2
YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9q
L3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRD
b3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29w
eSkKQEAgLTIwMTYsNiArMjAxNiw3IEBACiAJCUZFRjVCNDI3MjYyOEFCRDkwMDE2RTc3NiAvKiBK
U1dlYWtNYXBJbmxpbmVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp
bGVSZWYgPSBGRUY1QjQyNjI2MjhBQkQ5MDAxNkU3NzYgLyogSlNXZWFrTWFwSW5saW5lcy5oICov
OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUZFRjVCNDI5
MjYyOEI1MjQwMDE2RTc3NiAvKiBKU1NldElubGluZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRjVCNDI4MjYyOEI1MjQwMDE2RTc3NiAvKiBKU1Nl
dElubGluZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9
OwogCQlGRUY1QjQyQzI2MjhDQkM4MDAxNkU3NzYgLyogVk1UcmFwc0lubGluZXMuaCBpbiBIZWFk
ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRjVCNDJCMjYyOENCQzgw
MDE2RTc3NiAvKiBWTVRyYXBzSW5saW5lcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g
KFByaXZhdGUsICk7IH07IH07CisJCUZFRjVCNDMwMjYyQTMzOEIwMDE2RTc3NiAvKiBFeGNlcHRp
b25FeHBlY3RhdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl
UmVmID0gRkVGNUI0MkYyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmgg
Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJRkVGRDZG
QzYxRDVFNzk5MjAwOEYyRjBCIC8qIEpTU3RyaW5nSW5saW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkVGRDZGQzUxRDVFNzk3MDAwOEYyRjBCIC8q
IEpTU3RyaW5nSW5saW5lcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs
ICk7IH07IH07CiAvKiBFbmQgUEJYQnVpbGRGaWxlIHNlY3Rpb24gKi8KIApAQCAtNTQyNyw2ICs1
NDI4LDcgQEAKIAkJRkVGNUI0MjYyNjI4QUJEOTAwMTZFNzc2IC8qIEpTV2Vha01hcElubGluZXMu
aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v
d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNXZWFrTWFwSW5saW5lcy5oOyBz
b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRUY1QjQyODI2MjhCNTI0MDAxNkU3NzYgLyog
SlNTZXRJbmxpbmVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n
ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU2V0SW5s
aW5lcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRUY1QjQyQjI2MjhDQkM4MDAx
NkU3NzYgLyogVk1UcmFwc0lubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm
aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo
ID0gVk1UcmFwc0lubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRkVGNUI0
MkYyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmggKi8gPSB7aXNhID0g
UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz
b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEV4Y2VwdGlvbkV4cGVjdGF0aW9uLmg7IHNvdXJjZVRyZWUg
PSAiPGdyb3VwPiI7IH07CiAJCUZFRkQ2RkM1MUQ1RTc5NzAwMDhGMkYwQiAvKiBKU1N0cmluZ0lu
bGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs
YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNTdHJpbmdJbmxpbmVz
Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAvKiBFbmQgUEJYRmlsZVJlZmVyZW5jZSBz
ZWN0aW9uICovCiAKQEAgLTczNDUsNiArNzM0Nyw3IEBACiAJCQkJRkUxQzBGRkMxQjE5M0U5ODAw
QjUzRkNBIC8qIEV4Y2VwdGlvbi5oICovLAogCQkJCUZFODBDMTlBMUQ3NzY4RkQwMDg1MTBDMCAv
KiBFeGNlcHRpb25FdmVudExvY2F0aW9uLmNwcCAqLywKIAkJCQlGRTYwMjlEODFENkUxRTMzMDAz
MDIwNEQgLyogRXhjZXB0aW9uRXZlbnRMb2NhdGlvbi5oICovLAorCQkJCUZFRjVCNDJGMjYyQTMz
OEIwMDE2RTc3NiAvKiBFeGNlcHRpb25FeHBlY3RhdGlvbi5oICovLAogCQkJCTBGMTJERTBEMTk3
OUQ1RkQwMDA2RkY0RSAvKiBFeGNlcHRpb25GdXp6LmNwcCAqLywKIAkJCQkwRjEyREUwRTE5NzlE
NUZEMDAwNkZGNEUgLyogRXhjZXB0aW9uRnV6ei5oICovLAogCQkJCTE0MjlEODc3MEVEMjFBQ0Qw
MEI4OTYxOSAvKiBFeGNlcHRpb25IZWxwZXJzLmNwcCAqLywKQEAgLTEwNzQ0LDYgKzEwNzQ3LDcg
QEAKIAkJCQlBREU4MDI5QTFFMDhGMURFMDA1OERFNzggLyogV2ViQXNzZW1ibHlMaW5rRXJyb3JD
b25zdHJ1Y3Rvci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQURFODAyOUMxRTA4RjFERTAwNThERTc4
IC8qIFdlYkFzc2VtYmx5TGlua0Vycm9yUHJvdG90eXBlLmggaW4gSGVhZGVycyAqLywKIAkJCQlB
RDJGQ0JGNTFEQjU4REFEMDBCM0U3MzYgLyogV2ViQXNzZW1ibHlNZW1vcnlDb25zdHJ1Y3Rvci5o
IGluIEhlYWRlcnMgKi8sCisJCQkJRkVGNUI0MzAyNjJBMzM4QjAwMTZFNzc2IC8qIEV4Y2VwdGlv
bkV4cGVjdGF0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQlBRDJGQ0MxQTFEQjU5Q0IyMDBCM0U3
MzYgLyogV2ViQXNzZW1ibHlNZW1vcnlDb25zdHJ1Y3Rvci5sdXQuaCBpbiBIZWFkZXJzICovLAog
CQkJCUFEMkZDQkY3MURCNThEQUQwMEIzRTczNiAvKiBXZWJBc3NlbWJseU1lbW9yeVByb3RvdHlw
ZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUQyRkNDMUIxREI1OUNCMjAwQjNFNzM2IC8qIFdlYkFz
c2VtYmx5TWVtb3J5UHJvdG90eXBlLmx1dC5oIGluIEhlYWRlcnMgKi8sCkluZGV4OiBTb3VyY2Uv
SmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25FeHBlY3RhdGlvbi5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkV4cGVjdGF0aW9uLmgJ
KG5vbmV4aXN0ZW50KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9u
RXhwZWN0YXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDM1IEBACisvKgorICogQ29w
eXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS
ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y
IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo
ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u
cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu
b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt
ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug
dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u
cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv
biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K
KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycn
IEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV
VCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB
QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM
QUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMg
QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwK
KyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO
T1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS
VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5U
RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklM
SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAo
SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU
IE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg
UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICovCisKKyNwcmFnbWEgb25jZQorCituYW1l
c3BhY2UgSlNDIHsKKworZW51bSBjbGFzcyBFeGNlcHRpb25FeHBlY3RhdGlvbiB7CisgICAgQ2Fu
VGhyb3csCisgICAgU2hvdWxkTm90VGhyb3cKK307CisKK30gLy8gbmFtZXNwYWNlIEpTQwpJbmRl
eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMu
aAkocmV2aXNpb24gMjc2NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhj
ZXB0aW9uSGVscGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxMSArMzYsNiBAQAogCiBuYW1l
c3BhY2UgSlNDIHsKIAotZW51bSBjbGFzcyBFeGNlcHRpb25FeHBlY3RhdGlvbiB7Ci0gICAgQ2Fu
VGhyb3csCi0gICAgU2hvdWxkTm90VGhyb3cKLX07Ci0KIHR5cGVkZWYgSlNPYmplY3QqICgqRXJy
b3JGYWN0b3J5KShKU0dsb2JhbE9iamVjdCosIGNvbnN0IFN0cmluZyYsIEVycm9ySW5zdGFuY2U6
OlNvdXJjZUFwcGVuZGVyKTsKIAogU3RyaW5nIGRlZmF1bHRTb3VyY2VBcHBlbmRlcihjb25zdCBT
dHJpbmcmLCBjb25zdCBTdHJpbmcmLCBSdW50aW1lVHlwZSwgRXJyb3JJbnN0YW5jZTo6U291cmNl
VGV4dFdoZXJlRXJyb3JPY2N1cnJlZCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu
dGltZS9IYXNoTWFwSW1wbElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw
dENvcmUvcnVudGltZS9IYXNoTWFwSW1wbElubGluZXMuaAkocmV2aXNpb24gMjc2NjY4KQorKysg
U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmgJKHdvcmtp
bmcgY29weSkKQEAgLTI1LDYgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlICJF
eGNlcHRpb25FeHBlY3RhdGlvbi5oIgogI2luY2x1ZGUgIkhhc2hNYXBJbXBsLmgiCiAjaW5jbHVk
ZSAiSlNDSlNWYWx1ZUlubGluZXMuaCIKICNpbmNsdWRlICJWTVRyYXBzSW5saW5lcy5oIgpAQCAt
OTYsNyArOTcsNyBAQCBBTFdBWVNfSU5MSU5FIHVpbnQzMl90IGpzTWFwSGFzaEltcGwoSlNHCiAg
ICAgICAgIGlmIGNvbnN0ZXhwciAoZXhwZWN0aW9uID09IEV4Y2VwdGlvbkV4cGVjdGF0aW9uOjpD
YW5UaHJvdykKICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIFVJTlRfTUFY
KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgRVhDRVBUSU9OX0FTU0VSVCghc2NvcGUuZXhj
ZXB0aW9uKCkpOworICAgICAgICAgICAgRVhDRVBUSU9OX0FTU0VSVF9VTlVTRUQoc2NvcGUsICFz
Y29wZS5leGNlcHRpb24oKSk7CiAgICAgICAgIHJldHVybiB3dGZTdHJpbmcuaW1wbCgpLT5oYXNo
KCk7CiAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dlbmVy
aWNUeXBlZEFycmF5Vmlld0lubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw
dENvcmUvcnVudGltZS9KU0dlbmVyaWNUeXBlZEFycmF5Vmlld0lubGluZXMuaAkocmV2aXNpb24g
Mjc2NjY4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHZW5lcmljVHlwZWRB
cnJheVZpZXdJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NSw3ICsxNzUsNyBAQCBib29s
IEpTR2VuZXJpY1R5cGVkQXJyYXlWaWV3PEFkYXB0b3I+OjpzCiAKICAgICBSRUxFQVNFX0FTU0VS
VChvdGhlci0+Y2FuQWNjZXNzUmFuZ2VRdWlja2x5KG90aGVyT2Zmc2V0LCBsZW5ndGgpKTsKICAg
ICBib29sIHN1Y2Nlc3MgPSB2YWxpZGF0ZVJhbmdlKGdsb2JhbE9iamVjdCwgb2Zmc2V0LCBsZW5n
dGgpOwotICAgIEVYQ0VQVElPTl9BU1NFUlQoIXNjb3BlLmV4Y2VwdGlvbigpID09IHN1Y2Nlc3Mp
OworICAgIEVYQ0VQVElPTl9BU1NFUlRfVU5VU0VEKHNjb3BlLCAhc2NvcGUuZXhjZXB0aW9uKCkg
PT0gc3VjY2Vzcyk7CiAgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK
</data>
<flag name="review"
          id="447724"
          type_id="1"
          status="+"
          setter="rmorisset"
    />
          </attachment>
      

    </bug>

</bugzilla>