<?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>184841</bug_id>
          
          <creation_ts>2018-04-20 14:49:01 -0700</creation_ts>
          <short_desc>Activate NetworkLoadChecker for media loads</short_desc>
          <delta_ts>2018-04-21 13:47:22 -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>WebKit Misc.</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="youenn fablet">youennf</reporter>
          <assigned_to name="youenn fablet">youennf</assigned_to>
          <cc>cdumez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>jer.noble</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wilander</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1416424</commentid>
    <comment_count>0</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-20 14:49:01 -0700</bug_when>
    <thetext>Activate NetworkLoadChecker for media loads</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416437</commentid>
    <comment_count>1</comment_count>
      <attachid>338465</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-20 15:06:05 -0700</bug_when>
    <thetext>Created attachment 338465
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416476</commentid>
    <comment_count>2</comment_count>
      <attachid>338474</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-20 15:55:02 -0700</bug_when>
    <thetext>Created attachment 338474
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416496</commentid>
    <comment_count>3</comment_count>
      <attachid>338484</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-20 16:18:01 -0700</bug_when>
    <thetext>Created attachment 338484
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416611</commentid>
    <comment_count>4</comment_count>
      <attachid>338484</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2018-04-20 20:51:29 -0700</bug_when>
    <thetext>Comment on attachment 338484
Patch

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

&gt; Source/WebKit/Shared/WebCoreArgumentCoders.cpp:1274
&gt; +    if (resourceError.isNull())
&gt; +        return;

Nit: is it worth adding an ASSERT(resourceError.type() == ResourceError::Type::Null) when resourceError.isNull()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416676</commentid>
    <comment_count>5</comment_count>
      <attachid>338484</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-21 12:49:37 -0700</bug_when>
    <thetext>Comment on attachment 338484
Patch

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

&gt;&gt; Source/WebKit/Shared/WebCoreArgumentCoders.cpp:1274
&gt;&gt; +        return;
&gt; 
&gt; Nit: is it worth adding an ASSERT(resourceError.type() == ResourceError::Type::Null) when resourceError.isNull()?

Will change to check for type() instead, thanks for the review.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416677</commentid>
    <comment_count>6</comment_count>
      <attachid>338531</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-04-21 12:51:08 -0700</bug_when>
    <thetext>Created attachment 338531
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416692</commentid>
    <comment_count>7</comment_count>
      <attachid>338531</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-04-21 13:46:50 -0700</bug_when>
    <thetext>Comment on attachment 338531
Patch for landing

Clearing flags on attachment: 338531

Committed r230893: &lt;https://trac.webkit.org/changeset/230893&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416693</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-04-21 13:46:52 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1416694</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-04-21 13:47:22 -0700</bug_when>
    <thetext>&lt;rdar://problem/39623506&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>338465</attachid>
            <date>2018-04-20 15:06:05 -0700</date>
            <delta_ts>2018-04-20 15:35:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-184841-20180420150604.patch</filename>
            <type>text/plain</type>
            <size>6880</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhMmJhNDMxM2RhYmQwNGI0
NTJjNmIwOGZlNWUzOGJiZDI0ZDUyN2IuLjM4N2I4N2QwZjJkYWE2MmE1YWQwNDBhZGVkNmE1MWUy
MGZhYWM2MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTgtMDQtMjAgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2Fk
Q2hlY2tlciBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTE4NDg0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEluc3RhbnRpYXRlIGEgTmV0d29ya0xvYWRDaGVja2VyIGZvciBOZXR3
b3JrUmVzb3VyY2VMb2FkZXIgZm9yIGF1ZGlvL3ZpZGVvIGxvYWRzLgorCisgICAgICAgIE1vdmUg
Q09SUyBjaGVja3MgZm9yIHJlc3BvbnNlIGFmdGVyIGhhbmRsaW5nIG9mIDMwNCBjaGVja3MuCisg
ICAgICAgIEZvciAzMDQgY2hlY2tzLCB3ZSBuZWVkIHRvIGRvIHRoZSBDT1JTIGNoZWNrcyBvbiB0
aGUgdmFsaWRhdGVkIGNhY2hlZCByZXNwb25zZSwgbm90IHRoZSAzMDQgcmVjZWl2ZWQgcmVzcG9u
c2UuCisKKyAgICAgICAgVXBkYXRlZCBSZXNvdXJjZUVycm9yIGFyZ3VtZW50IGNvZGVyIHRvIGV4
cGxpY2l0bHkgcGFzcyB0aGUgZXJyb3IgdHlwZQorICAgICAgICBhcyBzb21lIGVycm9ycyBjcmVh
dGVkIGJ5IE5ldHdvcmtMb2FkQ2hlY2tlciB3b3VsZCBvdGhlcndpc2UgYmUgcmVjZWl2ZWQgYXMg
R2VuZXJhbCBlcnJvcnMgYnkgV2ViUHJvY2Vzcy4KKworICAgICAgICBBbGwgY2hhbmdlcyBhcmUg
Y292ZXJlZCBieSByZWd1bGFyIG1lZGlhIGxvYWRpbmcgbGF5b3V0IHRlc3RzLgorCisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6c2hvdWxkVXNlTmV0d29ya0xvYWRDaGVja2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0
d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIFNoYXJl
ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVy
PFJlc291cmNlRXJyb3I+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJl
c291cmNlRXJyb3I+OjpkZWNvZGUpOgorCiAyMDE4LTA0LTIwICBZb3Vlbm4gRmFibGV0ICA8eW91
ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBOZXR3b3JrUmVzb3VyY2VMb2FkZXIg
dG8gY2hlY2sgZm9yIG1fbmV0d29ya0xvYWRDaGVja2VyIHByZXNlbmNlIGJlZm9yZSB1c2luZyBp
dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy
Y2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy
Y2VMb2FkZXIuY3BwCmluZGV4IDJiNmRhMjI0NTY5YmQ4MzM4ZDE0MTgzYzliZDAyM2UxZTI1MTk5
YmUuLmIzNzAwMzY0MWQxNDJiNmQwMjY3ZjYwODRlMWU4N2Y4Y2MxMzc1MTAgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAor
KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j
cHAKQEAgLTg3LDYgKzg3LDI1IEBAIHN0YXRpYyB2b2lkIHNlbmRSZXBseVRvU3luY2hyb25vdXNS
ZXF1ZXN0KE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6U3luY2hyb25vdXNMb2FkCiAgICAgZGF0YS5k
ZWxheWVkUmVwbHkgPSBudWxscHRyOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkVXNl
TmV0d29ya0xvYWRDaGVja2VyKGJvb2wgaXNTeW5jaHJvbm91cywgY29uc3QgTmV0d29ya1Jlc291
cmNlTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCit7CisgICAgaWYgKGlzU3luY2hyb25vdXMp
CisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgaWYgKCFwYXJhbWV0ZXJzLnNob3VsZFJlc3Ry
aWN0SFRUUFJlc3BvbnNlQWNjZXNzKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBG
SVhNRTogQWRkIHN1cHBvcnQgZm9yIG90aGVyIGRlc3RpbmF0aW9ucy4KKyAgICBzd2l0Y2ggKHBh
cmFtZXRlcnMub3B0aW9ucy5kZXN0aW5hdGlvbikgeworICAgIGNhc2UgRmV0Y2hPcHRpb25zOjpE
ZXN0aW5hdGlvbjo6QXVkaW86CisgICAgY2FzZSBGZXRjaE9wdGlvbnM6OkRlc3RpbmF0aW9uOjpW
aWRlbzoKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7
CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogTmV0d29ya1Jlc291cmNlTG9hZGVyOjpO
ZXR3b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmJiBwYXJh
bWV0ZXJzLCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcyYgY29ubmVjdGlvbiwgUmVmUHRy
PE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9u
b3VzTG9hZDo6RGVsYXllZFJlcGx5PiYmIHN5bmNocm9ub3VzUmVwbHkpCiAgICAgOiBtX3BhcmFt
ZXRlcnMgeyBXVEZNb3ZlKHBhcmFtZXRlcnMpIH0KICAgICAsIG1fY29ubmVjdGlvbiB7IGNvbm5l
Y3Rpb24gfQpAQCAtMTA3LDE1ICsxMjYsMTYgQEAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3
b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmJiBwYXIKICAg
ICAgICAgfQogICAgIH0KIAotICAgIGlmIChzeW5jaHJvbm91c1JlcGx5KSB7CisgICAgaWYgKHNo
b3VsZFVzZU5ldHdvcmtMb2FkQ2hlY2tlcighIXN5bmNocm9ub3VzUmVwbHksIG1fcGFyYW1ldGVy
cykpIHsKICAgICAgICAgbV9uZXR3b3JrTG9hZENoZWNrZXIgPSBOZXR3b3JrTG9hZENoZWNrZXI6
OmNyZWF0ZShGZXRjaE9wdGlvbnMgeyBtX3BhcmFtZXRlcnMub3B0aW9ucyB9LCBtX3BhcmFtZXRl
cnMuc2Vzc2lvbklELCBIVFRQSGVhZGVyTWFwIHsgbV9wYXJhbWV0ZXJzLm9yaWdpbmFsUmVxdWVz
dEhlYWRlcnMgfSwgVVJMIHsgbV9wYXJhbWV0ZXJzLnJlcXVlc3QudXJsKCkgfSwgbV9wYXJhbWV0
ZXJzLnNvdXJjZU9yaWdpbi5jb3B5UmVmKCkpOwogICAgICAgICBpZiAobV9wYXJhbWV0ZXJzLmNz
cFJlc3BvbnNlSGVhZGVycykKICAgICAgICAgICAgIG1fbmV0d29ya0xvYWRDaGVja2VyLT5zZXRD
U1BSZXNwb25zZUhlYWRlcnMoQ29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzIHsg
bV9wYXJhbWV0ZXJzLmNzcFJlc3BvbnNlSGVhZGVycy52YWx1ZSgpIH0pOwogI2lmIEVOQUJMRShD
T05URU5UX0VYVEVOU0lPTlMpCiAgICAgICAgIG1fbmV0d29ya0xvYWRDaGVja2VyLT5zZXRDb250
ZW50RXh0ZW5zaW9uQ29udHJvbGxlcihVUkwgeyBtX3BhcmFtZXRlcnMubWFpbkRvY3VtZW50VVJM
IH0sIG1fcGFyYW1ldGVycy51c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyKTsKICNlbmRp
ZgotICAgICAgICBtX3N5bmNocm9ub3VzTG9hZERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPFN5bmNo
cm9ub3VzTG9hZERhdGE+KFdURk1vdmUoc3luY2hyb25vdXNSZXBseSkpOwogICAgIH0KKyAgICBp
ZiAoc3luY2hyb25vdXNSZXBseSkKKyAgICAgICAgbV9zeW5jaHJvbm91c0xvYWREYXRhID0gc3Rk
OjptYWtlX3VuaXF1ZTxTeW5jaHJvbm91c0xvYWREYXRhPihXVEZNb3ZlKHN5bmNocm9ub3VzUmVw
bHkpKTsKIH0KIAogTmV0d29ya1Jlc291cmNlTG9hZGVyOjp+TmV0d29ya1Jlc291cmNlTG9hZGVy
KCkKQEAgLTM0MywxNyArMzYzLDYgQEAgYXV0byBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJl
Y2VpdmVSZXNwb25zZShSZXNvdXJjZVJlc3BvbnNlJiYgcmVjZWl2ZWRSZXNwb24KIHsKICAgICBS
RUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IChwYWdlSUQgPSAlIiBQ
Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIs
IGh0dHBTdGF0dXNDb2RlID0gJWQsIGxlbmd0aCA9ICUiIFBSSWQ2NCAiKSIsIG1fcGFyYW1ldGVy
cy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRp
ZmllciwgcmVjZWl2ZWRSZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpLCByZWNlaXZlZFJlc3BvbnNl
LmV4cGVjdGVkQ29udGVudExlbmd0aCgpKTsKIAotICAgIGlmIChtX25ldHdvcmtMb2FkQ2hlY2tl
cikgewotICAgICAgICBhdXRvIGVycm9yID0gbV9uZXR3b3JrTG9hZENoZWNrZXItPnZhbGlkYXRl
UmVzcG9uc2UocmVjZWl2ZWRSZXNwb25zZSk7Ci0gICAgICAgIGlmICghZXJyb3IuaXNOdWxsKCkp
IHsKLSAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9
IG1ha2VSZWYoKnRoaXMpLCBlcnJvciA9IFdURk1vdmUoZXJyb3IpXSB7Ci0gICAgICAgICAgICAg
ICAgaWYgKHByb3RlY3RlZFRoaXMtPm1fbmV0d29ya0xvYWQpCi0gICAgICAgICAgICAgICAgICAg
IHByb3RlY3RlZFRoaXMtPmRpZEZhaWxMb2FkaW5nKGVycm9yKTsKLSAgICAgICAgICAgIH0pOwot
ICAgICAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlOjpObzsK
LSAgICAgICAgfQotICAgIH0KLQogICAgIG1fcmVzcG9uc2UgPSBXVEZNb3ZlKHJlY2VpdmVkUmVz
cG9uc2UpOwogCiAgICAgaWYgKHNob3VsZENhcHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljcygp
KQpAQCAtMzgwLDcgKzM4OSwxNyBAQCBhdXRvIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVj
ZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UmJiByZWNlaXZlZFJlc3BvbgogCiAgICAgYm9v
bCBzaG91bGRXYWl0Q29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UgPSBpc01haW5SZXNvdXJjZSgp
OwogICAgIGlmIChzaG91bGRTZW5kRGlkUmVjZWl2ZVJlc3BvbnNlKSB7Ci0gICAgICAgIC8vIEZJ
WE1FOiBTYW5pdGl6ZSByZXNwb25zZS4KKyAgICAgICAgaWYgKG1fbmV0d29ya0xvYWRDaGVja2Vy
KSB7CisgICAgICAgICAgICBhdXRvIGVycm9yID0gbV9uZXR3b3JrTG9hZENoZWNrZXItPnZhbGlk
YXRlUmVzcG9uc2UobV9yZXNwb25zZSk7CisgICAgICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgp
KSB7CisgICAgICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRU
aGlzID0gbWFrZVJlZigqdGhpcyksIGVycm9yID0gV1RGTW92ZShlcnJvcildIHsKKyAgICAgICAg
ICAgICAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPm1fbmV0d29ya0xvYWQpCisgICAgICAgICAg
ICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5kaWRGYWlsTG9hZGluZyhlcnJvcik7CisgICAg
ICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlRGlk
UmVjZWl2ZVJlc3BvbnNlOjpObzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAg
IGF1dG8gcmVzcG9uc2UgPSBzYW5pdGl6ZVJlc3BvbnNlSWZQb3NzaWJsZShSZXNvdXJjZVJlc3Bv
bnNlIHsgbV9yZXNwb25zZSB9LCBSZXNvdXJjZVJlc3BvbnNlOjpTYW5pdGl6YXRpb25UeXBlOjpD
cm9zc09yaWdpblNhZmUpOwogICAgICAgICBpZiAoaXNTeW5jaHJvbm91cygpKQogICAgICAgICAg
ICAgbV9zeW5jaHJvbm91c0xvYWREYXRhLT5yZXNwb25zZSA9IFdURk1vdmUocmVzcG9uc2UpOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNw
cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKaW5kZXgg
M2ExYmNjZjkwNzI1NjI0YzIzOGFiYTIxNzUyN2M0MmU3ZjNmMmFjNC4uY2RmMzVjYzY0ZjgzMzIz
NWFhNjcxZGJjM2EyMjgwZTU3ZTc0ZTE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFy
ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X
ZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCkBAIC0xMjcwLDExICsxMjcwLDE4IEBAIGJvb2wgQXJn
dW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgUmVz
b3VyY2VSZXF1ZXN0JiByCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29k
ZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVycm9yKQog
ewogICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVyLCByZXNvdXJjZUVycm9yKTsKKyAgICBl
bmNvZGVyLmVuY29kZUVudW0ocmVzb3VyY2VFcnJvci50eXBlKCkpOwogfQogCiBib29sIEFyZ3Vt
ZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJj
ZUVycm9yJiByZXNvdXJjZUVycm9yKQogewotICAgIHJldHVybiBkZWNvZGVQbGF0Zm9ybURhdGEo
ZGVjb2RlciwgcmVzb3VyY2VFcnJvcik7CisgICAgaWYgKCFkZWNvZGVQbGF0Zm9ybURhdGEoZGVj
b2RlciwgcmVzb3VyY2VFcnJvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBSZXNvdXJj
ZUVycm9yOjpUeXBlIHR5cGU7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0odHlwZSkpCisg
ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXNvdXJjZUVycm9yLnNldFR5cGUodHlwZSk7Cisg
ICAgcmV0dXJuIHRydWU7CiB9CiAKICNpZiBQTEFURk9STShJT1MpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>338474</attachid>
            <date>2018-04-20 15:55:02 -0700</date>
            <delta_ts>2018-04-20 16:18:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-184841-20180420155502.patch</filename>
            <type>text/plain</type>
            <size>11764</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhMmJhNDMxM2RhYmQwNGI0
NTJjNmIwOGZlNWUzOGJiZDI0ZDUyN2IuLjMwZGI1MzY3MGMxY2NkZDZhNWJmNzdiZWIxYzQxZmU5
OGNjYWI1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDQtMjAgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2Fk
Q2hlY2tlciBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTE4NDg0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEluc3RhbnRpYXRlIGEgTmV0d29ya0xvYWRDaGVja2VyIGZvciBOZXR3
b3JrUmVzb3VyY2VMb2FkZXIgZm9yIGF1ZGlvL3ZpZGVvIGxvYWRzLgorCisgICAgICAgIE1vdmUg
Q09SUyBjaGVja3MgZm9yIHJlc3BvbnNlIGFmdGVyIGhhbmRsaW5nIG9mIDMwNCBjaGVja3MuCisg
ICAgICAgIEZvciAzMDQgY2hlY2tzLCB3ZSBuZWVkIHRvIGRvIHRoZSBDT1JTIGNoZWNrcyBvbiB0
aGUgdmFsaWRhdGVkIGNhY2hlZCByZXNwb25zZSwgbm90IHRoZSAzMDQgcmVjZWl2ZWQgcmVzcG9u
c2UuCisKKyAgICAgICAgVXBkYXRlZCBSZXNvdXJjZUVycm9yIGFyZ3VtZW50IGNvZGVyIHRvIGV4
cGxpY2l0bHkgcGFzcyB0aGUgZXJyb3IgdHlwZQorICAgICAgICBhcyBzb21lIGVycm9ycyBjcmVh
dGVkIGJ5IE5ldHdvcmtMb2FkQ2hlY2tlciB3b3VsZCBvdGhlcndpc2UgYmUgcmVjZWl2ZWQgYXMg
R2VuZXJhbCBlcnJvcnMgYnkgV2ViUHJvY2Vzcy4KKyAgICAgICAgVXBkYXRlZCBwbGF0Zm9ybSBk
YXRhIGVuY29kaW5nIG9mIFJlc291cmNlRXJyb3IgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgQWxs
IGNoYW5nZXMgYXJlIGNvdmVyZWQgYnkgcmVndWxhciBtZWRpYSBsb2FkaW5nIGxheW91dCB0ZXN0
cy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6
CisgICAgICAgIChXZWJLaXQ6OnNob3VsZFVzZU5ldHdvcmtMb2FkQ2hlY2tlcik6CisgICAgICAg
IChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg
ICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6
QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJn
dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvbWFj
L1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2Rl
cjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJn
dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAg
V2UgbmVlZCB0byBzZXQgdGhlIHR5cGUgYWZ0ZXIgZGVjb2RpbmcgdGhlIE5TRXJyb3IgYXMgUmVz
b3VyY2VFcnJvciB0cmllcyB0byBndWVzcyB0aGUgdHlwZSBmcm9tIE5TRXJyb3IgZGF0YS4KKyAg
ICAgICAgKiBTaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcDoKKyAgICAg
ICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRh
KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlUGxh
dGZvcm1EYXRhKToKKwogMjAxOC0wNC0yMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j
b20+CiAKICAgICAgICAgUmVmYWN0b3IgTmV0d29ya1Jlc291cmNlTG9hZGVyIHRvIGNoZWNrIGZv
ciBtX25ldHdvcmtMb2FkQ2hlY2tlciBwcmVzZW5jZSBiZWZvcmUgdXNpbmcgaXQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw
cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw
cAppbmRleCAyYjZkYTIyNDU2OWJkODMzOGQxNDE4M2M5YmQwMjNlMWUyNTE5OWJlLi5iMzcwMDM2
NDFkMTQyYjZkMDI2N2Y2MDg0ZTFlODdmOGNjMTM3NTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC04Nyw2
ICs4NywyNSBAQCBzdGF0aWMgdm9pZCBzZW5kUmVwbHlUb1N5bmNocm9ub3VzUmVxdWVzdChOZXR3
b3JrUmVzb3VyY2VMb2FkZXI6OlN5bmNocm9ub3VzTG9hZAogICAgIGRhdGEuZGVsYXllZFJlcGx5
ID0gbnVsbHB0cjsKIH0KIAorc3RhdGljIGlubGluZSBib29sIHNob3VsZFVzZU5ldHdvcmtMb2Fk
Q2hlY2tlcihib29sIGlzU3luY2hyb25vdXMsIGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh
bWV0ZXJzJiBwYXJhbWV0ZXJzKQoreworICAgIGlmIChpc1N5bmNocm9ub3VzKQorICAgICAgICBy
ZXR1cm4gdHJ1ZTsKKworICAgIGlmICghcGFyYW1ldGVycy5zaG91bGRSZXN0cmljdEhUVFBSZXNw
b25zZUFjY2VzcykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gRklYTUU6IEFkZCBz
dXBwb3J0IGZvciBvdGhlciBkZXN0aW5hdGlvbnMuCisgICAgc3dpdGNoIChwYXJhbWV0ZXJzLm9w
dGlvbnMuZGVzdGluYXRpb24pIHsKKyAgICBjYXNlIEZldGNoT3B0aW9uczo6RGVzdGluYXRpb246
OkF1ZGlvOgorICAgIGNhc2UgRmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6VmlkZW86CisgICAg
ICAgIHJldHVybiB0cnVlOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KKyAg
ICByZXR1cm4gZmFsc2U7Cit9CisKIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291
cmNlTG9hZGVyKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycywgTmV0
d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNzYWdlczo6
TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRl
bGF5ZWRSZXBseT4mJiBzeW5jaHJvbm91c1JlcGx5KQogICAgIDogbV9wYXJhbWV0ZXJzIHsgV1RG
TW92ZShwYXJhbWV0ZXJzKSB9CiAgICAgLCBtX2Nvbm5lY3Rpb24geyBjb25uZWN0aW9uIH0KQEAg
LTEwNywxNSArMTI2LDE2IEBAIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNl
TG9hZGVyKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYgcGFyCiAgICAgICAgIH0KICAg
ICB9CiAKLSAgICBpZiAoc3luY2hyb25vdXNSZXBseSkgeworICAgIGlmIChzaG91bGRVc2VOZXR3
b3JrTG9hZENoZWNrZXIoISFzeW5jaHJvbm91c1JlcGx5LCBtX3BhcmFtZXRlcnMpKSB7CiAgICAg
ICAgIG1fbmV0d29ya0xvYWRDaGVja2VyID0gTmV0d29ya0xvYWRDaGVja2VyOjpjcmVhdGUoRmV0
Y2hPcHRpb25zIHsgbV9wYXJhbWV0ZXJzLm9wdGlvbnMgfSwgbV9wYXJhbWV0ZXJzLnNlc3Npb25J
RCwgSFRUUEhlYWRlck1hcCB7IG1fcGFyYW1ldGVycy5vcmlnaW5hbFJlcXVlc3RIZWFkZXJzIH0s
IFVSTCB7IG1fcGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpIH0sIG1fcGFyYW1ldGVycy5zb3VyY2VP
cmlnaW4uY29weVJlZigpKTsKICAgICAgICAgaWYgKG1fcGFyYW1ldGVycy5jc3BSZXNwb25zZUhl
YWRlcnMpCiAgICAgICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+c2V0Q1NQUmVzcG9uc2VI
ZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyB7IG1fcGFyYW1ldGVy
cy5jc3BSZXNwb25zZUhlYWRlcnMudmFsdWUoKSB9KTsKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRF
TlNJT05TKQogICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+c2V0Q29udGVudEV4dGVuc2lv
bkNvbnRyb2xsZXIoVVJMIHsgbV9wYXJhbWV0ZXJzLm1haW5Eb2N1bWVudFVSTCB9LCBtX3BhcmFt
ZXRlcnMudXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllcik7CiAjZW5kaWYKLSAgICAgICAg
bV9zeW5jaHJvbm91c0xvYWREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxTeW5jaHJvbm91c0xvYWRE
YXRhPihXVEZNb3ZlKHN5bmNocm9ub3VzUmVwbHkpKTsKICAgICB9CisgICAgaWYgKHN5bmNocm9u
b3VzUmVwbHkpCisgICAgICAgIG1fc3luY2hyb25vdXNMb2FkRGF0YSA9IHN0ZDo6bWFrZV91bmlx
dWU8U3luY2hyb25vdXNMb2FkRGF0YT4oV1RGTW92ZShzeW5jaHJvbm91c1JlcGx5KSk7CiB9CiAK
IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6fk5ldHdvcmtSZXNvdXJjZUxvYWRlcigpCkBAIC0zNDMs
MTcgKzM2Myw2IEBAIGF1dG8gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9u
c2UoUmVzb3VyY2VSZXNwb25zZSYmIHJlY2VpdmVkUmVzcG9uCiB7CiAgICAgUkVMRUFTRV9MT0df
SUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy
YW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBodHRwU3RhdHVz
Q29kZSA9ICVkLCBsZW5ndGggPSAlIiBQUklkNjQgIikiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlE
LCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHJlY2Vp
dmVkUmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSwgcmVjZWl2ZWRSZXNwb25zZS5leHBlY3RlZENv
bnRlbnRMZW5ndGgoKSk7CiAKLSAgICBpZiAobV9uZXR3b3JrTG9hZENoZWNrZXIpIHsKLSAgICAg
ICAgYXV0byBlcnJvciA9IG1fbmV0d29ya0xvYWRDaGVja2VyLT52YWxpZGF0ZVJlc3BvbnNlKHJl
Y2VpdmVkUmVzcG9uc2UpOwotICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAg
ICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0
aGlzKSwgZXJyb3IgPSBXVEZNb3ZlKGVycm9yKV0gewotICAgICAgICAgICAgICAgIGlmIChwcm90
ZWN0ZWRUaGlzLT5tX25ldHdvcmtMb2FkKQotICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRU
aGlzLT5kaWRGYWlsTG9hZGluZyhlcnJvcik7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgICAg
IHJldHVybiBTaG91bGRDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZTo6Tm87Ci0gICAgICAgIH0K
LSAgICB9Ci0KICAgICBtX3Jlc3BvbnNlID0gV1RGTW92ZShyZWNlaXZlZFJlc3BvbnNlKTsKIAog
ICAgIGlmIChzaG91bGRDYXB0dXJlRXh0cmFOZXR3b3JrTG9hZE1ldHJpY3MoKSkKQEAgLTM4MCw3
ICszODksMTcgQEAgYXV0byBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25z
ZShSZXNvdXJjZVJlc3BvbnNlJiYgcmVjZWl2ZWRSZXNwb24KIAogICAgIGJvb2wgc2hvdWxkV2Fp
dENvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlID0gaXNNYWluUmVzb3VyY2UoKTsKICAgICBpZiAo
c2hvdWxkU2VuZERpZFJlY2VpdmVSZXNwb25zZSkgewotICAgICAgICAvLyBGSVhNRTogU2FuaXRp
emUgcmVzcG9uc2UuCisgICAgICAgIGlmIChtX25ldHdvcmtMb2FkQ2hlY2tlcikgeworICAgICAg
ICAgICAgYXV0byBlcnJvciA9IG1fbmV0d29ya0xvYWRDaGVja2VyLT52YWxpZGF0ZVJlc3BvbnNl
KG1fcmVzcG9uc2UpOworICAgICAgICAgICAgaWYgKCFlcnJvci5pc051bGwoKSkgeworICAgICAg
ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IG1ha2VS
ZWYoKnRoaXMpLCBlcnJvciA9IFdURk1vdmUoZXJyb3IpXSB7CisgICAgICAgICAgICAgICAgICAg
IGlmIChwcm90ZWN0ZWRUaGlzLT5tX25ldHdvcmtMb2FkKQorICAgICAgICAgICAgICAgICAgICAg
ICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbExvYWRpbmcoZXJyb3IpOworICAgICAgICAgICAgICAg
IH0pOworICAgICAgICAgICAgICAgIHJldHVybiBTaG91bGRDb250aW51ZURpZFJlY2VpdmVSZXNw
b25zZTo6Tm87CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBhdXRvIHJlc3Bv
bnNlID0gc2FuaXRpemVSZXNwb25zZUlmUG9zc2libGUoUmVzb3VyY2VSZXNwb25zZSB7IG1fcmVz
cG9uc2UgfSwgUmVzb3VyY2VSZXNwb25zZTo6U2FuaXRpemF0aW9uVHlwZTo6Q3Jvc3NPcmlnaW5T
YWZlKTsKICAgICAgICAgaWYgKGlzU3luY2hyb25vdXMoKSkKICAgICAgICAgICAgIG1fc3luY2hy
b25vdXNMb2FkRGF0YS0+cmVzcG9uc2UgPSBXVEZNb3ZlKHJlc3BvbnNlKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDNhMWJjY2Y5MDcy
NTYyNGMyMzhhYmEyMTc1MjdjNDJlN2YzZjJhYzQuLmExYzJlNGJhY2E3MzI0ZDU5ZWYwM2NiMzg4
Y2Q1ODkzNDE4NWEyMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVB
cmd1bWVudENvZGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3Vt
ZW50Q29kZXJzLmNwcApAQCAtMTI2OSwxMiArMTI2OSwyOCBAQCBib29sIEFyZ3VtZW50Q29kZXI8
UmVzb3VyY2VSZXF1ZXN0Pjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFJlc291cmNlUmVxdWVz
dCYgcgogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZShFbmNvZGVy
JiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVycm9yKQogeworICAgIGVu
Y29kZXIuZW5jb2RlRW51bShyZXNvdXJjZUVycm9yLnR5cGUoKSk7CisgICAgaWYgKHJlc291cmNl
RXJyb3IuaXNOdWxsKCkpCisgICAgICAgIHJldHVybjsKICAgICBlbmNvZGVQbGF0Zm9ybURhdGEo
ZW5jb2RlciwgcmVzb3VyY2VFcnJvcik7CiB9CiAKIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJj
ZUVycm9yPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFJlc291cmNlRXJyb3ImIHJlc291cmNl
RXJyb3IpCiB7Ci0gICAgcmV0dXJuIGRlY29kZVBsYXRmb3JtRGF0YShkZWNvZGVyLCByZXNvdXJj
ZUVycm9yKTsKKyAgICBSZXNvdXJjZUVycm9yOjpUeXBlIHR5cGU7CisgICAgaWYgKCFkZWNvZGVy
LmRlY29kZUVudW0odHlwZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICh0eXBl
ID09IFJlc291cmNlRXJyb3I6OlR5cGU6Ok51bGwpIHsKKyAgICAgICAgcmVzb3VyY2VFcnJvciA9
IHsgfTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgaWYgKCFkZWNvZGVQbGF0
Zm9ybURhdGEoZGVjb2RlciwgcmVzb3VyY2VFcnJvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsK
KworICAgIHJlc291cmNlRXJyb3Iuc2V0VHlwZSh0eXBlKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0K
IAogI2lmIFBMQVRGT1JNKElPUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21h
Yy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMv
V2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCmluZGV4IDdlNDZhZDZjMTA4YjVhZDgyY2Q1ODQ5
NjgzMDQ5N2IwYTExZjRmYTguLmEwYTQwMGYwODA4ZGM1ZGFmMTJlZDAzZTUwN2RkMjBhZGQzZjZk
OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRD
b2RlcnNNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVu
dENvZGVyc01hYy5tbQpAQCAtMzg2LDE0ICszODYsNyBAQCBzdGF0aWMgdm9pZCBlbmNvZGVOU0Vy
cm9yKEVuY29kZXImIGVuY29kZXIsIE5TRXJyb3IgKm5zRXJyb3IpCiAKIHZvaWQgQXJndW1lbnRD
b2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVuY29kZXIs
IGNvbnN0IFJlc291cmNlRXJyb3ImIHJlc291cmNlRXJyb3IpCiB7Ci0gICAgYm9vbCBlcnJvcklz
TnVsbCA9IHJlc291cmNlRXJyb3IuaXNOdWxsKCk7Ci0gICAgZW5jb2RlciA8PCBlcnJvcklzTnVs
bDsKLQotICAgIGlmIChlcnJvcklzTnVsbCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTlNFcnJv
ciAqbnNFcnJvciA9IHJlc291cmNlRXJyb3IubnNFcnJvcigpOwotICAgIGVuY29kZU5TRXJyb3Io
ZW5jb2RlciwgbnNFcnJvcik7CisgICAgZW5jb2RlTlNFcnJvcihlbmNvZGVyLCByZXNvdXJjZUVy
cm9yLm5zRXJyb3IoKSk7CiB9CiAKIHN0YXRpYyBib29sIGRlY29kZU5TRXJyb3IoRGVjb2RlciYg
ZGVjb2RlciwgUmV0YWluUHRyPE5TRXJyb3I+JiBuc0Vycm9yKQpAQCAtNDMwLDE1ICs0MjMsNiBA
QCBzdGF0aWMgYm9vbCBkZWNvZGVOU0Vycm9yKERlY29kZXImIGRlY29kZXIsIFJldGFpblB0cjxO
U0Vycm9yPiYgbnNFcnJvcikKIAogYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+Ojpk
ZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VFcnJvciYgcmVzb3Vy
Y2VFcnJvcikKIHsKLSAgICBib29sIGVycm9ySXNOdWxsOwotICAgIGlmICghZGVjb2Rlci5kZWNv
ZGUoZXJyb3JJc051bGwpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgaWYgKGVy
cm9ySXNOdWxsKSB7Ci0gICAgICAgIHJlc291cmNlRXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7Ci0g
ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICAKICAgICBSZXRhaW5QdHI8TlNFcnJvcj4g
bnNFcnJvcjsKICAgICBpZiAoIWRlY29kZU5TRXJyb3IoZGVjb2RlciwgbnNFcnJvcikpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAv
V2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9zb3Vw
L1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCmluZGV4IDZlMWVmMDI1NGFkYWQwNDdlNGQ4
ZTU2OTQ1OTI1ZGQwOWMwMmFkZjUuLjEwMDUyMzZkYWY2YjQ2ZGFjODQ4YjA5OWFkM2QyNjViNzA1
NWU5ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3Vt
ZW50Q29kZXJzU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9XZWJDb3Jl
QXJndW1lbnRDb2RlcnNTb3VwLmNwcApAQCAtMTAxLDEwICsxMDEsNiBAQCBib29sIEFyZ3VtZW50
Q29kZXI8Q2VydGlmaWNhdGVJbmZvPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIENlcnRpZmlj
YXRlSW5mbyYgYwogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBs
YXRmb3JtRGF0YShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJj
ZUVycm9yKQogewotICAgIGVuY29kZXIuZW5jb2RlRW51bShyZXNvdXJjZUVycm9yLnR5cGUoKSk7
Ci0gICAgaWYgKHJlc291cmNlRXJyb3IuaXNOdWxsKCkpCi0gICAgICAgIHJldHVybjsKLQogICAg
IGVuY29kZXIgPDwgcmVzb3VyY2VFcnJvci5kb21haW4oKTsKICAgICBlbmNvZGVyIDw8IHJlc291
cmNlRXJyb3IuZXJyb3JDb2RlKCk7CiAgICAgZW5jb2RlciA8PCByZXNvdXJjZUVycm9yLmZhaWxp
bmdVUkwoKS5zdHJpbmcoKTsKQEAgLTExNSwxNCArMTExLDYgQEAgdm9pZCBBcmd1bWVudENvZGVy
PFJlc291cmNlRXJyb3I+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29u
c3QgUmUKIAogYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjpkZWNvZGVQbGF0Zm9y
bURhdGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvcikKIHsK
LSAgICBSZXNvdXJjZUVycm9yQmFzZTo6VHlwZSBlcnJvclR5cGU7Ci0gICAgaWYgKCFkZWNvZGVy
LmRlY29kZUVudW0oZXJyb3JUeXBlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChl
cnJvclR5cGUgPT0gUmVzb3VyY2VFcnJvckJhc2U6OlR5cGU6Ok51bGwpIHsKLSAgICAgICAgcmVz
b3VyY2VFcnJvciA9IHsgfTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCiAgICAgU3Ry
aW5nIGRvbWFpbjsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRvbWFpbikpCiAgICAgICAgIHJl
dHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwppbmRleCA1Nzg0OGJmNTllNWUyNjcwZDA1YjZhZWQ3Mzc1OTEzNjQ3NDI1
ZDE4Li41Y2U0ZWRkM2Y3Njc0NmYzZTg5NjZhZTQzMWQ5ODE2Njc5OWZkZGZjIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTIgQEAKKzIwMTgtMDQtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t
PgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2FkQ2hlY2tlciBmb3IgbWVkaWEgbG9hZHMK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDg0MQor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczogQWRkZWQgRHVtcEpTQ29uc29sZUxvZ0luU3RkRXJyIHRvIHJlbW92ZSBjb25z
b2xlIG1lc3NhZ2UgZGlmZmVyZW5jZXMgYmV0d2VlbiBXSzEvV0syLgorCiAyMDE4LTA0LTIwICBZ
b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBOZXR3
b3JrUmVzb3VyY2VMb2FkZXIgdG8gY2hlY2sgZm9yIG1fbmV0d29ya0xvYWRDaGVja2VyIHByZXNl
bmNlIGJlZm9yZSB1c2luZyBpdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMDFlZTIxNGQ4NDdiYTli
ZTRhYjAyZmQzNGRhZDcyZDAwM2NjZDRkMC4uNjA5MzliYjIxMjM3ZTA0ODI0NTE2ZTBkNzJkNTBi
NTQ5NzY0Zjk0MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0yNTMsNiArMjUzLDcgQEAgaHR0cC90
ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvcGF5bWVudC1yZXF1ZXN0IFsgU2tpcCBdCiAKIGh0dHAvdGVzdHMveG1s
aHR0cHJlcXVlc3QvcmVkaXJlY3QtY3Jvc3Mtb3JpZ2luLXN5bmMtZG91YmxlLmh0bWwgWyBEdW1w
SlNDb25zb2xlTG9nSW5TdGRFcnIgXQoraW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9Y
TUxIdHRwUmVxdWVzdC9zZW5kLXJlZGlyZWN0LWJvZ3VzLXN5bmMuaHRtIFsgRHVtcEpTQ29uc29s
ZUxvZ0luU3RkRXJyIF0KIAogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRw
UmVxdWVzdC94bWxodHRwcmVxdWVzdC1zeW5jLWRlZmF1bHQtZmVhdHVyZS1wb2xpY3kuc3ViLmh0
bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8xNzk2MDcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9YTUxIdHRwUmVxdWVzdC9hY2Nlc3MtY29udHJvbC1hbmQtcmVkaXJlY3RzLWFzeW5j
Lmh0bSBbIFBhc3MgRmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>338484</attachid>
            <date>2018-04-20 16:18:01 -0700</date>
            <delta_ts>2018-04-21 12:51:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-184841-20180420161800.patch</filename>
            <type>text/plain</type>
            <size>12113</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhMmJhNDMxM2RhYmQwNGI0
NTJjNmIwOGZlNWUzOGJiZDI0ZDUyN2IuLjMwZGI1MzY3MGMxY2NkZDZhNWJmNzdiZWIxYzQxZmU5
OGNjYWI1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDQtMjAgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2Fk
Q2hlY2tlciBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTE4NDg0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEluc3RhbnRpYXRlIGEgTmV0d29ya0xvYWRDaGVja2VyIGZvciBOZXR3
b3JrUmVzb3VyY2VMb2FkZXIgZm9yIGF1ZGlvL3ZpZGVvIGxvYWRzLgorCisgICAgICAgIE1vdmUg
Q09SUyBjaGVja3MgZm9yIHJlc3BvbnNlIGFmdGVyIGhhbmRsaW5nIG9mIDMwNCBjaGVja3MuCisg
ICAgICAgIEZvciAzMDQgY2hlY2tzLCB3ZSBuZWVkIHRvIGRvIHRoZSBDT1JTIGNoZWNrcyBvbiB0
aGUgdmFsaWRhdGVkIGNhY2hlZCByZXNwb25zZSwgbm90IHRoZSAzMDQgcmVjZWl2ZWQgcmVzcG9u
c2UuCisKKyAgICAgICAgVXBkYXRlZCBSZXNvdXJjZUVycm9yIGFyZ3VtZW50IGNvZGVyIHRvIGV4
cGxpY2l0bHkgcGFzcyB0aGUgZXJyb3IgdHlwZQorICAgICAgICBhcyBzb21lIGVycm9ycyBjcmVh
dGVkIGJ5IE5ldHdvcmtMb2FkQ2hlY2tlciB3b3VsZCBvdGhlcndpc2UgYmUgcmVjZWl2ZWQgYXMg
R2VuZXJhbCBlcnJvcnMgYnkgV2ViUHJvY2Vzcy4KKyAgICAgICAgVXBkYXRlZCBwbGF0Zm9ybSBk
YXRhIGVuY29kaW5nIG9mIFJlc291cmNlRXJyb3IgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgQWxs
IGNoYW5nZXMgYXJlIGNvdmVyZWQgYnkgcmVndWxhciBtZWRpYSBsb2FkaW5nIGxheW91dCB0ZXN0
cy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6
CisgICAgICAgIChXZWJLaXQ6OnNob3VsZFVzZU5ldHdvcmtMb2FkQ2hlY2tlcik6CisgICAgICAg
IChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg
ICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6
QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJn
dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvbWFj
L1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2Rl
cjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJn
dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAg
V2UgbmVlZCB0byBzZXQgdGhlIHR5cGUgYWZ0ZXIgZGVjb2RpbmcgdGhlIE5TRXJyb3IgYXMgUmVz
b3VyY2VFcnJvciB0cmllcyB0byBndWVzcyB0aGUgdHlwZSBmcm9tIE5TRXJyb3IgZGF0YS4KKyAg
ICAgICAgKiBTaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcDoKKyAgICAg
ICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRh
KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlUGxh
dGZvcm1EYXRhKToKKwogMjAxOC0wNC0yMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j
b20+CiAKICAgICAgICAgUmVmYWN0b3IgTmV0d29ya1Jlc291cmNlTG9hZGVyIHRvIGNoZWNrIGZv
ciBtX25ldHdvcmtMb2FkQ2hlY2tlciBwcmVzZW5jZSBiZWZvcmUgdXNpbmcgaXQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw
cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw
cAppbmRleCAyYjZkYTIyNDU2OWJkODMzOGQxNDE4M2M5YmQwMjNlMWUyNTE5OWJlLi5iMzcwMDM2
NDFkMTQyYjZkMDI2N2Y2MDg0ZTFlODdmOGNjMTM3NTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC04Nyw2
ICs4NywyNSBAQCBzdGF0aWMgdm9pZCBzZW5kUmVwbHlUb1N5bmNocm9ub3VzUmVxdWVzdChOZXR3
b3JrUmVzb3VyY2VMb2FkZXI6OlN5bmNocm9ub3VzTG9hZAogICAgIGRhdGEuZGVsYXllZFJlcGx5
ID0gbnVsbHB0cjsKIH0KIAorc3RhdGljIGlubGluZSBib29sIHNob3VsZFVzZU5ldHdvcmtMb2Fk
Q2hlY2tlcihib29sIGlzU3luY2hyb25vdXMsIGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh
bWV0ZXJzJiBwYXJhbWV0ZXJzKQoreworICAgIGlmIChpc1N5bmNocm9ub3VzKQorICAgICAgICBy
ZXR1cm4gdHJ1ZTsKKworICAgIGlmICghcGFyYW1ldGVycy5zaG91bGRSZXN0cmljdEhUVFBSZXNw
b25zZUFjY2VzcykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gRklYTUU6IEFkZCBz
dXBwb3J0IGZvciBvdGhlciBkZXN0aW5hdGlvbnMuCisgICAgc3dpdGNoIChwYXJhbWV0ZXJzLm9w
dGlvbnMuZGVzdGluYXRpb24pIHsKKyAgICBjYXNlIEZldGNoT3B0aW9uczo6RGVzdGluYXRpb246
OkF1ZGlvOgorICAgIGNhc2UgRmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6VmlkZW86CisgICAg
ICAgIHJldHVybiB0cnVlOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KKyAg
ICByZXR1cm4gZmFsc2U7Cit9CisKIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291
cmNlTG9hZGVyKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycywgTmV0
d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNzYWdlczo6
TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRl
bGF5ZWRSZXBseT4mJiBzeW5jaHJvbm91c1JlcGx5KQogICAgIDogbV9wYXJhbWV0ZXJzIHsgV1RG
TW92ZShwYXJhbWV0ZXJzKSB9CiAgICAgLCBtX2Nvbm5lY3Rpb24geyBjb25uZWN0aW9uIH0KQEAg
LTEwNywxNSArMTI2LDE2IEBAIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNl
TG9hZGVyKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYgcGFyCiAgICAgICAgIH0KICAg
ICB9CiAKLSAgICBpZiAoc3luY2hyb25vdXNSZXBseSkgeworICAgIGlmIChzaG91bGRVc2VOZXR3
b3JrTG9hZENoZWNrZXIoISFzeW5jaHJvbm91c1JlcGx5LCBtX3BhcmFtZXRlcnMpKSB7CiAgICAg
ICAgIG1fbmV0d29ya0xvYWRDaGVja2VyID0gTmV0d29ya0xvYWRDaGVja2VyOjpjcmVhdGUoRmV0
Y2hPcHRpb25zIHsgbV9wYXJhbWV0ZXJzLm9wdGlvbnMgfSwgbV9wYXJhbWV0ZXJzLnNlc3Npb25J
RCwgSFRUUEhlYWRlck1hcCB7IG1fcGFyYW1ldGVycy5vcmlnaW5hbFJlcXVlc3RIZWFkZXJzIH0s
IFVSTCB7IG1fcGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpIH0sIG1fcGFyYW1ldGVycy5zb3VyY2VP
cmlnaW4uY29weVJlZigpKTsKICAgICAgICAgaWYgKG1fcGFyYW1ldGVycy5jc3BSZXNwb25zZUhl
YWRlcnMpCiAgICAgICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+c2V0Q1NQUmVzcG9uc2VI
ZWFkZXJzKENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyB7IG1fcGFyYW1ldGVy
cy5jc3BSZXNwb25zZUhlYWRlcnMudmFsdWUoKSB9KTsKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRF
TlNJT05TKQogICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+c2V0Q29udGVudEV4dGVuc2lv
bkNvbnRyb2xsZXIoVVJMIHsgbV9wYXJhbWV0ZXJzLm1haW5Eb2N1bWVudFVSTCB9LCBtX3BhcmFt
ZXRlcnMudXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllcik7CiAjZW5kaWYKLSAgICAgICAg
bV9zeW5jaHJvbm91c0xvYWREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxTeW5jaHJvbm91c0xvYWRE
YXRhPihXVEZNb3ZlKHN5bmNocm9ub3VzUmVwbHkpKTsKICAgICB9CisgICAgaWYgKHN5bmNocm9u
b3VzUmVwbHkpCisgICAgICAgIG1fc3luY2hyb25vdXNMb2FkRGF0YSA9IHN0ZDo6bWFrZV91bmlx
dWU8U3luY2hyb25vdXNMb2FkRGF0YT4oV1RGTW92ZShzeW5jaHJvbm91c1JlcGx5KSk7CiB9CiAK
IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6fk5ldHdvcmtSZXNvdXJjZUxvYWRlcigpCkBAIC0zNDMs
MTcgKzM2Myw2IEBAIGF1dG8gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9u
c2UoUmVzb3VyY2VSZXNwb25zZSYmIHJlY2VpdmVkUmVzcG9uCiB7CiAgICAgUkVMRUFTRV9MT0df
SUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy
YW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBodHRwU3RhdHVz
Q29kZSA9ICVkLCBsZW5ndGggPSAlIiBQUklkNjQgIikiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlE
LCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHJlY2Vp
dmVkUmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSwgcmVjZWl2ZWRSZXNwb25zZS5leHBlY3RlZENv
bnRlbnRMZW5ndGgoKSk7CiAKLSAgICBpZiAobV9uZXR3b3JrTG9hZENoZWNrZXIpIHsKLSAgICAg
ICAgYXV0byBlcnJvciA9IG1fbmV0d29ya0xvYWRDaGVja2VyLT52YWxpZGF0ZVJlc3BvbnNlKHJl
Y2VpdmVkUmVzcG9uc2UpOwotICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAg
ICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0
aGlzKSwgZXJyb3IgPSBXVEZNb3ZlKGVycm9yKV0gewotICAgICAgICAgICAgICAgIGlmIChwcm90
ZWN0ZWRUaGlzLT5tX25ldHdvcmtMb2FkKQotICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRU
aGlzLT5kaWRGYWlsTG9hZGluZyhlcnJvcik7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgICAg
IHJldHVybiBTaG91bGRDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZTo6Tm87Ci0gICAgICAgIH0K
LSAgICB9Ci0KICAgICBtX3Jlc3BvbnNlID0gV1RGTW92ZShyZWNlaXZlZFJlc3BvbnNlKTsKIAog
ICAgIGlmIChzaG91bGRDYXB0dXJlRXh0cmFOZXR3b3JrTG9hZE1ldHJpY3MoKSkKQEAgLTM4MCw3
ICszODksMTcgQEAgYXV0byBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25z
ZShSZXNvdXJjZVJlc3BvbnNlJiYgcmVjZWl2ZWRSZXNwb24KIAogICAgIGJvb2wgc2hvdWxkV2Fp
dENvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlID0gaXNNYWluUmVzb3VyY2UoKTsKICAgICBpZiAo
c2hvdWxkU2VuZERpZFJlY2VpdmVSZXNwb25zZSkgewotICAgICAgICAvLyBGSVhNRTogU2FuaXRp
emUgcmVzcG9uc2UuCisgICAgICAgIGlmIChtX25ldHdvcmtMb2FkQ2hlY2tlcikgeworICAgICAg
ICAgICAgYXV0byBlcnJvciA9IG1fbmV0d29ya0xvYWRDaGVja2VyLT52YWxpZGF0ZVJlc3BvbnNl
KG1fcmVzcG9uc2UpOworICAgICAgICAgICAgaWYgKCFlcnJvci5pc051bGwoKSkgeworICAgICAg
ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IG1ha2VS
ZWYoKnRoaXMpLCBlcnJvciA9IFdURk1vdmUoZXJyb3IpXSB7CisgICAgICAgICAgICAgICAgICAg
IGlmIChwcm90ZWN0ZWRUaGlzLT5tX25ldHdvcmtMb2FkKQorICAgICAgICAgICAgICAgICAgICAg
ICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbExvYWRpbmcoZXJyb3IpOworICAgICAgICAgICAgICAg
IH0pOworICAgICAgICAgICAgICAgIHJldHVybiBTaG91bGRDb250aW51ZURpZFJlY2VpdmVSZXNw
b25zZTo6Tm87CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBhdXRvIHJlc3Bv
bnNlID0gc2FuaXRpemVSZXNwb25zZUlmUG9zc2libGUoUmVzb3VyY2VSZXNwb25zZSB7IG1fcmVz
cG9uc2UgfSwgUmVzb3VyY2VSZXNwb25zZTo6U2FuaXRpemF0aW9uVHlwZTo6Q3Jvc3NPcmlnaW5T
YWZlKTsKICAgICAgICAgaWYgKGlzU3luY2hyb25vdXMoKSkKICAgICAgICAgICAgIG1fc3luY2hy
b25vdXNMb2FkRGF0YS0+cmVzcG9uc2UgPSBXVEZNb3ZlKHJlc3BvbnNlKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDNhMWJjY2Y5MDcy
NTYyNGMyMzhhYmEyMTc1MjdjNDJlN2YzZjJhYzQuLmExYzJlNGJhY2E3MzI0ZDU5ZWYwM2NiMzg4
Y2Q1ODkzNDE4NWEyMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVB
cmd1bWVudENvZGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3Vt
ZW50Q29kZXJzLmNwcApAQCAtMTI2OSwxMiArMTI2OSwyOCBAQCBib29sIEFyZ3VtZW50Q29kZXI8
UmVzb3VyY2VSZXF1ZXN0Pjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFJlc291cmNlUmVxdWVz
dCYgcgogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZShFbmNvZGVy
JiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVycm9yKQogeworICAgIGVu
Y29kZXIuZW5jb2RlRW51bShyZXNvdXJjZUVycm9yLnR5cGUoKSk7CisgICAgaWYgKHJlc291cmNl
RXJyb3IuaXNOdWxsKCkpCisgICAgICAgIHJldHVybjsKICAgICBlbmNvZGVQbGF0Zm9ybURhdGEo
ZW5jb2RlciwgcmVzb3VyY2VFcnJvcik7CiB9CiAKIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJj
ZUVycm9yPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFJlc291cmNlRXJyb3ImIHJlc291cmNl
RXJyb3IpCiB7Ci0gICAgcmV0dXJuIGRlY29kZVBsYXRmb3JtRGF0YShkZWNvZGVyLCByZXNvdXJj
ZUVycm9yKTsKKyAgICBSZXNvdXJjZUVycm9yOjpUeXBlIHR5cGU7CisgICAgaWYgKCFkZWNvZGVy
LmRlY29kZUVudW0odHlwZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICh0eXBl
ID09IFJlc291cmNlRXJyb3I6OlR5cGU6Ok51bGwpIHsKKyAgICAgICAgcmVzb3VyY2VFcnJvciA9
IHsgfTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgaWYgKCFkZWNvZGVQbGF0
Zm9ybURhdGEoZGVjb2RlciwgcmVzb3VyY2VFcnJvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsK
KworICAgIHJlc291cmNlRXJyb3Iuc2V0VHlwZSh0eXBlKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0K
IAogI2lmIFBMQVRGT1JNKElPUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21h
Yy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMv
V2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCmluZGV4IDdlNDZhZDZjMTA4YjVhZDgyY2Q1ODQ5
NjgzMDQ5N2IwYTExZjRmYTguLmEwYTQwMGYwODA4ZGM1ZGFmMTJlZDAzZTUwN2RkMjBhZGQzZjZk
OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRD
b2RlcnNNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVu
dENvZGVyc01hYy5tbQpAQCAtMzg2LDE0ICszODYsNyBAQCBzdGF0aWMgdm9pZCBlbmNvZGVOU0Vy
cm9yKEVuY29kZXImIGVuY29kZXIsIE5TRXJyb3IgKm5zRXJyb3IpCiAKIHZvaWQgQXJndW1lbnRD
b2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVuY29kZXIs
IGNvbnN0IFJlc291cmNlRXJyb3ImIHJlc291cmNlRXJyb3IpCiB7Ci0gICAgYm9vbCBlcnJvcklz
TnVsbCA9IHJlc291cmNlRXJyb3IuaXNOdWxsKCk7Ci0gICAgZW5jb2RlciA8PCBlcnJvcklzTnVs
bDsKLQotICAgIGlmIChlcnJvcklzTnVsbCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTlNFcnJv
ciAqbnNFcnJvciA9IHJlc291cmNlRXJyb3IubnNFcnJvcigpOwotICAgIGVuY29kZU5TRXJyb3Io
ZW5jb2RlciwgbnNFcnJvcik7CisgICAgZW5jb2RlTlNFcnJvcihlbmNvZGVyLCByZXNvdXJjZUVy
cm9yLm5zRXJyb3IoKSk7CiB9CiAKIHN0YXRpYyBib29sIGRlY29kZU5TRXJyb3IoRGVjb2RlciYg
ZGVjb2RlciwgUmV0YWluUHRyPE5TRXJyb3I+JiBuc0Vycm9yKQpAQCAtNDMwLDE1ICs0MjMsNiBA
QCBzdGF0aWMgYm9vbCBkZWNvZGVOU0Vycm9yKERlY29kZXImIGRlY29kZXIsIFJldGFpblB0cjxO
U0Vycm9yPiYgbnNFcnJvcikKIAogYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+Ojpk
ZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VFcnJvciYgcmVzb3Vy
Y2VFcnJvcikKIHsKLSAgICBib29sIGVycm9ySXNOdWxsOwotICAgIGlmICghZGVjb2Rlci5kZWNv
ZGUoZXJyb3JJc051bGwpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgaWYgKGVy
cm9ySXNOdWxsKSB7Ci0gICAgICAgIHJlc291cmNlRXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7Ci0g
ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICAKICAgICBSZXRhaW5QdHI8TlNFcnJvcj4g
bnNFcnJvcjsKICAgICBpZiAoIWRlY29kZU5TRXJyb3IoZGVjb2RlciwgbnNFcnJvcikpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAv
V2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9zb3Vw
L1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCmluZGV4IDZlMWVmMDI1NGFkYWQwNDdlNGQ4
ZTU2OTQ1OTI1ZGQwOWMwMmFkZjUuLmJkOWJhMDlmY2IwZWJiYTQ1Njc4ZjBjOTM4MDNjY2UwNTJk
NGVmZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3Vt
ZW50Q29kZXJzU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9XZWJDb3Jl
QXJndW1lbnRDb2RlcnNTb3VwLmNwcApAQCAtMTAxLDEwICsxMDEsNiBAQCBib29sIEFyZ3VtZW50
Q29kZXI8Q2VydGlmaWNhdGVJbmZvPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIENlcnRpZmlj
YXRlSW5mbyYgYwogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBs
YXRmb3JtRGF0YShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJj
ZUVycm9yKQogewotICAgIGVuY29kZXIuZW5jb2RlRW51bShyZXNvdXJjZUVycm9yLnR5cGUoKSk7
Ci0gICAgaWYgKHJlc291cmNlRXJyb3IuaXNOdWxsKCkpCi0gICAgICAgIHJldHVybjsKLQogICAg
IGVuY29kZXIgPDwgcmVzb3VyY2VFcnJvci5kb21haW4oKTsKICAgICBlbmNvZGVyIDw8IHJlc291
cmNlRXJyb3IuZXJyb3JDb2RlKCk7CiAgICAgZW5jb2RlciA8PCByZXNvdXJjZUVycm9yLmZhaWxp
bmdVUkwoKS5zdHJpbmcoKTsKQEAgLTExNSwxNCArMTExLDYgQEAgdm9pZCBBcmd1bWVudENvZGVy
PFJlc291cmNlRXJyb3I+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29u
c3QgUmUKIAogYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjpkZWNvZGVQbGF0Zm9y
bURhdGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvcikKIHsK
LSAgICBSZXNvdXJjZUVycm9yQmFzZTo6VHlwZSBlcnJvclR5cGU7Ci0gICAgaWYgKCFkZWNvZGVy
LmRlY29kZUVudW0oZXJyb3JUeXBlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChl
cnJvclR5cGUgPT0gUmVzb3VyY2VFcnJvckJhc2U6OlR5cGU6Ok51bGwpIHsKLSAgICAgICAgcmVz
b3VyY2VFcnJvciA9IHsgfTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCiAgICAgU3Ry
aW5nIGRvbWFpbjsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRvbWFpbikpCiAgICAgICAgIHJl
dHVybiBmYWxzZTsKQEAgLTE0MCw3ICsxMjgsNiBAQCBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3Vy
Y2VFcnJvcj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZQog
ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXNvdXJjZUVycm9yID0gUmVzb3VyY2VFcnJv
cihkb21haW4sIGVycm9yQ29kZSwgVVJMKFVSTCgpLCBmYWlsaW5nVVJMKSwgbG9jYWxpemVkRGVz
Y3JpcHRpb24pOwotICAgIHJlc291cmNlRXJyb3Iuc2V0VHlwZShlcnJvclR5cGUpOwogCiAgICAg
Q2VydGlmaWNhdGVJbmZvIGNlcnRpZmljYXRlSW5mbzsKICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl
KGNlcnRpZmljYXRlSW5mbykpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTc4NDhiZjU5ZTVlMjY3MGQwNWI2YWVkNzM3NTkx
MzY0NzQyNWQxOC4uNWNlNGVkZDNmNzY3NDZmM2U4OTY2YWU0MzFkOTgxNjY3OTlmZGRmYyAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDEyIEBACisyMDE4LTA0LTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw
cGxlLmNvbT4KKworICAgICAgICBBY3RpdmF0ZSBOZXR3b3JrTG9hZENoZWNrZXIgZm9yIG1lZGlh
IGxvYWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x
ODQ4NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IFRlc3RFeHBlY3RhdGlvbnM6IEFkZGVkIER1bXBKU0NvbnNvbGVMb2dJblN0ZEVyciB0byByZW1v
dmUgY29uc29sZSBtZXNzYWdlIGRpZmZlcmVuY2VzIGJldHdlZW4gV0sxL1dLMi4KKwogMjAxOC0w
NC0yMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0
b3IgTmV0d29ya1Jlc291cmNlTG9hZGVyIHRvIGNoZWNrIGZvciBtX25ldHdvcmtMb2FkQ2hlY2tl
ciBwcmVzZW5jZSBiZWZvcmUgdXNpbmcgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDAxZWUyMTRk
ODQ3YmE5YmU0YWIwMmZkMzRkYWQ3MmQwMDNjY2Q0ZDAuLjYwOTM5YmIyMTIzN2UwNDgyNDUxNmUw
ZDcyZDUwYjU0OTc2NGY5NDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMjUzLDYgKzI1Myw3IEBA
IGh0dHAvdGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0IFsgU2tpcCBdCiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3BheW1lbnQtcmVxdWVzdCBbIFNraXAgXQogCiBodHRwL3Rl
c3RzL3htbGh0dHByZXF1ZXN0L3JlZGlyZWN0LWNyb3NzLW9yaWdpbi1zeW5jLWRvdWJsZS5odG1s
IFsgRHVtcEpTQ29uc29sZUxvZ0luU3RkRXJyIF0KK2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvWE1MSHR0cFJlcXVlc3Qvc2VuZC1yZWRpcmVjdC1ib2d1cy1zeW5jLmh0bSBbIER1bXBK
U0NvbnNvbGVMb2dJblN0ZEVyciBdCiAKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
WE1MSHR0cFJlcXVlc3QveG1saHR0cHJlcXVlc3Qtc3luYy1kZWZhdWx0LWZlYXR1cmUtcG9saWN5
LnN1Yi5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMTc5NjA3IGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvWE1MSHR0cFJlcXVlc3QvYWNjZXNzLWNvbnRyb2wtYW5kLXJlZGlyZWN0
cy1hc3luYy5odG0gWyBQYXNzIEZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>338531</attachid>
            <date>2018-04-21 12:51:08 -0700</date>
            <delta_ts>2018-04-21 13:46:50 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-184841-20180421125100.patch</filename>
            <type>text/plain</type>
            <size>12073</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE0OGY3ZWNjMDY2MmQ2MjVk
YmIxMzk3YmRkODNmZjgxMjJjNzIyMjkuLjlhMjE4YWEyYmFkYzBiYzc5NDI3MWNkOGViMTJjM2Q4
ZWYwNTkyYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDQtMjEgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2Fk
Q2hlY2tlciBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTE4NDg0MQorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNv
bi4KKworICAgICAgICBJbnN0YW50aWF0ZSBhIE5ldHdvcmtMb2FkQ2hlY2tlciBmb3IgTmV0d29y
a1Jlc291cmNlTG9hZGVyIGZvciBhdWRpby92aWRlbyBsb2Fkcy4KKworICAgICAgICBNb3ZlIENP
UlMgY2hlY2tzIGZvciByZXNwb25zZSBhZnRlciBoYW5kbGluZyBvZiAzMDQgY2hlY2tzLgorICAg
ICAgICBGb3IgMzA0IGNoZWNrcywgd2UgbmVlZCB0byBkbyB0aGUgQ09SUyBjaGVja3Mgb24gdGhl
IHZhbGlkYXRlZCBjYWNoZWQgcmVzcG9uc2UsIG5vdCB0aGUgMzA0IHJlY2VpdmVkIHJlc3BvbnNl
LgorCisgICAgICAgIFVwZGF0ZWQgUmVzb3VyY2VFcnJvciBhcmd1bWVudCBjb2RlciB0byBleHBs
aWNpdGx5IHBhc3MgdGhlIGVycm9yIHR5cGUKKyAgICAgICAgYXMgc29tZSBlcnJvcnMgY3JlYXRl
ZCBieSBOZXR3b3JrTG9hZENoZWNrZXIgd291bGQgb3RoZXJ3aXNlIGJlIHJlY2VpdmVkIGFzIEdl
bmVyYWwgZXJyb3JzIGJ5IFdlYlByb2Nlc3MuCisgICAgICAgIFVwZGF0ZWQgcGxhdGZvcm0gZGF0
YSBlbmNvZGluZyBvZiBSZXNvdXJjZUVycm9yIGFjY29yZGluZ2x5LgorCisgICAgICAgIEFsbCBj
aGFuZ2VzIGFyZSBjb3ZlcmVkIGJ5IHJlZ3VsYXIgbWVkaWEgbG9hZGluZyBsYXlvdXQgdGVzdHMu
CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgor
ICAgICAgICAoV2ViS2l0OjpzaG91bGRVc2VOZXR3b3JrTG9hZENoZWNrZXIpOgorICAgICAgICAo
V2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAg
ICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAgIChJUEM6OkFy
Z3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3Vt
ZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL21hYy9X
ZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW06CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8
UmVzb3VyY2VFcnJvcj46OmVuY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgIChJUEM6OkFyZ3Vt
ZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgIFdl
IG5lZWQgdG8gc2V0IHRoZSB0eXBlIGFmdGVyIGRlY29kaW5nIHRoZSBOU0Vycm9yIGFzIFJlc291
cmNlRXJyb3IgdHJpZXMgdG8gZ3Vlc3MgdGhlIHR5cGUgZnJvbSBOU0Vycm9yIGRhdGEuCisgICAg
ICAgICogU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHA6CisgICAgICAg
IChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBsYXRmb3JtRGF0YSk6
CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZVBsYXRm
b3JtRGF0YSk6CisKIDIwMTgtMDQtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp
Z2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBEbyBUTFMgZXJyb3IgY2hlY2tpbmcgb24gR1Rs
c0Nvbm5lY3Rpb246OmFjY2VwdC1jZXJ0aWZpY2F0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDJiNmRhMjI0
NTY5YmQ4MzM4ZDE0MTgzYzliZDAyM2UxZTI1MTk5YmUuLmIzNzAwMzY0MWQxNDJiNmQwMjY3ZjYw
ODRlMWU4N2Y4Y2MxMzc1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ
cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTg3LDYgKzg3LDI1IEBAIHN0YXRp
YyB2b2lkIHNlbmRSZXBseVRvU3luY2hyb25vdXNSZXF1ZXN0KE5ldHdvcmtSZXNvdXJjZUxvYWRl
cjo6U3luY2hyb25vdXNMb2FkCiAgICAgZGF0YS5kZWxheWVkUmVwbHkgPSBudWxscHRyOwogfQog
CitzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkVXNlTmV0d29ya0xvYWRDaGVja2VyKGJvb2wgaXNT
eW5jaHJvbm91cywgY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRl
cnMpCit7CisgICAgaWYgKGlzU3luY2hyb25vdXMpCisgICAgICAgIHJldHVybiB0cnVlOworCisg
ICAgaWYgKCFwYXJhbWV0ZXJzLnNob3VsZFJlc3RyaWN0SFRUUFJlc3BvbnNlQWNjZXNzKQorICAg
ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIG90aGVy
IGRlc3RpbmF0aW9ucy4KKyAgICBzd2l0Y2ggKHBhcmFtZXRlcnMub3B0aW9ucy5kZXN0aW5hdGlv
bikgeworICAgIGNhc2UgRmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6QXVkaW86CisgICAgY2Fz
ZSBGZXRjaE9wdGlvbnM6OkRlc3RpbmF0aW9uOjpWaWRlbzoKKyAgICAgICAgcmV0dXJuIHRydWU7
CisgICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsK
K30KKwogTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29y
a1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBOZXR3b3JrQ29ubmVjdGlvblRv
V2ViUHJvY2VzcyYgY29ubmVjdGlvbiwgUmVmUHRyPE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlv
blRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZDo6RGVsYXllZFJlcGx5PiYmIHN5
bmNocm9ub3VzUmVwbHkpCiAgICAgOiBtX3BhcmFtZXRlcnMgeyBXVEZNb3ZlKHBhcmFtZXRlcnMp
IH0KICAgICAsIG1fY29ubmVjdGlvbiB7IGNvbm5lY3Rpb24gfQpAQCAtMTA3LDE1ICsxMjYsMTYg
QEAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jl
c291cmNlTG9hZFBhcmFtZXRlcnMmJiBwYXIKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChz
eW5jaHJvbm91c1JlcGx5KSB7CisgICAgaWYgKHNob3VsZFVzZU5ldHdvcmtMb2FkQ2hlY2tlcigh
IXN5bmNocm9ub3VzUmVwbHksIG1fcGFyYW1ldGVycykpIHsKICAgICAgICAgbV9uZXR3b3JrTG9h
ZENoZWNrZXIgPSBOZXR3b3JrTG9hZENoZWNrZXI6OmNyZWF0ZShGZXRjaE9wdGlvbnMgeyBtX3Bh
cmFtZXRlcnMub3B0aW9ucyB9LCBtX3BhcmFtZXRlcnMuc2Vzc2lvbklELCBIVFRQSGVhZGVyTWFw
IHsgbV9wYXJhbWV0ZXJzLm9yaWdpbmFsUmVxdWVzdEhlYWRlcnMgfSwgVVJMIHsgbV9wYXJhbWV0
ZXJzLnJlcXVlc3QudXJsKCkgfSwgbV9wYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbi5jb3B5UmVmKCkp
OwogICAgICAgICBpZiAobV9wYXJhbWV0ZXJzLmNzcFJlc3BvbnNlSGVhZGVycykKICAgICAgICAg
ICAgIG1fbmV0d29ya0xvYWRDaGVja2VyLT5zZXRDU1BSZXNwb25zZUhlYWRlcnMoQ29udGVudFNl
Y3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzIHsgbV9wYXJhbWV0ZXJzLmNzcFJlc3BvbnNlSGVh
ZGVycy52YWx1ZSgpIH0pOwogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAgICAgICAg
IG1fbmV0d29ya0xvYWRDaGVja2VyLT5zZXRDb250ZW50RXh0ZW5zaW9uQ29udHJvbGxlcihVUkwg
eyBtX3BhcmFtZXRlcnMubWFpbkRvY3VtZW50VVJMIH0sIG1fcGFyYW1ldGVycy51c2VyQ29udGVu
dENvbnRyb2xsZXJJZGVudGlmaWVyKTsKICNlbmRpZgotICAgICAgICBtX3N5bmNocm9ub3VzTG9h
ZERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPFN5bmNocm9ub3VzTG9hZERhdGE+KFdURk1vdmUoc3lu
Y2hyb25vdXNSZXBseSkpOwogICAgIH0KKyAgICBpZiAoc3luY2hyb25vdXNSZXBseSkKKyAgICAg
ICAgbV9zeW5jaHJvbm91c0xvYWREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxTeW5jaHJvbm91c0xv
YWREYXRhPihXVEZNb3ZlKHN5bmNocm9ub3VzUmVwbHkpKTsKIH0KIAogTmV0d29ya1Jlc291cmNl
TG9hZGVyOjp+TmV0d29ya1Jlc291cmNlTG9hZGVyKCkKQEAgLTM0MywxNyArMzYzLDYgQEAgYXV0
byBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZVJlc3Bv
bnNlJiYgcmVjZWl2ZWRSZXNwb24KIHsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRS
ZWNlaXZlUmVzcG9uc2U6IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2
NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGh0dHBTdGF0dXNDb2RlID0gJWQsIGxlbmd0
aCA9ICUiIFBSSWQ2NCAiKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53
ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgcmVjZWl2ZWRSZXNwb25zZS5odHRw
U3RhdHVzQ29kZSgpLCByZWNlaXZlZFJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpKTsK
IAotICAgIGlmIChtX25ldHdvcmtMb2FkQ2hlY2tlcikgewotICAgICAgICBhdXRvIGVycm9yID0g
bV9uZXR3b3JrTG9hZENoZWNrZXItPnZhbGlkYXRlUmVzcG9uc2UocmVjZWl2ZWRSZXNwb25zZSk7
Ci0gICAgICAgIGlmICghZXJyb3IuaXNOdWxsKCkpIHsKLSAgICAgICAgICAgIFJ1bkxvb3A6Om1h
aW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBlcnJvciA9IFdU
Rk1vdmUoZXJyb3IpXSB7Ci0gICAgICAgICAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPm1fbmV0
d29ya0xvYWQpCi0gICAgICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmRpZEZhaWxMb2Fk
aW5nKGVycm9yKTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgcmV0dXJuIFNob3VsZENv
bnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlOjpObzsKLSAgICAgICAgfQotICAgIH0KLQogICAgIG1f
cmVzcG9uc2UgPSBXVEZNb3ZlKHJlY2VpdmVkUmVzcG9uc2UpOwogCiAgICAgaWYgKHNob3VsZENh
cHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljcygpKQpAQCAtMzgwLDcgKzM4OSwxNyBAQCBhdXRv
IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9u
c2UmJiByZWNlaXZlZFJlc3BvbgogCiAgICAgYm9vbCBzaG91bGRXYWl0Q29udGludWVEaWRSZWNl
aXZlUmVzcG9uc2UgPSBpc01haW5SZXNvdXJjZSgpOwogICAgIGlmIChzaG91bGRTZW5kRGlkUmVj
ZWl2ZVJlc3BvbnNlKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBTYW5pdGl6ZSByZXNwb25zZS4KKyAg
ICAgICAgaWYgKG1fbmV0d29ya0xvYWRDaGVja2VyKSB7CisgICAgICAgICAgICBhdXRvIGVycm9y
ID0gbV9uZXR3b3JrTG9hZENoZWNrZXItPnZhbGlkYXRlUmVzcG9uc2UobV9yZXNwb25zZSk7Cisg
ICAgICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgICAgICAgICAgUnVuTG9v
cDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGVycm9y
ID0gV1RGTW92ZShlcnJvcildIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHByb3RlY3RlZFRo
aXMtPm1fbmV0d29ya0xvYWQpCisgICAgICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlz
LT5kaWRGYWlsTG9hZGluZyhlcnJvcik7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAg
ICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlOjpObzsKKyAgICAg
ICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAgIGF1dG8gcmVzcG9uc2UgPSBzYW5pdGl6ZVJl
c3BvbnNlSWZQb3NzaWJsZShSZXNvdXJjZVJlc3BvbnNlIHsgbV9yZXNwb25zZSB9LCBSZXNvdXJj
ZVJlc3BvbnNlOjpTYW5pdGl6YXRpb25UeXBlOjpDcm9zc09yaWdpblNhZmUpOwogICAgICAgICBp
ZiAoaXNTeW5jaHJvbm91cygpKQogICAgICAgICAgICAgbV9zeW5jaHJvbm91c0xvYWREYXRhLT5y
ZXNwb25zZSA9IFdURk1vdmUocmVzcG9uc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T
aGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl
YkNvcmVBcmd1bWVudENvZGVycy5jcHAKaW5kZXggM2ExYmNjZjkwNzI1NjI0YzIzOGFiYTIxNzUy
N2M0MmU3ZjNmMmFjNC4uNDMwYzMzZTc0YmVjMmM3ZmY1N2FkOTI4M2IxNTk4NzViMGE5MmRjNiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCkBA
IC0xMjY5LDEyICsxMjY5LDI4IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+
OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VSZXF1ZXN0JiByCiAKIHZvaWQgQXJn
dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0
IFJlc291cmNlRXJyb3ImIHJlc291cmNlRXJyb3IpCiB7CisgICAgZW5jb2Rlci5lbmNvZGVFbnVt
KHJlc291cmNlRXJyb3IudHlwZSgpKTsKKyAgICBpZiAocmVzb3VyY2VFcnJvci50eXBlKCkgPT0g
UmVzb3VyY2VFcnJvcjo6VHlwZTo6TnVsbCkKKyAgICAgICAgcmV0dXJuOwogICAgIGVuY29kZVBs
YXRmb3JtRGF0YShlbmNvZGVyLCByZXNvdXJjZUVycm9yKTsKIH0KIAogYm9vbCBBcmd1bWVudENv
ZGVyPFJlc291cmNlRXJyb3I+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VFcnJv
ciYgcmVzb3VyY2VFcnJvcikKIHsKLSAgICByZXR1cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29k
ZXIsIHJlc291cmNlRXJyb3IpOworICAgIFJlc291cmNlRXJyb3I6OlR5cGUgdHlwZTsKKyAgICBp
ZiAoIWRlY29kZXIuZGVjb2RlRW51bSh0eXBlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg
ICAgaWYgKHR5cGUgPT0gUmVzb3VyY2VFcnJvcjo6VHlwZTo6TnVsbCkgeworICAgICAgICByZXNv
dXJjZUVycm9yID0geyB9OworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBpZiAo
IWRlY29kZVBsYXRmb3JtRGF0YShkZWNvZGVyLCByZXNvdXJjZUVycm9yKSkKKyAgICAgICAgcmV0
dXJuIGZhbHNlOworCisgICAgcmVzb3VyY2VFcnJvci5zZXRUeXBlKHR5cGUpOworICAgIHJldHVy
biB0cnVlOwogfQogCiAjaWYgUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQv
U2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0KaW5kZXggN2U0NmFkNmMxMDhi
NWFkODJjZDU4NDk2ODMwNDk3YjBhMTFmNGZhOC4uYTBhNDAwZjA4MDhkYzVkYWYxMmVkMDNlNTA3
ZGQyMGFkZDNmNmQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkNv
cmVBcmd1bWVudENvZGVyc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2Vi
Q29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCkBAIC0zODYsMTQgKzM4Niw3IEBAIHN0YXRpYyB2b2lk
IGVuY29kZU5TRXJyb3IoRW5jb2RlciYgZW5jb2RlciwgTlNFcnJvciAqbnNFcnJvcikKIAogdm9p
ZCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2Rl
ciYgZW5jb2RlciwgY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvcikKIHsKLSAgICBi
b29sIGVycm9ySXNOdWxsID0gcmVzb3VyY2VFcnJvci5pc051bGwoKTsKLSAgICBlbmNvZGVyIDw8
IGVycm9ySXNOdWxsOwotCi0gICAgaWYgKGVycm9ySXNOdWxsKQotICAgICAgICByZXR1cm47Ci0K
LSAgICBOU0Vycm9yICpuc0Vycm9yID0gcmVzb3VyY2VFcnJvci5uc0Vycm9yKCk7Ci0gICAgZW5j
b2RlTlNFcnJvcihlbmNvZGVyLCBuc0Vycm9yKTsKKyAgICBlbmNvZGVOU0Vycm9yKGVuY29kZXIs
IHJlc291cmNlRXJyb3IubnNFcnJvcigpKTsKIH0KIAogc3RhdGljIGJvb2wgZGVjb2RlTlNFcnJv
cihEZWNvZGVyJiBkZWNvZGVyLCBSZXRhaW5QdHI8TlNFcnJvcj4mIG5zRXJyb3IpCkBAIC00MzAs
MTUgKzQyMyw2IEBAIHN0YXRpYyBib29sIGRlY29kZU5TRXJyb3IoRGVjb2RlciYgZGVjb2Rlciwg
UmV0YWluUHRyPE5TRXJyb3I+JiBuc0Vycm9yKQogCiBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3Vy
Y2VFcnJvcj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZUVy
cm9yJiByZXNvdXJjZUVycm9yKQogewotICAgIGJvb2wgZXJyb3JJc051bGw7Ci0gICAgaWYgKCFk
ZWNvZGVyLmRlY29kZShlcnJvcklzTnVsbCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAK
LSAgICBpZiAoZXJyb3JJc051bGwpIHsKLSAgICAgICAgcmVzb3VyY2VFcnJvciA9IFJlc291cmNl
RXJyb3IoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIAogICAgIFJldGFpblB0
cjxOU0Vycm9yPiBuc0Vycm9yOwogICAgIGlmICghZGVjb2RlTlNFcnJvcihkZWNvZGVyLCBuc0Vy
cm9yKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T
aGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQv
U2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAKaW5kZXggNmUxZWYwMjU0
YWRhZDA0N2U0ZDhlNTY5NDU5MjVkZDA5YzAyYWRmNS4uYmQ5YmEwOWZjYjBlYmJhNDU2NzhmMGM5
MzgwM2NjZTA1MmQ0ZWZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9X
ZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9z
b3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCkBAIC0xMDEsMTAgKzEwMSw2IEBAIGJv
b2wgQXJndW1lbnRDb2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rl
ciwgQ2VydGlmaWNhdGVJbmZvJiBjCiAKIHZvaWQgQXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9y
Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFJlc291cmNlRXJy
b3ImIHJlc291cmNlRXJyb3IpCiB7Ci0gICAgZW5jb2Rlci5lbmNvZGVFbnVtKHJlc291cmNlRXJy
b3IudHlwZSgpKTsKLSAgICBpZiAocmVzb3VyY2VFcnJvci5pc051bGwoKSkKLSAgICAgICAgcmV0
dXJuOwotCiAgICAgZW5jb2RlciA8PCByZXNvdXJjZUVycm9yLmRvbWFpbigpOwogICAgIGVuY29k
ZXIgPDwgcmVzb3VyY2VFcnJvci5lcnJvckNvZGUoKTsKICAgICBlbmNvZGVyIDw8IHJlc291cmNl
RXJyb3IuZmFpbGluZ1VSTCgpLnN0cmluZygpOwpAQCAtMTE1LDE0ICsxMTEsNiBAQCB2b2lkIEFy
Z3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBsYXRmb3JtRGF0YShFbmNvZGVyJiBl
bmNvZGVyLCBjb25zdCBSZQogCiBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRl
Y29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZUVycm9yJiByZXNvdXJj
ZUVycm9yKQogewotICAgIFJlc291cmNlRXJyb3JCYXNlOjpUeXBlIGVycm9yVHlwZTsKLSAgICBp
ZiAoIWRlY29kZXIuZGVjb2RlRW51bShlcnJvclR5cGUpKQotICAgICAgICByZXR1cm4gZmFsc2U7
Ci0gICAgaWYgKGVycm9yVHlwZSA9PSBSZXNvdXJjZUVycm9yQmFzZTo6VHlwZTo6TnVsbCkgewot
ICAgICAgICByZXNvdXJjZUVycm9yID0geyB9OwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9
Ci0KICAgICBTdHJpbmcgZG9tYWluOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZG9tYWluKSkK
ICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTQwLDcgKzEyOCw2IEBAIGJvb2wgQXJndW1lbnRD
b2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIs
IFJlc291cmNlCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJlc291cmNlRXJyb3IgPSBS
ZXNvdXJjZUVycm9yKGRvbWFpbiwgZXJyb3JDb2RlLCBVUkwoVVJMKCksIGZhaWxpbmdVUkwpLCBs
b2NhbGl6ZWREZXNjcmlwdGlvbik7Ci0gICAgcmVzb3VyY2VFcnJvci5zZXRUeXBlKGVycm9yVHlw
ZSk7CiAKICAgICBDZXJ0aWZpY2F0ZUluZm8gY2VydGlmaWNhdGVJbmZvOwogICAgIGlmICghZGVj
b2Rlci5kZWNvZGUoY2VydGlmaWNhdGVJbmZvKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No
YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwODcwNWQ5MjgwMTU0Zjk4YTlm
OWIxOTVlYWNkYzQ1MWNlNjdjNjRjLi4yZTEzMmU1MDRiNmUzNjJkY2U4NDExMGU2NmZjNjMzNDRl
MDk1YWQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMDQtMjEgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFjdGl2YXRlIE5ldHdvcmtMb2FkQ2hlY2tl
ciBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTE4NDg0MQorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IEFkZGVkIER1bXBKU0NvbnNvbGVMb2dJblN0ZEVy
ciB0byByZW1vdmUgY29uc29sZSBtZXNzYWdlIGRpZmZlcmVuY2VzIGJldHdlZW4gV0sxL1dLMi4K
KwogMjAxOC0wNC0yMCAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEFY
OiBBT00gZG9lcyBub3Qgd29yayB3aXRoIERPTSBMZXZlbCAxIGV2ZW50cwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMKaW5kZXggODE4MGNiZDMzYzkzNjA1ZjU1ZmE1Y2ZkYzYwY2FjMjQ3NTZmOGVlZS4uM2M3ZGNk
YzI0ZWViMGE4NzgxYmZkN2QyZGM4MzA3ZDUxZjI4YzAzNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBA
IC0yNTQsNiArMjU0LDcgQEAgaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QgWyBT
a2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGF5bWVudC1yZXF1ZXN0IFsg
U2tpcCBdCiAKIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvcmVkaXJlY3QtY3Jvc3Mtb3JpZ2lu
LXN5bmMtZG91YmxlLmh0bWwgWyBEdW1wSlNDb25zb2xlTG9nSW5TdGRFcnIgXQoraW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRwUmVxdWVzdC9zZW5kLXJlZGlyZWN0LWJvZ3Vz
LXN5bmMuaHRtIFsgRHVtcEpTQ29uc29sZUxvZ0luU3RkRXJyIF0KIAogaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRwUmVxdWVzdC94bWxodHRwcmVxdWVzdC1zeW5jLWRlZmF1
bHQtZmVhdHVyZS1wb2xpY3kuc3ViLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8xNzk2MDcg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRwUmVxdWVzdC9hY2Nlc3MtY29u
dHJvbC1hbmQtcmVkaXJlY3RzLWFzeW5jLmh0bSBbIFBhc3MgRmFpbHVyZSBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>